1 |
commit: 9b28449fa0c087396229634de43b49224cb5b430 |
2 |
Author: Bernard Cafarelli <voyageur <AT> gentoo <DOT> org> |
3 |
AuthorDate: Thu Dec 3 10:39:50 2020 +0000 |
4 |
Commit: Bernard Cafarelli <voyageur <AT> gentoo <DOT> org> |
5 |
CommitDate: Thu Dec 3 10:40:09 2020 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9b28449f |
7 |
|
8 |
x11-plugins/wmsystray: properly set CC |
9 |
|
10 |
Also fix incorrect return statement |
11 |
|
12 |
Closes: https://bugs.gentoo.org/743073 |
13 |
Package-Manager: Portage-3.0.11, Repoman-3.0.2 |
14 |
Signed-off-by: Bernard Cafarelli <voyageur <AT> gentoo.org> |
15 |
|
16 |
.../wmsystray/files/wmsystray-0.1.1-Makefile.patch | 30 ++++++++++++++-------- |
17 |
.../files/wmsystray-0.1.1-return-type.patch | 12 +++++++++ |
18 |
x11-plugins/wmsystray/wmsystray-0.1.1-r1.ebuild | 16 ++++++------ |
19 |
3 files changed, 39 insertions(+), 19 deletions(-) |
20 |
|
21 |
diff --git a/x11-plugins/wmsystray/files/wmsystray-0.1.1-Makefile.patch b/x11-plugins/wmsystray/files/wmsystray-0.1.1-Makefile.patch |
22 |
index 19afa355b22..ab754703962 100644 |
23 |
--- a/x11-plugins/wmsystray/files/wmsystray-0.1.1-Makefile.patch |
24 |
+++ b/x11-plugins/wmsystray/files/wmsystray-0.1.1-Makefile.patch |
25 |
@@ -1,6 +1,6 @@ |
26 |
-diff -ur wmsystray-0.1.1/Makefile wmsystray-0.1.1.new/Makefile |
27 |
---- wmsystray-0.1.1/Makefile 2004-03-01 05:35:47.000000000 +0100 |
28 |
-+++ wmsystray-0.1.1.new/Makefile 2007-06-30 18:09:59.000000000 +0200 |
29 |
+diff -Naur wmsystray-0.1.1.orig/Makefile wmsystray-0.1.1/Makefile |
30 |
+--- wmsystray-0.1.1.orig/Makefile 2004-03-01 05:35:47.000000000 +0100 |
31 |
++++ wmsystray-0.1.1/Makefile 2020-12-03 11:22:13.786357942 +0100 |
32 |
@@ -1,13 +1,14 @@ |
33 |
prefix=/usr |
34 |
bindir = ${prefix}/bin |
35 |
@@ -19,21 +19,29 @@ diff -ur wmsystray-0.1.1/Makefile wmsystray-0.1.1.new/Makefile |
36 |
|
37 |
clean: |
38 |
make -C xembed clean |
39 |
-diff -ur wmsystray-0.1.1/wmsystray/Makefile wmsystray-0.1.1.new/wmsystray/Makefile |
40 |
---- wmsystray-0.1.1/wmsystray/Makefile 2004-03-01 04:54:44.000000000 +0100 |
41 |
-+++ wmsystray-0.1.1.new/wmsystray/Makefile 2007-06-30 18:09:59.000000000 +0200 |
42 |
-@@ -1,7 +1,7 @@ |
43 |
+diff -Naur wmsystray-0.1.1.orig/wmsystray/Makefile wmsystray-0.1.1/wmsystray/Makefile |
44 |
+--- wmsystray-0.1.1.orig/wmsystray/Makefile 2004-03-01 04:54:44.000000000 +0100 |
45 |
++++ wmsystray-0.1.1/wmsystray/Makefile 2020-12-03 11:26:57.544595661 +0100 |
46 |
+@@ -1,14 +1,13 @@ |
47 |
include ../Rules.make |
48 |
|
49 |
- CC = gcc |
50 |
+-CC = gcc |
51 |
-CFLAGS = ${X11CFLAGS} -DTRACE_LEVEL=${TRACE_LEVEL} -I../xembed -Wall -g |
52 |
+CFLAGS = ${X11CFLAGS} -DTRACE_LEVEL=${TRACE_LEVEL} -I../xembed -g ${EXTRACFLAGS} |
53 |
LDFLAGS = ${X11LDFLAGS} -lXpm |
54 |
|
55 |
OBJS = main.o ui.o systray.o xpms.o |
56 |
-diff -ur wmsystray-0.1.1/xembed/Makefile wmsystray-0.1.1.new/xembed/Makefile |
57 |
---- wmsystray-0.1.1/xembed/Makefile 2004-03-01 04:54:44.000000000 +0100 |
58 |
-+++ wmsystray-0.1.1.new/xembed/Makefile 2007-06-30 18:09:59.000000000 +0200 |
59 |
+ XEMBED_OBJS = ../xembed/xembed.o |
60 |
+ |
61 |
+ wmsystray: ${OBJS} ${XEMBED_OBJS} |
62 |
+- gcc ${OBJS} ${XEMBED_OBJS} -o wmsystray ${LDFLAGS} |
63 |
++ ${CC} ${OBJS} ${XEMBED_OBJS} -o wmsystray ${LDFLAGS} |
64 |
+ |
65 |
+ clean: |
66 |
+ rm -f wmsystray ${OBJS} |
67 |
+diff -Naur wmsystray-0.1.1.orig/xembed/Makefile wmsystray-0.1.1/xembed/Makefile |
68 |
+--- wmsystray-0.1.1.orig/xembed/Makefile 2004-03-01 04:54:44.000000000 +0100 |
69 |
++++ wmsystray-0.1.1/xembed/Makefile 2020-12-03 11:22:13.786357942 +0100 |
70 |
@@ -1,6 +1,6 @@ |
71 |
include ../Rules.make |
72 |
|
73 |
|
74 |
diff --git a/x11-plugins/wmsystray/files/wmsystray-0.1.1-return-type.patch b/x11-plugins/wmsystray/files/wmsystray-0.1.1-return-type.patch |
75 |
new file mode 100644 |
76 |
index 00000000000..aa2c6539b81 |
77 |
--- /dev/null |
78 |
+++ b/x11-plugins/wmsystray/files/wmsystray-0.1.1-return-type.patch |
79 |
@@ -0,0 +1,12 @@ |
80 |
+diff -Naur wmsystray-0.1.1.orig/wmsystray/systray.c wmsystray-0.1.1/wmsystray/systray.c |
81 |
+--- wmsystray-0.1.1.orig/wmsystray/systray.c 2004-03-01 04:54:50.000000000 +0100 |
82 |
++++ wmsystray-0.1.1/wmsystray/systray.c 2020-12-03 11:30:36.661776579 +0100 |
83 |
+@@ -338,7 +338,7 @@ |
84 |
+ XReparentWindow (main_disp, embed_wind, |
85 |
+ DefaultRootWindow(main_disp), 0, 0); |
86 |
+ TRACE((stderr, "REJECTED!\n")); |
87 |
+- return; |
88 |
++ return 1; |
89 |
+ } |
90 |
+ |
91 |
+ XSelectInput (main_disp, embed_wind, StructureNotifyMask | |
92 |
|
93 |
diff --git a/x11-plugins/wmsystray/wmsystray-0.1.1-r1.ebuild b/x11-plugins/wmsystray/wmsystray-0.1.1-r1.ebuild |
94 |
index 4756f31445f..926644e2d5b 100644 |
95 |
--- a/x11-plugins/wmsystray/wmsystray-0.1.1-r1.ebuild |
96 |
+++ b/x11-plugins/wmsystray/wmsystray-0.1.1-r1.ebuild |
97 |
@@ -1,9 +1,9 @@ |
98 |
-# Copyright 1999-2018 Gentoo Authors |
99 |
+# Copyright 1999-2020 Gentoo Authors |
100 |
# Distributed under the terms of the GNU General Public License v2 |
101 |
|
102 |
EAPI=7 |
103 |
|
104 |
-inherit desktop |
105 |
+inherit desktop toolchain-funcs |
106 |
|
107 |
DESCRIPTION="Window Maker dock app that provides a system tray for GNOME/KDE applications" |
108 |
HOMEPAGE="https://github.com/bbidulock/wmsystray" |
109 |
@@ -17,11 +17,11 @@ SLOT="0" |
110 |
LICENSE="GPL-2" |
111 |
KEYWORDS="amd64 ppc ~sparc x86" |
112 |
|
113 |
-# Let's honour Gentoo CFLAGS and use correct install program |
114 |
-# Fix for #61704, cannot compile with gcc 3.4.1: |
115 |
-# it's a trivial change and does not affect other compilers... |
116 |
-PATCHES=( "${FILESDIR}/${P}-Makefile.patch" |
117 |
- "${FILESDIR}/${P}-gcc-3.4.patch" ) |
118 |
+PATCHES=( |
119 |
+ "${FILESDIR}/${P}-Makefile.patch" |
120 |
+ "${FILESDIR}/${P}-gcc-3.4.patch" |
121 |
+ "${FILESDIR}/${P}-return-type.patch" |
122 |
+) |
123 |
|
124 |
DOCS=( README HACKING AUTHORS ) |
125 |
|
126 |
@@ -35,7 +35,7 @@ src_prepare() { |
127 |
} |
128 |
|
129 |
src_compile() { |
130 |
- emake EXTRACFLAGS="${CFLAGS}" |
131 |
+ emake CC="$(tc-getCC)" EXTRACFLAGS="${CFLAGS}" |
132 |
} |
133 |
|
134 |
src_install() { |