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

2022-03-19 Thread Sam James
commit: 1f1d4ca344f3b37cdeb209a80c47c29719282c1f
Author: Sam James  gentoo  org>
AuthorDate: Sun Mar 20 00:14:02 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Sun Mar 20 00:14:02 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1f1d4ca3

x11-misc/openbox-menu: [QA] fix tc-get* quoting

This can cause build problems for e.g. 32-bit (gcc -m32 ...)

Signed-off-by: Sam James  gentoo.org>

 x11-misc/openbox-menu/openbox-menu-0.8.1.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/x11-misc/openbox-menu/openbox-menu-0.8.1.ebuild 
b/x11-misc/openbox-menu/openbox-menu-0.8.1.ebuild
index 616287e4131d..1feb6e43a525 100644
--- a/x11-misc/openbox-menu/openbox-menu-0.8.1.ebuild
+++ b/x11-misc/openbox-menu/openbox-menu-0.8.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -35,7 +35,7 @@ PATCHES=(
 )
 
 src_compile() {
-   emake CC=$(tc-getCC) PKG_CONFIG=$(tc-getPKG_CONFIG) \
+   emake CC="$(tc-getCC)" PKG_CONFIG=$(tc-getPKG_CONFIG) \
WITH_ICONS=$(usex icons '1' '0') \
WITH_SVG=$(usex svg '1' '0')
 }



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

2021-05-01 Thread Andreas Sturmlechner
commit: b434d5b14023d0c204c72d9276c997fa7d8fe316
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Sat May  1 21:12:09 2021 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Sat May  1 21:21:54 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b434d5b1

x11-misc/openbox-menu: Drop 0.8.0, EAPI5--

Closes: https://bugs.gentoo.org/698100
Package-Manager: Portage-3.0.18, Repoman-3.0.3
Signed-off-by: Andreas Sturmlechner  gentoo.org>

 x11-misc/openbox-menu/Manifest |  1 -
 .../files/openbox-menu-0.5.0-build.patch   | 81 --
 x11-misc/openbox-menu/openbox-menu-0.8.0.ebuild| 42 ---
 3 files changed, 124 deletions(-)

diff --git a/x11-misc/openbox-menu/Manifest b/x11-misc/openbox-menu/Manifest
index bfff046437b..64735ae9fe9 100644
--- a/x11-misc/openbox-menu/Manifest
+++ b/x11-misc/openbox-menu/Manifest
@@ -1,2 +1 @@
-DIST openbox-menu-0.8.0.tar.bz2 24229 BLAKE2B 
8950d1bf55454f239a92cf17f8676295f7c769b73fce34ee2786b0a5dd18bd81b3dddfec7f5fcf77f697072abaea758d1d5c9d0f80d41c0a9d80709b845161c2
 SHA512 
955a5e16e7be001aec030358d3568aa6a3303d7138d6eb998494cd9ffa77de14ecf4bee163a9d49faf67939c85e303cbae51461f04f7eeaf44167a377c0f352d
 DIST openbox-menu-0.8.1.tar.gz 27960 BLAKE2B 
f4c78956c163b0d8ca2d601b05354217071e93307a0abc1536d1d373a3d402384b0a4d3c15252aaf9aae7c20b76b5b8aa69edfacbe11cfaa76b1aba8a7a4834e
 SHA512 
de6454e88ac30b5cb1094ae427116808ad9dd2f37c8d2ae20dea77aa60d414a47149c09e8ea7d3c5c31182b728b8a4f13283f33c6e2a34d3cd4b64f91d4ef8da

diff --git a/x11-misc/openbox-menu/files/openbox-menu-0.5.0-build.patch 
b/x11-misc/openbox-menu/files/openbox-menu-0.5.0-build.patch
deleted file mode 100644
index 5750e982be1..000
--- a/x11-misc/openbox-menu/files/openbox-menu-0.5.0-build.patch
+++ /dev/null
@@ -1,81 +0,0 @@
-From: Julian Ospald 
-Date: Wed Aug 21 14:26:38 UTC 2013
-Subject: several QA fixes
-
 a/Makefile
