Accepting request 714779 from KDE:Qt:5.13

- Increase assumed per-job memory use to 2.5GB
- add 0001-fix-build-after-y2038-changes-in-glibc.patch

OBS-URL: https://build.opensuse.org/request/show/714779
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/libqt5-qtwebengine?expand=0&rev=47
This commit is contained in:
Dominique Leuenberger 2019-07-22 10:18:04 +00:00 committed by Git OBS Bridge
commit 0dce5259c6
3 changed files with 40 additions and 1 deletions

View File

@ -0,0 +1,27 @@
From: Jiri Slaby <jslaby@suse.cz>
Date: Thu, 11 Jul 2019 09:35:13 +0200
Subject: fix build after y2038 changes in glibc
Patch-mainline: submitted on 2019/07/11
References: QTBUG-76963
SIOCGSTAMP is defined in linux/sockios.h since kernel 5.2. Include that
file wherever needed.
Signed-off-by: Jiri Slaby <jslaby@suse.cz>
---
chromium/third_party/webrtc/rtc_base/physical_socket_server.cc | 1 +
1 file changed, 1 insertion(+)
--- a/src/3rdparty/chromium/third_party/webrtc/rtc_base/physical_socket_server.cc
+++ b/src/3rdparty/chromium/third_party/webrtc/rtc_base/physical_socket_server.cc
@@ -67,6 +67,7 @@ typedef void* SockOptArg;
#endif // WEBRTC_POSIX
#if defined(WEBRTC_POSIX) && !defined(WEBRTC_MAC) && !defined(__native_client__)
+#include <linux/sockios.h>
int64_t GetSocketRecvTimestamp(int socket) {
struct timeval tv_ioctl;
--
2.21.0

View File

@ -1,3 +1,13 @@
-------------------------------------------------------------------
Fri Jul 12 07:26:17 UTC 2019 - Fabian Vogt <fabian@ritter-vogt.de>
- Increase assumed per-job memory use to 2.5GB
-------------------------------------------------------------------
Thu Jul 11 07:46:30 UTC 2019 - Jiri Slaby <jslaby@suse.com>
- add 0001-fix-build-after-y2038-changes-in-glibc.patch
-------------------------------------------------------------------
Wed Jun 19 11:26:34 UTC 2019 - fabian@ritter-vogt.de

View File

@ -68,6 +68,8 @@ Source1: baselibs.conf
Patch1: armv6-ffmpeg-no-thumb.patch
# PATCH-FIX-UPSTREAM disable-gpu-when-using-nouveau-boo-1005323.diff
Patch2: disable-gpu-when-using-nouveau-boo-1005323.diff
# PATCH-FIX-UPSTREAM 0001-fix-build-after-y2038-changes-in-glibc.patch
Patch3: 0001-fix-build-after-y2038-changes-in-glibc.patch
# PATCH-FIX-UPSTREAM harmony-fix.diff -- Show the patent-free LCD rendering. Without this patch, only grayscale rendering is used. (for freetype-2.8.1) boo#1061344
Patch5: harmony-fix.diff
# PATCH-FIX-OPENSUSE (copied from the chromium package)
@ -291,7 +293,7 @@ export RPM_OPT_FLAGS=${RPM_OPT_FLAGS/-g / }
-system-webengine-opus -system-webengine-webp -webengine-pepper-plugins -webengine-printing-and-pdf
# Determine the right number of parallel processes based on the available memory
%limit_build -m 2000
%limit_build -m 2500
# Ensure that also the internal chromium build follows the right number of parallel
# processes instead of its defaults.