diff options
| author |   Martin Väth <mvath@google.com> | 2019-01-20 09:43:59 +0100 |
|---|---|---|
| committer | Martin Väth <mvath@google.com> | 2019-01-20 09:43:59 +0100 |
| commit | adda89c8be9b0fb82572dfb18e638d87bc3af2da (patch) | |
| tree | 154176246fd9c1918bd145da0e227ffbf073fe9a /x11-libs | |
| parent | app-portage/portage-postsyncd-mv: Version bump (diff) | |
| download | mv-adda89c8be9b0fb82572dfb18e638d87bc3af2da.tar.gz mv-adda89c8be9b0fb82572dfb18e638d87bc3af2da.tar.bz2 mv-adda89c8be9b0fb82572dfb18e638d87bc3af2da.zip | |
x11-libs/gtk+: adapt recent changes from the gentoo repository
Signed-off-by: Martin Väth <mvath@google.com>
Diffstat (limited to 'x11-libs')
| -rw-r--r-- | x11-libs/gtk+/Manifest | 1 | ||||
| -rw-r--r-- | x11-libs/gtk+/gtk+-3.24.3-r1.ebuild (renamed from x11-libs/gtk+/gtk+-3.24.3.ebuild) | 18 |
2 files changed, 13 insertions, 6 deletions
diff --git a/x11-libs/gtk+/Manifest b/x11-libs/gtk+/Manifest index 1bd06955..9cf239f4 100644 --- a/x11-libs/gtk+/Manifest +++ b/x11-libs/gtk+/Manifest @@ -1,3 +1,4 @@ DIST gtk+-2.24.32-patchset.tar.xz 6392 SHA512 6c8763826b479c9c122bb991ae42b0ce0e754d460be5c6ea8d1bba28f7318c014822eccaae0b39c3b7c16804991c8c46c53cd8ded3ad6212830a2f5746567543 DIST gtk+-2.24.32.tar.xz 12620860 SHA512 8e8fd9ae32f1d6fb544da260f00599f0f05090d910d767b06ef086ab4f1f8373a29bb0da9767761c9b5f4cfd51b5c45d0fa5d39b0428c839ddf0a579df806696 +DIST gtk+-3.24.3-patchset-20190119.tar.xz 18032 SHA512 9fbd73936931e2e529146d74711a5243a5e67e49de2d63d9f4a64c1f0825cbdd50ae2683869e4616f5fd8a4267ac5bf68d3cd21a06589a9d3f14ce82e3573521 DIST gtk+-3.24.3.tar.xz 21099144 SHA512 72a69d71f2e16a1dd169cc74d568da47131bd5d77994bcdd3b427ec1cd37c5daf0841a6e4824b125d860bc1c4f07c9835a3b2e74d951666253d3e4edbed0e5fc diff --git a/x11-libs/gtk+/gtk+-3.24.3.ebuild b/x11-libs/gtk+/gtk+-3.24.3-r1.ebuild index 1fe0836e..5c6be8e2 100644 --- a/x11-libs/gtk+/gtk+-3.24.3.ebuild +++ b/x11-libs/gtk+/gtk+-3.24.3-r1.ebuild @@ -1,24 +1,25 @@ -# Copyright 1999-2018 Gentoo Authors and Martin V\"ath +# Copyright 1999-2019 Gentoo Authors and Martin V\"ath # Distributed under the terms of the GNU General Public License v2 EAPI=6 GNOME2_LA_PUNT="yes" +GNOME2_EAUTORECONF="yes" -inherit autotools flag-o-matic gnome2 multilib virtualx multilib-minimal +inherit flag-o-matic gnome2 multilib virtualx multilib-minimal DESCRIPTION="Gimp ToolKit +" HOMEPAGE="https://www.gtk.org/" -SRC_URI=${SRC_URI} +SRC_URI=${SRC_URI}" https://dev.gentoo.org/~leio/distfiles/${P}-patchset-20190119.tar.xz" LICENSE="LGPL-2+" SLOT="3" -IUSE="adwaita-icon-theme aqua atk-bridge broadway cloudprint colord cups examples +introspection test vim-syntax wayland +X xinerama" +IUSE="adwaita-icon-theme aqua atk-bridge broadway cloudprint colord cups examples gtk-doc +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" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~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 @@ -28,7 +29,7 @@ RESTRICT="test" # bug #???? COMMON_DEPEND=" >=dev-libs/atk-2.15[introspection?,${MULTILIB_USEDEP}] - >=dev-libs/glib-2.49.4:2[${MULTILIB_USEDEP}] + >=dev-libs/glib-2.53.4: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}] @@ -70,6 +71,7 @@ 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 ) >=sys-devel/gettext-0.19.7[${MULTILIB_USEDEP}] virtual/pkgconfig[${MULTILIB_USEDEP}] X? ( x11-base/xorg-proto ) @@ -121,6 +123,9 @@ src_prepare() { strip_builddir SRC_SUBDIRS examples Makefile.{am,in} fi + # Patches from gtk-3-24 branch up to b984074e2924b7e759, mainly fixing GtkSwitch glyphs when IEC power symbol unicode-9 glyphs are missing from all installed fonts + 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 @@ -149,6 +154,7 @@ multilib_src_configure() { $(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) \ |