[qt5-qtwebengine-freeworld/f31] (4 commits) ...Sync patches from Fedora.
by Kevin Kofler
Summary of changes:
4048a5d... 5.13.2, sync changes from fedora packaging (deps, patches, (*)
41ab591... Readd pulseaudio-12.2-headers.tar.gz and fix sources.keep. (*)
e681a62... Fix changelog date (*)
32d39f5... Sync patches from Fedora. (*)
(*) This commit already existed in another branch; no separate mail sent
4 years, 3 months
[qt5-qtwebengine-freeworld] Sync patches from Fedora.
by Kevin Kofler
commit 32d39f57d445169c64bb312592d1c6dab3990f50
Author: Kevin Kofler <kevin.kofler(a)chello.at>
Date: Tue Jan 14 19:51:48 2020 +0100
Sync patches from Fedora.
qtwebengine-SIOCGSTAMP.patch | 14 ++++++------
...rywhere-5.13.2-missing-semicolon-in-blink.patch | 13 +++++++++++
qtwebengine-everywhere-5.13.2-use-python2.patch | 13 +++++++++++
...ngine-everywhere-src-5.11.0-no-icudtl-dat.patch | 26 ++++++++++++----------
...verywhere-src-5.12.0-gn-bootstrap-verbose.patch | 17 +++++++-------
qtwebengine-gcc9-drop-rsp-clobber.patch | 12 ----------
qtwebengine-opensource-src-5.9.0-no-neon.patch | 9 ++++----
...gine-opensource-src-5.9.0-openmax-dl-neon.patch | 25 ++++++++++++---------
8 files changed, 76 insertions(+), 53 deletions(-)
---
diff --git a/qtwebengine-SIOCGSTAMP.patch b/qtwebengine-SIOCGSTAMP.patch
index 0b9df9b..7609f85 100644
--- a/qtwebengine-SIOCGSTAMP.patch
+++ b/qtwebengine-SIOCGSTAMP.patch
@@ -1,11 +1,11 @@
-diff --git a/src/3rdparty/chromium/third_party/webrtc/rtc_base/physicalsocketserver.cc b/src/3rdparty/chromium/third_party/webrtc/rtc_base/physicalsocketserver.cc
-index ca7849917..31c5f7697 100644
---- a/src/3rdparty/chromium/third_party/webrtc/rtc_base/physicalsocketserver.cc
-+++ b/src/3rdparty/chromium/third_party/webrtc/rtc_base/physicalsocketserver.cc
-@@ -69,6 +69,11 @@ typedef void* SockOptArg;
-
+diff --git 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
+index c38d7fdfa..0a8b0fd8b 100644
+--- 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
+@@ -72,6 +72,11 @@ typedef void* SockOptArg;
+
#if defined(WEBRTC_POSIX) && !defined(WEBRTC_MAC) && !defined(__native_client__)
-
+
+// Seems that kernel 5.2.0 renames this define to SIOCGSTAMP_OLD
+#ifndef SIOCGSTAMP
+#define SIOCGSTAMP 0x8906 /* Get stamp (timeval) */
diff --git a/qtwebengine-everywhere-5.13.2-missing-semicolon-in-blink.patch b/qtwebengine-everywhere-5.13.2-missing-semicolon-in-blink.patch
new file mode 100644
index 0000000..55251d7
--- /dev/null
+++ b/qtwebengine-everywhere-5.13.2-missing-semicolon-in-blink.patch
@@ -0,0 +1,13 @@
+diff --git a/src/3rdparty/chromium/third_party/blink/renderer/core/dom/document.cc b/src/3rdparty/chromium/third_party/blink/renderer/core/dom/document.cc
+index 18100c7b7..542f9bd11 100644
+--- a/src/3rdparty/chromium/third_party/blink/renderer/core/dom/document.cc
++++ b/src/3rdparty/chromium/third_party/blink/renderer/core/dom/document.cc
+@@ -5710,7 +5710,7 @@ static ParseQualifiedNameResult ParseQualifiedNameInternal(
+
+ for (unsigned i = 0; i < length;) {
+ UChar32 c;
+- U16_NEXT(characters, i, length, c)
++ U16_NEXT(characters, i, length, c);
+ if (c == ':') {
+ if (saw_colon)
+ return ParseQualifiedNameResult(kQNMultipleColons);
diff --git a/qtwebengine-everywhere-5.13.2-use-python2.patch b/qtwebengine-everywhere-5.13.2-use-python2.patch
new file mode 100644
index 0000000..91a17ae
--- /dev/null
+++ b/qtwebengine-everywhere-5.13.2-use-python2.patch
@@ -0,0 +1,13 @@
+diff --git a/src/webengine/module.pro b/src/webengine/module.pro
+index 49a1086b2..afc89d49e 100644
+--- a/src/webengine/module.pro
++++ b/src/webengine/module.pro
+@@ -76,7 +76,7 @@ qtConfig(webengine-testsupport) {
+ python = $$pythonPathForShell()
+ chromium_attributions.commands = \
+ cd $$shell_quote($$shell_path($$PWD/../3rdparty)) && \
+- $$python chromium/tools/licenses.py \
++ python2 chromium/tools/licenses.py \
+ --file-template ../../tools/about_credits.tmpl \
+ --entry-template ../../tools/about_credits_entry.tmpl credits \
+ $$shell_quote($$shell_path($$OUT_PWD/chromium_attributions.qdoc))
diff --git a/qtwebengine-everywhere-src-5.11.0-no-icudtl-dat.patch b/qtwebengine-everywhere-src-5.11.0-no-icudtl-dat.patch
index 59da86e..e035dff 100644
--- a/qtwebengine-everywhere-src-5.11.0-no-icudtl-dat.patch
+++ b/qtwebengine-everywhere-src-5.11.0-no-icudtl-dat.patch
@@ -1,9 +1,10 @@
-diff -up qtwebengine-everywhere-src-5.11.0/src/core/web_engine_library_info.cpp.no-icudtl-dat qtwebengine-everywhere-src-5.11.0/src/core/web_engine_library_info.cpp
---- qtwebengine-everywhere-src-5.11.0/src/core/web_engine_library_info.cpp.no-icudtl-dat 2018-06-14 09:23:48.931195271 -0500
-+++ qtwebengine-everywhere-src-5.11.0/src/core/web_engine_library_info.cpp 2018-06-14 09:27:26.248014325 -0500
-@@ -258,28 +258,12 @@ QString dictionariesPath()
+diff --git a/src/core/web_engine_library_info.cpp b/src/core/web_engine_library_info.cpp
+index 1c8316430..a1c27d28f 100644
+--- a/src/core/web_engine_library_info.cpp
++++ b/src/core/web_engine_library_info.cpp
+@@ -259,29 +259,12 @@ QString dictionariesPath()
- QString icuDataPath()
+ QString resourcesDataPath()
{
- static bool initialized = false;
static QString potentialResourcesPath =
@@ -14,19 +15,20 @@ diff -up qtwebengine-everywhere-src-5.11.0/src/core/web_engine_library_info.cpp.
#endif
- if (!initialized) {
- initialized = true;
-- if (!QFileInfo::exists(potentialResourcesPath % QLatin1String("/icudtl.dat"))) {
-- qWarning("Qt WebEngine ICU data not found at %s. Trying parent directory...", qPrintable(potentialResourcesPath));
+- if (!QFileInfo::exists(potentialResourcesPath % QLatin1String("/qtwebengine_resources.pak"))) {
+- qWarning("Qt WebEngine resources not found at %s. Trying parent directory...", qPrintable(potentialResourcesPath));
- potentialResourcesPath = QLibraryInfo::location(QLibraryInfo::DataPath);
- }
-- if (!QFileInfo::exists(potentialResourcesPath % QLatin1String("/icudtl.dat"))) {
-- qWarning("Qt WebEngine ICU data not found at %s. Trying application directory...", qPrintable(potentialResourcesPath));
+- if (!QFileInfo::exists(potentialResourcesPath % QLatin1String("/qtwebengine_resources.pak"))) {
+- qWarning("Qt WebEngine resources not found at %s. Trying application directory...", qPrintable(potentialResourcesPath));
- potentialResourcesPath = QCoreApplication::applicationDirPath();
- }
-- if (!QFileInfo::exists(potentialResourcesPath % QLatin1String("/icudtl.dat"))) {
-- qWarning("Qt WebEngine ICU data not found at %s. Trying fallback directory... The application MAY NOT work.", qPrintable(potentialResourcesPath));
+- if (!QFileInfo::exists(potentialResourcesPath % QLatin1String("/qtwebengine_resources.pak"))) {
+- qWarning("Qt WebEngine resources not found at %s. Trying fallback directory... The application MAY NOT work.", qPrintable(potentialResourcesPath));
- potentialResourcesPath = fallbackDir();
- }
- }
-
+-
return potentialResourcesPath;
}
+ } // namespace
diff --git a/qtwebengine-everywhere-src-5.12.0-gn-bootstrap-verbose.patch b/qtwebengine-everywhere-src-5.12.0-gn-bootstrap-verbose.patch
index 9d4cadb..ef1012f 100644
--- a/qtwebengine-everywhere-src-5.12.0-gn-bootstrap-verbose.patch
+++ b/qtwebengine-everywhere-src-5.12.0-gn-bootstrap-verbose.patch
@@ -1,12 +1,13 @@
-diff -up qtwebengine-everywhere-src-5.12.0/src/buildtools/gn.pro.gn-bootstrap-verbose qtwebengine-everywhere-src-5.12.0/src/buildtools/gn.pro
---- qtwebengine-everywhere-src-5.12.0/src/buildtools/gn.pro.gn-bootstrap-verbose 2018-12-07 09:53:18.262171677 -0600
-+++ qtwebengine-everywhere-src-5.12.0/src/buildtools/gn.pro 2018-12-07 09:57:53.246646133 -0600
+diff --git a/src/buildtools/gn.pro b/src/buildtools/gn.pro
+index b6bf9cfc4..30f92e6ac 100644
+--- a/src/buildtools/gn.pro
++++ b/src/buildtools/gn.pro
@@ -18,7 +18,7 @@ build_pass|!debug_and_release {
src_3rd_party_dir = $$absolute_path("$${getChromiumSrcDir()}/../", "$$QTWEBENGINE_ROOT")
gn_bootstrap = $$system_path($$absolute_path(gn/build/gen.py, $$src_3rd_party_dir))
-- gn_configure = $$system_quote($$gn_bootstrap) --no-last-commit-position --out-path $$out_path
-+ gn_configure = $$system_quote($$gn_bootstrap) --verbose --no-last-commit-position --out-path $$out_path
- !system("$$pythonPathForSystem() $$gn_configure") {
- error("GN generation error!")
- }
+- gn_gen_args = --no-last-commit-position --out-path $$out_path \
++ gn_gen_args = --no-last-commit-position --verbose --out-path $$out_path \
+ --cc \"$$which($$QMAKE_CC)\" --cxx \"$$which($$QMAKE_CXX)\" \
+ --ld \"$$which($$QMAKE_LINK)\"
+
diff --git a/qtwebengine-opensource-src-5.9.0-no-neon.patch b/qtwebengine-opensource-src-5.9.0-no-neon.patch
index 0fc7395..dd24ee2 100644
--- a/qtwebengine-opensource-src-5.9.0-no-neon.patch
+++ b/qtwebengine-opensource-src-5.9.0-no-neon.patch
@@ -1,7 +1,8 @@
-diff -ur qtwebengine-opensource-src-5.9.0/src/core/config/linux.pri qtwebengine-opensource-src-5.9.0-no-neon/src/core/config/linux.pri
---- qtwebengine-opensource-src-5.9.0/src/core/config/linux.pri 2017-05-19 06:22:04.000000000 +0200
-+++ qtwebengine-opensource-src-5.9.0-no-neon/src/core/config/linux.pri 2017-06-08 00:55:22.257781563 +0200
-@@ -70,7 +70,9 @@
+diff --git a/src/core/config/linux.pri b/src/core/config/linux.pri
+index f45c418fe..f6c7b714e 100644
+--- a/src/core/config/linux.pri
++++ b/src/core/config/linux.pri
+@@ -87,7 +87,9 @@ contains(QT_ARCH, "arm") {
gn_args += arm_use_neon=false
# If the toolchain does not explicitly specify to use NEON instructions
# we use arm_neon_optional for ARMv7
diff --git a/qtwebengine-opensource-src-5.9.0-openmax-dl-neon.patch b/qtwebengine-opensource-src-5.9.0-openmax-dl-neon.patch
index fd11fae..09803b2 100644
--- a/qtwebengine-opensource-src-5.9.0-openmax-dl-neon.patch
+++ b/qtwebengine-opensource-src-5.9.0-openmax-dl-neon.patch
@@ -1,19 +1,24 @@
-diff -ur qtwebengine-opensource-src-5.9.0/src/3rdparty/chromium/third_party/openmax_dl/dl/BUILD.gn qtwebengine-opensource-src-5.9.0-openmax-dl-neon/src/3rdparty/chromium/third_party/openmax_dl/dl/BUILD.gn
---- qtwebengine-opensource-src-5.9.0/src/3rdparty/chromium/third_party/openmax_dl/dl/BUILD.gn 2017-05-18 16:51:44.000000000 +0200
-+++ qtwebengine-opensource-src-5.9.0-openmax-dl-neon/src/3rdparty/chromium/third_party/openmax_dl/dl/BUILD.gn 2017-06-10 02:41:10.317340598 +0200
-@@ -196,9 +196,6 @@
+diff --git a/src/3rdparty/chromium/third_party/openmax_dl/dl/BUILD.gn b/src/3rdparty/chromium/third_party/openmax_dl/dl/BUILD.gn
+index 96a59c7c7..d5470f284 100644
+--- a/src/3rdparty/chromium/third_party/openmax_dl/dl/BUILD.gn
++++ b/src/3rdparty/chromium/third_party/openmax_dl/dl/BUILD.gn
+@@ -208,12 +208,6 @@ if (current_cpu == "arm") {
]
if (arm_optionally_use_neon) {
# Run-time NEON detection.
-- deps = [ "//third_party/android_tools:cpu_features" ]
+- deps = [
+- "//third_party/android_tools:cpu_features",
+- ]
+-
- # To get the __android_log_print routine
- libs = [ "log" ]
+
# Detection routine
sources += [ "sp/src/arm/detect.c" ]
- }
-diff -ur qtwebengine-opensource-src-5.9.0/src/3rdparty/chromium/third_party/openmax_dl/dl/sp/src/arm/detect.c qtwebengine-opensource-src-5.9.0-openmax-dl-neon/src/3rdparty/chromium/third_party/openmax_dl/dl/sp/src/arm/detect.c
---- qtwebengine-opensource-src-5.9.0/src/3rdparty/chromium/third_party/openmax_dl/dl/sp/src/arm/detect.c 2017-05-18 16:51:44.000000000 +0200
-+++ qtwebengine-opensource-src-5.9.0-openmax-dl-neon/src/3rdparty/chromium/third_party/openmax_dl/dl/sp/src/arm/detect.c 2017-06-10 02:38:30.593809570 +0200
+diff --git a/src/3rdparty/chromium/third_party/openmax_dl/dl/sp/src/arm/detect.c b/src/3rdparty/chromium/third_party/openmax_dl/dl/sp/src/arm/detect.c
+index 57bfe4089..94a3f7ddc 100644
+--- a/src/3rdparty/chromium/third_party/openmax_dl/dl/sp/src/arm/detect.c
++++ b/src/3rdparty/chromium/third_party/openmax_dl/dl/sp/src/arm/detect.c
@@ -9,13 +9,57 @@
*
*/
@@ -76,7 +81,7 @@ diff -ur qtwebengine-opensource-src-5.9.0/src/3rdparty/chromium/third_party/open
}
static void SetFFTRoutines() {
-@@ -24,13 +68,9 @@
+@@ -24,13 +68,9 @@ static void SetFFTRoutines() {
* forward and inverse FFTs
*/
if (omxSP_HasArmNeon()) {
4 years, 3 months
[qt5-qtwebengine-freeworld] Fix changelog date
by Kevin Kofler
commit e681a62c11c70c14a8cec15e981f24f796c2fd9a
Author: Kevin Kofler <kevin.kofler(a)chello.at>
Date: Tue Jan 14 19:44:35 2020 +0100
Fix changelog date
It's 2020 already.
qt5-qtwebengine-freeworld.spec | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
---
diff --git a/qt5-qtwebengine-freeworld.spec b/qt5-qtwebengine-freeworld.spec
index 628178a..068a477 100644
--- a/qt5-qtwebengine-freeworld.spec
+++ b/qt5-qtwebengine-freeworld.spec
@@ -434,7 +434,7 @@ echo "%{_libdir}/%{name}" \
%config(noreplace) %{_sysconfdir}/ld.so.conf.d/%{name}-%{_arch}.conf
%changelog
-* Tue Jan 14 2019 Kevin Kofler <Kevin(a)tigcc.ticalc.org> - 5.13.2-1
+* Tue Jan 14 2020 Kevin Kofler <Kevin(a)tigcc.ticalc.org> - 5.13.2-1
- 5.13.2, sync changes from fedora packaging (deps, patches, etc...)
* Mon Dec 02 2019 Rex Dieter <rdieter(a)fedoraproject.org> - 5.12.6-1
4 years, 3 months
[qt5-qtwebengine-freeworld] Readd pulseaudio-12.2-headers.tar.gz and fix sources.keep.
by Kevin Kofler
commit 41ab5910a81d0ae9a3e436d8f481ac1c2dd93b2a
Author: Kevin Kofler <kevin.kofler(a)chello.at>
Date: Tue Jan 14 19:43:42 2020 +0100
Readd pulseaudio-12.2-headers.tar.gz and fix sources.keep.
sources | 1 +
sources.keep | 2 +-
2 files changed, 2 insertions(+), 1 deletion(-)
---
diff --git a/sources b/sources
index c5a63a6..62bfd1e 100644
--- a/sources
+++ b/sources
@@ -1 +1,2 @@
SHA512 (qtwebengine-everywhere-src-5.13.2.tar.xz) = 10ae5cca36230069ef117cae15b84e29124c43e4864dbfa7a1f99879764b871355281edcb1942e86ec3a4cac12bbfd2749577745c8c7e736eb6a9909876554d0
+SHA512 (pulseaudio-12.2-headers.tar.gz) = a5a9bcbb16030b3bc83cc0cc8f5e7f90e0723d3e83258a5c77eacb32eaa267118a73fa7814fbcc99a24e4907916a2b371ebb6dedc4f45541c3acf6c834fd35be
diff --git a/sources.keep b/sources.keep
index 86dc953..adf9556 100644
--- a/sources.keep
+++ b/sources.keep
@@ -1 +1 @@
-45d9c2aba2e79c5ce319ca7e78bbbf39 pulseaudio-12.2-headers.tar.gz
+SHA512 (pulseaudio-12.2-headers.tar.gz) = a5a9bcbb16030b3bc83cc0cc8f5e7f90e0723d3e83258a5c77eacb32eaa267118a73fa7814fbcc99a24e4907916a2b371ebb6dedc4f45541c3acf6c834fd35be
4 years, 3 months
[qt5-qtwebengine-freeworld] 5.13.2, sync changes from fedora packaging (deps, patches, etc...)
by Kevin Kofler
commit 4048a5d9c63784be27344730431c9b72e8ddefc9
Author: Kevin Kofler <kevin.kofler(a)chello.at>
Date: Tue Jan 14 19:38:01 2020 +0100
5.13.2, sync changes from fedora packaging (deps, patches, etc...)
* Tue Jan 14 2019 Kevin Kofler <Kevin(a)tigcc.ticalc.org> - 5.13.2-1
- 5.13.2, sync changes from fedora packaging (deps, patches, etc...)
.gitignore | 1 +
qt5-qtwebengine-freeworld.spec | 45 +++++++++++++++++++++++++++---------------
sources | 3 +--
3 files changed, 31 insertions(+), 18 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 9e6e876..0ae7a17 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,3 +2,4 @@
/pulseaudio-12.2-headers.tar.gz
/qtwebengine-everywhere-src-5.12.5.tar.xz
/qtwebengine-everywhere-src-5.12.6.tar.xz
+/qtwebengine-everywhere-src-5.13.2.tar.xz
diff --git a/qt5-qtwebengine-freeworld.spec b/qt5-qtwebengine-freeworld.spec
index d555e18..628178a 100644
--- a/qt5-qtwebengine-freeworld.spec
+++ b/qt5-qtwebengine-freeworld.spec
@@ -7,8 +7,8 @@
# work around missing macro in the RPM Fusion build system (matches list in macros.qt5-srpm)
%{!?qt5_qtwebengine_arches:%global qt5_qtwebengine_arches %{ix86} x86_64 %{arm} aarch64 mips mipsel mips64el}
-%if 0%{?fedora} > 27
-# need libvpx >= 1.7.0 (need commit 297dfd869609d7c3c5cd5faa3ebc7b43a394434e)
+%if 0%{?fedora} > 29
+# need libvpx >= 1.8.0 (need commit 297dfd869609d7c3c5cd5faa3ebc7b43a394434e)
%global use_system_libvpx 1
%endif
# need libwebp >= 0.6.0
@@ -21,7 +21,7 @@
# NEON support on ARM (detected at runtime) - disable this if you are hitting
# FTBFS due to e.g. GCC bug https://bugzilla.redhat.com/show_bug.cgi?id=1282495
-%global arm_neon 1
+#global arm_neon 1
# the QMake CONFIG flags to force debugging information to be produced in
# release builds, and for all parts of the code
@@ -30,20 +30,18 @@
# setting below, and even with just force_debug_info, so omit all debuginfo
%global debug_config %{nil}
%else
-%global debug_config webcore_debug v8base_debug force_debug_info
+%global debug_config force_debug_info
+# webcore_debug v8base_debug
%endif
#global prerelease rc
-# exclude plugins (all architectures) and libv8.so (i686, it's static everywhere
-# else)
-%global __provides_exclude ^lib.*plugin\\.so.*|libv8\\.so$
-# exclude libv8.so (i686, it's static everywhere else)
-%global __requires_exclude ^libv8\\.so$
+# exclude plugins
+%global __provides_exclude ^lib.*plugin\\.so.*$
Summary: Qt5 - QtWebEngine components (freeworld version)
Name: qt5-qtwebengine-freeworld
-Version: 5.12.6
+Version: 5.13.2
Release: 1%{?dist}
%global major_minor %(echo %{version} | cut -d. -f-2)
@@ -80,8 +78,10 @@ Patch10: qtwebengine-opensource-src-5.9.0-openmax-dl-neon.patch
Patch21: qtwebengine-everywhere-src-5.12.0-gn-bootstrap-verbose.patch
# Fix/workaround FTBFS on aarch64 with newer glibc
Patch24: qtwebengine-everywhere-src-5.11.3-aarch64-new-stat.patch
-# borrow fix from chromium packaging
-Patch26: qtwebengine-gcc9-drop-rsp-clobber.patch
+# Fix missing semicolon in Blink
+Patch25: qtwebengine-everywhere-5.13.2-missing-semicolon-in-blink.patch
+# Use Python2
+Patch26: qtwebengine-everywhere-5.13.2-use-python2.patch
## Upstream patches:
# qtwebengine-chromium
@@ -173,7 +173,15 @@ BuildRequires: pkgconfig(lcms2)
## https://bugreports.qt.io/browse/QTBUG-59094
#BuildRequires: pkgconfig(libxslt) pkgconfig(libxml-2.0)
BuildRequires: perl-interpreter
-BuildRequires: python2-devel
+# fesco exception to allow python2 use: https://pagure.io/fesco/issue/2208
+# per https://fedoraproject.org/wiki/Changes/RetirePython2#FESCo_exceptions
+# Only the interpreter is needed
+%if 0%{?fedora} > 29 || 0%{?rhel} > 8
+BuildRequires: %{__python2}
+%else
+BuildRequires: python2
+BuildRequires: python2-rpm-macros
+%endif
%if 0%{?use_system_libvpx}
BuildRequires: pkgconfig(vpx) >= 1.7.0
%endif
@@ -249,7 +257,7 @@ Provides: bundled(modp_b64)
Provides: bundled(openmax_dl) = 1.0.2
Provides: bundled(ots)
# see src/3rdparty/chromium/third_party/protobuf/CHANGES.txt for the version
-Provides: bundled(protobuf) = 3.0.0-0.1.beta3
+#Provides: bundled(protobuf) = 3.0.0-0.1.beta3
Provides: bundled(qcms) = 4
Provides: bundled(sfntly)
Provides: bundled(skia)
@@ -332,7 +340,8 @@ popd
## NEEDSWORK
#patch21 -p1 -b .gn-bootstrap-verbose
%patch24 -p1 -b .aarch64-new-stat
-%patch26 -p1 -b .gcc9-drop-rsp-clobber
+%patch25 -p1 -b .missing-semicolon-in-blink
+%patch26 -p1 -b .use-python2
# the xkbcommon config/feature was renamed in 5.12, so need to adjust QT_CONFIG references
# when building on older Qt releases
@@ -390,7 +399,8 @@ export NINJAFLAGS="%{__ninja_common_opts}"
export NINJA_PATH=%{__ninja}
%{qmake_qt5} \
- CONFIG+="%{debug_config}" \
+ %{?debug_config:CONFIG+="%{debug_config}}" \
+ CONFIG+="link_pulseaudio" \
%{?system_ffmpeg_flag:QMAKE_EXTRA_ARGS+="%{?system_ffmpeg_flag}"} \
QMAKE_EXTRA_ARGS+="-proprietary-codecs" \
QMAKE_EXTRA_ARGS+="-system-webengine-icu" \
@@ -424,6 +434,9 @@ echo "%{_libdir}/%{name}" \
%config(noreplace) %{_sysconfdir}/ld.so.conf.d/%{name}-%{_arch}.conf
%changelog
+* Tue Jan 14 2019 Kevin Kofler <Kevin(a)tigcc.ticalc.org> - 5.13.2-1
+- 5.13.2, sync changes from fedora packaging (deps, patches, etc...)
+
* Mon Dec 02 2019 Rex Dieter <rdieter(a)fedoraproject.org> - 5.12.6-1
- 5.12.6
diff --git a/sources b/sources
index 19d8270..c5a63a6 100644
--- a/sources
+++ b/sources
@@ -1,2 +1 @@
-SHA512 (qtwebengine-everywhere-src-5.12.6.tar.xz) = 57abf07b3ed9fbf353e42bf9f93d63c3b8f1ac5a417ee36cf3e151489e7184094bf47414be1e4807ba83bdd19a25ed8f7c9f7200c55a66fb7e9be2a7200b2245
-SHA512 (pulseaudio-12.2-headers.tar.gz) = a5a9bcbb16030b3bc83cc0cc8f5e7f90e0723d3e83258a5c77eacb32eaa267118a73fa7814fbcc99a24e4907916a2b371ebb6dedc4f45541c3acf6c834fd35be
+SHA512 (qtwebengine-everywhere-src-5.13.2.tar.xz) = 10ae5cca36230069ef117cae15b84e29124c43e4864dbfa7a1f99879764b871355281edcb1942e86ec3a4cac12bbfd2749577745c8c7e736eb6a9909876554d0
4 years, 3 months
[chromium-freeworld/f30: 2/2] Merge branch 'master' into f30
by Vasiliy Glazov
commit 9552b0d3bebb7e750dc71135cc6c62bd05277f54
Merge: 8fa4bdf 3ad6845
Author: Vasiliy Glazov <vascom2(a)gmail.com>
Date: Tue Jan 14 16:51:41 2020 +0300
Merge branch 'master' into f30
chromium-freeworld.spec | 5 ++++-
sources | 2 +-
2 files changed, 5 insertions(+), 2 deletions(-)
---
4 years, 3 months
[chromium-freeworld/f31: 2/2] Merge branch 'master' into f31
by Vasiliy Glazov
commit 8c23d5047c5ed3e9435e324c90c93dd20575ebdf
Merge: 9dc4398 3ad6845
Author: Vasiliy Glazov <vascom2(a)gmail.com>
Date: Tue Jan 14 16:50:51 2020 +0300
Merge branch 'master' into f31
chromium-freeworld.spec | 5 ++++-
sources | 2 +-
2 files changed, 5 insertions(+), 2 deletions(-)
---
4 years, 3 months
[chromium-freeworld] Update to 79.0.3945.117.
by Vasiliy Glazov
commit 3ad684530aa7b5635cca27054812dd3601d5966f
Author: Vasiliy Glazov <vascom2(a)gmail.com>
Date: Tue Jan 14 16:35:22 2020 +0300
Update to 79.0.3945.117.
chromium-freeworld.spec | 5 ++++-
sources | 2 +-
2 files changed, 5 insertions(+), 2 deletions(-)
---
diff --git a/chromium-freeworld.spec b/chromium-freeworld.spec
index 86ad3b6..c20b1e9 100644
--- a/chromium-freeworld.spec
+++ b/chromium-freeworld.spec
@@ -69,7 +69,7 @@
%global ozone 0
##############################Package Definitions######################################
Name: chromium-freeworld
-Version: 79.0.3945.88
+Version: 79.0.3945.117
Release: 1%{?dist}
Summary: Chromium-freeworld is an open-source web browser, powered by WebKit (Blink). It comes with all freeworld codecs and video acceleration enabled.
License: BSD and LGPLv2+ and ASL 2.0 and IJG and MIT and GPLv2+ and ISC and OpenSSL and (MPLv1.1 or GPLv2 or LGPLv2)
@@ -756,6 +756,9 @@ appstream-util validate-relax --nonet "%{buildroot}%{_metainfodir}/%{name}.appda
%{chromiumdir}/swiftshader/libGLESv2.so
#########################################changelogs#################################################
%changelog
+* Tue Jan 14 2020 Vasiliy Glazov <vascom2(a)gmail.com> - 79.0.3945.117-1
+- Update to 79.0.3945.117
+
* Sat Dec 21 2019 Akarshan Biswas <akarshanbiswas(a)fedoraproject.org> - 79.0.3945.88-1
- Update to 79.0.3945.88
diff --git a/sources b/sources
index 4ee367d..910974e 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (chromium-79.0.3945.88.tar.xz) = 6474da7225beb9c99c01dc234b820924dd2fb3d736f53abbac02556f3bec43acd09aa02224666c4a735417500d10f57265ab130c29cce27124e5a69463cf5e0d
+SHA512 (chromium-79.0.3945.117.tar.xz) = bba4f52eec8011f92e3098d29269d978b6e2571593b66c93bf6767bab00f7984e733e6df5fde883b9f643e86b1ad527c3ec7d43ba381b48935512ad82e931e26
4 years, 3 months