From nobody Sun Feb 18 14:01:37 2024 X-Original-To: dev-commits-ports-all@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 4Td6m22QkQz59lGt; Sun, 18 Feb 2024 14:01:38 +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 4Td6m21jptz4snS; Sun, 18 Feb 2024 14:01:38 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1708264898; 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=Lf9r6Ofu5N2uY2DI9icV7mx6Gexg5YoHoyCw6INwsic=; b=OLXx/o3inCVWF9SthAXfSsLppi2KRwkHiMUPtmtF20x05cQCUWw/aLxohf0hQ0IvRYrV+G fG496uZsgo0Pqw0zUWp9+deRXY6qJ4E9I2cl16ENC02jncBADVn/jlsiYXX9YDC1ucT0e7 cxS9KN6RUDq3yF0WvhSY4N6fC4TOUf1kuG2mgnjsnxKlKJOpASenIwejXXrz87MxC9R7a3 wjekRsQI6RSJEBV5j7LigDYKnpVfdylY9zXnnUMLxDSfnm6UMbjJ1t17qJh81+iaxZFyVp 5668fwDhBDXttlgrOOJWuKp6I7ZEVYVqaxZeqf96qwTkr/yjv+j7qmMHGTH60g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1708264898; 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=Lf9r6Ofu5N2uY2DI9icV7mx6Gexg5YoHoyCw6INwsic=; b=ADA1IWOm0BbTDDMUFuNOl4n+a7lt7f4IWQzTSILvXr+Q0yKbyx6Pu73/MjCP1fB9xIIC+t pU6mlQ32d7OjKFi2aDWu6qmWqTcMyDLF/ySYqi73PvGgqfycA8H4ssptatiafnpaQ109AS HQcQMm8zKFIfHFzWPVPZljffB4r9Z1o+MpDkadoFnXo48ouvAe44u+dSqLo3lEebe225M/ Z6X/zMAVnod7vLTwAAMQcTq6td0MxGD2Fk7BfuxUY0Tfqle0M1JO6ibw2+0bAqwmBgH8Eg 21FGyXyBba2L94i3AEnXbAXzErJaB2s19Ru9DFXUUw/fq9rKdKUjYe6lNVz2+Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1708264898; a=rsa-sha256; cv=none; b=SalyofwKtoLtJXt0ebQY52ZnL2t/LI9BvEiYmVGbwqECOzpMsRPB19VQFCvOHBlsyKlvXk YQ/bFROmYVc5kHyJ7w0X/jdRj+XSWkLk0jiLeOEvCNfHkGbURSpwTd05/hR8+tzIHgZvsk 5HJNzQNPnIBMROM+NeH1EM2ovJqm+AX9nF85dAfjps66FAdI0p94JX4LQbURmJ/09jeQsA cnop6Blf0sbrZZvIlmYTTnH0ZYSCJhVtTKSG/VSVgk37Mfv5eZlEjXx5yh3sDpgK9HdcZt TLCExEtGrYtCHi9N0Cq8AyTpOvn/6FVqtmBRPo7aMZTShczmlj9Bj4wTBuWNQQ== 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 4Td6m20SdQztVP; Sun, 18 Feb 2024 14:01:38 +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 41IE1bg6085823; Sun, 18 Feb 2024 14:01:37 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 41IE1bIf085820; Sun, 18 Feb 2024 14:01:37 GMT (envelope-from git) Date: Sun, 18 Feb 2024 14:01:37 GMT Message-Id: <202402181401.41IE1bIf085820@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Alexey Dokuchaev Subject: git: 27b40d24d49a - main - devel/qxlsx: update the port to version 1.4.7 List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-all@freebsd.org X-BeenThere: dev-commits-ports-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: danfe X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 27b40d24d49ac1fa03c56d352f56ab52237489a2 Auto-Submitted: auto-generated The branch main has been updated by danfe: URL: https://cgit.FreeBSD.org/ports/commit/?id=27b40d24d49ac1fa03c56d352f56ab52237489a2 commit 27b40d24d49ac1fa03c56d352f56ab52237489a2 Author: Alexey Dokuchaev AuthorDate: 2024-02-18 14:00:48 +0000 Commit: Alexey Dokuchaev CommitDate: 2024-02-18 14:00:48 +0000 devel/qxlsx: update the port to version 1.4.7 Now that Qt5/Qt6 versions are fully coinstallable, provide both flavors. Reported by: portscout --- astro/stellarium/Makefile | 2 +- devel/qxlsx/Makefile | 26 ++++++++++++++++++------ devel/qxlsx/distinfo | 8 +++----- devel/qxlsx/pkg-plist | 52 +++++++++++++++++++++++------------------------ 4 files changed, 50 insertions(+), 38 deletions(-) diff --git a/astro/stellarium/Makefile b/astro/stellarium/Makefile index d7db47ab7888..fb699aef2063 100644 --- a/astro/stellarium/Makefile +++ b/astro/stellarium/Makefile @@ -75,7 +75,7 @@ TEXTURES_DISTFILES= textures-1K.zip:gfx WEBENGINE_USE= QT=declarative,webchannel,webengine WEBENGINE_CMAKE_OFF= -DENABLE_QTWEBENGINE:BOOL=OFF -XLSX_LIB_DEPENDS= libQXlsx.so:devel/qxlsx +XLSX_LIB_DEPENDS= libQXlsxQt5.so:devel/qxlsx@qt5 XLSX_CMAKE_OFF= -DENABLE_XLSX:BOOL=OFF .include diff --git a/devel/qxlsx/Makefile b/devel/qxlsx/Makefile index b63b06082aab..bb87c1adc98e 100644 --- a/devel/qxlsx/Makefile +++ b/devel/qxlsx/Makefile @@ -1,11 +1,8 @@ PORTNAME= ${GH_PROJECT:tl} -PORTVERSION= 1.4.4 +PORTVERSION= 1.4.7 DISTVERSIONPREFIX= v CATEGORIES= devel -PATCH_SITES= https://github.com/${GH_ACCOUNT}/${GH_PROJECT}/commit/ -PATCHFILES= 8e83402db866ae7a67582da28aa68c83545f13c8.patch:-p2 - MAINTAINER= danfe@FreeBSD.org COMMENT= Excel file reader/writer library using Qt WWW= https://qtexcel.github.io/QXlsx/ @@ -13,14 +10,31 @@ WWW= https://qtexcel.github.io/QXlsx/ LICENSE= MIT LICENSE_FILE= ${WRKSRC}/../LICENSE -USES= cmake qt:5 +USES= cmake USE_GITHUB= yes GH_ACCOUNT= QtExcel GH_PROJECT= QXlsx USE_LDCONFIG= yes -USE_QT= buildtools:build qmake:build core gui CMAKE_ON= BUILD_SHARED_LIBS +CMAKE_ARGS= -DQT_VERSION_MAJOR:STRING=${_QT_LIBVER} WRKSRC_SUBDIR= ${GH_PROJECT} +PLIST_SUB= QTVER=${_QT_LIBVER} + +FLAVORS= qt5 qt6 + +.if ${FLAVOR:U} == qt6 +USES+= qt:6 +USE_QT= base +PKGNAMESUFFIX= -${FLAVOR} +.else +USES+= qt:5 +USE_QT= buildtools:build qmake:build core gui +.endif + +post-patch: +# Sanitize SOVERSION (we know about lack of ABI guarantees but don't care) + @${REINPLACE_CMD} -E '/SOVERSION/s,([[:digit:]]+)\..*,\1,' \ + ${WRKSRC}/CMakeLists.txt .include diff --git a/devel/qxlsx/distinfo b/devel/qxlsx/distinfo index 40ddec859331..b7e4372ef4a4 100644 --- a/devel/qxlsx/distinfo +++ b/devel/qxlsx/distinfo @@ -1,5 +1,3 @@ -TIMESTAMP = 1658513489 -SHA256 (QtExcel-QXlsx-v1.4.4_GH0.tar.gz) = 5c6f7117000c7559d6557d00a2f7b836bee670f9bc16309a72bc23aaedf994d9 -SIZE (QtExcel-QXlsx-v1.4.4_GH0.tar.gz) = 4703732 -SHA256 (8e83402db866ae7a67582da28aa68c83545f13c8.patch) = a3d0a12b093cebc8a27e156c67871e43f020d6db207b3d7ab447562b042107fc -SIZE (8e83402db866ae7a67582da28aa68c83545f13c8.patch) = 749 +TIMESTAMP = 1702873179 +SHA256 (QtExcel-QXlsx-v1.4.7_GH0.tar.gz) = 6f2de3e3bcfd09b7be0f9ad06c363cfe29a7a4c14280b36a91d8968f54be796a +SIZE (QtExcel-QXlsx-v1.4.7_GH0.tar.gz) = 4705261 diff --git a/devel/qxlsx/pkg-plist b/devel/qxlsx/pkg-plist index aa548777b0b7..026bf60c3f4a 100644 --- a/devel/qxlsx/pkg-plist +++ b/devel/qxlsx/pkg-plist @@ -1,26 +1,26 @@ -include/QXlsx/xlsxabstractooxmlfile.h -include/QXlsx/xlsxabstractsheet.h -include/QXlsx/xlsxabstractsheet_p.h -include/QXlsx/xlsxcell.h -include/QXlsx/xlsxcellformula.h -include/QXlsx/xlsxcelllocation.h -include/QXlsx/xlsxcellrange.h -include/QXlsx/xlsxcellreference.h -include/QXlsx/xlsxchart.h -include/QXlsx/xlsxchartsheet.h -include/QXlsx/xlsxconditionalformatting.h -include/QXlsx/xlsxdatavalidation.h -include/QXlsx/xlsxdatetype.h -include/QXlsx/xlsxdocument.h -include/QXlsx/xlsxformat.h -include/QXlsx/xlsxglobal.h -include/QXlsx/xlsxrichstring.h -include/QXlsx/xlsxworkbook.h -include/QXlsx/xlsxworksheet.h -lib/cmake/QXlsx/QXlsxConfig.cmake -lib/cmake/QXlsx/QXlsxConfigVersion.cmake -lib/cmake/QXlsx/QXlsxTargets-%%CMAKE_BUILD_TYPE%%.cmake -lib/cmake/QXlsx/QXlsxTargets.cmake -lib/libQXlsx.so -lib/libQXlsx.so.0 -lib/libQXlsx.so.1.4.4 +include/QXlsxQt%%QTVER%%/xlsxabstractooxmlfile.h +include/QXlsxQt%%QTVER%%/xlsxabstractsheet.h +include/QXlsxQt%%QTVER%%/xlsxabstractsheet_p.h +include/QXlsxQt%%QTVER%%/xlsxcell.h +include/QXlsxQt%%QTVER%%/xlsxcellformula.h +include/QXlsxQt%%QTVER%%/xlsxcelllocation.h +include/QXlsxQt%%QTVER%%/xlsxcellrange.h +include/QXlsxQt%%QTVER%%/xlsxcellreference.h +include/QXlsxQt%%QTVER%%/xlsxchart.h +include/QXlsxQt%%QTVER%%/xlsxchartsheet.h +include/QXlsxQt%%QTVER%%/xlsxconditionalformatting.h +include/QXlsxQt%%QTVER%%/xlsxdatavalidation.h +include/QXlsxQt%%QTVER%%/xlsxdatetype.h +include/QXlsxQt%%QTVER%%/xlsxdocument.h +include/QXlsxQt%%QTVER%%/xlsxformat.h +include/QXlsxQt%%QTVER%%/xlsxglobal.h +include/QXlsxQt%%QTVER%%/xlsxrichstring.h +include/QXlsxQt%%QTVER%%/xlsxworkbook.h +include/QXlsxQt%%QTVER%%/xlsxworksheet.h +lib/cmake/QXlsxQt%%QTVER%%/QXlsxQt%%QTVER%%Config.cmake +lib/cmake/QXlsxQt%%QTVER%%/QXlsxQt%%QTVER%%ConfigVersion.cmake +lib/cmake/QXlsxQt%%QTVER%%/QXlsxQt%%QTVER%%Targets-%%CMAKE_BUILD_TYPE%%.cmake +lib/cmake/QXlsxQt%%QTVER%%/QXlsxQt%%QTVER%%Targets.cmake +lib/libQXlsxQt%%QTVER%%.so +lib/libQXlsxQt%%QTVER%%.so.0 +lib/libQXlsxQt%%QTVER%%.so.1.4.4