Tue Jun 4 00:27:56 PDT 2013

2 files changed, 15 insertions, 33 deletions

diff --git a/extra/digikam/PKGBUILD b/extra/digikam/PKGBUILD
index 527e359df..d0ebfd507 100644
--- a/extra/digikam/PKGBUILD
+++ b/extra/digikam/PKGBUILD
@@ -1,25 +1,23 @@
-# $Id: PKGBUILD 184369 2013-05-06 19:36:56Z foutrelis $
+# $Id: PKGBUILD 187093 2013-06-03 17:45:39Z andrea $
 # Maintainer: Ronald van Haren <ronald@archlinux.org>
 # Contributor: Andrea Scarpino <andrea@archlinux.org>
 # Contributor: Tobias Powalowski <tpowa@archlinux.org>
 
 pkgbase=digikam
 pkgname=('digikam' 'kipi-plugins' 'libkface' 'libkgeomap' 'libkvkontakte' 'libmediawiki')
-pkgver=3.1.0
-pkgrel=4
+pkgver=3.2.0
+pkgrel=2
 pkgdesc="Digital photo management application for KDE"
 arch=('i686' 'x86_64')
 license=('GPL')
 url="http://www.digikam.org/"
 makedepends=('kdepimlibs' 'libkexiv2' 'libkdcraw' 'libkipi' 'libksane' 'liblqr'
              'kdeedu-marble' 'opencv' 'boost' 'libgpod' 'qjson' 'hugin'
-             'cmake' 'automoc4' 'doxygen' 'lensfun')
+             'cmake' 'automoc4' 'doxygen' 'lensfun' 'qt-gstreamer' 'imagemagick')
 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'
+sha1sums=('666f1d937dc033ddb880aed8a32e7943113d973f'
           'b0a1991e0df9b72c79562c719bc9d944a3b8bc78')
 
 prepare() {
@@ -27,9 +25,6 @@ prepare() {
 
   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" --strip-components=1
@@ -50,7 +45,7 @@ package_digikam() {
   pkgdesc="Digital photo management application for KDE"
   depends=('kdebase-runtime' 'kdepimlibs' 'libgphoto2' 'opencv' 'liblqr'
            'libkipi' 'libkexiv2' 'libkdcraw' 'libkface' 'libkgeomap' 'lensfun')
-  optdepends=('kipi-plugins: for more extras and plugins')
+  optdepends=('kipi-plugins: more tools and plugins')
   install=digikam.install
 
   cd build/core
@@ -60,7 +55,7 @@ package_digikam() {
   cd ../../build/po
   make DESTDIR="${pkgdir}" install
 
-  # Fix conflicts with kde-l10n-*
+  # Fix conflicts with kde-l10n-* (FS#33762)
   rm "${pkgdir}"/usr/share/locale/*/LC_MESSAGES/libkipi.mo
 }
 
@@ -98,12 +93,14 @@ package_libmediawiki() {
 
 package_kipi-plugins() {
   pkgdesc="A collection of plugins extending the KDE graphics and image applications as digiKam"
-  depends=('kdebase-runtime' 'kdepimlibs' 'libkdcraw' 'libkipi' 'libksane'
-           'opencv' 'libkvkontakte' 'libkexiv2')
-  optdepends=('libkgeomap'
-              'libmediawiki'
-              'libgpod'
-              'hugin')
+  depends=('kdebase-runtime' 'kdepimlibs' 'libkdcraw' 'libkipi' 'libksane' 'libkexiv2')
+  optdepends=('libkgeomap: Geolocalize tool'
+              'libmediawiki: MediaWiki Export plugin'
+              'libkvkontakte: VKontakte.ru Exporter plugin'
+              'libgpod: iPodExport plugin'
+              'opencv: Remove Red Eyes plugin'
+              'imagemagick: Video SlideShow plugin'
+              'qt-gstreamer: Video SlideShow plugin')
   install=kipi-plugins.install
 
   cd build/extra/kipi-plugins
diff --git a/extra/digikam/digikam-3.1.0-htmlexport.patch b/extra/digikam/digikam-3.1.0-htmlexport.patch
deleted file mode 100644
index c9e2ff365..000000000
--- a/extra/digikam/digikam-3.1.0-htmlexport.patch
+++ /dev/null
@@ -1,15 +0,0 @@
---- 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)