cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

update x11/jgmenu to 4.4.1

Browse Source 
diff from Heppler, J. Scott (shep971 at spectrum dot net), thank you!
This commit is contained in:
op 2022-11-26 09:01:20 +00:00
parent 5b23d4ab02
commit 99a267da66
8 changed files with 41 additions and 63 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
x11/jgmenu/Makefile
View File

@ -1,32 +1,26 @@
COMMENT = freedesktop-compliant menu for openbox and tint2
CATEGORIES = x11
GH_ACCOUNT = johanmalm
GH_ACCOUNT = jgmenu
GH_PROJECT = jgmenu
GH_TAGNAME = v2.1
REVISION = 6
GH_TAGNAME = v4.4.1
# GPLv2 only
PERMIT_PACKAGE = Yes
WANTLIB = X11 Xrandr c cairo gdk_pixbuf-2.0 gio-2.0 glib-2.0
WANTLIB += gobject-2.0 harfbuzz iconv intl lzma m menu-cache pango-1.0
WANTLIB += gobject-2.0 harfbuzz iconv intl lzma m pango-1.0
WANTLIB += pangocairo-1.0 png pthread rsvg-2 xml2 z
# base-gcc does not understand all the warnings
COMPILER = base-clang ports-gcc
MODULES = lang/python
MODPY_BUILDDEP = No
MODPY_SETUPTOOLS = No
LIB_DEPENDS = x11/gnome/librsvg \
x11/menu-cache
LIB_DEPENDS = x11/gnome/librsvg
RUN_DEPENDS = devel/desktop-file-utils \
x11/gtk+3,-guic
CONFIGURE_STYLE = none
CONFIGURE_STYLE = simple
USE_GMAKE = Yes
MAKE_FLAGS = VERBOSE=1

4
x11/jgmenu/distinfo
View File

@ -1,2 +1,2 @@
SHA256 (jgmenu-2.1.tar.gz) = rtB7PRVsAn4uS2Kvv5b4+RstWRRvT22Hc8SNMV81rz8=
SIZE (jgmenu-2.1.tar.gz) = 330256
SHA256 (jgmenu-4.4.1.tar.gz) = FkGU652nzO3M+0d5ZWCyprD3NK5sXDh47BhPfP5/jzI=
SIZE (jgmenu-4.4.1.tar.gz) = 382258

34
x11/jgmenu/patches/patch-Makefile
View File

@ -1,42 +1,32 @@
Index: Makefile
--- Makefile.orig
+++ Makefile
@@ -24,7 +24,7 @@ else
datarootdir= $(prefix)/share
endif
-CFLAGS += -g -Wall -Os -std=gnu89
+CFLAGS += -Wall -std=gnu89
CFLAGS += -Wextra -Wdeclaration-after-statement -Wno-format-zero-length \
-Wold-style-definition -Woverflow -Wpointer-arith \
-Wstrict-prototypes -Wunused -Wvla -Wunused-result
@@ -100,18 +100,18 @@ $(DEPDIR)/%.d: ;
@@ -80,17 +80,17 @@ $(DEPDIR)/%.d: ;
.PRECIOUS: $(DEPDIR)/%.d
install: checkdeps $(PROGS)
install: $(PROGS)
- @install -d $(DESTDIR)$(bindir)
- @install -m755 jgmenu src/jgmenu_run $(DESTDIR)$(bindir)
- @install -d $(DESTDIR)$(libexecdir)
- @install -m755 $(PROGS_LIBEXEC) $(SCRIPTS_LIBEXEC) $(DESTDIR)$(libexecdir)
- @./scripts/set-exec-path.sh $(DESTDIR)$(bindir)/jgmenu_run $(libexecdir)
- @install -d $(DESTDIR)$(libexecdir)/jgmenu
- @install -m755 $(PROGS_LIBEXEC) $(SCRIPTS_LIBEXEC) $(DESTDIR)$(libexecdir)/jgmenu
- @./scripts/set-exec-path.sh $(DESTDIR)$(bindir)/jgmenu_run $(libexecdir)/jgmenu
- @$(MAKE) --no-print-directory -C docs/manual/ prefix=$(prefix) install
- @install -d $(DESTDIR)$(datarootdir)/icons/hicolor/scalable/apps/
- @install -d $(DESTDIR)$(datarootdir)/applications/
- @install -m644 ./data/jgmenu.svg $(DESTDIR)$(datarootdir)/icons/hicolor/scalable/apps/
- @install -m644 ./data/jgmenu.desktop $(DESTDIR)$(datarootdir)/applications/
- @for dir in $(CONTRIB_DIRS); do \
+ install -d $(DESTDIR)$(bindir)
+ install -m755 jgmenu src/jgmenu_run $(DESTDIR)$(bindir)
+ install -d $(DESTDIR)$(libexecdir)
+ install -m755 $(PROGS_LIBEXEC) $(SCRIPTS_LIBEXEC) $(DESTDIR)$(libexecdir)
+ ./scripts/set-exec-path.sh $(DESTDIR)$(bindir)/jgmenu_run $(libexecdir)
+ install -d $(DESTDIR)$(libexecdir)/jgmenu
+ install -m755 $(PROGS_LIBEXEC) $(SCRIPTS_LIBEXEC) $(DESTDIR)$(libexecdir)/jgmenu
+ ./scripts/set-exec-path.sh $(DESTDIR)$(bindir)/jgmenu_run $(libexecdir)/jgmenu
+ $(MAKE) --no-print-directory -C docs/manual/ prefix=$(prefix) install
+ install -d $(DESTDIR)$(datarootdir)/icons/hicolor/scalable/apps/
+ install -d $(DESTDIR)$(datarootdir)/applications/
+ install -m644 ./data/jgmenu.svg $(DESTDIR)$(datarootdir)/icons/hicolor/scalable/apps/
+ install -m644 ./data/jgmenu.desktop $(DESTDIR)$(datarootdir)/applications/
ifeq ($(NO_LX),1)
- @echo "info: lx module not included as libmenu-cache >=1.1.0 not found"
+ echo "info: lx module not included as libmenu-cache >=1.1.0 not found"
endif
+ for dir in $(CONTRIB_DIRS); do \
$(MAKE) -C contrib/$$dir install || exit 1; \
done
# We are not brave enough to uninstall in /usr/, /usr/local/ etc

