From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <gentoo-commits+bounces-1273267-garchives=archives.gentoo.org@lists.gentoo.org>
Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80])
	(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
	(No client certificate requested)
	by finch.gentoo.org (Postfix) with ESMTPS id 5E47F13835A
	for <garchives@archives.gentoo.org>; Tue, 20 Apr 2021 11:56:50 +0000 (UTC)
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
	by pigeon.gentoo.org (Postfix) with SMTP id 6D2CBE086E;
	Tue, 20 Apr 2021 11:56:49 +0000 (UTC)
Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183])
	(using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits))
	(No client certificate requested)
	by pigeon.gentoo.org (Postfix) with ESMTPS id 0850BE086D
	for <gentoo-commits@lists.gentoo.org>; Tue, 20 Apr 2021 11:56:49 +0000 (UTC)
Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52])
	(using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits))
	(No client certificate requested)
	by smtp.gentoo.org (Postfix) with ESMTPS id CB6B8335CEF
	for <gentoo-commits@lists.gentoo.org>; Tue, 20 Apr 2021 11:56:47 +0000 (UTC)
Received: from localhost.localdomain (localhost [IPv6:::1])
	by oystercatcher.gentoo.org (Postfix) with ESMTP id 31AC86F4
	for <gentoo-commits@lists.gentoo.org>; Tue, 20 Apr 2021 11:56:46 +0000 (UTC)
From: "Sam James" <sam@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Content-Transfer-Encoding: 8bit
Content-type: text/plain; charset=UTF-8
Reply-To: gentoo-dev@lists.gentoo.org, "Sam James" <sam@gentoo.org>
Message-ID: <1618919440.378266f4942bb8f2b12fc980d7ac2b8a24b0ec1e.sam@gentoo>
Subject: [gentoo-commits] repo/gentoo:master commit in: x11-misc/openbox-menu/files/
X-VCS-Repository: repo/gentoo
X-VCS-Files: x11-misc/openbox-menu/files/openbox-menu-0.8.1-build.patch x11-misc/openbox-menu/files/openbox-menu-0.8.1-gtk3.patch x11-misc/openbox-menu/files/openbox-menu-0.8.1-makefile.patch
X-VCS-Directories: x11-misc/openbox-menu/files/
X-VCS-Committer: sam
X-VCS-Committer-Name: Sam James
X-VCS-Revision: 378266f4942bb8f2b12fc980d7ac2b8a24b0ec1e
X-VCS-Branch: master
Date: Tue, 20 Apr 2021 11:56:46 +0000 (UTC)
Precedence: bulk
List-Post: <mailto:gentoo-commits@lists.gentoo.org>
List-Help: <mailto:gentoo-commits+help@lists.gentoo.org>
List-Unsubscribe: <mailto:gentoo-commits+unsubscribe@lists.gentoo.org>
List-Subscribe: <mailto:gentoo-commits+subscribe@lists.gentoo.org>
List-Id: Gentoo Linux mail <gentoo-commits.gentoo.org>
X-BeenThere: gentoo-commits@lists.gentoo.org
X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply
X-Archives-Salt: 027de5f2-2ef6-4573-aa5a-2eda703bed5d
X-Archives-Hash: 2c3c6d373a4ce3679889a273f145ca91

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