From f220f2cb8b8679fcfe4d365f2fb7ae7fadd4f3e3 Mon Sep 17 00:00:00 2001
From: Kevin Mihelich <kevin@archlinuxarm.org>
Date: Tue, 28 Jan 2020 13:23:30 +0000
Subject: [PATCH] community/gimp-nufraw to 0.42-6

---
 ...tream.patch => 0001-nufraw-iostream.patch} |  0
 ....27.patch => 0002-nufraw-exiv2-0.27.patch} |  0
 .../gimp-nufraw/0003-omp_definitions.patch    | 32 +++++++++++++++++++
 community/gimp-nufraw/PKGBUILD                | 21 +++++++++---
 4 files changed, 48 insertions(+), 5 deletions(-)
 rename community/gimp-nufraw/{nufraw-iostream.patch => 0001-nufraw-iostream.patch} (100%)
 rename community/gimp-nufraw/{nufraw-exiv2-0.27.patch => 0002-nufraw-exiv2-0.27.patch} (100%)
 create mode 100644 community/gimp-nufraw/0003-omp_definitions.patch

diff --git a/community/gimp-nufraw/nufraw-iostream.patch b/community/gimp-nufraw/0001-nufraw-iostream.patch
similarity index 100%
rename from community/gimp-nufraw/nufraw-iostream.patch
rename to community/gimp-nufraw/0001-nufraw-iostream.patch
diff --git a/community/gimp-nufraw/nufraw-exiv2-0.27.patch b/community/gimp-nufraw/0002-nufraw-exiv2-0.27.patch
similarity index 100%
rename from community/gimp-nufraw/nufraw-exiv2-0.27.patch
rename to community/gimp-nufraw/0002-nufraw-exiv2-0.27.patch
diff --git a/community/gimp-nufraw/0003-omp_definitions.patch b/community/gimp-nufraw/0003-omp_definitions.patch
new file mode 100644
index 000000000..8b26ee3a3
--- /dev/null
+++ b/community/gimp-nufraw/0003-omp_definitions.patch
@@ -0,0 +1,32 @@
+--- a/dcraw_api.cc	2015-06-16 04:58:38.000000000 +0100
++++ b/dcraw_api.cc	2019-06-30 16:37:05.503409567 +0100
+@@ -689,3 +689,3 @@
+             #pragma omp parallel for schedule(static) default(none) \
+-            shared(h,dark,rgbWB)
++            firstprivate(black,pixels) shared(h,dark,rgbWB)
+ #endif
+@@ -702,3 +702,3 @@
+             #pragma omp parallel for schedule(static) default(none) \
+-            shared(h,dark,rgbWB)
++            firstprivate(black,pixels) shared(h,dark,rgbWB)
+ #endif
+--- a/dcraw_indi.c	2015-06-16 04:58:38.000000000 +0100
++++ b/dcraw_indi.c	2019-06-30 17:03:59.692710441 +0100
+@@ -140,2 +140,3 @@
+     default(none)					\
++    firstprivate(iheight,iwidth,noise,threshold)	\
+     shared(nc,image,size,noise)				\
+@@ -145,2 +146,3 @@
+     default(none)					\
++    firstprivate(iheight,iwidth,noise,threshold)	\
+     shared(nc,image,size)				\
+@@ -416,2 +418,3 @@
+     default(none)					\
++    firstprivate(colors,filters,height,width)			\
+     shared(image,code,prow,pcol,h)			\
+@@ -502,3 +502,4 @@
+     default(none)					\
+-    shared(image,dir,diff)				\
++    firstprivate(filters,height,width)	\
++    shared(image,dir,diff)				\
+     private(row,col,i,d,c,pix,guess)
diff --git a/community/gimp-nufraw/PKGBUILD b/community/gimp-nufraw/PKGBUILD
index 921b6a9fa..0e1c67f83 100644
--- a/community/gimp-nufraw/PKGBUILD
+++ b/community/gimp-nufraw/PKGBUILD
@@ -5,7 +5,7 @@
 
 pkgname=gimp-nufraw
 pkgver=0.42
-pkgrel=5
+pkgrel=6
 pkgdesc='Converter for raw files; utility and GIMP plugin'
 url='https://sourceforge.net/projects/nufraw/'
 arch=('x86_64')
@@ -15,15 +15,26 @@ makedepends=('gimp')
 conflicts=('gimp-ufraw')
 replaces=('gimp-ufraw')
 optdepends=('gimp: to use the gimp import plugin for raw images')
-source=("https://downloads.sourceforge.net/nufraw/nufraw-$pkgver.tar.gz" nufraw-iostream.patch nufraw-exiv2-0.27.patch)
+source=("https://downloads.sourceforge.net/nufraw/nufraw-$pkgver.tar.gz"
+        '0001-nufraw-iostream.patch'
+        '0002-nufraw-exiv2-0.27.patch'
+        '0003-omp_definitions.patch')
 sha256sums=('ddfb592a183618c802e990211f6efce75f4801a7708ecc364666f53af25c9f90'
             'fd0120af2cfa8783edd3d91a39b638fbb30ced8c692815be230a302bc55a71ad'
-            'ec7caabbdaa8fb67097bfb72c26a1140754e184e756ec2013863af37eed67220')
+            'ec7caabbdaa8fb67097bfb72c26a1140754e184e756ec2013863af37eed67220'
+            '8f15799e1e682330072f04af4607380b91a55edc9c9f638bdeae1ee3d2318ccf')
 
 prepare() {
   cd "nufraw-$pkgver"
-  patch -p1 -i ../nufraw-iostream.patch # Add missing include
-  patch -p1 -i ../nufraw-exiv2-0.27.patch # Fix build with exiv2 0.27 (Gentoo)
+
+  # Add missing include
+  patch -p1 -i ../0001-nufraw-iostream.patch
+  
+  # Fix build with exiv2 0.27 (Gentoo)
+  patch -p1 -i ../0002-nufraw-exiv2-0.27.patch
+
+  # fix '... not specified in enclosing ‘parallel’'
+  patch -p1 -i ../0003-omp_definitions.patch
 
   autoreconf -fi