From nobody Sun Jun 23 19:39:45 2024 X-Original-To: dev-commits-ports-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4W6hJ20gjMz5NqvC; Sun, 23 Jun 2024 19:39:46 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4W6hJ16f4fz4HXJ; Sun, 23 Jun 2024 19:39:45 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1719171585; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=gLavFCQXNlF/VhSv5HUhcEloz5DB6rmRMeh4Ru/At/E=; b=CPCfYjdqiHo+czyChkcqaT5574Rf01N7EihN8M0C4j9u0M8g0YoPVG6hytWe7dqRMquWsM i+bgvatERPOwQ8ARnAl82oZVn5CYfNo3jxxKLh0RbS3rZqLCCMgj1YtaaJevsthqnfkzNX qk8CWQOl3PceuCIUgJ8W5ECujevNwz3lz6wDmLzGQVmoF10Imqg/srhT8hTpm66D6nfwoQ ujl6qq1WlNwNkWS4KzsMQPX3mayPqL4QBermYA8PJK14Fz4wAHl5tr9087eFboHKDhKkyk 6f5DhA55jdInLIW9fQhMITNAHRMc6Z2krJfJnFaYJN61mwZaa8VVjrN4sfALOQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1719171585; a=rsa-sha256; cv=none; b=mPX6OJX+RDzLo8KetnSV6kckY9TQGDKl6+OSrJf+bLhYQ4jx2F84fQhrtj5bq00Pt/W7E0 Sevf0s00yX96s+tiTjA4HiegKkGZOYucCdhCYHFPno9lsx7gLsRgYMj6Q0lvw3cyoXed3a 10IjY3dMGoq61LY0qhnEOAbhVn44n/VROwPmNVq1NU6m+NxW1C5M3XVVGlb0az3Y9Ijil0 YAGApgnEa6D0zbCvQWNTeZMDHdcctwag5DJIqXIWCP9HPDTfYYDHz9+YIMyxYo0GfXXVuK IWLcKt63ZD1pCe1DlimbkJy61Ao5UdfIFu8BwsR4f9vtQHYhGszi5ggJ95AQqw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1719171585; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=gLavFCQXNlF/VhSv5HUhcEloz5DB6rmRMeh4Ru/At/E=; b=guJjiX32yvjlKBP7GfryqrEXBDh/zQSr1Eue/9yK3SSBtELYaC/GUTQAivtjzDp8T/Lm+4 ELMAaWjeYDeJ4/DQ8t5oD14Lqjw7l1B0Ms2tLAQbBOLVsQwTmlxeo4vkXshzq5Btd4q6xQ 77elZSCKujCbaKT0ZKghw5lw+h4eLRs91Hw2k9paqcw46v8CymTrK4TjWJjVaIuy86CS6a 8nKMGJO70NeUb29iwizXn1yrhzdptk1C7WpUHfm9plwiIrjwNrlznRUw/U3SwOopWJracy /lp8jPXjNzPtLJj+mwJ0SFNVu860m3Kl7Bt9wjcz41moaYTOsI3ICUyVF6Xysw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4W6hJ16F8gzmph; Sun, 23 Jun 2024 19:39:45 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 45NJdjYJ045756; Sun, 23 Jun 2024 19:39:45 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 45NJdjZK045753; Sun, 23 Jun 2024 19:39:45 GMT (envelope-from git) Date: Sun, 23 Jun 2024 19:39:45 GMT Message-Id: <202406231939.45NJdjZK045753@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Lars Engels Subject: git: f91f4d5699d7 - main - deskutils/ausweisapp2: Update to 2.1.1 List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-ports-main@freebsd.org Sender: owner-dev-commits-ports-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: lme X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: f91f4d5699d7ed27d3285aceab5590ec90591d62 Auto-Submitted: auto-generated The branch main has been updated by lme: URL: https://cgit.FreeBSD.org/ports/commit/?id=f91f4d5699d7ed27d3285aceab5590ec90591d62 commit f91f4d5699d7ed27d3285aceab5590ec90591d62 Author: Lars Engels AuthorDate: 2024-06-23 18:52:28 +0000 Commit: Lars Engels CommitDate: 2024-06-23 19:39:31 +0000 deskutils/ausweisapp2: Update to 2.1.1 --- deskutils/ausweisapp2/Makefile | 16 ++++++----- deskutils/ausweisapp2/distinfo | 6 ++-- .../ausweisapp2/files/patch-cmake_Libraries.cmake | 33 +++++++++++++++------- deskutils/ausweisapp2/pkg-plist | 10 +++---- 4 files changed, 40 insertions(+), 25 deletions(-) diff --git a/deskutils/ausweisapp2/Makefile b/deskutils/ausweisapp2/Makefile index 6902b286439c..63e57112a0f0 100644 --- a/deskutils/ausweisapp2/Makefile +++ b/deskutils/ausweisapp2/Makefile @@ -1,5 +1,5 @@ PORTNAME= ausweisapp2 -DISTVERSION= 1.24.2 +DISTVERSION= 2.1.1 CATEGORIES= deskutils security MAINTAINER= freebsd@sysctl.cz @@ -11,19 +11,21 @@ LICENSE_NAME= European Union Public Licence V. 1.2 LICENSE_FILE= ${WRKSRC}/LICENSE.txt LICENSE_PERMS= dist-mirror dist-sell pkg-mirror pkg-sell auto-accept -BUILD_DEPENDS= pcsc-lite>0:devel/pcsc-lite \ +BUILD_DEPENDS= libglvnd>0:graphics/libglvnd \ + pcsc-lite>0:devel/pcsc-lite \ qt5-declarative-test>0:x11-toolkits/qt5-declarative-test + LIB_DEPENDS= libhttp_parser.so:www/http-parser \ libpcsclite.so:devel/pcsc-lite \ libudev.so:devel/libudev-devd -USES= cmake compiler:c++17-lang pkgconfig qmake qt:5 ssl +USES= cmake compiler:c++17-lang pkgconfig qmake qt:6 ssl +USE_GL+= gl opengl USE_GITHUB= yes GH_ACCOUNT= Governikus -GH_PROJECT= AusweisApp2 -USE_QT= concurrent core declarative graphicaleffects gui network \ - quickcontrols2 svg websockets widgets \ - buildtools linguisttools +GH_PROJECT= AusweisApp +USE_QT= base connectivity declarative scxml shadertools svg tools \ + websockets # The VENDOR variable controls the name of the directory in ${PREFIX}/share. CMAKE_ARGS= -DVENDOR=${PORTNAME} diff --git a/deskutils/ausweisapp2/distinfo b/deskutils/ausweisapp2/distinfo index ad087c34a26e..d7418a6a9388 100644 --- a/deskutils/ausweisapp2/distinfo +++ b/deskutils/ausweisapp2/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1664903413 -SHA256 (Governikus-AusweisApp2-1.24.2_GH0.tar.gz) = bb92f2e73e352921878000cd5ec81fcd8924c8d360059bf09b70707e06d35f05 -SIZE (Governikus-AusweisApp2-1.24.2_GH0.tar.gz) = 11478273 +TIMESTAMP = 1718018776 +SHA256 (Governikus-AusweisApp-2.1.1_GH0.tar.gz) = 131b49b8b17fbde2c7c5671721462fff1685725d9b02d244de85a782f3849562 +SIZE (Governikus-AusweisApp-2.1.1_GH0.tar.gz) = 5878477 diff --git a/deskutils/ausweisapp2/files/patch-cmake_Libraries.cmake b/deskutils/ausweisapp2/files/patch-cmake_Libraries.cmake index 2cfe616a9e1b..31013b98049c 100644 --- a/deskutils/ausweisapp2/files/patch-cmake_Libraries.cmake +++ b/deskutils/ausweisapp2/files/patch-cmake_Libraries.cmake @@ -1,11 +1,24 @@ ---- cmake/Libraries.cmake.orig 2022-09-06 11:32:26 UTC +--- cmake/Libraries.cmake.orig 2024-04-10 11:44:19 UTC +++ cmake/Libraries.cmake -@@ -144,7 +144,7 @@ elseif(MAC) - find_library(OSX_FOUNDATION Foundation) - find_library(OSX_SERVICEMANAGEMENT ServiceManagement) - elseif(UNIX) -- if(LINUX) -+ if(LINUX OR BSD) - find_package(PkgConfig REQUIRED) - pkg_check_modules(UDEV IMPORTED_TARGET libudev) - if(NOT TARGET PkgConfig::UDEV) +@@ -147,12 +147,12 @@ if(QT_COMPONENTS) + find_package(${Qt} ${MIN_QT_VERSION} COMPONENTS ${QT_COMPONENTS} REQUIRED) + endif() + +-if(LINUX OR BSD) +- try_run(testResult compileResult "${CMAKE_BINARY_DIR}" "${CMAKE_DIR}/tests/openssl.cpp" +- CMAKE_FLAGS INSTALL_RPATH_USE_LINK_PATH:BOOL=ON +- LINK_LIBRARIES ${Qt}::Network OpenSSL::Crypto OpenSSL::SSL +- OUTPUT_VARIABLE runResult) +- if(NOT testResult EQUAL 0) +- message(FATAL_ERROR "Your OpenSSL library looks incompatible: ${testResult}\n${runResult}") +- endif() +-endif() ++#if(LINUX OR BSD) ++# try_run(testResult compileResult "${CMAKE_BINARY_DIR}" "${CMAKE_DIR}/tests/openssl.cpp" ++# CMAKE_FLAGS INSTALL_RPATH_USE_LINK_PATH:BOOL=ON ++# LINK_LIBRARIES ${Qt}::Network OpenSSL::Crypto OpenSSL::SSL ++# OUTPUT_VARIABLE runResult) ++# if(NOT testResult EQUAL 0) ++# message(FATAL_ERROR "Your OpenSSL library looks incompatible: ${testResult}\n${runResult}") ++# endif() ++#endif() diff --git a/deskutils/ausweisapp2/pkg-plist b/deskutils/ausweisapp2/pkg-plist index 546fcb6b7d13..654eb58aa168 100644 --- a/deskutils/ausweisapp2/pkg-plist +++ b/deskutils/ausweisapp2/pkg-plist @@ -1,7 +1,7 @@ -bin/AusweisApp2 -share/man/man1/AusweisApp2.1.gz +bin/AusweisApp share/applications/com.governikus.ausweisapp2.desktop -share/icons/hicolor/96x96/apps/AusweisApp2.png -share/icons/hicolor/scalable/apps/AusweisApp2.svg +%%DATADIR%%/AusweisApp/AusweisApp.rcc +share/icons/hicolor/96x96/apps/AusweisApp.png +share/icons/hicolor/scalable/apps/AusweisApp.svg +share/man/man1/AusweisApp.1.gz share/metainfo/com.governikus.ausweisapp2.metainfo.xml -%%DATADIR%%/AusweisApp2/AusweisApp2.rcc