1 --- qemu-1.7.0/configure.orig 2013-12-15 08:38:07.584329114 +0100
2 +++ qemu-1.7.0/configure 2013-12-15 08:54:19.730954984 +0100
5 int main(void) { PK11_FreeSlot(0); return 0; }
7 - smartcard_includes="-I\$(SRC_PATH)/libcacard"
8 - libcacard_libs="$($pkg_config --libs nss 2>/dev/null) $glib_libs"
9 - libcacard_cflags="$($pkg_config --cflags nss 2>/dev/null) $glib_cflags"
10 + libcacard_libs="$($pkg_config --libs libcacard 2>/dev/null)"
11 + libcacard_cflags="$($pkg_config --cflags libcacard 2>/dev/null)"
12 + nss_libs="$($pkg_config --libs nss 2>/dev/null) $glib_libs"
13 + nss_cflags="$($pkg_config --cflags nss 2>/dev/null) $glib_cflags"
14 test_cflags="$libcacard_cflags"
15 # The header files in nss < 3.13.3 have a bug which causes them to
16 # emit a warning. If we're going to compile QEMU with -Werror, then
17 @@ -3136,11 +3137,10 @@
19 if test -n "$libtool" &&
20 $pkg_config --atleast-version=3.12.8 nss && \
21 - compile_prog "$test_cflags" "$libcacard_libs"; then
22 + compile_prog "$test_cflags" "$nss_libs"; then
24 - QEMU_CFLAGS="$QEMU_CFLAGS $libcacard_cflags"
25 - QEMU_INCLUDES="$QEMU_INCLUDES $smartcard_includes"
26 - libs_softmmu="$libcacard_libs $libs_softmmu"
27 + QEMU_CFLAGS="$QEMU_CFLAGS $libcacard_cflags $nss_cflags"
28 + libs_softmmu="$libcacard_libs $nss_libs $libs_softmmu"
30 if test "$smartcard_nss" = "yes"; then
31 feature_not_found "nss"
33 echo "CONFIG_SMARTCARD_NSS=y" >> $config_host_mak
34 echo "libcacard_libs=$libcacard_libs" >> $config_host_mak
35 echo "libcacard_cflags=$libcacard_cflags" >> $config_host_mak
36 + echo "nss_libs=$nss_libs" >> $config_host_mak
37 + echo "nss_cflags=$nss_cflags" >> $config_host_mak
40 if test "$libusb" = "yes" ; then
41 --- qemu-1.3.0/Makefile.orig 2012-12-03 20:37:05.000000000 +0100
42 +++ qemu-1.3.0/Makefile 2012-12-16 11:08:58.001201236 +0100
44 include $(SRC_PATH)/Makefile.objs
45 include $(SRC_PATH)/tests/Makefile
47 -ifeq ($(CONFIG_SMARTCARD_NSS),y)
48 -include $(SRC_PATH)/libcacard/Makefile
51 all: $(DOCS) $(TOOLS) $(HELPERS-y) recurse-all
53 --- qemu-1.5.0/Makefile.objs.orig 2013-05-20 17:34:39.000000000 +0200
54 +++ qemu-1.5.0/Makefile.objs 2013-05-26 17:46:51.190865264 +0200
57 common-obj-$(CONFIG_SECCOMP) += qemu-seccomp.o
59 -common-obj-$(CONFIG_SMARTCARD_NSS) += $(libcacard-y)
61 ######################################################################
64 --- qemu-1.5.0/hw/usb/ccid-card-passthru.c.orig 2013-05-20 17:34:39.000000000 +0200
65 +++ qemu-1.5.0/hw/usb/ccid-card-passthru.c 2013-05-26 17:58:20.660836330 +0200
67 #include "qemu/sockets.h"
68 #include "monitor/monitor.h"
70 -#include "libcacard/vscard_common.h"
71 +#include <cacard/vscard_common.h>
73 #define DPRINTF(card, lvl, fmt, ...) \