-+++ b/Makefile
-@@ -1,17 +1,27 @@
--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`
--CC=gcc
-+CC ?= gcc
-+PKG_CONFIG ?= pkg-config
-+
-+CFLAGS ?= -O2 -g
-+CFLAGS += -Wall $(shell $(PKG_CONFIG) --cflags glib-2.0 gtk+-2.0 
libmenu-cache)
-+LIBS += $(shell $(PKG_CONFIG) --libs glib-2.0 gtk+-2.0 libmenu-cache)
- #-DG_DISABLE_DEPRECATED
- 
--# Comment this line if you don't want icons to appear in menu
--CFLAGS+=-DWITH_ICONS
--# Uncomment this line if Openbox can display SVG icons 
--# Check SVG support with '$ ldd /usr/bin/openbox | grep svg', librsvg must 
appear..
--# CFLAGS+=-DWITH_SVG
--
--prefix= /usr/local
--DESTDIR ?= $(prefix)
--BINDIR= ${DESTDIR}/bin
-+# set to 0 to turn off icons in menus
-+ICONS=1
-+
-+# set to 0 to turn off svg icons in menus
-+SVG_ICONS=1
-+
-+ifeq ($(SVG_ICONS),1)
-+CPPFLAGS += -DWITH_SVG
-+endif
-+
-+ifeq ($(ICONS),1)
-+CPPFLAGS += -DWITH_ICONS
-+endif
-+
-+prefix = /usr
-+BINDIR = ${prefix}/bin
- 
- SRC= $(shell ls *.c 2> /dev/null)
- OBJ= $(SRC:.c=.o)
-@@ -19,26 +29,29 @@
- all: $(OBJ) openbox-menu
- 
- %.o: %.c
--  $(CC) $(CFLAGS) -c $< -o $@
-+  $(CC) $(CFLAGS) $(CPPFLAGS) -c $< -o $@
- 
- openbox-menu: $(OBJ)
--  $(CC) $(OBJ) -o openbox-menu $(LDFLAGS) $(LIBS)
-+  $(CC) $(CFLAGS) $(OBJ) -o openbox-menu $(LDFLAGS) $(LIBS)
- 
--.PHONY: clean install doc changelog check
-+.PHONY: clean install install-strip doc changelog check
- 
- clean:
-   @rm -f *.o openbox-menu
-   @rm -rf doc
- 
- install:
-+  @install -Dm 755 openbox-menu "$(DESTDIR)$(BINDIR)/openbox-menu"
-+
-+install-strip:
-   @strip -s openbox-menu
--  @install -Dm 755 openbox-menu $(BINDIR)/openbox-menu
-+  @install -Dm 755 openbox-menu "$(DESTDIR)$(BINDIR)/openbox-menu"
- 
- doc:
-   robodoc --src . --doc doc/ --multidoc --index --html --cmode
- 
- check: openbox-menu
--  ./openbox-menu > test.xml 
-+  ./openbox-menu > test.xml
-   xmllint test.xml
-   rm test.xml
- 

diff --git a/x11-misc/openbox-menu/openbox-menu-0.8.0.ebuild 
b/x11-misc/openbox-menu/openbox-menu-0.8.0.ebuild
deleted file mode 100644
index bbdd608be6b..000
--- a/x11-misc/openbox-menu/openbox-menu-0.8.0.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit epatch toolchain-funcs
-
-DESCRIPTION="Another dynamic menu generator for Openbox"
-HOMEPAGE="http://fabrice.thiroux.free.fr/openbox-menu_en.html;
-SRC_URI="https://bitbucket.org/fabriceT/${PN}/downloads/${P}.tar.bz2;
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="+icons svg"
-REQUIRED_USE="svg? ( icons )"
-
-COMMON_DEPEND="
-   dev-libs/glib:2
-   lxde-base/menu-cache
-   x11-libs/gtk+:2
-"
-RDEPEND="
-   ${COMMON_DEPEND}
-   icons? ( x11-wm/openbox[imlib,svg?] )
-   !icons? ( x11-wm/openbox )
-"
-DEPEND="
-   ${COMMON_DEPEND}
-   virtual/pkgconfig
-"
-
-src_prepare() {
-  

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

2021-04-26 Thread Sam James
commit: f6603baffc8aecb3df6cfcb640e31eaf45156626
Author: Sam James  gentoo  org>
AuthorDate: Mon Apr 26 19:09:46 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Mon Apr 26 19:11:02 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f6603baf

x11-misc/openbox-menu: Stabilize 0.8.1 x86, #739808

Signed-off-by: Sam James  gentoo.org>

 x11-misc/openbox-menu/openbox-menu-0.8.1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/x11-misc/openbox-menu/openbox-menu-0.8.1.ebuild 
b/x11-misc/openbox-menu/openbox-menu-0.8.1.ebuild
index a00a2be3279..616287e4131 100644
--- a/x11-misc/openbox-menu/openbox-menu-0.8.1.ebuild
+++ b/x11-misc/openbox-menu/openbox-menu-0.8.1.ebuild
@@ -11,7 +11,7 @@ 
SRC_URI="https://github.com/fabriceT/openbox-menu/archive/v${PV}.tar.gz -> ${P}.
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="+icons svg"
 REQUIRED_USE="svg? ( icons )"
 



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

2021-04-21 Thread Sam James
commit: 1a294e3a55083474484b3ad0b1fe6b3de1b42e98
Author: Sam James  gentoo  org>
AuthorDate: Wed Apr 21 18:52:03 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Wed Apr 21 18:52:03 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1a294e3a

x11-misc/openbox-menu: Stabilize 0.8.1 amd64, #739808

Signed-off-by: Sam James  gentoo.org>

 x11-misc/openbox-menu/openbox-menu-0.8.1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/x11-misc/openbox-menu/openbox-menu-0.8.1.ebuild 
b/x11-misc/openbox-menu/openbox-menu-0.8.1.ebuild
index e49e6551b15..a00a2be3279 100644
--- a/x11-misc/openbox-menu/openbox-menu-0.8.1.ebuild
+++ b/x11-misc/openbox-menu/openbox-menu-0.8.1.ebuild
@@ -11,7 +11,7 @@ 
SRC_URI="https://github.com/fabriceT/openbox-menu/archive/v${PV}.tar.gz -> ${P}.
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 IUSE="+icons svg"
 REQUIRED_USE="svg? ( icons )"
 



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

2021-04-20 Thread Sam James
commit: 378266f4942bb8f2b12fc980d7ac2b8a24b0ec1e
Author: Sam James  gentoo  org>
AuthorDate: Tue Apr 20 11:49:01 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Tue Apr 20 11:50:40 2021 +
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  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 
 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



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

2021-04-18 Thread Sam James
commit: d2fc163cbe5119e057441bd4664d24014eede5f9
Author: Sam James  gentoo  org>
AuthorDate: Fri Apr 16 14:07:09 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Sun Apr 18 06:05:24 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d2fc163c

x11-misc/openbox-menu: eutils->epatch

Package-Manager: Portage-3.0.14-prefix, Repoman-3.0.2
Signed-off-by: Sam James  gentoo.org>

 x11-misc/openbox-menu/openbox-menu-0.8.0.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/x11-misc/openbox-menu/openbox-menu-0.8.0.ebuild 
b/x11-misc/openbox-menu/openbox-menu-0.8.0.ebuild
index e7513e44be6..bbdd608be6b 100644
--- a/x11-misc/openbox-menu/openbox-menu-0.8.0.ebuild
+++ b/x11-misc/openbox-menu/openbox-menu-0.8.0.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
-inherit eutils toolchain-funcs
+inherit epatch toolchain-funcs
 
 DESCRIPTION="Another dynamic menu generator for Openbox"
 HOMEPAGE="http://fabrice.thiroux.free.fr/openbox-menu_en.html;



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

2021-03-27 Thread Jonas Stein
commit: d609662534c971de945944103e1888eb4dca1174
Author: Jonas Stein  gentoo  org>
AuthorDate: Sun Mar 28 01:53:43 2021 +
Commit: Jonas Stein  gentoo  org>
CommitDate: Sun Mar 28 01:53:43 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d6096625

x11-misc/openbox-menu: drop project desktop-misc

Drop project desktop-misc from the list of maintainers.

Package-Manager: Portage-3.0.17, Repoman-3.0.2
Signed-off-by: Jonas Stein  gentoo.org>

 x11-misc/openbox-menu/metadata.xml | 5 +
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/x11-misc/openbox-menu/metadata.xml 
b/x11-misc/openbox-menu/metadata.xml
index 374fcd14bd7..9ca68119c25 100644
--- a/x11-misc/openbox-menu/metadata.xml
+++ b/x11-misc/openbox-menu/metadata.xml
@@ -1,10 +1,7 @@
 
 http://www.gentoo.org/dtd/metadata.dtd;>
 
-   
-   desktop-m...@gentoo.org
-   Gentoo Desktop Miscellaneous Project
-   
+   


fabrice.thir...@free.fr



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

2021-03-15 Thread Andreas Sturmlechner
commit: fb3b6fa6ed33b54c6315c0b903b30de35a8ef876
Author: Azamat H. Hackimov  gmail  com>
AuthorDate: Thu Sep  3 21:06:07 2020 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Mon Mar 15 15:23:34 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fb3b6fa6

x11-misc/openbox-menu: update to 0.8.1

Updated SRC_URI (#739808), migrated to EAPI 7.

Bug: https://bugs.gentoo.org/739808
Package-Manager: Portage-3.0.4, Repoman-2.3.23
Signed-off-by: Azamat H. Hackimov  gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/17404
Signed-off-by: Andreas Sturmlechner  gentoo.org>

 x11-misc/openbox-menu/Manifest |   1 +
 .../files/openbox-menu-0.8.1-build.patch   |  26 +
 .../files/openbox-menu-0.8.1-makefile.patch| 106 +
 x11-misc/openbox-menu/metadata.xml |   3 +-
 x11-misc/openbox-menu/openbox-menu-0.8.1.ebuild|  38 
 5 files changed, 172 insertions(+), 2 deletions(-)

diff --git a/x11-misc/openbox-menu/Manifest b/x11-misc/openbox-menu/Manifest
index d0f1e833ff7..bfff046437b 100644
--- a/x11-misc/openbox-menu/Manifest
+++ b/x11-misc/openbox-menu/Manifest
@@ -1 +1,2 @@
 DIST openbox-menu-0.8.0.tar.bz2 24229 BLAKE2B 
8950d1bf55454f239a92cf17f8676295f7c769b73fce34ee2786b0a5dd18bd81b3dddfec7f5fcf77f697072abaea758d1d5c9d0f80d41c0a9d80709b845161c2
 SHA512 
955a5e16e7be001aec030358d3568aa6a3303d7138d6eb998494cd9ffa77de14ecf4bee163a9d49faf67939c85e303cbae51461f04f7eeaf44167a377c0f352d
+DIST openbox-menu-0.8.1.tar.gz 27960 BLAKE2B 
f4c78956c163b0d8ca2d601b05354217071e93307a0abc1536d1d373a3d402384b0a4d3c15252aaf9aae7c20b76b5b8aa69edfacbe11cfaa76b1aba8a7a4834e
 SHA512 
de6454e88ac30b5cb1094ae427116808ad9dd2f37c8d2ae20dea77aa60d414a47149c09e8ea7d3c5c31182b728b8a4f13283f33c6e2a34d3cd4b64f91d4ef8da

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
new file mode 100644
index 000..b1130c85d86
--- /dev/null
+++ b/x11-misc/openbox-menu/files/openbox-menu-0.8.1-build.patch
@@ -0,0 +1,26 @@
+From e3989a504d9713d0de8b236b1f8d21c74d1fcd00 Mon Sep 17 00:00:00 2001
+From: "Azamat H. Hackimov" 
+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*);
+ 
+ void context_free(OB_Menu *);
+ 
++#ifdef WITH_ICONS
++extern GtkIconTheme *icon_theme;
++#endif
++
+ #endif // __OPENBOXMENU_APP__
+-- 
+2.26.2
+

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
new file mode 100644
index 000..c74a02079f9
--- /dev/null
+++ b/x11-misc/openbox-menu/files/openbox-menu-0.8.1-makefile.patch
@@ -0,0 +1,106 @@
+From fa18093783ec77102c304134626bf3b4ddc07ec8 Mon Sep 17 00:00:00 2001
+From: "Azamat H. Hackimov" 
+Date: Thu, 11 Feb 2021 21:47:47 +0300
+Subject: [PATCH 2/2] Update Makefile build
+
+Introduce CC and PKG_CONFIG variables that can be redefined by user.
+Added variables WITH_ICONS and WITH_SVG that can be also redefined by user.
+Misc enhancements to file globbing.
+---
+ Makefile  | 36 ++--
+ README.md |  8 
+ 2 files changed, 30 insertions(+), 14 deletions(-)
+
+diff --git a/Makefile b/Makefile
+index 5d8af49..e40e611 100644
+--- a/Makefile
 b/Makefile
+@@ -1,19 +1,32 @@
+-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`
+-CC=gcc
++CC ?= gcc
++PKG_CONFIG ?= pkg-config
++
++CFLAGS ?= -O2 -g
++CFLAGS += -Wall $(shell $(PKG_CONFIG) --cflags glib-2.0 gtk+-2.0 
libmenu-cache)
++LIBS += $(shell $(PKG_CONFIG) --libs glib-2.0 gtk+-2.0 libmenu-cache)
++
+ #-DG_DISABLE_DEPRECATED
+ 
+-# Comment this line if you don't want icons to appear in menu
+-CFLAGS+=-DWITH_ICONS
+-# Uncomment this line if Openbox can display SVG icons
++# set to 0 to turn off icons in menus
++WITH_ICONS=1
++
++ifeq ($(WITH_ICONS),1)
++CFLAGS += -DWITH_ICONS
++endif
++
++# set to 0 to turn off svg icons in menus
+ # Check SVG support with '$ ldd /usr/bin/openbox | grep svg', librsvg must 
appear..
+-# CFLAGS+=-DWITH_SVG
++WITH_SVG=0
+ 
+-prefix= /usr/local
++ifeq ($(WITH_SVG),1)
++CFLAGS += -DWITH_SVG
++endif
++
++prefix = /usr/local
+ DESTDIR ?= $(prefix)
+ BINDIR= ${DESTDIR}/bin
+ 
+-SRC= $(shell ls src/*.c 2> /dev/null)
++SRC= $(wildcard src/*.c)
+ OBJ= $(SRC:.c=.o)
+ 
+ all: $(OBJ) check openbox-menu
+@@ -25,13 +38,16 @@ all: $(OBJ) check openbox-menu
+ openbox-menu: $(OBJ)
+   $(CC) $(OBJ) -o openbox-menu $(LDFLAGS) $(LIBS)
+ 
+-.PHONY: clean install doc changelog check xmllint
++.PHONY: clean install 

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

2021-03-15 Thread Andreas Sturmlechner
commit: 4d2d5a69a893f6c88ac53eb0c0fc4dc798fc8024
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Mon Mar 15 14:52:28 2021 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Mon Mar 15 15:23:35 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4d2d5a69

x11-misc/openbox-menu: Switch to GTK3

0.8.1-makefile.patch: Fix BINDIR path, add DESTDIR, adapt to GTK3 change

Bug: https://bugs.gentoo.org/739808
Package-Manager: Portage-3.0.17, Repoman-3.0.2
Signed-off-by: Andreas Sturmlechner  gentoo.org>

 .../files/openbox-menu-0.8.1-gtk3.patch| 91 ++
 .../files/openbox-menu-0.8.1-makefile.patch| 42 +-
 x11-misc/openbox-menu/openbox-menu-0.8.1.ebuild| 11 ++-
 3 files changed, 119 insertions(+), 25 deletions(-)

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
new file mode 100644
index 000..6b16b8a0ff8
--- /dev/null
+++ b/x11-misc/openbox-menu/files/openbox-menu-0.8.1-gtk3.patch
@@ -0,0 +1,91 @@
+From 8fe1e7fa9239ed8b604a59ef2202f183f1f56eb6 Mon Sep 17 00:00:00 2001
+From: Fabrice THIROUX 
+Date: Sat, 13 Feb 2021 14:46:53 +0100
+Subject: [PATCH] Updated for gtk3. Remove icon_theme annoying variable
+
+---
+ Makefile   |  4 ++--
+ src/menu.c |  1 -
+ src/openbox-menu.h |  1 +
+ src/utils.c| 16 ++--
+ 4 files changed, 9 insertions(+), 13 deletions(-)
+
+diff --git a/Makefile b/Makefile
+index 5d8af49..5e09ef2 100644
+--- 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+= -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)
+ 
+ #ifdef WITH_ICONS
+   gtk_init (, );
+-  icon_theme = gtk_icon_theme_get_default ();
+ #endif
+ 
+   if ((ob_context = configure (argc, argv)) == NULL)
+diff --git a/src/openbox-menu.h b/src/openbox-menu.h
+index 7035e9d..f5a7bce 100644
+--- a/src/openbox-menu.h
 b/src/openbox-menu.h
+@@ -19,6 +19,7 @@
+ 
+ #ifndef __OPENBOXMENU_APP__
+ #define __OPENBOXMENU_APP__
++
+ #include 
+ 
+ #ifdef WITH_ICONS
+diff --git a/src/utils.c b/src/utils.c
+index 7a68316..2f4f95b 100644
+--- a/src/utils.c
 b/src/utils.c
+@@ -169,8 +169,6 @@ clean_exec (MenuCacheApp *app)
+ 
+ #if WITH_ICONS
+ 
+-extern GtkIconTheme *icon_theme;
+-
+ /f* utils/item_icon_path
+  * OUTPUT
+  *   return the path for the themed icon if item.
+@@ -199,23 +197,21 @@ item_icon_path (MenuCacheItem *item)
+   if (g_path_is_absolute (name))
+   return g_strdup (name);
+ 
+-  /*  We remove the file extension as gtk_icon_theme_lookup_icon 
can't
+-   *  lookup a theme icon for, ie, 'geany.png'. It has to be 
'geany'.
+-   */
+-  tmp_name = strndup (name, strrchr (name, '.') - name);
+   #ifdef WITH_SVG
+-  icon_info = gtk_icon_theme_lookup_icon (icon_theme, tmp_name, 
16, GTK_ICON_LOOKUP_GENERIC_FALLBACK);
++  icon_info = gtk_icon_theme_lookup_icon 
(gtk_icon_theme_get_default(), name, 16, GTK_ICON_LOOKUP_GENERIC_FALLBACK);
+   #else
+-  icon_info = gtk_icon_theme_lookup_icon (icon_theme, tmp_name, 
16, GTK_ICON_LOOKUP_NO_SVG | GTK_ICON_LOOKUP_GENERIC_FALLBACK);
++  icon_info = gtk_icon_theme_lookup_icon 
(gtk_icon_theme_get_default(), name, 16, GTK_ICON_LOOKUP_NO_SVG | 
GTK_ICON_LOOKUP_GENERIC_FALLBACK);
+   #endif
+   g_free (tmp_name);
+   }
+ 
++
++
+   if (!icon_info) /* 2nd fallback */
+-  icon_info = gtk_icon_theme_lookup_icon (icon_theme, "empty", 
16, GTK_ICON_LOOKUP_NO_SVG);
++  icon_info = gtk_icon_theme_lookup_icon 
(gtk_icon_theme_get_default (), "empty", 16, GTK_ICON_LOOKUP_NO_SVG);
+ 
+   icon = g_strdup (gtk_icon_info_get_filename (icon_info));
+-  gtk_icon_info_free (icon_info);
++  g_object_unref (icon_info);
+ 
+   return icon;
+ }

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 c74a02079f9..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
@@ -6,25 +6,21 @@ Subject: [PATCH 2/2] Update Makefile build
 Introduce CC and PKG_CONFIG variables that can be redefined by user.
 Added variables WITH_ICONS and WITH_SVG that can be also redefined by user.
 Misc enhancements to file globbing.

