Patch from upstream to silent warnings.

(Portage version: 2.1.2.2)

4 files changed, 43 insertions, 6 deletions

diff --git a/xfce-base/libxfce4menu/ChangeLog b/xfce-base/libxfce4menu/ChangeLog
index f07e14835a71..3481e8bf0294 100644
--- a/xfce-base/libxfce4menu/ChangeLog
+++ b/xfce-base/libxfce4menu/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for xfce-base/libxfce4menu
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/xfce-base/libxfce4menu/ChangeLog,v 1.2 2007/03/25 15:15:58 drac Exp $
+# $Header: /var/cvsroot/gentoo-x86/xfce-base/libxfce4menu/ChangeLog,v 1.3 2007/03/25 16:17:51 drac Exp $
+
+*libxfce4menu-4.5_pre20070325-r1 (25 Mar 2007)
+
+  25 Mar 2007; Samuli Suominen <drac@gentoo.org>
+  +files/libxfce4menu-4.5_pre20070325-monitor.patch,
+  -libxfce4menu-4.5_pre20070325.ebuild,
+  +libxfce4menu-4.5_pre20070325-r1.ebuild:
+  Patch from upstream to silent warnings.
 
   25 Mar 2007; Samuli Suominen <drac@gentoo.org>
   libxfce4menu-4.5_pre20070325.ebuild:
diff --git a/xfce-base/libxfce4menu/files/digest-libxfce4menu-4.5_pre20070325 b/xfce-base/libxfce4menu/files/digest-libxfce4menu-4.5_pre20070325-r1
index 0ab4b99a4c81..0ab4b99a4c81 100644
--- a/xfce-base/libxfce4menu/files/digest-libxfce4menu-4.5_pre20070325
+++ b/xfce-base/libxfce4menu/files/digest-libxfce4menu-4.5_pre20070325-r1
diff --git a/xfce-base/libxfce4menu/files/libxfce4menu-4.5_pre20070325-monitor.patch b/xfce-base/libxfce4menu/files/libxfce4menu-4.5_pre20070325-monitor.patch
new file mode 100644
index 000000000000..0349d94a4bdc
--- /dev/null
+++ b/xfce-base/libxfce4menu/files/libxfce4menu-4.5_pre20070325-monitor.patch
@@ -0,0 +1,25 @@
+diff -ur libxfce4menu-4.5_pre20070325.orig/libxfce4menu/xfce-menu-monitor.c libxfce4menu-4.5_pre20070325/libxfce4menu/xfce-menu-monitor.c
+--- libxfce4menu-4.5_pre20070325.orig/libxfce4menu/xfce-menu-monitor.c	2007-03-25 17:00:13.000000000 +0300
++++ libxfce4menu-4.5_pre20070325/libxfce4menu/xfce-menu-monitor.c	2007-03-25 17:35:04.000000000 +0300
+@@ -104,7 +104,9 @@
+ 
+   g_return_val_if_fail (XFCE_IS_MENU (menu), NULL);
+   g_return_val_if_fail (XFCE_IS_MENU_ITEM (item), NULL);
+-  g_return_val_if_fail (xfce_menu_monitor_vtable.monitor_file != NULL, NULL);
++  
++  if (G_UNLIKELY (xfce_menu_monitor_vtable.monitor_file == NULL))
++    return NULL;
+ 
+   /* Request monitor handle from the library client */
+   monitor_handle = xfce_menu_monitor_vtable.monitor_file (menu, xfce_menu_item_get_filename (item), xfce_menu_monitor_user_data);
+@@ -127,7 +129,9 @@
+   gpointer monitor_handle;
+ 
+   g_return_if_fail (XFCE_IS_MENU_ITEM (item));
+-  g_return_if_fail (xfce_menu_monitor_vtable.remove_monitor != NULL);
++  
++  if (G_UNLIKELY (xfce_menu_monitor_vtable.remove_monitor == NULL))
++    return;
+ 
+   /* Lookup the monitor handle for this item */
+   monitor_handle = g_hash_table_lookup (xfce_menu_monitor_handles, item);
diff --git a/xfce-base/libxfce4menu/libxfce4menu-4.5_pre20070325.ebuild b/xfce-base/libxfce4menu/libxfce4menu-4.5_pre20070325-r1.ebuild
index e3161f8409c5..eed690aadeb3 100644
--- a/xfce-base/libxfce4menu/libxfce4menu-4.5_pre20070325.ebuild
+++ b/xfce-base/libxfce4menu/libxfce4menu-4.5_pre20070325-r1.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/xfce-base/libxfce4menu/libxfce4menu-4.5_pre20070325.ebuild,v 1.2 2007/03/25 15:15:58 drac Exp $
+# $Header: /var/cvsroot/gentoo-x86/xfce-base/libxfce4menu/libxfce4menu-4.5_pre20070325-r1.ebuild,v 1.1 2007/03/25 16:17:51 drac Exp $
 
-inherit xfce44
+inherit eutils xfce44
 
 xfce44
 
@@ -11,7 +11,7 @@ HOMEPAGE="http://www.xfce.org/projects/libraries"
 SRC_URI="http://dev.gentoo.org/~drac/distfiles/${P}.tar.bz2"
 
 KEYWORDS="~x86"
-IUSE="doc"
+IUSE="debug doc"
 
 RDEPEND=">=dev-libs/glib-2.6
 	>=x11-libs/gtk+-2.6
@@ -21,6 +21,10 @@ DEPEND="${RDEPEND}
 	dev-util/intltool
 	doc? ( dev-util/gtk-doc )"
 
-XFCE_CONFIG="${XFCE_CONFIG} --enable-debug"
-
 DOCS="AUTHORS ChangeLog HACKING NEWS README STATUS THANKS TODO"
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	epatch "${FILESDIR}"/${P}-monitor.patch
+}