From e940be0015d02f95f651ab4dbede535fb179502a Mon Sep 17 00:00:00 2001 From: Wenlong Zhang Date: Tue, 13 Dec 2022 09:42:05 +0800 Subject: [PATCH] add loongarch support for qt5-qtwebkit Signed-off-by: Wenlong Zhang --- 0001-add-loongarch-support-for-qtwebkit.patch | 79 +++++++++++++++++++ qt5-qtwebkit.spec | 10 ++- 2 files changed, 86 insertions(+), 3 deletions(-) create mode 100644 0001-add-loongarch-support-for-qtwebkit.patch diff --git a/0001-add-loongarch-support-for-qtwebkit.patch b/0001-add-loongarch-support-for-qtwebkit.patch new file mode 100644 index 0000000..929e380 --- /dev/null +++ b/0001-add-loongarch-support-for-qtwebkit.patch @@ -0,0 +1,79 @@ +From f391fa67112da31da7b6ce0011cecadbee29bedb Mon Sep 17 00:00:00 2001 +From: Wenlong Zhang +Date: Tue, 13 Dec 2022 01:30:55 +0000 +Subject: [PATCH] add loongarch support for qtwebkit + +--- + CMakeLists.txt | 2 ++ + Source/JavaScriptCore/CMakeLists.txt | 1 + + Source/WTF/wtf/Platform.h | 7 ++++++- + Source/WTF/wtf/dtoa/utils.h | 2 +- + 4 files changed, 10 insertions(+), 2 deletions(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index db54eb4..0acb7ba 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -88,6 +88,8 @@ elseif (LOWERCASE_CMAKE_SYSTEM_PROCESSOR MATCHES "s390") + set(WTF_CPU_S390 1) + elseif (LOWERCASE_CMAKE_SYSTEM_PROCESSOR MATCHES "s390x") + set(WTF_CPU_S390X 1) ++elseif (LOWERCASE_CMAKE_SYSTEM_PROCESSOR MATCHES "loongarch64") ++ set(WTF_CPU_LOONGARCH64 1) + else () + message(FATAL_ERROR "Unknown CPU '${LOWERCASE_CMAKE_SYSTEM_PROCESSOR}'") + endif () +diff --git a/Source/JavaScriptCore/CMakeLists.txt b/Source/JavaScriptCore/CMakeLists.txt +index afd76ca..4d6a72b 100644 +--- a/Source/JavaScriptCore/CMakeLists.txt ++++ b/Source/JavaScriptCore/CMakeLists.txt +@@ -1288,6 +1288,7 @@ elseif (WTF_CPU_S390X) + elseif (WTF_CPU_MIPS) + elseif (WTF_CPU_SH4) + elseif (WTF_CPU_X86) ++elseif (WTF_CPU_LOONGARCH64) + elseif (WTF_CPU_X86_64) + if (MSVC AND ENABLE_JIT) + add_custom_command( +diff --git a/Source/WTF/wtf/Platform.h b/Source/WTF/wtf/Platform.h +index 5717f3e..76f4262 100644 +--- a/Source/WTF/wtf/Platform.h ++++ b/Source/WTF/wtf/Platform.h +@@ -166,7 +166,11 @@ + #if defined(__SSE2__) || (defined(_M_IX86_FP) && _M_IX86_FP >= 2) + #define WTF_CPU_X86_SSE2 1 + #endif ++#endif + ++/* CPU(LOONGARCH64) - LOONGARCH64 */ ++#if defined(__loongarch64) ++#define WTF_CPU_LOONGARCH64 1 + #endif + + /* CPU(X86_64) - AMD64 / Intel64 / x86_64 64-bit */ +@@ -707,7 +711,8 @@ + || CPU(S390X) \ + || CPU(MIPS64) \ + || CPU(PPC64) \ +- || CPU(PPC64LE) ++ || CPU(PPC64LE) \ ++ || CPU(LOONGARCH64) + #define USE_JSVALUE64 1 + #else + #define USE_JSVALUE32_64 1 +diff --git a/Source/WTF/wtf/dtoa/utils.h b/Source/WTF/wtf/dtoa/utils.h +index 889642c..a90287d 100644 +--- a/Source/WTF/wtf/dtoa/utils.h ++++ b/Source/WTF/wtf/dtoa/utils.h +@@ -49,7 +49,7 @@ + defined(__ARMEL__) || \ + defined(_MIPS_ARCH_MIPS32R2) + #define DOUBLE_CONVERSION_CORRECT_DOUBLE_OPERATIONS 1 +-#elif CPU(MIPS) || CPU(MIPS64) || CPU(PPC) || CPU(PPC64) || CPU(PPC64LE) || CPU(SH4) || CPU(S390) || CPU(S390X) || CPU(IA64) || CPU(ALPHA) || CPU(ARM64) || CPU(HPPA) ++#elif CPU(MIPS) || CPU(MIPS64) || CPU(PPC) || CPU(PPC64) || CPU(PPC64LE) || CPU(SH4) || CPU(S390) || CPU(S390X) || CPU(IA64) || CPU(ALPHA) || CPU(ARM64) || CPU(HPPA) || CPU(LOONGARCH64) + #define DOUBLE_CONVERSION_CORRECT_DOUBLE_OPERATIONS 1 + #elif defined(_M_IX86) || defined(__i386__) + #if defined(_WIN32) +-- +2.33.0 + diff --git a/qt5-qtwebkit.spec b/qt5-qtwebkit.spec index bcfc360..ea413c7 100644 --- a/qt5-qtwebkit.spec +++ b/qt5-qtwebkit.spec @@ -16,7 +16,7 @@ Name: qt5-%{qt_module} Version: 5.212.0 -Release: 7 +Release: 8 Summary: Qt5 - QtWebKit components License: LGPL-2.0-or-later and BSD-2-Clause @@ -28,6 +28,7 @@ Patch2: qtwebkit-5.212.0_cmake_cmp0071.patch Patch3: fix_build_with_bison.patch Patch4: fix_build_with_glib2_68.patch Patch5: 0001-fix-TRUE-and-FALSE-was-not-declared.patch +Patch6: 0001-add-loongarch-support-for-qtwebkit.patch BuildRequires: bison BuildRequires: cmake @@ -153,10 +154,10 @@ cmake . \ -DCMAKE_C_FLAGS_RELEASE:STRING="-DNDEBUG" \ -DCMAKE_CXX_FLAGS_RELEASE:STRING="-DNDEBUG" \ -DCMAKE_VERBOSE_MAKEFILE:BOOL=ON \ -%ifarch s390 s390x ppc %{power64} +%ifarch s390 s390x ppc %{power64} loongarch64 -DENABLE_JIT=OFF \ %endif -%ifarch s390 s390x ppc %{power64} +%ifarch s390 s390x ppc %{power64} loongarch64 -DUSE_SYSTEM_MALLOC=ON \ %endif %{?docs:-DGENERATE_DOCUMENTATION=ON} \ @@ -235,6 +236,9 @@ test -z "$(pkg-config --cflags Qt5WebKit | grep Qt5WebKit)" %changelog +* Mon Dec 12 2022 Wenlong Zhang - 5.212.0-8 +- add loongarch support for qt5-qtwebkit + * Tue May 10 2022 chenchen - 5.212.0-7 - License compliance rectification