summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSamuli Suominen <ssuominen@gentoo.org>2010-08-10 22:04:10 +0000
committerSamuli Suominen <ssuominen@gentoo.org>2010-08-10 22:04:10 +0000
commit8d2f382f920e5705d51d4101ec237d52f8a663b2 (patch)
treef3664841f26184d90ea752d486a13fe98d603b43 /xfce-base/xfce4-panel
parentFixed for guile and multiple python, bug #331347 (diff)
downloadgentoo-2-8d2f382f920e5705d51d4101ec237d52f8a663b2.tar.gz
gentoo-2-8d2f382f920e5705d51d4101ec237d52f8a663b2.tar.bz2
gentoo-2-8d2f382f920e5705d51d4101ec237d52f8a663b2.zip
Restore localedir variable to libxfce4panel-1.0.pc wrt #331371.
(Portage version: 2.2_rc67/cvs/Linux x86_64)
Diffstat (limited to 'xfce-base/xfce4-panel')
-rw-r--r--xfce-base/xfce4-panel/ChangeLog6
-rw-r--r--xfce-base/xfce4-panel/files/xfce4-panel-4.7.2-localedir.patch13
-rw-r--r--xfce-base/xfce4-panel/xfce4-panel-4.7.2.ebuild3
3 files changed, 20 insertions, 2 deletions
diff --git a/xfce-base/xfce4-panel/ChangeLog b/xfce-base/xfce4-panel/ChangeLog
index 4b8bf0f8d54c..c91b099dbe2f 100644
--- a/xfce-base/xfce4-panel/ChangeLog
+++ b/xfce-base/xfce4-panel/ChangeLog
@@ -1,6 +1,10 @@
# 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.166 2010/08/10 15:53:37 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/xfce-base/xfce4-panel/ChangeLog,v 1.167 2010/08/10 22:04:09 ssuominen Exp $
+
+ 10 Aug 2010; Samuli Suominen <ssuominen@gentoo.org>
+ xfce4-panel-4.7.2.ebuild, +files/xfce4-panel-4.7.2-localedir.patch:
+ Restore localedir variable to libxfce4panel-1.0.pc wrt #331371.
10 Aug 2010; Jeroen Roovers <jer@gentoo.org> xfce4-panel-4.6.4.ebuild:
Stable for HPPA (bug #323729).
diff --git a/xfce-base/xfce4-panel/files/xfce4-panel-4.7.2-localedir.patch b/xfce-base/xfce4-panel/files/xfce4-panel-4.7.2-localedir.patch
new file mode 100644
index 000000000000..3f4019736015
--- /dev/null
+++ b/xfce-base/xfce4-panel/files/xfce4-panel-4.7.2-localedir.patch
@@ -0,0 +1,13 @@
+http://bugzilla.xfce.org/show_bug.cgi?id=6629
+http://bugs.gentoo.org/show_bug.cgi?id=331371
+
+--- libxfce4panel/libxfce4panel-1.0.pc.in
++++ libxfce4panel/libxfce4panel-1.0.pc.in
+@@ -2,6 +2,7 @@
+ exec_prefix=@exec_prefix@
+ libdir=@libdir@
+ includedir=@includedir@
++localedir=@localedir@
+
+ Name: libxfce4panel
+ Description: Library for the Xfce Panel
diff --git a/xfce-base/xfce4-panel/xfce4-panel-4.7.2.ebuild b/xfce-base/xfce4-panel/xfce4-panel-4.7.2.ebuild
index aecc55096988..8c8f12e06fa0 100644
--- a/xfce-base/xfce4-panel/xfce4-panel-4.7.2.ebuild
+++ b/xfce-base/xfce4-panel/xfce4-panel-4.7.2.ebuild
@@ -1,6 +1,6 @@
# 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.7.2.ebuild,v 1.1 2010/07/21 15:26:18 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/xfce-base/xfce4-panel/xfce4-panel-4.7.2.ebuild,v 1.2 2010/08/10 22:04:09 ssuominen Exp $
EAPI=3
inherit xfconf
@@ -32,6 +32,7 @@ DEPEND="${RDEPEND}
dev-util/pkgconfig"
pkg_setup() {
+ PATCHES=( "${FILESDIR}"/${P}-localedir.patch )
XFCONF="--docdir=${EPREFIX}/usr/share/doc/${PF}
--disable-dependency-tracking
--disable-static