[SCM] Google Gadgets packaging branch, master, updated. debian/0.11.2-5-3-g23d1912

[Pino Toscano]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/krap/google-gadgets.git;a=commitdiff;h=24e143f

The following commit has been merged in the master branch:
commit 24e143fd93f6a01437fac4d2e539c40a72b47ea0
Author: Pino Toscano <pino at debian.org>
Date:   Sat Mar 24 21:24:49 2012 +0100

    fix building with glib 2.32 (#665541)
    
    include only <glib.h> instead of individual headers
---
 debian/changelog                  |    3 +++
 debian/patches/glib_includes.diff |   33 +++++++++++++++++++++++++++++++++
 debian/patches/series             |    1 +
 3 files changed, 37 insertions(+), 0 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 527b5ed..4103c26 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,8 @@
 google-gadgets (0.11.2-6) UNRELEASED; urgency=low
 
+  [ Pino Toscano ]
+  * Fix building with glib 2.32, by including only <glib.h> instead of
+    individual headers; patch glib_includes.diff. (Closes: #665541)
 
  -- Debian Krap Maintainers <debian-qt-kde at lists.debian.org>  Sat, 24 Mar 2012 21:17:37 +0100
 
diff --git a/debian/patches/glib_includes.diff b/debian/patches/glib_includes.diff
new file mode 100644
index 0000000..bc7e20e
--- /dev/null
+++ b/debian/patches/glib_includes.diff
@@ -0,0 +1,33 @@
+Author: Pino Toscano <pino at kde.org>
+Description: Only include <glib.h> instead of other glib headers.
+ Starting with glib 2.32 it is now mandatory to include <glib.h> instead
+ of individual headers.
+Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=665541
+Origin: vendor
+Forwarded: no
+Last-Update: 2012-03-24
+
+--- a/ggadget/gtk/main_loop.cc
++++ b/ggadget/gtk/main_loop.cc
+@@ -16,9 +16,8 @@
+ 
+ #include <fcntl.h>
+ #include <stdint.h>
+-#include <glib/ghash.h>
++#include <glib.h>
+ #include <gtk/gtk.h>
+-#include <glib/gthread.h>
+ #include <ggadget/common.h>
+ #include "main_loop.h"
+ #include "utilities.h"
+--- a/hosts/gtk/main.cc
++++ b/hosts/gtk/main.cc
+@@ -15,7 +15,7 @@
+ */
+ 
+ #include <gtk/gtk.h>
+-#include <glib/gthread.h>
++#include <glib.h>
+ #include <locale.h>
+ #include <signal.h>
+ #include <unistd.h>
diff --git a/debian/patches/series b/debian/patches/series
index a65fc7b..34a625f 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -6,3 +6,4 @@
 fix_desktop.patch
 nm09.patch
 nm-mobile-devtypes.patch
+glib_includes.diff

-- 
Google Gadgets packaging