[arch-commits] Commit in digikam/repos (18 files)

Evangelos Foutras foutrelis at nymeria.archlinux.org
Sun May 5 06:55:27 EDT 2013


    Date: Sunday, May 5, 2013 @ 12:55:27
  Author: foutrelis
Revision: 184273

archrelease: copy trunk to testing-i686, testing-x86_64

Added:
  digikam/repos/testing-i686/PKGBUILD
    (from rev 184272, digikam/trunk/PKGBUILD)
  digikam/repos/testing-i686/digikam-3.1.0-fixed-pngs.tar.gz
    (from rev 184272, digikam/trunk/digikam-3.1.0-fixed-pngs.tar.gz)
  digikam/repos/testing-i686/digikam-3.1.0-htmlexport.patch
    (from rev 184272, digikam/trunk/digikam-3.1.0-htmlexport.patch)
  digikam/repos/testing-i686/digikam.install
    (from rev 184272, digikam/trunk/digikam.install)
  digikam/repos/testing-i686/kipi-plugins.install
    (from rev 184272, digikam/trunk/kipi-plugins.install)
  digikam/repos/testing-x86_64/PKGBUILD
    (from rev 184272, digikam/trunk/PKGBUILD)
  digikam/repos/testing-x86_64/digikam-3.1.0-fixed-pngs.tar.gz
    (from rev 184272, digikam/trunk/digikam-3.1.0-fixed-pngs.tar.gz)
  digikam/repos/testing-x86_64/digikam-3.1.0-htmlexport.patch
    (from rev 184272, digikam/trunk/digikam-3.1.0-htmlexport.patch)
  digikam/repos/testing-x86_64/digikam.install
    (from rev 184272, digikam/trunk/digikam.install)
  digikam/repos/testing-x86_64/kipi-plugins.install
    (from rev 184272, digikam/trunk/kipi-plugins.install)
Deleted:
  digikam/repos/testing-i686/PKGBUILD
  digikam/repos/testing-i686/digikam-3.1.0-fixed-pngs.tar.gz
  digikam/repos/testing-i686/digikam.install
  digikam/repos/testing-i686/kipi-plugins.install
  digikam/repos/testing-x86_64/PKGBUILD
  digikam/repos/testing-x86_64/digikam-3.1.0-fixed-pngs.tar.gz
  digikam/repos/testing-x86_64/digikam.install
  digikam/repos/testing-x86_64/kipi-plugins.install

-----------------------------------------------+
 /PKGBUILD                                     |  222 ++++++++++++++++++++++++
 /digikam.install                              |   24 ++
 /kipi-plugins.install                         |   24 ++
 testing-i686/PKGBUILD                         |  105 -----------
 testing-i686/digikam-3.1.0-htmlexport.patch   |   15 +
 testing-i686/digikam.install                  |   12 -
 testing-i686/kipi-plugins.install             |   12 -
 testing-x86_64/PKGBUILD                       |  105 -----------
 testing-x86_64/digikam-3.1.0-htmlexport.patch |   15 +
 testing-x86_64/digikam.install                |   12 -
 testing-x86_64/kipi-plugins.install           |   12 -
 11 files changed, 300 insertions(+), 258 deletions(-)

