* [PR PATCH] qtcreator: update to 7.0.0.
@ 2022-03-29 19:41 Chocimier
2022-04-08 17:41 ` [PR PATCH] [Updated] " Chocimier
` (3 more replies)
0 siblings, 4 replies; 5+ messages in thread
From: Chocimier @ 2022-03-29 19:41 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1244 bytes --]
There is a new pull request by Chocimier against master on the void-packages repository
https://github.com/Chocimier/void-packages-org qtcreator
https://github.com/void-linux/void-packages/pull/36408
qtcreator: update to 7.0.0.
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **YES**
<!--
#### New package
- This new package conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements): **YES**|**NO**
-->
<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
- aarch64-musl
- armv7l
- armv6l-musl
-->
A patch file from https://github.com/void-linux/void-packages/pull/36408.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-qtcreator-36408.patch --]
[-- Type: text/x-diff, Size: 4376 bytes --]
From 795ada386dbd16359da48ba78cdb47c3fc1712ab Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= <chocimier@tlen.pl>
Date: Tue, 29 Mar 2022 21:41:02 +0200
Subject: [PATCH] qtcreator: update to 7.0.0.
---
.../qtcreator/patches/QTCREATORBUG-26910.diff | 39 -------------------
srcpkgs/qtcreator/template | 23 ++++-------
2 files changed, 7 insertions(+), 55 deletions(-)
delete mode 100644 srcpkgs/qtcreator/patches/QTCREATORBUG-26910.diff
diff --git a/srcpkgs/qtcreator/patches/QTCREATORBUG-26910.diff b/srcpkgs/qtcreator/patches/QTCREATORBUG-26910.diff
deleted file mode 100644
index 8c07c72ccf10..000000000000
--- a/srcpkgs/qtcreator/patches/QTCREATORBUG-26910.diff
+++ /dev/null
@@ -1,39 +0,0 @@
-From b3e9f24ed1c0d3c0ee4917d4b449da90e00e888a Mon Sep 17 00:00:00 2001
-From: Marco Bubke <marco.bubke@qt.io>
-Date: Mon, 24 Jan 2022 14:38:29 +0100
-Subject: [PATCH] QmlDesigner: Fix 32 bit
-
-Because std::ptrdiff_t and int are the same under 32 bit the constructor
-is changed to a template. The class is private so it is very unlikely
-that it leads to errors.
-
-Task-number: QTCREATORBUG-26910
-Change-Id: I94c987b9b6d2f04876740ff283a339c0db056cfd
-Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
-Reviewed-by: Christophe Giboudeaux <christophe@krop.fr>
-Reviewed-by: Eike Ziller <eike.ziller@qt.io>
-Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
----
-
-diff --git a/src/plugins/qmldesigner/designercore/projectstorage/storagecache.h b/src/plugins/qmldesigner/designercore/projectstorage/storagecache.h
-index 747c3d9..27d2905 100644
---- a/src/plugins/qmldesigner/designercore/projectstorage/storagecache.h
-+++ b/src/plugins/qmldesigner/designercore/projectstorage/storagecache.h
-@@ -67,15 +67,8 @@
-
- StorageCacheIndex(const char *) = delete;
-
-- constexpr explicit StorageCacheIndex(int id) noexcept
-- : id{id}
-- {}
--
-- constexpr explicit StorageCacheIndex(std::size_t id) noexcept
-- : id{static_cast<int>(id)}
-- {}
--
-- constexpr explicit StorageCacheIndex(std::ptrdiff_t id) noexcept
-+ template<typename IntegerType>
-+ constexpr explicit StorageCacheIndex(IntegerType id) noexcept
- : id{static_cast<int>(id)}
- {}
-
diff --git a/srcpkgs/qtcreator/template b/srcpkgs/qtcreator/template
index 988491ec6496..5adf2e0759cd 100644
--- a/srcpkgs/qtcreator/template
+++ b/srcpkgs/qtcreator/template
@@ -1,14 +1,15 @@
# Template file for 'qtcreator'
pkgname=qtcreator
-version=6.0.2
+version=7.0.0
revision=1
wrksrc="qt-creator-opensource-src-${version}"
-build_style=qmake
-make_install_args="INSTALL_ROOT=\${DESTDIR}/usr"
+build_style=cmake
hostmakedepends="clang llvm perl pkg-config python3 which qt5-qmake
- qt5-host-tools"
+ qt5-host-tools qt5-tools"
makedepends="qt5-declarative-devel qt5-script-devel qt5-tools-devel
- qt5-quickcontrols qt5-svg-devel clang llvm"
+ qt5-quickcontrols qt5-svg-devel qt5-plugin-odbc qt5-plugin-sqlite
+ qt5-plugin-tds qt5-plugin-pgsql qt5-plugin-mysql
+ clang llvm clang-tools-extra"
depends="qt5-declarative-devel qt5-quickcontrols qt5-plugin-sqlite"
short_desc="Cross-platform IDE for Qt developers"
maintainer="Piotr Wójcik <chocimier@tlen.pl>"
@@ -16,7 +17,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/changes-${version}.md"
distfiles="https://download.qt.io/official_releases/qtcreator/${version%.*}/${version}/${wrksrc}.tar.xz"
-checksum=3d173c1a02ce55137a23f294e1a840d7648656e97826067eb29d9df653351bfa
+checksum=d39a05e48bb961cfab61135a5ee5503fc4d381c74000b910f36bf0cea37736d9
replaces="qtcreator-data>=0"
python_version=3
@@ -24,16 +25,6 @@ if [ "$XBPS_TARGET_LIBC" = "musl" ]; then
makedepends+=" libexecinfo-devel"
fi
-pre_configure() {
- if [ "$XBPS_TARGET_LIBC" = "musl" ]; then
- vsed -i src/plugins/qmldesigner/qmldesignerplugin.pro \
- src/plugins/clangformat/clangformat.pro \
- -e "/LIBS += /aLIBS += -L${XBPS_CROSS_BASE}/usr/lib -lexecinfo"
- vsed -i src/plugins/debugger/debugger.pro \
- -e "/RESOURCES += /aLIBS += -L${XBPS_CROSS_BASE}/usr/lib -lexecinfo"
- fi
-}
-
post_install() {
# Install the license with the annotation for
# the Qt Company GPL Exception 1.0
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PR PATCH] [Updated] qtcreator: update to 7.0.0.
2022-03-29 19:41 [PR PATCH] qtcreator: update to 7.0.0 Chocimier
@ 2022-04-08 17:41 ` Chocimier
2022-04-21 16:03 ` Chocimier
` (2 subsequent siblings)
3 siblings, 0 replies; 5+ messages in thread
From: Chocimier @ 2022-04-08 17:41 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1249 bytes --]
There is an updated pull request by Chocimier against master on the void-packages repository
https://github.com/Chocimier/void-packages-org qtcreator
https://github.com/void-linux/void-packages/pull/36408
qtcreator: update to 7.0.0.
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **YES**
<!--
#### New package
- This new package conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements): **YES**|**NO**
-->
<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
- aarch64-musl
- armv7l
- armv6l-musl
-->
A patch file from https://github.com/void-linux/void-packages/pull/36408.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-qtcreator-36408.patch --]
[-- Type: text/x-diff, Size: 4410 bytes --]
From 35a1da54373eb6463f642d1665d5940281326704 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= <chocimier@tlen.pl>
Date: Tue, 29 Mar 2022 21:41:02 +0200
Subject: [PATCH] qtcreator: update to 7.0.0.
---
.../qtcreator/patches/QTCREATORBUG-26910.diff | 39 -------------------
srcpkgs/qtcreator/template | 24 ++++--------
2 files changed, 8 insertions(+), 55 deletions(-)
delete mode 100644 srcpkgs/qtcreator/patches/QTCREATORBUG-26910.diff
diff --git a/srcpkgs/qtcreator/patches/QTCREATORBUG-26910.diff b/srcpkgs/qtcreator/patches/QTCREATORBUG-26910.diff
deleted file mode 100644
index 8c07c72ccf10..000000000000
--- a/srcpkgs/qtcreator/patches/QTCREATORBUG-26910.diff
+++ /dev/null
@@ -1,39 +0,0 @@
-From b3e9f24ed1c0d3c0ee4917d4b449da90e00e888a Mon Sep 17 00:00:00 2001
-From: Marco Bubke <marco.bubke@qt.io>
-Date: Mon, 24 Jan 2022 14:38:29 +0100
-Subject: [PATCH] QmlDesigner: Fix 32 bit
-
-Because std::ptrdiff_t and int are the same under 32 bit the constructor
-is changed to a template. The class is private so it is very unlikely
-that it leads to errors.
-
-Task-number: QTCREATORBUG-26910
-Change-Id: I94c987b9b6d2f04876740ff283a339c0db056cfd
-Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
-Reviewed-by: Christophe Giboudeaux <christophe@krop.fr>
-Reviewed-by: Eike Ziller <eike.ziller@qt.io>
-Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
----
-
-diff --git a/src/plugins/qmldesigner/designercore/projectstorage/storagecache.h b/src/plugins/qmldesigner/designercore/projectstorage/storagecache.h
-index 747c3d9..27d2905 100644
---- a/src/plugins/qmldesigner/designercore/projectstorage/storagecache.h
-+++ b/src/plugins/qmldesigner/designercore/projectstorage/storagecache.h
-@@ -67,15 +67,8 @@
-
- StorageCacheIndex(const char *) = delete;
-
-- constexpr explicit StorageCacheIndex(int id) noexcept
-- : id{id}
-- {}
--
-- constexpr explicit StorageCacheIndex(std::size_t id) noexcept
-- : id{static_cast<int>(id)}
-- {}
--
-- constexpr explicit StorageCacheIndex(std::ptrdiff_t id) noexcept
-+ template<typename IntegerType>
-+ constexpr explicit StorageCacheIndex(IntegerType id) noexcept
- : id{static_cast<int>(id)}
- {}
-
diff --git a/srcpkgs/qtcreator/template b/srcpkgs/qtcreator/template
index 988491ec6496..3eb1da576f0a 100644
--- a/srcpkgs/qtcreator/template
+++ b/srcpkgs/qtcreator/template
@@ -1,14 +1,16 @@
# Template file for 'qtcreator'
pkgname=qtcreator
-version=6.0.2
+version=7.0.0
revision=1
wrksrc="qt-creator-opensource-src-${version}"
-build_style=qmake
-make_install_args="INSTALL_ROOT=\${DESTDIR}/usr"
+build_style=cmake
+configure_args="-DBUILD_QBS=ON"
hostmakedepends="clang llvm perl pkg-config python3 which qt5-qmake
- qt5-host-tools"
+ qt5-host-tools qt5-tools"
makedepends="qt5-declarative-devel qt5-script-devel qt5-tools-devel
- qt5-quickcontrols qt5-svg-devel clang llvm"
+ qt5-quickcontrols qt5-svg-devel qt5-plugin-odbc qt5-plugin-sqlite
+ qt5-plugin-tds qt5-plugin-pgsql qt5-plugin-mysql
+ clang llvm clang-tools-extra"
depends="qt5-declarative-devel qt5-quickcontrols qt5-plugin-sqlite"
short_desc="Cross-platform IDE for Qt developers"
maintainer="Piotr Wójcik <chocimier@tlen.pl>"
@@ -16,7 +18,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/changes-${version}.md"
distfiles="https://download.qt.io/official_releases/qtcreator/${version%.*}/${version}/${wrksrc}.tar.xz"
-checksum=3d173c1a02ce55137a23f294e1a840d7648656e97826067eb29d9df653351bfa
+checksum=d39a05e48bb961cfab61135a5ee5503fc4d381c74000b910f36bf0cea37736d9
replaces="qtcreator-data>=0"
python_version=3
@@ -24,16 +26,6 @@ if [ "$XBPS_TARGET_LIBC" = "musl" ]; then
makedepends+=" libexecinfo-devel"
fi
-pre_configure() {
- if [ "$XBPS_TARGET_LIBC" = "musl" ]; then
- vsed -i src/plugins/qmldesigner/qmldesignerplugin.pro \
- src/plugins/clangformat/clangformat.pro \
- -e "/LIBS += /aLIBS += -L${XBPS_CROSS_BASE}/usr/lib -lexecinfo"
- vsed -i src/plugins/debugger/debugger.pro \
- -e "/RESOURCES += /aLIBS += -L${XBPS_CROSS_BASE}/usr/lib -lexecinfo"
- fi
-}
-
post_install() {
# Install the license with the annotation for
# the Qt Company GPL Exception 1.0
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PR PATCH] [Updated] qtcreator: update to 7.0.0.
2022-03-29 19:41 [PR PATCH] qtcreator: update to 7.0.0 Chocimier
2022-04-08 17:41 ` [PR PATCH] [Updated] " Chocimier
@ 2022-04-21 16:03 ` Chocimier
2022-04-21 16:06 ` Chocimier
2022-04-21 17:15 ` [PR PATCH] [Merged]: " Chocimier
3 siblings, 0 replies; 5+ messages in thread
From: Chocimier @ 2022-04-21 16:03 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1249 bytes --]
There is an updated pull request by Chocimier against master on the void-packages repository
https://github.com/Chocimier/void-packages-org qtcreator
https://github.com/void-linux/void-packages/pull/36408
qtcreator: update to 7.0.0.
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **YES**
<!--
#### New package
- This new package conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements): **YES**|**NO**
-->
<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
- aarch64-musl
- armv7l
- armv6l-musl
-->
A patch file from https://github.com/void-linux/void-packages/pull/36408.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-qtcreator-36408.patch --]
[-- Type: text/x-diff, Size: 4410 bytes --]
From fe07d236c0ebbba077ecc390d4a414cb9912ae89 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= <chocimier@tlen.pl>
Date: Tue, 29 Mar 2022 21:41:02 +0200
Subject: [PATCH] qtcreator: update to 7.0.0.
---
.../qtcreator/patches/QTCREATORBUG-26910.diff | 39 -------------------
srcpkgs/qtcreator/template | 24 ++++--------
2 files changed, 8 insertions(+), 55 deletions(-)
delete mode 100644 srcpkgs/qtcreator/patches/QTCREATORBUG-26910.diff
diff --git a/srcpkgs/qtcreator/patches/QTCREATORBUG-26910.diff b/srcpkgs/qtcreator/patches/QTCREATORBUG-26910.diff
deleted file mode 100644
index 8c07c72ccf10..000000000000
--- a/srcpkgs/qtcreator/patches/QTCREATORBUG-26910.diff
+++ /dev/null
@@ -1,39 +0,0 @@
-From b3e9f24ed1c0d3c0ee4917d4b449da90e00e888a Mon Sep 17 00:00:00 2001
-From: Marco Bubke <marco.bubke@qt.io>
-Date: Mon, 24 Jan 2022 14:38:29 +0100
-Subject: [PATCH] QmlDesigner: Fix 32 bit
-
-Because std::ptrdiff_t and int are the same under 32 bit the constructor
-is changed to a template. The class is private so it is very unlikely
-that it leads to errors.
-
-Task-number: QTCREATORBUG-26910
-Change-Id: I94c987b9b6d2f04876740ff283a339c0db056cfd
-Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
-Reviewed-by: Christophe Giboudeaux <christophe@krop.fr>
-Reviewed-by: Eike Ziller <eike.ziller@qt.io>
-Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
----
-
-diff --git a/src/plugins/qmldesigner/designercore/projectstorage/storagecache.h b/src/plugins/qmldesigner/designercore/projectstorage/storagecache.h
-index 747c3d9..27d2905 100644
---- a/src/plugins/qmldesigner/designercore/projectstorage/storagecache.h
-+++ b/src/plugins/qmldesigner/designercore/projectstorage/storagecache.h
-@@ -67,15 +67,8 @@
-
- StorageCacheIndex(const char *) = delete;
-
-- constexpr explicit StorageCacheIndex(int id) noexcept
-- : id{id}
-- {}
--
-- constexpr explicit StorageCacheIndex(std::size_t id) noexcept
-- : id{static_cast<int>(id)}
-- {}
--
-- constexpr explicit StorageCacheIndex(std::ptrdiff_t id) noexcept
-+ template<typename IntegerType>
-+ constexpr explicit StorageCacheIndex(IntegerType id) noexcept
- : id{static_cast<int>(id)}
- {}
-
diff --git a/srcpkgs/qtcreator/template b/srcpkgs/qtcreator/template
index 988491ec6496..3eb1da576f0a 100644
--- a/srcpkgs/qtcreator/template
+++ b/srcpkgs/qtcreator/template
@@ -1,14 +1,16 @@
# Template file for 'qtcreator'
pkgname=qtcreator
-version=6.0.2
+version=7.0.0
revision=1
wrksrc="qt-creator-opensource-src-${version}"
-build_style=qmake
-make_install_args="INSTALL_ROOT=\${DESTDIR}/usr"
+build_style=cmake
+configure_args="-DBUILD_QBS=ON"
hostmakedepends="clang llvm perl pkg-config python3 which qt5-qmake
- qt5-host-tools"
+ qt5-host-tools qt5-tools"
makedepends="qt5-declarative-devel qt5-script-devel qt5-tools-devel
- qt5-quickcontrols qt5-svg-devel clang llvm"
+ qt5-quickcontrols qt5-svg-devel qt5-plugin-odbc qt5-plugin-sqlite
+ qt5-plugin-tds qt5-plugin-pgsql qt5-plugin-mysql
+ clang llvm clang-tools-extra"
depends="qt5-declarative-devel qt5-quickcontrols qt5-plugin-sqlite"
short_desc="Cross-platform IDE for Qt developers"
maintainer="Piotr Wójcik <chocimier@tlen.pl>"
@@ -16,7 +18,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/changes-${version}.md"
distfiles="https://download.qt.io/official_releases/qtcreator/${version%.*}/${version}/${wrksrc}.tar.xz"
-checksum=3d173c1a02ce55137a23f294e1a840d7648656e97826067eb29d9df653351bfa
+checksum=d39a05e48bb961cfab61135a5ee5503fc4d381c74000b910f36bf0cea37736d9
replaces="qtcreator-data>=0"
python_version=3
@@ -24,16 +26,6 @@ if [ "$XBPS_TARGET_LIBC" = "musl" ]; then
makedepends+=" libexecinfo-devel"
fi
-pre_configure() {
- if [ "$XBPS_TARGET_LIBC" = "musl" ]; then
- vsed -i src/plugins/qmldesigner/qmldesignerplugin.pro \
- src/plugins/clangformat/clangformat.pro \
- -e "/LIBS += /aLIBS += -L${XBPS_CROSS_BASE}/usr/lib -lexecinfo"
- vsed -i src/plugins/debugger/debugger.pro \
- -e "/RESOURCES += /aLIBS += -L${XBPS_CROSS_BASE}/usr/lib -lexecinfo"
- fi
-}
-
post_install() {
# Install the license with the annotation for
# the Qt Company GPL Exception 1.0
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PR PATCH] [Updated] qtcreator: update to 7.0.0.
2022-03-29 19:41 [PR PATCH] qtcreator: update to 7.0.0 Chocimier
2022-04-08 17:41 ` [PR PATCH] [Updated] " Chocimier
2022-04-21 16:03 ` Chocimier
@ 2022-04-21 16:06 ` Chocimier
2022-04-21 17:15 ` [PR PATCH] [Merged]: " Chocimier
3 siblings, 0 replies; 5+ messages in thread
From: Chocimier @ 2022-04-21 16:06 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1249 bytes --]
There is an updated pull request by Chocimier against master on the void-packages repository
https://github.com/Chocimier/void-packages-org qtcreator
https://github.com/void-linux/void-packages/pull/36408
qtcreator: update to 7.0.0.
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **YES**
<!--
#### New package
- This new package conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements): **YES**|**NO**
-->
<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
- aarch64-musl
- armv7l
- armv6l-musl
-->
A patch file from https://github.com/void-linux/void-packages/pull/36408.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-qtcreator-36408.patch --]
[-- Type: text/x-diff, Size: 4544 bytes --]
From a620b87257bdf6a1ae7ec8205230ba5370faa847 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= <chocimier@tlen.pl>
Date: Tue, 29 Mar 2022 21:41:02 +0200
Subject: [PATCH] qtcreator: update to 7.0.0.
---
.../qtcreator/patches/QTCREATORBUG-26910.diff | 39 -------------------
srcpkgs/qtcreator/template | 31 +++++++--------
2 files changed, 15 insertions(+), 55 deletions(-)
delete mode 100644 srcpkgs/qtcreator/patches/QTCREATORBUG-26910.diff
diff --git a/srcpkgs/qtcreator/patches/QTCREATORBUG-26910.diff b/srcpkgs/qtcreator/patches/QTCREATORBUG-26910.diff
deleted file mode 100644
index 8c07c72ccf10..000000000000
--- a/srcpkgs/qtcreator/patches/QTCREATORBUG-26910.diff
+++ /dev/null
@@ -1,39 +0,0 @@
-From b3e9f24ed1c0d3c0ee4917d4b449da90e00e888a Mon Sep 17 00:00:00 2001
-From: Marco Bubke <marco.bubke@qt.io>
-Date: Mon, 24 Jan 2022 14:38:29 +0100
-Subject: [PATCH] QmlDesigner: Fix 32 bit
-
-Because std::ptrdiff_t and int are the same under 32 bit the constructor
-is changed to a template. The class is private so it is very unlikely
-that it leads to errors.
-
-Task-number: QTCREATORBUG-26910
-Change-Id: I94c987b9b6d2f04876740ff283a339c0db056cfd
-Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
-Reviewed-by: Christophe Giboudeaux <christophe@krop.fr>
-Reviewed-by: Eike Ziller <eike.ziller@qt.io>
-Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
----
-
-diff --git a/src/plugins/qmldesigner/designercore/projectstorage/storagecache.h b/src/plugins/qmldesigner/designercore/projectstorage/storagecache.h
-index 747c3d9..27d2905 100644
---- a/src/plugins/qmldesigner/designercore/projectstorage/storagecache.h
-+++ b/src/plugins/qmldesigner/designercore/projectstorage/storagecache.h
-@@ -67,15 +67,8 @@
-
- StorageCacheIndex(const char *) = delete;
-
-- constexpr explicit StorageCacheIndex(int id) noexcept
-- : id{id}
-- {}
--
-- constexpr explicit StorageCacheIndex(std::size_t id) noexcept
-- : id{static_cast<int>(id)}
-- {}
--
-- constexpr explicit StorageCacheIndex(std::ptrdiff_t id) noexcept
-+ template<typename IntegerType>
-+ constexpr explicit StorageCacheIndex(IntegerType id) noexcept
- : id{static_cast<int>(id)}
- {}
-
diff --git a/srcpkgs/qtcreator/template b/srcpkgs/qtcreator/template
index 988491ec6496..912c6c00c4c5 100644
--- a/srcpkgs/qtcreator/template
+++ b/srcpkgs/qtcreator/template
@@ -1,14 +1,16 @@
# Template file for 'qtcreator'
pkgname=qtcreator
-version=6.0.2
+version=7.0.0
revision=1
wrksrc="qt-creator-opensource-src-${version}"
-build_style=qmake
-make_install_args="INSTALL_ROOT=\${DESTDIR}/usr"
+build_style=cmake
+configure_args="$(vopt_bool qbs BUILD_QBS)"
hostmakedepends="clang llvm perl pkg-config python3 which qt5-qmake
- qt5-host-tools"
+ qt5-host-tools qt5-tools"
makedepends="qt5-declarative-devel qt5-script-devel qt5-tools-devel
- qt5-quickcontrols qt5-svg-devel clang llvm"
+ qt5-quickcontrols qt5-svg-devel qt5-plugin-odbc qt5-plugin-sqlite
+ qt5-plugin-tds qt5-plugin-pgsql qt5-plugin-mysql
+ clang llvm clang-tools-extra"
depends="qt5-declarative-devel qt5-quickcontrols qt5-plugin-sqlite"
short_desc="Cross-platform IDE for Qt developers"
maintainer="Piotr Wójcik <chocimier@tlen.pl>"
@@ -16,24 +18,21 @@ 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/changes-${version}.md"
distfiles="https://download.qt.io/official_releases/qtcreator/${version%.*}/${version}/${wrksrc}.tar.xz"
-checksum=3d173c1a02ce55137a23f294e1a840d7648656e97826067eb29d9df653351bfa
+checksum=d39a05e48bb961cfab61135a5ee5503fc4d381c74000b910f36bf0cea37736d9
replaces="qtcreator-data>=0"
python_version=3
+build_options="qbs"
+desc_option_qbs="Build vendored Qbs"
+
+if [ -z "$XBPS_CROSS_BUILD" ]; then
+ build_options_default="qbs"
+fi
+
if [ "$XBPS_TARGET_LIBC" = "musl" ]; then
makedepends+=" libexecinfo-devel"
fi
-pre_configure() {
- if [ "$XBPS_TARGET_LIBC" = "musl" ]; then
- vsed -i src/plugins/qmldesigner/qmldesignerplugin.pro \
- src/plugins/clangformat/clangformat.pro \
- -e "/LIBS += /aLIBS += -L${XBPS_CROSS_BASE}/usr/lib -lexecinfo"
- vsed -i src/plugins/debugger/debugger.pro \
- -e "/RESOURCES += /aLIBS += -L${XBPS_CROSS_BASE}/usr/lib -lexecinfo"
- fi
-}
-
post_install() {
# Install the license with the annotation for
# the Qt Company GPL Exception 1.0
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PR PATCH] [Merged]: qtcreator: update to 7.0.0.
2022-03-29 19:41 [PR PATCH] qtcreator: update to 7.0.0 Chocimier
` (2 preceding siblings ...)
2022-04-21 16:06 ` Chocimier
@ 2022-04-21 17:15 ` Chocimier
3 siblings, 0 replies; 5+ messages in thread
From: Chocimier @ 2022-04-21 17:15 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1083 bytes --]
There's a merged pull request on the void-packages repository
qtcreator: update to 7.0.0.
https://github.com/void-linux/void-packages/pull/36408
Description:
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **YES**
<!--
#### New package
- This new package conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements): **YES**|**NO**
-->
<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
- aarch64-musl
- armv7l
- armv6l-musl
-->
^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2022-04-21 17:15 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2022-03-29 19:41 [PR PATCH] qtcreator: update to 7.0.0 Chocimier
2022-04-08 17:41 ` [PR PATCH] [Updated] " Chocimier
2022-04-21 16:03 ` Chocimier
2022-04-21 16:06 ` Chocimier
2022-04-21 17:15 ` [PR PATCH] [Merged]: " 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).