Fix underlinking on libWMaker, bug #425788

Package-Manager: portage-2.2.0_alpha116/cvs/Linux x86_64

4 files changed, 145 insertions, 15 deletions

diff --git a/x11-wm/windowmaker/ChangeLog b/x11-wm/windowmaker/ChangeLog
index 61a47a5d9dc4..3314a7fb8bf4 100644
--- a/x11-wm/windowmaker/ChangeLog
+++ b/x11-wm/windowmaker/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for x11-wm/windowmaker
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-wm/windowmaker/ChangeLog,v 1.134 2012/06/07 22:42:15 voyageur Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/windowmaker/ChangeLog,v 1.135 2012/07/11 13:10:11 voyageur Exp $
+
+*windowmaker-0.95.3-r1 (11 Jul 2012)
+
+  11 Jul 2012; Bernard Cafarelli <voyageur@gentoo.org>
+  +windowmaker-0.95.3-r1.ebuild,
+  +files/windowmaker-0.95.3-fix_underlinking.patch:
+  Fix underlinking on libWMaker, bug #425788
 
 *windowmaker-0.95.3 (07 Jun 2012)
 
diff --git a/x11-wm/windowmaker/Manifest b/x11-wm/windowmaker/Manifest
index f33e24f4598d..00cf777c876b 100644
--- a/x11-wm/windowmaker/Manifest
+++ b/x11-wm/windowmaker/Manifest
@@ -1,21 +1,23 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
-AUX wmaker.desktop 221 RMD160 501ba6451f7e756cc3d07682d728bcd6fe55366d SHA1 acd95a41645fbef358459f8f4753056cb321497e SHA256 40359d3c61117f0dbc5eb547e4c369982427e8bc3174c95002d34eb30f9a4a84
-DIST WindowMaker-0.92.0.tar.gz 2758524 RMD160 b8bebed6a34696625ae0ae7c0ebcfdfc0ba09cdd SHA1 6f545356acde7e9bf4c11345ac1359b451a9d1bc SHA256 9edaa8d9ee6e6beb06f4c391c0aec5cd0e5b5494456cae2cdcfd49656177afc6
-DIST WindowMaker-0.95.2.tar.gz 2753910 RMD160 bd0e1737ca356a0178afdbaac156abb50115fb1d SHA1 9fa55d525a04377089caf6ffc0c4d8d0aebe9d61 SHA256 6b271e9427f5207484ec21c25e114e4eb1eafa957b446a1ff516f0c41ac19c59
-DIST WindowMaker-0.95.3.tar.gz 2780245 RMD160 320f29bb930b046ebdb796dc0d8b2dfdfa551c1b SHA1 3991e79fe742ea491326b46974e1a5fd73d73cc4 SHA256 b5eb88eccbf9a196a617594717797aa38f5c38d13d2ee40e914e153d09c9975a
-DIST WindowMaker-extra-0.1.tar.gz 238018 RMD160 94334c2c12d20a8fd0cd2a70e54cd3689f043038 SHA1 80f34cb3af705ec0f79d727b82cef28ee50fc4e7 SHA256 acd6e1fb790485b107daf2b710da372367b41383c55d9c8bdfdac521d850edc4
-DIST windowmaker-0.92.0-patchset-5.tar.bz2 226417 RMD160 c49fa346e3d024a5e12e576073d141f1d1c9958b SHA1 a6285c3034b80575f8a9dbda95f830f6387cd554 SHA256 3298be8a2f1eb8130c249df790ed2a35a230c337f2d12fd426e14df9652a9adc
-EBUILD windowmaker-0.92.0-r11.ebuild 6343 RMD160 f7dcecec467c6c4d09fb91ccd78989e58e7976dc SHA1 d4e770681d45c311599e3cd7c9ff372077313f9b SHA256 09979ec2a7e3ecbbebd54be27ba6b9662abcb1ad8f44aaf0baf73aa68e415d9a
-EBUILD windowmaker-0.95.2.ebuild 2900 RMD160 1236e8cee72c0cd60ac0fdd395b98cb36c7d6ce3 SHA1 1b2b98f99bbc407281e5509bd9a1c9f34458f807 SHA256 db41a0681630123f93d889a2bd08c0589a330ef8348e48caa3599b8f9b3a4e40
-EBUILD windowmaker-0.95.3.ebuild 2900 RMD160 f261d8527e5b7d1cd06a44653b690a62e340e80c SHA1 150a2d6e0830e769b99592af89132d853d6e36c9 SHA256 6e4080064e10d75a3b69bc5d3ffba112b15f7f3a0b8bd6bb96e8033c6ef81ff6
-MISC ChangeLog 27951 RMD160 d8678357c2a4c75b785f3bab2b66222bfffd98b1 SHA1 97cd38af1663ac344e88d4c32da361ebcb7505ce SHA256 99577c9ef754cd1720a6d4426de0f7ce257c5428babce2900a97a9070f0db2a9
-MISC metadata.xml 523 RMD160 65016780ac744ca6af2a6d9a65872b24f8a77aad SHA1 da7ab9ff44ceb7976c660b9c9fd676a87e93b59c SHA256 e13995c0dd8f3ebfaba07e96f2721cd2f3e81554567a1c0380f88870c8b97ceb
+AUX windowmaker-0.95.3-fix_underlinking.patch 355 SHA256 ae4bc0f40edb8fc38084051f06672b80b59ddf7a75805ae22376565f958c9682 SHA512 9ebf6ec14cfe821eb69d8385b3009953bfc58da576f06d22291d2acb112635ffd0a89c5388656fff76f07d7aef8f68a6226b8621b776b1f7437f73159ef6d349 WHIRLPOOL edde5e6d86da9fee9d9acb1cd75244554c455fabe0bb5705a25837e09f5cb0f6c2a825a96584ae7068c1194bfe63632ff28d7136832217f3dbb694d77809ae9c
+AUX wmaker.desktop 221 SHA256 40359d3c61117f0dbc5eb547e4c369982427e8bc3174c95002d34eb30f9a4a84 SHA512 1c1b24001e47a2af8f18a5f90675d095ba7f929ad9273ca82f61fd13ad35ff22dc9b777eec24fc3fd984790a5d494949d1dd5e0ca39780920017ea7971a3289d WHIRLPOOL 68ea31480ba1796e4243184deff38270963841c2bdb54bc85a606ecad0cdccc6815b11fa67158cbcc527ae3a17488b97a209283289922323ed42ea37a062ac2b
+DIST WindowMaker-0.92.0.tar.gz 2758524 SHA256 9edaa8d9ee6e6beb06f4c391c0aec5cd0e5b5494456cae2cdcfd49656177afc6
+DIST WindowMaker-0.95.2.tar.gz 2753910 SHA256 6b271e9427f5207484ec21c25e114e4eb1eafa957b446a1ff516f0c41ac19c59
+DIST WindowMaker-0.95.3.tar.gz 2780245 SHA256 b5eb88eccbf9a196a617594717797aa38f5c38d13d2ee40e914e153d09c9975a SHA512 7a70f6eb9de03c466d9de6a84febc59d46edee82c789287caa3a67012ab40c9b9a029ee46236f79dc80daeecab2313999a72f4d90caa77a464876116bd48ad16 WHIRLPOOL 056adcc7fd532aca611dd3699584aef793b5a86f66f051b571f4a0c247e33a37871e775389f7449d0357d3133a75ba3a7cd862a6cc2a243e447959b977d8a731
+DIST WindowMaker-extra-0.1.tar.gz 238018 SHA256 acd6e1fb790485b107daf2b710da372367b41383c55d9c8bdfdac521d850edc4 SHA512 0fe9b3ffc093942db167d8a01e15c0f6741f3a40959d1434ea4f23e7b9d4a9c13935a61eabef9691e5fdfd4e407564caafce15c2d65d66499960a6764a874ab8 WHIRLPOOL f2c61b318f64a2debb727ae79dfa1bb8101888bc9492633a96ace0e704c731c383e92882c871622987d5971b919359c066638fba05c5dade330fe3bee21bb034
+DIST windowmaker-0.92.0-patchset-5.tar.bz2 226417 SHA256 3298be8a2f1eb8130c249df790ed2a35a230c337f2d12fd426e14df9652a9adc
+EBUILD windowmaker-0.92.0-r11.ebuild 6343 SHA256 09979ec2a7e3ecbbebd54be27ba6b9662abcb1ad8f44aaf0baf73aa68e415d9a SHA512 45af454a20c5f7cfd22b9a71e7c44dd080a7fe9d4a3697dfc988ebf3363a6ed8d7adf2d319e861bdb5bf1c351f83e4d668f8e802ea032b8a8422422dd68eee55 WHIRLPOOL ba513ee2b7e8a602ccc8a44f63a4ede9720d16bd5d54f4d94991b29d77e2aa3329a915f2c9360a1dc05ca5421c3df51731de4e7f7fdeec7522b541eb0df284b1
+EBUILD windowmaker-0.95.2.ebuild 2900 SHA256 db41a0681630123f93d889a2bd08c0589a330ef8348e48caa3599b8f9b3a4e40 SHA512 4acdec6f3631494c4f29691c8d4e13300c057200483a6d3d800d0302cbc78e7993de8f6b261282ad10dba11b6d343d525782d48304193902a95c9450f50eaced WHIRLPOOL 905c44db6c5560f75565d4d25c40125ce02b64630c9a1d1f34f0d81eb95c3bc9bd19728d38b8e38987801da647e1b8538a1716fabb4c66be957e1c5064a4193d
+EBUILD windowmaker-0.95.3-r1.ebuild 2977 SHA256 75f835f532ff9e37f1421fdc6d75b1f3da1ce2ac3952bc00df68e4ff692ab650 SHA512 175004da9553672fb6e432f43caefe391e0e4943a0a2af8dccc8e9c9eb74c6002ec584b417f556743795b611ea2f6bb032fe1043638c1cf2417c2035210555d6 WHIRLPOOL 69b253c8d39bb43d2ffec3dee1651445ff0135cd4fcb64717f4867067f0e22fee7ef00c54b2b252fa41755e6145fddd44edb2b95455a68bca965a6361b65b567
+EBUILD windowmaker-0.95.3.ebuild 2900 SHA256 6e4080064e10d75a3b69bc5d3ffba112b15f7f3a0b8bd6bb96e8033c6ef81ff6 SHA512 76b4574c21599cc7f5ab9e886b93375dcda095afcfbb90ff41489a6a581add75e803dbb08d8b0e5a1352b6a903dcbf465be579e5432fd191764001ed5df2dc55 WHIRLPOOL 9e53054d45989e9df674ec7528d6115d3de0b5da55b8d5c1fe85e04da2d930eb8be83bc035315df2220444ec5962d7c5e6502c7f8647cdb712c9d9c1567d58a8
+MISC ChangeLog 28175 SHA256 716c44a9b74595e010cec7d105bbd201be87cdddbe314424339fb83028a931ac SHA512 1958f678fccf9bf328c8377047e33800493e16415f2979e6b79540d56a825b87119a346734f8c88c43b7148d67fa670aa47ac9a8d3008e297f3257584aebefbd WHIRLPOOL 5df3227554b723e8fd75df4e2534155d3c52113ca71445684ee52f57d2326b82e306aa6ecc01f0981d17781556a7301043ee0bcefc122e960f81ea359cac5a4f
+MISC metadata.xml 523 SHA256 e13995c0dd8f3ebfaba07e96f2721cd2f3e81554567a1c0380f88870c8b97ceb SHA512 feded16f4fd775bb4531c067965acf4c5e2a536938a39c05e6fc47833ccf53c4e2509519d20e725368ec49c132a53ec344f4957a51c57ee2f16c9eae2ecdd001 WHIRLPOOL 5a50662514af64aeb0c229fc881f325628c7cf23da8d51d94d103a4ba96332dd567eece0b4484a18a4e2dc70e6d193b6acc89c62a02d691fea88d3e7d915d425
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iF4EAREIAAYFAk/RLlIACgkQFYEBGcdFJfJM/gD+M5QfmS1XhUIcDZ2glINZS1wr
-gckldfBkekXRbhyn+xkA/RT8yHvC2yLaIeaaKPnVPwhbcmxUcYTrZX2ZV7zwL1nu
-=DR0F
+iF4EAREIAAYFAk/9e0EACgkQFYEBGcdFJfL6MwD7BHeQKz0DqPusVgoFEedQCWmk
+DzoSdBrraX76OV+hRqAA/iKJkORWhJwCF5TL2ZbmwI7ddTNJKb8js/GMJi0Ges63
+=IueL
 -----END PGP SIGNATURE-----
