| 1 |
commit: 378266f4942bb8f2b12fc980d7ac2b8a24b0ec1e |
| 2 |
Author: Sam James <sam <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Tue Apr 20 11:49:01 2021 +0000 |
| 4 |
Commit: Sam James <sam <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Tue Apr 20 11:50:40 2021 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=378266f4 |
| 7 |
|
| 8 |
x11-misc/openbox-menu: fix patch |
| 9 |
|
| 10 |
Closes: https://bugs.gentoo.org/784305 |
| 11 |
Signed-off-by: Sam James <sam <AT> gentoo.org> |
| 12 |
|
| 13 |
x11-misc/openbox-menu/files/openbox-menu-0.8.1-build.patch | 6 ------ |
| 14 |
x11-misc/openbox-menu/files/openbox-menu-0.8.1-gtk3.patch | 8 ++++---- |
| 15 |
x11-misc/openbox-menu/files/openbox-menu-0.8.1-makefile.patch | 1 + |
| 16 |
3 files changed, 5 insertions(+), 10 deletions(-) |
| 17 |
|
| 18 |
diff --git a/x11-misc/openbox-menu/files/openbox-menu-0.8.1-build.patch b/x11-misc/openbox-menu/files/openbox-menu-0.8.1-build.patch |
| 19 |
index b1130c85d86..ea66efb1290 100644 |
| 20 |
--- a/x11-misc/openbox-menu/files/openbox-menu-0.8.1-build.patch |
| 21 |
+++ b/x11-misc/openbox-menu/files/openbox-menu-0.8.1-build.patch |
| 22 |
@@ -4,12 +4,6 @@ Date: Thu, 11 Feb 2021 21:12:52 +0300 |
| 23 |
Subject: [PATCH 1/2] Fix compilation |
| 24 |
|
| 25 |
icon_theme is needed in menu.c |
| 26 |
---- |
| 27 |
- src/openbox-menu.h | 4 ++++ |
| 28 |
- 1 file changed, 4 insertions(+) |
| 29 |
- |
| 30 |
-diff --git a/src/openbox-menu.h b/src/openbox-menu.h |
| 31 |
-index 88ab2bf..e3dee22 100644 |
| 32 |
--- a/src/openbox-menu.h |
| 33 |
+++ b/src/openbox-menu.h |
| 34 |
@@ -82,4 +82,8 @@ gboolean context_get_persistent (OB_Menu*); |
| 35 |
|
| 36 |
diff --git a/x11-misc/openbox-menu/files/openbox-menu-0.8.1-gtk3.patch b/x11-misc/openbox-menu/files/openbox-menu-0.8.1-gtk3.patch |
| 37 |
index 20643a6a151..de8e28189a2 100644 |
| 38 |
--- a/x11-misc/openbox-menu/files/openbox-menu-0.8.1-gtk3.patch |
| 39 |
+++ b/x11-misc/openbox-menu/files/openbox-menu-0.8.1-gtk3.patch |
| 40 |
@@ -2,18 +2,18 @@ From 8fe1e7fa9239ed8b604a59ef2202f183f1f56eb6 Mon Sep 17 00:00:00 2001 |
| 41 |
From: Fabrice THIROUX <fabrice.thiroux@×××××.com> |
| 42 |
Date: Sat, 13 Feb 2021 14:46:53 +0100 |
| 43 |
Subject: [PATCH] Updated for gtk3. Remove icon_theme annoying variable |
| 44 |
+ |
| 45 |
+--- |
| 46 |
--- a/Makefile |
| 47 |
+++ b/Makefile |
| 48 |
@@ -1,5 +1,5 @@ |
| 49 |
-LIBS= `pkg-config --libs glib-2.0 gtk+-2.0 libmenu-cache` |
| 50 |
-CFLAGS+= -g -Wall `pkg-config --cflags glib-2.0 gtk+-2.0 libmenu-cache` |
| 51 |
-+LIBS= `${PKG_CONFIG} --libs glib-2.0 gtk+-3.0 libmenu-cache` |
| 52 |
-+CFLAGS+= -Wall `${PKG_CONFIG} --cflags glib-2.0 gtk+-3.0 libmenu-cache` |
| 53 |
++LIBS= `pkg-config --libs glib-2.0 gtk+-3.0 libmenu-cache` |
| 54 |
++CFLAGS+= -g -Wall `pkg-config --cflags glib-2.0 gtk+-3.0 libmenu-cache` |
| 55 |
CC=gcc |
| 56 |
#-DG_DISABLE_DEPRECATED |
| 57 |
|
| 58 |
-diff --git a/src/menu.c b/src/menu.c |
| 59 |
-index 5b7e8f8..3b752d9 100644 |
| 60 |
--- a/src/menu.c |
| 61 |
+++ b/src/menu.c |
| 62 |
@@ -240,7 +240,6 @@ main (int argc, char **argv) |
| 63 |
|
| 64 |
diff --git a/x11-misc/openbox-menu/files/openbox-menu-0.8.1-makefile.patch b/x11-misc/openbox-menu/files/openbox-menu-0.8.1-makefile.patch |
| 65 |
index acf62388572..a2848bf464b 100644 |
| 66 |
--- a/x11-misc/openbox-menu/files/openbox-menu-0.8.1-makefile.patch |
| 67 |
+++ b/x11-misc/openbox-menu/files/openbox-menu-0.8.1-makefile.patch |
| 68 |
@@ -76,6 +76,7 @@ Misc enhancements to file globbing. |
| 69 |
doc: |
| 70 |
robodoc --src . --doc doc/ --multidoc --index --html --cmode |
| 71 |
|
| 72 |
+diff --git a/README.md b/README.md |
| 73 |
--- a/README.md |
| 74 |
+++ b/README.md |
| 75 |
@@ -6,17 +6,17 @@ Type `make` then, with superuser privileges, `make install` to install it. openb |
Archives