diff options
| author | root <root@rshg054.dnsready.net> | 2013-05-07 00:36:35 -0700 |
|---|---|---|
| committer | root <root@rshg054.dnsready.net> | 2013-05-07 00:36:35 -0700 |
| commit | da0a0d88caa1bf934ebf314ef86e15928dbb027b (patch) | |
| tree | b7c57ac9667de10c72390e0d81654fffbe47c42d /extra/digikam | |
| parent | ffb692bf2696e7ebedd19bcd55ba253e21cb732d (diff) | |
Tue May 7 00:36:35 PDT 2013
Diffstat (limited to 'extra/digikam')
| -rw-r--r-- | extra/digikam/PKGBUILD | 27 | ||||
| -rw-r--r-- | extra/digikam/digikam-3.1.0-fixed-pngs.tar.gz | bin | 0 -> 402725 bytes | |||
| -rw-r--r-- | extra/digikam/digikam-3.1.0-htmlexport.patch | 15 |
3 files changed, 37 insertions, 5 deletions
diff --git a/extra/digikam/PKGBUILD b/extra/digikam/PKGBUILD index 1ec455c62..527e359df 100644 --- a/extra/digikam/PKGBUILD +++ b/extra/digikam/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 180024 2013-03-14 20:15:45Z andrea $ +# $Id: PKGBUILD 184369 2013-05-06 19:36:56Z foutrelis $ # Maintainer: Ronald van Haren <ronald@archlinux.org> # Contributor: Andrea Scarpino <andrea@archlinux.org> # Contributor: Tobias Powalowski <tpowa@archlinux.org> @@ -6,7 +6,7 @@ pkgbase=digikam pkgname=('digikam' 'kipi-plugins' 'libkface' 'libkgeomap' 'libkvkontakte' 'libmediawiki') pkgver=3.1.0 -pkgrel=1 +pkgrel=4 pkgdesc="Digital photo management application for KDE" arch=('i686' 'x86_64') license=('GPL') @@ -14,11 +14,28 @@ url="http://www.digikam.org/" makedepends=('kdepimlibs' 'libkexiv2' 'libkdcraw' 'libkipi' 'libksane' 'liblqr' 'kdeedu-marble' 'opencv' 'boost' 'libgpod' 'qjson' 'hugin' 'cmake' 'automoc4' 'doxygen' 'lensfun') -source=("http://download.kde.org/stable/${pkgname}/${pkgname}-${pkgver}.tar.bz2") -sha1sums=('f4ce304acdf10e859ab8f70ce9d53a05d92d4fbd') +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') -build() { +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" --strip-components=1 +} + +build() { cd build cmake ../${pkgname}-${pkgver} \ -DCMAKE_INSTALL_PREFIX=/usr \ diff --git a/extra/digikam/digikam-3.1.0-fixed-pngs.tar.gz b/extra/digikam/digikam-3.1.0-fixed-pngs.tar.gz Binary files differnew file mode 100644 index 000000000..cbd21446f --- /dev/null +++ b/extra/digikam/digikam-3.1.0-fixed-pngs.tar.gz diff --git a/extra/digikam/digikam-3.1.0-htmlexport.patch b/extra/digikam/digikam-3.1.0-htmlexport.patch new file mode 100644 index 000000000..c9e2ff365 --- /dev/null +++ b/extra/digikam/digikam-3.1.0-htmlexport.patch @@ -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) |