diff options
Diffstat (limited to 'x11-wm')
-rw-r--r-- | x11-wm/Manifest.gz | bin | 9448 -> 9451 bytes | |||
-rw-r--r-- | x11-wm/aewm++/Manifest | 6 | ||||
-rw-r--r-- | x11-wm/aewm++/aewm++-1.1.5-r3.ebuild (renamed from x11-wm/aewm++/aewm++-1.1.5-r2.ebuild) | 13 | ||||
-rw-r--r-- | x11-wm/aewm++/files/aewm++-1.1.5-gcc43.patch | 53 | ||||
-rw-r--r-- | x11-wm/aewm++/files/aewm++-1.1.5-makefile.patch | 34 | ||||
-rw-r--r-- | x11-wm/goomwwm/Manifest | 4 | ||||
-rw-r--r-- | x11-wm/goomwwm/files/goomwwm-1.0.0-makefile.patch | 29 | ||||
-rw-r--r-- | x11-wm/goomwwm/goomwwm-1.0.0-r2.ebuild (renamed from x11-wm/goomwwm/goomwwm-1.0.0-r1.ebuild) | 28 | ||||
-rw-r--r-- | x11-wm/goomwwm/goomwwm-9999.ebuild | 44 | ||||
-rw-r--r-- | x11-wm/oroborus/Manifest | 2 | ||||
-rw-r--r-- | x11-wm/oroborus/oroborus-2.0.20-r2.ebuild (renamed from x11-wm/oroborus/oroborus-2.0.20-r1.ebuild) | 4 |
11 files changed, 116 insertions, 101 deletions
diff --git a/x11-wm/Manifest.gz b/x11-wm/Manifest.gz Binary files differindex 9eb3ef2a8eca..b2245783f9a0 100644 --- a/x11-wm/Manifest.gz +++ b/x11-wm/Manifest.gz diff --git a/x11-wm/aewm++/Manifest b/x11-wm/aewm++/Manifest index a684158e82b9..5543123a8f35 100644 --- a/x11-wm/aewm++/Manifest +++ b/x11-wm/aewm++/Manifest @@ -1,5 +1,5 @@ -AUX aewm++-1.1.5-gcc43.patch 1011 BLAKE2B 8450e4a1028275196533a3d41450ef094bbd58c442fea8e8963e43155659a6e935ee612adecd8aa29654999c9599bfe1c1e800e749944faa724c9be0dd4756ca SHA512 aa95ca31f68ac57ee4d92377b39839594b8673cf9f54834c15026ab385c17dace0f0e7673feb9b92bbab5aaa528dbd4a861e7df5e3b257052cb253bdffeda3bd -AUX aewm++-1.1.5-makefile.patch 853 BLAKE2B d5f90e83b0c4e7b10c6afc057578ad5db820c5ac31840eff812a3ae482dd2609fb6657c45817318abace461577bbd4e973c3e67d5b6c8ad5b0df76ce60aace62 SHA512 f4d3ddec499e18598c6a2d99aed0f709226bbc43b6183c7bb5832e26d2fbe99c3292fe9c249613f62c962e10ddace5b10b6ee3d484f3030d1d233ce0b2269adc +AUX aewm++-1.1.5-gcc43.patch 1260 BLAKE2B adb4d6a2e427d7caf10bb9efe23566a4499309e8686d3ec88add54151324a6495b2334b6adb91ba4579c138a10f73ff6adbee5cdce358ad173dd73ea19a2915f SHA512 8c96af49e5ced1b0d4cad73f12abdc854ff70f990cdf95b4e2f82664196872ad6515848597ae24add06e9fab24562037b9517f3b06bee90a35b4f05a198f3b2d +AUX aewm++-1.1.5-makefile.patch 1020 BLAKE2B 3c77d3ead1bb53efe6343034114ab9bcd0692bd253618fdf769a16ae8cba6c1420d69ccf2de115a89d2c73d1df585ced485c8ed75e1ffd2c5d6da18e2fcfe2c8 SHA512 fb0853fae776b5e12a2c002c1c982f0f02272652b150106c5e3333a9ce6f91d60f6c1a721386c9428f80e00310a2e3f63f737fead4db20a1235bfa6408b42dc2 DIST aewm++-1.1.5.tar.gz 24553 BLAKE2B f6a013cbc33476a809623c434dd0d1dc38766d27beb42e042c39e8a51db03410ea5cbdfae0f2169df46722d72d25542d920fad4881d48f589a832847177e4961 SHA512 84fe2d51e82a2098a42ad405da705810e5d3b93513a30cd688f7bb8c717875b286b64bbd8e48ab799e4ee14ac27097fb98276f89bcfeb9301dc8187d0bcad370 -EBUILD aewm++-1.1.5-r2.ebuild 559 BLAKE2B a8f0797ebedb83b2dda511d9470c1b90e145f20854aec5d3e6e587239f9e11d04b16fd7c82cc54f8cae422450b16fea06cb15331d06f6f0c84767a143c8ecca0 SHA512 d59c6a9e1b1d4a5ebe673726b98c4e00a4f38d558f9cfc6455aea0169c92a4c7dbcffa5626b3be3857aeb65a98c95b828e985b8fd93d6d187edfc9bd3e335b6b +EBUILD aewm++-1.1.5-r3.ebuild 545 BLAKE2B 69070d553a2a5bb023f174b3979a2f291838f97374004d602fd329a1da4565927b192be684aad932eb32777e2733fcf6f52b5daadf9105edab43d8edcab57dd8 SHA512 a3f2dfd7172bfa97858e6da88bb4f51c7a745ea5a252dd67743b81a40a891b6a4ff7fe7e9c4f5c9dbafd890046ddb41d8d849489b62b4e2f82cfcc5760e28402 MISC metadata.xml 462 BLAKE2B ef4cf4ed751c2c988829df1344b61fd7c58e027e96bbae740856aea74e43c6e47d9367c838b66e6af116d0b2d7856015aa8b3e02bba059c9328e574e379032ea SHA512 1e1158e4b53be6cfba8522f57d0aa53df83797edaab9428bd14aa3011f67e4bd46a7e09317acf98ac3664f94e3b9666175ae76e8496ad34f5473cf986cf6b991 diff --git a/x11-wm/aewm++/aewm++-1.1.5-r2.ebuild b/x11-wm/aewm++/aewm++-1.1.5-r3.ebuild index 47ceef425b86..1afc79dbe2dc 100644 --- a/x11-wm/aewm++/aewm++-1.1.5-r2.ebuild +++ b/x11-wm/aewm++/aewm++-1.1.5-r3.ebuild @@ -1,7 +1,8 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=8 + inherit toolchain-funcs DESCRIPTION="A window manager with more modern features than aewm" @@ -11,9 +12,9 @@ SRC_URI="mirror://gentoo/${P}.tar.gz" LICENSE="GPL-2" SLOT="0" KEYWORDS="amd64 ppc x86" -IUSE="" -RDEPEND="x11-libs/libX11 +RDEPEND=" + x11-libs/libX11 x11-libs/libXext" DEPEND="${RDEPEND} x11-base/xorg-proto" @@ -23,6 +24,6 @@ PATCHES=( "${FILESDIR}"/${P}-makefile.patch ) -src_compile() { - emake CXX="$(tc-getCXX)" +src_configure() { + tc-export CXX } diff --git a/x11-wm/aewm++/files/aewm++-1.1.5-gcc43.patch b/x11-wm/aewm++/files/aewm++-1.1.5-gcc43.patch index 23cacdc43a2b..1fab782112d2 100644 --- a/x11-wm/aewm++/files/aewm++-1.1.5-gcc43.patch +++ b/x11-wm/aewm++/files/aewm++-1.1.5-gcc43.patch @@ -1,6 +1,16 @@ -diff -ur aewm++-1.1.5.orig/client.cc aewm++-1.1.5/client.cc ---- aewm++-1.1.5.orig/client.cc 2005-05-23 06:06:01.000000000 +0300 -+++ aewm++-1.1.5/client.cc 2008-05-03 23:50:02.000000000 +0300 +--- a/aewm.hh ++++ b/aewm.hh +@@ -87,7 +87,7 @@ + #define BW (has_border ? wm->getOptBW() : 0) + + // defined in main.cc +-void forkExec(char *); ++void forkExec(const char *); + int handleXError(Display *, XErrorEvent *); + + class Client; +--- a/client.cc ++++ b/client.cc @@ -6,6 +6,8 @@ */ #include "aewm.hh" @@ -10,21 +20,22 @@ diff -ur aewm++-1.1.5.orig/client.cc aewm++-1.1.5/client.cc Client::Client(Display *d, Window new_client) { initialize(d); -diff -ur aewm++-1.1.5.orig/main.cc aewm++-1.1.5/main.cc ---- aewm++-1.1.5.orig/main.cc 2005-02-12 05:38:32.000000000 +0200 -+++ aewm++-1.1.5/main.cc 2008-05-03 23:50:02.000000000 +0300 -@@ -6,6 +6,8 @@ +--- a/main.cc ++++ b/main.cc +@@ -6,8 +6,10 @@ */ #include "aewm.hh" +#include <string.h> + // Dunno where I ripped this from. Kudos to the author whoever he is! - void forkExec(char *cmd) +-void forkExec(char *cmd) ++void forkExec(const char *cmd) { -diff -ur aewm++-1.1.5.orig/windowmanager.cc aewm++-1.1.5/windowmanager.cc ---- aewm++-1.1.5.orig/windowmanager.cc 2005-05-17 04:41:42.000000000 +0300 -+++ aewm++-1.1.5/windowmanager.cc 2008-05-03 23:50:02.000000000 +0300 + if(! (strlen(cmd)>0)) return; + +--- a/windowmanager.cc ++++ b/windowmanager.cc @@ -6,6 +6,8 @@ */ #include "aewm.hh" @@ -34,3 +45,23 @@ diff -ur aewm++-1.1.5.orig/windowmanager.cc aewm++-1.1.5/windowmanager.cc WindowManager* wm; #define AEWM_KEY_ALT_COUNT 4 +@@ -1020,7 +1022,7 @@ + { + cleanup(); + +- execl("/bin/sh", "sh", "-c", command_line.c_str(), 0); ++ execl("/bin/sh", "sh", "-c", command_line.c_str(), (const char*)NULL); + } + + void WindowManager::quitNicely() +--- a/windowmanager.hh ++++ b/windowmanager.hh +@@ -46,7 +46,7 @@ + string command_line; + int max_desktops; + int focus_model; +- char *opt_display, ++ const char *opt_display, + *opt_fc, + *opt_fg, + *opt_fm, diff --git a/x11-wm/aewm++/files/aewm++-1.1.5-makefile.patch b/x11-wm/aewm++/files/aewm++-1.1.5-makefile.patch index 8b84a9963469..3066b0981a1f 100644 --- a/x11-wm/aewm++/files/aewm++-1.1.5-makefile.patch +++ b/x11-wm/aewm++/files/aewm++-1.1.5-makefile.patch @@ -1,29 +1,35 @@ -Respect CFLAGS, LDFLAGS, don't strip binaries +* Respect CXX, CXXFLAGS, LDFLAGS, LIBS +* Don't strip binaries +https://bugs.gentoo.org/336099 -http://bugs.gentoo.org/show_bug.cgi?id=336099 - ---- aewm++-1.1.5/Makefile -+++ aewm++-1.1.5/Makefile -@@ -1,9 +1,6 @@ - CC = g++ +--- a/Makefile ++++ b/Makefile +@@ -1,14 +1,9 @@ +-CC = g++ -ADDITIONAL_CFLAGS = -g -O2 -march=i686 -Wall - +- prefix = /usr -INCLUDES = -I$/usr/X11R6 -LDPATH = -L/usr/X11R6/lib - LIBS = -lXext -lX11 +-LIBS = -lXext -lX11 ++LIBS += -lXext -lX11 # SHAPE = Shape Extension -@@ -28,14 +25,13 @@ + # NEED_SETENV = Does your Unix not support the setenv function? Use this! +-DEFINES = -DSHAPE #-DNEED_SETENV ++CPPFLAGS += -DSHAPE #-DNEED_SETENV + HEADERS = aewm.hh \ + client.hh \ + windowmanager.hh \ +@@ -28,14 +23,10 @@ all: aewm++ aewm++: $(OBJS) - $(CC) $(OBJS) $(LDPATH) $(LIBS) -o $@ -+ $(CXX) $(LDFLAGS) $(OBJS) $(LDPATH) $(LIBS) -o $@ - - $(OBJS): %.o: %.cc $(HEADERS) +- +-$(OBJS): %.o: %.cc $(HEADERS) - $(CC) $(CFLAGS) $(ADDITIONAL_CFLAGS) $(DEFINES) $(INCLUDES) -c $< -o $@ -+ $(CXX) $(CXXFLAGS) $(DEFINES) $(INCLUDES) -c $< -o $@ ++ $(CXX) $(LDFLAGS) $(CXXFLAGS) $(OBJS) $(LIBS) -o $@ install: all - mkdir -p $(DESTDIR)$(prefix)/bin diff --git a/x11-wm/goomwwm/Manifest b/x11-wm/goomwwm/Manifest index 880dd9ab9de8..ffc46bd7f14e 100644 --- a/x11-wm/goomwwm/Manifest +++ b/x11-wm/goomwwm/Manifest @@ -1,4 +1,4 @@ +AUX goomwwm-1.0.0-makefile.patch 767 BLAKE2B a41842159c2fb2042c61438a2a3e51838145a2873cc19abf95195d0bea9e759d2211aa7210ce74b8409f31a2839b707d92155a1f94826fbd774862398082bac8 SHA512 39fdd1bdf6dbe91662f27450c790643838c4feee81d1021b8c5b7ad77c8f5d024fbafac000b81b8e6788d945ad126d82a1ecf59939695770148adc9d4b1df412 DIST goomwwm-1.0.0-github.tar.gz 406143 BLAKE2B 0118dfec32a3598b0a23b3421643a211386c1bc302d523a4a63a78e34ba9f0673b0bae18b27b491ab153e3e0fb8031123c56425ac007c20651fb3ec8484ab7a5 SHA512 e37d80c8ea47fe136172c392521ec8d4dab361c3469d3d1626ed7c30385513301983c0ffde39f4c2e6f2dee8709da6a34f14f7bb89776f1ccde5103ab1a26764 -EBUILD goomwwm-1.0.0-r1.ebuild 795 BLAKE2B 09f17ae9824995f845a3537076e11a69f2431c4631ddff5965c2dfd316be2b505d0ff11498b13284dfb481afce61ca2da89e971ea22797c5c79160e03f7c6e64 SHA512 cd5a942d05221ed3bf51c685dd053a7a60ac0e6c727d1a4766d3546a10b67fce3cacec21aba494809c701fce1a1ac49ac2010c5451f46bd3edddb4fc4433f93b -EBUILD goomwwm-9999.ebuild 754 BLAKE2B a773fbe2e44f62bd889668b0d64411c02c7e6bf3415d4b119f500be99f9f6cab83ab58a8922f6c298c339cecec58bd1ebe49cec5cbb6a8ad1b0b4fa9f73a6f15 SHA512 77c6450c9fbb0874987eb930121dbf1827b1e48e7796fb33d9e14267e2ead0d8bcfd7873f6a606aa021b5e1bd6b11deec1f54dd25e33fc58e6a77844e3ac8a48 +EBUILD goomwwm-1.0.0-r2.ebuild 723 BLAKE2B d6e68f478f359ea35a05640d5f1daff79cc19c54d2c468ac1a926a51bccb5bbdf6f55e92f1708c87db60e2b739865ed288190ccfcfb726a9835bd0d9bdf5cad9 SHA512 1659fc4541f7dcf71e051e848892f15e622ec6e8c6d5e5c7cfff65ad1185a7b64adb430c0e6a035ca6a5a75d6668aca5137b7c20339fec01adb856bafc8c932f MISC metadata.xml 252 BLAKE2B c4a2c3f6d0db197a7b49dfc6cfb753158bf4a405c4deb0527672c789a2c97c68f22df69507107830adebb769d52366dbcdc13d6f2cc1199f84c6f563fd9c387e SHA512 627fde87dcdac1bc610d9889b780582d1f94cb08dc45df38b3200536b71a3b913a5b3f232144bd796a598e89c08bb9987aeb0b1ad86f79bceac7d26dd304b392 diff --git a/x11-wm/goomwwm/files/goomwwm-1.0.0-makefile.patch b/x11-wm/goomwwm/files/goomwwm-1.0.0-makefile.patch new file mode 100644 index 000000000000..b5d7ddb873f5 --- /dev/null +++ b/x11-wm/goomwwm/files/goomwwm-1.0.0-makefile.patch @@ -0,0 +1,29 @@ +--- a/Makefile ++++ b/Makefile +@@ -1,11 +1,9 @@ +-CFLAGS?=-Wall -O2 +-LDADD?=$(shell pkg-config --cflags --libs x11 xinerama x11 xft) ++CFLAGS += -Wall ++CPPFLAGS += $(shell $(PKG_CONFIG) --cflags x11 xinerama x11 xft) ++LDLIBS += $(shell $(PKG_CONFIG) --libs x11 xinerama x11 xft) + +-normal: +- $(CC) -o goomwwm goomwwm.c $(CFLAGS) $(LDADD) $(LDFLAGS) +- +-debug: +- $(CC) -o goomwwm-debug goomwwm.c $(CFLAGS) -g -DDEBUG $(LDADD) ++all: goomwwm ++goomwwm.c: proto + + proto: + cat *.c | egrep '^(void|int|char|unsigned|client|Window|winlist|XWindow)' | sed -r 's/\)/);/' > proto.h +@@ -13,7 +11,5 @@ + docs: + pandoc -s -w man goomwwm.md -o goomwwm.1 + +-all: proto normal debug docs +- + clean: +- rm -f goomwwm goomwwm-debug +\ No newline at end of file ++ rm -f goomwwm goomwwm-debug diff --git a/x11-wm/goomwwm/goomwwm-1.0.0-r1.ebuild b/x11-wm/goomwwm/goomwwm-1.0.0-r2.ebuild index f51897cf633f..506169ced6bf 100644 --- a/x11-wm/goomwwm/goomwwm-1.0.0-r1.ebuild +++ b/x11-wm/goomwwm/goomwwm-1.0.0-r2.ebuild @@ -1,7 +1,7 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=8 inherit flag-o-matic toolchain-funcs @@ -17,28 +17,20 @@ IUSE="debug" RDEPEND=" x11-libs/libXft x11-libs/libX11 - x11-libs/libXinerama -" + x11-libs/libXinerama" DEPEND=" ${RDEPEND} - virtual/pkgconfig - x11-base/xorg-proto -" + x11-base/xorg-proto" +BDEPEND="virtual/pkgconfig" -src_prepare() { - default - sed -i -e 's|$(LDADD) $(LDFLAGS)|$(LDFLAGS) $(LDADD)|g' Makefile || die -} +PATCHES=( "${FILESDIR}"/${P}-makefile.patch ) src_configure() { - use debug && append-cflags -DDEBUG -} - -src_compile() { - emake CC="$(tc-getCC)" proto normal + tc-export CC PKG_CONFIG + use debug && append-cppflags -DDEBUG } src_install() { - dobin ${PN} - doman ${PN}.1 + dobin goomwwm + doman goomwwm.1 } diff --git a/x11-wm/goomwwm/goomwwm-9999.ebuild b/x11-wm/goomwwm/goomwwm-9999.ebuild deleted file mode 100644 index 7183c82c7e49..000000000000 --- a/x11-wm/goomwwm/goomwwm-9999.ebuild +++ /dev/null @@ -1,44 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit flag-o-matic git-r3 toolchain-funcs - -DESCRIPTION="Get out of my way, Window Manager!" -HOMEPAGE="https://github.com/seanpringle/goomwwm" -EGIT_REPO_URI="https://github.com/seanpringle/goomwwm" - -LICENSE="MIT" -SLOT="0" -KEYWORDS="" -IUSE="debug" - -RDEPEND=" - x11-libs/libXft - x11-libs/libX11 - x11-libs/libXinerama -" -DEPEND=" - ${RDEPEND} - virtual/pkgconfig - x11-base/xorg-proto -" - -src_prepare() { - default - sed -i -e 's|$(LDADD) $(LDFLAGS)|$(LDFLAGS) $(LDADD)|g' Makefile || die -} - -src_configure() { - use debug && append-cflags -DDEBUG -} - -src_compile() { - emake CC="$(tc-getCC)" proto normal -} - -src_install() { - dobin ${PN} - doman ${PN}.1 -} diff --git a/x11-wm/oroborus/Manifest b/x11-wm/oroborus/Manifest index 1584233f68ba..2c25471afcb9 100644 --- a/x11-wm/oroborus/Manifest +++ b/x11-wm/oroborus/Manifest @@ -1,4 +1,4 @@ AUX oroborus-2.0.20-fno-common.patch 850 BLAKE2B d93da4bff9439414c68b66589d695a577ea6f8467adbeabdc35c30020ecce1b911894f325ecccdc55f77e5a120246e106628254807c6ddb33f4c0d78966ef327 SHA512 438addec1bcc4b0aa095be0bfa84f5223bd5637ff7a77694b8ef3f9d423b4b355890e879d2a41ba7b950ddc7aea0f659677db35b014efdf41beabad2678d3931 DIST oroborus_2.0.20.tar.gz 335099 BLAKE2B 6c4dc4e8104f47ca847b0e358ac606aeb684b004a0fc6cf55130318814efd65ef96a602630ea01a090b6851595982fd7c3865d5efec38f72182e29c3ccc1aae5 SHA512 0ffa9e3ce25c3d2cb6f24c827755b4f7af14f6e34127fec66ef367cb8dc53ceb89d0fec3619f80f055f9d2241dfa0e4edf53e4e22dad1558d7b448f0b878c573 -EBUILD oroborus-2.0.20-r1.ebuild 550 BLAKE2B 99f5fbab1b6c9488ab7c101dfec491cbcd826280a66bdb3e7f2f47872fa1833332b7e00c5c38c90a70a69d1fdec963040f8eebfef36a351b446d5d7c4e91f74d SHA512 6df8ebdcbdf867706fc6f52628c3660fd60ca967912afd641636aa1d377fc174d47a5557bd8e06e9f89f2444042c5a67893b995bdf261d6800d270c0e7fc4390 +EBUILD oroborus-2.0.20-r2.ebuild 550 BLAKE2B d4e38a54f954f6383df33124b8724439d86fc5371ee881efb2924de675760d95eaca3f800208f9e482da027fd8350ec9af322065135dfb1282248d6a11799ae8 SHA512 39f57b6a642cf9c7b5a796654d69b9782cf63704ff89ca1c40adcf62f23606523f9e469afb71d6491498bc647ffa490f4b9ce76bbbf4f13a6df1bcb1fdbd1166 MISC metadata.xml 496 BLAKE2B 78fb97cdc059334c0c390ec90cd8ac587ed3b3d056f5de4b5c8183f559bc1264118b0a5631b0cfd187b3fbae56e278d45bb3944c60f0b97e49bc119c464a1df4 SHA512 ed611ffbc729a47ef6d22fb00a39343d64278fd75a6600264575a2d84efd2d08cba421ddd2908374810b668b9956ce8824a5bec4b4734aa77198de811964e8ac diff --git a/x11-wm/oroborus/oroborus-2.0.20-r1.ebuild b/x11-wm/oroborus/oroborus-2.0.20-r2.ebuild index 1c0dec3cece9..45d223b8d592 100644 --- a/x11-wm/oroborus/oroborus-2.0.20-r1.ebuild +++ b/x11-wm/oroborus/oroborus-2.0.20-r2.ebuild @@ -1,7 +1,7 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=8 DESCRIPTION="Small and fast window manager" HOMEPAGE="https://www.oroborus.org" |