- Makefile  | 36 ++--
- README.md |  8 
- 2 files 

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

2016-11-25 Thread Patrice Clement
commit: ad812b1bf8e62c23428a5abdcd23ff0e78edf3f7
Author: Wim Muskee  gmail  com>
AuthorDate: Mon Nov 21 20:01:23 2016 +
Commit: Patrice Clement  gentoo  org>
CommitDate: Fri Nov 25 22:00:02 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ad812b1b

x11-misc/openbox-menu: update HOMEPAGE and metadata.xml.

Gentoo-Bug: https://bugs.gentoo.org/582380

Closes: https://github.com/gentoo/gentoo/pull/2886

Signed-off-by: Patrice Clement  gentoo.org>

 x11-misc/openbox-menu/metadata.xml  | 4 ++--
 x11-misc/openbox-menu/openbox-menu-0.5.1.ebuild | 4 ++--
 x11-misc/openbox-menu/openbox-menu-0.7.0.ebuild | 4 ++--
 x11-misc/openbox-menu/openbox-menu-0.8.0.ebuild | 4 ++--
 4 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/x11-misc/openbox-menu/metadata.xml 
b/x11-misc/openbox-menu/metadata.xml
index faa65d5..1636af9 100644
--- a/x11-misc/openbox-menu/metadata.xml
+++ b/x11-misc/openbox-menu/metadata.xml
@@ -7,8 +7,8 @@



