From 4c74903018b1373329d9fdac80c44d8b7067e73a Mon Sep 17 00:00:00 2001 From: Jan Palus Date: Tue, 10 Aug 2021 18:28:49 +0200 Subject: [PATCH] rediff patches --- qt-everywhere-opensource-src-4.8.5-QTBUG-4862.patch | 4 ++-- qt4-build-lib-static.patch | 2 +- qt4-buildsystem.patch | 4 ++-- qt4-kde-git.patch | 4 ++-- qt4-locale.patch | 2 +- qt4-support-cflags-with-commas.patch | 2 +- x32.patch | 10 +++++----- 7 files changed, 14 insertions(+), 14 deletions(-) diff --git a/qt-everywhere-opensource-src-4.8.5-QTBUG-4862.patch b/qt-everywhere-opensource-src-4.8.5-QTBUG-4862.patch index ee1d191..eece497 100644 --- a/qt-everywhere-opensource-src-4.8.5-QTBUG-4862.patch +++ b/qt-everywhere-opensource-src-4.8.5-QTBUG-4862.patch @@ -2,8 +2,8 @@ diff -up qt-everywhere-opensource-src-4.8.5/src/corelib/io/qfilesystemengine_uni --- qt-everywhere-opensource-src-4.8.5/src/corelib/io/qfilesystemengine_unix.cpp.QTBUG-4862 2013-06-09 12:02:50.323221694 -0500 +++ qt-everywhere-opensource-src-4.8.5/src/corelib/io/qfilesystemengine_unix.cpp 2013-06-09 12:38:53.140804742 -0500 @@ -624,6 +624,25 @@ QString QFileSystemEngine::homePath() - { - QString home = QFile::decodeName(qgetenv("HOME")); + home = QFile::decodeName(QByteArray(pw->pw_dir)); + } if (home.isEmpty()) + { +#if !defined(QT_NO_THREAD) && defined(_POSIX_THREAD_SAFE_FUNCTIONS) && !defined(Q_OS_OPENBSD) diff --git a/qt4-build-lib-static.patch b/qt4-build-lib-static.patch index 49fa567..7760eca 100644 --- a/qt4-build-lib-static.patch +++ b/qt4-build-lib-static.patch @@ -19,7 +19,7 @@ diff -ur qt-everywhere-opensource-src-4.6.0-beta1/tools/designer/src/uitools/uit +++ qt-everywhere-opensource-src-4.6.0-beta1.new/tools/designer/src/uitools/uitools.pro 2009-10-18 10:40:38.624930212 +0200 @@ -1,7 +1,7 @@ TEMPLATE = lib - TARGET = $$qtLibraryTarget(QtUiTools) + TARGET = QtUiTools QT += xml -CONFIG += qt staticlib +CONFIG += qt diff --git a/qt4-buildsystem.patch b/qt4-buildsystem.patch index cd17b80..7db68aa 100644 --- a/qt4-buildsystem.patch +++ b/qt4-buildsystem.patch @@ -10,5 +10,5 @@ + fi + if [ "$BUILD_ON_MAC" = "yes" ]; then - echo "export MACOSX_DEPLOYMENT_TARGET = 10.5" >> "$mkfile" - echo "CARBON_LFLAGS =-framework ApplicationServices" >>"$mkfile" + case "$PLATFORM" in + *macx-clang-libc++) diff --git a/qt4-kde-git.patch b/qt4-kde-git.patch index e561c73..c6ffe9b 100644 --- a/qt4-kde-git.patch +++ b/qt4-kde-git.patch @@ -298,7 +298,7 @@ index 0d9df16..b88fc3e 100755 --- a/configure +++ b/configure @@ -1058,6 +1058,11 @@ while [ "$#" -gt 0 ]; do - VAL=`echo $1 | sed 's,-D,,'` + VAL=$1 fi ;; + -isystem) @@ -419,8 +419,8 @@ index 2574b74..9f57417 100644 class Q_CORE_EXPORT QAbstractDeclarativeData { @@ -155,6 +157,9 @@ public: + #ifdef QT3_SUPPORT void sendPendingChildInsertedEvents(); - void removePendingChildInsertedEvents(QObject *child); #endif +#if defined(Q_WS_X11) + virtual void checkWindowRole(); diff --git a/qt4-locale.patch b/qt4-locale.patch index 55ddb5d..ac3ea51 100644 --- a/qt4-locale.patch +++ b/qt4-locale.patch @@ -38,7 +38,7 @@ diff -Nur qt-x11-opensource-src-4.2.1.orig/tools/linguist/linguist/main.cpp qt-x +#include #include "qresource.h" - #if defined(Q_OS_UNIX) && !defined(Q_OS_SYMBIAN) + #if defined(Q_OS_UNIX) && !defined(Q_OS_SYMBIAN) && !defined(Q_OS_INTEGRITY) #define QT_USE_MMAP @@ -445,49 +445,71 @@ QString delims; diff --git a/qt4-support-cflags-with-commas.patch b/qt4-support-cflags-with-commas.patch index f83d8ef..2d416dd 100644 --- a/qt4-support-cflags-with-commas.patch +++ b/qt4-support-cflags-with-commas.patch @@ -2,8 +2,8 @@ diff -uNr qt-x11-opensource-desktop-4.0.0.orig/configure qt-x11-opensource-deskt --- qt-x11-opensource-desktop-4.0.0.orig/configure 2005-08-16 11:54:47.000000000 +0200 +++ qt-x11-opensource-desktop-4.0.0/configure 2005-08-16 11:58:19.000000000 +0200 @@ -2737,7 +2737,7 @@ - adjrelpath=`echo "$relpath" | sed 's/ /\\\\\\\\ /g'` adjoutpath=`echo "$outpath" | sed 's/ /\\\\\\\\ /g'` + adjqmakespec=`echo "$QMAKESPEC" | sed 's/ /\\\\\\\\ /g'` sed -e "s,@SOURCE_PATH@,$adjrelpath,g" -e "s,@BUILD_PATH@,$adjoutpath,g" \ - -e "s,@QMAKE_CFLAGS@,$EXTRA_CFLAGS,g" -e "s,@QMAKE_LFLAGS@,$EXTRA_LFLAGS,g" \ + -e "s:@QMAKE_CFLAGS@:$EXTRA_CFLAGS:g" -e "s,@QMAKE_LFLAGS@,$EXTRA_LFLAGS,g" \ diff --git a/x32.patch b/x32.patch index 2d5b515..b9ddb97 100644 --- a/x32.patch +++ b/x32.patch @@ -26,13 +26,13 @@ #endif +#endif - /* 64-bit mode on AIX */ - #ifdef __64BIT__ + /* CPU(ARM) - ARM, any version*/ + #if defined(arm) \ --- a/configure +++ b/configure @@ -3329,6 +3329,12 @@ if [ -z "${CFG_HOST_ARCH}" ]; then - fi - CFG_HOST_ARCH=sh + ;; + esac ;; + *:*:x32) + if [ "$OPT_VERBOSE" = "yes" ]; then @@ -53,7 +53,7 @@ +# include "QtCore/qatomic_i386.h" #elif defined(QT_ARCH_NACL) # include "QtCore/qatomic_generic.h" - #elif defined(QT_ARCH_AARCH64) + #else --- /dev/null +++ b/src/corelib/arch/x32/arch.pri @@ -0,0 +1,4 @@ -- 2.44.0