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

3 files changed, 30 insertions, 15 deletions

diff --git a/nonprism/kipi-plugins/PKGBUILD b/nonprism/kipi-plugins/PKGBUILD
index 6b45e6372..d8f5b7d79 100644
--- a/nonprism/kipi-plugins/PKGBUILD
+++ b/nonprism/kipi-plugins/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 271080 2016-07-06 10:08:49Z arojas $
+# $Id: PKGBUILD 273537 2016-08-09 16:38:33Z arojas $
 # Maintainer (Arch): Ronald van Haren <ronald@archlinux.org>
 # Contributor (Arch): Andrea Scarpino <andrea@archlinux.org>
 # Contributor (Arch): Tobias Powalowski <tpowa@archlinux.org>
@@ -7,7 +7,7 @@
 
 pkgbase=digikam
 pkgname=kipi-plugins
-_pkgver=5.0.0
+_pkgver=5.1.0
 pkgver=${_pkgver//-/_}
 pkgrel=1.parabola1.nonprism1
 pkgdesc="Digital photo management application for KDE"
@@ -19,23 +19,25 @@ conflicts=("${pkgname}-libre" "${pkgname}-libre-nonprism")
 makedepends=('extra-cmake-modules' 'libkipi' 'libksane' 'liblqr' 'opencv' 'boost'
              'opencv' 'doxygen' 'lensfun' 'eigen' 'kdoctools' 'marble' 'kdesignerplugin'
              'kfilemetadata' 'akonadi-contact' 'qt5-multimedia' 'threadweaver' 'kcalcore'
-             'knotifyconfig' 'libmediawiki' 'kqoauth')
+             'knotifyconfig' 'libmediawiki' 'libkvkontakte')
 source=("http://download.kde.org/stable/${pkgbase}/${pkgbase}-${_pkgver}.tar.xz"
+        "digikam-5.1-fix-build.patch"
         "libre.patch"
         "nonprism.patch")
-sha1sums=('e0dec2eba9ab3a51d632b69b3dd6daf8dca64a45'
+sha1sums=('87a843c39f45b8704ead6e6029e52fb03ee44680'
+          '5b6644c8b5534a1712f46fc84948de9a0039a601'
           'ed2a01c4a837b50d3c1ad0d4758f2fa3bb44402f'
-          'b6dfd32aa127a858d7df84ed5c821f9f0bb3bc72')
+          '3e0f11296e887171c4f5f05652bb0ea635b021fd')
 
 prepare() {
   mkdir -p build
 
-# Build fails
-  sed -e '/add_subdirectory(showfoto)/d' -i ${pkgbase}-${_pkgver}/doc-translated/digikam/CMakeLists.txt
-
   cd ${pkgbase}-${_pkgver}
   patch -p1 -i ../libre.patch
   patch -p1 -i ../nonprism.patch
+
+  # Fix build on i686
+  patch -p1 -i ../digikam-5.1-fix-build.patch
 }
 
 build() {
diff --git a/nonprism/kipi-plugins/digikam-5.1-fix-build.patch b/nonprism/kipi-plugins/digikam-5.1-fix-build.patch
new file mode 100644
index 000000000..29f282079
--- /dev/null
+++ b/nonprism/kipi-plugins/digikam-5.1-fix-build.patch
@@ -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
diff --git a/nonprism/kipi-plugins/nonprism.patch b/nonprism/kipi-plugins/nonprism.patch
index 72d6ced28..4b31776a4 100644
--- a/nonprism/kipi-plugins/nonprism.patch
+++ b/nonprism/kipi-plugins/nonprism.patch
@@ -29,7 +29,7 @@ index 45f6406..ebafd76 100644
  &doc-imagesgallery;
  &doc-imageviewer;
 diff --git a/extra/kipi-plugins/CMakeLists.txt b/extra/kipi-plugins/CMakeLists.txt
-index bdd3c18..e28ef8d 100644
+index 0d3e41f..fde60fc 100644
 --- a/extra/kipi-plugins/CMakeLists.txt
 +++ b/extra/kipi-plugins/CMakeLists.txt
 @@ -109,7 +109,6 @@ find_package(KF5 ${KF5_MIN_VERSION}
@@ -40,25 +40,23 @@ index bdd3c18..e28ef8d 100644
               Archive      # for FlashExport
               KIO          # Some kipi-plugins depends of KIO indeep..
  )
-@@ -136,8 +135,6 @@ if(KF5Kipi_FOUND)
+@@ -136,7 +135,6 @@ if(KF5Kipi_FOUND)
      # -- Optional dependencies detection required by some plugins -------------------------------------
  
      DETECT_LIBMEDIAWIKI(5.0.0)                                                 # For Mediawiki.
 -    DETECT_LIBKVKONTAKTE(4.70.0)                                               # For VKontakte.
--    find_package(QtKOAuth)                                                     # For Imgur Auhtenticated API.
  
      # ==================================================================================================
      # Log messages
-@@ -158,8 +155,6 @@ if(KF5Kipi_FOUND)
+@@ -157,7 +155,6 @@ if(KF5Kipi_FOUND)
      PRINT_OPTIONAL_LIBRARY_STATUS("libkio"          "https://projects.kde.org/projects/frameworks/kio"                "(version >= ${KF5_MIN_VERSION})"      "Kipi-plugins will be compiled without libkio support."          KF5KIO_FOUND)
      PRINT_OPTIONAL_LIBRARY_STATUS("libkarchive"     "https://projects.kde.org/projects/frameworks/karchive"           "(version >= ${KF5_MIN_VERSION})"      "Kipi-plugins will be compiled without libkarchive support."     KF5Archive_FOUND)
      PRINT_OPTIONAL_LIBRARY_STATUS("libmediawiki"    "https://projects.kde.org/projects/extragear/libs/libmediawiki"   "(version >= ${KF5_MIN_VERSION})"      "Kipi-plugins will be compiled without libmediawiki support."    KF5MediaWiki_FOUND)
 -    PRINT_OPTIONAL_LIBRARY_STATUS("libkvkontakte"   "https://projects.kde.org/projects/extragear/libs/libkvkontakte"  "(version >= 4.70.0)"                  "Kipi-plugins will be compiled without libkvkontakte support."   KF5Vkontakte_FOUND)
--    PRINT_OPTIONAL_LIBRARY_STATUS("libqtkoauth"     "https://github.com/kypeli/kQOAuth"                               "(version >= 0.97)"                    "Kipi-plugins will be compiled without libqtkoauth support."     QTKOAUTH_FOUND)
  
      # Optional plugins results ----------------------------------------------------------------------------
  
-@@ -175,7 +170,6 @@ if(KF5Kipi_FOUND)
+@@ -173,7 +170,6 @@ if(KF5Kipi_FOUND)
          set(KIPIPLUGINS_CAN_BE_COMPILED false)
      endif()
  
@@ -66,7 +64,7 @@ index bdd3c18..e28ef8d 100644
      PRINT_COMPONENT_COMPILE_STATUS("Mediawiki"          KF5MediaWiki_FOUND)
      PRINT_COMPONENT_COMPILE_STATUS("FlashExport"        KF5Archive_FOUND)
  
-@@ -230,25 +224,12 @@ if(KF5Kipi_FOUND)
+@@ -229,25 +225,12 @@ if(KF5Kipi_FOUND)
          add_subdirectory(printimages)
          add_subdirectory(kmlexport)
          add_subdirectory(sendimages)