From 7916ba0995e903a5c4d660e5477d7613bebd9149 Mon Sep 17 00:00:00 2001 From: Adrien Plazas Date: Thu, 2 Jul 2020 23:49:13 +0200 Subject: [PATCH 1/4] flatpak: Drop appindicator support for network-manager-applet This fixes the build, as we don't ship the needed libraries. --- build-aux/flatpak/org.gnome.Settings.json | 1 + 1 file changed, 1 insertion(+) diff --git a/build-aux/flatpak/org.gnome.Settings.json b/build-aux/flatpak/org.gnome.Settings.json index a3603715d..d0327b479 100644 --- a/build-aux/flatpak/org.gnome.Settings.json +++ b/build-aux/flatpak/org.gnome.Settings.json @@ -408,6 +408,7 @@ "name" : "network-manager-applet", "buildsystem" : "meson", "config-opts" : [ + "-Dappindicator=no", "-Dgtk_doc=false", "-Dintrospection=false", "-Dlibnm_gtk=false", -- GitLab From 57b6ef8240777f4a8a353b3c7e80c74de7648131 Mon Sep 17 00:00:00 2001 From: Adrien Plazas Date: Fri, 3 Jul 2020 08:45:00 +0200 Subject: [PATCH 2/4] flatpak: Add libcanberra as a gnome-settings-daemon submodule libcanberra-gtk3 is needed by gnome-settings-daemon. --- build-aux/flatpak/org.gnome.Settings.json | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/build-aux/flatpak/org.gnome.Settings.json b/build-aux/flatpak/org.gnome.Settings.json index d0327b479..9078d9008 100644 --- a/build-aux/flatpak/org.gnome.Settings.json +++ b/build-aux/flatpak/org.gnome.Settings.json @@ -449,6 +449,23 @@ "type" : "git", "url" : "https://gitlab.gnome.org/GNOME/gnome-settings-daemon.git" } + ], + "modules": [ + { + "name": "libcanberra", + "sources": [ + { + "type": "archive", + "url": "http://0pointer.de/lennart/projects/libcanberra/libcanberra-0.30.tar.xz", + "sha256": "c2b671e67e0c288a69fc33dc1b6f1b534d07882c2aceed37004bf48c601afa72" + } + ], + "config-opts": [ + "--disable-alsa", + "--disable-null", + "--disable-oss" + ] + } ] }, { -- GitLab From 97de694bf960ecd7ad94cb91b3f34b13a80c0469 Mon Sep 17 00:00:00 2001 From: Adrien Plazas Date: Fri, 3 Jul 2020 08:52:59 +0200 Subject: [PATCH 3/4] flatpak: Disable systemd for gnome-settings-daemon We don't have it. --- build-aux/flatpak/org.gnome.Settings.json | 3 +++ 1 file changed, 3 insertions(+) diff --git a/build-aux/flatpak/org.gnome.Settings.json b/build-aux/flatpak/org.gnome.Settings.json index 9078d9008..7731f494e 100644 --- a/build-aux/flatpak/org.gnome.Settings.json +++ b/build-aux/flatpak/org.gnome.Settings.json @@ -444,6 +444,9 @@ { "name" : "gnome-settings-daemon", "buildsystem" : "meson", + "config-opts" : [ + "-Dsystemd=false" + ], "sources" : [ { "type" : "git", -- GitLab From 031c311344a10ef0d6738d9a10a45ece5582f8bc Mon Sep 17 00:00:00 2001 From: Adrien Plazas Date: Fri, 3 Jul 2020 08:56:47 +0200 Subject: [PATCH 4/4] flatpak: Bump libtirpc to 1.2.6 This fixes errors in the libtirpc 1.0.3 build. --- build-aux/flatpak/org.gnome.Settings.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/build-aux/flatpak/org.gnome.Settings.json b/build-aux/flatpak/org.gnome.Settings.json index 7731f494e..e2fb5bd19 100644 --- a/build-aux/flatpak/org.gnome.Settings.json +++ b/build-aux/flatpak/org.gnome.Settings.json @@ -521,8 +521,8 @@ "sources" : [ { "type" : "archive", - "url" : "http://downloads.sourceforge.net/sourceforge/libtirpc/libtirpc-1.0.3.tar.bz2", - "sha256" : "86c3a78fc1bddefa96111dd233124c703b22a78884203c55c3e06b3be6a0fd5e" + "url" : "http://downloads.sourceforge.net/sourceforge/libtirpc/libtirpc-1.2.6.tar.bz2", + "sha256" : "4278e9a5181d5af9cd7885322fdecebc444f9a3da87c526e7d47f7a12a37d1cc" } ] }, -- GitLab