summaryrefslogtreecommitdiff
path: root/x11-wm
diff options
context:
space:
mode:
authorLuis Medinas <metalgod@gentoo.org>2006-01-31 16:08:13 +0000
committerLuis Medinas <metalgod@gentoo.org>2006-01-31 16:08:13 +0000
commitc7f19a222124d04b26454559376791d9edca0d38 (patch)
tree828562cd68d7565629599cb7ca999541e772b01b /x11-wm
parentVersion bump. (diff)
downloadhistorical-c7f19a222124d04b26454559376791d9edca0d38.tar.gz
historical-c7f19a222124d04b26454559376791d9edca0d38.tar.bz2
historical-c7f19a222124d04b26454559376791d9edca0d38.zip
Added a patch to fix qt dialogs thanks to Dejan Lesjak <dejan.lesjak@ijs.si> closes bug #120187. Modular X love to 0.80 series.
Package-Manager: portage-2.1_pre4-r1
Diffstat (limited to 'x11-wm')
-rw-r--r--x11-wm/windowmaker/ChangeLog11
-rw-r--r--x11-wm/windowmaker/Manifest77
-rw-r--r--x11-wm/windowmaker/files/0.92.0/windowmaker-0.92.0-qtdialogsfix.patch84
-rw-r--r--x11-wm/windowmaker/files/digest-windowmaker-0.92.0-r36
-rw-r--r--x11-wm/windowmaker/windowmaker-0.80.2-r2.ebuild4
-rw-r--r--x11-wm/windowmaker/windowmaker-0.80.2-r4.ebuild4
-rw-r--r--x11-wm/windowmaker/windowmaker-0.92.0-r3.ebuild172
7 files changed, 347 insertions, 11 deletions
diff --git a/x11-wm/windowmaker/ChangeLog b/x11-wm/windowmaker/ChangeLog
index 5493baa5f0ff..58b0e7361361 100644
--- a/x11-wm/windowmaker/ChangeLog
+++ b/x11-wm/windowmaker/ChangeLog
@@ -1,6 +1,15 @@
# ChangeLog for x11-wm/windowmaker
# Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-wm/windowmaker/ChangeLog,v 1.64 2006/01/12 01:07:56 metalgod Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/windowmaker/ChangeLog,v 1.65 2006/01/31 16:08:13 metalgod Exp $
+
+*windowmaker-0.92.0-r3 (31 Jan 2006)
+
+ 31 Jan 2006; Luis Medinas <metalgod@gentoo.org>
+ +files/0.92.0/windowmaker-0.92.0-qtdialogsfix.patch,
+ windowmaker-0.80.2-r2.ebuild, windowmaker-0.80.2-r4.ebuild,
+ +windowmaker-0.92.0-r3.ebuild:
+ Added a patch to fix qt dialogs thanks to Dejan Lesjak <dejan.lesjak@ijs.si>
+ closes bug #120187. Modular X love to 0.80 series.
12 Jan 2006; Luis Medinas <metalgod@gentoo.org>
windowmaker-0.80.2-r2.ebuild, windowmaker-0.80.2-r4.ebuild,
diff --git a/x11-wm/windowmaker/Manifest b/x11-wm/windowmaker/Manifest
index df9d2eafc657..7c70ed4351eb 100644
--- a/x11-wm/windowmaker/Manifest
+++ b/x11-wm/windowmaker/Manifest
@@ -1,38 +1,103 @@
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
-MD5 2df446e770e19ec748c922eac1cb3f7c ChangeLog 15691
+MD5 4ba9cc4d1aa347cf018e0cff29f697f1 ChangeLog 16062
+RMD160 f4ebf72cdb29714b2056e85fa8aef4e6bc288d97 ChangeLog 16062
+SHA256 ab5ade1e118bd0b5b379e39f372f019c1b5ccb6582706ab980c605b3b971b123 ChangeLog 16062
MD5 c8eb68627dc7b53b10143626018ff597 files/0.80.2/gtk2flickerfix.patch 1969
+RMD160 a21c185c4d05ba166588e94ad064c87cb7de63eb files/0.80.2/gtk2flickerfix.patch 1969
+SHA256 50c6f7cb9691fd129364154f58f7f0eb4b9e9c80d48eb809fc8d1dd83ace08fe files/0.80.2/gtk2flickerfix.patch 1969
MD5 a42a33a349ca84fb6e2cc5fdbd627b99 files/0.80.2/trance.patch.WM-0.80.2.diff 9738
+RMD160 7d8e47b0e533582430520b0dfaf0d007bad24cbb files/0.80.2/trance.patch.WM-0.80.2.diff 9738
+SHA256 2959144bdd67a0a5fe838bbf59f68090f03e706f364919e5a841ea627672238b files/0.80.2/trance.patch.WM-0.80.2.diff 9738
MD5 9a5c9f1b2b44a678526f0fd71b2cf51d files/0.80.2/windowmaker-0.80.2-r1-gentoo.patch 4331
+RMD160 f336db370a026583f8e081301bb65d6e2b5f9db4 files/0.80.2/windowmaker-0.80.2-r1-gentoo.patch 4331
+SHA256 f7f278216747494d240e5b8fbf0e32502f99f079dafeaf8beb6db11d7e5365cc files/0.80.2/windowmaker-0.80.2-r1-gentoo.patch 4331
MD5 a062e261bd5aaca39bc17be01f07f1b6 files/0.80.2/wlist.patch 2776
+RMD160 815f5fc8d7a7716fa0806f332bd528bb87daa202 files/0.80.2/wlist.patch 2776
+SHA256 abe9e7f537b8aff5736e918a839e61ec039c65ebe68a4f2be9c664d07edfff67 files/0.80.2/wlist.patch 2776
MD5 37aefa1e6f793583e8fa7890231d1721 files/0.80.2/wmfpo.patch 7696
+RMD160 0c07dc0f3069c1bc70425c9a83d0bb2c254fb45e files/0.80.2/wmfpo.patch 7696
+SHA256 63f26a8cd7f1ce9273a12215dd1af1a9da397438e95edfaf48e988ca337c3d4f files/0.80.2/wmfpo.patch 7696
MD5 e451189d91551534b18988709274b73b files/0.80.2/xinerama.patch.bz2 5908
+RMD160 4b4de1389ca1b4a282a4f94a8eafca8dd01ac995 files/0.80.2/xinerama.patch.bz2 5908
+SHA256 f2a0d7a852aa1ebd2003624e7f678d8ff4f431ba1644906635ffd38e7fa73c5b files/0.80.2/xinerama.patch.bz2 5908
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
+SHA256 f39eff1216a2207f72ebd95785759627e7cf8fc723bafce987633b85dec616c0 files/0.91.0/64bit+endian-fixes-0.9x.patch 4831
MD5 0b1eb289596c8aa934b6c17362b0201c files/0.91.0/maximize-fix-0.9x.patch 1245
+RMD160 21b035369a382c189917fbc5090d05138cbd38d7 files/0.91.0/maximize-fix-0.9x.patch 1245
+SHA256 7883bb2ff68aee3411a3048b025541731c1dac710132dca30a511fa17f8588f1 files/0.91.0/maximize-fix-0.9x.patch 1245
MD5 c41215f830e33a636a440ce389db01eb files/0.91.0/menufocus.patch 1554
+RMD160 dc9e73943b3d36e0fa71d85c51e19555465224a8 files/0.91.0/menufocus.patch 1554
+SHA256 e334b8ac57fd5995e90047ef5cb0268a8dcfd64b008c957d1f05b823903bb484 files/0.91.0/menufocus.patch 1554
MD5 84bc0e347cd23ca347219959362afa91 files/0.91.0/singleclick-shadeormaxopts-0.9x.patch2 7788
+RMD160 c448c6ac9269650b89dfcc87bcf3bbbf9fb20fd8 files/0.91.0/singleclick-shadeormaxopts-0.9x.patch2 7788
+SHA256 4cdf6629afeaec576864f6738ffa62497e63a429d2db69ea5db01dbde3894f49 files/0.91.0/singleclick-shadeormaxopts-0.9x.patch2 7788
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
MD5 5abe2330c51f22194319220caf8503ff files/0.92.0/windowmaker-0.92.0-fullscreen.patch 500
+RMD160 9502957cd4affa92441911bacfd0fdf9b0c226ca files/0.92.0/windowmaker-0.92.0-fullscreen.patch 500
+SHA256 28dfdcac0c073bc08c06042ccc5ea97f6833c948238085321f80e3a4b3c0683c files/0.92.0/windowmaker-0.92.0-fullscreen.patch 500
MD5 b5ce486f7df03158abef49d88da24105 files/0.92.0/windowmaker-0.92.0-gcc41.patch 5212
+RMD160 087111b64a199ad56faa7fcc0e90c91540e35666 files/0.92.0/windowmaker-0.92.0-gcc41.patch 5212
+SHA256 aef2a3b6e3e74fad11e0c3cc338446b40e90af3f3a1b0d15d97c5e5d79449858 files/0.92.0/windowmaker-0.92.0-gcc41.patch 5212
+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
+SHA256 5f442989d9d0ba352a8c327e4ffaa39e72362eb1719d9b50e5bb90f63c9b096f files/0.92.0/windowmaker-0.92.0-qtdialogsfix.patch 2071
MD5 b5304655d4ff5441989ab94a1bdc9506 files/digest-windowmaker-0.80.2-r2 144
+RMD160 c33dd5597b6810444efb06d9e5288040b95349a9 files/digest-windowmaker-0.80.2-r2 144
+SHA256 24b0e6c8b118f95c17d995a161cdb6655bbc085e287be615fd9842dc88ee36e3 files/digest-windowmaker-0.80.2-r2 144
MD5 b5304655d4ff5441989ab94a1bdc9506 files/digest-windowmaker-0.80.2-r4 144
+RMD160 c33dd5597b6810444efb06d9e5288040b95349a9 files/digest-windowmaker-0.80.2-r4 144
+SHA256 24b0e6c8b118f95c17d995a161cdb6655bbc085e287be615fd9842dc88ee36e3 files/digest-windowmaker-0.80.2-r4 144
MD5 8b11b75a0ece3b854bf47e03ded7e0ba files/digest-windowmaker-0.91.0-r1 144
+RMD160 74e37e0a3100b0df33d5b90be337680aac4d5556 files/digest-windowmaker-0.91.0-r1 144
+SHA256 e66726aaf2b249c043adaf29f5ceb9e226d30db0b1135cc0c3f49962de3f863a files/digest-windowmaker-0.91.0-r1 144
MD5 4c748a4dd9d3e57dfe5c1d01ccac4b54 files/digest-windowmaker-0.91.0-r7 227
+RMD160 b31da3f02c035c4758daede724ff5891c1540c0e files/digest-windowmaker-0.91.0-r7 227
+SHA256 fff1b6d46b50988782c45a02d36274916a669740a8655ac7bfaed775e6cf4720 files/digest-windowmaker-0.91.0-r7 227
MD5 56fa606e28d04ba426e4d4cacc8d0b2d files/digest-windowmaker-0.92.0-r1 144
+RMD160 218776f4a36887dae3d7509c6984082f2efc9a1a files/digest-windowmaker-0.92.0-r1 144
+SHA256 ea41d4af91d6e98fcf212bc31d22bf4038c33fd933486f89ab8ba8a1b4d52ca3 files/digest-windowmaker-0.92.0-r1 144
MD5 56fa606e28d04ba426e4d4cacc8d0b2d files/digest-windowmaker-0.92.0-r2 144
+RMD160 218776f4a36887dae3d7509c6984082f2efc9a1a files/digest-windowmaker-0.92.0-r2 144
+SHA256 ea41d4af91d6e98fcf212bc31d22bf4038c33fd933486f89ab8ba8a1b4d52ca3 files/digest-windowmaker-0.92.0-r2 144
+MD5 c65600a9a881a199e1f0b5d85ac91a40 files/digest-windowmaker-0.92.0-r3 524
+RMD160 7ecd7073fbe68cedeb28ab5df95b8df4491e4f37 files/digest-windowmaker-0.92.0-r3 524
+SHA256 f1929cf5dfc688631773e6f18c3e9b0856863825579b372b7a25593125216a30 files/digest-windowmaker-0.92.0-r3 524
MD5 f70c1e1b121cfc32dbd802678f3b111f files/wmaker.desktop 221
+RMD160 501ba6451f7e756cc3d07682d728bcd6fe55366d files/wmaker.desktop 221
+SHA256 40359d3c61117f0dbc5eb547e4c369982427e8bc3174c95002d34eb30f9a4a84 files/wmaker.desktop 221
MD5 870a91577a60ccb6ea581e99f879e9b8 metadata.xml 248
-MD5 4c2fa2e58f69afaa7e8b53a09868e07f windowmaker-0.80.2-r2.ebuild 3435
-MD5 1cd863edc032e958fe6cc7c58fbf8d26 windowmaker-0.80.2-r4.ebuild 4066
+RMD160 507fd60616d5d14e274ac0628255acdddc90e4d4 metadata.xml 248
+SHA256 0d544700457efe5f7c24489f30572dd20c81a6d8879bf833f7d050408a79f36a metadata.xml 248
+MD5 d59f3d5b51ed7ff12ee5ff85fdf32f3a windowmaker-0.80.2-r2.ebuild 3461
+RMD160 eddb5c48822205485b20549cf2381862937f852c windowmaker-0.80.2-r2.ebuild 3461
+SHA256 7cf62fd49cf872941377fedc739451ea6f285dd06ad1fef2034a5fc84ddbd1ff windowmaker-0.80.2-r2.ebuild 3461
+MD5 3ceafc6ffa736e5cd7d21d18895e2aa1 windowmaker-0.80.2-r4.ebuild 4092
+RMD160 af26dde4e0c6108b14a871f8cae362995e4983b0 windowmaker-0.80.2-r4.ebuild 4092
+SHA256 23b5e053d0ef8fe0fed30ca80bfe02b98493743ea29c3849d9b61ba665ad5e36 windowmaker-0.80.2-r4.ebuild 4092
MD5 0b7d5f0f23bea9a4793a92f25117d9f3 windowmaker-0.91.0-r1.ebuild 5881
+RMD160 15401d0c46197d9c622f2557195387991a91728f windowmaker-0.91.0-r1.ebuild 5881
+SHA256 ad8f5120f78032a208d76d72a2ccaf49ec78c1cd0b51cec89a9a4aff10cf2f39 windowmaker-0.91.0-r1.ebuild 5881
MD5 6dfb07e767918268038ad952d0e38029 windowmaker-0.91.0-r7.ebuild 6800
+RMD160 fe3ece5d5d91f3f5a5edf1dd3132e05a879db9d1 windowmaker-0.91.0-r7.ebuild 6800
+SHA256 5fa0d751990414399edd296e609e714d43ee18b9726cf9a51ad2d2af60c90ed7 windowmaker-0.91.0-r7.ebuild 6800
MD5 7cd4046827ba9b7b99679af4c0a14586 windowmaker-0.92.0-r1.ebuild 5354
+RMD160 150ed9ada9911ebd989f13b74fc87ec8932d2dea windowmaker-0.92.0-r1.ebuild 5354
+SHA256 7bd59f2fc62317454bd6c74f3e57cd008d5b158974d7d90cbccb1857a4ee3006 windowmaker-0.92.0-r1.ebuild 5354
MD5 fc719636563d4ef47b1be6726231374d windowmaker-0.92.0-r2.ebuild 5217
+RMD160 0e70f591c2e1d7e945f3fc8a39bce886e02fb541 windowmaker-0.92.0-r2.ebuild 5217
+SHA256 86a9eaaa440913533a4c830e81972ed95be6c032c049d60e66a9961cd4257917 windowmaker-0.92.0-r2.ebuild 5217
+MD5 e805bca58ab50f9eab81ca66601ba50a windowmaker-0.92.0-r3.ebuild 5267
+RMD160 4b300eaf4e646874e5f4013bb10c7cd38e00e193 windowmaker-0.92.0-r3.ebuild 5267
+SHA256 e11ba6d5c8683c2e1af41e276217ee414c1f6a1a7f3527cbb10acb4320401d9e windowmaker-0.92.0-r3.ebuild 5267
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.2 (GNU/Linux)
-iD8DBQFDxgkqI1lqEGTUzyQRAgskAKC4LFT5fX2sJTJDYnmeFgUjbP/54gCgm1R+
-19KGGz3PCCfVtVM14tIPutk=
-=QnSb
+iD8DBQFD34rCwUpWvClEHQoRAmSoAJ4jf9AselomtWWrhf9WHGenrr0HJgCeNpPZ
+/BLiHVCujLYk1r6aZ6oOgDg=
+=huBW
-----END PGP SIGNATURE-----
diff --git a/x11-wm/windowmaker/files/0.92.0/windowmaker-0.92.0-qtdialogsfix.patch b/x11-wm/windowmaker/files/0.92.0/windowmaker-0.92.0-qtdialogsfix.patch
new file mode 100644
index 000000000000..626630e5e1ac
--- /dev/null
+++ b/x11-wm/windowmaker/files/0.92.0/windowmaker-0.92.0-qtdialogsfix.patch
@@ -0,0 +1,84 @@
+--- src/wmspec.c.sav 2004-10-24 21:36:15.000000000 +0200
++++ src/wmspec.c 2005-01-26 17:13:54.266216856 +0100
+@@ -314,15 +314,15 @@
+ void
+ wNETWMUpdateDesktop(WScreen *scr)
+ {
+- CARD32 *views, sizes[2];
++ long *views, sizes[2];
+ int count, i;
+
+ if (scr->workspace_count==0)
+ return;
+
+ count = scr->workspace_count * 2;
+- views = wmalloc(sizeof(CARD32) * count);
+- /*memset(views, 0, sizeof(CARD32) * count);*/
++ views = wmalloc(sizeof(long) * count);
++ /*memset(views, 0, sizeof(long) * count);*/
+
+ #ifdef VIRTUAL_DESKTOP
+ sizes[0] = scr->workspaces[scr->current_workspace]->width;
+@@ -362,7 +362,7 @@
+ 0, 1, &count);
+ if (prop)
+ {
+- int desktop= *(CARD32*)prop;
++ int desktop= *(long*)prop;
+ XFree(prop);
+ return desktop;
+ }
+@@ -426,7 +426,7 @@
+ static void
+ updateShowDesktop(WScreen * scr, Bool show)
+ {
+- CARD32 foo;
++ long foo;
+
+ foo = (show == True);
+ XChangeProperty(dpy, scr->root_win, net_showing_desktop, XA_CARDINAL, 32,
+@@ -599,7 +599,7 @@
+ void
+ wNETWMUpdateWorkarea(WScreen *scr, WArea usableArea)
+ {
+- CARD32 *area;
++ long *area;
+ int count, i;
+
+ /* XXX: not Xinerama compatible,
+@@ -609,7 +609,7 @@
+ return;
+
+ count = scr->workspace_count * 4;
+- area = wmalloc(sizeof(CARD32) * count);
++ area = wmalloc(sizeof(long) * count);
+ for (i=0; i<scr->workspace_count; i++) {
+ area[4*i + 0] = usableArea.x1;
+ area[4*i + 1] = usableArea.y1;
+@@ -732,7 +732,7 @@
+ static void
+ updateWorkspaceCount(WScreen *scr) /* changeable */
+ {
+- CARD32 count;
++ long count;
+
+ count = scr->workspace_count;
+
+@@ -744,7 +744,7 @@
+ static void
+ updateCurrentWorkspace(WScreen *scr) /* changeable */
+ {
+- CARD32 count;
++ long count;
+
+ count = scr->current_workspace;
+
+@@ -791,7 +791,7 @@
+ static void
+ updateWorkspaceHint(WWindow *wwin, Bool fake, Bool del)
+ {
+- CARD32 l;
++ long l;
+
+ if (del) {
+ XDeleteProperty(dpy, wwin->client_win, net_wm_desktop);
diff --git a/x11-wm/windowmaker/files/digest-windowmaker-0.92.0-r3 b/x11-wm/windowmaker/files/digest-windowmaker-0.92.0-r3
new file mode 100644
index 000000000000..e46aeeb39e0d
--- /dev/null
+++ b/x11-wm/windowmaker/files/digest-windowmaker-0.92.0-r3
@@ -0,0 +1,6 @@
+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
diff --git a/x11-wm/windowmaker/windowmaker-0.80.2-r2.ebuild b/x11-wm/windowmaker/windowmaker-0.80.2-r2.ebuild
index 887f1b7e5e3d..00caced9dd79 100644
--- a/x11-wm/windowmaker/windowmaker-0.80.2-r2.ebuild
+++ b/x11-wm/windowmaker/windowmaker-0.80.2-r2.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2006 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-wm/windowmaker/windowmaker-0.80.2-r2.ebuild,v 1.12 2006/01/12 01:07:56 metalgod Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/windowmaker/windowmaker-0.80.2-r2.ebuild,v 1.13 2006/01/31 16:08:13 metalgod Exp $
inherit eutils
@@ -13,7 +13,7 @@ SRC_URI="ftp://ftp.windowmaker.org/pub/source/release/${MY_P}.tar.gz
ftp://ftp.windowmaker.org/pub/source/release/WindowMaker-extra-0.1.tar.gz"
HOMEPAGE="http://www.windowmaker.org/"
-DEPEND="virtual/x11
+DEPEND="|| ( ( x11-libs/libXt ) virtual/x11 )
media-libs/hermes
>=media-libs/tiff-3.5.5
gif? ( >=media-libs/giflib-4.1.0-r3 )
diff --git a/x11-wm/windowmaker/windowmaker-0.80.2-r4.ebuild b/x11-wm/windowmaker/windowmaker-0.80.2-r4.ebuild
index f66193503adf..10eb49d7fcd3 100644
--- a/x11-wm/windowmaker/windowmaker-0.80.2-r4.ebuild
+++ b/x11-wm/windowmaker/windowmaker-0.80.2-r4.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2006 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-wm/windowmaker/windowmaker-0.80.2-r4.ebuild,v 1.12 2006/01/12 01:07:56 metalgod Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/windowmaker/windowmaker-0.80.2-r4.ebuild,v 1.13 2006/01/31 16:08:13 metalgod Exp $
inherit eutils flag-o-matic
filter-mfpmath "sse" "387"
@@ -15,7 +15,7 @@ SRC_URI="ftp://ftp.windowmaker.org/pub/source/release/${MY_P}.tar.gz
ftp://ftp.windowmaker.org/pub/source/release/WindowMaker-extra-0.1.tar.gz"
HOMEPAGE="http://www.windowmaker.org/"
-DEPEND="virtual/x11
+DEPEND="|| ( ( x11-libs/libXt ) virtual/x11 )
media-libs/hermes
>=media-libs/tiff-3.5.5
gif? ( >=media-libs/giflib-4.1.0-r3 )
diff --git a/x11-wm/windowmaker/windowmaker-0.92.0-r3.ebuild b/x11-wm/windowmaker/windowmaker-0.92.0-r3.ebuild
new file mode 100644
index 000000000000..180635f63389
--- /dev/null
+++ b/x11-wm/windowmaker/windowmaker-0.92.0-r3.ebuild
@@ -0,0 +1,172 @@
+# Copyright 1999-2006 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-r3.ebuild,v 1.1 2006/01/31 16:08:13 metalgod Exp $
+
+inherit eutils gnustep-funcs flag-o-matic multilib
+
+S=${WORKDIR}/${P/windowm/WindowM}
+
+DESCRIPTION="The fast and light GNUstep window manager"
+SRC_URI="ftp://ftp.windowmaker.org/pub/source/release/${P/windowm/WindowM}.tar.gz
+ http://www.windowmaker.org/pub/source/release/WindowMaker-extra-0.1.tar.gz"
+HOMEPAGE="http://www.windowmaker.org/"
+
+IUSE="gif gnustep jpeg nls png tiff modelock xinerama"
+DEPEND="x11-base/xorg-x11
+ 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 )"
+RDEPEND="${DEPEND}
+ nls? ( >=sys-devel/gettext-0.10.39 )"
+
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="~alpha ~amd64 ~mips ~ppc ~sparc ~x86"
+
+if use gnustep; then
+ egnustep_install_domain "Local"
+fi
+
+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
+ filter-flags -Os
+ unpack ${A}
+ cd "${S}"
+ epatch ${FILESDIR}/${PV/0.92/0.91}/singleclick-shadeormaxopts-0.9x.patch2
+ epatch ${FILESDIR}/${PV/0.92/0.91}/wlist-0.9x.patch
+ epatch ${FILESDIR}/${PV}/${P}-gcc41.patch
+ epatch ${FILESDIR}/${PV}/${P}-fullscreen.patch
+ epatch ${FILESDIR}/${PV}/${P}-qtdialogsfix.patch
+}
+
+src_compile() {
+ local myconf
+ local gs_user_postfix
+
+ # 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)"
+
+ # integrate with GNUstep environment, or not
+ if use gnustep ; then
+ # install WPrefs.app into GS Local Domain after setting up the GS env
+ egnustep_env
+# myconf="${myconf} --with-gnustepdir=$(egnustep_system_root)/Applications"
+ else
+ # no change from wm-0.80* ebuilds, as to not pollute things more
+ myconf="${myconf} --with-gnustepdir=/usr/$(get_libdir)/GNUstep"
+ fi
+
+ 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=/etc/X11 \
+ --with-x \
+ --enable-usermenu \
+ --with-pixmapdir=/usr/share/pixmaps \
+ ${myconf} || die
+
+# # call here needed as some users report breakage with one of the above
+# # patches (though patched after autoreconf)
+# libtoolize --copy --force
+
+# # don't know if zh_TW is still non-functional, but leaving it out still
+# # for now
+# cd ${S}/po
+# cp Makefile Makefile.orig
+# sed 's:zh_TW.*::' \
+# Makefile.orig > Makefile
+
+# cd ${S}/WPrefs.app/po
+# cp Makefile Makefile.orig
+# sed 's:zh_TW.*::' \
+# Makefile.orig > Makefile
+
+ cd ${S}
+ for file in ${S}/WindowMaker/*menu*; do
+ if [ -r $file ]; then
+ if use gnustep ; then
+# sed -e "s/\/usr\/local\/GNUstep/`cat ${TMP}/sed.gs_prefix`System/g;
+# s/XXX_SED_FSLASH/\//g;" < $file > $file.tmp
+ sed -e "s:/usr/local/GNUstep:`cat ${TMP}/sed.gs_prefix`System:g;" \
+ -e "s:XXX_SED_FSLASH:/:g;" < $file > $file.tmp
+ else
+# sed -e 's/\/usr\/local\/GNUstep/\/usr\/lib\/GNUstep/g;' < $file > $file.tmp
+ sed -e "s:/usr/local/GNUstep:/usr/$(get_libdir)/GNUstep:g;" < $file > $file.tmp
+ fi
+ mv $file.tmp $file;
+
+# sed -e 's/\/usr\/local\/share\/WindowMaker/\/usr\/share\/WindowMaker/g;' < $file > $file.tmp;
+ sed -e 's:/usr/local/share/WindowMaker:/usr/share/WindowMaker:g;' < $file > $file.tmp;
+ mv $file.tmp $file;
+ fi;
+ done;
+
+ # amd64 and mmx don't play nice together (yet)
+ use amd64 && sed -i -e '/ASM_X86/ d' "${S}/src/config.h"
+
+ cd ${S}
+ emake -j1 || die "windowmaker: make has failed"
+
+ cd ${S}
+ for file in ${S}/WindowMaker/Defaults/W*; do
+ if [ -r $file ]; then
+ if use gnustep; then
+ sed -e "s/\$HOME\/GNUstep\//\$HOME`cat ${TMP}/sed.gs_user_root_suffix`/g;
+ s/XXX_SED_FSLASH/\//g;" < $file > $file.tmp
+ mv $file.tmp $file;
+
+ sed -e "s/~\/GNUstep\//~`cat ${TMP}/sed.gs_user_root_suffix`/g;
+ s/XXX_SED_FSLASH/\//g;" < $file > $file.tmp
+ mv $file.tmp $file;
+ fi
+ fi
+ done;
+
+ # 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 install DESTDIR=${D} || 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 install DESTDIR=${D} || die "windowmaker-extra: install failed"
+
+ newdoc README README.extra
+
+ # create wmaker session shell script
+ echo "#!/bin/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
+}
+
+pkg_postinst() {
+ if use gnustep ; then
+ einfo "WPrefs.app is installed in you GNUstep Local Domain Applications directory."
+ fi
+}
+