summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMartin Väth <mvath@google.com>2019-02-10 05:56:34 +0100
committerMartin Väth <mvath@google.com>2019-02-10 05:56:34 +0100
commit8d961324b7c1e307d1c1afeb2069a60f605e86fc (patch)
tree85b1b4c7cb36f891279bb3ecbc16a417758186c0
parentRe-add meson.eclass since the gentoo repository breaks it again (diff)
downloadmv-8d961324b7c1e307d1c1afeb2069a60f605e86fc.tar.gz
mv-8d961324b7c1e307d1c1afeb2069a60f605e86fc.tar.bz2
mv-8d961324b7c1e307d1c1afeb2069a60f605e86fc.zip
x11-libs/gtk+: Version bump
Signed-off-by: Martin Väth <mvath@google.com>
-rw-r--r--metadata/pkg_desc_index2
-rw-r--r--x11-libs/gtk+/Manifest3
-rw-r--r--x11-libs/gtk+/gtk+-3.24.5.ebuild (renamed from x11-libs/gtk+/gtk+-3.24.4.ebuild)6
3 files changed, 8 insertions, 3 deletions
diff --git a/metadata/pkg_desc_index b/metadata/pkg_desc_index
index 789fdbd1..c1bbcede 100644
--- a/metadata/pkg_desc_index
+++ b/metadata/pkg_desc_index
@@ -130,5 +130,5 @@ www-plugins/noscript 10.2.1: Firefox webextension: restrict active contents like
www-plugins/skip-redirect 2.2.1: Firefox webextension: skip intermediary pages before redirecting
www-plugins/translate-to-me 1.1: Firefox webextension: translate the selected text with www.linguee.com
www-plugins/ublock-origin 1.17.2: Firefox webextension: An efficient list-based blocker
-x11-libs/gtk+ 2.24.32-r1 3.24.4: Gimp ToolKit +
+x11-libs/gtk+ 2.24.32-r1 3.24.5: Gimp ToolKit +
x11-libs/motif 2.3.8-r1: The Motif user interface component toolkit
diff --git a/x11-libs/gtk+/Manifest b/x11-libs/gtk+/Manifest
index 113ce53f..baeeb2fe 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.4.tar.xz 21102236 SHA512 d1cce6d0d7f1c5ef0f4e8988b88372a32b9d8a2924da4cfc46a80ede91cf8a2aacdcd87eec122dfab1369b36fc849d875832ac11d79426cf6884e1730e5d4dd1
+DIST gtk+-3.24.5-patchset-20190206.tar.xz 4208 SHA512 e3748ab10032d1c388b50ac35e295d08f7373c70186d35ee52f8a31ea53cddbac61eb25e5c6aac9855a4cb02c25ed0d2361241fe2530b6ce6738fb5e4840817e
+DIST gtk+-3.24.5.tar.xz 21012108 SHA512 344988c9e2a2d7fd2fd1e367a113be7c4a32c28c9cf395aeab923e25256b99856091d1583d3f8557aac6919a930a4d0af69b966486caab559c7d9d22585cc1a1
diff --git a/x11-libs/gtk+/gtk+-3.24.4.ebuild b/x11-libs/gtk+/gtk+-3.24.5.ebuild
index baf6f45b..a42dac57 100644
--- a/x11-libs/gtk+/gtk+-3.24.4.ebuild
+++ b/x11-libs/gtk+/gtk+-3.24.5.ebuild
@@ -9,7 +9,7 @@ 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-20190206.tar.xz"
LICENSE="LGPL-2+"
SLOT="3"
@@ -29,6 +29,7 @@ RESTRICT="test"
# bug #????
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}]
media-libs/fontconfig[${MULTILIB_USEDEP}]
>=media-libs/libepoxy-1.4[X(+)?,${MULTILIB_USEDEP}]
@@ -123,6 +124,9 @@ 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