From 2baecdb3395f18fc19e8ceee0a348a77b5b7ca4f Mon Sep 17 00:00:00 2001
From: Isaac David <isacdaavid@isacdaavid.info>
Date: Fri, 11 Nov 2016 16:21:27 -0600
Subject: nonprism/kipi-plugins: bring armv7h support to date

---
 .../kipi-plugins/0001-optionally-enable-OpenGL.patch     | 16 ++++++++--------
 nonprism/kipi-plugins/PKGBUILD                           |  3 ++-
 2 files changed, 10 insertions(+), 9 deletions(-)

(limited to 'nonprism')

diff --git a/nonprism/kipi-plugins/0001-optionally-enable-OpenGL.patch b/nonprism/kipi-plugins/0001-optionally-enable-OpenGL.patch
index 8527b9cce..909a44434 100644
--- a/nonprism/kipi-plugins/0001-optionally-enable-OpenGL.patch
+++ b/nonprism/kipi-plugins/0001-optionally-enable-OpenGL.patch
@@ -1,4 +1,4 @@
-From 72f50a2d29648248e03eb871f896f0c940e44c78 Mon Sep 17 00:00:00 2001
+From 9e291325f5d2568834fd0d590e5e99af129d9518 Mon Sep 17 00:00:00 2001
 From: Kevin Mihelich <kevin@archlinuxarm.org>
 Date: Tue, 5 Jul 2016 18:47:56 -0600
 Subject: [PATCH] optionally enable OpenGL
@@ -9,18 +9,18 @@ Signed-off-by: Kevin Mihelich <kevin@archlinuxarm.org>
  1 file changed, 2 insertions(+), 1 deletion(-)
 
 diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 47f6b10..7615b7f 100644
+index d3e64b5..1dabead 100644
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
 @@ -104,6 +104,7 @@ option(ENABLE_KFILEMETADATASUPPORT  "Build digiKam with KDE files indexer suppor
- option(ENABLE_AKONADICONTACTSUPPORT "Build digiKam with KDE Mail Contacts support (default=OFF)"                       OFF)
- option(ENABLE_MEDIAPLAYER           "Build digiKam with QtMultimedia support (default=OFF)"                            OFF)
- option(ENABLE_DBUS                  "Build digiKam with DBUS support (default=ON)"                                     ON)
+ option(ENABLE_AKONADICONTACTSUPPORT "Build digiKam with KDE Mail Contacts support (default=OFF)"                         OFF)
+ option(ENABLE_MEDIAPLAYER           "Build digiKam with QtMultimedia support (default=OFF)"                              OFF)
+ option(ENABLE_DBUS                  "Build digiKam with DBUS support (default=ON)"                                       ON)
 +option(ENABLE_OPENGL                "Build digiKam with OpenGL support (default=ON)"                                   ON)
+ option(ENABLE_APPSTYLES             "Build digiKam with support for changing the widget application style (default=OFF)" OFF)
  
  # Mysql support options (experimental):
- option(ENABLE_MYSQLSUPPORT          "Build digiKam with MySQL dabatase support (default=OFF)"                          OFF)
-@@ -284,7 +285,7 @@ else()
+@@ -286,7 +287,7 @@ else()
  endif()
  
  # decide if Presentation tool can be built with OpenGL
@@ -30,5 +30,5 @@ index 47f6b10..7615b7f 100644
  elseif()
      set(HAVE_OPENGL FALSE)
 -- 
-2.8.3
+2.9.2
 
diff --git a/nonprism/kipi-plugins/PKGBUILD b/nonprism/kipi-plugins/PKGBUILD
index 9ecff8658..d899841e5 100644
--- a/nonprism/kipi-plugins/PKGBUILD
+++ b/nonprism/kipi-plugins/PKGBUILD
@@ -27,7 +27,7 @@ source=("http://download.kde.org/stable/${pkgbase}/${pkgbase}-${_pkgver}.tar.xz"
 sha1sums=('3a62f6efdfafc37341626cbf0225cd7adc9d0633'
           'edd5b5eeae7ed4139b4c5f6a8446990f1da2e544'
           '246366b6b4b315957387938d842112e1146b9495'
-          '2711c73bdecbf355d4b8be1fa0c46be2e0e22df8')
+          '95169d438884b1650a4c11e1ca44ae7ad5096a89')
 
 prepare() {
   mkdir -p build
@@ -38,6 +38,7 @@ prepare() {
 
   # OpenGL switch
   if [[ "$CARCH" = arm* ]]; then
+    cd core
     patch -p1 -i ${srcdir}/0001-optionally-enable-OpenGL.patch
   fi
 }
-- 
cgit v1.2.2