Acked-by: Christophe Fergeau <cfergeau@xxxxxxxxxx>
On Tue, Jan 08, 2019 at 01:48:45PM +0400, marcandre.lureau@xxxxxxxxxx wrote:
> From: Marc-André Lureau <marcandre.lureau@xxxxxxxxxx>
>
> v2.5.1 was released the 2015-11-24.
>
> According to repology, from the distro we care about, CentOS 6,
> openSUSE Leap 42.3 have too old version (0.1.2).
>
> SPICE_CHECK_SMARTCARD is updated with spice-common.
>
> Signed-off-by: Marc-André Lureau <marcandre.lureau@xxxxxxxxxx>
> ---
> meson.build | 18 ++----------------
> src/channel-smartcard.c | 4 ----
> src/smartcard-manager.c | 6 ------
> subprojects/spice-common | 2 +-
> tools/spicy.c | 4 ----
> 5 files changed, 3 insertions(+), 31 deletions(-)
>
> diff --git a/meson.build b/meson.build
> index 89de9bf..e406feb 100644
> --- a/meson.build
> +++ b/meson.build
> @@ -341,22 +341,8 @@ endif
> # smartcard check
> spice_gtk_has_smartcard = false
> if get_option('smartcard')
> - smartcard_dep = dependency('libcacard', required : false, version : '>= 2.5.1')
> - if smartcard_dep.found()
> - spice_glib_deps += smartcard_dep
> - spice_gtk_config_data.set('USE_SMARTCARD', '1')
> - else
> - smartcard012_dep = dependency('libcacard', required : false, version : '>= 0.1.2')
> - if smartcard012_dep.found()
> - spice_glib_deps += smartcard012_dep
> - spice_gtk_config_data.set('USE_SMARTCARD_012', '1')
> - endif
> - endif
> -
> - spice_gtk_has_smartcard = smartcard_dep.found() or smartcard012_dep.found()
> - if not spice_gtk_has_smartcard
> - error('Building with smartcard support but dependency not found')
> - endif
> + spice_glib_deps += dependency('libcacard', version : '>= 2.5.1')
> + spice_gtk_config_data.set('USE_SMARTCARD', '1')
> endif
>
> #
> diff --git a/src/channel-smartcard.c b/src/channel-smartcard.c
> index 6d0facd..aad5f8f 100644
> --- a/src/channel-smartcard.c
> +++ b/src/channel-smartcard.c
> @@ -17,10 +17,6 @@
> */
> #include "config.h"
>
> -#ifdef USE_SMARTCARD_012
> -#include <vreader.h>
> -#endif
> -
> #include "spice-client.h"
> #include "spice-common.h"
>
> diff --git a/src/smartcard-manager.c b/src/smartcard-manager.c
> index 9c94f95..ceecfdc 100644
> --- a/src/smartcard-manager.c
> +++ b/src/smartcard-manager.c
> @@ -20,15 +20,9 @@
> #include <glib-object.h>
> #include <string.h>
>
> -#ifdef USE_SMARTCARD_012
> -#include <vcard_emul.h>
> -#include <vevent.h>
> -#include <vreader.h>
> -#else
> #ifdef USE_SMARTCARD
> #include <libcacard.h>
> #endif
> -#endif
>
> #include "spice-client.h"
> #include "smartcard-manager.h"
> diff --git a/subprojects/spice-common b/subprojects/spice-common
> index 2060672..924f47a 160000
> --- a/subprojects/spice-common
> +++ b/subprojects/spice-common
> @@ -1 +1 @@
> -Subproject commit 2060672e8126ed9086dac6b70a4b138c106084a8
> +Subproject commit 924f47a653bd87fbd50229ee34b58d7b9a3f1ec8
> diff --git a/tools/spicy.c b/tools/spicy.c
> index 263c15f..060bbdc 100644
> --- a/tools/spicy.c
> +++ b/tools/spicy.c
> @@ -24,10 +24,6 @@
> #include <termios.h>
> #endif
>
> -#ifdef USE_SMARTCARD_012
> -#include <vreader.h>
> -#endif
> -
> #include "spice-widget.h"
> #include "spice-gtk-session.h"
> #include "spice-audio.h"
> --
> 2.20.1.2.gb21ebb671b
>
> _______________________________________________
> Spice-devel mailing list
> Spice-devel@xxxxxxxxxxxxxxxxxxxxx
> https://lists.freedesktop.org/mailman/listinfo/spice-devel
Attachment:
signature.asc
Description: PGP signature
_______________________________________________ Spice-devel mailing list Spice-devel@xxxxxxxxxxxxxxxxxxxxx https://lists.freedesktop.org/mailman/listinfo/spice-devel