- use gtk+2's gdk_pixbuf

ok wilfried@ (MAINTAINER)
This commit is contained in:
jasper 2010-03-26 11:28:15 +00:00
parent fdc60f1997
commit f02c0e5cee
3 changed files with 18 additions and 14 deletions

View File

@ -1,15 +1,16 @@
# $OpenBSD: Makefile,v 1.11 2007/09/15 20:04:25 merdely Exp $
# $OpenBSD: Makefile,v 1.12 2010/03/26 11:28:15 jasper Exp $
COMMENT= wm-dockapp; A popup menu of icons that launch programs
DISTNAME= wmmenu-1.2
PKGNAME= ${DISTNAME}p0
CATEGORIES= x11 x11/windowmaker
HOMEPAGE= http://www.fcoutant.freesurf.fr/wmmenu.html
MAINTAINER= Peter Stromberg <wilfried@openbsd.org>
# GPL
# GPLv2
PERMIT_PACKAGE_CDROM= Yes
PERMIT_PACKAGE_FTP= Yes
PERMIT_DISTFILES_CDROM= Yes
@ -26,9 +27,8 @@ FLAVORS= gdk_pixbuf
FLAVOR?=
.if ${FLAVOR:L:Mgdk_pixbuf}
MAKE_FLAGS= GDKPIXBUF=1
LIB_DEPENDS+= gdk_pixbuf_xlib::graphics/gdk-pixbuf
WANTLIB+= gdk glib gmodule gtk intl jpeg png tiff z
MAKE_FLAGS= GDKPIXBUF2=1
LIB_DEPENDS+= gdk_pixbuf_xlib-2.0::x11/gtk+2
.endif
WRKDIST= ${WRKDIR}/wmmenu

View File

@ -1,6 +1,6 @@
$OpenBSD: patch-Makefile,v 1.4 2010/03/26 08:51:44 jasper Exp $
$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 09:51:02 2010
+++ Makefile Fri Mar 26 10:00:50 2010
@@ -1,36 +1,29 @@
-prefix = /usr/local
+prefix = ${PREFIX}
@ -31,12 +31,16 @@ $OpenBSD: patch-Makefile,v 1.4 2010/03/26 08:51:44 jasper Exp $
# If you want to use gdk-pixbuf-2.0, pass GDKPIXBUF2=1 to make command
-ifdef GDKPIXBUF2
+.if GDKPIXBUF2
PIXBUF_CFG = /opt/gtk2/bin/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_CFG = /opt/gtk2/bin/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
-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
+.endif
-CC = gcc #-g

View File

@ -1,5 +1,5 @@
@comment $OpenBSD: PLIST,v 1.2 2004/09/15 19:26:32 espie Exp $
bin/wmmenu
@comment $OpenBSD: PLIST,v 1.3 2010/03/26 11:28:15 jasper Exp $
@bin bin/wmmenu
share/doc/wmmenu/
share/doc/wmmenu/README
share/examples/wmmenu/