From: Richard W.M. Jones <rjones@redhat.com> <"Richard W.M. Jones <rjones@redhat.com>">
Date: Fri, 23 Jan 2009 19:26:58 +0000 (+0000)
Subject: Patch so it builds on Rawhide.
X-Git-Url: http://git.annexia.org/?a=commitdiff_plain;h=dfae835ac98e33d4aaf11912de26a2627568e044;p=fedora-mingw.git

Patch so it builds on Rawhide.
---

diff --git a/gtk2/mingw32-gtk2-2.15.0-xbuttons.patch b/gtk2/mingw32-gtk2-2.15.0-xbuttons.patch
new file mode 100644
index 0000000..6138fce
--- /dev/null
+++ b/gtk2/mingw32-gtk2-2.15.0-xbuttons.patch
@@ -0,0 +1,30 @@
+--- gtk+-2.15.0.orig/gtk/gtkstatusicon.c	2009-01-01 19:41:45.000000000 +0000
++++ gtk+-2.15.0/gtk/gtkstatusicon.c	2009-01-23 19:03:37.000000000 +0000
+@@ -707,11 +707,13 @@
+ 	  button = 3;
+ 	  goto buttondown0;
+ 
++#ifdef WM_XBUTTONDOWN
+ 	case WM_XBUTTONDOWN:
+ 	  if (HIWORD (wparam) == XBUTTON1)
+ 	    button = 4;
+ 	  else
+ 	    button = 5;
++#endif
+ 
+ 	buttondown0:
+ 	  bc = g_new (ButtonCallbackData, 1);
+@@ -733,11 +735,13 @@
+ 	  button = 3;
+ 	  goto buttonup0;
+ 
++#ifdef WM_XBUTTONUP
+ 	case WM_XBUTTONUP:
+ 	  if (HIWORD (wparam) == XBUTTON1)
+ 	    button = 4;
+ 	  else
+ 	    button = 5;
++#endif
+ 
+ 	buttonup0:
+ 	  bc = g_new (ButtonCallbackData, 1);
diff --git a/gtk2/mingw32-gtk2.spec b/gtk2/mingw32-gtk2.spec
index e89f173..835e3bf 100644
--- a/gtk2/mingw32-gtk2.spec
+++ b/gtk2/mingw32-gtk2.spec
@@ -20,21 +20,26 @@ BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 # wine %{_mingw32_bindir}/gdk-pixbuf-query-loaders.exe > gdk-pixbuf.loaders
 Source1:        gdk-pixbuf.loaders
 
+# Fix use of extended buttons in gtkstatusicon.
+Patch1000:      mingw32-gtk2-2.15.0-xbuttons.patch
+
 BuildArch:      noarch
 
 BuildRequires:  mingw32-filesystem >= 40
 BuildRequires:  mingw32-gcc
 BuildRequires:  mingw32-binutils
-BuildRequires:  mingw32-iconv
+
+BuildRequires:  mingw32-atk >= 1.13.0
+BuildRequires:  mingw32-cairo >= 1.8.0
 BuildRequires:  mingw32-gettext
 BuildRequires:  mingw32-glib2 >= 2.17.7
-BuildRequires:  mingw32-cairo >= 1.8.0
+BuildRequires:  mingw32-iconv
 BuildRequires:  mingw32-jasper
-BuildRequires:  mingw32-libpng >= 1.2.2
 BuildRequires:  mingw32-libjpeg
+BuildRequires:  mingw32-libpng >= 1.2.2
 BuildRequires:  mingw32-pango >= 1.20.0
-BuildRequires:  mingw32-atk >= 1.13.0
 BuildRequires:  pkgconfig
+
 # Native one for msgfmt
 BuildRequires:  gettext
 # Native one for glib-genmarsjal
@@ -52,6 +57,8 @@ MinGW Windows Gtk2 library.
 %prep
 %setup -q -n gtk+-%{version}
 
+%patch1000 -p1
+
 
 %build
 # Need to run the correct version of glib-mkenums.