public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
* [gentoo-commits] repo/gentoo:master commit in: app-crypt/coolkey/files/, app-crypt/coolkey/
@ 2022-10-14 11:57 Ionen Wolkens
  0 siblings, 0 replies; only message in thread
From: Ionen Wolkens @ 2022-10-14 11:57 UTC (permalink / raw
  To: gentoo-commits

commit:     0d9d5268d47dc05309f796e83117af9e978bc2d2
Author:     Ionen Wolkens <ionen <AT> gentoo <DOT> org>
AuthorDate: Fri Oct 14 05:53:32 2022 +0000
Commit:     Ionen Wolkens <ionen <AT> gentoo <DOT> org>
CommitDate: Fri Oct 14 11:55:54 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0d9d5268

app-crypt/coolkey: fix build w/ upcoming clang16

Header that declare this is not installed, and seems like these
headers would conflict in all sorts of ways here either way.

An alternative fix could be to drop --enable-pk11install which is
marked legacy (off by default), but don't know this package and
no idea if anyone need this.

Closes: https://bugs.gentoo.org/871585
Signed-off-by: Ionen Wolkens <ionen <AT> gentoo.org>

 app-crypt/coolkey/coolkey-1.1.0-r9.ebuild           |  3 ++-
 app-crypt/coolkey/files/coolkey-1.1.0-clang16.patch | 13 +++++++++++++
 2 files changed, 15 insertions(+), 1 deletion(-)

diff --git a/app-crypt/coolkey/coolkey-1.1.0-r9.ebuild b/app-crypt/coolkey/coolkey-1.1.0-r9.ebuild
index cd3d7f1e434b..d388df3391b7 100644
--- a/app-crypt/coolkey/coolkey-1.1.0-r9.ebuild
+++ b/app-crypt/coolkey/coolkey-1.1.0-r9.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -26,6 +26,7 @@ BDEPEND="virtual/pkgconfig"
 
 PATCHES=(
 	"${WORKDIR}/${PN}-patches"
+	"${FILESDIR}/${P}-clang16.patch"
 )
 
 pkg_setup() {

diff --git a/app-crypt/coolkey/files/coolkey-1.1.0-clang16.patch b/app-crypt/coolkey/files/coolkey-1.1.0-clang16.patch
new file mode 100644
index 000000000000..88c3e11b53e8
--- /dev/null
+++ b/app-crypt/coolkey/files/coolkey-1.1.0-clang16.patch
@@ -0,0 +1,13 @@
+Declaration taken from nss sources' lib/softoken/pkcs11i.h.
+Only needed with --enable-pk11install.
+
+https://bugs.gentoo.org/871585
+--- a/src/install/pk11install.c
++++ b/src/install/pk11install.c
+@@ -23,4 +23,6 @@
+ #include "pkcs11n.h"
+ 
++char **NSC_ModuleDBFunc(unsigned long function, char *parameters, void *args);
++
+ /*
+  * windows specific globing search


^ permalink raw reply related	[flat|nested] only message in thread

only message in thread, other threads:[~2022-10-14 11:57 UTC | newest]

Thread overview: (only message) (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2022-10-14 11:57 [gentoo-commits] repo/gentoo:master commit in: app-crypt/coolkey/files/, app-crypt/coolkey/ Ionen Wolkens

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox