From dcf3f1030c7c2b0ebeacdfd204e843d5ac3e4408 Mon Sep 17 00:00:00 2001
From: Peter Clifton <peter@clifton-electronics.co.uk>
Date: Sat, 24 Nov 2012 21:19:32 +0000
Subject: [PATCH] Update GTK version to 2.24.13

Drop mousewheel patch as this version has many Win32 fixes upstream -
we should test them as is before patching if necessary.
---
 patches/gtk+/01-mousewheel.patch | 29 -----------------------------
 recipes/gtk+.recipe              |  7 +++----
 2 files changed, 3 insertions(+), 33 deletions(-)
 delete mode 100644 patches/gtk+/01-mousewheel.patch

diff --git a/patches/gtk+/01-mousewheel.patch b/patches/gtk+/01-mousewheel.patch
deleted file mode 100644
index 996f6de..0000000
--- a/patches/gtk+/01-mousewheel.patch
+++ /dev/null
@@ -1,29 +0,0 @@
---- a/gdk/win32/gdkevents-win32.c	2008-10-17 05:06:36.000000000 +0100
-+++ b/gdk/win32/gdkevents-win32.c	2008-11-23 14:56:17.000000000 +0000
-@@ -2243,7 +2243,7 @@
-   RECT rect, *drag, orig_drag;
-   POINT point;
-   MINMAXINFO *mmi;
--  HWND hwnd;
-+  HWND hwnd, hwndc;
-   HCURSOR hcursor;
-   BYTE key_state[256];
-   HIMC himc;
-@@ -2855,8 +2855,15 @@
-       point.x = GET_X_LPARAM (msg->lParam);
-       point.y = GET_Y_LPARAM (msg->lParam);
- 
--      if ((hwnd = WindowFromPoint (point)) == NULL)
--	break;
-+      /* Find our toplevel window */
-+      hwnd = GetAncestor (msg->hwnd, GA_ROOT);
-+
-+      /* Walk back up to the outermost child at the desired point */
-+      do {
-+        ScreenToClient (hwnd, &point);
-+        hwndc = ChildWindowFromPoint (hwnd, point);
-+        ClientToScreen (hwnd, &point);
-+      } while (hwndc != hwnd && (hwnd = hwndc, 1));
- 
-       msg->hwnd = hwnd;
-       if ((new_window = gdk_win32_handle_table_lookup ((GdkNativeWindow) msg->hwnd)) == NULL)
diff --git a/recipes/gtk+.recipe b/recipes/gtk+.recipe
index bda9fbf..9aeb0d5 100644
--- a/recipes/gtk+.recipe
+++ b/recipes/gtk+.recipe
@@ -1,13 +1,12 @@
 name=gtk+
-major=2.20
-minor=1
+major=2.24
+minor=13
 release=1
 version=$major.$minor
 download=http://ftp.gnome.org/pub/gnome/sources/$name/$major
+source_package_type=tar.xz
 
 configure_opt="
-  --without-libjasper
   --disable-cups
-  --with-included-loaders
   --with-included-immodules
 "
-- 
2.11.4.GIT