Fix glib >= 2.23 compability wrt #308569, thanks to Michal Kurgan and David Heavens.

Package-Manager: portage-2.2_rc67/cvs/Linux x86_64

4 files changed, 74 insertions, 2 deletions

diff --git a/xfce-base/xfce4-panel/ChangeLog b/xfce-base/xfce4-panel/ChangeLog
index 6d80cfdd5f4f..d5f31562820d 100644
--- a/xfce-base/xfce4-panel/ChangeLog
+++ b/xfce-base/xfce4-panel/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for xfce-base/xfce4-panel
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/xfce-base/xfce4-panel/ChangeLog,v 1.153 2010/03/11 21:10:21 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/xfce-base/xfce4-panel/ChangeLog,v 1.154 2010/03/20 11:33:35 ssuominen Exp $
+
+*xfce4-panel-4.6.2-r1 (20 Mar 2010)
+
+  20 Mar 2010; Samuli Suominen <ssuominen@gentoo.org>
+  +xfce4-panel-4.6.2-r1.ebuild, +files/xfce4-panel-4.6.2-glib-2.23.patch:
+  Fix glib >= 2.23 compability wrt #308569, thanks to Michal Kurgan and
+  David Heavens.
 
   11 Mar 2010; Brent Baude <ranger@gentoo.org> xfce4-panel-4.6.2.ebuild:
   Marking xfce4-panel-4.6.2 ppc64 stable for bug 305657
diff --git a/xfce-base/xfce4-panel/Manifest b/xfce-base/xfce4-panel/Manifest
index 4abac853bd28..36fe5d79af65 100644
--- a/xfce-base/xfce4-panel/Manifest
+++ b/xfce-base/xfce4-panel/Manifest
@@ -1,7 +1,9 @@
 AUX xfce4-panel-4.6.2-exo.patch 649 RMD160 fd7308cb4f400898a70790f40220d965fe49cee8 SHA1 95bbac9b45b0a40a15d7d87ca563808bf4799d56 SHA256 23d6868c9beaf6ad57dd9d33d9c3778559877cfc7578355005b9a555d8a90e25
+AUX xfce4-panel-4.6.2-glib-2.23.patch 1061 RMD160 c370de827923fdb5d522a46c7a6275a973374207 SHA1 ab7f4124e2c2ec40ad0c38edb544c02c05ed9873 SHA256 00d19efee9b5277001b63c48a65035ec0b36347ef0740dd46e109c6859cd82e9
 DIST xfce4-panel-4.6.1.tar.bz2 868225 RMD160 47ce1703306e7427d300bb3675e2e8dcd13c459e SHA1 613c66f6402feba7983a7effb008f091182350d2 SHA256 b308ddc96fcb27b3f18ed2fa20aeb3a12fb73cec7676d75914a58d1b27124b83
 DIST xfce4-panel-4.6.2.tar.bz2 876456 RMD160 5d981eaffc5aab227a3db66f8d39d0492d02a16d SHA1 32a5e5b9e8b93c2167077b329cf4d2fcb4323c9e SHA256 1d8ab1354c73935a5d12f0d7d226d26ae1b90fdd235460bdb57fd5651229bc8b
 EBUILD xfce4-panel-4.6.1.ebuild 1052 RMD160 86294c5a7559056fc1bed3651cd59ed30c8b8d8d SHA1 230104c4609ef1ebe51e2681fd3f523304970950 SHA256 5c8e7f6eac57d8249476dc9a38ed1964ac9d7d0acad3dba3f8d5369911763aeb
+EBUILD xfce4-panel-4.6.2-r1.ebuild 1216 RMD160 88258feba83295b05b4e8da91814ffeb5c26f769 SHA1 0d8c8a3d900890010105faef06c1c6f1852d328c SHA256 28fd584f40376b5e94e09a307bd0934304cd77d67c20a27e3d566c700a25216e
 EBUILD xfce4-panel-4.6.2.ebuild 1164 RMD160 bbb1c2cc5abbe8cf1fc3166dc05d018969fbdb6d SHA1 d247bc6a8d7226ba948548c0e44e622a3c77e40b SHA256 8c0e61e2d1db74391559ce966f3dcbf9d12d53cea067470fbbd2c1bd242138f5
