pkgsrc-WIP-changes archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

qt6-qtbase: pickup heimdal kerberos



Module Name:	pkgsrc-wip
Committed By:	Niclas Rosenvik <nros%NetBSD.org@localhost>
Pushed By:	nros
Date:		Tue Feb 16 21:03:11 2021 +0100
Changeset:	85654946161ac1459b271cb244b040ca0fd578bd

Modified Files:
	qt6-qtbase/distinfo
Added Files:
	qt6-qtbase/patches/patch-cmake_FindGSSAPI.cmake

Log Message:
qt6-qtbase: pickup heimdal kerberos

add patch that makes qt look for heimdals impementation
of kerberos as well as the on from MIT.

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=85654946161ac1459b271cb244b040ca0fd578bd

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

diffstat:
 qt6-qtbase/distinfo                             |  1 +
 qt6-qtbase/patches/patch-cmake_FindGSSAPI.cmake | 30 +++++++++++++++++++++++++
 2 files changed, 31 insertions(+)

diffs:
diff --git a/qt6-qtbase/distinfo b/qt6-qtbase/distinfo
index 128cb83091..1afee2b1d0 100644
--- a/qt6-qtbase/distinfo
+++ b/qt6-qtbase/distinfo
@@ -4,6 +4,7 @@ SHA1 (qtbase-everywhere-src-6.0.1.tar.xz) = 1cd91a1696b8e4b59483a271aa7f9fde22a9
 RMD160 (qtbase-everywhere-src-6.0.1.tar.xz) = 2b3a5bc8834c3330ac4194eaaaedb327faeb9c3d
 SHA512 (qtbase-everywhere-src-6.0.1.tar.xz) = 69a24162239f19e8eb889d51662c6cea3869ad7e53a889fe16c35083840fde8c90053b0f943129c82066364eea0ec94eb86d91d3293ef874e100476dad10a998
 Size (qtbase-everywhere-src-6.0.1.tar.xz) = 46262020 bytes
+SHA1 (patch-cmake_FindGSSAPI.cmake) = 522dd9f02daef2587eb46a3a1c582fdd98a77360
 SHA1 (patch-cmake_QtBuild.cmake) = 9e51c025686de3b1a383056eb6c61b0884349b57
 SHA1 (patch-cmake_QtPlatformSupport.cmake) = 597c57d1acd2798e2f8393c6fd391721c2f54f41
 SHA1 (patch-configure) = f5019131cc4e6cd4e35242cc7b598fbf8f5f766b
diff --git a/qt6-qtbase/patches/patch-cmake_FindGSSAPI.cmake b/qt6-qtbase/patches/patch-cmake_FindGSSAPI.cmake
new file mode 100644
index 0000000000..853cf981f2
--- /dev/null
+++ b/qt6-qtbase/patches/patch-cmake_FindGSSAPI.cmake
@@ -0,0 +1,30 @@
+$NetBSD$
+
+* look for heimdals gssapi implementation as well
+  fixes build where KRB5_TYPE = heimdal, see mk/krb5.buildlink3.mk
+
+--- cmake/FindGSSAPI.cmake.orig	2021-02-15 21:57:24.639772681 +0000
++++ cmake/FindGSSAPI.cmake
+@@ -1,15 +1,19 @@
+ find_package(PkgConfig QUIET)
+-pkg_check_modules(PC_GSSAPI QUIET krb5-gssapi)
++pkg_search_module(PC_GSSAPI QUIET krb5-gssapi heimdal-gssapi)
+ 
+ find_path(GSSAPI_INCLUDE_DIRS
+           NAMES gssapi/gssapi.h
+           HINTS ${PC_GSSAPI_INCLUDEDIR}
+-          PATH_SUFFIXES gssapi)
++          PATH_SUFFIXES 
++          gssapi
++          krb5 # heimdal
++)
+ 
+ find_library(GSSAPI_LIBRARIES
+              NAMES
+              GSS # framework
+-             gssapi_krb5
++             gssapi_krb5 # mit krb5
++             gssapi # heimdal
+              HINTS ${PC_GSSAPILIBDIR}
+ )
+ 


Home | Main Index | Thread Index | Old Index