Skip to content

Commit

Permalink
x11-misc/openbox-menu: fix patch
Browse files Browse the repository at this point in the history
Closes: https://bugs.gentoo.org/784305
Signed-off-by: Sam James <[email protected]>
  • Loading branch information
thesamesam committed Apr 20, 2021
1 parent 59d4a38 commit 378266f
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 10 deletions.
6 changes: 0 additions & 6 deletions x11-misc/openbox-menu/files/openbox-menu-0.8.1-build.patch
Original file line number Diff line number Diff line change
Expand Up @@ -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*);
Expand Down
8 changes: 4 additions & 4 deletions x11-misc/openbox-menu/files/openbox-menu-0.8.1-gtk3.patch
Original file line number Diff line number Diff line change
Expand Up @@ -2,18 +2,18 @@ From 8fe1e7fa9239ed8b604a59ef2202f183f1f56eb6 Mon Sep 17 00:00:00 2001
From: Fabrice THIROUX <[email protected]>
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)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit 378266f

Please sign in to comment.