Attachment 162684 Details for Bug 204200 – x11-clocks_wmfishtime.diff

[patch] x11-clocks_wmfishtime.diff

x11-clocks_wmfishtime.diff (text/plain), 6.26 KB, created by tkato432 on 2015-11-01 18:34:09 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: tkato432

Created: 2015-11-01 18:34:09 UTC

Size: 6.26 KB

patch

obsolete

>diff -urN /usr/ports/x11-clocks/wmfishtime/Makefile x11-clocks/wmfishtime/Makefile
>--- /usr/ports/x11-clocks/wmfishtime/Makefile	2015-09-14 20:01:51.780558000 +0900
>+++ x11-clocks/wmfishtime/Makefile	2015-11-01 00:00:00.000000000 +0900
>@@ -3,29 +3,47 @@
> 
> PORTNAME=	wmfishtime
> PORTVERSION=	1.24
>-PORTREVISION=	5
>+PORTREVISION=	6
> CATEGORIES=	x11-clocks windowmaker
> MASTER_SITES=	http://www.ne.jp/asahi/linux/timecop/software/ \
>-		http://atreides.freenix.no/~anders/
>+		http://www.sourcefiles.org/Toys/Clocks/
> 
> MAINTAINER=	ports@FreeBSD.org
> COMMENT=	Time/date applet for WindowMaker with fishes swimming around
> 
>-USE_GNOME=	gtk12
>+LICENSE=	GPLv2
> 
>-BROKEN=		does not fetch
>-GTK_LIBS?=	`${GTK_CONFIG} --libs`
>-GTK_CFLAGS?=	`${GTK_CONFIG} --cflags`
>-MAKE_ARGS+=	CFLAGS="${CPPFLAGS} ${CFLAGS} -Wall ${GTK_CFLAGS}" \
>-		LDFLAGS="${LDFLAGS}" \
>-		GTK_LIBS="${GTK_LIBS}"
>-PLIST_FILES=	bin/wmfishtime man/man1/${PORTNAME}.1.gz
>+USES=		pkgconfig
>+
>+PLIST_FILES=	bin/wmfishtime man/man1/wmfishtime.1.gz
>+
>+OPTIONS_SINGLE=		TOOLKIT
>+OPTIONS_SINGLE_TOOLKIT=	GTK1 GTK2
>+OPTIONS_DEFAULT=	GTK2
>+
>+GTK1_USE=		gnome=gtk12
>+GTK1_CPPFLAGS=		$$(pkg-config --cflags gdk)
>+GTK1_LDFLAGS=		$$(pkg-config --libs gdk)
>+GTK2_USE=		gnome=gtk20
>+GTK2_CPPFLAGS=		$$(pkg-config --cflags gdk-x11-2.0 x11)
>+GTK2_LDFLAGS=		$$(pkg-config --libs gdk-x11-2.0 x11) -lm
>+TOOLKIT_DESC=		GTK Toolkit
> 
> post-patch:
>-	${REINPLACE_CMD} -E -e "s@1\.23@1\.24@g" ${WRKSRC}/fishmon.c ${WRKSRC}/wmfishtime.1
>+	@${REINPLACE_CMD} -e \
>+		'/^CFLAGS/s|$[[:blank:]]$=.*|\1+= $$(CPPFLAGS)| ; \
>+		 /^CC/s|$[[:blank:]]$=|\1?=| ; \
>+		 /^LIBS/s|$[[:blank:]]$=.*|\1+= $$(LDFLAGS)|' \
>+		${WRKSRC}/Makefile
>+.for i in fishmon.c wmfishtime.1
>+	@${REINPLACE_CMD} -e \
>+		's|1\.23|${PORTVERSION}|g' ${WRKSRC}/${i}
>+.endfor
> 
> do-install:
>-	${INSTALL_PROGRAM} ${WRKSRC}/wmfishtime ${STAGEDIR}${PREFIX}/bin
>-	${INSTALL_MAN} ${WRKSRC}/wmfishtime.1 ${STAGEDIR}${PREFIX}/man/man1/
>+	(cd ${WRKSRC} && ${INSTALL_PROGRAM} wmfishtime \
>+		${STAGEDIR}${PREFIX}/bin)
>+	(cd ${WRKSRC} && ${INSTALL_MAN} wmfishtime.1 \
>+		${STAGEDIR}${MANPREFIX}/man/man1)
> 
> .include <bsd.port.mk>
>diff -urN /usr/ports/x11-clocks/wmfishtime/files/patch-Makefile x11-clocks/wmfishtime/files/patch-Makefile
>--- /usr/ports/x11-clocks/wmfishtime/files/patch-Makefile	2015-08-24 04:05:12.649608000 +0900
>+++ x11-clocks/wmfishtime/files/patch-Makefile	1970-01-01 09:00:00.000000000 +0900
>@@ -1,28 +0,0 @@
>---- Makefile.orig	Sun May 27 05:49:41 2001
>-+++ Makefile	Sun Jul  6 20:29:07 2003
>-@@ -6,23 +6,21 @@
>- 
>- # no user serviceable parts below this line
>- # optimization cflags
>--CFLAGS = -O3 -Wall `gtk-config --cflags` ${EXTRA}
>- # profiling cflags
>- # CFLAGS=-ansi -pedantic -Wall -pg -O3 `gtk-config --cflags` ${EXTRA} -DPRO
>- # test coverage cflags
>- # CFLAGS=-fprofile-arcs -ftest-coverage -Wall -ansi -pedantic -g `gtk-config --cflags` ${EXTRA} -DPRO
>- 
>- 
>--CC = gcc
>- SHELL = sh
>- OBJS = fishmon.o
>--LIBS = `gtk-config --libs | sed "s/-lgtk//g"`
>-+LIBS = `echo $(GTK_LIBS) | sed "s/-lgtk12//g"`
>- INSTALL = -m 755
>- 
>- all: wmfishtime
>- 
>- wmfishtime: $(OBJS)
>--	$(CC) $(CFLAGS) -o wmfishtime $(OBJS) $(LIBS)
>-+	$(CC) $(CFLAGS) -o wmfishtime $(OBJS) $(LIBS) $(LDFLAGS)
>- 
>- clean:
>- 	rm -rf wmfishtime *.o *.bb* *.gcov gmon.* *.da *~ .xvpics
>diff -urN /usr/ports/x11-clocks/wmfishtime/files/patch-fishmon.c x11-clocks/wmfishtime/files/patch-fishmon.c
>--- /usr/ports/x11-clocks/wmfishtime/files/patch-fishmon.c	2015-08-24 04:05:12.653451000 +0900
>+++ x11-clocks/wmfishtime/files/patch-fishmon.c	2015-11-01 00:00:00.000000000 +0900
>@@ -1,6 +1,39 @@
>---- fishmon.c.orig	Sun May 27 05:53:09 2001
>-+++ fishmon.c	Mon Jul  7 04:01:52 2003
>-@@ -1018,26 +1018,28 @@
>+--- fishmon.c.orig	2004-05-12 23:55:59 UTC
>++++ fishmon.c
>+@@ -152,6 +152,10 @@ static char month[12][4] = { "JAN", "FEB
>+ 
>+ int main(int argc, char **argv)
>+ {
>++#if (GTK_MAJOR_VERSION >= 2)
>++    /* This is needed to proper dockapp work on >=GTK+=2.18 */
>++    setenv("GDK_NATIVE_WINDOWS", "1", 0);
>++#endif
>+     int ch;
>+     GdkEvent *event;
>+ #ifdef PRO
>+@@ -648,6 +652,9 @@ static void make_new_fishmon_dockapp(voi
>+ 
>+     /* make a copy for the iconwin - parameters are the same */
>+     memcpy(&attri, &attr, sizeof(GdkWindowAttr));
>++#if (GTK_MAJOR_VERSION >= 2)
>++    attri.window_type = GTK_WINDOW_CHILD;
>++#endif
>+ 
>+     sizehints.flags = USSize;
>+     sizehints.width = 64;
>+@@ -679,7 +686,11 @@ static void make_new_fishmon_dockapp(voi
>+     wmhints.window_group = win;
>+     wmhints.flags =
>+ 	StateHint | IconWindowHint | IconPositionHint | WindowGroupHint;
>++#if (GTK_MAJOR_VERSION >= 2)
>++    gdk_window_show(bm.iconwin);
>++#else
>+     XSetWMHints(GDK_WINDOW_XDISPLAY(bm.win), win, &wmhints);
>++#endif
>+ 
>+     bm.gc = gdk_gc_new(bm.win);
>+ 
>+@@ -1020,27 +1031,29 @@ static void parse_options(int argc, char
>  {
>      static int ch = 0;
>      static struct option long_opts[] = {
>@@ -31,12 +64,13 @@
> +	    case 'v':
>  		do_version();
>  		exit(0);
>-+		break;
>+ 		break;
> +	    case 'c':
> +		enable_check_mail = 1;
> +		break;
> +	    case 'b':
> +		broken_wm = 1;
>- 		break;
>++		break;
>  	}
>      }
>+ }
>diff -urN /usr/ports/x11-clocks/wmfishtime/pkg-descr x11-clocks/wmfishtime/pkg-descr
>--- /usr/ports/x11-clocks/wmfishtime/pkg-descr	2015-08-24 04:05:12.639558000 +0900
>+++ x11-clocks/wmfishtime/pkg-descr	2015-11-01 00:00:00.000000000 +0900
>@@ -1,9 +1,9 @@
>-This is a time/date applet for WindowMaker (and BlackBox, E, SawFish...). Top
>-part has the clock face, bottom part has day of the week, followed by day,
>-followed by month. Yellow hand counts seconds, green hand counts minutes, red
>-hand counts hours. Few seconds after startup there are at least 32 bubbles
>-floating up behind the clock face.  There are 4 fishes randomly swimming back
>-and forth. If you move your mouse inside the dockapp window, the fish will get
>-scared and run away.
>+WMFishTime is a time/date applet for WindowMaker (and BlackBox, E,
>+SawFish...). Top part has the clock face, bottom part has day of the
>+week, followed by day, followed by month. Yellow hand counts seconds,
>+green hand counts minutes, red hand counts hours. Few seconds after
>+startup there are at least 32 bubbles floating up behind the clock face.
>+There are 4 fishes randomly swimming back and forth. If you move your
>+mouse inside the dockapp window, the fish will get scared and run away.
> 
> WWW: http://www.ne.jp/asahi/linux/timecop/#wmfishtime

Actions: View | Diff

Attachments on bug 204200: 162684