From 025b1576f86b3ac58bb3066f34c5d2522483005c Mon Sep 17 00:00:00 2001 From: Fabian Groffen Date: Wed, 21 Nov 2007 19:54:41 +0000 Subject: Drop nowings patch that I accidentially enabled, this should make the as-needed patch obsolete, and fix bug #199414. Retained Harald's math.h fixes by splitting it off in a new patch. Package-Manager: portage-2.1.3.19 --- x11-wm/windowmaker/ChangeLog | 12 +- x11-wm/windowmaker/Manifest | 40 ++--- .../0.92.0/windowmaker-0.92.0-as-needed.patch | 58 ------- .../files/0.92.0/windowmaker-0.92.0-math_h.patch | 25 +++ .../windowmaker/files/digest-windowmaker-0.92.0-r5 | 9 -- .../windowmaker/files/digest-windowmaker-0.92.0-r6 | 9 ++ x11-wm/windowmaker/windowmaker-0.92.0-r5.ebuild | 177 --------------------- x11-wm/windowmaker/windowmaker-0.92.0-r6.ebuild | 174 ++++++++++++++++++++ 8 files changed, 234 insertions(+), 270 deletions(-) delete mode 100644 x11-wm/windowmaker/files/0.92.0/windowmaker-0.92.0-as-needed.patch create mode 100644 x11-wm/windowmaker/files/0.92.0/windowmaker-0.92.0-math_h.patch delete mode 100644 x11-wm/windowmaker/files/digest-windowmaker-0.92.0-r5 create mode 100644 x11-wm/windowmaker/files/digest-windowmaker-0.92.0-r6 delete mode 100644 x11-wm/windowmaker/windowmaker-0.92.0-r5.ebuild create mode 100644 x11-wm/windowmaker/windowmaker-0.92.0-r6.ebuild (limited to 'x11-wm/windowmaker') diff --git a/x11-wm/windowmaker/ChangeLog b/x11-wm/windowmaker/ChangeLog index 11f17258c1ad..f4e3a6cb9667 100644 --- a/x11-wm/windowmaker/ChangeLog +++ b/x11-wm/windowmaker/ChangeLog @@ -1,6 +1,16 @@ # 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.90 2007/11/18 15:22:27 truedfx Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-wm/windowmaker/ChangeLog,v 1.91 2007/11/21 19:54:40 grobian Exp $ + +*windowmaker-0.92.0-r6 (21 Nov 2007) + + 21 Nov 2007; Fabian Groffen + -files/0.92.0/windowmaker-0.92.0-as-needed.patch, + +files/0.92.0/windowmaker-0.92.0-math_h.patch, + -windowmaker-0.92.0-r5.ebuild, +windowmaker-0.92.0-r6.ebuild: + Drop nowings patch that I accidentially enabled, this should make the + as-needed patch obsolete, and fix bug #199414. Retained Harald's math.h + fixes by splitting it off in a new patch. 18 Nov 2007; Harald van Dijk +files/0.92.0/windowmaker-0.92.0-as-needed.patch, diff --git a/x11-wm/windowmaker/Manifest b/x11-wm/windowmaker/Manifest index 1b403b10f478..6668d610cfe6 100644 --- a/x11-wm/windowmaker/Manifest +++ b/x11-wm/windowmaker/Manifest @@ -1,6 +1,3 @@ ------BEGIN PGP SIGNED MESSAGE----- -Hash: SHA1 - AUX 0.91.0/64bit+endian-fixes-0.9x.patch 4831 RMD160 3faeee2ee8c812808bd88a95cdce395ca84843e9 SHA1 a599063bc73a7cb5bdadeba7c112fff1271746ce SHA256 f39eff1216a2207f72ebd95785759627e7cf8fc723bafce987633b85dec616c0 MD5 c53a14e14931247288ba66cb017a9f42 files/0.91.0/64bit+endian-fixes-0.9x.patch 4831 RMD160 3faeee2ee8c812808bd88a95cdce395ca84843e9 files/0.91.0/64bit+endian-fixes-0.9x.patch 4831 @@ -21,10 +18,6 @@ AUX 0.91.0/wlist-0.9x.patch 2980 RMD160 903fb1977228f651868515ca9719343b6f03ed4b MD5 3a5eaebd5ccf7d3384c042e13f52bef1 files/0.91.0/wlist-0.9x.patch 2980 RMD160 903fb1977228f651868515ca9719343b6f03ed4b files/0.91.0/wlist-0.9x.patch 2980 SHA256 5f9ba4d49371e517834f9c8e1718cab943a682c43c573b1e6b6541bbf96b8a5d files/0.91.0/wlist-0.9x.patch 2980 -AUX 0.92.0/windowmaker-0.92.0-as-needed.patch 1491 RMD160 7f639462ae66ae93038696771dd7115c4fd553e3 SHA1 253376e5dc6028d507e4725a194e3567daf0cc7d SHA256 517aecfdbe870ac3a8a950cd0fe4967b29e3820a0b64330a07b4d6c4ce90194a -MD5 211f1ef7a1d3163f7c5ccf9ba0638659 files/0.92.0/windowmaker-0.92.0-as-needed.patch 1491 -RMD160 7f639462ae66ae93038696771dd7115c4fd553e3 files/0.92.0/windowmaker-0.92.0-as-needed.patch 1491 -SHA256 517aecfdbe870ac3a8a950cd0fe4967b29e3820a0b64330a07b4d6c4ce90194a files/0.92.0/windowmaker-0.92.0-as-needed.patch 1491 AUX 0.92.0/windowmaker-0.92.0-configure.patch 1003 RMD160 cd91114ae8d8a3e96ac04887ccdfcb128d7936b7 SHA1 66e9a3cacf1a5aed75ff8903a5536a1c8ace4639 SHA256 a71a4245be52013bb985b63508727fb19a379fbcbebfa89cdb00c02dbd796089 MD5 9e44d5155908f93890795d1df3845250 files/0.92.0/windowmaker-0.92.0-configure.patch 1003 RMD160 cd91114ae8d8a3e96ac04887ccdfcb128d7936b7 files/0.92.0/windowmaker-0.92.0-configure.patch 1003 @@ -41,6 +34,10 @@ AUX 0.92.0/windowmaker-0.92.0-gif-before-ungif.patch 877 RMD160 837849d3c2701a88 MD5 705e71f4e9e8a005d81cdddb56790729 files/0.92.0/windowmaker-0.92.0-gif-before-ungif.patch 877 RMD160 837849d3c2701a8848972e5a7d366b2815677b71 files/0.92.0/windowmaker-0.92.0-gif-before-ungif.patch 877 SHA256 3b0608d45484f1d47b780baa68cede5bbbff2f28da65019aff0b0386cf0125b4 files/0.92.0/windowmaker-0.92.0-gif-before-ungif.patch 877 +AUX 0.92.0/windowmaker-0.92.0-math_h.patch 584 RMD160 0cc28eed098937a7adf70a49c8d5784c4385570b SHA1 0abcd4b4cf2f5e87cede994196ee1098466855de SHA256 b84fd57c6c1f9ca2b61354487bb09b55d1c9155dfde7b37d49fc115d1d44a28c +MD5 63b38c1397924f3fd25c40c2fc3d247b files/0.92.0/windowmaker-0.92.0-math_h.patch 584 +RMD160 0cc28eed098937a7adf70a49c8d5784c4385570b files/0.92.0/windowmaker-0.92.0-math_h.patch 584 +SHA256 b84fd57c6c1f9ca2b61354487bb09b55d1c9155dfde7b37d49fc115d1d44a28c files/0.92.0/windowmaker-0.92.0-math_h.patch 584 AUX 0.92.0/windowmaker-0.92.0-qtdialogsfix.patch 2071 RMD160 6b66f1f4c91196dae32876c5adb0eeb54733fbba SHA1 41051888180dd490cb0f65a7e02667ee7be723a2 SHA256 5f442989d9d0ba352a8c327e4ffaa39e72362eb1719d9b50e5bb90f63c9b096f MD5 f20ef384ecebb7c4b293c63de8721c0b files/0.92.0/windowmaker-0.92.0-qtdialogsfix.patch 2071 RMD160 6b66f1f4c91196dae32876c5adb0eeb54733fbba files/0.92.0/windowmaker-0.92.0-qtdialogsfix.patch 2071 @@ -65,14 +62,14 @@ EBUILD windowmaker-0.92.0-r4.ebuild 3739 RMD160 e3c59b2492d915b138dd8e36d11a1407 MD5 4a7683613dad75e119fc95a7fe93a672 windowmaker-0.92.0-r4.ebuild 3739 RMD160 e3c59b2492d915b138dd8e36d11a1407d4050425 windowmaker-0.92.0-r4.ebuild 3739 SHA256 58a71596cd25488628c487b54c1d9c742d3783d0ea6fca01e22ffc251f068e79 windowmaker-0.92.0-r4.ebuild 3739 -EBUILD windowmaker-0.92.0-r5.ebuild 5982 RMD160 ccc2247787153af0cd31a033bbd31ce07dfcdd34 SHA1 8dbff088777c4dd0c89093e62b51d22ba7225d3f SHA256 dc042073b66abe49fc7f3630e2e991832dd269546bd4783820dec7d1742a3615 -MD5 29d421fc1a84c1218361a002a67a5313 windowmaker-0.92.0-r5.ebuild 5982 -RMD160 ccc2247787153af0cd31a033bbd31ce07dfcdd34 windowmaker-0.92.0-r5.ebuild 5982 -SHA256 dc042073b66abe49fc7f3630e2e991832dd269546bd4783820dec7d1742a3615 windowmaker-0.92.0-r5.ebuild 5982 -MISC ChangeLog 20448 RMD160 363f298d69bf08d19fb961df37a22a8154f6cd59 SHA1 beef3b1c97aec56e7ba73bdf8f4811fa2a6fa270 SHA256 b571e7fcced92f3de23793ed5aa30d66b7e4ddfa2e21f70aebc43acd2f1eb86d -MD5 f582a35809904b85095b539a37de3753 ChangeLog 20448 -RMD160 363f298d69bf08d19fb961df37a22a8154f6cd59 ChangeLog 20448 -SHA256 b571e7fcced92f3de23793ed5aa30d66b7e4ddfa2e21f70aebc43acd2f1eb86d ChangeLog 20448 +EBUILD windowmaker-0.92.0-r6.ebuild 5910 RMD160 3b8eb237ef7d42061e7defbcb5e5df7f12c5c648 SHA1 6061eb813dc1dac444b42b2eb2fd7dc483c62c83 SHA256 3b9fc6fd1507ebe704a26d2a9d42a2a79622851bad29908afffb7c92046ac07d +MD5 3957fbf0bc7e51cf0ac8ad7b86dbd97c windowmaker-0.92.0-r6.ebuild 5910 +RMD160 3b8eb237ef7d42061e7defbcb5e5df7f12c5c648 windowmaker-0.92.0-r6.ebuild 5910 +SHA256 3b9fc6fd1507ebe704a26d2a9d42a2a79622851bad29908afffb7c92046ac07d windowmaker-0.92.0-r6.ebuild 5910 +MISC ChangeLog 20893 RMD160 9d8ec90879d7124f01cb557da6dd5299cf736900 SHA1 1dab9c1093b2123fefa6570aee4ed5379c630ce1 SHA256 d97f82e99057792ec08a2a8af266e963bc5795000f8b00f68c7fe4fa05a15173 +MD5 d91736524d26072d74ef9179ec733c26 ChangeLog 20893 +RMD160 9d8ec90879d7124f01cb557da6dd5299cf736900 ChangeLog 20893 +SHA256 d97f82e99057792ec08a2a8af266e963bc5795000f8b00f68c7fe4fa05a15173 ChangeLog 20893 MISC metadata.xml 160 RMD160 ddb4d678bca64884df87cfab19e00ed9b1ff68a7 SHA1 b3d2981594e6dc70e8f74882cb08b541e1031987 SHA256 264f651f5dc3c8c2d37605e94abe49e6b29b7aed9131e82b473f27e12d67ebe7 MD5 72c8d22e50caaf5dd42b1823f5874206 metadata.xml 160 RMD160 ddb4d678bca64884df87cfab19e00ed9b1ff68a7 metadata.xml 160 @@ -86,13 +83,6 @@ SHA256 f1929cf5dfc688631773e6f18c3e9b0856863825579b372b7a25593125216a30 files/di MD5 c65600a9a881a199e1f0b5d85ac91a40 files/digest-windowmaker-0.92.0-r4 524 RMD160 7ecd7073fbe68cedeb28ab5df95b8df4491e4f37 files/digest-windowmaker-0.92.0-r4 524 SHA256 f1929cf5dfc688631773e6f18c3e9b0856863825579b372b7a25593125216a30 files/digest-windowmaker-0.92.0-r4 524 -MD5 2459d0146419b63c6f799390b249660f files/digest-windowmaker-0.92.0-r5 816 -RMD160 da338d4eff641c03d2279f0bfe41e7720ce5dc18 files/digest-windowmaker-0.92.0-r5 816 -SHA256 b4b6a0cc104598fc196e077278ff9f9346fb13f3bb5dc0445c7efd0b64697fed files/digest-windowmaker-0.92.0-r5 816 ------BEGIN PGP SIGNATURE----- -Version: GnuPG v2.0.7 (GNU/Linux) - -iD8DBQFHQGbLwnQyISwouHwRAjJFAJ97IVmfIfXCmPR2hSGJ6eC1gEb27QCfUDVc -TAFz+KCs2Aha4hr2ckqODFw= -=bVEe ------END PGP SIGNATURE----- +MD5 2459d0146419b63c6f799390b249660f files/digest-windowmaker-0.92.0-r6 816 +RMD160 da338d4eff641c03d2279f0bfe41e7720ce5dc18 files/digest-windowmaker-0.92.0-r6 816 +SHA256 b4b6a0cc104598fc196e077278ff9f9346fb13f3bb5dc0445c7efd0b64697fed files/digest-windowmaker-0.92.0-r6 816 diff --git a/x11-wm/windowmaker/files/0.92.0/windowmaker-0.92.0-as-needed.patch b/x11-wm/windowmaker/files/0.92.0/windowmaker-0.92.0-as-needed.patch deleted file mode 100644 index 5b370d10a374..000000000000 --- a/x11-wm/windowmaker/files/0.92.0/windowmaker-0.92.0-as-needed.patch +++ /dev/null @@ -1,58 +0,0 @@ - - Fix building with --as-needed (bug #199520), make sure libWINGs gets - installed, and add a missing #include . - ---- WindowMaker-0.92.0/configure.ac -+++ WindowMaker-0.92.0/configure.ac -@@ -78,7 +78,8 @@ - [ --with-incs-from pass compiler flags to look for header files], - [inc_search_path="$withval $inc_search_path"]) - -- -+AC_CHECK_LIBM -+AC_SUBST([LIBM]) - - dnl Checks for library functions. - dnl ============================ ---- WindowMaker-0.92.0/src/placement.c -+++ WindowMaker-0.92.0/src/placement.c -@@ -27,6 +27,7 @@ - #include - #include - #include -+#include - - #include "WindowMaker.h" - #include "wcore.h" ---- WindowMaker-0.92.0/WINGs/Extras/Makefile.am -+++ WindowMaker-0.92.0/WINGs/Extras/Makefile.am -@@ -31,5 +31,6 @@ - $(top_builddir)/WINGs/libWUtil.la \ - @XFTLIBS@ @INTLIBS@ - -+libExtraWINGs_la_LIBADD = $(LDADD) - test_LDADD = wtableview.o wtabledelegates.o $(LDADD) - ---- WindowMaker-0.92.0/WINGs/Makefile.am -+++ WindowMaker-0.92.0/WINGs/Makefile.am -@@ -6,6 +6,10 @@ - - - -+libWINGs_la_DEPENDENCIES = libWUtil.la -+libWINGs_la_LIBADD = libWUtil.la \ -+ $(top_builddir)/wrlib/libwraster.la \ -+ @LIBM@ @XLIBS@ @XFTLIBS@ - libWINGs_la_LDFLAGS = -version-info 2:1:0 - libWUtil_la_LDFLAGS = -version-info 1:2:0 - ---- WindowMaker-0.92.0/wmlib/Makefile.am -+++ WindowMaker-0.92.0/wmlib/Makefile.am -@@ -8,6 +8,7 @@ - - INCLUDES = $(DFLAGS) @XCFLAGS@ - -+libWMaker_la_LIBADD = @XLIBS@ - libWMaker_la_SOURCES = \ - menu.c \ - app.c \ diff --git a/x11-wm/windowmaker/files/0.92.0/windowmaker-0.92.0-math_h.patch b/x11-wm/windowmaker/files/0.92.0/windowmaker-0.92.0-math_h.patch new file mode 100644 index 000000000000..8c83d4da2c5c --- /dev/null +++ b/x11-wm/windowmaker/files/0.92.0/windowmaker-0.92.0-math_h.patch @@ -0,0 +1,25 @@ + + Add a missing #include . + +--- WindowMaker-0.92.0/configure.ac ++++ WindowMaker-0.92.0/configure.ac +@@ -78,7 +78,8 @@ + [ --with-incs-from pass compiler flags to look for header files], + [inc_search_path="$withval $inc_search_path"]) + +- ++AC_CHECK_LIBM ++AC_SUBST([LIBM]) + + dnl Checks for library functions. + dnl ============================ +--- WindowMaker-0.92.0/src/placement.c ++++ WindowMaker-0.92.0/src/placement.c +@@ -27,6 +27,7 @@ + #include + #include + #include ++#include + + #include "WindowMaker.h" + #include "wcore.h" diff --git a/x11-wm/windowmaker/files/digest-windowmaker-0.92.0-r5 b/x11-wm/windowmaker/files/digest-windowmaker-0.92.0-r5 deleted file mode 100644 index b17f3551cfd5..000000000000 --- a/x11-wm/windowmaker/files/digest-windowmaker-0.92.0-r5 +++ /dev/null @@ -1,9 +0,0 @@ -MD5 678cb4a9b22a557cfb524dc3cb457c08 WindowMaker-0.92.0.tar.gz 2758524 -RMD160 b8bebed6a34696625ae0ae7c0ebcfdfc0ba09cdd WindowMaker-0.92.0.tar.gz 2758524 -SHA256 9edaa8d9ee6e6beb06f4c391c0aec5cd0e5b5494456cae2cdcfd49656177afc6 WindowMaker-0.92.0.tar.gz 2758524 -MD5 07c7700daaaf232bc490f5abaabef085 WindowMaker-extra-0.1.tar.gz 238018 -RMD160 94334c2c12d20a8fd0cd2a70e54cd3689f043038 WindowMaker-extra-0.1.tar.gz 238018 -SHA256 acd6e1fb790485b107daf2b710da372367b41383c55d9c8bdfdac521d850edc4 WindowMaker-extra-0.1.tar.gz 238018 -MD5 59d84318ff6516edf6e3ddadb3caa9c1 windowmaker-0.92.0-patchset-1.tar.bz2 196673 -RMD160 963b1941afd2b5038845e2d89fb2dffade9c17e0 windowmaker-0.92.0-patchset-1.tar.bz2 196673 -SHA256 0548af8e03a3696baf868966015400c9de5438e75dff4df7392ca58c61bf9365 windowmaker-0.92.0-patchset-1.tar.bz2 196673 diff --git a/x11-wm/windowmaker/files/digest-windowmaker-0.92.0-r6 b/x11-wm/windowmaker/files/digest-windowmaker-0.92.0-r6 new file mode 100644 index 000000000000..b17f3551cfd5 --- /dev/null +++ b/x11-wm/windowmaker/files/digest-windowmaker-0.92.0-r6 @@ -0,0 +1,9 @@ +MD5 678cb4a9b22a557cfb524dc3cb457c08 WindowMaker-0.92.0.tar.gz 2758524 +RMD160 b8bebed6a34696625ae0ae7c0ebcfdfc0ba09cdd WindowMaker-0.92.0.tar.gz 2758524 +SHA256 9edaa8d9ee6e6beb06f4c391c0aec5cd0e5b5494456cae2cdcfd49656177afc6 WindowMaker-0.92.0.tar.gz 2758524 +MD5 07c7700daaaf232bc490f5abaabef085 WindowMaker-extra-0.1.tar.gz 238018 +RMD160 94334c2c12d20a8fd0cd2a70e54cd3689f043038 WindowMaker-extra-0.1.tar.gz 238018 +SHA256 acd6e1fb790485b107daf2b710da372367b41383c55d9c8bdfdac521d850edc4 WindowMaker-extra-0.1.tar.gz 238018 +MD5 59d84318ff6516edf6e3ddadb3caa9c1 windowmaker-0.92.0-patchset-1.tar.bz2 196673 +RMD160 963b1941afd2b5038845e2d89fb2dffade9c17e0 windowmaker-0.92.0-patchset-1.tar.bz2 196673 +SHA256 0548af8e03a3696baf868966015400c9de5438e75dff4df7392ca58c61bf9365 windowmaker-0.92.0-patchset-1.tar.bz2 196673 diff --git a/x11-wm/windowmaker/windowmaker-0.92.0-r5.ebuild b/x11-wm/windowmaker/windowmaker-0.92.0-r5.ebuild deleted file mode 100644 index df2ac19df4f2..000000000000 --- a/x11-wm/windowmaker/windowmaker-0.92.0-r5.ebuild +++ /dev/null @@ -1,177 +0,0 @@ -# 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.2 2007/11/18 15:22:27 truedfx Exp $ - -inherit autotools eutils gnustep-base flag-o-matic - -PATCHVER=1 -S=${WORKDIR}/${P/windowm/WindowM} - -DESCRIPTION="The fast and light GNUstep window manager" -SRC_URI="ftp://ftp.windowmaker.info/pub/source/release/${P/windowm/WindowM}.tar.gz - http://www.windowmaker.info/pub/source/release/WindowMaker-extra-0.1.tar.gz - http://www.gentoo.org/~grobian/distfiles/${P}-patchset-${PATCHVER}.tar.bz2" -HOMEPAGE="http://www.windowmaker.info/" - -IUSE="gif gnustep jpeg nls png tiff modelock xinerama" -DEPEND="x11-libs/libXv - x11-libs/libXft - x11-libs/libXt - media-libs/fontconfig - gif? ( >=media-libs/giflib-4.1.0-r3 ) - png? ( >=media-libs/libpng-1.2.1 ) - jpeg? ( >=media-libs/jpeg-6b-r2 ) - tiff? ( >=media-libs/tiff-3.6.1-r2 ) - gnustep? ( >=gnustep-base/gnustep-make-2.0 )" -RDEPEND="${DEPEND} - nls? ( >=sys-devel/gettext-0.10.39 )" - -SLOT="0" -LICENSE="GPL-2" -KEYWORDS="~alpha ~amd64 ~hppa ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd" - -src_unpack() { - is-flag -fstack-protector && filter-flags -fstack-protector \ - && ewarn "CFLAG -fstack-protector has been disabled, as it is known to cause bugs with WindowMaker (bug #78051)" && ebeep 2 - replace-flags "-Os" "-O2" - replace-flags "-O3" "-O2" - - unpack ${A} - cd "${S}" - local psd="${WORKDIR}"/${P}-patchset-${PATCHVER} - - epatch "${psd}"/WindowMaker-0.92.0-cvs20060123.patch - epatch "${psd}"/WindowMaker-0.92.0-cvs-gcc41.patch - epatch "${FILESDIR}"/${PV/0.92/0.91}/wlist-0.9x.patch - epatch "${FILESDIR}"/${PV}/${P}-gif-before-ungif.patch - - # Patches from altlinux - epatch "${psd}"/WindowMaker-0.91.0-alt-sowings.patch - epatch "${psd}"/WindowMaker-0.91.0-alt-session.patch - epatch "${psd}"/WindowMaker-0.91.0-alt-restartscrpt.patch - epatch "${psd}"/WindowMaker-0.91.0-alt-menutrans.patch - epatch "${psd}"/WindowMaker-0.91.0-alt-titlebar.patch - epatch "${psd}"/WindowMaker-0.91.0-alt-clipnotext.patch - epatch "${psd}"/WindowMaker-0.91.0-alt-mmx.patch - epatch "${psd}"/WindowMaker-0.80.2-cvs-alt-textfield.patch - epatch "${psd}"/WindowMaker-0.91.0-alt-focus.patch - - # New features (cool!) - epatch "${FILESDIR}"/${PV/0.92/0.91}/singleclick-shadeormaxopts-0.9x.patch2 - epatch "${psd}"/WindowMaker-0.91.0-alt-dockhotkeys.patch - epatch "${psd}"/WindowMaker-0.91.0-alt-vlaad-trance.patch - epatch "${psd}"/WindowMaker-0.91.0-alt-vlaad-newbuttons.patch - epatch "${psd}"/WindowMaker-0.91.0-alt-adialog.patch - epatch "${psd}"/WindowMaker-0.91.0-hmepas-minimizeall.patch - epatch "${psd}"/WindowMaker-0.91.0-hmepas-swmenu_rclick.patch - epatch "${psd}"/WindowMaker-0.91.0-sga-moving-add.patch - epatch "${psd}"/WindowMaker-0.91.0-peter-newappicon.patch - epatch "${psd}"/WindowMaker-0.91.0-peter-mouse-placement.patch - epatch "${psd}"/WindowMaker-0.91.0-peter-appicon-bouncer2.patch - 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 - - # Add newbuttons resources - cp "${psd}"/WindowMaker-newbuttons.nextstyle.tiff \ - WPrefs.app/tiff/nextstyle.tiff - cp "${psd}"/WindowMaker-newbuttons.oldstyle.tiff \ - WPrefs.app/tiff/oldstyle.tiff - cp "${psd}"/WindowMaker-newbuttons.nextstyle.xpm \ - WPrefs.app/xpm/nextstyle.xpm - - # Fix some paths - if use gnustep; then - egnustep_env - fi - 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" - else - 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" - fi; - done; - - eautoreconf || die "eautoreconf failed" -} - -src_compile() { - 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 xinerama)" - - if use gnustep ; then - egnustep_env - # Gentoo installs everything in System, make sure configure honors that - export GNUSTEP_LOCAL_ROOT=${GNUSTEP_SYSTEM_ROOT} - myconf="${myconf} --with-gnustepdir=${GNUSTEP_SYSTEM_ROOT}" - fi - - if use nls; then - [ -z "$LINGUAS" ] && export LINGUAS="`ls po/*.po | sed 's:po/\(.*\)\.po$:\1:'`" - append-ldflags -lgettextlib - else - myconf="${myconf} --disable-locale" - fi - - # enable new features, need to be done via defines - append-flags -DBOUNCE_APP -DNEWAPPICON -DVIRTUAL_DESKTOP - - # Solaris has inet_aton, but it's hidden in -lresolv - [[ ${CHOST} == *-solaris* ]] && append-ldflags -lresolv - - # default settings with $myconf appended - econf \ - --sysconfdir=/etc/X11 \ - --with-x \ - --enable-usermenu \ - --with-pixmapdir=/usr/share/pixmaps \ - --with-nlsdir=/usr/share/locale \ - ${myconf} || die - - emake || die "windowmaker: make has failed" - - # WindowMaker Extra Package (themes and icons) - cd ../WindowMaker-extra-0.1 - econf || die "windowmaker-extra: configure has failed" - emake || die "windowmaker-extra: make has failed" -} - -src_install() { - emake DESTDIR="${D}" install || die "windowmaker: install has failed." - - dodoc AUTHORS BUGFORM BUGS ChangeLog COPYING* INSTALL* FAQ* \ - MIRRORS README* NEWS TODO - - # WindowMaker Extra - cd ../WindowMaker-extra-0.1 - emake DESTDIR="${D}" install || die "windowmaker-extra: install failed" - - newdoc README README.extra - - # create wmaker session shell script - echo "#!/usr/bin/env bash" > wmaker - echo "/usr/bin/wmaker" >> wmaker - exeinto /etc/X11/Sessions/ - doexe wmaker - - insinto /etc/X11/dm/Sessions - doins "${FILESDIR}"/wmaker.desktop - make_desktop_entry /usr/bin/wmaker -} diff --git a/x11-wm/windowmaker/windowmaker-0.92.0-r6.ebuild b/x11-wm/windowmaker/windowmaker-0.92.0-r6.ebuild new file mode 100644 index 000000000000..38b83d13947c --- /dev/null +++ b/x11-wm/windowmaker/windowmaker-0.92.0-r6.ebuild @@ -0,0 +1,174 @@ +# 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-r6.ebuild,v 1.1 2007/11/21 19:54:40 grobian Exp $ + +inherit autotools eutils gnustep-base flag-o-matic + +PATCHVER=1 +S=${WORKDIR}/${P/windowm/WindowM} + +DESCRIPTION="The fast and light GNUstep window manager" +SRC_URI="ftp://ftp.windowmaker.info/pub/source/release/${P/windowm/WindowM}.tar.gz + http://www.windowmaker.info/pub/source/release/WindowMaker-extra-0.1.tar.gz + http://www.gentoo.org/~grobian/distfiles/${P}-patchset-${PATCHVER}.tar.bz2" +HOMEPAGE="http://www.windowmaker.info/" + +IUSE="gif gnustep jpeg nls png tiff modelock xinerama" +DEPEND="x11-libs/libXv + x11-libs/libXft + x11-libs/libXt + media-libs/fontconfig + gif? ( >=media-libs/giflib-4.1.0-r3 ) + png? ( >=media-libs/libpng-1.2.1 ) + jpeg? ( >=media-libs/jpeg-6b-r2 ) + tiff? ( >=media-libs/tiff-3.6.1-r2 ) + gnustep? ( >=gnustep-base/gnustep-make-2.0 )" +RDEPEND="${DEPEND} + nls? ( >=sys-devel/gettext-0.10.39 )" + +SLOT="0" +LICENSE="GPL-2" +KEYWORDS="~alpha ~amd64 ~hppa ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd" + +src_unpack() { + is-flag -fstack-protector && filter-flags -fstack-protector \ + && ewarn "CFLAG -fstack-protector has been disabled, as it is known to cause bugs with WindowMaker (bug #78051)" && ebeep 2 + replace-flags "-Os" "-O2" + replace-flags "-O3" "-O2" + + unpack ${A} + cd "${S}" + local psd="${WORKDIR}"/${P}-patchset-${PATCHVER} + + epatch "${psd}"/WindowMaker-0.92.0-cvs20060123.patch + epatch "${psd}"/WindowMaker-0.92.0-cvs-gcc41.patch + epatch "${FILESDIR}"/${PV/0.92/0.91}/wlist-0.9x.patch + epatch "${FILESDIR}"/${PV}/${P}-gif-before-ungif.patch + epatch "${FILESDIR}"/${PV}/${P}-math_h.patch + + # Patches from altlinux + epatch "${psd}"/WindowMaker-0.91.0-alt-session.patch + epatch "${psd}"/WindowMaker-0.91.0-alt-restartscrpt.patch + epatch "${psd}"/WindowMaker-0.91.0-alt-menutrans.patch + epatch "${psd}"/WindowMaker-0.91.0-alt-titlebar.patch + epatch "${psd}"/WindowMaker-0.91.0-alt-clipnotext.patch + epatch "${psd}"/WindowMaker-0.91.0-alt-mmx.patch + epatch "${psd}"/WindowMaker-0.80.2-cvs-alt-textfield.patch + epatch "${psd}"/WindowMaker-0.91.0-alt-focus.patch + + # New features (cool!) + epatch "${FILESDIR}"/${PV/0.92/0.91}/singleclick-shadeormaxopts-0.9x.patch2 + epatch "${psd}"/WindowMaker-0.91.0-alt-dockhotkeys.patch + epatch "${psd}"/WindowMaker-0.91.0-alt-vlaad-trance.patch + epatch "${psd}"/WindowMaker-0.91.0-alt-vlaad-newbuttons.patch + epatch "${psd}"/WindowMaker-0.91.0-alt-adialog.patch + epatch "${psd}"/WindowMaker-0.91.0-hmepas-minimizeall.patch + epatch "${psd}"/WindowMaker-0.91.0-hmepas-swmenu_rclick.patch + epatch "${psd}"/WindowMaker-0.91.0-sga-moving-add.patch + epatch "${psd}"/WindowMaker-0.91.0-peter-newappicon.patch + epatch "${psd}"/WindowMaker-0.91.0-peter-mouse-placement.patch + epatch "${psd}"/WindowMaker-0.91.0-peter-appicon-bouncer2.patch + epatch "${psd}"/WindowMaker-0.91.0-sga-swpanel-customization.patch + epatch "${psd}"/WindowMaker-0.92.0-alt-newpo.patch + + # Add UK localisation + cp "${psd}"/WindowMaker-uk.po po/uk.po + cp "${psd}"/WPrefs-uk.po WPrefs.app/po/uk.po + + # Add newbuttons resources + cp "${psd}"/WindowMaker-newbuttons.nextstyle.tiff \ + WPrefs.app/tiff/nextstyle.tiff + cp "${psd}"/WindowMaker-newbuttons.oldstyle.tiff \ + WPrefs.app/tiff/oldstyle.tiff + cp "${psd}"/WindowMaker-newbuttons.nextstyle.xpm \ + WPrefs.app/xpm/nextstyle.xpm + + # Fix some paths + if use gnustep; then + egnustep_env + fi + 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" + else + 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" + fi; + done; + + eautoreconf || die "eautoreconf failed" +} + +src_compile() { + 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 xinerama)" + + if use gnustep ; then + egnustep_env + # Gentoo installs everything in System, make sure configure honors that + export GNUSTEP_LOCAL_ROOT=${GNUSTEP_SYSTEM_ROOT} + myconf="${myconf} --with-gnustepdir=${GNUSTEP_SYSTEM_ROOT}" + fi + + if use nls; then + [ -z "$LINGUAS" ] && export LINGUAS="`ls po/*.po | sed 's:po/\(.*\)\.po$:\1:'`" + append-ldflags -lgettextlib + else + myconf="${myconf} --disable-locale" + fi + + # enable new features, need to be done via defines + append-flags -DBOUNCE_APP -DNEWAPPICON -DVIRTUAL_DESKTOP + + # Solaris has inet_aton, but it's hidden in -lresolv + [[ ${CHOST} == *-solaris* ]] && append-ldflags -lresolv + + # default settings with $myconf appended + econf \ + --sysconfdir=/etc/X11 \ + --with-x \ + --enable-usermenu \ + --with-pixmapdir=/usr/share/pixmaps \ + --with-nlsdir=/usr/share/locale \ + ${myconf} || die + + emake || die "windowmaker: make has failed" + + # WindowMaker Extra Package (themes and icons) + cd ../WindowMaker-extra-0.1 + econf || die "windowmaker-extra: configure has failed" + emake || die "windowmaker-extra: make has failed" +} + +src_install() { + emake DESTDIR="${D}" install || die "windowmaker: install has failed." + + dodoc AUTHORS BUGFORM BUGS ChangeLog COPYING* INSTALL* FAQ* \ + MIRRORS README* NEWS TODO + + # WindowMaker Extra + cd ../WindowMaker-extra-0.1 + emake DESTDIR="${D}" install || die "windowmaker-extra: install failed" + + newdoc README README.extra + + # create wmaker session shell script + echo "#!/usr/bin/env bash" > wmaker + echo "/usr/bin/wmaker" >> wmaker + exeinto /etc/X11/Sessions/ + doexe wmaker + + insinto /etc/X11/dm/Sessions + doins "${FILESDIR}"/wmaker.desktop + make_desktop_entry /usr/bin/wmaker +} -- cgit v1.2.3-65-gdbad