-   mimas...@free.fr
-   mimas
+   fabrice.thir...@free.fr
+   Fabrice Thiroux

https://bitbucket.org/fabriceT/openbox-menu
fabriceT/openbox-menu

diff --git a/x11-misc/openbox-menu/openbox-menu-0.5.1.ebuild 
b/x11-misc/openbox-menu/openbox-menu-0.5.1.ebuild
index 6c6e36c..b518b73 100644
--- a/x11-misc/openbox-menu/openbox-menu-0.5.1.ebuild
+++ b/x11-misc/openbox-menu/openbox-menu-0.5.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -6,7 +6,7 @@ EAPI=5
 inherit eutils toolchain-funcs
 
 DESCRIPTION="Another dynamic menu generator for Openbox"
-HOMEPAGE="http://mimasgpc.free.fr/openbox-menu_en.html;
+HOMEPAGE="http://fabrice.thiroux.free.fr/openbox-menu_en.html;
 SRC_URI="https://bitbucket.org/fabriceT/${PN}/downloads/${P}.tar.bz2;
 
 LICENSE="GPL-3"

diff --git a/x11-misc/openbox-menu/openbox-menu-0.7.0.ebuild 
b/x11-misc/openbox-menu/openbox-menu-0.7.0.ebuild
index 1a4fc20..2faceb8 100644
--- a/x11-misc/openbox-menu/openbox-menu-0.7.0.ebuild
+++ b/x11-misc/openbox-menu/openbox-menu-0.7.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -6,7 +6,7 @@ EAPI=5
 inherit eutils toolchain-funcs
 
 DESCRIPTION="Another dynamic menu generator for Openbox"
