Patch from upstream to silent warnings.

Package-Manager: portage-2.1.2.2

diff --git a/xfce-base/libxfce4menu/ChangeLog b/xfce-base/libxfce4menu/ChangeLog
index f07e14835a7125b178f87edc49737a66031df687..3481e8bf029459b1b69db767d25a820a9a8fb4fa 100644 (file)
--- 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/Manifest b/xfce-base/libxfce4menu/Manifest
index 74767423744506c89d46903a0006c08008562580..febea8a95c1da8952234651ed7caf3bc0f081b77 100644 (file)
--- a/xfce-base/libxfce4menu/Manifest
+++ b/xfce-base/libxfce4menu/Manifest
@@ -1,16 +1,20 @@
+AUX libxfce4menu-4.5_pre20070325-monitor.patch 1218 RMD160 ace3a0a34b432de65b8ee70d8e30e0175c8068c5 SHA1 73a0f5e3a436ed7396b39dd3854efa0e33d57ce7 SHA256 289147336309fe9dfccd1270e87f4c1f556a4ecdc26fa8ca79033510beb2b467
+MD5 eac0e56a9133d63f27a04d8e340fe8f2 files/libxfce4menu-4.5_pre20070325-monitor.patch 1218
+RMD160 ace3a0a34b432de65b8ee70d8e30e0175c8068c5 files/libxfce4menu-4.5_pre20070325-monitor.patch 1218
+SHA256 289147336309fe9dfccd1270e87f4c1f556a4ecdc26fa8ca79033510beb2b467 files/libxfce4menu-4.5_pre20070325-monitor.patch 1218
 DIST libxfce4menu-4.5_pre20070325.tar.bz2 774595 RMD160 574b24a59c6c868f2b6fa314ad3ded83bab93e31 SHA1 18b679be0a22d677b63487455c1a1c0c2d837127 SHA256 12f7dd1485615af89e2cd1d383d0a79295dced027118caea1422e2295a8ec4c7
-EBUILD libxfce4menu-4.5_pre20070325.ebuild 741 RMD160 28143edced5e820a1e2e32e1fa10ff8f60848e92 SHA1 7634718f0144467550bfbd9b25ca32c51ed32011 SHA256 0f390be0e7c30cd5c7ebd5f72125fd3490d915e68a2b005985d84fe9adaff08f
-MD5 00c170d29813efed5b855e0d5c1ddbf6 libxfce4menu-4.5_pre20070325.ebuild 741
-RMD160 28143edced5e820a1e2e32e1fa10ff8f60848e92 libxfce4menu-4.5_pre20070325.ebuild 741
-SHA256 0f390be0e7c30cd5c7ebd5f72125fd3490d915e68a2b005985d84fe9adaff08f libxfce4menu-4.5_pre20070325.ebuild 741
-MISC ChangeLog 506 RMD160 39cdf9edd01369141cfcecec7cefb03280b45132 SHA1 677e6b1c11230c266b3af5c9e6c704f6a6c4f2b0 SHA256 7c2f99e258c0d50181e8818c8a845e477309c534286f28e3946327080254cf92
-MD5 3afd024d3112fa79d945b58907724457 ChangeLog 506
-RMD160 39cdf9edd01369141cfcecec7cefb03280b45132 ChangeLog 506
-SHA256 7c2f99e258c0d50181e8818c8a845e477309c534286f28e3946327080254cf92 ChangeLog 506
+EBUILD libxfce4menu-4.5_pre20070325-r1.ebuild 795 RMD160 c9452324a8b54606f73df6964981aedcca936575 SHA1 537cbdb1496e61b07194dc954a3c6e06890594d2 SHA256 5deb5f8077d589fd0d979c933dabc7aeb747e447b5c932cb002d0b6a7d0ad302
+MD5 228ec6ab4e8e5912c8ab9db0b89551ec libxfce4menu-4.5_pre20070325-r1.ebuild 795
+RMD160 c9452324a8b54606f73df6964981aedcca936575 libxfce4menu-4.5_pre20070325-r1.ebuild 795
+SHA256 5deb5f8077d589fd0d979c933dabc7aeb747e447b5c932cb002d0b6a7d0ad302 libxfce4menu-4.5_pre20070325-r1.ebuild 795
+MISC ChangeLog 782 RMD160 8924403a56f1a05e9224e5a3de246c5eec8500f0 SHA1 d7c378ce4a3aa481d8e326c4225de1cbb4e53ad8 SHA256 288457f78f2902734fe2c0a4b820fdef7c1e546b866c84381a4d0e4acace2fba
+MD5 283e7873cb54831abbea3d1744584ff2 ChangeLog 782
+RMD160 8924403a56f1a05e9224e5a3de246c5eec8500f0 ChangeLog 782
+SHA256 288457f78f2902734fe2c0a4b820fdef7c1e546b866c84381a4d0e4acace2fba ChangeLog 782
 MISC metadata.xml 157 RMD160 d7470fe88d1b96f3a7f1ef26fb7dc646b4a1b907 SHA1 7eae91f2588bdae8667d37a98fb3090d539eeca1 SHA256 44350daa7594842894d676413708d8ea77ccb0017bed24711af5b256281f5e61
 MD5 c390804e060ffd11a5bbb143434b2b2d metadata.xml 157
 RMD160 d7470fe88d1b96f3a7f1ef26fb7dc646b4a1b907 metadata.xml 157
 SHA256 44350daa7594842894d676413708d8ea77ccb0017bed24711af5b256281f5e61 metadata.xml 157
-MD5 e39b82ff8c5b9517d7523a087f746b02 files/digest-libxfce4menu-4.5_pre20070325 289
-RMD160 c31193cec4b8e84ccca69ffd3365e78763e46ef5 files/digest-libxfce4menu-4.5_pre20070325 289
-SHA256 73715c2061dbb3e6db6a9032780f8cb71835d9c6b53248eab951f2818e1f27fc files/digest-libxfce4menu-4.5_pre20070325 289
+MD5 e39b82ff8c5b9517d7523a087f746b02 files/digest-libxfce4menu-4.5_pre20070325-r1 289
+RMD160 c31193cec4b8e84ccca69ffd3365e78763e46ef5 files/digest-libxfce4menu-4.5_pre20070325-r1 289
+SHA256 73715c2061dbb3e6db6a9032780f8cb71835d9c6b53248eab951f2818e1f27fc files/digest-libxfce4menu-4.5_pre20070325-r1 289

diff --git a/xfce-base/libxfce4menu/files/digest-libxfce4menu-4.5_pre20070325 b/xfce-base/libxfce4menu/files/digest-libxfce4menu-4.5_pre20070325-r1
similarity index 100%
rename from xfce-base/libxfce4menu/files/digest-libxfce4menu-4.5_pre20070325
rename to 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 (file)
index 0000000..0349d94
--- /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
similarity index 75%
rename from xfce-base/libxfce4menu/libxfce4menu-4.5_pre20070325.ebuild
rename to xfce-base/libxfce4menu/libxfce4menu-4.5_pre20070325-r1.ebuild
index e3161f8409c57846ad451bf709b42d1fe7b63322..eed690aadeb303cf78d91081c8a1ba2447e82b44 100644 (file)
--- 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
+}