summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSam James <sam@gentoo.org>2021-04-20 11:49:01 +0000
committerSam James <sam@gentoo.org>2021-04-20 11:50:40 +0000
commit378266f4942bb8f2b12fc980d7ac2b8a24b0ec1e (patch)
tree369cbcce6bf7f6675b523f3a17d9523f9f8bbbd5 /x11-misc
parentx11-plugins/wmcalendar: fix patch (diff)
downloadgentoo-378266f4942bb8f2b12fc980d7ac2b8a24b0ec1e.tar.gz
gentoo-378266f4942bb8f2b12fc980d7ac2b8a24b0ec1e.tar.bz2
gentoo-378266f4942bb8f2b12fc980d7ac2b8a24b0ec1e.zip
x11-misc/openbox-menu: fix patch
Closes: https://bugs.gentoo.org/784305 Signed-off-by: Sam James <sam@gentoo.org>
Diffstat (limited to 'x11-misc')
-rw-r--r--x11-misc/openbox-menu/files/openbox-menu-0.8.1-build.patch6
-rw-r--r--x11-misc/openbox-menu/files/openbox-menu-0.8.1-gtk3.patch8
-rw-r--r--x11-misc/openbox-menu/files/openbox-menu-0.8.1-makefile.patch1
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 b1130c85d864..ea66efb12903 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 20643a6a1516..de8e28189a25 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 acf623885720..a2848bf464bf 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