Skip site navigation (1)Skip section navigation (2)
Date:      Sun, 15 Sep 2024 19:54:53 GMT
From:      Muhammad Moinur Rahman <bofh@FreeBSD.org>
To:        ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org
Subject:   git: b860826e9005 - main - devel/gammaray: Update version 2.11.3=>3.0.0
Message-ID:  <202409151954.48FJsrM9041524@gitrepo.freebsd.org>

next in thread | raw e-mail | index | archive | help
The branch main has been updated by bofh:

URL: https://cgit.FreeBSD.org/ports/commit/?id=b860826e900528525e4d7b10705ea5a8dc9fde00

commit b860826e900528525e4d7b10705ea5a8dc9fde00
Author:     Muhammad Moinur Rahman <bofh@FreeBSD.org>
AuthorDate: 2024-09-15 19:52:30 +0000
Commit:     Muhammad Moinur Rahman <bofh@FreeBSD.org>
CommitDate: 2024-09-15 19:54:37 +0000

    devel/gammaray: Update version 2.11.3=>3.0.0
    
    Changelog: https://github.com/KDAB/GammaRay/releases/tag/v3.0.0
    
    Reported by:    arrowd
---
 devel/gammaray/Makefile                   | 55 ++++++++++++++++++++++++-------
 devel/gammaray/distinfo                   |  6 ++--
 devel/gammaray/files/patch-CMakeLists.txt | 16 ++++-----
 devel/gammaray/pkg-plist                  |  1 -
 4 files changed, 55 insertions(+), 23 deletions(-)

diff --git a/devel/gammaray/Makefile b/devel/gammaray/Makefile
index a7b3994e7b85..38f9c7cfe213 100644
--- a/devel/gammaray/Makefile
+++ b/devel/gammaray/Makefile
@@ -1,30 +1,63 @@
 PORTNAME=	gammaray
-DISTVERSION=	2.11.3
-PORTREVISION=	3
+DISTVERSION=	3.0.0
 CATEGORIES=	devel
 MASTER_SITES=	https://github.com/KDAB/GammaRay/releases/download/v${DISTVERSION}/
 
+# implicit-approval+: arrowd
 MAINTAINER=	bofh@FreeBSD.org
 COMMENT=	Debugging tool for Qt-application
 WWW=		https://www.kdab.com/development-resources/qt-tools/gammaray/
 
-LICENSE=	GPLv2 BSD2CLAUSE
+LICENSE=	BSD2CLAUSE BSD3CLAUSE GPLv2 GPLv2+ GPLv3 GPLv3+ LGPL20+ LGPL21 LGPL21+ LGPL3 MIT
 LICENSE_COMB=	multi
-LICENSE_FILE_GPLv2=	${WRKSRC}/LICENSE.GPL.txt
-LICENSE_FILE_BSD2CLAUSE=	${WRKSRC}/LICENSE.BSD2.txt
+LICENSE_FILE_BSD2CLAUSE=${WRKSRC}/LICENSES/BSD-2-Clause.txt
+LICENSE_FILE_BSD3CLAUSE=${WRKSRC}/LICENSES/BSD-3-Clause.txt
+LICENSE_FILE_GPLv2=	${WRKSRC}/LICENSES/GPL-2.0-only.txt
+LICENSE_FILE_GPLv2+ =	${WRKSRC}/LICENSES/GPL-2.0-or-later.txt
+LICENSE_FILE_GPLv3=	${WRKSRC}/LICENSES/GPL-3.0-only.txt
+LICENSE_FILE_GPLv3+ =	${WRKSRC}/LICENSES/GPL-3.0-or-later.txt
+LICENSE_FILE_LGPL20+ =	${WRKSRC}/LICENSES/LGPL-2.0-or-later.txt
+LICENSE_FILE_LGPL21=	${WRKSRC}/LICENSES/LGPL-2.1-only.txt
+LICENSE_FILE_LGPL21+ =	${WRKSRC}/LICENSES/LGPL-2.1-or-later.txt
+LICENSE_FILE_LGPL3=	${WRKSRC}/LICENSES/LGPL-3.0-only.txt
+LICENSE_FILE_MIT=	${WRKSRC}/LICENSES/MIT.txt
 
 LIB_DEPENDS=	libdwarf.so:devel/libdwarf \
 		libelf.so:devel/libelf
 
-USES=		cmake kde:5 pkgconfig qt:5
+#FLAVORS=	qt5 qt6
+#FLAVOR?=	qt6
+
+#qt5_PKGNAMESUFFIX=		-qt5
+#qt5_CONFLICTS_INSTALL=	${PORTNAME}
+#qt6_CONFLICTS_INSTALL=	${PORTNAME}-qt5
+
+USES=		cmake pkgconfig
 
-USE_QT=		3d concurrent core declarative designer gui help linguisttools \
-		location network printsupport script scripttools svg uiplugin \
-		webchannel widgets xml buildtools:build qdoc:build qmake:build
 USE_KDE=	coreaddons syntaxhighlighting
