Update Qt packages to 6.5.0
This commit is contained in:
parent
97d89e925a
commit
b91bc46a5a
|
@ -14,7 +14,7 @@
|
||||||
|
|
||||||
_android_arch=<%= $variant_prefix_part =~ s/android-// && $variant_prefix_part %>
|
_android_arch=<%= $variant_prefix_part =~ s/android-// && $variant_prefix_part %>
|
||||||
pkgname=<%= $package_name %>
|
pkgname=<%= $package_name %>
|
||||||
_qtver=6.4.3
|
_qtver=6.5.0
|
||||||
pkgver=${_qtver/-/}
|
pkgver=${_qtver/-/}
|
||||||
pkgrel=1
|
pkgrel=1
|
||||||
arch=(any)
|
arch=(any)
|
||||||
|
|
|
@ -14,7 +14,7 @@
|
||||||
% }
|
% }
|
||||||
|
|
||||||
pkgname=<%= $package_name %>
|
pkgname=<%= $package_name %>
|
||||||
_qtver=6.4.3
|
_qtver=6.5.0
|
||||||
pkgver=${_qtver/-/}
|
pkgver=${_qtver/-/}
|
||||||
pkgrel=1
|
pkgrel=1
|
||||||
arch=(any)
|
arch=(any)
|
||||||
|
|
|
@ -13,7 +13,7 @@
|
||||||
% }
|
% }
|
||||||
|
|
||||||
pkgname=<%= $package_name %>
|
pkgname=<%= $package_name %>
|
||||||
_qtver=6.4.3
|
_qtver=6.5.0
|
||||||
pkgver=${_qtver/-/}
|
pkgver=${_qtver/-/}
|
||||||
pkgrel=1
|
pkgrel=1
|
||||||
arch=(x86_64)
|
arch=(x86_64)
|
||||||
|
@ -27,7 +27,7 @@ depends=(shared-mime-info
|
||||||
static-compat-libxdamage static-compat-libxkbcommon static-compat-libxmu
|
static-compat-libxdamage static-compat-libxkbcommon static-compat-libxmu
|
||||||
static-compat-libxxf86vm static-compat-md4c static-compat-pcre2
|
static-compat-libxxf86vm static-compat-md4c static-compat-pcre2
|
||||||
static-compat-sqlite static-compat-xcb-util-image static-compat-xcb-util-keysyms
|
static-compat-sqlite static-compat-xcb-util-image static-compat-xcb-util-keysyms
|
||||||
static-compat-xcb-util-renderutil static-compat-vulkan-headers
|
static-compat-xcb-util-renderutil static-compat-xcb-util-cursor static-compat-vulkan-headers
|
||||||
static-compat-xcb-util-wm static-compat-xorgproto static-compat-xtrans)
|
static-compat-xcb-util-wm static-compat-xorgproto static-compat-xtrans)
|
||||||
makedepends=(static-compat-cmake xdg-utils ninja)
|
makedepends=(static-compat-cmake xdg-utils ninja)
|
||||||
options=('!strip' '!buildflags' 'staticlibs' '!emptydirs')
|
options=('!strip' '!buildflags' 'staticlibs' '!emptydirs')
|
||||||
|
|
|
@ -14,7 +14,7 @@ declare -A versions=(
|
||||||
[dbus-soundrecorder]=1.2.3
|
[dbus-soundrecorder]=1.2.3
|
||||||
[geocoordinatecalculator]=1.1.3
|
[geocoordinatecalculator]=1.1.3
|
||||||
[qt5]=5.15.8
|
[qt5]=5.15.8
|
||||||
[qt6]=6.4.3
|
[qt6]=6.5.0
|
||||||
)
|
)
|
||||||
declare -A github_names=(
|
declare -A github_names=(
|
||||||
[c++utilities]=cpp-utilities
|
[c++utilities]=cpp-utilities
|
||||||
|
|
|
@ -5,7 +5,7 @@
|
||||||
|
|
||||||
_android_arch=aarch64
|
_android_arch=aarch64
|
||||||
pkgname=android-$_android_arch-qt6-5compat
|
pkgname=android-$_android_arch-qt6-5compat
|
||||||
_qtver=6.4.3
|
_qtver=6.5.0
|
||||||
pkgver=${_qtver/-/}
|
pkgver=${_qtver/-/}
|
||||||
pkgrel=1
|
pkgrel=1
|
||||||
arch=(any)
|
arch=(any)
|
||||||
|
@ -18,7 +18,7 @@ options=('!strip' '!buildflags' 'staticlibs' '!emptydirs')
|
||||||
groups=(android-${_android_arch}-qt6)
|
groups=(android-${_android_arch}-qt6)
|
||||||
_pkgfqn="qt5compat-everywhere-src-${_qtver}"
|
_pkgfqn="qt5compat-everywhere-src-${_qtver}"
|
||||||
source=("https://download.qt.io/official_releases/qt/${pkgver%.*}/${_qtver}/submodules/${_pkgfqn}.tar.xz")
|
source=("https://download.qt.io/official_releases/qt/${pkgver%.*}/${_qtver}/submodules/${_pkgfqn}.tar.xz")
|
||||||
sha256sums=('d4b249abb823d575eee9045c24d924ba8d1276e6be7735b287689991d998aa7a')
|
sha256sums=('a9e2f53a193fc2e131b01a2f6e7a1fbfe31309c2413fdc213e5a81c558c21261')
|
||||||
|
|
||||||
build() {
|
build() {
|
||||||
source android-env ${_android_arch}
|
source android-env ${_android_arch}
|
||||||
|
|
|
@ -1,6 +1,6 @@
|
||||||
% layout 'android-qt6-module';
|
% layout 'android-qt6-module';
|
||||||
\
|
\
|
||||||
_qtver=6.4.3
|
_qtver=6.5.0
|
||||||
pkgver=${_qtver/-/}
|
pkgver=${_qtver/-/}
|
||||||
pkgrel=1
|
pkgrel=1
|
||||||
arch=(any)
|
arch=(any)
|
||||||
|
|
|
@ -1 +1 @@
|
||||||
d4b249abb823d575eee9045c24d924ba8d1276e6be7735b287689991d998aa7a
|
a9e2f53a193fc2e131b01a2f6e7a1fbfe31309c2413fdc213e5a81c558c21261
|
||||||
|
|
|
@ -4,7 +4,7 @@
|
||||||
# you also find the URL of a binary repository.
|
# you also find the URL of a binary repository.
|
||||||
|
|
||||||
pkgname=mingw-w64-qt6-5compat-static
|
pkgname=mingw-w64-qt6-5compat-static
|
||||||
_qtver=6.4.3
|
_qtver=6.5.0
|
||||||
pkgver=${_qtver/-/}
|
pkgver=${_qtver/-/}
|
||||||
pkgrel=1
|
pkgrel=1
|
||||||
arch=(any)
|
arch=(any)
|
||||||
|
@ -17,7 +17,7 @@ options=('!strip' '!buildflags' 'staticlibs' '!emptydirs')
|
||||||
groups=(mingw-w64-qt6)
|
groups=(mingw-w64-qt6)
|
||||||
_pkgfqn="qt5compat-everywhere-src-${_qtver}"
|
_pkgfqn="qt5compat-everywhere-src-${_qtver}"
|
||||||
source=("https://download.qt.io/official_releases/qt/${pkgver%.*}/${_qtver}/submodules/${_pkgfqn}.tar.xz")
|
source=("https://download.qt.io/official_releases/qt/${pkgver%.*}/${_qtver}/submodules/${_pkgfqn}.tar.xz")
|
||||||
sha256sums=('d4b249abb823d575eee9045c24d924ba8d1276e6be7735b287689991d998aa7a')
|
sha256sums=('a9e2f53a193fc2e131b01a2f6e7a1fbfe31309c2413fdc213e5a81c558c21261')
|
||||||
|
|
||||||
_architectures='i686-w64-mingw32 x86_64-w64-mingw32'
|
_architectures='i686-w64-mingw32 x86_64-w64-mingw32'
|
||||||
|
|
||||||
|
|
|
@ -1 +1 @@
|
||||||
d4b249abb823d575eee9045c24d924ba8d1276e6be7735b287689991d998aa7a
|
a9e2f53a193fc2e131b01a2f6e7a1fbfe31309c2413fdc213e5a81c558c21261
|
||||||
|
|
|
@ -4,7 +4,7 @@
|
||||||
# you also find the URL of a binary repository.
|
# you also find the URL of a binary repository.
|
||||||
|
|
||||||
pkgname=mingw-w64-qt6-5compat
|
pkgname=mingw-w64-qt6-5compat
|
||||||
_qtver=6.4.3
|
_qtver=6.5.0
|
||||||
pkgver=${_qtver/-/}
|
pkgver=${_qtver/-/}
|
||||||
pkgrel=1
|
pkgrel=1
|
||||||
arch=(any)
|
arch=(any)
|
||||||
|
@ -17,7 +17,7 @@ options=('!strip' '!buildflags' 'staticlibs' '!emptydirs')
|
||||||
groups=(mingw-w64-qt6)
|
groups=(mingw-w64-qt6)
|
||||||
_pkgfqn="qt5compat-everywhere-src-${_qtver}"
|
_pkgfqn="qt5compat-everywhere-src-${_qtver}"
|
||||||
source=("https://download.qt.io/official_releases/qt/${pkgver%.*}/${_qtver}/submodules/${_pkgfqn}.tar.xz")
|
source=("https://download.qt.io/official_releases/qt/${pkgver%.*}/${_qtver}/submodules/${_pkgfqn}.tar.xz")
|
||||||
sha256sums=('d4b249abb823d575eee9045c24d924ba8d1276e6be7735b287689991d998aa7a')
|
sha256sums=('a9e2f53a193fc2e131b01a2f6e7a1fbfe31309c2413fdc213e5a81c558c21261')
|
||||||
|
|
||||||
_architectures='i686-w64-mingw32 x86_64-w64-mingw32'
|
_architectures='i686-w64-mingw32 x86_64-w64-mingw32'
|
||||||
|
|
||||||
|
|
|
@ -1,6 +1,6 @@
|
||||||
% layout 'mingw-w64-qt6-module';
|
% layout 'mingw-w64-qt6-module';
|
||||||
\
|
\
|
||||||
_qtver=6.4.3
|
_qtver=6.5.0
|
||||||
pkgver=${_qtver/-/}
|
pkgver=${_qtver/-/}
|
||||||
pkgrel=1
|
pkgrel=1
|
||||||
arch=(any)
|
arch=(any)
|
||||||
|
|
|
@ -1 +1 @@
|
||||||
d4b249abb823d575eee9045c24d924ba8d1276e6be7735b287689991d998aa7a
|
a9e2f53a193fc2e131b01a2f6e7a1fbfe31309c2413fdc213e5a81c558c21261
|
||||||
|
|
|
@ -4,7 +4,7 @@
|
||||||
# you also find the URL of a binary repository.
|
# you also find the URL of a binary repository.
|
||||||
|
|
||||||
pkgname=static-compat-qt6-5compat
|
pkgname=static-compat-qt6-5compat
|
||||||
_qtver=6.4.3
|
_qtver=6.5.0
|
||||||
pkgver=${_qtver/-/}
|
pkgver=${_qtver/-/}
|
||||||
pkgrel=1
|
pkgrel=1
|
||||||
arch=(x86_64)
|
arch=(x86_64)
|
||||||
|
@ -17,7 +17,7 @@ makedepends=(static-compat-cmake static-compat-qt6-declarative static-compat-qt6
|
||||||
options=('!strip' '!buildflags' 'staticlibs' '!emptydirs')
|
options=('!strip' '!buildflags' 'staticlibs' '!emptydirs')
|
||||||
_pkgfqn="qt5compat-everywhere-src-${_qtver}"
|
_pkgfqn="qt5compat-everywhere-src-${_qtver}"
|
||||||
source=("https://download.qt.io/official_releases/qt/${pkgver%.*}/${_qtver}/submodules/${_pkgfqn}.tar.xz")
|
source=("https://download.qt.io/official_releases/qt/${pkgver%.*}/${_qtver}/submodules/${_pkgfqn}.tar.xz")
|
||||||
sha256sums=('d4b249abb823d575eee9045c24d924ba8d1276e6be7735b287689991d998aa7a')
|
sha256sums=('a9e2f53a193fc2e131b01a2f6e7a1fbfe31309c2413fdc213e5a81c558c21261')
|
||||||
|
|
||||||
build() {
|
build() {
|
||||||
check_buildoption ccache y && ccache_args='
|
check_buildoption ccache y && ccache_args='
|
||||||
|
|
|
@ -1,6 +1,6 @@
|
||||||
% layout 'static-compat-qt6-module';
|
% layout 'static-compat-qt6-module';
|
||||||
\
|
\
|
||||||
_qtver=6.4.3
|
_qtver=6.5.0
|
||||||
pkgver=${_qtver/-/}
|
pkgver=${_qtver/-/}
|
||||||
pkgrel=1
|
pkgrel=1
|
||||||
arch=(x86_64)
|
arch=(x86_64)
|
||||||
|
|
|
@ -1 +1 @@
|
||||||
d4b249abb823d575eee9045c24d924ba8d1276e6be7735b287689991d998aa7a
|
a9e2f53a193fc2e131b01a2f6e7a1fbfe31309c2413fdc213e5a81c558c21261
|
||||||
|
|
|
@ -4,7 +4,7 @@
|
||||||
# you also find the URL of a binary repository.
|
# you also find the URL of a binary repository.
|
||||||
|
|
||||||
pkgname=mingw-w64-qt6-activeqt-static
|
pkgname=mingw-w64-qt6-activeqt-static
|
||||||
_qtver=6.4.3
|
_qtver=6.5.0
|
||||||
pkgver=${_qtver/-/}
|
pkgver=${_qtver/-/}
|
||||||
pkgrel=1
|
pkgrel=1
|
||||||
arch=(any)
|
arch=(any)
|
||||||
|
@ -21,10 +21,10 @@ source=("https://download.qt.io/official_releases/qt/${pkgver%.*}/${_qtver}/subm
|
||||||
'0001-Handle-win64-in-dumpcpp-and-MetaObjectGenerator-read.patch'
|
'0001-Handle-win64-in-dumpcpp-and-MetaObjectGenerator-read.patch'
|
||||||
'0002-Build-tools-for-the-target-platform.patch'
|
'0002-Build-tools-for-the-target-platform.patch'
|
||||||
'0003-Fix-compile-error-about-missing-QStringView-overload.patch')
|
'0003-Fix-compile-error-about-missing-QStringView-overload.patch')
|
||||||
sha256sums=('093ee1d1514d32ed2657e32b6370523e57881d843fa87276e20cb7b2fb711c6d'
|
sha256sums=('25b0aacbd9aaac3822ee44ac201a159d3e63c77bfbce57599c0368f294f89c3b'
|
||||||
'66e5a32fa63add8a712406ebaeb56e948b8ef5b4b24fc43e12d8f714fbac6a44'
|
'869a86ceb1801432bada4f12420703140563393661d9d4283982019d5831cd14'
|
||||||
'3ff2118e5b88aa47d053965335c764a4aa803bdafe8340c78f757b2809027e15'
|
'78e8f82cf03e5ce55498f553a98e65b8e990c38038b58bf98afcceb65add27ed'
|
||||||
'da3fb21d0ecd45594ed0ad06f37bbbb1bd356fc125948cc47016b8361dbade0f')
|
'c83752006cae2dd3573c88aa674daef6cb62d2e7e1146a8c8ea32cbca9a20362')
|
||||||
|
|
||||||
_architectures='i686-w64-mingw32 x86_64-w64-mingw32'
|
_architectures='i686-w64-mingw32 x86_64-w64-mingw32'
|
||||||
|
|
||||||
|
|
|
@ -1 +1 @@
|
||||||
093ee1d1514d32ed2657e32b6370523e57881d843fa87276e20cb7b2fb711c6d
|
25b0aacbd9aaac3822ee44ac201a159d3e63c77bfbce57599c0368f294f89c3b
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
From 510fd537b1f6329d429b51e19d593214605d1b4a Mon Sep 17 00:00:00 2001
|
From cfa5a39b153d434906682f3c89059e2c38a43940 Mon Sep 17 00:00:00 2001
|
||||||
From: Martchus <martchus@gmx.net>
|
From: Martchus <martchus@gmx.net>
|
||||||
Date: Fri, 2 Jun 2017 17:21:08 +0200
|
Date: Fri, 2 Jun 2017 17:21:08 +0200
|
||||||
Subject: [PATCH 1/3] Handle win64 in dumpcpp and
|
Subject: [PATCH 1/3] Handle win64 in dumpcpp and
|
||||||
|
@ -26,7 +26,7 @@ index c3b9b0a..ee19ffe 100644
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
diff --git a/tools/dumpcpp/main.cpp b/tools/dumpcpp/main.cpp
|
diff --git a/tools/dumpcpp/main.cpp b/tools/dumpcpp/main.cpp
|
||||||
index fc8bf8c..435ab1e 100644
|
index 9820a76..222aff0 100644
|
||||||
--- a/tools/dumpcpp/main.cpp
|
--- a/tools/dumpcpp/main.cpp
|
||||||
+++ b/tools/dumpcpp/main.cpp
|
+++ b/tools/dumpcpp/main.cpp
|
||||||
@@ -1111,6 +1111,10 @@ int main(int argc, char **argv)
|
@@ -1111,6 +1111,10 @@ int main(int argc, char **argv)
|
||||||
|
@ -52,5 +52,5 @@ index fc8bf8c..435ab1e 100644
|
||||||
}
|
}
|
||||||
|
|
||||||
--
|
--
|
||||||
2.39.2
|
2.40.0
|
||||||
|
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
From 16fc69c4e2081f3e9c27b98a970bd0c177e78221 Mon Sep 17 00:00:00 2001
|
From c20640e04fcc1b26e7d608a85e3e0060e0598124 Mon Sep 17 00:00:00 2001
|
||||||
From: Martchus <martchus@gmx.net>
|
From: Martchus <martchus@gmx.net>
|
||||||
Date: Fri, 7 May 2021 16:10:47 +0200
|
Date: Fri, 7 May 2021 16:10:47 +0200
|
||||||
Subject: [PATCH 2/3] Build tools for the target platform
|
Subject: [PATCH 2/3] Build tools for the target platform
|
||||||
|
@ -13,55 +13,53 @@ executed using WINE.
|
||||||
3 files changed, 5 insertions(+), 6 deletions(-)
|
3 files changed, 5 insertions(+), 6 deletions(-)
|
||||||
|
|
||||||
diff --git a/src/tools/idc/CMakeLists.txt b/src/tools/idc/CMakeLists.txt
|
diff --git a/src/tools/idc/CMakeLists.txt b/src/tools/idc/CMakeLists.txt
|
||||||
index 3a3e946..11dcad5 100644
|
index f1d784e..b595ac5 100644
|
||||||
--- a/src/tools/idc/CMakeLists.txt
|
--- a/src/tools/idc/CMakeLists.txt
|
||||||
+++ b/src/tools/idc/CMakeLists.txt
|
+++ b/src/tools/idc/CMakeLists.txt
|
||||||
@@ -5,12 +5,13 @@
|
@@ -6,10 +6,11 @@
|
||||||
#####################################################################
|
#####################################################################
|
||||||
|
|
||||||
qt_get_tool_target_name(target_name idc)
|
qt_get_tool_target_name(target_name idc)
|
||||||
-qt_internal_add_tool(${target_name} # special case
|
-qt_internal_add_tool(${target_name}
|
||||||
+qt_internal_add_app(${target_name} # special case
|
+qt_internal_add_app(${target_name}
|
||||||
# BOOTSTRAP # special case
|
|
||||||
TARGET_DESCRIPTION "Active Qt Interface Description Compiler"
|
TARGET_DESCRIPTION "Active Qt Interface Description Compiler"
|
||||||
- TOOLS_TARGET AxServer # special case
|
- TOOLS_TARGET AxServer
|
||||||
SOURCES
|
SOURCES
|
||||||
main.cpp
|
main.cpp
|
||||||
+ PUBLIC_LIBRARIES
|
+ PUBLIC_LIBRARIES
|
||||||
+ Qt::Core
|
+ Qt::Core
|
||||||
)
|
)
|
||||||
qt_internal_return_unless_building_tools()
|
qt_internal_return_unless_building_tools()
|
||||||
|
|
||||||
diff --git a/tools/dumpcpp/CMakeLists.txt b/tools/dumpcpp/CMakeLists.txt
|
diff --git a/tools/dumpcpp/CMakeLists.txt b/tools/dumpcpp/CMakeLists.txt
|
||||||
index fb7b1db..d1806ab 100644
|
index 571f830..7cbec30 100644
|
||||||
--- a/tools/dumpcpp/CMakeLists.txt
|
--- a/tools/dumpcpp/CMakeLists.txt
|
||||||
+++ b/tools/dumpcpp/CMakeLists.txt
|
+++ b/tools/dumpcpp/CMakeLists.txt
|
||||||
@@ -5,9 +5,8 @@
|
@@ -6,9 +6,8 @@
|
||||||
#####################################################################
|
#####################################################################
|
||||||
|
|
||||||
qt_get_tool_target_name(target_name dumpcpp)
|
qt_get_tool_target_name(target_name dumpcpp)
|
||||||
-qt_internal_add_tool(${target_name} # special case
|
-qt_internal_add_tool(${target_name}
|
||||||
+qt_internal_add_app(${target_name} # special case
|
+qt_internal_add_app(${target_name}
|
||||||
TARGET_DESCRIPTION "Active Qt DumpCpp"
|
TARGET_DESCRIPTION "Active Qt DumpCpp"
|
||||||
- TOOLS_TARGET AxContainer # special case
|
- TOOLS_TARGET AxContainer
|
||||||
SOURCES
|
SOURCES
|
||||||
main.cpp
|
main.cpp
|
||||||
moc.cpp moc.h
|
moc.cpp moc.h
|
||||||
diff --git a/tools/dumpdoc/CMakeLists.txt b/tools/dumpdoc/CMakeLists.txt
|
diff --git a/tools/dumpdoc/CMakeLists.txt b/tools/dumpdoc/CMakeLists.txt
|
||||||
index 515a5fc..86369ae 100644
|
index 84b4018..1dc4b9e 100644
|
||||||
--- a/tools/dumpdoc/CMakeLists.txt
|
--- a/tools/dumpdoc/CMakeLists.txt
|
||||||
+++ b/tools/dumpdoc/CMakeLists.txt
|
+++ b/tools/dumpdoc/CMakeLists.txt
|
||||||
@@ -5,9 +5,8 @@
|
@@ -6,9 +6,8 @@
|
||||||
#####################################################################
|
#####################################################################
|
||||||
|
|
||||||
qt_get_tool_target_name(target_name dumpdoc)
|
qt_get_tool_target_name(target_name dumpdoc)
|
||||||
-qt_internal_add_tool(${target_name} # special case
|
-qt_internal_add_tool(${target_name}
|
||||||
+qt_internal_add_app(${target_name} # special case
|
+qt_internal_add_app(${target_name}
|
||||||
TARGET_DESCRIPTION "Active Qt DumpDoc"
|
TARGET_DESCRIPTION "Active Qt DumpDoc"
|
||||||
- TOOLS_TARGET AxContainer # special case
|
- TOOLS_TARGET AxContainer
|
||||||
SOURCES
|
SOURCES
|
||||||
main.cpp
|
main.cpp
|
||||||
PUBLIC_LIBRARIES
|
LIBRARIES
|
||||||
--
|
--
|
||||||
2.39.2
|
2.40.0
|
||||||
|
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
From 9bc85106cb4380c723b8e095d700094382d380ac Mon Sep 17 00:00:00 2001
|
From fd8c8a7edd18b3fc310073ca1bf6483f1ad46a08 Mon Sep 17 00:00:00 2001
|
||||||
From: Martchus <martchus@gmx.net>
|
From: Martchus <martchus@gmx.net>
|
||||||
Date: Mon, 12 Sep 2022 17:38:47 +0200
|
Date: Mon, 12 Sep 2022 17:38:47 +0200
|
||||||
Subject: [PATCH 3/3] Fix compile error about missing QStringView overload
|
Subject: [PATCH 3/3] Fix compile error about missing QStringView overload
|
||||||
|
@ -20,7 +20,7 @@ Prevents the following compiler error:
|
||||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||||
|
|
||||||
diff --git a/tools/dumpcpp/main.cpp b/tools/dumpcpp/main.cpp
|
diff --git a/tools/dumpcpp/main.cpp b/tools/dumpcpp/main.cpp
|
||||||
index 435ab1e..3b8c8e9 100644
|
index 222aff0..53d2a18 100644
|
||||||
--- a/tools/dumpcpp/main.cpp
|
--- a/tools/dumpcpp/main.cpp
|
||||||
+++ b/tools/dumpcpp/main.cpp
|
+++ b/tools/dumpcpp/main.cpp
|
||||||
@@ -570,7 +570,7 @@ bool generateClassImpl(QTextStream &out, const QMetaObject *mo, const QByteArray
|
@@ -570,7 +570,7 @@ bool generateClassImpl(QTextStream &out, const QMetaObject *mo, const QByteArray
|
||||||
|
@ -33,5 +33,5 @@ index 435ab1e..3b8c8e9 100644
|
||||||
nextTypeAndForceComplete = startType + lengthType;
|
nextTypeAndForceComplete = startType + lengthType;
|
||||||
} while (true);
|
} while (true);
|
||||||
--
|
--
|
||||||
2.39.2
|
2.40.0
|
||||||
|
|
||||||
|
|
|
@ -4,7 +4,7 @@
|
||||||
# you also find the URL of a binary repository.
|
# you also find the URL of a binary repository.
|
||||||
|
|
||||||
pkgname=mingw-w64-qt6-activeqt
|
pkgname=mingw-w64-qt6-activeqt
|
||||||
_qtver=6.4.3
|
_qtver=6.5.0
|
||||||
pkgver=${_qtver/-/}
|
pkgver=${_qtver/-/}
|
||||||
pkgrel=1
|
pkgrel=1
|
||||||
arch=(any)
|
arch=(any)
|
||||||
|
@ -21,10 +21,10 @@ source=("https://download.qt.io/official_releases/qt/${pkgver%.*}/${_qtver}/subm
|
||||||
'0001-Handle-win64-in-dumpcpp-and-MetaObjectGenerator-read.patch'
|
'0001-Handle-win64-in-dumpcpp-and-MetaObjectGenerator-read.patch'
|
||||||
'0002-Build-tools-for-the-target-platform.patch'
|
'0002-Build-tools-for-the-target-platform.patch'
|
||||||
'0003-Fix-compile-error-about-missing-QStringView-overload.patch')
|
'0003-Fix-compile-error-about-missing-QStringView-overload.patch')
|
||||||
sha256sums=('093ee1d1514d32ed2657e32b6370523e57881d843fa87276e20cb7b2fb711c6d'
|
sha256sums=('25b0aacbd9aaac3822ee44ac201a159d3e63c77bfbce57599c0368f294f89c3b'
|
||||||
'66e5a32fa63add8a712406ebaeb56e948b8ef5b4b24fc43e12d8f714fbac6a44'
|
'869a86ceb1801432bada4f12420703140563393661d9d4283982019d5831cd14'
|
||||||
'3ff2118e5b88aa47d053965335c764a4aa803bdafe8340c78f757b2809027e15'
|
'78e8f82cf03e5ce55498f553a98e65b8e990c38038b58bf98afcceb65add27ed'
|
||||||
'da3fb21d0ecd45594ed0ad06f37bbbb1bd356fc125948cc47016b8361dbade0f')
|
'c83752006cae2dd3573c88aa674daef6cb62d2e7e1146a8c8ea32cbca9a20362')
|
||||||
|
|
||||||
_architectures='i686-w64-mingw32 x86_64-w64-mingw32'
|
_architectures='i686-w64-mingw32 x86_64-w64-mingw32'
|
||||||
|
|
||||||
|
|
|
@ -1,6 +1,6 @@
|
||||||
% layout 'mingw-w64-qt6-module', no_libs => 1;
|
% layout 'mingw-w64-qt6-module', no_libs => 1;
|
||||||
\
|
\
|
||||||
_qtver=6.4.3
|
_qtver=6.5.0
|
||||||
pkgver=${_qtver/-/}
|
pkgver=${_qtver/-/}
|
||||||
pkgrel=1
|
pkgrel=1
|
||||||
arch=(any)
|
arch=(any)
|
||||||
|
|
|
@ -1 +1 @@
|
||||||
093ee1d1514d32ed2657e32b6370523e57881d843fa87276e20cb7b2fb711c6d
|
25b0aacbd9aaac3822ee44ac201a159d3e63c77bfbce57599c0368f294f89c3b
|
||||||
|
|
|
@ -11,7 +11,7 @@
|
||||||
|
|
||||||
_android_arch=aarch64
|
_android_arch=aarch64
|
||||||
pkgname=android-aarch64-qt6-base
|
pkgname=android-aarch64-qt6-base
|
||||||
_qtver=6.4.3
|
_qtver=6.5.0
|
||||||
pkgver=${_qtver/-/}
|
pkgver=${_qtver/-/}
|
||||||
pkgrel=1
|
pkgrel=1
|
||||||
arch=(any)
|
arch=(any)
|
||||||
|
@ -40,19 +40,19 @@ source=("https://download.qt.io/official_releases/qt/${pkgver%.*}/${_qtver}/subm
|
||||||
'0010-Fix-dependency-of-xcb-image-on-xcb-util.patch'
|
'0010-Fix-dependency-of-xcb-image-on-xcb-util.patch'
|
||||||
'0011-Allow-using-properties-of-PkgConfig-targets-for-glib.patch'
|
'0011-Allow-using-properties-of-PkgConfig-targets-for-glib.patch'
|
||||||
'0012-Allow-using-properties-of-PkgConfig-targets-for-Wayl.patch')
|
'0012-Allow-using-properties-of-PkgConfig-targets-for-Wayl.patch')
|
||||||
sha256sums=('5087c9e5b0165e7bc3c1a4ab176b35d0cd8f52636aea903fa377bdba00891a60'
|
sha256sums=('fde1aa7b4fbe64ec1b4fc576a57f4688ad1453d2fab59cbadd948a10a6eaf5ef'
|
||||||
'90910e209a4ee9e5ce7a8e6352bd3d53197a8d11a6f6385b2cbc1be2732c10b0'
|
'0cb9c1a10d04575b36b0abe4a422af1e7279b3e07249b2af5fa7631dcc93d262'
|
||||||
'12089a41e68e5708707301dac514e69578791c57926f79903b6011ddfedaf3b3'
|
'a26661954e7c1b1c74bb1563d8d269f8b7dfda196640e30eded9c03be27656e1'
|
||||||
'a6aa4d12dd99c1cfa4dc53f6f8d348e3f0a9f5a4f56ef55934d93763540af1b0'
|
'61fd2877aff4ba0d471ec88cf85c08dac8e522d0a0312739c134fb1a483474f0'
|
||||||
'e9ba0c08d4ba390d501f7b0973c59effe71902d6fb577db2b1eda070e50036c0'
|
'95d18cb173cc0c13323a8394f8c536c2f78157928d6ddc959f20031a913f3960'
|
||||||
'6dcdb034cebe1c3db9e3c26e3eb3ed5cd73b2f32b2a69ec65b2d490ebc28eadb'
|
'004a09d1e475f3288f599f83c6ec183e479ba58ed8e12286e0050935428ee470'
|
||||||
'35e3e9f71af5bff857f4d8fec2f7805b5e74e998212f9e0468713fb79b5bc28b'
|
'e3ea83b5c934ff3f5f8d9c48ecc3831eb66379f134247d61664a10837107bd46'
|
||||||
'a023ba4db23599ef8141da35e576c169fd2d98266b3c33af0b555da971299b51'
|
'fb3b3e2c49d0e3466410dd03a936dc127b7669e5de7e11dbbe721baed8544043'
|
||||||
'6b417acac9059b5b2da850a3da48432526ac3f95fa6b713a6cad9ad1cc9c2c2e'
|
'32f80d7cedbb4b32e4689c28b4d0ddb64ea4e4d74612738a56c771d9179eecf7'
|
||||||
'58fdfd58b66a4ee2c968b7190c47b058b576c374483f3860e59e44f5856e6fe0'
|
'a2d54f21fa6205fb4273dd8f7b51b679c9c20f91021af46ccfd251addce775b8'
|
||||||
'47434e7a794ac04e689658458331abdb839abb0407577d9edf50272fe864d329'
|
'4c8f6c5aec035a6fbe59973e88adb0817b24464881f958d70eff030c42884072'
|
||||||
'0fbc4aee0aaf9fbb34f1b9ffaf82b1ceeb07d1d0bd25f3a2a441a13b06d650ac'
|
'3bdbbab00cbef3915031f7eb1d174e54107fee8b326f17c8291d5129ba0d606f'
|
||||||
'a98277ea7bfa934ae9f3378125dc5b6d9849dfe861da787f760e89208f99c763')
|
'0908f24881d7ae5c09abe58a1d5a1ca81a6f8139fcf15924cae9fc9feb6eb4dc')
|
||||||
|
|
||||||
prepare () {
|
prepare () {
|
||||||
cd $_pkgfqn
|
cd $_pkgfqn
|
||||||
|
|
|
@ -1 +1 @@
|
||||||
5087c9e5b0165e7bc3c1a4ab176b35d0cd8f52636aea903fa377bdba00891a60
|
fde1aa7b4fbe64ec1b4fc576a57f4688ad1453d2fab59cbadd948a10a6eaf5ef
|
||||||
|
|
|
@ -11,7 +11,7 @@
|
||||||
# All patches are managed at https://github.com/Martchus/qtbase
|
# All patches are managed at https://github.com/Martchus/qtbase
|
||||||
|
|
||||||
pkgname=mingw-w64-qt6-base-static
|
pkgname=mingw-w64-qt6-base-static
|
||||||
_qtver=6.4.3
|
_qtver=6.5.0
|
||||||
pkgver=${_qtver/-/}
|
pkgver=${_qtver/-/}
|
||||||
pkgrel=1
|
pkgrel=1
|
||||||
arch=(any)
|
arch=(any)
|
||||||
|
@ -43,19 +43,19 @@ source=("https://download.qt.io/official_releases/qt/${pkgver%.*}/${_qtver}/subm
|
||||||
'0010-Fix-dependency-of-xcb-image-on-xcb-util.patch'
|
'0010-Fix-dependency-of-xcb-image-on-xcb-util.patch'
|
||||||
'0011-Allow-using-properties-of-PkgConfig-targets-for-glib.patch'
|
'0011-Allow-using-properties-of-PkgConfig-targets-for-glib.patch'
|
||||||
'0012-Allow-using-properties-of-PkgConfig-targets-for-Wayl.patch')
|
'0012-Allow-using-properties-of-PkgConfig-targets-for-Wayl.patch')
|
||||||
sha256sums=('5087c9e5b0165e7bc3c1a4ab176b35d0cd8f52636aea903fa377bdba00891a60'
|
sha256sums=('fde1aa7b4fbe64ec1b4fc576a57f4688ad1453d2fab59cbadd948a10a6eaf5ef'
|
||||||
'90910e209a4ee9e5ce7a8e6352bd3d53197a8d11a6f6385b2cbc1be2732c10b0'
|
'0cb9c1a10d04575b36b0abe4a422af1e7279b3e07249b2af5fa7631dcc93d262'
|
||||||
'12089a41e68e5708707301dac514e69578791c57926f79903b6011ddfedaf3b3'
|
'a26661954e7c1b1c74bb1563d8d269f8b7dfda196640e30eded9c03be27656e1'
|
||||||
'a6aa4d12dd99c1cfa4dc53f6f8d348e3f0a9f5a4f56ef55934d93763540af1b0'
|
'61fd2877aff4ba0d471ec88cf85c08dac8e522d0a0312739c134fb1a483474f0'
|
||||||
'e9ba0c08d4ba390d501f7b0973c59effe71902d6fb577db2b1eda070e50036c0'
|
'95d18cb173cc0c13323a8394f8c536c2f78157928d6ddc959f20031a913f3960'
|
||||||
'6dcdb034cebe1c3db9e3c26e3eb3ed5cd73b2f32b2a69ec65b2d490ebc28eadb'
|
'004a09d1e475f3288f599f83c6ec183e479ba58ed8e12286e0050935428ee470'
|
||||||
'35e3e9f71af5bff857f4d8fec2f7805b5e74e998212f9e0468713fb79b5bc28b'
|
'e3ea83b5c934ff3f5f8d9c48ecc3831eb66379f134247d61664a10837107bd46'
|
||||||
'a023ba4db23599ef8141da35e576c169fd2d98266b3c33af0b555da971299b51'
|
'fb3b3e2c49d0e3466410dd03a936dc127b7669e5de7e11dbbe721baed8544043'
|
||||||
'6b417acac9059b5b2da850a3da48432526ac3f95fa6b713a6cad9ad1cc9c2c2e'
|
'32f80d7cedbb4b32e4689c28b4d0ddb64ea4e4d74612738a56c771d9179eecf7'
|
||||||
'58fdfd58b66a4ee2c968b7190c47b058b576c374483f3860e59e44f5856e6fe0'
|
'a2d54f21fa6205fb4273dd8f7b51b679c9c20f91021af46ccfd251addce775b8'
|
||||||
'47434e7a794ac04e689658458331abdb839abb0407577d9edf50272fe864d329'
|
'4c8f6c5aec035a6fbe59973e88adb0817b24464881f958d70eff030c42884072'
|
||||||
'0fbc4aee0aaf9fbb34f1b9ffaf82b1ceeb07d1d0bd25f3a2a441a13b06d650ac'
|
'3bdbbab00cbef3915031f7eb1d174e54107fee8b326f17c8291d5129ba0d606f'
|
||||||
'a98277ea7bfa934ae9f3378125dc5b6d9849dfe861da787f760e89208f99c763')
|
'0908f24881d7ae5c09abe58a1d5a1ca81a6f8139fcf15924cae9fc9feb6eb4dc')
|
||||||
|
|
||||||
_architectures='i686-w64-mingw32 x86_64-w64-mingw32'
|
_architectures='i686-w64-mingw32 x86_64-w64-mingw32'
|
||||||
|
|
||||||
|
|
|
@ -1 +1 @@
|
||||||
5087c9e5b0165e7bc3c1a4ab176b35d0cd8f52636aea903fa377bdba00891a60
|
fde1aa7b4fbe64ec1b4fc576a57f4688ad1453d2fab59cbadd948a10a6eaf5ef
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
From 089202508f01a9663a2d184ed49a4970032eaeea Mon Sep 17 00:00:00 2001
|
From c8094f63d266880d6137acc3d5a2995b65dd81c5 Mon Sep 17 00:00:00 2001
|
||||||
From: Martchus <martchus@gmx.net>
|
From: Martchus <martchus@gmx.net>
|
||||||
Date: Thu, 5 Nov 2020 22:08:10 +0100
|
Date: Thu, 5 Nov 2020 22:08:10 +0100
|
||||||
Subject: [PATCH 01/12] Use CMake's default import library suffix
|
Subject: [PATCH 01/12] Use CMake's default import library suffix
|
||||||
|
@ -13,10 +13,10 @@ Change-Id: I3dbedaec74683e5bfd008f7f2fd1e046dfb921b2
|
||||||
5 files changed, 21 insertions(+), 6 deletions(-)
|
5 files changed, 21 insertions(+), 6 deletions(-)
|
||||||
|
|
||||||
diff --git a/cmake/QtPriHelpers.cmake b/cmake/QtPriHelpers.cmake
|
diff --git a/cmake/QtPriHelpers.cmake b/cmake/QtPriHelpers.cmake
|
||||||
index b8c238c203..431c9b44db 100644
|
index c619a50f30..903c49133e 100644
|
||||||
--- a/cmake/QtPriHelpers.cmake
|
--- a/cmake/QtPriHelpers.cmake
|
||||||
+++ b/cmake/QtPriHelpers.cmake
|
+++ b/cmake/QtPriHelpers.cmake
|
||||||
@@ -507,9 +507,13 @@ QT.${config_module_name}_private.disabled_features = ${disabled_private_features
|
@@ -518,9 +518,13 @@ QT.${config_module_name}_private.disabled_features = ${disabled_private_features
|
||||||
qt_path_join(private_pri_file_path "${target_path}" "${private_pri_file_name}")
|
qt_path_join(private_pri_file_path "${target_path}" "${private_pri_file_name}")
|
||||||
list(APPEND pri_files "${private_pri_file_path}")
|
list(APPEND pri_files "${private_pri_file_path}")
|
||||||
|
|
||||||
|
@ -31,7 +31,7 @@ index b8c238c203..431c9b44db 100644
|
||||||
${CMAKE_EXTRA_SHARED_LIBRARY_SUFFIXES}
|
${CMAKE_EXTRA_SHARED_LIBRARY_SUFFIXES}
|
||||||
${CMAKE_STATIC_LIBRARY_SUFFIX})
|
${CMAKE_STATIC_LIBRARY_SUFFIX})
|
||||||
if(MSVC)
|
if(MSVC)
|
||||||
@@ -939,9 +943,13 @@ CONFIG += ${private_config_joined}
|
@@ -971,9 +975,13 @@ CONFIG += ${private_config_joined}
|
||||||
list(APPEND inputs "${preliminary_pri_root}/${cfg}/${pri_data_cmake_file}")
|
list(APPEND inputs "${preliminary_pri_root}/${cfg}/${pri_data_cmake_file}")
|
||||||
endforeach()
|
endforeach()
|
||||||
|
|
||||||
|
@ -47,10 +47,10 @@ index b8c238c203..431c9b44db 100644
|
||||||
${CMAKE_STATIC_LIBRARY_SUFFIX})
|
${CMAKE_STATIC_LIBRARY_SUFFIX})
|
||||||
if(MSVC)
|
if(MSVC)
|
||||||
diff --git a/cmake/QtPrlHelpers.cmake b/cmake/QtPrlHelpers.cmake
|
diff --git a/cmake/QtPrlHelpers.cmake b/cmake/QtPrlHelpers.cmake
|
||||||
index 298bc44c9b..6978fe25fc 100644
|
index 45bfaedcdf..a433c98fe8 100644
|
||||||
--- a/cmake/QtPrlHelpers.cmake
|
--- a/cmake/QtPrlHelpers.cmake
|
||||||
+++ b/cmake/QtPrlHelpers.cmake
|
+++ b/cmake/QtPrlHelpers.cmake
|
||||||
@@ -121,11 +121,17 @@ ${prl_step1_content_libs}
|
@@ -123,11 +123,17 @@ ${prl_step1_content_libs}
|
||||||
CONTENT
|
CONTENT
|
||||||
"FINAL_PRL_FILE_PATH = ${final_prl_file_path}")
|
"FINAL_PRL_FILE_PATH = ${final_prl_file_path}")
|
||||||
|
|
||||||
|
@ -98,10 +98,10 @@ index 24ed125f12..73ebe453d3 100644
|
||||||
CMAKE_WINMAIN_FILE_LOCATION_DEBUG = qtmain$${QT_LIBINFIX}$${debug_suffix}.lib
|
CMAKE_WINMAIN_FILE_LOCATION_DEBUG = qtmain$${QT_LIBINFIX}$${debug_suffix}.lib
|
||||||
CMAKE_WINMAIN_FILE_LOCATION_RELEASE = qtmain$${QT_LIBINFIX}.lib
|
CMAKE_WINMAIN_FILE_LOCATION_RELEASE = qtmain$${QT_LIBINFIX}.lib
|
||||||
diff --git a/src/corelib/Qt6CoreMacros.cmake b/src/corelib/Qt6CoreMacros.cmake
|
diff --git a/src/corelib/Qt6CoreMacros.cmake b/src/corelib/Qt6CoreMacros.cmake
|
||||||
index ccfba93899..7fc87a8403 100644
|
index 18576eead0..21b66c64e5 100644
|
||||||
--- a/src/corelib/Qt6CoreMacros.cmake
|
--- a/src/corelib/Qt6CoreMacros.cmake
|
||||||
+++ b/src/corelib/Qt6CoreMacros.cmake
|
+++ b/src/corelib/Qt6CoreMacros.cmake
|
||||||
@@ -520,7 +520,6 @@ function(_qt_internal_apply_win_prefix_and_suffix target)
|
@@ -524,7 +524,6 @@ function(_qt_internal_apply_win_prefix_and_suffix target)
|
||||||
|
|
||||||
# This should cover both MINGW with GCC and CLANG.
|
# This should cover both MINGW with GCC and CLANG.
|
||||||
if(NOT MSVC)
|
if(NOT MSVC)
|
||||||
|
@ -110,5 +110,5 @@ index ccfba93899..7fc87a8403 100644
|
||||||
get_target_property(target_type ${target} TYPE)
|
get_target_property(target_type ${target} TYPE)
|
||||||
if(target_type STREQUAL "STATIC_LIBRARY")
|
if(target_type STREQUAL "STATIC_LIBRARY")
|
||||||
--
|
--
|
||||||
2.39.2
|
2.40.0
|
||||||
|
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
From bb7889fda3d2bb7e84f93879e545559809425fa8 Mon Sep 17 00:00:00 2001
|
From 6a509943be2621f77ab5914bb52b905670a885db Mon Sep 17 00:00:00 2001
|
||||||
From: Martchus <martchus@gmx.net>
|
From: Martchus <martchus@gmx.net>
|
||||||
Date: Wed, 7 Oct 2020 12:13:37 +0200
|
Date: Wed, 7 Oct 2020 12:13:37 +0200
|
||||||
Subject: [PATCH 02/12] Fix finding D-Bus
|
Subject: [PATCH 02/12] Fix finding D-Bus
|
||||||
|
@ -9,10 +9,10 @@ Change-Id: Ie21eb9cbc6b1b5d9c8b34eea46f54718e5926986
|
||||||
1 file changed, 3 insertions(+)
|
1 file changed, 3 insertions(+)
|
||||||
|
|
||||||
diff --git a/cmake/FindWrapDBus1.cmake b/cmake/FindWrapDBus1.cmake
|
diff --git a/cmake/FindWrapDBus1.cmake b/cmake/FindWrapDBus1.cmake
|
||||||
index e227d224e0..bdbcab9eb3 100644
|
index e2a58790c4..8e0ed81f89 100644
|
||||||
--- a/cmake/FindWrapDBus1.cmake
|
--- a/cmake/FindWrapDBus1.cmake
|
||||||
+++ b/cmake/FindWrapDBus1.cmake
|
+++ b/cmake/FindWrapDBus1.cmake
|
||||||
@@ -45,3 +45,6 @@ include(FindPackageHandleStandardArgs)
|
@@ -48,3 +48,6 @@ include(FindPackageHandleStandardArgs)
|
||||||
find_package_handle_standard_args(WrapDBus1 REQUIRED_VARS
|
find_package_handle_standard_args(WrapDBus1 REQUIRED_VARS
|
||||||
DBus1_LIBRARY DBus1_INCLUDE_DIR WrapDBus1_FOUND
|
DBus1_LIBRARY DBus1_INCLUDE_DIR WrapDBus1_FOUND
|
||||||
VERSION_VAR DBus1_VERSION)
|
VERSION_VAR DBus1_VERSION)
|
||||||
|
@ -20,5 +20,5 @@ index e227d224e0..bdbcab9eb3 100644
|
||||||
+ set_property(TARGET dbus-1 PROPERTY IMPORTED_IMPLIB ${DBus1_LIBRARY})
|
+ set_property(TARGET dbus-1 PROPERTY IMPORTED_IMPLIB ${DBus1_LIBRARY})
|
||||||
+endif()
|
+endif()
|
||||||
--
|
--
|
||||||
2.39.2
|
2.40.0
|
||||||
|
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
From dee6d0767a7eda9fdd184512fdc15e953af22dc4 Mon Sep 17 00:00:00 2001
|
From f107e9d917723329e1fbdfd8a1477f182bbaf93a Mon Sep 17 00:00:00 2001
|
||||||
From: Martchus <martchus@gmx.net>
|
From: Martchus <martchus@gmx.net>
|
||||||
Date: Thu, 5 Nov 2020 21:13:19 +0100
|
Date: Thu, 5 Nov 2020 21:13:19 +0100
|
||||||
Subject: [PATCH 03/12] Fix using static PCRE2 and DBus-1
|
Subject: [PATCH 03/12] Fix using static PCRE2 and DBus-1
|
||||||
|
@ -13,7 +13,7 @@ Change-Id: I2387b79462b6d183b71f9433dd937f63fc7ef26e
|
||||||
2 files changed, 9 insertions(+)
|
2 files changed, 9 insertions(+)
|
||||||
|
|
||||||
diff --git a/src/corelib/text/qregularexpression.cpp b/src/corelib/text/qregularexpression.cpp
|
diff --git a/src/corelib/text/qregularexpression.cpp b/src/corelib/text/qregularexpression.cpp
|
||||||
index a523a64788..d64a4b3963 100644
|
index 8b3cf63dd2..42988c6300 100644
|
||||||
--- a/src/corelib/text/qregularexpression.cpp
|
--- a/src/corelib/text/qregularexpression.cpp
|
||||||
+++ b/src/corelib/text/qregularexpression.cpp
|
+++ b/src/corelib/text/qregularexpression.cpp
|
||||||
@@ -20,6 +20,11 @@
|
@@ -20,6 +20,11 @@
|
||||||
|
@ -44,5 +44,5 @@ index e3008be761..9c745c16c4 100644
|
||||||
# include <dbus/dbus.h>
|
# include <dbus/dbus.h>
|
||||||
#else
|
#else
|
||||||
--
|
--
|
||||||
2.39.2
|
2.40.0
|
||||||
|
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
From 42c085d4a746a12ef0ffde8e29fc7fef048bfb19 Mon Sep 17 00:00:00 2001
|
From d35043f858eada057e7b12f49354ed95281c6f97 Mon Sep 17 00:00:00 2001
|
||||||
From: Martchus <martchus@gmx.net>
|
From: Martchus <martchus@gmx.net>
|
||||||
Date: Thu, 5 Nov 2020 21:59:33 +0100
|
Date: Thu, 5 Nov 2020 21:59:33 +0100
|
||||||
Subject: [PATCH 04/12] Fix transitive dependencies (of static libraries)
|
Subject: [PATCH 04/12] Fix transitive dependencies (of static libraries)
|
||||||
|
@ -36,10 +36,10 @@ index 24a194c9cb..a6a16b494f 100644
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
diff --git a/cmake/FindMySQL.cmake b/cmake/FindMySQL.cmake
|
diff --git a/cmake/FindMySQL.cmake b/cmake/FindMySQL.cmake
|
||||||
index f5cad361d7..cdfb469c71 100644
|
index d191d1ac0a..b61d0107f2 100644
|
||||||
--- a/cmake/FindMySQL.cmake
|
--- a/cmake/FindMySQL.cmake
|
||||||
+++ b/cmake/FindMySQL.cmake
|
+++ b/cmake/FindMySQL.cmake
|
||||||
@@ -80,6 +80,7 @@ if(MySQL_FOUND)
|
@@ -83,6 +83,7 @@ if(MySQL_FOUND)
|
||||||
add_library(MySQL::MySQL UNKNOWN IMPORTED)
|
add_library(MySQL::MySQL UNKNOWN IMPORTED)
|
||||||
set_target_properties(MySQL::MySQL PROPERTIES
|
set_target_properties(MySQL::MySQL PROPERTIES
|
||||||
IMPORTED_LOCATION "${MySQL_LIBRARIES}"
|
IMPORTED_LOCATION "${MySQL_LIBRARIES}"
|
||||||
|
@ -48,20 +48,20 @@ index f5cad361d7..cdfb469c71 100644
|
||||||
if(MySQL_LIBRARY_DEBUG)
|
if(MySQL_LIBRARY_DEBUG)
|
||||||
set_target_properties(MySQL::MySQL PROPERTIES
|
set_target_properties(MySQL::MySQL PROPERTIES
|
||||||
diff --git a/cmake/FindWrapDBus1.cmake b/cmake/FindWrapDBus1.cmake
|
diff --git a/cmake/FindWrapDBus1.cmake b/cmake/FindWrapDBus1.cmake
|
||||||
index bdbcab9eb3..06e9af49f6 100644
|
index 8e0ed81f89..0aec7dbb77 100644
|
||||||
--- a/cmake/FindWrapDBus1.cmake
|
--- a/cmake/FindWrapDBus1.cmake
|
||||||
+++ b/cmake/FindWrapDBus1.cmake
|
+++ b/cmake/FindWrapDBus1.cmake
|
||||||
@@ -47,4 +47,5 @@ find_package_handle_standard_args(WrapDBus1 REQUIRED_VARS
|
@@ -50,4 +50,5 @@ find_package_handle_standard_args(WrapDBus1 REQUIRED_VARS
|
||||||
VERSION_VAR DBus1_VERSION)
|
VERSION_VAR DBus1_VERSION)
|
||||||
if(TARGET dbus-1)
|
if(TARGET dbus-1)
|
||||||
set_property(TARGET dbus-1 PROPERTY IMPORTED_IMPLIB ${DBus1_LIBRARY})
|
set_property(TARGET dbus-1 PROPERTY IMPORTED_IMPLIB ${DBus1_LIBRARY})
|
||||||
+ set_property(TARGET dbus-1 PROPERTY INTERFACE_LINK_LIBRARIES "${DBUS1_DEPENDENCIES}")
|
+ set_property(TARGET dbus-1 PROPERTY INTERFACE_LINK_LIBRARIES "${DBUS1_DEPENDENCIES}")
|
||||||
endif()
|
endif()
|
||||||
diff --git a/cmake/FindWrapOpenSSL.cmake b/cmake/FindWrapOpenSSL.cmake
|
diff --git a/cmake/FindWrapOpenSSL.cmake b/cmake/FindWrapOpenSSL.cmake
|
||||||
index 7b6dccb1d2..550c5134fb 100644
|
index a4341271fe..be6ac7003a 100644
|
||||||
--- a/cmake/FindWrapOpenSSL.cmake
|
--- a/cmake/FindWrapOpenSSL.cmake
|
||||||
+++ b/cmake/FindWrapOpenSSL.cmake
|
+++ b/cmake/FindWrapOpenSSL.cmake
|
||||||
@@ -11,7 +11,7 @@ set(WrapOpenSSL_FOUND OFF)
|
@@ -14,7 +14,7 @@ set(WrapOpenSSL_FOUND OFF)
|
||||||
find_package(WrapOpenSSLHeaders ${WrapOpenSSL_FIND_VERSION})
|
find_package(WrapOpenSSLHeaders ${WrapOpenSSL_FIND_VERSION})
|
||||||
|
|
||||||
if(TARGET OpenSSL::SSL)
|
if(TARGET OpenSSL::SSL)
|
||||||
|
@ -70,7 +70,7 @@ index 7b6dccb1d2..550c5134fb 100644
|
||||||
get_target_property(libType OpenSSL::Crypto TYPE)
|
get_target_property(libType OpenSSL::Crypto TYPE)
|
||||||
if(libType STREQUAL "ALIAS")
|
if(libType STREQUAL "ALIAS")
|
||||||
get_target_property(writableLib OpenSSL::Crypto ALIASED_TARGET)
|
get_target_property(writableLib OpenSSL::Crypto ALIASED_TARGET)
|
||||||
@@ -26,7 +26,7 @@ if(TARGET OpenSSL::SSL)
|
@@ -29,7 +29,7 @@ if(TARGET OpenSSL::SSL)
|
||||||
set(WrapOpenSSL_FOUND ON)
|
set(WrapOpenSSL_FOUND ON)
|
||||||
|
|
||||||
add_library(WrapOpenSSL::WrapOpenSSL INTERFACE IMPORTED)
|
add_library(WrapOpenSSL::WrapOpenSSL INTERFACE IMPORTED)
|
||||||
|
@ -80,10 +80,10 @@ index 7b6dccb1d2..550c5134fb 100644
|
||||||
|
|
||||||
include(FindPackageHandleStandardArgs)
|
include(FindPackageHandleStandardArgs)
|
||||||
diff --git a/cmake/FindWrapSystemFreetype.cmake b/cmake/FindWrapSystemFreetype.cmake
|
diff --git a/cmake/FindWrapSystemFreetype.cmake b/cmake/FindWrapSystemFreetype.cmake
|
||||||
index 2cf6caca19..23dc161e4c 100644
|
index d0c27a9f0f..64e14c584c 100644
|
||||||
--- a/cmake/FindWrapSystemFreetype.cmake
|
--- a/cmake/FindWrapSystemFreetype.cmake
|
||||||
+++ b/cmake/FindWrapSystemFreetype.cmake
|
+++ b/cmake/FindWrapSystemFreetype.cmake
|
||||||
@@ -44,7 +44,7 @@ find_package_handle_standard_args(WrapSystemFreetype
|
@@ -47,7 +47,7 @@ find_package_handle_standard_args(WrapSystemFreetype
|
||||||
if(WrapSystemFreetype_FOUND)
|
if(WrapSystemFreetype_FOUND)
|
||||||
add_library(WrapSystemFreetype::WrapSystemFreetype INTERFACE IMPORTED)
|
add_library(WrapSystemFreetype::WrapSystemFreetype INTERFACE IMPORTED)
|
||||||
target_link_libraries(WrapSystemFreetype::WrapSystemFreetype
|
target_link_libraries(WrapSystemFreetype::WrapSystemFreetype
|
||||||
|
@ -93,10 +93,10 @@ index 2cf6caca19..23dc161e4c 100644
|
||||||
unset(__freetype_target_name)
|
unset(__freetype_target_name)
|
||||||
unset(__freetype_found)
|
unset(__freetype_found)
|
||||||
diff --git a/cmake/FindWrapSystemHarfbuzz.cmake b/cmake/FindWrapSystemHarfbuzz.cmake
|
diff --git a/cmake/FindWrapSystemHarfbuzz.cmake b/cmake/FindWrapSystemHarfbuzz.cmake
|
||||||
index fc6233d942..1e6105a00c 100644
|
index 07b3405bc0..10fb738d7c 100644
|
||||||
--- a/cmake/FindWrapSystemHarfbuzz.cmake
|
--- a/cmake/FindWrapSystemHarfbuzz.cmake
|
||||||
+++ b/cmake/FindWrapSystemHarfbuzz.cmake
|
+++ b/cmake/FindWrapSystemHarfbuzz.cmake
|
||||||
@@ -70,7 +70,7 @@ find_package_handle_standard_args(WrapSystemHarfbuzz
|
@@ -73,7 +73,7 @@ find_package_handle_standard_args(WrapSystemHarfbuzz
|
||||||
if(WrapSystemHarfbuzz_FOUND)
|
if(WrapSystemHarfbuzz_FOUND)
|
||||||
add_library(WrapSystemHarfbuzz::WrapSystemHarfbuzz INTERFACE IMPORTED)
|
add_library(WrapSystemHarfbuzz::WrapSystemHarfbuzz INTERFACE IMPORTED)
|
||||||
target_link_libraries(WrapSystemHarfbuzz::WrapSystemHarfbuzz
|
target_link_libraries(WrapSystemHarfbuzz::WrapSystemHarfbuzz
|
||||||
|
@ -106,10 +106,10 @@ index fc6233d942..1e6105a00c 100644
|
||||||
unset(__harfbuzz_target_name)
|
unset(__harfbuzz_target_name)
|
||||||
unset(__harfbuzz_find_include_dirs_hints)
|
unset(__harfbuzz_find_include_dirs_hints)
|
||||||
diff --git a/cmake/FindWrapSystemPNG.cmake b/cmake/FindWrapSystemPNG.cmake
|
diff --git a/cmake/FindWrapSystemPNG.cmake b/cmake/FindWrapSystemPNG.cmake
|
||||||
index 372a064ff4..a363bfd31b 100644
|
index 967ccc5c02..9a7d5150dc 100644
|
||||||
--- a/cmake/FindWrapSystemPNG.cmake
|
--- a/cmake/FindWrapSystemPNG.cmake
|
||||||
+++ b/cmake/FindWrapSystemPNG.cmake
|
+++ b/cmake/FindWrapSystemPNG.cmake
|
||||||
@@ -33,7 +33,7 @@ find_package_handle_standard_args(WrapSystemPNG
|
@@ -36,7 +36,7 @@ find_package_handle_standard_args(WrapSystemPNG
|
||||||
if(WrapSystemPNG_FOUND)
|
if(WrapSystemPNG_FOUND)
|
||||||
add_library(WrapSystemPNG::WrapSystemPNG INTERFACE IMPORTED)
|
add_library(WrapSystemPNG::WrapSystemPNG INTERFACE IMPORTED)
|
||||||
target_link_libraries(WrapSystemPNG::WrapSystemPNG
|
target_link_libraries(WrapSystemPNG::WrapSystemPNG
|
||||||
|
@ -119,10 +119,10 @@ index 372a064ff4..a363bfd31b 100644
|
||||||
unset(__png_target_name)
|
unset(__png_target_name)
|
||||||
unset(__png_found)
|
unset(__png_found)
|
||||||
diff --git a/src/plugins/sqldrivers/psql/CMakeLists.txt b/src/plugins/sqldrivers/psql/CMakeLists.txt
|
diff --git a/src/plugins/sqldrivers/psql/CMakeLists.txt b/src/plugins/sqldrivers/psql/CMakeLists.txt
|
||||||
index d3a6a8588e..743154fc50 100644
|
index d392f4dfa5..165c345e1b 100644
|
||||||
--- a/src/plugins/sqldrivers/psql/CMakeLists.txt
|
--- a/src/plugins/sqldrivers/psql/CMakeLists.txt
|
||||||
+++ b/src/plugins/sqldrivers/psql/CMakeLists.txt
|
+++ b/src/plugins/sqldrivers/psql/CMakeLists.txt
|
||||||
@@ -16,7 +16,7 @@ qt_internal_add_plugin(QPSQLDriverPlugin
|
@@ -17,7 +17,7 @@ qt_internal_add_plugin(QPSQLDriverPlugin
|
||||||
QT_NO_CAST_FROM_ASCII
|
QT_NO_CAST_FROM_ASCII
|
||||||
QT_NO_CAST_TO_ASCII
|
QT_NO_CAST_TO_ASCII
|
||||||
LIBRARIES
|
LIBRARIES
|
||||||
|
@ -132,5 +132,5 @@ index d3a6a8588e..743154fc50 100644
|
||||||
Qt::CorePrivate
|
Qt::CorePrivate
|
||||||
Qt::SqlPrivate
|
Qt::SqlPrivate
|
||||||
--
|
--
|
||||||
2.39.2
|
2.40.0
|
||||||
|
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
From 86a8b29852b1063b1a793177de80c93c326b23a6 Mon Sep 17 00:00:00 2001
|
From 0a83b64b3bf63004cdecc9a5b9717dac9e846310 Mon Sep 17 00:00:00 2001
|
||||||
From: Martchus <martchus@gmx.net>
|
From: Martchus <martchus@gmx.net>
|
||||||
Date: Mon, 2 Nov 2020 13:47:45 +0100
|
Date: Mon, 2 Nov 2020 13:47:45 +0100
|
||||||
Subject: [PATCH 05/12] Fix libjpeg workaround for conflict with rpcndr.h
|
Subject: [PATCH 05/12] Fix libjpeg workaround for conflict with rpcndr.h
|
||||||
|
@ -13,7 +13,7 @@ Change-Id: I011b7735485689c9797cffe2646c8c3d15d0645e
|
||||||
1 file changed, 1 insertion(+)
|
1 file changed, 1 insertion(+)
|
||||||
|
|
||||||
diff --git a/src/plugins/imageformats/jpeg/qjpeghandler.cpp b/src/plugins/imageformats/jpeg/qjpeghandler.cpp
|
diff --git a/src/plugins/imageformats/jpeg/qjpeghandler.cpp b/src/plugins/imageformats/jpeg/qjpeghandler.cpp
|
||||||
index 6472702fdd..fe9c19d1a2 100644
|
index 0d72ba01d0..a706fb4cea 100644
|
||||||
--- a/src/plugins/imageformats/jpeg/qjpeghandler.cpp
|
--- a/src/plugins/imageformats/jpeg/qjpeghandler.cpp
|
||||||
+++ b/src/plugins/imageformats/jpeg/qjpeghandler.cpp
|
+++ b/src/plugins/imageformats/jpeg/qjpeghandler.cpp
|
||||||
@@ -26,6 +26,7 @@
|
@@ -26,6 +26,7 @@
|
||||||
|
@ -25,5 +25,5 @@ index 6472702fdd..fe9c19d1a2 100644
|
||||||
#ifdef const
|
#ifdef const
|
||||||
# undef const // remove crazy C hackery in jconfig.h
|
# undef const // remove crazy C hackery in jconfig.h
|
||||||
--
|
--
|
||||||
2.39.2
|
2.40.0
|
||||||
|
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
From 4bd1150d0750b5eb0f9d2ca0aa262d34fcab11aa Mon Sep 17 00:00:00 2001
|
From cef672609c101ed359828c7e4b7762f7f464fa20 Mon Sep 17 00:00:00 2001
|
||||||
From: Martchus <martchus@gmx.net>
|
From: Martchus <martchus@gmx.net>
|
||||||
Date: Sun, 8 Nov 2020 00:33:12 +0100
|
Date: Sun, 8 Nov 2020 00:33:12 +0100
|
||||||
Subject: [PATCH 06/12] Support finding static MariaDB client library
|
Subject: [PATCH 06/12] Support finding static MariaDB client library
|
||||||
|
@ -14,10 +14,10 @@ Change-Id: I8f9ba27e638619dba411ad0e37f2f03eab4775bf
|
||||||
1 file changed, 2 insertions(+), 2 deletions(-)
|
1 file changed, 2 insertions(+), 2 deletions(-)
|
||||||
|
|
||||||
diff --git a/cmake/FindMySQL.cmake b/cmake/FindMySQL.cmake
|
diff --git a/cmake/FindMySQL.cmake b/cmake/FindMySQL.cmake
|
||||||
index cdfb469c71..bd634d6cbb 100644
|
index b61d0107f2..6fb26e51f1 100644
|
||||||
--- a/cmake/FindMySQL.cmake
|
--- a/cmake/FindMySQL.cmake
|
||||||
+++ b/cmake/FindMySQL.cmake
|
+++ b/cmake/FindMySQL.cmake
|
||||||
@@ -60,13 +60,13 @@ find_path(MySQL_INCLUDE_DIR
|
@@ -63,13 +63,13 @@ find_path(MySQL_INCLUDE_DIR
|
||||||
|
|
||||||
find_library(MySQL_LIBRARY
|
find_library(MySQL_LIBRARY
|
||||||
NO_PACKAGE_ROOT_PATH
|
NO_PACKAGE_ROOT_PATH
|
||||||
|
@ -34,5 +34,5 @@ index cdfb469c71..bd634d6cbb 100644
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
--
|
--
|
||||||
2.39.2
|
2.40.0
|
||||||
|
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
From ba72e0065156596ba81556e618ae8ff6c7aec091 Mon Sep 17 00:00:00 2001
|
From 1c52bbeebea4325f7e6ff5adaa987c1aaaedcebe Mon Sep 17 00:00:00 2001
|
||||||
From: Martchus <martchus@gmx.net>
|
From: Martchus <martchus@gmx.net>
|
||||||
Date: Sun, 8 Nov 2020 00:34:09 +0100
|
Date: Sun, 8 Nov 2020 00:34:09 +0100
|
||||||
Subject: [PATCH 07/12] Allow overriding CMAKE_FIND_LIBRARY_SUFFIXES to prefer
|
Subject: [PATCH 07/12] Allow overriding CMAKE_FIND_LIBRARY_SUFFIXES to prefer
|
||||||
|
@ -10,12 +10,12 @@ Change-Id: I4c617e0706044d31da1bd56ae51615dc8ed37099
|
||||||
1 file changed, 4 insertions(+)
|
1 file changed, 4 insertions(+)
|
||||||
|
|
||||||
diff --git a/cmake/QtBuildInternals/QtBuildInternalsConfig.cmake b/cmake/QtBuildInternals/QtBuildInternalsConfig.cmake
|
diff --git a/cmake/QtBuildInternals/QtBuildInternalsConfig.cmake b/cmake/QtBuildInternals/QtBuildInternalsConfig.cmake
|
||||||
index f51e4d6ab5..175671ebcd 100644
|
index 5246d67c37..4637820272 100644
|
||||||
--- a/cmake/QtBuildInternals/QtBuildInternalsConfig.cmake
|
--- a/cmake/QtBuildInternals/QtBuildInternalsConfig.cmake
|
||||||
+++ b/cmake/QtBuildInternals/QtBuildInternalsConfig.cmake
|
+++ b/cmake/QtBuildInternals/QtBuildInternalsConfig.cmake
|
||||||
@@ -1,6 +1,10 @@
|
@@ -4,6 +4,10 @@
|
||||||
# These values should be kept in sync with those in qtbase/.cmake.conf
|
# These values should be kept in sync with those in qtbase/.cmake.conf
|
||||||
cmake_minimum_required(VERSION 3.16...3.20)
|
cmake_minimum_required(VERSION 3.16...3.21)
|
||||||
|
|
||||||
+if (CMAKE_FIND_LIBRARY_SUFFIXES_OVERRIDE)
|
+if (CMAKE_FIND_LIBRARY_SUFFIXES_OVERRIDE)
|
||||||
+ set(CMAKE_FIND_LIBRARY_SUFFIXES "${CMAKE_FIND_LIBRARY_SUFFIXES_OVERRIDE}")
|
+ set(CMAKE_FIND_LIBRARY_SUFFIXES "${CMAKE_FIND_LIBRARY_SUFFIXES_OVERRIDE}")
|
||||||
|
@ -25,5 +25,5 @@ index f51e4d6ab5..175671ebcd 100644
|
||||||
#
|
#
|
||||||
# Macros and functions for building Qt modules
|
# Macros and functions for building Qt modules
|
||||||
--
|
--
|
||||||
2.39.2
|
2.40.0
|
||||||
|
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
From 7d188c5f8e0fb4646ba339b429b94f400f7853b3 Mon Sep 17 00:00:00 2001
|
From 3a6c3bf10d77edc588264f496f4a437579223fb7 Mon Sep 17 00:00:00 2001
|
||||||
From: Martchus <martchus@gmx.net>
|
From: Martchus <martchus@gmx.net>
|
||||||
Date: Sat, 26 Jun 2021 22:24:12 +0200
|
Date: Sat, 26 Jun 2021 22:24:12 +0200
|
||||||
Subject: [PATCH 08/12] Fix crashes in rasterization code using setjmp
|
Subject: [PATCH 08/12] Fix crashes in rasterization code using setjmp
|
||||||
|
@ -28,10 +28,10 @@ Change-Id: I01937d13569dd01ab4cb1f608020544c93bc343c
|
||||||
rename src/gui/painting/{qgrayraster.c => qgrayraster.cpp} (98%)
|
rename src/gui/painting/{qgrayraster.c => qgrayraster.cpp} (98%)
|
||||||
|
|
||||||
diff --git a/src/gui/CMakeLists.txt b/src/gui/CMakeLists.txt
|
diff --git a/src/gui/CMakeLists.txt b/src/gui/CMakeLists.txt
|
||||||
index 36dae764d7..0aa24cca77 100644
|
index 5b8bc278e9..e3e2ca1829 100644
|
||||||
--- a/src/gui/CMakeLists.txt
|
--- a/src/gui/CMakeLists.txt
|
||||||
+++ b/src/gui/CMakeLists.txt
|
+++ b/src/gui/CMakeLists.txt
|
||||||
@@ -167,7 +167,7 @@ qt_internal_add_module(Gui
|
@@ -175,7 +175,7 @@ qt_internal_add_module(Gui
|
||||||
painting/qdrawingprimitive_sse2_p.h
|
painting/qdrawingprimitive_sse2_p.h
|
||||||
painting/qemulationpaintengine.cpp painting/qemulationpaintengine_p.h
|
painting/qemulationpaintengine.cpp painting/qemulationpaintengine_p.h
|
||||||
painting/qfixed_p.h
|
painting/qfixed_p.h
|
||||||
|
@ -40,8 +40,8 @@ index 36dae764d7..0aa24cca77 100644
|
||||||
painting/qicc.cpp painting/qicc_p.h
|
painting/qicc.cpp painting/qicc_p.h
|
||||||
painting/qimagescale.cpp painting/qimagescale_p.h
|
painting/qimagescale.cpp painting/qimagescale_p.h
|
||||||
painting/qmath_p.h
|
painting/qmath_p.h
|
||||||
@@ -274,6 +274,11 @@ qt_internal_add_module(Gui
|
@@ -284,6 +284,11 @@ qt_internal_add_module(Gui
|
||||||
GENERATE_CPP_EXPORTS
|
"(^|/)qplatform.+\\.h$|(^|/)qwindowsystem.+\\.h$"
|
||||||
)
|
)
|
||||||
|
|
||||||
+# enable exceptions for painting/qgrayraster.cpp
|
+# enable exceptions for painting/qgrayraster.cpp
|
||||||
|
@ -248,5 +248,5 @@ index d0f2468e6a..d1d7d2e17a 100644
|
||||||
"Description": "FreeType is a freely available software library to render fonts.",
|
"Description": "FreeType is a freely available software library to render fonts.",
|
||||||
"Homepage": "http://www.freetype.org",
|
"Homepage": "http://www.freetype.org",
|
||||||
--
|
--
|
||||||
2.39.2
|
2.40.0
|
||||||
|
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
From e01c8d18eb0d74822cbacb7b8582af53d52b707b Mon Sep 17 00:00:00 2001
|
From 0f4e793f81feda03ecf1b3cd21c635a0343c6841 Mon Sep 17 00:00:00 2001
|
||||||
From: Martchus <martchus@gmx.net>
|
From: Martchus <martchus@gmx.net>
|
||||||
Date: Sun, 24 Apr 2022 23:00:27 +0200
|
Date: Sun, 24 Apr 2022 23:00:27 +0200
|
||||||
Subject: [PATCH 09/12] Find fontconfig via pkg-config for correct handling of
|
Subject: [PATCH 09/12] Find fontconfig via pkg-config for correct handling of
|
||||||
|
@ -33,10 +33,10 @@ index 0000000000..1a52327ae6
|
||||||
+ set(Fontconfig_FOUND 1)
|
+ set(Fontconfig_FOUND 1)
|
||||||
+endif()
|
+endif()
|
||||||
diff --git a/src/gui/CMakeLists.txt b/src/gui/CMakeLists.txt
|
diff --git a/src/gui/CMakeLists.txt b/src/gui/CMakeLists.txt
|
||||||
index 0aa24cca77..d144d000fb 100644
|
index e3e2ca1829..8999bf76e6 100644
|
||||||
--- a/src/gui/CMakeLists.txt
|
--- a/src/gui/CMakeLists.txt
|
||||||
+++ b/src/gui/CMakeLists.txt
|
+++ b/src/gui/CMakeLists.txt
|
||||||
@@ -750,7 +750,7 @@ qt_internal_extend_target(Gui CONDITION QT_FEATURE_fontconfig AND QT_FEATURE_fre
|
@@ -699,7 +699,7 @@ qt_internal_extend_target(Gui CONDITION QT_FEATURE_fontconfig AND QT_FEATURE_fre
|
||||||
text/unix/qfontconfigdatabase.cpp text/unix/qfontconfigdatabase_p.h
|
text/unix/qfontconfigdatabase.cpp text/unix/qfontconfigdatabase_p.h
|
||||||
text/unix/qfontenginemultifontconfig.cpp text/unix/qfontenginemultifontconfig_p.h
|
text/unix/qfontenginemultifontconfig.cpp text/unix/qfontenginemultifontconfig_p.h
|
||||||
LIBRARIES
|
LIBRARIES
|
||||||
|
@ -46,10 +46,10 @@ index 0aa24cca77..d144d000fb 100644
|
||||||
|
|
||||||
qt_internal_extend_target(Gui CONDITION APPLE AND NOT MACOS
|
qt_internal_extend_target(Gui CONDITION APPLE AND NOT MACOS
|
||||||
diff --git a/src/gui/configure.cmake b/src/gui/configure.cmake
|
diff --git a/src/gui/configure.cmake b/src/gui/configure.cmake
|
||||||
index 9844d778e6..c55d2ef2ab 100644
|
index d8319c120b..afb3cf96bb 100644
|
||||||
--- a/src/gui/configure.cmake
|
--- a/src/gui/configure.cmake
|
||||||
+++ b/src/gui/configure.cmake
|
+++ b/src/gui/configure.cmake
|
||||||
@@ -39,7 +39,7 @@ qt_find_package(WrapSystemFreetype 2.2.0 PROVIDED_TARGETS WrapSystemFreetype::Wr
|
@@ -42,7 +42,7 @@ qt_find_package(WrapSystemFreetype 2.2.0 PROVIDED_TARGETS WrapSystemFreetype::Wr
|
||||||
if(QT_FEATURE_system_zlib)
|
if(QT_FEATURE_system_zlib)
|
||||||
qt_add_qmake_lib_dependency(freetype zlib)
|
qt_add_qmake_lib_dependency(freetype zlib)
|
||||||
endif()
|
endif()
|
||||||
|
@ -59,5 +59,5 @@ index 9844d778e6..c55d2ef2ab 100644
|
||||||
qt_find_package(gbm PROVIDED_TARGETS gbm::gbm MODULE_NAME gui QMAKE_LIB gbm)
|
qt_find_package(gbm PROVIDED_TARGETS gbm::gbm MODULE_NAME gui QMAKE_LIB gbm)
|
||||||
qt_find_package(WrapSystemHarfbuzz 2.6.0 PROVIDED_TARGETS WrapSystemHarfbuzz::WrapSystemHarfbuzz MODULE_NAME gui QMAKE_LIB harfbuzz)
|
qt_find_package(WrapSystemHarfbuzz 2.6.0 PROVIDED_TARGETS WrapSystemHarfbuzz::WrapSystemHarfbuzz MODULE_NAME gui QMAKE_LIB harfbuzz)
|
||||||
--
|
--
|
||||||
2.39.2
|
2.40.0
|
||||||
|
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
From 6fe99004d9dd3384cab4efe81959f53536581ad2 Mon Sep 17 00:00:00 2001
|
From 2400cc9196d3d472ea2632c9541f8878d4698f58 Mon Sep 17 00:00:00 2001
|
||||||
From: Martchus <martchus@gmx.net>
|
From: Martchus <martchus@gmx.net>
|
||||||
Date: Sun, 24 Apr 2022 23:49:36 +0200
|
Date: Sun, 24 Apr 2022 23:49:36 +0200
|
||||||
Subject: [PATCH 10/12] Fix dependency of xcb-image on xcb-util
|
Subject: [PATCH 10/12] Fix dependency of xcb-image on xcb-util
|
||||||
|
@ -15,7 +15,7 @@ Change-Id: Ic87a94ec664c126a5af1012d31b068d3dc7ec947
|
||||||
1 file changed, 2 insertions(+), 2 deletions(-)
|
1 file changed, 2 insertions(+), 2 deletions(-)
|
||||||
|
|
||||||
diff --git a/cmake/3rdparty/extra-cmake-modules/find-modules/FindXCB.cmake b/cmake/3rdparty/extra-cmake-modules/find-modules/FindXCB.cmake
|
diff --git a/cmake/3rdparty/extra-cmake-modules/find-modules/FindXCB.cmake b/cmake/3rdparty/extra-cmake-modules/find-modules/FindXCB.cmake
|
||||||
index d530d2d7f4..f5298642ca 100644
|
index dc60289401..3dd06d4cd0 100644
|
||||||
--- a/cmake/3rdparty/extra-cmake-modules/find-modules/FindXCB.cmake
|
--- a/cmake/3rdparty/extra-cmake-modules/find-modules/FindXCB.cmake
|
||||||
+++ b/cmake/3rdparty/extra-cmake-modules/find-modules/FindXCB.cmake
|
+++ b/cmake/3rdparty/extra-cmake-modules/find-modules/FindXCB.cmake
|
||||||
@@ -108,6 +108,7 @@ set(XCB_known_components
|
@@ -108,6 +108,7 @@ set(XCB_known_components
|
||||||
|
@ -34,7 +34,7 @@ index d530d2d7f4..f5298642ca 100644
|
||||||
XEVIE
|
XEVIE
|
||||||
XF86DRI
|
XF86DRI
|
||||||
XINERAMA
|
XINERAMA
|
||||||
@@ -146,7 +146,7 @@ endforeach()
|
@@ -142,7 +142,7 @@ endforeach()
|
||||||
set(XCB_XCB_component_deps)
|
set(XCB_XCB_component_deps)
|
||||||
set(XCB_COMPOSITE_component_deps XCB XFIXES)
|
set(XCB_COMPOSITE_component_deps XCB XFIXES)
|
||||||
set(XCB_DAMAGE_component_deps XCB XFIXES)
|
set(XCB_DAMAGE_component_deps XCB XFIXES)
|
||||||
|
@ -44,5 +44,5 @@ index d530d2d7f4..f5298642ca 100644
|
||||||
set(XCB_XFIXES_component_deps XCB RENDER SHAPE)
|
set(XCB_XFIXES_component_deps XCB RENDER SHAPE)
|
||||||
set(XCB_XVMC_component_deps XCB XV)
|
set(XCB_XVMC_component_deps XCB XV)
|
||||||
--
|
--
|
||||||
2.39.2
|
2.40.0
|
||||||
|
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
From 6f7fbfc9e01bea377dea78ac08958fc17f41178f Mon Sep 17 00:00:00 2001
|
From b1aaada4a65ef09175f73df2059e81ec1ab590c3 Mon Sep 17 00:00:00 2001
|
||||||
From: Martchus <martchus@gmx.net>
|
From: Martchus <martchus@gmx.net>
|
||||||
Date: Tue, 26 Apr 2022 20:16:31 +0200
|
Date: Tue, 26 Apr 2022 20:16:31 +0200
|
||||||
Subject: [PATCH 11/12] Allow using properties of PkgConfig targets for glib2
|
Subject: [PATCH 11/12] Allow using properties of PkgConfig targets for glib2
|
||||||
|
@ -70,5 +70,5 @@ index a6a16b494f..a5da57824c 100644
|
||||||
set_package_properties(GLIB2 PROPERTIES
|
set_package_properties(GLIB2 PROPERTIES
|
||||||
URL "https://wiki.gnome.org/Projects/GLib"
|
URL "https://wiki.gnome.org/Projects/GLib"
|
||||||
--
|
--
|
||||||
2.39.2
|
2.40.0
|
||||||
|
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
From d5e7a66c30c3e6a2ccbe32b7119008654e7f78b2 Mon Sep 17 00:00:00 2001
|
From c4463c0b74bd7693035b48ab609a6cf18c3480d8 Mon Sep 17 00:00:00 2001
|
||||||
From: Martchus <martchus@gmx.net>
|
From: Martchus <martchus@gmx.net>
|
||||||
Date: Sun, 1 May 2022 23:28:26 +0200
|
Date: Sun, 1 May 2022 23:28:26 +0200
|
||||||
Subject: [PATCH 12/12] Allow using properties of PkgConfig targets for Wayland
|
Subject: [PATCH 12/12] Allow using properties of PkgConfig targets for Wayland
|
||||||
|
@ -49,5 +49,5 @@ index 233cc88d02..875c71377c 100644
|
||||||
set_package_properties(Wayland PROPERTIES
|
set_package_properties(Wayland PROPERTIES
|
||||||
URL "http://wayland.freedesktop.org"
|
URL "http://wayland.freedesktop.org"
|
||||||
--
|
--
|
||||||
2.39.2
|
2.40.0
|
||||||
|
|
||||||
|
|
|
@ -11,7 +11,7 @@
|
||||||
# All patches are managed at https://github.com/Martchus/qtbase
|
# All patches are managed at https://github.com/Martchus/qtbase
|
||||||
|
|
||||||
pkgname=mingw-w64-qt6-base
|
pkgname=mingw-w64-qt6-base
|
||||||
_qtver=6.4.3
|
_qtver=6.5.0
|
||||||
pkgver=${_qtver/-/}
|
pkgver=${_qtver/-/}
|
||||||
pkgrel=1
|
pkgrel=1
|
||||||
arch=(any)
|
arch=(any)
|
||||||
|
@ -43,19 +43,19 @@ source=("https://download.qt.io/official_releases/qt/${pkgver%.*}/${_qtver}/subm
|
||||||
'0010-Fix-dependency-of-xcb-image-on-xcb-util.patch'
|
'0010-Fix-dependency-of-xcb-image-on-xcb-util.patch'
|
||||||
'0011-Allow-using-properties-of-PkgConfig-targets-for-glib.patch'
|
'0011-Allow-using-properties-of-PkgConfig-targets-for-glib.patch'
|
||||||
'0012-Allow-using-properties-of-PkgConfig-targets-for-Wayl.patch')
|
'0012-Allow-using-properties-of-PkgConfig-targets-for-Wayl.patch')
|
||||||
sha256sums=('5087c9e5b0165e7bc3c1a4ab176b35d0cd8f52636aea903fa377bdba00891a60'
|
sha256sums=('fde1aa7b4fbe64ec1b4fc576a57f4688ad1453d2fab59cbadd948a10a6eaf5ef'
|
||||||
'90910e209a4ee9e5ce7a8e6352bd3d53197a8d11a6f6385b2cbc1be2732c10b0'
|
'0cb9c1a10d04575b36b0abe4a422af1e7279b3e07249b2af5fa7631dcc93d262'
|
||||||
'12089a41e68e5708707301dac514e69578791c57926f79903b6011ddfedaf3b3'
|
'a26661954e7c1b1c74bb1563d8d269f8b7dfda196640e30eded9c03be27656e1'
|
||||||
'a6aa4d12dd99c1cfa4dc53f6f8d348e3f0a9f5a4f56ef55934d93763540af1b0'
|
'61fd2877aff4ba0d471ec88cf85c08dac8e522d0a0312739c134fb1a483474f0'
|
||||||
'e9ba0c08d4ba390d501f7b0973c59effe71902d6fb577db2b1eda070e50036c0'
|
'95d18cb173cc0c13323a8394f8c536c2f78157928d6ddc959f20031a913f3960'
|
||||||
'6dcdb034cebe1c3db9e3c26e3eb3ed5cd73b2f32b2a69ec65b2d490ebc28eadb'
|
'004a09d1e475f3288f599f83c6ec183e479ba58ed8e12286e0050935428ee470'
|
||||||
'35e3e9f71af5bff857f4d8fec2f7805b5e74e998212f9e0468713fb79b5bc28b'
|
'e3ea83b5c934ff3f5f8d9c48ecc3831eb66379f134247d61664a10837107bd46'
|
||||||
'a023ba4db23599ef8141da35e576c169fd2d98266b3c33af0b555da971299b51'
|
'fb3b3e2c49d0e3466410dd03a936dc127b7669e5de7e11dbbe721baed8544043'
|
||||||
'6b417acac9059b5b2da850a3da48432526ac3f95fa6b713a6cad9ad1cc9c2c2e'
|
'32f80d7cedbb4b32e4689c28b4d0ddb64ea4e4d74612738a56c771d9179eecf7'
|
||||||
'58fdfd58b66a4ee2c968b7190c47b058b576c374483f3860e59e44f5856e6fe0'
|
'a2d54f21fa6205fb4273dd8f7b51b679c9c20f91021af46ccfd251addce775b8'
|
||||||
'47434e7a794ac04e689658458331abdb839abb0407577d9edf50272fe864d329'
|
'4c8f6c5aec035a6fbe59973e88adb0817b24464881f958d70eff030c42884072'
|
||||||
'0fbc4aee0aaf9fbb34f1b9ffaf82b1ceeb07d1d0bd25f3a2a441a13b06d650ac'
|
'3bdbbab00cbef3915031f7eb1d174e54107fee8b326f17c8291d5129ba0d606f'
|
||||||
'a98277ea7bfa934ae9f3378125dc5b6d9849dfe861da787f760e89208f99c763')
|
'0908f24881d7ae5c09abe58a1d5a1ca81a6f8139fcf15924cae9fc9feb6eb4dc')
|
||||||
|
|
||||||
_architectures='i686-w64-mingw32 x86_64-w64-mingw32'
|
_architectures='i686-w64-mingw32 x86_64-w64-mingw32'
|
||||||
|
|
||||||
|
|
|
@ -1 +1 @@
|
||||||
5087c9e5b0165e7bc3c1a4ab176b35d0cd8f52636aea903fa377bdba00891a60
|
fde1aa7b4fbe64ec1b4fc576a57f4688ad1453d2fab59cbadd948a10a6eaf5ef
|
||||||
|
|
|
@ -10,7 +10,7 @@
|
||||||
# All patches are managed at https://github.com/Martchus/qtbase
|
# All patches are managed at https://github.com/Martchus/qtbase
|
||||||
|
|
||||||
pkgname=static-compat-qt6-base
|
pkgname=static-compat-qt6-base
|
||||||
_qtver=6.4.3
|
_qtver=6.5.0
|
||||||
pkgver=${_qtver/-/}
|
pkgver=${_qtver/-/}
|
||||||
pkgrel=1
|
pkgrel=1
|
||||||
arch=(x86_64)
|
arch=(x86_64)
|
||||||
|
@ -24,7 +24,7 @@ depends=(shared-mime-info
|
||||||
static-compat-libxdamage static-compat-libxkbcommon static-compat-libxmu
|
static-compat-libxdamage static-compat-libxkbcommon static-compat-libxmu
|
||||||
static-compat-libxxf86vm static-compat-md4c static-compat-pcre2
|
static-compat-libxxf86vm static-compat-md4c static-compat-pcre2
|
||||||
static-compat-sqlite static-compat-xcb-util-image static-compat-xcb-util-keysyms
|
static-compat-sqlite static-compat-xcb-util-image static-compat-xcb-util-keysyms
|
||||||
static-compat-xcb-util-renderutil static-compat-vulkan-headers
|
static-compat-xcb-util-renderutil static-compat-xcb-util-cursor static-compat-vulkan-headers
|
||||||
static-compat-xcb-util-wm static-compat-xorgproto static-compat-xtrans)
|
static-compat-xcb-util-wm static-compat-xorgproto static-compat-xtrans)
|
||||||
makedepends=(static-compat-cmake xdg-utils ninja)
|
makedepends=(static-compat-cmake xdg-utils ninja)
|
||||||
options=('!strip' '!buildflags' 'staticlibs' '!emptydirs')
|
options=('!strip' '!buildflags' 'staticlibs' '!emptydirs')
|
||||||
|
@ -42,19 +42,19 @@ source=("https://download.qt.io/official_releases/qt/${pkgver%.*}/${_qtver}/subm
|
||||||
'0010-Fix-dependency-of-xcb-image-on-xcb-util.patch'
|
'0010-Fix-dependency-of-xcb-image-on-xcb-util.patch'
|
||||||
'0011-Allow-using-properties-of-PkgConfig-targets-for-glib.patch'
|
'0011-Allow-using-properties-of-PkgConfig-targets-for-glib.patch'
|
||||||
'0012-Allow-using-properties-of-PkgConfig-targets-for-Wayl.patch')
|
'0012-Allow-using-properties-of-PkgConfig-targets-for-Wayl.patch')
|
||||||
sha256sums=('5087c9e5b0165e7bc3c1a4ab176b35d0cd8f52636aea903fa377bdba00891a60'
|
sha256sums=('fde1aa7b4fbe64ec1b4fc576a57f4688ad1453d2fab59cbadd948a10a6eaf5ef'
|
||||||
'90910e209a4ee9e5ce7a8e6352bd3d53197a8d11a6f6385b2cbc1be2732c10b0'
|
'0cb9c1a10d04575b36b0abe4a422af1e7279b3e07249b2af5fa7631dcc93d262'
|
||||||
'12089a41e68e5708707301dac514e69578791c57926f79903b6011ddfedaf3b3'
|
'a26661954e7c1b1c74bb1563d8d269f8b7dfda196640e30eded9c03be27656e1'
|
||||||
'a6aa4d12dd99c1cfa4dc53f6f8d348e3f0a9f5a4f56ef55934d93763540af1b0'
|
'61fd2877aff4ba0d471ec88cf85c08dac8e522d0a0312739c134fb1a483474f0'
|
||||||
'e9ba0c08d4ba390d501f7b0973c59effe71902d6fb577db2b1eda070e50036c0'
|
'95d18cb173cc0c13323a8394f8c536c2f78157928d6ddc959f20031a913f3960'
|
||||||
'6dcdb034cebe1c3db9e3c26e3eb3ed5cd73b2f32b2a69ec65b2d490ebc28eadb'
|
'004a09d1e475f3288f599f83c6ec183e479ba58ed8e12286e0050935428ee470'
|
||||||
'35e3e9f71af5bff857f4d8fec2f7805b5e74e998212f9e0468713fb79b5bc28b'
|
'e3ea83b5c934ff3f5f8d9c48ecc3831eb66379f134247d61664a10837107bd46'
|
||||||
'a023ba4db23599ef8141da35e576c169fd2d98266b3c33af0b555da971299b51'
|
'fb3b3e2c49d0e3466410dd03a936dc127b7669e5de7e11dbbe721baed8544043'
|
||||||
'6b417acac9059b5b2da850a3da48432526ac3f95fa6b713a6cad9ad1cc9c2c2e'
|
'32f80d7cedbb4b32e4689c28b4d0ddb64ea4e4d74612738a56c771d9179eecf7'
|
||||||
'58fdfd58b66a4ee2c968b7190c47b058b576c374483f3860e59e44f5856e6fe0'
|
'a2d54f21fa6205fb4273dd8f7b51b679c9c20f91021af46ccfd251addce775b8'
|
||||||
'47434e7a794ac04e689658458331abdb839abb0407577d9edf50272fe864d329'
|
'4c8f6c5aec035a6fbe59973e88adb0817b24464881f958d70eff030c42884072'
|
||||||
'0fbc4aee0aaf9fbb34f1b9ffaf82b1ceeb07d1d0bd25f3a2a441a13b06d650ac'
|
'3bdbbab00cbef3915031f7eb1d174e54107fee8b326f17c8291d5129ba0d606f'
|
||||||
'a98277ea7bfa934ae9f3378125dc5b6d9849dfe861da787f760e89208f99c763')
|
'0908f24881d7ae5c09abe58a1d5a1ca81a6f8139fcf15924cae9fc9feb6eb4dc')
|
||||||
|
|
||||||
prepare () {
|
prepare () {
|
||||||
cd $_pkgfqn
|
cd $_pkgfqn
|
||||||
|
|
|
@ -5,7 +5,7 @@
|
||||||
|
|
||||||
_android_arch=aarch64
|
_android_arch=aarch64
|
||||||
pkgname=android-$_android_arch-qt6-charts
|
pkgname=android-$_android_arch-qt6-charts
|
||||||
_qtver=6.4.3
|
_qtver=6.5.0
|
||||||
pkgver=${_qtver/-/}
|
pkgver=${_qtver/-/}
|
||||||
pkgrel=1
|
pkgrel=1
|
||||||
arch=(any)
|
arch=(any)
|
||||||
|
@ -18,7 +18,7 @@ options=('!strip' '!buildflags' 'staticlibs' '!emptydirs')
|
||||||
groups=(android-${_android_arch}-qt6)
|
groups=(android-${_android_arch}-qt6)
|
||||||
_pkgfqn="qtcharts-everywhere-src-${_qtver}"
|
_pkgfqn="qtcharts-everywhere-src-${_qtver}"
|
||||||
source=("https://download.qt.io/official_releases/qt/${pkgver%.*}/${_qtver}/submodules/${_pkgfqn}.tar.xz")
|
source=("https://download.qt.io/official_releases/qt/${pkgver%.*}/${_qtver}/submodules/${_pkgfqn}.tar.xz")
|
||||||
sha256sums=('4a61e4f5ffb55df69fc58f88255aabca44fb51935b180c03ab81e098d437c346')
|
sha256sums=('fccd1d50a7f56de011f7668e0e90f022316bd4065fa7f91b078579403e2e26a8')
|
||||||
|
|
||||||
build() {
|
build() {
|
||||||
source android-env ${_android_arch}
|
source android-env ${_android_arch}
|
||||||
|
|
|
@ -1,6 +1,6 @@
|
||||||
% layout 'android-qt6-module';
|
% layout 'android-qt6-module';
|
||||||
\
|
\
|
||||||
_qtver=6.4.3
|
_qtver=6.5.0
|
||||||
pkgver=${_qtver/-/}
|
pkgver=${_qtver/-/}
|
||||||
pkgrel=1
|
pkgrel=1
|
||||||
arch=(any)
|
arch=(any)
|
||||||
|
|
|
@ -1 +1 @@
|
||||||
4a61e4f5ffb55df69fc58f88255aabca44fb51935b180c03ab81e098d437c346
|
fccd1d50a7f56de011f7668e0e90f022316bd4065fa7f91b078579403e2e26a8
|
||||||
|
|
|
@ -4,7 +4,7 @@
|
||||||
# you also find the URL of a binary repository.
|
# you also find the URL of a binary repository.
|
||||||
|
|
||||||
pkgname=mingw-w64-qt6-charts-static
|
pkgname=mingw-w64-qt6-charts-static
|
||||||
_qtver=6.4.3
|
_qtver=6.5.0
|
||||||
pkgver=${_qtver/-/}
|
pkgver=${_qtver/-/}
|
||||||
pkgrel=1
|
pkgrel=1
|
||||||
arch=(any)
|
arch=(any)
|
||||||
|
@ -17,7 +17,7 @@ options=('!strip' '!buildflags' 'staticlibs' '!emptydirs')
|
||||||
groups=(mingw-w64-qt6)
|
groups=(mingw-w64-qt6)
|
||||||
_pkgfqn="qtcharts-everywhere-src-${_qtver}"
|
_pkgfqn="qtcharts-everywhere-src-${_qtver}"
|
||||||
source=("https://download.qt.io/official_releases/qt/${pkgver%.*}/${_qtver}/submodules/${_pkgfqn}.tar.xz")
|
source=("https://download.qt.io/official_releases/qt/${pkgver%.*}/${_qtver}/submodules/${_pkgfqn}.tar.xz")
|
||||||
sha256sums=('4a61e4f5ffb55df69fc58f88255aabca44fb51935b180c03ab81e098d437c346')
|
sha256sums=('fccd1d50a7f56de011f7668e0e90f022316bd4065fa7f91b078579403e2e26a8')
|
||||||
|
|
||||||
_architectures='i686-w64-mingw32 x86_64-w64-mingw32'
|
_architectures='i686-w64-mingw32 x86_64-w64-mingw32'
|
||||||
|
|
||||||
|
|
|
@ -1 +1 @@
|
||||||
4a61e4f5ffb55df69fc58f88255aabca44fb51935b180c03ab81e098d437c346
|
fccd1d50a7f56de011f7668e0e90f022316bd4065fa7f91b078579403e2e26a8
|
||||||
|
|
|
@ -4,7 +4,7 @@
|
||||||
# you also find the URL of a binary repository.
|
# you also find the URL of a binary repository.
|
||||||
|
|
||||||
pkgname=mingw-w64-qt6-charts
|
pkgname=mingw-w64-qt6-charts
|
||||||
_qtver=6.4.3
|
_qtver=6.5.0
|
||||||
pkgver=${_qtver/-/}
|
pkgver=${_qtver/-/}
|
||||||
pkgrel=1
|
pkgrel=1
|
||||||
arch=(any)
|
arch=(any)
|
||||||
|
@ -17,7 +17,7 @@ options=('!strip' '!buildflags' 'staticlibs' '!emptydirs')
|
||||||
groups=(mingw-w64-qt6)
|
groups=(mingw-w64-qt6)
|
||||||
_pkgfqn="qtcharts-everywhere-src-${_qtver}"
|
_pkgfqn="qtcharts-everywhere-src-${_qtver}"
|
||||||
source=("https://download.qt.io/official_releases/qt/${pkgver%.*}/${_qtver}/submodules/${_pkgfqn}.tar.xz")
|
source=("https://download.qt.io/official_releases/qt/${pkgver%.*}/${_qtver}/submodules/${_pkgfqn}.tar.xz")
|
||||||
sha256sums=('4a61e4f5ffb55df69fc58f88255aabca44fb51935b180c03ab81e098d437c346')
|
sha256sums=('fccd1d50a7f56de011f7668e0e90f022316bd4065fa7f91b078579403e2e26a8')
|
||||||
|
|
||||||
_architectures='i686-w64-mingw32 x86_64-w64-mingw32'
|
_architectures='i686-w64-mingw32 x86_64-w64-mingw32'
|
||||||
|
|
||||||
|
|
|
@ -1,6 +1,6 @@
|
||||||
% layout 'mingw-w64-qt6-module';
|
% layout 'mingw-w64-qt6-module';
|
||||||
\
|
\
|
||||||
_qtver=6.4.3
|
_qtver=6.5.0
|
||||||
pkgver=${_qtver/-/}
|
pkgver=${_qtver/-/}
|
||||||
pkgrel=1
|
pkgrel=1
|
||||||
arch=(any)
|
arch=(any)
|
||||||
|
|
|
@ -1 +1 @@
|
||||||
4a61e4f5ffb55df69fc58f88255aabca44fb51935b180c03ab81e098d437c346
|
fccd1d50a7f56de011f7668e0e90f022316bd4065fa7f91b078579403e2e26a8
|
||||||
|
|
|
@ -4,7 +4,7 @@
|
||||||
# you also find the URL of a binary repository.
|
# you also find the URL of a binary repository.
|
||||||
|
|
||||||
pkgname=static-compat-qt6-charts
|
pkgname=static-compat-qt6-charts
|
||||||
_qtver=6.4.3
|
_qtver=6.5.0
|
||||||
pkgver=${_qtver/-/}
|
pkgver=${_qtver/-/}
|
||||||
pkgrel=1
|
pkgrel=1
|
||||||
arch=(x86_64)
|
arch=(x86_64)
|
||||||
|
@ -16,7 +16,7 @@ makedepends=(static-compat-cmake static-compat-vulkan-headers ninja)
|
||||||
options=('!strip' '!buildflags' 'staticlibs' '!emptydirs')
|
options=('!strip' '!buildflags' 'staticlibs' '!emptydirs')
|
||||||
_pkgfqn="qtcharts-everywhere-src-${_qtver}"
|
_pkgfqn="qtcharts-everywhere-src-${_qtver}"
|
||||||
source=("https://download.qt.io/official_releases/qt/${pkgver%.*}/${_qtver}/submodules/${_pkgfqn}.tar.xz")
|
source=("https://download.qt.io/official_releases/qt/${pkgver%.*}/${_qtver}/submodules/${_pkgfqn}.tar.xz")
|
||||||
sha256sums=('4a61e4f5ffb55df69fc58f88255aabca44fb51935b180c03ab81e098d437c346')
|
sha256sums=('fccd1d50a7f56de011f7668e0e90f022316bd4065fa7f91b078579403e2e26a8')
|
||||||
|
|
||||||
build() {
|
build() {
|
||||||
check_buildoption ccache y && ccache_args='
|
check_buildoption ccache y && ccache_args='
|
||||||
|
|
|
@ -1,6 +1,6 @@
|
||||||
% layout 'static-compat-qt6-module';
|
% layout 'static-compat-qt6-module';
|
||||||
\
|
\
|
||||||
_qtver=6.4.3
|
_qtver=6.5.0
|
||||||
pkgver=${_qtver/-/}
|
pkgver=${_qtver/-/}
|
||||||
pkgrel=1
|
pkgrel=1
|
||||||
arch=(x86_64)
|
arch=(x86_64)
|
||||||
|
|
|
@ -1 +1 @@
|
||||||
4a61e4f5ffb55df69fc58f88255aabca44fb51935b180c03ab81e098d437c346
|
fccd1d50a7f56de011f7668e0e90f022316bd4065fa7f91b078579403e2e26a8
|
||||||
|
|
|
@ -5,7 +5,7 @@
|
||||||
|
|
||||||
_android_arch=aarch64
|
_android_arch=aarch64
|
||||||
pkgname=android-$_android_arch-qt6-connectivity
|
pkgname=android-$_android_arch-qt6-connectivity
|
||||||
_qtver=6.4.3
|
_qtver=6.5.0
|
||||||
pkgver=${_qtver/-/}
|
pkgver=${_qtver/-/}
|
||||||
pkgrel=1
|
pkgrel=1
|
||||||
arch=(any)
|
arch=(any)
|
||||||
|
@ -19,7 +19,7 @@ options=('!strip' '!buildflags' 'staticlibs' '!emptydirs')
|
||||||
groups=(android-${_android_arch}-qt6)
|
groups=(android-${_android_arch}-qt6)
|
||||||
_pkgfqn="qtconnectivity-everywhere-src-${_qtver}"
|
_pkgfqn="qtconnectivity-everywhere-src-${_qtver}"
|
||||||
source=("https://download.qt.io/official_releases/qt/${pkgver%.*}/${_qtver}/submodules/${_pkgfqn}.tar.xz")
|
source=("https://download.qt.io/official_releases/qt/${pkgver%.*}/${_qtver}/submodules/${_pkgfqn}.tar.xz")
|
||||||
sha256sums=('f98c2014cc4ab7ed69e762ecddd2433b95468942bb1612f648a7e9c94ba44c9d')
|
sha256sums=('e7636653bab986361a77b23451d966c85591428c0422741890ef0fb197698f06')
|
||||||
|
|
||||||
build() {
|
build() {
|
||||||
source android-env ${_android_arch}
|
source android-env ${_android_arch}
|
||||||
|
|
|
@ -1,6 +1,6 @@
|
||||||
% layout 'android-qt6-module';
|
% layout 'android-qt6-module';
|
||||||
\
|
\
|
||||||
_qtver=6.4.3
|
_qtver=6.5.0
|
||||||
pkgver=${_qtver/-/}
|
pkgver=${_qtver/-/}
|
||||||
pkgrel=1
|
pkgrel=1
|
||||||
arch=(any)
|
arch=(any)
|
||||||
|
|
|
@ -1 +1 @@
|
||||||
f98c2014cc4ab7ed69e762ecddd2433b95468942bb1612f648a7e9c94ba44c9d
|
e7636653bab986361a77b23451d966c85591428c0422741890ef0fb197698f06
|
||||||
|
|
|
@ -4,7 +4,7 @@
|
||||||
# you also find the URL of a binary repository.
|
# you also find the URL of a binary repository.
|
||||||
|
|
||||||
pkgname=mingw-w64-qt6-connectivity-static
|
pkgname=mingw-w64-qt6-connectivity-static
|
||||||
_qtver=6.4.3
|
_qtver=6.5.0
|
||||||
pkgver=${_qtver/-/}
|
pkgver=${_qtver/-/}
|
||||||
pkgrel=1
|
pkgrel=1
|
||||||
arch=(any)
|
arch=(any)
|
||||||
|
@ -18,7 +18,7 @@ options=('!strip' '!buildflags' 'staticlibs' '!emptydirs')
|
||||||
groups=(mingw-w64-qt6)
|
groups=(mingw-w64-qt6)
|
||||||
_pkgfqn="qtconnectivity-everywhere-src-${_qtver}"
|
_pkgfqn="qtconnectivity-everywhere-src-${_qtver}"
|
||||||
source=("https://download.qt.io/official_releases/qt/${pkgver%.*}/${_qtver}/submodules/${_pkgfqn}.tar.xz")
|
source=("https://download.qt.io/official_releases/qt/${pkgver%.*}/${_qtver}/submodules/${_pkgfqn}.tar.xz")
|
||||||
sha256sums=('f98c2014cc4ab7ed69e762ecddd2433b95468942bb1612f648a7e9c94ba44c9d')
|
sha256sums=('e7636653bab986361a77b23451d966c85591428c0422741890ef0fb197698f06')
|
||||||
|
|
||||||
_architectures='i686-w64-mingw32 x86_64-w64-mingw32'
|
_architectures='i686-w64-mingw32 x86_64-w64-mingw32'
|
||||||
|
|
||||||
|
|
|
@ -1 +1 @@
|
||||||
f98c2014cc4ab7ed69e762ecddd2433b95468942bb1612f648a7e9c94ba44c9d
|
e7636653bab986361a77b23451d966c85591428c0422741890ef0fb197698f06
|
||||||
|
|
|
@ -4,7 +4,7 @@
|
||||||
# you also find the URL of a binary repository.
|
# you also find the URL of a binary repository.
|
||||||
|
|
||||||
pkgname=mingw-w64-qt6-connectivity
|
pkgname=mingw-w64-qt6-connectivity
|
||||||
_qtver=6.4.3
|
_qtver=6.5.0
|
||||||
pkgver=${_qtver/-/}
|
pkgver=${_qtver/-/}
|
||||||
pkgrel=1
|
pkgrel=1
|
||||||
arch=(any)
|
arch=(any)
|
||||||
|
@ -18,7 +18,7 @@ options=('!strip' '!buildflags' 'staticlibs' '!emptydirs')
|
||||||
groups=(mingw-w64-qt6)
|
groups=(mingw-w64-qt6)
|
||||||
_pkgfqn="qtconnectivity-everywhere-src-${_qtver}"
|
_pkgfqn="qtconnectivity-everywhere-src-${_qtver}"
|
||||||
source=("https://download.qt.io/official_releases/qt/${pkgver%.*}/${_qtver}/submodules/${_pkgfqn}.tar.xz")
|
source=("https://download.qt.io/official_releases/qt/${pkgver%.*}/${_qtver}/submodules/${_pkgfqn}.tar.xz")
|
||||||
sha256sums=('f98c2014cc4ab7ed69e762ecddd2433b95468942bb1612f648a7e9c94ba44c9d')
|
sha256sums=('e7636653bab986361a77b23451d966c85591428c0422741890ef0fb197698f06')
|
||||||
|
|
||||||
_architectures='i686-w64-mingw32 x86_64-w64-mingw32'
|
_architectures='i686-w64-mingw32 x86_64-w64-mingw32'
|
||||||
|
|
||||||
|
|
|
@ -1,6 +1,6 @@
|
||||||
% layout 'mingw-w64-qt6-module';
|
% layout 'mingw-w64-qt6-module';
|
||||||
\
|
\
|
||||||
_qtver=6.4.3
|
_qtver=6.5.0
|
||||||
pkgver=${_qtver/-/}
|
pkgver=${_qtver/-/}
|
||||||
pkgrel=1
|
pkgrel=1
|
||||||
arch=(any)
|
arch=(any)
|
||||||
|
|
|
@ -1 +1 @@
|
||||||
f98c2014cc4ab7ed69e762ecddd2433b95468942bb1612f648a7e9c94ba44c9d
|
e7636653bab986361a77b23451d966c85591428c0422741890ef0fb197698f06
|
||||||
|
|
|
@ -4,7 +4,7 @@
|
||||||
# you also find the URL of a binary repository.
|
# you also find the URL of a binary repository.
|
||||||
|
|
||||||
pkgname=static-compat-qt6-connectivity
|
pkgname=static-compat-qt6-connectivity
|
||||||
_qtver=6.4.3
|
_qtver=6.5.0
|
||||||
pkgver=${_qtver/-/}
|
pkgver=${_qtver/-/}
|
||||||
pkgrel=1
|
pkgrel=1
|
||||||
arch=(x86_64)
|
arch=(x86_64)
|
||||||
|
|
|
@ -1,6 +1,6 @@
|
||||||
% layout 'static-compat-qt6-module';
|
% layout 'static-compat-qt6-module';
|
||||||
\
|
\
|
||||||
_qtver=6.4.3
|
_qtver=6.5.0
|
||||||
pkgver=${_qtver/-/}
|
pkgver=${_qtver/-/}
|
||||||
pkgrel=1
|
pkgrel=1
|
||||||
arch=(x86_64)
|
arch=(x86_64)
|
||||||
|
|
|
@ -5,7 +5,7 @@
|
||||||
|
|
||||||
_android_arch=aarch64
|
_android_arch=aarch64
|
||||||
pkgname=android-$_android_arch-qt6-datavis3d
|
pkgname=android-$_android_arch-qt6-datavis3d
|
||||||
_qtver=6.4.3
|
_qtver=6.5.0
|
||||||
pkgver=${_qtver/-/}
|
pkgver=${_qtver/-/}
|
||||||
pkgrel=1
|
pkgrel=1
|
||||||
arch=(any)
|
arch=(any)
|
||||||
|
@ -19,7 +19,7 @@ options=('!strip' '!buildflags' 'staticlibs' '!emptydirs')
|
||||||
groups=(android-${_android_arch}-qt6)
|
groups=(android-${_android_arch}-qt6)
|
||||||
_pkgfqn="qtdatavis3d-everywhere-src-${_qtver}"
|
_pkgfqn="qtdatavis3d-everywhere-src-${_qtver}"
|
||||||
source=("https://download.qt.io/official_releases/qt/${pkgver%.*}/${_qtver}/submodules/${_pkgfqn}.tar.xz")
|
source=("https://download.qt.io/official_releases/qt/${pkgver%.*}/${_qtver}/submodules/${_pkgfqn}.tar.xz")
|
||||||
sha256sums=('c978ac5db663560b8071ddf62e7d7e82e0c01d109d9292171f5589ce5e787995')
|
sha256sums=('d48ac17717e7ae7d8251c660a2b1ec97884c3d6a411f0ab901168c5683a9816b')
|
||||||
|
|
||||||
build() {
|
build() {
|
||||||
source android-env ${_android_arch}
|
source android-env ${_android_arch}
|
||||||
|
|
|
@ -1,6 +1,6 @@
|
||||||
% layout 'android-qt6-module';
|
% layout 'android-qt6-module';
|
||||||
\
|
\
|
||||||
_qtver=6.4.3
|
_qtver=6.5.0
|
||||||
pkgver=${_qtver/-/}
|
pkgver=${_qtver/-/}
|
||||||
pkgrel=1
|
pkgrel=1
|
||||||
arch=(any)
|
arch=(any)
|
||||||
|
|
|
@ -1 +1 @@
|
||||||
c978ac5db663560b8071ddf62e7d7e82e0c01d109d9292171f5589ce5e787995
|
d48ac17717e7ae7d8251c660a2b1ec97884c3d6a411f0ab901168c5683a9816b
|
||||||
|
|
|
@ -4,7 +4,7 @@
|
||||||
# you also find the URL of a binary repository.
|
# you also find the URL of a binary repository.
|
||||||
|
|
||||||
pkgname=mingw-w64-qt6-datavis3d-static
|
pkgname=mingw-w64-qt6-datavis3d-static
|
||||||
_qtver=6.4.3
|
_qtver=6.5.0
|
||||||
pkgver=${_qtver/-/}
|
pkgver=${_qtver/-/}
|
||||||
pkgrel=1
|
pkgrel=1
|
||||||
arch=(any)
|
arch=(any)
|
||||||
|
@ -18,7 +18,7 @@ options=('!strip' '!buildflags' 'staticlibs' '!emptydirs')
|
||||||
groups=(mingw-w64-qt6)
|
groups=(mingw-w64-qt6)
|
||||||
_pkgfqn="qtdatavis3d-everywhere-src-${_qtver}"
|
_pkgfqn="qtdatavis3d-everywhere-src-${_qtver}"
|
||||||
source=("https://download.qt.io/official_releases/qt/${pkgver%.*}/${_qtver}/submodules/${_pkgfqn}.tar.xz")
|
source=("https://download.qt.io/official_releases/qt/${pkgver%.*}/${_qtver}/submodules/${_pkgfqn}.tar.xz")
|
||||||
sha256sums=('c978ac5db663560b8071ddf62e7d7e82e0c01d109d9292171f5589ce5e787995')
|
sha256sums=('d48ac17717e7ae7d8251c660a2b1ec97884c3d6a411f0ab901168c5683a9816b')
|
||||||
|
|
||||||
_architectures='i686-w64-mingw32 x86_64-w64-mingw32'
|
_architectures='i686-w64-mingw32 x86_64-w64-mingw32'
|
||||||
|
|
||||||
|
|
|
@ -1 +1 @@
|
||||||
c978ac5db663560b8071ddf62e7d7e82e0c01d109d9292171f5589ce5e787995
|
d48ac17717e7ae7d8251c660a2b1ec97884c3d6a411f0ab901168c5683a9816b
|
||||||
|
|
|
@ -4,7 +4,7 @@
|
||||||
# you also find the URL of a binary repository.
|
# you also find the URL of a binary repository.
|
||||||
|
|
||||||
pkgname=mingw-w64-qt6-datavis3d
|
pkgname=mingw-w64-qt6-datavis3d
|
||||||
_qtver=6.4.3
|
_qtver=6.5.0
|
||||||
pkgver=${_qtver/-/}
|
pkgver=${_qtver/-/}
|
||||||
pkgrel=1
|
pkgrel=1
|
||||||
arch=(any)
|
arch=(any)
|
||||||
|
@ -18,7 +18,7 @@ options=('!strip' '!buildflags' 'staticlibs' '!emptydirs')
|
||||||
groups=(mingw-w64-qt6)
|
groups=(mingw-w64-qt6)
|
||||||
_pkgfqn="qtdatavis3d-everywhere-src-${_qtver}"
|
_pkgfqn="qtdatavis3d-everywhere-src-${_qtver}"
|
||||||
source=("https://download.qt.io/official_releases/qt/${pkgver%.*}/${_qtver}/submodules/${_pkgfqn}.tar.xz")
|
source=("https://download.qt.io/official_releases/qt/${pkgver%.*}/${_qtver}/submodules/${_pkgfqn}.tar.xz")
|
||||||
sha256sums=('c978ac5db663560b8071ddf62e7d7e82e0c01d109d9292171f5589ce5e787995')
|
sha256sums=('d48ac17717e7ae7d8251c660a2b1ec97884c3d6a411f0ab901168c5683a9816b')
|
||||||
|
|
||||||
_architectures='i686-w64-mingw32 x86_64-w64-mingw32'
|
_architectures='i686-w64-mingw32 x86_64-w64-mingw32'
|
||||||
|
|
||||||
|
|
|
@ -1,6 +1,6 @@
|
||||||
% layout 'mingw-w64-qt6-module';
|
% layout 'mingw-w64-qt6-module';
|
||||||
\
|
\
|
||||||
_qtver=6.4.3
|
_qtver=6.5.0
|
||||||
pkgver=${_qtver/-/}
|
pkgver=${_qtver/-/}
|
||||||
pkgrel=1
|
pkgrel=1
|
||||||
arch=(any)
|
arch=(any)
|
||||||
|
|
|
@ -1 +1 @@
|
||||||
c978ac5db663560b8071ddf62e7d7e82e0c01d109d9292171f5589ce5e787995
|
d48ac17717e7ae7d8251c660a2b1ec97884c3d6a411f0ab901168c5683a9816b
|
||||||
|
|
|
@ -4,7 +4,7 @@
|
||||||
# you also find the URL of a binary repository.
|
# you also find the URL of a binary repository.
|
||||||
|
|
||||||
pkgname=static-compat-qt6-datavis3d
|
pkgname=static-compat-qt6-datavis3d
|
||||||
_qtver=6.4.3
|
_qtver=6.5.0
|
||||||
pkgver=${_qtver/-/}
|
pkgver=${_qtver/-/}
|
||||||
pkgrel=1
|
pkgrel=1
|
||||||
arch=(x86_64)
|
arch=(x86_64)
|
||||||
|
@ -17,7 +17,7 @@ makedepends=(static-compat-cmake static-compat-qt6-declarative static-compat-vul
|
||||||
options=('!strip' '!buildflags' 'staticlibs' '!emptydirs')
|
options=('!strip' '!buildflags' 'staticlibs' '!emptydirs')
|
||||||
_pkgfqn="qtdatavis3d-everywhere-src-${_qtver}"
|
_pkgfqn="qtdatavis3d-everywhere-src-${_qtver}"
|
||||||
source=("https://download.qt.io/official_releases/qt/${pkgver%.*}/${_qtver}/submodules/${_pkgfqn}.tar.xz")
|
source=("https://download.qt.io/official_releases/qt/${pkgver%.*}/${_qtver}/submodules/${_pkgfqn}.tar.xz")
|
||||||
sha256sums=('c978ac5db663560b8071ddf62e7d7e82e0c01d109d9292171f5589ce5e787995')
|
sha256sums=('d48ac17717e7ae7d8251c660a2b1ec97884c3d6a411f0ab901168c5683a9816b')
|
||||||
|
|
||||||
build() {
|
build() {
|
||||||
check_buildoption ccache y && ccache_args='
|
check_buildoption ccache y && ccache_args='
|
||||||
|
|
|
@ -1,6 +1,6 @@
|
||||||
% layout 'static-compat-qt6-module';
|
% layout 'static-compat-qt6-module';
|
||||||
\
|
\
|
||||||
_qtver=6.4.3
|
_qtver=6.5.0
|
||||||
pkgver=${_qtver/-/}
|
pkgver=${_qtver/-/}
|
||||||
pkgrel=1
|
pkgrel=1
|
||||||
arch=(x86_64)
|
arch=(x86_64)
|
||||||
|
|
|
@ -1 +1 @@
|
||||||
c978ac5db663560b8071ddf62e7d7e82e0c01d109d9292171f5589ce5e787995
|
d48ac17717e7ae7d8251c660a2b1ec97884c3d6a411f0ab901168c5683a9816b
|
||||||
|
|
|
@ -5,7 +5,7 @@
|
||||||
|
|
||||||
_android_arch=aarch64
|
_android_arch=aarch64
|
||||||
pkgname=android-$_android_arch-qt6-declarative
|
pkgname=android-$_android_arch-qt6-declarative
|
||||||
_qtver=6.4.3
|
_qtver=6.5.0
|
||||||
pkgver=${_qtver/-/}
|
pkgver=${_qtver/-/}
|
||||||
pkgrel=1
|
pkgrel=1
|
||||||
arch=(any)
|
arch=(any)
|
||||||
|
@ -23,8 +23,8 @@ groups=(android-${_android_arch}-qt6)
|
||||||
_pkgfqn="qtdeclarative-everywhere-src-${_qtver}"
|
_pkgfqn="qtdeclarative-everywhere-src-${_qtver}"
|
||||||
source=("https://download.qt.io/official_releases/qt/${pkgver%.*}/${_qtver}/submodules/${_pkgfqn}.tar.xz"
|
source=("https://download.qt.io/official_releases/qt/${pkgver%.*}/${_qtver}/submodules/${_pkgfqn}.tar.xz"
|
||||||
'0001-Exclude-qmltime-when-cross-compiling.patch')
|
'0001-Exclude-qmltime-when-cross-compiling.patch')
|
||||||
sha256sums=('67ded1b3b988135e3600916b34bb156fe3986c88420c6f87a6d0fd53521ba795'
|
sha256sums=('f7d631cd8ebc1491dad0f30f1b5326ae812bee4ad706e61157816a82bf588c97'
|
||||||
'1f5b90f3a7b7121d071982d99435a9fa2a4fa19f026d439d393c0fd1c7f9059a')
|
'abef6f71bd31435262e095d0678458f809f0e6a3990a523c10db9c4ef612f5a2')
|
||||||
|
|
||||||
prepare () {
|
prepare () {
|
||||||
cd $_pkgfqn
|
cd $_pkgfqn
|
||||||
|
|
|
@ -1,6 +1,6 @@
|
||||||
% layout 'android-qt6-module', has_binaries => 1;
|
% layout 'android-qt6-module', has_binaries => 1;
|
||||||
\
|
\
|
||||||
_qtver=6.4.3
|
_qtver=6.5.0
|
||||||
pkgver=${_qtver/-/}
|
pkgver=${_qtver/-/}
|
||||||
pkgrel=1
|
pkgrel=1
|
||||||
arch=(any)
|
arch=(any)
|
||||||
|
|
|
@ -1 +1 @@
|
||||||
67ded1b3b988135e3600916b34bb156fe3986c88420c6f87a6d0fd53521ba795
|
f7d631cd8ebc1491dad0f30f1b5326ae812bee4ad706e61157816a82bf588c97
|
||||||
|
|
|
@ -4,7 +4,7 @@
|
||||||
# you also find the URL of a binary repository.
|
# you also find the URL of a binary repository.
|
||||||
|
|
||||||
pkgname=mingw-w64-qt6-declarative-static
|
pkgname=mingw-w64-qt6-declarative-static
|
||||||
_qtver=6.4.3
|
_qtver=6.5.0
|
||||||
pkgver=${_qtver/-/}
|
pkgver=${_qtver/-/}
|
||||||
pkgrel=1
|
pkgrel=1
|
||||||
arch=(any)
|
arch=(any)
|
||||||
|
@ -22,8 +22,8 @@ groups=(mingw-w64-qt6)
|
||||||
_pkgfqn="qtdeclarative-everywhere-src-${_qtver}"
|
_pkgfqn="qtdeclarative-everywhere-src-${_qtver}"
|
||||||
source=("https://download.qt.io/official_releases/qt/${pkgver%.*}/${_qtver}/submodules/${_pkgfqn}.tar.xz"
|
source=("https://download.qt.io/official_releases/qt/${pkgver%.*}/${_qtver}/submodules/${_pkgfqn}.tar.xz"
|
||||||
'0001-Exclude-qmltime-when-cross-compiling.patch')
|
'0001-Exclude-qmltime-when-cross-compiling.patch')
|
||||||
sha256sums=('67ded1b3b988135e3600916b34bb156fe3986c88420c6f87a6d0fd53521ba795'
|
sha256sums=('f7d631cd8ebc1491dad0f30f1b5326ae812bee4ad706e61157816a82bf588c97'
|
||||||
'1f5b90f3a7b7121d071982d99435a9fa2a4fa19f026d439d393c0fd1c7f9059a')
|
'abef6f71bd31435262e095d0678458f809f0e6a3990a523c10db9c4ef612f5a2')
|
||||||
|
|
||||||
_architectures='i686-w64-mingw32 x86_64-w64-mingw32'
|
_architectures='i686-w64-mingw32 x86_64-w64-mingw32'
|
||||||
|
|
||||||
|
|
|
@ -1 +1 @@
|
||||||
67ded1b3b988135e3600916b34bb156fe3986c88420c6f87a6d0fd53521ba795
|
f7d631cd8ebc1491dad0f30f1b5326ae812bee4ad706e61157816a82bf588c97
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
From 861e8176f6332d7743530f00b15a1fbac1ea9496 Mon Sep 17 00:00:00 2001
|
From 9b02f99cfaafb0bbca2f145dcd6c3bbad62ea23a Mon Sep 17 00:00:00 2001
|
||||||
From: Martchus <martchus@gmx.net>
|
From: Martchus <martchus@gmx.net>
|
||||||
Date: Fri, 5 Feb 2021 02:22:45 +0100
|
Date: Fri, 5 Feb 2021 02:22:45 +0100
|
||||||
Subject: [PATCH] Exclude qmltime when cross compiling
|
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(-)
|
1 file changed, 3 insertions(+), 1 deletion(-)
|
||||||
|
|
||||||
diff --git a/tools/CMakeLists.txt b/tools/CMakeLists.txt
|
diff --git a/tools/CMakeLists.txt b/tools/CMakeLists.txt
|
||||||
index 5a34fd4c11..063f38a943 100644
|
index a99cd33c24..56243e28e8 100644
|
||||||
--- a/tools/CMakeLists.txt
|
--- a/tools/CMakeLists.txt
|
||||||
+++ b/tools/CMakeLists.txt
|
+++ b/tools/CMakeLists.txt
|
||||||
@@ -36,7 +36,9 @@ if(QT_FEATURE_qml_preview AND QT_FEATURE_thread AND NOT ANDROID AND NOT WASM AND
|
@@ -40,7 +40,9 @@ if(QT_FEATURE_qml_preview AND QT_FEATURE_thread AND NOT ANDROID AND NOT WASM AND
|
||||||
endif()
|
endif()
|
||||||
if(QT_BUILD_SHARED_LIBS AND QT_FEATURE_thread AND TARGET Qt::Quick AND NOT ANDROID AND NOT WASM AND NOT IOS AND NOT rtems)
|
if(QT_BUILD_SHARED_LIBS AND QT_FEATURE_thread AND TARGET Qt::Quick AND NOT ANDROID AND NOT WASM AND NOT IOS AND NOT rtems)
|
||||||
add_subdirectory(qmlscene)
|
add_subdirectory(qmlscene)
|
||||||
|
@ -29,5 +29,5 @@ index 5a34fd4c11..063f38a943 100644
|
||||||
if(QT_BUILD_SHARED_LIBS
|
if(QT_BUILD_SHARED_LIBS
|
||||||
AND QT_FEATURE_process
|
AND QT_FEATURE_process
|
||||||
--
|
--
|
||||||
2.39.2
|
2.40.0
|
||||||
|
|
||||||
|
|
|
@ -4,7 +4,7 @@
|
||||||
# you also find the URL of a binary repository.
|
# you also find the URL of a binary repository.
|
||||||
|
|
||||||
pkgname=mingw-w64-qt6-declarative
|
pkgname=mingw-w64-qt6-declarative
|
||||||
_qtver=6.4.3
|
_qtver=6.5.0
|
||||||
pkgver=${_qtver/-/}
|
pkgver=${_qtver/-/}
|
||||||
pkgrel=1
|
pkgrel=1
|
||||||
arch=(any)
|
arch=(any)
|
||||||
|
@ -22,8 +22,8 @@ groups=(mingw-w64-qt6)
|
||||||
_pkgfqn="qtdeclarative-everywhere-src-${_qtver}"
|
_pkgfqn="qtdeclarative-everywhere-src-${_qtver}"
|
||||||
source=("https://download.qt.io/official_releases/qt/${pkgver%.*}/${_qtver}/submodules/${_pkgfqn}.tar.xz"
|
source=("https://download.qt.io/official_releases/qt/${pkgver%.*}/${_qtver}/submodules/${_pkgfqn}.tar.xz"
|
||||||
'0001-Exclude-qmltime-when-cross-compiling.patch')
|
'0001-Exclude-qmltime-when-cross-compiling.patch')
|
||||||
sha256sums=('67ded1b3b988135e3600916b34bb156fe3986c88420c6f87a6d0fd53521ba795'
|
sha256sums=('f7d631cd8ebc1491dad0f30f1b5326ae812bee4ad706e61157816a82bf588c97'
|
||||||
'1f5b90f3a7b7121d071982d99435a9fa2a4fa19f026d439d393c0fd1c7f9059a')
|
'abef6f71bd31435262e095d0678458f809f0e6a3990a523c10db9c4ef612f5a2')
|
||||||
|
|
||||||
_architectures='i686-w64-mingw32 x86_64-w64-mingw32'
|
_architectures='i686-w64-mingw32 x86_64-w64-mingw32'
|
||||||
|
|
||||||
|
|
|
@ -1,6 +1,6 @@
|
||||||
% layout 'mingw-w64-qt6-module', has_binaries => 1;
|
% layout 'mingw-w64-qt6-module', has_binaries => 1;
|
||||||
\
|
\
|
||||||
_qtver=6.4.3
|
_qtver=6.5.0
|
||||||
pkgver=${_qtver/-/}
|
pkgver=${_qtver/-/}
|
||||||
pkgrel=1
|
pkgrel=1
|
||||||
arch=(any)
|
arch=(any)
|
||||||
|
|
|
@ -1 +1 @@
|
||||||
67ded1b3b988135e3600916b34bb156fe3986c88420c6f87a6d0fd53521ba795
|
f7d631cd8ebc1491dad0f30f1b5326ae812bee4ad706e61157816a82bf588c97
|
||||||
|
|
|
@ -4,7 +4,7 @@
|
||||||
# you also find the URL of a binary repository.
|
# you also find the URL of a binary repository.
|
||||||
|
|
||||||
pkgname=static-compat-qt6-declarative
|
pkgname=static-compat-qt6-declarative
|
||||||
_qtver=6.4.3
|
_qtver=6.5.0
|
||||||
pkgver=${_qtver/-/}
|
pkgver=${_qtver/-/}
|
||||||
pkgrel=1
|
pkgrel=1
|
||||||
arch=(x86_64)
|
arch=(x86_64)
|
||||||
|
@ -17,8 +17,8 @@ options=('!strip' '!buildflags' 'staticlibs' '!emptydirs')
|
||||||
_pkgfqn="qtdeclarative-everywhere-src-${_qtver}"
|
_pkgfqn="qtdeclarative-everywhere-src-${_qtver}"
|
||||||
source=("https://download.qt.io/official_releases/qt/${pkgver%.*}/${_qtver}/submodules/${_pkgfqn}.tar.xz"
|
source=("https://download.qt.io/official_releases/qt/${pkgver%.*}/${_qtver}/submodules/${_pkgfqn}.tar.xz"
|
||||||
'0001-Exclude-qmltime-when-cross-compiling.patch')
|
'0001-Exclude-qmltime-when-cross-compiling.patch')
|
||||||
sha256sums=('67ded1b3b988135e3600916b34bb156fe3986c88420c6f87a6d0fd53521ba795'
|
sha256sums=('f7d631cd8ebc1491dad0f30f1b5326ae812bee4ad706e61157816a82bf588c97'
|
||||||
'1f5b90f3a7b7121d071982d99435a9fa2a4fa19f026d439d393c0fd1c7f9059a')
|
'abef6f71bd31435262e095d0678458f809f0e6a3990a523c10db9c4ef612f5a2')
|
||||||
|
|
||||||
prepare () {
|
prepare () {
|
||||||
cd $_pkgfqn
|
cd $_pkgfqn
|
||||||
|
|
|
@ -1,6 +1,6 @@
|
||||||
% layout 'static-compat-qt6-module', has_binaries => 1;
|
% layout 'static-compat-qt6-module', has_binaries => 1;
|
||||||
\
|
\
|
||||||
_qtver=6.4.3
|
_qtver=6.5.0
|
||||||
pkgver=${_qtver/-/}
|
pkgver=${_qtver/-/}
|
||||||
pkgrel=1
|
pkgrel=1
|
||||||
arch=(x86_64)
|
arch=(x86_64)
|
||||||
|
|
|
@ -1 +1 @@
|
||||||
67ded1b3b988135e3600916b34bb156fe3986c88420c6f87a6d0fd53521ba795
|
f7d631cd8ebc1491dad0f30f1b5326ae812bee4ad706e61157816a82bf588c97
|
||||||
|
|
|
@ -5,7 +5,7 @@
|
||||||
|
|
||||||
_android_arch=aarch64
|
_android_arch=aarch64
|
||||||
pkgname=android-$_android_arch-qt6-imageformats
|
pkgname=android-$_android_arch-qt6-imageformats
|
||||||
_qtver=6.4.3
|
_qtver=6.5.0
|
||||||
pkgver=${_qtver/-/}
|
pkgver=${_qtver/-/}
|
||||||
pkgrel=1
|
pkgrel=1
|
||||||
arch=(any)
|
arch=(any)
|
||||||
|
@ -18,7 +18,7 @@ options=('!strip' '!buildflags' 'staticlibs' '!emptydirs')
|
||||||
groups=(android-${_android_arch}-qt6)
|
groups=(android-${_android_arch}-qt6)
|
||||||
_pkgfqn="qtimageformats-everywhere-src-${_qtver}"
|
_pkgfqn="qtimageformats-everywhere-src-${_qtver}"
|
||||||
source=("https://download.qt.io/official_releases/qt/${pkgver%.*}/${_qtver}/submodules/${_pkgfqn}.tar.xz")
|
source=("https://download.qt.io/official_releases/qt/${pkgver%.*}/${_qtver}/submodules/${_pkgfqn}.tar.xz")
|
||||||
sha256sums=('0aff58062e74b84617c5da8325d8cdad5368d8f4d2a11ceafcd58329fe99b798')
|
sha256sums=('f9f810cd3ac7e60132c0da33f34fcfce42e3e764d6cad3020c2f3b1b42046f78')
|
||||||
|
|
||||||
build() {
|
build() {
|
||||||
source android-env ${_android_arch}
|
source android-env ${_android_arch}
|
||||||
|
|
|
@ -1,6 +1,6 @@
|
||||||
% layout 'android-qt6-module';
|
% layout 'android-qt6-module';
|
||||||
\
|
\
|
||||||
_qtver=6.4.3
|
_qtver=6.5.0
|
||||||
pkgver=${_qtver/-/}
|
pkgver=${_qtver/-/}
|
||||||
pkgrel=1
|
pkgrel=1
|
||||||
arch=(any)
|
arch=(any)
|
||||||
|
|
|
@ -1 +1 @@
|
||||||
0aff58062e74b84617c5da8325d8cdad5368d8f4d2a11ceafcd58329fe99b798
|
f9f810cd3ac7e60132c0da33f34fcfce42e3e764d6cad3020c2f3b1b42046f78
|
||||||
|
|
|
@ -4,7 +4,7 @@
|
||||||
# you also find the URL of a binary repository.
|
# you also find the URL of a binary repository.
|
||||||
|
|
||||||
pkgname=mingw-w64-qt6-imageformats-static
|
pkgname=mingw-w64-qt6-imageformats-static
|
||||||
_qtver=6.4.3
|
_qtver=6.5.0
|
||||||
pkgver=${_qtver/-/}
|
pkgver=${_qtver/-/}
|
||||||
pkgrel=1
|
pkgrel=1
|
||||||
arch=(any)
|
arch=(any)
|
||||||
|
@ -20,7 +20,7 @@ options=('!strip' '!buildflags' 'staticlibs' '!emptydirs')
|
||||||
groups=(mingw-w64-qt6)
|
groups=(mingw-w64-qt6)
|
||||||
_pkgfqn="qtimageformats-everywhere-src-${_qtver}"
|
_pkgfqn="qtimageformats-everywhere-src-${_qtver}"
|
||||||
source=("https://download.qt.io/official_releases/qt/${pkgver%.*}/${_qtver}/submodules/${_pkgfqn}.tar.xz")
|
source=("https://download.qt.io/official_releases/qt/${pkgver%.*}/${_qtver}/submodules/${_pkgfqn}.tar.xz")
|
||||||
sha256sums=('0aff58062e74b84617c5da8325d8cdad5368d8f4d2a11ceafcd58329fe99b798')
|
sha256sums=('f9f810cd3ac7e60132c0da33f34fcfce42e3e764d6cad3020c2f3b1b42046f78')
|
||||||
|
|
||||||
_architectures='i686-w64-mingw32 x86_64-w64-mingw32'
|
_architectures='i686-w64-mingw32 x86_64-w64-mingw32'
|
||||||
|
|
||||||
|
|
|
@ -1 +1 @@
|
||||||
0aff58062e74b84617c5da8325d8cdad5368d8f4d2a11ceafcd58329fe99b798
|
f9f810cd3ac7e60132c0da33f34fcfce42e3e764d6cad3020c2f3b1b42046f78
|
||||||
|
|
|
@ -4,7 +4,7 @@
|
||||||
# you also find the URL of a binary repository.
|
# you also find the URL of a binary repository.
|
||||||
|
|
||||||
pkgname=mingw-w64-qt6-imageformats
|
pkgname=mingw-w64-qt6-imageformats
|
||||||
_qtver=6.4.3
|
_qtver=6.5.0
|
||||||
pkgver=${_qtver/-/}
|
pkgver=${_qtver/-/}
|
||||||
pkgrel=1
|
pkgrel=1
|
||||||
arch=(any)
|
arch=(any)
|
||||||
|
@ -20,7 +20,7 @@ options=('!strip' '!buildflags' 'staticlibs' '!emptydirs')
|
||||||
groups=(mingw-w64-qt6)
|
groups=(mingw-w64-qt6)
|
||||||
_pkgfqn="qtimageformats-everywhere-src-${_qtver}"
|
_pkgfqn="qtimageformats-everywhere-src-${_qtver}"
|
||||||
source=("https://download.qt.io/official_releases/qt/${pkgver%.*}/${_qtver}/submodules/${_pkgfqn}.tar.xz")
|
source=("https://download.qt.io/official_releases/qt/${pkgver%.*}/${_qtver}/submodules/${_pkgfqn}.tar.xz")
|
||||||
sha256sums=('0aff58062e74b84617c5da8325d8cdad5368d8f4d2a11ceafcd58329fe99b798')
|
sha256sums=('f9f810cd3ac7e60132c0da33f34fcfce42e3e764d6cad3020c2f3b1b42046f78')
|
||||||
|
|
||||||
_architectures='i686-w64-mingw32 x86_64-w64-mingw32'
|
_architectures='i686-w64-mingw32 x86_64-w64-mingw32'
|
||||||
|
|
||||||
|
|
|
@ -1,6 +1,6 @@
|
||||||
% layout 'mingw-w64-qt6-module', no_libs => 1;
|
% layout 'mingw-w64-qt6-module', no_libs => 1;
|
||||||
\
|
\
|
||||||
_qtver=6.4.3
|
_qtver=6.5.0
|
||||||
pkgver=${_qtver/-/}
|
pkgver=${_qtver/-/}
|
||||||
pkgrel=1
|
pkgrel=1
|
||||||
arch=(any)
|
arch=(any)
|
||||||
|
|
|
@ -1 +1 @@
|
||||||
0aff58062e74b84617c5da8325d8cdad5368d8f4d2a11ceafcd58329fe99b798
|
f9f810cd3ac7e60132c0da33f34fcfce42e3e764d6cad3020c2f3b1b42046f78
|
||||||
|
|
|
@ -4,7 +4,7 @@
|
||||||
# you also find the URL of a binary repository.
|
# you also find the URL of a binary repository.
|
||||||
|
|
||||||
pkgname=static-compat-qt6-imageformats
|
pkgname=static-compat-qt6-imageformats
|
||||||
_qtver=6.4.3
|
_qtver=6.5.0
|
||||||
pkgver=${_qtver/-/}
|
pkgver=${_qtver/-/}
|
||||||
pkgrel=1
|
pkgrel=1
|
||||||
arch=(x86_64)
|
arch=(x86_64)
|
||||||
|
@ -19,7 +19,7 @@ makedepends=(static-compat-cmake ninja)
|
||||||
options=('!strip' '!buildflags' 'staticlibs' '!emptydirs')
|
options=('!strip' '!buildflags' 'staticlibs' '!emptydirs')
|
||||||
_pkgfqn="qtimageformats-everywhere-src-${_qtver}"
|
_pkgfqn="qtimageformats-everywhere-src-${_qtver}"
|
||||||
source=("https://download.qt.io/official_releases/qt/${pkgver%.*}/${_qtver}/submodules/${_pkgfqn}.tar.xz")
|
source=("https://download.qt.io/official_releases/qt/${pkgver%.*}/${_qtver}/submodules/${_pkgfqn}.tar.xz")
|
||||||
sha256sums=('0aff58062e74b84617c5da8325d8cdad5368d8f4d2a11ceafcd58329fe99b798')
|
sha256sums=('f9f810cd3ac7e60132c0da33f34fcfce42e3e764d6cad3020c2f3b1b42046f78')
|
||||||
|
|
||||||
build() {
|
build() {
|
||||||
check_buildoption ccache y && ccache_args='
|
check_buildoption ccache y && ccache_args='
|
||||||
|
|
|
@ -1,6 +1,6 @@
|
||||||
% layout 'static-compat-qt6-module';
|
% layout 'static-compat-qt6-module';
|
||||||
\
|
\
|
||||||
_qtver=6.4.3
|
_qtver=6.5.0
|
||||||
pkgver=${_qtver/-/}
|
pkgver=${_qtver/-/}
|
||||||
pkgrel=1
|
pkgrel=1
|
||||||
arch=(x86_64)
|
arch=(x86_64)
|
||||||
|
|
|
@ -1 +1 @@
|
||||||
0aff58062e74b84617c5da8325d8cdad5368d8f4d2a11ceafcd58329fe99b798
|
f9f810cd3ac7e60132c0da33f34fcfce42e3e764d6cad3020c2f3b1b42046f78
|
||||||
|
|
|
@ -5,7 +5,7 @@
|
||||||
|
|
||||||
_android_arch=aarch64
|
_android_arch=aarch64
|
||||||
pkgname=android-$_android_arch-qt6-lottie
|
pkgname=android-$_android_arch-qt6-lottie
|
||||||
_qtver=6.4.3
|
_qtver=6.5.0
|
||||||
pkgver=${_qtver/-/}
|
pkgver=${_qtver/-/}
|
||||||
pkgrel=1
|
pkgrel=1
|
||||||
arch=(any)
|
arch=(any)
|
||||||
|
@ -19,7 +19,7 @@ options=('!strip' '!buildflags' 'staticlibs' '!emptydirs')
|
||||||
groups=(android-${_android_arch}-qt6)
|
groups=(android-${_android_arch}-qt6)
|
||||||
_pkgfqn="qtlottie-everywhere-src-${_qtver}"
|
_pkgfqn="qtlottie-everywhere-src-${_qtver}"
|
||||||
source=("https://download.qt.io/official_releases/qt/${pkgver%.*}/${_qtver}/submodules/${_pkgfqn}.tar.xz")
|
source=("https://download.qt.io/official_releases/qt/${pkgver%.*}/${_qtver}/submodules/${_pkgfqn}.tar.xz")
|
||||||
sha256sums=('ff6c52e04566ecadee351eb3b803237bf07d417e4bb27d2122a5879618f1693d')
|
sha256sums=('8425ecdeb9286a6c51985bdaf3936026610d04dc31eec06fee79df6442b7e246')
|
||||||
|
|
||||||
build() {
|
build() {
|
||||||
source android-env ${_android_arch}
|
source android-env ${_android_arch}
|
||||||
|
|
|
@ -1,6 +1,6 @@
|
||||||
% layout 'android-qt6-module';
|
% layout 'android-qt6-module';
|
||||||
\
|
\
|
||||||
_qtver=6.4.3
|
_qtver=6.5.0
|
||||||
pkgver=${_qtver/-/}
|
pkgver=${_qtver/-/}
|
||||||
pkgrel=1
|
pkgrel=1
|
||||||
arch=(any)
|
arch=(any)
|
||||||
|
|
|
@ -1 +1 @@
|
||||||
ff6c52e04566ecadee351eb3b803237bf07d417e4bb27d2122a5879618f1693d
|
8425ecdeb9286a6c51985bdaf3936026610d04dc31eec06fee79df6442b7e246
|
||||||
|
|
Some files were not shown because too many files have changed in this diff Show More
Loading…
Reference in New Issue