summaryrefslogtreecommitdiff
path: root/devel/qbs
diff options
context:
space:
mode:
Diffstat (limited to 'devel/qbs')
-rw-r--r--devel/qbs/Makefile9
-rw-r--r--devel/qbs/distinfo6
-rw-r--r--devel/qbs/files/patch-src_app_qbs-setup-qt_setupqt.cpp4
-rw-r--r--devel/qbs/pkg-plist22
4 files changed, 28 insertions, 13 deletions
diff --git a/devel/qbs/Makefile b/devel/qbs/Makefile
index 4a10f8f14d82..5d29eda711b9 100644
--- a/devel/qbs/Makefile
+++ b/devel/qbs/Makefile
@@ -1,6 +1,6 @@
PORTNAME= qbs
DISTVERSIONPREFIX= src-
-DISTVERSION= 2.6.0
+DISTVERSION= 3.0.3
CATEGORIES= devel
MASTER_SITES= QT/official_releases/${PORTNAME}/${PORTVERSION}
DIST_SUBDIR= KDE/Qt/qbs
@@ -13,18 +13,19 @@ LICENSE= GPLv3 LGPL21
LICENSE_COMB= dual
USES= cmake compiler:c++20-lang gl python:run qt:6
-USE_GL= gl
+USE_GL= opengl
USE_LDCONFIG= yes
USE_QT= 5compat base
CMAKE_ON= QBS_INSTALL_MAN_PAGE
-PLIST_SUB= SHLIB_VERSION="${PORTVERSION}"
+PLIST_SUB= QBS_VER="${DISTVERSION:R}" \
+ QBS_VERSION="${DISTVERSION}"
OPTIONS_DEFINE= DOCS
DOCS_BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}beautifulsoup>=4.12.2:www/py-beautifulsoup@${PY_FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}lxml>=4.9.3:devel/py-lxml@${PY_FLAVOR}
+ ${PYTHON_PKGNAMEPREFIX}lxml5>=4.9.3:devel/py-lxml5@${PY_FLAVOR}
DOCS_USES= python:build
DOCS_USE= QT=tools:build
DOCS_CMAKE_BOOL= QBS_INSTALL_HTML_DOCS \
diff --git a/devel/qbs/distinfo b/devel/qbs/distinfo
index c54486b528a4..1e005315037b 100644
--- a/devel/qbs/distinfo
+++ b/devel/qbs/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1742490389
-SHA256 (KDE/Qt/qbs/qbs-src-2.6.0.tar.gz) = 9eac7441a5c80df38190796012a842d0d22b0f3b11845d59c5d98b4e88457f02
-SIZE (KDE/Qt/qbs/qbs-src-2.6.0.tar.gz) = 5732888
+TIMESTAMP = 1756940690
+SHA256 (KDE/Qt/qbs/qbs-src-3.0.3.tar.gz) = 5ea02139263ec4dbf947d18f4a73ccc41f691ec43c5914a6a6b089d9713ec0dc
+SIZE (KDE/Qt/qbs/qbs-src-3.0.3.tar.gz) = 5796778
diff --git a/devel/qbs/files/patch-src_app_qbs-setup-qt_setupqt.cpp b/devel/qbs/files/patch-src_app_qbs-setup-qt_setupqt.cpp
index 7824f9aba426..85d9fbbc44f2 100644
--- a/devel/qbs/files/patch-src_app_qbs-setup-qt_setupqt.cpp
+++ b/devel/qbs/files/patch-src_app_qbs-setup-qt_setupqt.cpp
@@ -1,6 +1,6 @@
---- src/app/qbs-setup-qt/setupqt.cpp.orig 2021-11-28 22:25:29 UTC
+--- src/app/qbs-setup-qt/setupqt.cpp.orig 2025-06-20 12:42:25 UTC
+++ src/app/qbs-setup-qt/setupqt.cpp
-@@ -70,7 +70,7 @@ static QStringList qmakeExecutableNames()
+@@ -71,7 +71,7 @@ static QStringList qmakeExecutableNames()
{
const QString baseName = HostOsInfo::appendExecutableSuffix(QStringLiteral("qmake"));
QStringList lst(baseName);
diff --git a/devel/qbs/pkg-plist b/devel/qbs/pkg-plist
index 252bcc6d11dd..e944304f33ea 100644
--- a/devel/qbs/pkg-plist
+++ b/devel/qbs/pkg-plist
@@ -58,8 +58,8 @@ include/qbs/tools/setupprojectparameters.h
include/qbs/tools/toolchains.h
include/qbs/tools/version.h
lib/libqbscore.so
-lib/libqbscore.so.2.6
-lib/libqbscore.so.%%SHLIB_VERSION%%
+lib/libqbscore.so.%%QBS_VER%%
+lib/libqbscore.so.%%QBS_VERSION%%
lib/qbs/plugins/libclangcompilationdbgenerator.so
lib/qbs/plugins/libiarewgenerator.so
lib/qbs/plugins/libkeiluvgenerator.so
@@ -104,8 +104,6 @@ libexec/qbs/qbs_processlauncher
%%PORTDOCS%%%%DOCSDIR%%/html/images/bullet_dn.png
%%PORTDOCS%%%%DOCSDIR%%/html/images/bullet_sq.png
%%PORTDOCS%%%%DOCSDIR%%/html/images/home.png
-@comment %%PORTDOCS%%%%DOCSDIR%%/html/images/ico_note.png
-@comment %%PORTDOCS%%%%DOCSDIR%%/html/images/ico_note_attention.png
%%PORTDOCS%%%%DOCSDIR%%/html/images/ico_out.png
%%PORTDOCS%%%%DOCSDIR%%/html/images/logo.png
%%PORTDOCS%%%%DOCSDIR%%/html/images/qbs-build-process.png
@@ -315,6 +313,8 @@ libexec/qbs/qbs_processlauncher
%%PORTDOCS%%%%DOCSDIR%%/html/qml-qbsmodules-qt-quick.html
%%PORTDOCS%%%%DOCSDIR%%/html/qml-qbsmodules-qt-scxml-members.html
%%PORTDOCS%%%%DOCSDIR%%/html/qml-qbsmodules-qt-scxml.html
+%%PORTDOCS%%%%DOCSDIR%%/html/qml-qbsmodules-qt-shadertools-members.html
+%%PORTDOCS%%%%DOCSDIR%%/html/qml-qbsmodules-qt-shadertools.html
%%PORTDOCS%%%%DOCSDIR%%/html/qml-qbsmodules-sanitizers-address-members.html
%%PORTDOCS%%%%DOCSDIR%%/html/qml-qbsmodules-sanitizers-address.html
%%PORTDOCS%%%%DOCSDIR%%/html/qml-qbsmodules-texttemplate-members.html
@@ -660,6 +660,18 @@ share/man/man1/qbs.1.gz
%%DATADIR%%/examples/rpaths/rpaths.qbs
%%DATADIR%%/examples/rule/lorem_ipsum.txt
%%DATADIR%%/examples/rule/rule.qbs
+%%DATADIR%%/examples/shadereffects/content/face-smile.png
+%%DATADIR%%/examples/shadereffects/content/qt-logo.png
+%%DATADIR%%/examples/shadereffects/content/shaders/blur.frag
+%%DATADIR%%/examples/shadereffects/content/shaders/colorize.frag
+%%DATADIR%%/examples/shadereffects/content/shaders/genie.vert
+%%DATADIR%%/examples/shadereffects/content/shaders/outline.frag
+%%DATADIR%%/examples/shadereffects/content/shaders/shadow.frag
+%%DATADIR%%/examples/shadereffects/content/shaders/wobble.frag
+%%DATADIR%%/examples/shadereffects/main.cpp
+%%DATADIR%%/examples/shadereffects/resources.qrc
+%%DATADIR%%/examples/shadereffects/shadereffects.qbs
+%%DATADIR%%/examples/shadereffects/shadereffects.qml
%%DATADIR%%/imports/qbs/BundleTools/bundle-tools.js
%%DATADIR%%/imports/qbs/DarwinTools/darwin-tools.js
%%DATADIR%%/imports/qbs/ModUtils/utils.js
@@ -752,6 +764,8 @@ share/man/man1/qbs.1.gz
%%DATADIR%%/module-providers/Qt/templates/quick.qbs
%%DATADIR%%/module-providers/Qt/templates/rcc.js
%%DATADIR%%/module-providers/Qt/templates/scxml.qbs
+%%DATADIR%%/module-providers/Qt/templates/shadertools.js
+%%DATADIR%%/module-providers/Qt/templates/shadertools.qbs
%%DATADIR%%/module-providers/__fallback/fallback.qbs
%%DATADIR%%/module-providers/__fallback/provider.qbs
%%DATADIR%%/module-providers/conan.js