[arch-commits] Commit in digikam/repos/extra-i686 (PKGBUILD libkexiv2.patch)

[Ronald van Haren]

    Date: Friday, November 14, 2014 @ 21:19:33
  Author: ronald
Revision: 226259

fix svn merge error

Added:
  digikam/repos/extra-i686/libkexiv2.patch
Modified:
  digikam/repos/extra-i686/PKGBUILD

-----------------+
 PKGBUILD        |   13 ++++++++++---
 libkexiv2.patch |   10 ++++++++++
 2 files changed, 20 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2014-11-14 20:14:29 UTC (rev 226258)
+++ PKGBUILD	2014-11-14 20:19:33 UTC (rev 226259)
@@ -6,7 +6,7 @@
 pkgbase=digikam
 pkgname=('digikam' 'kipi-plugins' 'libkface' 'libkgeomap' 'libkvkontakte' 'libmediawiki')
 pkgver=4.5.0
-pkgrel=1
+pkgrel=2
 pkgdesc="Digital photo management application for KDE"
 arch=('i686' 'x86_64')
 license=('GPL')
@@ -15,9 +15,16 @@
              'kdeedu-marble' 'opencv' 'boost' 'libgpod' 'qjson' 'hugin' 'libgphoto2'
              'cmake' 'automoc4' 'doxygen' 'lensfun' 'qt-gstreamer' 'imagemagick' 'eigen' 
 	     'libbaloo4' 'libpgf')
-source=("http://download.kde.org/stable/${pkgname}/${pkgname}-${pkgver}.tar.bz2")
-sha1sums=('ba735f4b7bb0437c1676141ab78ea958e46f135e')
+source=("http://download.kde.org/stable/${pkgname}/${pkgname}-${pkgver}.tar.bz2"
+	"libkexiv2.patch")
+sha1sums=('ba735f4b7bb0437c1676141ab78ea958e46f135e'
+          '1bcef459bd400a04526aac9adf39d4d0a1c3549c')
 
+prepare() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
+  patch -Np0 -i "${srcdir}/libkexiv2.patch" 
+}
+
 build() {
   mkdir build
   cd build

Added: libkexiv2.patch
===================================================================
--- libkexiv2.patch	                        (rev 0)
+++ libkexiv2.patch	2014-11-14 20:19:33 UTC (rev 226259)
@@ -0,0 +1,10 @@
+--- 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)