Merge remote-tracking branch 'origin/3.6' into 3.7

2022-02-27 22:21:54 +01:00 · 2022-02-27 22:21:54 +01:00 · fbbfe373d5
commit fbbfe373d5
parent 9658b164fa 056d462c5b
9 changed files with 82 additions and 32 deletions
--- a/bat/.signature
+++ b/bat/.signature
@ -1,5 +1,5 @@
 untrusted comment: verify with /etc/ports/contrib.pub
-RWSagIOpLGJF3y7KFtnCgxkm8YVjJNB2HnoCE4xE+xlVIGd8mnNcs4oTkpHN+FQQMSoeVmaalKketWp1uFcreJ1SE9q8OTCnzAs=
-SHA256 (Pkgfile) = 2983ae26cec16863a782fcd2705e48b0d20fb919b253846f6cd0820e3c97c716
+RWSagIOpLGJF36lNxQwBB3gU0d1fXC5rBWbbHL7hQTOd4FaNxPkmysF0qTquLFhCcRM7Tj1YUS1tE+WTMWrWAef5ygzVV2ngGQk=
+SHA256 (Pkgfile) = 56054d16b8628af2258b5ebc0fc56e67ba951b2d73a22f8a3af3a81bdd3bd108
 SHA256 (.footprint) = 7d7c597044f485aecf5b2c12f56d294b1f8a66f7e2515693ad3b29aba8628209
-SHA256 (bat-0.19.0.tar.gz) = 6a920cad1e7ae069eb9393f5b6883e0a7f2c957186b1075976331daaa5e0468a
+SHA256 (bat-0.20.0.tar.gz) = 12eca3add56f21b8056a4c17cfb5bffc45e107f23f75a8e0f5de948d8e997c39
--- a/bat/Pkgfile
+++ b/bat/Pkgfile
@ -4,7 +4,7 @@
 # Depends on: rust

 name=bat
