From 4f0c1fc60182ba4dee4b3d3d38dc40b819436ccb Mon Sep 17 00:00:00 2001 From: Lubomir Rintel Date: Mon, 3 Oct 2022 16:38:13 +0200 Subject: flatpak: drop It's not clear why this sort of thing (e.g. polkit build patch) needs to go in the upstream repository and nobody seems to be maintaining this [1]. [1] https://gitlab.gnome.org/GNOME/network-manager-applet/-/merge_requests/118 https://gitlab.gnome.org/GNOME/network-manager-applet/-/merge_requests/122 --- .gitlab-ci.yml | 13 -- .../flatpak/org.gnome.nm_connection_editor.json | 210 --------------------- build-aux/flatpak/polkit-autogen | 4 - ...build-Add-option-to-build-without-polkitd.patch | 132 ------------- 4 files changed, 359 deletions(-) delete mode 100644 build-aux/flatpak/org.gnome.nm_connection_editor.json delete mode 100755 build-aux/flatpak/polkit-autogen delete mode 100644 build-aux/flatpak/polkit-build-Add-option-to-build-without-polkitd.patch diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 59c27836..f8ecf49e 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -117,19 +117,6 @@ fedora_autotools_full: image: fedora:latest stage: test -# Flatpak build of nm-connection-editor -include: 'https://gitlab.gnome.org/GNOME/citemplates/raw/master/flatpak/flatpak_ci_initiative.yml' -flatpak: - image: registry.gitlab.gnome.org/gnome/gnome-runtime-images/gnome:master - variables: - MANIFEST_PATH: "build-aux/flatpak/org.gnome.nm_connection_editor.json" - FLATPAK_MODULE: "network-manager-applet" - RUNTIME_REPO: "https://nightly.gnome.org/gnome-nightly.flatpakrepo" - APP_ID: "org.gnome.nm_connection_editor" - BUNDLE: "nm-connection-editor.flatpak" - extends: .flatpak - when: manual - triage:issues: stage: triage image: ruby:2.7 diff --git a/build-aux/flatpak/org.gnome.nm_connection_editor.json b/build-aux/flatpak/org.gnome.nm_connection_editor.json deleted file mode 100644 index dd79c665..00000000 --- a/build-aux/flatpak/org.gnome.nm_connection_editor.json +++ /dev/null @@ -1,210 +0,0 @@ -{ - "app-id": "org.gnome.nm_connection_editor", - "runtime": "org.gnome.Platform", - "runtime-version": "master", - "sdk": "org.gnome.Sdk", - "command": "nm-connection-editor", - "finish-args": [ - "--share=network", - "--share=ipc", - "--socket=fallback-x11", - "--socket=wayland", - "--socket=session-bus", - "--socket=system-bus" - ], - "modules": [ - { - "name" : "udev", - "config-opts" : [ - "--disable-hwdb", - "--disable-logging", - "--disable-gudev", - "--disable-introspection", - "--disable-keymap", - "--disable-mtd_probe" - ], - "cleanup" : [ - "/include", - "/etc", - "/libexec", - "/sbin", - "/lib/pkgconfig", - "/man", - "/share/aclocal", - "/share/doc", - "/share/gtk-doc", - "/share/man", - "/share/pkgconfig", - "*.la", - "*.a" - ], - "sources" : [ - { - "type" : "git", - "url" : "git://github.com/gentoo/eudev.git" - } - ] - }, - { - "name" : "gudev", - "buildsystem" : "autotools", - "config-opts" : [ - "--disable-umockdev" - ], - "sources" : [ - { - "type" : "git", - "url" : "https://gitlab.gnome.org/GNOME/libgudev.git" - } - ] - }, - { - "name": "intltool", - "cleanup": [ "*" ], - "sources": [ - { - "type": "archive", - "url": "https://launchpad.net/intltool/trunk/0.51.0/+download/intltool-0.51.0.tar.gz", - "sha256": "67c74d94196b153b774ab9f89b2fa6c6ba79352407037c8c14d5aeb334e959cd" - } - ] - }, - { - "name" : "libndp", - "buildsystem" : "autotools", - "sources" : [ - { - "type" : "archive", - "url" : " http://libndp.org/files/libndp-1.6.tar.gz", - "sha256" : "0c7dfa84e013bd5e569ef2c6292a6f72cfaf14f4ff77a77425e52edc33ffac0e" - } - ] - }, - { - "name" : "polkit", - "buildsystem" : "autotools", - "config-opts" : [ - "--disable-polkitd", - "--disable-man-pages", - "--disable-introspection", - "--disable-examples", - "--disable-gtk-doc", - "--disable-libelogind", - "--disable-libsystemd-login", - "--with-systemdsystemunitdir=no", - "--with-authdb=dummy", - "--with-authfw=none" - ], - "rm-configure" : true, - "cleanup" : [ - "/bin/*", - "/etc/pam.d", - "/etc/dbus-1", - "/share/dbus-1/system-services/*", - "/share/polkit-1", - "/lib/polkit-1" - ], - "sources" : [ - { - "type" : "archive", - "url" : "https://www.freedesktop.org/software/polkit/releases/polkit-0.116.tar.gz", - "sha256" : "88170c9e711e8db305a12fdb8234fac5706c61969b94e084d0f117d8ec5d34b1" - }, - { - "type" : "patch", - "path" : "polkit-build-Add-option-to-build-without-polkitd.patch" - }, - { - "type" : "file", - "path" : "polkit-autogen", - "dest-filename" : "autogen.sh" - } - ] - }, - - { - "name" : "NetworkManager", - "buildsystem" : "meson", - "build-options" : { - "cflags" : "-ltinfo", - "cxxflags" : "-ltinfo" - }, - "config-opts" : [ - "-Dlibaudit=no", - "-Ddbus_conf_dir=/app/etc/dbus-1/system.d", - "-Ddbus_ifaces_dir=/app/share/dbus-1/interfaces", - "-Ddbus_sys_dir=/app/share/dbus-1/system.d", - "-Ddnsmasq=/usr/bin/true", - "-Ddocs=false", - "-Dintrospection=false", - "-Diptables=/usr/bin/true", - "-Djson_validation=false", - "-Dlibnm_glib=false", - "-Dlibpsl=false", - "-Dmodem_manager=false", - "-Dnmtui=false", - "-Dovs=false", - "-Dppp=false", - "-Dqt=false", - "-Dselinux=false", - "-Dsession_tracking=no", - "-Dsystemdsystemunitdir='no'", - "-Dsystemd_journal=false", - "-Dtests=no", - "-Dvapi=false" - ], - "sources" : [ - { - "type" : "git", - "url" : "https://gitlab.freedesktop.org/NetworkManager/NetworkManager.git" - } - ] - }, - { - "name" : "mobile-broadband-provider-info", - "buildsystem" : "autotools", - "sources" : [ - { - "type" : "git", - "url" : "https://gitlab.gnome.org/GNOME/mobile-broadband-provider-info.git" - } - ] - }, - { - "name" : "libnma", - "buildsystem" : "meson", - "config-opts" : [ - "-Dgtk_doc=false", - "-Dintrospection=false", - "-Dvapi=false" - ], - "sources" : [ - { - "type" : "git", - "url" : "https://gitlab.gnome.org/GNOME/libnma.git" - } - ] - }, - - { - "name": "network-manager-applet", - "buildsystem" : "meson", - "builddir": true, - "config-opts" : [ - "-Dappindicator=no", - "-Dgtk_doc=false", - "-Dintrospection=false", - "-Dlibnm_gtk=false", - "-Dselinux=false", - "-Dteam=false", - "-Dwwan=false" - ], - "sources": [ - { - "type": "git", - "url": "https://gitlab.gnome.org/GNOME/network-manager-applet.git" - } - ] - } - ] -} diff --git a/build-aux/flatpak/polkit-autogen b/build-aux/flatpak/polkit-autogen deleted file mode 100755 index 3ba457e5..00000000 --- a/build-aux/flatpak/polkit-autogen +++ /dev/null @@ -1,4 +0,0 @@ -#!/bin/sh - -gtkdocize --flavour no-tmpl -autoreconf -if diff --git a/build-aux/flatpak/polkit-build-Add-option-to-build-without-polkitd.patch b/build-aux/flatpak/polkit-build-Add-option-to-build-without-polkitd.patch deleted file mode 100644 index 651f53ba..00000000 --- a/build-aux/flatpak/polkit-build-Add-option-to-build-without-polkitd.patch +++ /dev/null @@ -1,132 +0,0 @@ -From 1073a44277316348d40d86ecec908f1d4812f360 Mon Sep 17 00:00:00 2001 -From: Christian Hergert -Date: Mon, 27 May 2019 11:49:09 -0700 -Subject: [PATCH] flatpak: make polkit suitable for use within flatpak - -This is based on patches from Patrick Griffis with additional fixes -to allow us to disable use of PAM within Flaptak. ---- - configure.ac | 20 ++++++++++++++++---- - src/Makefile.am | 6 +++++- - src/polkitagent/Makefile.am | 5 +++++ - test/Makefile.am | 6 +++++- - 4 files changed, 31 insertions(+), 6 deletions(-) - -diff --git a/configure.ac b/configure.ac -index 5cedb4e..729d78d 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -79,11 +79,13 @@ PKG_CHECK_MODULES(GLIB, [gmodule-2.0 gio-unix-2.0 >= 2.30.0]) - AC_SUBST(GLIB_CFLAGS) - AC_SUBST(GLIB_LIBS) - --PKG_CHECK_MODULES(LIBJS, [mozjs-60]) -+AS_IF([test x${enable_polkitd} = yes], [ -+ PKG_CHECK_MODULES(LIBJS, [mozjs-60]) - --AC_SUBST(LIBJS_CFLAGS) --AC_SUBST(LIBJS_CXXFLAGS) --AC_SUBST(LIBJS_LIBS) -+ AC_SUBST(LIBJS_CFLAGS) -+ AC_SUBST(LIBJS_CXXFLAGS) -+ AC_SUBST(LIBJS_LIBS) -+]) - - EXPAT_LIB="" - AC_ARG_WITH(expat, [ --with-expat= Use expat from here], -@@ -236,6 +238,15 @@ if test "x$with_systemdsystemunitdir" != "xno"; then - fi - AM_CONDITIONAL(HAVE_SYSTEMD, [test -n "$systemdsystemunitdir"]) - -+dnl --------------------------------------------------------------------------- -+dnl - Disable polkitd when using library alone -+dnl --------------------------------------------------------------------------- -+ -+AC_ARG_ENABLE([polkitd], -+ [AS_HELP_STRING([--disable-polkitd], [Do not build polkitd])], -+ [enable_polkitd=$enableval], [enable_polkitd=yes]) -+AM_CONDITIONAL(BUILD_POLKITD, [test x${enable_polkitd} = yes]) -+ - dnl --------------------------------------------------------------------------- - dnl - User for running polkitd - dnl --------------------------------------------------------------------------- -@@ -579,6 +590,7 @@ echo " - Session tracking: ${SESSION_TRACKING} - PAM support: ${have_pam} - systemdsystemunitdir: ${systemdsystemunitdir} -+ polkitd: ${enable_polkitd} - polkitd user: ${POLKITD_USER}" - - if test "$have_pam" = yes ; then -diff --git a/src/Makefile.am b/src/Makefile.am -index 09fc7b3..c6fe91b 100644 ---- a/src/Makefile.am -+++ b/src/Makefile.am -@@ -1,5 +1,9 @@ - --SUBDIRS = polkit polkitbackend polkitagent programs -+SUBDIRS = polkit polkitagent programs -+ -+if BUILD_POLKITD -+SUBDIRS += polkitbackend -+endif - - if BUILD_EXAMPLES - SUBDIRS += examples -diff --git a/src/polkitagent/Makefile.am b/src/polkitagent/Makefile.am -index 49720db..633f9d4 100644 ---- a/src/polkitagent/Makefile.am -+++ b/src/polkitagent/Makefile.am -@@ -79,6 +79,7 @@ libpolkit_agent_1_la_LIBADD = \ - - libpolkit_agent_1_la_LDFLAGS = -export-symbols-regex '(^polkit_.*)' - -+if !POLKIT_AUTHFW_NONE - libprivdir = $(prefix)/lib/polkit-1 - libpriv_PROGRAMS = polkit-agent-helper-1 - -@@ -113,6 +114,8 @@ polkit_agent_helper_1_LDFLAGS = \ - $(AM_LDFLAGS) \ - $(NULL) - -+endif # !POLKIT_AUTHFW_NONE -+ - if HAVE_INTROSPECTION - - girdir = $(INTROSPECTION_GIRDIR) -@@ -142,6 +145,7 @@ include $(INTROSPECTION_MAKEFILE) - - endif # HAVE_INTROSPECTION - -+if !POLKIT_AUTHFW_NONE - # polkit-agent-helper-1 need to be setuid root because it's used to - # authenticate not only the invoking user, but possibly also root - # and/or other users. -@@ -149,6 +153,7 @@ endif # HAVE_INTROSPECTION - install-data-hook: - -chown root $(DESTDIR)$(libprivdir)/polkit-agent-helper-1 - -chmod 4755 $(DESTDIR)$(libprivdir)/polkit-agent-helper-1 -+endif # !POLKIT_AUTHFW_NONE - - EXTRA_DIST = polkitagentmarshal.list polkitagentenumtypes.h.template polkitagentenumtypes.c.template - CLEANFILES = $(gir_DATA) $(typelibs_DATA) -diff --git a/test/Makefile.am b/test/Makefile.am -index 59d0680..d43b0fe 100644 ---- a/test/Makefile.am -+++ b/test/Makefile.am -@@ -1,7 +1,11 @@ - --SUBDIRS = mocklibc . polkit polkitbackend -+SUBDIRS = mocklibc . polkit - AM_CFLAGS = $(GLIB_CFLAGS) - -+if BUILD_POLKITD -+SUBDIRS += polkitbackend -+endif -+ - noinst_LTLIBRARIES = libpolkit-test-helper.la - libpolkit_test_helper_la_SOURCES = polkittesthelper.c polkittesthelper.h - libpolkit_test_helper_la_LIBADD = $(GLIB_LIBS) --- -2.21.0 - -- cgit v1.2.1