Merge branch 'feature/upstream' into develop

5 files changed, 282 insertions, 106 deletions

diff --git a/flatpak/org.gnome.Shotwell.Faces.json b/flatpak/org.gnome.Shotwell.Faces.json
new file mode 100644
index 0000000..a44634b
--- /dev/null
+++ b/flatpak/org.gnome.Shotwell.Faces.json
@@ -0,0 +1,97 @@
+{
+    "app-id" : "org.gnome.Shotwell.Faces1",
+    "runtime" : "org.gnome.Platform",
+    "runtime-version" : "40",
+    "sdk" : "org.gnome.Sdk",
+    "tags" : [
+        "nightly"
+    ],
+    "desktop-file-name-prefix" : "(Nightly) ",
+    "finish-args" : [
+        "--env=DCONF_USER_CONFIG_DIR=.config/dconf",
+        "--filesystem=~/.config/dconf:ro",
+        "--filesystem=xdg-download",
+        "--filesystem=xdg-pictures",
+        "--share=ipc",
+        "--talk-name=org.gtk.vfs",
+        "--talk-name=org.gtk.vfs.*"
+    ],
+    "cleanup" : [
+        "/include",
+        "/lib/pkconfig",
+        "/share/pkgconfig",
+        "/share/gtk-doc",
+        "/share/man",
+        "/share/vala",
+        "/lib/girepository",
+        "*.la",
+        "*.a"
+    ],
+    "modules" : [
+        {
+            "name" : "opencv",
+            "buildsystem" : "cmake",
+            "builddir" : true,
+            "cleanup" : [
+                "/share/OpenCV/*.cmake",
+                "/share/OpenCV/*.supp"
+            ],
+            "config-opts" : [
+                "-DBUILD_TESTS=OFF",
+                "-DBUILD_EXAMPLES=OFF",
+                "-DBUILD_PERF_TESTS=OFF",
+                "-DWITH_FFMPEG=OFF",
+                "-DWITH_GTK=OFF",
+                "-DWITH_GSTREAMER=OFF",
+                "-DWITH_JASPER=OFF",
+                "-DWITH_OPENEXR=OFF",
+                "-DWITH_GDAL=OFF",
+                "-DWITH_GDCM=OFF",
+                "-DBUILD_opencv_apps=OFF",
+                "-DCMAKE_INSTALL_LIBDIR=lib",
+                "-DBUILD_LIST=imgproc,imgcodecs,objdetect,dnn"
+            ],
+            "sources" : [
+                {
+                    "type" : "git",
+                    "tag" : "4.2.0",
+                    "commit" : "bda89a6469aa79ecd8713967916bd754bff1d931",
+                    "url" : "https://github.com/opencv/opencv"
+                }
+            ]
+        },
+        {
+            "name" : "shotwell-facedetect",
+            "buildsystem" : "meson",
+            "subdir" : "subprojects/shotwell-facedetect",
+            "sources" : [
+                {
+                    "type" : "git",
+                    "path": "/home/jgeorg/Source/GNOME/shotwell",
+                    "branch" : "master"
+                },
+                {
+                    "type" : "extra-data",
+                    "filename" : "openface.nn4.small2.v1.t7",
+                    "url" : "https://storage.cmusatyalab.org/openface-models/nn4.small2.v1.t7",
+                    "sha256" : "9b72d54aeb24a64a8135dca8e792f7cc675c99a884a6940350a6cedcf7b7ba08",
+                    "size" : 31510785
+                },
+                {
+                    "type" : "extra-data",
+                    "filename" : "res10_300x300_ssd_iter_140000_fp16.caffemodel",
+                    "url" : "https://raw.githubusercontent.com/opencv/opencv_3rdparty/dnn_samples_face_detector_20180205_fp16/res10_300x300_ssd_iter_140000_fp16.caffemodel",
+                    "sha256" : "510ffd2471bd81e3fcc88a5beb4eae4fb445ccf8333ebc54e7302b83f4158a76",
+                    "size" : 5351047
+                },
+                {
+                    "type" : "extra-data",
+                    "filename" : "deploy.prototxt",
+                    "url" : "https://raw.githubusercontent.com/opencv/opencv/master/samples/dnn/face_detector/deploy.prototxt",
+                    "sha256" : "dcd661dc48fc9de0a341db1f666a2164ea63a67265c7f779bc12d6b3f2fa67e9",
+                    "size" : 28104
+                }
+            ]
+        }
+    ]
+}
diff --git a/flatpak/org.gnome.Shotwell.json b/flatpak/org.gnome.Shotwell.json
index e32147b..d3ce3f8 100644
--- a/flatpak/org.gnome.Shotwell.json
+++ b/flatpak/org.gnome.Shotwell.json
@@ -1,35 +1,29 @@
 {
-    "app-id": "org.gnome.Shotwell",
-    "runtime": "org.gnome.Platform",
-    "runtime-version": "41",
-    "branch": "testing",
-    "sdk": "org.gnome.Sdk",
+    "app-id" : "org.gnome.Shotwell",
+    "runtime" : "org.gnome.Platform",
+    "runtime-version" : "master",
+    "sdk" : "org.gnome.Sdk",
     "command" : "shotwell",
-    "rename-desktop-file" : "shotwell.desktop",
-    "rename-icon" : "shotwell",
-    "rename-appdata-file" : "shotwell.appdata.xml",
     "tags" : [
-        "testing"
+        "nightly"
     ],
-    "finish-args": [
-        "--env=DCONF_USER_CONFIG_DIR=.config/dconf",
-        "--filesystem=~/.config/dconf:ro",
-        "--filesystem=xdg-run/dconf",
+    "desktop-file-name-prefix" : "(Nightly) ",
+    "finish-args" : [
         "--filesystem=/media",
         "--filesystem=/run/media",
         "--filesystem=xdg-download",
         "--filesystem=xdg-pictures",
+        "--filesystem=xdg-run/gvfsd",
         "--share=ipc",
         "--share=network",
         "--device=all",
+        "--device=dri",
         "--socket=wayland",
-        "--socket=x11",
-        "--talk-name=ca.desrt.dconf",
+        "--socket=fallback-x11",
         "--talk-name=org.freedesktop.FileManager1",
         "--talk-name=org.gnome.SettingsDaemon",
-        "--talk-name=org.gtk.vfs",
         "--talk-name=org.gtk.vfs.*",
-        "--env=GSETTINGS_BACKEND=dconf"
+        "--talk-name=org.freedesktop.secrets"
     ],
     "cleanup" : [
         "/include",
@@ -44,138 +38,227 @@
     ],
     "modules" : [
         {
-            "name": "libusb",
+            "name" : "opencv",
+            "buildsystem" : "cmake-ninja",
+            "builddir" : true,
+            "cleanup" : [
+                "/share/OpenCV/*.cmake",
+                "/share/OpenCV/*.supp"
+            ],
+            "build-options" : {
+                "cxxflags" : "-Wp,-U_GLIBCXX_ASSERTIONS",
+                "cflags" : "-Wp,-U_GLIBCXX_ASSERTIONS"
+            },
+            "config-opts" : [
+                "-DCMAKE_BUILD_TYPE=Release",
+                "-DOPENCV_GENERATE_PKGCONFIG=ON",
+                "-DBUILD_TESTS=OFF",
+                "-DBUILD_EXAMPLES=OFF",
+                "-DBUILD_PERF_TESTS=OFF",
+                "-DWITH_FFMPEG=OFF",
+                "-DWITH_GTK=OFF",
+                "-DWITH_GSTREAMER=OFF",
+                "-DWITH_JASPER=OFF",
+                "-DWITH_OPENEXR=OFF",
+                "-DWITH_GDAL=OFF",
+                "-DWITH_GDCM=OFF",
+                "-DBUILD_opencv_apps=OFF",
+                "-DCMAKE_INSTALL_LIBDIR=lib",
+                "-DBUILD_LIST=imgproc,imgcodecs,objdetect,dnn"
+            ],
             "sources" : [
                 {
-                "type" : "archive",
-                    "url" : "https://github.com/libusb/libusb/archive/v1.0.24.tar.gz",
-                    "sha256" : "b7724c272dfc5713dce88ff717efd60f021ca5b7c8e30f08ebb2c42d2eea08ae"
+                    "type" : "git",
+                    "commit" : "6dbc5e032fa851d1a25fb4a895d735ed3441975b",
+                    "url" : "https://github.com/opencv/opencv"
                 }
-            ],
-            "config-opts" : ["--disable-udev"]
+            ]
         },
-	{
+        {
             "name": "libportal",
             "buildsystem": "meson",
             "builddir": true,
             "config-opts": [
                  "--libdir=/app/lib",
                 "--buildtype=debugoptimized",
-		"-Dbackends=gtk3",
-		"-Ddocs=false",
-		"-Dtests=false"
+                "-Dbackend-gtk3=enabled",
+                "-Dbackend-gtk4=disabled",
+                "-Dbackend-qt5=disabled",
+                "-Ddocs=false",
+                "-Dtests=false"
             ],
             "sources" : [
                 {
                     "type": "git",
                     "url": "https://github.com/flatpak/libportal.git",
-		    "branch": "main"
+                    "branch": "main"
                 }
             ]
-	},
+        },
         {
-            "name": "libghoto2",
-            "cleanup" : ["/bin", "/lib/udev", "/share/doc"],
+            "name" : "libusb",
             "sources" : [
                 {
                     "type" : "archive",
-                    "url" : "https://github.com/gphoto/libgphoto2/releases/download/v2.5.27/libgphoto2-2.5.27.tar.xz",
-                    "sha256" : "a7253bd18c6ef65352150ac36a668f883a5ad2634eb6455b3ca9aa6ac98d0073",
-                    "dest-filename" : "libgphoto2-2.5.27.tar.xz"
+                    "url" : "https://github.com/libusb/libusb/releases/download/v1.0.26/libusb-1.0.26.tar.bz2",
+                    "sha256" : "12ce7a61fc9854d1d2a1ffe095f7b5fac19ddba095c259e6067a46500381b5a5"
                 }
             ],
-            "config-opts" : ["--disable-introspection", "--disable-docs"]
+            "config-opts" : [
+                "--disable-udev"
+            ]
         },
         {
-            "name": "liboauth",
-            "config-opts": [ "--enable-nss" ],
-            "sources": [
+            "name" : "libghoto2",
+            "cleanup" : [
+                "/bin",
+                "/lib/udev",
+                "/share/doc"
+            ],
+            "sources" : [
                 {
-                    "type": "archive",
-                    "url" : "https://sourceforge.net/projects/liboauth/files/liboauth-1.0.3.tar.gz/download",
-                    "sha256" : "0df60157b052f0e774ade8a8bac59d6e8d4b464058cc55f9208d72e41156811f",
-                    "dest-filename" : "liboauth-1.0.3.tar.gz"
+                    "type" : "archive",
+                    "url" : "https://sourceforge.net/projects/gphoto/files/libgphoto/2.5.30/libgphoto2-2.5.30.tar.bz2/download",
+                    "sha256" : "ee61a1dac6ad5cf711d114e06b90a6d431961a6e7ec59f4b757a7cd77b1c0fb4",
+                    "dest-filename" : "libgphoto2-2.5.30.tar.bz2"
                 }
+            ],
+            "config-opts" : [
+                "--disable-introspection",
+                "--disable-docs"
             ]
         },
         {
-            "name": "libgdata",
-            "buildsystem" : "meson",
-            "cleanup": ["/share/gtk-doc"],
-            "config-opts": [ "-Dintrospection=false", "-Dalways_build_tests=false", "-Dgoa=disabled", "-Dgtk_doc=false"],
-                "sources": [
-                    {
-                        "type": "archive",
-                        "url": "https://download.gnome.org/sources/libgdata/0.17/libgdata-0.17.13.tar.xz",
-                        "sha256": "eab9ef792c3c2b9ece19d45aea15225aba8df2521bc12785b1b2d3318d8c472e"
-                    }
-                ]
+            "name": "libraw",
+            "config-opts": [ "--disable-examples", "--disable-static" ],
+            "cleanup": [ "/share/doc" ],
+            "sources": [
+                {
+                    "type": "archive",
+                    "url" : "https://www.libraw.org/data/LibRaw-0.21.1.tar.gz",
+                    "sha256" : "630a6bcf5e65d1b1b40cdb8608bdb922316759bfb981c65091fec8682d1543cd"
+                },
+                {
+                    "type": "patch",
+                    "path": "patches/libraw-pkgconfig.patch"
+                },
+                {
+                    "type": "shell",
+                    "commands": [
+                        "autoreconf -fiv"
+                    ]
+                }
+            ]
         },
         {
-            "name": "exiv2",
-            "cleanup": [ "/bin" ],
-            "buildsystem": "cmake-ninja",
+            "name" : "exiv2",
+            "cleanup" : [
+                "/bin"
+            ],
+            "buildsystem" : "cmake-ninja",
             "config-opts" : [
+                "-DCMAKE_INSTALL_LIBDIR=lib",
                 "-DCMAKE_BUILD_TYPE=Release",
                 "-DEXIV2_BUILD_EXIV2_COMMAND=OFF",
-                "-DEXIV2_BUILD_SAMPLES=OFF"
+                "-DEXIV2_BUILD_SAMPLES=OFF",
+                "-DEXIV2_BUILD_UNIT_TESTS=OFF",
+                "-DEXIV2_ENABLE_BMFF=ON"
             ],
-            "sources": [
+            "sources" : [
                 {
-                    "type": "git",
-                    "url": "https://github.com/Exiv2/exiv2/",
-                    "commit" : "d3f7e92240a5e8bb827846c6094f46f9c7b53585"
+                    "type" : "git",
+                    "url" : "https://github.com/Exiv2/exiv2/",
+                    "branch" : "0.27-maintenance"
                 }
             ]
         },
         {
-            "name": "gexiv2",
+            "name" : "gexiv2",
             "buildsystem" : "meson",
-            "cleanup" : ["/lib/girepository-1.0", "/share/gir-1.0"],
-            "config-opts" : ["-Dpython2_girdir=no", "-Dpython3_girdir=no"],
+            "cleanup" : [
+                "/lib/girepository-1.0",
+                "/share/gir-1.0"
+            ],
+            "config-opts" : [
+                "-Dpython3=false"
+            ],
             "build-options" : {
-                "env": {
-                    "PKG_CONFIG_GOBJECT_INTROSPECTION_1_0_GIRDIR": "/app/share/gir-1.0",
-                    "PKG_CONFIG_GOBJECT_INTROSPECTION_1_0_TYPELIBDIR": "/app/lib/girepository-1.0"
+                "env" : {
+                    "PKG_CONFIG_GOBJECT_INTROSPECTION_1_0_GIRDIR" : "/app/share/gir-1.0",
+                    "PKG_CONFIG_GOBJECT_INTROSPECTION_1_0_TYPELIBDIR" : "/app/lib/girepository-1.0"
                 }
             },
-            "sources": [
+            "sources" : [
                 {
-                    "type": "git",
-                    "url": "https://gitlab.gnome.org/GNOME/gexiv2.git/",
-                    "commit" : "e4d65b31cd77f28ef248117e161de9d8cc31d712"
+                    "type" : "git",
+                    "url" : "https://gitlab.gnome.org/GNOME/gexiv2.git/"
                 }
             ]
         },
         {
-            "name": "libraw",
-            "config-opts": [ "--disable-examples", "--disable-static" ],
-            "cleanup": [ "/share/doc" ],
-            "sources": [
+            "name": "de256",
+            "buildsystem": "cmake-ninja",
+            "config-opts" : [
+                "-DCMAKE_INSTALL_LIBDIR=lib",
+                "-DCMAKE_BUILD_TYPE=Release",
+                "-DENABLE_DECODER=Off",
+                "-DENABLE_ENCODER=OfF"
+            ],
+            "sources" : [
                 {
-                    "type": "archive",
-                    "url" : "https://www.libraw.org/data/LibRaw-0.20.0.tar.gz",
-                    "sha256" : "1f0a383da2ce9f409087facd28261decbf6be72cc90c78cd003b0766e4d694a3"
-                },
+                    "type": "git",
+                    "url" : "https://github.com/strukturag/libde265.git",
+                    "tag" : "v1.0.11",
+                    "commit" : "e255f0571a46935955deef15808e52b18043788c"
+                }
+            ]
+        },
+        {
+            "name" : "libheif",
+            "buildsystem" : "cmake-ninja",
+            "config-opts": [
+                "-DCMAKE_INSTALL_LIBDIR=lib",
+                "-DCMAKE_BUILD_TYPE=Release",
+                "-DLIBDE265=On",
+                "-DWITH_DAV1D=Off",
+                "-DWITH_AOM_ENCODER=Off",
+                "-DWITH_AOM_DECODER=Off",
+                "-DWITH_SvtEnc=Off",
+                "-DWITH_RAV1E=Off",
+                "-DWITH_ENABLE_PLUGIN_LOADING=On",
+                "-DWITH_EXAMPLES=Off"
+            ],
+            "sources" : [
                 {
-                    "type": "patch",
-                    "path": "patches/libraw-pkgconfig.patch"
+                    "type" : "git",
+                    "url" : "https://github.com/strukturag/libheif",
+                    "tag" : "v1.15.2",
+                    "commit" : "516ef5522680c7cb62768a34ecb24f3b165ec8b4"
                 }
+            ],
+            "post-install" :  [
+                "mkdir -p /app/lib/gdk-pixbuf-2.0/2.10.0/loaders",
+                "mv $(pkg-config --define-variable=prefix=/app --variable=gdk_pixbuf_moduledir gdk-pixbuf-2.0)/* /app/lib/gdk-pixbuf-2.0/2.10.0/loaders",
+                "gdk-pixbuf-query-loaders /app/lib/gdk-pixbuf-2.0/2.10.0/loaders/*  > /app/lib/gdk-pixbuf-2.0/2.10.0/loaders.cache"
             ]
         },
         {
-            "name": "shotwell",
-            "buildsystem": "meson",
-            "config-opts" : ["-Dudev=false", "-Dinstall-apport-hook=false", "-Dface-detection=false", "-Dfatal_warnings=false"],
+            "name" : "shotwell",
+            "buildsystem" : "meson",
+            "config-opts" : [
+                "-Dfatal_warnings=true",
+                "-Dudev=false",
+                "-Dinstall_apport_hook=false",
+                "-Dface_detection_helper_bus=private",
+                "-Dface_detection=true",
+                "-Dextra_pixbuf_loaders_path=/app/lib/gdk-pixbuf-2.0/2.10.0"
+            ],
             "sources" : [
                 {
-                    "type": "git",
+                    "type" : "git",
                     "url" : "https://gitlab.gnome.org/GNOME/shotwell.git/",
-                    "commit" : "382ac43b6b5fb688bf43a03601e48abd05925b89"
+                    "branch" : "master"
                 }
-            ],
-            "post-install" : [
-                "mv /app/share/applications/shotwell-viewer.desktop /app/share/applications/org.gnome.Shotwell.Viewer.desktop"
             ]
         }
     ]
diff --git a/flatpak/org.gnome.Shotwell.nightly.flatpakref b/flatpak/org.gnome.Shotwell.nightly.flatpakref
deleted file mode 100644
index a589642..0000000
--- a/flatpak/org.gnome.Shotwell.nightly.flatpakref
+++ /dev/null
@@ -1,8 +0,0 @@
-[Flatpak Ref]
-Name=org.gnome.Shotwell
-Branch=master
-Title=org.gnome.Shotwell from Shotwell nightly
-Url=https://shotwell-project.org/flatpak/nightly
-RuntimeRepo=https://dl.flathub.org/repo/flathub.flatpakrepo
-IsRuntime=false
-GPGKey=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
diff --git a/flatpak/org.gnome.Shotwell.unstable.flatpakref b/flatpak/org.gnome.Shotwell.unstable.flatpakref
index 6ae8621..f347561 100644
--- a/flatpak/org.gnome.Shotwell.unstable.flatpakref
+++ b/flatpak/org.gnome.Shotwell.unstable.flatpakref
@@ -5,4 +5,4 @@ Title=org.gnome.Shotwell from Shotwell unstable
 Url=https://shotwell-project.org/flatpak/nightly
 RuntimeRepo=https://dl.flathub.org/repo/flathub.flatpakrepo
 IsRuntime=false
-GPGKey=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
+GPGKey=mQINBF0oVpgBEACT0HBw+i5YPxwnzkT8vAx/2lQ5R+2FTJ8MBEGi+a7A/G9c24hg5ikq9IGCbRzSg9kC8i5O6TjFZkauk+nfc2JGeSuNqrXzZqf5vW2Tx/EewzcQWBfrVQWmjT9r/5kkpxoUE5hKTOGRCqZNb064CmQGw8Jk5joRe6DvOcYO0AtRo3hUQqfIrYSsyxpZsN8L3/9UPo1ynASCdhWTqsfb2323LrahDzFwSbQFkEv2/7C0Bh0KvGX9MOq/SCNnSFpAafKUd97+/B8ymujAc4Dbk0MawaOfgeHdaxlgEstFIgQ2pkH1VEgNWuBiANTGFpl1vV///k4xIDNFR40zAxGaVjA2uOu+T+pnwEIkI0oERxeMpg38Mcobxd3/w/Z+jkNbroPahbdAsz4JNx0X49dJYwo9ytUSpDhLe0F1AyN1OZpTwv2rgyESsCB4iuHPdwvser1RCbTDmwrdoNO7hwkKigsJovZPgbQj4YoxhsHjvYVoj8mnWOwmunSz6Jxsz86ebgv7clipwXh2+u5rn3+dbrzui53UqyeH3bq714Miuj6rl2lmquQ1Ht/18/GE+pfmPQQR34G2iJxy5Iwy6YeNGNFil8Aw4UsuJkTXNurz37mR7JGAaurACuaNUaDLUKj5UBk5ul0RWyVkj8NSm5ZX0AiQ41jCwQCAgA2nGjpo6H0c/QARAQABtItTaG90d2VsbCBOaWdodGx5IEZsYXRwYWsgc2lnbmluZyBrZXkgIzIgKFRoaXMga2V5IGlzIHVzZWQgdG8gc2lnbiBTaG90d2VsbCdzIG5pZ2h0bHkgRmxhdHBhayBidWlsZHMpIDxmbGF0cGFrLW5pZ2h0bHlAc2hvdHdlbGwtcHJvamVjdC5vcmc+iQJUBBMBCgA+FiEEIL91I+xaQ1BqAO73ltwDoQTyJ7QFAl0oVpgCGwMFCQPCZwAFCwkIBwIGFQoJCAsCBBYCAwECHgECF4AACgkQltwDoQTyJ7Rw7xAAiw5bwdENiBe6WhTQbZ1U4bEuL06Ef6pc9fmCtCCvkyvxG+pp/h6xXwZNNlHaS6BCLgEAyGg9fk+/2orWXcRKif1uZUDsWoOMd7BW6Me+wzQY6tDtzvokkfiHkGAFwTNCJMP89i/KlGNLSiUAsQ/N00H1NXLPQzX0gd2poWVEHZR7W54jNuTYn8cTAbGIeQ3swgNUF7pGS+bjGllykNXl7AAUe3dZSGWoGqTsu0+OQOyGR4Fmez+TIyq1SGwa6LMlJw6XLtyt8AkL8sBAmvqW8cjDlNyRp8akWH18iaJ7ImpjQ3nHJSl6Kmdf38wPUMBa8IN5QWdhl/flUShkRVfaeV5kp3xHjsof1YDvSOxIf00HB/e7xwNmSYxE3nII7u5fVYZ4PwPLkJh8x8h3xfDcslS3DSCvbzejrtSeSRHrao+4OK5fVZv2L1mU0eEaImAoo7sHzeH2sCJ5aiwrbHkL+AqJ3ptAze9dk1Gyj8vjxh2D2nR/8/hm7EgziWfktTkoR6WVi9FnspsqIKlBmopNJDk/83B9gHrfBRzbN1Qa3zB+tJZCZ0BzoMrVzhb3mQ01V467Bg5VXcnpDDTHRvEZ/pN0UfvzmXwWAUj7pXc1ii24cwaXXfFzhmXor5qPgAEzglkPPRIJ1JCYKgEmcH68CQWbEmSUef3K7OO4dOcu+u2JAjMEEAEKAB0WIQRQuhty3ayIYfV90RpfKjkDEXmmcAUCXShcxwAKCRBfKjkDEXmmcK/MD/9zDiErvAdcJK5e+ktFq1vC2ypCX1vXvYylRUk9mZ9SbXdNSPHWCZrb8A1CNwvP5qQUlZ96BCD3zcpWGgQmtxiWpHwA510ArtKcvZyzWWpE9ZeI/VBXV2G9mnbwsKxVknAracnGz4iOOMKLDdHw7MZGlizdPzo28f+/N7GLc907wo46kZyx0yR0G+OvNwiW/wXwaff5QdwL9HiDSr0TzUK6ESVeEV85EA5wQvTuGmWicutwpEyG6VbgJH9TxgjpuNwqPHQoda9Iov1yvBZPwHqWl/E8Toe2h5ELODyAtpO02yjFmYZpV8V91m6E06xcIlK9BIsOGogYXDtxSLkvuQndrRJjbcGU2ZfoTl8SS1gQiJxT55vyE6tw/h8DJiXnZoMmR25Uvf6HgEvOdWJuXHuqZEH0Qpfi45zlSJf9eM4ACGVdqO547RKl9znm0upSVp3KbiMSvd8pBy8fgwHi42mX2N96IF/ISnXpO3dYnzd1/f06VlAXKHsoy3Skbh+Bla9T0frGISD9vR4iFtEoe9AM5n/7B5zJ9MtqUKGbHQuQysjZuQgVX8VxvchxNvrI09aEw6hspzymekeEo3imKgcxz61WTQ6ExldaAgDga4iZSeUh3tq2UjMux02KxWxNau97PNZeUwCggYZd1nnpb5GhizrPQlv/UskD8xv1FzqFBg==
diff --git a/flatpak/patches/libraw-pkgconfig.patch b/flatpak/patches/libraw-pkgconfig.patch
index 5b60b03..7af6ae0 100644
--- a/flatpak/patches/libraw-pkgconfig.patch
+++ b/flatpak/patches/libraw-pkgconfig.patch
@@ -1,6 +1,7 @@
---- 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 @@
+diff -r -u foo/libraw.pc.in libraw-7/libraw.pc.in
+--- foo/libraw.pc.in	2023-04-01 14:26:50.358780145 +0200
++++ libraw-7/libraw.pc.in	2023-01-05 07:49:26.000000000 +0100
+@@ -5,8 +5,8 @@
  
  Name: libraw
  Description: Raw image decoder library (non-thread-safe)
@@ -8,12 +9,14 @@
 +Requires.private: @PACKAGE_REQUIRES@
  Version: @PACKAGE_VERSION@
 -Libs: -L${libdir} -lraw -lstdc++@PC_OPENMP@
+-Libs.private: @PACKAGE_LIBS_PRIVATE@
 +Libs: -L${libdir} -lraw@PC_OPENMP@
-+Libs.private: -lstdc++
++Libs.private: @PACKAGE_LIBS_PRIVATE@ -lstdc++
  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 @@
+diff -r -u foo/libraw_r.pc.in libraw-7/libraw_r.pc.in
+--- foo/libraw_r.pc.in	2023-04-01 14:26:50.358780145 +0200
++++ libraw-7/libraw_r.pc.in	2023-01-05 07:49:26.000000000 +0100
+@@ -5,8 +5,8 @@
  
  Name: libraw
  Description: Raw image decoder library (thread-safe)
@@ -21,6 +24,7 @@
 +Requires.private: @PACKAGE_REQUIRES@
  Version: @PACKAGE_VERSION@
 -Libs: -L${libdir} -lraw_r -lstdc++@PC_OPENMP@
+-Libs.private: @PACKAGE_LIBS_PRIVATE@
 +Libs: -L${libdir} -lraw_r@PC_OPENMP@
-+Libs.private: -lstdc++
++Libs.private: @PACKAGE_LIBS_PRIVATE@ -lstdc++
  Cflags: -I${includedir}/libraw -I${includedir}