diff options
Diffstat (limited to 'x11-wm/ctwm')
| -rw-r--r-- | x11-wm/ctwm/Manifest | 5 | ||||
| -rw-r--r-- | x11-wm/ctwm/ctwm-4.0.3.ebuild (renamed from x11-wm/ctwm/ctwm-4.0.1-r1.ebuild) | 26 | ||||
| -rw-r--r-- | x11-wm/ctwm/files/ctwm-4.0.1-m4.patch | 21 |
3 files changed, 13 insertions, 39 deletions
diff --git a/x11-wm/ctwm/Manifest b/x11-wm/ctwm/Manifest index 97fd083c6ee0..6fc857c911bf 100644 --- a/x11-wm/ctwm/Manifest +++ b/x11-wm/ctwm/Manifest @@ -1,6 +1,5 @@ -AUX ctwm-4.0.1-m4.patch 600 BLAKE2B 119ca96ba88e694d5a8269c67869e3185d15701dd9c3af921243db12793c4e90b2832aab9eba1ac432619472f1b2103474866853ccfe89aefda0679bbb6bab35 SHA512 d90b490d5a39dd1caf8c59b6753a65e0aa2e38a911ceef9e5b84d0c4b246b44072499d1853c7137e28f858d1856d33fd510b57b0ebef75097f98ebb6455fac77 -DIST ctwm-4.0.1.tar.xz 656776 BLAKE2B 37d6011d04f8d64552a86608a4d3867e6e1b0135f45457886daee6be1ae23ca1e3079caa1a63befd1d17bcc640e40ba0f1ed92e0a0caf2c6182f6e282f012bf7 SHA512 8c5c0bf868ba36cf5acca1ac5dbcea9327f63892698ace5086fabe563632acbb578cefea44ac3de91dc15afdbdce0370169e14156525507b90dc8aca8d305bc6 DIST ctwm-4.0.2.tar.xz 672608 BLAKE2B b4dc26b9d6ba5aba0a5f1f71363c25065aec0d4d4be7b9772f51117460062f5d7ea17d338e1ad9a89cf1213ca2125a1d203417bdc3f6c95a9b9969477b443a40 SHA512 445151f12084acd44bcf8a7d895e29363411a1a663b93e098fa9db5b96ae5cb43921eaf0695026aff2196117b810b96712a60570f57d6dabbee7fba34d5bd57f -EBUILD ctwm-4.0.1-r1.ebuild 984 BLAKE2B cba23544d81b5cc2eed545e11147302ec6cdc34d3da21e7ae1ba1795757eef3e213e5345a4bcd07a7cf725fb0401129e8eec968b63cf2dc9a2428ab6c80f2f98 SHA512 b5b2d3782bec877df729a6c516bd2c1c3bb852633d38796f14978e0321468cd691254408c9339ed712ed85f61b2622b5863064286c05bd45b6b2ea2ec2a956af +DIST ctwm-4.0.3.tar.xz 683684 BLAKE2B d16a47a5cd91ab5305da3c02f874d5ad1c71e2c8a3664cd33d5fa0781f4fdc2613407f5b43b4da16bcf89e323eb34b0888c5dbd02598746195991e7870aba0ef SHA512 f9bb2f8f28a050cce0fc2f1f4e00e79acd7c54055016d8483e045d8f5fa9829f8f5d92bb53f0c1d9500f97d6f52cd827ddd15515c84451ea03551025a8ab831d EBUILD ctwm-4.0.2.ebuild 878 BLAKE2B 4bd7b7a394707aa325203ce972947e1a2cbe88de61faf436773b2c464ccba2164b2e7865c591656cbbcde9485152347f9b75f67be6092ae727a4bc4bd73b90b6 SHA512 a2951928b6cd49fe015a20d696e58415271c68658b6fb93036d7a1ce85d96ff40fdbedbad14702eea6afca75fcb74f182c526bc1b2412ea957aef837c655e075 +EBUILD ctwm-4.0.3.ebuild 777 BLAKE2B de7c71f6b2632b6ac0e399c4f2bb2f79e057c86b2101dc1ec1c0e4d0fc9f1903e85fc3fb8fcb6a1fc414386a86937d6d5176202f0a43d332ad0588d6c13f7c78 SHA512 2a040d73b35c07be0274cbf6ac1d7a1f4e43958194049db624bfab6dfbc7a4e0c00088727be14a6fe5646e3cd8cb6b0a64dbedc857dada3044a461750ae75aaa MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84 diff --git a/x11-wm/ctwm/ctwm-4.0.1-r1.ebuild b/x11-wm/ctwm/ctwm-4.0.3.ebuild index b684a843fb93..63fd567ef40a 100644 --- a/x11-wm/ctwm/ctwm-4.0.1-r1.ebuild +++ b/x11-wm/ctwm/ctwm-4.0.3.ebuild @@ -1,17 +1,16 @@ -# Copyright 1999-2018 Gentoo Foundation +# Copyright 1999-2019 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 - -inherit cmake-utils eutils flag-o-matic toolchain-funcs +EAPI=7 +inherit cmake-utils DESCRIPTION="A clean, light window manager" -HOMEPAGE="http://ctwm.org/" +HOMEPAGE="https://ctwm.org/" SRC_URI="${HOMEPAGE}dist/${P}.tar.xz" LICENSE="MIT" SLOT="0" -KEYWORDS="amd64 ppc x86 ~x86-fbsd" +KEYWORDS="~amd64 ~ppc ~x86 ~x86-fbsd" RDEPEND=" x11-libs/libICE @@ -30,11 +29,6 @@ DEPEND=" x11-base/xorg-proto " -PATCHES=( - # http://bazaar.launchpad.net/~ctwm/ctwm/trunk/revision/597 - "${FILESDIR}"/${P}-m4.patch -) - src_prepare() { cmake-utils_src_prepare @@ -42,9 +36,11 @@ src_prepare() { sed -i parse.c -e "/<stdio.h>/ a#include <ctype.h>" || die } -src_install() { - cmake-utils_src_install +src_configure() { + mycmakeargs=( + -DNOMANCOMPRESS=yes + -DDOCDIR=/usr/share/doc/${PF} + ) - mv "${D}"/usr/share/doc/${PN} "${D}"/usr/share/doc/${PF} || die - mv "${D}"/usr/share/examples/${PN} "${D}"/usr/share/doc/${PF}/examples || die + cmake-utils_src_configure } diff --git a/x11-wm/ctwm/files/ctwm-4.0.1-m4.patch b/x11-wm/ctwm/files/ctwm-4.0.1-m4.patch deleted file mode 100644 index 94aa5a02d822..000000000000 --- a/x11-wm/ctwm/files/ctwm-4.0.1-m4.patch +++ /dev/null @@ -1,21 +0,0 @@ -=== modified file 'parse_m4.c' ---- ctwm-4.0.1____orig/parse_m4.c 2016-05-03 20:19:31 +0000 -+++ ctwm-4.0.1____MaFu/parse_m4.c 2017-06-13 10:37:46 +0000 -@@ -140,12 +140,15 @@ - char client[MAXHOSTNAME], server[MAXHOSTNAME], *colon; - struct hostent *hostname; - char *vc, *color; -- static char tmp_name[] = "/tmp/ctwmrcXXXXXX"; -+#define TMPLFILE "/tmp/ctwmrcXXXXXX" -+ static char tmp_name[sizeof(TMPLFILE)]; - int fd; - FILE *tmpf; - char *user; - - /* Create temp file */ -+ strcpy(tmp_name, TMPLFILE); -+#undef TMPLFILE - fd = mkstemp(tmp_name); - if(fd < 0) { - perror("mkstemp failed in m4_defs"); - |