The below diff updates wmmenu to 1.3.
Port-wise:
- move MASTER_SITES and HOMEPAGE to dockapps.net
- overhaul the gdk_pixbuf flavor
- update the Makefile patch to be as close as possible to the
original patch; note that gdx-pixbuf-1.0 support is gone. There are
-L/-I duplicates, but due to the how the Makefile has been written
it seems unavoidable
- and add fixes for the new libdockapp
Testing:
It has been run tested on amd64 and macppc with the app list provided as
example. Note that you *need* to use this dockapp with windowmaker;
it won't do anything if you don't.
Comments/feedback are welcome,
Charlène.
Index: Makefile
===================================================================
RCS file: /cvs/ports/x11/wmmenu/Makefile,v
retrieving revision 1.23
diff -u -p -u -p -r1.23 Makefile
--- Makefile 11 Nov 2020 09:51:46 -0000 1.23
+++ Makefile 1 Feb 2021 02:33:59 -0000
@@ -2,22 +2,21 @@
COMMENT= wm-dockapp; A popup menu of icons that launch programs
-DISTNAME= wmmenu-1.2
-REVISION= 5
+DISTNAME= wmmenu-1.3
-CATEGORIES= x11 x11/windowmaker
+CATEGORIES= x11 x11/windowmaker
-HOMEPAGE= http://www.fcoutant.freesurf.fr/wmmenu.html
+HOMEPAGE= https://www.dockapps.net/wmmenu
# GPLv2
PERMIT_PACKAGE= Yes
WANTLIB= X11 Xext Xpm c m dockapp
-MASTER_SITES= http://www.fcoutant.freesurf.fr/download/
+MASTER_SITES= https://www.dockapps.net/download/
-LIB_DEPENDS= devel/libdockapp
+LIB_DEPENDS= devel/libdockapp>=0.7.3
FLAVORS= gdk_pixbuf
FLAVOR?=
@@ -25,12 +24,17 @@ FLAVOR?=
.if ${FLAVOR:Mgdk_pixbuf}
MAKE_FLAGS= GDKPIXBUF2=1
LIB_DEPENDS+= graphics/gdk-pixbuf-xlib
-CFLAGS+= -pthread
-MAKE_ENV+= LDFLAGS="-pthread"
-WANTLIB += pthread gdk_pixbuf_xlib-2.0
+WANTLIB += gdk_pixbuf-2.0 gdk_pixbuf_xlib-2.0 glib-2.0 gobject-2.0
+WANTLIB += intl
.endif
-WRKDIST= ${WRKDIR}/wmmenu
+WRKDIST= ${WRKDIR}/dockapps
+
+
+CFLAGS+= -I${X11BASE}/include
+LDFLAGS+= -L${X11BASE}/lib
+
+MAKE_ENV+= CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}"
pre-configure:
@perl -pi -e 's#%%PREFIX%%#${PREFIX}#' ${WRKSRC}/example/defaults
Index: distinfo
===================================================================
RCS file: /cvs/ports/x11/wmmenu/distinfo,v
retrieving revision 1.6
diff -u -p -u -p -r1.6 distinfo
--- distinfo 18 Jan 2015 03:16:04 -0000 1.6
+++ distinfo 1 Feb 2021 02:33:59 -0000
@@ -1,2 +1,2 @@
-SHA256 (wmmenu-1.2.tar.gz) = wicP3WNugrzdvTpDxK57jcL18PiJDPj0BM4CTV99q4c=
-SIZE (wmmenu-1.2.tar.gz) = 32845
+SHA256 (wmmenu-1.3.tar.gz) = xvwJ6BKwEvrIPJSLv8N/u9PqcC5G6ULrsp7GovVB+jo=
+SIZE (wmmenu-1.3.tar.gz) = 33766
Index: patches/patch-Makefile
===================================================================
RCS file: /cvs/ports/x11/wmmenu/patches/patch-Makefile,v
retrieving revision 1.5
diff -u -p -u -p -r1.5 patch-Makefile
--- patches/patch-Makefile 26 Mar 2010 11:28:15 -0000 1.5
+++ patches/patch-Makefile 1 Feb 2021 02:33:59 -0000
@@ -1,7 +1,8 @@
$OpenBSD: patch-Makefile,v 1.5 2010/03/26 11:28:15 jasper Exp $
---- Makefile.orig Sat Mar 23 13:51:36 2002
-+++ Makefile Fri Mar 26 10:00:50 2010
-@@ -1,36 +1,29 @@
+Index: Makefile
+--- Makefile.orig
++++ Makefile
+@@ -1,27 +1,27 @@
-prefix = /usr/local
+prefix = ${PREFIX}
BINDIR = $(prefix)/bin
@@ -9,51 +10,43 @@ $OpenBSD: patch-Makefile,v 1.5 2010/03/2
-ETCDIR = $(prefix)/etc
+ETCDIR = $(prefix)/share/wmmenu
--# comment out both lines to get the old, Xpm-only, version
--GDKPIXBUF = 1
--#GDKPIXBUF2 = 1
+-# comment to get the old, Xpm-only, version
+-GDKPIXBUF2 = 1
+XROOT = ${X11BASE}
+DAROOT = ${LOCALBASE}
--XROOT = /usr/X11R6
--DAROOT = /usr/local
--
- # If you want to use gdk-pixbuf, pass GDKPIXBUF=1 to make command
--ifdef GDKPIXBUF
-+.if GDKPIXBUF
- PIXBUF_DEF = -DWITH_GDKPIXBUF
--PIXBUF_INC := $(shell gdk-pixbuf-config --cflags)
--PIXBUF_LIB := -rdynamic -L$(shell gdk-pixbuf-config --prefix)/lib -lgdk_pixbuf_xlib
--endif
-+PIXBUF_INC != gdk-pixbuf-config --cflags
-+PIXBUF_LIB = -lgdk_pixbuf_xlib -lgtk -lgdk -lgmodule -lglib -lintl -lXext -lX11 -lm -ltiff -ljpeg -lpng -lz
-+.endif
-
# If you want to use gdk-pixbuf-2.0, pass GDKPIXBUF2=1 to make command
-ifdef GDKPIXBUF2
--PIXBUF_CFG = /opt/gtk2/bin/pkg-config gdk-pixbuf-xlib-2.0
--PIXBUF_DEF = -DWITH_GDKPIXBUF
+-PIXBUF_CFG = pkg-config gdk-pixbuf-xlib-2.0
++.if GDKPIXBUF2
++PIXBUF_CFG != pkg-config gdk-pixbuf-xlib-2.0
+ PIXBUF_DEF = -DWITH_GDKPIXBUF
-PIXBUF_INC := $(shell $(PIXBUF_CFG) --cflags)
--PIXBUF_LIB := -rdynamic -L$(shell $(PIXBUF_CFG) --variable=prefix)/lib -lgdk_pixbuf_xlib-2.0
+-PIXBUF_LIB := -rdynamic -L$(shell $(PIXBUF_CFG) --variable=prefix)/lib -lgdk_pixbuf_xlib-2.0 -lgdk_pixbuf-2.0 -lgobject-2.0
-endif
-+.if GDKPIXBUF2
-+PIXBUF_CFG = pkg-config gdk-pixbuf-xlib-2.0
-+PIXBUF_DEF = -DWITH_GDKPIXBUF2
-+PIXBUF_INC != pkg-config --cflgas gdk-pixbuf-xlib-2.0
-+PIXBUF_LIB = -rdynamic -L$(shell $(PIXBUF_CFG) --variable=prefix)/lib -lgdk_pixbuf_xlib-2.0
++PIXBUF_INC != pkg-config --cflags gdk-pixbuf-xlib-2.0
++PIXBUF_LIB != pkg-config --libs gdk-pixbuf-xlib-2.0
+.endif
-CC = gcc #-g
--CFLAGS = -pipe $(CPPFLAGS) -O2
--CPPFLAGS = -MMD -ansi -pedantic -Wall $(INCDIRS) $(DEFINES)
+-CFLAGS = -pipe -O2
+-CPPFLAGS = -MMD -ansi -pedantic -Wall
+-INCDIRS = $(PIXBUF_INC)
+CFLAGS += $(INCDIRS) $(DEFINES)
- INCDIRS = -I$(DAROOT)/include -I$(XROOT)/include $(PIXBUF_INC)
++INCDIRS != pkg-config --cflags dockapp
++INCDIRS += -I$(DAROOT)/include -I$(XROOT)/include $(PIXBUF_INC)
DEFINES = -DETCDIR='"$(ETCDIR)"' $(PIXBUF_DEF)
-LDFLAGS = -s
- LIBDIRS = -L$(DAROOT)/lib -L$(XROOT)/lib $(PIXBUF_LIB)
- LDLIBS = -ldockapp -lXpm -lXext -lX11 -lm
+-LIBDIRS = $(PIXBUF_LIB)
+-LDLIBS = -ldockapp -lXpm -lXext -lX11 -lm
++LIBDIRS != pkg-config --libs-only-L dockapp
++LIBDIRS += $(PIXBUF_LIB)
++LDLIBS != pkg-config --libs-only-l dockapp
++LDLIBS += -lXpm -lXext -lX11 -lm
-@@ -67,4 +60,3 @@ clean :
+ MKDIRHIER = mkdir -p
+ MAN1DIR = $(MANDIR)/man1
+@@ -56,4 +56,3 @@ clean :
$(RM) *.o *.d core tags $(PRGS)
# dependencies -- do not change lines below
Index: patches/patch-buttonbar_c
===================================================================
RCS file: patches/patch-buttonbar_c
diff -N patches/patch-buttonbar_c
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-buttonbar_c 1 Feb 2021 02:33:59 -0000
@@ -0,0 +1,15 @@
+$OpenBSD$
+
+Fix with libdockapp>=0.7
+
+Index: buttonbar.c
+--- buttonbar.c.orig
++++ buttonbar.c
+@@ -1,6 +1,6 @@
+ #include <assert.h>
+
+-#include <dockapp.h>
++#include <libdockapp/dockapp.h>
+
+ #include "buttonbar.h"
+ #include "xobjects.h"
Index: patches/patch-events_c
===================================================================
RCS file: patches/patch-events_c
diff -N patches/patch-events_c
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-events_c 1 Feb 2021 02:33:59 -0000
@@ -0,0 +1,16 @@
+$OpenBSD$
+
+Fix with libdockapp>=0.7
+
+Index: events.c
+--- events.c.orig
++++ events.c
+@@ -22,7 +22,7 @@ Reparent and Destroy events are catched with Structure
+
+ #include <stdlib.h>
+
+-#include <dockapp.h>
++#include <libdockapp/dockapp.h>
+
+ #include "types.h"
+ #include "events.h"
Index: patches/patch-example_defaults
===================================================================
RCS file: /cvs/ports/x11/wmmenu/patches/patch-example_defaults,v
retrieving revision 1.2
diff -u -p -u -p -r1.2 patch-example_defaults
--- patches/patch-example_defaults 26 Mar 2010 08:51:44 -0000 1.2
+++ patches/patch-example_defaults 1 Feb 2021 02:33:59 -0000
@@ -1,6 +1,7 @@
$OpenBSD: patch-example_defaults,v 1.2 2010/03/26 08:51:44 jasper Exp $
---- example/defaults.orig Sat May 4 14:50:00 2002
-+++ example/defaults Fri Mar 26 09:51:02 2010
+Index: example/defaults
+--- example/defaults.orig
++++ example/defaults
@@ -20,7 +20,9 @@
#
# hide_timeout 1
Index: patches/patch-pixmaps_c
===================================================================
RCS file: patches/patch-pixmaps_c
diff -N patches/patch-pixmaps_c
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-pixmaps_c 1 Feb 2021 02:33:59 -0000
@@ -0,0 +1,16 @@
+$OpenBSD$
+
+Fix with libdockapp>=0.7
+
+Index: pixmaps.c
+--- pixmaps.c.orig
++++ pixmaps.c
+@@ -4,7 +4,7 @@
+ #ifdef WITH_GDKPIXBUF
+ #include <gdk-pixbuf-xlib/gdk-pixbuf-xlib.h>
+
No comments:
Post a Comment