Deleted: testing-i686/PKGBUILD
===================================================================
--- testing-i686/PKGBUILD	2013-05-05 10:55:02 UTC (rev 184272)
+++ testing-i686/PKGBUILD	2013-05-05 10:55:27 UTC (rev 184273)
@@ -1,105 +0,0 @@
-# $Id$
-# Maintainer: Ronald van Haren <ronald at archlinux.org>
-# Contributor: Andrea Scarpino <andrea at archlinux.org>
-# Contributor: Tobias Powalowski <tpowa at archlinux.org>
-
-pkgbase=digikam
-pkgname=('digikam' 'kipi-plugins' 'libkface' 'libkgeomap' 'libkvkontakte' 'libmediawiki')
-pkgver=3.1.0
-pkgrel=3
-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')
-source=("http://download.kde.org/stable/${pkgname}/${pkgname}-${pkgver}.tar.bz2"
-        "digikam-3.1.0-fixed-pngs.tar.gz")
-noextract=("digikam-3.1.0-fixed-pngs.tar.gz")
-sha1sums=('f4ce304acdf10e859ab8f70ce9d53a05d92d4fbd'
-          'b0a1991e0df9b72c79562c719bc9d944a3b8bc78')
-
-prepare() {
-  mkdir build
-
-  # 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
-}
-
-build() {
-  cd build
-  cmake ../${pkgname}-${pkgver} \
-    -DCMAKE_INSTALL_PREFIX=/usr \
-    -DCMAKE_BUILD_TYPE=Release \
-    -DCMAKE_SKIP_RPATH=ON \
-    -DBUILD_tests=OFF \
-    -DDIGIKAMSC_USE_PRIVATE_KDEGRAPHICS=OFF
-  make
-}
-
-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')
-  install=digikam.install
-
-  cd build/core
-  make DESTDIR="${pkgdir}" install
-  cd ../../build/doc
-  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() {
-  pkgdesc="A Qt/C++ wrapper around LibFace library to perform face recognition and detection over pictures"
-  depends=('kdelibs' 'opencv')
-
-  cd build/extra/libkface
-  make DESTDIR="${pkgdir}" install
-}
-
-package_libkgeomap() {
-  pkgdesc="A wrapper around world map components for browsing and arranging photos on a map"
-  depends=('kdelibs' 'kdeedu-marble')
-
-  cd build/extra/libkgeomap
-  make DESTDIR="${pkgdir}" install
-}
-
-package_libkvkontakte() {
-  pkgdesc="KDE C++ library for asynchronous interaction with vkontakte.rusocial network"
-  depends=('kdelibs' 'qjson')
-
-  cd build/extra/libkvkontakte
-  make DESTDIR="${pkgdir}" install
-}
-
-package_libmediawiki() {
-  pkgdesc="A KDE C++ interface for MediaWiki based web service as wikipedia.org"
-  depends=('kdelibs')
-
-  cd build/extra/libmediawiki
-  make DESTDIR="${pkgdir}" install
-}
-
-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')
-  install=kipi-plugins.install
-
-  cd build/extra/kipi-plugins
-  make DESTDIR="${pkgdir}" install
-}

Copied: digikam/repos/testing-i686/PKGBUILD (from rev 184272, digikam/trunk/PKGBUILD)
===================================================================
--- testing-i686/PKGBUILD	                        (rev 0)
+++ testing-i686/PKGBUILD	2013-05-05 10:55:27 UTC (rev 184273)
@@ -0,0 +1,111 @@
+# $Id$
+# Maintainer: Ronald van Haren <ronald at archlinux.org>
+# Contributor: Andrea Scarpino <andrea at archlinux.org>
+# Contributor: Tobias Powalowski <tpowa at archlinux.org>
+
+pkgbase=digikam
+pkgname=('digikam' 'kipi-plugins' 'libkface' 'libkgeomap' 'libkvkontakte' 'libmediawiki')
+pkgver=3.1.0
+pkgrel=4
+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')
+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" --strip-components=1
+}
+
+build() {
+  cd build
+  cmake ../${pkgname}-${pkgver} \
+    -DCMAKE_INSTALL_PREFIX=/usr \
+    -DCMAKE_BUILD_TYPE=Release \
+    -DCMAKE_SKIP_RPATH=ON \
+    -DBUILD_tests=OFF \
+    -DDIGIKAMSC_USE_PRIVATE_KDEGRAPHICS=OFF
+  make
+}
+
+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')
+  install=digikam.install
+
+  cd build/core
+  make DESTDIR="${pkgdir}" install
+  cd ../../build/doc
+  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() {
+  pkgdesc="A Qt/C++ wrapper around LibFace library to perform face recognition and detection over pictures"
+  depends=('kdelibs' 'opencv')
+
+  cd build/extra/libkface
+  make DESTDIR="${pkgdir}" install
+}
+
+package_libkgeomap() {
+  pkgdesc="A wrapper around world map components for browsing and arranging photos on a map"
+  depends=('kdelibs' 'kdeedu-marble')
+
+  cd build/extra/libkgeomap
+  make DESTDIR="${pkgdir}" install
+}
+
+package_libkvkontakte() {
+  pkgdesc="KDE C++ library for asynchronous interaction with vkontakte.rusocial network"
+  depends=('kdelibs' 'qjson')
+
+  cd build/extra/libkvkontakte
+  make DESTDIR="${pkgdir}" install
+}
+
+package_libmediawiki() {
+  pkgdesc="A KDE C++ interface for MediaWiki based web service as wikipedia.org"
+  depends=('kdelibs')
+
+  cd build/extra/libmediawiki
+  make DESTDIR="${pkgdir}" install
+}
+
+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')
+  install=kipi-plugins.install
+
+  cd build/extra/kipi-plugins
+  make DESTDIR="${pkgdir}" install
+}

