diff options
| author |   Harald van Dijk <truedfx@gentoo.org> | 2007-11-18 15:22:27 +0000 |
|---|---|---|
| committer | Harald van Dijk <truedfx@gentoo.org> | 2007-11-18 15:22:27 +0000 |
| commit | 984e6a76484c9bb73e9019debe75a9dc2aa3e7d9 (patch) | |
| tree | 4a71cd2d684eb0921b41849c3d825ba907b3f735 | |
| parent | unmask debootstrap (diff) | |
| download | gentoo-2-984e6a76484c9bb73e9019debe75a9dc2aa3e7d9.tar.gz gentoo-2-984e6a76484c9bb73e9019debe75a9dc2aa3e7d9.tar.bz2 gentoo-2-984e6a76484c9bb73e9019debe75a9dc2aa3e7d9.zip | |
Fix building with --as-needed (#199520); add missing quotes
(Portage version: 2.1.3.19)
| -rw-r--r-- | x11-wm/windowmaker/ChangeLog | 8 | ||||
| -rw-r--r-- | x11-wm/windowmaker/windowmaker-0.92.0-r5.ebuild | 19 |
2 files changed, 18 insertions, 9 deletions
diff --git a/x11-wm/windowmaker/ChangeLog b/x11-wm/windowmaker/ChangeLog index f971540acea6..11f17258c1ad 100644 --- a/x11-wm/windowmaker/ChangeLog +++ b/x11-wm/windowmaker/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for x11-wm/windowmaker # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/x11-wm/windowmaker/ChangeLog,v 1.89 2007/11/13 10:22:31 grobian Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-wm/windowmaker/ChangeLog,v 1.90 2007/11/18 15:22:27 truedfx Exp $ + + 18 Nov 2007; Harald van Dijk <truedfx@gentoo.org> + +files/0.92.0/windowmaker-0.92.0-as-needed.patch, + windowmaker-0.92.0-r5.ebuild: + Fix building with --as-needed (#199520) + Add missing quotes in ebuild for repoman complaints *windowmaker-0.92.0-r5 (13 Nov 2007) diff --git a/x11-wm/windowmaker/windowmaker-0.92.0-r5.ebuild b/x11-wm/windowmaker/windowmaker-0.92.0-r5.ebuild index 4ca13413b27f..df2ac19df4f2 100644 --- a/x11-wm/windowmaker/windowmaker-0.92.0-r5.ebuild +++ b/x11-wm/windowmaker/windowmaker-0.92.0-r5.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2007 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/x11-wm/windowmaker/windowmaker-0.92.0-r5.ebuild,v 1.1 2007/11/13 10:22:31 grobian Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-wm/windowmaker/windowmaker-0.92.0-r5.ebuild,v 1.2 2007/11/18 15:22:27 truedfx Exp $ inherit autotools eutils gnustep-base flag-o-matic @@ -71,6 +71,9 @@ src_unpack() { epatch "${psd}"/WindowMaker-0.91.0-sga-swpanel-customization.patch epatch "${psd}"/WindowMaker-0.92.0-alt-newpo.patch + # Bug 199520 + epatch "${FILESDIR}"/${PV}/${P}-as-needed.patch + # Add UK localisation cp "${psd}"/WindowMaker-uk.po po/uk.po cp "${psd}"/WPrefs-uk.po WPrefs.app/po/uk.po @@ -87,16 +90,16 @@ src_unpack() { if use gnustep; then egnustep_env fi - for file in ${S}/WindowMaker/*menu*; do - if [ -r $file ]; then + for file in "${S}"/WindowMaker/*menu*; do + if [ -r "$file" ]; then if use gnustep ; then - sed -i "s:/usr/local/GNUstep/Applications:${GNUSTEP_SYSTEM_APPS}:g" $file + sed -i "s:/usr/local/GNUstep/Applications:${GNUSTEP_SYSTEM_APPS}:g" "$file" else - sed -i "s:/usr/local/GNUstep/Applications/WPrefs.app:/usr/bin/:g;" $file + sed -i "s:/usr/local/GNUstep/Applications/WPrefs.app:/usr/bin/:g;" "$file" fi - sed -i 's:/usr/local/share/WindowMaker:/usr/share/WindowMaker:g;' $file - sed -i 's:/opt/share/WindowMaker:/usr/share/WindowMaker:g;' $file + sed -i 's:/usr/local/share/WindowMaker:/usr/share/WindowMaker:g;' "$file" + sed -i 's:/opt/share/WindowMaker:/usr/share/WindowMaker:g;' "$file" fi; done; @@ -169,6 +172,6 @@ src_install() { doexe wmaker insinto /etc/X11/dm/Sessions - doins ${FILESDIR}/wmaker.desktop + doins "${FILESDIR}"/wmaker.desktop make_desktop_entry /usr/bin/wmaker } |