-HOMEPAGE="http://mimasgpc.free.fr/openbox-menu_en.html;
+HOMEPAGE="http://fabrice.thiroux.free.fr/openbox-menu_en.html;
 SRC_URI="https://bitbucket.org/fabriceT/${PN}/downloads/${P}.tar.bz2;
 
 LICENSE="GPL-3"

diff --git a/x11-misc/openbox-menu/openbox-menu-0.8.0.ebuild 
b/x11-misc/openbox-menu/openbox-menu-0.8.0.ebuild
index 1a4fc20..2faceb8 100644
--- a/x11-misc/openbox-menu/openbox-menu-0.8.0.ebuild
+++ b/x11-misc/openbox-menu/openbox-menu-0.8.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -6,7 +6,7 @@ EAPI=5
 inherit eutils toolchain-funcs
 
 DESCRIPTION="Another dynamic menu generator for Openbox"
-HOMEPAGE="http://mimasgpc.free.fr/openbox-menu_en.html;
+HOMEPAGE="http://fabrice.thiroux.free.fr/openbox-menu_en.html;
 SRC_URI="https://bitbucket.org/fabriceT/${PN}/downloads/${P}.tar.bz2;
 
 LICENSE="GPL-3"



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

2016-05-10 Thread Patrice Clement
commit: fe1c48f1e2b318811c87faae58b53e954708a158
Author: Patrice Clement  gentoo  org>
AuthorDate: Tue May 10 10:52:30 2016 +
Commit: Patrice Clement  gentoo  org>
CommitDate: Tue May 10 10:52:50 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fe1c48f1

