[gentoo-commits] repo/gentoo:master commit in: x11-misc/openbox-menu/files/

[gentoo-commits] repo/gentoo:master commit in: x11-misc/openbox-menu/files/

[Sam James]

commit:     378266f4942bb8f2b12fc980d7ac2b8a24b0ec1e
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Tue Apr 20 11:49:01 2021 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Tue Apr 20 11:50:40 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=378266f4

x11-misc/openbox-menu: fix patch

Closes: https://bugs.gentoo.org/784305
Signed-off-by: Sam James <sam <AT> gentoo.org>

 x11-misc/openbox-menu/files/openbox-menu-0.8.1-build.patch    | 6 ------
 x11-misc/openbox-menu/files/openbox-menu-0.8.1-gtk3.patch     | 8 ++++----
 x11-misc/openbox-menu/files/openbox-menu-0.8.1-makefile.patch | 1 +
 3 files changed, 5 insertions(+), 10 deletions(-)

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
index b1130c85d86..ea66efb1290 100644
--- 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
@@ -4,12 +4,6 @@ Date: Thu, 11 Feb 2021 21:12:52 +0300
 Subject: [PATCH 1/2] Fix compilation
 
 icon_theme is needed in menu.c
----
- src/openbox-menu.h | 4 ++++
- 1 file changed, 4 insertions(+)
-
-diff --git a/src/openbox-menu.h b/src/openbox-menu.h
-index 88ab2bf..e3dee22 100644
 --- a/src/openbox-menu.h
 +++ b/src/openbox-menu.h
 @@ -82,4 +82,8 @@ gboolean context_get_persistent (OB_Menu*);

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
index 20643a6a151..de8e28189a2 100644
--- 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
@@ -2,18 +2,18 @@ From 8fe1e7fa9239ed8b604a59ef2202f183f1f56eb6 Mon Sep 17 00:00:00 2001
 From: Fabrice THIROUX <fabrice.thiroux@net-c.com>
 Date: Sat, 13 Feb 2021 14:46:53 +0100
 Subject: [PATCH] Updated for gtk3. Remove icon_theme annoying variable
+
+---
 --- a/Makefile
 +++ b/Makefile
 @@ -1,5 +1,5 @@
 -LIBS= `pkg-config --libs glib-2.0 gtk+-2.0 libmenu-cache`
 -CFLAGS+= -g -Wall `pkg-config --cflags glib-2.0 gtk+-2.0 libmenu-cache`
-+LIBS= `${PKG_CONFIG} --libs glib-2.0 gtk+-3.0 libmenu-cache`
-+CFLAGS+= -Wall `${PKG_CONFIG} --cflags glib-2.0 gtk+-3.0 libmenu-cache`
++LIBS= `pkg-config --libs glib-2.0 gtk+-3.0 libmenu-cache`
++CFLAGS+= -g -Wall `pkg-config --cflags glib-2.0 gtk+-3.0 libmenu-cache`
  CC=gcc
  #-DG_DISABLE_DEPRECATED
  
-diff --git a/src/menu.c b/src/menu.c
-index 5b7e8f8..3b752d9 100644
 --- a/src/menu.c
 +++ b/src/menu.c
 @@ -240,7 +240,6 @@ main (int argc, char **argv)

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
index acf62388572..a2848bf464b 100644
--- 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
@@ -76,6 +76,7 @@ Misc enhancements to file globbing.
  doc:
  	robodoc --src . --doc doc/ --multidoc --index --html --cmode
 
+diff --git a/README.md b/README.md
 --- a/README.md
 +++ b/README.md
 @@ -6,17 +6,17 @@ Type `make` then, with superuser privileges, `make install` to install it. openb