Merge branch 'release/debian/0.30.1-1'debian/0.30.1-1

2 files changed, 68 insertions, 0 deletions

diff --git a/flatpak/patches/exiv2-no-builddir.patch b/flatpak/patches/exiv2-no-builddir.patch
new file mode 100644
index 0000000..939a6d1
--- /dev/null
+++ b/flatpak/patches/exiv2-no-builddir.patch
@@ -0,0 +1,25 @@
+From ba7a8cfe30342592e277ad41837f0eb5c6e88648 Mon Sep 17 00:00:00 2001
+From: Emmanuele Bassi <ebassi@gnome.org>
+Date: Wed, 20 Jan 2016 17:00:19 +0000
+Subject: [PATCH] Disable builddir for exiv2
+
+It's not supported.
+---
+ configure | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/configure b/configure
+index 4cd76eb..7848532 100755
+--- a/configure
++++ b/configure
+@@ -19914,6 +19914,8 @@ fi
+ # Configuration summary.
+ # ---------------------------------------------------------------------------
+
++echo \#buildapi-variable-no-builddir >/dev/null
++
+ echo ""
+ echo "------------------------------------------------------------------"
+ echo "-- Exiv2 $VERSION feature configuration summary"
+--
+2.5.0
diff --git a/flatpak/patches/libraw-pkgconfig.patch b/flatpak/patches/libraw-pkgconfig.patch
new file mode 100644
index 0000000..8ef671a
--- /dev/null
+++ b/flatpak/patches/libraw-pkgconfig.patch
@@ -0,0 +1,43 @@
+From bf4b0b6a3ec1579916475295ac42a5f98559a04b Mon Sep 17 00:00:00 2001
+From: Emmanuele Bassi <ebassi@gnome.org>
+Date: Fri, 12 Feb 2016 18:29:35 +0000
+Subject: [PATCH] Add pkg-config file to LibRaw
+
+Taken from the Fedora package.
+---
+ libraw.pc.in   | 5 +++--
+ libraw_r.pc.in | 5 +++--
+ 2 files changed, 6 insertions(+), 4 deletions(-)
+
+diff --git a/libraw.pc.in b/libraw.pc.in
+index 0e530b2..0c635f0 100644
+--- a/libraw.pc.in
++++ b/libraw.pc.in
+@@ -5,7 +5,8 @@ includedir=@includedir@
+
+ Name: libraw
+ Description: Raw image decoder library (non-thread-safe)
+-Requires: @PACKAGE_REQUIRES@
++Requires.private: @PACKAGE_REQUIRES@
+ Version: @PACKAGE_VERSION@
+-Libs: -L${libdir} -lraw -lstdc++@PC_OPENMP@
++Libs: -L${libdir} -lraw@PC_OPENMP@
++Libs.private: -lstdc++
+ Cflags: -I${includedir}/libraw
+diff --git a/libraw_r.pc.in b/libraw_r.pc.in
+index a7f4535..c4e6028 100644
+--- a/libraw_r.pc.in
++++ b/libraw_r.pc.in
+@@ -5,7 +5,8 @@ includedir=@includedir@
+
+ Name: libraw
+ Description: Raw image decoder library (thread-safe)
+-Requires: @PACKAGE_REQUIRES@
++Requires.private: @PACKAGE_REQUIRES@
+ Version: @PACKAGE_VERSION@
+-Libs: -L${libdir} -lraw_r -lstdc++@PC_OPENMP@
++Libs: -L${libdir} -lraw_r@PC_OPENMP@
++Libs.private: -lstdc++
+ Cflags: -I${includedir}/libraw
+--
+2.5.0