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

2013-06-03 Thread Andrea Scarpino 
Date: Monday, June 3, 2013 @ 18:27:29
  Author: andrea
Revision: 187090

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

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

-+
 /PKGBUILD   |  208 ++
 /digikam.install|   24 +++
 /kipi-plugins.install   |   24 +++
 extra-i686/PKGBUILD |  111 -
 extra-i686/digikam-3.1.0-htmlexport.patch   |   15 -
 extra-i686/digikam.install  |   12 -
 extra-i686/kipi-plugins.install |   12 -
 extra-x86_64/PKGBUILD   |  111 -
 extra-x86_64/digikam-3.1.0-htmlexport.patch |   15 -
 extra-x86_64/digikam.install|   12 -
 extra-x86_64/kipi-plugins.install   |   12 -
 11 files changed, 256 insertions(+), 300 deletions(-)

Deleted: extra-i686/PKGBUILD
===
--- extra-i686/PKGBUILD 2013-06-03 16:27:18 UTC (rev 187089)
+++ extra-i686/PKGBUILD 2013-06-03 16:27:29 UTC (rev 187090)
@@ -1,111 +0,0 @@
-# $Id$
-# Maintainer: Ronald van Haren 
-# Contributor: Andrea Scarpino 
-# Contributor: Tobias Powalowski 
-
-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

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

2013-05-05 Thread Evangelos Foutras 
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 
-# Contributor: Andrea Scarpino 
-# Contributor: Tobias Powalowski 
-
-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-