Date: Monday, June 3, 2013 @ 18:27:18
Author: andrea
Revision: 187089
upgpkg: digikam 3.2.0-1
Upstream release
Modified:
digikam/trunk/PKGBUILD
Deleted:
digikam/trunk/digikam-3.1.0-htmlexport.patch
+
PKGBUILD | 27 ++-
digikam-3.1.0-htmlexport.patch | 15 ---
2 files changed, 10 insertions(+), 32 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2013-06-03 15:58:10 UTC (rev 187088)
+++ PKGBUILD2013-06-03 16:27:18 UTC (rev 187089)
@@ -5,21 +5,19 @@
pkgbase=digikam
pkgname=('digikam' 'kipi-plugins' 'libkface' 'libkgeomap' 'libkvkontakte'
'libmediawiki')
-pkgver=3.1.0
-pkgrel=5
+pkgver=3.2.0
+pkgrel=1
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' 'qt-gstremer')
+ '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 @@
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 @@
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
@@ -59,9 +54,6 @@
make DESTDIR=${pkgdir} install
cd ../../build/po
make DESTDIR=${pkgdir} install
-
- # Fix conflicts with kde-l10n-*
- rm ${pkgdir}/usr/share/locale/*/LC_MESSAGES/libkipi.mo
}
package_libkface() {
@@ -100,10 +92,11 @@
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')
+ optdepends=('libkgeomap: Geolocalize tool'
+ 'libmediawiki: MediaWiki Export plugin'
+ 'libgpod: iPodExport plugin'
+ 'imagemagick: Video SlideShow plugin'
+ 'qt-gstreamer: Video SlideShow plugin')
install=kipi-plugins.install
cd build/extra/kipi-plugins
Deleted: digikam-3.1.0-htmlexport.patch
===
--- digikam-3.1.0-htmlexport.patch 2013-06-03 15:58:10 UTC (rev 187088)
+++ digikam-3.1.0-htmlexport.patch 2013-06-03 16:27:18 UTC (rev 187089)
@@ -1,15 +0,0 @@
digikam-3.1.0/extra/kipi-plugins/CMakeLists.txt2013-03-11
10:24:11.0 +0200
-+++ digikam-3.1.0/extra/kipi-plugins/CMakeLists.txt2013-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)
