diff options
| -rw-r--r-- | .SRCINFO | 12 | ||||
| -rw-r--r-- | 0001-Exclude-qmltime-when-cross-compiling.patch | 6 | ||||
| -rw-r--r-- | PKGBUILD | 11 | ||||
| -rw-r--r-- | PKGBUILD.sh.ep | 7 | ||||
| -rw-r--r-- | qtdeclarative-sha256.txt | 2 |
5 files changed, 24 insertions, 14 deletions
@@ -1,6 +1,6 @@ pkgbase = mingw-w64-qt6-declarative pkgdesc = Classes for QML and JavaScript languages (mingw-w64) - pkgver = 6.1.3 + pkgver = 6.2.0 pkgrel = 1 url = https://www.qt.io arch = any @@ -13,17 +13,21 @@ pkgbase = mingw-w64-qt6-declarative makedepends = mingw-w64-vulkan-headers makedepends = mingw-w64-vulkan-icd-loader makedepends = qt6-declarative + makedepends = qt6-shadertools makedepends = ninja makedepends = python depends = mingw-w64-qt6-base optdepends = qt6-declarative: development tools + provides = mingw-w64-qt6-quickcontrols2 + conflicts = mingw-w64-qt6-quickcontrols2 + replaces = mingw-w64-qt6-quickcontrols2 options = !strip options = !buildflags options = staticlibs options = !emptydirs - source = https://download.qt.io/official_releases/qt/6.1/6.1.3/submodules/qtdeclarative-everywhere-src-6.1.3.tar.xz + source = https://download.qt.io/official_releases/qt/6.2/6.2.0/submodules/qtdeclarative-everywhere-src-6.2.0.tar.xz source = 0001-Exclude-qmltime-when-cross-compiling.patch - sha256sums = 3e49a36135e799262226d3365016c61c09bacb07fb96438226e753716a3ff743 - sha256sums = 98be8fd1d4c74b9a137b585bc9cb556873bed9104d00010395a2f73997bbaab6 + sha256sums = 46737feceb9e54d63ad0c87a08d33f08ca58f4b8920ccefad8f1ebd64f0d1270 + sha256sums = d2510025ff4140248403c0ea4c6bc6de88b15b3808a3016651e69bd52d14e5aa pkgname = mingw-w64-qt6-declarative diff --git a/0001-Exclude-qmltime-when-cross-compiling.patch b/0001-Exclude-qmltime-when-cross-compiling.patch index 9b1b7e496fad..102aeed9a03f 100644 --- a/0001-Exclude-qmltime-when-cross-compiling.patch +++ b/0001-Exclude-qmltime-when-cross-compiling.patch @@ -1,4 +1,4 @@ -From e50c6db728eed159a05440c45a0328690d32752d Mon Sep 17 00:00:00 2001 +From 74152bbe05919391b4fade59b72c66ca203b40e2 Mon Sep 17 00:00:00 2001 From: Martchus <martchus@gmx.net> Date: Fri, 5 Feb 2021 02:22:45 +0100 Subject: [PATCH] Exclude qmltime when cross compiling @@ -14,10 +14,10 @@ That's likely also why upstream did not notice this problem so far. 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/tools/CMakeLists.txt b/tools/CMakeLists.txt -index 8438e8c6fa..23753dd0dc 100644 +index 01fa0bf043..c855dc0338 100644 --- a/tools/CMakeLists.txt +++ b/tools/CMakeLists.txt -@@ -30,7 +30,9 @@ if(QT_FEATURE_qml_preview AND QT_FEATURE_thread AND NOT ANDROID AND NOT WASM AND +@@ -31,7 +31,9 @@ if(QT_FEATURE_qml_preview AND QT_FEATURE_thread AND NOT ANDROID AND NOT WASM AND endif() if(QT_BUILD_SHARED_LIBS AND QT_FEATURE_thread AND TARGET Qt::Quick AND NOT ANDROID AND NOT WASM AND NOT rtems) add_subdirectory(qmlscene) @@ -4,7 +4,7 @@ # you also find the URL of a binary repository. pkgname=mingw-w64-qt6-declarative -_qtver=6.1.3 +_qtver=6.2.0 pkgver=${_qtver/-/} pkgrel=1 arch=(any) @@ -12,15 +12,18 @@ url='https://www.qt.io' license=(GPL3 LGPL3 FDL custom) pkgdesc='Classes for QML and JavaScript languages (mingw-w64)' depends=('mingw-w64-qt6-base') -makedepends=('mingw-w64-cmake' 'mingw-w64-vulkan-headers' 'mingw-w64-vulkan-icd-loader' 'qt6-declarative' 'ninja' 'python') +makedepends=('mingw-w64-cmake' 'mingw-w64-vulkan-headers' 'mingw-w64-vulkan-icd-loader' 'qt6-declarative' 'qt6-shadertools' 'ninja' 'python') optdepends=('qt6-declarative: development tools') +conflicts=('mingw-w64-qt6-quickcontrols2') +provides=('mingw-w64-qt6-quickcontrols2') +replaces=('mingw-w64-qt6-quickcontrols2') options=('!strip' '!buildflags' 'staticlibs' '!emptydirs') groups=(mingw-w64-qt6) _pkgfqn="qtdeclarative-everywhere-src-${_qtver}" source=("https://download.qt.io/official_releases/qt/${pkgver%.*}/${_qtver}/submodules/${_pkgfqn}.tar.xz" '0001-Exclude-qmltime-when-cross-compiling.patch') -sha256sums=('3e49a36135e799262226d3365016c61c09bacb07fb96438226e753716a3ff743' - '98be8fd1d4c74b9a137b585bc9cb556873bed9104d00010395a2f73997bbaab6') +sha256sums=('46737feceb9e54d63ad0c87a08d33f08ca58f4b8920ccefad8f1ebd64f0d1270' + 'd2510025ff4140248403c0ea4c6bc6de88b15b3808a3016651e69bd52d14e5aa') _architectures='i686-w64-mingw32 x86_64-w64-mingw32' diff --git a/PKGBUILD.sh.ep b/PKGBUILD.sh.ep index 2710a19a3f9b..31527ce32b5a 100644 --- a/PKGBUILD.sh.ep +++ b/PKGBUILD.sh.ep @@ -1,6 +1,6 @@ % layout 'mingw-w64-qt6-module', has_binaries => 1; \ -_qtver=6.1.3 +_qtver=6.2.0 pkgver=${_qtver/-/} pkgrel=1 arch=(any) @@ -8,5 +8,8 @@ url='https://www.qt.io' license=(GPL3 LGPL3 FDL custom) pkgdesc='Classes for QML and JavaScript languages (mingw-w64)' depends=(<%== qt6deps qw(base) %>) -makedepends=('mingw-w64-cmake<%== $static_suffix %>' 'mingw-w64-vulkan-headers' 'mingw-w64-vulkan-icd-loader' 'qt6-declarative' 'ninja' 'python') +makedepends=('mingw-w64-cmake<%== $static_suffix %>' 'mingw-w64-vulkan-headers' 'mingw-w64-vulkan-icd-loader' 'qt6-declarative' 'qt6-shadertools' 'ninja' 'python') optdepends=('qt6-declarative: development tools') +conflicts=(<%== qt6deps qw(quickcontrols2) %>) +provides=(<%== qt6deps qw(quickcontrols2) %>) +replaces=(<%== qt6deps qw(quickcontrols2) %>) diff --git a/qtdeclarative-sha256.txt b/qtdeclarative-sha256.txt index 5b4804bc9314..02f96af3d509 100644 --- a/qtdeclarative-sha256.txt +++ b/qtdeclarative-sha256.txt @@ -1 +1 @@ -3e49a36135e799262226d3365016c61c09bacb07fb96438226e753716a3ff743 +46737feceb9e54d63ad0c87a08d33f08ca58f4b8920ccefad8f1ebd64f0d1270 |