Befator-Inc-Firmen-Netzwerk/MINGW-packages
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 1 Wiki Activity

Build Qt6 with RelWithDebInfo to get proper debug packages. Backport

Browse Source 
patches to build with proper import library extensions. Add more
features
This commit is contained in:
Alexey Pavlov
2021-10-09 23:22:47 +03:00
parent 7ad3e83e63
commit db9fb378fa
34 changed files with 699 additions and 84 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
mingw-w64-qt6-5compat/PKGBUILD
View File

@@ -6,7 +6,7 @@ pkgname=("${MINGW_PACKAGE_PREFIX}-${_realname}"
"${MINGW_PACKAGE_PREFIX}-${_realname}-debug")
_qtver=6.2.0
pkgver=${_qtver/-/}
pkgrel=1
pkgrel=2
arch=(any)
mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64' 'clang32')
url='https://www.qt.io'
@@ -29,7 +29,7 @@ build() {
MSYS2_ARG_CONV_EXCL="-DCMAKE_INSTALL_PREFIX=" \
cmake \
-GNinja \
-DCMAKE_BUILD_TYPE=Release \
-DCMAKE_BUILD_TYPE=RelWithDebInfo \
-DCMAKE_INSTALL_PREFIX=${MINGW_PREFIX} \
../${_pkgfn}

55
mingw-w64-qt6-activeqt/002-Handle-win64-in-dumpcpp-and-MetaObjectGenerator-read.patch Normal file
View File

@@ -0,0 +1,55 @@
From 6bc100ab085078adedd616c0520b855a420d6498 Mon Sep 17 00:00:00 2001
From: Martchus <martchus@gmx.net>
Date: Fri, 2 Jun 2017 17:21:08 +0200
Subject: [PATCH 1/2] Handle win64 in dumpcpp and
MetaObjectGenerator::readClassInfo
See https://bugreports.qt.io/browse/QTBUG-46827
---
src/activeqt/container/qaxbase.cpp | 4 ++++
tools/dumpcpp/main.cpp | 8 ++++++++
2 files changed, 12 insertions(+)
diff --git a/src/activeqt/container/qaxbase.cpp b/src/activeqt/container/qaxbase.cpp
index 4944c3b..f92d18b 100644
--- a/src/activeqt/container/qaxbase.cpp
+++ b/src/activeqt/container/qaxbase.cpp
@@ -2104,6 +2104,10 @@ void MetaObjectGenerator::readClassInfo()
const QStringList versions = controls.childGroups();
for (const QString &version : versions) {
tlfile = controls.value(QLatin1Char('/') + version + QLatin1String("/0/win32/.")).toString();
+ if(tlfile.isEmpty())
+ {
+ tlfile = controls.value(QLatin1Char('/') + version + QLatin1String("/0/win64/.")).toString();
+ }
if (!tlfile.isEmpty())
break;
}
diff --git a/tools/dumpcpp/main.cpp b/tools/dumpcpp/main.cpp
index 60e5c94..b2ea4eb 100644
--- a/tools/dumpcpp/main.cpp
+++ b/tools/dumpcpp/main.cpp
@@ -1090,6 +1090,10 @@ int main(int argc, char **argv)
typeLib = settings.value(keyPrefix + QLatin1String("win32/.")).toString();
if (QFile::exists(typeLib))
break;
+ typeLib = settings.value(QLatin1String("/") + codes.at(c) + QLatin1String("/0/win64/.")).toByteArray();
+ if (QFile::exists(typeLib)) {
+ break;
+ }
}
if (!typeLib.isEmpty())
@@ -1154,6 +1158,10 @@ int main(int argc, char **argv)
typeLib = settings.value(keyPrefix + QLatin1String("win32/.")).toString();
if (QFile::exists(typeLib))
break;
+ typeLib = settings.value(key + QLatin1String("/") + codes.at(c) + QLatin1String("/win64/.")).toByteArray();
+ if (QFile::exists(typeLib)) {
+ break;
+ }
}
}
--
2.33.0

13
mingw-w64-qt6-activeqt/PKGBUILD
View File

