diff options
author | Lars Wendler <polynomial-c@gentoo.org> | 2013-12-03 19:49:20 +0000 |
---|---|---|
committer | Lars Wendler <polynomial-c@gentoo.org> | 2013-12-03 19:49:20 +0000 |
commit | 22532fe1c149692faec30aa1a1b56057046efce0 (patch) | |
tree | b84b6285708263cf9b4b31a1bbfa7799d36be744 /x11-wm | |
parent | Fix cross-compiles by exporting CC for the default ABI, bug 439258. (diff) | |
download | historical-22532fe1c149692faec30aa1a1b56057046efce0.tar.gz historical-22532fe1c149692faec30aa1a1b56057046efce0.tar.bz2 historical-22532fe1c149692faec30aa1a1b56057046efce0.zip |
Version bump (bug #490904)
Package-Manager: portage-2.2.7/cvs/Linux x86_64
Manifest-Sign-Key: 0x981CA6FC
Diffstat (limited to 'x11-wm')
-rw-r--r-- | x11-wm/icewm/ChangeLog | 9 | ||||
-rw-r--r-- | x11-wm/icewm/Manifest | 23 | ||||
-rw-r--r-- | x11-wm/icewm/files/icewm-1.3.8-build-fixes.patch | 113 | ||||
-rw-r--r-- | x11-wm/icewm/files/icewm-1.3.8-deprecated.patch | 12 | ||||
-rw-r--r-- | x11-wm/icewm/files/icewm-1.3.8-menu.patch | 23 | ||||
-rw-r--r-- | x11-wm/icewm/icewm-1.3.8.ebuild | 132 |
6 files changed, 307 insertions, 5 deletions
diff --git a/x11-wm/icewm/ChangeLog b/x11-wm/icewm/ChangeLog index ab2faba855e8..683f985b3f7f 100644 --- a/x11-wm/icewm/ChangeLog +++ b/x11-wm/icewm/ChangeLog @@ -1,6 +1,13 @@ # ChangeLog for x11-wm/icewm # Copyright 1999- Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/x11-wm/icewm/ChangeLog,v 1.160 2013/11/09 15:19:49 pacho Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-wm/icewm/ChangeLog,v 1.161 2013/12/03 19:49:19 polynomial-c Exp $ + +*icewm-1.3.8 (03 Dec 2013) + + 03 Dec 2013; Lars Wendler <polynomial-c@gentoo.org> +icewm-1.3.8.ebuild, + +files/icewm-1.3.8-build-fixes.patch, +files/icewm-1.3.8-deprecated.patch, + +files/icewm-1.3.8-menu.patch: + Version bump (bug #490904). 09 Nov 2013; Pacho Ramos <pacho@gentoo.org> icewm-1.3.7-r1.ebuild: x86 stable, bug #472086 diff --git a/x11-wm/icewm/Manifest b/x11-wm/icewm/Manifest index a6df46060280..9de31ca98b4d 100644 --- a/x11-wm/icewm/Manifest +++ b/x11-wm/icewm/Manifest @@ -14,6 +14,9 @@ AUX icewm-1.3.7-gcc47.patch 475 SHA256 e380d2ece544c9f851f6888c75e219d907cd8f5ee AUX icewm-1.3.7-menuiconsize.patch 2435 SHA256 ba77282c9b952d0e9f780244edbc708e63bd7bb39e8c583ad3490f025050cebc SHA512 ee56ff65a74d9a4cf4a03bc7e1324c6f0ea180fadc2232ba46a5f467d2b4f6f9e57ca73a658d5f7ed0acce4f399e1c7491ef54a29516da2fef081e7671dd1e3d WHIRLPOOL e3274f791b7081721e77a9cd3207b67b4fd6cb74b741e979ddae7b32c524e4a6c32d1bfa997385ba1faa65bb6001d579a80a4a9a805d9117348a327bb2ebe443 AUX icewm-1.3.7-thermal.patch 1335 SHA256 fe69b7994764e1c3fbf90ec3547e85e8dc92a305570291201c456b7cc4efcd9e SHA512 3d6cfce4980a19cc16a1c56737300157f73261e0f8e512063f3ac43ac177acbe635d9e9456cdfd2e177899091e620caf0cfad1f651e533cfa5c1712e71b90650 WHIRLPOOL ab2e0279bbb792a2df31221e32b8874a4646894e28cde28615fbfc8c4974f7bd151b5fe15263ed365869bd755eb50f205f3209d1c008bf021b15e13a0ebb410c AUX icewm-1.3.7-uclibc.patch 1830 SHA256 7ee3a62e956d1c8c1b2563a1a85356405cc11b06d8f67e65b63d364355acab52 SHA512 ed3abce7aabb21e5fb516f02a6860d140b2d74f288daf8a7edd14f8d70cd377f5bcf9b4172da4c8ca30b176c79e7500ba2c253004ca59a1ab6e9258b6b8a6f2e WHIRLPOOL 5e5b89cdb7b76f06541001b9f72b7da0cde8235528b57fc2fb7d6d7c816aefea82a314b34959e3987145228ae98c0e9dfa2c9575cefedc3aa95acfb7731e21cd +AUX icewm-1.3.8-build-fixes.patch 3821 SHA256 243db61d3c5b27a70061fb806387e18c1418d7b6b526cc37c7c3e7027089edbf SHA512 7fce22f361dbff6635acbcb91b91235221b1d85f9639a38f12c081305a3b1eb1de7e8825048d39a84495bb6b443e78eff5b9af315a9beb2b20d4205646e47362 WHIRLPOOL e0971a26dde9b74cdd3b259fab32fd5569f838ec8c17fd1674cf08264385a1b5109411716ff375a574647f1cd964645622cb334f1153eb98bbbb8e8f49b03d60 +AUX icewm-1.3.8-deprecated.patch 317 SHA256 05c464c0abbf65a1ea01f81a514c3022939ec0f0a3152583969f6c022dd38451 SHA512 7f0649853c78ea553a20d07bb3d88c3481a033d0fc143585f3bc2e39e9b66572b068f2ffd1660fcbf7d805c7d2f064d6d8900ddf01b61244a84aa13466061aaa WHIRLPOOL 5653fbabd227438b754371daf4a8d483d5d84a2e34be831b400591bf32630616cf9cdafacf15351a54f3953c33ca53cccb29b34a5b617d9e7833f04685effc2c +AUX icewm-1.3.8-menu.patch 928 SHA256 22d1929f34f377eeb776e993d3052bed06987922b8f6fffb9183c8c986b5ea8e SHA512 837720dc620a02d225f5df82f8fc8b8bb8512e846f6360b058c02fb1e2483186bdccbeaf997bb690c6d8482555f710494a0d534a4add1009ecc3060e180f8baa WHIRLPOOL 50c07457c67802c67b789a42f489c4dace8cf2f912cecf7abe2d1551a951ef25c4d0c66970adb277b37a0041b630c77250c13ac741884ed198e1b51618c7c3b1 AUX icewm-defaults.patch 694 SHA256 ce43d1a20428cecf2198422e87f5092c6378d97e3987925b2c494ea87323bf8c SHA512 41832e4d23af4790991703a502e3c5f5b0189bceac34b3e2e133ed60efd164f0521a90c39aab6fbac81ffb00a07313e1607cd7fb961bda9c5062bd1623a37919 WHIRLPOOL d243a0434ec9217ba8ccd29d9160d8028ce2db8b727e1619021b96304edac10f0969fa581749d387e6ebf7a1ef595a2ff3bb9a49109d3fb416487059140ad0ab AUX icewm-fribidi.patch 2168 SHA256 15865e8642ccc9fc5da221cc803176db2acc4a7afc500d199bc33c893a703649 SHA512 85f1f6f12a68f0e64d847ade924755e7f5eac3e443a8c8efeb44400e6403c10d5739b178f540d4337687c0c55159e81ebaaf6c53ae5c14d73a1e4352bd5d1fb5 WHIRLPOOL 9801fde474805e825e0f88a32560192fd45444d194c76e32dc5e82f7d0045022c695713b5d93babbc3a14ee8944c53ea0ef2efc4d618ea6d4c9d6bd12f9824c6 AUX icewm-keys.patch 1870 SHA256 8e64cf50489fc27b0ddd44faa1e04651981e2d13c8a48bb6270636e7c7d3d7c7 SHA512 c5206e2c4e98d89e71ccd46c3838941101e009036abd6026cf445b2e01315d9d70d6835b45def978d101d575e0c4dc48514883406c0bef67f11f24e4404daf43 WHIRLPOOL 517e63604d1730a3f9895e6d20d3c8b6d9d2b9c79b565e486190682417cff82245292211f09ff6b2659cdd830dde06f6eee8535887da11696370bffd7991823d @@ -25,14 +28,26 @@ AUX icewm-wmclient.patch 1253 SHA256 a147022909e083571bb7a17784966c7bbdeba54960e AUX icewm-xdg-menu 4380 SHA256 115f081152fe8d376b884402bd8af24f678e68bbf4d6717690678df92eba2c22 SHA512 edbb196bae0c6aff3d5cfa31c50486e0ac9ffc5d287a11221e0a16ab27e176c9c6e724bc00725c5e3eba71df9afa12e5a8132eb0f154c4bc38c3150242f5d9c3 WHIRLPOOL e7380eeab8965d297ef7e16c5deb6d5dccb25e1077197ef0e2c6123d8559e36bd156b9fe2eeef630ff12951c78749ac2051a2d548a69aaf578687ead5db7e213 DIST icewm-1.2.37.tar.gz 841879 SHA256 bfb60165cddafb458cbfd4b4b9203aa351e37cb75e0ad0c64e818b6fd2140595 SHA512 e7605470ab6480ac93ae482d68cab361b640a9355db0826c7d1a4b48f1a29c690fa908d649929db203ddb340e61a9fcbbf19732e237bbefd5116f33bdd85e34f WHIRLPOOL 8d55e97a5584c26151d4bbe64bd1be9a07ef9f8a10b767fd1d015f94fc95b66988ad3ce675bbbf446437b3ee199664934e7c432b4c42474e691aafcd9ccb2868 DIST icewm-1.3.7.tar.gz 898197 SHA256 ca1a78046ae340c324c441ce24a9675c24a8bafd3eb6ed8205345785da08887b SHA512 b0c09b19d1a6df3acf03eda364716b5a8516011c760806087fd6315ccf2a5c926471db56079b46d8fab01db87ea42a809a66fe3088b6ad8575e41a000914e895 WHIRLPOOL 8ea9ade64b2d6eadedb35ec146096fd6c3986142ff14d718c789315aaf3bfb1ef9afcb5206ee2286bc01f3775373428d5b969e3e632e87eb2bf1e49a3d03b9ef +DIST icewm-1.3.8.tar.gz 905680 SHA256 17588d9e0bbbb23587bc04c83da9dd94fd4da6894ecfee6d7f3ed50d780dcd18 SHA512 ce9bf3e736a2f3fad4bbf731647b4e4ad0168cd2c4af66b1c43beef9ceeee39d14909714d2fc73ab13f6c285a74dfe31fffc9677ae8bd2d1077716cd6d6afb72 WHIRLPOOL 5bb0f6fa830ea10978bb8fd31805596c849a370d619626736e1218e844de72e142ed1aaa87b2f2aeb40603fcf2cfaa88ffae242c726ae1151045c6a792d5cf6c EBUILD icewm-1.2.37.ebuild 2982 SHA256 da8b5d7b54234d08b1f2c1cb66ba00a90f13f2291c662f3e3cf8f1d586f4f110 SHA512 b817ffc6f2ef6280e769ed7ab7713a2294dfe42775204ab80840b93fd68e629b30c6ed501feda2c850a5854773ae047835247bfff32a3f00215012afc410de35 WHIRLPOOL a75427d1169a089008d98a9b4d6ec60db0cc3fc8f7f8743f0a531a106080fa4e5f9e655cc9e3464f488d2c801c114af8acdfad6db65684d473a99affd3523f0e EBUILD icewm-1.3.7-r1.ebuild 3529 SHA256 707656334cc138b1a99c5249d7c3142194edd78b8887f6bd851c0c689dfb7459 SHA512 627ca79ef76297eb5bd22fd62a75c614b79cd3a8a1638fa8329b66079b605b856cc0ebe97418ac19b4e0dc30b19938d1868527bc18729ab2c65779822e529cd1 WHIRLPOOL d3920209cfbe748e598a82751069bacae40b36bd2da6d7a1d7253a61714bb9df49620661c4d03518da2561edfa8b5396c7d598813c432a77d86c9582c6102292 -MISC ChangeLog 24817 SHA256 050a32260d92f8bcbdb680c1beae7e0cc4a89b1c35a65e9b6ad4672800413693 SHA512 4a132deccb348a654c6d3e8c8c68de9f42f7fa8fb9c3ca4fabe6ced44ceb12ea76bd06a078384b0f38e7b3453e4d2d0bc349e79609043f27301c35b36da599c2 WHIRLPOOL 40bc10e222ad291c06cb8e0ae92d7975e7f9a44ffafbe49b2a303e18cb4402f8fa753eeded3ec7c8ac67cd83b47b024bc99981a6fdfd9efb5f64cd3abd9bb87b +EBUILD icewm-1.3.8.ebuild 3416 SHA256 75de5decf87ef7d7c098e8328ae0cb580149cd61dc002435f00f6dcea9ff6d8c SHA512 d081dce2e74a28d23ab4aa0108409c552ee971f81c724ad2c59a5eb1468a62f6b8e914bba4ca80ce6beb9775bdfc4b5017538c6199d505e8c1efee6210c75f0a WHIRLPOOL 04096973abe41fbc3fb8e5e90a401bce4bb5d6fd573ec9557077165433ed89da2a31d62b8eabf7e289314d66bd3098d63f9b16795256d040dd71948527eea16b +MISC ChangeLog 25068 SHA256 7f2bfd6bb976ab2b03a01cd832b61589224df2e2d3dc89c442edcf06a095dca3 SHA512 a0785e289b1048e97de30f2c7eabcbb49a5a46e7451e571db8d30f4fe43655a73674ddae521a10783a2a836d19a09275ca2d1b080c0ea02c16ba5fc9801f6122 WHIRLPOOL 793a8185a50efa2dd667d1241b29cf34f8f2ae227884d323f7d1d2a4b3daa9d790b7849790daa023fb10e746bc7944d487f57398a8ab27905cab54775f24746b MISC metadata.xml 475 SHA256 ab567633101459c7952b19014cc0cca71f5cf90e5ff7bc322ef8e39755e24826 SHA512 fab94ce62073fb76d3e8413444e3f43b243b5f484f5afab7c4ef2e47d020f5f013fd610109c248b247b0c78af978779da237c822bf103d2ffff7cb43dba276ad WHIRLPOOL d817f0e0c27ed472d7ebef46fd2d11c4e71e5b092ee46ccb6a60caf3a11d54051d20e03074b7167d585e225bf27302cbf27b48bc0ddb5f036ada359fde03f2a8 -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.22 (GNU/Linux) -iEYEAREIAAYFAlJ+UpYACgkQCaWpQKGI+9Qa5gCfYQOiRQhT7EmfBrz3JQlgOyZB -BdIAoId75QY7Lv4dM+7F1TgfGMFN2h8W -=eTRZ +iQIcBAEBCAAGBQJSnjXAAAoJEPiazRVxLXTFqKYP/AmzI4KEY5nxCf7VNzITDLwQ +i7yseJae62QKa+zIifnfWOyGEP4S5sStAsmdEa3uG4u7TfQWqEmbe3WDHRvQScHD +tNZNMn940oqW4R7O5gpZdM7LTwF6aiav0EXEXMFohVdIX71y/CDjJ+2VBD8prV0i +kUboc4kH5zGlJahlqo0LbzMSNCZm+//9eQkzQHIRm+ROMk3tw1ZdA3dzdwF5/dua +CiJ0j8CdoUaRCckOP5FvzB9/aXmy42dFKn3O7oRjojRBou5ihPoO8RIbZFEMU1F7 +juNGjmAkoMSMZEUpS0KisZwo/FcegoM6cGMKh4YwHiLYwpHIO83hdjo5raIZq1Gt +KX7y+MqK7oGK2NGaaNe1DPuHd60RZQ9Z3ivOdjHO+Ta3QfFII6yt5swPaiPZwpDH +DwjQKlnDU7cjLh9WPHojBHPEKtNsTivLqMaQyxvp8PdKVJQX8taA9k0+SjsF2j8q +9jn7XDLU2lKGd9kOkIA64+P3dQZ/j1d/NRBv+gXgTbko00SRORqdrLV0QRmoJncr +VcqD7WMILn1SkU5I/uc8uzxhnyBWOWuhc+Q3oVArOFfqkScZpeL+iyqdT5E7PB01 +NDoisk2e523+BZZqJ9zDcCJj4VJaGwU/JgMesrEVJXiqH6p9KaSmzIy0/AaAzUZP +CypWpfIzZZEGEwSWO0af +=3MUc -----END PGP SIGNATURE----- diff --git a/x11-wm/icewm/files/icewm-1.3.8-build-fixes.patch b/x11-wm/icewm/files/icewm-1.3.8-build-fixes.patch new file mode 100644 index 000000000000..cec27a79ad0a --- /dev/null +++ b/x11-wm/icewm/files/icewm-1.3.8-build-fixes.patch @@ -0,0 +1,113 @@ +--- icewm-1.3.8/Makefile.in ++++ icewm-1.3.8/Makefile.in +@@ -35,7 +35,7 @@ + + ################################################################################ + +-BINFILES = @BINFILES@ icewm-set-gnomewm ++BINFILES = @BINFILES@ "$(srcdir)/icewm-set-gnomewm" + LIBFILES = lib/preferences lib/winoptions lib/keys \ + lib/menu lib/toolbar # lib/programs + DOCFILES = README BUGS CHANGES COPYING AUTHORS INSTALL VERSION icewm.lsm +@@ -83,21 +83,23 @@ + @echo ------------------------------------------ + @echo "Installing binaries in $(DESTDIR)$(BINDIR)" + @$(INSTALLDIR) "$(DESTDIR)$(BINDIR)" ++#generated files, relative to the build directory + @for bin in $(BINFILES); do \ + $(INSTALLBIN) "$${bin}" "$(DESTDIR)$(BINDIR)"; \ + done + + @echo "Installing presets and icons in $(DESTDIR)$(LIBDIR)" + @$(INSTALLDIR) "$(DESTDIR)$(LIBDIR)" ++# data files from the source directory + #-@$(INSTALLDIR) "$(DESTDIR)$(CFGDIR)" + @for lib in $(LIBFILES); do \ +- $(INSTALLLIB) "$${lib}" "$(DESTDIR)$(LIBDIR)"; \ ++ $(INSTALLLIB) "$(top_srcdir)/$${lib}" "$(DESTDIR)$(LIBDIR)"; \ + done + + @for xpmdir in $(XPMDIRS); do \ +- if test -d "lib/$${xpmdir}"; then \ ++ if test -d "$(top_srcdir)/lib/$${xpmdir}"; then \ + $(INSTALLDIR) "$(DESTDIR)$(LIBDIR)/$${xpmdir}"; \ +- for pixmap in "lib/$${xpmdir}/"*.xpm; do \ ++ for pixmap in "$(top_srcdir)/lib/$${xpmdir}/"*.xpm; do \ + $(INSTALLLIB) "$${pixmap}" "$(DESTDIR)$(LIBDIR)/$${xpmdir}"; \ + done; \ + fi; \ +--- icewm-1.3.8/po/Makefile.in ++++ icewm-1.3.8/po/Makefile.in +@@ -20,6 +20,7 @@ + XGETTEXT = @XGETTEXT@ + MSGMERGE = @MSGMERGE@ + MSGFMT = @MSGFMT@ ++VPATH = .:po:@srcdir@ + + .SUFFIXES: + .SUFFIXES: .po .mo +--- icewm-1.3.8/src/Makefile.in ++++ icewm-1.3.8/src/Makefile.in +@@ -11,7 +11,7 @@ + + CXX = @CXX@ + HOSTCXX = @HOSTCXX@ +-LD = @CXX_LINK@ ++LD = gcc + HOSTLD = @HOSTCXX_LINK@ + EXEEXT = @EXEEXT@ + +@@ -32,12 +32,12 @@ + -DICEWMBGEXE='"icewmbg$(EXEEXT)"' \ + -DICESMEXE='"icewm-session$(EXEEXT)"' \ + -DICEHELPEXE='"icehelp$(EXEEXT)"' \ +- -DICEHELPIDX='"$(DOCDIR)/icewm-$(VERSION)/icewm.html"' ++ -DICEHELPIDX='"$(DOCDIR)/icewm-common/icewm.html"' + + CXXFLAGS = @CXXFLAGS@ $(DEBUG) $(DEFS) `pkg-config gdk-pixbuf-xlib-2.0 --cflags` \ + @CORE_CFLAGS@ @IMAGE_CFLAGS@ @AUDIO_CFLAGS@ `pkg-config fontconfig --cflags` + LFLAGS = @LDFLAGS@ +-LIBS = @LIBS@ `pkg-config gdk-pixbuf-xlib-2.0 --libs` ++LIBS = @LIBS@ `pkg-config gdk-pixbuf-xlib-2.0 --libs` -lfontconfig -lm -lsupc++ + + CORE_LIBS = @CORE_LIBS@ `pkg-config fontconfig --libs` + IMAGE_LIBS = @IMAGE_LIBS@ +@@ -188,6 +188,8 @@ + TESTCASES = @TESTCASES@ + OBJECTS = @BASEOBJS@ @TESTOBJS@ + BINARIES = @BASEBINS@ @TESTBINS@ ++BASEOBJS = @BASEOBJS@ ++VPATH = .:@srcdir@ + + ################################################################################ + +@@ -205,7 +207,8 @@ + @echo " CXX " $@ + @$(CXX) $(CXXFLAGS) $(GCCDEP) -c $< + +-$(BINARIES): ++$(BINARIES): $(BASEOBJS) ++# @$(MAKE) --no-print-directory build-dep DEPLIST="$($(@:$(EXEEXT)=)_OBJS)" + @echo " LD " $@ + @$(LD) -o $@ $($(@:$(EXEEXT)=)_OBJS) $(LFLAGS) $($(@:$(EXEEXT)=)_LFLAGS) $(LIBS) $($(@:$(EXEEXT)=)_LIBS) + +@@ -217,6 +220,8 @@ + @echo " HOSTLD " $@ + @$(HOSTLD) -o $@ $(genpref_OBJS) + ++build-dep: $(DEPLIST) ++ + ################################################################################ + + gnome2.o: gnome2.cc +--- icewm-1.3.8/src/WinMgr.h ++++ icewm-1.3.8/src/WinMgr.h +@@ -128,7 +128,7 @@ + * this where WIN_WORKSPACE_COUNT comes into play. + */ + +-#define WinWorkspaceInvalid (-1L) ++#define WinWorkspaceInvalid ((unsigned long)-1) + + /* workspaces */ + #define XA_WIN_WORKSPACES "_WIN_WORKSPACES" diff --git a/x11-wm/icewm/files/icewm-1.3.8-deprecated.patch b/x11-wm/icewm/files/icewm-1.3.8-deprecated.patch new file mode 100644 index 000000000000..b956180627bc --- /dev/null +++ b/x11-wm/icewm/files/icewm-1.3.8-deprecated.patch @@ -0,0 +1,12 @@ +--- icewm-1.3.8/src/base.h ++++ icewm-1.3.8/src/base.h +@@ -2,7 +2,9 @@ + #define __BASE_H + + #if ( __GNUC__ == 3 && __GNUC_MINOR__ > 0 ) || __GNUC__ > 3 ++#if ( __GNUC__ == 4 && __GNUC_MINOR__ > 7 ) || __GNUC__ > 3 + #define _icewm_deprecated __attribute__((deprecated)) ++#endif + #else + #define _icewm_deprecated + #endif diff --git a/x11-wm/icewm/files/icewm-1.3.8-menu.patch b/x11-wm/icewm/files/icewm-1.3.8-menu.patch new file mode 100644 index 000000000000..e4bab5c5ffc3 --- /dev/null +++ b/x11-wm/icewm/files/icewm-1.3.8-menu.patch @@ -0,0 +1,23 @@ +--- icewm-1.3.8/lib/menu.in ++++ icewm-1.3.8/lib/menu.in +@@ -4,15 +4,9 @@ + # since modifications to this file will be discarded when you + # (re)install icewm. + # +-prog xterm xterm xterm +-prog rxvt xterm rxvt -bg black -cr green -fg white -C -fn 9x15 -sl 500 +-prog fte fte fte +-prog NEdit nedit nedit +-prog Mozilla mozilla mozilla +-prog XChat xchat xchat +-prog Gimp gimp gimp ++prog xterm /usr/share/icons/gnome/16x16/apps/terminal.png xterm ++prog "Web browser" /usr/share/icons/gnome/16x16/apps/web-browser.png xdg-open about:blank + separator +-menuprog Gnome folder icewm-menu-gnome2 --list @CONFIG_GNOME2_MENU_DIR@ +-menuprog KDE folder icewm-menu-gnome@GNOME_VER@ --list @CONFIG_KDE_MENU_DIR@ +-menufile Programs folder programs +-menufile Tool_bar folder toolbar ++prog "Rebuild program menu" /usr/share/icons/gnome/16x16/actions/edit-find-replace.png /usr/share/icewm/startup ++separator ++menufile Programs folder programs.autogen diff --git a/x11-wm/icewm/icewm-1.3.8.ebuild b/x11-wm/icewm/icewm-1.3.8.ebuild new file mode 100644 index 000000000000..65c2708eeace --- /dev/null +++ b/x11-wm/icewm/icewm-1.3.8.ebuild @@ -0,0 +1,132 @@ +# Copyright 1999- Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/x11-wm/icewm/icewm-1.3.8.ebuild,v 1.1 2013/12/03 19:49:19 polynomial-c Exp $ + +EAPI=5 +PYTHON_COMPAT=( python{2_6,2_7} ) + +inherit autotools eutils python-single-r1 + +DESCRIPTION="Ice Window Manager with Themes" +HOMEPAGE="http://www.icewm.org/" +LICENSE="GPL-2" +SRC_URI="mirror://sourceforge/${PN}/${P/_}.tar.gz" + +SLOT="0" +KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86" +IUSE="bidi debug gnome minimal nls truetype uclibc xinerama" +REQUIRED_USE="gnome? ( ${PYTHON_REQUIRED_USE} )" + +# Tests broken in all versions, patches welcome, bug #323907, #389533 +RESTRICT="test" + +#fix for icewm preversion package names +S=${WORKDIR}/${P/_} + +RDEPEND=" + x11-libs/libX11 + x11-libs/libXrandr + x11-libs/libXext + x11-libs/libXpm + x11-libs/libXrender + x11-libs/libXft + x11-libs/libSM + x11-libs/libICE + xinerama? ( x11-libs/libXinerama ) + bidi? ( dev-libs/fribidi ) + gnome? ( + ${PYTHON_DEPS} + dev-python/pyxdg + gnome-base/gnome-desktop:2 + gnome-base/gnome-menus + gnome-base/libgnomeui ) + nls? ( sys-devel/gettext ) + truetype? ( >=media-libs/freetype-2.0.9 ) + media-libs/giflib +" +DEPEND="${RDEPEND} + x11-proto/xproto + x11-proto/xextproto + xinerama? ( x11-proto/xineramaproto ) + >=sys-apps/sed-4 +" + +pkg_setup() { + if use truetype && use minimal; then + ewarn "You have both 'truetype' and 'minimal' use flags enabled." + ewarn "If you really want a minimal install, you will have to turn off" + ewarn "the truetype flag for this package." + fi +} + +src_prepare() { + # Fedora patches + epatch "${FILESDIR}"/${PN}-1.3.8-menu.patch + epatch "${FILESDIR}"/${PN}-toolbar.patch + epatch "${FILESDIR}"/${PN}-keys.patch + epatch "${FILESDIR}"/${PN}-fribidi.patch + epatch "${FILESDIR}"/${PN}-1.3.7-dso.patch + epatch "${FILESDIR}"/${PN}-defaults.patch + epatch "${FILESDIR}"/${PN}-1.3.7-menuiconsize.patch + epatch "${FILESDIR}"/${PN}-1.3.8-deprecated.patch + + epatch "${FILESDIR}"/${PN}-1.3.7-gcc44.patch + + # Get thermal info from proper locations, bug #452730 + epatch "${FILESDIR}"/${PN}-1.3.7-thermal.patch + + # Debian patch fixing multiple build issues, like bug #470148 + epatch "${FILESDIR}"/${PN}-1.3.8-build-fixes.patch + + # Fix bug #486710 + use uclibc && epatch "${FILESDIR}/${P}-uclibc.patch" + + eautoreconf +} + +src_configure() { + if use truetype + then + myconf="${myconf} --enable-gradients --enable-shape --enable-shaped-decorations" + else + myconf="${myconf} --disable-xfreetype --enable-corefonts + $(use_enable minimal lite)" + fi + + myconf="${myconf} + --with-libdir=/usr/share/icewm + --with-cfgdir=/etc/icewm + --with-docdir=/usr/share/doc/${PF}/html + $(use_enable bidi fribidi) + $(use_enable debug) + $(use_enable gnome menus-gnome2) + $(use_enable nls i18n) + $(use_enable nls) + $(use_enable x86 x86-asm) + $(use_enable xinerama) + --without-esd-config" + + CXXFLAGS="${CXXFLAGS}" econf ${myconf} + + sed -i "s:/icewm-\$(VERSION)::" src/Makefile || die "patch failed" + sed -i "s:ungif:gif:" src/Makefile || die "libungif fix failed" +} + +src_install(){ + default + + if use gnome; then + dobin "${FILESDIR}"/icewm-xdg-menu + exeinto /usr/share/icewm/ + newexe "${FILESDIR}"/icewm-startup startup + fi + + dodoc AUTHORS BUGS CHANGES PLATFORMS README* TODO VERSION + dohtml -a html,sgml doc/* + + exeinto /etc/X11/Sessions + doexe "${FILESDIR}/icewm" + + insinto /usr/share/xsessions + doins "${FILESDIR}/IceWM.desktop" +} |