From 6a4441a53f1b67a5f96ad78f0a923b1ef6690c37 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sat, 28 Apr 2018 20:48:38 +0100 Subject: x11-libs/gtk+:3 : version bump --- x11-libs/gtk+/Manifest | 2 +- .../gtk+-3.22.20-libcloudproviders-automagic.patch | 57 +++++ x11-libs/gtk+/gtk+-3.22.19-r1337.ebuild | 226 -------------------- x11-libs/gtk+/gtk+-3.22.29-r1337.ebuild | 231 +++++++++++++++++++++ 4 files changed, 289 insertions(+), 227 deletions(-) create mode 100644 x11-libs/gtk+/files/gtk+-3.22.20-libcloudproviders-automagic.patch delete mode 100644 x11-libs/gtk+/gtk+-3.22.19-r1337.ebuild create mode 100644 x11-libs/gtk+/gtk+-3.22.29-r1337.ebuild 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 +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.19-r1337.ebuild deleted file mode 100644 index 5cfe545d..00000000 --- a/x11-libs/gtk+/gtk+-3.22.19-r1337.ebuild +++ /dev/null @@ -1,226 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 -GNOME2_LA_PUNT="yes" - -inherit autotools flag-o-matic gnome2 multilib virtualx multilib-minimal - -DESCRIPTION="Gimp ToolKit +" -HOMEPAGE="https://www.gtk.org/" - -LICENSE="LGPL-2+" -SLOT="3" -IUSE="aqua broadway cloudprint colord cups examples +introspection test vim-syntax wayland +X xinerama" -REQUIRED_USE=" - || ( aqua wayland X ) - 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" - -# Upstream wants us to do their job: -# https://bugzilla.gnome.org/show_bug.cgi?id=768662#c1 -RESTRICT="test" - -# FIXME: introspection data is built against system installation of gtk+:3, -# bug #???? -COMMON_DEPEND=" - >=dev-libs/atk-2.15[introspection?,${MULTILIB_USEDEP}] - >=dev-libs/glib-2.49.4:2[${MULTILIB_USEDEP}] - media-libs/fontconfig[${MULTILIB_USEDEP}] - >=media-libs/libepoxy-1.0[X(+)?,${MULTILIB_USEDEP}] - >=x11-libs/cairo-1.14[aqua?,glib,svg,X?,${MULTILIB_USEDEP}] - >=x11-libs/gdk-pixbuf-2.30:2[introspection?,${MULTILIB_USEDEP}] - >=x11-libs/pango-1.37.3[introspection?,${MULTILIB_USEDEP}] - x11-misc/shared-mime-info - - cloudprint? ( - >=net-libs/rest-0.7[${MULTILIB_USEDEP}] - >=dev-libs/json-glib-1.0[${MULTILIB_USEDEP}] ) - colord? ( >=x11-misc/colord-0.1.9:0=[${MULTILIB_USEDEP}] ) - cups? ( >=net-print/cups-1.2[${MULTILIB_USEDEP}] ) - introspection? ( >=dev-libs/gobject-introspection-1.39:= ) - wayland? ( - >=dev-libs/wayland-1.9.91[${MULTILIB_USEDEP}] - >=dev-libs/wayland-protocols-1.9 - media-libs/mesa[wayland,${MULTILIB_USEDEP}] - >=x11-libs/libxkbcommon-0.2[${MULTILIB_USEDEP}] - ) - X? ( - >=app-accessibility/at-spi2-atk-2.5.3[${MULTILIB_USEDEP}] - x11-libs/libX11[${MULTILIB_USEDEP}] - >=x11-libs/libXi-1.3[${MULTILIB_USEDEP}] - x11-libs/libXext[${MULTILIB_USEDEP}] - >=x11-libs/libXrandr-1.5[${MULTILIB_USEDEP}] - x11-libs/libXcursor[${MULTILIB_USEDEP}] - x11-libs/libXfixes[${MULTILIB_USEDEP}] - x11-libs/libXcomposite[${MULTILIB_USEDEP}] - x11-libs/libXdamage[${MULTILIB_USEDEP}] - xinerama? ( x11-libs/libXinerama[${MULTILIB_USEDEP}] ) - ) -" -DEPEND="${COMMON_DEPEND} - app-text/docbook-xsl-stylesheets - app-text/docbook-xml-dtd:4.1.2 - dev-libs/libxslt - dev-libs/gobject-introspection-common - >=dev-util/gdbus-codegen-2.48 - >=dev-util/gtk-doc-am-1.20 - >=sys-devel/gettext-0.19.7[${MULTILIB_USEDEP}] - virtual/pkgconfig[${MULTILIB_USEDEP}] - X? ( - x11-proto/xextproto[${MULTILIB_USEDEP}] - x11-proto/xproto[${MULTILIB_USEDEP}] - x11-proto/inputproto[${MULTILIB_USEDEP}] - x11-proto/damageproto[${MULTILIB_USEDEP}] - xinerama? ( x11-proto/xineramaproto[${MULTILIB_USEDEP}] ) - ) - test? ( - media-fonts/font-misc-misc - media-fonts/font-cursor-misc ) -" -# gtk+-3.2.2 breaks Alt key handling in <=x11-libs/vte-0.30.1:2.90 -# gtk+-3.3.18 breaks scrolling in <=x11-libs/vte-0.31.0:2.90 -RDEPEND="${COMMON_DEPEND} - >=dev-util/gtk-update-icon-cache-3 - !