[arch-commits] Commit in digikam/repos (6 files)
Antonio Rojas
arojas at archlinux.org
Tue Aug 9 17:43:58 UTC 2016
Date: Tuesday, August 9, 2016 @ 17:43:58
Author: arojas
Revision: 273540
archrelease: copy kde-unstable to kde-unstable-i686, kde-unstable-x86_64
Added:
digikam/repos/kde-unstable-i686/PKGBUILD
(from rev 273539, digikam/kde-unstable/PKGBUILD)
digikam/repos/kde-unstable-i686/digikam-5.1-fix-build.patch
(from rev 273539, digikam/kde-unstable/digikam-5.1-fix-build.patch)
digikam/repos/kde-unstable-x86_64/PKGBUILD
(from rev 273539, digikam/kde-unstable/PKGBUILD)
digikam/repos/kde-unstable-x86_64/digikam-5.1-fix-build.patch
(from rev 273539, digikam/kde-unstable/digikam-5.1-fix-build.patch)
Deleted:
digikam/repos/kde-unstable-i686/PKGBUILD
digikam/repos/kde-unstable-x86_64/PKGBUILD
-------------------------------------------------+
/PKGBUILD | 170 ++++++++++++++++++++++
kde-unstable-i686/PKGBUILD | 84 ----------
kde-unstable-i686/digikam-5.1-fix-build.patch | 15 +
kde-unstable-x86_64/PKGBUILD | 84 ----------
kde-unstable-x86_64/digikam-5.1-fix-build.patch | 15 +
5 files changed, 200 insertions(+), 168 deletions(-)
Deleted: kde-unstable-i686/PKGBUILD
===================================================================
--- kde-unstable-i686/PKGBUILD 2016-08-09 17:43:27 UTC (rev 273539)
+++ kde-unstable-i686/PKGBUILD 2016-08-09 17:43:58 UTC (rev 273540)
@@ -1,84 +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.0.0
-pkgver=${_pkgver//-/_}
-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'
- 'opencv' 'doxygen' 'lensfun' 'eigen' 'kdoctools' 'marble' 'kdesignerplugin'
- 'kfilemetadata' 'akonadi-contacts' 'qt5-multimedia' 'threadweaver' 'kcalcore'
- 'knotifyconfig' 'libmediawiki' 'libkvkontakte' 'kqoauth')
-source=("http://download.kde.org/stable/${pkgname}/${pkgname}-${_pkgver}.tar.xz")
-sha1sums=('e0dec2eba9ab3a51d632b69b3dd6daf8dca64a45')
-
-prepare() {
- mkdir -p build
-
-# Build fails
- sed -e '/add_subdirectory(showfoto)/d' -i $pkgname-${_pkgver}/doc-translated/digikam/CMakeLists.txt
-}
-
-build() {
- cd build
-
- cmake ../${pkgname}-${_pkgver} \
- -DCMAKE_INSTALL_PREFIX=/usr \
- -DCMAKE_INSTALL_LIBDIR=lib \
- -DCMAKE_BUILD_TYPE=Release \
- -DCMAKE_SKIP_RPATH=ON \
- -DBUILD_TESTING=OFF \
- -DENABLE_KFILEMETADATASUPPORT=ON \
- -DENABLE_MEDIAPLAYER=ON \
- -DENABLE_AKONADICONTACTSUPPORT=ON \
- -DENABLE_MYSQLSUPPORT=ON \
- -DENABLE_OPENCV3=ON
- make
-}
-
-package_digikam() {
- pkgdesc="Digital photo management application for KDE"
- depends=('liblqr' 'libkipi' 'lensfun' 'opencv' 'akonadi-contacts'
- 'knotifyconfig' 'libksane' 'kfilemetadata' 'qt5-multimedia' 'marble' 'threadweaver' 'kcalcore')
- optdepends=('kipi-plugins: export to various online services'
- 'hugin: panorama tool')
-
- cd build/core
- make DESTDIR="$pkgdir" install
- cd $srcdir/build/doc/digikam
- make DESTDIR="$pkgdir" install
- cd $srcdir/build/doc-translated/digikam
- 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'
- 'kqoauth: OAuth authentication for imgur')
-
- cd build/extra
- make DESTDIR="$pkgdir" install
- cd $srcdir/build/doc/kipi-plugins
- make DESTDIR="$pkgdir" install
- cd $srcdir/build/doc-translated/kipi-plugins
- 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/kde-unstable-i686/PKGBUILD (from rev 273539, digikam/kde-unstable/PKGBUILD)
===================================================================
--- kde-unstable-i686/PKGBUILD (rev 0)
+++ kde-unstable-i686/PKGBUILD 2016-08-09 17:43:58 UTC (rev 273540)
@@ -0,0 +1,85 @@
+# $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.1.0
+pkgver=${_pkgver//-/_}
+pkgrel=3
+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'
+ 'opencv' 'doxygen' 'lensfun' 'eigen' 'kdoctools' 'marble' 'kdesignerplugin'
+ 'kfilemetadata' 'akonadi-contacts' 'qt5-multimedia' 'threadweaver' 'kcalcore'
+ 'knotifyconfig' 'libmediawiki' 'libkvkontakte')
+source=("http://download.kde.org/stable/${pkgname}/${pkgname}-${_pkgver}.tar.xz" digikam-5.1-fix-build.patch)
+sha1sums=('87a843c39f45b8704ead6e6029e52fb03ee44680'
+ '5b6644c8b5534a1712f46fc84948de9a0039a601')
+
+prepare() {
+ mkdir -p build
+
+ cd $pkgname-$pkgver
+ # Fix build on i686
+ patch -p1 -i ../digikam-5.1-fix-build.patch
+}
+
+build() {
+ cd build
+
+ cmake ../${pkgname}-${_pkgver} \
+ -DCMAKE_INSTALL_PREFIX=/usr \
+ -DCMAKE_INSTALL_LIBDIR=lib \
+ -DCMAKE_BUILD_TYPE=Release \
+ -DCMAKE_SKIP_RPATH=ON \
+ -DBUILD_TESTING=OFF \
+ -DENABLE_KFILEMETADATASUPPORT=ON \
+ -DENABLE_MEDIAPLAYER=ON \
+ -DENABLE_AKONADICONTACTSUPPORT=ON \
+ -DENABLE_MYSQLSUPPORT=ON \
+ -DENABLE_OPENCV3=ON
+ make
+}
+
+package_digikam() {
+ pkgdesc="Digital photo management application for KDE"
+ depends=('liblqr' 'libkipi' 'lensfun' 'opencv' 'akonadi-contacts'
+ 'knotifyconfig' 'libksane' 'kfilemetadata' 'qt5-multimedia' 'marble' 'threadweaver' 'kcalcore')
+ optdepends=('kipi-plugins: export to various online services'
+ 'hugin: panorama tool')
+
+ cd build/core
+ make DESTDIR="$pkgdir" install
+ cd $srcdir/build/doc/digikam
+ make DESTDIR="$pkgdir" install
+ cd $srcdir/build/doc-translated/digikam
+ 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/doc/kipi-plugins
+ make DESTDIR="$pkgdir" install
+ cd $srcdir/build/doc-translated/kipi-plugins
+ 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/kde-unstable-i686/digikam-5.1-fix-build.patch (from rev 273539, digikam/kde-unstable/digikam-5.1-fix-build.patch)
===================================================================
--- kde-unstable-i686/digikam-5.1-fix-build.patch (rev 0)
+++ kde-unstable-i686/digikam-5.1-fix-build.patch 2016-08-09 17:43:58 UTC (rev 273540)
@@ -0,0 +1,15 @@
+--- digikam-5.1.0/core/libs/rawengine/libraw/libraw/libraw_types.h.orig 2016-08-09 15:05:10.449224741 +0000
++++ digikam-5.1.0/core/libs/rawengine/libraw/libraw/libraw_types.h 2016-08-09 15:05:50.725789944 +0000
+@@ -618,10 +618,10 @@
+ #elif defined(_M_X64) || defined(__amd64__)
+ #define LibRawBigEndian 0
+
+-#elif defined(__LITTLE_ENDIAN__)
++#elif __BYTE_ORDER__ == __ORDER_LITTLE_ENDIAN__
+ #define LibRawBigEndian 0
+
+-#elif defined(__BIG_ENDIAN__)
++#elif __BYTE_ORDER__ == __ORDER_BIG_ENDIAN__
+ #define LibRawBigEndian 1
+ #elif defined(_ARM_)
+ #define LibRawBigEndian 0
Deleted: kde-unstable-x86_64/PKGBUILD
===================================================================
--- kde-unstable-x86_64/PKGBUILD 2016-08-09 17:43:27 UTC (rev 273539)
+++ kde-unstable-x86_64/PKGBUILD 2016-08-09 17:43:58 UTC (rev 273540)
@@ -1,84 +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.0.0
-pkgver=${_pkgver//-/_}
-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'
- 'opencv' 'doxygen' 'lensfun' 'eigen' 'kdoctools' 'marble' 'kdesignerplugin'
- 'kfilemetadata' 'akonadi-contacts' 'qt5-multimedia' 'threadweaver' 'kcalcore'
- 'knotifyconfig' 'libmediawiki' 'libkvkontakte' 'kqoauth')
-source=("http://download.kde.org/stable/${pkgname}/${pkgname}-${_pkgver}.tar.xz")
-sha1sums=('e0dec2eba9ab3a51d632b69b3dd6daf8dca64a45')
-
-prepare() {
- mkdir -p build
-
-# Build fails
- sed -e '/add_subdirectory(showfoto)/d' -i $pkgname-${_pkgver}/doc-translated/digikam/CMakeLists.txt
-}
-
-build() {
- cd build
-
- cmake ../${pkgname}-${_pkgver} \
- -DCMAKE_INSTALL_PREFIX=/usr \
- -DCMAKE_INSTALL_LIBDIR=lib \
- -DCMAKE_BUILD_TYPE=Release \
- -DCMAKE_SKIP_RPATH=ON \
- -DBUILD_TESTING=OFF \
- -DENABLE_KFILEMETADATASUPPORT=ON \
- -DENABLE_MEDIAPLAYER=ON \
- -DENABLE_AKONADICONTACTSUPPORT=ON \
- -DENABLE_MYSQLSUPPORT=ON \
- -DENABLE_OPENCV3=ON
- make
-}
-
-package_digikam() {
- pkgdesc="Digital photo management application for KDE"
- depends=('liblqr' 'libkipi' 'lensfun' 'opencv' 'akonadi-contacts'
- 'knotifyconfig' 'libksane' 'kfilemetadata' 'qt5-multimedia' 'marble' 'threadweaver' 'kcalcore')
- optdepends=('kipi-plugins: export to various online services'
- 'hugin: panorama tool')
-
- cd build/core
- make DESTDIR="$pkgdir" install
- cd $srcdir/build/doc/digikam
- make DESTDIR="$pkgdir" install
- cd $srcdir/build/doc-translated/digikam
- 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'
- 'kqoauth: OAuth authentication for imgur')
-
- cd build/extra
- make DESTDIR="$pkgdir" install
- cd $srcdir/build/doc/kipi-plugins
- make DESTDIR="$pkgdir" install
- cd $srcdir/build/doc-translated/kipi-plugins
- 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/kde-unstable-x86_64/PKGBUILD (from rev 273539, digikam/kde-unstable/PKGBUILD)
===================================================================
--- kde-unstable-x86_64/PKGBUILD (rev 0)
+++ kde-unstable-x86_64/PKGBUILD 2016-08-09 17:43:58 UTC (rev 273540)
@@ -0,0 +1,85 @@
+# $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.1.0
+pkgver=${_pkgver//-/_}
+pkgrel=3
+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'
+ 'opencv' 'doxygen' 'lensfun' 'eigen' 'kdoctools' 'marble' 'kdesignerplugin'
+ 'kfilemetadata' 'akonadi-contacts' 'qt5-multimedia' 'threadweaver' 'kcalcore'
+ 'knotifyconfig' 'libmediawiki' 'libkvkontakte')
+source=("http://download.kde.org/stable/${pkgname}/${pkgname}-${_pkgver}.tar.xz" digikam-5.1-fix-build.patch)
+sha1sums=('87a843c39f45b8704ead6e6029e52fb03ee44680'
+ '5b6644c8b5534a1712f46fc84948de9a0039a601')
+
+prepare() {
+ mkdir -p build
+
+ cd $pkgname-$pkgver
+ # Fix build on i686
+ patch -p1 -i ../digikam-5.1-fix-build.patch
+}
+
+build() {
+ cd build
+
+ cmake ../${pkgname}-${_pkgver} \
+ -DCMAKE_INSTALL_PREFIX=/usr \
+ -DCMAKE_INSTALL_LIBDIR=lib \
+ -DCMAKE_BUILD_TYPE=Release \
+ -DCMAKE_SKIP_RPATH=ON \
+ -DBUILD_TESTING=OFF \
+ -DENABLE_KFILEMETADATASUPPORT=ON \
+ -DENABLE_MEDIAPLAYER=ON \
+ -DENABLE_AKONADICONTACTSUPPORT=ON \
+ -DENABLE_MYSQLSUPPORT=ON \
+ -DENABLE_OPENCV3=ON
+ make
+}
+
+package_digikam() {
+ pkgdesc="Digital photo management application for KDE"
+ depends=('liblqr' 'libkipi' 'lensfun' 'opencv' 'akonadi-contacts'
+ 'knotifyconfig' 'libksane' 'kfilemetadata' 'qt5-multimedia' 'marble' 'threadweaver' 'kcalcore')
+ optdepends=('kipi-plugins: export to various online services'
+ 'hugin: panorama tool')
+
+ cd build/core
+ make DESTDIR="$pkgdir" install
+ cd $srcdir/build/doc/digikam
+ make DESTDIR="$pkgdir" install
+ cd $srcdir/build/doc-translated/digikam
+ 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/doc/kipi-plugins
+ make DESTDIR="$pkgdir" install
+ cd $srcdir/build/doc-translated/kipi-plugins
+ 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/kde-unstable-x86_64/digikam-5.1-fix-build.patch (from rev 273539, digikam/kde-unstable/digikam-5.1-fix-build.patch)
===================================================================
--- kde-unstable-x86_64/digikam-5.1-fix-build.patch (rev 0)
+++ kde-unstable-x86_64/digikam-5.1-fix-build.patch 2016-08-09 17:43:58 UTC (rev 273540)
@@ -0,0 +1,15 @@
+--- digikam-5.1.0/core/libs/rawengine/libraw/libraw/libraw_types.h.orig 2016-08-09 15:05:10.449224741 +0000
++++ digikam-5.1.0/core/libs/rawengine/libraw/libraw/libraw_types.h 2016-08-09 15:05:50.725789944 +0000
+@@ -618,10 +618,10 @@
+ #elif defined(_M_X64) || defined(__amd64__)
+ #define LibRawBigEndian 0
+
+-#elif defined(__LITTLE_ENDIAN__)
++#elif __BYTE_ORDER__ == __ORDER_LITTLE_ENDIAN__
+ #define LibRawBigEndian 0
+
+-#elif defined(__BIG_ENDIAN__)
++#elif __BYTE_ORDER__ == __ORDER_BIG_ENDIAN__
+ #define LibRawBigEndian 1
+ #elif defined(_ARM_)
+ #define LibRawBigEndian 0
More information about the arch-commits
mailing list