diff --git a/community/gimp-nufraw/PKGBUILD b/community/gimp-nufraw/PKGBUILD index 642b7c05d..0dbc066b1 100644 --- a/community/gimp-nufraw/PKGBUILD +++ b/community/gimp-nufraw/PKGBUILD @@ -5,7 +5,7 @@ pkgname=gimp-nufraw pkgver=0.42 -pkgrel=3 +pkgrel=4 pkgdesc='Converter for raw files; utility and GIMP plugin' url='https://sourceforge.net/projects/nufraw/' arch=('x86_64') @@ -15,11 +15,15 @@ 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") -sha256sums=('ddfb592a183618c802e990211f6efce75f4801a7708ecc364666f53af25c9f90') +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 diff --git a/community/gimp-nufraw/nufraw-exiv2-0.27.patch b/community/gimp-nufraw/nufraw-exiv2-0.27.patch new file mode 100644 index 000000000..94e40bc8a --- /dev/null +++ b/community/gimp-nufraw/nufraw-exiv2-0.27.patch @@ -0,0 +1,25 @@ +--- a/nufraw_exiv2.cc ++++ b/nufraw_exiv2.cc +@@ -15,9 +15,7 @@ + #include "nufraw.h" + + #ifdef HAVE_EXIV2 +-#include +-#include +-#include ++#include + #include + #include + +@@ -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 */ diff --git a/community/gimp-nufraw/nufraw-iostream.patch b/community/gimp-nufraw/nufraw-iostream.patch new file mode 100644 index 000000000..a52d77798 --- /dev/null +++ b/community/gimp-nufraw/nufraw-iostream.patch @@ -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 + #include + #include ++#include + + /* + * Helper function to copy a string to a buffer, converting it from