Deleted: testing-i686/digikam-3.1.0-fixed-pngs.tar.gz
===================================================================
(Binary files differ)

Copied: digikam/repos/testing-i686/digikam-3.1.0-fixed-pngs.tar.gz (from rev 184272, digikam/trunk/digikam-3.1.0-fixed-pngs.tar.gz)
===================================================================
(Binary files differ)

Copied: digikam/repos/testing-i686/digikam-3.1.0-htmlexport.patch (from rev 184272, digikam/trunk/digikam-3.1.0-htmlexport.patch)
===================================================================
--- testing-i686/digikam-3.1.0-htmlexport.patch	                        (rev 0)
+++ testing-i686/digikam-3.1.0-htmlexport.patch	2013-05-05 10:55:27 UTC (rev 184273)
@@ -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)

Deleted: testing-i686/digikam.install
===================================================================
--- testing-i686/digikam.install	2013-05-05 10:55:02 UTC (rev 184272)
+++ testing-i686/digikam.install	2013-05-05 10:55:27 UTC (rev 184273)
@@ -1,12 +0,0 @@
-post_install() {
-	xdg-icon-resource forceupdate --theme hicolor &> /dev/null
-    update-desktop-database -q
-}
-
-post_upgrade() {
-	post_install
-}
-
-post_remove() {
-	post_install
-}

Copied: digikam/repos/testing-i686/digikam.install (from rev 184272, digikam/trunk/digikam.install)
===================================================================
--- testing-i686/digikam.install	                        (rev 0)
+++ testing-i686/digikam.install	2013-05-05 10:55:27 UTC (rev 184273)
@@ -0,0 +1,12 @@
+post_install() {
+	xdg-icon-resource forceupdate --theme hicolor &> /dev/null
+    update-desktop-database -q
+}
+
+post_upgrade() {
+	post_install
+}
+
+post_remove() {
+	post_install
+}

Deleted: testing-i686/kipi-plugins.install
===================================================================
--- testing-i686/kipi-plugins.install	2013-05-05 10:55:02 UTC (rev 184272)
+++ testing-i686/kipi-plugins.install	2013-05-05 10:55:27 UTC (rev 184273)
@@ -1,12 +0,0 @@
-post_install() {
-	xdg-icon-resource forceupdate --theme hicolor &> /dev/null
-    update-desktop-database -q
-}
-
-post_upgrade() {
-	post_install
-}
-
-post_remove() {
-	post_install
-}

Copied: digikam/repos/testing-i686/kipi-plugins.install (from rev 184272, digikam/trunk/kipi-plugins.install)
===================================================================
--- testing-i686/kipi-plugins.install	                        (rev 0)
+++ testing-i686/kipi-plugins.install	2013-05-05 10:55:27 UTC (rev 184273)
@@ -0,0 +1,12 @@
+post_install() {
+	xdg-icon-resource forceupdate --theme hicolor &> /dev/null
+    update-desktop-database -q
+}
+
+post_upgrade() {
+	post_install
+}
+
+post_remove() {
+	post_install
+}

