[arch-commits] Commit in gimp-nufraw/repos (4 files)

[Christian Hesse]

    Date: Wednesday, May 22, 2019 @ 15:23:43
  Author: eworm
Revision: 468565

archrelease: copy trunk to community-staging-x86_64

Added:
  gimp-nufraw/repos/community-staging-x86_64/
  gimp-nufraw/repos/community-staging-x86_64/PKGBUILD
    (from rev 468564, gimp-nufraw/trunk/PKGBUILD)
  gimp-nufraw/repos/community-staging-x86_64/nufraw-exiv2-0.27.patch
    (from rev 468564, gimp-nufraw/trunk/nufraw-exiv2-0.27.patch)
  gimp-nufraw/repos/community-staging-x86_64/nufraw-iostream.patch
    (from rev 468564, gimp-nufraw/trunk/nufraw-iostream.patch)

-------------------------+
 PKGBUILD                |   49 ++++++++++++++++++++++++++++++++++++++++++++++
 nufraw-exiv2-0.27.patch |   25 +++++++++++++++++++++++
 nufraw-iostream.patch   |   10 +++++++++
 3 files changed, 84 insertions(+)

Copied: gimp-nufraw/repos/community-staging-x86_64/PKGBUILD (from rev 468564, gimp-nufraw/trunk/PKGBUILD)
===================================================================
--- community-staging-x86_64/PKGBUILD	                        (rev 0)
+++ community-staging-x86_64/PKGBUILD	2019-05-22 15:23:43 UTC (rev 468565)
@@ -0,0 +1,49 @@
+# Maintainer: Christian Hesse <mail at eworm.de>
+
+pkgname=gimp-nufraw
+pkgver=0.42
+pkgrel=5
+pkgdesc='Converter for raw files; utility and GIMP plugin'
+url='https://sourceforge.net/projects/nufraw/'
+arch=('x86_64')
+license=('GPL')
+depends=('cfitsio' 'exiv2' 'gtkimageview' 'lcms2' 'lensfun' 'libjpeg-turbo')
+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)
+sha256sums=('ddfb592a183618c802e990211f6efce75f4801a7708ecc364666f53af25c9f90'
+            'fd0120af2cfa8783edd3d91a39b638fbb30ced8c692815be230a302bc55a71ad'
+            'ec7caabbdaa8fb67097bfb72c26a1140754e184e756ec2013863af37eed67220')
+
+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)
+
+  autoreconf -fi
+
+  mv nufraw.desktop{.desktop,}
+  chmod +x generate_schemas.sh
+}
+
+build() {
+  cd "nufraw-$pkgver"
+
+  ./configure \
+    --prefix=/usr \
+    --enable-extras \
+    --enable-mime \
+    --enable-openmp \
+    --with-gimp \
+    --with-cinepaint \
+    --enable-contrast
+  make
+}
+
+package() {
+  make -C "nufraw-$pkgver" DESTDIR="$pkgdir" install
+  rm -f "$pkgdir/usr/bin/dcraw"
+}
+

Copied: gimp-nufraw/repos/community-staging-x86_64/nufraw-exiv2-0.27.patch (from rev 468564, gimp-nufraw/trunk/nufraw-exiv2-0.27.patch)
===================================================================
--- community-staging-x86_64/nufraw-exiv2-0.27.patch	                        (rev 0)
+++ community-staging-x86_64/nufraw-exiv2-0.27.patch	2019-05-22 15:23:43 UTC (rev 468565)
@@ -0,0 +1,25 @@
+--- a/nufraw_exiv2.cc
++++ b/nufraw_exiv2.cc
+@@ -15,9 +15,7 @@
+ #include "nufraw.h"
+ 
+ #ifdef HAVE_EXIV2
+-#include <exiv2/image.hpp>
+-#include <exiv2/easyaccess.hpp>
+-#include <exiv2/exif.hpp>
++#include <exiv2/exiv2.hpp>
+ #include <sstream>
+ #include <cassert>
+ 
+@@ -67,7 +65,11 @@
+         if (exifData.empty()) {
+             std::string error(uf->filename);
+             error += ": No Exif data found in the file";
++#if EXIV2_TEST_VERSION(0,27,0)
++            throw Exiv2::Error(Exiv2::kerErrorMessage, error);
++#else
+             throw Exiv2::Error(1, error);
++#endif
+         }
+ 
+         /* List of tag names taken from exiv2's printSummary() in actions.cpp */

Copied: gimp-nufraw/repos/community-staging-x86_64/nufraw-iostream.patch (from rev 468564, gimp-nufraw/trunk/nufraw-iostream.patch)
===================================================================
--- community-staging-x86_64/nufraw-iostream.patch	                        (rev 0)
+++ community-staging-x86_64/nufraw-iostream.patch	2019-05-22 15:23:43 UTC (rev 468565)
@@ -0,0 +1,10 @@
+--- nufraw-0.42/nufraw_exiv2.cc.orig	2019-05-18 08:41:34.220544309 +0000
++++ nufraw-0.42/nufraw_exiv2.cc	2019-05-18 08:41:41.170631700 +0000
+@@ -20,6 +20,7 @@
+ #include <exiv2/exif.hpp>
+ #include <sstream>
+ #include <cassert>
++#include <iostream>
+ 
+ /*
+  * Helper function to copy a string to a buffer, converting it from