diff options
| author | V3n3RiX <venerix@redcorelinux.org> | 2018-01-16 17:34:21 +0000 |
|---|---|---|
| committer | V3n3RiX <venerix@redcorelinux.org> | 2018-01-16 17:34:21 +0000 |
| commit | 02e2208f46f4e2c00fb9743cbc47350bdd233bfa (patch) | |
| tree | 132dd60828854db4f65f30f9230f43d9602507ff /x11-libs/gtk+/files | |
| parent | 8be70107efbb417f839292165ee39d07a062046f (diff) | |
gentoo resync : 16.01.2018
Diffstat (limited to 'x11-libs/gtk+/files')
| -rw-r--r-- | x11-libs/gtk+/files/gtk+-3.22.20-libcloudproviders-automagic.patch | 57 |
1 files changed, 57 insertions, 0 deletions
diff --git a/x11-libs/gtk+/files/gtk+-3.22.20-libcloudproviders-automagic.patch b/x11-libs/gtk+/files/gtk+-3.22.20-libcloudproviders-automagic.patch new file mode 100644 index 000000000000..8913bc88bd4e --- /dev/null +++ b/x11-libs/gtk+/files/gtk+-3.22.20-libcloudproviders-automagic.patch @@ -0,0 +1,57 @@ +From 4588c9c6463d8958d8305caafa58ea5c263fd352 Mon Sep 17 00:00:00 2001 +From: Gilles Dartiguelongue <eva@gentoo.org> +Date: Tue, 16 Jan 2018 09:07:38 +0100 +Subject: [PATCH] Fix libcloudproviders check + +Use autotools managed variables and make use of pkgconfig macros. +--- + configure.ac | 26 +++++++++++++------------- + 1 file changed, 13 insertions(+), 13 deletions(-) + +diff --git a/configure.ac b/configure.ac +index 24110386b4..cebe66c2e5 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -349,8 +349,10 @@ AC_ARG_ENABLE(mir-backend, + + AC_ARG_ENABLE(cloudproviders, + [AS_HELP_STRING([--enable-cloudproviders], +- [enable libcloudproviders integration])], +- [cloudproviders_set=yes]) ++ [enable libcloudproviders integration]) ++ ], ++ [], ++ [enable_cloudproviders=yes]) + + if test -z "$backend_set"; then + if test "$platform_win32" = yes; then +@@ -1350,17 +1352,15 @@ fi + # Check for libcloudproviders + + CLOUDPROVIDER_PACKAGES="" +-if test "x$cloudproviders_set" = "xyes"; then +- CLOUDPROVIDER_PACKAGES="cloudproviders >= cloudproviders_required_version" +- if $PKG_CONFIG --exists $CLOUDPROVIDER_PACKAGES ; then +- AC_DEFINE(HAVE_CLOUDPROVIDERS, [1], +- [Define if libcloudproviders is available] +- ) +- else +- AC_MSG_ERROR([ +-*** libcloudproviders not found.]) +- fi +-fi ++AS_IF([test "$enable_cloudproviders" = "yes"], ++ [ ++ CLOUDPROVIDER_PACKAGES="cloudproviders >= cloudproviders_required_version" ++ PKG_CHECK_EXISTS( ++ [$CLOUDPROVIDER_PACKAGES], ++ [AC_DEFINE(HAVE_CLOUDPROVIDERS, [1], [Define if libcloudproviders is available])], ++ [AC_MSG_ERROR([*** libcloudproviders not found])] ++ ) ++ ]) + + CFLAGS="$saved_cflags" + LDFLAGS="$saved_ldflags" +-- +2.15.1 + |