1 |
commit: 6d78e77332db5e494cb3d82e7f4666d92250d3f6 |
2 |
Author: Jeroen Roovers <jer <AT> gentoo <DOT> org> |
3 |
AuthorDate: Thu May 9 07:48:35 2019 +0000 |
4 |
Commit: Jeroen Roovers <jer <AT> gentoo <DOT> org> |
5 |
CommitDate: Thu May 9 08:03:59 2019 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6d78e773 |
7 |
|
8 |
x11-misc/wbar: Fix automagic dev-libs/glib dependency |
9 |
|
10 |
* Fix a bunch of C++11 warnings |
11 |
* USE=-gtk should patch out AM_GLIB_GNU_GETTEXT and @INTLLIBS@ |
12 |
* USE=gtk should depend on dev-libs/glib |
13 |
|
14 |
Package-Manager: Portage-2.3.66, Repoman-2.3.12 |
15 |
Fixes: https://bugs.gentoo.org/685068 |
16 |
Signed-off-by: Jeroen Roovers <jer <AT> gentoo.org> |
17 |
|
18 |
x11-misc/wbar/files/wbar-2.3.4-c++11.patch | 54 ++++++++++++++++++++++++++++ |
19 |
x11-misc/wbar/files/wbar-2.3.4-gtk.patch | 32 +++++++++++++++++ |
20 |
x11-misc/wbar/wbar-2.3.4-r3.ebuild | 57 ++++++++++++++++++++++++++++++ |
21 |
3 files changed, 143 insertions(+) |
22 |
|
23 |
diff --git a/x11-misc/wbar/files/wbar-2.3.4-c++11.patch b/x11-misc/wbar/files/wbar-2.3.4-c++11.patch |
24 |
new file mode 100644 |
25 |
index 00000000000..fead9e9b4cb |
26 |
--- /dev/null |
27 |
+++ b/x11-misc/wbar/files/wbar-2.3.4-c++11.patch |
28 |
@@ -0,0 +1,54 @@ |
29 |
+--- a/src/config/Functions.cc |
30 |
++++ b/src/config/Functions.cc |
31 |
+@@ -11,7 +11,7 @@ |
32 |
+ #include "Run.h" |
33 |
+ #include "OptParser.h" |
34 |
+ |
35 |
+-#define ICON_DEFAULT PIXMAPDIR"/"PACKAGE_NAME".png" |
36 |
++#define ICON_DEFAULT PIXMAPDIR "/" PACKAGE_NAME ".png" |
37 |
+ |
38 |
+ static const gchar *authors[] = |
39 |
+ { |
40 |
+@@ -304,7 +304,7 @@ |
41 |
+ |
42 |
+ if (command.empty()) |
43 |
+ { |
44 |
+- command = PACKAGE_NAME" "DEFAULT_ARGV; |
45 |
++ command = PACKAGE_NAME " " DEFAULT_ARGV; |
46 |
+ } |
47 |
+ |
48 |
+ if (argc <= 1 || tmpoptparser.isSet( OptParser::CONFIG )) |
49 |
+--- a/src/config/Run.cc |
50 |
++++ b/src/config/Run.cc |
51 |
+@@ -125,9 +125,9 @@ |
52 |
+ |
53 |
+ bool Run::start(std::string command) |
54 |
+ { |
55 |
+- if (system ((PACKAGE_NAME" " + command + " &").c_str()) != 0) |
56 |
++ if (system ((PACKAGE_NAME " " + command + " &").c_str()) != 0) |
57 |
+ { |
58 |
+- std::cout << _("Error run program: ") << PACKAGE_NAME" " + command << std::endl; |
59 |
++ std::cout << _("Error run program: ") << PACKAGE_NAME " " + command << std::endl; |
60 |
+ } |
61 |
+ return Run::getPID() > 0; |
62 |
+ } |
63 |
+@@ -136,7 +136,7 @@ |
64 |
+ { |
65 |
+ if (Run::getPID() > 0) |
66 |
+ { |
67 |
+- if (system ("killall "PACKAGE_NAME) != 0) |
68 |
++ if (system ("killall " PACKAGE_NAME) != 0) |
69 |
+ { |
70 |
+ std::cout << _("Error kill program: ") << PACKAGE_NAME << std::endl; |
71 |
+ } |
72 |
+--- a/src/core/Main.cc |
73 |
++++ b/src/core/Main.cc |
74 |
+@@ -81,7 +81,7 @@ |
75 |
+ |
76 |
+ if (command.empty()) |
77 |
+ { |
78 |
+- command = PACKAGE_NAME" "DEFAULT_ARGV; |
79 |
++ command = PACKAGE_NAME " " DEFAULT_ARGV; |
80 |
+ } |
81 |
+ |
82 |
+ if (argc <= 1 || tmpoptparser.isSet( OptParser::CONFIG )) |
83 |
|
84 |
diff --git a/x11-misc/wbar/files/wbar-2.3.4-gtk.patch b/x11-misc/wbar/files/wbar-2.3.4-gtk.patch |
85 |
new file mode 100644 |
86 |
index 00000000000..76f2b902759 |
87 |
--- /dev/null |
88 |
+++ b/x11-misc/wbar/files/wbar-2.3.4-gtk.patch |
89 |
@@ -0,0 +1,32 @@ |
90 |
+--- a/configure.ac |
91 |
++++ b/configure.ac |
92 |
+@@ -59,7 +59,6 @@ |
93 |
+ AC_DEFINE_UNQUOTED(DEFAULT_ARGV, "$DEFAULT_ARGV" , [ The default argv ]) |
94 |
+ |
95 |
+ AC_PROG_INTLTOOL() |
96 |
+-AM_GLIB_GNU_GETTEXT |
97 |
+ PKG_PROG_PKG_CONFIG |
98 |
+ |
99 |
+ PKG_CHECK_MODULES(modules, [imlib2 x11]) |
100 |
+--- a/etc/wbar.cfg.in |
101 |
++++ b/etc/wbar.cfg.in |
102 |
+@@ -2,8 +2,3 @@ |
103 |
+ c: @PACKAGE_NAME@ @DEFAULT_ARGV@ |
104 |
+ t: none |
105 |
+ |
106 |
+-i: @PIXMAPDIR@/@PACKAGE_NAME@/wbar.png |
107 |
+-c: wbar-config |
108 |
+-t: Config |
109 |
+- |
110 |
+- |
111 |
+--- a/src/Makefile.am |
112 |
++++ b/src/Makefile.am |
113 |
+@@ -51,7 +51,7 @@ |
114 |
+ $(top_srcdir)/src/utils/i18n.h |
115 |
+ |
116 |
+ wbar_CXXFLAGS = @modules_CFLAGS@ |
117 |
+-wbar_LDADD = @modules_LIBS@ @INTLLIBS@ |
118 |
++wbar_LDADD = @modules_LIBS@ |
119 |
+ |
120 |
+ if WBAR_CONFIG |
121 |
+ wbar_config_CXXFLAGS = @gui_modules_CFLAGS@ |
122 |
|
123 |
diff --git a/x11-misc/wbar/wbar-2.3.4-r3.ebuild b/x11-misc/wbar/wbar-2.3.4-r3.ebuild |
124 |
new file mode 100644 |
125 |
index 00000000000..f46e060720d |
126 |
--- /dev/null |
127 |
+++ b/x11-misc/wbar/wbar-2.3.4-r3.ebuild |
128 |
@@ -0,0 +1,57 @@ |
129 |
+# Copyright 1999-2019 Gentoo Authors |
130 |
+# Distributed under the terms of the GNU General Public License v2 |
131 |
+ |
132 |
+EAPI=7 |
133 |
+inherit autotools bash-completion-r1 |
134 |
+ |
135 |
+DESCRIPTION="A fast, lightweight quick launch bar" |
136 |
+HOMEPAGE="https://github.com/rodolf0/wbar" |
137 |
+SRC_URI="https://${PN}.googlecode.com/files/${P}.tgz" |
138 |
+ |
139 |
+LICENSE="GPL-3" |
140 |
+SLOT="0" |
141 |
+KEYWORDS="~amd64 ~x86" |
142 |
+ |
143 |
+IUSE="gtk" |
144 |
+RDEPEND=" |
145 |
+ media-libs/imlib2[X] |
146 |
+ x11-libs/libX11 |
147 |
+ gtk? ( |
148 |
+ dev-libs/glib |
149 |
+ gnome-base/libglade |
150 |
+ media-libs/freetype:2 |
151 |
+ x11-libs/gdk-pixbuf:2 |
152 |
+ x11-libs/gtk+:2 |
153 |
+ ) |
154 |
+" |
155 |
+DEPEND=" |
156 |
+ ${RDEPEND} |
157 |
+ dev-util/intltool |
158 |
+ sys-devel/gettext |
159 |
+ virtual/pkgconfig |
160 |
+" |
161 |
+PATCHES=( |
162 |
+ "${FILESDIR}"/${PN}-2.3.3-desktopfile.patch |
163 |
+ "${FILESDIR}"/${PN}-2.3.3-nowerror.patch |
164 |
+ "${FILESDIR}"/${PN}-2.3.3-test.patch |
165 |
+ "${FILESDIR}"/${PN}-2.3.4-automake-1.13.patch |
166 |
+ "${FILESDIR}"/${PN}-2.3.4-c++11.patch |
167 |
+ "${FILESDIR}"/${PN}-2.3.4-completion.patch |
168 |
+) |
169 |
+ |
170 |
+src_prepare() { |
171 |
+ default |
172 |
+ |
173 |
+ use gtk || eapply "${FILESDIR}"/${PN}-2.3.4-gtk.patch |
174 |
+ |
175 |
+ sed -i \ |
176 |
+ -e "/^bashcompletiondir/s:=.*$:=$(get_bashcompdir):" \ |
177 |
+ etc/Makefile.am || die #482358 |
178 |
+ |
179 |
+ eautoreconf |
180 |
+} |
181 |
+ |
182 |
+src_configure() { |
183 |
+ econf \ |
184 |
+ $(use_enable gtk wbar-config) |
185 |
+} |