12
x11/jgmenu/patches/patch-Makefile_inc Normal file
View File

@ -0,0 +1,12 @@
Index: Makefile.inc
--- Makefile.inc.orig
+++ Makefile.inc
@@ -15,7 +15,7 @@ else
datarootdir= $(prefix)/share
endif
-CFLAGS += -g -Wall -Os -std=gnu99
+CFLAGS += -Wall -std=gnu89
CFLAGS += -Wextra -Wdeclaration-after-statement -Wno-format-zero-length \
-Wold-style-definition -Woverflow -Wpointer-arith \
-Wstrict-prototypes -Wunused -Wvla -Wunused-result

2
x11/jgmenu/patches/patch-docs_manual_Makefile
View File

@ -1,7 +1,7 @@
Index: docs/manual/Makefile
--- docs/manual/Makefile.orig
+++ docs/manual/Makefile
@@ -11,7 +11,7 @@ man7pages = jgmenututorial.7
@@ -4,7 +4,7 @@ man7pages = jgmenututorial.7 jgmenuunicode.7
manpages = $(man1pages) $(man7pages)
prefix ?= /usr/local

2
x11/jgmenu/patches/patch-src_jgmenu_run
View File

@ -1,7 +1,7 @@
Index: src/jgmenu_run
--- src/jgmenu_run.orig
+++ src/jgmenu_run
@@ -57,7 +57,7 @@ then
@@ -58,7 +58,7 @@ then
if test -e ${JGMENU_LOCKFILE}
then
send_tint2_env_vars_to_jgmenu

13
x11/jgmenu/pkg/PLIST
View File

@ -1,24 +1,27 @@
@bin bin/jgmenu
bin/jgmenu_run
lib/jgmenu/
lib/jgmenu/jgmenu-config.py
@bin lib/jgmenu/jgmenu-apps
@bin lib/jgmenu/jgmenu-config
@bin lib/jgmenu/jgmenu-greeneye
lib/jgmenu/jgmenu-hide-app.sh
@bin lib/jgmenu/jgmenu-i18n
lib/jgmenu/jgmenu-init.sh
@bin lib/jgmenu/jgmenu-lx
@bin lib/jgmenu/jgmenu-ob
lib/jgmenu/jgmenu-pmenu.py
@bin lib/jgmenu/jgmenu-obtheme
@bin lib/jgmenu/jgmenu-socket
lib/jgmenu/jgmenu-themes.sh
lib/jgmenu/jgmenu-unity-hack.py
@man man/man1/jgmenu-config.1
@man man/man1/jgmenu-apps.1
@man man/man1/jgmenu-i18n.1
@man man/man1/jgmenu-lx.1
@man man/man1/jgmenu-ob.1
@man man/man1/jgmenu-pmenu.1
@man man/man1/jgmenu.1
@man man/man1/jgmenu_run.1
@man man/man7/jgmenututorial.7
@man man/man7/jgmenuunicode.7
share/applications/jgmenu.desktop
share/doc/pkg-readmes/${PKGSTEM}
share/icons/hicolor/scalable/apps/jgmenu.svg
@tag gtk-update-icon-cache %D/share/icons/hicolor
@tag update-desktop-database

21
x11/jgmenu/pkg/README
View File

@ -1,21 +0,0 @@
+-------------------------------------------------------------------------------
| Running ${PKGSTEM} on OpenBSD
+-------------------------------------------------------------------------------
jgmenu options
==============
This jgmenu port can generate an X11 application menu three different ways:
1) 'jgmenu_run lx' using additional packages menu-cache and gnome(mate)-menus
2) 'jgmenu_run ob' from an existing openbox menu.xml file
3) 'jgmenu_run pmenu' with python3 text parsing
For those running Openbox, the first method provides automatic, FreeDesktop
compliant, menu generation. The second method will source a manually edited
menu.xml file. If no ~/.config/openbox/menu.xml file exists,
/etc/xdg/openbox/menu.xml will be used. Pmenu does not require additional
packages but has roughly four times the latency.
For other Window managers, pmenu, lx/menu-cache/gnome(mate)-menus will work.
More details are provided in jgmenu(4) and jgmenututorial(7).