[arch-commits] Commit in digikam/trunk (PKGBUILD libkexiv2.patch)

[Ronald van Haren]

    Date: Thursday, January 22, 2015 @ 15:42:12
  Author: ronald
Revision: 229642

update PKGBUILD for 4.6.0

Modified:
  digikam/trunk/PKGBUILD
Deleted:
  digikam/trunk/libkexiv2.patch

-----------------+
 PKGBUILD        |   19 ++++++++-----------
 libkexiv2.patch |   10 ----------
 2 files changed, 8 insertions(+), 21 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2015-01-22 06:41:07 UTC (rev 229641)
+++ PKGBUILD	2015-01-22 14:42:12 UTC (rev 229642)
@@ -5,8 +5,8 @@
 
 pkgbase=digikam
 pkgname=('digikam' 'kipi-plugins' 'libkgeomap' 'libkvkontakte' 'libmediawiki')
-pkgver=4.5.0
-pkgrel=5
+pkgver=4.6.0
+pkgrel=1
 pkgdesc="Digital photo management application for KDE"
 arch=('i686' 'x86_64')
 license=('GPL')
@@ -15,15 +15,9 @@
              'kdeedu-marble' 'opencv' 'boost' 'libgpod' 'qjson' 'hugin' 'libgphoto2'
              'cmake' 'automoc4' 'doxygen' 'lensfun' 'qt-gstreamer' 'imagemagick' 'eigen' 
 	     'libbaloo4' 'libpgf' 'libusb-compat' 'libkface')
-source=("http://download.kde.org/stable/${pkgname}/${pkgname}-${pkgver}.tar.bz2"
-	"libkexiv2.patch")
-sha1sums=('ba735f4b7bb0437c1676141ab78ea958e46f135e'
-          '1bcef459bd400a04526aac9adf39d4d0a1c3549c')
+source=("http://download.kde.org/stable/${pkgname}/${pkgname}-${pkgver}.tar.bz2")
+sha1sums=('ee4241f02e997c7b122166bc845feb885b633f0e')
 
-prepare() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  patch -Np0 -i "${srcdir}/libkexiv2.patch" 
-}
 
 build() {
   mkdir build
@@ -34,7 +28,10 @@
     -DCMAKE_SKIP_RPATH=ON \
     -DBUILD_tests=OFF \
     -DDIGIKAMSC_USE_PRIVATE_KDEGRAPHICS=OFF \
-    -DDIGIKAMSC_USE_PRIVATE_SHAREDLIBS=ON
+    -DDIGIKAMSC_USE_PRIVATE_SHAREDLIBS=ON \
+    -DDIGIKAMSC_COMPILE_LIBKGEOMAP=ON \
+    -DDIGIKAMSC_COMPILE_LIBVKONTAKTE=ON \
+    -DDIGIKAMSC_COMPILE_LIBMEDIAWIKI=ON 
   make
 }
 

Deleted: libkexiv2.patch
===================================================================
--- libkexiv2.patch	2015-01-22 06:41:07 UTC (rev 229641)
+++ libkexiv2.patch	2015-01-22 14:42:12 UTC (rev 229642)
@@ -1,10 +0,0 @@
---- extra/CMakeLists.txt.bak	2014-11-14 20:46:49.265601687 +0100
-+++ extra/CMakeLists.txt	2014-11-14 20:46:55.555823691 +0100
-@@ -11,7 +11,6 @@
- 
-     # from kdegraphics/libs
-     add_subdirectory(libkipi)
--    add_subdirectory(libkexiv2)
-     add_subdirectory(libkdcraw)
-     add_subdirectory(libkface)
-     MACRO_OPTIONAL_ADD_SUBDIRECTORY(libksane)