[arch-commits] Commit in calligra/trunk (PKGBUILD do-not-build-hancomword.patch)

[Andrea Scarpino]

    Date: Saturday, April 14, 2012 @ 08:48:20
  Author: andrea
Revision: 156146

upgpkg: calligra 2.4.0-1

Upstream release

Added:
  calligra/trunk/do-not-build-hancomword.patch
Modified:
  calligra/trunk/PKGBUILD

-------------------------------+
 PKGBUILD                      |   14 ++++++++++----
 do-not-build-hancomword.patch |   11 +++++++++++
 2 files changed, 21 insertions(+), 4 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2012-04-14 12:33:44 UTC (rev 156145)
+++ PKGBUILD	2012-04-14 12:48:20 UTC (rev 156146)
@@ -23,7 +23,7 @@
          'calligra-thesaurus-doc'
          'calligra-braindump'
          'calligra-flow')
-pkgver=2.3.92
+pkgver=2.4.0
 pkgrel=1
 arch=('i686' 'x86_64')
 url='http://www.calligra-suite.org'
@@ -32,10 +32,15 @@
              'libwpd' 'libwpg' 'pstoedit' 'glew' 'gsl' 'cmake' 'automoc4'
              'boost' 'libkdcraw' 'libpqxx' 'fftw' 'opengtl' 'lcms2')
 groups=('calligra')
-source=("http://download.kde.org/unstable/${pkgbase}-${pkgver}/${pkgbase}-${pkgver}.tar.bz2")
-md5sums=('4121631cf148e801cca29e2167b1806d')
+source=("http://download.kde.org/stable/${pkgbase}-${pkgver}/${pkgbase}-${pkgver}.tar.bz2"
+        'do-not-build-hancomword.patch')
+md5sums=('a45b9141c6bb750569e8f6554197dd50'
+         'cc1a5fba43426003909751035d093362')
 
 build() {
+  cd "${srcdir}"/${pkgbase}-${pkgver}
+  patch -p1 -i "${srcdir}"/do-not-build-hancomword.patch
+
   cd "${srcdir}"
   mkdir build
   cd build
@@ -47,7 +52,8 @@
     -DBUILD_mobile=OFF \
     -DBUILD_mysql=OFF \
     -DKDCRAW_LOCAL_FOUND=/usr/lib/libkdcraw.so \
-    -DWITH_Marble=OFF
+    -DWITH_Marble=OFF \
+    -DIHAVEPATCHEDQT=1
   make
 }
 

Added: do-not-build-hancomword.patch
===================================================================
--- do-not-build-hancomword.patch	                        (rev 0)
+++ do-not-build-hancomword.patch	2012-04-14 12:48:20 UTC (rev 156146)
@@ -0,0 +1,11 @@
+--- a/filters/words/CMakeLists.txt
++++ b/filters/words/CMakeLists.txt
+@@ -75,7 +75,6 @@ IF( NOT TINY )
+         add_subdirectory( docbook )
+ #	    add_subdirectory( html )
+ 	    add_subdirectory( kword1.3 )
+-	    add_subdirectory( hancomword )
+ 	    add_subdirectory( oowriter )
+         add_subdirectory( palmdoc )
+ 	    add_subdirectory( wml )
+