-MISC ChangeLog 19151 RMD160 0d252405511abd205e1204e22a633bf5c0770b28 SHA1 3f1fa14ba8220297e86f456f4217998ed4194069 SHA256 662d387920610300b88d2aee41935e627e0c3848e7dabd5d82c97fe5a7e742f7
+MISC ChangeLog 19409 RMD160 7be96da646ff0855fa6c939e2f4906e76ba85cdd SHA1 6de9c194226b379d45f5f00b08a958564a31c0ad SHA256 cab6317431a264037f255b05ee60b0409de45919e8db52e743ee0688737cf49e
 MISC metadata.xml 157 RMD160 d7470fe88d1b96f3a7f1ef26fb7dc646b4a1b907 SHA1 7eae91f2588bdae8667d37a98fb3090d539eeca1 SHA256 44350daa7594842894d676413708d8ea77ccb0017bed24711af5b256281f5e61
diff --git a/xfce-base/xfce4-panel/files/xfce4-panel-4.6.2-glib-2.23.patch b/xfce-base/xfce4-panel/files/xfce4-panel-4.6.2-glib-2.23.patch
new file mode 100644
index 000000000000..b4047f87a93b
--- /dev/null
+++ b/xfce-base/xfce4-panel/files/xfce4-panel-4.6.2-glib-2.23.patch
@@ -0,0 +1,23 @@
+diff --git a/libxfce4panel/xfce-panel-window.c b/libxfce4panel/xfce-panel-window.c
+index 7d0687b..6a6ecd8 100644
+--- a/libxfce4panel/xfce-panel-window.c
++++ b/libxfce4panel/xfce-panel-window.c
+@@ -304,14 +304,10 @@ xfce_panel_window_init (XfcePanelWindow *panel_window)
+ 
+     GTK_WIDGET_SET_FLAGS (GTK_WIDGET (panel_window), GTK_CAN_FOCUS);
+ 
+-    g_object_set (G_OBJECT (panel_window),
+-                  "type", GTK_WINDOW_TOPLEVEL,
+-                  "decorated", FALSE,
+-                  "resizable", FALSE,
+-                  "type-hint", GDK_WINDOW_TYPE_HINT_DOCK,
+-                  "title", PACKAGE_NAME " " PACKAGE_VERSION,
+-                  NULL);
+-
++    gtk_window_set_type_hint (GTK_WINDOW (panel_window), GDK_WINDOW_TYPE_HINT_DOCK);
++    gtk_window_set_decorated (GTK_WINDOW (panel_window), FALSE);
++    gtk_window_set_resizable (GTK_WINDOW (panel_window), FALSE);
++    gtk_window_set_title (GTK_WINDOW (panel_window), PACKAGE_NAME);
+     gtk_window_stick (GTK_WINDOW (panel_window));
+ 
+     priv = XFCE_PANEL_WINDOW_GET_PRIVATE (panel_window);
diff --git a/xfce-base/xfce4-panel/xfce4-panel-4.6.2-r1.ebuild b/xfce-base/xfce4-panel/xfce4-panel-4.6.2-r1.ebuild
new file mode 100644
index 000000000000..494e87d82438
--- /dev/null
+++ b/xfce-base/xfce4-panel/xfce4-panel-4.6.2-r1.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/xfce-base/xfce4-panel/xfce4-panel-4.6.2-r1.ebuild,v 1.1 2010/03/20 11:33:35 ssuominen Exp $
+
+EAPI=2
+EAUTORECONF=yes
+inherit xfconf
+
+DESCRIPTION="Panel for Xfce4"
+HOMEPAGE="http://www.xfce.org/projects/xfce4-panel/"
+SRC_URI="mirror://xfce/src/xfce/${PN}/4.6/${P}.tar.bz2"
+
+LICENSE="GPL-2 LGPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~x86-solaris"
+IUSE="debug startup-notification"
+
+RDEPEND=">=dev-libs/glib-2.20:2
+	x11-libs/cairo
+	x11-libs/libX11
+	x11-libs/libSM
+	>=x11-libs/gtk+-2.12:2
+	>=x11-libs/libwnck-2.12
+	>=xfce-base/libxfce4util-4.6
+	>=xfce-base/libxfcegui4-4.6
+	>=xfce-base/exo-0.3.100
+	startup-notification? ( x11-libs/startup-notification )"
+DEPEND="${RDEPEND}
+	dev-util/intltool
+	sys-devel/gettext
+	dev-util/pkgconfig"
+
+pkg_setup() {
+	XFCONF="--disable-dependency-tracking
+		$(use_enable startup-notification)
+		$(use_enable debug)"
+	DOCS="AUTHORS ChangeLog HACKING NEWS README TODO"
+	PATCHES=( "${FILESDIR}/${P}-exo.patch"
+		"${FILESDIR}/${P}-glib-2.23.patch" )
+}