From: Chocimier <Chocimier@users.noreply.github.com>
To: ml@inbox.vuxu.org
Subject: Re: [PR PATCH] [Updated] qtcreator: update to 10.0.2.
Date: Wed, 12 Jul 2023 19:56:18 +0200 [thread overview]
Message-ID: <20230712175618.XFII8mtCVBGIt4ruFHklWvsAzxYBDnk0fzKs_3AjhSc@z> (raw)
In-Reply-To: <gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-44988@inbox.vuxu.org>
[-- Attachment #1: Type: text/plain, Size: 658 bytes --]
There is an updated pull request by Chocimier against master on the void-packages repository
https://github.com/classabbyamp/void-packages update/qtcreator-10
https://github.com/void-linux/void-packages/pull/44988
qtcreator: update to 10.0.2.
replace -full subpackage with -qt5, add -qt6 subpackage
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **YES**
cc: maintainer @Chocimier and qt guru @Johnnynator, not sure if I got every qt6 dependency in the new subpackage
A patch file from https://github.com/void-linux/void-packages/pull/44988.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-update/qtcreator-10-44988.patch --]
[-- Type: text/x-diff, Size: 4306 bytes --]
From 5e6eeefd0aeb67da4dbcfc6349405c15f1acf8b6 Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Wed, 12 Jul 2023 01:31:18 -0400
Subject: [PATCH] qtcreator: update to 10.0.2.
replace -full subpackage with -qt5, add -qt6 subpackage
---
srcpkgs/qtcreator-qt5 | 1 +
srcpkgs/qtcreator-qt6 | 1 +
srcpkgs/qtcreator/template | 44 ++++++++++++++++++++++++++++++++------
3 files changed, 39 insertions(+), 7 deletions(-)
create mode 120000 srcpkgs/qtcreator-qt5
create mode 120000 srcpkgs/qtcreator-qt6
diff --git a/srcpkgs/qtcreator-qt5 b/srcpkgs/qtcreator-qt5
new file mode 120000
index 000000000000..265a9b4f7d61
--- /dev/null
+++ b/srcpkgs/qtcreator-qt5
@@ -0,0 +1 @@
+qtcreator
\ No newline at end of file
diff --git a/srcpkgs/qtcreator-qt6 b/srcpkgs/qtcreator-qt6
new file mode 120000
index 000000000000..265a9b4f7d61
--- /dev/null
+++ b/srcpkgs/qtcreator-qt6
@@ -0,0 +1 @@
+qtcreator
\ No newline at end of file
diff --git a/srcpkgs/qtcreator/template b/srcpkgs/qtcreator/template
index b1dffd304198..71beaceaf3b6 100644
--- a/srcpkgs/qtcreator/template
+++ b/srcpkgs/qtcreator/template
@@ -1,12 +1,12 @@
# Template file for 'qtcreator'
pkgname=qtcreator
-version=9.0.1
-revision=2
+version=10.0.2
+revision=1
build_style=cmake
configure_args="$(vopt_bool qbs BUILD_QBS) -DWITH_DOCS=ON -DBUILD_WITH_PCH=OFF
-DQT_HOST_PATH=/usr/ -DQT_HOST_PATH_CMAKE_DIR=/usr/lib64/cmake/Qt6"
hostmakedepends="clang llvm perl pkg-config python3 which
- qt6-base-devel qt6-tools qtchooser qt6-shadertools-devel"
+ qt6-base-devel qt6-tools qtchooser qt6-shadertools-devel qt6-declarative-tools"
makedepends="qt6-declarative-devel
qt6-quick3d-devel qt6-svg-devel qt6-plugin-odbc qt6-plugin-sqlite
qt6-plugin-pgsql qt6-plugin-mysql qt6-qt5compat-devel
@@ -19,7 +19,7 @@ license="LGPL-3.0-or-later, custom:QtCompany-GPL-Exception-1.0"
homepage="https://wiki.qt.io/Category:Tools::QtCreator"
changelog="https://code.qt.io/cgit/qt-creator/qt-creator.git/plain/dist/changelog/changes-${version}.md"
distfiles="https://download.qt.io/official_releases/qtcreator/${version%.*}/${version}/qt-creator-opensource-src-${version}.tar.xz"
-checksum=4e4e881b2635bac07e785c9e889ab9a253ad47a00074e260cbccdb3c0aef189f
+checksum=da7fc5e7dc1a80c71c09e245b7d2711eb01ba575e2f99110d04a7ce799926d4e
replaces="qtcreator-data>=0"
python_version=3
@@ -40,6 +40,12 @@ if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
CXXFLAGS+=" -latomic "
fi
+pre_configure() {
+ if [ "$XBPS_CROSS_BUILD" ]; then
+ ln -sf /usr/lib/qt6/libexec/qmltyperegistrar ${XBPS_CROSS_BASE}/usr/lib/qt6/libexec/qmltyperegistrar
+ fi
+}
+
post_install() {
# Install the license with the annotation for
# the Qt Company GPL Exception 1.0
@@ -47,6 +53,12 @@ post_install() {
}
qtcreator-full_package() {
+ short_desc+=" - full Qt5 dependencies (transitional dummy package)"
+ depends="qtcreator-qt5>=${version}_${revision}"
+ build_style=meta
+}
+
+qtcreator-qt5_package() {
short_desc+=" - full Qt5 dependencies"
depends="${sourcepkg}>=${version}_${revision} base-devel
qt5-3d-devel qt5-charts-devel qt5-connectivity-devel qt5-datavis3d-devel
@@ -69,7 +81,25 @@ qtcreator-full_package() {
esac
fi
build_style=meta
- pkg_install() {
- echo "Just the dependencies"
- }
+}
+
+qtcreator-qt6_package() {
+ short_desc+=" - full Qt6 dependencies"
+ depends="${sourcepkg}>=${version}_${revision} base-devel
+ qt6-3d-devel qt6-charts-devel qt6-concurrent qt6-connectivity-devel
+ qt6-declarative-devel qt6-location-devel qt6-lottie-devel qt6-multimedia-devel
+ qt6-networkauth-devel qt6-qt5compat-devel qt6-remoteobjects-devel qt6-scxml-devel
+ qt6-sensors-devel qt6-serialport-devel qt6-shadertools-devel qt6-svg-devel
+ qt6-tools-devel qt6-virtualkeyboard-devel qt6-wayland-devel qt6-webchannel-devel
+ qt6-websockets-devel qt6-tools qt6-designer qt6-imageformats qt6-translations
+ qt6-plugin-mysql qt6-plugin-odbc qt6-plugin-pgsql qt6-plugin-sqlite qt6-base-doc"
+ # Not for big endian targets and not if word sizes of host and target differ
+ if [ "$XBPS_TARGET_ENDIAN" = "le" -a "$XBPS_TARGET_WORDSIZE" = "$XBPS_WORDSIZE" ]; then
+ # qt5-webengine cannot be built for armv5tel
+ case "$XBPS_TARGET_MACHINE" in
+ armv5tel*) ;;
+ *) depends+=" qt6-webengine-devel" ;;
+ esac
+ fi
+ build_style=meta
}
next prev parent reply other threads:[~2023-07-12 17:56 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-07-12 5:33 [PR PATCH] " classabbyamp
2023-07-12 6:29 ` Chocimier
2023-07-12 17:28 ` [PR PATCH] [Updated] " Chocimier
2023-07-12 17:35 ` classabbyamp
2023-07-12 17:35 ` classabbyamp
2023-07-12 17:35 ` classabbyamp
2023-07-12 17:54 ` [PR PATCH] [Updated] " classabbyamp
2023-07-12 17:56 ` Chocimier [this message]
2023-07-12 17:56 ` [PR PATCH] [Merged]: " Chocimier
2023-07-12 17:57 ` Chocimier
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20230712175618.XFII8mtCVBGIt4ruFHklWvsAzxYBDnk0fzKs_3AjhSc@z \
--to=chocimier@users.noreply.github.com \
--cc=ml@inbox.vuxu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).