Github messages for voidlinux
 help / color / mirror / Atom feed
* [PR PATCH] qtcreator: update to 10.0.2.
@ 2023-07-12  5:33 classabbyamp
  2023-07-12  6:29 ` Chocimier
                   ` (8 more replies)
  0 siblings, 9 replies; 10+ messages in thread
From: classabbyamp @ 2023-07-12  5:33 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 656 bytes --]

There is a new pull request by classabbyamp 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: 3581 bytes --]

From c27adc4a796c323df89196c019768639c94dce58 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 | 36 ++++++++++++++++++++++++++++++------
 3 files changed, 32 insertions(+), 6 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..bc313f53384a 100644
--- a/srcpkgs/qtcreator/template
+++ b/srcpkgs/qtcreator/template
@@ -1,7 +1,7 @@
 # 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"
@@ -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
 
@@ -47,6 +47,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 +75,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
 }

^ permalink raw reply	[flat|nested] 10+ messages in thread
end of thread, other threads:[~2023-07-12 17:57 UTC | newest]

Thread overview: 10+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2023-07-12  5:33 [PR PATCH] qtcreator: update to 10.0.2 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
2023-07-12 17:56 ` [PR PATCH] [Merged]: " Chocimier
2023-07-12 17:57 ` Chocimier

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).