Fix building with glib-2.32 (bug #410455, thanks to Tom-Steve Watzke). Drop stale patches.

Package-Manager: portage-2.2.0_alpha95/cvs/Linux x86_64

7 files changed, 53 insertions, 94 deletions

diff --git a/x11-themes/gtk-engines/ChangeLog b/x11-themes/gtk-engines/ChangeLog
index a42372c42f94..8168e0000d7b 100644
--- a/x11-themes/gtk-engines/ChangeLog
+++ b/x11-themes/gtk-engines/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for x11-themes/gtk-engines
-# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-themes/gtk-engines/ChangeLog,v 1.183 2011/03/27 13:03:17 nirbheek Exp $
+# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/x11-themes/gtk-engines/ChangeLog,v 1.184 2012/04/02 04:33:35 tetromino Exp $
+
+  02 Apr 2012; Alexandre Rostovtsev <tetromino@gentoo.org>
+  -files/gtk-engines-2.18.3-fix-system-lua-check.patch,
+  -files/gtk-engines-2.20.1-evolution-workaround.patch,
+  -files/gtk-engines-2.20.1-xfce-workaround.patch, gtk-engines-2.20.2.ebuild,
+  +files/gtk-engines-2.20.2-glib.h.patch:
+  Fix building with glib-2.32 (bug #410455, thanks to Tom-Steve Watzke). Drop
+  stale patches.
 
   27 Mar 2011; Nirbheek Chauhan <nirbheek@gentoo.org>
   -gtk-engines-2.18.5.ebuild, -gtk-engines-2.20.1-r1.ebuild,
diff --git a/x11-themes/gtk-engines/Manifest b/x11-themes/gtk-engines/Manifest
index 906f8fe13cb4..a99e89834b88 100644
--- a/x11-themes/gtk-engines/Manifest
+++ b/x11-themes/gtk-engines/Manifest
@@ -1,27 +1,15 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
+Hash: SHA256
 
-AUX gtk-engines-2.18.3-fix-system-lua-check.patch 862 RMD160 c14e110e1c2f604e6b42d8034d78c6d29ca39428 SHA1 3c5d009bfe73237927bb0dbe78f3a815c485b1a3 SHA256 5d1ab916b9146859cbdde2af627d63c69faad41438fd747e14ca2476fd3ee9bb
-AUX gtk-engines-2.20.1-evolution-workaround.patch 1028 RMD160 0fee809fec9d95bfd1b1796559bbe01cd35fb930 SHA1 3e240d99c8de754768ae996103c43360c792d0c8 SHA256 22e11c338b4db573fe87a6c11c9bffd204780f27af81f39dbaf1c78080e61d40
-AUX gtk-engines-2.20.1-xfce-workaround.patch 1047 RMD160 a3889363c8884b27de5eb6d14383c77fd8a76f35 SHA1 b2de5c652bbf47f71e5b6dfaa873c55704bde054 SHA256 61cd87901804d9be6bc95694dfe4707c64f50954dca9b5a0ff75d380a875d1fb
+AUX gtk-engines-2.20.2-glib.h.patch 729 RMD160 957335892fce9f5d4ddfff25bb034aee7a5a2297 SHA1 048ee7b3ca88e3dec3e5458ae66a81ea84bdb29b SHA256 11334d320b5a857895e221c7aefb9bd01fc721b8700bfeecacb0abf6fcbf6aec
 DIST gtk-engines-2.20.2.tar.bz2 688171 RMD160 941b71cd2346a349d89f68962c2ce28e3520297c SHA1 574c7577d70eaacecd2ffa14e288ef88fdcb6c2a SHA256 15b680abca6c773ecb85253521fa100dd3b8549befeecc7595b10209d62d66b5
-EBUILD gtk-engines-2.20.2.ebuild 975 RMD160 39b45cfb0b562694093c9cffb3a1b438eeebd1c7 SHA1 3969d33745fe54f17dbb04a73db8c83686c2905a SHA256 9c1af15ea8096873f1ad33b6282f9f97ba0410501f248bd58608a799c073356b
-MISC ChangeLog 24160 RMD160 1b299bcc8c4cb9210d83bc5e9647ea77fa01b0c2 SHA1 5623e5e6cbebcb1847d7cb375be9ab9718b5b583 SHA256 aaf234ce6dc8d9f3d8e6cdc84ac2bbc645c7e7f54f5f3b2c0cd22335e0aba6ed
+EBUILD gtk-engines-2.20.2.ebuild 1128 RMD160 eea46b7e4218034ab70c739011ccc343140f850e SHA1 85cd07acc8376b5415c991766e511ef93a85933a SHA256 5f2cbaadac8bea7b09b86a7c089173e3f35ba8554b11ec36b38e2c356395c3e9
+MISC ChangeLog 24548 RMD160 f7ba165f67062e4382dcfd723fe084661a3367f5 SHA1 d1c81466ea4778f6938c322d3c5ee07809de696e SHA256 35fb8edd995040a15c244ea0474d404dda8a58f141c595c717c76892894cb869
 MISC metadata.xml 568 RMD160 55afc3bd5e963a38ca159fe1855fb86c1d205ed1 SHA1 fefe96510715292236a409394ac78e1b092043bc SHA256 cfae48dc83100358d4370ba22eaa6284c74288b749e2f34525358e3627fa8a89
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
+Version: GnuPG v2.0.18 (GNU/Linux)
 
-iQIcBAEBAgAGBQJNjzWcAAoJEO/kOhxWD91kEWUP/R0DJp/B0m6NFNqlwb0L75Tr
-8VMaHukEIDBZeonfDtC4tCsoLYYU4vgXWHVuVME0TI3+dtByjhJwnvB3IfHPoVrZ
-TVl+RveXBcv4chpxuRkQG/HUfRgjDF8SrYRQXDiVGDqM05ehkEXK5qCcMaE5aFnL
-S54vm/RorsHKqr0tThfdORRVIefVDiMAFtugPHKc3bE6Xp/43QQMMOl+ERCF9gnY
-WiEMSao0o+xnY0cNnm7QQNN+ViJxum6DI2fCaXldBECdVFiYIxEFoxI5Ih++wEgG
-JsXeMz9tBHlaWjvrTzeuB39U6qHKo5pEvchnflbzcnIai80rKHp4Y+rIRvheE1kp
-MF9KiSINd6qlmByC5IYrarv/plhbN5ufzbsOX9YWHnH6T1qhybpKaV+N8Sior2VU
-nHA3BvZbHN2esrNIKi9Neu240EHtj2/WG+tkHBTT1dgg8HyjUw9jvTIp52yLiscy
-VcmDSjWFVzqS7Tb0dZdsN6PpsbzZKpKrlo3CMfJQP5Bva1ThNSHLjodAYJLG/jog
-EQdji1h2TtZ1JbhCzXbdnJD/TVzPrSFMzcw2eB8b49OBTW8Mp2ORSaiwhb/Q44bx
-SNeL64Dhu1x4OAs+8LUkfnVIvDSl4G5fWcMTmaoWPjspmUFHEOo5GRYyUfPtrE6p
-BiUkcP9Tovb3XeV0zPP+
-=1JFU
+iF4EAREIAAYFAk95LCQACgkQdjK8w9WeBnCq2wD+NfI60zBuhakl+mQiSetDIvI+
+Fb+t+n8SqsiqF+pHR/EBAKgq4UD/ZOQRD8jfk6U7RXUNamG4EJKDz5hKRAG/QUZy
+=vQ4U
 -----END PGP SIGNATURE-----
diff --git a/x11-themes/gtk-engines/files/gtk-engines-2.18.3-fix-system-lua-check.patch b/x11-themes/gtk-engines/files/gtk-engines-2.18.3-fix-system-lua-check.patch
deleted file mode 100644
index b6413f7ee249..000000000000
--- a/x11-themes/gtk-engines/files/gtk-engines-2.18.3-fix-system-lua-check.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-From 5a5eb6dd706179da9294e939ede807170b99c1a5 Mon Sep 17 00:00:00 2001
-From: Benjamin Berg <benjamin@sipsolutions.net>
-Date: Tue, 22 Sep 2009 09:43:28 +0000
-Subject: Correct the SYSTEM_LUA conditional check. (patch from bug #594014)
-
----
-diff --git a/configure.ac b/configure.ac
-index 06f388c..9061044 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -47,7 +47,7 @@ AC_ARG_ENABLE(deprecated,	[  --disable-deprecated    disable deprecated function
- AC_ARG_ENABLE(schemas,		[  --disable-schema        disable engine schemas],	[schemas=$enableval],	[schemas="yes"])
- AC_ARG_WITH(system-lua,	[  --with-system-lua        link with system Lua library], 		[system_lua=$withval], 	[system_lua="no"])
- 
--AM_CONDITIONAL([SYSTEM_LUA], [test x$system_lua = xtrue])
-+AM_CONDITIONAL([SYSTEM_LUA], [test x$system_lua = xyes])
- 
- BUILD_ENGINES=""
- BUILD_THEMES=""
---
-cgit v0.8.2
diff --git a/x11-themes/gtk-engines/files/gtk-engines-2.20.1-evolution-workaround.patch b/x11-themes/gtk-engines/files/gtk-engines-2.20.1-evolution-workaround.patch
deleted file mode 100644
index 160f703be0ad..000000000000
--- a/x11-themes/gtk-engines/files/gtk-engines-2.20.1-evolution-workaround.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-From bc8e41851f670186c09a71e6525c4aea9766b1b6 Mon Sep 17 00:00:00 2001
-From: Benjamin Berg <benjamin@sipsolutions.net>
-Date: Sat, 22 May 2010 10:26:51 +0000
-Subject: Fix evolution table header workaround for new evo versions.
-
----
-diff --git a/themes/Clearlooks/gtk-2.0/gtkrc b/themes/Clearlooks/gtk-2.0/gtkrc
-index 3f193ea..6df11b2 100644
---- a/themes/Clearlooks/gtk-2.0/gtkrc
-+++ b/themes/Clearlooks/gtk-2.0/gtkrc
-@@ -400,9 +400,9 @@ widget "gtk-tooltip*" style "tooltips"
- ##########################################################################
- 
- # Workaround for the evolution ETable (bug #527532)
--widget_class "*.ETable.ECanvas" style "treeview_header"
-+widget_class "*.<ETable>.<ECanvas>" style "treeview_header"
- # Workaround for the evolution ETree
--widget_class "*.ETree.ECanvas" style "treeview_header"
-+widget_class "*.<ETree>.<ECanvas>" style "treeview_header"
- 
- # Special case the nautilus-extra-view-widget
- # ToDo: A more generic approach for all applications that have a widget like this.
---
-cgit v0.8.3.1
diff --git a/x11-themes/gtk-engines/files/gtk-engines-2.20.1-xfce-workaround.patch b/x11-themes/gtk-engines/files/gtk-engines-2.20.1-xfce-workaround.patch
deleted file mode 100644
index 1a8ba1ce7d5c..000000000000
--- a/x11-themes/gtk-engines/files/gtk-engines-2.20.1-xfce-workaround.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-From ee5d780dc2e424bce8a75b21eb6f1b74ea177247 Mon Sep 17 00:00:00 2001
-From: Benjamin Berg <benjamin@sipsolutions.net>
-Date: Thu, 29 Apr 2010 15:07:31 +0000
-Subject: Remove Xfce workaround. (bug #616124)
-
----
-diff --git a/engines/clearlooks/src/clearlooks_style.c b/engines/clearlooks/src/clearlooks_style.c
-index 97ff857..647e447 100644
---- a/engines/clearlooks/src/clearlooks_style.c
-+++ b/engines/clearlooks/src/clearlooks_style.c
-@@ -250,9 +250,8 @@ clearlooks_style_draw_shadow (DRAW_ARGS)
- 		clearlooks_set_widget_parameters (widget, style, state_type, &params);
- 		params.corners = CR_CORNER_NONE;
- 
--		if (widget && !g_str_equal ("XfcePanelWindow", gtk_widget_get_name (gtk_widget_get_toplevel (widget))))
--			STYLE_FUNCTION(draw_frame) (cr, colors, &params, &frame,
--			                            x, y, width, height);
-+		STYLE_FUNCTION(draw_frame) (cr, colors, &params, &frame,
-+		                            x, y, width, height);
- 	}
- 	else if (DETAIL ("scrolled_window") || DETAIL ("viewport") || detail == NULL)
- 	{
---
-cgit v0.8.3.1
diff --git a/x11-themes/gtk-engines/files/gtk-engines-2.20.2-glib.h.patch b/x11-themes/gtk-engines/files/gtk-engines-2.20.2-glib.h.patch
new file mode 100644
index 000000000000..35e5007e2c4a
--- /dev/null
+++ b/x11-themes/gtk-engines/files/gtk-engines-2.20.2-glib.h.patch
@@ -0,0 +1,26 @@
+From 8d49a386f467cbf8e0842d2218126f643e50f834 Mon Sep 17 00:00:00 2001
+From: Dominique Leuenberger <dimstar@opensuse.org>
+Date: Sun, 27 Nov 2011 15:24:57 +0100
+Subject: [PATCH] Fix build with glib 2.31: Only glib.h can be #include'd.
+ Fixes bug #664914
+
+---
+ engines/clearlooks/src/animation.c |    2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+diff --git a/engines/clearlooks/src/animation.c b/engines/clearlooks/src/animation.c
+index 1f7a41f..56a9286 100644
+--- a/engines/clearlooks/src/animation.c
++++ b/engines/clearlooks/src/animation.c
+@@ -28,7 +28,7 @@
+ #include "animation.h"
+ 
+ #ifdef HAVE_WORKING_ANIMATION
+-#include <glib/gtimer.h>
++#include <glib.h>
+ 
+ struct _AnimationInfo {
+ 	GTimer *timer;
+-- 
+1.7.8.5
+
diff --git a/x11-themes/gtk-engines/gtk-engines-2.20.2.ebuild b/x11-themes/gtk-engines/gtk-engines-2.20.2.ebuild
index 570642c3bdbc..70cd7ab2874a 100644
--- a/x11-themes/gtk-engines/gtk-engines-2.20.2.ebuild
+++ b/x11-themes/gtk-engines/gtk-engines-2.20.2.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-themes/gtk-engines/gtk-engines-2.20.2.ebuild,v 1.9 2011/03/27 13:03:17 nirbheek Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-themes/gtk-engines/gtk-engines-2.20.2.ebuild,v 1.10 2012/04/02 04:33:35 tetromino Exp $
 
 EAPI="3"
 GCONF_DEBUG="no"
 
-inherit gnome2
+inherit eutils gnome2
 
 DESCRIPTION="GTK+2 standard engines and themes"
 HOMEPAGE="http://www.gtk.org/"
@@ -28,6 +28,12 @@ pkg_setup() {
 	use accessibility || G2CONF="${G2CONF} --disable-hc"
 }
 
+src_prepare() {
+	# Patch from 2.21.x, fixes building with glib-2.32, bug #410455
+	epatch "${FILESDIR}/${P}-glib.h.patch"
+	gnome2_src_prepare
+}
+
 src_install() {
 	gnome2_src_install
 	find "${ED}" -name "*.la" -delete || die