Deleted: testing-x86_64/PKGBUILD
===================================================================
--- testing-x86_64/PKGBUILD	2013-05-05 10:55:02 UTC (rev 184272)
+++ testing-x86_64/PKGBUILD	2013-05-05 10:55:27 UTC (rev 184273)
@@ -1,105 +0,0 @@
-# $Id$
-# Maintainer: Ronald van Haren <ronald at archlinux.org>
-# Contributor: Andrea Scarpino <andrea at archlinux.org>
-# Contributor: Tobias Powalowski <tpowa at archlinux.org>
-
-pkgbase=digikam
-pkgname=('digikam' 'kipi-plugins' 'libkface' 'libkgeomap' 'libkvkontakte' 'libmediawiki')
-pkgver=3.1.0
-pkgrel=3
-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')
-source=("http://download.kde.org/stable/${pkgname}/${pkgname}-${pkgver}.tar.bz2"
-        "digikam-3.1.0-fixed-pngs.tar.gz")
-noextract=("digikam-3.1.0-fixed-pngs.tar.gz")
-sha1sums=('f4ce304acdf10e859ab8f70ce9d53a05d92d4fbd'
-          'b0a1991e0df9b72c79562c719bc9d944a3b8bc78')
-
-prepare() {
-  mkdir build
-
-  # 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
-}
-
-build() {
-  cd build
-  cmake ../${pkgname}-${pkgver} \
-    -DCMAKE_INSTALL_PREFIX=/usr \
-    -DCMAKE_BUILD_TYPE=Release \
-    -DCMAKE_SKIP_RPATH=ON \
-    -DBUILD_tests=OFF \
-    -DDIGIKAMSC_USE_PRIVATE_KDEGRAPHICS=OFF
-  make
-}
-
-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')
-  install=digikam.install
-
-  cd build/core
-  make DESTDIR="${pkgdir}" install
-  cd ../../build/doc
-  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() {
-  pkgdesc="A Qt/C++ wrapper around LibFace library to perform face recognition and detection over pictures"
-  depends=('kdelibs' 'opencv')
-
-  cd build/extra/libkface
-  make DESTDIR="${pkgdir}" install
-}
-
-package_libkgeomap() {
-  pkgdesc="A wrapper around world map components for browsing and arranging photos on a map"
-  depends=('kdelibs' 'kdeedu-marble')
-
-  cd build/extra/libkgeomap
-  make DESTDIR="${pkgdir}" install
-}
-
-package_libkvkontakte() {
-  pkgdesc="KDE C++ library for asynchronous interaction with vkontakte.rusocial network"
-  depends=('kdelibs' 'qjson')
-
-  cd build/extra/libkvkontakte
-  make DESTDIR="${pkgdir}" install
-}
-
-package_libmediawiki() {
-  pkgdesc="A KDE C++ interface for MediaWiki based web service as wikipedia.org"
-  depends=('kdelibs')
-
-  cd build/extra/libmediawiki
-  make DESTDIR="${pkgdir}" install
-}
-
-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')
-  install=kipi-plugins.install
-
-  cd build/extra/kipi-plugins
-  make DESTDIR="${pkgdir}" install
-}

Copied: digikam/repos/testing-x86_64/PKGBUILD (from rev 184272, digikam/trunk/PKGBUILD)
===================================================================
--- testing-x86_64/PKGBUILD	                        (rev 0)
+++ testing-x86_64/PKGBUILD	2013-05-05 10:55:27 UTC (rev 184273)
@@ -0,0 +1,111 @@
+# $Id$
+# Maintainer: Ronald van Haren <ronald at archlinux.org>
+# Contributor: Andrea Scarpino <andrea at archlinux.org>
+# Contributor: Tobias Powalowski <tpowa at archlinux.org>
+
+pkgbase=digikam
+pkgname=('digikam' 'kipi-plugins' 'libkface' 'libkgeomap' 'libkvkontakte' 'libmediawiki')
+pkgver=3.1.0
+pkgrel=4
+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')
+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" --strip-components=1
+}
+
+build() {
+  cd build
+  cmake ../${pkgname}-${pkgver} \
+    -DCMAKE_INSTALL_PREFIX=/usr \
+    -DCMAKE_BUILD_TYPE=Release \
+    -DCMAKE_SKIP_RPATH=ON \
+    -DBUILD_tests=OFF \
+    -DDIGIKAMSC_USE_PRIVATE_KDEGRAPHICS=OFF
+  make
+}
+
+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')
+  install=digikam.install
+
+  cd build/core
+  make DESTDIR="${pkgdir}" install
+  cd ../../build/doc
+  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() {
+  pkgdesc="A Qt/C++ wrapper around LibFace library to perform face recognition and detection over pictures"
+  depends=('kdelibs' 'opencv')
+
+  cd build/extra/libkface
+  make DESTDIR="${pkgdir}" install
+}
+
+package_libkgeomap() {
+  pkgdesc="A wrapper around world map components for browsing and arranging photos on a map"
+  depends=('kdelibs' 'kdeedu-marble')
+
+  cd build/extra/libkgeomap
+  make DESTDIR="${pkgdir}" install
+}
+
+package_libkvkontakte() {
+  pkgdesc="KDE C++ library for asynchronous interaction with vkontakte.rusocial network"
+  depends=('kdelibs' 'qjson')
+
+  cd build/extra/libkvkontakte
+  make DESTDIR="${pkgdir}" install
+}
+
+package_libmediawiki() {
+  pkgdesc="A KDE C++ interface for MediaWiki based web service as wikipedia.org"
+  depends=('kdelibs')
+
+  cd build/extra/libmediawiki
+  make DESTDIR="${pkgdir}" install
+}
+
+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')
+  install=kipi-plugins.install
+
+  cd build/extra/kipi-plugins
+  make DESTDIR="${pkgdir}" install
+}

