Update Qt 6 packages to 6.0.0
This commit is contained in:
parent
8bcbcdde52
commit
884c9b52c6
|
@ -14,7 +14,7 @@
|
|||
% }
|
||||
|
||||
pkgname=<%= $package_name %>
|
||||
_qtver=6.0.0-rc
|
||||
_qtver=6.0.0
|
||||
pkgver=${_qtver/-/}
|
||||
pkgrel=1
|
||||
arch=(any)
|
||||
|
@ -33,7 +33,7 @@ optdepends=('mingw-w64-postgresql: PostgreSQL driver'
|
|||
options=('!strip' '!buildflags' 'staticlibs' '!emptydirs')
|
||||
groups=(mingw-w64-qt6)
|
||||
_pkgfqn="qt<%== $qt_module %>-everywhere-src-${_qtver}"
|
||||
source=("https://download.qt.io/development_releases/qt/${pkgver%.*}/${_qtver}/submodules/${_pkgfqn}.tar.xz"\
|
||||
source=("https://download.qt.io/official_releases/qt/${pkgver%.*}/${_qtver}/submodules/${_pkgfqn}.tar.xz"\
|
||||
<%== include 'fragments/source_file_list', relevant_files => $patch_files %>)
|
||||
sha256sums=('<%== $qt_module_sha256 %>'\
|
||||
<%== include 'fragments/sha256_list', relevant_files => $patch_files %>)
|
||||
|
|
|
@ -13,8 +13,11 @@ _pkgfqn="qt<%== $qt_module %>-everywhere-src-${_qtver}"
|
|||
% if (my $git_commit = stash('git_commit')) {
|
||||
source=("$_pkgfqn::git://code.qt.io/qt/qt<%== $qt_module %>.git#commit=<%== $git_commit %>"\
|
||||
% }
|
||||
% elsif (my $git_tag = stash('git_tag')) {
|
||||
source=("$_pkgfqn::git://code.qt.io/qt/qt<%== $qt_module %>.git#tag=<%== $git_tag %>"\
|
||||
% }
|
||||
% else {
|
||||
source=("https://download.qt.io/development_releases/qt/${pkgver%.*}/${_qtver}/submodules/${_pkgfqn}.tar.xz"\
|
||||
source=("https://download.qt.io/official_releases/qt/${pkgver%.*}/${_qtver}/submodules/${_pkgfqn}.tar.xz"\
|
||||
% }
|
||||
<%== include 'fragments/source_file_list', relevant_files => $patch_files %>)
|
||||
sha256sums=('<%== stash('git_commit') ? 'SKIP' : $qt_module_sha256 %>'\
|
||||
|
|
|
@ -12,8 +12,11 @@ _pkgfqn="${pkgname/6-/}-everywhere-src-${_qtver}"
|
|||
% if (my $git_commit = stash('git_commit')) {
|
||||
source=("$_pkgfqn::git://code.qt.io/qt/qt<%== $qt_module %>.git#commit=<%== $git_commit %>"\
|
||||
% }
|
||||
% elsif (my $git_tag = stash('git_tag')) {
|
||||
source=("$_pkgfqn::git://code.qt.io/qt/qt<%== $qt_module %>.git#tag=<%== $git_tag %>"\
|
||||
% }
|
||||
% else {
|
||||
source=("https://download.qt.io/development_releases/qt/${pkgver%.*}/${_qtver}/submodules/${_pkgfqn}.tar.xz"\
|
||||
source=("https://download.qt.io/official_releases/qt/${pkgver%.*}/${_qtver}/submodules/${_pkgfqn}.tar.xz"\
|
||||
% }
|
||||
<%== include 'fragments/source_file_list', relevant_files => $patch_files %>)
|
||||
sha256sums=('<%== stash('git_commit') ? 'SKIP' : $qt_module_sha256 %>'\
|
||||
|
|
|
@ -13,7 +13,7 @@ declare -A versions=(
|
|||
[dbus-soundrecorder]=1.2.3
|
||||
[geocoordinatecalculator]=1.1.3
|
||||
[qt5]=5.15.2
|
||||
[qt6]=6.0.0-rc
|
||||
[qt6]=6.0.0
|
||||
)
|
||||
declare -A github_names=(
|
||||
[c++utilities]=cpp-utilities
|
||||
|
|
|
@ -11,7 +11,7 @@ _cfg=qt6
|
|||
pkgname=passwordmanager-$_cfg
|
||||
_name=${pkgname%-$_cfg}
|
||||
pkgver=4.1.6
|
||||
pkgrel=1
|
||||
pkgrel=2
|
||||
arch=('i686' 'x86_64' 'armv6h' 'armv7h' 'aarch64')
|
||||
pkgdesc='A simple password store using AES-256-CBC encryption via OpenSSL'
|
||||
license=('GPL')
|
||||
|
|
|
@ -17,7 +17,7 @@ optdepends=('assimp: assimp importer'
|
|||
'qt6-shadertools: RHI renderer')
|
||||
groups=(qt6)
|
||||
_pkgfqn="${pkgname/6-/}-everywhere-src-${_qtver}"
|
||||
source=("https://download.qt.io/development_releases/qt/${pkgver%.*}/${_qtver}/submodules/${_pkgfqn}.tar.xz")
|
||||
source=("https://download.qt.io/official_releases/qt/${pkgver%.*}/${_qtver}/submodules/${_pkgfqn}.tar.xz")
|
||||
sha256sums=('3362d01c7542af0e902908d2d339374feda1a037552ea625b900278982375c27')
|
||||
|
||||
build() {
|
||||
|
|
|
@ -19,7 +19,7 @@ optdepends=('mingw-w64-assimp: Import from assimp'
|
|||
options=('!strip' '!buildflags' 'staticlibs' '!emptydirs')
|
||||
groups=(mingw-w64-qt6)
|
||||
_pkgfqn="qt3d-everywhere-src-${_qtver}"
|
||||
source=("https://download.qt.io/development_releases/qt/${pkgver%.*}/${_qtver}/submodules/${_pkgfqn}.tar.xz")
|
||||
source=("https://download.qt.io/official_releases/qt/${pkgver%.*}/${_qtver}/submodules/${_pkgfqn}.tar.xz")
|
||||
sha256sums=('3362d01c7542af0e902908d2d339374feda1a037552ea625b900278982375c27')
|
||||
|
||||
_architectures='i686-w64-mingw32 x86_64-w64-mingw32'
|
||||
|
|
|
@ -19,7 +19,7 @@ optdepends=('mingw-w64-assimp: Import from assimp'
|
|||
options=('!strip' '!buildflags' 'staticlibs' '!emptydirs')
|
||||
groups=(mingw-w64-qt6)
|
||||
_pkgfqn="qt3d-everywhere-src-${_qtver}"
|
||||
source=("https://download.qt.io/development_releases/qt/${pkgver%.*}/${_qtver}/submodules/${_pkgfqn}.tar.xz")
|
||||
source=("https://download.qt.io/official_releases/qt/${pkgver%.*}/${_qtver}/submodules/${_pkgfqn}.tar.xz")
|
||||
sha256sums=('3362d01c7542af0e902908d2d339374feda1a037552ea625b900278982375c27')
|
||||
|
||||
_architectures='i686-w64-mingw32 x86_64-w64-mingw32'
|
||||
|
|
|
@ -4,7 +4,7 @@
|
|||
# you also find the URL of a binary repository.
|
||||
|
||||
pkgname=qt6-5compat
|
||||
_qtver=6.0.0-rc
|
||||
_qtver=6.0.0
|
||||
pkgver=${_qtver/-/}
|
||||
pkgrel=1
|
||||
arch=(x86_64)
|
||||
|
@ -15,7 +15,7 @@ depends=(qt6-base)
|
|||
makedepends=(cmake ninja)
|
||||
groups=(qt6)
|
||||
_pkgfqn="${pkgname/6-/}-everywhere-src-${_qtver}"
|
||||
source=("https://download.qt.io/development_releases/qt/${pkgver%.*}/${_qtver}/submodules/${_pkgfqn}.tar.xz")
|
||||
source=("https://download.qt.io/official_releases/qt/${pkgver%.*}/${_qtver}/submodules/${_pkgfqn}.tar.xz")
|
||||
sha256sums=('114a7f5f69c53449c545a03262b55c223cf32f276188e7bead4dfa2f3672c1c0')
|
||||
|
||||
build() {
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
% layout 'qt6-module';
|
||||
\
|
||||
_qtver=6.0.0-rc
|
||||
_qtver=6.0.0
|
||||
pkgver=${_qtver/-/}
|
||||
pkgrel=1
|
||||
arch=(x86_64)
|
||||
|
|
|
@ -4,7 +4,7 @@
|
|||
# you also find the URL of a binary repository.
|
||||
|
||||
pkgname=mingw-w64-qt6-5compat-static
|
||||
_qtver=6.0.0-rc
|
||||
_qtver=6.0.0
|
||||
pkgver=${_qtver/-/}
|
||||
pkgrel=1
|
||||
arch=(any)
|
||||
|
@ -16,8 +16,8 @@ makedepends=('mingw-w64-cmake-static' 'qt6-base' 'ninja')
|
|||
options=('!strip' '!buildflags' 'staticlibs' '!emptydirs')
|
||||
groups=(mingw-w64-qt6)
|
||||
_pkgfqn="qt5compat-everywhere-src-${_qtver}"
|
||||
source=("https://download.qt.io/development_releases/qt/${pkgver%.*}/${_qtver}/submodules/${_pkgfqn}.tar.xz")
|
||||
sha256sums=('114a7f5f69c53449c545a03262b55c223cf32f276188e7bead4dfa2f3672c1c0')
|
||||
source=("https://download.qt.io/official_releases/qt/${pkgver%.*}/${_qtver}/submodules/${_pkgfqn}.tar.xz")
|
||||
sha256sums=('13b9d78aa698609d07376e3e9e9d1a82a96084236aba0642f8ac695c181ab25f')
|
||||
|
||||
_architectures='i686-w64-mingw32 x86_64-w64-mingw32'
|
||||
|
||||
|
|
|
@ -1 +1 @@
|
|||
114a7f5f69c53449c545a03262b55c223cf32f276188e7bead4dfa2f3672c1c0
|
||||
13b9d78aa698609d07376e3e9e9d1a82a96084236aba0642f8ac695c181ab25f
|
||||
|
|
|
@ -4,7 +4,7 @@
|
|||
# you also find the URL of a binary repository.
|
||||
|
||||
pkgname=mingw-w64-qt6-5compat
|
||||
_qtver=6.0.0-rc
|
||||
_qtver=6.0.0
|
||||
pkgver=${_qtver/-/}
|
||||
pkgrel=1
|
||||
arch=(any)
|
||||
|
@ -16,8 +16,8 @@ makedepends=('mingw-w64-cmake' 'qt6-base' 'ninja')
|
|||
options=('!strip' '!buildflags' 'staticlibs' '!emptydirs')
|
||||
groups=(mingw-w64-qt6)
|
||||
_pkgfqn="qt5compat-everywhere-src-${_qtver}"
|
||||
source=("https://download.qt.io/development_releases/qt/${pkgver%.*}/${_qtver}/submodules/${_pkgfqn}.tar.xz")
|
||||
sha256sums=('114a7f5f69c53449c545a03262b55c223cf32f276188e7bead4dfa2f3672c1c0')
|
||||
source=("https://download.qt.io/official_releases/qt/${pkgver%.*}/${_qtver}/submodules/${_pkgfqn}.tar.xz")
|
||||
sha256sums=('13b9d78aa698609d07376e3e9e9d1a82a96084236aba0642f8ac695c181ab25f')
|
||||
|
||||
_architectures='i686-w64-mingw32 x86_64-w64-mingw32'
|
||||
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
% layout 'mingw-w64-qt6-module';
|
||||
\
|
||||
_qtver=6.0.0-rc
|
||||
_qtver=6.0.0
|
||||
pkgver=${_qtver/-/}
|
||||
pkgrel=1
|
||||
arch=(any)
|
||||
|
|
|
@ -1 +1 @@
|
|||
114a7f5f69c53449c545a03262b55c223cf32f276188e7bead4dfa2f3672c1c0
|
||||
13b9d78aa698609d07376e3e9e9d1a82a96084236aba0642f8ac695c181ab25f
|
||||
|
|
|
@ -5,7 +5,7 @@
|
|||
# you also find the URL of a binary repository.
|
||||
|
||||
pkgname=qt6-base
|
||||
_qtver=6.0.0-rc
|
||||
_qtver=6.0.0
|
||||
pkgver=${_qtver/-/}
|
||||
pkgrel=1
|
||||
arch=(x86_64)
|
||||
|
@ -26,7 +26,7 @@ optdepends=('postgresql-libs: PostgreSQL driver'
|
|||
'perl: for fixqt4headers and syncqt')
|
||||
groups=(qt6)
|
||||
_pkgfqn="${pkgname/6-/}-everywhere-src-${_qtver}"
|
||||
source=("https://download.qt.io/development_releases/qt/${pkgver%.*}/${_qtver}/submodules/${_pkgfqn}.tar.xz")
|
||||
source=("https://download.qt.io/official_releases/qt/${pkgver%.*}/${_qtver}/submodules/${_pkgfqn}.tar.xz")
|
||||
sha256sums=('8dc2c6fe053235e4a2866d8e1927fd667e5e8c853c96de708b9688012089138d')
|
||||
|
||||
build() {
|
||||
|
|
|
@ -1,115 +0,0 @@
|
|||
From 302744ea356871a22f9cb6819bf0a9baf0e8211c Mon Sep 17 00:00:00 2001
|
||||
From: Martchus <martchus@gmx.net>
|
||||
Date: Thu, 5 Nov 2020 22:08:10 +0100
|
||||
Subject: [PATCH 1/7] Use CMake's default import library suffix
|
||||
|
||||
Change-Id: Iedc6a7ee8982a62ddd56ad0bf25ba0b8752a666a
|
||||
---
|
||||
cmake/QtPriHelpers.cmake | 12 ++++++++++--
|
||||
cmake/QtPrlHelpers.cmake | 8 +++++++-
|
||||
cmake/QtTargetHelpers.cmake | 2 --
|
||||
mkspecs/common/g++-win32.conf | 1 +
|
||||
mkspecs/features/create_cmake.prf | 5 +++--
|
||||
5 files changed, 21 insertions(+), 7 deletions(-)
|
||||
|
||||
diff --git a/cmake/QtPriHelpers.cmake b/cmake/QtPriHelpers.cmake
|
||||
index 5fc0a5877b..5782de0f91 100644
|
||||
--- a/cmake/QtPriHelpers.cmake
|
||||
+++ b/cmake/QtPriHelpers.cmake
|
||||
@@ -330,9 +330,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})
|
||||
add_custom_command(
|
||||
@@ -737,9 +741,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})
|
||||
add_custom_command(
|
||||
diff --git a/cmake/QtPrlHelpers.cmake b/cmake/QtPrlHelpers.cmake
|
||||
index 35d321420c..40a85e6c73 100644
|
||||
--- a/cmake/QtPrlHelpers.cmake
|
||||
+++ b/cmake/QtPrlHelpers.cmake
|
||||
@@ -258,11 +258,17 @@ QMAKE_PRL_VERSION = ${PROJECT_VERSION}
|
||||
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})
|
||||
diff --git a/cmake/QtTargetHelpers.cmake b/cmake/QtTargetHelpers.cmake
|
||||
index fcbb3ab1f2..332ef6ee4c 100644
|
||||
--- a/cmake/QtTargetHelpers.cmake
|
||||
+++ b/cmake/QtTargetHelpers.cmake
|
||||
@@ -283,8 +283,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")
|
||||
set_property(TARGET "${target}" PROPERTY PREFIX "lib")
|
||||
diff --git a/mkspecs/common/g++-win32.conf b/mkspecs/common/g++-win32.conf
|
||||
index 67ad1e3b8c..b98c7121f6 100644
|
||||
--- a/mkspecs/common/g++-win32.conf
|
||||
+++ b/mkspecs/common/g++-win32.conf
|
||||
@@ -54,6 +54,7 @@ QMAKE_PREFIX_SHLIB =
|
||||
QMAKE_EXTENSION_SHLIB = dll
|
||||
QMAKE_PREFIX_STATICLIB = lib
|
||||
QMAKE_EXTENSION_STATICLIB = a
|
||||
+QMAKE_EXTENSION_IMPORTLIB = dll.a
|
||||
QMAKE_LIB_EXTENSIONS = a dll.a
|
||||
|
||||
QMAKE_LIBS =
|
||||
diff --git a/mkspecs/features/create_cmake.prf b/mkspecs/features/create_cmake.prf
|
||||
index 24ed125f12..73ebe453d3 100644
|
||||
--- a/mkspecs/features/create_cmake.prf
|
||||
+++ b/mkspecs/features/create_cmake.prf
|
||||
@@ -332,8 +332,9 @@ mac {
|
||||
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(QMAKE_EXTENSION_IMPORTLIB): QMAKE_EXTENSION_IMPORTLIB = 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
|
||||
--
|
||||
2.29.2
|
||||
|
|
@ -0,0 +1 @@
|
|||
../mingw-w64/0001-Use-CMake-s-default-import-library-suffix.patch
|
|
@ -1,23 +0,0 @@
|
|||
From 8a975011cc6b9fa6277ad4bb9015d5d509ad769a Mon Sep 17 00:00:00 2001
|
||||
From: Martchus <martchus@gmx.net>
|
||||
Date: Wed, 7 Oct 2020 12:13:37 +0200
|
||||
Subject: [PATCH 2/7] Fix finding D-Bus
|
||||
|
||||
Change-Id: Ie21eb9cbc6b1b5d9c8b34eea46f54718e5926986
|
||||
---
|
||||
cmake/FindWrapDBus1.cmake | 1 +
|
||||
1 file changed, 1 insertion(+)
|
||||
|
||||
diff --git a/cmake/FindWrapDBus1.cmake b/cmake/FindWrapDBus1.cmake
|
||||
index e227d224e0..4982e7c8ae 100644
|
||||
--- a/cmake/FindWrapDBus1.cmake
|
||||
+++ b/cmake/FindWrapDBus1.cmake
|
||||
@@ -45,3 +45,4 @@ include(FindPackageHandleStandardArgs)
|
||||
find_package_handle_standard_args(WrapDBus1 REQUIRED_VARS
|
||||
DBus1_LIBRARY DBus1_INCLUDE_DIR WrapDBus1_FOUND
|
||||
VERSION_VAR DBus1_VERSION)
|
||||
+set_property(TARGET dbus-1 PROPERTY IMPORTED_IMPLIB ${DBus1_LIBRARY})
|
||||
\ No newline at end of file
|
||||
--
|
||||
2.29.2
|
||||
|
|
@ -0,0 +1 @@
|
|||
../mingw-w64/0002-Fix-finding-D-Bus.patch
|
|
@ -1,48 +0,0 @@
|
|||
From 7a839b449645c8978889c0a09f2c149398c833e3 Mon Sep 17 00:00:00 2001
|
||||
From: Martchus <martchus@gmx.net>
|
||||
Date: Thu, 5 Nov 2020 21:13:19 +0100
|
||||
Subject: [PATCH 3/7] Fix using static PCRE2 and DBus-1
|
||||
|
||||
When making a static build of Qt we're using the static version of these
|
||||
libraries and must define the corresponding macros.
|
||||
|
||||
Change-Id: I2387b79462b6d183b71f9433dd937f63fc7ef26e
|
||||
---
|
||||
src/corelib/text/qregularexpression.cpp | 5 +++++
|
||||
src/dbus/qdbus_symbols_p.h | 4 ++++
|
||||
2 files changed, 9 insertions(+)
|
||||
|
||||
diff --git a/src/corelib/text/qregularexpression.cpp b/src/corelib/text/qregularexpression.cpp
|
||||
index 827884d709..be5159186c 100644
|
||||
--- a/src/corelib/text/qregularexpression.cpp
|
||||
+++ b/src/corelib/text/qregularexpression.cpp
|
||||
@@ -53,6 +53,11 @@
|
||||
#include <QtCore/qdatastream.h>
|
||||
|
||||
#define PCRE2_CODE_UNIT_WIDTH 16
|
||||
+#ifdef QT_STATIC
|
||||
+#define PCRE_STATIC
|
||||
+#define PCRE2_STATIC
|
||||
+#endif
|
||||
+#define PCRE2_EXP_DECL Q_CORE_EXPORT
|
||||
|
||||
#include <pcre2.h>
|
||||
|
||||
diff --git a/src/dbus/qdbus_symbols_p.h b/src/dbus/qdbus_symbols_p.h
|
||||
index accaa4f5ed..4b11c74caa 100644
|
||||
--- a/src/dbus/qdbus_symbols_p.h
|
||||
+++ b/src/dbus/qdbus_symbols_p.h
|
||||
@@ -57,6 +57,10 @@
|
||||
|
||||
#ifndef QT_NO_DBUS
|
||||
|
||||
+#ifdef QT_STATIC
|
||||
+# define DBUS_STATIC_BUILD
|
||||
+#endif
|
||||
+
|
||||
#ifdef QT_LINKED_LIBDBUS
|
||||
# include <dbus/dbus.h>
|
||||
#else
|
||||
--
|
||||
2.29.2
|
||||
|
|
@ -0,0 +1 @@
|
|||
../mingw-w64/0003-Fix-using-static-PCRE2-and-DBus-1.patch
|
|
@ -1,126 +0,0 @@
|
|||
From 7c05fdef291be4b1819c15845116005f865b185e Mon Sep 17 00:00:00 2001
|
||||
From: Martchus <martchus@gmx.net>
|
||||
Date: Thu, 5 Nov 2020 21:59:33 +0100
|
||||
Subject: [PATCH 4/7] Fix transitive dependencies (of static libraries)
|
||||
|
||||
The dependencies of these libraries are not reliably picked up by their
|
||||
corresponding find modules. This change allows adding the required
|
||||
dependencies by setting certain variables, e.g. within the toolchain file.
|
||||
|
||||
Change-Id: I89da5ef519dd6dd3f86a94a01d3da7208a070bdb
|
||||
---
|
||||
.../3rdparty/extra-cmake-modules/find-modules/FindGLIB2.cmake | 2 +-
|
||||
cmake/FindMySQL.cmake | 1 +
|
||||
cmake/FindWrapDBus1.cmake | 3 ++-
|
||||
cmake/FindWrapOpenSSL.cmake | 2 +-
|
||||
cmake/FindWrapSystemFreetype.cmake | 2 +-
|
||||
cmake/FindWrapSystemHarfbuzz.cmake | 2 +-
|
||||
cmake/FindWrapSystemPNG.cmake | 2 +-
|
||||
src/plugins/sqldrivers/psql/CMakeLists.txt | 2 +-
|
||||
8 files changed, 9 insertions(+), 7 deletions(-)
|
||||
|
||||
diff --git a/cmake/3rdparty/extra-cmake-modules/find-modules/FindGLIB2.cmake b/cmake/3rdparty/extra-cmake-modules/find-modules/FindGLIB2.cmake
|
||||
index 8f873c1b45..831ca8e624 100644
|
||||
--- a/cmake/3rdparty/extra-cmake-modules/find-modules/FindGLIB2.cmake
|
||||
+++ b/cmake/3rdparty/extra-cmake-modules/find-modules/FindGLIB2.cmake
|
||||
@@ -95,7 +95,7 @@ if(GLIB2_FOUND AND NOT TARGET GLIB2::GLIB2)
|
||||
add_library(GLIB2::GLIB2 UNKNOWN IMPORTED)
|
||||
set_target_properties(GLIB2::GLIB2 PROPERTIES
|
||||
IMPORTED_LOCATION "${GLIB2_LIBRARIES}"
|
||||
- INTERFACE_LINK_LIBRARIES "${GTHREAD2_LIBRARIES}"
|
||||
+ INTERFACE_LINK_LIBRARIES "${GTHREAD2_LIBRARIES};${GLIB2_DEPENDENCIES}"
|
||||
INTERFACE_INCLUDE_DIRECTORIES "${GLIB2_INCLUDE_DIRS}")
|
||||
endif()
|
||||
|
||||
diff --git a/cmake/FindMySQL.cmake b/cmake/FindMySQL.cmake
|
||||
index 54c94b8a2f..7575386338 100644
|
||||
--- a/cmake/FindMySQL.cmake
|
||||
+++ b/cmake/FindMySQL.cmake
|
||||
@@ -38,6 +38,7 @@ if(MySQL_FOUND AND NOT TARGET MySQL::MySQL)
|
||||
add_library(MySQL::MySQL UNKNOWN IMPORTED)
|
||||
set_target_properties(MySQL::MySQL PROPERTIES
|
||||
IMPORTED_LOCATION "${MySQL_LIBRARIES}"
|
||||
+ INTERFACE_LINK_LIBRARIES "${MYSQL_DEPENDENCIES}"
|
||||
INTERFACE_INCLUDE_DIRECTORIES "${MySQL_INCLUDE_DIRS}")
|
||||
endif()
|
||||
|
||||
diff --git a/cmake/FindWrapDBus1.cmake b/cmake/FindWrapDBus1.cmake
|
||||
index 4982e7c8ae..56d139c538 100644
|
||||
--- a/cmake/FindWrapDBus1.cmake
|
||||
+++ b/cmake/FindWrapDBus1.cmake
|
||||
@@ -45,4 +45,5 @@ include(FindPackageHandleStandardArgs)
|
||||
find_package_handle_standard_args(WrapDBus1 REQUIRED_VARS
|
||||
DBus1_LIBRARY DBus1_INCLUDE_DIR WrapDBus1_FOUND
|
||||
VERSION_VAR DBus1_VERSION)
|
||||
-set_property(TARGET dbus-1 PROPERTY IMPORTED_IMPLIB ${DBus1_LIBRARY})
|
||||
\ No newline at end of file
|
||||
+set_property(TARGET dbus-1 PROPERTY IMPORTED_IMPLIB ${DBus1_LIBRARY})
|
||||
+set_property(TARGET dbus-1 PROPERTY INTERFACE_LINK_LIBRARIES "${DBUS1_DEPENDENCIES}")
|
||||
diff --git a/cmake/FindWrapOpenSSL.cmake b/cmake/FindWrapOpenSSL.cmake
|
||||
index 6e80862258..47bea72aad 100644
|
||||
--- a/cmake/FindWrapOpenSSL.cmake
|
||||
+++ b/cmake/FindWrapOpenSSL.cmake
|
||||
@@ -14,7 +14,7 @@ if(OpenSSL_FOUND)
|
||||
set(WrapOpenSSL_FOUND ON)
|
||||
|
||||
add_library(WrapOpenSSL::WrapOpenSSL INTERFACE IMPORTED)
|
||||
- target_link_libraries(WrapOpenSSL::WrapOpenSSL INTERFACE OpenSSL::SSL)
|
||||
+ target_link_libraries(WrapOpenSSL::WrapOpenSSL INTERFACE OpenSSL::SSL ${OPENSSL_DEPENDENCIES})
|
||||
endif()
|
||||
|
||||
include(FindPackageHandleStandardArgs)
|
||||
diff --git a/cmake/FindWrapSystemFreetype.cmake b/cmake/FindWrapSystemFreetype.cmake
|
||||
index 2cf6caca19..23dc161e4c 100644
|
||||
--- a/cmake/FindWrapSystemFreetype.cmake
|
||||
+++ b/cmake/FindWrapSystemFreetype.cmake
|
||||
@@ -44,7 +44,7 @@ find_package_handle_standard_args(WrapSystemFreetype
|
||||
if(WrapSystemFreetype_FOUND)
|
||||
add_library(WrapSystemFreetype::WrapSystemFreetype INTERFACE IMPORTED)
|
||||
target_link_libraries(WrapSystemFreetype::WrapSystemFreetype
|
||||
- INTERFACE "${__freetype_target_name}")
|
||||
+ INTERFACE "${__freetype_target_name}" ${FREETYPE_DEPENDENCIES})
|
||||
endif()
|
||||
unset(__freetype_target_name)
|
||||
unset(__freetype_found)
|
||||
diff --git a/cmake/FindWrapSystemHarfbuzz.cmake b/cmake/FindWrapSystemHarfbuzz.cmake
|
||||
index 3cb44aa766..9dc741b2be 100644
|
||||
--- a/cmake/FindWrapSystemHarfbuzz.cmake
|
||||
+++ b/cmake/FindWrapSystemHarfbuzz.cmake
|
||||
@@ -54,7 +54,7 @@ find_package_handle_standard_args(WrapSystemHarfbuzz
|
||||
if(WrapSystemHarfbuzz_FOUND)
|
||||
add_library(WrapSystemHarfbuzz::WrapSystemHarfbuzz INTERFACE IMPORTED)
|
||||
target_link_libraries(WrapSystemHarfbuzz::WrapSystemHarfbuzz
|
||||
- INTERFACE "${__harfbuzz_target_name}")
|
||||
+ INTERFACE "${__harfbuzz_target_name}" ${HARFBUZZ_DEPENDENCIES})
|
||||
endif()
|
||||
unset(__harfbuzz_target_name)
|
||||
unset(__harfbuzz_found)
|
||||
diff --git a/cmake/FindWrapSystemPNG.cmake b/cmake/FindWrapSystemPNG.cmake
|
||||
index 372a064ff4..a363bfd31b 100644
|
||||
--- a/cmake/FindWrapSystemPNG.cmake
|
||||
+++ b/cmake/FindWrapSystemPNG.cmake
|
||||
@@ -33,7 +33,7 @@ find_package_handle_standard_args(WrapSystemPNG
|
||||
if(WrapSystemPNG_FOUND)
|
||||
add_library(WrapSystemPNG::WrapSystemPNG INTERFACE IMPORTED)
|
||||
target_link_libraries(WrapSystemPNG::WrapSystemPNG
|
||||
- INTERFACE "${__png_target_name}")
|
||||
+ INTERFACE "${__png_target_name}" ${LIBPNG_DEPENDENCIES})
|
||||
endif()
|
||||
unset(__png_target_name)
|
||||
unset(__png_found)
|
||||
diff --git a/src/plugins/sqldrivers/psql/CMakeLists.txt b/src/plugins/sqldrivers/psql/CMakeLists.txt
|
||||
index 62e9619d16..939163bde7 100644
|
||||
--- a/src/plugins/sqldrivers/psql/CMakeLists.txt
|
||||
+++ b/src/plugins/sqldrivers/psql/CMakeLists.txt
|
||||
@@ -19,7 +19,7 @@ qt_internal_add_plugin(QPSQLDriverPlugin
|
||||
QT_NO_CAST_FROM_ASCII
|
||||
QT_NO_CAST_TO_ASCII
|
||||
PUBLIC_LIBRARIES
|
||||
- PostgreSQL::PostgreSQL
|
||||
+ PostgreSQL::PostgreSQL ${POSTGRESQL_DEPENDENCIES}
|
||||
Qt::Core
|
||||
Qt::CorePrivate
|
||||
Qt::SqlPrivate
|
||||
--
|
||||
2.29.2
|
||||
|
|
@ -0,0 +1 @@
|
|||
../mingw-w64/0004-Fix-transitive-dependencies-of-static-libraries.patch
|
|
@ -1,37 +0,0 @@
|
|||
From 2e806336a1053599c6b9b2fb1bcd541b256506b2 Mon Sep 17 00:00:00 2001
|
||||
From: Martchus <martchus@gmx.net>
|
||||
Date: Mon, 2 Nov 2020 13:47:45 +0100
|
||||
Subject: [PATCH 5/7] Fix libjpeg workaround for conflict with rpcndr.h
|
||||
|
||||
Otherwise it won't compile against mingw-w64-libjpeg-turbo. This version of
|
||||
libjpeg seems to take care of the conflict already as long as jconfig.h is
|
||||
included before jmorecfg.h.
|
||||
|
||||
Change-Id: I011b7735485689c9797cffe2646c8c3d15d0645e
|
||||
---
|
||||
src/plugins/imageformats/jpeg/qjpeghandler.cpp | 8 +-------
|
||||
1 file changed, 1 insertion(+), 7 deletions(-)
|
||||
|
||||
diff --git a/src/plugins/imageformats/jpeg/qjpeghandler.cpp b/src/plugins/imageformats/jpeg/qjpeghandler.cpp
|
||||
index 29bf5ab589..dc336f156a 100644
|
||||
--- a/src/plugins/imageformats/jpeg/qjpeghandler.cpp
|
||||
+++ b/src/plugins/imageformats/jpeg/qjpeghandler.cpp
|
||||
@@ -61,14 +61,8 @@
|
||||
|
||||
// including jpeglib.h seems to be a little messy
|
||||
extern "C" {
|
||||
-// jpeglib.h->jmorecfg.h tries to typedef int boolean; but this conflicts with
|
||||
-// some Windows headers that may or may not have been included
|
||||
-#ifdef HAVE_BOOLEAN
|
||||
-# undef HAVE_BOOLEAN
|
||||
-#endif
|
||||
-#define boolean jboolean
|
||||
-
|
||||
#define XMD_H // shut JPEGlib up
|
||||
+#include <jconfig.h> // ensure jconfig.h is included before jmorecfg.h
|
||||
#include <jpeglib.h>
|
||||
#ifdef const
|
||||
# undef const // remove crazy C hackery in jconfig.h
|
||||
--
|
||||
2.29.2
|
||||
|
|
@ -0,0 +1 @@
|
|||
../mingw-w64/0005-Fix-libjpeg-workaround-for-conflict-with-rpcndr.h.patch
|
|
@ -1,30 +0,0 @@
|
|||
From e8cb07cbabefc1bf1acfd238b3298c7fa7a6c536 Mon Sep 17 00:00:00 2001
|
||||
From: Martchus <martchus@gmx.net>
|
||||
Date: Sun, 8 Nov 2020 00:33:12 +0100
|
||||
Subject: [PATCH 6/7] Support finding MariaDB
|
||||
|
||||
Change-Id: I3f95a7c3aabc734e1c6c5ce00957ab9814200232
|
||||
---
|
||||
cmake/FindMySQL.cmake | 4 ++--
|
||||
1 file changed, 2 insertions(+), 2 deletions(-)
|
||||
|
||||
diff --git a/cmake/FindMySQL.cmake b/cmake/FindMySQL.cmake
|
||||
index 7575386338..df1d848cf6 100644
|
||||
--- a/cmake/FindMySQL.cmake
|
||||
+++ b/cmake/FindMySQL.cmake
|
||||
@@ -24,10 +24,10 @@ pkg_check_modules(PC_MySQL QUIET mysqlclient)
|
||||
find_path(MySQL_INCLUDE_DIRS
|
||||
NAMES mysql.h
|
||||
HINTS ${PC_MySQL_INCLUDEDIR}
|
||||
- PATH_SUFFIXES mysql)
|
||||
+ PATH_SUFFIXES mariadb mysql)
|
||||
|
||||
find_library(MySQL_LIBRARIES
|
||||
- NAMES mysqlclient
|
||||
+ NAMES mariadb mariadbclient mysqlclient
|
||||
HINTS ${PC_MySQL_LIBDIR}
|
||||
)
|
||||
|
||||
--
|
||||
2.29.2
|
||||
|
|
@ -0,0 +1 @@
|
|||
../mingw-w64/0006-Support-finding-MariaDB.patch
|
|
@ -1,37 +0,0 @@
|
|||
From dd3d798d4c338164db0ff41ba09af66c43a9d2ab Mon Sep 17 00:00:00 2001
|
||||
From: Martchus <martchus@gmx.net>
|
||||
Date: Sun, 8 Nov 2020 00:34:09 +0100
|
||||
Subject: [PATCH 7/7] Allow overriding CMAKE_FIND_LIBRARY_SUFFIXES to prefer
|
||||
static libraries
|
||||
|
||||
Change-Id: Ic29b64b999ed9b5888a8dc1b0961a76009c5e75c
|
||||
---
|
||||
cmake/QtBuildInternals/QtBuildInternalsConfig.cmake | 5 +++++
|
||||
1 file changed, 5 insertions(+)
|
||||
|
||||
diff --git a/cmake/QtBuildInternals/QtBuildInternalsConfig.cmake b/cmake/QtBuildInternals/QtBuildInternalsConfig.cmake
|
||||
index 5e49a99f5d..dd8ffc1972 100644
|
||||
--- a/cmake/QtBuildInternals/QtBuildInternalsConfig.cmake
|
||||
+++ b/cmake/QtBuildInternals/QtBuildInternalsConfig.cmake
|
||||
@@ -2,6 +2,10 @@ if (CMAKE_VERSION VERSION_LESS 3.1.0)
|
||||
message(FATAL_ERROR "Qt requires at least CMake version 3.1.0")
|
||||
endif()
|
||||
|
||||
+if (CMAKE_FIND_LIBRARY_SUFFIXES_OVERRIDE)
|
||||
+ set(CMAKE_FIND_LIBRARY_SUFFIXES "${CMAKE_FIND_LIBRARY_SUFFIXES_OVERRIDE}")
|
||||
+endif ()
|
||||
+
|
||||
######################################
|
||||
#
|
||||
# Macros for building Qt modules
|
||||
@@ -224,6 +228,7 @@ macro(qt_prepare_standalone_project)
|
||||
endmacro()
|
||||
|
||||
macro(qt_build_repo_begin)
|
||||
+
|
||||
qt_build_internals_set_up_private_api()
|
||||
qt_enable_cmake_languages()
|
||||
|
||||
--
|
||||
2.29.2
|
||||
|
|
@ -0,0 +1 @@
|
|||
../mingw-w64/0007-Allow-overriding-CMAKE_FIND_LIBRARY_SUFFIXES-to-pref.patch
|
|
@ -11,7 +11,7 @@
|
|||
# All patches are managed at https://github.com/Martchus/qtbase
|
||||
|
||||
pkgname=mingw-w64-qt6-base-static
|
||||
_qtver=6.0.0-rc
|
||||
_qtver=6.0.0
|
||||
pkgver=${_qtver/-/}
|
||||
pkgrel=1
|
||||
arch=(any)
|
||||
|
@ -30,7 +30,7 @@ optdepends=('mingw-w64-postgresql: PostgreSQL driver'
|
|||
options=('!strip' '!buildflags' 'staticlibs' '!emptydirs')
|
||||
groups=(mingw-w64-qt6)
|
||||
_pkgfqn="qtbase-everywhere-src-${_qtver}"
|
||||
source=("https://download.qt.io/development_releases/qt/${pkgver%.*}/${_qtver}/submodules/${_pkgfqn}.tar.xz"
|
||||
source=("https://download.qt.io/official_releases/qt/${pkgver%.*}/${_qtver}/submodules/${_pkgfqn}.tar.xz"
|
||||
'0001-Use-CMake-s-default-import-library-suffix.patch'
|
||||
'0002-Fix-finding-D-Bus.patch'
|
||||
'0003-Fix-using-static-PCRE2-and-DBus-1.patch'
|
||||
|
@ -38,14 +38,14 @@ source=("https://download.qt.io/development_releases/qt/${pkgver%.*}/${_qtver}/s
|
|||
'0005-Fix-libjpeg-workaround-for-conflict-with-rpcndr.h.patch'
|
||||
'0006-Support-finding-MariaDB.patch'
|
||||
'0007-Allow-overriding-CMAKE_FIND_LIBRARY_SUFFIXES-to-pref.patch')
|
||||
sha256sums=('8dc2c6fe053235e4a2866d8e1927fd667e5e8c853c96de708b9688012089138d'
|
||||
'bb9bec76506c3425d6fa2394c2c15cf8c8e84d6ce090f8cd9136c77e7a286d8f'
|
||||
'9ba0563f3c47327ca2f51c864fc1916a4355f56f82da77dea81c8a90cf315579'
|
||||
'37e533855b3b498bd1e93879aac05cc77dad3b2df64f9a61440aa2bcb73e9847'
|
||||
'3bdb93179f5258aa87ce3c2b8e560e2ff9fc9446bfd4688b2faf46c5deb45fc8'
|
||||
'f2f64e7b6bc2a3b7c4414fc4c857b206c597ee7174cdaadaccc51ca4c0f5ada1'
|
||||
'bd3a50b6a034e647a36cc4bf6a37532d892561255cda3e6cbdaf5849e710b657'
|
||||
'df804bde0b39e507f07cbedc18001ea8eb939497c89586e93dc1cbb8c878fbed')
|
||||
sha256sums=('ae227180272d199cbb15318e3353716afada5c57fd5185b812ae26912c958656'
|
||||
'ea0d7432318261cfd13dadd39ecef5bb98d6ff3017c9e170209c9227bfddaed7'
|
||||
'42e06c8f4261adf434d3f570c22156dec8164745bcb25fd1a93c54a0a5f2277a'
|
||||
'01e52d9a60f6b31561c95798bc1fe0f3e0b6361c9e22307a8db47af789bd8544'
|
||||
'c7a416a2bb61f938a81c7ddc82257776e6752f5372ee57f2cc08cba8761e2211'
|
||||
'e11565af9b05b7714248324b5afecda78caa9be03e9c4872f80ea07636bfa1a7'
|
||||
'8fa423062a850d68341b80aade231cfec865f9a750324ff3819faecf77ff9347'
|
||||
'c9c0289e08106dcc18973d1625526f2a90271452d375171d97a9793199549cea')
|
||||
|
||||
_architectures='i686-w64-mingw32 x86_64-w64-mingw32'
|
||||
|
||||
|
|
|
@ -1 +1 @@
|
|||
8dc2c6fe053235e4a2866d8e1927fd667e5e8c853c96de708b9688012089138d
|
||||
ae227180272d199cbb15318e3353716afada5c57fd5185b812ae26912c958656
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
From 302744ea356871a22f9cb6819bf0a9baf0e8211c Mon Sep 17 00:00:00 2001
|
||||
From b3a78b8672134e97f6a6b511dd1c6822fe9811e8 Mon Sep 17 00:00:00 2001
|
||||
From: Martchus <martchus@gmx.net>
|
||||
Date: Thu, 5 Nov 2020 22:08:10 +0100
|
||||
Subject: [PATCH 1/7] Use CMake's default import library suffix
|
||||
|
@ -13,10 +13,10 @@ Change-Id: Iedc6a7ee8982a62ddd56ad0bf25ba0b8752a666a
|
|||
5 files changed, 21 insertions(+), 7 deletions(-)
|
||||
|
||||
diff --git a/cmake/QtPriHelpers.cmake b/cmake/QtPriHelpers.cmake
|
||||
index 5fc0a5877b..5782de0f91 100644
|
||||
index e0f10d19bb..ae2fe6e8f3 100644
|
||||
--- a/cmake/QtPriHelpers.cmake
|
||||
+++ b/cmake/QtPriHelpers.cmake
|
||||
@@ -330,9 +330,13 @@ QT.${config_module_name}_private.disabled_features = ${disabled_private_features
|
||||
@@ -342,9 +342,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 5fc0a5877b..5782de0f91 100644
|
|||
${CMAKE_EXTRA_SHARED_LIBRARY_SUFFIXES}
|
||||
${CMAKE_STATIC_LIBRARY_SUFFIX})
|
||||
add_custom_command(
|
||||
@@ -737,9 +741,13 @@ CONFIG += ${private_config_joined}
|
||||
@@ -749,9 +753,13 @@ CONFIG += ${private_config_joined}
|
||||
list(APPEND inputs "${preliminary_pri_root}/${cfg}/${pri_data_cmake_file}")
|
||||
endforeach()
|
||||
|
||||
|
@ -47,10 +47,10 @@ index 5fc0a5877b..5782de0f91 100644
|
|||
${CMAKE_STATIC_LIBRARY_SUFFIX})
|
||||
add_custom_command(
|
||||
diff --git a/cmake/QtPrlHelpers.cmake b/cmake/QtPrlHelpers.cmake
|
||||
index 35d321420c..40a85e6c73 100644
|
||||
index 0ad1747961..fcb520f2ad 100644
|
||||
--- a/cmake/QtPrlHelpers.cmake
|
||||
+++ b/cmake/QtPrlHelpers.cmake
|
||||
@@ -258,11 +258,17 @@ QMAKE_PRL_VERSION = ${PROJECT_VERSION}
|
||||
@@ -348,11 +348,17 @@ ${prl_step1_content_libs}
|
||||
CONTENT
|
||||
"FINAL_PRL_FILE_PATH = ${final_prl_file_path}")
|
||||
|
||||
|
@ -70,10 +70,10 @@ index 35d321420c..40a85e6c73 100644
|
|||
if(QT_GENERATOR_IS_MULTI_CONFIG)
|
||||
set(configs ${CMAKE_CONFIGURATION_TYPES})
|
||||
diff --git a/cmake/QtTargetHelpers.cmake b/cmake/QtTargetHelpers.cmake
|
||||
index fcbb3ab1f2..332ef6ee4c 100644
|
||||
index fe8d461856..74dfefcedc 100644
|
||||
--- a/cmake/QtTargetHelpers.cmake
|
||||
+++ b/cmake/QtTargetHelpers.cmake
|
||||
@@ -283,8 +283,6 @@ function(qt_internal_apply_win_prefix_and_suffix target)
|
||||
@@ -288,8 +288,6 @@ function(qt_internal_apply_win_prefix_and_suffix target)
|
||||
|
||||
# This should cover both MINGW with GCC and CLANG.
|
||||
if(NOT MSVC)
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
From 8a975011cc6b9fa6277ad4bb9015d5d509ad769a Mon Sep 17 00:00:00 2001
|
||||
From cd942ac25b912c5a8ddf807d09124cb920327e66 Mon Sep 17 00:00:00 2001
|
||||
From: Martchus <martchus@gmx.net>
|
||||
Date: Wed, 7 Oct 2020 12:13:37 +0200
|
||||
Subject: [PATCH 2/7] Fix finding D-Bus
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
From 7a839b449645c8978889c0a09f2c149398c833e3 Mon Sep 17 00:00:00 2001
|
||||
From a0f488c28adfd04e3eb47e1d33d13f7112c4baa7 Mon Sep 17 00:00:00 2001
|
||||
From: Martchus <martchus@gmx.net>
|
||||
Date: Thu, 5 Nov 2020 21:13:19 +0100
|
||||
Subject: [PATCH 3/7] Fix using static PCRE2 and DBus-1
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
From 7c05fdef291be4b1819c15845116005f865b185e Mon Sep 17 00:00:00 2001
|
||||
From f0176a1ae2e36b4ea89bda4a927bf387a4e20ead Mon Sep 17 00:00:00 2001
|
||||
From: Martchus <martchus@gmx.net>
|
||||
Date: Thu, 5 Nov 2020 21:59:33 +0100
|
||||
Subject: [PATCH 4/7] Fix transitive dependencies (of static libraries)
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
From 2e806336a1053599c6b9b2fb1bcd541b256506b2 Mon Sep 17 00:00:00 2001
|
||||
From 042b2c86c9f895980f400fdd1d4e6ab8ce8022d8 Mon Sep 17 00:00:00 2001
|
||||
From: Martchus <martchus@gmx.net>
|
||||
Date: Mon, 2 Nov 2020 13:47:45 +0100
|
||||
Subject: [PATCH 5/7] Fix libjpeg workaround for conflict with rpcndr.h
|
||||
|
@ -13,7 +13,7 @@ Change-Id: I011b7735485689c9797cffe2646c8c3d15d0645e
|
|||
1 file changed, 1 insertion(+), 7 deletions(-)
|
||||
|
||||
diff --git a/src/plugins/imageformats/jpeg/qjpeghandler.cpp b/src/plugins/imageformats/jpeg/qjpeghandler.cpp
|
||||
index 29bf5ab589..dc336f156a 100644
|
||||
index beef18f260..72708145f4 100644
|
||||
--- a/src/plugins/imageformats/jpeg/qjpeghandler.cpp
|
||||
+++ b/src/plugins/imageformats/jpeg/qjpeghandler.cpp
|
||||
@@ -61,14 +61,8 @@
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
From e8cb07cbabefc1bf1acfd238b3298c7fa7a6c536 Mon Sep 17 00:00:00 2001
|
||||
From baf1e987e55c90a32e6e32438f770f7aab4c4a3c Mon Sep 17 00:00:00 2001
|
||||
From: Martchus <martchus@gmx.net>
|
||||
Date: Sun, 8 Nov 2020 00:33:12 +0100
|
||||
Subject: [PATCH 6/7] Support finding MariaDB
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
From dd3d798d4c338164db0ff41ba09af66c43a9d2ab Mon Sep 17 00:00:00 2001
|
||||
From 28e6e716d2a09f40720f3d213e82c1ff6e61a860 Mon Sep 17 00:00:00 2001
|
||||
From: Martchus <martchus@gmx.net>
|
||||
Date: Sun, 8 Nov 2020 00:34:09 +0100
|
||||
Subject: [PATCH 7/7] Allow overriding CMAKE_FIND_LIBRARY_SUFFIXES to prefer
|
||||
|
@ -10,7 +10,7 @@ Change-Id: Ic29b64b999ed9b5888a8dc1b0961a76009c5e75c
|
|||
1 file changed, 5 insertions(+)
|
||||
|
||||
diff --git a/cmake/QtBuildInternals/QtBuildInternalsConfig.cmake b/cmake/QtBuildInternals/QtBuildInternalsConfig.cmake
|
||||
index 5e49a99f5d..dd8ffc1972 100644
|
||||
index bb2de0a0c2..a2e8b37ba7 100644
|
||||
--- a/cmake/QtBuildInternals/QtBuildInternalsConfig.cmake
|
||||
+++ b/cmake/QtBuildInternals/QtBuildInternalsConfig.cmake
|
||||
@@ -2,6 +2,10 @@ if (CMAKE_VERSION VERSION_LESS 3.1.0)
|
||||
|
@ -24,7 +24,7 @@ index 5e49a99f5d..dd8ffc1972 100644
|
|||
######################################
|
||||
#
|
||||
# Macros for building Qt modules
|
||||
@@ -224,6 +228,7 @@ macro(qt_prepare_standalone_project)
|
||||
@@ -268,6 +272,7 @@ macro(qt_prepare_standalone_project)
|
||||
endmacro()
|
||||
|
||||
macro(qt_build_repo_begin)
|
||||
|
|
|
@ -11,7 +11,7 @@
|
|||
# All patches are managed at https://github.com/Martchus/qtbase
|
||||
|
||||
pkgname=mingw-w64-qt6-base
|
||||
_qtver=6.0.0-rc
|
||||
_qtver=6.0.0
|
||||
pkgver=${_qtver/-/}
|
||||
pkgrel=1
|
||||
arch=(any)
|
||||
|
@ -30,7 +30,7 @@ optdepends=('mingw-w64-postgresql: PostgreSQL driver'
|
|||
options=('!strip' '!buildflags' 'staticlibs' '!emptydirs')
|
||||
groups=(mingw-w64-qt6)
|
||||
_pkgfqn="qtbase-everywhere-src-${_qtver}"
|
||||
source=("https://download.qt.io/development_releases/qt/${pkgver%.*}/${_qtver}/submodules/${_pkgfqn}.tar.xz"
|
||||
source=("https://download.qt.io/official_releases/qt/${pkgver%.*}/${_qtver}/submodules/${_pkgfqn}.tar.xz"
|
||||
'0001-Use-CMake-s-default-import-library-suffix.patch'
|
||||
'0002-Fix-finding-D-Bus.patch'
|
||||
'0003-Fix-using-static-PCRE2-and-DBus-1.patch'
|
||||
|
@ -38,14 +38,14 @@ source=("https://download.qt.io/development_releases/qt/${pkgver%.*}/${_qtver}/s
|
|||
'0005-Fix-libjpeg-workaround-for-conflict-with-rpcndr.h.patch'
|
||||
'0006-Support-finding-MariaDB.patch'
|
||||
'0007-Allow-overriding-CMAKE_FIND_LIBRARY_SUFFIXES-to-pref.patch')
|
||||
sha256sums=('8dc2c6fe053235e4a2866d8e1927fd667e5e8c853c96de708b9688012089138d'
|
||||
'bb9bec76506c3425d6fa2394c2c15cf8c8e84d6ce090f8cd9136c77e7a286d8f'
|
||||
'9ba0563f3c47327ca2f51c864fc1916a4355f56f82da77dea81c8a90cf315579'
|
||||
'37e533855b3b498bd1e93879aac05cc77dad3b2df64f9a61440aa2bcb73e9847'
|
||||
'3bdb93179f5258aa87ce3c2b8e560e2ff9fc9446bfd4688b2faf46c5deb45fc8'
|
||||
'f2f64e7b6bc2a3b7c4414fc4c857b206c597ee7174cdaadaccc51ca4c0f5ada1'
|
||||
'bd3a50b6a034e647a36cc4bf6a37532d892561255cda3e6cbdaf5849e710b657'
|
||||
'df804bde0b39e507f07cbedc18001ea8eb939497c89586e93dc1cbb8c878fbed')
|
||||
sha256sums=('ae227180272d199cbb15318e3353716afada5c57fd5185b812ae26912c958656'
|
||||
'ea0d7432318261cfd13dadd39ecef5bb98d6ff3017c9e170209c9227bfddaed7'
|
||||
'42e06c8f4261adf434d3f570c22156dec8164745bcb25fd1a93c54a0a5f2277a'
|
||||
'01e52d9a60f6b31561c95798bc1fe0f3e0b6361c9e22307a8db47af789bd8544'
|
||||
'c7a416a2bb61f938a81c7ddc82257776e6752f5372ee57f2cc08cba8761e2211'
|
||||
'e11565af9b05b7714248324b5afecda78caa9be03e9c4872f80ea07636bfa1a7'
|
||||
'8fa423062a850d68341b80aade231cfec865f9a750324ff3819faecf77ff9347'
|
||||
'c9c0289e08106dcc18973d1625526f2a90271452d375171d97a9793199549cea')
|
||||
|
||||
_architectures='i686-w64-mingw32 x86_64-w64-mingw32'
|
||||
|
||||
|
|
|
@ -1 +1 @@
|
|||
8dc2c6fe053235e4a2866d8e1927fd667e5e8c853c96de708b9688012089138d
|
||||
ae227180272d199cbb15318e3353716afada5c57fd5185b812ae26912c958656
|
||||
|
|
|
@ -5,7 +5,7 @@
|
|||
# you also find the URL of a binary repository.
|
||||
|
||||
pkgname=qt6-declarative
|
||||
_qtver=6.0.0-rc
|
||||
_qtver=6.0.0
|
||||
pkgver=${_qtver/-/}
|
||||
pkgrel=1
|
||||
arch=(x86_64)
|
||||
|
@ -16,7 +16,7 @@ depends=(qt6-base)
|
|||
makedepends=(cmake python vulkan-headers at-spi2-core ninja)
|
||||
groups=(qt6)
|
||||
_pkgfqn="${pkgname/6-/}-everywhere-src-${_qtver}"
|
||||
source=("https://download.qt.io/development_releases/qt/${pkgver%.*}/${_qtver}/submodules/${_pkgfqn}.tar.xz")
|
||||
source=("https://download.qt.io/official_releases/qt/${pkgver%.*}/${_qtver}/submodules/${_pkgfqn}.tar.xz")
|
||||
sha256sums=('f623518d14ac1ea9d2a5a1e8962be36f86a2e77393a315518a34c78931bcb389')
|
||||
|
||||
build() {
|
||||
|
|
|
@ -4,7 +4,7 @@
|
|||
# Based on: AUR package qt6-declarative-git, official qt5-declarative package
|
||||
% end
|
||||
\
|
||||
_qtver=6.0.0-rc
|
||||
_qtver=6.0.0
|
||||
pkgver=${_qtver/-/}
|
||||
pkgrel=1
|
||||
arch=(x86_64)
|
||||
|
|
|
@ -4,7 +4,7 @@
|
|||
# you also find the URL of a binary repository.
|
||||
|
||||
pkgname=mingw-w64-qt6-declarative-static
|
||||
_qtver=6.0.0-rc
|
||||
_qtver=6.0.0
|
||||
pkgver=${_qtver/-/}
|
||||
pkgrel=1
|
||||
arch=(any)
|
||||
|
@ -17,8 +17,8 @@ optdepends=('qt6-declarative: development tools')
|
|||
options=('!strip' '!buildflags' 'staticlibs' '!emptydirs')
|
||||
groups=(mingw-w64-qt6)
|
||||
_pkgfqn="qtdeclarative-everywhere-src-${_qtver}"
|
||||
source=("https://download.qt.io/development_releases/qt/${pkgver%.*}/${_qtver}/submodules/${_pkgfqn}.tar.xz")
|
||||
sha256sums=('f623518d14ac1ea9d2a5a1e8962be36f86a2e77393a315518a34c78931bcb389')
|
||||
source=("https://download.qt.io/official_releases/qt/${pkgver%.*}/${_qtver}/submodules/${_pkgfqn}.tar.xz")
|
||||
sha256sums=('8535fe31fa3e876b8f2d3954efcdca47b3813adf228c1640608fb9f4c7b2c1a6')
|
||||
|
||||
_architectures='i686-w64-mingw32 x86_64-w64-mingw32'
|
||||
|
||||
|
|
|
@ -1 +1 @@
|
|||
f623518d14ac1ea9d2a5a1e8962be36f86a2e77393a315518a34c78931bcb389
|
||||
8535fe31fa3e876b8f2d3954efcdca47b3813adf228c1640608fb9f4c7b2c1a6
|
||||
|
|
|
@ -4,7 +4,7 @@
|
|||
# you also find the URL of a binary repository.
|
||||
|
||||
pkgname=mingw-w64-qt6-declarative
|
||||
_qtver=6.0.0-rc
|
||||
_qtver=6.0.0
|
||||
pkgver=${_qtver/-/}
|
||||
pkgrel=1
|
||||
arch=(any)
|
||||
|
@ -17,8 +17,8 @@ optdepends=('qt6-declarative: development tools')
|
|||
options=('!strip' '!buildflags' 'staticlibs' '!emptydirs')
|
||||
groups=(mingw-w64-qt6)
|
||||
_pkgfqn="qtdeclarative-everywhere-src-${_qtver}"
|
||||
source=("https://download.qt.io/development_releases/qt/${pkgver%.*}/${_qtver}/submodules/${_pkgfqn}.tar.xz")
|
||||
sha256sums=('f623518d14ac1ea9d2a5a1e8962be36f86a2e77393a315518a34c78931bcb389')
|
||||
source=("https://download.qt.io/official_releases/qt/${pkgver%.*}/${_qtver}/submodules/${_pkgfqn}.tar.xz")
|
||||
sha256sums=('8535fe31fa3e876b8f2d3954efcdca47b3813adf228c1640608fb9f4c7b2c1a6')
|
||||
|
||||
_architectures='i686-w64-mingw32 x86_64-w64-mingw32'
|
||||
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
% layout 'mingw-w64-qt6-module', has_binaries => 1;
|
||||
\
|
||||
_qtver=6.0.0-rc
|
||||
_qtver=6.0.0
|
||||
pkgver=${_qtver/-/}
|
||||
pkgrel=1
|
||||
arch=(any)
|
||||
|
|
|
@ -1 +1 @@
|
|||
f623518d14ac1ea9d2a5a1e8962be36f86a2e77393a315518a34c78931bcb389
|
||||
8535fe31fa3e876b8f2d3954efcdca47b3813adf228c1640608fb9f4c7b2c1a6
|
||||
|
|
|
@ -4,7 +4,7 @@
|
|||
# you also find the URL of a binary repository.
|
||||
|
||||
pkgname=qt6-imageformats
|
||||
_qtver=6.0.0-rc
|
||||
_qtver=6.0.0
|
||||
pkgver=${_qtver/-/}
|
||||
pkgrel=1
|
||||
arch=(x86_64)
|
||||
|
@ -18,7 +18,7 @@ depends=(qt6-base jasper libwebp)
|
|||
makedepends=(cmake ninja git)
|
||||
groups=(qt6)
|
||||
_pkgfqn="${pkgname/6-/}-everywhere-src-${_qtver}"
|
||||
source=("$_pkgfqn::git://code.qt.io/qt/qtimageformats.git#commit=9b0b68488ac75668da339bdcd1ab358db03f2932")
|
||||
source=("$_pkgfqn::git://code.qt.io/qt/qtimageformats.git#tag=v6.0.0")
|
||||
sha256sums=('SKIP')
|
||||
|
||||
build() {
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
% layout 'qt6-module', git_commit => '9b0b68488ac75668da339bdcd1ab358db03f2932';
|
||||
% layout 'qt6-module', git_tag => 'v6.0.0';
|
||||
\
|
||||
_qtver=6.0.0-rc
|
||||
_qtver=6.0.0
|
||||
pkgver=${_qtver/-/}
|
||||
pkgrel=1
|
||||
arch=(x86_64)
|
||||
|
|
|
@ -4,7 +4,7 @@
|
|||
# you also find the URL of a binary repository.
|
||||
|
||||
pkgname=mingw-w64-qt6-imageformats-static
|
||||
_qtver=6.0.0-rc
|
||||
_qtver=6.0.0
|
||||
pkgver=${_qtver/-/}
|
||||
pkgrel=1
|
||||
arch=(any)
|
||||
|
@ -19,7 +19,7 @@ makedepends=('mingw-w64-cmake-static' 'qt6-base' 'ninja' 'git')
|
|||
options=('!strip' '!buildflags' 'staticlibs' '!emptydirs')
|
||||
groups=(mingw-w64-qt6)
|
||||
_pkgfqn="qtimageformats-everywhere-src-${_qtver}"
|
||||
source=("$_pkgfqn::git://code.qt.io/qt/qtimageformats.git#commit=9b0b68488ac75668da339bdcd1ab358db03f2932")
|
||||
source=("$_pkgfqn::git://code.qt.io/qt/qtimageformats.git#tag=v6.0.0")
|
||||
sha256sums=('SKIP')
|
||||
|
||||
_architectures='i686-w64-mingw32 x86_64-w64-mingw32'
|
||||
|
|
|
@ -4,7 +4,7 @@
|
|||
# you also find the URL of a binary repository.
|
||||
|
||||
pkgname=mingw-w64-qt6-imageformats
|
||||
_qtver=6.0.0-rc
|
||||
_qtver=6.0.0
|
||||
pkgver=${_qtver/-/}
|
||||
pkgrel=1
|
||||
arch=(any)
|
||||
|
@ -19,7 +19,7 @@ makedepends=('mingw-w64-cmake' 'qt6-base' 'ninja' 'git')
|
|||
options=('!strip' '!buildflags' 'staticlibs' '!emptydirs')
|
||||
groups=(mingw-w64-qt6)
|
||||
_pkgfqn="qtimageformats-everywhere-src-${_qtver}"
|
||||
source=("$_pkgfqn::git://code.qt.io/qt/qtimageformats.git#commit=9b0b68488ac75668da339bdcd1ab358db03f2932")
|
||||
source=("$_pkgfqn::git://code.qt.io/qt/qtimageformats.git#tag=v6.0.0")
|
||||
sha256sums=('SKIP')
|
||||
|
||||
_architectures='i686-w64-mingw32 x86_64-w64-mingw32'
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
% layout 'mingw-w64-qt6-module', git_commit => '9b0b68488ac75668da339bdcd1ab358db03f2932';
|
||||
% layout 'mingw-w64-qt6-module', git_tag => 'v6.0.0';
|
||||
\
|
||||
_qtver=6.0.0-rc
|
||||
_qtver=6.0.0
|
||||
pkgver=${_qtver/-/}
|
||||
pkgrel=1
|
||||
arch=(any)
|
||||
|
|
|
@ -4,7 +4,7 @@
|
|||
# you also find the URL of a binary repository.
|
||||
|
||||
pkgname=qt6-quick3d
|
||||
_qtver=6.0.0-rc
|
||||
_qtver=6.0.0
|
||||
pkgver=${_qtver/-/}
|
||||
pkgrel=1
|
||||
arch=(x86_64)
|
||||
|
@ -16,7 +16,7 @@ makedepends=(cmake assimp qt6-shadertools vulkan-headers ninja)
|
|||
optdepends=('assimp: Import from assimp')
|
||||
groups=(qt6)
|
||||
_pkgfqn="${pkgname/6-/}-everywhere-src-${_qtver}"
|
||||
source=("https://download.qt.io/development_releases/qt/${pkgver%.*}/${_qtver}/submodules/${_pkgfqn}.tar.xz")
|
||||
source=("https://download.qt.io/official_releases/qt/${pkgver%.*}/${_qtver}/submodules/${_pkgfqn}.tar.xz")
|
||||
sha256sums=('439b7ab05177e6b5800676c261bb0953e93afcd9fc68aee9fdb75ec179e72e16')
|
||||
|
||||
build() {
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
% layout 'qt6-module';
|
||||
\
|
||||
_qtver=6.0.0-rc
|
||||
_qtver=6.0.0
|
||||
pkgver=${_qtver/-/}
|
||||
pkgrel=1
|
||||
arch=(x86_64)
|
||||
|
|
|
@ -4,7 +4,7 @@
|
|||
# you also find the URL of a binary repository.
|
||||
|
||||
pkgname=mingw-w64-qt6-quick3d-static
|
||||
_qtver=6.0.0-rc
|
||||
_qtver=6.0.0
|
||||
pkgver=${_qtver/-/}
|
||||
pkgrel=1
|
||||
arch=(any)
|
||||
|
@ -17,8 +17,8 @@ makedepends=('mingw-w64-cmake-static' 'mingw-w64-vulkan-headers' 'mingw-w64-vulk
|
|||
options=('!strip' '!buildflags' 'staticlibs' '!emptydirs')
|
||||
groups=(mingw-w64-qt6)
|
||||
_pkgfqn="qtquick3d-everywhere-src-${_qtver}"
|
||||
source=("https://download.qt.io/development_releases/qt/${pkgver%.*}/${_qtver}/submodules/${_pkgfqn}.tar.xz")
|
||||
sha256sums=('439b7ab05177e6b5800676c261bb0953e93afcd9fc68aee9fdb75ec179e72e16')
|
||||
source=("https://download.qt.io/official_releases/qt/${pkgver%.*}/${_qtver}/submodules/${_pkgfqn}.tar.xz")
|
||||
sha256sums=('0a9a3e765c343b55511900b173f9591df88b0787f67b9ecfb8f25203bfdb0aa8')
|
||||
|
||||
_architectures='i686-w64-mingw32 x86_64-w64-mingw32'
|
||||
|
||||
|
|
|
@ -1 +1 @@
|
|||
439b7ab05177e6b5800676c261bb0953e93afcd9fc68aee9fdb75ec179e72e16
|
||||
0a9a3e765c343b55511900b173f9591df88b0787f67b9ecfb8f25203bfdb0aa8
|
||||
|
|
|
@ -4,7 +4,7 @@
|
|||
# you also find the URL of a binary repository.
|
||||
|
||||
pkgname=mingw-w64-qt6-quick3d
|
||||
_qtver=6.0.0-rc
|
||||
_qtver=6.0.0
|
||||
pkgver=${_qtver/-/}
|
||||
pkgrel=1
|
||||
arch=(any)
|
||||
|
@ -17,8 +17,8 @@ makedepends=('mingw-w64-cmake' 'mingw-w64-vulkan-headers' 'mingw-w64-vulkan-icd-
|
|||
options=('!strip' '!buildflags' 'staticlibs' '!emptydirs')
|
||||
groups=(mingw-w64-qt6)
|
||||
_pkgfqn="qtquick3d-everywhere-src-${_qtver}"
|
||||
source=("https://download.qt.io/development_releases/qt/${pkgver%.*}/${_qtver}/submodules/${_pkgfqn}.tar.xz")
|
||||
sha256sums=('439b7ab05177e6b5800676c261bb0953e93afcd9fc68aee9fdb75ec179e72e16')
|
||||
source=("https://download.qt.io/official_releases/qt/${pkgver%.*}/${_qtver}/submodules/${_pkgfqn}.tar.xz")
|
||||
sha256sums=('0a9a3e765c343b55511900b173f9591df88b0787f67b9ecfb8f25203bfdb0aa8')
|
||||
|
||||
_architectures='i686-w64-mingw32 x86_64-w64-mingw32'
|
||||
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
% layout 'mingw-w64-qt6-module', has_binaries => 1;
|
||||
\
|
||||
_qtver=6.0.0-rc
|
||||
_qtver=6.0.0
|
||||
pkgver=${_qtver/-/}
|
||||
pkgrel=1
|
||||
arch=(any)
|
||||
|
|
|
@ -1 +1 @@
|
|||
439b7ab05177e6b5800676c261bb0953e93afcd9fc68aee9fdb75ec179e72e16
|
||||
0a9a3e765c343b55511900b173f9591df88b0787f67b9ecfb8f25203bfdb0aa8
|
||||
|
|
|
@ -4,7 +4,7 @@
|
|||
# you also find the URL of a binary repository.
|
||||
|
||||
pkgname=qt6-quickcontrols2
|
||||
_qtver=6.0.0-rc
|
||||
_qtver=6.0.0
|
||||
pkgver=${_qtver/-/}
|
||||
pkgrel=1
|
||||
arch=(x86_64)
|
||||
|
@ -15,7 +15,7 @@ depends=(qt6-declarative)
|
|||
makedepends=(cmake vulkan-headers ninja)
|
||||
groups=(qt6)
|
||||
_pkgfqn="${pkgname/6-/}-everywhere-src-${_qtver}"
|
||||
source=("https://download.qt.io/development_releases/qt/${pkgver%.*}/${_qtver}/submodules/${_pkgfqn}.tar.xz")
|
||||
source=("https://download.qt.io/official_releases/qt/${pkgver%.*}/${_qtver}/submodules/${_pkgfqn}.tar.xz")
|
||||
sha256sums=('13e68868e28512614f96a630332918054b918435cc17696a1281eddd7dbeb2cf')
|
||||
|
||||
build() {
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
% layout 'qt6-module';
|
||||
\
|
||||
_qtver=6.0.0-rc
|
||||
_qtver=6.0.0
|
||||
pkgver=${_qtver/-/}
|
||||
pkgrel=1
|
||||
arch=(x86_64)
|
||||
|
|
|
@ -4,7 +4,7 @@
|
|||
# you also find the URL of a binary repository.
|
||||
|
||||
pkgname=mingw-w64-qt6-quickcontrols2-static
|
||||
_qtver=6.0.0-rc
|
||||
_qtver=6.0.0
|
||||
pkgver=${_qtver/-/}
|
||||
pkgrel=1
|
||||
arch=(any)
|
||||
|
@ -16,8 +16,8 @@ makedepends=('mingw-w64-cmake-static' 'mingw-w64-vulkan-headers' 'mingw-w64-vulk
|
|||
options=('!strip' '!buildflags' 'staticlibs' '!emptydirs')
|
||||
groups=(mingw-w64-qt6)
|
||||
_pkgfqn="qtquickcontrols2-everywhere-src-${_qtver}"
|
||||
source=("https://download.qt.io/development_releases/qt/${pkgver%.*}/${_qtver}/submodules/${_pkgfqn}.tar.xz")
|
||||
sha256sums=('13e68868e28512614f96a630332918054b918435cc17696a1281eddd7dbeb2cf')
|
||||
source=("https://download.qt.io/official_releases/qt/${pkgver%.*}/${_qtver}/submodules/${_pkgfqn}.tar.xz")
|
||||
sha256sums=('03fd2dbf030bf859e8069144bb6a282517063589c9d4025293eb89bcc580253b')
|
||||
|
||||
_architectures='i686-w64-mingw32 x86_64-w64-mingw32'
|
||||
|
||||
|
|
|
@ -1 +1 @@
|
|||
13e68868e28512614f96a630332918054b918435cc17696a1281eddd7dbeb2cf
|
||||
03fd2dbf030bf859e8069144bb6a282517063589c9d4025293eb89bcc580253b
|
||||
|
|
|
@ -4,7 +4,7 @@
|
|||
# you also find the URL of a binary repository.
|
||||
|
||||
pkgname=mingw-w64-qt6-quickcontrols2
|
||||
_qtver=6.0.0-rc
|
||||
_qtver=6.0.0
|
||||
pkgver=${_qtver/-/}
|
||||
pkgrel=1
|
||||
arch=(any)
|
||||
|
@ -16,8 +16,8 @@ makedepends=('mingw-w64-cmake' 'mingw-w64-vulkan-headers' 'mingw-w64-vulkan-icd-
|
|||
options=('!strip' '!buildflags' 'staticlibs' '!emptydirs')
|
||||
groups=(mingw-w64-qt6)
|
||||
_pkgfqn="qtquickcontrols2-everywhere-src-${_qtver}"
|
||||
source=("https://download.qt.io/development_releases/qt/${pkgver%.*}/${_qtver}/submodules/${_pkgfqn}.tar.xz")
|
||||
sha256sums=('13e68868e28512614f96a630332918054b918435cc17696a1281eddd7dbeb2cf')
|
||||
source=("https://download.qt.io/official_releases/qt/${pkgver%.*}/${_qtver}/submodules/${_pkgfqn}.tar.xz")
|
||||
sha256sums=('03fd2dbf030bf859e8069144bb6a282517063589c9d4025293eb89bcc580253b')
|
||||
|
||||
_architectures='i686-w64-mingw32 x86_64-w64-mingw32'
|
||||
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
% layout 'mingw-w64-qt6-module';
|
||||
\
|
||||
_qtver=6.0.0-rc
|
||||
_qtver=6.0.0
|
||||
pkgver=${_qtver/-/}
|
||||
pkgrel=1
|
||||
arch=(any)
|
||||
|
|
|
@ -1 +1 @@
|
|||
13e68868e28512614f96a630332918054b918435cc17696a1281eddd7dbeb2cf
|
||||
03fd2dbf030bf859e8069144bb6a282517063589c9d4025293eb89bcc580253b
|
||||
|
|
|
@ -4,7 +4,7 @@
|
|||
# you also find the URL of a binary repository.
|
||||
|
||||
pkgname=qt6-quicktimeline
|
||||
_qtver=6.0.0-rc
|
||||
_qtver=6.0.0
|
||||
pkgver=${_qtver/-/}
|
||||
pkgrel=1
|
||||
arch=(x86_64)
|
||||
|
@ -15,7 +15,7 @@ depends=(qt6-declarative)
|
|||
makedepends=(cmake vulkan-headers ninja)
|
||||
groups=(qt6)
|
||||
_pkgfqn="${pkgname/6-/}-everywhere-src-${_qtver}"
|
||||
source=("https://download.qt.io/development_releases/qt/${pkgver%.*}/${_qtver}/submodules/${_pkgfqn}.tar.xz")
|
||||
source=("https://download.qt.io/official_releases/qt/${pkgver%.*}/${_qtver}/submodules/${_pkgfqn}.tar.xz")
|
||||
sha256sums=('1c7ef1302ee97f315b9fec017e9c0c4f77a36914b0bf1ad2adb40b1f86956eec')
|
||||
|
||||
build() {
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
% layout 'qt6-module';
|
||||
\
|
||||
_qtver=6.0.0-rc
|
||||
_qtver=6.0.0
|
||||
pkgver=${_qtver/-/}
|
||||
pkgrel=1
|
||||
arch=(x86_64)
|
||||
|
|
|
@ -4,7 +4,7 @@
|
|||
# you also find the URL of a binary repository.
|
||||
|
||||
pkgname=mingw-w64-qt6-quicktimeline-static
|
||||
_qtver=6.0.0-rc
|
||||
_qtver=6.0.0
|
||||
pkgver=${_qtver/-/}
|
||||
pkgrel=1
|
||||
arch=(any)
|
||||
|
@ -16,8 +16,8 @@ makedepends=('mingw-w64-cmake-static' 'mingw-w64-vulkan-headers' 'mingw-w64-vulk
|
|||
options=('!strip' '!buildflags' 'staticlibs' '!emptydirs')
|
||||
groups=(mingw-w64-qt6)
|
||||
_pkgfqn="qtquicktimeline-everywhere-src-${_qtver}"
|
||||
source=("https://download.qt.io/development_releases/qt/${pkgver%.*}/${_qtver}/submodules/${_pkgfqn}.tar.xz")
|
||||
sha256sums=('1c7ef1302ee97f315b9fec017e9c0c4f77a36914b0bf1ad2adb40b1f86956eec')
|
||||
source=("https://download.qt.io/official_releases/qt/${pkgver%.*}/${_qtver}/submodules/${_pkgfqn}.tar.xz")
|
||||
sha256sums=('7a71495c07a98279a852d518bc9ca0f07b49b495ceb65bfdd000c826ee156b0c')
|
||||
|
||||
_architectures='i686-w64-mingw32 x86_64-w64-mingw32'
|
||||
|
||||
|
|
|
@ -1 +1 @@
|
|||
1c7ef1302ee97f315b9fec017e9c0c4f77a36914b0bf1ad2adb40b1f86956eec
|
||||
7a71495c07a98279a852d518bc9ca0f07b49b495ceb65bfdd000c826ee156b0c
|
||||
|
|
|
@ -4,7 +4,7 @@
|
|||
# you also find the URL of a binary repository.
|
||||
|
||||
pkgname=mingw-w64-qt6-quicktimeline
|
||||
_qtver=6.0.0-rc
|
||||
_qtver=6.0.0
|
||||
pkgver=${_qtver/-/}
|
||||
pkgrel=1
|
||||
arch=(any)
|
||||
|
@ -16,8 +16,8 @@ makedepends=('mingw-w64-cmake' 'mingw-w64-vulkan-headers' 'mingw-w64-vulkan-icd-
|
|||
options=('!strip' '!buildflags' 'staticlibs' '!emptydirs')
|
||||
groups=(mingw-w64-qt6)
|
||||
_pkgfqn="qtquicktimeline-everywhere-src-${_qtver}"
|
||||
source=("https://download.qt.io/development_releases/qt/${pkgver%.*}/${_qtver}/submodules/${_pkgfqn}.tar.xz")
|
||||
sha256sums=('1c7ef1302ee97f315b9fec017e9c0c4f77a36914b0bf1ad2adb40b1f86956eec')
|
||||
source=("https://download.qt.io/official_releases/qt/${pkgver%.*}/${_qtver}/submodules/${_pkgfqn}.tar.xz")
|
||||
sha256sums=('7a71495c07a98279a852d518bc9ca0f07b49b495ceb65bfdd000c826ee156b0c')
|
||||
|
||||
_architectures='i686-w64-mingw32 x86_64-w64-mingw32'
|
||||
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
% layout 'mingw-w64-qt6-module';
|
||||
\
|
||||
_qtver=6.0.0-rc
|
||||
_qtver=6.0.0
|
||||
pkgver=${_qtver/-/}
|
||||
pkgrel=1
|
||||
arch=(any)
|
||||
|
|
|
@ -1 +1 @@
|
|||
1c7ef1302ee97f315b9fec017e9c0c4f77a36914b0bf1ad2adb40b1f86956eec
|
||||
7a71495c07a98279a852d518bc9ca0f07b49b495ceb65bfdd000c826ee156b0c
|
||||
|
|
|
@ -4,7 +4,7 @@
|
|||
# you also find the URL of a binary repository.
|
||||
|
||||
pkgname=qt6-shadertools
|
||||
_qtver=6.0.0-rc
|
||||
_qtver=6.0.0
|
||||
pkgver=${_qtver/-/}
|
||||
pkgrel=1
|
||||
arch=(x86_64)
|
||||
|
@ -15,7 +15,7 @@ depends=(qt6-base)
|
|||
makedepends=(cmake vulkan-headers ninja)
|
||||
groups=(qt6)
|
||||
_pkgfqn="${pkgname/6-/}-everywhere-src-${_qtver}"
|
||||
source=("https://download.qt.io/development_releases/qt/${pkgver%.*}/${_qtver}/submodules/${_pkgfqn}.tar.xz")
|
||||
source=("https://download.qt.io/official_releases/qt/${pkgver%.*}/${_qtver}/submodules/${_pkgfqn}.tar.xz")
|
||||
sha256sums=('4129357f7318c9e7879b2b3570c94e62dedc0d7a5b27f585fc411d5c06d80d35')
|
||||
|
||||
build() {
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
% layout 'qt6-module';
|
||||
\
|
||||
_qtver=6.0.0-rc
|
||||
_qtver=6.0.0
|
||||
pkgver=${_qtver/-/}
|
||||
pkgrel=1
|
||||
arch=(x86_64)
|
||||
|
|
|
@ -4,7 +4,7 @@
|
|||
# you also find the URL of a binary repository.
|
||||
|
||||
pkgname=mingw-w64-qt6-shadertools-static
|
||||
_qtver=6.0.0-rc
|
||||
_qtver=6.0.0
|
||||
pkgver=${_qtver/-/}
|
||||
pkgrel=1
|
||||
arch=(any)
|
||||
|
@ -17,8 +17,8 @@ optdepends=('qt6-shadertools: development tools')
|
|||
options=('!strip' '!buildflags' 'staticlibs' '!emptydirs')
|
||||
groups=(mingw-w64-qt6)
|
||||
_pkgfqn="qtshadertools-everywhere-src-${_qtver}"
|
||||
source=("https://download.qt.io/development_releases/qt/${pkgver%.*}/${_qtver}/submodules/${_pkgfqn}.tar.xz")
|
||||
sha256sums=('4129357f7318c9e7879b2b3570c94e62dedc0d7a5b27f585fc411d5c06d80d35')
|
||||
source=("https://download.qt.io/official_releases/qt/${pkgver%.*}/${_qtver}/submodules/${_pkgfqn}.tar.xz")
|
||||
sha256sums=('201b1376b65ef9f7fd19789781e0378ea813385217cd392c5c896699e6108e6c')
|
||||
|
||||
_architectures='i686-w64-mingw32 x86_64-w64-mingw32'
|
||||
|
||||
|
|
|
@ -1 +1 @@
|
|||
4129357f7318c9e7879b2b3570c94e62dedc0d7a5b27f585fc411d5c06d80d35
|
||||
201b1376b65ef9f7fd19789781e0378ea813385217cd392c5c896699e6108e6c
|
||||
|
|
|
@ -4,7 +4,7 @@
|
|||
# you also find the URL of a binary repository.
|
||||
|
||||
pkgname=mingw-w64-qt6-shadertools
|
||||
_qtver=6.0.0-rc
|
||||
_qtver=6.0.0
|
||||
pkgver=${_qtver/-/}
|
||||
pkgrel=1
|
||||
arch=(any)
|
||||
|
@ -17,8 +17,8 @@ optdepends=('qt6-shadertools: development tools')
|
|||
options=('!strip' '!buildflags' 'staticlibs' '!emptydirs')
|
||||
groups=(mingw-w64-qt6)
|
||||
_pkgfqn="qtshadertools-everywhere-src-${_qtver}"
|
||||
source=("https://download.qt.io/development_releases/qt/${pkgver%.*}/${_qtver}/submodules/${_pkgfqn}.tar.xz")
|
||||
sha256sums=('4129357f7318c9e7879b2b3570c94e62dedc0d7a5b27f585fc411d5c06d80d35')
|
||||
source=("https://download.qt.io/official_releases/qt/${pkgver%.*}/${_qtver}/submodules/${_pkgfqn}.tar.xz")
|
||||
sha256sums=('201b1376b65ef9f7fd19789781e0378ea813385217cd392c5c896699e6108e6c')
|
||||
|
||||
_architectures='i686-w64-mingw32 x86_64-w64-mingw32'
|
||||
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
% layout 'mingw-w64-qt6-module', has_binaries => 1;
|
||||
\
|
||||
_qtver=6.0.0-rc
|
||||
_qtver=6.0.0
|
||||
pkgver=${_qtver/-/}
|
||||
pkgrel=1
|
||||
arch=(any)
|
||||
|
|
|
@ -1 +1 @@
|
|||
4129357f7318c9e7879b2b3570c94e62dedc0d7a5b27f585fc411d5c06d80d35
|
||||
201b1376b65ef9f7fd19789781e0378ea813385217cd392c5c896699e6108e6c
|
||||
|
|
|
@ -4,7 +4,7 @@
|
|||
# you also find the URL of a binary repository.
|
||||
|
||||
pkgname=qt6-svg
|
||||
_qtver=6.0.0-rc
|
||||
_qtver=6.0.0
|
||||
pkgver=${_qtver/-/}
|
||||
pkgrel=1
|
||||
arch=(x86_64)
|
||||
|
@ -15,7 +15,7 @@ depends=(qt6-base)
|
|||
makedepends=(cmake ninja)
|
||||
groups=(qt6)
|
||||
_pkgfqn="${pkgname/6-/}-everywhere-src-${_qtver}"
|
||||
source=("https://download.qt.io/development_releases/qt/${pkgver%.*}/${_qtver}/submodules/${_pkgfqn}.tar.xz")
|
||||
source=("https://download.qt.io/official_releases/qt/${pkgver%.*}/${_qtver}/submodules/${_pkgfqn}.tar.xz")
|
||||
sha256sums=('cbd8de2db7d2af14ae7d5dffb6c63507c10261d5b02fce25eabdcb48cf9c8258')
|
||||
|
||||
build() {
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
% layout 'qt6-module';
|
||||
\
|
||||
_qtver=6.0.0-rc
|
||||
_qtver=6.0.0
|
||||
pkgver=${_qtver/-/}
|
||||
pkgrel=1
|
||||
arch=(x86_64)
|
||||
|
|
|
@ -4,7 +4,7 @@
|
|||
# you also find the URL of a binary repository.
|
||||
|
||||
pkgname=mingw-w64-qt6-svg-static
|
||||
_qtver=6.0.0-rc
|
||||
_qtver=6.0.0
|
||||
pkgver=${_qtver/-/}
|
||||
pkgrel=1
|
||||
arch=(any)
|
||||
|
@ -16,8 +16,8 @@ makedepends=('mingw-w64-cmake-static' 'qt6-base' 'ninja')
|
|||
options=('!strip' '!buildflags' 'staticlibs' '!emptydirs')
|
||||
groups=(mingw-w64-qt6)
|
||||
_pkgfqn="qtsvg-everywhere-src-${_qtver}"
|
||||
source=("https://download.qt.io/development_releases/qt/${pkgver%.*}/${_qtver}/submodules/${_pkgfqn}.tar.xz")
|
||||
sha256sums=('cbd8de2db7d2af14ae7d5dffb6c63507c10261d5b02fce25eabdcb48cf9c8258')
|
||||
source=("https://download.qt.io/official_releases/qt/${pkgver%.*}/${_qtver}/submodules/${_pkgfqn}.tar.xz")
|
||||
sha256sums=('9703c9a69e21ad373fb52d0107338da7ef0a46966f69107b0d879e9c366dd91b')
|
||||
|
||||
_architectures='i686-w64-mingw32 x86_64-w64-mingw32'
|
||||
|
||||
|
|
|
@ -1 +1 @@
|
|||
cbd8de2db7d2af14ae7d5dffb6c63507c10261d5b02fce25eabdcb48cf9c8258
|
||||
9703c9a69e21ad373fb52d0107338da7ef0a46966f69107b0d879e9c366dd91b
|
||||
|
|
|
@ -4,7 +4,7 @@
|
|||
# you also find the URL of a binary repository.
|
||||
|
||||
pkgname=mingw-w64-qt6-svg
|
||||
_qtver=6.0.0-rc
|
||||
_qtver=6.0.0
|
||||
pkgver=${_qtver/-/}
|
||||
pkgrel=1
|
||||
arch=(any)
|
||||
|
@ -16,8 +16,8 @@ makedepends=('mingw-w64-cmake' 'qt6-base' 'ninja')
|
|||
options=('!strip' '!buildflags' 'staticlibs' '!emptydirs')
|
||||
groups=(mingw-w64-qt6)
|
||||
_pkgfqn="qtsvg-everywhere-src-${_qtver}"
|
||||
source=("https://download.qt.io/development_releases/qt/${pkgver%.*}/${_qtver}/submodules/${_pkgfqn}.tar.xz")
|
||||
sha256sums=('cbd8de2db7d2af14ae7d5dffb6c63507c10261d5b02fce25eabdcb48cf9c8258')
|
||||
source=("https://download.qt.io/official_releases/qt/${pkgver%.*}/${_qtver}/submodules/${_pkgfqn}.tar.xz")
|
||||
sha256sums=('9703c9a69e21ad373fb52d0107338da7ef0a46966f69107b0d879e9c366dd91b')
|
||||
|
||||
_architectures='i686-w64-mingw32 x86_64-w64-mingw32'
|
||||
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
% layout 'mingw-w64-qt6-module';
|
||||
\
|
||||
_qtver=6.0.0-rc
|
||||
_qtver=6.0.0
|
||||
pkgver=${_qtver/-/}
|
||||
pkgrel=1
|
||||
arch=(any)
|
||||
|
|
|
@ -1 +1 @@
|
|||
cbd8de2db7d2af14ae7d5dffb6c63507c10261d5b02fce25eabdcb48cf9c8258
|
||||
9703c9a69e21ad373fb52d0107338da7ef0a46966f69107b0d879e9c366dd91b
|
||||
|
|
|
@ -4,7 +4,7 @@
|
|||
# you also find the URL of a binary repository.
|
||||
|
||||
pkgname=qt6-tools
|
||||
_qtver=6.0.0-rc
|
||||
_qtver=6.0.0
|
||||
pkgver=${_qtver/-/}
|
||||
pkgrel=1
|
||||
arch=(x86_64)
|
||||
|
@ -16,7 +16,7 @@ makedepends=(cmake qt6-declarative vulkan-headers llvm clang ninja)
|
|||
optdepends=('clang: for qdoc and lupdate')
|
||||
groups=(qt6)
|
||||
_pkgfqn="${pkgname/6-/}-everywhere-src-${_qtver}"
|
||||
source=("https://download.qt.io/development_releases/qt/${pkgver%.*}/${_qtver}/submodules/${_pkgfqn}.tar.xz")
|
||||
source=("https://download.qt.io/official_releases/qt/${pkgver%.*}/${_qtver}/submodules/${_pkgfqn}.tar.xz")
|
||||
sha256sums=('6fe789cf7e1abc7f0ac39027c53e7880433425b234d448d1500e583e9c3ba498')
|
||||
|
||||
build() {
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
% layout 'qt6-module', has_binaries => 1;
|
||||
\
|
||||
_qtver=6.0.0-rc
|
||||
_qtver=6.0.0
|
||||
pkgver=${_qtver/-/}
|
||||
pkgrel=1
|
||||
arch=(x86_64)
|
||||
|
|
|
@ -4,7 +4,7 @@
|
|||
# you also find the URL of a binary repository.
|
||||
|
||||
pkgname=mingw-w64-qt6-tools-static
|
||||
_qtver=6.0.0-rc
|
||||
_qtver=6.0.0
|
||||
pkgver=${_qtver/-/}
|
||||
pkgrel=1
|
||||
arch=(any)
|
||||
|
@ -16,10 +16,10 @@ makedepends=('mingw-w64-cmake-static' 'mingw-w64-vulkan-headers' 'mingw-w64-vulk
|
|||
options=('!strip' '!buildflags' 'staticlibs' '!emptydirs')
|
||||
groups=(mingw-w64-qt6)
|
||||
_pkgfqn="qttools-everywhere-src-${_qtver}"
|
||||
source=("https://download.qt.io/development_releases/qt/${pkgver%.*}/${_qtver}/submodules/${_pkgfqn}.tar.xz"
|
||||
source=("https://download.qt.io/official_releases/qt/${pkgver%.*}/${_qtver}/submodules/${_pkgfqn}.tar.xz"
|
||||
'0001-Make-windeployqt-an-optional-feature.patch')
|
||||
sha256sums=('6fe789cf7e1abc7f0ac39027c53e7880433425b234d448d1500e583e9c3ba498'
|
||||
'5655e188088c8345ba3aed72c74d98800d270bc65f9298676eeb40e3796d17c8')
|
||||
sha256sums=('b6dc559db447bf394d09dfb238d5c09108f834139a183888179e855c6566bfae'
|
||||
'f316cdb87dcc84d1fe9ebd262812118e35571aa0fadd3da6ac3b9f42af19b8bb')
|
||||
|
||||
_architectures='i686-w64-mingw32 x86_64-w64-mingw32'
|
||||
|
||||
|
|
|
@ -1 +1 @@
|
|||
6fe789cf7e1abc7f0ac39027c53e7880433425b234d448d1500e583e9c3ba498
|
||||
b6dc559db447bf394d09dfb238d5c09108f834139a183888179e855c6566bfae
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
From adbcd437ab61010cec31a3e52a1fd0b7e772173f Mon Sep 17 00:00:00 2001
|
||||
From 007674dc717498f33a8e30a558e8d6560369a0fd Mon Sep 17 00:00:00 2001
|
||||
From: Martchus <martchus@gmx.net>
|
||||
Date: Thu, 26 Nov 2020 01:53:27 +0100
|
||||
Subject: [PATCH] Make windeployqt an optional feature
|
||||
|
|
|
@ -4,7 +4,7 @@
|
|||
# you also find the URL of a binary repository.
|
||||
|
||||
pkgname=mingw-w64-qt6-tools
|
||||
_qtver=6.0.0-rc
|
||||
_qtver=6.0.0
|
||||
pkgver=${_qtver/-/}
|
||||
pkgrel=1
|
||||
arch=(any)
|
||||
|
@ -16,10 +16,10 @@ makedepends=('mingw-w64-cmake' 'mingw-w64-vulkan-headers' 'mingw-w64-vulkan-icd-
|
|||
options=('!strip' '!buildflags' 'staticlibs' '!emptydirs')
|
||||
groups=(mingw-w64-qt6)
|
||||
_pkgfqn="qttools-everywhere-src-${_qtver}"
|
||||
source=("https://download.qt.io/development_releases/qt/${pkgver%.*}/${_qtver}/submodules/${_pkgfqn}.tar.xz"
|
||||
source=("https://download.qt.io/official_releases/qt/${pkgver%.*}/${_qtver}/submodules/${_pkgfqn}.tar.xz"
|
||||
'0001-Make-windeployqt-an-optional-feature.patch')
|
||||
sha256sums=('6fe789cf7e1abc7f0ac39027c53e7880433425b234d448d1500e583e9c3ba498'
|
||||
'5655e188088c8345ba3aed72c74d98800d270bc65f9298676eeb40e3796d17c8')
|
||||
sha256sums=('b6dc559db447bf394d09dfb238d5c09108f834139a183888179e855c6566bfae'
|
||||
'f316cdb87dcc84d1fe9ebd262812118e35571aa0fadd3da6ac3b9f42af19b8bb')
|
||||
|
||||
_architectures='i686-w64-mingw32 x86_64-w64-mingw32'
|
||||
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
% layout 'mingw-w64-qt6-module', has_binaries => 1;
|
||||
\
|
||||
_qtver=6.0.0-rc
|
||||
_qtver=6.0.0
|
||||
pkgver=${_qtver/-/}
|
||||
pkgrel=1
|
||||
arch=(any)
|
||||
|
|
|
@ -1 +1 @@
|
|||
6fe789cf7e1abc7f0ac39027c53e7880433425b234d448d1500e583e9c3ba498
|
||||
b6dc559db447bf394d09dfb238d5c09108f834139a183888179e855c6566bfae
|
||||
|
|
|
@ -4,7 +4,7 @@
|
|||
# you also find the URL of a binary repository.
|
||||
|
||||
pkgname=qt6-translations
|
||||
_qtver=6.0.0-rc
|
||||
_qtver=6.0.0
|
||||
pkgver=${_qtver/-/}
|
||||
pkgrel=1
|
||||
arch=(any)
|
||||
|
@ -15,7 +15,7 @@ depends=(qt6-base)
|
|||
makedepends=(cmake qt6-tools ninja)
|
||||
groups=(qt6)
|
||||
_pkgfqn="${pkgname/6-/}-everywhere-src-${_qtver}"
|
||||
source=("https://download.qt.io/development_releases/qt/${pkgver%.*}/${_qtver}/submodules/${_pkgfqn}.tar.xz")
|
||||
source=("https://download.qt.io/official_releases/qt/${pkgver%.*}/${_qtver}/submodules/${_pkgfqn}.tar.xz")
|
||||
sha256sums=('7da1d59db9ab5d25acce79cfefe51fbca79076e0fcb0a0abbfc2043324f140c6')
|
||||
|
||||
build() {
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
% layout 'qt6-module', no_libs => 1;
|
||||
\
|
||||
_qtver=6.0.0-rc
|
||||
_qtver=6.0.0
|
||||
pkgver=${_qtver/-/}
|
||||
pkgrel=1
|
||||
arch=(any)
|
||||
|
|
|
@ -4,7 +4,7 @@
|
|||
# you also find the URL of a binary repository.
|
||||
|
||||
pkgname=mingw-w64-qt6-translations
|
||||
_qtver=6.0.0-rc
|
||||
_qtver=6.0.0
|
||||
pkgver=${_qtver/-/}
|
||||
pkgrel=1
|
||||
arch=(any)
|
||||
|
@ -16,8 +16,8 @@ makedepends=('mingw-w64-cmake' 'mingw-w64-qt6-tools' 'qt6-tools' 'ninja')
|
|||
options=('!strip' '!buildflags' 'staticlibs' '!emptydirs')
|
||||
groups=(mingw-w64-qt6)
|
||||
_pkgfqn="qttranslations-everywhere-src-${_qtver}"
|
||||
source=("https://download.qt.io/development_releases/qt/${pkgver%.*}/${_qtver}/submodules/${_pkgfqn}.tar.xz")
|
||||
sha256sums=('7da1d59db9ab5d25acce79cfefe51fbca79076e0fcb0a0abbfc2043324f140c6')
|
||||
source=("https://download.qt.io/official_releases/qt/${pkgver%.*}/${_qtver}/submodules/${_pkgfqn}.tar.xz")
|
||||
sha256sums=('ed6487425c17e88531e825c44820c1f47c9b7dc0918125e5d45ccc36fdc679d5')
|
||||
|
||||
_architectures='i686-w64-mingw32 x86_64-w64-mingw32'
|
||||
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
% layout 'mingw-w64-qt6-module', no_libs => 1;
|
||||
\
|
||||
_qtver=6.0.0-rc
|
||||
_qtver=6.0.0
|
||||
pkgver=${_qtver/-/}
|
||||
pkgrel=1
|
||||
arch=(any)
|
||||
|
|
Some files were not shown because too many files have changed in this diff Show More
Loading…
Reference in New Issue