[arch-commits] Commit in digikam/repos (6 files)
Antonio Rojas
arojas at archlinux.org
Tue Mar 14 08:06:53 UTC 2017
Date: Tuesday, March 14, 2017 @ 08:06:53
Author: arojas
Revision: 290818
archrelease: copy trunk to extra-i686, extra-x86_64
Added:
digikam/repos/extra-i686/PKGBUILD
(from rev 290817, digikam/trunk/PKGBUILD)
digikam/repos/extra-x86_64/PKGBUILD
(from rev 290817, digikam/trunk/PKGBUILD)
Deleted:
digikam/repos/extra-i686/PKGBUILD
digikam/repos/extra-i686/digikam-find-qtav.patch
digikam/repos/extra-x86_64/PKGBUILD
digikam/repos/extra-x86_64/digikam-find-qtav.patch
--------------------------------------+
/PKGBUILD | 154 +++++++++++++++++++++++++++++++++
extra-i686/PKGBUILD | 79 ----------------
extra-i686/digikam-find-qtav.patch | 21 ----
extra-x86_64/PKGBUILD | 79 ----------------
extra-x86_64/digikam-find-qtav.patch | 21 ----
5 files changed, 154 insertions(+), 200 deletions(-)
Deleted: extra-i686/PKGBUILD
===================================================================
--- extra-i686/PKGBUILD 2017-03-14 08:05:30 UTC (rev 290817)
+++ extra-i686/PKGBUILD 2017-03-14 08:06:53 UTC (rev 290818)
@@ -1,79 +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')
-_pkgver=5.4.0
-pkgver=${_pkgver//-/_} # for beta versions
-pkgrel=2
-pkgdesc="Digital photo management application for KDE"
-arch=('i686' 'x86_64')
-license=('GPL')
-url="http://www.digikam.org/"
-makedepends=('extra-cmake-modules' 'libkipi' 'libksane' 'liblqr' 'opencv' 'boost'
- 'doxygen' 'lensfun' 'eigen' 'kdoctools' 'marble' 'kdesignerplugin'
- 'kfilemetadata' 'akonadi-contacts' 'qtav' 'threadweaver' 'kcalcore'
- 'knotifyconfig' 'libmediawiki' 'libkvkontakte')
-source=("http://download.kde.org/stable/${pkgname}/${pkgname}-${_pkgver}.tar.xz" digikam-find-qtav.patch)
-sha1sums=('6c58ee30cd84b40acf4427f1bb9dbb8b891eb894'
- 'b170e5eab5a8c40d1c8c8f2d2cfe5e911ad66939')
-
-prepare() {
- mkdir -p build
-
-# Fix QtAV location
- cd $pkgname-$pkgver
- patch -p1 -i ../digikam-find-qtav.patch
-}
-
-build() {
- cd build
-
- cmake ../${pkgname}-${_pkgver} \
- -DCMAKE_INSTALL_PREFIX=/usr \
- -DCMAKE_INSTALL_LIBDIR=lib \
- -DCMAKE_BUILD_TYPE=Release \
- -DBUILD_TESTING=OFF \
- -DENABLE_KFILEMETADATASUPPORT=ON \
- -DENABLE_MEDIAPLAYER=ON \
- -DENABLE_AKONADICONTACTSUPPORT=ON \
- -DENABLE_MYSQLSUPPORT=ON \
- -DENABLE_OPENCV3=ON \
- -DENABLE_APPSTYLES=ON
- make
-}
-
-package_digikam() {
- pkgdesc="Digital photo management application for KDE"
- depends=('liblqr' 'libkipi' 'lensfun' 'opencv' 'akonadi-contacts'
- 'knotifyconfig' 'libksane' 'kfilemetadata' 'qtav' 'marble' 'threadweaver' 'kcalcore')
- optdepends=('kipi-plugins: export to various online services'
- 'hugin: panorama tool' 'qt5-imageformats: support for additional image formats (WEBP, TIFF)')
-
- cd build/core
- make DESTDIR="$pkgdir" install
- cd $srcdir/build/doc
- make DESTDIR="$pkgdir" install
- cd $srcdir/build/po
- make DESTDIR="$pkgdir" install
-
-# Provided by kipi-plugins
- rm "$pkgdir"/usr/share/locale/*/LC_MESSAGES/{kipiplugin*,libkvkontakte}.mo
-}
-
-package_kipi-plugins() {
- pkgdesc="A collection of plugins extending the KDE graphics and image applications as digiKam"
- depends=('kio' 'libkipi')
- optdepends=('libmediawiki: MediaWiki Export plugin'
- 'libkvkontakte: VKontakte.ru Exporter plugin')
-
- cd build/extra
- make DESTDIR="$pkgdir" install
- cd $srcdir/build/po
- make DESTDIR="$pkgdir" install
-
-# Provided by digikam
- rm "$pkgdir"/usr/share/locale/*/LC_MESSAGES/digikam.mo
-}
Copied: digikam/repos/extra-i686/PKGBUILD (from rev 290817, digikam/trunk/PKGBUILD)
===================================================================
--- extra-i686/PKGBUILD (rev 0)
+++ extra-i686/PKGBUILD 2017-03-14 08:06:53 UTC (rev 290818)
@@ -0,0 +1,77 @@
+# $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')
+_pkgver=5.5.0
+pkgver=${_pkgver//-/_} # for beta versions
+pkgrel=1
+pkgdesc="Digital photo management application for KDE"
+arch=('i686' 'x86_64')
+license=('GPL')
+url="http://www.digikam.org/"
+makedepends=('extra-cmake-modules' 'libkipi' 'libksane' 'liblqr' 'opencv' 'boost'
+ 'doxygen' 'lensfun' 'eigen' 'kdoctools' 'marble-common' 'kdesignerplugin'
+ 'kfilemetadata' 'akonadi-contacts' 'qtav' 'threadweaver' 'kcalcore'
+ 'knotifyconfig' 'libmediawiki' 'libkvkontakte')
+source=("http://download.kde.org/stable/${pkgname}/${pkgname}-${_pkgver}.tar.xz")
+sha256sums=('df9cbf1b8dbfb9235cebc97e77c02fcb1498c5a905c7fd3b9fb42fd7accc6252')
+
+prepare() {
+ mkdir -p build
+
+# sv docs fail to build
+ sed -e '/sv/d' -i $pkgname-$pkgver/doc-translated/CMakeLists.txt
+}
+
+build() {
+ cd build
+
+ cmake ../${pkgname}-${_pkgver} \
+ -DCMAKE_INSTALL_PREFIX=/usr \
+ -DCMAKE_INSTALL_LIBDIR=lib \
+ -DCMAKE_BUILD_TYPE=Release \
+ -DBUILD_TESTING=OFF \
+ -DENABLE_KFILEMETADATASUPPORT=ON \
+ -DENABLE_MEDIAPLAYER=ON \
+ -DENABLE_AKONADICONTACTSUPPORT=ON \
+ -DENABLE_MYSQLSUPPORT=ON \
+ -DENABLE_OPENCV3=ON \
+ -DENABLE_APPSTYLES=ON
+ make
+}
+
+package_digikam() {
+ pkgdesc="Digital photo management application for KDE"
+ depends=('liblqr' 'libkipi' 'lensfun' 'opencv' 'akonadi-contacts'
+ 'knotifyconfig' 'libksane' 'kfilemetadata' 'qtav' 'marble-common' 'threadweaver' 'kcalcore')
+ optdepends=('kipi-plugins: export to various online services'
+ 'hugin: panorama tool' 'qt5-imageformats: support for additional image formats (WEBP, TIFF)')
+
+ cd build/core
+ make DESTDIR="$pkgdir" install
+ cd $srcdir/build/doc
+ make DESTDIR="$pkgdir" install
+ cd $srcdir/build/po
+ make DESTDIR="$pkgdir" install
+
+# Provided by kipi-plugins
+ rm "$pkgdir"/usr/share/locale/*/LC_MESSAGES/{kipiplugin*,libkvkontakte}.mo
+}
+
+package_kipi-plugins() {
+ pkgdesc="A collection of plugins extending the KDE graphics and image applications as digiKam"
+ depends=('kio' 'libkipi')
+ optdepends=('libmediawiki: MediaWiki Export plugin'
+ 'libkvkontakte: VKontakte.ru Exporter plugin')
+
+ cd build/extra
+ make DESTDIR="$pkgdir" install
+ cd $srcdir/build/po
+ make DESTDIR="$pkgdir" install
+
+# Provided by digikam
+ rm "$pkgdir"/usr/share/locale/*/LC_MESSAGES/digikam.mo
+}
Deleted: extra-i686/digikam-find-qtav.patch
===================================================================
--- extra-i686/digikam-find-qtav.patch 2017-03-14 08:05:30 UTC (rev 290817)
+++ extra-i686/digikam-find-qtav.patch 2017-03-14 08:06:53 UTC (rev 290818)
@@ -1,21 +0,0 @@
---- digikam-5.4.0/core/cmake/modules/FindQtAV.cmake.0 2017-01-09 22:56:43.303991660 +0000
-+++ digikam-5.4.0/core/cmake/modules/FindQtAV.cmake 2017-01-09 22:57:24.843934106 +0000
-@@ -24,15 +24,17 @@
- HINTS ${_qt5_install_prefix} # For MXE
- ${_qt5_install_prefix}/../qt5/include # For Mageia
- ${_qt5_install_prefix}/../../include/qt5 # For Suse
-+ ${_qt5_install_prefix}/../../include/qt
- ${_qt5_install_prefix}/../../../include/x86_64-linux-gnu/qt5 # For Debian
- PATH_SUFFIXES QtAV
- )
-
- find_path(QTAV_WIDGETS_INCLUDE_DIR
- NAMES QtAVWidgets.h
- HINTS ${_qt5_install_prefix} # For MXE
- ${_qt5_install_prefix}/../qt5/include # For Mageia
- ${_qt5_install_prefix}/../../include/qt5 # For Suse
-+ ${_qt5_install_prefix}/../../include/qt
- ${_qt5_install_prefix}/../../../include/x86_64-linux-gnu/qt5 # For Debian
- PATH_SUFFIXES QtAVWidgets
- )
-
Deleted: extra-x86_64/PKGBUILD
===================================================================
--- extra-x86_64/PKGBUILD 2017-03-14 08:05:30 UTC (rev 290817)
+++ extra-x86_64/PKGBUILD 2017-03-14 08:06:53 UTC (rev 290818)
@@ -1,79 +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')
-_pkgver=5.4.0
-pkgver=${_pkgver//-/_} # for beta versions
-pkgrel=2
-pkgdesc="Digital photo management application for KDE"
-arch=('i686' 'x86_64')
-license=('GPL')
-url="http://www.digikam.org/"
-makedepends=('extra-cmake-modules' 'libkipi' 'libksane' 'liblqr' 'opencv' 'boost'
- 'doxygen' 'lensfun' 'eigen' 'kdoctools' 'marble' 'kdesignerplugin'
- 'kfilemetadata' 'akonadi-contacts' 'qtav' 'threadweaver' 'kcalcore'
- 'knotifyconfig' 'libmediawiki' 'libkvkontakte')
-source=("http://download.kde.org/stable/${pkgname}/${pkgname}-${_pkgver}.tar.xz" digikam-find-qtav.patch)
-sha1sums=('6c58ee30cd84b40acf4427f1bb9dbb8b891eb894'
- 'b170e5eab5a8c40d1c8c8f2d2cfe5e911ad66939')
-
-prepare() {
- mkdir -p build
-
-# Fix QtAV location
- cd $pkgname-$pkgver
- patch -p1 -i ../digikam-find-qtav.patch
-}
-
-build() {
- cd build
-
- cmake ../${pkgname}-${_pkgver} \
- -DCMAKE_INSTALL_PREFIX=/usr \
- -DCMAKE_INSTALL_LIBDIR=lib \
- -DCMAKE_BUILD_TYPE=Release \
- -DBUILD_TESTING=OFF \
- -DENABLE_KFILEMETADATASUPPORT=ON \
- -DENABLE_MEDIAPLAYER=ON \
- -DENABLE_AKONADICONTACTSUPPORT=ON \
- -DENABLE_MYSQLSUPPORT=ON \
- -DENABLE_OPENCV3=ON \
- -DENABLE_APPSTYLES=ON
- make
-}
-
-package_digikam() {
- pkgdesc="Digital photo management application for KDE"
- depends=('liblqr' 'libkipi' 'lensfun' 'opencv' 'akonadi-contacts'
- 'knotifyconfig' 'libksane' 'kfilemetadata' 'qtav' 'marble' 'threadweaver' 'kcalcore')
- optdepends=('kipi-plugins: export to various online services'
- 'hugin: panorama tool' 'qt5-imageformats: support for additional image formats (WEBP, TIFF)')
-
- cd build/core
- make DESTDIR="$pkgdir" install
- cd $srcdir/build/doc
- make DESTDIR="$pkgdir" install
- cd $srcdir/build/po
- make DESTDIR="$pkgdir" install
-
-# Provided by kipi-plugins
- rm "$pkgdir"/usr/share/locale/*/LC_MESSAGES/{kipiplugin*,libkvkontakte}.mo
-}
-
-package_kipi-plugins() {
- pkgdesc="A collection of plugins extending the KDE graphics and image applications as digiKam"
- depends=('kio' 'libkipi')
- optdepends=('libmediawiki: MediaWiki Export plugin'
- 'libkvkontakte: VKontakte.ru Exporter plugin')
-
- cd build/extra
- make DESTDIR="$pkgdir" install
- cd $srcdir/build/po
- make DESTDIR="$pkgdir" install
-
-# Provided by digikam
- rm "$pkgdir"/usr/share/locale/*/LC_MESSAGES/digikam.mo
-}
Copied: digikam/repos/extra-x86_64/PKGBUILD (from rev 290817, digikam/trunk/PKGBUILD)
===================================================================
--- extra-x86_64/PKGBUILD (rev 0)
+++ extra-x86_64/PKGBUILD 2017-03-14 08:06:53 UTC (rev 290818)
@@ -0,0 +1,77 @@
+# $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')
+_pkgver=5.5.0
+pkgver=${_pkgver//-/_} # for beta versions
+pkgrel=1
+pkgdesc="Digital photo management application for KDE"
+arch=('i686' 'x86_64')
+license=('GPL')
+url="http://www.digikam.org/"
+makedepends=('extra-cmake-modules' 'libkipi' 'libksane' 'liblqr' 'opencv' 'boost'
+ 'doxygen' 'lensfun' 'eigen' 'kdoctools' 'marble-common' 'kdesignerplugin'
+ 'kfilemetadata' 'akonadi-contacts' 'qtav' 'threadweaver' 'kcalcore'
+ 'knotifyconfig' 'libmediawiki' 'libkvkontakte')
+source=("http://download.kde.org/stable/${pkgname}/${pkgname}-${_pkgver}.tar.xz")
+sha256sums=('df9cbf1b8dbfb9235cebc97e77c02fcb1498c5a905c7fd3b9fb42fd7accc6252')
+
+prepare() {
+ mkdir -p build
+
+# sv docs fail to build
+ sed -e '/sv/d' -i $pkgname-$pkgver/doc-translated/CMakeLists.txt
+}
+
+build() {
+ cd build
+
+ cmake ../${pkgname}-${_pkgver} \
+ -DCMAKE_INSTALL_PREFIX=/usr \
+ -DCMAKE_INSTALL_LIBDIR=lib \
+ -DCMAKE_BUILD_TYPE=Release \
+ -DBUILD_TESTING=OFF \
+ -DENABLE_KFILEMETADATASUPPORT=ON \
+ -DENABLE_MEDIAPLAYER=ON \
+ -DENABLE_AKONADICONTACTSUPPORT=ON \
+ -DENABLE_MYSQLSUPPORT=ON \
+ -DENABLE_OPENCV3=ON \
+ -DENABLE_APPSTYLES=ON
+ make
+}
+
+package_digikam() {
+ pkgdesc="Digital photo management application for KDE"
+ depends=('liblqr' 'libkipi' 'lensfun' 'opencv' 'akonadi-contacts'
+ 'knotifyconfig' 'libksane' 'kfilemetadata' 'qtav' 'marble-common' 'threadweaver' 'kcalcore')
+ optdepends=('kipi-plugins: export to various online services'
+ 'hugin: panorama tool' 'qt5-imageformats: support for additional image formats (WEBP, TIFF)')
+
+ cd build/core
+ make DESTDIR="$pkgdir" install
+ cd $srcdir/build/doc
+ make DESTDIR="$pkgdir" install
+ cd $srcdir/build/po
+ make DESTDIR="$pkgdir" install
+
+# Provided by kipi-plugins
+ rm "$pkgdir"/usr/share/locale/*/LC_MESSAGES/{kipiplugin*,libkvkontakte}.mo
+}
+
+package_kipi-plugins() {
+ pkgdesc="A collection of plugins extending the KDE graphics and image applications as digiKam"
+ depends=('kio' 'libkipi')
+ optdepends=('libmediawiki: MediaWiki Export plugin'
+ 'libkvkontakte: VKontakte.ru Exporter plugin')
+
+ cd build/extra
+ make DESTDIR="$pkgdir" install
+ cd $srcdir/build/po
+ make DESTDIR="$pkgdir" install
+
+# Provided by digikam
+ rm "$pkgdir"/usr/share/locale/*/LC_MESSAGES/digikam.mo
+}
Deleted: extra-x86_64/digikam-find-qtav.patch
===================================================================
--- extra-x86_64/digikam-find-qtav.patch 2017-03-14 08:05:30 UTC (rev 290817)
+++ extra-x86_64/digikam-find-qtav.patch 2017-03-14 08:06:53 UTC (rev 290818)
@@ -1,21 +0,0 @@
---- digikam-5.4.0/core/cmake/modules/FindQtAV.cmake.0 2017-01-09 22:56:43.303991660 +0000
-+++ digikam-5.4.0/core/cmake/modules/FindQtAV.cmake 2017-01-09 22:57:24.843934106 +0000
-@@ -24,15 +24,17 @@
- HINTS ${_qt5_install_prefix} # For MXE
- ${_qt5_install_prefix}/../qt5/include # For Mageia
- ${_qt5_install_prefix}/../../include/qt5 # For Suse
-+ ${_qt5_install_prefix}/../../include/qt
- ${_qt5_install_prefix}/../../../include/x86_64-linux-gnu/qt5 # For Debian
- PATH_SUFFIXES QtAV
- )
-
- find_path(QTAV_WIDGETS_INCLUDE_DIR
- NAMES QtAVWidgets.h
- HINTS ${_qt5_install_prefix} # For MXE
- ${_qt5_install_prefix}/../qt5/include # For Mageia
- ${_qt5_install_prefix}/../../include/qt5 # For Suse
-+ ${_qt5_install_prefix}/../../include/qt
- ${_qt5_install_prefix}/../../../include/x86_64-linux-gnu/qt5 # For Debian
- PATH_SUFFIXES QtAVWidgets
- )
-
More information about the arch-commits
mailing list