[neon/qt/qt5webkit/Neon/release] debian: revert to -2 version

Thu Nov 5 11:35:25 GMT 2020

Git commit e62ebb91f7538d2c169290bf343fd37837b0e9fc by Jonathan Riddell.
Committed on 05/11/2020 at 11:35.
Pushed by jriddell into branch 'Neon/release'.

revert to -2 version

M  +0    -13   debian/changelog
M  +1    -1    debian/libqt5webkit5.symbols
M  +0    -2    debian/patches/series
D  +0    -61   debian/patches/support_riscv64.diff
M  +0    -5    debian/rules

https://invent.kde.org/neon/qt/qt5webkit/commit/e62ebb91f7538d2c169290bf343fd37837b0e9fc

diff --git a/debian/changelog b/debian/changelog
index 8e2488f..fc74f94 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,16 +1,3 @@
-qtwebkit-opensource-src (5.212.0~alpha4-4) unstable; urgency=medium
-
-  * Upload to unstable.
-
- -- Dmitry Shachnev <mitya57 at debian.org>  Wed, 24 Jun 2020 12:10:47 +0300
-
-qtwebkit-opensource-src (5.212.0~alpha4-3) experimental; urgency=medium
-
-  * Bump Qt build-dependencies to 5.14.2.
-  * Add support for riscv64, based on a patch by William Grant.
-
- -- Dmitry Shachnev <mitya57 at debian.org>  Tue, 28 Apr 2020 23:22:16 +0300
-
 qtwebkit-opensource-src (5.212.0~alpha4-2) experimental; urgency=medium
 
   * Merge 5.212.0~alpha4-1 unstable upload into experimental branch.
diff --git a/debian/libqt5webkit5.symbols b/debian/libqt5webkit5.symbols
index 9cbcbd4..f4c9ba8 100644
--- a/debian/libqt5webkit5.symbols
+++ b/debian/libqt5webkit5.symbols
@@ -2454,7 +2454,7 @@ libQt5WebKit.so.5 libqt5webkit5 #MINVER#
  _ZTV25QWebNotificationPresenter at Qt_5 5.212.0~alpha3
  (arch=!ppc64el !s390x)_ZTVNSt6thread11_State_implINS_8_InvokerISt5tupleIJPFvPN7bmalloc9AsyncTaskINS3_4HeapEMS5_FvvEEEES9_EEEEEE at Qt_5 5.212.0~alpha3
  (arch=armel)_ZTVSt23_Sp_counted_ptr_inplaceISt5mutexSaIS0_ELN9__gnu_cxx12_Lock_policyE1EE at Qt_5 5.212.0~alpha3
- (arch=!armel !ppc64el !riscv64 !s390x)_ZTVSt23_Sp_counted_ptr_inplaceISt5mutexSaIS0_ELN9__gnu_cxx12_Lock_policyE2EE at Qt_5 5.212.0~alpha3
+ (arch=!armel !ppc64el !s390x)_ZTVSt23_Sp_counted_ptr_inplaceISt5mutexSaIS0_ELN9__gnu_cxx12_Lock_policyE2EE at Qt_5 5.212.0~alpha3
  (arch=!ppc64el !s390x)_ZZNSt19_Sp_make_shared_tag5_S_tiEvE5__tag at Qt_5 5.212.0~alpha3
  _ZZZN21QWebIconImageProvider10identifierEvENKUlvE_clEvE15qstring_literal at Qt_5 5.212.0~alpha3
  _ZlsR11QDataStreamRK11QWebHistory at Qt_5 5.212.0~alpha3
diff --git a/debian/patches/series b/debian/patches/series
index 698bac5..6b87e12 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,4 +1,2 @@
 reduce_exports.diff
 path_max.diff
-support_riscv64.diff
-# bison_3.7.diff
diff --git a/debian/patches/support_riscv64.diff b/debian/patches/support_riscv64.diff
deleted file mode 100644
index 0838efa..0000000
--- a/debian/patches/support_riscv64.diff
+++ /dev/null
@@ -1,61 +0,0 @@
-Description: add support for riscv64 architecture
-Author: William Grant <wgrant at ubuntu.com>
-Forwarded: https://github.com/qtwebkit/qtwebkit/pull/982
-Last-Update: 2020-04-28
-
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -83,6 +83,8 @@ elseif (LOWERCASE_CMAKE_SYSTEM_PROCESSOR
-     set(WTF_CPU_S390 1)
- elseif (LOWERCASE_CMAKE_SYSTEM_PROCESSOR MATCHES "s390x")
-     set(WTF_CPU_S390X 1)
-+elseif (LOWERCASE_CMAKE_SYSTEM_PROCESSOR MATCHES "riscv64")
-+    set(WTF_CPU_RISCV64 1)
- else ()
-     message(FATAL_ERROR "Unknown CPU '${LOWERCASE_CMAKE_SYSTEM_PROCESSOR}'")
- endif ()
---- a/Source/JavaScriptCore/CMakeLists.txt
-+++ b/Source/JavaScriptCore/CMakeLists.txt
-@@ -1287,6 +1287,7 @@ elseif (WTF_CPU_S390)
- elseif (WTF_CPU_S390X)
- elseif (WTF_CPU_MIPS)
- elseif (WTF_CPU_SH4)
-+elseif (WTF_CPU_RISCV64)
- elseif (WTF_CPU_X86)
- elseif (WTF_CPU_X86_64)
-     if (MSVC AND ENABLE_JIT)
---- a/Source/WTF/wtf/Platform.h
-+++ b/Source/WTF/wtf/Platform.h
-@@ -176,6 +176,11 @@
- #define WTF_CPU_X86_SSE2 1
- #endif
- 
-+/* CPU(RISCV64) - RISCV64 */
-+#if defined(__riscv) && defined(__riscv_xlen) && __riscv_xlen == 64
-+#define WTF_CPU_RISCV64 1
-+#endif
-+
- /* CPU(ARM64) - Apple */
- #if (defined(__arm64__) && defined(__APPLE__)) || defined(__aarch64__)
- #define WTF_CPU_ARM64 1
-@@ -707,7 +712,8 @@
-     || CPU(S390X) \
-     || CPU(MIPS64) \
-     || CPU(PPC64) \
--    || CPU(PPC64LE)
-+    || CPU(PPC64LE) \
-+    || CPU(RISCV64)
- #define USE_JSVALUE64 1
- #else
- #define USE_JSVALUE32_64 1
---- 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(RISCV64)
- #define DOUBLE_CONVERSION_CORRECT_DOUBLE_OPERATIONS 1
- #elif defined(_M_IX86) || defined(__i386__)
- #if defined(_WIN32)
diff --git a/debian/rules b/debian/rules
index 572c819..df1b87e 100755
--- a/debian/rules
+++ b/debian/rules
@@ -45,11 +45,6 @@ ifneq (,$(filter $(DEB_HOST_ARCH_CPU),ppc64el s390x))
 	EXTRA_CMAKE_ARGUMENTS += -DUSE_SYSTEM_MALLOC=ON
 endif
 
-# webkit2gtk does a similar thing, see their prefer-pthread.patch
-ifeq ($(DEB_HOST_ARCH),riscv64)
-	EXTRA_CMAKE_ARGUMENTS += -DTHREADS_PREFER_PTHREAD_FLAG=ON
-endif
-
 %:
 	dh $@ --buildsystem=cmake+ninja --with pkgkde_symbolshelper
 
