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

[Evangelos Foutras]

    Date: Sunday, May 5, 2013 @ 12:55:02
  Author: foutrelis
Revision: 184272

upgpkg: digikam 3.1.0-4

Add patch for FS#34960: [kipi-plugins] kipiplugin_htmlexport is missing

Added:
  digikam/trunk/digikam-3.1.0-htmlexport.patch
Modified:
  digikam/trunk/PKGBUILD

--------------------------------+
 PKGBUILD                       |   12 +++++++++---
 digikam-3.1.0-htmlexport.patch |   15 +++++++++++++++
 2 files changed, 24 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2013-05-05 10:45:31 UTC (rev 184271)
+++ PKGBUILD	2013-05-05 10:55:02 UTC (rev 184272)
@@ -6,7 +6,7 @@
 pkgbase=digikam
 pkgname=('digikam' 'kipi-plugins' 'libkface' 'libkgeomap' 'libkvkontakte' 'libmediawiki')
 pkgver=3.1.0
-pkgrel=3
+pkgrel=4
 pkgdesc="Digital photo management application for KDE"
 arch=('i686' 'x86_64')
 license=('GPL')
@@ -15,18 +15,24 @@
              'kdeedu-marble' 'opencv' 'boost' 'libgpod' 'qjson' 'hugin'
              'cmake' 'automoc4' 'doxygen' 'lensfun')
 source=("http://download.kde.org/stable/${pkgname}/${pkgname}-${pkgver}.tar.bz2"
+        "digikam-3.1.0-htmlexport.patch"
         "digikam-3.1.0-fixed-pngs.tar.gz")
 noextract=("digikam-3.1.0-fixed-pngs.tar.gz")
 sha1sums=('f4ce304acdf10e859ab8f70ce9d53a05d92d4fbd'
+          'ef3ee0b6e56e692eb7c10cda5cd581d20c3c46bb'
           'b0a1991e0df9b72c79562c719bc9d944a3b8bc78')
 
 prepare() {
   mkdir build
 
+  cd  ${pkgname}-${pkgver}
+
+  # https://bugs.kde.org/show_bug.cgi?id=316620
+  patch -Np1 -i "${srcdir}/digikam-3.1.0-htmlexport.patch"
+
   # Fix invalid PNG images to work with libpng 1.6
   # https://bugs.kde.org/show_bug.cgi?id=319350
-  tar xf "${srcdir}/digikam-3.1.0-fixed-pngs.tar.gz" -C ${pkgname}-${pkgver} \
-    --strip-components=1
+  tar xf "${srcdir}/digikam-3.1.0-fixed-pngs.tar.gz" --strip-components=1
 }
 
 build() {

Added: digikam-3.1.0-htmlexport.patch
===================================================================
--- digikam-3.1.0-htmlexport.patch	                        (rev 0)
+++ digikam-3.1.0-htmlexport.patch	2013-05-05 10:55:02 UTC (rev 184272)
@@ -0,0 +1,15 @@
+--- digikam-3.1.0/extra/kipi-plugins/CMakeLists.txt	2013-03-11 10:24:11.000000000 +0200
++++ digikam-3.1.0/extra/kipi-plugins/CMakeLists.txt	2013-03-13 00:15:05.539275132 +0200
+@@ -468,9 +468,9 @@
+     # Currently the cmake module distributed w/ cmake uses a different variable
+     # name LIBXLST_EXSLT_LIBRARIES for libxeslt than the cmake modeule 
+     # distributed w/ kdelibs LIBEXSLT_LIBRARIES.
+-    if (NOT LIBXSLT_EXSLT_LIBRARIES AND NOT LIBXSLT_LIBRARIES)
+-        set(LIBXSLT_EXSLT_LIBRARIES ${LIBXSLT_LIBRARIES})
+-    endif (NOT LIBXSLT_EXSLT_LIBRARIES AND NOT LIBXSLT_LIBRARIES)
++    if (NOT LIBXSLT_EXSLT_LIBRARIES AND LIBEXSLT_LIBRARIES)
++        set(LIBXSLT_EXSLT_LIBRARIES ${LIBEXSLT_LIBRARIES})
++    endif (NOT LIBXSLT_EXSLT_LIBRARIES AND LIBEXSLT_LIBRARIES)
+     IF(LIBXML2_FOUND AND LIBXSLT_FOUND AND LIBXSLT_EXSLT_LIBRARIES)
+         ADD_SUBDIRECTORY(htmlexport)
+     ENDIF(LIBXML2_FOUND AND LIBXSLT_FOUND AND LIBXSLT_EXSLT_LIBRARIES)