kipi-plugins-5.2.0-1.parabola1{,.nonprism1}: updating version

3 files changed, 15 insertions, 44 deletions

diff --git a/libre/kipi-plugins/PKGBUILD b/libre/kipi-plugins/PKGBUILD
index 7c01c28ad..282238356 100644
--- a/libre/kipi-plugins/PKGBUILD
+++ b/libre/kipi-plugins/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 275324 2016-08-30 17:01:57Z arojas $
+# $Id: PKGBUILD 276865 2016-09-23 11:17:29Z arojas $
 # Maintainer (Arch): Ronald van Haren <ronald@archlinux.org>
 # Contributor (Arch): Andrea Scarpino <andrea@archlinux.org>
 # Contributor (Arch): Tobias Powalowski <tpowa@archlinux.org>
@@ -7,9 +7,9 @@
 
 pkgbase=digikam
 pkgname=kipi-plugins
-_pkgver=5.1.0
-pkgver=${_pkgver//-/_}
-pkgrel=4.parabola1
+_pkgver=5.2.0
+pkgver=${_pkgver//-/_} # for beta versions
+pkgrel=1.parabola1
 pkgdesc="Digital photo management application for KDE"
 arch=('i686' 'x86_64' 'armv7h')
 license=('GPL')
@@ -17,18 +17,14 @@ url="http://www.digikam.org/"
 replaces=("${pkgname}-libre")
 conflicts=("${pkgname}-libre")
 makedepends=('extra-cmake-modules' 'libkipi' 'libksane' 'liblqr' 'opencv' 'boost'
-             'opencv' 'doxygen' 'lensfun' 'eigen' 'kdoctools' 'marble' 'kdesignerplugin'
+             'doxygen' 'lensfun' 'eigen' 'kdoctools' 'marble' 'kdesignerplugin'
              'kfilemetadata' 'akonadi-contacts' 'qt5-multimedia' 'threadweaver' 'kcalcore'
-             'knotifyconfig' 'libmediawiki' 'libkvkontakte')
+             'knotifyconfig' 'libmediawiki' 'libkvkontakte' 'gphoto2')
 source=("http://download.kde.org/stable/${pkgbase}/${pkgbase}-${_pkgver}.tar.xz"
-        "digikam-5.1-fix-build.patch"
-        kdebug-367675.patch::"https://quickgit.kde.org/?p=digikam.git&a=commitdiff&h=463667c8&o=plain"
         "libre.patch"
         '0001-optionally-enable-OpenGL.patch')
-sha1sums=('87a843c39f45b8704ead6e6029e52fb03ee44680'
-          '5b6644c8b5534a1712f46fc84948de9a0039a601'
-          'd669d6f248d6c7dec6728037992fdf8d4e14c1d9'
-          'ed2a01c4a837b50d3c1ad0d4758f2fa3bb44402f'
+sha1sums=('329195ac7ea890a3bec435cd2ed83b04bc80ba1d'
+          'edd5b5eeae7ed4139b4c5f6a8446990f1da2e544'
           '2711c73bdecbf355d4b8be1fa0c46be2e0e22df8')
 
 prepare() {
@@ -37,12 +33,6 @@ prepare() {
   cd ${pkgbase}-${_pkgver}
   patch -p1 -i ../libre.patch
 
-  # Fix build on i686
-  patch -p1 -i ../digikam-5.1-fix-build.patch
-  # Fix digikamhelperdir
-  cd core
-  patch -p1 -i "$srcdir"/kdebug-367675.patch
-
   # OpenGL switch
   if [[ "$CARCH" = arm* ]]; then
     patch -p1 -i ${srcdir}/0001-optionally-enable-OpenGL.patch
@@ -60,13 +50,13 @@ build() {
     -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 \
+    -DENABLE_APPSTYLES=ON \
     $cmake_extra
   make
 }
@@ -79,10 +69,6 @@ package_kipi-plugins() {
 
   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
 
diff --git a/libre/kipi-plugins/digikam-5.1-fix-build.patch b/libre/kipi-plugins/digikam-5.1-fix-build.patch
deleted file mode 100644
index 29f282079..000000000
--- a/libre/kipi-plugins/digikam-5.1-fix-build.patch
+++ /dev/null
@@ -1,15 +0,0 @@
---- 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
diff --git a/libre/kipi-plugins/libre.patch b/libre/kipi-plugins/libre.patch
index 6255727bb..8c677e210 100644
--- a/libre/kipi-plugins/libre.patch
+++ b/libre/kipi-plugins/libre.patch
@@ -1,5 +1,5 @@
 diff --git a/extra/kipi-plugins/sendimages/emailsettings.h b/extra/kipi-plugins/sendimages/emailsettings.h
-index 8f98ec5..4b55443 100644
+index 0f58cc4..b497299 100644
 --- a/extra/kipi-plugins/sendimages/emailsettings.h
 +++ b/extra/kipi-plugins/sendimages/emailsettings.h
 @@ -64,10 +64,9 @@ public:
@@ -15,10 +15,10 @@ index 8f98ec5..4b55443 100644
  
      enum ImageSize
 diff --git a/extra/kipi-plugins/sendimages/sendimages.cpp b/extra/kipi-plugins/sendimages/sendimages.cpp
-index 498cf92..67b03f9 100644
+index 1be65d6..68094de 100644
 --- a/extra/kipi-plugins/sendimages/sendimages.cpp
 +++ b/extra/kipi-plugins/sendimages/sendimages.cpp
-@@ -593,18 +593,13 @@ bool SendImages::invokeMailAgent()
+@@ -589,18 +589,13 @@ bool SendImages::invokeMailAgent()
                  // More info about command lines options with Mozilla & co:
                  // http://www.mozilla.org/docs/command-line-args.html#Syntax_Rules
  
@@ -41,10 +41,10 @@ index 498cf92..67b03f9 100644
  
                      QStringList args;
 diff --git a/extra/kipi-plugins/sendimages/settingswidget.cpp b/extra/kipi-plugins/sendimages/settingswidget.cpp
-index 7e55726..fd8eec5 100644
+index b8416a4..f160310 100644
 --- a/extra/kipi-plugins/sendimages/settingswidget.cpp
 +++ b/extra/kipi-plugins/sendimages/settingswidget.cpp
-@@ -96,10 +96,9 @@ SettingsWidget::SettingsWidget(QWidget* const parent)
+@@ -97,10 +97,9 @@ SettingsWidget::SettingsWidget(QWidget* const parent)
      d->mailAgentName->insertItem(EmailSettings::CLAWSMAIL,     QLatin1String("Claws Mail"));
      d->mailAgentName->insertItem(EmailSettings::EVOLUTION,     QLatin1String("Evolution"));
      d->mailAgentName->insertItem(EmailSettings::KMAIL,         QLatin1String("KMail"));
@@ -53,6 +53,6 @@ index 7e55726..fd8eec5 100644
      d->mailAgentName->insertItem(EmailSettings::SYLPHEEDCLAWS, QLatin1String("Sylpheed-Claws"));
 -    d->mailAgentName->insertItem(EmailSettings::THUNDERBIRD,   QLatin1String("Thunderbird"));
 +    d->mailAgentName->insertItem(EmailSettings::ICEDOVE,   QLatin1String("Icedove"));
+ #endif
      d->mailAgentName->setCurrentIndex(EmailSettings::DEFAULT);
      d->mailAgentName->setWhatsThis(i18n("Select your preferred external email program here. "
-                                         "<b>Default</b> is the current email program set in KDE "