Merge branch 'master' into gtk4

.github/workflows/main.yml

@@ -25,37 +25,36 @@ jobs:
     - name: Install Dependencies
       run: |
         apt update
-        apt install -y gettext libadwaita-1-dev libappstream-dev libflatpak-dev libgee-0.8-dev libgranite-7-dev libgtk-4-dev libjson-glib-dev libpackagekit-glib2-dev libsoup2.4-dev libxml2-dev libxml2-utils libpolkit-gobject-1-dev meson valac
-
+        apt install -y gettext libadwaita-1-dev libappstream-dev libflatpak-dev libgee-0.8-dev libgranite-7-dev libgtk-4-dev libjson-glib-dev libpackagekit-glib2-dev libportal-dev libportal-gtk4-dev libsoup-3.0-dev libxml2-dev libxml2-utils libpolkit-gobject-1-dev meson valac
     - name: Build and Test
       env:
         DESTDIR: out
       run: |
-        meson build
+        meson setup -Dintegration_tests=true build
         ninja -C build install
         ninja -C build test
 
     - name: Build and Test (Fedora)
       env:
         DESTDIR: out
       run: |
-        meson configure -Dcurated=false -Dpayments=false build
+        meson configure -Dintegration_tests=true -Dcurated=false -Dpayments=false build
         ninja -C build install
         ninja -C build test
 
     - name: Build and Test (Pop!_Shop)
       env:
         DESTDIR: out
       run: |
-        meson configure -Dcurated=false -Dpayments=false -Dsharing=false -Dname=Pop\!_Shop build
+        meson configure -Dintegration_tests=true -Dcurated=false -Dpayments=false -Dsharing=false -Dname=Pop\!_Shop build
         ninja -C build install
         ninja -C build test
 
     - name: Build (Flatpak-only)
       env:
         DESTDIR: out
       run: |
-        meson configure -Dpackagekit_backend=false -Dubuntu_drivers_backend=false build
+        meson configure -Dintegration_tests=true -Dpackagekit_backend=false -Dubuntu_drivers_backend=false build
         ninja -C build install
 
   lint:

README.md

@@ -18,7 +18,9 @@ You'll need the following dependencies:
 * libjson-glib-dev
 * libpackagekit-glib2-dev
 * libpolkit-gobject-1-dev
-* libsoup2.4-dev
+* libportal-dev
+* libportal-gtk3-dev
+* libsoup-3.0-dev
 * libxml2-dev
 * libxml2-utils
 * meson

data/meson.build

@@ -19,14 +19,6 @@ install_data(
     rename: meson.project_name() + '-symbolic.svg'
 )
 
-# Daemon Desktop file (for GNOME Session autostart)
-configure_file(
-    input: meson.project_name() + '-daemon.desktop.in',
-    output: meson.project_name() + '-daemon.desktop',
-    configuration: conf_data,
-    install_dir: join_paths(get_option('datadir'), 'applications')
-)
-
 # GNOME Shell Search Provider
 configure_file(
     input: meson.project_name() + '.search-provider.ini.in',

meson.build

@@ -20,36 +20,41 @@ add_project_arguments(['--vapidir', vapi_dir], language: 'vala')
 
 glib = dependency ('glib-2.0')
 gobject = dependency ('gobject-2.0')
+gio = dependency ('gio-2.0')
 gee = dependency ('gee-0.8')
 gtk = dependency ('gtk4')
 granite = dependency ('granite-7', version: '>=7.3.0')
 adwaita = dependency('libadwaita-1')
 appstream = dependency ('appstream', version: '>=0.15.2')
-libsoup = dependency ('libsoup-2.4')
+libsoup = dependency ('libsoup-3.0')
 json = dependency ('json-glib-1.0')
 flatpak = dependency ('flatpak')
 xml = dependency ('libxml-2.0')
 polkit = dependency ('polkit-gobject-1')
+portal = dependency('libportal')
+portal_gtk4 = dependency('libportal-gtk4')
 posix = meson.get_compiler('vala').find_library('posix')
 
 dbus = dependency ('dbus-1')
 
 core_deps = [
     glib,
     gobject,
+    gio,
+    json,
+    libsoup,
 ]
 
 dependencies = core_deps + [
-    gee,
     gtk,
     granite,
     adwaita,
     appstream,
-    libsoup,
-    json,
     flatpak,
     xml,
     polkit,
+    portal,
+    portal_gtk4,
     posix
 ]
 

meson_options.txt

@@ -7,3 +7,4 @@ option('hide_upstream_distro_apps', type : 'boolean', value : true, description
 option('runtime_name', type : 'string', value : 'io.elementary.Platform', description : 'The name of the distributor runtime')
 option('packagekit_backend', type : 'boolean', value : true, description : 'Use PackageKit as a backend')
 option('ubuntu_drivers_backend', type : 'boolean', value : true, description : 'Use Ubuntu Drivers as a backend (requires packagekit_backend)')
+option('integration_tests', type : 'boolean', value : false, description : 'Enable integration tests, require internet connection')

po/POTFILES

@@ -13,6 +13,7 @@ src/Core/Job.vala
 src/Core/Package.vala
 src/Core/PackageKitBackend.vala
 src/Core/ScreenshotCache.vala
+src/Core/Stripe.vala
 src/Core/Task.vala
 src/Core/UbuntuDriversBackend.vala
 src/Core/UpdateManager.vala