diff options
Diffstat (limited to 'source/xap/libnma')
| -rw-r--r-- | source/xap/libnma/gschema-Remove-path-from-eap-schema.patch | 28 | ||||
| -rwxr-xr-x | source/xap/libnma/libnma.SlackBuild | 6 |
2 files changed, 32 insertions, 2 deletions
diff --git a/source/xap/libnma/gschema-Remove-path-from-eap-schema.patch b/source/xap/libnma/gschema-Remove-path-from-eap-schema.patch new file mode 100644 index 000000000..f855a885c --- /dev/null +++ b/source/xap/libnma/gschema-Remove-path-from-eap-schema.patch @@ -0,0 +1,28 @@ +From: "Jan Alexander Steffens (heftig)" <heftig@archlinux.org> +Date: Wed, 9 Nov 2022 08:00:19 +0000 +Subject: 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 0fc3ca9..f4a56ea 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> diff --git a/source/xap/libnma/libnma.SlackBuild b/source/xap/libnma/libnma.SlackBuild index 18771c5d3..5a0504275 100755 --- a/source/xap/libnma/libnma.SlackBuild +++ b/source/xap/libnma/libnma.SlackBuild @@ -1,6 +1,6 @@ #!/bin/bash -# Copyright 2020 Patrick J. Volkerding, Sebeka, Minnesota, USA +# Copyright 2020, 2022 Patrick J. Volkerding, Sebeka, Minnesota, USA # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -24,7 +24,7 @@ cd $(dirname $0) ; CWD=$(pwd) PKGNAM=libnma VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} -BUILD=${BUILD:-1} +BUILD=${BUILD:-2} NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "} @@ -74,6 +74,8 @@ find . \ \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ -exec chmod 644 {} \+ +zcat $CWD/gschema-Remove-path-from-eap-schema.patch.gz | patch -p1 --verbose || exit 1 + export CFLAGS="$SLKCFLAGS" export CXXFLAGS="$SLKCFLAGS" mkdir build |