| 1 |
commit: 1ce14fb1660a6ec86050ca280a459a01bdb69309 |
| 2 |
Author: Sergei Trofimovich <slyfox <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sun Oct 11 09:48:44 2020 +0000 |
| 4 |
Commit: Sergei Trofimovich <slyfox <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sun Oct 11 09:48:44 2020 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1ce14fb1 |
| 7 |
|
| 8 |
x11-wm/fluxbox: fix build on c++17 compiler (gcc-11) |
| 9 |
|
| 10 |
Reported-by: lekto <AT> o2.pl |
| 11 |
Closes: https://bugs.gentoo.org/732782 |
| 12 |
Package-Manager: Portage-3.0.8, Repoman-3.0.1 |
| 13 |
Signed-off-by: Sergei Trofimovich <slyfox <AT> gentoo.org> |
| 14 |
|
| 15 |
x11-wm/fluxbox/files/fluxbox-1.3.7-c++17.patch | 28 ++++++++++++++++++++++++++ |
| 16 |
x11-wm/fluxbox/fluxbox-1.3.7-r4.ebuild | 4 ++++ |
| 17 |
2 files changed, 32 insertions(+) |
| 18 |
|
| 19 |
diff --git a/x11-wm/fluxbox/files/fluxbox-1.3.7-c++17.patch b/x11-wm/fluxbox/files/fluxbox-1.3.7-c++17.patch |
| 20 |
new file mode 100644 |
| 21 |
index 00000000000..37e450b08f1 |
| 22 |
--- /dev/null |
| 23 |
+++ b/x11-wm/fluxbox/files/fluxbox-1.3.7-c++17.patch |
| 24 |
@@ -0,0 +1,28 @@ |
| 25 |
+http://git.fluxbox.org/fluxbox.git/patch/?id=22866c4d30f5b289c429c5ca88d800200db4fc4f |
| 26 |
+https://bugs.gentoo.org/732782 |
| 27 |
+ |
| 28 |
+From 22866c4d30f5b289c429c5ca88d800200db4fc4f Mon Sep 17 00:00:00 2001 |
| 29 |
+From: John Sennesael <john@××××××××.com> |
| 30 |
+Date: Mon, 2 Nov 2015 15:14:32 -0600 |
| 31 |
+Subject: fixes bug #1138 |
| 32 |
+ |
| 33 |
+--- |
| 34 |
+ util/fluxbox-remote.cc | 2 +- |
| 35 |
+ 1 file changed, 1 insertion(+), 1 deletion(-) |
| 36 |
+ |
| 37 |
+diff --git a/util/fluxbox-remote.cc b/util/fluxbox-remote.cc |
| 38 |
+index 59852e6..504015b 100644 |
| 39 |
+--- a/util/fluxbox-remote.cc |
| 40 |
++++ b/util/fluxbox-remote.cc |
| 41 |
+@@ -73,7 +73,7 @@ int main(int argc, char **argv) { |
| 42 |
+ if (strcmp(cmd, "result") == 0) { |
| 43 |
+ XTextProperty text_prop; |
| 44 |
+ if (XGetTextProperty(disp, root, &text_prop, atom_result) != 0 |
| 45 |
+- && text_prop.value > 0 |
| 46 |
++ && text_prop.value != 0 |
| 47 |
+ && text_prop.nitems > 0) { |
| 48 |
+ |
| 49 |
+ printf("%s", text_prop.value); |
| 50 |
+-- |
| 51 |
+cgit v0.11.2 |
| 52 |
+ |
| 53 |
|
| 54 |
diff --git a/x11-wm/fluxbox/fluxbox-1.3.7-r4.ebuild b/x11-wm/fluxbox/fluxbox-1.3.7-r4.ebuild |
| 55 |
index 762963c8932..1acca675107 100644 |
| 56 |
--- a/x11-wm/fluxbox/fluxbox-1.3.7-r4.ebuild |
| 57 |
+++ b/x11-wm/fluxbox/fluxbox-1.3.7-r4.ebuild |
| 58 |
@@ -34,6 +34,10 @@ BDEPEND="bidi? ( virtual/pkgconfig ) |
| 59 |
DEPEND="${RDEPEND} |
| 60 |
x11-base/xorg-proto" |
| 61 |
|
| 62 |
+PATCHES=( |
| 63 |
+ "${FILESDIR}"/${P}-c++17.patch |
| 64 |
+) |
| 65 |
+ |
| 66 |
src_prepare() { |
| 67 |
default |
| 68 |
# We need to be able to include directories rather than just plain |
Archives