diff options
Diffstat (limited to 'x11-libs')
| -rw-r--r-- | x11-libs/gtk+/Manifest | 2 | ||||
| -rw-r--r-- | x11-libs/gtk+/files/gtk+-3.22.20-libcloudproviders-automagic.patch | 57 | ||||
| -rw-r--r-- | x11-libs/gtk+/gtk+-3.22.29-r1337.ebuild (renamed from x11-libs/gtk+/gtk+-3.22.19-r1337.ebuild) | 11 |
3 files changed, 66 insertions, 4 deletions
diff --git a/x11-libs/gtk+/Manifest b/x11-libs/gtk+/Manifest index 82cccd9d..2c580d37 100644 --- a/x11-libs/gtk+/Manifest +++ b/x11-libs/gtk+/Manifest @@ -1,2 +1,2 @@ DIST gtk+-2.24.31.tar.xz 12805344 BLAKE2B f516f9970a95afa21ae5dbe9f0cafd3c57c5cd27af0c6740a0f7f4367eb8032719e39e533bf89db72dddba7485ee499da9c2370707f51bbc4a7af2d4fb7c1309 SHA512 75b846661308d94b5236e7e1c367deabf57753792ca87e92f9769822dd5ec90e00cd8d5574adcc12162e3702e1ae6dc152278a1d218f9bd9e4d1c8dc1dd520c1 -DIST gtk+-3.22.19.tar.xz 18841024 BLAKE2B dc4c27d022c6766036b16e52b53b4aa3946c41457abaabca390bdba2b720db71b9c584101990928af1bef73dc49f7b71a951ba0000bd52e11aa5306a1d877f18 SHA512 c83198794433ee6eb29f8740d59bd7056cd36808b4bff1a99563ab1a1742e6635dab4f2a8be33317f74d3b336f0d1adc28dd91410da056b50a08c215f184dce2 +DIST gtk+-3.22.29.tar.xz 18964852 BLAKE2B a7551d604a1e27cba1d0580f2645bf4afff900908ce40d3d4d05cfb7348afc0620922e9b7939cf4ce2314ff489ffe38386aaf2634f3eff6591dfd0a225f19bc7 SHA512 046fa4458626e81ea7b1ddb753d53ecd91d0f2101af428cfdf77fe866bbe430cb3622203cc5e895b220a9364e35009245cdaf76e0cfa30d32d31095b5fcb42bc 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 00000000..8913bc88 --- /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 + diff --git a/x11-libs/gtk+/gtk+-3.22.19-r1337.ebuild b/x11-libs/gtk+/gtk+-3.22.29-r1337.ebuild index 5cfe545d..d331980e 100644 --- a/x11-libs/gtk+/gtk+-3.22.19-r1337.ebuild +++ b/x11-libs/gtk+/gtk+-3.22.29-r1337.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -17,7 +17,7 @@ REQUIRED_USE=" xinerama? ( X ) " -KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" +KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ia64 ~mips ~ppc ~ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" # Upstream wants us to do their job: # https://bugzilla.gnome.org/show_bug.cgi?id=768662#c1 @@ -126,6 +126,9 @@ src_prepare() { # gtk-update-icon-cache is installed by dev-util/gtk-update-icon-cache eapply "${FILESDIR}"/${PN}-3.22.2-update-icon-cache.patch + # Fix broken autotools logic + eapply "${FILESDIR}"/${PN}-3.22.20-libcloudproviders-automagic.patch + eautoreconf gnome2_src_prepare } @@ -133,6 +136,7 @@ src_prepare() { multilib_src_configure() { # need libdir here to avoid a double slash in a path that libtool doesn't # grok so well during install (// between $EPREFIX and usr ...) + # cloudprovider is not packaged in Gentoo ECONF_SOURCE=${S} \ gnome2_src_configure \ $(use_enable aqua quartz-backend) \ @@ -149,8 +153,9 @@ multilib_src_configure() { $(use_enable X xkb) \ $(use_enable X xrandr) \ $(use_enable xinerama) \ - --disable-papi \ + --disable-cloudproviders \ --disable-mir-backend \ + --disable-papi \ --enable-man \ --with-xml-catalog="${EPREFIX}"/etc/xml/catalog \ --libdir="${EPREFIX}"/usr/$(get_libdir) \ |