Deleted: testing-x86_64/digikam-3.1.0-fixed-pngs.tar.gz
===================================================================
(Binary files differ)

Copied: digikam/repos/testing-x86_64/digikam-3.1.0-fixed-pngs.tar.gz (from rev 184272, digikam/trunk/digikam-3.1.0-fixed-pngs.tar.gz)
===================================================================
(Binary files differ)

Copied: digikam/repos/testing-x86_64/digikam-3.1.0-htmlexport.patch (from rev 184272, digikam/trunk/digikam-3.1.0-htmlexport.patch)
===================================================================
--- testing-x86_64/digikam-3.1.0-htmlexport.patch	                        (rev 0)
+++ testing-x86_64/digikam-3.1.0-htmlexport.patch	2013-05-05 10:55:27 UTC (rev 184273)
@@ -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)

Deleted: testing-x86_64/digikam.install
===================================================================
--- testing-x86_64/digikam.install	2013-05-05 10:55:02 UTC (rev 184272)
+++ testing-x86_64/digikam.install	2013-05-05 10:55:27 UTC (rev 184273)
@@ -1,12 +0,0 @@
-post_install() {
-	xdg-icon-resource forceupdate --theme hicolor &> /dev/null
-    update-desktop-database -q
-}
-
-post_upgrade() {
-	post_install
-}
-
-post_remove() {
-	post_install
-}

Copied: digikam/repos/testing-x86_64/digikam.install (from rev 184272, digikam/trunk/digikam.install)
===================================================================
--- testing-x86_64/digikam.install	                        (rev 0)
+++ testing-x86_64/digikam.install	2013-05-05 10:55:27 UTC (rev 184273)
@@ -0,0 +1,12 @@
+post_install() {
+	xdg-icon-resource forceupdate --theme hicolor &> /dev/null
+    update-desktop-database -q
+}
+
+post_upgrade() {
+	post_install
+}
+
+post_remove() {
+	post_install
+}

Deleted: testing-x86_64/kipi-plugins.install
===================================================================
--- testing-x86_64/kipi-plugins.install	2013-05-05 10:55:02 UTC (rev 184272)
+++ testing-x86_64/kipi-plugins.install	2013-05-05 10:55:27 UTC (rev 184273)
@@ -1,12 +0,0 @@
-post_install() {
-	xdg-icon-resource forceupdate --theme hicolor &> /dev/null
-    update-desktop-database -q
-}
-
-post_upgrade() {
-	post_install
-}
-
-post_remove() {
-	post_install
-}

Copied: digikam/repos/testing-x86_64/kipi-plugins.install (from rev 184272, digikam/trunk/kipi-plugins.install)
===================================================================
--- testing-x86_64/kipi-plugins.install	                        (rev 0)
+++ testing-x86_64/kipi-plugins.install	2013-05-05 10:55:27 UTC (rev 184273)
@@ -0,0 +1,12 @@
+post_install() {
+	xdg-icon-resource forceupdate --theme hicolor &> /dev/null
+    update-desktop-database -q
+}
+
+post_upgrade() {
+	post_install
+}
+
+post_remove() {
+	post_install
+}



More information about the arch-commits mailing list