qemu-system-libcacard.patch

   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
   3 @@ -3543,9 +3543,11 @@
   4  int main(void) { PK11_FreeSlot(0); return 0; }
   5  EOF
   6      # FIXME: do not include $glib_* in here
   7 +    libcacard_libs="$($pkg_config --libs libcacard 2>/dev/null)"
   8 +    libcacard_cflags="$($pkg_config --cflags libcacard 2>/dev/null)"
   9      nss_libs="$($pkg_config --libs nss 2>/dev/null) $glib_libs"
  10      nss_cflags="$($pkg_config --cflags nss 2>/dev/null) $glib_cflags"
  11 -    test_cflags="$nss_cflags"
  12 +    test_cflags="$libcacard_cflags"
  13      # The header files in nss < 3.13.3 have a bug which causes them to
  14      # emit a warning. If we're going to compile QEMU with -Werror, then
  15      # test that the headers don't have this bug. Otherwise we would pass
  16 @@ -3557,6 +3559,8 @@
  17         $pkg_config --atleast-version=3.12.8 nss && \
  18        compile_prog "$test_cflags" "$nss_libs"; then
  19          smartcard_nss="yes"
  20 +        QEMU_CFLAGS="$QEMU_CFLAGS $libcacard_cflags $nss_cflags"
  21 +        libs_softmmu="$libcacard_libs $nss_libs $libs_softmmu"
  22      else
  23          if test "$smartcard_nss" = "yes"; then
  24              feature_not_found "nss"
  25 @@ -4574,6 +4578,8 @@
  26
  27  if test "$smartcard_nss" = "yes" ; then
  28    echo "CONFIG_SMARTCARD_NSS=y" >> $config_host_mak
  29 +  echo "LIBCACARD_LIBS=$libcacard_libs" >> $config_host_mak
  30 +  echo "LIBCACARD_CFLAGS=$libcacard_cflags" >> $config_host_mak
  31    echo "NSS_LIBS=$nss_libs" >> $config_host_mak
  32    echo "NSS_CFLAGS=$nss_cflags" >> $config_host_mak
  33  fi
  34 --- qemu-1.3.0/Makefile.orig    2012-12-03 20:37:05.000000000 +0100
  35 +++ qemu-1.3.0/Makefile 2012-12-16 11:08:58.001201236 +0100
  36 @@ -111,9 +111,6 @@
  37  include $(SRC_PATH)/Makefile.objs
  38  include $(SRC_PATH)/tests/Makefile
  39  endif
  40 -ifeq ($(CONFIG_SMARTCARD_NSS),y)
  41 -include $(SRC_PATH)/libcacard/Makefile
  42 -endif
  43
  44  all: $(DOCS) $(TOOLS) $(HELPERS-y) recurse-all
  45
  46 --- qemu-1.5.0/Makefile.objs.orig       2013-05-20 17:34:39.000000000 +0200
  47 +++ qemu-1.5.0/Makefile.objs    2013-05-26 17:46:51.190865264 +0200
  48 @@ -74,8 +74,6 @@
  49
  50  common-obj-$(CONFIG_SECCOMP) += qemu-seccomp.o
  51
  52 -common-obj-$(CONFIG_SMARTCARD_NSS) += $(libcacard-y)
  53 -
  54  ######################################################################
  55  # qapi
  56
  57 --- qemu-1.5.0/hw/usb/ccid-card-passthru.c.orig 2013-05-20 17:34:39.000000000 +0200
  58 +++ qemu-1.5.0/hw/usb/ccid-card-passthru.c      2013-05-26 17:58:20.660836330 +0200
  59 @@ -12,7 +12,7 @@
  60  #include "qemu/sockets.h"
  61  #include "monitor/monitor.h"
  62  #include "ccid.h"
  63 -#include "libcacard/vscard_common.h"
  64 +#include <cacard/vscard_common.h>
  65
  66  #define DPRINTF(card, lvl, fmt, ...)                    \
  67  do {                                                    \