Date: Wednesday, November 9, 2022 @ 08:06:02
  Author: heftig
Revision: 461014

1.10.4-3: FS#76490 Fix creating VPN connections

Added:
  libnma/trunk/0001-gschema-Remove-path-from-eap-schema.patch
Modified:
  libnma/trunk/PKGBUILD

------------------------------------------------+
 0001-gschema-Remove-path-from-eap-schema.patch |   29 +++++++++++++++++++++++
 PKGBUILD                                       |    9 +++++--
 2 files changed, 36 insertions(+), 2 deletions(-)

Added: 0001-gschema-Remove-path-from-eap-schema.patch
===================================================================
--- 0001-gschema-Remove-path-from-eap-schema.patch                              
(rev 0)
+++ 0001-gschema-Remove-path-from-eap-schema.patch      2022-11-09 08:06:02 UTC 
(rev 461014)
@@ -0,0 +1,29 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: "Jan Alexander Steffens (heftig)" <[email protected]>
+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 0fc3ca9f1f61..f4a56ea672cd 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>

Modified: PKGBUILD
===================================================================
--- PKGBUILD    2022-11-09 07:55:33 UTC (rev 461013)
+++ PKGBUILD    2022-11-09 08:06:02 UTC (rev 461014)
@@ -3,7 +3,7 @@
 pkgbase=libnma
 pkgname=(libnma-common libnma libnma-gtk4)
 pkgver=1.10.4
-pkgrel=2
+pkgrel=3
 pkgdesc="NetworkManager GUI client library"
 url="https://gitlab.gnome.org/GNOME/libnma";
 arch=(x86_64)
@@ -26,8 +26,10 @@
 _commit=ec11ca120a3f323e51566076bc3827d686b30e43  # tags/1.10.4^0
 source=(
   "git+https://gitlab.gnome.org/GNOME/libnma.git#commit=$_commit";
+  0001-gschema-Remove-path-from-eap-schema.patch
 )
-sha256sums=('SKIP')
+sha256sums=('SKIP'
+            '794f612a95936ed67891c1231526950e098af38afa5c4a65dffff4f228a261f3')
 
 pkgver() {
   cd libnma
@@ -36,6 +38,9 @@
 
 prepare() {
   cd libnma
+
+  # https://bugs.archlinux.org/task/76490
+  git apply -3 ../0001-gschema-Remove-path-from-eap-schema.patch
 }
 
 build() {

Reply via email to