Merge branch 'release/debian/46.0-1'HEADdebian/46.0-1master

2 files changed, 91 insertions, 26 deletions

diff --git a/build-aux/flatpak/org.gnome.SimpleScan.json b/build-aux/flatpak/org.gnome.SimpleScan.json
index 1acdaa2..54643d4 100644
--- a/build-aux/flatpak/org.gnome.SimpleScan.json
+++ b/build-aux/flatpak/org.gnome.SimpleScan.json
@@ -57,34 +57,99 @@
             ]
         },
         {
-            "name" : "udev",
-            "config-opts" : [
-                "--disable-hwdb",
-                "--disable-logging",
-                "--disable-gudev",
-                "--disable-introspection",
-                "--disable-keymap",
-                "--disable-mtd_probe"
+            "name": "python3-jinja2",
+            "buildsystem": "simple",
+            "build-commands": [
+                "pip3 install --verbose --exists-action=i --no-index --find-links=\"file://${PWD}\" --prefix=${FLATPAK_DEST} \"jinja2\" --no-build-isolation"
             ],
-            "cleanup" : [
-                "/include",
+            "sources": [
+                {
+                    "type": "file",
+                    "url": "https://files.pythonhosted.org/packages/1d/97/2288fe498044284f39ab8950703e88abbac2abbdf65524d576157af70556/MarkupSafe-2.1.1.tar.gz",
+                    "sha256": "7f91197cc9e48f989d12e4e6fbc46495c446636dfc81b9ccf50bb0ec74b91d4b"
+                },
+                {
+                    "type": "file",
+                    "url": "https://files.pythonhosted.org/packages/bc/c3/f068337a370801f372f2f8f6bad74a5c140f6fda3d9de154052708dd3c65/Jinja2-3.1.2-py3-none-any.whl",
+                    "sha256": "6088930bfe239f0e6710546ab9c19c9ef35e29792895fed6e6e31a023a182a61"
+                }
+            ]
+        },
+        {
+            "name": "systemd",
+            "buildsystem": "meson",
+            "config-opts": [
+                "--libdir=lib",
+                "-Drootprefix=/app",
+                "-Drootlibdir=/app/lib",
+                "-Dsysconfdir=/app/etc",
+                "-Ddocdir=/app/share/doc",
+                "-Dsysvinit-path=/app/etc/init.d",
+
+                "-Dfdisk=false",
+                "-Ddbus=false",
+                "-Dutmp=false",
+                "-Dhibernate=false",
+                "-Dldconfig=false",
+                "-Dresolve=false",
+                "-Defi=false",
+                "-Dtpm=false",
+                "-Denvironment-d=false",
+                "-Dbinfmt=false",
+                "-Dcoredump=false",
+                "-Dlogind=false",
+                "-Dhostnamed=false",
+                "-Dlocaled=false",
+                "-Dmachined=false",
+                "-Dportabled=false",
+                "-Dnetworkd=false",
+                "-Dtimedated=false",
+                "-Dtimesyncd=false",
+                "-Dremote=false",
+                "-Dnss-myhostname=false",
+                "-Dnss-mymachines=false",
+                "-Dnss-resolve=false",
+                "-Dnss-systemd=false",
+                "-Dfirstboot=false",
+                "-Drandomseed=false",
+                "-Dbacklight=false",
+                "-Dvconsole=false",
+                "-Dquotacheck=false",
+                "-Dsysusers=false",
+                "-Dtmpfiles=false",
+                "-Dimportd=false",
+                "-Dhwdb=false",
+                "-Drfkill=false",
+                "-Dman=false",
+                "-Dhtml=false",
+                "-Dbashcompletiondir=no",
+                "-Dzshcompletiondir=no"
+            ],
+            "cleanup": [
+                "/bin",
                 "/etc",
-                "/libexec",
-                "/sbin",
-                "/lib/pkgconfig",
-                "/man",
-                "/share/aclocal",
+                "/lib/libudev*",
+                "/lib/kernel",
+                "/lib/modprobe.d",
+                "/lib/rpm",
+                "/lib/sysctl.d",
+                "/lib/systemd",
+                "/lib/udev",
+                "/share/dbus-1",
                 "/share/doc",
-                "/share/gtk-doc",
+                "/share/factory",
+                "/share/glib-2.0",
+                "/share/icons",
                 "/share/man",
                 "/share/pkgconfig",
-                "*.la",
-                "*.a"
+                "/share/polkit-1",
+                "/share/runtime"
             ],
-            "sources" : [
+            "sources": [
                 {
-                    "type" : "git",
-                    "url" : "https://github.com/gentoo/eudev.git"
+                    "type": "git",
+                    "url": "https://github.com/systemd/systemd.git",
+                    "tag": "v251"
                 }
             ]
         },
@@ -92,8 +157,7 @@
             "name" : "gudev",
             "buildsystem" : "meson",
             "config-opts" : [
-                "-Dtests=disabled",
-                "-Dintrospection=disabled"
+                "-Dtests=disabled"
             ],
             "sources" : [
                 {
diff --git a/build-aux/snap/snapcraft.yaml b/build-aux/snap/snapcraft.yaml
index a2b5b20..2a50893 100644
--- a/build-aux/snap/snapcraft.yaml
+++ b/build-aux/snap/snapcraft.yaml
@@ -6,7 +6,7 @@ description: |
 
 grade: stable # must be 'stable' to release into candidate/stable channels
 confinement: strict
-base: core20
+base: core22
 
 slots:
   # for GtkApplication registration
@@ -28,7 +28,7 @@ apps:
       - io-ports-control
       - raw-usb
     command: usr/bin/simple-scan
-    extensions: [ gnome-3-38 ]
+    extensions: [ gnome ]
     desktop: usr/share/applications/simple-scan.desktop
     environment:
       GSETTINGS_SCHEMA_DIR: $SNAP/share/glib-2.0/schemas
@@ -81,7 +81,8 @@ parts:
       - libcolord-dev
       - libdbus-glib-1-dev
       - libglib2.0-dev
-      - libgtk-3-dev
+      - libgtk-4-dev
+      - libadwaita-1-dev
       - libgdk-pixbuf2.0-dev
       - libgusb-dev
       - libgirepository1.0-dev