- update wmtimer to 2.92, which switches it to gtk2
ok wilfried@ (MAINTAINER)
This commit is contained in:
jasper
parent
ee40a9f268
commit
b3067884bd
@ -1,26 +1,31 @@
|
||||
# $OpenBSD: Makefile,v 1.22 2009/08/10 06:33:02 kili Exp $
|
||||
# $OpenBSD: Makefile,v 1.23 2010/03/25 06:22:41 jasper Exp $
|
||||
|
||||
COMMENT= wm-dockapp; alarm clock
|
||||
|
||||
DISTNAME= wmtimer-2.9
|
||||
PKGNAME= ${DISTNAME}p0
|
||||
DISTNAME= wmtimer-2.92
|
||||
CATEGORIES= misc x11 x11/windowmaker
|
||||
|
||||
HOMEPAGE= http://www.darkops.net/wmtimer/
|
||||
|
||||
MAINTAINER= Peter Stromberg <wilfried@openbsd.org>
|
||||
|
||||
# GPL
|
||||
# GPLv2
|
||||
PERMIT_PACKAGE_CDROM= Yes
|
||||
PERMIT_PACKAGE_FTP= Yes
|
||||
PERMIT_DISTFILES_CDROM= Yes
|
||||
PERMIT_DISTFILES_FTP= Yes
|
||||
WANTLIB= X11 Xext Xi Xpm c glib gmodule iconv intl m pthread \
|
||||
pthread-stubs xcb
|
||||
|
||||
MASTER_SITES= ${HOMEPAGE}
|
||||
|
||||
LIB_DEPENDS= gtk.>=1,gdk.>=1::x11/gtk+
|
||||
MODULES= devel/gettext
|
||||
|
||||
WANTLIB += X11 Xau Xcomposite Xcursor Xdamage Xdmcp Xext Xfixes
|
||||
WANTLIB += Xi Xinerama Xpm Xrandr Xrender atk-1.0 c cairo expat
|
||||
WANTLIB += fontconfig freetype gio-2.0 glib-2.0 glitz gmodule-2.0
|
||||
WANTLIB += gobject-2.0 m pango-1.0 pangocairo-1.0 pangoft2-1.0
|
||||
WANTLIB += pixman-1 png pthread pthread-stubs xcb z
|
||||
|
||||
LIB_DEPENDS= gdk_pixbuf-2.0,gdk-x11-2.0,gtk-x11-2.0::x11/gtk+2
|
||||
|
||||
USE_X11= Yes
|
||||
NO_REGRESS= Yes
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
MD5 (wmtimer-2.9.tar.gz) = iye47RWagRCl5SkgwUcJbA==
|
||||
RMD160 (wmtimer-2.9.tar.gz) = 0TTx6JgUy4/fNr1S8DMgZFHht+4=
|
||||
SHA1 (wmtimer-2.9.tar.gz) = 5t9QVXmbxJ5kyf+l2rGvUZkot4w=
|
||||
SHA256 (wmtimer-2.9.tar.gz) = JmcTuXIBof+eR34up1KiwNmoNMqJv9xbWN2Pn8OED8s=
|
||||
SIZE (wmtimer-2.9.tar.gz) = 22003
|
||||
MD5 (wmtimer-2.92.tar.gz) = Qlu7SwzIUvhY2gJVONfJAA==
|
||||
RMD160 (wmtimer-2.92.tar.gz) = x5Tfebo1VEAL5MwSuDCcIXHmhlI=
|
||||
SHA1 (wmtimer-2.92.tar.gz) = 1yg55CM3RtIogkjiUHlUIDCjSnc=
|
||||
SHA256 (wmtimer-2.92.tar.gz) = NybA4KCpXOfEyd2AiLPwUNUmj3D++TQUUvVEnO+MDNQ=
|
||||
SIZE (wmtimer-2.92.tar.gz) = 22091
|
||||
|
||||
@ -1,28 +1,26 @@
|
||||
$OpenBSD: patch-wmtimer_Makefile,v 1.3 2003/12/19 12:22:41 wilfried Exp $
|
||||
--- wmtimer/Makefile.orig 2001-09-28 21:23:40.000000000 +0200
|
||||
+++ wmtimer/Makefile 2003-12-19 13:16:12.000000000 +0100
|
||||
@@ -1,19 +1,19 @@
|
||||
$OpenBSD: patch-wmtimer_Makefile,v 1.4 2010/03/25 06:22:41 jasper Exp $
|
||||
--- wmtimer/Makefile.orig Wed Mar 24 17:13:52 2010
|
||||
+++ wmtimer/Makefile Wed Mar 24 17:15:16 2010
|
||||
@@ -1,7 +1,7 @@
|
||||
CC = gcc
|
||||
-LIBDIR = -L/usr/X11R6/lib -L/usr/lib
|
||||
-LIBS = -lXpm -lXext -lX11 -lm `gtk-config --libs` -lpthread
|
||||
+LIBDIR = -L${X11BASE}/lib
|
||||
+LIBS = -lXpm -lXext -lX11 -lm `gtk-config --libs` -pthread
|
||||
LIBS = -lXpm -lXext -lX11 -lpthread `pkg-config --libs gtk+-2.0`
|
||||
-CFLAGS = `pkg-config --cflags gtk+-2.0`
|
||||
+CFLAGS = -I${X11BASE}/include `pkg-config --cflags gtk+-2.0`
|
||||
|
||||
-CFLAGS = -g -I/usr/X11R6/include `gtk-config --cflags`
|
||||
+CFLAGS = -I${X11BASE}/include `gtk-config --cflags` -pthread
|
||||
OBJS = wmtimer.o \
|
||||
../wmgeneral/wmgeneral.o \
|
||||
../wmgeneral/misc.o \
|
||||
../wmgeneral/list.o
|
||||
|
||||
.c.o:
|
||||
- $(CC) -c -O2 -Wall $< -o $*.o $(CFLAGS)
|
||||
+ $(CC) -c $(CFLAGS) $< -o $*.o
|
||||
../wmgeneral/wmgeneral.o \
|
||||
@@ -10,10 +10,10 @@ OBJS = wmtimer.o \
|
||||
|
||||
all: wmtimer
|
||||
.c.o:
|
||||
- $(CC) -g -c -O2 -Wall $< -o $*.o $(CFLAGS)
|
||||
+ $(CC) -c $(CFLAGS) $< -o $*.o
|
||||
|
||||
wmtimer: $(OBJS)
|
||||
- $(CC) -Wall -g -o wmtimer $^ $(LIBDIR) $(LIBS)
|
||||
+ $(CC) -o $@ $(OBJS) $(LIBDIR) $(LIBS)
|
||||
|
||||
clean::
|
||||
for i in $(OBJS) ; do \
|
||||
install:
|
||||
cp wmtimer /usr/local/bin/
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
$OpenBSD: patch-wmtimer_wmtimer_c,v 1.3 2003/12/19 12:22:41 wilfried Exp $
|
||||
--- wmtimer/wmtimer.c.orig 2003-09-27 03:35:28.000000000 +0200
|
||||
+++ wmtimer/wmtimer.c 2003-12-19 13:09:39.000000000 +0100
|
||||
$OpenBSD: patch-wmtimer_wmtimer_c,v 1.4 2010/03/25 06:22:41 jasper Exp $
|
||||
--- wmtimer/wmtimer.c.orig Thu Jan 29 03:45:48 2004
|
||||
+++ wmtimer/wmtimer.c Wed Mar 24 17:15:25 2010
|
||||
@@ -84,7 +84,7 @@ configState configSt;
|
||||
int main(int argc, char *argv[])
|
||||
{
|
||||
@ -10,16 +10,16 @@ $OpenBSD: patch-wmtimer_wmtimer_c,v 1.3 2003/12/19 12:22:41 wilfried Exp $
|
||||
struct tm *thisTime;
|
||||
int wminet_mask_width = 64;
|
||||
int wminet_mask_height = 64;
|
||||
@@ -234,7 +234,7 @@ void parseArgs(int argc, char *argv[])
|
||||
action.bell = 1;
|
||||
break;
|
||||
@@ -239,7 +239,7 @@ void parseArgs(int argc, char *argv[])
|
||||
action.bell = 1;
|
||||
break;
|
||||
case 'e':
|
||||
- strcpy(command, argv[argIndex+1]);
|
||||
+ strlcpy(command, argv[argIndex+1], sizeof(command));
|
||||
action.command = 1;
|
||||
break;
|
||||
case 't':
|
||||
@@ -594,7 +594,7 @@ void callback(GtkWidget * widget, gpoint
|
||||
@@ -599,7 +599,7 @@ void callback(GtkWidget * widget, gpointer data)
|
||||
else if ((char *) data == "ok")
|
||||
{
|
||||
if (tmpAction.command)
|
||||
|
||||
@ -1,2 +1,2 @@
|
||||
@comment $OpenBSD: PLIST,v 1.1.1.1 2001/01/11 22:45:21 naddy Exp $
|
||||
bin/wmtimer
|
||||
@comment $OpenBSD: PLIST,v 1.2 2010/03/25 06:22:41 jasper Exp $
|
||||
@bin bin/wmtimer
|
||||
|
||||
Loading…
Reference in New Issue
Block a user