#! /bin/sh /usr/share/dpatch/dpatch-run
## 01_gtk2.dpatch by  <jblache@debian.org>
##
## DP: Patch build to use GTK2.0; bts 437429

diff -ru wmfishtime~/Makefile wmfishtime/Makefile
--- wmfishtime~/Makefile	2007-08-12 15:49:11.000000000 +0200
+++ wmfishtime/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 wmfishtime~/fishmon.c wmfishtime/fishmon.c
--- wmfishtime~/fishmon.c	2004-05-13 01:55:59.000000000 +0200
+++ wmfishtime/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 */