From f7809afbcdd0b574ce8db02f2656c209102db2db Mon Sep 17 00:00:00 2001
From: Freemor <freemor@freemor.ca>
Date: Sun, 1 Dec 2019 22:16:50 -0400
Subject: Update and rebuild [nonprism/darktable]

---
 nonprism/darktable/PKGBUILD             | 16 ++++++++++++----
 nonprism/darktable/fixCompileFlag.patch | 12 ++++++++++++
 2 files changed, 24 insertions(+), 4 deletions(-)
 create mode 100644 nonprism/darktable/fixCompileFlag.patch

(limited to 'nonprism')

diff --git a/nonprism/darktable/PKGBUILD b/nonprism/darktable/PKGBUILD
index 6dc4ab313..a2829e2e4 100644
--- a/nonprism/darktable/PKGBUILD
+++ b/nonprism/darktable/PKGBUILD
@@ -3,24 +3,32 @@
 # Contributor: Márcio Silva <coadde@hyperbola.info>
 # Contributor (Arch): Christian Himpel <chressie at gmail dot com>
 # Contributor (Arch): Johannes Hanika <hanatos at gmail dot com>
+# Contributor: Freemor <freemor@freemor.ca>
 
 pkgname=darktable
 epoch=2
 pkgver=2.6.3
 pkgrel=1.nonprism1
 pkgdesc="Utility to organize and develop raw images, without flickcurl support"
-arch=(i686 x86_64)
+arch=(i686 x86_64 armv7h)
 url="https://darktable.org"
 license=(GPL3)
 depends=(pugixml libjpeg-turbo colord-gtk libgphoto2 openexr lensfun iso-codes
          exiv2 openjpeg2 graphicsmagick lua osm-gps-map libsecret)
-makedepends=(cmake intltool desktop-file-utils llvm clang python-jsonschema libwebp)
-source=("https://github.com/darktable-org/darktable/releases/download/release-${pkgver}/darktable-${pkgver/rc/.rc}.tar.xz"{,.asc})
-sha256sums=('a518999c8458472edfc04577026ce5047d74553052af0f52d10ba8ce601b78f0' 'SKIP')
+makedepends=(cmake intltool desktop-file-utils llvm clang python-jsonschema libwebp libxslt)
+source=("https://github.com/darktable-org/darktable/releases/download/release-${pkgver}/darktable-${pkgver/rc/.rc}.tar.xz"{,.asc}
+	fixCompileFlag.patch)
+sha256sums=('a518999c8458472edfc04577026ce5047d74553052af0f52d10ba8ce601b78f0'
+            'SKIP'
+            '4529cf75dc0fd68f3aed9b3c917106eeac58adffa608b57b79256f66fd23959b')
+
 validpgpkeys=(C4CBC150699956E2A3268EF5BB5CC8295B1779C9  # darktable releases <release@darktable.org>
               F10F9686652B0E949FCD94C318DCA123F949BD3B) # Pascal Obry <pascal@obry.net>
 
 prepare() {
+    cd "$srcdir/$pkgname-$pkgver"
+    patch --strip=1 --input=../fixCompileFlag.patch
+    cd "$srcdir"
     mkdir -p build
 }
 
diff --git a/nonprism/darktable/fixCompileFlag.patch b/nonprism/darktable/fixCompileFlag.patch
new file mode 100644
index 000000000..cfa81e909
--- /dev/null
+++ b/nonprism/darktable/fixCompileFlag.patch
@@ -0,0 +1,12 @@
+diff --unified --recursive --text a/cmake/compiler-warnings.cmake b/cmake/compiler-warnings.cmake
+--- a/cmake/compiler-warnings.cmake	2019-10-20 09:39:07.000000000 -0300
++++ b/cmake/compiler-warnings.cmake	2019-12-01 21:23:51.750926133 -0400
+@@ -26,8 +26,6 @@
+ 
+ CHECK_COMPILER_FLAG_AND_ENABLE_IT(-Wold-style-declaration)
+ 
+-CHECK_COMPILER_FLAG_AND_ENABLE_IT(-Wthread-safety)
+-
+ # may be our bug :(
+ CHECK_COMPILER_FLAG_AND_ENABLE_IT(-Wno-error=varargs)
+ 
-- 
cgit v1.2.3