Add patch to fix building Qt with glibc 2.28
This commit is contained in:
parent
85e750e720
commit
9337a71ad6
|
|
@ -5,6 +5,7 @@ shopt -s nullglob
|
|||
if ! [[ $1 ]] || ! [[ $2 ]]; then
|
||||
echo 'No version specified, must specify the new and old version, eg. 5.9.2 5.9.1'
|
||||
echo "Usage: $0 newversion oldversion [old-branch-suffix]"
|
||||
echo "Note: supposed to be run within the Qt Git checkout"
|
||||
exit -1
|
||||
fi
|
||||
newversion="$1"
|
||||
|
|
|
|||
|
|
@ -10,6 +10,7 @@ shopt -s nullglob
|
|||
if ! [[ $1 ]]; then
|
||||
echo 'No Qt repo specified - must be specified like eg. base or multimedia.'
|
||||
echo "Usage: $0 repo [branch=\$pkgver-\$variant] [variant=mingw-w64]"
|
||||
echo "Note: DEFAULT_PKGBUILDS_DIR and QT_GIT_REPOS_DIR must point to directories containing PKGBUILDs and the Qt repos."
|
||||
exit -1
|
||||
fi
|
||||
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
From 955c44726565654efbf8099a66b1e3b23e2d41df Mon Sep 17 00:00:00 2001
|
||||
From: Martchus <martchus@gmx.net>
|
||||
Date: Fri, 3 Feb 2017 18:30:51 +0100
|
||||
Subject: [PATCH 01/33] Adjust win32-g++ profile for cross compilation with
|
||||
Subject: [PATCH 01/34] Adjust win32-g++ profile for cross compilation with
|
||||
mingw-w64
|
||||
|
||||
Adding a new, separate mkspec instead of patching the existing one
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
From 190efab0758fdd9055145491f6c788996fa6b7ce Mon Sep 17 00:00:00 2001
|
||||
From: Martchus <martchus@gmx.net>
|
||||
Date: Sun, 18 Sep 2016 13:36:53 +0200
|
||||
Subject: [PATCH 02/33] Ensure GLdouble is defined when using dynamic OpenGL
|
||||
Subject: [PATCH 02/34] Ensure GLdouble is defined when using dynamic OpenGL
|
||||
|
||||
FIXME: Not sure whether this is still required
|
||||
---
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
From f17fa5afa2f24bc569eda2bbe35b77a4ab268608 Mon Sep 17 00:00:00 2001
|
||||
From: Martchus <martchus@gmx.net>
|
||||
Date: Sun, 18 Sep 2016 13:41:38 +0200
|
||||
Subject: [PATCH 03/33] Use external ANGLE library
|
||||
Subject: [PATCH 03/34] Use external ANGLE library
|
||||
|
||||
---
|
||||
src/gui/Qt5GuiConfigExtras.cmake.in | 4 ++--
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
From 1ec5d5ee305fd993022c404ad00e5c3f4524d007 Mon Sep 17 00:00:00 2001
|
||||
From: Martchus <martchus@gmx.net>
|
||||
Date: Sun, 18 Sep 2016 13:48:51 +0200
|
||||
Subject: [PATCH 04/33] Fix too many sections assemler error in OpenGL factory
|
||||
Subject: [PATCH 04/34] Fix too many sections assemler error in OpenGL factory
|
||||
|
||||
On x86_64 qopenglversionfunctionsfactory.o exceeds the
|
||||
limit of 32768 sections.
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
From ddc22a123829a1d50a82ea62e6b9f1df3496b253 Mon Sep 17 00:00:00 2001
|
||||
From: Martchus <martchus@gmx.net>
|
||||
Date: Sun, 18 Sep 2016 13:54:12 +0200
|
||||
Subject: [PATCH 05/33] Make sure *.pc files are installed correctly
|
||||
Subject: [PATCH 05/34] Make sure *.pc files are installed correctly
|
||||
|
||||
---
|
||||
qmake/generators/makefile.cpp | 8 ++++++--
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
From 1eb6c3cccc09e51f68f30ab2fc6d8bbf04085031 Mon Sep 17 00:00:00 2001
|
||||
From: Martchus <martchus@gmx.net>
|
||||
Date: Sun, 18 Sep 2016 13:58:28 +0200
|
||||
Subject: [PATCH 06/33] Don't add resource files to LIBS parameter
|
||||
Subject: [PATCH 06/34] Don't add resource files to LIBS parameter
|
||||
|
||||
Solves an issue where the generated pkg-config
|
||||
files contained invalid Libs.private references
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
From 31cca3a47eea50156a5549574d934dd0264cb0f3 Mon Sep 17 00:00:00 2001
|
||||
From: Martchus <martchus@gmx.net>
|
||||
Date: Sun, 18 Sep 2016 14:01:14 +0200
|
||||
Subject: [PATCH 07/33] Prevent debug library names in pkg-config files
|
||||
Subject: [PATCH 07/34] Prevent debug library names in pkg-config files
|
||||
|
||||
qmake generates the pkgconfig .pc files two times, once for the
|
||||
release build and once for the debug build (which we're not actually
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
From c8ebd475383209c46510769731be7f7598e6feee Mon Sep 17 00:00:00 2001
|
||||
From: Martchus <martchus@gmx.net>
|
||||
Date: Thu, 26 Jan 2017 17:51:31 +0100
|
||||
Subject: [PATCH 08/33] Fix linking against shared/static libpng
|
||||
Subject: [PATCH 08/34] Fix linking against shared/static libpng
|
||||
|
||||
Change-Id: Ic7a0ec9544059b8e647a5d0186f1b88c00911dcf
|
||||
---
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
From d79b593a0d432b88521ec58ed6e7411a85347bb8 Mon Sep 17 00:00:00 2001
|
||||
From: Martchus <martchus@gmx.net>
|
||||
Date: Fri, 3 Feb 2017 19:36:25 +0100
|
||||
Subject: [PATCH 09/33] Fix linking against static D-Bus
|
||||
Subject: [PATCH 09/34] Fix linking against static D-Bus
|
||||
|
||||
---
|
||||
configure.json | 9 +++++++--
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
From 6032fdbbd2df9576e7509b80c2e4d6c87d744470 Mon Sep 17 00:00:00 2001
|
||||
From: Martchus <martchus@gmx.net>
|
||||
Date: Fri, 2 Jun 2017 18:28:10 +0200
|
||||
Subject: [PATCH 10/33] Don't try to use debug version of D-Bus library
|
||||
Subject: [PATCH 10/34] Don't try to use debug version of D-Bus library
|
||||
|
||||
Required for a debug build of Qt because mingw-w64-dbus
|
||||
does not contain debug version
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
From a1ce36f86105230865fd6fb5eb4f0bbe09d7221b Mon Sep 17 00:00:00 2001
|
||||
From: Martchus <martchus@gmx.net>
|
||||
Date: Fri, 3 Feb 2017 20:51:19 +0100
|
||||
Subject: [PATCH 11/33] Fix linking against static freetype2
|
||||
Subject: [PATCH 11/34] Fix linking against static freetype2
|
||||
|
||||
---
|
||||
src/gui/configure.json | 7 +++++--
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
From ab966035502f0b14f4e9b037223c9d84646f0bf2 Mon Sep 17 00:00:00 2001
|
||||
From: Martchus <martchus@gmx.net>
|
||||
Date: Sun, 18 Sep 2016 14:22:56 +0200
|
||||
Subject: [PATCH 12/33] Fix linking against static harfbuzz
|
||||
Subject: [PATCH 12/34] Fix linking against static harfbuzz
|
||||
|
||||
---
|
||||
src/gui/configure.json | 6 +++++-
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
From 313ee18fb5ba456880fbcfcb5f5d991235094da4 Mon Sep 17 00:00:00 2001
|
||||
From: Martchus <martchus@gmx.net>
|
||||
Date: Sun, 18 Sep 2016 14:24:01 +0200
|
||||
Subject: [PATCH 13/33] Fix linking against static pcre
|
||||
Subject: [PATCH 13/34] Fix linking against static pcre
|
||||
|
||||
Change-Id: I3225c6e82dc4d17aef37d4289c16eb7a5ea3c5a1
|
||||
---
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
From 267961ff9c908b5c02828b0c2842c8f320fa7f1b Mon Sep 17 00:00:00 2001
|
||||
From: Martchus <martchus@gmx.net>
|
||||
Date: Sun, 18 Sep 2016 18:56:55 +0200
|
||||
Subject: [PATCH 14/33] Fix linking against shared/static MariaDB
|
||||
Subject: [PATCH 14/34] Fix linking against shared/static MariaDB
|
||||
|
||||
Change-Id: I9722c154d845f288a2d4d1ab14a014066b28819b
|
||||
---
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
From 00fc4018caca88c40fb216917ae0066aa3dd2ed3 Mon Sep 17 00:00:00 2001
|
||||
From: Martchus <martchus@gmx.net>
|
||||
Date: Sun, 18 Sep 2016 18:58:25 +0200
|
||||
Subject: [PATCH 15/33] Fix linking against shared/static PostgreSQL
|
||||
Subject: [PATCH 15/34] Fix linking against shared/static PostgreSQL
|
||||
|
||||
---
|
||||
src/plugins/sqldrivers/configure.json | 5 +++--
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
From ef21b8b44d8c71e927a93bd24cdca38ec2c37391 Mon Sep 17 00:00:00 2001
|
||||
From: Martchus <martchus@gmx.net>
|
||||
Date: Sun, 18 Sep 2016 14:25:40 +0200
|
||||
Subject: [PATCH 16/33] Rename qtmain to qt5main
|
||||
Subject: [PATCH 16/34] Rename qtmain to qt5main
|
||||
|
||||
Prevents conflict with mingw-w64-qt4 package
|
||||
---
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
From c79c2a4f048484d235574a69e6f6ba3dcff23abe Mon Sep 17 00:00:00 2001
|
||||
From: Martchus <martchus@gmx.net>
|
||||
Date: Sun, 18 Sep 2016 14:27:28 +0200
|
||||
Subject: [PATCH 17/33] Build dynamic host libraries
|
||||
Subject: [PATCH 17/34] Build dynamic host libraries
|
||||
|
||||
This came initially from Fedora, not sure whether
|
||||
it makes sense to keep it. Regular Arch package
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
From 9a506994e00aa0fb257bfe80458b0543c0e9f8b0 Mon Sep 17 00:00:00 2001
|
||||
From: Martchus <martchus@gmx.net>
|
||||
Date: Sun, 18 Sep 2016 17:59:27 +0200
|
||||
Subject: [PATCH 18/33] Enable rpath for build tools
|
||||
Subject: [PATCH 18/34] Enable rpath for build tools
|
||||
|
||||
- Required because various tools depend on libQt5Bootstrap.so which resides
|
||||
in folder /usr/${_arch}/lib
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
From 92e7155e22bfe514a20d6ebf39b6bdfbf45f194c Mon Sep 17 00:00:00 2001
|
||||
From: Martchus <martchus@gmx.net>
|
||||
Date: Sun, 18 Sep 2016 18:04:42 +0200
|
||||
Subject: [PATCH 19/33] Use system zlib for build tools
|
||||
Subject: [PATCH 19/34] Use system zlib for build tools
|
||||
|
||||
---
|
||||
src/tools/bootstrap/bootstrap.pro | 2 +-
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
From d3a0f355335aa086e2663d634f2f41766f1bcdd6 Mon Sep 17 00:00:00 2001
|
||||
From: Martchus <martchus@gmx.net>
|
||||
Date: Sun, 18 Sep 2016 18:26:18 +0200
|
||||
Subject: [PATCH 20/33] Use *.dll.a as import lib extension
|
||||
Subject: [PATCH 20/34] Use *.dll.a as import lib extension
|
||||
|
||||
The variables used here are provided by
|
||||
mingw-w64 specific mkspec
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
From 91d94eadf25139197ce3cf74bb75692e9c77db07 Mon Sep 17 00:00:00 2001
|
||||
From: Martchus <martchus@gmx.net>
|
||||
Date: Sun, 18 Sep 2016 18:45:08 +0200
|
||||
Subject: [PATCH 21/33] Merge shared and static library trees
|
||||
Subject: [PATCH 21/34] Merge shared and static library trees
|
||||
|
||||
Allow installation of shared and static build in the same prefix
|
||||
---
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
From 86e3c50a96608acab006e9e525c23e4f420d8b4d Mon Sep 17 00:00:00 2001
|
||||
From: Martchus <martchus@gmx.net>
|
||||
Date: Sun, 18 Sep 2016 18:32:00 +0200
|
||||
Subject: [PATCH 22/33] Pull dependencies of static libraries in CMake modules
|
||||
Subject: [PATCH 22/34] Pull dependencies of static libraries in CMake modules
|
||||
|
||||
When doing a static build of Qt, the dependencies of the Qt
|
||||
libraries and plugins itself must be specified when linking
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
From 244565bea2e8c84287b0a5dbbacea3db7e186f6d Mon Sep 17 00:00:00 2001
|
||||
From: Martchus <martchus@gmx.net>
|
||||
Date: Sat, 5 Aug 2017 21:14:26 +0200
|
||||
Subject: [PATCH 23/33] Allow usage of static version with CMake
|
||||
Subject: [PATCH 23/34] Allow usage of static version with CMake
|
||||
|
||||
Allow selecting between dynamic and static Qt versions
|
||||
installed in the same prefix
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
From dad3f2977824ca10f03f28486f10780fa2f615e3 Mon Sep 17 00:00:00 2001
|
||||
From: Martchus <martchus@gmx.net>
|
||||
Date: Fri, 2 Jun 2017 16:42:07 +0200
|
||||
Subject: [PATCH 24/33] Adjust linker flags for static build with
|
||||
Subject: [PATCH 24/34] Adjust linker flags for static build with
|
||||
cmake/mingw-w64
|
||||
|
||||
Change-Id: I33b88976d8f5ce87ce431a6f422fe87785bf5b8d
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
From 2c846ab2a45c159905715e98338246f86e98e5a8 Mon Sep 17 00:00:00 2001
|
||||
From: Martchus <martchus@gmx.net>
|
||||
Date: Sun, 18 Sep 2016 18:50:21 +0200
|
||||
Subject: [PATCH 25/33] Use correct pkg-config --static flag
|
||||
Subject: [PATCH 25/34] Use correct pkg-config --static flag
|
||||
|
||||
---
|
||||
configure.pri | 3 +++
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
From 400f992fa24ed2b62be4258d5d26bff3846d95ce Mon Sep 17 00:00:00 2001
|
||||
From: Martchus <martchus@gmx.net>
|
||||
Date: Sun, 4 Dec 2016 20:35:47 +0100
|
||||
Subject: [PATCH 26/33] Fix macro invoking moc, rcc and uic
|
||||
Subject: [PATCH 26/34] Fix macro invoking moc, rcc and uic
|
||||
|
||||
* Otherwise the arguments aren't passed correctly leading to errors like
|
||||
```
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
From 3872dc79e2e8c530ee73003c6c7f4b08e4697f7f Mon Sep 17 00:00:00 2001
|
||||
From: Martchus <martchus@gmx.net>
|
||||
Date: Wed, 25 Jan 2017 20:59:54 +0100
|
||||
Subject: [PATCH 27/33] Ignore errors about missing feature static
|
||||
Subject: [PATCH 27/34] Ignore errors about missing feature static
|
||||
|
||||
Not sure why this error occurs, let's hope for the best
|
||||
---
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
From c7eb8dbf86904eab61b3bb53f52563d861372f65 Mon Sep 17 00:00:00 2001
|
||||
From: Martchus <martchus@gmx.net>
|
||||
Date: Wed, 25 Jan 2017 21:08:20 +0100
|
||||
Subject: [PATCH 28/33] Enable and fix use of iconv
|
||||
Subject: [PATCH 28/34] Enable and fix use of iconv
|
||||
|
||||
Change-Id: I5f0ab27afca0800dec11c7af74d196190820ae5c
|
||||
---
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
From 558b86ad0cbaa5fb318d729c3768bc51f385e7cd Mon Sep 17 00:00:00 2001
|
||||
From: Martchus <martchus@gmx.net>
|
||||
Date: Wed, 25 Jan 2017 21:08:48 +0100
|
||||
Subject: [PATCH 29/33] Ignore failing pkg-config test
|
||||
Subject: [PATCH 29/34] Ignore failing pkg-config test
|
||||
|
||||
Didn't investigate why it fails, let's hope for the best
|
||||
---
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
From cfdde9962386c34c3f2bfe902aa2a522b0530dba Mon Sep 17 00:00:00 2001
|
||||
From: Martchus <martchus@gmx.net>
|
||||
Date: Tue, 7 Feb 2017 18:25:28 +0100
|
||||
Subject: [PATCH 30/33] Prevent qmake from messing static lib dependencies
|
||||
Subject: [PATCH 30/34] Prevent qmake from messing static lib dependencies
|
||||
|
||||
In particular, it messes resolving cyclic dependency between
|
||||
static freetype2 and harfbuzz
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
From 0e3e71c77f1bf23ab20c2c4b3219c371ba94825f Mon Sep 17 00:00:00 2001
|
||||
From: Martchus <martchus@gmx.net>
|
||||
Date: Wed, 25 Jan 2017 23:42:30 +0100
|
||||
Subject: [PATCH 31/33] Hardcode linker flags for platform plugins
|
||||
Subject: [PATCH 31/34] Hardcode linker flags for platform plugins
|
||||
|
||||
Otherwise incorrect order of libs leads to errors
|
||||
when building libqminimal.dll, libqoffscreen.dll
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
From 8741a4b4d6c3bc569dc6452c777a7692266e6a91 Mon Sep 17 00:00:00 2001
|
||||
From: Martchus <martchus@gmx.net>
|
||||
Date: Fri, 25 Aug 2017 17:07:17 +0200
|
||||
Subject: [PATCH 32/33] Fix linking against static plugins with qmake
|
||||
Subject: [PATCH 32/34] Fix linking against static plugins with qmake
|
||||
|
||||
Required because qtConfig(static) does not work
|
||||
with 'Merge shared and static library trees'
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
From 4c9b1ccd23a3d0b63e57f5dff781ae8650b5d85c Mon Sep 17 00:00:00 2001
|
||||
From: Martchus <martchus@gmx.net>
|
||||
Date: Sat, 26 May 2018 03:47:14 +0200
|
||||
Subject: [PATCH 33/33] Disable hardware randomizer for 32-bit
|
||||
Subject: [PATCH 33/34] Disable hardware randomizer for 32-bit
|
||||
MIME-Version: 1.0
|
||||
Content-Type: text/plain; charset=UTF-8
|
||||
Content-Transfer-Encoding: 8bit
|
||||
|
|
|
|||
|
|
@ -0,0 +1,69 @@
|
|||
From 0fc1e355f07235ca7fe1f04d7206394772c6b5f4 Mon Sep 17 00:00:00 2001
|
||||
From: Martchus <martchus@gmx.net>
|
||||
Date: Sat, 25 Aug 2018 11:44:46 +0200
|
||||
Subject: [PATCH 34/34] Fix build error related to glibc 2.28 and stat
|
||||
|
||||
Taken from regular package, comes from Fedora
|
||||
---
|
||||
mkspecs/linux-g++/qplatformdefs.h | 2 ++
|
||||
src/corelib/io/qfilesystemengine_unix.cpp | 10 +++++++---
|
||||
2 files changed, 9 insertions(+), 3 deletions(-)
|
||||
|
||||
diff --git a/mkspecs/linux-g++/qplatformdefs.h b/mkspecs/linux-g++/qplatformdefs.h
|
||||
index 13523f0702..d32453162c 100644
|
||||
--- a/mkspecs/linux-g++/qplatformdefs.h
|
||||
+++ b/mkspecs/linux-g++/qplatformdefs.h
|
||||
@@ -72,7 +72,9 @@
|
||||
#include <sys/time.h>
|
||||
#include <sys/shm.h>
|
||||
#include <sys/socket.h>
|
||||
+#if 0
|
||||
#include <sys/stat.h>
|
||||
+#endif
|
||||
#include <sys/wait.h>
|
||||
#include <netinet/in.h>
|
||||
|
||||
diff --git a/src/corelib/io/qfilesystemengine_unix.cpp b/src/corelib/io/qfilesystemengine_unix.cpp
|
||||
index be6ce48d0c..3648cfc43d 100644
|
||||
--- a/src/corelib/io/qfilesystemengine_unix.cpp
|
||||
+++ b/src/corelib/io/qfilesystemengine_unix.cpp
|
||||
@@ -50,7 +50,9 @@
|
||||
#include <pwd.h>
|
||||
#include <stdlib.h> // for realpath()
|
||||
#include <sys/types.h>
|
||||
+#if 0
|
||||
#include <sys/stat.h>
|
||||
+#endif
|
||||
#include <unistd.h>
|
||||
#include <stdio.h>
|
||||
#include <errno.h>
|
||||
@@ -91,7 +93,9 @@ extern "C" NSString *NSTemporaryDirectory();
|
||||
# include <sys/syscall.h>
|
||||
# include <sys/sendfile.h>
|
||||
# include <linux/fs.h>
|
||||
+#if 0
|
||||
# include <linux/stat.h>
|
||||
+#endif
|
||||
|
||||
// in case linux/fs.h is too old and doesn't define it:
|
||||
#ifndef FICLONE
|
||||
@@ -105,13 +109,13 @@ extern "C" NSString *NSTemporaryDirectory();
|
||||
# undef SYS_renameat2
|
||||
# undef SYS_statx
|
||||
# undef STATX_BASIC_STATS
|
||||
-# else
|
||||
-# if !QT_CONFIG(renameat2) && defined(SYS_renameat2)
|
||||
+# else
|
||||
+# if 0 && !QT_CONFIG(renameat2) && defined(SYS_renameat2)
|
||||
static int renameat2(int oldfd, const char *oldpath, int newfd, const char *newpath, unsigned flags)
|
||||
{ return syscall(SYS_renameat2, oldfd, oldpath, newfd, newpath, flags); }
|
||||
# endif
|
||||
|
||||
-# if !QT_CONFIG(statx) && defined(SYS_statx)
|
||||
+# if 0 && !QT_CONFIG(statx) && defined(SYS_statx)
|
||||
static int statx(int dirfd, const char *pathname, int flag, unsigned mask, struct statx *statxbuf)
|
||||
{ return syscall(SYS_statx, dirfd, pathname, flag, mask, statxbuf); }
|
||||
# elif !QT_CONFIG(statx) && !defined(SYS_statx)
|
||||
--
|
||||
2.18.0
|
||||
|
||||
|
|
@ -84,41 +84,43 @@ source=("https://download.qt.io/official_releases/qt/${pkgver%.*}/${pkgver}/subm
|
|||
'0030-Prevent-qmake-from-messing-static-lib-dependencies.patch'
|
||||
'0031-Hardcode-linker-flags-for-platform-plugins.patch'
|
||||
'0032-Fix-linking-against-static-plugins-with-qmake.patch'
|
||||
'0033-Disable-hardware-randomizer-for-32-bit.patch')
|
||||
'0033-Disable-hardware-randomizer-for-32-bit.patch'
|
||||
'0034-Fix-build-error-related-to-glibc-2.28-and-stat.patch')
|
||||
sha256sums=('a0d047b2da5782c8332c59ae203984b64e4d5dc5f4ba9c0884fdbe753d0afb46'
|
||||
'e1973bda25994e3dc3d6c1b4d9b78fbbb540490d2da43db166df14f776a39039'
|
||||
'46da072fdffff5edee7c23a024f4a28ca55b5ae57890145fb59ebe00bbeb897e'
|
||||
'48a9629a9f26b7e828d6021e7db0149421ad05c3927cb9b60147c90caa487f9b'
|
||||
'b8d97a80c547e90e1348fa722b26dbda3d1f07ddfa4a00a0a268a5dbb3de489d'
|
||||
'765501ce588fe5ebaccc8e54f3a588a08abceae304a19988358dd118fead847c'
|
||||
'80181dda780b44bc24d3d7f0eb6b7c496170ef0db5955dd2d7e4214a24b48169'
|
||||
'22974a0a1f902f812a655e86fb0bb18a7931be89240aef3a5b5eebadf085cbce'
|
||||
'1eeeaf5b710df4846c94ad3e06802cd204ebfaf481905fe2644421efd557ff0f'
|
||||
'd26c120c12eddc18f1a424117e38c27c8171dfccb7d5ba1fcf3991d57328b9d7'
|
||||
'a8e27ad9ef209661ba42112a49f0fbf29fdb9bc94d6ad51f715e59b031d3230d'
|
||||
'dacf9cbed1f0f309b8394d4a1a27d60b641f3d19e70352827b1ef123dcf194a8'
|
||||
'7e919946802ba7b3d666b69c661dff396abfc24b046edb439b684d4b3cc7f42f'
|
||||
'03003c3a2a16d6f7b36436d8b63496fb5eb97c5da9770eb3f0d0bc3090b5d4e4'
|
||||
'910f6198069a5d72b88bab70bfef2de50cf44f253a61a37e24c10d3d2d1f2590'
|
||||
'a262866828f5fd77c49d4dd62aa49447ab2e59eb7031a3bc09304ef100837ce5'
|
||||
'613246baff8474c33314c6320fbf163835d36e9aae3221ab1c3ad87a55bcab9a'
|
||||
'3e08a5af6515821049d611143782bfe1bea7b75c46b25a1a8cdd5b5d66f01cde'
|
||||
'9ab6cd425c778cded2575d22a4577d5ae220f7a031e3ebc9581fe871f5bbda98'
|
||||
'90bd7cfdb2a8e890db775293b498008264ccb5571247c77a1dbca21ef96f0e3f'
|
||||
'37fa408528ff94f4f41e27097a619acc7dd97e66a9f2584178517079e3c5232c'
|
||||
'4b293b11424efabcf25fc634fd7eec058351297474fcaaad6bbbf3b7be94e39f'
|
||||
'3878d33beb40fc2907ccfaf7f656e983e30399bd0f6afa78658d802715e2e91d'
|
||||
'f96bea78b8a04a5d278cd01fdc6478a79beea6bba8f922a7ba91b14acd7998b3'
|
||||
'c0dc173b900ea5edc45ab2695406b1ca11c08113d8c402672208bee95deff4c7'
|
||||
'feb8bf1ee858b8c499c3644c95454880835adc85a5039f6d2027b06caa552be1'
|
||||
'e463ff31d6bc218a3724d95463b405f63ee66fb270ac1bbc0f3fc3d1e81c6444'
|
||||
'faeac0d51bc8ddda40fd02fdf8aff5f35187d9a3bcfa9c0a02d6d19a7314f91c'
|
||||
'241790c3788449d71ef38c84c15fa158408057730b782fb7976e93ba26df4876'
|
||||
'e2983e47533094c5add54bdc4d565f7107b5508a2b23c3de8e0e92bf93627505'
|
||||
'5a8f2561eb06951b5923f115cdcb7df863169c4db01207dc216ede107e9fca7c'
|
||||
'e907fb9111c9a54ac91a538a40b420088d54f86f047c129b0b6e4ff4423ae982'
|
||||
'60cdf773863423f33207526b343cf72c76ee1680af27fb3c494f63ce9a58f9e8'
|
||||
'7e353383fbd5ce8368089b5ec4ced6f19674c4490a46d4e0db81e1ea6800b180')
|
||||
'6e929b114e4a69fec480db4e78a39c2e95a88e76b88b1743863013e9f4bd1b0b'
|
||||
'f0bb44995308af295a9847b2f796dc938d4e4673dbd422616cb890a1ad559ade'
|
||||
'bb81e37b265140e99c8ed01acadd93ba533757f98cc38452309aca4de74fc957'
|
||||
'5a7eff8dd3312a62b3f1606358e74fa8d4e5b118796299afbd334bff159f3659'
|
||||
'857650169e6c7f96aeb835c7c622ff67034a19cc295f7724498c95c49a6d0b79'
|
||||
'b56639a777db979145b26cb39dcba15d7b6f52178cc94373be637ec026db23b7'
|
||||
'87ad586b648f3fd9c24f9794f0926ca3a3b78d62c544dcbfc1f80c89ad51dbbf'
|
||||
'cd2d25b8c036a967624d46dcbe9f04b323678fa72855c11c2bf307d713b32aad'
|
||||
'1223e502f6700f6d428920bf0cb103eba03f8b253f43d9cd9dfd2b8e1c4974bc'
|
||||
'd9c0de2a86939bfa19c69b31a8165d4553dc4afdbbe60f9dce8ca1e030b96e51'
|
||||
'0e5462994dcaf9b3d879b4ef562c12ecb2462b325e5026486ae6c29a83975e07'
|
||||
'75fd2a29acc8e06bdd46a18018c81f0cb4816947ebd8ff8b8c76a633855c60d1'
|
||||
'88f0f909022c7a3be8df0f4597ad36681a73d3be40a848061fa17d23641263ad'
|
||||
'c413a032bbf1e0de0ac722cb7213cc1e21ef36797d23fd12604a843c9a9cfcd8'
|
||||
'564ca84a3c7bdc12aab2edca084850fec3104ea9dba053127c754dd463010283'
|
||||
'3191b4c924af232ac5c3db8e2b670868107837ff39541451806731fd88c44877'
|
||||
'9eeaeb84fc650f6fa54b66d45a67a1922b9d363c40d749aa0fb0925d0a190110'
|
||||
'62d8b373f074c3d0f440cb35f464b98a283b28c57551b921d7f464b86f95902c'
|
||||
'17a17bea14fedbffc011334f5298e3b3da6be90d26635982aa9027d0f9be8d5c'
|
||||
'b43c3b5e7e071854ba0249b38ea8e7e543e3be3a604dfb700baad752c5722967'
|
||||
'6097ff39d3996d1c7832a2fa4fbdd67728bf1014083db7c145c9585579d79a95'
|
||||
'dc79f6449d4aa5c3be57cfcff975f5573017c69c49785fc124d37837e8704e02'
|
||||
'6ff9bdee5dfc958b38b5063d1f1cf082a5950d00479f70fd5905ff9b5e53acc1'
|
||||
'339139a569c951c75e6db12754f8629b392d1b4c410718f068a8ad1cf63c2ff4'
|
||||
'5db30dd7615347286975f50911e9c0aa567733107069d96c484f414c9eb0d06d'
|
||||
'45fba6b70852c8ddfc1793d7d661788ccad23468a276617e13566efce2993e5f'
|
||||
'9199a5fe3eccca581df6513ff9167bfbfaa7e9b3ff787a0803da543a37ff054b'
|
||||
'28a30fd468eedcb08d70df65c670a8b5713898f64c2fe4985f93694441543b39'
|
||||
'b8fae2d545997d1cdfab3688d7dec42e7606de493a1eb8ff118d6d56b3000440'
|
||||
'd1c83496e0139fbc3aa167238296dd5bfe08adf645549bffeaf9bbb3a40ceaf0'
|
||||
'2cbabbad04e7a1ddaffb2d3e968814dac875dc070ed63b90181905e3dd0351de'
|
||||
'84528256f371719d0a8a68628392a6f3f37ca3d9353a746114a9bc7d4732728b'
|
||||
'9af2a3650bf3141d4fb042f00b2067a43069a72e5f75ea2f37d90730089f5e44'
|
||||
'd354ab15d7475e2df989d969990ddd415da62423b4af731946e8c3c7ab496d07')
|
||||
|
||||
_architectures='i686-w64-mingw32 x86_64-w64-mingw32'
|
||||
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
From 955c44726565654efbf8099a66b1e3b23e2d41df Mon Sep 17 00:00:00 2001
|
||||
From: Martchus <martchus@gmx.net>
|
||||
Date: Fri, 3 Feb 2017 18:30:51 +0100
|
||||
Subject: [PATCH 01/33] Adjust win32-g++ profile for cross compilation with
|
||||
Subject: [PATCH 01/34] Adjust win32-g++ profile for cross compilation with
|
||||
mingw-w64
|
||||
|
||||
Adding a new, separate mkspec instead of patching the existing one
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
From 190efab0758fdd9055145491f6c788996fa6b7ce Mon Sep 17 00:00:00 2001
|
||||
From: Martchus <martchus@gmx.net>
|
||||
Date: Sun, 18 Sep 2016 13:36:53 +0200
|
||||
Subject: [PATCH 02/33] Ensure GLdouble is defined when using dynamic OpenGL
|
||||
Subject: [PATCH 02/34] Ensure GLdouble is defined when using dynamic OpenGL
|
||||
|
||||
FIXME: Not sure whether this is still required
|
||||
---
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
From f17fa5afa2f24bc569eda2bbe35b77a4ab268608 Mon Sep 17 00:00:00 2001
|
||||
From: Martchus <martchus@gmx.net>
|
||||
Date: Sun, 18 Sep 2016 13:41:38 +0200
|
||||
Subject: [PATCH 03/33] Use external ANGLE library
|
||||
Subject: [PATCH 03/34] Use external ANGLE library
|
||||
|
||||
---
|
||||
src/gui/Qt5GuiConfigExtras.cmake.in | 4 ++--
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
From 1ec5d5ee305fd993022c404ad00e5c3f4524d007 Mon Sep 17 00:00:00 2001
|
||||
From: Martchus <martchus@gmx.net>
|
||||
Date: Sun, 18 Sep 2016 13:48:51 +0200
|
||||
Subject: [PATCH 04/33] Fix too many sections assemler error in OpenGL factory
|
||||
Subject: [PATCH 04/34] Fix too many sections assemler error in OpenGL factory
|
||||
|
||||
On x86_64 qopenglversionfunctionsfactory.o exceeds the
|
||||
limit of 32768 sections.
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
From ddc22a123829a1d50a82ea62e6b9f1df3496b253 Mon Sep 17 00:00:00 2001
|
||||
From: Martchus <martchus@gmx.net>
|
||||
Date: Sun, 18 Sep 2016 13:54:12 +0200
|
||||
Subject: [PATCH 05/33] Make sure *.pc files are installed correctly
|
||||
Subject: [PATCH 05/34] Make sure *.pc files are installed correctly
|
||||
|
||||
---
|
||||
qmake/generators/makefile.cpp | 8 ++++++--
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
From 1eb6c3cccc09e51f68f30ab2fc6d8bbf04085031 Mon Sep 17 00:00:00 2001
|
||||
From: Martchus <martchus@gmx.net>
|
||||
Date: Sun, 18 Sep 2016 13:58:28 +0200
|
||||
Subject: [PATCH 06/33] Don't add resource files to LIBS parameter
|
||||
Subject: [PATCH 06/34] Don't add resource files to LIBS parameter
|
||||
|
||||
Solves an issue where the generated pkg-config
|
||||
files contained invalid Libs.private references
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
From 31cca3a47eea50156a5549574d934dd0264cb0f3 Mon Sep 17 00:00:00 2001
|
||||
From: Martchus <martchus@gmx.net>
|
||||
Date: Sun, 18 Sep 2016 14:01:14 +0200
|
||||
Subject: [PATCH 07/33] Prevent debug library names in pkg-config files
|
||||
Subject: [PATCH 07/34] Prevent debug library names in pkg-config files
|
||||
|
||||
qmake generates the pkgconfig .pc files two times, once for the
|
||||
release build and once for the debug build (which we're not actually
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
From c8ebd475383209c46510769731be7f7598e6feee Mon Sep 17 00:00:00 2001
|
||||
From: Martchus <martchus@gmx.net>
|
||||
Date: Thu, 26 Jan 2017 17:51:31 +0100
|
||||
Subject: [PATCH 08/33] Fix linking against shared/static libpng
|
||||
Subject: [PATCH 08/34] Fix linking against shared/static libpng
|
||||
|
||||
Change-Id: Ic7a0ec9544059b8e647a5d0186f1b88c00911dcf
|
||||
---
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
From d79b593a0d432b88521ec58ed6e7411a85347bb8 Mon Sep 17 00:00:00 2001
|
||||
From: Martchus <martchus@gmx.net>
|
||||
Date: Fri, 3 Feb 2017 19:36:25 +0100
|
||||
Subject: [PATCH 09/33] Fix linking against static D-Bus
|
||||
Subject: [PATCH 09/34] Fix linking against static D-Bus
|
||||
|
||||
---
|
||||
configure.json | 9 +++++++--
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
From 6032fdbbd2df9576e7509b80c2e4d6c87d744470 Mon Sep 17 00:00:00 2001
|
||||
From: Martchus <martchus@gmx.net>
|
||||
Date: Fri, 2 Jun 2017 18:28:10 +0200
|
||||
Subject: [PATCH 10/33] Don't try to use debug version of D-Bus library
|
||||
Subject: [PATCH 10/34] Don't try to use debug version of D-Bus library
|
||||
|
||||
Required for a debug build of Qt because mingw-w64-dbus
|
||||
does not contain debug version
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
From a1ce36f86105230865fd6fb5eb4f0bbe09d7221b Mon Sep 17 00:00:00 2001
|
||||
From: Martchus <martchus@gmx.net>
|
||||
Date: Fri, 3 Feb 2017 20:51:19 +0100
|
||||
Subject: [PATCH 11/33] Fix linking against static freetype2
|
||||
Subject: [PATCH 11/34] Fix linking against static freetype2
|
||||
|
||||
---
|
||||
src/gui/configure.json | 7 +++++--
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
From ab966035502f0b14f4e9b037223c9d84646f0bf2 Mon Sep 17 00:00:00 2001
|
||||
From: Martchus <martchus@gmx.net>
|
||||
Date: Sun, 18 Sep 2016 14:22:56 +0200
|
||||
Subject: [PATCH 12/33] Fix linking against static harfbuzz
|
||||
Subject: [PATCH 12/34] Fix linking against static harfbuzz
|
||||
|
||||
---
|
||||
src/gui/configure.json | 6 +++++-
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
From 313ee18fb5ba456880fbcfcb5f5d991235094da4 Mon Sep 17 00:00:00 2001
|
||||
From: Martchus <martchus@gmx.net>
|
||||
Date: Sun, 18 Sep 2016 14:24:01 +0200
|
||||
Subject: [PATCH 13/33] Fix linking against static pcre
|
||||
Subject: [PATCH 13/34] Fix linking against static pcre
|
||||
|
||||
Change-Id: I3225c6e82dc4d17aef37d4289c16eb7a5ea3c5a1
|
||||
---
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
From 267961ff9c908b5c02828b0c2842c8f320fa7f1b Mon Sep 17 00:00:00 2001
|
||||
From: Martchus <martchus@gmx.net>
|
||||
Date: Sun, 18 Sep 2016 18:56:55 +0200
|
||||
Subject: [PATCH 14/33] Fix linking against shared/static MariaDB
|
||||
Subject: [PATCH 14/34] Fix linking against shared/static MariaDB
|
||||
|
||||
Change-Id: I9722c154d845f288a2d4d1ab14a014066b28819b
|
||||
---
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
From 00fc4018caca88c40fb216917ae0066aa3dd2ed3 Mon Sep 17 00:00:00 2001
|
||||
From: Martchus <martchus@gmx.net>
|
||||
Date: Sun, 18 Sep 2016 18:58:25 +0200
|
||||
Subject: [PATCH 15/33] Fix linking against shared/static PostgreSQL
|
||||
Subject: [PATCH 15/34] Fix linking against shared/static PostgreSQL
|
||||
|
||||
---
|
||||
src/plugins/sqldrivers/configure.json | 5 +++--
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
From ef21b8b44d8c71e927a93bd24cdca38ec2c37391 Mon Sep 17 00:00:00 2001
|
||||
From: Martchus <martchus@gmx.net>
|
||||
Date: Sun, 18 Sep 2016 14:25:40 +0200
|
||||
Subject: [PATCH 16/33] Rename qtmain to qt5main
|
||||
Subject: [PATCH 16/34] Rename qtmain to qt5main
|
||||
|
||||
Prevents conflict with mingw-w64-qt4 package
|
||||
---
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
From c79c2a4f048484d235574a69e6f6ba3dcff23abe Mon Sep 17 00:00:00 2001
|
||||
From: Martchus <martchus@gmx.net>
|
||||
Date: Sun, 18 Sep 2016 14:27:28 +0200
|
||||
Subject: [PATCH 17/33] Build dynamic host libraries
|
||||
Subject: [PATCH 17/34] Build dynamic host libraries
|
||||
|
||||
This came initially from Fedora, not sure whether
|
||||
it makes sense to keep it. Regular Arch package
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
From 9a506994e00aa0fb257bfe80458b0543c0e9f8b0 Mon Sep 17 00:00:00 2001
|
||||
From: Martchus <martchus@gmx.net>
|
||||
Date: Sun, 18 Sep 2016 17:59:27 +0200
|
||||
Subject: [PATCH 18/33] Enable rpath for build tools
|
||||
Subject: [PATCH 18/34] Enable rpath for build tools
|
||||
|
||||
- Required because various tools depend on libQt5Bootstrap.so which resides
|
||||
in folder /usr/${_arch}/lib
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
From 92e7155e22bfe514a20d6ebf39b6bdfbf45f194c Mon Sep 17 00:00:00 2001
|
||||
From: Martchus <martchus@gmx.net>
|
||||
Date: Sun, 18 Sep 2016 18:04:42 +0200
|
||||
Subject: [PATCH 19/33] Use system zlib for build tools
|
||||
Subject: [PATCH 19/34] Use system zlib for build tools
|
||||
|
||||
---
|
||||
src/tools/bootstrap/bootstrap.pro | 2 +-
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
From d3a0f355335aa086e2663d634f2f41766f1bcdd6 Mon Sep 17 00:00:00 2001
|
||||
From: Martchus <martchus@gmx.net>
|
||||
Date: Sun, 18 Sep 2016 18:26:18 +0200
|
||||
Subject: [PATCH 20/33] Use *.dll.a as import lib extension
|
||||
Subject: [PATCH 20/34] Use *.dll.a as import lib extension
|
||||
|
||||
The variables used here are provided by
|
||||
mingw-w64 specific mkspec
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
From 91d94eadf25139197ce3cf74bb75692e9c77db07 Mon Sep 17 00:00:00 2001
|
||||
From: Martchus <martchus@gmx.net>
|
||||
Date: Sun, 18 Sep 2016 18:45:08 +0200
|
||||
Subject: [PATCH 21/33] Merge shared and static library trees
|
||||
Subject: [PATCH 21/34] Merge shared and static library trees
|
||||
|
||||
Allow installation of shared and static build in the same prefix
|
||||
---
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
From 86e3c50a96608acab006e9e525c23e4f420d8b4d Mon Sep 17 00:00:00 2001
|
||||
From: Martchus <martchus@gmx.net>
|
||||
Date: Sun, 18 Sep 2016 18:32:00 +0200
|
||||
Subject: [PATCH 22/33] Pull dependencies of static libraries in CMake modules
|
||||
Subject: [PATCH 22/34] Pull dependencies of static libraries in CMake modules
|
||||
|
||||
When doing a static build of Qt, the dependencies of the Qt
|
||||
libraries and plugins itself must be specified when linking
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
From 244565bea2e8c84287b0a5dbbacea3db7e186f6d Mon Sep 17 00:00:00 2001
|
||||
From: Martchus <martchus@gmx.net>
|
||||
Date: Sat, 5 Aug 2017 21:14:26 +0200
|
||||
Subject: [PATCH 23/33] Allow usage of static version with CMake
|
||||
Subject: [PATCH 23/34] Allow usage of static version with CMake
|
||||
|
||||
Allow selecting between dynamic and static Qt versions
|
||||
installed in the same prefix
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
From dad3f2977824ca10f03f28486f10780fa2f615e3 Mon Sep 17 00:00:00 2001
|
||||
From: Martchus <martchus@gmx.net>
|
||||
Date: Fri, 2 Jun 2017 16:42:07 +0200
|
||||
Subject: [PATCH 24/33] Adjust linker flags for static build with
|
||||
Subject: [PATCH 24/34] Adjust linker flags for static build with
|
||||
cmake/mingw-w64
|
||||
|
||||
Change-Id: I33b88976d8f5ce87ce431a6f422fe87785bf5b8d
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
From 2c846ab2a45c159905715e98338246f86e98e5a8 Mon Sep 17 00:00:00 2001
|
||||
From: Martchus <martchus@gmx.net>
|
||||
Date: Sun, 18 Sep 2016 18:50:21 +0200
|
||||
Subject: [PATCH 25/33] Use correct pkg-config --static flag
|
||||
Subject: [PATCH 25/34] Use correct pkg-config --static flag
|
||||
|
||||
---
|
||||
configure.pri | 3 +++
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
From 400f992fa24ed2b62be4258d5d26bff3846d95ce Mon Sep 17 00:00:00 2001
|
||||
From: Martchus <martchus@gmx.net>
|
||||
Date: Sun, 4 Dec 2016 20:35:47 +0100
|
||||
Subject: [PATCH 26/33] Fix macro invoking moc, rcc and uic
|
||||
Subject: [PATCH 26/34] Fix macro invoking moc, rcc and uic
|
||||
|
||||
* Otherwise the arguments aren't passed correctly leading to errors like
|
||||
```
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
From 3872dc79e2e8c530ee73003c6c7f4b08e4697f7f Mon Sep 17 00:00:00 2001
|
||||
From: Martchus <martchus@gmx.net>
|
||||
Date: Wed, 25 Jan 2017 20:59:54 +0100
|
||||
Subject: [PATCH 27/33] Ignore errors about missing feature static
|
||||
Subject: [PATCH 27/34] Ignore errors about missing feature static
|
||||
|
||||
Not sure why this error occurs, let's hope for the best
|
||||
---
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
From c7eb8dbf86904eab61b3bb53f52563d861372f65 Mon Sep 17 00:00:00 2001
|
||||
From: Martchus <martchus@gmx.net>
|
||||
Date: Wed, 25 Jan 2017 21:08:20 +0100
|
||||
Subject: [PATCH 28/33] Enable and fix use of iconv
|
||||
Subject: [PATCH 28/34] Enable and fix use of iconv
|
||||
|
||||
Change-Id: I5f0ab27afca0800dec11c7af74d196190820ae5c
|
||||
---
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
From 558b86ad0cbaa5fb318d729c3768bc51f385e7cd Mon Sep 17 00:00:00 2001
|
||||
From: Martchus <martchus@gmx.net>
|
||||
Date: Wed, 25 Jan 2017 21:08:48 +0100
|
||||
Subject: [PATCH 29/33] Ignore failing pkg-config test
|
||||
Subject: [PATCH 29/34] Ignore failing pkg-config test
|
||||
|
||||
Didn't investigate why it fails, let's hope for the best
|
||||
---
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
From cfdde9962386c34c3f2bfe902aa2a522b0530dba Mon Sep 17 00:00:00 2001
|
||||
From: Martchus <martchus@gmx.net>
|
||||
Date: Tue, 7 Feb 2017 18:25:28 +0100
|
||||
Subject: [PATCH 30/33] Prevent qmake from messing static lib dependencies
|
||||
Subject: [PATCH 30/34] Prevent qmake from messing static lib dependencies
|
||||
|
||||
In particular, it messes resolving cyclic dependency between
|
||||
static freetype2 and harfbuzz
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
From 0e3e71c77f1bf23ab20c2c4b3219c371ba94825f Mon Sep 17 00:00:00 2001
|
||||
From: Martchus <martchus@gmx.net>
|
||||
Date: Wed, 25 Jan 2017 23:42:30 +0100
|
||||
Subject: [PATCH 31/33] Hardcode linker flags for platform plugins
|
||||
Subject: [PATCH 31/34] Hardcode linker flags for platform plugins
|
||||
|
||||
Otherwise incorrect order of libs leads to errors
|
||||
when building libqminimal.dll, libqoffscreen.dll
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
From 8741a4b4d6c3bc569dc6452c777a7692266e6a91 Mon Sep 17 00:00:00 2001
|
||||
From: Martchus <martchus@gmx.net>
|
||||
Date: Fri, 25 Aug 2017 17:07:17 +0200
|
||||
Subject: [PATCH 32/33] Fix linking against static plugins with qmake
|
||||
Subject: [PATCH 32/34] Fix linking against static plugins with qmake
|
||||
|
||||
Required because qtConfig(static) does not work
|
||||
with 'Merge shared and static library trees'
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
From 4c9b1ccd23a3d0b63e57f5dff781ae8650b5d85c Mon Sep 17 00:00:00 2001
|
||||
From: Martchus <martchus@gmx.net>
|
||||
Date: Sat, 26 May 2018 03:47:14 +0200
|
||||
Subject: [PATCH 33/33] Disable hardware randomizer for 32-bit
|
||||
Subject: [PATCH 33/34] Disable hardware randomizer for 32-bit
|
||||
MIME-Version: 1.0
|
||||
Content-Type: text/plain; charset=UTF-8
|
||||
Content-Transfer-Encoding: 8bit
|
||||
|
|
|
|||
|
|
@ -0,0 +1,69 @@
|
|||
From 0fc1e355f07235ca7fe1f04d7206394772c6b5f4 Mon Sep 17 00:00:00 2001
|
||||
From: Martchus <martchus@gmx.net>
|
||||
Date: Sat, 25 Aug 2018 11:44:46 +0200
|
||||
Subject: [PATCH 34/34] Fix build error related to glibc 2.28 and stat
|
||||
|
||||
Taken from regular package, comes from Fedora
|
||||
---
|
||||
mkspecs/linux-g++/qplatformdefs.h | 2 ++
|
||||
src/corelib/io/qfilesystemengine_unix.cpp | 10 +++++++---
|
||||
2 files changed, 9 insertions(+), 3 deletions(-)
|
||||
|
||||
diff --git a/mkspecs/linux-g++/qplatformdefs.h b/mkspecs/linux-g++/qplatformdefs.h
|
||||
index 13523f0702..d32453162c 100644
|
||||
--- a/mkspecs/linux-g++/qplatformdefs.h
|
||||
+++ b/mkspecs/linux-g++/qplatformdefs.h
|
||||
@@ -72,7 +72,9 @@
|
||||
#include <sys/time.h>
|
||||
#include <sys/shm.h>
|
||||
#include <sys/socket.h>
|
||||
+#if 0
|
||||
#include <sys/stat.h>
|
||||
+#endif
|
||||
#include <sys/wait.h>
|
||||
#include <netinet/in.h>
|
||||
|
||||
diff --git a/src/corelib/io/qfilesystemengine_unix.cpp b/src/corelib/io/qfilesystemengine_unix.cpp
|
||||
index be6ce48d0c..3648cfc43d 100644
|
||||
--- a/src/corelib/io/qfilesystemengine_unix.cpp
|
||||
+++ b/src/corelib/io/qfilesystemengine_unix.cpp
|
||||
@@ -50,7 +50,9 @@
|
||||
#include <pwd.h>
|
||||
#include <stdlib.h> // for realpath()
|
||||
#include <sys/types.h>
|
||||
+#if 0
|
||||
#include <sys/stat.h>
|
||||
+#endif
|
||||
#include <unistd.h>
|
||||
#include <stdio.h>
|
||||
#include <errno.h>
|
||||
@@ -91,7 +93,9 @@ extern "C" NSString *NSTemporaryDirectory();
|
||||
# include <sys/syscall.h>
|
||||
# include <sys/sendfile.h>
|
||||
# include <linux/fs.h>
|
||||
+#if 0
|
||||
# include <linux/stat.h>
|
||||
+#endif
|
||||
|
||||
// in case linux/fs.h is too old and doesn't define it:
|
||||
#ifndef FICLONE
|
||||
@@ -105,13 +109,13 @@ extern "C" NSString *NSTemporaryDirectory();
|
||||
# undef SYS_renameat2
|
||||
# undef SYS_statx
|
||||
# undef STATX_BASIC_STATS
|
||||
-# else
|
||||
-# if !QT_CONFIG(renameat2) && defined(SYS_renameat2)
|
||||
+# else
|
||||
+# if 0 && !QT_CONFIG(renameat2) && defined(SYS_renameat2)
|
||||
static int renameat2(int oldfd, const char *oldpath, int newfd, const char *newpath, unsigned flags)
|
||||
{ return syscall(SYS_renameat2, oldfd, oldpath, newfd, newpath, flags); }
|
||||
# endif
|
||||
|
||||
-# if !QT_CONFIG(statx) && defined(SYS_statx)
|
||||
+# if 0 && !QT_CONFIG(statx) && defined(SYS_statx)
|
||||
static int statx(int dirfd, const char *pathname, int flag, unsigned mask, struct statx *statxbuf)
|
||||
{ return syscall(SYS_statx, dirfd, pathname, flag, mask, statxbuf); }
|
||||
# elif !QT_CONFIG(statx) && !defined(SYS_statx)
|
||||
--
|
||||
2.18.0
|
||||
|
||||
|
|
@ -84,41 +84,43 @@ source=("https://download.qt.io/official_releases/qt/${pkgver%.*}/${pkgver}/subm
|
|||
'0030-Prevent-qmake-from-messing-static-lib-dependencies.patch'
|
||||
'0031-Hardcode-linker-flags-for-platform-plugins.patch'
|
||||
'0032-Fix-linking-against-static-plugins-with-qmake.patch'
|
||||
'0033-Disable-hardware-randomizer-for-32-bit.patch')
|
||||
'0033-Disable-hardware-randomizer-for-32-bit.patch'
|
||||
'0034-Fix-build-error-related-to-glibc-2.28-and-stat.patch')
|
||||
sha256sums=('a0d047b2da5782c8332c59ae203984b64e4d5dc5f4ba9c0884fdbe753d0afb46'
|
||||
'e1973bda25994e3dc3d6c1b4d9b78fbbb540490d2da43db166df14f776a39039'
|
||||
'46da072fdffff5edee7c23a024f4a28ca55b5ae57890145fb59ebe00bbeb897e'
|
||||
'48a9629a9f26b7e828d6021e7db0149421ad05c3927cb9b60147c90caa487f9b'
|
||||
'b8d97a80c547e90e1348fa722b26dbda3d1f07ddfa4a00a0a268a5dbb3de489d'
|
||||
'765501ce588fe5ebaccc8e54f3a588a08abceae304a19988358dd118fead847c'
|
||||
'80181dda780b44bc24d3d7f0eb6b7c496170ef0db5955dd2d7e4214a24b48169'
|
||||
'22974a0a1f902f812a655e86fb0bb18a7931be89240aef3a5b5eebadf085cbce'
|
||||
'1eeeaf5b710df4846c94ad3e06802cd204ebfaf481905fe2644421efd557ff0f'
|
||||
'd26c120c12eddc18f1a424117e38c27c8171dfccb7d5ba1fcf3991d57328b9d7'
|
||||
'a8e27ad9ef209661ba42112a49f0fbf29fdb9bc94d6ad51f715e59b031d3230d'
|
||||
'dacf9cbed1f0f309b8394d4a1a27d60b641f3d19e70352827b1ef123dcf194a8'
|
||||
'7e919946802ba7b3d666b69c661dff396abfc24b046edb439b684d4b3cc7f42f'
|
||||
'03003c3a2a16d6f7b36436d8b63496fb5eb97c5da9770eb3f0d0bc3090b5d4e4'
|
||||
'910f6198069a5d72b88bab70bfef2de50cf44f253a61a37e24c10d3d2d1f2590'
|
||||
'a262866828f5fd77c49d4dd62aa49447ab2e59eb7031a3bc09304ef100837ce5'
|
||||
'613246baff8474c33314c6320fbf163835d36e9aae3221ab1c3ad87a55bcab9a'
|
||||
'3e08a5af6515821049d611143782bfe1bea7b75c46b25a1a8cdd5b5d66f01cde'
|
||||
'9ab6cd425c778cded2575d22a4577d5ae220f7a031e3ebc9581fe871f5bbda98'
|
||||
'90bd7cfdb2a8e890db775293b498008264ccb5571247c77a1dbca21ef96f0e3f'
|
||||
'37fa408528ff94f4f41e27097a619acc7dd97e66a9f2584178517079e3c5232c'
|
||||
'4b293b11424efabcf25fc634fd7eec058351297474fcaaad6bbbf3b7be94e39f'
|
||||
'3878d33beb40fc2907ccfaf7f656e983e30399bd0f6afa78658d802715e2e91d'
|
||||
'f96bea78b8a04a5d278cd01fdc6478a79beea6bba8f922a7ba91b14acd7998b3'
|
||||
'c0dc173b900ea5edc45ab2695406b1ca11c08113d8c402672208bee95deff4c7'
|
||||
'feb8bf1ee858b8c499c3644c95454880835adc85a5039f6d2027b06caa552be1'
|
||||
'e463ff31d6bc218a3724d95463b405f63ee66fb270ac1bbc0f3fc3d1e81c6444'
|
||||
'faeac0d51bc8ddda40fd02fdf8aff5f35187d9a3bcfa9c0a02d6d19a7314f91c'
|
||||
'241790c3788449d71ef38c84c15fa158408057730b782fb7976e93ba26df4876'
|
||||
'e2983e47533094c5add54bdc4d565f7107b5508a2b23c3de8e0e92bf93627505'
|
||||
'5a8f2561eb06951b5923f115cdcb7df863169c4db01207dc216ede107e9fca7c'
|
||||
'e907fb9111c9a54ac91a538a40b420088d54f86f047c129b0b6e4ff4423ae982'
|
||||
'60cdf773863423f33207526b343cf72c76ee1680af27fb3c494f63ce9a58f9e8'
|
||||
'7e353383fbd5ce8368089b5ec4ced6f19674c4490a46d4e0db81e1ea6800b180')
|
||||
'6e929b114e4a69fec480db4e78a39c2e95a88e76b88b1743863013e9f4bd1b0b'
|
||||
'f0bb44995308af295a9847b2f796dc938d4e4673dbd422616cb890a1ad559ade'
|
||||
'bb81e37b265140e99c8ed01acadd93ba533757f98cc38452309aca4de74fc957'
|
||||
'5a7eff8dd3312a62b3f1606358e74fa8d4e5b118796299afbd334bff159f3659'
|
||||
'857650169e6c7f96aeb835c7c622ff67034a19cc295f7724498c95c49a6d0b79'
|
||||
'b56639a777db979145b26cb39dcba15d7b6f52178cc94373be637ec026db23b7'
|
||||
'87ad586b648f3fd9c24f9794f0926ca3a3b78d62c544dcbfc1f80c89ad51dbbf'
|
||||
'cd2d25b8c036a967624d46dcbe9f04b323678fa72855c11c2bf307d713b32aad'
|
||||
'1223e502f6700f6d428920bf0cb103eba03f8b253f43d9cd9dfd2b8e1c4974bc'
|
||||
'd9c0de2a86939bfa19c69b31a8165d4553dc4afdbbe60f9dce8ca1e030b96e51'
|
||||
'0e5462994dcaf9b3d879b4ef562c12ecb2462b325e5026486ae6c29a83975e07'
|
||||
'75fd2a29acc8e06bdd46a18018c81f0cb4816947ebd8ff8b8c76a633855c60d1'
|
||||
'88f0f909022c7a3be8df0f4597ad36681a73d3be40a848061fa17d23641263ad'
|
||||
'c413a032bbf1e0de0ac722cb7213cc1e21ef36797d23fd12604a843c9a9cfcd8'
|
||||
'564ca84a3c7bdc12aab2edca084850fec3104ea9dba053127c754dd463010283'
|
||||
'3191b4c924af232ac5c3db8e2b670868107837ff39541451806731fd88c44877'
|
||||
'9eeaeb84fc650f6fa54b66d45a67a1922b9d363c40d749aa0fb0925d0a190110'
|
||||
'62d8b373f074c3d0f440cb35f464b98a283b28c57551b921d7f464b86f95902c'
|
||||
'17a17bea14fedbffc011334f5298e3b3da6be90d26635982aa9027d0f9be8d5c'
|
||||
'b43c3b5e7e071854ba0249b38ea8e7e543e3be3a604dfb700baad752c5722967'
|
||||
'6097ff39d3996d1c7832a2fa4fbdd67728bf1014083db7c145c9585579d79a95'
|
||||
'dc79f6449d4aa5c3be57cfcff975f5573017c69c49785fc124d37837e8704e02'
|
||||
'6ff9bdee5dfc958b38b5063d1f1cf082a5950d00479f70fd5905ff9b5e53acc1'
|
||||
'339139a569c951c75e6db12754f8629b392d1b4c410718f068a8ad1cf63c2ff4'
|
||||
'5db30dd7615347286975f50911e9c0aa567733107069d96c484f414c9eb0d06d'
|
||||
'45fba6b70852c8ddfc1793d7d661788ccad23468a276617e13566efce2993e5f'
|
||||
'9199a5fe3eccca581df6513ff9167bfbfaa7e9b3ff787a0803da543a37ff054b'
|
||||
'28a30fd468eedcb08d70df65c670a8b5713898f64c2fe4985f93694441543b39'
|
||||
'b8fae2d545997d1cdfab3688d7dec42e7606de493a1eb8ff118d6d56b3000440'
|
||||
'd1c83496e0139fbc3aa167238296dd5bfe08adf645549bffeaf9bbb3a40ceaf0'
|
||||
'2cbabbad04e7a1ddaffb2d3e968814dac875dc070ed63b90181905e3dd0351de'
|
||||
'84528256f371719d0a8a68628392a6f3f37ca3d9353a746114a9bc7d4732728b'
|
||||
'9af2a3650bf3141d4fb042f00b2067a43069a72e5f75ea2f37d90730089f5e44'
|
||||
'd354ab15d7475e2df989d969990ddd415da62423b4af731946e8c3c7ab496d07')
|
||||
|
||||
_architectures='i686-w64-mingw32 x86_64-w64-mingw32'
|
||||
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
From 955c44726565654efbf8099a66b1e3b23e2d41df Mon Sep 17 00:00:00 2001
|
||||
From: Martchus <martchus@gmx.net>
|
||||
Date: Fri, 3 Feb 2017 18:30:51 +0100
|
||||
Subject: [PATCH 01/33] Adjust win32-g++ profile for cross compilation with
|
||||
Subject: [PATCH 01/34] Adjust win32-g++ profile for cross compilation with
|
||||
mingw-w64
|
||||
|
||||
Adding a new, separate mkspec instead of patching the existing one
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
From 190efab0758fdd9055145491f6c788996fa6b7ce Mon Sep 17 00:00:00 2001
|
||||
From: Martchus <martchus@gmx.net>
|
||||
Date: Sun, 18 Sep 2016 13:36:53 +0200
|
||||
Subject: [PATCH 02/33] Ensure GLdouble is defined when using dynamic OpenGL
|
||||
Subject: [PATCH 02/34] Ensure GLdouble is defined when using dynamic OpenGL
|
||||
|
||||
FIXME: Not sure whether this is still required
|
||||
---
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
From f17fa5afa2f24bc569eda2bbe35b77a4ab268608 Mon Sep 17 00:00:00 2001
|
||||
From: Martchus <martchus@gmx.net>
|
||||
Date: Sun, 18 Sep 2016 13:41:38 +0200
|
||||
Subject: [PATCH 03/33] Use external ANGLE library
|
||||
Subject: [PATCH 03/34] Use external ANGLE library
|
||||
|
||||
---
|
||||
src/gui/Qt5GuiConfigExtras.cmake.in | 4 ++--
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
From 1ec5d5ee305fd993022c404ad00e5c3f4524d007 Mon Sep 17 00:00:00 2001
|
||||
From: Martchus <martchus@gmx.net>
|
||||
Date: Sun, 18 Sep 2016 13:48:51 +0200
|
||||
Subject: [PATCH 04/33] Fix too many sections assemler error in OpenGL factory
|
||||
Subject: [PATCH 04/34] Fix too many sections assemler error in OpenGL factory
|
||||
|
||||
On x86_64 qopenglversionfunctionsfactory.o exceeds the
|
||||
limit of 32768 sections.
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
From ddc22a123829a1d50a82ea62e6b9f1df3496b253 Mon Sep 17 00:00:00 2001
|
||||
From: Martchus <martchus@gmx.net>
|
||||
Date: Sun, 18 Sep 2016 13:54:12 +0200
|
||||
Subject: [PATCH 05/33] Make sure *.pc files are installed correctly
|
||||
Subject: [PATCH 05/34] Make sure *.pc files are installed correctly
|
||||
|
||||
---
|
||||
qmake/generators/makefile.cpp | 8 ++++++--
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
From 1eb6c3cccc09e51f68f30ab2fc6d8bbf04085031 Mon Sep 17 00:00:00 2001
|
||||
From: Martchus <martchus@gmx.net>
|
||||
Date: Sun, 18 Sep 2016 13:58:28 +0200
|
||||
Subject: [PATCH 06/33] Don't add resource files to LIBS parameter
|
||||
Subject: [PATCH 06/34] Don't add resource files to LIBS parameter
|
||||
|
||||
Solves an issue where the generated pkg-config
|
||||
files contained invalid Libs.private references
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
From 31cca3a47eea50156a5549574d934dd0264cb0f3 Mon Sep 17 00:00:00 2001
|
||||
From: Martchus <martchus@gmx.net>
|
||||
Date: Sun, 18 Sep 2016 14:01:14 +0200
|
||||
Subject: [PATCH 07/33] Prevent debug library names in pkg-config files
|
||||
Subject: [PATCH 07/34] Prevent debug library names in pkg-config files
|
||||
|
||||
qmake generates the pkgconfig .pc files two times, once for the
|
||||
release build and once for the debug build (which we're not actually
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
From c8ebd475383209c46510769731be7f7598e6feee Mon Sep 17 00:00:00 2001
|
||||
From: Martchus <martchus@gmx.net>
|
||||
Date: Thu, 26 Jan 2017 17:51:31 +0100
|
||||
Subject: [PATCH 08/33] Fix linking against shared/static libpng
|
||||
Subject: [PATCH 08/34] Fix linking against shared/static libpng
|
||||
|
||||
Change-Id: Ic7a0ec9544059b8e647a5d0186f1b88c00911dcf
|
||||
---
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
From d79b593a0d432b88521ec58ed6e7411a85347bb8 Mon Sep 17 00:00:00 2001
|
||||
From: Martchus <martchus@gmx.net>
|
||||
Date: Fri, 3 Feb 2017 19:36:25 +0100
|
||||
Subject: [PATCH 09/33] Fix linking against static D-Bus
|
||||
Subject: [PATCH 09/34] Fix linking against static D-Bus
|
||||
|
||||
---
|
||||
configure.json | 9 +++++++--
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
From 6032fdbbd2df9576e7509b80c2e4d6c87d744470 Mon Sep 17 00:00:00 2001
|
||||
From: Martchus <martchus@gmx.net>
|
||||
Date: Fri, 2 Jun 2017 18:28:10 +0200
|
||||
Subject: [PATCH 10/33] Don't try to use debug version of D-Bus library
|
||||
Subject: [PATCH 10/34] Don't try to use debug version of D-Bus library
|
||||
|
||||
Required for a debug build of Qt because mingw-w64-dbus
|
||||
does not contain debug version
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
From a1ce36f86105230865fd6fb5eb4f0bbe09d7221b Mon Sep 17 00:00:00 2001
|
||||
From: Martchus <martchus@gmx.net>
|
||||
Date: Fri, 3 Feb 2017 20:51:19 +0100
|
||||
Subject: [PATCH 11/33] Fix linking against static freetype2
|
||||
Subject: [PATCH 11/34] Fix linking against static freetype2
|
||||
|
||||
---
|
||||
src/gui/configure.json | 7 +++++--
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
From ab966035502f0b14f4e9b037223c9d84646f0bf2 Mon Sep 17 00:00:00 2001
|
||||
From: Martchus <martchus@gmx.net>
|
||||
Date: Sun, 18 Sep 2016 14:22:56 +0200
|
||||
Subject: [PATCH 12/33] Fix linking against static harfbuzz
|
||||
Subject: [PATCH 12/34] Fix linking against static harfbuzz
|
||||
|
||||
---
|
||||
src/gui/configure.json | 6 +++++-
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
From 313ee18fb5ba456880fbcfcb5f5d991235094da4 Mon Sep 17 00:00:00 2001
|
||||
From: Martchus <martchus@gmx.net>
|
||||
Date: Sun, 18 Sep 2016 14:24:01 +0200
|
||||
Subject: [PATCH 13/33] Fix linking against static pcre
|
||||
Subject: [PATCH 13/34] Fix linking against static pcre
|
||||
|
||||
Change-Id: I3225c6e82dc4d17aef37d4289c16eb7a5ea3c5a1
|
||||
---
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
From 267961ff9c908b5c02828b0c2842c8f320fa7f1b Mon Sep 17 00:00:00 2001
|
||||
From: Martchus <martchus@gmx.net>
|
||||
Date: Sun, 18 Sep 2016 18:56:55 +0200
|
||||
Subject: [PATCH 14/33] Fix linking against shared/static MariaDB
|
||||
Subject: [PATCH 14/34] Fix linking against shared/static MariaDB
|
||||
|
||||
Change-Id: I9722c154d845f288a2d4d1ab14a014066b28819b
|
||||
---
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
From 00fc4018caca88c40fb216917ae0066aa3dd2ed3 Mon Sep 17 00:00:00 2001
|
||||
From: Martchus <martchus@gmx.net>
|
||||
Date: Sun, 18 Sep 2016 18:58:25 +0200
|
||||
Subject: [PATCH 15/33] Fix linking against shared/static PostgreSQL
|
||||
Subject: [PATCH 15/34] Fix linking against shared/static PostgreSQL
|
||||
|
||||
---
|
||||
src/plugins/sqldrivers/configure.json | 5 +++--
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
From ef21b8b44d8c71e927a93bd24cdca38ec2c37391 Mon Sep 17 00:00:00 2001
|
||||
From: Martchus <martchus@gmx.net>
|
||||
Date: Sun, 18 Sep 2016 14:25:40 +0200
|
||||
Subject: [PATCH 16/33] Rename qtmain to qt5main
|
||||
Subject: [PATCH 16/34] Rename qtmain to qt5main
|
||||
|
||||
Prevents conflict with mingw-w64-qt4 package
|
||||
---
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
From c79c2a4f048484d235574a69e6f6ba3dcff23abe Mon Sep 17 00:00:00 2001
|
||||
From: Martchus <martchus@gmx.net>
|
||||
Date: Sun, 18 Sep 2016 14:27:28 +0200
|
||||
Subject: [PATCH 17/33] Build dynamic host libraries
|
||||
Subject: [PATCH 17/34] Build dynamic host libraries
|
||||
|
||||
This came initially from Fedora, not sure whether
|
||||
it makes sense to keep it. Regular Arch package
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
From 9a506994e00aa0fb257bfe80458b0543c0e9f8b0 Mon Sep 17 00:00:00 2001
|
||||
From: Martchus <martchus@gmx.net>
|
||||
Date: Sun, 18 Sep 2016 17:59:27 +0200
|
||||
Subject: [PATCH 18/33] Enable rpath for build tools
|
||||
Subject: [PATCH 18/34] Enable rpath for build tools
|
||||
|
||||
- Required because various tools depend on libQt5Bootstrap.so which resides
|
||||
in folder /usr/${_arch}/lib
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
From 92e7155e22bfe514a20d6ebf39b6bdfbf45f194c Mon Sep 17 00:00:00 2001
|
||||
From: Martchus <martchus@gmx.net>
|
||||
Date: Sun, 18 Sep 2016 18:04:42 +0200
|
||||
Subject: [PATCH 19/33] Use system zlib for build tools
|
||||
Subject: [PATCH 19/34] Use system zlib for build tools
|
||||
|
||||
---
|
||||
src/tools/bootstrap/bootstrap.pro | 2 +-
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
From d3a0f355335aa086e2663d634f2f41766f1bcdd6 Mon Sep 17 00:00:00 2001
|
||||
From: Martchus <martchus@gmx.net>
|
||||
Date: Sun, 18 Sep 2016 18:26:18 +0200
|
||||
Subject: [PATCH 20/33] Use *.dll.a as import lib extension
|
||||
Subject: [PATCH 20/34] Use *.dll.a as import lib extension
|
||||
|
||||
The variables used here are provided by
|
||||
mingw-w64 specific mkspec
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
From 91d94eadf25139197ce3cf74bb75692e9c77db07 Mon Sep 17 00:00:00 2001
|
||||
From: Martchus <martchus@gmx.net>
|
||||
Date: Sun, 18 Sep 2016 18:45:08 +0200
|
||||
Subject: [PATCH 21/33] Merge shared and static library trees
|
||||
Subject: [PATCH 21/34] Merge shared and static library trees
|
||||
|
||||
Allow installation of shared and static build in the same prefix
|
||||
---
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
From 86e3c50a96608acab006e9e525c23e4f420d8b4d Mon Sep 17 00:00:00 2001
|
||||
From: Martchus <martchus@gmx.net>
|
||||
Date: Sun, 18 Sep 2016 18:32:00 +0200
|
||||
Subject: [PATCH 22/33] Pull dependencies of static libraries in CMake modules
|
||||
Subject: [PATCH 22/34] Pull dependencies of static libraries in CMake modules
|
||||
|
||||
When doing a static build of Qt, the dependencies of the Qt
|
||||
libraries and plugins itself must be specified when linking
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
From 244565bea2e8c84287b0a5dbbacea3db7e186f6d Mon Sep 17 00:00:00 2001
|
||||
From: Martchus <martchus@gmx.net>
|
||||
Date: Sat, 5 Aug 2017 21:14:26 +0200
|
||||
Subject: [PATCH 23/33] Allow usage of static version with CMake
|
||||
Subject: [PATCH 23/34] Allow usage of static version with CMake
|
||||
|
||||
Allow selecting between dynamic and static Qt versions
|
||||
installed in the same prefix
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
From dad3f2977824ca10f03f28486f10780fa2f615e3 Mon Sep 17 00:00:00 2001
|
||||
From: Martchus <martchus@gmx.net>
|
||||
Date: Fri, 2 Jun 2017 16:42:07 +0200
|
||||
Subject: [PATCH 24/33] Adjust linker flags for static build with
|
||||
Subject: [PATCH 24/34] Adjust linker flags for static build with
|
||||
cmake/mingw-w64
|
||||
|
||||
Change-Id: I33b88976d8f5ce87ce431a6f422fe87785bf5b8d
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
From 2c846ab2a45c159905715e98338246f86e98e5a8 Mon Sep 17 00:00:00 2001
|
||||
From: Martchus <martchus@gmx.net>
|
||||
Date: Sun, 18 Sep 2016 18:50:21 +0200
|
||||
Subject: [PATCH 25/33] Use correct pkg-config --static flag
|
||||
Subject: [PATCH 25/34] Use correct pkg-config --static flag
|
||||
|
||||
---
|
||||
configure.pri | 3 +++
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
From 400f992fa24ed2b62be4258d5d26bff3846d95ce Mon Sep 17 00:00:00 2001
|
||||
From: Martchus <martchus@gmx.net>
|
||||
Date: Sun, 4 Dec 2016 20:35:47 +0100
|
||||
Subject: [PATCH 26/33] Fix macro invoking moc, rcc and uic
|
||||
Subject: [PATCH 26/34] Fix macro invoking moc, rcc and uic
|
||||
|
||||
* Otherwise the arguments aren't passed correctly leading to errors like
|
||||
```
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
From 3872dc79e2e8c530ee73003c6c7f4b08e4697f7f Mon Sep 17 00:00:00 2001
|
||||
From: Martchus <martchus@gmx.net>
|
||||
Date: Wed, 25 Jan 2017 20:59:54 +0100
|
||||
Subject: [PATCH 27/33] Ignore errors about missing feature static
|
||||
Subject: [PATCH 27/34] Ignore errors about missing feature static
|
||||
|
||||
Not sure why this error occurs, let's hope for the best
|
||||
---
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
From c7eb8dbf86904eab61b3bb53f52563d861372f65 Mon Sep 17 00:00:00 2001
|
||||
From: Martchus <martchus@gmx.net>
|
||||
Date: Wed, 25 Jan 2017 21:08:20 +0100
|
||||
Subject: [PATCH 28/33] Enable and fix use of iconv
|
||||
Subject: [PATCH 28/34] Enable and fix use of iconv
|
||||
|
||||
Change-Id: I5f0ab27afca0800dec11c7af74d196190820ae5c
|
||||
---
|
||||
|
|
|
|||
Some files were not shown because too many files have changed in this diff Show More
Loading…
Reference in New Issue