1 |
commit: da3ec746b026699b762728ee3a939bc2786754b0 |
2 |
Author: Michael Mair-Keimberger <m.mairkeimberger <AT> gmail <DOT> com> |
3 |
AuthorDate: Mon Jul 9 17:54:50 2018 +0000 |
4 |
Commit: Virgil Dupras <vdupras <AT> gentoo <DOT> org> |
5 |
CommitDate: Sun Sep 30 12:55:06 2018 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=da3ec746 |
7 |
|
8 |
x11-wm/treewm: EAPI7, improve ebuild |
9 |
|
10 |
Closes: https://bugs.gentoo.org/663802 |
11 |
Closes: https://github.com/gentoo/gentoo/pull/9161 |
12 |
Signed-off-by: Virgil Dupras <vdupras <AT> gentoo.org> |
13 |
|
14 |
x11-wm/treewm/files/treewm-0.4.5-gcc43.patch | 8 ++-- |
15 |
x11-wm/treewm/treewm-0.4.5-r2.ebuild | 60 ++++++++++++++++++++++++++++ |
16 |
2 files changed, 64 insertions(+), 4 deletions(-) |
17 |
|
18 |
diff --git a/x11-wm/treewm/files/treewm-0.4.5-gcc43.patch b/x11-wm/treewm/files/treewm-0.4.5-gcc43.patch |
19 |
index a8faf431987..687bf809e3c 100644 |
20 |
--- a/x11-wm/treewm/files/treewm-0.4.5-gcc43.patch |
21 |
+++ b/x11-wm/treewm/files/treewm-0.4.5-gcc43.patch |
22 |
@@ -1,5 +1,5 @@ |
23 |
---- treewm-0.4.5b/src/action.cc 2009-01-17 18:17:32.000000000 -0400 |
24 |
-+++ treewm-0.4.5/src/action.cc 2009-01-17 18:20:41.000000000 -0400 |
25 |
+--- a/src/action.cc 2009-01-17 18:17:32.000000000 -0400 |
26 |
++++ b/src/action.cc 2009-01-17 18:20:41.000000000 -0400 |
27 |
@@ -9,6 +9,7 @@ |
28 |
#include "clienttree.h" |
29 |
#include "clientinfo.h" |
30 |
@@ -8,8 +8,8 @@ |
31 |
|
32 |
Action::Action(Section *section) { |
33 |
s = section; |
34 |
---- treewm-0.4.5b/src/resmanager.h 2009-01-17 18:17:32.000000000 -0400 |
35 |
-+++ treewm-0.4.5/src/resmanager.h 2009-01-17 18:21:10.000000000 -0400 |
36 |
+--- a/src/resmanager.h 2009-01-17 18:17:32.000000000 -0400 |
37 |
++++ b/src/resmanager.h 2009-01-17 18:21:10.000000000 -0400 |
38 |
@@ -12,6 +12,7 @@ |
39 |
#include "global.h" |
40 |
#include "client.h" |
41 |
|
42 |
diff --git a/x11-wm/treewm/treewm-0.4.5-r2.ebuild b/x11-wm/treewm/treewm-0.4.5-r2.ebuild |
43 |
new file mode 100644 |
44 |
index 00000000000..751b8b2fe24 |
45 |
--- /dev/null |
46 |
+++ b/x11-wm/treewm/treewm-0.4.5-r2.ebuild |
47 |
@@ -0,0 +1,60 @@ |
48 |
+# Copyright 1999-2018 Gentoo Foundation |
49 |
+# Distributed under the terms of the GNU General Public License v2 |
50 |
+ |
51 |
+EAPI=7 |
52 |
+ |
53 |
+inherit toolchain-funcs |
54 |
+ |
55 |
+DESCRIPTION="WindowManager that arranges the windows in a tree (not in a list)" |
56 |
+HOMEPAGE="http://treewm.sourceforge.net/" |
57 |
+SRC_URI="mirror://sourceforge/treewm/${P}.tar.bz2" |
58 |
+ |
59 |
+SLOT="0" |
60 |
+LICENSE="GPL-2" |
61 |
+KEYWORDS="~ppc ~sparc ~x86" |
62 |
+ |
63 |
+RDEPEND=" |
64 |
+ x11-libs/libX11 |
65 |
+ x11-libs/libXext |
66 |
+ x11-libs/libXxf86vm |
67 |
+ x11-libs/libXpm" |
68 |
+DEPEND="${RDEPEND} |
69 |
+ x11-base/xorg-proto |
70 |
+ x11-misc/imake" |
71 |
+ |
72 |
+src_prepare() { |
73 |
+ default |
74 |
+ # bug 251845 |
75 |
+ eapply "${FILESDIR}/${P}-gcc43.patch" |
76 |
+ # bug 86453 |
77 |
+ sed -i xprop/dsimple.c \ |
78 |
+ -e 's:malloc:Malloc:g' \ |
79 |
+ || die "sed xprop/dsimple.c" |
80 |
+} |
81 |
+ |
82 |
+src_compile() { |
83 |
+ # only compile treewm, not (x11-apps/){xprop,xkill} |
84 |
+ emake treewm \ |
85 |
+ CXX=$(tc-getCXX) \ |
86 |
+ CCOPTIONS="${CFLAGS}" \ |
87 |
+ EXTRA_LDOPTIONS="${LDFLAGS}" \ |
88 |
+ PREFIX="/usr" ROOT="${D}" |
89 |
+} |
90 |
+ |
91 |
+src_install() { |
92 |
+ # only install treewm, not (x11-apps/){xprop,xkill} |
93 |
+ dobin src/treewm |
94 |
+ dodoc AUTHORS ChangeLog PROBLEMS README README.tiling TODO default.cfg \ |
95 |
+ sample.cfg |
96 |
+ insinto /usr/share/pixmaps/treewm |
97 |
+ doins src/pixmaps/*.xpm |
98 |
+} |
99 |
+ |
100 |
+pkg_postinst() { |
101 |
+ elog "x11-wm/treewm used to install its own versions of x11-apps/xprop and" |
102 |
+ elog "x11-apps/xkill as treewm-xprop and treewm-xkill respectively, since" |
103 |
+ elog "they are assumed to be broken in combination with treewm. Since" |
104 |
+ elog "X(org) has become modular since treewm's last release and are not" |
105 |
+ elog "installed by default, we can leave those out and simply point out" |
106 |
+ elog "that it is NOT adviseable to use these programs when using treewm." |
107 |
+} |