[SCM] KOffice packaging branch, master, updated. debian/2.3.3-2-5-g3f73d97

[Pino Toscano]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/kde-std/koffice.git;a=commitdiff;h=3f73d97

The following commit has been merged in the master branch:
commit 3f73d97e0cfbdf0ed035bf570f995e9ac708148a
Author: Pino Toscano <pino at debian.org>
Date:   Sun Mar 25 13:14:10 2012 +0200

    fix building with glib 2.32 (#665564)
    
    include only <glib.h> instead of individual headers
---
 debian/changelog                |    2 ++
 debian/patches/30_glib_includes |   20 ++++++++++++++++++++
 debian/patches/series           |    1 +
 3 files changed, 23 insertions(+), 0 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 65646e9..428659f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -6,6 +6,8 @@ koffice (1:2.3.3-3) UNRELEASED; urgency=low
   [ Pino Toscano ]
   * Switch the libpoppler-dev build dependency to libpoppler-private-dev.
   * Switch the libpng12-dev build dependency to libpng-dev. (Closes: #662390)
+  * Fix building with glib 2.32, by including only <glib.h> instead of
+    individual headers; patch 30_glib_includes. (Closes: #665564)
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Sat, 17 Sep 2011 12:15:57 +0200
 
diff --git a/debian/patches/30_glib_includes b/debian/patches/30_glib_includes
new file mode 100644
index 0000000..2e0809c
--- /dev/null
+++ b/debian/patches/30_glib_includes
@@ -0,0 +1,20 @@
+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=665564
+Origin: vendor
+Forwarded: no
+Last-Update: 2012-03-25
+
+--- a/filters/kword/msword-odf/wv2/src/olestream.h
++++ b/filters/kword/msword-odf/wv2/src/olestream.h
+@@ -23,7 +23,7 @@
+ #include "global.h"  // U8,... typedefs
+ #include <stack>
+ 
+-#include <glib/giochannel.h> // GSeekType
++#include <glib.h> // GSeekType
+ #include "wv2_export.h"
+ 
+ namespace wvWare {
diff --git a/debian/patches/series b/debian/patches/series
index d35be92..492f784 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -2,3 +2,4 @@
 #16_kformula_kdeinit4
 15_new_libwpd
 20_arm_fix
+30_glib_includes

-- 
KOffice packaging