From 9e0516824a0f79514aca5d6dbb1aa21cd247ba05 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Frings-F=C3=BCrst?= <debian@jff.email>
Date: Sat, 21 May 2022 19:43:54 +0200
Subject: New upstream version 0.30.16

---
 flatpak/org.gnome.Shotwell.json        |  7 +++++--
 flatpak/patches/libraw-pkgconfig.patch | 37 +++++++++-------------------------
 2 files changed, 15 insertions(+), 29 deletions(-)

(limited to 'flatpak')

diff --git a/flatpak/org.gnome.Shotwell.json b/flatpak/org.gnome.Shotwell.json
index 47037c7..d79226f 100644
--- a/flatpak/org.gnome.Shotwell.json
+++ b/flatpak/org.gnome.Shotwell.json
@@ -2,12 +2,15 @@
     "app-id": "org.gnome.Shotwell",
     "runtime": "org.gnome.Platform",
     "runtime-version": "41",
-    "branch": "stable",
+    "branch": "testing",
     "sdk": "org.gnome.Sdk",
     "command" : "shotwell",
     "rename-desktop-file" : "shotwell.desktop",
     "rename-icon" : "shotwell",
     "rename-appdata-file" : "shotwell.appdata.xml",
+    "tags" : [
+        "testing"
+    ],
     "finish-args": [
         "--env=DCONF_USER_CONFIG_DIR=.config/dconf",
         "--filesystem=~/.config/dconf:ro",
@@ -137,7 +140,7 @@
                 },
                 {
                     "type": "patch",
-                    "path": "libraw-pkgconfig.patch"
+                    "path": "patches/libraw-pkgconfig.patch"
                 }
             ]
         },
diff --git a/flatpak/patches/libraw-pkgconfig.patch b/flatpak/patches/libraw-pkgconfig.patch
index 8ef671a..5b60b03 100644
--- a/flatpak/patches/libraw-pkgconfig.patch
+++ b/flatpak/patches/libraw-pkgconfig.patch
@@ -1,20 +1,7 @@
-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@
-
+--- LibRaw-0.20-Beta1/libraw.pc.in~	2020-05-13 14:22:12.656424311 +0200
++++ LibRaw-0.20-Beta1/libraw.pc.in	2020-05-13 14:22:27.481441569 +0200
+@@ -5,7 +5,8 @@
+ 
  Name: libraw
  Description: Raw image decoder library (non-thread-safe)
 -Requires: @PACKAGE_REQUIRES@
@@ -23,13 +10,11 @@ index 0e530b2..0c635f0 100644
 -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@
-
+ Cflags: -I${includedir}/libraw -I${includedir}
+--- LibRaw-0.20-Beta1/libraw_r.pc.in~	2020-05-13 14:22:18.034430572 +0200
++++ LibRaw-0.20-Beta1/libraw_r.pc.in	2020-05-13 14:22:27.481441569 +0200
+@@ -5,7 +5,8 @@
+ 
  Name: libraw
  Description: Raw image decoder library (thread-safe)
 -Requires: @PACKAGE_REQUIRES@
@@ -38,6 +23,4 @@ index a7f4535..c4e6028 100644
 -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
+ Cflags: -I${includedir}/libraw -I${includedir}
-- 
cgit v1.2.3