@@ -6,7 +6,7 @@ pkgname=("${MINGW_PACKAGE_PREFIX}-${_realname}"
"${MINGW_PACKAGE_PREFIX}-${_realname}-debug")
_qtver=6.2.0
pkgver=${_qtver/-/}
pkgrel=1
pkgrel=2
arch=(any)
mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64' 'clang32')
url='https://www.qt.io'
@@ -19,9 +19,11 @@ makedepends=("${MINGW_PACKAGE_PREFIX}-cmake"
options=('!strip')
_pkgfn="${_realname/6-/}-everywhere-src-${_qtver}"
source=("https://download.qt.io/official_releases/qt/${pkgver%.*}/$_qtver/submodules/$_pkgfn.tar.xz"
001-appending-qt6-to-remove-qt5-conflict.patch)
001-appending-qt6-to-remove-qt5-conflict.patch
002-Handle-win64-in-dumpcpp-and-MetaObjectGenerator-read.patch)
sha256sums=('ed991638e27e2e8eac487c2002845827097d1e66397100eea2061d8ad790ded2'
'2efb74d2d941f84eddeaa95022aedb3f0e935b9267de910eedff633fa6687e60')
'2efb74d2d941f84eddeaa95022aedb3f0e935b9267de910eedff633fa6687e60'
'93e1c08068e45372fb02e9a33e3366b5067817ea7de4bba4e91b6c165645cb41')
# Helper macros to help make tasks easier #
apply_patch_with_msg() {
@@ -36,7 +38,8 @@ prepare() {
cd $srcdir/${_pkgfn}
apply_patch_with_msg \
001-appending-qt6-to-remove-qt5-conflict.patch
001-appending-qt6-to-remove-qt5-conflict.patch \
002-Handle-win64-in-dumpcpp-and-MetaObjectGenerator-read.patch
}
build() {
@@ -47,7 +50,7 @@ build() {
MSYS2_ARG_CONV_EXCL="-DCMAKE_INSTALL_PREFIX=" \
cmake \
-GNinja \
-DCMAKE_BUILD_TYPE=Release \
-DCMAKE_BUILD_TYPE=RelWithDebInfo \
-DCMAKE_INSTALL_PREFIX=${MINGW_PREFIX} \
../${_pkgfn}

52
mingw-w64-qt6-base/003-adjust-qmake-conf-mingw.patch Normal file
View File

@@ -0,0 +1,52 @@
--- qtbase-6.2.0/mkspecs/common/g++-win32.conf.orig 2021-10-07 09:56:09.819539300 +0300
+++ qtbase-6.2.0/mkspecs/common/g++-win32.conf 2021-10-07 10:02:23.970867500 +0300
@@ -32,6 +32,7 @@
QMAKE_CFLAGS_SSE2 += -mstackrealign
QMAKE_CXXFLAGS_EXCEPTIONS_ON = -fexceptions
+QMAKE_CXXFLAGS_EXCEPTIONS_OFF = -fno-exceptions
QMAKE_INCDIR =
@@ -44,6 +45,7 @@
QMAKE_LFLAGS_CONSOLE = -Wl,-subsystem,console
QMAKE_LFLAGS_WINDOWS = -Wl,-subsystem,windows
QMAKE_LFLAGS_DLL = -shared
+QMAKE_LFLAGS_STATIC_LIB = -static
QMAKE_LFLAGS_GCSECTIONS = -Wl,--gc-sections
equals(QMAKE_HOST.os, Windows) {
QMAKE_LINK_OBJECT_MAX = 10
@@ -56,6 +58,9 @@
QMAKE_EXTENSION_STATICLIB = a
QMAKE_LIB_EXTENSIONS = a dll.a
+PKG_CONFIG = $${CROSS_COMPILE}pkg-config
+QMAKE_PKG_CONFIG = $${CROSS_COMPILE}pkg-config
+
QMAKE_LIBS =
QMAKE_LIBS_GUI = -lgdi32 -lcomdlg32 -loleaut32 -limm32 -lwinmm -lws2_32 -lole32 -luuid -luser32 -ladvapi32
QMAKE_LIBS_NETWORK = -lws2_32
@@ -64,9 +69,10 @@
QMAKE_LIBS_OPENGL_ES2_DEBUG = -lgdi32 -luser32
QMAKE_LIBS_COMPAT = -ladvapi32 -lshell32 -lcomdlg32 -luser32 -lgdi32 -lws2_32
-QMAKE_IDL = midl
+QMAKE_IDL = $${CROSS_COMPILE}widl
QMAKE_LIB = $${CROSS_COMPILE}ar -rc
QMAKE_RC = $${CROSS_COMPILE}windres
+QMAKE_DLLTOOL = $${CROSS_COMPILE}dlltool
QMAKE_STRIP = $${CROSS_COMPILE}strip
QMAKE_STRIPFLAGS_LIB += --strip-unneeded
--- qtbase-6.2.0/mkspecs/features/default_post.prf.orig 2021-10-07 10:01:04.313014900 +0300
+++ qtbase-6.2.0/mkspecs/features/default_post.prf 2021-10-07 10:01:38.737973300 +0300
@@ -87,8 +87,8 @@
enable_gdb_index: QMAKE_LFLAGS += $$QMAKE_LFLAGS_GDB_INDEX
}
+static: QMAKE_LFLAGS += $$QMAKE_LFLAGS_STATIC_LIB
dll:win32: QMAKE_LFLAGS += $$QMAKE_LFLAGS_DLL
-static:mac: QMAKE_LFLAGS += $$QMAKE_LFLAGS_STATIC_LIB
staticlib:unix {
QMAKE_CFLAGS += $$QMAKE_CFLAGS_STATIC_LIB
QMAKE_CXXFLAGS += $$QMAKE_CXXFLAGS_STATIC_LIB

159
mingw-w64-qt6-base/004-qt-6.2.0-win32-g-Add-QMAKE_EXTENSION_IMPORTLIB-defaulting-to-.patch Normal file
View File

@@ -0,0 +1,159 @@
--- qtbase-6.2.0/mkspecs/common/g++-win32.conf.orig 2019-06-15 15:09:10.556066900 +0300
+++ qtbase-6.2.0/mkspecs/common/g++-win32.conf 2019-06-15 15:09:21.226485600 +0300
@@ -63,7 +63,7 @@
QMAKE_EXTENSION_SHLIB = dll
QMAKE_PREFIX_STATICLIB = lib
QMAKE_EXTENSION_STATICLIB = a
-QMAKE_LIB_EXTENSIONS = a dll.a
+QMAKE_EXTENSION_IMPORTLIB = dll.a
PKG_CONFIG = $${CROSS_COMPILE}pkg-config
QMAKE_PKG_CONFIG = $${CROSS_COMPILE}pkg-config
--- qtbase-6.2.0/mkspecs/features/create_cmake.prf.orig 2021-10-07 10:06:11.566984500 +0300
+++ qtbase-6.2.0/mkspecs/features/create_cmake.prf 2021-10-07 10:07:30.499392600 +0300
@@ -332,8 +332,14 @@
CMAKE_WINMAIN_FILE_LOCATION_DEBUG = libqtmain$${QT_LIBINFIX}$${debug_suffix}.a
CMAKE_WINMAIN_FILE_LOCATION_RELEASE = libqtmain$${QT_LIBINFIX}.a
- CMAKE_IMPLIB_FILE_LOCATION_DEBUG = lib$${CMAKE_QT_STEM}$${debug_suffix}.a
- CMAKE_IMPLIB_FILE_LOCATION_RELEASE = lib$${CMAKE_QT_STEM}.a
+ !isEmpty(CMAKE_STATIC_TYPE) {
+ CMAKE_IMPLIB_FILE_LOCATION_DEBUG = lib$${CMAKE_QT_STEM}$${debug_suffix}.a
+ CMAKE_IMPLIB_FILE_LOCATION_RELEASE = lib$${CMAKE_QT_STEM}.a
+ } else {
+ isEmpty(QMAKE_EXTENSION_IMPORTLIB): QMAKE_EXTENSION_IMPORTLIB = dll.a
+ CMAKE_IMPLIB_FILE_LOCATION_DEBUG = lib$${CMAKE_QT_STEM}$${debug_suffix}.$${QMAKE_EXTENSION_IMPORTLIB}
+ CMAKE_IMPLIB_FILE_LOCATION_RELEASE = lib$${CMAKE_QT_STEM}.$${QMAKE_EXTENSION_IMPORTLIB}
+ }
} else {
CMAKE_WINMAIN_FILE_LOCATION_DEBUG = qtmain$${QT_LIBINFIX}$${debug_suffix}.lib
CMAKE_WINMAIN_FILE_LOCATION_RELEASE = qtmain$${QT_LIBINFIX}.lib
--- qtbase-6.2.0/mkspecs/features/qt.prf.orig 2021-10-07 10:08:00.815247900 +0300
+++ qtbase-6.2.0/mkspecs/features/qt.prf 2021-10-07 10:11:39.347590300 +0300
@@ -220,9 +220,13 @@
} else {
lib_bases = $$MODULE_MODULE$$qtPlatformTargetSuffix()
darwin: lib_bases *= $$MODULE_MODULE
- win32|contains(MODULE_CONFIG, staticlib) {
+ win32 {
lib_prefix = $$MODULE_LIBS/$$QMAKE_PREFIX_STATICLIB
- lib_suffixes = $$QMAKE_EXTENSION_STATICLIB
+ contains(MODULE_CONFIG, staticlib) {
+ lib_suffixes = $$QMAKE_EXTENSION_STATICLIB
+ } else {
+ lib_suffixes = $$QMAKE_EXTENSION_IMPORTLIB
+ }
lib_suffixes *= $$QMAKE_LIB_EXTENSIONS
add_lib_to_pretargetdeps = true
} else {
--- qtbase-6.2.0/qmake/generators/win32/winmakefile.cpp.orig 2021-10-07 10:14:13.043627000 +0300
+++ qtbase-6.2.0/qmake/generators/win32/winmakefile.cpp 2021-10-07 10:16:00.750253600 +0300
@@ -99,10 +99,16 @@
bool
Win32MakefileGenerator::findLibraries(bool linkPrl, bool mergeLflags)
{
- ProStringList impexts = project->values("QMAKE_LIB_EXTENSIONS");
- if (impexts.isEmpty())
- impexts = project->values("QMAKE_EXTENSION_STATICLIB");
- QList<LibrarySearchPath> dirs;
+ ProStringList impexts;
+ if (project->isActiveConfig("staticlib")) {
+ impexts.append(project->values("QMAKE_EXTENSION_STATICLIB"));
+ } else {
+ impexts.append(project->values("QMAKE_EXTENSION_IMPORTLIB"));
+ impexts.append(project->values("QMAKE_EXTENSION_STATICLIB"));
+ }
+ QVector<LibrarySearchPath> dirs;
+ QString qt_prefix_libs = project->propertyValue(ProKey("QT_INSTALL_LIBS")).toQString();
+ dirs.append(qt_prefix_libs);
int libidx = 0;
for (const ProString &dlib : project->values("QMAKE_DEFAULT_LIBDIRS"))
dirs.append(LibrarySearchPath(dlib.toQString(), true));
@@ -283,9 +289,12 @@
if (!project->values("QMAKE_APP_FLAG").isEmpty()) {
project->values("TARGET_EXT").append(".exe");
} else if (project->isActiveConfig("shared")) {
+ ProString impext = project->first("QMAKE_EXTENSION_IMPORTLIB");
+ if (impext.isEmpty())
+ impext = project->first("QMAKE_PREFIX_STATICLIB");
project->values("LIB_TARGET").prepend(project->first("QMAKE_PREFIX_STATICLIB")
+ project->first("TARGET") + project->first("TARGET_VERSION_EXT")
- + '.' + project->first("QMAKE_EXTENSION_STATICLIB"));
+ + '.' + impext);
project->values("TARGET_EXT").append(project->first("TARGET_VERSION_EXT") + "."
+ project->first("QMAKE_EXTENSION_SHLIB"));
project->values("TARGET").first() = project->first("QMAKE_PREFIX_SHLIB") + project->first("TARGET");
--- qtbase-6.2.0/src/corelib/global/qlibraryinfo.cpp.orig 2021-10-07 10:17:23.364194300 +0300
+++ qtbase-6.2.0/src/corelib/global/qlibraryinfo.cpp 2021-10-07 10:17:48.004750400 +0300
@@ -458,7 +458,7 @@
const QLatin1Char slash('/');
#if defined(Q_CC_MINGW)
const QString implibPrefix = QStringLiteral("lib");
- const QString implibSuffix = QStringLiteral(".a");
+ const QString implibSuffix = QStringLiteral(".dll.a");
#else
const QString implibPrefix;
const QString implibSuffix = QStringLiteral(".lib");
--- qtbase-6.2.0/cmake/QtPriHelpers.cmake.orig 2021-10-07 10:17:23.364194300 +0300
+++ qtbase-6.2.0/cmake/QtPriHelpers.cmake 2021-10-07 10:17:48.004750400 +0300
@@ -401,9 +401,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}")
- set(library_prefixes ${CMAKE_SHARED_LIBRARY_PREFIX} ${CMAKE_STATIC_LIBRARY_PREFIX})
+ set(library_prefixes
+ ${CMAKE_SHARED_LIBRARY_PREFIX}
+ ${CMAKE_IMPORT_LIBRARY_PREFIX}
+ ${CMAKE_STATIC_LIBRARY_PREFIX})
set(library_suffixes
${CMAKE_SHARED_LIBRARY_SUFFIX}
+ ${CMAKE_CMAKE_IMPORT_LIBRARY_SUFFIX}
${CMAKE_EXTRA_SHARED_LIBRARY_SUFFIXES}
${CMAKE_STATIC_LIBRARY_SUFFIX})
if(MSVC)
@@ -828,9 +832,13 @@ CONFIG += ${private_config_joined}
list(APPEND inputs "${preliminary_pri_root}/${cfg}/${pri_data_cmake_file}")
endforeach()
- set(library_prefixes ${CMAKE_SHARED_LIBRARY_PREFIX} ${CMAKE_STATIC_LIBRARY_PREFIX})
+ set(library_prefixes
+ ${CMAKE_SHARED_LIBRARY_PREFIX}
+ ${CMAKE_IMPORT_LIBRARY_PREFIX}
+ ${CMAKE_STATIC_LIBRARY_PREFIX})
set(library_suffixes
${CMAKE_SHARED_LIBRARY_SUFFIX}
+ ${CMAKE_CMAKE_IMPORT_LIBRARY_SUFFIX}
${CMAKE_EXTRA_SHARED_LIBRARY_SUFFIXES}
${CMAKE_STATIC_LIBRARY_SUFFIX})
if(MSVC)
--- qtbase-6.2.0/cmake/QtPrlHelpers.cmake.orig 2021-10-07 10:17:23.364194300 +0300
+++ qtbase-6.2.0/cmake/QtPrlHelpers.cmake 2021-10-07 10:17:48.004750400 +0300
@@ -120,11 +120,17 @@ ${prl_step1_content_libs}
CONTENT
"FINAL_PRL_FILE_PATH = ${final_prl_file_path}")
- set(library_prefixes ${CMAKE_SHARED_LIBRARY_PREFIX} ${CMAKE_STATIC_LIBRARY_PREFIX})
+ set(library_prefixes
+ ${CMAKE_SHARED_LIBRARY_PREFIX}
+ ${CMAKE_IMPORT_LIBRARY_PREFIX}
+ ${CMAKE_STATIC_LIBRARY_PREFIX})
set(library_suffixes
${CMAKE_SHARED_LIBRARY_SUFFIX}
+ ${CMAKE_CMAKE_IMPORT_LIBRARY_SUFFIX}
${CMAKE_EXTRA_SHARED_LIBRARY_SUFFIXES}
${CMAKE_STATIC_LIBRARY_SUFFIX})
+ list(REMOVE_DUPLICATES library_prefixes)
+ list(REMOVE_DUPLICATES library_suffixes)
if(QT_GENERATOR_IS_MULTI_CONFIG)
set(configs ${CMAKE_CONFIGURATION_TYPES})
--- qtbase-6.2.0/src/corelib/Qt6CoreMacros.cmake.orig 2021-10-07 10:17:23.364194300 +0300
+++ qtbase-6.2.0/src/corelib/Qt6CoreMacros.cmake 2021-10-07 10:17:48.004750400 +0300
@@ -495,7 +495,6 @@ function(_qt_internal_apply_win_prefix_and_suffix target)
# This should cover both MINGW with GCC and CLANG.
if(NOT MSVC)
- set_property(TARGET "${target}" PROPERTY IMPORT_SUFFIX ".a")
get_target_property(target_type ${target} TYPE)
if(target_type STREQUAL "STATIC_LIBRARY")

28
mingw-w64-qt6-base/005-Allow-overriding-CMAKE_FIND_LIBRARY_SUFFIXES-to-pref.patch Normal file
View File

@@ -0,0 +1,28 @@
From 6139785883e6ceee0369390debd39a90c18d821b 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
static libraries
Change-Id: I4c617e0706044d31da1bd56ae51615dc8ed37099
---
cmake/QtBuildInternals/QtBuildInternalsConfig.cmake | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/cmake/QtBuildInternals/QtBuildInternalsConfig.cmake b/cmake/QtBuildInternals/QtBuildInternalsConfig.cmake
index 89c13afe01..6a21b6e266 100644
--- a/cmake/QtBuildInternals/QtBuildInternalsConfig.cmake
+++ b/cmake/QtBuildInternals/QtBuildInternalsConfig.cmake
@@ -1,6 +1,10 @@
# These values should be kept in sync with those in qtbase/.cmake.conf
cmake_minimum_required(VERSION 3.16...3.20)
+if (CMAKE_FIND_LIBRARY_SUFFIXES_OVERRIDE)
+ set(CMAKE_FIND_LIBRARY_SUFFIXES "${CMAKE_FIND_LIBRARY_SUFFIXES_OVERRIDE}")
+endif ()
+
###############################################
#
# Macros and functions for building Qt modules
--
2.33.0

11
mingw-w64-qt6-base/006-qt-6.2.0-dont-add-resource-files-to-qmake-libs.patch Normal file
View File

@@ -0,0 +1,11 @@
--- qtbase-6.2.0/qmake/generators/win32/mingw_make.cpp.orig 2021-10-07 10:20:07.922667300 +0300
+++ qtbase-6.2.0/qmake/generators/win32/mingw_make.cpp 2021-10-07 10:20:16.041674400 +0300
@@ -147,7 +147,7 @@
processVars();
- project->values("LIBS") += project->values("RES_FILE");
+ project->values("OBJECTS") += project->values("RES_FILE");
if (project->isActiveConfig("dll")) {
QString destDir = "";

251
mingw-w64-qt6-base/007-Fix-crashes-in-rasterization-code-using-setjmp.patch Normal file
View File

@@ -0,0 +1,251 @@
From a8f1c4b28f9f4d3b9dbebcacfa9ad3047332016f 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
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
* Use C++ exceptions instead of setjmp to workaround crashes
* The setjmp/longjmp code crashes when compiling for x86_64-w64-mingw32
with GCC 11 and optimizations enabled¹. It crashes when jumping back
to handle the case of insufficient memory. This change uses C++
exceptions instead (turning the compile unit into a C++ unit instead
of just using C) which should behave identical but don't seem to
crash.
* Fix rendering certain SVGs and possibly other graphics
Change-Id: I01937d13569dd01ab4cb1f608020544c93bc343c
---
¹ See https://bugreports.qt.io/browse/QTBUG-94692 for details.
---
src/gui/CMakeLists.txt | 7 +++-
.../{qgrayraster.c => qgrayraster.cpp} | 41 ++++++++-----------
src/gui/painting/qt_attribution.json | 2 +-
3 files changed, 24 insertions(+), 26 deletions(-)
rename src/gui/painting/{qgrayraster.c => qgrayraster.cpp} (98%)
diff --git a/src/gui/CMakeLists.txt b/src/gui/CMakeLists.txt
index 905afd4038..e4c23c4714 100644
--- a/src/gui/CMakeLists.txt
+++ b/src/gui/CMakeLists.txt
@@ -165,7 +165,7 @@ qt_internal_add_module(Gui
painting/qdrawingprimitive_sse2_p.h
painting/qemulationpaintengine.cpp painting/qemulationpaintengine_p.h
painting/qfixed_p.h
- painting/qgrayraster.c painting/qgrayraster_p.h
+ painting/qgrayraster.cpp painting/qgrayraster_p.h
painting/qicc.cpp painting/qicc_p.h
painting/qimagescale.cpp
painting/qmemrotate.cpp painting/qmemrotate_p.h
@@ -279,6 +279,11 @@ qt_internal_add_module(Gui
"kernel/qt_gui_pch.h"
)
+# enable exceptions for painting/qgrayraster.cpp
+set_source_files_properties("painting/qgrayraster.cpp"
+ PROPERTIES COMPILE_FLAGS "-fexceptions" DISABLE_PRECOMPILE_HEADERS ON SKIP_PRECOMPILE_HEADERS ON
+)
+
# Resources:
set_source_files_properties("../3rdparty/icc/sRGB2014.icc"
PROPERTIES QT_RESOURCE_ALIAS "sRGB2014.icc"
diff --git a/src/gui/painting/qgrayraster.c b/src/gui/painting/qgrayraster.cpp
similarity index 98%
rename from src/gui/painting/qgrayraster.c
rename to src/gui/painting/qgrayraster.cpp
index c6b9aa679e..8952343922 100644
--- a/src/gui/painting/qgrayraster.c
+++ b/src/gui/painting/qgrayraster.cpp
@@ -39,7 +39,7 @@
/***************************************************************************/
/* */
-/* qgrayraster.c, derived from ftgrays.c */
+/* qgrayraster.cpp, derived from ftgrays.c */
/* */
/* A new `perfect' anti-aliasing renderer (body). */
/* */
@@ -157,17 +157,12 @@
# include <vxWorksCommon.h> /* needed for setjmp.h */
#endif
#include <string.h> /* for qt_ft_memcpy() */
-#include <setjmp.h>
#include <limits.h>
#define QT_FT_UINT_MAX UINT_MAX
#define qt_ft_memset memset
-#define qt_ft_setjmp setjmp
-#define qt_ft_longjmp longjmp
-#define qt_ft_jmp_buf jmp_buf
-
#include <stddef.h>
typedef ptrdiff_t QT_FT_PtrDist;
@@ -177,6 +172,8 @@ typedef ptrdiff_t QT_FT_PtrDist;
#define ErrRaster_Memory_Overflow -4
#define ErrRaster_OutOfMemory -6
+struct RasterMemoryOverflow {};
+
#define QT_FT_BEGIN_HEADER
#define QT_FT_END_HEADER
@@ -310,8 +307,6 @@ QT_FT_END_STMNT
int band_size;
int band_shoot;
- qt_ft_jmp_buf jump_buffer;
-
void* buffer;
long buffer_size;
@@ -333,12 +328,14 @@ QT_FT_END_STMNT
} TRaster, *PRaster;
+ extern "C" {
int q_gray_rendered_spans(TRaster *raster)
{
if ( raster && raster->worker )
return raster->worker->skip_spans > 0 ? 0 : -raster->worker->skip_spans;
return 0;
}
+ }
/*************************************************************************/
/* */
@@ -404,7 +401,6 @@ QT_FT_END_STMNT
ras.max_ey = ( ras.max_ey + 63 ) >> 6;
}
-
/*************************************************************************/
/* */
/* Record the current cell in the table. */
@@ -433,7 +429,7 @@ QT_FT_END_STMNT
}
if ( ras.num_cells >= ras.max_cells )
- qt_ft_longjmp( ras.jump_buffer, 1 );
+ throw RasterMemoryOverflow();
cell = ras.cells + ras.num_cells++;
cell->x = x;
@@ -1506,7 +1502,7 @@ QT_FT_END_STMNT
QT_FT_TRACE5(( " move to (%.2f, %.2f)\n",
v_start.x / 64.0, v_start.y / 64.0 ));
- error = gray_move_to( &v_start, user );
+ error = gray_move_to( &v_start, static_cast<PWorker>(user) );
if ( error )
goto Exit;
@@ -1528,7 +1524,7 @@ QT_FT_END_STMNT
QT_FT_TRACE5(( " line to (%.2f, %.2f)\n",
vec.x / 64.0, vec.y / 64.0 ));
- gray_render_line(user, UPSCALE(vec.x), UPSCALE(vec.y));
+ gray_render_line(static_cast<PWorker>(user), UPSCALE(vec.x), UPSCALE(vec.y));
continue;
}
@@ -1557,7 +1553,7 @@ QT_FT_END_STMNT
" with control (%.2f, %.2f)\n",
vec.x / 64.0, vec.y / 64.0,
v_control.x / 64.0, v_control.y / 64.0 ));
- gray_render_conic(user, &v_control, &vec);
+ gray_render_conic(static_cast<PWorker>(user), &v_control, &vec);
continue;
}
@@ -1571,7 +1567,7 @@ QT_FT_END_STMNT
" with control (%.2f, %.2f)\n",
v_middle.x / 64.0, v_middle.y / 64.0,
v_control.x / 64.0, v_control.y / 64.0 ));
- gray_render_conic(user, &v_control, &v_middle);
+ gray_render_conic(static_cast<PWorker>(user), &v_control, &v_middle);
v_control = vec;
goto Do_Conic;
@@ -1581,7 +1577,7 @@ QT_FT_END_STMNT
" with control (%.2f, %.2f)\n",
v_start.x / 64.0, v_start.y / 64.0,
v_control.x / 64.0, v_control.y / 64.0 ));
- gray_render_conic(user, &v_control, &v_start);
+ gray_render_conic(static_cast<PWorker>(user), &v_control, &v_start);
goto Close;
}
@@ -1616,7 +1612,7 @@ QT_FT_END_STMNT
vec.x / 64.0, vec.y / 64.0,
vec1.x / 64.0, vec1.y / 64.0,
vec2.x / 64.0, vec2.y / 64.0 ));
- gray_render_cubic(user, &vec1, &vec2, &vec);
+ gray_render_cubic(static_cast<PWorker>(user), &vec1, &vec2, &vec);
continue;
}
@@ -1625,7 +1621,7 @@ QT_FT_END_STMNT
v_start.x / 64.0, v_start.y / 64.0,
vec1.x / 64.0, vec1.y / 64.0,
vec2.x / 64.0, vec2.y / 64.0 ));
- gray_render_cubic(user, &vec1, &vec2, &v_start);
+ gray_render_cubic(static_cast<PWorker>(user), &vec1, &vec2, &v_start);
goto Close;
}
}
@@ -1634,7 +1630,7 @@ QT_FT_END_STMNT
/* close the contour with a line segment */
QT_FT_TRACE5(( " line to (%.2f, %.2f)\n",
v_start.x / 64.0, v_start.y / 64.0 ));
- gray_render_line(user, UPSCALE(v_start.x), UPSCALE(v_start.y));
+ gray_render_line(static_cast<PWorker>(user), UPSCALE(v_start.x), UPSCALE(v_start.y));
Close:
first = last + 1;
@@ -1662,14 +1658,11 @@ QT_FT_END_STMNT
{
volatile int error = 0;
- if ( qt_ft_setjmp( ras.jump_buffer ) == 0 )
- {
+ try {
error = QT_FT_Outline_Decompose( &ras.outline, &ras );
if ( !ras.invalid )
gray_record_cell( RAS_VAR );
- }
- else
- {
+ } catch (const RasterMemoryOverflow &) {
error = ErrRaster_Memory_Overflow;
}
@@ -1934,7 +1927,7 @@ QT_FT_END_STMNT
static int
gray_raster_new( QT_FT_Raster* araster )
{
- *araster = malloc(sizeof(TRaster));
+ *araster = static_cast<TRaster *>(malloc(sizeof(TRaster)));
if (!*araster) {
*araster = 0;
return ErrRaster_Memory_Overflow;
diff --git a/src/gui/painting/qt_attribution.json b/src/gui/painting/qt_attribution.json
index e2326a56c1..7b30969ec8 100644
--- a/src/gui/painting/qt_attribution.json
+++ b/src/gui/painting/qt_attribution.json
@@ -4,7 +4,7 @@
"Name": "Anti-aliasing rasterizer from FreeType 2",
"QDocModule": "qtgui",
"QtUsage": "Used in Qt GUI.",
- "Path": "qgrayraster.c",
+ "Path": "qgrayraster.cpp",
"Description": "FreeType is a freely available software library to render fonts.",
"Homepage": "http://www.freetype.org",
--
2.33.0

110
mingw-w64-qt6-base/PKGBUILD
View File

@@ -6,7 +6,7 @@ pkgname=("${MINGW_PACKAGE_PREFIX}-${_realname}"
"${MINGW_PACKAGE_PREFIX}-${_realname}-debug")
_qtver=6.2.0
pkgver=${_qtver/-/}
pkgrel=1
pkgrel=2
arch=(any)
mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64' 'clang32')
url='https://www.qt.io'
@@ -14,18 +14,21 @@ license=(GPL3 LGPL3 FDL custom)
pkgdesc="A cross-platform application and UI framework (mingw-w64)"
makedepends=("${MINGW_PACKAGE_PREFIX}-cmake"
"${MINGW_PACKAGE_PREFIX}-ninja"
"${MINGW_PACKAGE_PREFIX}-pkgconf"
"${MINGW_PACKAGE_PREFIX}-double-conversion"
"${MINGW_PACKAGE_PREFIX}-dbus"
"${MINGW_PACKAGE_PREFIX}-freetype"
"${MINGW_PACKAGE_PREFIX}-fontconfig"
"${MINGW_PACKAGE_PREFIX}-harfbuzz"
"${MINGW_PACKAGE_PREFIX}-icu"
"${MINGW_PACKAGE_PREFIX}-libjpeg-turbo"
"${MINGW_PACKAGE_PREFIX}-pcre2"
"${MINGW_PACKAGE_PREFIX}-libpng"
"${MINGW_PACKAGE_PREFIX}-md4c"
"${MINGW_PACKAGE_PREFIX}-openssl"
"${MINGW_PACKAGE_PREFIX}-pcre2"
"${MINGW_PACKAGE_PREFIX}-sqlite3"
"${MINGW_PACKAGE_PREFIX}-zlib"
"${MINGW_PACKAGE_PREFIX}-pkgconf"
"${MINGW_PACKAGE_PREFIX}-zstd"
"${MINGW_PACKAGE_PREFIX}-xmlstarlet"
"${MINGW_PACKAGE_PREFIX}-vulkan-headers"
"${MINGW_PACKAGE_PREFIX}-libmariadbclient"
@@ -36,10 +39,27 @@ options=('!strip')
_pkgfn="${_realname/6-/}-everywhere-src-${_qtver}"
source=("https://download.qt.io/official_releases/qt/${pkgver%.*}/$_qtver/submodules/$_pkgfn.tar.xz"
001-appending-qt6-to-remove-qt5-conflict.patch
002-fix-qtdocs-helpers-cmake.patch)
002-fix-qtdocs-helpers-cmake.patch
003-adjust-qmake-conf-mingw.patch
004-qt-6.2.0-win32-g-Add-QMAKE_EXTENSION_IMPORTLIB-defaulting-to-.patch
005-Allow-overriding-CMAKE_FIND_LIBRARY_SUFFIXES-to-pref.patch
006-qt-6.2.0-dont-add-resource-files-to-qmake-libs.patch
007-Fix-crashes-in-rasterization-code-using-setjmp.patch)
sha256sums=('fdfff0716d093bcb6bcd53746ce1d3c9701a6bf3326d47813866d43949b47769'
'78757ddc0685a15df55e17742b74951e634ada305736310bad03823288f45203'
'b0267f3293984d9fbd012a1b22efe2a0990f95c1ed4a7d6fb46438f8f476f021')
'b0267f3293984d9fbd012a1b22efe2a0990f95c1ed4a7d6fb46438f8f476f021'
'68156b8b7717a0ce19c4b991942469171bfa048cd5c90765115a546e65669a1d'
'e8867fa643823b149b2f1937a4854752aa86191148ae8cf4667e32ed5b97a36c'
'b644586be741dabf66b79bcc2eed71727739f4b301e0ae7da35506b30605aeb5'
'4085a10b290b8e3d930de535cbad2ba3e643432cba433aa2b28fe664f86d38a3'
'7ca754db6546f0992307e76cf9c5c9e8d4146278b7989fd4df9a8bd45eb62611')
# Use the right mkspecs file
if [[ ${MINGW_PACKAGE_PREFIX} == *-clang-* ]]; then
_platform=win32-clang-g++
else
_platform=win32-g++
fi
# Helper macros to help make tasks easier #
apply_patch_with_msg() {
@@ -55,7 +75,35 @@ prepare() {
apply_patch_with_msg \
001-appending-qt6-to-remove-qt5-conflict.patch \
002-fix-qtdocs-helpers-cmake.patch
002-fix-qtdocs-helpers-cmake.patch \
003-adjust-qmake-conf-mingw.patch \
004-qt-6.2.0-win32-g-Add-QMAKE_EXTENSION_IMPORTLIB-defaulting-to-.patch \
005-Allow-overriding-CMAKE_FIND_LIBRARY_SUFFIXES-to-pref.patch \
006-qt-6.2.0-dont-add-resource-files-to-qmake-libs.patch \
007-Fix-crashes-in-rasterization-code-using-setjmp.patch
local _ARCH_TUNE=
local _HARD_FLAGS=
case ${MINGW_CHOST} in
i686*)
_ARCH_TUNE="-march=i686 -mtune=core2"
if [ "${_enable_hardening}" = "yes" ]; then
_HARD_FLAGS="-Wl,--dynamicbase,--nxcompat,--no-seh"
fi
;;
x86_64*)
_ARCH_TUNE="-march=nocona -mtune=core2"
if [ "${_enable_hardening}" = "yes" ]; then
_HARD_FLAGS="-Wl,--dynamicbase,--high-entropy-va,--nxcompat,--default-image-base-high"
fi
;;
esac
BIGOBJ_FLAGS="-Wa,-mbig-obj"
# Append these ones ..
sed -i "s|^QMAKE_CFLAGS .*= \(.*\)$|QMAKE_CFLAGS = \1 ${_ARCH_TUNE} ${BIGOBJ_FLAGS} ${LTCG_CFLAGS}|g" mkspecs/${_platform}/qmake.conf
sed -i "s|^QMAKE_LFLAGS +=\(.*\)$|QMAKE_LFLAGS += \1 ${_HARD_FLAGS}|g" mkspecs/common/gcc-base.conf
}
build() {
@@ -67,31 +115,36 @@ build() {
MSYS2_ARG_CONV_EXCL="-DCMAKE_INSTALL_PREFIX=" \
cmake \
-GNinja \
-DCMAKE_BUILD_TYPE=Release \
-DCMAKE_BUILD_TYPE=RelWithDebInfo \
-DQT_QMAKE_TARGET_MKSPEC=${_platform} \
-DCMAKE_INSTALL_PREFIX=${MINGW_PREFIX} \
-DINSTALL_INCLUDEDIR=include/qt6 \
-DINSTALL_ARCHDATADIR=share/qt6 \
-DINSTALL_DATADIR=share/qt6 \
-DINSTALL_MKSPECSDIR=share/qt6/mkspecs \
-DINSTALL_DESCRIPTIONSDIR=share/qt6/modules \
-DQT_FEATURE_system_doubleconversion=ON \
-DQT_FEATURE_system_freetype=ON \
-DQT_FEATURE_system_jpeg=ON \
-DQT_FEATURE_system_pcre2=ON \
-DQT_FEATURE_system_png=ON \
-DQT_FEATURE_system_sqlite=ON \
-DQT_FEATURE_system_zlib=ON \
-DQT_FEATURE_openssl=ON \
-DQT_FEATURE_opengl=ON \
-DQT_FEATURE_opengl_desktop=ON \
-DQT_FEATURE_dbus=ON \
-DQT_FEATURE_icu=ON \
-DQT_FEATURE_fontconfig=ON \
-DQT_FEATURE_pkg_config=ON \
-DQT_FEATURE_vulkan=ON \
-DQT_FEATURE_sql_ibase=OFF \
-DQT_FEATURE_force_debug_info=ON \
-DQT_FEATURE_separate_debug_info=ON \
-DFEATURE_system_doubleconversion=ON \
-DFEATURE_system_freetype=ON \
-DFEATURE_fontconfig=OFF \
-DFEATURE_system_jpeg=ON \
-DFEATURE_system_harfbuzz=ON \
-DFEATURE_system_pcre2=ON \
-DFEATURE_system_png=ON \
-DFEATURE_system_sqlite=ON \
-DFEATURE_system_zlib=ON \
-DFEATURE_zstd=ON \
-DFEATURE_openssl=ON \
-DFEATURE_opengl=ON \
-DFEATURE_opengl_desktop=ON \
-DFEATURE_dbus=ON \
-DFEATURE_gstreamer=OFF \
-DFEATURE_glib=OFF \
-DFEATURE_icu=ON \
-DFEATURE_pkg_config=ON \
-DFEATURE_vulkan=ON \
-DFEATURE_sql_ibase=OFF \
-DFEATURE_force_debug_info=ON \
-DFEATURE_separate_debug_info=ON \
../${_pkgfn}
export PATH=$PWD/bin:$PATH
@@ -104,14 +157,17 @@ package_qt6-base() {
"${MINGW_PACKAGE_PREFIX}-dbus"
"${MINGW_PACKAGE_PREFIX}-freetype"
"${MINGW_PACKAGE_PREFIX}-fontconfig"
"${MINGW_PACKAGE_PREFIX}-harfbuzz"
"${MINGW_PACKAGE_PREFIX}-icu"
"${MINGW_PACKAGE_PREFIX}-libjpeg-turbo"
"${MINGW_PACKAGE_PREFIX}-pcre2"
"${MINGW_PACKAGE_PREFIX}-libpng"
"${MINGW_PACKAGE_PREFIX}-md4c"
"${MINGW_PACKAGE_PREFIX}-openssl"
"${MINGW_PACKAGE_PREFIX}-pcre2"
"${MINGW_PACKAGE_PREFIX}-sqlite3"
"${MINGW_PACKAGE_PREFIX}-vulkan-loader"
"${MINGW_PACKAGE_PREFIX}-zlib"
"${MINGW_PACKAGE_PREFIX}-vulkan-loader")
"${MINGW_PACKAGE_PREFIX}-zstd")
optdepends=("${MINGW_PACKAGE_PREFIX}-libmariadbclient"
$( [[ ${MINGW_PACKAGE_PREFIX} == *-clang-* ]] || echo "${MINGW_PACKAGE_PREFIX}-firebird2" )
"${MINGW_PACKAGE_PREFIX}-postgresql")

4
mingw-w64-qt6-charts/PKGBUILD
View File

@@ -6,7 +6,7 @@ pkgname=("${MINGW_PACKAGE_PREFIX}-${_realname}"
"${MINGW_PACKAGE_PREFIX}-${_realname}-debug")
_qtver=6.2.0
pkgver=${_qtver/-/}
pkgrel=1
pkgrel=2
arch=(any)
mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64' 'clang32')
url='https://www.qt.io'
@@ -30,7 +30,7 @@ build() {
MSYS2_ARG_CONV_EXCL="-DCMAKE_INSTALL_PREFIX=" \
cmake \
-GNinja \
-DCMAKE_BUILD_TYPE=Release \
-DCMAKE_BUILD_TYPE=RelWithDebInfo \
-DCMAKE_INSTALL_PREFIX=${MINGW_PREFIX} \
../${_pkgfn}

4
mingw-w64-qt6-connectivity/PKGBUILD
View File

@@ -6,7 +6,7 @@ pkgname=("${MINGW_PACKAGE_PREFIX}-${_realname}"
"${MINGW_PACKAGE_PREFIX}-${_realname}-debug")
_qtver=6.2.0
pkgver=${_qtver/-/}
pkgrel=1
pkgrel=2
arch=(any)
mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64' 'clang32')
url='https://www.qt.io'
@@ -29,7 +29,7 @@ build() {
MSYS2_ARG_CONV_EXCL="-DCMAKE_INSTALL_PREFIX=" \
cmake \
-GNinja \
-DCMAKE_BUILD_TYPE=Release \
-DCMAKE_BUILD_TYPE=RelWithDebInfo \
-DCMAKE_INSTALL_PREFIX=${MINGW_PREFIX} \
../${_pkgfn}

4
mingw-w64-qt6-datavis3d/PKGBUILD
View File

@@ -6,7 +6,7 @@ pkgname=("${MINGW_PACKAGE_PREFIX}-${_realname}"
"${MINGW_PACKAGE_PREFIX}-${_realname}-debug")
_qtver=6.2.0
pkgver=${_qtver/-/}
pkgrel=1
pkgrel=2
arch=(any)
mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64' 'clang32')
url='https://www.qt.io'
@@ -30,7 +30,7 @@ build() {
MSYS2_ARG_CONV_EXCL="-DCMAKE_INSTALL_PREFIX=" \
cmake \
-GNinja \
-DCMAKE_BUILD_TYPE=Release \
-DCMAKE_BUILD_TYPE=RelWithDebInfo \
-DCMAKE_INSTALL_PREFIX=${MINGW_PREFIX} \
../${_pkgfn}

4
mingw-w64-qt6-declarative/PKGBUILD
View File

@@ -6,7 +6,7 @@ pkgname=("${MINGW_PACKAGE_PREFIX}-${_realname}"
"${MINGW_PACKAGE_PREFIX}-${_realname}-debug")
_qtver=6.2.0
pkgver=${_qtver/-/}
pkgrel=1
pkgrel=2
arch=(any)
mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64' 'clang32')
url='https://www.qt.io'
@@ -47,7 +47,7 @@ build() {
MSYS2_ARG_CONV_EXCL="-DCMAKE_INSTALL_PREFIX=" \
cmake \
-GNinja \
-DCMAKE_BUILD_TYPE=Release \
-DCMAKE_BUILD_TYPE=RelWithDebInfo \
-DCMAKE_INSTALL_PREFIX=${MINGW_PREFIX} \
../${_pkgfn}

4
mingw-w64-qt6-doc/PKGBUILD
View File

@@ -5,7 +5,7 @@ pkgbase=mingw-w64-${_realname}
pkgname=${MINGW_PACKAGE_PREFIX}-${_realname}
_qtver=6.2.0
pkgver=${_qtver/-/}
pkgrel=1
pkgrel=2
arch=(any)
mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64' 'clang32')
url='https://www.qt.io'
@@ -54,7 +54,7 @@ build() {
MSYS2_ARG_CONV_EXCL="-DCMAKE_INSTALL_PREFIX=" \
cmake \
-GNinja \
-DCMAKE_BUILD_TYPE=Release \
-DCMAKE_BUILD_TYPE=RelWithDebInfo \
-DCMAKE_INSTALL_PREFIX=${MINGW_PREFIX} \
-DQT_HOST_PATH=${MINGW_PREFIX} \
-DINSTALL_INCLUDEDIR=include/qt6 \

4
mingw-w64-qt6-imageformats/PKGBUILD
View File

@@ -6,7 +6,7 @@ pkgname=("${MINGW_PACKAGE_PREFIX}-${_realname}"
"${MINGW_PACKAGE_PREFIX}-${_realname}-debug")
_qtver=6.2.0
pkgver=${_qtver/-/}
pkgrel=1
pkgrel=2
arch=(any)
mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64' 'clang32')
url='https://www.qt.io'
@@ -39,7 +39,7 @@ build() {
MSYS2_ARG_CONV_EXCL="-DCMAKE_INSTALL_PREFIX=" \
cmake \
-GNinja \
-DCMAKE_BUILD_TYPE=Release \
-DCMAKE_BUILD_TYPE=RelWithDebInfo \
-DCMAKE_INSTALL_PREFIX=${MINGW_PREFIX} \
../${_pkgfn}

4
mingw-w64-qt6-location/PKGBUILD
View File

@@ -6,7 +6,7 @@ pkgname=("${MINGW_PACKAGE_PREFIX}-${_realname}"
"${MINGW_PACKAGE_PREFIX}-${_realname}-debug")
_qtver=6.2.0
pkgver=${_qtver/-/}
pkgrel=1
pkgrel=2
arch=(any)
mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64' 'clang32')
url='https://www.qt.io'
@@ -30,7 +30,7 @@ build() {
MSYS2_ARG_CONV_EXCL="-DCMAKE_INSTALL_PREFIX=" \
cmake \
-GNinja \
-DCMAKE_BUILD_TYPE=Release \
-DCMAKE_BUILD_TYPE=RelWithDebInfo \
-DCMAKE_INSTALL_PREFIX=${MINGW_PREFIX} \
../${_pkgfn}

4
mingw-w64-qt6-lottie/PKGBUILD
View File

@@ -6,7 +6,7 @@ pkgname=("${MINGW_PACKAGE_PREFIX}-${_realname}"
"${MINGW_PACKAGE_PREFIX}-${_realname}-debug")
_qtver=6.2.0
pkgver=${_qtver/-/}
pkgrel=1
pkgrel=2
arch=(any)
mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64' 'clang32')
url='https://www.qt.io'
@@ -29,7 +29,7 @@ build() {
MSYS2_ARG_CONV_EXCL="-DCMAKE_INSTALL_PREFIX=" \
cmake \
-GNinja \
-DCMAKE_BUILD_TYPE=Release \
-DCMAKE_BUILD_TYPE=RelWithDebInfo \
-DCMAKE_INSTALL_PREFIX=${MINGW_PREFIX} \
../${_pkgfn}

4
mingw-w64-qt6-multimedia/PKGBUILD
View File

@@ -6,7 +6,7 @@ pkgname=("${MINGW_PACKAGE_PREFIX}-${_realname}"
"${MINGW_PACKAGE_PREFIX}-${_realname}-debug")
_qtver=6.2.0
pkgver=${_qtver/-/}
pkgrel=1
pkgrel=2
arch=(any)
mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64' 'clang32')
url='https://www.qt.io'
@@ -30,7 +30,7 @@ build() {
MSYS2_ARG_CONV_EXCL="-DCMAKE_INSTALL_PREFIX=" \
cmake \
-GNinja \
-DCMAKE_BUILD_TYPE=Release \
-DCMAKE_BUILD_TYPE=RelWithDebInfo \
-DCMAKE_INSTALL_PREFIX=${MINGW_PREFIX} \
../${_pkgfn}

4
mingw-w64-qt6-networkauth/PKGBUILD
View File

@@ -6,7 +6,7 @@ pkgname=("${MINGW_PACKAGE_PREFIX}-${_realname}"
"${MINGW_PACKAGE_PREFIX}-${_realname}-debug")
_qtver=6.2.0
pkgver=${_qtver/-/}
pkgrel=1
pkgrel=2
arch=(any)
mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64' 'clang32')
url='https://www.qt.io'
@@ -29,7 +29,7 @@ build() {
MSYS2_ARG_CONV_EXCL="-DCMAKE_INSTALL_PREFIX=" \
cmake \
-GNinja \
-DCMAKE_BUILD_TYPE=Release \
-DCMAKE_BUILD_TYPE=RelWithDebInfo \
-DCMAKE_INSTALL_PREFIX=${MINGW_PREFIX} \
../${_pkgfn}

4
mingw-w64-qt6-quick3d/PKGBUILD
View File

@@ -6,7 +6,7 @@ pkgname=("${MINGW_PACKAGE_PREFIX}-${_realname}"
"${MINGW_PACKAGE_PREFIX}-${_realname}-debug")
_qtver=6.2.0
pkgver=${_qtver/-/}
pkgrel=1
pkgrel=2
arch=(any)
mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64' 'clang32')
url='https://www.qt.io'
@@ -50,7 +50,7 @@ build() {
MSYS2_ARG_CONV_EXCL="-DCMAKE_INSTALL_PREFIX=" \
cmake \
-GNinja \
-DCMAKE_BUILD_TYPE=Release \
-DCMAKE_BUILD_TYPE=RelWithDebInfo \
-DCMAKE_INSTALL_PREFIX=${MINGW_PREFIX} \
-DQT_FEATURE_quick3d_assimp=OFF \
../${_pkgfn}

4
mingw-w64-qt6-quicktimeline/PKGBUILD
View File

@@ -6,7 +6,7 @@ pkgname=("${MINGW_PACKAGE_PREFIX}-${_realname}"
"${MINGW_PACKAGE_PREFIX}-${_realname}-debug")
_qtver=6.2.0
pkgver=${_qtver/-/}
pkgrel=1
pkgrel=2
arch=(any)
mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64' 'clang32')
url='https://www.qt.io'
@@ -29,7 +29,7 @@ build() {
MSYS2_ARG_CONV_EXCL="-DCMAKE_INSTALL_PREFIX=" \
cmake \
-GNinja \
-DCMAKE_BUILD_TYPE=Release \
-DCMAKE_BUILD_TYPE=RelWithDebInfo \
-DCMAKE_INSTALL_PREFIX=${MINGW_PREFIX} \
../${_pkgfn}

4
mingw-w64-qt6-remoteobjects/PKGBUILD
View File

@@ -6,7 +6,7 @@ pkgname=("${MINGW_PACKAGE_PREFIX}-${_realname}"
"${MINGW_PACKAGE_PREFIX}-${_realname}-debug")
_qtver=6.2.0
pkgver=${_qtver/-/}
pkgrel=1
pkgrel=2
arch=(any)
mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64' 'clang32')
url='https://www.qt.io'
@@ -29,7 +29,7 @@ build() {
MSYS2_ARG_CONV_EXCL="-DCMAKE_INSTALL_PREFIX=" \
cmake \
-GNinja \
-DCMAKE_BUILD_TYPE=Release \
-DCMAKE_BUILD_TYPE=RelWithDebInfo \
-DCMAKE_INSTALL_PREFIX=${MINGW_PREFIX} \
../${_pkgfn}

4
mingw-w64-qt6-scxml/PKGBUILD
View File

@@ -6,7 +6,7 @@ pkgname=("${MINGW_PACKAGE_PREFIX}-${_realname}"
"${MINGW_PACKAGE_PREFIX}-${_realname}-debug")
_qtver=6.2.0
pkgver=${_qtver/-/}
pkgrel=1
pkgrel=2
arch=(any)
mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64' 'clang32')
url='https://www.qt.io'
@@ -29,7 +29,7 @@ build() {
MSYS2_ARG_CONV_EXCL="-DCMAKE_INSTALL_PREFIX=" \
cmake \
-GNinja \
-DCMAKE_BUILD_TYPE=Release \
-DCMAKE_BUILD_TYPE=RelWithDebInfo \
-DCMAKE_INSTALL_PREFIX=${MINGW_PREFIX} \
../${_pkgfn}

4
mingw-w64-qt6-sensors/PKGBUILD
View File

@@ -6,7 +6,7 @@ pkgname=("${MINGW_PACKAGE_PREFIX}-${_realname}"
"${MINGW_PACKAGE_PREFIX}-${_realname}-debug")
_qtver=6.2.0
pkgver=${_qtver/-/}
pkgrel=1
pkgrel=2
arch=(any)
mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64' 'clang32')
url='https://www.qt.io'
@@ -30,7 +30,7 @@ build() {
MSYS2_ARG_CONV_EXCL="-DCMAKE_INSTALL_PREFIX=" \
cmake \
-GNinja \
-DCMAKE_BUILD_TYPE=Release \
-DCMAKE_BUILD_TYPE=RelWithDebInfo \
-DCMAKE_INSTALL_PREFIX=${MINGW_PREFIX} \
../${_pkgfn}

4
mingw-w64-qt6-serialbus/PKGBUILD
View File

@@ -6,7 +6,7 @@ pkgname=("${MINGW_PACKAGE_PREFIX}-${_realname}"
"${MINGW_PACKAGE_PREFIX}-${_realname}-debug")
_qtver=6.2.0
pkgver=${_qtver/-/}
pkgrel=1
pkgrel=2
arch=(any)
mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64' 'clang32')
url='https://www.qt.io'
@@ -47,7 +47,7 @@ build() {
MSYS2_ARG_CONV_EXCL="-DCMAKE_INSTALL_PREFIX=" \
cmake \
-GNinja \
-DCMAKE_BUILD_TYPE=Release \
-DCMAKE_BUILD_TYPE=RelWithDebInfo \
-DCMAKE_INSTALL_PREFIX=${MINGW_PREFIX} \
../${_pkgfn}

4
mingw-w64-qt6-serialport/PKGBUILD
View File

@@ -6,7 +6,7 @@ pkgname=("${MINGW_PACKAGE_PREFIX}-${_realname}"
"${MINGW_PACKAGE_PREFIX}-${_realname}-debug")
_qtver=6.2.0
pkgver=${_qtver/-/}
pkgrel=1
pkgrel=2
arch=(any)
mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64' 'clang32')
url='https://www.qt.io'
@@ -29,7 +29,7 @@ build() {
MSYS2_ARG_CONV_EXCL="-DCMAKE_INSTALL_PREFIX=" \
cmake \
-GNinja \
-DCMAKE_BUILD_TYPE=Release \
-DCMAKE_BUILD_TYPE=RelWithDebInfo \
-DCMAKE_INSTALL_PREFIX=${MINGW_PREFIX} \
../${_pkgfn}

4
mingw-w64-qt6-shadertools/PKGBUILD
View File

@@ -6,7 +6,7 @@ pkgname=("${MINGW_PACKAGE_PREFIX}-${_realname}"
"${MINGW_PACKAGE_PREFIX}-${_realname}-debug")
_qtver=6.2.0
pkgver=${_qtver/-/}
pkgrel=1
pkgrel=2
arch=(any)
mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64' 'clang32')
url='https://www.qt.io'
@@ -30,7 +30,7 @@ build() {
MSYS2_ARG_CONV_EXCL="-DCMAKE_INSTALL_PREFIX=" \
cmake \
-GNinja \
-DCMAKE_BUILD_TYPE=Release \
-DCMAKE_BUILD_TYPE=RelWithDebInfo \
-DCMAKE_INSTALL_PREFIX=${MINGW_PREFIX} \
../${_pkgfn}

4
mingw-w64-qt6-svg/PKGBUILD
View File

@@ -6,7 +6,7 @@ pkgname=("${MINGW_PACKAGE_PREFIX}-${_realname}"
"${MINGW_PACKAGE_PREFIX}-${_realname}-debug")
_qtver=6.2.0
pkgver=${_qtver/-/}
pkgrel=1
pkgrel=2
arch=(any)
mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64' 'clang32')
url='https://www.qt.io'
@@ -30,7 +30,7 @@ build() {
MSYS2_ARG_CONV_EXCL="-DCMAKE_INSTALL_PREFIX=" \
cmake \
-GNinja \
-DCMAKE_BUILD_TYPE=Release \
-DCMAKE_BUILD_TYPE=RelWithDebInfo \
-DCMAKE_INSTALL_PREFIX=${MINGW_PREFIX} \
../${_pkgfn}

4
mingw-w64-qt6-tools/PKGBUILD
View File

@@ -6,7 +6,7 @@ pkgname=("${MINGW_PACKAGE_PREFIX}-${_realname}"
"${MINGW_PACKAGE_PREFIX}-${_realname}-debug")
_qtver=6.2.0
pkgver=${_qtver/-/}
pkgrel=1
pkgrel=2
arch=(any)
mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64' 'clang32')
url='https://www.qt.io'
@@ -61,7 +61,7 @@ build() {
MSYS2_ARG_CONV_EXCL="-DCMAKE_INSTALL_PREFIX=" \
cmake \
-GNinja \
-DCMAKE_BUILD_TYPE=Release \
-DCMAKE_BUILD_TYPE=RelWithDebInfo \
-DCMAKE_INSTALL_PREFIX=${MINGW_PREFIX} \
-DQT_FEATURE_clang=ON \
-DQT_FEATURE_clangcpp=${_clangcpp} \

4
mingw-w64-qt6-translations/PKGBUILD
View File

@@ -5,7 +5,7 @@ pkgbase=mingw-w64-${_realname}
pkgname=${MINGW_PACKAGE_PREFIX}-${_realname}
_qtver=6.2.0
pkgver=${_qtver/-/}
pkgrel=1
pkgrel=2
arch=(any)
mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64' 'clang32')
url='https://www.qt.io'
@@ -30,7 +30,7 @@ build() {
MSYS2_ARG_CONV_EXCL="-DCMAKE_INSTALL_PREFIX=" \
cmake \
-GNinja \
-DCMAKE_BUILD_TYPE=Release \
-DCMAKE_BUILD_TYPE=RelWithDebInfo \
-DCMAKE_INSTALL_PREFIX=${MINGW_PREFIX} \
../${_pkgfn}

4
mingw-w64-qt6-virtualkeyboard/PKGBUILD
View File

@@ -6,7 +6,7 @@ pkgname=("${MINGW_PACKAGE_PREFIX}-${_realname}"
"${MINGW_PACKAGE_PREFIX}-${_realname}-debug")
_qtver=6.2.0
pkgver=${_qtver/-/}
pkgrel=1
pkgrel=2
arch=(any)
mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64' 'clang32')
url='https://www.qt.io'
@@ -32,7 +32,7 @@ build() {
MSYS2_ARG_CONV_EXCL="-DCMAKE_INSTALL_PREFIX=" \
cmake \
-GNinja \
-DCMAKE_BUILD_TYPE=Release \
-DCMAKE_BUILD_TYPE=RelWithDebInfo \
-DCMAKE_INSTALL_PREFIX=${MINGW_PREFIX} \
../${_pkgfn}

4
mingw-w64-qt6-webchannel/PKGBUILD
View File

@@ -6,7 +6,7 @@ pkgname=("${MINGW_PACKAGE_PREFIX}-${_realname}"
"${MINGW_PACKAGE_PREFIX}-${_realname}-debug")
_qtver=6.2.0
pkgver=${_qtver/-/}
pkgrel=1
pkgrel=2
arch=(any)
mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64' 'clang32')
url='https://www.qt.io'
@@ -30,7 +30,7 @@ build() {
MSYS2_ARG_CONV_EXCL="-DCMAKE_INSTALL_PREFIX=" \
cmake \
-GNinja \
-DCMAKE_BUILD_TYPE=Release \
-DCMAKE_BUILD_TYPE=RelWithDebInfo \
-DCMAKE_INSTALL_PREFIX=${MINGW_PREFIX} \
../${_pkgfn}

4
mingw-w64-qt6-websockets/PKGBUILD
View File

@@ -6,7 +6,7 @@ pkgname=("${MINGW_PACKAGE_PREFIX}-${_realname}"
"${MINGW_PACKAGE_PREFIX}-${_realname}-debug")
_qtver=6.2.0
pkgver=${_qtver/-/}
pkgrel=1
pkgrel=2
arch=(any)
mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64' 'clang32')
url='https://www.qt.io'
@@ -29,7 +29,7 @@ build() {
MSYS2_ARG_CONV_EXCL="-DCMAKE_INSTALL_PREFIX=" \
cmake \
-GNinja \
-DCMAKE_BUILD_TYPE=Release \
-DCMAKE_BUILD_TYPE=RelWithDebInfo \
-DCMAKE_INSTALL_PREFIX=${MINGW_PREFIX} \
../${_pkgfn}

4
mingw-w64-qt6-webview/PKGBUILD
View File

@@ -6,7 +6,7 @@ pkgname=("${MINGW_PACKAGE_PREFIX}-${_realname}"
"${MINGW_PACKAGE_PREFIX}-${_realname}-debug")
_qtver=6.2.0
pkgver=${_qtver/-/}
pkgrel=1
pkgrel=2
arch=(any)
mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64' 'clang32')
url='https://www.qt.io'
@@ -29,7 +29,7 @@ build() {
MSYS2_ARG_CONV_EXCL="-DCMAKE_INSTALL_PREFIX=" \
cmake \
-GNinja \
-DCMAKE_BUILD_TYPE=Release \
-DCMAKE_BUILD_TYPE=RelWithDebInfo \
-DCMAKE_INSTALL_PREFIX=${MINGW_PREFIX} \
../${_pkgfn}