[qt5-qtwebengine-freeworld/f36] Updated to version 5.15.9.
by Vitaly Zaitsev
commit 018cc08b500ddbc96ea7cfa433c5dd9f8c45fe1c
Author: Vitaly Zaitsev <vitaly(a)easycoding.org>
Date: Wed Jul 27 16:37:58 2022 +0200
Updated to version 5.15.9.
.gitignore | 1 +
qt5-qtwebengine-freeworld.spec | 27 +++++++++++-------
...bengine-everywhere-5.15.8-libpipewire-0.3.patch | 24 ++++++++++++++++
...ngine-everywhere-src-5.15.0-no-icudtl-dat.patch | 33 ----------------------
qtwebengine-release.sh | 2 +-
qtwebengine-skia-missing-includes.patch | 15 ++++++++++
sources | 3 +-
7 files changed, 59 insertions(+), 46 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 79e3b3c..44e759a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -11,3 +11,4 @@
/qtwebengine-everywhere-src-5.15.5.tar.xz
/qtwebengine-everywhere-src-5.15.6.tar.xz
/qtwebengine-everywhere-src-5.15.8.tar.xz
+/qtwebengine-everywhere-src-5.15.9.tar.xz
diff --git a/qt5-qtwebengine-freeworld.spec b/qt5-qtwebengine-freeworld.spec
index f52b083..8c26d06 100644
--- a/qt5-qtwebengine-freeworld.spec
+++ b/qt5-qtwebengine-freeworld.spec
@@ -13,6 +13,8 @@
%if 0%{?fedora}
# need libvpx >= 1.8.0 (need commit 297dfd869609d7c3c5cd5faa3ebc7b43a394434e)
%global use_system_libvpx 1
+# For screen sharing on Wayland, currently Fedora only thing - no epel
+#global pipewire 1
%endif
%if 0%{?fedora} > 30 || 0%{?epel} > 7
# need libwebp >= 0.6.0
@@ -60,8 +62,8 @@
Summary: Qt5 - QtWebEngine components (freeworld version)
Name: qt5-qtwebengine-freeworld
-Version: 5.15.8
-Release: 5%{?dist}
+Version: 5.15.9
+Release: 1%{?dist}
%global major_minor %(echo %{version} | cut -d. -f-2)
%global major %(echo %{version} | cut -d. -f1)
@@ -79,11 +81,6 @@ Source1: qtwebengine-release.sh
# pulseaudio headers
Source20: pulseaudio-12.2-headers.tar.gz
-# quick hack to avoid checking for the nonexistent icudtl.dat and silence the
-# resulting warnings - not upstreamable as is because it removes the fallback
-# mechanism for the ICU data directory (which is not used in our builds because
-# we use the system ICU, which embeds the data statically) completely
-Patch1: qtwebengine-everywhere-src-5.15.0-no-icudtl-dat.patch
# fix extractCFlag to also look in QMAKE_CFLAGS_RELEASE, needed to detect the
# ARM flags with our %%qmake_qt5 macro, including for the next patch
Patch2: qtwebengine-opensource-src-5.12.4-fix-extractcflag.patch
@@ -97,12 +94,14 @@ Patch5: qtwebengine-5.15.0-QT_DEPRECATED_VERSION.patch
# gcc-12 FTBFS "use of deleted function"
Patch6: chromium-angle-nullptr.patch
Patch7: chromium-hunspell-nullptr.patch
+Patch8: qtwebengine-everywhere-5.15.8-libpipewire-0.3.patch
# Fix/workaround FTBFS on aarch64 with newer glibc
Patch24: qtwebengine-everywhere-src-5.11.3-aarch64-new-stat.patch
# Use Python2
Patch26: qtwebengine-everywhere-5.15.5-use-python2.patch
# FTBFS TRUE/FALSE undeclared
Patch31: qtwebengine-everywhere-src-5.15.5-TRUE.patch
+Patch32: qtwebengine-skia-missing-includes.patch
## Upstream patches:
@@ -145,6 +144,9 @@ BuildRequires: nodejs
%if 0%{?use_system_re2}
BuildRequires: re2-devel
%endif
+%if 0%{?pipewire}
+BuildRequires: pkgconfig(libpipewire-0.3)
+%endif
BuildRequires: snappy-devel
BuildRequires: pkgconfig(expat)
BuildRequires: pkgconfig(gobject-2.0)
@@ -358,9 +360,6 @@ mv pulse src/3rdparty/chromium/
pushd src/3rdparty/chromium
popd
-%if 0%{?use_system_libicu}
-%patch1 -p1 -b .no-icudtl-dat
-%endif
%patch2 -p1 -b .fix-extractcflag
%if !0%{?arm_neon}
%patch3 -p1 -b .no-neon
@@ -369,11 +368,15 @@ popd
%patch5 -p1 -b .QT_DEPRECATED_VERSION
%patch6 -p1 -b .angle_nullptr
%patch7 -p1 -b .hunspell_nullptr
+#if 0%{?pipewire}
+%patch8 -p1 -b .libpipewire-0.3
+#endif
## upstream patches
%patch24 -p1 -b .aarch64-new-stat
%patch26 -p1 -b .use-python2
%patch31 -p1 -b .TRUE
+%patch32 -p1 -b .skia-missing-includes
# delete all "toolprefix = " lines from build/toolchain/linux/BUILD.gn, as we
# never cross-compile in native Fedora RPMs, fixes ARM and aarch64 FTBFS
@@ -433,6 +436,7 @@ export NINJA_PATH=%{__ninja}
QMAKE_EXTRA_ARGS+="-proprietary-codecs" \
%{?use_system_libicu:QMAKE_EXTRA_ARGS+="-system-webengine-icu"} \
QMAKE_EXTRA_ARGS+="-webengine-kerberos" \
+ %{?pipewire:QMAKE_EXTRA_ARGS+="-webengine-webrtc-pipewire"} \
.
# avoid %%make_build for now, the -O flag buffers output from intermediate build steps done via ninja
@@ -464,6 +468,9 @@ echo "%{_libdir}/%{name}" \
%changelog
+* Wed Jul 27 2022 Vitaly Zaitsev <vitaly(a)easycoding.org> - 5.15.9-1
+- Updated to version 5.15.9.
+
* Fri Apr 01 2022 Xavier Bachelot <xavier(a)bachelot.org> - 5.15.8-5
- Enable libicu on EL9+
diff --git a/qtwebengine-everywhere-5.15.8-libpipewire-0.3.patch b/qtwebengine-everywhere-5.15.8-libpipewire-0.3.patch
new file mode 100644
index 0000000..c9e4686
--- /dev/null
+++ b/qtwebengine-everywhere-5.15.8-libpipewire-0.3.patch
@@ -0,0 +1,24 @@
+diff -up qtwebengine-everywhere-src-5.15.8/src/3rdparty/chromium/third_party/webrtc/modules/desktop_capture/BUILD.gn.libpipewire-0.3 qtwebengine-everywhere-src-5.15.8/src/3rdparty/chromium/third_party/webrtc/modules/desktop_capture/BUILD.gn
+--- qtwebengine-everywhere-src-5.15.8/src/3rdparty/chromium/third_party/webrtc/modules/desktop_capture/BUILD.gn.libpipewire-0.3 2021-12-15 10:09:27.000000000 -0600
++++ qtwebengine-everywhere-src-5.15.8/src/3rdparty/chromium/third_party/webrtc/modules/desktop_capture/BUILD.gn 2022-02-18 09:43:31.402923179 -0600
+@@ -202,7 +202,7 @@ if (is_linux || is_chromeos) {
+
+ if (rtc_link_pipewire) {
+ pkg_config("pipewire") {
+- packages = [ "libpipewire-0.2" ]
++ packages = [ "libpipewire-0.3" ]
+ }
+ } else {
+ # When libpipewire is not directly linked, use stubs to allow for dlopening of
+diff -up qtwebengine-everywhere-src-5.15.8/src/3rdparty/chromium/third_party/webrtc/webrtc.gni.libpipewire-0.3 qtwebengine-everywhere-src-5.15.8/src/3rdparty/chromium/third_party/webrtc/webrtc.gni
+--- qtwebengine-everywhere-src-5.15.8/src/3rdparty/chromium/third_party/webrtc/webrtc.gni.libpipewire-0.3 2021-12-15 10:09:27.000000000 -0600
++++ qtwebengine-everywhere-src-5.15.8/src/3rdparty/chromium/third_party/webrtc/webrtc.gni 2022-02-18 12:35:13.895009491 -0600
+@@ -115,7 +115,7 @@ declare_args() {
+ rtc_use_pipewire = is_desktop_linux && use_sysroot
+
+ # Set this to link PipeWire directly instead of using the dlopen.
+- rtc_link_pipewire = false
++ rtc_link_pipewire = true
+
+ # Enable to use the Mozilla internal settings.
+ build_with_mozilla = false
diff --git a/qtwebengine-release.sh b/qtwebengine-release.sh
index a05c100..d46ff5c 100755
--- a/qtwebengine-release.sh
+++ b/qtwebengine-release.sh
@@ -1,6 +1,6 @@
#!/bin/sh
set -x
-VERSION=5.15.8
+VERSION=5.15.9
CHROMIUMHASH=`wget https://code.qt.io/cgit/qt/qtwebengine.git/tree/src/3rdparty?h=$VERSION -q --content-on-error -O - | grep "Bad object name: " | sed 's/^.*Bad object name: \([0-9a-f]\{40\}\).*$/\1/g'`
rm -rf qtwebengine-$VERSION qtwebengine-$VERSION.tar.gz qtwebengine-chromium-$CHROMIUMHASH qtwebengine-chromium-$CHROMIUMHASH.tar.gz qtwebengine-everywhere-src-$VERSION
wget https://github.com/qt/qtwebengine/archive/$VERSION.tar.gz -O qtwebengine-$VERSION.tar.gz || exit $?
diff --git a/qtwebengine-skia-missing-includes.patch b/qtwebengine-skia-missing-includes.patch
new file mode 100644
index 0000000..8402a73
--- /dev/null
+++ b/qtwebengine-skia-missing-includes.patch
@@ -0,0 +1,15 @@
+diff --git a/src/3rdparty/chromium/third_party/skia/src/utils/SkParseColor.cpp b/src/3rdparty/chromium/third_party/skia/src/utils/SkParseColor.cpp
+index 7260365..503ed08 100644
+--- a/src/3rdparty/chromium/third_party/skia/src/utils/SkParseColor.cpp
++++ b/src/3rdparty/chromium/third_party/skia/src/utils/SkParseColor.cpp
+@@ -8,6 +8,10 @@
+
+ #include "include/utils/SkParse.h"
+
++#include <string.h>
++#include <algorithm>
++#include <iterator>
++
+ static constexpr const char* gColorNames[] = {
+ "aliceblue",
+ "antiquewhite",
diff --git a/sources b/sources
index cb9140a..d20aa5c 100644
--- a/sources
+++ b/sources
@@ -1,2 +1 @@
-SHA512 (pulseaudio-12.2-headers.tar.gz) = a5a9bcbb16030b3bc83cc0cc8f5e7f90e0723d3e83258a5c77eacb32eaa267118a73fa7814fbcc99a24e4907916a2b371ebb6dedc4f45541c3acf6c834fd35be
-SHA512 (qtwebengine-everywhere-src-5.15.8.tar.xz) = e7e6fe6765c5d4a95bedc1af5d4883587b08887ed37d16c299f739de6ce5d80de16a4cbc9f6a75053cf65c98c0d739b09914fae80bd8b2a5215b1d1836d99c32
+SHA512 (qtwebengine-everywhere-src-5.15.9.tar.xz) = 8483f963f63230a691ae28320aa6ea2284e664bc680112de78f1a696859671764e8b9298e904e1ec681837ae98593aee4cc8ef58dae581558cd49b5265b7367a
1 year, 9 months
[obs-studio/f36] (4 commits) ...Update changelog
by Vitaly Zaitsev
Summary of changes:
c3c6504... Mass rebuild for x264-0.164 (*)
c5f3420... Rebuilt for Python 3.11 (*)
9481442... Rebuild for new ffmpeg (*)
071b9fa... Update changelog (*)
(*) This commit already existed in another branch; no separate mail sent
1 year, 9 months
[telegram-desktop/f36] Rebuilt due to the Qt 6.3.1 update.
by Vitaly Zaitsev
commit 841c2426c72fddbc53110bbf94a8726b5d9c8cfc
Author: Vitaly Zaitsev <vitaly(a)easycoding.org>
Date: Wed Jul 27 14:13:35 2022 +0200
Rebuilt due to the Qt 6.3.1 update.
telegram-desktop.spec | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
---
diff --git a/telegram-desktop.spec b/telegram-desktop.spec
index de77ed7..2ee084f 100644
--- a/telegram-desktop.spec
+++ b/telegram-desktop.spec
@@ -11,7 +11,7 @@
Name: telegram-desktop
Version: 4.0.2
-Release: 1%{?dist}
+Release: 2%{?dist}
# Application and 3rd-party modules licensing:
# * Telegram Desktop - GPLv3+ with OpenSSL exception -- main tarball;
@@ -183,11 +183,11 @@ desktop-file-validate %{buildroot}%{_datadir}/applications/%{launcher}.desktop
%{_metainfodir}/%{launcher}.metainfo.xml
%changelog
+* Wed Jul 27 2022 Vitaly Zaitsev <vitaly(a)easycoding.org> - 4.0.2-2
+- Rebuilt due to the Qt 6.3.1 update.
+
* Sat Jun 25 2022 Vitaly Zaitsev <vitaly(a)easycoding.org> - 4.0.2-1
- Updated to version 4.0.2.
* Fri Jun 03 2022 Vitaly Zaitsev <vitaly(a)easycoding.org> - 3.7.3-2
- Rebuilt due to Qt 6.3.0 update.
-
-* Tue Apr 26 2022 Vitaly Zaitsev <vitaly(a)easycoding.org> - 3.7.3-1
-- Updated to version 3.7.3.
1 year, 9 months
[mpd] Fix ffmpeg-5.1 build issue
by Leigh Scott
commit 415f4256626be314b1a705ea5162978a37a8748d
Author: Leigh Scott <leigh123linux(a)gmail.com>
Date: Wed Jul 27 10:47:46 2022 +0100
Fix ffmpeg-5.1 build issue
ffmpeg51.patch | 33 +++++++++++++++++++++++++++++++++
mpd.spec | 1 +
2 files changed, 34 insertions(+)
---
diff --git a/ffmpeg51.patch b/ffmpeg51.patch
new file mode 100644
index 0000000..f645c00
--- /dev/null
+++ b/ffmpeg51.patch
@@ -0,0 +1,33 @@
+From 59792cb0b801854ee41be72d33db9542735df754 Mon Sep 17 00:00:00 2001
+From: Max Kellermann <max.kellermann(a)gmail.com>
+Date: Wed, 27 Jul 2022 10:59:48 +0200
+Subject: [PATCH] decoder/ffmpeg: wrap FFmpeg include in "extern C"
+
+Commit ebae25d175eb31 added that #include, but forgot to wrap it in
+"extern C", so the linker tried to look up C++ symbols, causing linker
+failure.
+
+Closes https://github.com/MusicPlayerDaemon/MPD/issues/1582
+---
+ src/decoder/plugins/FfmpegIo.cxx | 5 ++++-
+ 1 files changed, 5 insertions(+), 1 deletion(-)
+
+diff --git a/src/decoder/plugins/FfmpegIo.cxx b/src/decoder/plugins/FfmpegIo.cxx
+index 2e22d95991..5b5c8b40e3 100644
+--- a/src/decoder/plugins/FfmpegIo.cxx
++++ b/src/decoder/plugins/FfmpegIo.cxx
+@@ -21,10 +21,13 @@
+ #define __STDC_CONSTANT_MACROS
+
+ #include "FfmpegIo.hxx"
+-#include "libavutil/mem.h"
+ #include "../DecoderAPI.hxx"
+ #include "input/InputStream.hxx"
+
++extern "C" {
++#include <libavutil/mem.h>
++}
++
+ AvioStream::~AvioStream()
+ {
+ if (io != nullptr) {
diff --git a/mpd.spec b/mpd.spec
index d287a5f..f26ab22 100644
--- a/mpd.spec
+++ b/mpd.spec
@@ -35,6 +35,7 @@ Source5: mpd.xml
Patch0: mpd-0.22-mpdconf.patch
Patch1: mpd-0.20-remove_NoNewPrivileges.patch
Patch2: timidity_path.patch
+Patch3: https://github.com/MusicPlayerDaemon/MPD/commit/59792cb0b801854ee41be72d3...
BuildRequires: alsa-lib-devel
BuildRequires: audiofile-devel
1 year, 9 months
[rpmfusion-packager] Only requires rfpkg, rfpkg will requires the rest
by Sérgio M. Basto
commit 154770ebdfb30339dc140de19f195524fa022387
Author: Sérgio M. Basto <sergio(a)serjux.com>
Date: Tue Jul 26 03:55:23 2022 +0100
Only requires rfpkg, rfpkg will requires the rest
rpmfusion-packager.spec | 16 +++++++++-------
1 file changed, 9 insertions(+), 7 deletions(-)
---
diff --git a/rpmfusion-packager.spec b/rpmfusion-packager.spec
index fb45ba5..b834713 100644
--- a/rpmfusion-packager.spec
+++ b/rpmfusion-packager.spec
@@ -12,7 +12,7 @@
Name: rpmfusion-packager
Version: 0.7.2
-Release: 3%{?dist}
+Release: 4%{?dist}
Summary: Tools for setting up a rpmfusion maintainer environment
License: GPLv2+
@@ -31,20 +31,18 @@ BuildRequires: python2-devel
%endif
# Packager tools
-Requires: rpm-build
-Requires: rpmdevtools
-Requires: rpmlint
-Requires: mock
+%if 0%{?rhel} && 0%{?rhel} <= 7
Requires: rfpkg
+%else
+Suggests: rfpkg
+%endif
Requires: koji
%if 0%{?fedora}
Requires: libabigail-fedora
%else
# EPEL8, ATM, don't have /usr/bin/fedabipkgdiff
# PR proposed: https://src.fedoraproject.org/rpms/libabigail/pull-request/5
-Requires: libabigail
%endif
-Requires: mock-rpmfusion-free
# Tools required by the scripts included
%if %{with python3}
@@ -64,6 +62,7 @@ infrastructure.
Summary: Fedora certificate tool and python library
Requires: python3-pyOpenSSL
Requires: python3-requests
+# need for fedora.client.fas2.AccountSystem
Requires: python3-fedora
Requires: python3-six
Provides: rpmfusion-cert = %{version}-%{release}
@@ -125,6 +124,9 @@ pathfix.py -pni %{python3} src/*.py
%endif
%changelog
+* Tue Jul 26 2022 Sérgio Basto <sergio(a)serjux.com> - 0.7.2-4
+- Only requires rfpkg, rfpkg will requires the rest
+
* Sat Jun 25 2022 Robert-André Mauchin <zebob.m(a)gmail.com> - 0.7.2-3
- Rebuilt for Python 3.11
1 year, 9 months
[rfpkg] Organize BR and Requires
by Sérgio M. Basto
commit 875e9a240e8450eda9f1b510e043be79d4d0bbd8
Author: Sérgio M. Basto <sergio(a)serjux.com>
Date: Tue Jul 26 01:54:33 2022 +0100
Organize BR and Requires
rfpkg.spec | 21 +++++++++------------
1 file changed, 9 insertions(+), 12 deletions(-)
---
diff --git a/rfpkg.spec b/rfpkg.spec
index 7fb8b69..9c4efe7 100644
--- a/rfpkg.spec
+++ b/rfpkg.spec
@@ -47,33 +47,30 @@ BuildRequires: packagedb-cli > 2.2
# For testing
BuildRequires: python-nose
BuildRequires: python-mock
-
-Requires: python2-rpkg >= 1.45
-Requires: python-pycurl
-# We need this for what ?
-#Requires: python-fedora
-Requires: rpmfusion-cert
-Requires: packagedb-cli > 2.2
-
%else
BuildRequires: python3-devel
BuildRequires: python3-setuptools
BuildRequires: python3-rpkg
BuildRequires: python3-six
-# We need this for what ?
-#BuildRequires: python3-distro
-
# We br these things for man page generation due to imports
BuildRequires: python3-rpmfusion-cert
BuildRequires: rfpkgdb-cli
-
# For testing
BuildRequires: python3-mock
BuildRequires: python3-nose
#BuildRequires: python3-bugzilla
#BuildRequires: python3-freezegun
#BuildRequires: python3-bodhi-client
+%endif
+%if %{with python2}
+Requires: python2-rpkg >= 1.45
+Requires: python-pycurl
+# We need this for what ?
+#Requires: python-fedora
+Requires: rpmfusion-cert
+Requires: packagedb-cli > 2.2
+%else
Requires: python3-rpkg
Requires: python3-pycurl
# We need this for what ?
1 year, 9 months
[VirtualBox-kmod/el9] (4 commits) ...Merge branch 'el9'
by Sérgio M. Basto
Summary of changes:
db9f014... Update to 6.1.36 (*)
c20e375... Drop cs9.patch to fix the build (*)
f3fbc70... Update to 6.1.36 (*)
e0b02d6... Merge branch 'el9' (*)
(*) This commit already existed in another branch; no separate mail sent
1 year, 9 months