+USE_QT=		3d declarative location svg webchannel
+
+#.if ${FLAVOR} == qt5
+USES+=		kde:5 qt:5
+USE_QT+=	buildtools:build concurrent core designer gui help \
+		linguisttools network printsupport qdoc:build \
+		qmake:build script scripttools uiplugin widgets xml
+QT_VERSION=${QT5_VERSION:C/\./_/:C/\..*//}
+#.else
+#USES+=		kde:6 qt:6
+#USE_QT+=	shadertools
+#QT_VERSION=${QT6_VERSION:C/\./_/:C/\..*//}
+#USE_QT+=	charts connectivity datavis3d doc examples imageformats \
+#	multimedia networkauth quick3d quicktimeline remoteobjects scxml \
+#	sensors serialbus serialport speech virtualkeyboard wayland \
+#	webengine websockets webview
+#USE_QT+=	5compat base coap graphs httpserver languageserver lottie pdf positioning \
+#	quick3dphysics quickeffectmaker shadertools tools translations \
+#	sqldriver-sqlite sqldriver-mysql sqldriver-psql sqldriver-odbc
+#.endif
 
-CMAKE_OFF=	STACK_DETAILS_AUTO_DETECT
 CMAKE_ON=	STACK_DETAILS_DWARF
+CMAKE_OFF=	STACK_DETAILS_AUTO_DETECT
 
 .include <bsd.port.options.mk>
 
@@ -38,6 +71,6 @@ PLIST_SUB=	WEBENGINE="@comment "
 PLIST_SUB+=	ARCH=${ARCH:S/amd64/x86_64/:S/i386/i686/:C/armv./arm/} \
 		PORTMAJMIN=${PORTVERSION:C/(.*)\..*/\1/} \
 		PORTVERSION=${PORTVERSION} \
-		QTVER=${QT5_VERSION:C/\./_/:C/\..*//}
+		QTVER=${QT_VERSION}
 
 .include <bsd.port.mk>
diff --git a/devel/gammaray/distinfo b/devel/gammaray/distinfo
index 0486398c298d..f773829511e1 100644
--- a/devel/gammaray/distinfo
+++ b/devel/gammaray/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1693655782
-SHA256 (gammaray-2.11.3.tar.gz) = 03d7ca7bd5eb600c9c389d0cf071960330592f1f392a783b7fec5f9eaa5df586
-SIZE (gammaray-2.11.3.tar.gz) = 10841865
+TIMESTAMP = 1726418815
+SHA256 (gammaray-3.0.0.tar.gz) = acd27dbbcbdf73fed497e0b5d6c477f2e11b59c48499752602677037dcd64ba5
+SIZE (gammaray-3.0.0.tar.gz) = 11037590
diff --git a/devel/gammaray/files/patch-CMakeLists.txt b/devel/gammaray/files/patch-CMakeLists.txt
index 10446b3b67e0..14168c9e50ca 100644
--- a/devel/gammaray/files/patch-CMakeLists.txt
+++ b/devel/gammaray/files/patch-CMakeLists.txt
@@ -1,12 +1,12 @@
 Weird CMake macro error coming from that
 
---- CMakeLists.txt.orig	2021-03-22 12:21:36 UTC
+--- CMakeLists.txt.orig	2023-09-04 14:43:10 UTC
 +++ CMakeLists.txt
-@@ -405,7 +405,6 @@ find_package(Qt5 NO_MODULE QUIET OPTIONAL_COMPONENTS
-   Test
-   WebEngineWidgets
-   Widgets
--  WaylandCompositor
+@@ -459,7 +459,6 @@ find_package(
+         Test
+         WebEngineWidgets
+         Widgets
+-        WaylandCompositor
  )
- 
- set(MACOS_DISABLE_UNSUPPORTED_TESTS FALSE)
+ if(ANDROID)
+     find_package(Qt${QT_VERSION_MAJOR} NO_MODULE REQUIRED COMPONENTS AndroidExtras)
diff --git a/devel/gammaray/pkg-plist b/devel/gammaray/pkg-plist
index a6573d09c36a..30124c5b263a 100644
--- a/devel/gammaray/pkg-plist
+++ b/devel/gammaray/pkg-plist
@@ -89,7 +89,6 @@ lib/gammaray/%%PORTMAJMIN%%/qt%%QTVER%%-%%ARCH%%/gammaray_modelinspector_ui.so
 lib/gammaray/%%PORTMAJMIN%%/qt%%QTVER%%-%%ARCH%%/gammaray_modelinspector.so
 lib/gammaray/%%PORTMAJMIN%%/qt%%QTVER%%-%%ARCH%%/gammaray_network_ui.so
 lib/gammaray/%%PORTMAJMIN%%/qt%%QTVER%%-%%ARCH%%/gammaray_network.so
-lib/gammaray/%%PORTMAJMIN%%/qt%%QTVER%%-%%ARCH%%/gammaray_objectvisualizer_plugin.so
 lib/gammaray/%%PORTMAJMIN%%/qt%%QTVER%%-%%ARCH%%/gammaray_positioning_ui.so
 lib/gammaray/%%PORTMAJMIN%%/qt%%QTVER%%-%%ARCH%%/gammaray_positioning.so
 lib/gammaray/%%PORTMAJMIN%%/qt%%QTVER%%-%%ARCH%%/gammaray_probe.so



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202409151954.48FJsrM9041524>