diff --git a/x11-wm/windowmaker/files/windowmaker-0.95.3-fix_underlinking.patch b/x11-wm/windowmaker/files/windowmaker-0.95.3-fix_underlinking.patch
new file mode 100644
index 000000000000..cd88709dc148
--- /dev/null
+++ b/x11-wm/windowmaker/files/windowmaker-0.95.3-fix_underlinking.patch
@@ -0,0 +1,15 @@
+diff --git a/wmlib/Makefile.am b/wmlib/Makefile.am
+index 0f8201f..7b95d1f 100644
+--- a/wmlib/Makefile.am
++++ b/wmlib/Makefile.am
+@@ -2,6 +2,7 @@
+ AUTOMAKE_OPTIONS = no-dependencies
+ 
+ libWMaker_la_LDFLAGS = -version-info 1:1:0
++libWMaker_la_LIBADD = @LIBRARY_SEARCH_PATH@ @XLIBS@
+ lib_LTLIBRARIES = libWMaker.la
+ 
+ include_HEADERS = WMaker.h
+-- 
+1.7.8.6
+
diff --git a/x11-wm/windowmaker/windowmaker-0.95.3-r1.ebuild b/x11-wm/windowmaker/windowmaker-0.95.3-r1.ebuild
new file mode 100644
index 000000000000..0dcaae83b4ec
--- /dev/null
+++ b/x11-wm/windowmaker/windowmaker-0.95.3-r1.ebuild
@@ -0,0 +1,106 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/windowmaker/windowmaker-0.95.3-r1.ebuild,v 1.1 2012/07/11 13:10:11 voyageur Exp $
+
+EAPI=4
+inherit autotools eutils
+
+DESCRIPTION="The fast and light GNUstep window manager"
+HOMEPAGE="http://www.windowmaker.org/"
+SRC_URI=" http://windowmaker.org/pub/source/release/${P/windowm/WindowM}.tar.gz
+	http://www.windowmaker.org/pub/source/release/WindowMaker-extra-0.1.tar.gz"
+
+SLOT="0"
+LICENSE="GPL-2"
+IUSE="gif jpeg nls png tiff modelock xinerama xrandr"
+KEYWORDS="~alpha ~amd64 ~hppa ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+
+DEPEND="media-libs/fontconfig
+	>=x11-libs/libXft-2.1.0
+	x11-libs/libXmu
+	x11-libs/libXt
+	x11-libs/libXv
+	gif? ( >=media-libs/giflib-4.1.0-r3 )
+	png? ( media-libs/libpng:0 )
+	jpeg? ( virtual/jpeg )
+	tiff? ( media-libs/tiff:0 )
+	xinerama? ( x11-libs/libXinerama )
+	xrandr? ( x11-libs/libXrandr )"
+RDEPEND="${DEPEND}
+	nls? ( >=sys-devel/gettext-0.10.39 )"
+
+S=${WORKDIR}/${P/windowm/WindowM}
+
+src_prepare() {
+	# Fix some paths
+	for file in WindowMaker/*menu* util/wmgenmenu.c; do
+		if [[ -r $file ]] ; then
+			sed -i -e "s:/usr/local/GNUstep/Applications/WPrefs.app:${EPREFIX}/usr/bin/:g;" "$file" || die
+			sed -i -e "s:/usr/local/share/WindowMaker:${EPREFIX}/usr/share/WindowMaker:g;" "$file" || die
+			sed -i -e "s:/opt/share/WindowMaker:${EPREFIX}/usr/share/WindowMaker:g;" "$file" || die
+		fi;
+	done;
+
+	epatch "${FILESDIR}"/${P}-fix_underlinking.patch
+	eautoreconf
+}
+
+src_configure() {
+	local myconf
+
+	# image format types
+	# xpm is provided by X itself
+	myconf="--enable-xpm $(use_enable png) $(use_enable jpeg) $(use_enable gif) $(use_enable tiff)"
+
+	# non required X capabilities
+	myconf="${myconf} $(use_enable modelock) $(use_enable xrandr) $(use_enable xinerama)"
+
+	if use nls; then
+		[[ -z $LINGUAS ]] && export LINGUAS="`ls po/*.po | sed 's:po/\(.*\)\.po$:\1:'`"
+	else
+		myconf="${myconf} --disable-locale"
+	fi
+
+	# default settings with $myconf appended
+	econf \
+		--sysconfdir="${EPREFIX}"/etc/X11 \
+		--with-x \
+		--enable-usermenu \
+		--with-pixmapdir="${EPREFIX}"/usr/share/pixmaps \
+		--with-nlsdir="${EPREFIX}"/usr/share/locale \
+		${myconf}
+
+	cd ../WindowMaker-extra-0.1
+	econf
+}
+
+src_compile() {
+	emake
+
+	# WindowMaker Extra Package (themes and icons)
+	cd ../WindowMaker-extra-0.1
+	emake
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+
+	dodoc AUTHORS BUGFORM BUGS ChangeLog INSTALL* FAQ* \
+		  README* NEWS TODO
+
+	# WindowMaker Extra
+	cd ../WindowMaker-extra-0.1
+	emake DESTDIR="${D}" install
+
+	newdoc README README.extra
+
+	# create wmaker session shell script
+	echo "#!/usr/bin/env bash" > wmaker
+	echo "${EPREFIX}/usr/bin/wmaker" >> wmaker
+	exeinto /etc/X11/Sessions/
+	doexe wmaker
+
+	insinto /usr/share/xsessions
+	doins "${FILESDIR}"/wmaker.desktop
+	make_desktop_entry /usr/bin/wmaker
+}