[telegram-desktop/f30] Updated to version 1.8.13.
by Vitaly Zaitsev
commit d8db09b086ca42991853cfaf734bbbdf8474bc9d
Author: Vitaly Zaitsev <vitaly(a)easycoding.org>
Date: Thu Oct 3 14:55:42 2019 +0200
Updated to version 1.8.13.
.gitignore | 1 +
sources | 2 +-
telegram-desktop-build-fixes.patch | 2 +-
telegram-desktop-system-fonts.patch | 2 +-
telegram-desktop-unbundle-minizip.patch | 2 +-
telegram-desktop.spec | 5 ++++-
6 files changed, 9 insertions(+), 5 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index d04f5a9..eff8910 100644
--- a/.gitignore
+++ b/.gitignore
@@ -104,3 +104,4 @@
/tdesktop-1.8.8.tar.gz
/tdesktop-1.8.9.tar.gz
/tdesktop-1.8.12.tar.gz
+/tdesktop-1.8.13.tar.gz
diff --git a/sources b/sources
index 1b1a79f..c057ad3 100644
--- a/sources
+++ b/sources
@@ -1,3 +1,3 @@
744e77b69697f659a356727be22d4247 crl-52baf11.tar.gz
ad8b6f3f07ac4339f5a6fd2d28827825 rlottie-589db02.tar.gz
-f81f9088599e5292b3818a7a8a1556dd tdesktop-1.8.12.tar.gz
+0ca8038fbf65f5566b2b3777f31273cc tdesktop-1.8.13.tar.gz
diff --git a/telegram-desktop-build-fixes.patch b/telegram-desktop-build-fixes.patch
index 2b6079c..ebdbb31 100644
--- a/telegram-desktop-build-fixes.patch
+++ b/telegram-desktop-build-fixes.patch
@@ -1,4 +1,4 @@
-From 5d5a55b143522c6ea7f705454b888537f0c4c594 Mon Sep 17 00:00:00 2001
+From cdfc271bdc0f85bd971e6870d9f90b9c902d6c41 Mon Sep 17 00:00:00 2001
From: Vitaly Zaitsev <vitaly(a)easycoding.org>
Date: Fri, 31 Mar 2017 14:29:58 +0200
Subject: [PATCH 1/3] Fixed build under Fedora using rpmbuild and mock.
diff --git a/telegram-desktop-system-fonts.patch b/telegram-desktop-system-fonts.patch
index b16e596..fc188e3 100644
--- a/telegram-desktop-system-fonts.patch
+++ b/telegram-desktop-system-fonts.patch
@@ -1,4 +1,4 @@
-From 7bb2cc4a814035d774ccd46e2b2ac313dcfcef34 Mon Sep 17 00:00:00 2001
+From 6f921dcc68023c6bf55dcf48d8c2714b3bcf4762 Mon Sep 17 00:00:00 2001
From: Vitaly Zaitsev <vitaly(a)easycoding.org>
Date: Sun, 24 Jun 2018 22:59:34 +0200
Subject: [PATCH 2/3] Backported and rebased patch from Debian maintainer
diff --git a/telegram-desktop-unbundle-minizip.patch b/telegram-desktop-unbundle-minizip.patch
index d6c113c..d8d2d66 100644
--- a/telegram-desktop-unbundle-minizip.patch
+++ b/telegram-desktop-unbundle-minizip.patch
@@ -1,4 +1,4 @@
-From 0fac3cadbb6ebd61ada3d13c878948bd70df876d Mon Sep 17 00:00:00 2001
+From 1bee2926201c7f73d1f438e35a5943416a6863f7 Mon Sep 17 00:00:00 2001
From: Vitaly Zaitsev <vitaly(a)easycoding.org>
Date: Wed, 17 Oct 2018 17:57:59 +0200
Subject: [PATCH 3/3] Use packaged version of minizip on Fedora <= 29.
diff --git a/telegram-desktop.spec b/telegram-desktop.spec
index b944da1..c657d57 100644
--- a/telegram-desktop.spec
+++ b/telegram-desktop.spec
@@ -28,7 +28,7 @@
Summary: Telegram Desktop official messaging app
Name: telegram-desktop
-Version: 1.8.12
+Version: 1.8.13
Release: 1%{?dist}
# Application and 3rd-party modules licensing:
@@ -216,6 +216,9 @@ appstream-util validate-relax --nonet %{buildroot}%{_metainfodir}/%{name}.appdat
%{_metainfodir}/%{name}.appdata.xml
%changelog
+* Thu Oct 03 2019 Vitaly Zaitsev <vitaly(a)easycoding.org> - 1.8.13-1
+- Updated to 1.8.13.
+
* Wed Oct 02 2019 Vitaly Zaitsev <vitaly(a)easycoding.org> - 1.8.12-1
- Updated to 1.8.12.
4 years, 7 months
[mpv] add unpacked file
by Leigh Scott
commit 3dd65ae34aed9621551859a67c7b5ec8b5ea60ac
Author: Leigh Scott <leigh123linux(a)googlemail.com>
Date: Thu Oct 3 10:31:54 2019 +0100
add unpacked file
mpv.spec | 1 +
1 file changed, 1 insertion(+)
---
diff --git a/mpv.spec b/mpv.spec
index 73096fd..2a5d25f 100644
--- a/mpv.spec
+++ b/mpv.spec
@@ -158,6 +158,7 @@ install -Dpm 644 README.md etc/input.conf etc/mpv.conf -t %{buildroot}%{_docdir}
%{_bindir}/%{name}
%{_datadir}/applications/%{name}.desktop
%{_datadir}/icons/hicolor/*/apps/%{name}*.*
+%{_datadir}/zsh/site-functions/_mpv
%{_mandir}/man1/%{name}.*
%dir %{_sysconfdir}/%{name}/
%config(noreplace) %{_sysconfdir}/%{name}/encoding-profiles.conf
4 years, 7 months
[mpv] Update to 20191003 snapshot
by Leigh Scott
commit 1132614c71d103e8de8ab8147298ba5dfb1600c4
Author: Leigh Scott <leigh123linux(a)googlemail.com>
Date: Thu Oct 3 10:16:11 2019 +0100
Update to 20191003 snapshot
mpv.spec | 9 ++++++---
sources | 2 +-
2 files changed, 7 insertions(+), 4 deletions(-)
---
diff --git a/mpv.spec b/mpv.spec
index bb5ca03..73096fd 100644
--- a/mpv.spec
+++ b/mpv.spec
@@ -1,11 +1,11 @@
-%global commit b6def652a4b0db0f3514a44fec08f4be66187f3b
-%global gitdate 20190922
+%global commit defc8f359c5e4bb666e8ad1d4a097a8ac66cc1e2
+%global gitdate 20191003
%global shortcommit %(c=%{commit}; echo ${c:0:7})
%global gitrelease .%{gitdate}.git%{shortcommit}
Name: mpv
Version: 0.29.1
-Release: 15%{?gitrelease}%{?dist}
+Release: 16%{?gitrelease}%{?dist}
Summary: Movie player playing most video formats and DVDs
License: GPLv2+ and LGPLv2+
URL: http://mpv.io/
@@ -172,6 +172,9 @@ install -Dpm 644 README.md etc/input.conf etc/mpv.conf -t %{buildroot}%{_docdir}
%{_libdir}/pkgconfig/mpv.pc
%changelog
+* Thu Oct 03 2019 Leigh Scott <leigh123linux(a)googlemail.com> - 0.29.1-16.20191003.gitdefc8f3
+- Update to 20191003 snapshot
+
* Mon Sep 23 2019 Leigh Scott <leigh123linux(a)googlemail.com> - 0.29.1-15.20190922.gitb6def65
- Rebuild with newer zimg
diff --git a/sources b/sources
index 342c631..aae123e 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-2a4e960c66270d470b80bd519a352474 mpv-b6def65.tar.gz
+SHA512 (mpv-defc8f3.tar.gz) = 7c3626e1cccc7134f6241226f475f5426c5a49ac3514d8168250f2da2801621a696e614fd1f69848beb0787954c2261f4fb7683823deb7d88661f931f044ca52
4 years, 7 months
[xorg-x11-drv-nvidia] Add runtime PM rules
by Leigh Scott
commit 0f0e53c35781956427efffeb077b3311dadeeaea
Author: Leigh Scott <leigh123linux(a)googlemail.com>
Date: Thu Oct 3 10:02:08 2019 +0100
Add runtime PM rules
60-nvidia.rules | 8 ++++++++
1 file changed, 8 insertions(+)
---
diff --git a/60-nvidia.rules b/60-nvidia.rules
index 429e532..c1d19be 100644
--- a/60-nvidia.rules
+++ b/60-nvidia.rules
@@ -1,3 +1,11 @@
KERNEL=="nvidia", RUN+="/usr/bin/bash -c '/usr/bin/mknod -Z -m 666 /dev/nvidiactl c 195 255'"
KERNEL=="nvidia", RUN+="/usr/bin/bash -c 'for i in $(cat /proc/driver/nvidia/gpus/*/information | grep Minor | cut -d \ -f 4); do /usr/bin/mknod -Z -m 666 /dev/nvidia${i} c 195 ${i}; done'"
KERNEL=="nvidia_modeset", RUN+="/usr/bin/bash -c '/usr/bin/mknod -Z -m 666 /dev/nvidia-modeset c 195 254'"
+
+# Enable runtime PM for NVIDIA VGA/3D controller devices on driver bind
+ACTION=="bind", SUBSYSTEM=="pci", ATTR{vendor}=="0x10de", ATTR{class}=="0x030000", TEST=="power/control", ATTR{power/control}="auto"
+ACTION=="bind", SUBSYSTEM=="pci", ATTR{vendor}=="0x10de", ATTR{class}=="0x030200", TEST=="power/control", ATTR{power/control}="auto"
+
+# Disable runtime PM for NVIDIA VGA/3D controller devices on driver unbind
+ACTION=="unbind", SUBSYSTEM=="pci", ATTR{vendor}=="0x10de", ATTR{class}=="0x030000", TEST=="power/control", ATTR{power/control}="on"
+ACTION=="unbind", SUBSYSTEM=="pci", ATTR{vendor}=="0x10de", ATTR{class}=="0x030200", TEST=="power/control", ATTR{power/control}="on"
4 years, 7 months
[chromium-libs-media-freeworld/f30] (7 commits) ...Merge Fedora, chromium-77.0.3865.90-2
by Nicolas Chauvet
Summary of changes:
a2942aa... Don't try to revert a previously removed patch (*)
1ef42a2... Remove support for (p)NaCL (*)
d8b8fc1... Fix how the arguments are passed to GN's bootstrap.py (*)
5a01686... Remove the unused patches or patches that are not needed an (*)
6aa7bda... Fix the icon (*)
0f0792f... Fix the icon Remove quite a few of downstream patches Fix t (*)
be6c8dc... Merge Fedora, chromium-77.0.3865.90-2 (*)
(*) This commit already existed in another branch; no separate mail sent
4 years, 7 months
[chromium-libs-media-freeworld: 7/7] Merge Fedora, chromium-77.0.3865.90-2
by Nicolas Chauvet
commit be6c8dc53a7e40672f1c005e0d05644aeb3764c9
Merge: 898e5d5 0f0792f
Author: Nicolas Chauvet <kwizart(a)gmail.com>
Date: Thu Oct 3 09:00:08 2019 +0200
Merge Fedora, chromium-77.0.3865.90-2
chromium-45.0.2454.101-linux-path-max.patch | 44 ---
...7.0.2526.80-nacl-ignore-broken-fd-counter.patch | 27 --
chromium-47.0.2526.80-pnacl-fgnu-inline-asm.patch | 11 -
chromium-53.0.2785.92-boringssl-time-fix.patch | 11 -
chromium-54.0.2840.59-jpeg-include-dir.patch | 11 -
chromium-55.0.2883.75-addrfix.patch | 11 -
chromium-59.0.3071.86-i686-ld-memory-tricks.patch | 12 -
...3112.113-libavutil-timer-include-path-fix.patch | 21 --
chromium-62.0.3202.62-kmaxskip-constexpr.patch | 12 -
chromium-63.0.3289.84-nullfix.patch | 43 ---
chromium-64.0.3282.119-ffmpeg-stdatomic.patch | 17 -
chromium-65.0.3325.146-gcc-round-fix.patch | 12 -
chromium-65.0.3325.146-memcpy-fix.patch | 12 -
...fully-declare-ConfigurationPolicyProvider.patch | 18 -
chromium-66.0.3359.117-system-clang.patch | 12 -
chromium-67.0.3396.62-gcc5.patch | 12 -
...8.0.3440.106-fix-default-on-redeclaration.patch | 30 --
chromium-69.0.3497.81-build-sanely-please.patch | 33 --
...m-70.0.3538.77-aarch64-arch-want-new-stat.patch | 12 -
chromium-71.0.3578.98-skia-aarch64-buildfix.patch | 21 --
chromium-72.0.3626.121-notest.patch | 11 -
...75-disable-fno-delete-null-pointer-checks.patch | 48 ---
chromium-75.0.3770.100-git00281713.patch | 34 --
chromium-75.0.3770.80-SIOCGSTAMP.patch | 15 -
...ium-75.0.3770.80-aeed4d-gcc-dcheck_ne-fix.patch | 14 -
chromium-75.0.3770.80-gcc-no-assume.patch | 21 --
chromium-75.0.3770.80-revert-daff6b.patch | 13 -
...0.3809.100-libusb_interrupt_event_handler.patch | 15 -
chromium-77.0.3865.75-boolfix.patch | 24 --
chromium-77.0.3865.75-gcc-no-opt-safe-math.patch | 15 -
chromium-77.0.3865.75-gcc5-r3.patch | 36 --
chromium-77.0.3865.90-linked-hash-set.patch | 130 +++++++
chromium-libs-media-freeworld.spec | 402 ++++-----------------
33 files changed, 206 insertions(+), 954 deletions(-)
---
diff --cc chromium-libs-media-freeworld.spec
index 85f12a6,1542845..49c6bc0
--- a/chromium-libs-media-freeworld.spec
+++ b/chromium-libs-media-freeworld.spec
@@@ -177,9 -156,13 +156,9 @@@ BuildRequires: libicu-devel >= 5.
%global majorversion 77
-%if %{freeworld}
-Name: chromium%{chromium_channel}%{?freeworld:-freeworld}
-%else
-Name: chromium%{chromium_channel}
-%endif
+Name: chromium%{chromium_channel}%{?freeworld:%{?shared:-libs-media}-freeworld}
Version: %{majorversion}.0.3865.90
- Release: 1%{?dist}
+ Release: 2%{?dist}
Summary: A WebKit (Blink) powered web browser
Url: http://www.chromium.org/Home
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)
4 years, 7 months
[chromium-libs-media-freeworld: 6/7] Fix the icon Remove quite a few of downstream patches Fix the crashes by backporting an upstream bug
by Nicolas Chauvet
commit 0f0792f310ed8f54ca8bf6b73f6c020253dc5f54
Author: Tomas Popela <tpopela(a)redhat.com>
Date: Mon Sep 23 17:25:20 2019 +0200
Fix the icon
Remove quite a few of downstream patches
Fix the crashes by backporting an upstream bug
Resolves: rhbz#1754179
chromium-77.0.3865.90-linked-hash-set.patch | 130 ++++++++++++++++++++++++++++
chromium.spec | 11 ++-
2 files changed, 140 insertions(+), 1 deletion(-)
---
diff --git a/chromium-77.0.3865.90-linked-hash-set.patch b/chromium-77.0.3865.90-linked-hash-set.patch
new file mode 100644
index 0000000..f921f1a
--- /dev/null
+++ b/chromium-77.0.3865.90-linked-hash-set.patch
@@ -0,0 +1,130 @@
+From 74138b9febd37eac0fc26b8efb110014a83a52c6 Mon Sep 17 00:00:00 2001
+From: Jeremy Roman <jbroman(a)chromium.org>
+Date: Wed, 07 Aug 2019 13:26:48 +0000
+Subject: [PATCH] WTF: Make LinkedHashSet understand values for which memset initialization would be bad.
+
+Includes a unit test which fails before, and uses this to fix FontCacheKeyTraits.
+
+Bug: 980025
+Change-Id: If41f97444c7fd37b9b95d6dadaf3da5689079e9e
+Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1739948
+Reviewed-by: Kentaro Hara <haraken(a)chromium.org>
+Reviewed-by: Yutaka Hirano <yhirano(a)chromium.org>
+Commit-Queue: Jeremy Roman <jbroman(a)chromium.org>
+Cr-Commit-Position: refs/heads/master@{#684731}
+---
+
+diff --git a/third_party/blink/renderer/platform/fonts/font_cache_key.h b/third_party/blink/renderer/platform/fonts/font_cache_key.h
+index 0efc8fb..90063cb 100644
+--- a/third_party/blink/renderer/platform/fonts/font_cache_key.h
++++ b/third_party/blink/renderer/platform/fonts/font_cache_key.h
+@@ -133,6 +133,10 @@
+
+ struct FontCacheKeyTraits : WTF::SimpleClassHashTraits<FontCacheKey> {
+ STATIC_ONLY(FontCacheKeyTraits);
++
++ // std::string's empty state need not be zero in all implementations,
++ // and it is held within FontFaceCreationParams.
++ static const bool kEmptyValueIsZero = false;
+ };
+
+ } // namespace blink
+diff --git a/third_party/blink/renderer/platform/wtf/linked_hash_set.h b/third_party/blink/renderer/platform/wtf/linked_hash_set.h
+index b35b6e9..77e524c 100644
+--- a/third_party/blink/renderer/platform/wtf/linked_hash_set.h
++++ b/third_party/blink/renderer/platform/wtf/linked_hash_set.h
+@@ -146,6 +146,11 @@
+ LinkedHashSetNodeBase* next)
+ : LinkedHashSetNodeBase(prev, next), value_(value) {}
+
++ LinkedHashSetNode(ValueArg&& value,
++ LinkedHashSetNodeBase* prev,
++ LinkedHashSetNodeBase* next)
++ : LinkedHashSetNodeBase(prev, next), value_(std::move(value)) {}
++
+ LinkedHashSetNode(LinkedHashSetNode&& other)
+ : LinkedHashSetNodeBase(std::move(other)),
+ value_(std::move(other.value_)) {}
+@@ -445,10 +450,13 @@
+
+ // The slot is empty when the next_ field is zero so it's safe to zero
+ // the backing.
+- static const bool kEmptyValueIsZero = true;
++ static const bool kEmptyValueIsZero = ValueTraits::kEmptyValueIsZero;
+
+ static const bool kHasIsEmptyValueFunction = true;
+ static bool IsEmptyValue(const Node& node) { return !node.next_; }
++ static Node EmptyValue() {
++ return Node(ValueTraits::EmptyValue(), nullptr, nullptr);
++ }
+
+ static const int kDeletedValue = -1;
+
+diff --git a/third_party/blink/renderer/platform/wtf/list_hash_set_test.cc b/third_party/blink/renderer/platform/wtf/list_hash_set_test.cc
+index 4c3f899..cd1be00 100644
+--- a/third_party/blink/renderer/platform/wtf/list_hash_set_test.cc
++++ b/third_party/blink/renderer/platform/wtf/list_hash_set_test.cc
+@@ -487,6 +487,7 @@
+ };
+
+ struct Complicated {
++ Complicated() : Complicated(0) {}
+ Complicated(int value) : simple_(value) { objects_constructed_++; }
+
+ Complicated(const Complicated& other) : simple_(other.simple_) {
+@@ -495,9 +496,6 @@
+
+ Simple simple_;
+ static int objects_constructed_;
+-
+- private:
+- Complicated() = delete;
+ };
+
+ int Complicated::objects_constructed_ = 0;
+@@ -731,4 +729,45 @@
+
+ } // anonymous namespace
+
++// A unit type which objects to its state being initialized wrong.
++struct InvalidZeroValue {
++ InvalidZeroValue() = default;
++ InvalidZeroValue(WTF::HashTableDeletedValueType) : deleted_(true) {}
++ ~InvalidZeroValue() { CHECK(ok_); }
++ bool IsHashTableDeletedValue() const { return deleted_; }
++
++ bool ok_ = true;
++ bool deleted_ = false;
++};
++
++template <>
++struct HashTraits<InvalidZeroValue> : SimpleClassHashTraits<InvalidZeroValue> {
++ static const bool kEmptyValueIsZero = false;
++};
++
++template <>
++struct DefaultHash<InvalidZeroValue> {
++ struct Hash {
++ static unsigned GetHash(const InvalidZeroValue&) { return 0; }
++ static bool Equal(const InvalidZeroValue&, const InvalidZeroValue&) {
++ return true;
++ }
++ };
++};
++
++template <typename Set>
++class ListOrLinkedHashSetInvalidZeroTest : public testing::Test {};
++
++using InvalidZeroValueSetTypes =
++ testing::Types<ListHashSet<InvalidZeroValue>,
++ ListHashSet<InvalidZeroValue, 1>,
++ LinkedHashSet<InvalidZeroValue>>;
++TYPED_TEST_SUITE(ListOrLinkedHashSetInvalidZeroTest, InvalidZeroValueSetTypes);
++
++TYPED_TEST(ListOrLinkedHashSetInvalidZeroTest, InvalidZeroValue) {
++ using Set = TypeParam;
++ Set set;
++ set.insert(InvalidZeroValue());
++}
++
+ } // namespace WTF
diff --git a/chromium.spec b/chromium.spec
index a37d653..1542845 100644
--- a/chromium.spec
+++ b/chromium.spec
@@ -162,7 +162,7 @@ Name: chromium%{chromium_channel}%{?freeworld:-freeworld}
Name: chromium%{chromium_channel}
%endif
Version: %{majorversion}.0.3865.90
-Release: 1%{?dist}
+Release: 2%{?dist}
Summary: A WebKit (Blink) powered web browser
Url: http://www.chromium.org/Home
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)
@@ -222,6 +222,8 @@ Patch58: chromium-77.0.3865.75-harfbuzz-subset.patch
Patch59: chromium-77.0.3865.75-gcc-abstract-class.patch
# https://chromium.googlesource.com/chromium/src/+/5baf7df7f4c5971dab552897...
Patch60: chromium-77.0.3865.75-missing-limits.patch
+# https://chromium.googlesource.com/chromium/src/+/74138b9febd37eac0fc26b8e...
+Patch61: chromium-77.0.3865.90-linked-hash-set.patch
# Use lstdc++ on EPEL7 only
Patch101: chromium-75.0.3770.100-epel7-stdc++.patch
@@ -739,6 +741,7 @@ udev.
%patch58 -p1 -b .harfbuzz-subset
%patch59 -p1 -b .gcc-abstract-class
%patch60 -p1 -b .missing-limits
+%patch61 -p1 -b .linked-hash-set
# Fedora branded user agent
%if 0%{?fedora}
@@ -1643,6 +1646,12 @@ getent group chrome-remote-desktop >/dev/null || groupadd -r chrome-remote-deskt
%changelog
+* Mon Sep 23 2019 Tomas Popela <tpopela(a)redhat.com> - 77.0.3865.90-2
+- Fix the icon
+- Remove quite a few of downstream patches
+- Fix the crashes by backporting an upstream bug
+- Resolves: rhbz#1754179
+
* Thu Sep 19 2019 Tomas Popela <tpopela(a)redhat.com> - 77.0.3865.90-1
- Update to 77.0.3865.90
4 years, 7 months
[chromium-libs-media-freeworld: 5/7] Fix the icon
by Nicolas Chauvet
commit 6aa7bda96ed4de25260acb5a9e907d5ff1fa1368
Author: Tomas Popela <tpopela(a)redhat.com>
Date: Mon Sep 23 17:21:06 2019 +0200
Fix the icon
So the monochromatic icon is being shown even in the GNOME's overview
and it's ugly (as it's upscaled from 22x22). Remove it.
chromium.spec | 2 --
1 file changed, 2 deletions(-)
---
diff --git a/chromium.spec b/chromium.spec
index e426495..a37d653 100644
--- a/chromium.spec
+++ b/chromium.spec
@@ -1399,8 +1399,6 @@ mkdir -p %{buildroot}%{_datadir}/icons/hicolor/48x48/apps
cp -a chrome/app/theme/chromium/product_logo_48.png %{buildroot}%{_datadir}/icons/hicolor/48x48/apps/%{chromium_browser_channel}.png
mkdir -p %{buildroot}%{_datadir}/icons/hicolor/24x24/apps
cp -a chrome/app/theme/chromium/product_logo_24.png %{buildroot}%{_datadir}/icons/hicolor/24x24/apps/%{chromium_browser_channel}.png
-mkdir -p %{buildroot}%{_datadir}/icons/hicolor/symbolic/apps
-cp -a chrome/app/theme/chromium/product_logo_22_mono.png %{buildroot}%{_datadir}/icons/hicolor/symbolic/apps/%{chromium_browser_channel}.png
# Install the master_preferences file
mkdir -p %{buildroot}%{_sysconfdir}/%{name}
4 years, 7 months
[chromium-libs-media-freeworld: 4/7] Remove the unused patches or patches that are not needed anymore
by Nicolas Chauvet
commit 5a0168685de2184cd3ce9b36a80febe22a738e54
Author: Tomas Popela <tpopela(a)redhat.com>
Date: Fri Sep 20 09:57:18 2019 +0200
Remove the unused patches or patches that are not needed anymore
Also replace some patches with changes in the SPEC file.
chromium-45.0.2454.101-linux-path-max.patch | 44 -----
chromium-53.0.2785.92-boringssl-time-fix.patch | 11 --
chromium-54.0.2840.59-jpeg-include-dir.patch | 11 --
chromium-55.0.2883.75-addrfix.patch | 11 --
chromium-59.0.3071.86-i686-ld-memory-tricks.patch | 12 --
...3112.113-libavutil-timer-include-path-fix.patch | 21 ---
chromium-62.0.3202.62-kmaxskip-constexpr.patch | 12 --
chromium-63.0.3289.84-nullfix.patch | 43 -----
chromium-64.0.3282.119-ffmpeg-stdatomic.patch | 17 --
chromium-65.0.3325.146-gcc-round-fix.patch | 12 --
chromium-65.0.3325.146-memcpy-fix.patch | 12 --
...fully-declare-ConfigurationPolicyProvider.patch | 18 --
chromium-66.0.3359.117-system-clang.patch | 12 --
chromium-67.0.3396.62-gcc5.patch | 12 --
...8.0.3440.106-fix-default-on-redeclaration.patch | 30 ----
chromium-69.0.3497.81-build-sanely-please.patch | 33 ----
...m-70.0.3538.77-aarch64-arch-want-new-stat.patch | 12 --
chromium-71.0.3578.98-skia-aarch64-buildfix.patch | 21 ---
chromium-72.0.3626.121-notest.patch | 11 --
...75-disable-fno-delete-null-pointer-checks.patch | 48 -----
chromium-75.0.3770.100-git00281713.patch | 34 ----
chromium-75.0.3770.80-SIOCGSTAMP.patch | 15 --
...ium-75.0.3770.80-aeed4d-gcc-dcheck_ne-fix.patch | 14 --
chromium-75.0.3770.80-gcc-no-assume.patch | 21 ---
chromium-75.0.3770.80-revert-daff6b.patch | 13 --
...0.3809.100-libusb_interrupt_event_handler.patch | 15 --
chromium-77.0.3865.75-boolfix.patch | 24 ---
chromium-77.0.3865.75-gcc-no-opt-safe-math.patch | 15 --
chromium-77.0.3865.75-gcc5-r3.patch | 36 ----
chromium.spec | 198 +++++++--------------
30 files changed, 65 insertions(+), 723 deletions(-)
---
diff --git a/chromium.spec b/chromium.spec
index 4fa3d44..e426495 100644
--- a/chromium.spec
+++ b/chromium.spec
@@ -168,114 +168,61 @@ Url: http://www.chromium.org/Home
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)
### Chromium Fedora Patches ###
-Patch0: chromium-67.0.3396.62-gcc5.patch
-Patch1: chromium-45.0.2454.101-linux-path-max.patch
-Patch2: chromium-55.0.2883.75-addrfix.patch
-Patch3: chromium-72.0.3626.121-notest.patch
-# Use libusb_interrupt_event_handler from current libusbx (1.0.21-0.1.git448584a)
-Patch4: chromium-76.0.3809.100-libusb_interrupt_event_handler.patch
-# Use PIE in the Linux sandbox (from openSUSE via Russian Fedora)
-Patch6: chromium-70.0.3538.67-sandbox-pie.patch
+Patch0: chromium-70.0.3538.67-sandbox-pie.patch
# Use /etc/chromium for master_prefs
-Patch7: chromium-68.0.3440.106-master-prefs-path.patch
+Patch1: chromium-68.0.3440.106-master-prefs-path.patch
# Use gn system files
-Patch8: chromium-67.0.3396.62-gn-system.patch
-# Fix issue where timespec is not defined when sys/stat.h is included.
-Patch9: chromium-53.0.2785.92-boringssl-time-fix.patch
-# I wouldn't have to do this if there was a standard way to append extra compiler flags
-Patch10: chromium-63.0.3289.84-nullfix.patch
-# Add explicit includedir for jpeglib.h
-Patch11: chromium-54.0.2840.59-jpeg-include-dir.patch
-# On i686, pass --no-keep-memory --reduce-memory-overheads to ld.
-Patch12: chromium-59.0.3071.86-i686-ld-memory-tricks.patch
+Patch2: chromium-67.0.3396.62-gn-system.patch
# Revert https://chromium.googlesource.com/chromium/src/+/b794998819088f76b4cf44c8...
# https://bugs.chromium.org/p/chromium/issues/detail?id=712737
# https://bugzilla.redhat.com/show_bug.cgi?id=1446851
-Patch13: chromium-58.0.3029.96-revert-b794998819088f76b4cf44c8db6940240c563cf4.patch
-# Correctly compile the stdatomic.h in ffmpeg with gcc 4.8
-Patch14: chromium-64.0.3282.119-ffmpeg-stdatomic.patch
-# Nacl can't die soon enough
-Patch15: chromium-66.0.3359.117-system-clang.patch
+Patch3: chromium-58.0.3029.96-revert-b794998819088f76b4cf44c8db6940240c563cf4.patch
# Do not prefix libpng functions
-Patch16: chromium-60.0.3112.78-no-libpng-prefix.patch
+Patch4: chromium-60.0.3112.78-no-libpng-prefix.patch
# Do not mangle libjpeg
-Patch17: chromium-60.0.3112.78-jpeg-nomangle.patch
+Patch5: chromium-60.0.3112.78-jpeg-nomangle.patch
# Do not mangle zlib
-Patch18: chromium-77.0.3865.75-no-zlib-mangle.patch
-# Fix libavutil include pathing to find arch specific timer.h
-# For some reason, this only fails on aarch64. No idea why.
-Patch19: chromium-60.0.3112.113-libavutil-timer-include-path-fix.patch
-# from gentoo
-Patch20: chromium-77.0.3865.75-gcc-no-opt-safe-math.patch
-# From gentoo
-Patch21: chromium-77.0.3865.75-gcc5-r3.patch
-# To use round with gcc, you need to #include <cmath>
-Patch22: chromium-65.0.3325.146-gcc-round-fix.patch
-# Include proper headers to invoke memcpy()
-Patch23: chromium-65.0.3325.146-memcpy-fix.patch
-# ../../mojo/public/cpp/bindings/associated_interface_ptr_info.h:48:43: error: cannot convert 'const mojo::ScopedInterfaceEndpointHandle' to 'bool' in return
-Patch24: chromium-77.0.3865.75-boolfix.patch
-# From Debian
-Patch25: chromium-71.0.3578.98-skia-aarch64-buildfix.patch
+Patch6: chromium-77.0.3865.75-no-zlib-mangle.patch
# Do not use unrar code, it is non-free
-Patch27: chromium-73.0.3683.75-norar.patch
-# Upstream GCC fixes
-Patch28: chromium-66.0.3359.117-GCC-fully-declare-ConfigurationPolicyProvider.patch
-# Add "Fedora" to the user agent string
-Patch29: chromium-77.0.3865.75-fedora-user-agent.patch
-# Try to fix version.py for Rawhide
-Patch30: chromium-71.0.3578.98-py2-bootstrap.patch
-# Fix default on redeclaration error
-# https://chromium.googlesource.com/chromium/src/+/122692ccee62223f266a988c...
-Patch31: chromium-68.0.3440.106-fix-default-on-redeclaration.patch
+Patch7: chromium-73.0.3683.75-norar.patch
# Use Gentoo's Widevine hack
# https://gitweb.gentoo.org/repo/gentoo.git/tree/www-client/chromium/files/...
-Patch32: chromium-71.0.3578.98-widevine-r3.patch
-# Do not require sysroot
-# Forget about trying to make libc++
-# BUILD SANELY PLEASE
-Patch33: chromium-69.0.3497.81-build-sanely-please.patch
+Patch8: chromium-71.0.3578.98-widevine-r3.patch
# Disable fontconfig cache magic that breaks remoting
-Patch34: chromium-70.0.3538.67-disable-fontconfig-cache-magic.patch
-# Fix aarch64 build against latest linux kernel headers
-Patch35: chromium-70.0.3538.77-aarch64-arch-want-new-stat.patch
+Patch9: chromium-70.0.3538.67-disable-fontconfig-cache-magic.patch
# drop rsp clobber, which breaks gcc9 (thanks to Jeff Law)
-Patch36: chromium-71.0.3578.98-gcc9-drop-rsp-clobber.patch
+Patch10: chromium-71.0.3578.98-gcc9-drop-rsp-clobber.patch
# Try to load widevine from other places
-Patch37: chromium-widevine-other-locations.patch
-# Disable -fno-delete-null-pointer-checks
-Patch38: chromium-73.0.3683.75-disable-fno-delete-null-pointer-checks.patch
-# Linux 5.2 defines SIOCGSTAMP in a slightly different way, so we need to teach chromium where to find it
-Patch41: chromium-75.0.3770.80-SIOCGSTAMP.patch
-# Revert https://chromium.googlesource.com/chromium/src/+/daff6b66faae53a0cefb8898...
-# It might make clang happy but it breaks gcc. F*** clang.
-Patch43: chromium-75.0.3770.80-revert-daff6b.patch
+Patch11: chromium-widevine-other-locations.patch
+# Try to fix version.py for Rawhide
+Patch12: chromium-71.0.3578.98-py2-bootstrap.patch
+# Add "Fedora" to the user agent string
+Patch13: chromium-77.0.3865.75-fedora-user-agent.patch
+
# rename function to avoid conflict with rawhide glibc "gettid()"
-Patch45: chromium-75.0.3770.80-grpc-gettid-fix.patch
+Patch50: chromium-75.0.3770.80-grpc-gettid-fix.patch
# In GCC one can't use alignas() for exported classes
# https://chromium.googlesource.com/chromium/src.git/+/8148fd96ae04a1150a9c...
-Patch61: chromium-76.0.3809.100-gcc-no-alignas-and-export.patch
+Patch51: chromium-76.0.3809.100-gcc-no-alignas-and-export.patch
# Needs to be submitted..
-Patch62: chromium-76.0.3809.100-gcc-remoting-constexpr.patch
+Patch52: chromium-76.0.3809.100-gcc-remoting-constexpr.patch
# Needs to be submitted.. (ugly hack, needs to be added properly to GN files)
-Patch63: chromium-76.0.3809.100-vtable-symbol-undefined.patch
+Patch53: chromium-76.0.3809.100-vtable-symbol-undefined.patch
# https://chromium.googlesource.com/chromium/src.git/+/3c9720245e440c4b7222...
-Patch64: chromium-77.0.3865.75-certificate-transparency.patch
+Patch54: chromium-77.0.3865.75-certificate-transparency.patch
# https://gitweb.gentoo.org/repo/gentoo.git/tree/www-client/chromium/files/...
-Patch65: chromium-77.0.3865.75-unbundle-zlib.patch
+Patch55: chromium-77.0.3865.75-unbundle-zlib.patch
# Needs to be submitted..
-Patch66: chromium-77.0.3865.75-gcc-include-memory.patch
-# Needs to be submitted..
-Patch67: chromium-77.0.3865.75-base-gcc-no-alignas.patch
+Patch56: chromium-77.0.3865.75-gcc-include-memory.patch
+# https://chromium.googlesource.com/chromium/src/+/6b633c4b14850df376d5cec5...
+Patch57: chromium-77.0.3865.75-base-gcc-no-alignas.patch
# https://chromium.googlesource.com/chromium/src/+/27e25336b8316ff3ec4e4640...
-Patch68: chromium-77.0.3865.75-harfbuzz-subset.patch
+Patch58: chromium-77.0.3865.75-harfbuzz-subset.patch
# https://chromium.googlesource.com/chromium/src.git/+/f08cb0022527081c078e...
-Patch69: chromium-77.0.3865.75-gcc-abstract-class.patch
+Patch59: chromium-77.0.3865.75-gcc-abstract-class.patch
# https://chromium.googlesource.com/chromium/src/+/5baf7df7f4c5971dab552897...
-Patch70: chromium-77.0.3865.75-missing-limits.patch
+Patch60: chromium-77.0.3865.75-missing-limits.patch
-# Apply these changes to work around EPEL7 compiler issues
-Patch100: chromium-62.0.3202.62-kmaxskip-constexpr.patch
# Use lstdc++ on EPEL7 only
Patch101: chromium-75.0.3770.100-epel7-stdc++.patch
# el7 only patch
@@ -766,60 +713,40 @@ udev.
%setup -q -n chromium-%{version}
### Chromium Fedora Patches ###
-%patch0 -p1 -b .gcc5
-%patch1 -p1 -b .pathmax
-%patch2 -p1 -b .addrfix
-%patch3 -p1 -b .notest
-%patch4 -p1 -b .modern-libusbx
-%patch6 -p1 -b .sandboxpie
-%patch7 -p1 -b .etc
-%patch8 -p1 -b .gnsystem
-%patch9 -p1 -b .timefix
-%patch10 -p1 -b .nullfix
-%patch11 -p1 -b .jpegfix
-%patch12 -p1 -b .ldmemory
-%patch13 -p1 -b .revert
-%patch14 -p1 -b .ffmpeg-stdatomic
-%patch15 -p1 -b .system-clang
-%patch16 -p1 -b .noprefix
-%patch17 -p1 -b .nomangle
-%patch18 -p1 -b .nozmangle
-%patch19 -p1 -b .pathfix
-%patch20 -p1 -b .nogccoptmath
-%patch21 -p1 -b .gcc5-r3
-%patch22 -p1 -b .gcc-round-fix
-%patch23 -p1 -b .memcpyfix
-%patch24 -p1 -b .boolfix
-#%patch25 -p1 -b .aarch64fix
-%patch27 -p1 -b .nounrar
-%patch28 -p1 -b .gcc-cpolicyprovider
-%patch29 -p1 -b .fedora-user-agent
-%patch30 -p1 -b .py2
-%patch31 -p1 -b .fix-default-redeclaration
-%patch32 -p1 -b .wvhack
-%patch33 -p1 -b .sanebuild
-%patch34 -p1 -b .nofc
-%patch35 -p1 -b .aarch64-new-stat
-%patch36 -p1 -b .gcc9
-%patch37 -p1 -b .widevine-other-locations
-%patch38 -p1 -b .disable-ndnpc
-%patch41 -p1 -b .SIOCGSTAMP
-%patch43 -p1 -b .revert-daff6b
-%patch45 -p1 -b .gettid-fix
-%patch61 -p1 -b .gcc-no-alignas-and-export
-%patch62 -p1 -b .gcc-remoting-constexpr
-%patch63 -p1 -b .vtable-symbol-undefined
-%patch64 -p1 -b .certificate-transparency
-%patch65 -p1 -b .unbundle-zlib
-%patch66 -p1 -b .gcc-include-memory
-%patch67 -p1 -b .base-gcc-no-alignas
-%patch68 -p1 -b .harfbuzz-subset
-%patch69 -p1 -b .gcc-abstract-class
-%patch70 -p1 -b .missing-limits
+%patch0 -p1 -b .sandboxpie
+%patch1 -p1 -b .etc
+%patch2 -p1 -b .gnsystem
+%patch3 -p1 -b .revert
+%patch4 -p1 -b .nolibpngprefix
+%patch5 -p1 -b .nolibjpegmangle
+%patch6 -p1 -b .nozlibmangle
+%patch7 -p1 -b .nounrar
+%patch8 -p1 -b .widevine-hack
+%patch9 -p1 -b .nofontconfigcache
+%patch10 -p1 -b .gcc9
+%patch11 -p1 -b .widevine-other-locations
+%patch12 -p1 -b .py2
+
+# Short term fixes (usually gcc and backports)
+%patch50 -p1 -b .gettid-fix
+%patch51 -p1 -b .gcc-no-alignas-and-export
+%patch52 -p1 -b .gcc-remoting-constexpr
+%patch53 -p1 -b .vtable-symbol-undefined
+%patch54 -p1 -b .certificate-transparency
+%patch55 -p1 -b .unbundle-zlib
+%patch56 -p1 -b .gcc-include-memory
+%patch57 -p1 -b .base-gcc-no-alignas
+%patch58 -p1 -b .harfbuzz-subset
+%patch59 -p1 -b .gcc-abstract-class
+%patch60 -p1 -b .missing-limits
+
+# Fedora branded user agent
+%if 0%{?fedora}
+%patch13 -p1 -b .fedora-user-agent
+%endif
# EPEL specific patches
%if 0%{?rhel} == 7
-%patch100 -p1 -b .kmaxskip
%patch101 -p1 -b .epel7
%patch102 -p1 -b .el7-noexcept
%endif
@@ -1298,6 +1225,11 @@ sed -i.orig -e 's/getenv("CHROME_VERSION_EXTRA")/"Fedora Project"/' $FILE
. /opt/rh/devtoolset-%{dts_version}/enable
%endif
+# Decrease the debuginfo verbosity, so it compiles in koji
+%ifarch %{ix86}
+%global optflags %(echo %{optflags} | sed 's/-g /-g1 /')
+%endif
+
echo
# Now do the full browser
%if 0%{freeworld}
4 years, 7 months
[chromium-libs-media-freeworld: 3/7] Fix how the arguments are passed to GN's bootstrap.py
by Nicolas Chauvet
commit d8b8fc10a9d2bc16fbdc802ba975b68bc5f4d97b
Author: Tomas Popela <tpopela(a)redhat.com>
Date: Fri Sep 20 09:45:43 2019 +0200
Fix how the arguments are passed to GN's bootstrap.py
I don't know why, but previously it was failing only on aarch64.
chromium.spec | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
---
diff --git a/chromium.spec b/chromium.spec
index 25eb383..4fa3d44 100644
--- a/chromium.spec
+++ b/chromium.spec
@@ -1267,7 +1267,7 @@ if python2 -c 'import google ; print google.__path__' 2> /dev/null ; then \
exit 1 ; \
fi
-tools/gn/bootstrap/bootstrap.py -v "$CHROMIUM_CORE_GN_DEFINES $CHROMIUM_BROWSER_GN_DEFINES"
+tools/gn/bootstrap/bootstrap.py -v --no-clean --gn-gen-args="$CHROMIUM_CORE_GN_DEFINES $CHROMIUM_BROWSER_GN_DEFINES"
%{builddir}/gn --script-executable=/usr/bin/python2 gen --args="$CHROMIUM_CORE_GN_DEFINES $CHROMIUM_BROWSER_GN_DEFINES" %{builddir}
%if %{freeworld}
4 years, 7 months