summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMart Raudsepp <leio@gentoo.org>2015-03-11 16:07:38 +0200
committerMart Raudsepp <leio@gentoo.org>2015-03-11 16:13:24 +0200
commitf18afc2079fbffe66486e99f2d3f963fc89c57c0 (patch)
tree21c44562ace7a978b8518d81b462e38fdd38b4b8
parentraspberrypi-userland: Claim a mesa version for wayland-egl package (diff)
downloadleio-f18afc2079fbffe66486e99f2d3f963fc89c57c0.tar.gz
leio-f18afc2079fbffe66486e99f2d3f963fc89c57c0.tar.bz2
leio-f18afc2079fbffe66486e99f2d3f963fc89c57c0.zip
gtk+:2 - bump and sync with main tree
-rw-r--r--x11-libs/gtk+/Manifest2
-rw-r--r--x11-libs/gtk+/gtk+-2.24.27.ebuild (renamed from x11-libs/gtk+/gtk+-2.24.26.ebuild)9
2 files changed, 1 insertions, 10 deletions
diff --git a/x11-libs/gtk+/Manifest b/x11-libs/gtk+/Manifest
index 88b83d1..adc3d3b 100644
--- a/x11-libs/gtk+/Manifest
+++ b/x11-libs/gtk+/Manifest
@@ -1,2 +1,2 @@
-DIST gtk+-2.24.26.tar.xz 13328708 SHA256 d84fc0f1e3cd99e8b9ec756e754f42653940638579a8f28d0eabffc37018d133 SHA512 2a3a366c41214fcacbc2a69719d5b20060e0efbb0576a1fc4f4123f97ea1f5ff1b06296302806655b32c06901629f5d23b91d65de9a01143053f63607d94498d WHIRLPOOL b0cf44be24dd1999f2f4aeb6ed779e536cb00c7d1b42cb1a4c8fc9a807093a1b8f26f4f750bb52533ca6a18e6a9ce481f7d879e0c186d7d11add6c793090c244
+DIST gtk+-2.24.27.tar.xz 13349252 SHA256 20cb10cae43999732a9af2e9aac4d1adebf2a9c2e1ba147050976abca5cd24f4 SHA512 ffe981a41137302713a411039238604e92d41146e25ea0643857ec40388ddfe69cbb15bdc1aa8300b87ddbb4d6fbcf0054cdb7ba39634fbe4bfd1802f5bc8ac6 WHIRLPOOL 02259afb7a410fe941b9cc20e8031d61d5dd90f2ac532e3b8525b203997cfa57999286cd59e76ef152a68de35f08e8712dc4b9cd107633f2ba2433eba633197c
DIST gtk+-3.14.9.tar.xz 15716588 SHA256 3be9560e6e99388d7706a168e3353ecd63fc30ec4f7f8bea23889e71ab7b6c64 SHA512 3b64142d65ec4b4e0ed709c2fac629d80b95dac03481a3d6f8e3cc6c351ac779fe172a1edee552df7b3c40287f10c97fa0e99212e5f0e6b4751e3d8efd0896e5 WHIRLPOOL bc45b3722913ebb90bff944ec724909d01e3e976d49f8bd273500de2af9de7dcedc85e24fca36226816993a10cb87f4477f4498cc67946449855b37a0790a2fa
diff --git a/x11-libs/gtk+/gtk+-2.24.26.ebuild b/x11-libs/gtk+/gtk+-2.24.27.ebuild
index 2f231e1..3fd16d8 100644
--- a/x11-libs/gtk+/gtk+-2.24.26.ebuild
+++ b/x11-libs/gtk+/gtk+-2.24.27.ebuild
@@ -103,10 +103,6 @@ set_gtk2_confdir() {
}
src_prepare() {
- # Fix building due to moved definition, upstream bug #704766
- # Upstream says it was fixed with a different commit
-# epatch "${FILESDIR}"/${PN}-2.24.20-darwin-quartz-pasteboard.patch
-
# Fix tests running when building out of sources, bug #510596, upstream bug #730319
epatch "${FILESDIR}"/${PN}-2.24.24-out-of-source.patch
@@ -141,11 +137,6 @@ src_prepare() {
sed 's:\({ "GtkFileChooserButton".*},\):/*\1*/:g' -i gtk/tests/object.c \
|| die "failed to disable recentmanager test (3)"
- # Skip tests known to fail
- # https://bugzilla.gnome.org/show_bug.cgi?id=646609
-# sed -e '/g_test_add_func.*test_text_access/s:^://:' \
-# -i "${S}/gtk/tests/testing.c" || die
-
# https://bugzilla.gnome.org/show_bug.cgi?id=617473
sed -i -e 's:pltcheck.sh:$(NULL):g' \
gtk/Makefile.am || die