Date: Wednesday, November 9, 2022 @ 08:06:10
Author: heftig
Revision: 461015
archrelease: copy trunk to extra-x86_64
Added:
libnma/repos/extra-x86_64/0001-gschema-Remove-path-from-eap-schema.patch
(from rev 461014,
libnma/trunk/0001-gschema-Remove-path-from-eap-schema.patch)
libnma/repos/extra-x86_64/PKGBUILD
(from rev 461014, libnma/trunk/PKGBUILD)
Deleted:
libnma/repos/extra-x86_64/PKGBUILD
------------------------------------------------+
0001-gschema-Remove-path-from-eap-schema.patch | 29 ++
PKGBUILD | 227 +++++++++++------------
2 files changed, 145 insertions(+), 111 deletions(-)
Copied:
libnma/repos/extra-x86_64/0001-gschema-Remove-path-from-eap-schema.patch (from
rev 461014, libnma/trunk/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:10 UTC
(rev 461015)
@@ -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>
Deleted: PKGBUILD
===================================================================
--- PKGBUILD 2022-11-09 08:06:02 UTC (rev 461014)
+++ PKGBUILD 2022-11-09 08:06:10 UTC (rev 461015)
@@ -1,111 +0,0 @@
-# Maintainer: Jan Alexander Steffens (heftig) <[email protected]>
-
-pkgbase=libnma
-pkgname=(libnma-common libnma libnma-gtk4)
-pkgver=1.10.4
-pkgrel=2
-pkgdesc="NetworkManager GUI client library"
-url="https://gitlab.gnome.org/GNOME/libnma";
-arch=(x86_64)
-license=(GPL LGPL)
-makedepends=(
- dconf
- gcr-4
- git
- gobject-introspection
- gtk-doc
- gtk3
- gtk4
- iso-codes
- libnm
- meson
- mobile-broadband-provider-info
- vala
-)
-options=(debug)
-_commit=ec11ca120a3f323e51566076bc3827d686b30e43 # tags/1.10.4^0
-source=(
- "git+https://gitlab.gnome.org/GNOME/libnma.git#commit=$_commit";
-)
-sha256sums=('SKIP')
-
-pkgver() {
- cd libnma
- git describe --tags | sed 's/-dev/dev/;s/[^-]*-g/r&/;s/-/+/g'
-}
-
-prepare() {
- cd libnma
-}
-
-build() {
- local meson_options=(
- -D libnma_gtk4=true
- )
-
- arch-meson libnma build "${meson_options[@]}"
- meson compile -C build
-}
-
-check() {
- meson test -C build --print-errorlogs
-}
-
-_pick() {
- local p="$1" f d; shift
- for f; do
- d="$srcdir/$p/${f#$pkgdir/}"
- mkdir -p "$(dirname "$d")"
- mv "$f" "$d"
- rmdir -p --ignore-fail-on-non-empty "$(dirname "$f")"
- done
-}
-
-package_libnma-common() {
- pkgdesc+=" (common files)"
- depends=(
- dconf
- gcr-4
- iso-codes
- libnm
- mobile-broadband-provider-info
- )
-
- meson install -C build --destdir "$pkgdir"
-
- cd "$pkgdir"
-
- _pick gtk3 usr/lib/libnma.so*
- _pick gtk3 usr/lib/pkgconfig/libnma.pc
- _pick gtk3 usr/lib/girepository-1.0/NMA-*
- _pick gtk3 usr/share/gir-1.0/NMA-*
- _pick gtk3 usr/share/vala/vapi/libnma.*
-
- _pick gtk4 usr/lib/libnma-gtk4.so*
- _pick gtk4 usr/lib/pkgconfig/libnma-gtk4.pc
- _pick gtk4 usr/lib/girepository-1.0/NMA4-*
- _pick gtk4 usr/share/gir-1.0/NMA4-*
- _pick gtk4 usr/share/vala/vapi/libnma-gtk4.*
-
- # Moved to network-manager-applet 1.30.0
- # https://bugs.archlinux.org/task/76489
- rm usr/share/glib-2.0/schemas/org.gnome.nm-applet.gschema.xml
-}
-
-package_libnma() {
- pkgdesc+=" (GTK3)"
- depends=(libnma-common="$pkgver-$pkgrel" gtk3)
- provides=(libnma.so)
-
- mv gtk3/* "$pkgdir"
-}
-
-package_libnma-gtk4() {
- pkgdesc+=" (GTK4)"
- depends=(libnma-common="$pkgver-$pkgrel" gtk4)
- provides=(libnma-gtk4.so)
-
- mv gtk4/* "$pkgdir"
-}
-
-# vim:set sw=2 sts=-1 et:
Copied: libnma/repos/extra-x86_64/PKGBUILD (from rev 461014,
libnma/trunk/PKGBUILD)
===================================================================
--- PKGBUILD (rev 0)
+++ PKGBUILD 2022-11-09 08:06:10 UTC (rev 461015)
@@ -0,0 +1,116 @@
+# Maintainer: Jan Alexander Steffens (heftig) <[email protected]>
+
+pkgbase=libnma
+pkgname=(libnma-common libnma libnma-gtk4)
+pkgver=1.10.4
+pkgrel=3
+pkgdesc="NetworkManager GUI client library"
+url="https://gitlab.gnome.org/GNOME/libnma";
+arch=(x86_64)
+license=(GPL LGPL)
+makedepends=(
+ dconf
+ gcr-4
+ git
+ gobject-introspection
+ gtk-doc
+ gtk3
+ gtk4
+ iso-codes
+ libnm
+ meson
+ mobile-broadband-provider-info
+ vala
+)
+options=(debug)
+_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'
+ '794f612a95936ed67891c1231526950e098af38afa5c4a65dffff4f228a261f3')
+
+pkgver() {
+ cd libnma
+ git describe --tags | sed 's/-dev/dev/;s/[^-]*-g/r&/;s/-/+/g'
+}
+
+prepare() {
+ cd libnma
+
+ # https://bugs.archlinux.org/task/76490
+ git apply -3 ../0001-gschema-Remove-path-from-eap-schema.patch
+}
+
+build() {
+ local meson_options=(
+ -D libnma_gtk4=true
+ )
+
+ arch-meson libnma build "${meson_options[@]}"
+ meson compile -C build
+}
+
+check() {
+ meson test -C build --print-errorlogs
+}
+
+_pick() {
+ local p="$1" f d; shift
+ for f; do
+ d="$srcdir/$p/${f#$pkgdir/}"
+ mkdir -p "$(dirname "$d")"
+ mv "$f" "$d"
+ rmdir -p --ignore-fail-on-non-empty "$(dirname "$f")"
+ done
+}
+
+package_libnma-common() {
+ pkgdesc+=" (common files)"
+ depends=(
+ dconf
+ gcr-4
+ iso-codes
+ libnm
+ mobile-broadband-provider-info
+ )
+
+ meson install -C build --destdir "$pkgdir"
+
+ cd "$pkgdir"
+
+ _pick gtk3 usr/lib/libnma.so*
+ _pick gtk3 usr/lib/pkgconfig/libnma.pc
+ _pick gtk3 usr/lib/girepository-1.0/NMA-*
+ _pick gtk3 usr/share/gir-1.0/NMA-*
+ _pick gtk3 usr/share/vala/vapi/libnma.*
+
+ _pick gtk4 usr/lib/libnma-gtk4.so*
+ _pick gtk4 usr/lib/pkgconfig/libnma-gtk4.pc
+ _pick gtk4 usr/lib/girepository-1.0/NMA4-*
+ _pick gtk4 usr/share/gir-1.0/NMA4-*
+ _pick gtk4 usr/share/vala/vapi/libnma-gtk4.*
+
+ # Moved to network-manager-applet 1.30.0
+ # https://bugs.archlinux.org/task/76489
+ rm usr/share/glib-2.0/schemas/org.gnome.nm-applet.gschema.xml
+}
+
+package_libnma() {
+ pkgdesc+=" (GTK3)"
+ depends=(libnma-common="$pkgver-$pkgrel" gtk3)
+ provides=(libnma.so)
+
+ mv gtk3/* "$pkgdir"
+}
+
+package_libnma-gtk4() {
+ pkgdesc+=" (GTK4)"
+ depends=(libnma-common="$pkgver-$pkgrel" gtk4)
+ provides=(libnma-gtk4.so)
+
+ mv gtk4/* "$pkgdir"
+}
+
+# vim:set sw=2 sts=-1 et:
