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
commit472b197845ce77be76aadddaa9bdbeafcfb3bf37 (patch)
treeb618909f4df19aeb99df75bb0a5ddadb66844ed9 /xfce-base/xfce4-panel
parentFixed for guile and multiple python, bug #331347 (diff)
downloadhistorical-472b197845ce77be76aadddaa9bdbeafcfb3bf37.tar.gz
historical-472b197845ce77be76aadddaa9bdbeafcfb3bf37.tar.bz2
historical-472b197845ce77be76aadddaa9bdbeafcfb3bf37.zip
Restore localedir variable to libxfce4panel-1.0.pc wrt #331371.
Package-Manager: portage-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/Manifest5
-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
4 files changed, 23 insertions, 4 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/Manifest b/xfce-base/xfce4-panel/Manifest
index 3e1ed66dac51..f181d6630849 100644
--- a/xfce-base/xfce4-panel/Manifest
+++ b/xfce-base/xfce4-panel/Manifest
@@ -1,9 +1,10 @@
AUX xfce4-panel-4.6.2-exo.patch 649 RMD160 fd7308cb4f400898a70790f40220d965fe49cee8 SHA1 95bbac9b45b0a40a15d7d87ca563808bf4799d56 SHA256 23d6868c9beaf6ad57dd9d33d9c3778559877cfc7578355005b9a555d8a90e25
+AUX xfce4-panel-4.7.2-localedir.patch 349 RMD160 48e69b8f2a6aa9c25f5c3b5e3f3f47a0bf59e269 SHA1 03f957474017143058c3304114cd4929ae3b2422 SHA256 26b3d05aec90745a5b3e3b4aa8d93ab2ee78c6ce617603f655006b9e76eb1cf0
DIST xfce4-panel-4.6.2.tar.bz2 876456 RMD160 5d981eaffc5aab227a3db66f8d39d0492d02a16d SHA1 32a5e5b9e8b93c2167077b329cf4d2fcb4323c9e SHA256 1d8ab1354c73935a5d12f0d7d226d26ae1b90fdd235460bdb57fd5651229bc8b
DIST xfce4-panel-4.6.4.tar.bz2 902913 RMD160 35eaab8726a447b961024d433845f30804da4751 SHA1 d2b310c036be84ed9886c06ae35b7a1a8eabfcb8 SHA256 cc9b70bdc73ab80f46655a34cdbaf876a67cd90b50230cbf4d77a3106a5c54e7
DIST xfce4-panel-4.7.2.tar.bz2 1120274 RMD160 4aaa2cfd25faf9fde9c75af35c54178d6aa83468 SHA1 6d6a1f7d26ebf8ce10e2be0ab9bd0f8da345d1a7 SHA256 8c5d3e0b2703802637fd75373f9bb6ca879ffc999c4b0607ca9cec394c5344d3
EBUILD xfce4-panel-4.6.2.ebuild 1160 RMD160 14413e5fd29a19defbd1998523daf54e5b23f2ee SHA1 fdc951562136a54185f2069c229d92bed7d6ef95 SHA256 471d90b58e428cd4ab43891e48d31681eb0b5e50f41eb42c63d0ca56752949f6
EBUILD xfce4-panel-4.6.4.ebuild 1107 RMD160 f6bc6af9ee230731cb4853da671be7c47070c9f0 SHA1 969708aa01b5a89f4b4d2c743d1859adc6d6d5fc SHA256 d1899d3a69827156d3fc0e37ff53f9961fa033efb942d95568605bc851b87afd
-EBUILD xfce4-panel-4.7.2.ebuild 1188 RMD160 dd823701235ff80d53752e1a4e30132a5fa8bd86 SHA1 ba8b6da06a3ddcc9b473545ddbe3930cfde1546e SHA256 f480acb2a68c2dd62dbf847ff43c7bfd0c55bc5683aa6d098a5de8b3ce25d1dd
-MISC ChangeLog 20585 RMD160 48a7a3fbee3cbef0566af5079b656fc36cadd5ee SHA1 1b2dffacc084982aeda8daae1aaf97a0611b5372 SHA256 99d3cfe09f8c1abcd378e7948398fc162c687db4ac0c22a6c8fcd2e4f62f198f
+EBUILD xfce4-panel-4.7.2.ebuild 1236 RMD160 8a18dcc0e8466e0413c58cd61d2678318bfdb55c SHA1 78406e57075b04b72858806e770d23c0f9e5f0f1 SHA256 8b1f063a46b125316ef2c3d69a5fa300c689dec26c7cf172b00324eea611f149
+MISC ChangeLog 20782 RMD160 6e84ef9ad2075041ffc1f4c62c7e1f3b3ef6810d SHA1 1ad6373e3f52509da31278f7bca585efca048dcf SHA256 8c8b769f3c978f946f1bb9f10103e05d3c6e9714c6205be2f3c38d125278375c
MISC metadata.xml 157 RMD160 d7470fe88d1b96f3a7f1ef26fb7dc646b4a1b907 SHA1 7eae91f2588bdae8667d37a98fb3090d539eeca1 SHA256 44350daa7594842894d676413708d8ea77ccb0017bed24711af5b256281f5e61
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