Fix a warning that would otherwise make the build fail with USE=debug, bug 245142

Package-Manager: portage-2.2_rc13/cvs/Linux 2.6.28-rc3 x86_64

4 files changed, 31 insertions, 12 deletions

diff --git a/xfce-base/libxfcegui4/ChangeLog b/xfce-base/libxfcegui4/ChangeLog
index 0172213f48d8..9b264deb643d 100644
--- a/xfce-base/libxfcegui4/ChangeLog
+++ b/xfce-base/libxfcegui4/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for xfce-base/libxfcegui4
 # Copyright 2000-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/xfce-base/libxfcegui4/ChangeLog,v 1.114 2008/10/30 22:01:32 angelos Exp $
+# $Header: /var/cvsroot/gentoo-x86/xfce-base/libxfcegui4/ChangeLog,v 1.115 2008/11/06 13:43:55 angelos Exp $
+
+  06 Nov 2008; Christoph Mende <angelos@gentoo.org>
+  +files/libxfcegui4-4.4.3-64bit-warning.patch, libxfcegui4-4.4.3.ebuild:
+  Fix a warning that would otherwise make the build fail with USE=debug, bug
+  245142
 
 *libxfcegui4-4.4.3 (30 Oct 2008)
 
diff --git a/xfce-base/libxfcegui4/Manifest b/xfce-base/libxfcegui4/Manifest
index e9bebfe64545..078ce6bed36c 100644
--- a/xfce-base/libxfcegui4/Manifest
+++ b/xfce-base/libxfcegui4/Manifest
@@ -1,16 +1,17 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
+AUX libxfcegui4-4.4.3-64bit-warning.patch 577 RMD160 50362fc361d3f4f4001d68349840176a745d40e9 SHA1 4d76caf91619bc749a3f700aa9accf385ed3e97b SHA256 991c444d001b7c1bad5e3fa1b7ec20321593b79ecf0acef6e2b40b63910e43a6
 DIST libxfcegui4-4.4.2.tar.bz2 565036 RMD160 1de306d67f9a38d72ec184e00471e4d53db3801d SHA1 554a30c02c92b76c8caad444040e18d8ec1737bc SHA256 622c2585f61666d9c46841829ba141e86861c73bd9041a3a73452d1c8df5ee91
 DIST libxfcegui4-4.4.3.tar.bz2 621245 RMD160 c0155a89e35d88d3c2e25fc2f38630309d50e916 SHA1 4f1ab2fb035b0aaeb01cbef15d7378726037bcc9 SHA256 8f45bc2ca5e9575b1b1d7f050ee70bdb9de16a35ca2f6838795e9f617343bb23
 EBUILD libxfcegui4-4.4.2.ebuild 865 RMD160 b4237a7c7ad47fa72cbb8f82602e6284117853ee SHA1 86bc64f902fa225c413a4985864d9393a5222cb8 SHA256 11c2b460d5436ca129f45b7951919bf27fc95994a2ede620088c33ef39697edb
-EBUILD libxfcegui4-4.4.3.ebuild 860 RMD160 1ea93353838cc2c2fe658f5cd267d3a92ec2a7b8 SHA1 b0c3839ae06f7145960c1dc0b9edffee867c3162 SHA256 2b628ddb528898963654ea3baacf4b48e395a92fe4d5026357cc94e84a4017fd
-MISC ChangeLog 13938 RMD160 23e33af04bc3bba1f1f922745cd4d63756033b60 SHA1 53503d20f1d73db977b4611ce127fe0f441889ae SHA256 7613858ab3acef5d62e4a722c50920734ad1e3ec794fc913055ede16b22dddb3
+EBUILD libxfcegui4-4.4.3.ebuild 859 RMD160 4082493deae2f520f2df7a8051a25aeafbebd4f8 SHA1 676dc9f0e38f873a5bdf9cc5b34b7eae0fe5a9aa SHA256 26a47a1bda565b032dc2148c161d3f2f6c0c1a7fbeb7f32a2f1be0e9e1866865
+MISC ChangeLog 14151 RMD160 8b6f807304426b9fa384653561894ad63a2faa64 SHA1 bd248dd2825866f8e44ceac8e8e2a7b3c13f803d SHA256 bbbb748279f1e61aa0279495c67fcc3dd8815b3d130d3ce7c8f7735b866341bd
 MISC metadata.xml 157 RMD160 d7470fe88d1b96f3a7f1ef26fb7dc646b4a1b907 SHA1 7eae91f2588bdae8667d37a98fb3090d539eeca1 SHA256 44350daa7594842894d676413708d8ea77ccb0017bed24711af5b256281f5e61
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.9 (GNU/Linux)
 
-iEYEARECAAYFAkkKLsEACgkQKhnDs22gwa99nACgypJy7jz9bzhOVEBmXqcomwlS
-qUsAoOfD1SdZMlJLCOrZEuM5MjZdK5fz
-=1NFT
+iEYEARECAAYFAkkS9KMACgkQKhnDs22gwa+ZrwCgsx9TV9+UgF2c0/xeLwqJW3hn
+JU8AoMDZya64JR4uFBt+PzqjVVH3x56x
+=mqnT
 -----END PGP SIGNATURE-----
diff --git a/xfce-base/libxfcegui4/files/libxfcegui4-4.4.3-64bit-warning.patch b/xfce-base/libxfcegui4/files/libxfcegui4-4.4.3-64bit-warning.patch
new file mode 100644
index 000000000000..139bd1467da7
--- /dev/null
+++ b/xfce-base/libxfcegui4/files/libxfcegui4-4.4.3-64bit-warning.patch
@@ -0,0 +1,11 @@
+--- libxfcegui4-4.4.3/libxfcegui4/xfce-appmenuitem.c.orig	2008-11-06 14:36:20.000000000 +0100
++++ libxfcegui4-4.4.3/libxfcegui4/xfce-appmenuitem.c	2008-11-06 14:36:35.000000000 +0100
+@@ -149,7 +149,7 @@
+                             g_free(name_locale);
+                         } else {
+                             g_warning("Invalid UTF-8 in Name at byte %d: %s",
+-                                      bread, error->message);
++                                      (guint)bread, error->message);
+                         }
+                     }
+                     break;
diff --git a/xfce-base/libxfcegui4/libxfcegui4-4.4.3.ebuild b/xfce-base/libxfcegui4/libxfcegui4-4.4.3.ebuild
index 6dccc56e6bed..f1cce8b839ba 100644
--- a/xfce-base/libxfcegui4/libxfcegui4-4.4.3.ebuild
+++ b/xfce-base/libxfcegui4/libxfcegui4-4.4.3.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/xfce-base/libxfcegui4/libxfcegui4-4.4.3.ebuild,v 1.1 2008/10/30 22:01:32 angelos Exp $
+# $Header: /var/cvsroot/gentoo-x86/xfce-base/libxfcegui4/libxfcegui4-4.4.3.ebuild,v 1.2 2008/11/06 13:43:55 angelos Exp $
 
-inherit xfce44
+inherit eutils xfce44
 
 XFCE_VERSION=4.4.3
 
@@ -22,9 +22,11 @@ RDEPEND="x11-libs/libSM
 DEPEND="${RDEPEND}
 	doc? ( dev-util/gtk-doc )"
 
-#src_unpack() {
-#	unpack ${A}
-#	sed -i -e "s:-Werror::g" "${S}"/configure || die "sed failed"
-#}
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+
+	epatch "${FILESDIR}"/${P}-64bit-warning.patch
+}
 
 DOCS="AUTHORS ChangeLog NEWS README TODO"