[discord/f40] Update to 0.0.59
by Sérgio M. Basto
Summary of changes:
91a1c9f... Update to 0.0.59 (*)
(*) This commit already existed in another branch; no separate mail sent
4 months, 2 weeks
[discord] Update to 0.0.59
by Sérgio M. Basto
commit 91a1c9faa477f7fa89d891e403e7d8478999411c
Author: Sérgio M. Basto <sergio(a)serjux.com>
Date: Tue Jul 9 12:30:33 2024 +0100
Update to 0.0.59
check_new_version.py | 1 +
discord.spec | 7 +++++--
sources | 2 +-
3 files changed, 7 insertions(+), 3 deletions(-)
---
diff --git a/check_new_version.py b/check_new_version.py
index bb7d0e4..3c3af04 100755
--- a/check_new_version.py
+++ b/check_new_version.py
@@ -49,3 +49,4 @@ print("rfpkg new-sources $(spectool -l --sources discord.spec | grep https | sed
print('rfpkg ci -c && git show && echo Press enter to push and build; read dummy; rfpkg push && rfpkg build --nowait')
print('git checkout f40 && git merge master && git push && rfpkg build --nowait; git checkout master')
print('git checkout f39 && git merge master && git push && rfpkg build --nowait; git checkout master')
+print('git checkout el9 && git merge master && git push && rfpkg build --nowait; git checkout master')
diff --git a/discord.spec b/discord.spec
index 9ba5b6a..1931727 100644
--- a/discord.spec
+++ b/discord.spec
@@ -6,8 +6,8 @@
%global __provides_exclude_from %{_libdir}/discord/.*\\.s
Name: discord
-Version: 0.0.58
-Release: 2%{?dist}
+Version: 0.0.59
+Release: 1%{?dist}
Summary: All-in-one voice and text chat
# License Information: https://bugzilla.rpmfusion.org/show_bug.cgi?id=4441#c14
@@ -86,6 +86,9 @@ appstream-util validate-relax --nonet %{buildroot}%{_metainfodir}/%{name}.metain
%changelog
+* Tue Jul 09 2024 Sérgio Basto <sergio(a)serjux.com> - 0.0.59-1
+- Update to 0.0.59
+
* Wed Jun 26 2024 Sérgio Basto <sergio(a)serjux.com> - 0.0.58-2
- Move to libayatana-appindicator
- Remove the requires of libcxx http://libcxx.llvm.org/ and requires libstdc++ http://gcc.gnu.org
diff --git a/sources b/sources
index faefdd8..dbf4329 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (discord-0.0.58.tar.gz) = 8efab6f4a476c05b620f3e95c082ae3f5423a2aaab310687f8b67711b0b34e7c82105e8c9ea5d4e0b92fc368443bc6a0e8970143d28ef7cb2d5f9e05f85b038d
+SHA512 (discord-0.0.59.tar.gz) = 43a911d03d62f9d73e8058771b59d148500fc48a0cf51be90899f4927979034d73326086084d342b4885ebe74560b4b99598d8514be9a51f00a9dd2010c74132
4 months, 2 weeks
[qt5-qtwebengine-freeworld] 5.15.17
by Sérgio M. Basto
commit 57fb4f8ad7cdc739c0b0c4501cf595bec1725f94
Author: Sérgio M. Basto <sergio(a)serjux.com>
Date: Mon Jul 8 15:49:55 2024 +0100
5.15.17
.gitignore | 1 +
...-mathops-clip-constants-used-with-shift-i.patch | 75 ----------------------
fix_build_pdf_extension_util.patch | 10 +++
qt5-qtwebengine-freeworld.spec | 43 +++++++------
qtwebengine-5.15.13_p20240322-ninja1.12.patch | 27 ++++++++
qtwebengine-everywhere-5.15.5-use-python2.patch | 22 -------
qtwebengine-icu-74.patch | 15 -----
sources | 2 +-
8 files changed, 63 insertions(+), 132 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 54f545f..e941492 100644
--- a/.gitignore
+++ b/.gitignore
@@ -15,3 +15,4 @@
/qtwebengine-everywhere-src-5.15.10.tar.xz
/qtwebengine-everywhere-src-5.15.12.tar.xz
/qtwebengine-everywhere-src-5.15.16.tar.xz
+/qtwebengine-everywhere-src-5.15.17.tar.xz
diff --git a/fix_build_pdf_extension_util.patch b/fix_build_pdf_extension_util.patch
new file mode 100644
index 0000000..0b4c754
--- /dev/null
+++ b/fix_build_pdf_extension_util.patch
@@ -0,0 +1,10 @@
+--- ./src/3rdparty/chromium/qtwebengine/browser/pdf/BUILD.gn.orig 2024-07-03 13:49:13.812285886 +0100
++++ ./src/3rdparty/chromium/qtwebengine/browser/pdf/BUILD.gn 2024-07-03 13:51:45.789966941 +0100
+@@ -6,6 +6,7 @@ source_set("pdf") {
+ ]
+
+ deps = [
++ "//chrome/app:generated_resources",
+ "//content/public/browser",
+ ]
+ }
diff --git a/qt5-qtwebengine-freeworld.spec b/qt5-qtwebengine-freeworld.spec
index f5a416f..23c61f2 100644
--- a/qt5-qtwebengine-freeworld.spec
+++ b/qt5-qtwebengine-freeworld.spec
@@ -62,8 +62,8 @@
Summary: Qt5 - QtWebEngine components (freeworld version)
Name: qt5-qtwebengine-freeworld
-Version: 5.15.16
-Release: 3%{?dist}
+Version: 5.15.17
+Release: 1%{?dist}
%global major_minor %(echo %{version} | cut -d. -f-2)
%global major %(echo %{version} | cut -d. -f1)
@@ -106,9 +106,9 @@ Patch34: qtwebengine-fix-build.patch
# https://src.fedoraproject.org/rpms/qt5-qtwebengine/c/628adfbb0613c892b916...
Patch35: qt5-qtwebengine-c99.patch
-# Fix assembly with binutils 2.41 https://fftrac-bg.ffmpeg.org/ticket/10405
-Patch50: 0001-avcodec-x86-mathops-clip-constants-used-with-shift-i.patch
-Patch51: qtwebengine-icu-74.patch
+# Fix build
+Patch61: qtwebengine-5.15.13_p20240322-ninja1.12.patch
+Patch62: fix_build_pdf_extension_util.patch
## Upstream patches:
@@ -138,6 +138,7 @@ BuildRequires: cmake
BuildRequires: bison
BuildRequires: flex
BuildRequires: gcc-c++
+BuildRequires: binutils-gold
# gn links statically (for now)
BuildRequires: libstdc++-static
BuildRequires: git-core
@@ -367,27 +368,28 @@ mv pulse src/3rdparty/chromium/
pushd src/3rdparty/chromium
popd
-%patch -P 2 -p1 -b .fix-extractcflag
+%patch -P2 -p1 -b .fix-extractcflag
%if !0%{?arm_neon}
-%patch -P 3 -p1 -b .no-neon
+%patch -P3 -p1 -b .no-neon
%endif
-%patch -P 4 -p1 -b .SIOCGSTAMP
-%patch -P 5 -p1 -b .QT_DEPRECATED_VERSION
-%patch -P 6 -p1 -b .angle_nullptr
-%patch -P 7 -p1 -b .hunspell_nullptr
+%patch -P4 -p1 -b .SIOCGSTAMP
+%patch -P5 -p1 -b .QT_DEPRECATED_VERSION
+%patch -P6 -p1 -b .angle_nullptr
+%patch -P7 -p1 -b .hunspell_nullptr
#if 0%{?pipewire}
-%patch -P 8 -p1 -b .libpipewire-0.3
+%patch -P8 -p1 -b .libpipewire-0.3
#endif
## upstream patches
-%patch -P 24 -p1 -b .aarch64-new-stat
-%patch -P 26 -p1 -b .use-python2
-%patch -P 32 -p1 -b .skia-missing-includes
-%patch -P 34 -p1 -b .gcc-13
-%patch -P 35 -p1 -b .c99
+%patch -P24 -p1 -b .aarch64-new-stat
+%patch -P26 -p1 -b .use-python2
+%patch -P32 -p1 -b .skia-missing-includes
+%patch -P34 -p1 -b .gcc-13
-%patch -P 50 -p1 -b .0001-avcodec-x86-mathops-clip-constants-used-with-shift-i
-%patch -P 51 -p1 -b .icu-74
+%patch -P35 -p1 -b .c99
+
+%patch -P61 -p1
+%patch -P62 -p1
# delete all "toolprefix = " lines from build/toolchain/linux/BUILD.gn, as we
# never cross-compile in native Fedora RPMs, fixes ARM and aarch64 FTBFS
@@ -479,6 +481,9 @@ echo "%{_libdir}/%{name}" \
%changelog
+* Mon Jul 08 2024 Sérgio Basto <sergio(a)serjux.com> - 5.15.17-1
+- 5.15.17
+
* Thu Jun 13 2024 Ankur Sinha <ankursinha AT fedoraproject DOT org> - 5.15.16-3
- Rebuild for qt-5.15.14
diff --git a/qtwebengine-5.15.13_p20240322-ninja1.12.patch b/qtwebengine-5.15.13_p20240322-ninja1.12.patch
new file mode 100644
index 0000000..0fdf13e
--- /dev/null
+++ b/qtwebengine-5.15.13_p20240322-ninja1.12.patch
@@ -0,0 +1,27 @@
+Quoting the description from qtwebengine-6.7.0-ninja1.12.patch:
+"""
+Patch status: pending being looked at upstream
+
+Issue[1][2][3] also exist in chromium itself[4], and unclear
+why this started happening only with ninja-1.12.0 at the moment.
+
+Just a quickfix, likely not fully correct and seems there may
+be further unresolved race issues.
+
+[1] https://bugs.gentoo.org/930107
+[2] https://bugreports.qt.io/browse/QTBUG-124375
+[3] https://github.com/ninja-build/ninja/issues/2417
+[4] https://bugs.gentoo.org/930112
+"""
+
+This has a hunk removed but is otherwise the same.
+--- ./src/3rdparty/chromium/content/browser/BUILD.gn.orig 2024-03-26 14:47:34.000000000 +0000
++++ ./src/3rdparty/chromium/content/browser/BUILD.gn 2024-06-24 04:57:25.108720935 +0100
+@@ -196,6 +196,7 @@ jumbo_static_library("browser") {
+ "//content/common",
+ "//content/common:buildflags",
+ "//content/common:mojo_bindings",
++ "//components/spellcheck:buildflags",
+ "//content/public/browser:proto",
+ "//content/public/common:common_sources",
+ "//content/public/common:content_descriptor_keys",
diff --git a/qtwebengine-everywhere-5.15.5-use-python2.patch b/qtwebengine-everywhere-5.15.5-use-python2.patch
index 9626d27..91a17ae 100644
--- a/qtwebengine-everywhere-5.15.5-use-python2.patch
+++ b/qtwebengine-everywhere-5.15.5-use-python2.patch
@@ -1,25 +1,3 @@
-diff --git a/src/3rdparty/chromium/third_party/catapult/common/py_vulcanize/py_vulcanize/generate.py b/src/3rdparty/chromium/third_party/catapult/common/py_vulcanize/py_vulcanize/generate.py
-index 8af373102..b551c0fe2 100644
---- a/src/3rdparty/chromium/third_party/catapult/common/py_vulcanize/py_vulcanize/generate.py
-+++ b/src/3rdparty/chromium/third_party/catapult/common/py_vulcanize/py_vulcanize/generate.py
-@@ -83,7 +83,7 @@ def _MinifyJS(input_js):
-
- with tempfile.NamedTemporaryFile() as _:
- args = [
-- 'python',
-+ 'python2',
- rjsmin_path
- ]
- p = subprocess.Popen(args,
-@@ -203,7 +203,7 @@ def _MinifyCSS(css_text):
- os.path.join(py_vulcanize_path, 'third_party', 'rcssmin', 'rcssmin.py'))
-
- with tempfile.NamedTemporaryFile() as _:
-- rcssmin_args = ['python', rcssmin_path]
-+ rcssmin_args = ['python2', rcssmin_path]
- p = subprocess.Popen(rcssmin_args,
- stdin=subprocess.PIPE,
- stdout=subprocess.PIPE,
diff --git a/src/webengine/module.pro b/src/webengine/module.pro
index 49a1086b2..afc89d49e 100644
--- a/src/webengine/module.pro
diff --git a/sources b/sources
index 9a85f40..e3747f1 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-SHA512 (qtwebengine-everywhere-src-5.15.16.tar.xz) = 1fabffe58db7cfa9c0f91d5963495159b90f4e6d67b0db9a01a8bbbba9303d12299317c3b485106a847f10a9d81a8ec8bc0986f284c1a2b1fa5bb0cfd9c7291e
+SHA512 (qtwebengine-everywhere-src-5.15.17.tar.xz) = db541ecaf7b27c3e81bbf6567d07f269e0d877caf1605a24abd8bccc67f51539a3aae20279d38f233ddd0de3e4d1855cd83d67104841191b672b8c595ebbff96
SHA512 (pulseaudio-12.2-headers.tar.gz) = a5a9bcbb16030b3bc83cc0cc8f5e7f90e0723d3e83258a5c77eacb32eaa267118a73fa7814fbcc99a24e4907916a2b371ebb6dedc4f45541c3acf6c834fd35be
4 months, 2 weeks
[vcmi/f40] Fix date in changelog
by runlevel5
commit 8a6dc67b3ff466345b12e771f232ad1d5a406ae5
Author: Trung Lê <8(a)tle.id.au>
Date: Tue Jul 9 00:08:54 2024 +1000
Fix date in changelog
vcmi.spec | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
---
diff --git a/vcmi.spec b/vcmi.spec
index 63c49c7..d89ceac 100644
--- a/vcmi.spec
+++ b/vcmi.spec
@@ -128,7 +128,7 @@ appstream-util validate-relax --nonet %{buildroot}%{_metainfodir}/eu.vcmi.VCMI.m
%changelog
-* Wed Jun 9 2024 Trung Lê <8(a)tle.id.au> - 1.5.3-0
+* Tue Jul 9 2024 Trung Lê <8(a)tle.id.au> - 1.5.3-0
- New upstream release
* Mon Jul 8 2024 Peter Lemenkov <lemenkov(a)gmail.com> - 1.5.2-1
4 months, 2 weeks
[vcmi] Bump to 1.5.3
by runlevel5
commit 2931dec80db7c0cff827e9e88d34dcec8c1f4727
Author: Trung Lê <8(a)tle.id.au>
Date: Mon Jul 8 12:48:41 2024 +1000
Bump to 1.5.3
sources | 2 +-
vcmi.spec | 7 +++++--
2 files changed, 6 insertions(+), 3 deletions(-)
---
diff --git a/sources b/sources
index 2eeaa10..623630f 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-SHA512 (vcmi-1.5.2.tar.gz) = f7ce8c8849e50576a86e69f4733bc54363862c1d5081b2b43fdb747d0d8dee9d331b4cb5b776fc1de65b88f78eaddf1d5ab2347d53215ee6a6fa5c9c68a4917b
+SHA512 (vcmi-1.5.3.tar.gz) = 23591133d0576fa43e646404bb81ca9db852451c95a5d6528d2cf0afe7ef915261bd7fc73ec97855bc2deed94c2228d109c94e64000859fa8b99e65fa6583f83
SHA512 (fuzzylite-7aee562.tar.gz) = f7ef98b28c52ff7e793ca21d532f49fc547bae882ab77ed72fd4b43e80805d738c829be11e13a4f71c74166a0c4e54936a79d3f89ae68edced3cf39dc37c5be5
diff --git a/vcmi.spec b/vcmi.spec
index 7e77887..d89ceac 100644
--- a/vcmi.spec
+++ b/vcmi.spec
@@ -6,8 +6,8 @@ URL: https://vcmi.eu/
%global fuzzylite_scommit %(c=%{fuzzylite_commit}; echo ${c:0:7})
%global fuzzylite_version 6.0
-Version: 1.5.2
-Release: 1%{?dist}
+Version: 1.5.3
+Release: 0%{?dist}
# vcmi is GPL-2.0-or-later, fuzzylight is GPL-3.0-only
License: GPL-2.0-or-later AND GPL-3.0-only
@@ -128,6 +128,9 @@ appstream-util validate-relax --nonet %{buildroot}%{_metainfodir}/eu.vcmi.VCMI.m
%changelog
+* Tue Jul 9 2024 Trung Lê <8(a)tle.id.au> - 1.5.3-0
+- New upstream release
+
* Mon Jul 8 2024 Peter Lemenkov <lemenkov(a)gmail.com> - 1.5.2-1
- Refactoring
4 months, 2 weeks
[vcmi/f40] Update changelog
by runlevel5
commit a11d273760fd8a26e91e0256baf582ef047ce070
Author: Trung Lê <8(a)tle.id.au>
Date: Tue Jul 9 00:05:50 2024 +1000
Update changelog
vcmi.spec | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
---
diff --git a/vcmi.spec b/vcmi.spec
index 60c78c1..63c49c7 100644
--- a/vcmi.spec
+++ b/vcmi.spec
@@ -128,7 +128,7 @@ appstream-util validate-relax --nonet %{buildroot}%{_metainfodir}/eu.vcmi.VCMI.m
%changelog
-* Wed Jun 5 2024 Trung Lê <8(a)tle.id.au> - 1.5.3-0
+* Wed Jun 9 2024 Trung Lê <8(a)tle.id.au> - 1.5.3-0
- New upstream release
* Mon Jul 8 2024 Peter Lemenkov <lemenkov(a)gmail.com> - 1.5.2-1
4 months, 2 weeks
[vcmi/f40] Bump to 1.5.3
by runlevel5
commit 574c895c3c9a5454019b15ffab8db714a57e1bcf
Author: Trung Lê <8(a)tle.id.au>
Date: Mon Jul 8 12:48:41 2024 +1000
Bump to 1.5.3
sources | 2 +-
vcmi.spec | 7 +++++--
2 files changed, 6 insertions(+), 3 deletions(-)
---
diff --git a/sources b/sources
index 2eeaa10..623630f 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-SHA512 (vcmi-1.5.2.tar.gz) = f7ce8c8849e50576a86e69f4733bc54363862c1d5081b2b43fdb747d0d8dee9d331b4cb5b776fc1de65b88f78eaddf1d5ab2347d53215ee6a6fa5c9c68a4917b
+SHA512 (vcmi-1.5.3.tar.gz) = 23591133d0576fa43e646404bb81ca9db852451c95a5d6528d2cf0afe7ef915261bd7fc73ec97855bc2deed94c2228d109c94e64000859fa8b99e65fa6583f83
SHA512 (fuzzylite-7aee562.tar.gz) = f7ef98b28c52ff7e793ca21d532f49fc547bae882ab77ed72fd4b43e80805d738c829be11e13a4f71c74166a0c4e54936a79d3f89ae68edced3cf39dc37c5be5
diff --git a/vcmi.spec b/vcmi.spec
index 7e77887..60c78c1 100644
--- a/vcmi.spec
+++ b/vcmi.spec
@@ -6,8 +6,8 @@ URL: https://vcmi.eu/
%global fuzzylite_scommit %(c=%{fuzzylite_commit}; echo ${c:0:7})
%global fuzzylite_version 6.0
-Version: 1.5.2
-Release: 1%{?dist}
+Version: 1.5.3
+Release: 0%{?dist}
# vcmi is GPL-2.0-or-later, fuzzylight is GPL-3.0-only
License: GPL-2.0-or-later AND GPL-3.0-only
@@ -128,6 +128,9 @@ appstream-util validate-relax --nonet %{buildroot}%{_metainfodir}/eu.vcmi.VCMI.m
%changelog
+* Wed Jun 5 2024 Trung Lê <8(a)tle.id.au> - 1.5.3-0
+- New upstream release
+
* Mon Jul 8 2024 Peter Lemenkov <lemenkov(a)gmail.com> - 1.5.2-1
- Refactoring
4 months, 2 weeks