Package: wmfishtime
Tags: patch
Hi,
Attached is a patch for wmbubble to build against GTK+ 2.0:
- changes the required bit in the Makefile
- adjusts a couple of things for GTK+ 2.0
After applying the patch, please remove the CFLAGS= line from
debian/rules. As is, the package is unbuildable without going through
the Debian build process, which is not practical and totally useless.
Please apply, as it'll help clear the list of GTK+1.2 applications.
Thanks,
JB.
--
Julien BLACHE - Debian & GNU/Linux Developer - <[EMAIL PROTECTED]>
Public key available on <http://www.jblache.org> - KeyID: F5D6 5169
GPG Fingerprint : 935A 79F1 C8B3 3521 FD62 7CC7 CD61 4FD7 F5D6 5169
diff -ru orig/wmfishtime-1.24/Makefile wmfishtime-1.24/Makefile
--- orig/wmfishtime-1.24/Makefile 2007-08-12 15:49:11.000000000 +0200
+++ wmfishtime-1.24/Makefile 2007-08-12 15:51:26.670078369 +0200
@@ -6,7 +6,7 @@
# no user serviceable parts below this line
# optimization cflags
-#CFLAGS = -O3 -Wall `gtk-config --cflags` ${EXTRA}
+CFLAGS = -O2 -Wall `pkg-config gtk+-2.0 --cflags` ${EXTRA}
# profiling cflags
# CFLAGS=-ansi -pedantic -Wall -pg -O3 `gtk-config --cflags` ${EXTRA} -DPRO
# test coverage cflags
@@ -16,7 +16,7 @@
CC = gcc
SHELL = sh
OBJS = fishmon.o
-LIBS = `gtk-config --libs | sed "s/-lgtk//g"`
+LIBS = `pkg-config gtk+-2.0 --libs`
INSTALL = -m 755
all: wmfishtime
diff -ru orig/wmfishtime-1.24/fishmon.c wmfishtime-1.24/fishmon.c
--- orig/wmfishtime-1.24/fishmon.c 2004-05-13 01:55:59.000000000 +0200
+++ wmfishtime-1.24/fishmon.c 2007-08-12 15:53:18.676461250 +0200
@@ -648,6 +648,7 @@
/* make a copy for the iconwin - parameters are the same */
memcpy(&attri, &attr, sizeof(GdkWindowAttr));
+ attri.window_type = GDK_WINDOW_CHILD;
sizehints.flags = USSize;
sizehints.width = 64;
@@ -679,7 +680,6 @@
wmhints.window_group = win;
wmhints.flags =
StateHint | IconWindowHint | IconPositionHint | WindowGroupHint;
- XSetWMHints(GDK_WINDOW_XDISPLAY(bm.win), win, &wmhints);
bm.gc = gdk_gc_new(bm.win);
@@ -693,6 +693,8 @@
gdk_window_show(bm.win);
+ XSetWMHints(GDK_WINDOW_XDISPLAY(bm.win), win, &wmhints);
+
#undef MASK
} /* make_new_fishmon_dockapp */
