[packages/qt5-qtwebengine] another debian patch to fix 32bit build with new binutils; rel 6

atler atler at pld-linux.org
Wed Aug 5 17:54:29 CEST 2020


commit ab34bd78ff6cc140e029b16a5543bd377b2abdf7
Author: Jan Palus <atler at pld-linux.org>
Date:   Wed Aug 5 17:52:09 2020 +0200

    another debian patch to fix 32bit build with new binutils; rel 6

 binutils-2.35.patch  | 35 +++++++++++++++++++++++++++++++++++
 qt5-qtwebengine.spec |  8 +++++---
 2 files changed, 40 insertions(+), 3 deletions(-)
---
diff --git a/qt5-qtwebengine.spec b/qt5-qtwebengine.spec
index 26690c0..b48dd56 100644
--- a/qt5-qtwebengine.spec
+++ b/qt5-qtwebengine.spec
@@ -8,7 +8,7 @@ Summary:	The Qt5 WebEngine library
 Summary(pl.UTF-8):	Biblioteka Qt5 WebEngine
 Name:		qt5-%{orgname}
 Version:	5.15.0
-Release:	5
+Release:	6
 License:	LGPL v3 or GPL v2+ or commercial
 Group:		X11/Libraries
 Source0:	http://download.qt.io/official_releases/qt/5.15/%{version}/submodules/%{orgname}-everywhere-src-%{version}.tar.xz
@@ -16,7 +16,8 @@ Source0:	http://download.qt.io/official_releases/qt/5.15/%{version}/submodules/%
 Patch0:		x32.patch
 Patch1:		webauthn.patch
 Patch2:		bison-3.7.patch
-Patch3:		icu67.patch
+Patch3:		binutils-2.35.patch
+Patch4:		icu67.patch
 URL:		http://www.qt.io/
 BuildRequires:	Mesa-khrplatform-devel
 BuildRequires:	Qt5Core-devel >= %{version}
@@ -228,8 +229,9 @@ Biblioteka Qt5 Pdf - pliki programistyczne.
 %endif
 %patch1 -p1
 %patch2 -p1
+%patch3 -p1
 cd ./src/3rdparty/chromium
-%patch3 -p2
+%patch4 -p2
 
 %build
 %ifarch x32
diff --git a/binutils-2.35.patch b/binutils-2.35.patch
new file mode 100644
index 0000000..dedb0f2
--- /dev/null
+++ b/binutils-2.35.patch
@@ -0,0 +1,35 @@
+Description: build openh264 with -DX86_32_PICASM on x86
+ To fix linker errors with new binutils, see #965328.
+Author: Dmitry Shachnev <mitya57 at debian.org>
+Forwarded: not-yet
+Last-Update: 2020-07-20
+
+--- a/src/3rdparty/chromium/third_party/openh264/BUILD.gn
++++ b/src/3rdparty/chromium/third_party/openh264/BUILD.gn
+@@ -67,7 +67,7 @@ if (use_assembler) {
+     sources = openh264_common_sources_asm_x86
+     defines = yasm_defines
+     if (target_cpu == "x86") {
+-      defines += [ "X86_32" ]
++      defines += [ "X86_32", "X86_32_PICASM" ]
+     } else {  # x64
+       if (is_mac) {
+         defines += [
+@@ -88,7 +88,7 @@ if (use_assembler) {
+     sources = openh264_processing_sources_asm_x86
+     defines = yasm_defines
+     if (target_cpu == "x86") {
+-      defines += [ "X86_32" ]
++      defines += [ "X86_32", "X86_32_PICASM" ]
+     } else {  # x64
+       if (is_mac) {
+         defines += [
+@@ -109,7 +109,7 @@ if (use_assembler) {
+     sources = openh264_encoder_sources_asm_x86
+     defines = yasm_defines
+     if (target_cpu == "x86") {
+-      defines += [ "X86_32" ]
++      defines += [ "X86_32", "X86_32_PICASM" ]
+     } else {  # x64
+       if (is_mac) {
+         defines += [
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/qt5-qtwebengine.git/commitdiff/ab34bd78ff6cc140e029b16a5543bd377b2abdf7



More information about the pld-cvs-commit mailing list