[arch-commits] Commit in koffice/trunk (PKGBUILD gcc46.patch)

[Andrea Scarpino]

    Date: Friday, May 27, 2011 @ 20:58:39
  Author: andrea
Revision: 125678

glew rebuild; fix build with gcc 4.6; cleanup makedependencies

Added:
  koffice/trunk/gcc46.patch
Modified:
  koffice/trunk/PKGBUILD

-------------+
 PKGBUILD    |   17 ++++++++++-------
 gcc46.patch |   23 +++++++++++++++++++++++
 2 files changed, 33 insertions(+), 7 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2011-05-28 00:02:17 UTC (rev 125677)
+++ PKGBUILD	2011-05-28 00:58:39 UTC (rev 125678)
@@ -1,5 +1,6 @@
 # $Id$
 # Maintainer: Ronald van Haren <ronald.archlinux.org>
+# Contributor: Andrea Scarpino <andrea at archlinux.org>
 # Contributor: BlackEagle < ike DOT devolder AT gmail DOT com >
 
 pkgbase=koffice
@@ -36,23 +37,25 @@
 #	'koffice-kdgantt' # still an empty package
 )
 pkgver=2.3.3
-pkgrel=3
+pkgrel=4
 arch=('i686' 'x86_64')
 url='http://koffice.kde.org'
 license=('GPL' 'LGPL' 'FDL')
-makedepends=('pkg-config' 'cmake' 'automoc4' 'boost' 'eigen' \
-  'kdelibs' 'gsl' 'qca' 'lcms' 'glew' 'qimageblitz' \
-  'kdepimlibs' 'pstoedit' 'poppler-qt' 'libwpd' 'libwpg' 'openexr' 'opengtl' 'kdegraphics-libs' 'sqlite3' 'docbook-xml' 'docbook-xsl')
+makedepends=('pkg-config' 'cmake' 'automoc4' 'boost' 'eigen' 'gsl' 'lcms'
+             'glew' 'qimageblitz' 'kdepimlibs' 'pstoedit' 'poppler-qt' 'libwpd'
+             'libwpg' 'opengtl' 'kdegraphics-libs')
 groups=('koffice')
 source=("http://download.kde.org/stable/${pkgbase}-${pkgver}/${pkgbase}-${pkgver}.tar.bz2"
-	"kde4-koffice-libwpg02.patch")
+        'kde4-koffice-libwpg02.patch' 'gcc46.patch')
 sha256sums=('31ba0d98c0d29c7b8ab97efdeb6c618b82177b2b0ec85da088178254da43c099'
-            '69106deb4081d71b5bd8f2e4f5af67ca689e4ce9f2bb49c11dbce5fb3409d612')
+            '69106deb4081d71b5bd8f2e4f5af67ca689e4ce9f2bb49c11dbce5fb3409d612'
+            'e095c0b2bbedf41da6535a68b2275464dafd3f194566028d0135322f596e4739')
 
 build() {
 	cd "${srcdir}/${pkgbase}-${pkgver}"
 
-	patch -Np1 -i "${srcdir}/kde4-koffice-libwpg02.patch"
+	patch -p1 -i "${srcdir}/kde4-koffice-libwpg02.patch"
+    patch -p1 -i "${srcdir}"/gcc46.patch
 
 	cd "${srcdir}"
 	mkdir build

Added: gcc46.patch
===================================================================
--- gcc46.patch	                        (rev 0)
+++ gcc46.patch	2011-05-28 00:58:39 UTC (rev 125678)
@@ -0,0 +1,23 @@
+diff -up koffice-2.3.2/krita/plugins/formats/exr/exr_converter.cc.gcc46 koffice-2.3.2/krita/plugins/formats/exr/exr_converter.cc
+--- koffice-2.3.2/krita/plugins/formats/exr/exr_converter.cc.gcc46	2011-02-17 06:13:40.000000000 -0600
++++ koffice-2.3.2/krita/plugins/formats/exr/exr_converter.cc	2011-02-19 21:15:56.597142885 -0600
+@@ -80,6 +80,9 @@ ImageType imfTypeToKisType(Imf::PixelTyp
+         return IT_FLOAT16;
+     case Imf::FLOAT:
+         return IT_FLOAT32;
++    default:
++    // shouldn't reach here
++        return IT_UNSUPPORTED;
+     }
+ }
+ 
+@@ -93,6 +96,9 @@ const KoColorSpace* kisTypeToColorSpace(
+     case IT_UNKNOWN:
+     case IT_UNSUPPORTED:
+         return 0;
++    default:
++    // shouldn't reach here
++        return 0;
+     }
+ }
+