[PR PATCH] p11-kit: update to 0.24.1.

[PR PATCH] p11-kit: update to 0.24.1.

[motorto]

[-- Attachment #1: Type: text/plain, Size: 478 bytes --]

There is a new pull request by motorto against master on the void-packages repository

https://github.com/motorto/void-packages p11-kit-0.24.1
https://github.com/void-linux/void-packages/pull/41665

p11-kit: update to 0.24.1.
<!-- Uncomment relevant sections and delete options which are not applicable -->

#### Testing the changes
- I tested the changes in this PR: **briefly**



A patch file from https://github.com/void-linux/void-packages/pull/41665.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-p11-kit-0.24.1-41665.patch --]
[-- Type: text/x-diff, Size: 9934 bytes --]

From aedbba611346d18a58e1c46aa26bd9a635e4796a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Sun, 15 Jan 2023 14:27:53 +0000
Subject: [PATCH] p11-kit: update to 0.24.1.

---
 ...7870d918ecfea32fa59cbed0066f9cba0d0d.patch | 117 ------------------
 ...ec6c84421b6e5d309323e4817394fa6dbf49.patch |  38 ------
 srcpkgs/p11-kit/patches/meson-0.61.patch      |  42 -------
 .../p11-kit/patches/we-know-glib-prefix.patch |  13 --
 srcpkgs/p11-kit/template                      |   9 +-
 5 files changed, 5 insertions(+), 214 deletions(-)
 delete mode 100644 srcpkgs/p11-kit/patches/c4477870d918ecfea32fa59cbed0066f9cba0d0d.patch
 delete mode 100644 srcpkgs/p11-kit/patches/e1a8ec6c84421b6e5d309323e4817394fa6dbf49.patch
 delete mode 100644 srcpkgs/p11-kit/patches/meson-0.61.patch
 delete mode 100644 srcpkgs/p11-kit/patches/we-know-glib-prefix.patch

diff --git a/srcpkgs/p11-kit/patches/c4477870d918ecfea32fa59cbed0066f9cba0d0d.patch b/srcpkgs/p11-kit/patches/c4477870d918ecfea32fa59cbed0066f9cba0d0d.patch
deleted file mode 100644
index f6882457ee32..000000000000
--- a/srcpkgs/p11-kit/patches/c4477870d918ecfea32fa59cbed0066f9cba0d0d.patch
+++ /dev/null
@@ -1,117 +0,0 @@
-From c4477870d918ecfea32fa59cbed0066f9cba0d0d Mon Sep 17 00:00:00 2001
-From: Daiki Ueno <ueno@gnu.org>
-Date: Fri, 5 Mar 2021 08:26:02 +0100
-Subject: [PATCH] common: Enable message translation in p11_tool_main
-
----
- common/tool.c | 45 ++++++++++++++++++++++++++++++++++++---------
- 1 file changed, 36 insertions(+), 9 deletions(-)
-
-diff --git a/common/tool.c b/common/tool.c
-index 414f852d..5bd2a956 100644
---- a/common/tool.c
-+++ b/common/tool.c
-@@ -48,6 +48,17 @@
- #include <stdlib.h>
- #include <unistd.h>
- 
-+#ifdef HAVE_LOCALE_H
-+#include <locale.h>
-+#endif
-+
-+#ifdef ENABLE_NLS
-+#include <libintl.h>
-+#define _(x) dgettext(PACKAGE_NAME, x)
-+#else
-+#define _(x) (x)
-+#endif
-+
- #include "tool.h"
- 
- static char
-@@ -170,13 +181,21 @@ command_usage (const p11_tool_command *commands)
- 	int i;
- 
- 	progname = getprogname ();
--	printf ("usage: %s command <args>...\n", progname);
--	printf ("\nCommon %s commands are:\n", progname);
-+	printf (_("usage: %s command <args>...\n"), progname);
-+	printf (_("\nCommon %s commands are:\n"), progname);
- 	for (i = 0; commands[i].name != NULL; i++) {
- 		if (strcmp (commands[i].name, P11_TOOL_FALLBACK) != 0)
--			printf ("  %-15s  %s\n", commands[i].name, commands[i].text);
-+#ifdef ENABLE_NLS
-+			printf ("  %-15s  %s\n",
-+				commands[i].name,
-+				dgettext (PACKAGE_NAME, commands[i].text));
-+#else
-+			printf ("  %-15s  %s\n",
-+				commands[i].name,
-+				commands[i].text);
-+#endif
- 	}
--	printf ("\nSee '%s <command> --help' for more information\n", progname);
-+	printf (_("\nSee '%s <command> --help' for more information\n"), progname);
- }
- 
- static void
-@@ -205,6 +224,14 @@ p11_tool_main (int argc,
- 	int in, out;
- 	int i;
- 
-+#ifdef HAVE_LOCALE_H
-+	setlocale (LC_ALL, "");
-+#endif
-+
-+#ifdef ENABLE_NLS
-+	textdomain (PACKAGE_NAME);
-+#endif
-+
- 	/* Print messages by default. */
- 	p11_message_loud ();
- 
-@@ -231,7 +258,7 @@ p11_tool_main (int argc,
- 
- 			if (strcmp (argv[in], "--") == 0) {
- 				if (!command) {
--					p11_message ("no command specified");
-+					p11_message (_("no command specified"));
- 					return 2;
- 				} else {
- 					break;
-@@ -247,7 +274,7 @@ p11_tool_main (int argc,
- 				want_help = true;
- 
- 			} else if (!command) {
--				p11_message ("unknown global option: %s", argv[in]);
-+				p11_message (_("unknown global option: %s"), argv[in]);
- 				return 2;
- 			}
- 
-@@ -276,7 +303,7 @@ p11_tool_main (int argc,
- 
- 				default:
- 					if (!command) {
--						p11_message ("unknown global option: -%c", (int)argv[in][i]);
-+						p11_message (_("unknown global option: -%c"), (int)argv[in][i]);
- 						return 2;
- 					}
- 					break;
-@@ -303,7 +330,7 @@ p11_tool_main (int argc,
- 			command_usage (commands);
- 			return 0;
- 		} else {
--			p11_message ("no command specified");
-+			p11_message (_("no command specified"));
- 			return 2;
- 		}
- 	}
-@@ -328,7 +355,7 @@ p11_tool_main (int argc,
- 	}
- 
- 	/* At this point we have no command */
--	p11_message ("'%s' is not a valid command. See '%s --help'",
-+	p11_message (_("'%s' is not a valid command. See '%s --help'"),
- 	             command, getprogname ());
- 	return 2;
- }
diff --git a/srcpkgs/p11-kit/patches/e1a8ec6c84421b6e5d309323e4817394fa6dbf49.patch b/srcpkgs/p11-kit/patches/e1a8ec6c84421b6e5d309323e4817394fa6dbf49.patch
deleted file mode 100644
index 79a9242a9b1d..000000000000
--- a/srcpkgs/p11-kit/patches/e1a8ec6c84421b6e5d309323e4817394fa6dbf49.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-From e1a8ec6c84421b6e5d309323e4817394fa6dbf49 Mon Sep 17 00:00:00 2001
-From: Daiki Ueno <ueno@gnu.org>
-Date: Fri, 5 Mar 2021 08:24:50 +0100
-Subject: [PATCH] meson: Make sure to set PROJECT_NAME and ENABLE_NLS for 'nls'
- option
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Pointed out by Érico Nogueira Rolim in:
-https://github.com/p11-glue/p11-kit/issues/357
----
- meson.build | 5 +++++
- 1 file changed, 5 insertions(+)
-
-diff --git a/meson.build b/meson.build
-index 27cb5e76..52643f02 100644
---- a/meson.build
-+++ b/meson.build
-@@ -26,6 +26,7 @@ add_project_arguments(['-D_GNU_SOURCE', '-DP11_KIT_FUTURE_UNSTABLE_API'],
- 
- conf = configuration_data()
- 
-+conf.set_quoted('PACKAGE_NAME', meson.project_name())
- conf.set('PACKAGE_MAJOR', major_version)
- conf.set('PACKAGE_MINOR', minor_version)
- 
-@@ -58,6 +59,10 @@ endif
- 
- conf.set10('WITH_STRICT', get_option('strict'))
- 
-+if get_option('nls') and cc.has_header('libintl.h')
-+  conf.set('ENABLE_NLS', 1)
-+endif
-+
- prefix = get_option('prefix')
- datadir = get_option('datadir')
- bindir = get_option('bindir')
diff --git a/srcpkgs/p11-kit/patches/meson-0.61.patch b/srcpkgs/p11-kit/patches/meson-0.61.patch
deleted file mode 100644
index 43e75620c40e..000000000000
--- a/srcpkgs/p11-kit/patches/meson-0.61.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-From 9f01a8a45ba913a9b65894cef9369b6010005096 Mon Sep 17 00:00:00 2001
-From: Eli Schwartz <eschwartz@archlinux.org>
-Date: Tue, 11 Jan 2022 23:25:05 -0500
-Subject: [PATCH] gtkdoc: remove dependencies on custom target files
-
-Sadly, the `dependencies` kwarg does not actually do what it seems to be
-trying to be used for, here. It is for listing dependency or library
-objects whose compiler flags should be added to gtkdoc-scangobj.
-
-It will not actually add ninja target dependencies. The similar kwarg in
-other meson functions (e.g. genmarshal and compile_schemas) that *do*
-allow adding target dependencies, is `depend_files`.
-
-Older versions of meson simply did nothing in an if/elif/elif block
-where these custom_targets never matched anything, and were thus
-silently ignored.
-
-Meson 0.61 type-validates the arguments and rejects CustomTarget as
-invalid:
-
-```
-doc/manual/meson.build:72:8: ERROR: gnome.gtkdoc keyword argument 'dependencies' was of type array[CustomTarget | PkgConfigDependency] but should have been array[Dependency | SharedLibrary | StaticLibrary]
-```
-
-Fixes #406
----
- doc/manual/meson.build | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/doc/manual/meson.build b/doc/manual/meson.build
-index cf8758db..560df8db 100644
---- a/doc/manual/meson.build
-+++ b/doc/manual/meson.build
-@@ -73,7 +73,7 @@ if get_option('gtk_doc')
-               main_xml: 'p11-kit-docs.xml',
-               namespace: 'p11_kit',
-               src_dir: 'p11-kit',
--              dependencies: libffi_deps + dlopen_deps + xml_deps,
-+              dependencies: libffi_deps + dlopen_deps,
-               scan_args: [
-                 '--ignore-headers=' + ' '.join(ignore_headers),
-                 '--rebuild-types',
diff --git a/srcpkgs/p11-kit/patches/we-know-glib-prefix.patch b/srcpkgs/p11-kit/patches/we-know-glib-prefix.patch
deleted file mode 100644
index 4586dbe9effc..000000000000
--- a/srcpkgs/p11-kit/patches/we-know-glib-prefix.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Index: p11-kit-0.23.22/doc/manual/meson.build
-===================================================================
---- p11-kit-0.23.22.orig/doc/manual/meson.build
-+++ p11-kit-0.23.22/doc/manual/meson.build
-@@ -60,7 +60,7 @@ if get_option('gtk_doc')
-     'annotation-glossary.xml'
-   ]
- 
--  glib_prefix = dependency('glib-2.0').get_pkgconfig_variable('prefix')
-+  glib_prefix = '/usr'
-   fixxref_args = [
-     '--html-dir=' + (prefix / gnome.gtkdoc_html_dir(meson.project_name())),
-     '--extra-dir=' + (glib_prefix / gnome.gtkdoc_html_dir('glib')),
diff --git a/srcpkgs/p11-kit/template b/srcpkgs/p11-kit/template
index 63cdebc7563f..3e934c95d083 100644
--- a/srcpkgs/p11-kit/template
+++ b/srcpkgs/p11-kit/template
@@ -1,12 +1,13 @@
 # Template file for 'p11-kit'
 pkgname=p11-kit
-version=0.23.22
-revision=3
+version=0.24.1
+revision=1
 build_style=meson
 build_helper="qemu"
 configure_args="-Dlibffi=enabled -Dsystemd=disabled -Dbash_completion=disabled
  -Dman=true $(vopt_bool gtk_doc gtk_doc) -Dnls=true -Dtrust_module=enabled
- -Dtrust_paths=/etc/ssl/certs/ca-certificates.crt"
+ -Dtrust_paths=/etc/ssl/certs/ca-certificates.crt
+ -Dglib_prefix=/usr"
 hostmakedepends="pkg-config gettext gtk-doc libxslt libtasn1-tools"
 makedepends="libtasn1-devel libffi-devel"
 short_desc="Provides a way to load and enumerate PKCS#11 modules"
@@ -14,7 +15,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="BSD-3-Clause"
 homepage="https://github.com/p11-glue/p11-kit"
 distfiles="${homepage}/releases/download/${version}/p11-kit-${version}.tar.xz"
-checksum=8a8f40153dd5a3f8e7c03e641f8db400133fb2a6a9ab2aee1b6d0cb0495ec6b6
+checksum=d8be783efd5cd4ae534cee4132338e3f40f182c3205d23b200094ec85faaaef8
 conf_files="/etc/pkcs11/pkcs11.conf"
 
 if [ "$XBPS_CHECK_PKGS" ]; then

Re: [PR PATCH] [Merged]: p11-kit: update to 0.24.1.

[classabbyamp]

[-- Attachment #1: Type: text/plain, Size: 941 bytes --]

There's a merged pull request on the void-packages repository

p11-kit: update to 0.24.1.
https://github.com/void-linux/void-packages/pull/41665

Description:
<!-- Uncomment relevant sections and delete options which are not applicable -->

#### Testing the changes
- I tested the changes in this PR: **briefly**

```
SUMMARY                                    
pkg      host         target        cross  result
p11-kit  x86_64       x86_64        n      OK
p11-kit  x86_64-musl  x86_64-musl   n      OK
p11-kit  i686         i686          n      OK
p11-kit  x86_64-musl  aarch64-musl  y      OK
p11-kit  x86_64-musl  aarch64       y      OK
p11-kit  x86_64-musl  armv7l-musl   y      OK
p11-kit  x86_64-musl  armv7l        y      OK
p11-kit  x86_64-musl  armv6l-musl   y      OK
p11-kit  x86_64-musl  armv6l        y      OK
```

Not sure how to solve the xlint issue since we don't want to build gtk_docs by default ...