summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--x11-libs/gtk+/Manifest3
-rw-r--r--x11-libs/gtk+/files/gtk+-3.24.8-update-icon-cache.patch (renamed from x11-libs/gtk+/files/gtk+-3.22.2-update-icon-cache.patch)28
-rw-r--r--x11-libs/gtk+/gtk+-3.24.20-r314.ebuild (renamed from x11-libs/gtk+/gtk+-3.24.5-r314.ebuild)91
3 files changed, 66 insertions, 56 deletions
diff --git a/x11-libs/gtk+/Manifest b/x11-libs/gtk+/Manifest
index 152115f2..3caf8e34 100644
--- a/x11-libs/gtk+/Manifest
+++ b/x11-libs/gtk+/Manifest
@@ -1,4 +1,3 @@
DIST gtk+-2.24.32-patchset-r1.tar.xz 13364 BLAKE2B 15e5429b11cc4ccef1bf44105c790b5325e833ab12f393fe718c06470b90f3e4004bea4b51076a725f4bb10bcfd0c48b7063d9b9b021919ad0367d1b981be980 SHA512 1a15dce7578a914585981426d2e5d1cc45866866a70c3f443d1867ab1c0c28fb279bde6c3117b28eec2758a62c1b54bb6fb1b382ad6e9a7cf0114b13f2afd858
DIST gtk+-2.24.32.tar.xz 12620860 BLAKE2B 03f4c0a8be98473f62bc8c86859937969c4169960a5f93d37ff6dcde00413215fa6c7125b15781bf50d67b40aa0056cb71b83fb50acb2c3467b5deb3c8d938f0 SHA512 8e8fd9ae32f1d6fb544da260f00599f0f05090d910d767b06ef086ab4f1f8373a29bb0da9767761c9b5f4cfd51b5c45d0fa5d39b0428c839ddf0a579df806696
-DIST gtk+-3.24.5-patchset-20190206.tar.xz 4208 BLAKE2B 09d1dcd0a6312f042739c633ef5c3a3b26c81f586c4c1396bc9ed4cd5e8a891507d6a6857e91b481794c8c6ea1e9511b756e7307775acb4ec53f561283c2139c SHA512 e3748ab10032d1c388b50ac35e295d08f7373c70186d35ee52f8a31ea53cddbac61eb25e5c6aac9855a4cb02c25ed0d2361241fe2530b6ce6738fb5e4840817e
-DIST gtk+-3.24.5.tar.xz 21012108 BLAKE2B 25b8fc92655be190a0dc082ee303614026054d9bf17f93e8df11129f77fe1e6dc9cc97d5ceeab139eb905e3d61ea918b01d39f342e11d06fb3245c590567d24a SHA512 344988c9e2a2d7fd2fd1e367a113be7c4a32c28c9cf395aeab923e25256b99856091d1583d3f8557aac6919a930a4d0af69b966486caab559c7d9d22585cc1a1
+DIST gtk+-3.24.20.tar.xz 22726768 BLAKE2B 75daa850275d55758503fa98055ca4deb9adca172e0f38c39ca4d5e7f8179398ca8753a759b0d3afc1ad1712ac6e3aa2cc1bce29e2a8fff4198a7f2d70002b11 SHA512 bda8eeacf721afcff4565756fe45857cbf8b053494d1d747ca9b97c899e9fe21fddef6871ecd5ec9a7a0f87b0a3ede2f9d6b5e5712de10a845100d82464a4556
diff --git a/x11-libs/gtk+/files/gtk+-3.22.2-update-icon-cache.patch b/x11-libs/gtk+/files/gtk+-3.24.8-update-icon-cache.patch
index fc1e86e9..6fcbb5c0 100644
--- a/x11-libs/gtk+/files/gtk+-3.22.2-update-icon-cache.patch
+++ b/x11-libs/gtk+/files/gtk+-3.24.8-update-icon-cache.patch
@@ -1,4 +1,4 @@
-From 101b43f4a38904ee21070a3e2eb5ba03dfe17647 Mon Sep 17 00:00:00 2001
+From 87693de873b15194b122e98438b3bc1bf37f6d0b Mon Sep 17 00:00:00 2001
From: Gilles Dartiguelongue <eva@gentoo.org>
Date: Tue, 1 Nov 2016 15:24:22 +0100
Subject: [PATCH] Always use external gtk-update-icon-cache
@@ -10,14 +10,14 @@ used when building.
demos/gtk-demo/Makefile.am | 2 +-
demos/widget-factory/Makefile.am | 2 +-
docs/reference/gtk/Makefile.am | 1 -
- gtk/Makefile.am | 44 ----------------------------------------
+ gtk/Makefile.am | 44 --------------------------------
5 files changed, 4 insertions(+), 47 deletions(-)
diff --git a/configure.ac b/configure.ac
-index 4f9f183..ecf99dc 100644
+index f700616649..e3604fef05 100644
--- a/configure.ac
+++ b/configure.ac
-@@ -999,6 +999,8 @@ dnl Look for a host system's gdk-pixbuf-csource if we are cross-compiling
+@@ -1003,6 +1003,8 @@ dnl Look for a host system's gdk-pixbuf-csource if we are cross-compiling
AM_CONDITIONAL(CROSS_COMPILING, test $cross_compiling = yes)
@@ -27,7 +27,7 @@ index 4f9f183..ecf99dc 100644
# Windowing system checks
########################################
diff --git a/demos/gtk-demo/Makefile.am b/demos/gtk-demo/Makefile.am
-index 8c15e16..5d774d2 100644
+index c8529e5bf7..b2924fc081 100644
--- a/demos/gtk-demo/Makefile.am
+++ b/demos/gtk-demo/Makefile.am
@@ -171,7 +171,7 @@ dist_appsicon32_DATA = data/32x32/gtk3-demo.png data/32x32/gtk3-demo-symbolic.sy
@@ -40,7 +40,7 @@ index 8c15e16..5d774d2 100644
install-data-hook: install-update-icon-cache
uninstall-hook: uninstall-update-icon-cache
diff --git a/demos/widget-factory/Makefile.am b/demos/widget-factory/Makefile.am
-index a6bfbdc..28a3be2 100644
+index 62c156aa09..7aad079dcd 100644
--- a/demos/widget-factory/Makefile.am
+++ b/demos/widget-factory/Makefile.am
@@ -47,7 +47,7 @@ dist_appsicon32_DATA = data/32x32/gtk3-widget-factory.png data/32x32/gtk3-widget
@@ -53,10 +53,10 @@ index a6bfbdc..28a3be2 100644
install-data-hook: install-update-icon-cache
uninstall-hook: uninstall-update-icon-cache
diff --git a/docs/reference/gtk/Makefile.am b/docs/reference/gtk/Makefile.am
-index 5a88a12..b51f3ac 100644
+index abdea7fb59..0ee826c31e 100644
--- a/docs/reference/gtk/Makefile.am
+++ b/docs/reference/gtk/Makefile.am
-@@ -504,7 +504,6 @@ EXTRA_DIST += version.xml.in gtk3.types.in
+@@ -502,7 +502,6 @@ EXTRA_DIST += version.xml.in gtk3.types.in
man_MANS = \
gtk-query-immodules-3.0.1 \
@@ -65,10 +65,10 @@ index 5a88a12..b51f3ac 100644
gtk-launch.1 \
gtk3-demo.1 \
diff --git a/gtk/Makefile.am b/gtk/Makefile.am
-index 3b76b82..d4c5681 100644
+index e556e9d3af..4d7973f3b1 100644
--- a/gtk/Makefile.am
+++ b/gtk/Makefile.am
-@@ -1581,7 +1581,6 @@ endif
+@@ -1653,7 +1653,6 @@ endif
#
bin_PROGRAMS = \
gtk-query-immodules-3.0 \
@@ -76,7 +76,7 @@ index 3b76b82..d4c5681 100644
gtk-encode-symbolic-svg \
gtk-builder-tool \
gtk-query-settings \
-@@ -1594,9 +1593,6 @@ gtk_query_immodules_3_0_LDADD = \
+@@ -1666,9 +1665,6 @@ gtk_query_immodules_3_0_LDADD = \
$(GMODULE_LIBS) \
$(GTK_DEP_LIBS)
@@ -86,7 +86,7 @@ index 3b76b82..d4c5681 100644
gtk_encode_symbolic_svg_SOURCES = encodesymbolic.c
gtk_encode_symbolic_svg_LDADD = \
$(GDK_PIXBUF_LIBS) \
-@@ -1621,46 +1617,6 @@ gtk_launch_LDADD = \
+@@ -1693,46 +1689,6 @@ gtk_launch_LDADD = \
$(top_builddir)/gdk/libgdk-3.la \
$(GTK_DEP_LIBS)
@@ -121,7 +121,7 @@ index 3b76b82..d4c5681 100644
- echo '</assembly>' ) >$@
-
-$(GTK_UPDATE_ICON_CACHE_RC):
-- (echo 'CREATEPROCESS_MANIFEST_RESOURCE_ID RT_MANIFEST '$(GTK_UPDATE_ICON_CACHE_MANIFEST)) >$@
+- (echo -e '#include <winuser.h>\nCREATEPROCESS_MANIFEST_RESOURCE_ID RT_MANIFEST '$(GTK_UPDATE_ICON_CACHE_MANIFEST)) >$@
-
-$(GTK_UPDATE_ICON_CACHE_MANIFEST_OBJECT): $(GTK_UPDATE_ICON_CACHE_RC) $(GTK_UPDATE_ICON_CACHE_MANIFEST)
- $(WINDRES) --input $< --output $@ --output-format=coff
@@ -134,5 +134,5 @@ index 3b76b82..d4c5681 100644
files:
--
-2.10.1
+2.17.0
diff --git a/x11-libs/gtk+/gtk+-3.24.5-r314.ebuild b/x11-libs/gtk+/gtk+-3.24.20-r314.ebuild
index 3372fa89..9a806a2d 100644
--- a/x11-libs/gtk+/gtk+-3.24.5-r314.ebuild
+++ b/x11-libs/gtk+/gtk+-3.24.20-r314.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -9,7 +9,6 @@ inherit flag-o-matic gnome2 multilib virtualx multilib-minimal
DESCRIPTION="Gimp ToolKit +"
HOMEPAGE="https://www.gtk.org/"
-SRC_URI+=" https://dev.gentoo.org/~leio/distfiles/${P}-patchset-20190206.tar.xz"
LICENSE="LGPL-2+"
SLOT="3"
@@ -19,7 +18,7 @@ REQUIRED_USE="
xinerama? ( X )
"
-KEYWORDS="amd64"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 s390 sparc x86 ~amd64-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
@@ -30,7 +29,7 @@ RESTRICT="test"
COMMON_DEPEND="
>=dev-libs/atk-2.15[introspection?,${MULTILIB_USEDEP}]
>=dev-libs/fribidi-0.19.7[${MULTILIB_USEDEP}]
- >=dev-libs/glib-2.53.4:2[${MULTILIB_USEDEP}]
+ >=dev-libs/glib-2.57.2:2[${MULTILIB_USEDEP}]
media-libs/fontconfig[${MULTILIB_USEDEP}]
>=media-libs/libepoxy-1.4[X(+)?,${MULTILIB_USEDEP}]
>=x11-libs/cairo-1.14[aqua?,glib,svg,X?,${MULTILIB_USEDEP}]
@@ -43,16 +42,17 @@ COMMON_DEPEND="
>=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}] )
+ cups? ( >=net-print/cups-2.0[${MULTILIB_USEDEP}] )
introspection? ( >=dev-libs/gobject-introspection-1.39:= )
wayland? (
- >=dev-libs/wayland-1.9.91[${MULTILIB_USEDEP}]
- >=dev-libs/wayland-protocols-1.12
+ >=dev-libs/wayland-1.14.91[${MULTILIB_USEDEP}]
+ >=dev-libs/wayland-protocols-1.14
media-libs/mesa[wayland,${MULTILIB_USEDEP}]
>=x11-libs/libxkbcommon-0.2[${MULTILIB_USEDEP}]
)
X? (
>=app-accessibility/at-spi2-atk-2.5.3[${MULTILIB_USEDEP}]
+ media-libs/mesa[X(+),${MULTILIB_USEDEP}]
x11-libs/libX11[${MULTILIB_USEDEP}]
>=x11-libs/libXi-1.3[${MULTILIB_USEDEP}]
x11-libs/libXext[${MULTILIB_USEDEP}]
@@ -72,7 +72,8 @@ DEPEND="${COMMON_DEPEND}
>=dev-util/gdbus-codegen-2.48
dev-util/glib-utils
>=dev-util/gtk-doc-am-1.20
- gtk-doc? ( >=dev-util/gtk-doc-1.20 )
+ gtk-doc? ( >=dev-util/gtk-doc-1.20
+ app-text/docbook-xml-dtd:4.3 )
>=sys-devel/gettext-0.19.7[${MULTILIB_USEDEP}]
virtual/pkgconfig
X? ( x11-base/xorg-proto )
@@ -123,11 +124,8 @@ src_prepare() {
strip_builddir SRC_SUBDIRS examples Makefile.{am,in}
fi
- # gtk-3-24 branch at morning of 2019-02-07 - fribidi explicit linking, compiler warning fixes, small bugfixes
- eapply "${WORKDIR}"/patches
-
# gtk-update-icon-cache is installed by dev-util/gtk-update-icon-cache
- eapply "${FILESDIR}"/${PN}-3.22.2-update-icon-cache.patch
+ eapply "${FILESDIR}"/${PN}-3.24.8-update-icon-cache.patch
# Fix broken autotools logic
eapply "${FILESDIR}"/${PN}-3.22.20-libcloudproviders-automagic.patch
@@ -136,33 +134,46 @@ 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) \
- $(use_enable broadway broadway-backend) \
- $(use_enable cloudprint) \
- $(use_enable colord) \
- $(use_enable cups cups auto) \
- $(multilib_native_use_enable gtk-doc) \
- $(multilib_native_use_enable introspection) \
- $(use_enable wayland wayland-backend) \
- $(use_enable X x11-backend) \
- $(use_enable X xcomposite) \
- $(use_enable X xdamage) \
- $(use_enable X xfixes) \
- $(use_enable X xkb) \
- $(use_enable X xrandr) \
- $(use_enable xinerama) \
- --disable-cloudproviders \
- --disable-mir-backend \
- --disable-papi \
- --enable-man \
- --with-xml-catalog="${EPREFIX}"/etc/xml/catalog \
- --libdir="${EPREFIX}"/usr/$(get_libdir) \
+ local myconf=(
+ $(use_enable aqua quartz-backend)
+ $(use_enable broadway broadway-backend)
+ $(use_enable cloudprint)
+ $(use_enable colord)
+ $(use_enable cups cups auto)
+ $(multilib_native_use_enable gtk-doc)
+ $(multilib_native_use_enable introspection)
+ $(use_enable wayland wayland-backend)
+ $(use_enable X x11-backend)
+ $(use_enable X xcomposite)
+ $(use_enable X xdamage)
+ $(use_enable X xfixes)
+ $(use_enable X xkb)
+ $(use_enable X xrandr)
+ $(use_enable xinerama)
+ # cloudprovider is not packaged in Gentoo yet
+ --disable-cloudproviders
+ --disable-papi
+ # sysprof integration needs >=sysprof-3.33.2
+ --disable-profiler
+ --enable-man
+ --with-xml-catalog="${EPREFIX}"/etc/xml/catalog
+ # need libdir here to avoid a double slash in a path that libtool doesn't
+ # grok so well during install (// between $EPREFIX and usr ...)
+ # TODO: Is this still the case?
+ --libdir="${EPREFIX}"/usr/$(get_libdir)
CUPS_CONFIG="${EPREFIX}/usr/bin/${CHOST}-cups-config"
+ )
+
+ if use wayland; then
+ myconf+=(
+ # Include wayland immodule into gtk itself, to avoid problems like
+ # https://gitlab.gnome.org/GNOME/gnome-shell/issues/109 from a
+ # user overridden GTK_IM_MODULE envvar
+ --with-included-immodules=wayland
+ )
+ fi;
+
+ ECONF_SOURCE=${S} gnome2_src_configure "${myconf[@]}"
# work-around gtk-doc out-of-source brokedness
if multilib_is_native_abi; then
@@ -185,8 +196,8 @@ multilib_src_install() {
multilib_src_install_all() {
insinto /etc/gtk-3.0
doins "${FILESDIR}"/settings.ini
- # Skip README.{in,commits,win32} and useless ChangeLog that would get installed by default
- DOCS=( AUTHORS NEWS README )
+ # Skip README.{in,commits,win32} that would get installed by default
+ DOCS=( AUTHORS ChangeLog NEWS README )
einstalldocs
}