[Lunar-commits] <moonbase> koffice: fix build with recent gcc qt and glibc

[Zbigniew Luszpinski]

commit b7bcbd127946c619381fee88344f219ba7f5fa02
Author: Zbigniew Luszpinski <zbiggy at lunar-linux.org>
Date:   Tue May 8 00:53:54 2012 +0200

    koffice: fix build with recent gcc qt and glibc
---
 kde4/office/koffice/BUILD   |    4 ++++
 kde4/office/koffice/DETAILS |    3 +++
 2 files changed, 7 insertions(+)

diff --git a/kde4/office/koffice/BUILD b/kde4/office/koffice/BUILD
index 4326639..b11d42e 100644
--- a/kde4/office/koffice/BUILD
+++ b/kde4/office/koffice/BUILD
@@ -3,6 +3,10 @@
   OPTS+=" -Wno-dev"   &&
 
   patch_it $SOURCE2 1 &&
+  patch_it $SOURCE3 1 &&
+
+  # fix for glib-2.32
+  sedit 's:glib/giochannel.h:glib.h:' filters/kword/msword-odf/wv2/src/olestream.h &&
 
   default_cmake_build
 
diff --git a/kde4/office/koffice/DETAILS b/kde4/office/koffice/DETAILS
index e5aa1b5..6a87ea0 100644
--- a/kde4/office/koffice/DETAILS
+++ b/kde4/office/koffice/DETAILS
@@ -2,10 +2,13 @@
          VERSION=2.3.3
           SOURCE=koffice-$VERSION.tar.bz2
          SOURCE2=krita.patch
+	 SOURCE3=koffice-libs-2.3.3-qt48.patch.bz2
       SOURCE_URL=$KDE_URL/stable/koffice-$VERSION
      SOURCE2_URL=$PATCH_URL
+     SOURCE3_URL=$PATCH_URL
       SOURCE_VFY=sha1:53eaac4d17922e9fff8cc8028612e581003e1add
      SOURCE2_VFY=sha1:25e1b462758bb5e12f36bf100defafadbb6b0643
+     SOURCE3_VFY=sha1:4ef33be87f92e8d27074dd833e3ed94844947c94
    MODULE_PREFIX=${KDE4_INSTALL_DIR:-/usr}
         WEB_SITE=http://www.koffice.org
          ENTERED=20080718