mirror of
https://github.com/RGBCube/serenity
synced 2025-07-28 13:37:45 +00:00
Ports: Format patches without numbering, commit hash or version number
This commit is contained in:
parent
d69a79b03b
commit
d426c5a4b2
371 changed files with 806 additions and 1884 deletions
|
@ -1,24 +1,24 @@
|
|||
From 168040b44c185772fe6d24eb017e6fc6366fadb1 Mon Sep 17 00:00:00 2001
|
||||
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
||||
From: =?UTF-8?q?Martin=20B=C5=99=C3=ADza?= <m@rtinbriza.cz>
|
||||
Date: Wed, 15 Dec 2021 20:01:43 +0100
|
||||
Subject: [PATCH 1/5] Add a SerenityOS platform definition
|
||||
Subject: [PATCH] Add a SerenityOS platform definition
|
||||
|
||||
---
|
||||
cmake/QtBuild.cmake | 2 +
|
||||
mkspecs/serenity-g++/qmake.conf | 25 ++++++++
|
||||
mkspecs/serenity-g++/qplatformdefs.h | 88 +++++++++++++++++++++++++++
|
||||
mkspecs/serenity-g++/qplatformdefs.h | 87 +++++++++++++++++++++++++++
|
||||
src/corelib/global/qsystemdetection.h | 3 +
|
||||
src/gui/CMakeLists.txt | 2 +
|
||||
util/cmake/helper.py | 1 +
|
||||
6 files changed, 121 insertions(+)
|
||||
6 files changed, 120 insertions(+)
|
||||
create mode 100644 mkspecs/serenity-g++/qmake.conf
|
||||
create mode 100644 mkspecs/serenity-g++/qplatformdefs.h
|
||||
|
||||
diff --git a/cmake/QtBuild.cmake b/cmake/QtBuild.cmake
|
||||
index 7553b681..702ddf6f 100644
|
||||
index 6bd255b..ed466b7 100644
|
||||
--- a/cmake/QtBuild.cmake
|
||||
+++ b/cmake/QtBuild.cmake
|
||||
@@ -321,6 +321,8 @@ elseif(APPLE)
|
||||
@@ -325,6 +325,8 @@ elseif(APPLE)
|
||||
set(QT_DEFAULT_MKSPEC macx-clang)
|
||||
elseif(WASM)
|
||||
set(QT_DEFAULT_MKSPEC wasm-emscripten)
|
||||
|
@ -29,7 +29,7 @@ index 7553b681..702ddf6f 100644
|
|||
set(QT_ENABLE_CXX_EXTENSIONS ON)
|
||||
diff --git a/mkspecs/serenity-g++/qmake.conf b/mkspecs/serenity-g++/qmake.conf
|
||||
new file mode 100644
|
||||
index 00000000..00d5ae2c
|
||||
index 0000000..3808b5a
|
||||
--- /dev/null
|
||||
+++ b/mkspecs/serenity-g++/qmake.conf
|
||||
@@ -0,0 +1,25 @@
|
||||
|
@ -60,7 +60,7 @@ index 00000000..00d5ae2c
|
|||
+load(qt_config)
|
||||
diff --git a/mkspecs/serenity-g++/qplatformdefs.h b/mkspecs/serenity-g++/qplatformdefs.h
|
||||
new file mode 100644
|
||||
index 00000000..c054ddc5
|
||||
index 0000000..1f0dd98
|
||||
--- /dev/null
|
||||
+++ b/mkspecs/serenity-g++/qplatformdefs.h
|
||||
@@ -0,0 +1,87 @@
|
||||
|
@ -152,7 +152,7 @@ index 00000000..c054ddc5
|
|||
+
|
||||
+#endif // QPLATFORMDEFS_H
|
||||
diff --git a/src/corelib/global/qsystemdetection.h b/src/corelib/global/qsystemdetection.h
|
||||
index c8f98042..5c534c4a 100644
|
||||
index c8f9804..5c534c4 100644
|
||||
--- a/src/corelib/global/qsystemdetection.h
|
||||
+++ b/src/corelib/global/qsystemdetection.h
|
||||
@@ -72,6 +72,7 @@
|
||||
|
@ -173,7 +173,7 @@ index c8f98042..5c534c4a 100644
|
|||
#else
|
||||
# error "Qt has not been ported to this OS - see http://www.qt-project.org/"
|
||||
diff --git a/src/gui/CMakeLists.txt b/src/gui/CMakeLists.txt
|
||||
index 1e212b25..b12c8196 100644
|
||||
index 1e212b2..b12c819 100644
|
||||
--- a/src/gui/CMakeLists.txt
|
||||
+++ b/src/gui/CMakeLists.txt
|
||||
@@ -29,6 +29,8 @@ if (QT_FEATURE_gui)
|
||||
|
@ -186,7 +186,7 @@ index 1e212b25..b12c8196 100644
|
|||
set(_default_platform "xcb")
|
||||
endif()
|
||||
diff --git a/util/cmake/helper.py b/util/cmake/helper.py
|
||||
index e55a9412..87260f36 100644
|
||||
index e55a941..87260f3 100644
|
||||
--- a/util/cmake/helper.py
|
||||
+++ b/util/cmake/helper.py
|
||||
@@ -767,6 +767,7 @@ platform_mapping = {
|
||||
|
@ -197,6 +197,3 @@ index e55a9412..87260f36 100644
|
|||
}
|
||||
|
||||
|
||||
--
|
||||
2.33.1
|
||||
|
||||
|
|
|
@ -1,7 +1,7 @@
|
|||
From f376d694af85f2f14de87f235d929895baa66fed Mon Sep 17 00:00:00 2001
|
||||
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
||||
From: =?UTF-8?q?Martin=20B=C5=99=C3=ADza?= <m@rtinbriza.cz>
|
||||
Date: Wed, 15 Dec 2021 19:38:27 +0100
|
||||
Subject: [PATCH 3/5] Disable shared memory and semaphores
|
||||
Subject: [PATCH] Disable shared memory and semaphores
|
||||
|
||||
It's probably not done in the cleanest way but it works
|
||||
---
|
||||
|
@ -11,10 +11,10 @@ It's probably not done in the cleanest way but it works
|
|||
3 files changed, 6 insertions(+), 1 deletion(-)
|
||||
|
||||
diff --git a/mkspecs/serenity-g++/qplatformdefs.h b/mkspecs/serenity-g++/qplatformdefs.h
|
||||
index c054ddc5..a5a759c0 100644
|
||||
index 1f0dd98..65b641e 100644
|
||||
--- a/mkspecs/serenity-g++/qplatformdefs.h
|
||||
+++ b/mkspecs/serenity-g++/qplatformdefs.h
|
||||
@@ -44,6 +44,9 @@
|
||||
@@ -43,6 +43,9 @@
|
||||
|
||||
#define _GLIBCXX_HAVE_MBSTATE_T 1
|
||||
|
||||
|
@ -25,7 +25,7 @@ index c054ddc5..a5a759c0 100644
|
|||
|
||||
// Set any POSIX/XOPEN defines at the top of this file to turn on specific APIs
|
||||
diff --git a/src/corelib/kernel/qsharedmemory_p.h b/src/corelib/kernel/qsharedmemory_p.h
|
||||
index e06e7e86..7292782d 100644
|
||||
index e06e7e8..7292782 100644
|
||||
--- a/src/corelib/kernel/qsharedmemory_p.h
|
||||
+++ b/src/corelib/kernel/qsharedmemory_p.h
|
||||
@@ -51,6 +51,7 @@
|
||||
|
@ -46,7 +46,7 @@ index e06e7e86..7292782d 100644
|
|||
#endif
|
||||
|
||||
diff --git a/src/corelib/kernel/qsystemsemaphore_p.h b/src/corelib/kernel/qsystemsemaphore_p.h
|
||||
index 56619d73..56cf8687 100644
|
||||
index 56619d7..56cf868 100644
|
||||
--- a/src/corelib/kernel/qsystemsemaphore_p.h
|
||||
+++ b/src/corelib/kernel/qsystemsemaphore_p.h
|
||||
@@ -51,6 +51,7 @@
|
||||
|
@ -57,6 +57,3 @@ index 56619d73..56cf8687 100644
|
|||
#include "qsystemsemaphore.h"
|
||||
|
||||
#ifndef QT_NO_SYSTEMSEMAPHORE
|
||||
--
|
||||
2.33.1
|
||||
|
||||
|
|
|
@ -1,14 +1,14 @@
|
|||
From a5935c4f1e954caa33a913cf999a468a02732d21 Mon Sep 17 00:00:00 2001
|
||||
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
||||
From: =?UTF-8?q?Martin=20B=C5=99=C3=ADza?= <m@rtinbriza.cz>
|
||||
Date: Wed, 15 Dec 2021 19:49:43 +0100
|
||||
Subject: [PATCH 4/5] Serenity doesn't support utimensat and UTIME_NOW
|
||||
Subject: [PATCH] Serenity doesn't support utimensat and UTIME_NOW
|
||||
|
||||
---
|
||||
qmake/library/ioutils.cpp | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/qmake/library/ioutils.cpp b/qmake/library/ioutils.cpp
|
||||
index 719d3b51..5490e823 100644
|
||||
index 719d3b5..5490e82 100644
|
||||
--- a/qmake/library/ioutils.cpp
|
||||
+++ b/qmake/library/ioutils.cpp
|
||||
@@ -262,7 +262,7 @@ bool IoUtils::touchFile(const QString &targetFileName, const QString &referenceF
|
||||
|
@ -20,6 +20,3 @@ index 719d3b51..5490e823 100644
|
|||
const struct timespec times[2] = { { 0, UTIME_NOW }, st.st_mtim };
|
||||
const bool utimeError = utimensat(AT_FDCWD, targetFileName.toLocal8Bit().constData(), times, 0) < 0;
|
||||
# else
|
||||
--
|
||||
2.33.1
|
||||
|
||||
|
|
|
@ -1,7 +1,7 @@
|
|||
From c1809bf9fcbf7f4767f750057d08b723d1ad034b Mon Sep 17 00:00:00 2001
|
||||
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
||||
From: =?UTF-8?q?Martin=20B=C5=99=C3=ADza?= <m@rtinbriza.cz>
|
||||
Date: Wed, 15 Dec 2021 21:09:35 +0100
|
||||
Subject: [PATCH 5/5] Hack: Force searching for plugins in /usr/local
|
||||
Subject: [PATCH] Hack: Force searching for plugins in /usr/local
|
||||
|
||||
I really don't know how else to do this but I'm sure there is a proper
|
||||
way to handle this. But this works and doesn't break the system so
|
||||
|
@ -11,10 +11,10 @@ whatever for now.
|
|||
1 file changed, 6 insertions(+)
|
||||
|
||||
diff --git a/src/corelib/kernel/qcoreapplication.cpp b/src/corelib/kernel/qcoreapplication.cpp
|
||||
index 3bce669b..ca9ca8b9 100644
|
||||
index 009aa28..9c0cb52 100644
|
||||
--- a/src/corelib/kernel/qcoreapplication.cpp
|
||||
+++ b/src/corelib/kernel/qcoreapplication.cpp
|
||||
@@ -2751,6 +2751,12 @@ QStringList QCoreApplication::libraryPathsLocked()
|
||||
@@ -2760,6 +2760,12 @@ QStringList QCoreApplication::libraryPathsLocked()
|
||||
}
|
||||
#endif // Q_OS_DARWIN
|
||||
|
||||
|
@ -27,6 +27,3 @@ index 3bce669b..ca9ca8b9 100644
|
|||
QString installPathPlugins = QLibraryInfo::path(QLibraryInfo::PluginsPath);
|
||||
if (QFile::exists(installPathPlugins)) {
|
||||
// Make sure we convert from backslashes to slashes.
|
||||
--
|
||||
2.33.1
|
||||
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
From 830de469bab98268a328fc982c6d4f938e1547fb Mon Sep 17 00:00:00 2001
|
||||
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
||||
From: =?UTF-8?q?Martin=20B=C5=99=C3=ADza?= <m@rtinbriza.cz>
|
||||
Date: Thu, 16 Dec 2021 12:47:31 +0100
|
||||
Subject: [PATCH] Disable version tagging
|
||||
|
@ -11,10 +11,10 @@ and other related ELF objects
|
|||
2 files changed, 3 insertions(+), 1 deletion(-)
|
||||
|
||||
diff --git a/cmake/QtBuild.cmake b/cmake/QtBuild.cmake
|
||||
index 702ddf6f..ff60a061 100644
|
||||
index ed466b7..30668af 100644
|
||||
--- a/cmake/QtBuild.cmake
|
||||
+++ b/cmake/QtBuild.cmake
|
||||
@@ -323,6 +323,8 @@ elseif(WASM)
|
||||
@@ -327,6 +327,8 @@ elseif(WASM)
|
||||
set(QT_DEFAULT_MKSPEC wasm-emscripten)
|
||||
elseif(SERENITYOS)
|
||||
set(QT_DEFAULT_MKSPEC serenity-g++)
|
||||
|
@ -24,7 +24,7 @@ index 702ddf6f..ff60a061 100644
|
|||
# Certain POSIX defines are not set if we don't compile with -std=gnuXX
|
||||
set(QT_ENABLE_CXX_EXTENSIONS ON)
|
||||
diff --git a/src/corelib/global/qversiontagging.cpp b/src/corelib/global/qversiontagging.cpp
|
||||
index b5e524bf..a7547a3b 100644
|
||||
index b5e524b..a7547a3 100644
|
||||
--- a/src/corelib/global/qversiontagging.cpp
|
||||
+++ b/src/corelib/global/qversiontagging.cpp
|
||||
@@ -42,7 +42,7 @@
|
||||
|
@ -36,6 +36,3 @@ index b5e524bf..a7547a3b 100644
|
|||
# define make_versioned_symbol2(sym, m, n, separator) \
|
||||
Q_CORE_EXPORT extern const char sym ## _ ## m ## _ ## n = 0; \
|
||||
asm(".symver " QT_STRINGIFY(sym) "_" QT_STRINGIFY(m) "_" QT_STRINGIFY(n) ", " \
|
||||
--
|
||||
2.33.1
|
||||
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue