From d157fffb2e86f85701f37ea5d5620db32cc0a25e Mon Sep 17 00:00:00 2001 From: Alexandre Rostovtsev Date: Mon, 2 Apr 2012 04:33:35 +0000 Subject: Fix building with glib-2.32 (bug #410455, thanks to Tom-Steve Watzke). Drop stale patches. (Portage version: 2.2.0_alpha95/cvs/Linux x86_64) --- x11-themes/gtk-engines/ChangeLog | 12 ++++++++-- .../gtk-engines-2.18.3-fix-system-lua-check.patch | 21 ----------------- .../gtk-engines-2.20.1-evolution-workaround.patch | 24 -------------------- .../files/gtk-engines-2.20.1-xfce-workaround.patch | 24 -------------------- .../files/gtk-engines-2.20.2-glib.h.patch | 26 ++++++++++++++++++++++ x11-themes/gtk-engines/gtk-engines-2.20.2.ebuild | 12 +++++++--- 6 files changed, 45 insertions(+), 74 deletions(-) delete mode 100644 x11-themes/gtk-engines/files/gtk-engines-2.18.3-fix-system-lua-check.patch delete mode 100644 x11-themes/gtk-engines/files/gtk-engines-2.20.1-evolution-workaround.patch delete mode 100644 x11-themes/gtk-engines/files/gtk-engines-2.20.1-xfce-workaround.patch create mode 100644 x11-themes/gtk-engines/files/gtk-engines-2.20.2-glib.h.patch (limited to 'x11-themes') 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 + -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 -gtk-engines-2.18.5.ebuild, -gtk-engines-2.20.1-r1.ebuild, 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 -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 -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 "*.." style "treeview_header" - # Workaround for the evolution ETree --widget_class "*.ETree.ECanvas" style "treeview_header" -+widget_class "*.." 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 -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, ¶ms); - 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, ¶ms, &frame, -- x, y, width, height); -+ STYLE_FUNCTION(draw_frame) (cr, colors, ¶ms, &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 +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 ++#include + + 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 -- cgit v1.2.3-65-gdbad