-version=0.19.0
+version=0.20.0
 release=1
 source=(https://github.com/sharkdp/bat/archive/v$version/$name-$version.tar.gz)

--- a/distcc/pre-install
+++ b/distcc/pre-install
@ -1,2 +1,4 @@
-/usr/sbin/groupadd --system distcc
-/usr/sbin/useradd --system --gid distcc --home-dir /var/empty --shell /bin/false distcc && passwd --lock distcc
+#!/bin/sh -e
+
+/usr/bin/getent group distcc > /dev/null 2>&1 || /usr/sbin/groupadd --system distcc
+/usr/bin/getent passwd distcc > /dev/null 2>&1 || /usr/sbin/useradd --system --gid distcc --home-dir /var/empty --shell /bin/false distcc && passwd --lock distcc
--- a/gcr/.footprint
+++ b/gcr/.footprint
@ -74,10 +74,6 @@ drwxr-xr-x	root/root	usr/include/gcr-3/ui/
 drwxr-xr-x	root/root	usr/lib/
 -rwxr-xr-x	root/root	usr/lib/gcr-prompter
 -rwxr-xr-x	root/root	usr/lib/gcr-ssh-askpass
-drwxr-xr-x	root/root	usr/lib/girepository-1.0/
-rw-r--r--	root/root	usr/lib/girepository-1.0/Gck-1.typelib
-rw-r--r--	root/root	usr/lib/girepository-1.0/Gcr-3.typelib
-rw-r--r--	root/root	usr/lib/girepository-1.0/GcrUi-3.typelib
 lrwxrwxrwx	root/root	usr/lib/libgck-1.so -> libgck-1.so.0
 lrwxrwxrwx	root/root	usr/lib/libgck-1.so.0 -> libgck-1.so.0.0.0
 -rwxr-xr-x	root/root	usr/lib/libgck-1.so.0.0.0
@ -104,10 +100,6 @@ drwxr-xr-x	root/root	usr/share/dbus-1/
 drwxr-xr-x	root/root	usr/share/dbus-1/services/
 -rw-r--r--	root/root	usr/share/dbus-1/services/org.gnome.keyring.PrivatePrompter.service
 -rw-r--r--	root/root	usr/share/dbus-1/services/org.gnome.keyring.SystemPrompter.service
-drwxr-xr-x	root/root	usr/share/gir-1.0/
-rw-r--r--	root/root	usr/share/gir-1.0/Gck-1.gir
-rw-r--r--	root/root	usr/share/gir-1.0/Gcr-3.gir
-rw-r--r--	root/root	usr/share/gir-1.0/GcrUi-3.gir
 drwxr-xr-x	root/root	usr/share/glib-2.0/
 drwxr-xr-x	root/root	usr/share/glib-2.0/schemas/
 -rw-r--r--	root/root	usr/share/glib-2.0/schemas/org.gnome.crypto.pgp.gschema.xml
@ -156,12 +148,3 @@ drwxr-xr-x	root/root	usr/share/icons/hicolor/48x48/apps/
 drwxr-xr-x	root/root	usr/share/mime/
 drwxr-xr-x	root/root	usr/share/mime/packages/
 -rw-r--r--	root/root	usr/share/mime/packages/gcr-crypto-types.xml
-drwxr-xr-x	root/root	usr/share/vala/
-drwxr-xr-x	root/root	usr/share/vala/vapi/
-rw-r--r--	root/root	usr/share/vala/vapi/gck-1.deps
-rw-r--r--	root/root	usr/share/vala/vapi/gck-1.vapi
-rw-r--r--	root/root	usr/share/vala/vapi/gcr-3.deps
-rw-r--r--	root/root	usr/share/vala/vapi/gcr-3.vapi
-rw-r--r--	root/root	usr/share/vala/vapi/gcr-ui-3.deps
-rw-r--r--	root/root	usr/share/vala/vapi/gcr-ui-3.vapi
-rw-r--r--	root/root	usr/share/vala/vapi/pkcs11.vapi
--- a/gcr/.signature
+++ b/gcr/.signature
@ -1,5 +1,6 @@
 untrusted comment: verify with /etc/ports/contrib.pub
-RWSagIOpLGJF3zihsNfzfhF7Sfh9TL8cKSZnSFGoUuUokLvefRc6/8GLuosSUahMnqAxAI09UX/EFyUrSXjslEs7rjFvGbEOGg4=
-SHA256 (Pkgfile) = 549311731da89694c87df4791e8ed0df65cd8738b4c92934406deb0864725b7a
-SHA256 (.footprint) = b04d74c567e09f65d3a53dc094e083fa9b428632457a644e9019bdffe8a3fa27
+RWSagIOpLGJF377PW5d8d1kUC74vMTpoHly2oc4w+LeX6OqE+hDrwM4ygpgmTinmE7w0X8leu4Y+Fjz66aaRDYSCUyLCOYyrYAI=
+SHA256 (Pkgfile) = 774b7cec85f1fa479ed348cc57f8827032fabe4ad5b4f324d3be44ad18fe383d
+SHA256 (.footprint) = 18e743378f7b515bea6ec8d9b3098f496f54d56bfc8c55079d3923d3da845ff0
 SHA256 (gcr-3.40.0.tar.xz) = b9d3645a5fd953a54285cc64d4fc046736463dbd4dcc25caf5c7b59bed3027f5
+SHA256 (fix-meson-invalid-kw-argument.patch) = 7f0d47b09170f988b226600c46241dcbd5bf3349f5ac6415a0030e401612a675
--- a/gcr/Pkgfile
+++ b/gcr/Pkgfile
@ -5,10 +5,13 @@

 name=gcr
 version=3.40.0
-release=1
-source=(https://download.gnome.org/sources/$name/${version:0:4}/$name-$version.tar.xz)
+release=2
+source=(https://download.gnome.org/sources/$name/${version:0:4}/$name-$version.tar.xz
+	fix-meson-invalid-kw-argument.patch)

 build() {
+	patch -Np1 -d $name-$version -i $SRC/fix-meson-invalid-kw-argument.patch
+
 	meson setup build $name-$version \
 		--prefix=/usr \
 		--libexecdir=/usr/lib \
--- a/gcr/fix-meson-invalid-kw-argument.patch
+++ b/gcr/fix-meson-invalid-kw-argument.patch
@ -0,0 +1,61 @@
+Patch-Source: https://gitlab.gnome.org/GNOME/gcr/-/merge_requests/81
+
+From b3ca1d02bb0148ca787ac4aead164d7c8ce2c4d8 Mon Sep 17 00:00:00 2001
+From: Jakub Jirutka <jakub@jirutka.cz>
+Date: Wed, 12 Jan 2022 00:24:20 +0100
+Subject: [PATCH] meson: Fix unknown kw argument in gnome.generate_gir
+
+This argument has been removed in Meson 0.61.0:
+
+    gck/meson.build:130:2: ERROR: gnome.generate_gir got unknown keyword arguments "packages"
+
+https://github.com/mesonbuild/meson/commit/f8fc5cb860465718fe7c79a1bf1fe00659f138de:
+
+> The packages argument to gnome.generate_gir was allowed, but never did anything, so stop passing it.
+
+Fixes #89
+---
+ gck/meson.build | 1 -
+ gcr/meson.build | 1 -
+ ui/meson.build  | 1 -
+ 3 files changed, 3 deletions(-)
+
+diff --git a/gck/meson.build b/gck/meson.build
+index 756b486..a21a1e9 100644
+--- a/gck/meson.build
+++ b/gck/meson.build
+@@ -131,7 +131,6 @@ if get_option('introspection')
+     sources: gck_gir_sources,
+     namespace: 'Gck',
+     nsversion: '@0@'.format(gck_major_version),
+-    packages: gck_deps,
+     export_packages: 'gck-@0@'.format(gck_major_version),
+     includes: [ 'GObject-2.0', 'Gio-2.0' ],
+     header: 'gck/gck.h',
+diff --git a/gcr/meson.build b/gcr/meson.build
+index 2233a44..c83641b 100644
+--- a/gcr/meson.build
+++ b/gcr/meson.build
+@@ -190,7 +190,6 @@ if get_option('introspection')
+     sources: [ gcr_base_public_sources, gcr_base_headers ],
+     namespace: 'Gcr',
+     nsversion: '@0@'.format(gcr_major_version),
+-    packages: gcr_base_deps,
+     export_packages: 'gcr-base-@0@'.format(gcr_major_version),
+     includes: [
+       'GObject-2.0',
+diff --git a/ui/meson.build b/ui/meson.build
+index e656ea2..32ee057 100644
+--- a/ui/meson.build
+++ b/ui/meson.build
+@@ -152,7 +152,6 @@ if get_option('introspection')
+     export_packages: 'gcr-ui-@0@'.format(gcr_major_version),
+     identifier_prefix: 'Gcr',
+     symbol_prefix: 'gcr',
+-    packages: gcr_ui_deps,
+     includes: [
+       'GObject-2.0',
+       'Gio-2.0',
+-- 
+GitLab
+
--- a/lfs/.signature
+++ b/lfs/.signature
@ -1,5 +1,5 @@
 untrusted comment: verify with /etc/ports/contrib.pub
-RWSagIOpLGJF3yZTHAEMs+MHxnyJmZc8xuC2PQMzJpe8lqjSQD/qymFOpZW2iEd1gO3x1Kw/pnn5h2V5cJ1SMfwxApp222PBTAU=
-SHA256 (Pkgfile) = 9df45f553e7acc808390a0da0ef5350a9f9311ac25e950302023d4e2c3a264ff
+RWSagIOpLGJF3y+uGg6iOiEp2gLEz+bnn+Y7zYkNoDNFGVdJcASD0k+SHYchJtQuT1veBsgtnmh0O+wltly7yIQaye2Z4ac8qQ0=
+SHA256 (Pkgfile) = 98edbaddf31b57be4dda6b8a549d265608c94602d82d6f5eeaf938de5efdadd2
 SHA256 (.footprint) = 79ccffc31e81e056e99987d40c46c8a4bd47aa98638e5a3ef0a506a11a61149e
-SHA256 (lfs-2.2.0.tar.gz) = 6c85e6027640317d15dbe010591f6aea680d4485af63973901ed190fedb47b63
+SHA256 (lfs-2.3.0.tar.gz) = b022132f2d6666878469373d4018fcfab83481902d363287bd26e24c7335233c
--- a/lfs/Pkgfile
+++ b/lfs/Pkgfile
@ -4,7 +4,7 @@
 # Depends on: rust

 name=lfs
-version=2.2.0
+version=2.3.0
 release=1
 source=(https://github.com/Canop/lfs/archive/v$version/$name-$version.tar.gz)