summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristoph Mende <angelos@gentoo.org>2008-11-06 13:43:55 +0000
committerChristoph Mende <angelos@gentoo.org>2008-11-06 13:43:55 +0000
commit8e809b5ec16a044c2214b6bc48e4230595f06b05 (patch)
treea38afbe90d071ef53dd2b1f6d392f5fcb759cb3e /xfce-base/libxfcegui4
parentversion bump and patch for security bug 238762 (CVE-2008-4242); this bump has... (diff)
downloadgentoo-2-8e809b5ec16a044c2214b6bc48e4230595f06b05.tar.gz
gentoo-2-8e809b5ec16a044c2214b6bc48e4230595f06b05.tar.bz2
gentoo-2-8e809b5ec16a044c2214b6bc48e4230595f06b05.zip
Fix a warning that would otherwise make the build fail with USE=debug, bug 245142
(Portage version: 2.2_rc13/cvs/Linux 2.6.28-rc3 x86_64)
Diffstat (limited to 'xfce-base/libxfcegui4')
-rw-r--r--xfce-base/libxfcegui4/ChangeLog7
-rw-r--r--xfce-base/libxfcegui4/files/libxfcegui4-4.4.3-64bit-warning.patch11
-rw-r--r--xfce-base/libxfcegui4/libxfcegui4-4.4.3.ebuild14
3 files changed, 25 insertions, 7 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/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"