x11-misc/openbox-menu: Add maintainer name.

Package-Manager: portage-2.2.26

 x11-misc/openbox-menu/metadata.xml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/x11-misc/openbox-menu/metadata.xml 
b/x11-misc/openbox-menu/metadata.xml
index 2fa55e9..faa65d5 100644
--- a/x11-misc/openbox-menu/metadata.xml
+++ b/x11-misc/openbox-menu/metadata.xml
@@ -8,8 +8,9 @@


mimas...@free.fr
+   mimas

-   http://mimasgpc.free.fr/openbox-menu_en.html
+   https://bitbucket.org/fabriceT/openbox-menu
fabriceT/openbox-menu





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

2015-12-17 Thread Jeroen Roovers
commit: 80759d89c4b264998bceb36bda47352c94f37f3f
Author: Jeroen Roovers  gentoo  org>
AuthorDate: Fri Dec 18 05:06:19 2015 +
Commit: Jeroen Roovers  gentoo  org>
CommitDate: Fri Dec 18 05:09:23 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=80759d89

x11-misc/openbox-menu: Version bump.

Package-Manager: portage-2.2.26

 x11-misc/openbox-menu/Manifest  |  1 +
 x11-misc/openbox-menu/openbox-menu-0.8.0.ebuild | 43 +
 2 files changed, 44 insertions(+)

