cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

switch to qt6

Browse Source
This commit is contained in:
kn 2022-12-13 03:24:57 +00:00
parent f8324449b0
commit 4ceebbb9f9
3 changed files with 12 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
security/qdigidoc4/Makefile
View File

@ -1,7 +1,7 @@
COMMENT = DigiDoc4 GUI client for signing and encrypting documents
V = 4.2.12
REVISION = 0
REVISION = 1
DISTNAME = qdigidoc4-${V}
CATEGORIES = security x11
@ -31,6 +31,7 @@ CONFIGURE_ENV += TSL_URL=file://${FULLDISTDIR}/eu-lotl-pivot-300.xml
MASTER_SITES2 = https://github.com/open-eid/DigiDoc4-Client/
# merged but after 4.2.12 release
PATCHFILES += bsd-{pull/}1072.patch:2
PATCHFILES += qt6-{pull/}1082.patch:2
MASTER_SITES3 = https://github.com/open-eid/qt-common/
# merged but after 4.2.12 release
@ -44,23 +45,25 @@ PATCH_DIST_STRIP = -p1
MAINTAINER = Klemens Nanni <kn@openbsd.org>
WANTLIB += ${COMPILER_LIBCXX} Qt5Core Qt5Gui Qt5Network Qt5PrintSupport
WANTLIB += Qt5Svg Qt5Widgets c crypto digidocpp lber ldap m pcsclite ssl
WANTLIB += ${COMPILER_LIBCXX} GL Qt6Core Qt6Core5Compat Qt6Gui
WANTLIB += Qt6Network Qt6PrintSupport Qt6Svg Qt6SvgWidgets Qt6Widgets
WANTLIB += c crypto digidocpp lber ldap m pcsclite ssl
MODULES = devel/cmake \
x11/qt5
x11/qt6
BUILD_DEPENDS = devel/gettext,-tools \
x11/qt5/qttools
x11/qt6/qttools
LIB_DEPENDS = databases/openldap,-main \
security/libdigidocpp>=3.14.10 \
security/pcsc-lite \
x11/qt5/qtsvg
x11/qt6/qt5compat \
x11/qt6/qtsvg
RUN_DEPENDS = devel/desktop-file-utils \
misc/shared-mime-info \
x11/qt5/qttranslations \
x11/qt6/qttranslations \
x11/gtk+3,-guic
CONFIGURE_ENV += LDFLAGS=${LDFLAGS:Q}

2
security/qdigidoc4/distinfo
View File

@ -6,6 +6,7 @@ SHA256 (qdigidoc4/eu-lotl-pivot-300.xml) = DSmCpZOMKFf1lEcM4XkKac7R65hkcovZZw/ex
SHA256 (qdigidoc4/qdigidoc4-4.2.12.tar.gz) = 6bso1qvhVhbBfrcTq4S+aHtHli7X2A926N4r45ztq4E=
SHA256 (qdigidoc4/qt-common-fix-i386-124.patch) = xABbKTV6LEv/9pjs17mVz+p3zkka2uiijDVT++SJZqU=
SHA256 (qdigidoc4/qt-common-pcsc-lite-121.patch) = 6mZNDCrZszL/7CdD7b12zcC5klsi0+GDLxoZ3S3U+OM=
SHA256 (qdigidoc4/qt6-1082.patch) = JG851k9p1xESrlQy9DrpA+lnARrKdkb1kUMzBLJAMUQ=
SIZE (qdigidoc4/bsd-1072.patch) = 5862
SIZE (qdigidoc4/config.json) = 67182
SIZE (qdigidoc4/config.pub) = 426
@ -14,3 +15,4 @@ SIZE (qdigidoc4/eu-lotl-pivot-300.xml) = 424989
SIZE (qdigidoc4/qdigidoc4-4.2.12.tar.gz) = 4179889
SIZE (qdigidoc4/qt-common-fix-i386-124.patch) = 1416
SIZE (qdigidoc4/qt-common-pcsc-lite-121.patch) = 2040
SIZE (qdigidoc4/qt6-1082.patch) = 6673

17
security/qdigidoc4/patches/patch-CMakeLists_txt
View File

@ -1,17 +0,0 @@
Stick to Qt5 for now, see "Cannot build against Qt5 if Qt6 is installed"
https://github.com/open-eid/DigiDoc4-Client/issues/1097
Index: CMakeLists.txt
--- CMakeLists.txt.orig
+++ CMakeLists.txt
@@ -14,7 +14,9 @@ include( VersionInfo )
find_package( PKCS11 )
find_package( LibDigiDocpp 3.14.8 REQUIRED )
find_package( LDAP REQUIRED )
-find_package(QT NAMES Qt6 Qt5 COMPONENTS Core REQUIRED)
+find_package(Qt5 COMPONENTS Core REQUIRED)
+set(QT_VERSION ${Qt5_VERSION})
+set(QT_VERSION_MAJOR ${Qt5_VERSION_MAJOR})
find_package(Qt${QT_VERSION_MAJOR} 5.9.0 REQUIRED COMPONENTS Core Widgets Network PrintSupport Svg LinguistTools)
set_env( TSL_URL "https://ec.europa.eu/tools/lotl/eu-lotl.xml" CACHE STRING "TSL trust list primary URL" )