summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorMartchus2021-12-02 12:25:11 +0100
committerMartchus2021-12-02 12:25:11 +0100
commit8613f58e079b2ddfe1689a97d57d25a3814dcf9a (patch)
treef94c973656fb1f189df25c718075552927b53701
parenta1cd3b7da36cc39f08961efef28a6ffb4eb91cc6 (diff)
downloadaur-8613f58e079b2ddfe1689a97d57d25a3814dcf9a.tar.gz
Update to 6.2.2
Diffstat
-rw-r--r--.SRCINFO22
-rw-r--r--0001-Use-CMake-s-default-import-library-suffix.patch12
-rw-r--r--0002-Fix-finding-D-Bus.patch4
-rw-r--r--0003-Fix-using-static-PCRE2-and-DBus-1.patch4
-rw-r--r--0004-Fix-transitive-dependencies-of-static-libraries.patch6
-rw-r--r--0005-Fix-libjpeg-workaround-for-conflict-with-rpcndr.h.patch4
-rw-r--r--0006-Support-finding-static-MariaDB-client-library.patch4
-rw-r--r--0007-Allow-overriding-CMAKE_FIND_LIBRARY_SUFFIXES-to-pref.patch4
-rw-r--r--0008-Fix-crashes-in-rasterization-code-using-setjmp.patch4
-rw-r--r--PKGBUILD20
-rw-r--r--qtbase-sha256.txt2
11 files changed, 43 insertions, 43 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 786283c04572..699774492486 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
pkgbase = android-aarch64-qt6-base
pkgdesc = A cross-platform application and UI framework (android)
- pkgver = 6.2.1
+ pkgver = 6.2.2
pkgrel = 1
url = https://www.qt.io
arch = any
@@ -30,7 +30,7 @@ pkgbase = android-aarch64-qt6-base
options = !buildflags
options = staticlibs
options = !emptydirs
- source = https://download.qt.io/official_releases/qt/6.2/6.2.1/submodules/qtbase-everywhere-src-6.2.1.tar.xz
+ source = https://download.qt.io/official_releases/qt/6.2/6.2.2/submodules/qtbase-everywhere-src-6.2.2.tar.xz
source = 0001-Use-CMake-s-default-import-library-suffix.patch
source = 0002-Fix-finding-D-Bus.patch
source = 0003-Fix-using-static-PCRE2-and-DBus-1.patch
@@ -39,14 +39,14 @@ pkgbase = android-aarch64-qt6-base
source = 0006-Support-finding-static-MariaDB-client-library.patch
source = 0007-Allow-overriding-CMAKE_FIND_LIBRARY_SUFFIXES-to-pref.patch
source = 0008-Fix-crashes-in-rasterization-code-using-setjmp.patch
- sha256sums = 2c5f07b5c3ea27d3fc1a46686ea3fb6724f94dddf1fb007de3eb0bdb87429079
- sha256sums = be2cb794752635df017e97601646f7cb2f6b22b0a2411ad23d7ada5d685dc97f
- sha256sums = ef7e3305f8bb11482bb6b9dd5dea16a0bbed293d7b615c75caa10db304862a52
- sha256sums = 3f80ae4137d875e60043b1d974479bbe9b331beebb794c41b9b4514c2e5e8a9b
- sha256sums = b27ce3e4082d687524035548ef8a903f272447a5a57a79edc500c0a9ff1d5dcb
- sha256sums = 1c386bcaede05b6bd1c01e5e41aff157447551733ac9f56428de3cae8761d826
- sha256sums = af25984f537976cbc457039e5780ca1101a14aac58b12a87e05db712292c6ae8
- sha256sums = 0f7cefb3cffa69137b1654c342c20a3f7f9299035eb63e8663bfbc61c54117fd
- sha256sums = 667ecd0b46cd8af6c29a292a1faaa65d868a54155d42d48053f7b66cc70e1142
+ sha256sums = 85ab9180180c2eaf84cd11ae4c6d5a6a69f2f8fd7260aaccfd91a3e7e7232c1a
+ sha256sums = 70abdd5f8bfafc46a833a3dc9ea3eea7050cc01ac7b54e0f4b9a25dc44ff4faa
+ sha256sums = 3651ea66d40665681cd64d9ec0e600d32ad65adb7922869bd4c02aeb3c1eb66c
+ sha256sums = e948083c12aa3c468b2845174ec3ee796bba7ddb2447f44f321b31b7e354152a
+ sha256sums = 0736df9ed395025851be441bb422128d046b82847d7e546abbdaf63391cddb43
+ sha256sums = d408dba9f000a69aa4a684ec94aba843b2c2f1462562b88f07846480da7e5a54
+ sha256sums = a7674e5475f2b3f64926ccf02fb0881e2861beed5643143a87cacd9e940bd699
+ sha256sums = 02818bb9ac13c14d18c3bf5a0729666c37b8b0248088e2237c66049c0ad62a10
+ sha256sums = 2353af5cfaf83090690d8cd933e349781b45328742fb1c4ad9bcbe51f03aa35a
pkgname = android-aarch64-qt6-base
diff --git a/0001-Use-CMake-s-default-import-library-suffix.patch b/0001-Use-CMake-s-default-import-library-suffix.patch
index 11b121ee41e2..98ba12bd0065 100644
--- a/0001-Use-CMake-s-default-import-library-suffix.patch
+++ b/0001-Use-CMake-s-default-import-library-suffix.patch
@@ -1,4 +1,4 @@
-From 586f94dd358cc00e35eb30b09250c597c8b020ef Mon Sep 17 00:00:00 2001
+From 6d8a5f0107d7fdcc837f4737decfc44406fb8c14 Mon Sep 17 00:00:00 2001
From: Martchus <martchus@gmx.net>
Date: Thu, 5 Nov 2020 22:08:10 +0100
Subject: [PATCH 1/8] Use CMake's default import library suffix
@@ -13,10 +13,10 @@ Change-Id: I3dbedaec74683e5bfd008f7f2fd1e046dfb921b2
5 files changed, 21 insertions(+), 6 deletions(-)
diff --git a/cmake/QtPriHelpers.cmake b/cmake/QtPriHelpers.cmake
-index cb20cfcf43..6983987dd3 100644
+index 85767fadbe..4f1978bab1 100644
--- a/cmake/QtPriHelpers.cmake
+++ b/cmake/QtPriHelpers.cmake
-@@ -506,9 +506,13 @@ QT.${config_module_name}_private.disabled_features = ${disabled_private_features
+@@ -507,9 +507,13 @@ QT.${config_module_name}_private.disabled_features = ${disabled_private_features
qt_path_join(private_pri_file_path "${target_path}" "${private_pri_file_name}")
list(APPEND pri_files "${private_pri_file_path}")
@@ -31,7 +31,7 @@ index cb20cfcf43..6983987dd3 100644
${CMAKE_EXTRA_SHARED_LIBRARY_SUFFIXES}
${CMAKE_STATIC_LIBRARY_SUFFIX})
if(MSVC)
-@@ -933,9 +937,13 @@ CONFIG += ${private_config_joined}
+@@ -934,9 +938,13 @@ CONFIG += ${private_config_joined}
list(APPEND inputs "${preliminary_pri_root}/${cfg}/${pri_data_cmake_file}")
endforeach()
@@ -98,7 +98,7 @@ index 24ed125f12..73ebe453d3 100644
CMAKE_WINMAIN_FILE_LOCATION_DEBUG = qtmain$${QT_LIBINFIX}$${debug_suffix}.lib
CMAKE_WINMAIN_FILE_LOCATION_RELEASE = qtmain$${QT_LIBINFIX}.lib
diff --git a/src/corelib/Qt6CoreMacros.cmake b/src/corelib/Qt6CoreMacros.cmake
-index e2aa89f72c..3250b2f4f8 100644
+index a30e7ec9fb..8c9927a276 100644
--- a/src/corelib/Qt6CoreMacros.cmake
+++ b/src/corelib/Qt6CoreMacros.cmake
@@ -495,7 +495,6 @@ function(_qt_internal_apply_win_prefix_and_suffix target)
@@ -110,5 +110,5 @@ index e2aa89f72c..3250b2f4f8 100644
get_target_property(target_type ${target} TYPE)
if(target_type STREQUAL "STATIC_LIBRARY")
--
-2.33.1
+2.34.1
diff --git a/0002-Fix-finding-D-Bus.patch b/0002-Fix-finding-D-Bus.patch
index 5fd21e6b272c..71b9a3c0d3c0 100644
--- a/0002-Fix-finding-D-Bus.patch
+++ b/0002-Fix-finding-D-Bus.patch
@@ -1,4 +1,4 @@
-From 8f42d8487b7c9afb9b8f582e0aba48143bf47536 Mon Sep 17 00:00:00 2001
+From 178c7bcd692d7d8367456aacbec4715a4bd2b845 Mon Sep 17 00:00:00 2001
From: Martchus <martchus@gmx.net>
Date: Wed, 7 Oct 2020 12:13:37 +0200
Subject: [PATCH 2/8] Fix finding D-Bus
@@ -20,5 +20,5 @@ index e227d224e0..bdbcab9eb3 100644
+ set_property(TARGET dbus-1 PROPERTY IMPORTED_IMPLIB ${DBus1_LIBRARY})
+endif()
--
-2.33.1
+2.34.1
diff --git a/0003-Fix-using-static-PCRE2-and-DBus-1.patch b/0003-Fix-using-static-PCRE2-and-DBus-1.patch
index b2d83a126796..7e18fb1cf2db 100644
--- a/0003-Fix-using-static-PCRE2-and-DBus-1.patch
+++ b/0003-Fix-using-static-PCRE2-and-DBus-1.patch
@@ -1,4 +1,4 @@
-From 42a00262b863de893a81fd289f39c317c5f0eebc Mon Sep 17 00:00:00 2001
+From 99ddd863a93afc92c622f2eba83f15d2b0b96af6 Mon Sep 17 00:00:00 2001
From: Martchus <martchus@gmx.net>
Date: Thu, 5 Nov 2020 21:13:19 +0100
Subject: [PATCH 3/8] Fix using static PCRE2 and DBus-1
@@ -44,5 +44,5 @@ index accaa4f5ed..4b11c74caa 100644
# include <dbus/dbus.h>
#else
--
-2.33.1
+2.34.1
diff --git a/0004-Fix-transitive-dependencies-of-static-libraries.patch b/0004-Fix-transitive-dependencies-of-static-libraries.patch
index 0ff1a545bca0..54d9f2199fb3 100644
--- a/0004-Fix-transitive-dependencies-of-static-libraries.patch
+++ b/0004-Fix-transitive-dependencies-of-static-libraries.patch
@@ -1,4 +1,4 @@
-From f6e2b65e02ff6c29fe77dbb6b12f50d8a9414068 Mon Sep 17 00:00:00 2001
+From f60b0a86b113e248ba3574633856e59d35d1ea4b Mon Sep 17 00:00:00 2001
From: Martchus <martchus@gmx.net>
Date: Thu, 5 Nov 2020 21:59:33 +0100
Subject: [PATCH 4/8] Fix transitive dependencies (of static libraries)
@@ -120,7 +120,7 @@ index 372a064ff4..a363bfd31b 100644
unset(__png_target_name)
unset(__png_found)
diff --git a/src/plugins/sqldrivers/psql/CMakeLists.txt b/src/plugins/sqldrivers/psql/CMakeLists.txt
-index 8ed84c9028..807dc34cf7 100644
+index d3a6a8588e..743154fc50 100644
--- a/src/plugins/sqldrivers/psql/CMakeLists.txt
+++ b/src/plugins/sqldrivers/psql/CMakeLists.txt
@@ -16,7 +16,7 @@ qt_internal_add_plugin(QPSQLDriverPlugin
@@ -133,5 +133,5 @@ index 8ed84c9028..807dc34cf7 100644
Qt::CorePrivate
Qt::SqlPrivate
--
-2.33.1
+2.34.1
diff --git a/0005-Fix-libjpeg-workaround-for-conflict-with-rpcndr.h.patch b/0005-Fix-libjpeg-workaround-for-conflict-with-rpcndr.h.patch
index 4831fb2bd1c6..d8dd89f66739 100644
--- a/0005-Fix-libjpeg-workaround-for-conflict-with-rpcndr.h.patch
+++ b/0005-Fix-libjpeg-workaround-for-conflict-with-rpcndr.h.patch
@@ -1,4 +1,4 @@
-From 0757e7a6edc83bcb6def8d705e51ff8b764dc740 Mon Sep 17 00:00:00 2001
+From 4a907550b9abc3f7519cf3c2e990bbc4824e4c2c Mon Sep 17 00:00:00 2001
From: Martchus <martchus@gmx.net>
Date: Mon, 2 Nov 2020 13:47:45 +0100
Subject: [PATCH 5/8] Fix libjpeg workaround for conflict with rpcndr.h
@@ -25,5 +25,5 @@ index a17afc0f69..72708145f4 100644
#ifdef const
# undef const // remove crazy C hackery in jconfig.h
--
-2.33.1
+2.34.1
diff --git a/0006-Support-finding-static-MariaDB-client-library.patch b/0006-Support-finding-static-MariaDB-client-library.patch
index ed71d790afd1..84b8d9d40beb 100644
--- a/0006-Support-finding-static-MariaDB-client-library.patch
+++ b/0006-Support-finding-static-MariaDB-client-library.patch
@@ -1,4 +1,4 @@
-From c7d311a6364dcf8b83e68025ed269fa3a3beff88 Mon Sep 17 00:00:00 2001
+From 0b0834acba35161a25517494e7d73ec7e889bdd6 Mon Sep 17 00:00:00 2001
From: Martchus <martchus@gmx.net>
Date: Sun, 8 Nov 2020 00:33:12 +0100
Subject: [PATCH 6/8] Support finding static MariaDB client library
@@ -27,5 +27,5 @@ index 0fcba2148e..ab4f6fdc9e 100644
include(FindPackageHandleStandardArgs)
--
-2.33.1
+2.34.1
diff --git a/0007-Allow-overriding-CMAKE_FIND_LIBRARY_SUFFIXES-to-pref.patch b/0007-Allow-overriding-CMAKE_FIND_LIBRARY_SUFFIXES-to-pref.patch
index e37f5487ff4b..cb5305b0bb5b 100644
--- a/0007-Allow-overriding-CMAKE_FIND_LIBRARY_SUFFIXES-to-pref.patch
+++ b/0007-Allow-overriding-CMAKE_FIND_LIBRARY_SUFFIXES-to-pref.patch
@@ -1,4 +1,4 @@
-From c398d6b9ca06d723c03d0c7f0f96f34a475d7f53 Mon Sep 17 00:00:00 2001
+From aad825321c01ccdea8efc289a6e701d1ae11948f Mon Sep 17 00:00:00 2001
From: Martchus <martchus@gmx.net>
Date: Sun, 8 Nov 2020 00:34:09 +0100
Subject: [PATCH 7/8] Allow overriding CMAKE_FIND_LIBRARY_SUFFIXES to prefer
@@ -25,5 +25,5 @@ index 472ce4fd0b..3f11c42c5a 100644
#
# Macros and functions for building Qt modules
--
-2.33.1
+2.34.1
diff --git a/0008-Fix-crashes-in-rasterization-code-using-setjmp.patch b/0008-Fix-crashes-in-rasterization-code-using-setjmp.patch
index c4c1dda21fe5..a478e27ac0f6 100644
--- a/0008-Fix-crashes-in-rasterization-code-using-setjmp.patch
+++ b/0008-Fix-crashes-in-rasterization-code-using-setjmp.patch
@@ -1,4 +1,4 @@
-From 925e67d1b020c19b4f453085765c02320b23f014 Mon Sep 17 00:00:00 2001
+From 343e997afbad4830ff3ea76179659a4e4dc21556 Mon Sep 17 00:00:00 2001
From: Martchus <martchus@gmx.net>
Date: Sat, 26 Jun 2021 22:24:12 +0200
Subject: [PATCH 8/8] Fix crashes in rasterization code using setjmp
@@ -248,5 +248,5 @@ index e2326a56c1..7b30969ec8 100644
"Description": "FreeType is a freely available software library to render fonts.",
"Homepage": "http://www.freetype.org",
--
-2.33.1
+2.34.1
diff --git a/PKGBUILD b/PKGBUILD
index 4c5b3b5d8b55..a6fa95b20a77 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -11,7 +11,7 @@
_android_arch=aarch64
pkgname=android-aarch64-qt6-base
-_qtver=6.2.1
+_qtver=6.2.2
pkgver=${_qtver/-/}
pkgrel=1
arch=(any)
@@ -36,15 +36,15 @@ source=("https://download.qt.io/official_releases/qt/${pkgver%.*}/${_qtver}/subm
'0006-Support-finding-static-MariaDB-client-library.patch'
'0007-Allow-overriding-CMAKE_FIND_LIBRARY_SUFFIXES-to-pref.patch'
'0008-Fix-crashes-in-rasterization-code-using-setjmp.patch')
-sha256sums=('2c5f07b5c3ea27d3fc1a46686ea3fb6724f94dddf1fb007de3eb0bdb87429079'
- 'be2cb794752635df017e97601646f7cb2f6b22b0a2411ad23d7ada5d685dc97f'
- 'ef7e3305f8bb11482bb6b9dd5dea16a0bbed293d7b615c75caa10db304862a52'
- '3f80ae4137d875e60043b1d974479bbe9b331beebb794c41b9b4514c2e5e8a9b'
- 'b27ce3e4082d687524035548ef8a903f272447a5a57a79edc500c0a9ff1d5dcb'
- '1c386bcaede05b6bd1c01e5e41aff157447551733ac9f56428de3cae8761d826'
- 'af25984f537976cbc457039e5780ca1101a14aac58b12a87e05db712292c6ae8'
- '0f7cefb3cffa69137b1654c342c20a3f7f9299035eb63e8663bfbc61c54117fd'
- '667ecd0b46cd8af6c29a292a1faaa65d868a54155d42d48053f7b66cc70e1142')
+sha256sums=('85ab9180180c2eaf84cd11ae4c6d5a6a69f2f8fd7260aaccfd91a3e7e7232c1a'
+ '70abdd5f8bfafc46a833a3dc9ea3eea7050cc01ac7b54e0f4b9a25dc44ff4faa'
+ '3651ea66d40665681cd64d9ec0e600d32ad65adb7922869bd4c02aeb3c1eb66c'
+ 'e948083c12aa3c468b2845174ec3ee796bba7ddb2447f44f321b31b7e354152a'
+ '0736df9ed395025851be441bb422128d046b82847d7e546abbdaf63391cddb43'
+ 'd408dba9f000a69aa4a684ec94aba843b2c2f1462562b88f07846480da7e5a54'
+ 'a7674e5475f2b3f64926ccf02fb0881e2861beed5643143a87cacd9e940bd699'
+ '02818bb9ac13c14d18c3bf5a0729666c37b8b0248088e2237c66049c0ad62a10'
+ '2353af5cfaf83090690d8cd933e349781b45328742fb1c4ad9bcbe51f03aa35a')
prepare () {
cd $_pkgfqn
diff --git a/qtbase-sha256.txt b/qtbase-sha256.txt
index c8f98b491e99..3cff07eb2fb2 100644
--- a/qtbase-sha256.txt
+++ b/qtbase-sha256.txt
@@ -1 +1 @@
-2c5f07b5c3ea27d3fc1a46686ea3fb6724f94dddf1fb007de3eb0bdb87429079
+85ab9180180c2eaf84cd11ae4c6d5a6a69f2f8fd7260aaccfd91a3e7e7232c1a