diff --git a/x11-misc/openbox-menu/Manifest b/x11-misc/openbox-menu/Manifest
index 5d7e3a1..d7f73c5 100644
--- a/x11-misc/openbox-menu/Manifest
+++ b/x11-misc/openbox-menu/Manifest
@@ -1,2 +1,3 @@
 DIST openbox-menu-0.5.1.tar.bz2 23027 SHA256 
328f669e96919e94c13f77cad755625c23b9f9cef9a8a0eb2e7a5a8621b56387 SHA512 
3c794413a7a1ecc7823c3d50c3b5aaca31cdb4f919aeb2b9cb4e04583a417329fc7e3a751d115170b12099ca9b4fb958cd44347558453140863a1f3b7b765b06
 WHIRLPOOL 
1f4ef46ea7e357a5c0ad25c6b99a0d6e106c27d0021c588e32361440125b3012a23d97f65b6225cff6fce9344698d7547532db8e3f6529a26bf80f66df13a4aa
 DIST openbox-menu-0.7.0.tar.bz2 23088 SHA256 
00964fc4798152393c49a5bc41afbf5e04af07ef250ef61309091f95ff96542d SHA512 
21684097ffdfce625761b059d26a29dca27b1d79251c7f1d9ef4017b1af6be321059ce9e52349a5e8e40a4e54493ab920cf193d87f5b0d4f96a498da594abb8e
 WHIRLPOOL 
