Gnome 47

.github/Dockerfile

@@ -1,13 +1,13 @@
 FROM ghcr.io/distroless/alpine-base:latest
 
-ENV BRANCH=profiler-private
+ENV BRANCH=appstream-plugin-fixes
 # distroless/alpine-base only has main by default
 RUN echo "" >> /etc/apk/repositories \
     && echo https://dl-cdn.alpinelinux.org/alpine/edge/community >> /etc/apk/repositories
 RUN apk add --no-cache meson apk-polkit-rs-dev build-base \
     curl gdk-pixbuf-dev libxmlb-dev glib-dev gtk4.0-dev libadwaita-dev \
     json-glib-dev libsoup3-dev gspell-dev polkit-dev libgudev-dev appstream-dev \
-    desktop-file-utils gsettings-desktop-schemas-dev dbus
+    desktop-file-utils gsettings-desktop-schemas-dev dbus git itstool
 RUN curl -L -O https://gitlab.gnome.org/pabloyoyoista/gnome-software/-/archive/${BRANCH}/gnome-software-${BRANCH}.tar.gz \
     && tar xf gnome-software-${BRANCH}.tar.gz \
     && cd gnome-software-${BRANCH} \
@@ -23,6 +23,7 @@ RUN curl -L -O https://gitlab.gnome.org/pabloyoyoista/gnome-software/-/archive/$
        -Dgtk_doc=false \
        -Dman=false \
        -Dtests=false \
+       -Dsysprof=disabled \
         build \
     && meson install -C build
 RUN apk add --no-cache py3-dbusmock

.github/workflows/docker-image.yaml

@@ -10,7 +10,7 @@ on:
 env:
   REGISTRY: ghcr.io
   IMAGE_NAME: cogitri/gnome-software-plugin-apk-ci
-  VERSION: 43
+  VERSION: 47
 
 jobs:
   build-test-and-push-image:

.github/workflows/unittests.yaml

@@ -10,7 +10,7 @@ jobs:
     permissions:
       packages: read
     container:
-      image: ghcr.io/cogitri/gnome-software-plugin-apk-ci:43
+      image: ghcr.io/cogitri/gnome-software-plugin-apk-ci:47
       credentials:
         username: cogitri
         password: ${{ secrets.GITHUB_TOKEN }}
@@ -22,4 +22,4 @@ jobs:
         run: meson build && ninja -C build
 
       - name: Test
-        run: dbus-run-session -- meson test -v -C build
+        run: dbus-run-session ./tests/test_wrapper.sh -- meson test -v -C build

.gitignore

@@ -0,0 +1,3 @@
+/subprojects/*/
+_build/
+output/

meson.build

@@ -5,16 +5,38 @@ project(
     meson_version: '>=0.58'
 )
 
-gnome_software_dep = dependency('gnome-software', version: '>=44.0')
-plugin_install_dir = gnome_software_dep.get_variable('plugindir')
+gnome_software_dep = dependency(
+  'gnome-software',
+  version: '>=46.0',
+  fallback: ['gnome-software', 'libgnomesoftware_dep'],
+  default_options: [
+    'malcontent=false',
+    'packagekit=false',
+    'webapps=false',
+    'fwupd=false',
+    'hardcoded_foss_webapps=false',
+    'hardcoded_proprietary_webapps=false',
+    'external_appstream=true',
+    'gtk_doc=false',
+    'sysprof=disabled',
+  ],
+)
+plugin_install_dir = gnome_software_dep.get_variable(
+  'plugindir',
+  default_value: '/usr/lib/gnome-software/plugins-21',
+)
 
 cargs = [
   '-DG_LOG_DOMAIN="GsPluginApk"',
   '-DI_KNOW_THE_GNOME_SOFTWARE_API_IS_SUBJECT_TO_CHANGE',
   '-DGS_PLUGIN_APK_VERSION="@0@"'.format(meson.project_version()),
 ]
 
-apk_dep = dependency('apk-polkit-client-2')
+apk_dep = dependency(
+  'apk-polkit-client-2',
+  fallback: ['apk-polkit-rs', 'apk_polkit_client_dep'],
+)
+
 glib_dep = dependency('glib-2.0', version: '>=2.60')
 gobject_dep = dependency('gobject-2.0')
 gio_dep = dependency('gio-2.0')