commit: ef1f1c97af1b9ada1d6b9ef86c3b5cda8075e459 Author: Pacho Ramos <pacho <AT> gentoo <DOT> org> AuthorDate: Sun Dec 4 18:40:23 2022 +0000 Commit: Pacho Ramos <pacho <AT> gentoo <DOT> org> CommitDate: Sun Dec 4 18:41:23 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ef1f1c97
net-libs/libnma: Really apply the patch Thanks-to: Matt Turner Closes: https://bugs.gentoo.org/882419 Signed-off-by: Pacho Ramos <pacho <AT> gentoo.org> .../files/libnma-1.10.4-path-eap-schema.patch | 32 ++++++++++++++++++++++ ...ma-1.10.4-r1.ebuild => libnma-1.10.4-r2.ebuild} | 5 ++++ 2 files changed, 37 insertions(+) diff --git a/net-libs/libnma/files/libnma-1.10.4-path-eap-schema.patch b/net-libs/libnma/files/libnma-1.10.4-path-eap-schema.patch new file mode 100644 index 000000000000..fe00ff9d9a9b --- /dev/null +++ b/net-libs/libnma/files/libnma-1.10.4-path-eap-schema.patch @@ -0,0 +1,32 @@ +From 0ab5c1e39e94e158650da847f8512ab5e2b03593 Mon Sep 17 00:00:00 2001 +From: "Jan Alexander Steffens (heftig)" <hef...@archlinux.org> +Date: Wed, 9 Nov 2022 08:00:19 +0000 +Subject: [PATCH] gschema: Remove path from eap schema + +This one needs to be relocatable, otherwise creating a new VPN +connection will fail with: + + settings object created with schema 'org.gnome.nm-applet.eap' + and path '/org/gnome/nm-applet/eap/<uuid>/', + but path '/org/gnome/nm-applet/eap/' is specified by schema + +Fixes: https://bugs.archlinux.org/task/76490 +--- + org.gnome.nm-applet.eap.gschema.xml.in | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/org.gnome.nm-applet.eap.gschema.xml.in b/org.gnome.nm-applet.eap.gschema.xml.in +index 0fc3ca9f..f4a56ea6 100644 +--- a/org.gnome.nm-applet.eap.gschema.xml.in ++++ b/org.gnome.nm-applet.eap.gschema.xml.in +@@ -1,6 +1,6 @@ + <?xml version="1.0" encoding="UTF-8"?> + <schemalist> +- <schema id="org.gnome.nm-applet.eap" path="/org/gnome/nm-applet/eap/" gettext-domain="nm-applet"> ++ <schema id="org.gnome.nm-applet.eap" gettext-domain="nm-applet"> + <key name="ignore-ca-cert" type="b"> + <default>false</default> + <summary>Ignore CA certificate</summary> +-- +GitLab + diff --git a/net-libs/libnma/libnma-1.10.4-r1.ebuild b/net-libs/libnma/libnma-1.10.4-r2.ebuild similarity index 93% rename from net-libs/libnma/libnma-1.10.4-r1.ebuild rename to net-libs/libnma/libnma-1.10.4-r2.ebuild index 965eae62dbe5..845d3ba4a4fb 100644 --- a/net-libs/libnma/libnma-1.10.4-r1.ebuild +++ b/net-libs/libnma/libnma-1.10.4-r2.ebuild @@ -38,6 +38,11 @@ BDEPEND=" ) " +PATCHES=( + # https://gitlab.gnome.org/GNOME/libnma/-/issues/18 + "${FILESDIR}/${PN}-1.10.4-path-eap-schema.patch" +) + src_prepare() { default use vala && vala_setup