f488388a9c789a5ccc92125e4a02319add1a88747fc94eb9a7dbcb868271c596b01ec7ee41177ba07cb7afe540fbef24f36dce12e5ef3ca54e199b83160b8ece
+DIST openbox-menu-0.8.0.tar.bz2 24229 SHA256 
14f1e0847c15112e9b48152a35e351500d31e79a514348b054c69f84ab5924c2 SHA512 
955a5e16e7be001aec030358d3568aa6a3303d7138d6eb998494cd9ffa77de14ecf4bee163a9d49faf67939c85e303cbae51461f04f7eeaf44167a377c0f352d
 WHIRLPOOL 
4f851b77c306de62eebad7f3c41b49e4ad784dc5ff92f3a079e60e0e420e284f72309556395c6db0014e8f24b1c9b5f3c83256b21d092b7c123f420def711f12

diff --git a/x11-misc/openbox-menu/openbox-menu-0.8.0.ebuild 
b/x11-misc/openbox-menu/openbox-menu-0.8.0.ebuild
new file mode 100644
index 000..1a4fc20
--- /dev/null
+++ b/x11-misc/openbox-menu/openbox-menu-0.8.0.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+inherit eutils toolchain-funcs
+
+DESCRIPTION="Another dynamic menu generator for Openbox"
+HOMEPAGE="http://mimasgpc.free.fr/openbox-menu_en.html;
+SRC_URI="https://bitbucket.org/fabriceT/${PN}/downloads/${P}.tar.bz2;
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="+icons svg"
+REQUIRED_USE="svg? ( icons )"
+
+COMMON_DEPEND="
+   dev-libs/glib:2
+   lxde-base/menu-cache
+   x11-libs/gtk+:2
+"
+RDEPEND="
+   ${COMMON_DEPEND}
+   icons? ( x11-wm/openbox[imlib,svg?] )
+   !icons? ( x11-wm/openbox )
+"
+DEPEND="
+   ${COMMON_DEPEND}
+   virtual/pkgconfig
+"
+
+src_prepare() {
+   epatch "${FILESDIR}"/${PN}-0.5.0-build.patch
+   epatch_user
+   tc-export CC PKG_CONFIG
+}
+
+src_compile() {
+   emake \
+   $(usex icons 'ICONS=1' 'ICONS=0') \
+   $(usex svg 'SVG_ICONS=1' 'SVG_ICONS=0')
+}