[gnome-photos/gnome-3-24] flatpak: Restore patch to fix LibRaw's pkgconfig file



commit fd2e1132f6e520120528b1a7873c433d8c1be754
Author: Debarshi Ray <debarshir gnome org>
Date:   Fri Sep 8 13:20:53 2017 +0200

    flatpak: Restore patch to fix LibRaw's pkgconfig file
    
    This patch was mistakenly removed because our version of the patch
    has a commit message that claimed:
      "Add pkg-config file to LibRaw"
    
    In reality, it merely fixes some of the flags in the existing pkgconfig
    file shipped by LibRaw.
    
    This reverts part of 21a07e09e40dc117e30abb18a825cd9f217f52e3

 flatpak/libraw-pkgconfig.patch |   44 ++++++++++++++++++++++++++++++++++++++++
 flatpak/org.gnome.Photos.json  |    4 +++
 2 files changed, 48 insertions(+), 0 deletions(-)
---
diff --git a/flatpak/libraw-pkgconfig.patch b/flatpak/libraw-pkgconfig.patch
new file mode 100644
index 0000000..505fdd7
--- /dev/null
+++ b/flatpak/libraw-pkgconfig.patch
@@ -0,0 +1,44 @@
+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
+
diff --git a/flatpak/org.gnome.Photos.json b/flatpak/org.gnome.Photos.json
index aaac150..5f3d2f1 100644
--- a/flatpak/org.gnome.Photos.json
+++ b/flatpak/org.gnome.Photos.json
@@ -132,6 +132,10 @@
                     "type": "archive",
                     "url": "http://www.libraw.org/data/LibRaw-0.18.2.tar.gz";,
                     "sha256": "ce366bb38c1144130737eb16e919038937b4dc1ab165179a225d5e847af2abc6"
+                },
+                {
+                    "type": "patch",
+                    "path": "libraw-pkgconfig.patch"
                 }
             ]
         },


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]