summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPacho Ramos <pacho@gentoo.org>2022-12-04 19:40:23 +0100
committerPacho Ramos <pacho@gentoo.org>2022-12-04 19:41:23 +0100
commitef1f1c97af1b9ada1d6b9ef86c3b5cda8075e459 (patch)
tree8dde313189148d13228fe97d7157017e6a9208c1
parentsys-apps/polychromatic: bump to 0.8.0 (diff)
downloadgentoo-ef1f1c97.tar.gz
gentoo-ef1f1c97.tar.bz2
gentoo-ef1f1c97.zip
net-libs/libnma: Really apply the patch
Thanks-to: Matt Turner Closes: https://bugs.gentoo.org/882419 Signed-off-by: Pacho Ramos <pacho@gentoo.org>
-rw-r--r--net-libs/libnma/files/libnma-1.10.4-path-eap-schema.patch32
-rw-r--r--net-libs/libnma/libnma-1.10.4-r2.ebuild (renamed from net-libs/libnma/libnma-1.10.4-r1.ebuild)5
2 files changed, 37 insertions, 0 deletions
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)" <heftig@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
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