[chromium-freeworld/f28] (12 commits) ...Merge Fedora, chromium-67.0.3396.79-1
by Miro Hrončok
Summary of changes:
d164b66... also filter out fontconfig on epel7 (*)
afb86c1... 67 (*)
169992d... 67 patches (*)
bb0214e... Merge Fedora, chromium-66.0.3359.181-3 (*)
02b89a3... fixup spec (*)
3bfff4f... fix sources (*)
022abfe... fix crashpad issue on aarch64 (*)
27ff9a9... fix epel fonts (*)
0b37303... work around bug in RHEL7 python exec (*)
91e89ca... Merge Fedora, chromium-67.0.3396.62-1 (*)
9cdea2b... update to 67.0.3396.79 (*)
33889a4... Merge Fedora, chromium-67.0.3396.79-1 (*)
(*) This commit already existed in another branch; no separate mail sent
5 years, 11 months
[chromium-freeworld: 5/5] Merge Fedora, chromium-67.0.3396.79-1
by Miro Hrončok
commit 33889a41ca2a6bfcbc497f62dc787a6f8e6ad70d
Merge: 91e89ca 9cdea2b
Author: Miro Hrončok <miro(a)hroncok.cz>
Date: Tue Jun 12 14:29:32 2018 +0200
Merge Fedora, chromium-67.0.3396.79-1
.gitignore | 1 +
...um-67.0.3396.62-crashpad-aarch64-buildfix.patch | 13 ++++
....3396.62-epel7-use-old-python-exec-syntax.patch | 12 ++++
chromium-freeworld.spec | 69 +++++++++++++++++++---
sources | 2 +-
5 files changed, 89 insertions(+), 8 deletions(-)
---
diff --cc .gitignore
index b799f4b,0bb4453..e8858f9
--- a/.gitignore
+++ b/.gitignore
@@@ -57,4 -62,4 +57,5 @@@
/Tinos-Bold.ttf
/Tinos-Italic.ttf
/Tinos-Regular.ttf
-/chromium-67.0.3396.79-clean.tar.xz
+/chromium-67.0.3396.62.tar.xz
++/chromium-67.0.3396.79.tar.xz
diff --cc sources
index 18b1cf9,e8b818f..db80af4
--- a/sources
+++ b/sources
@@@ -1,18 -1,18 +1,18 @@@
-SHA512 (depot_tools.git-master.tar.gz) = d3d6a1873b2b0296a8cd99e0d8d2e629a17b1808934b4972556168f8b4ccea60577ebaeab4445baf15afb1b04080808db59a832a5b61d247bd48da14fa6acf03
-SHA512 (gelasio.zip) = 0a22def3eca8848161ee72453dc5f97cc52ed09ffe21834152f2535d3a71f404cdf1f6e1809564bacb86aae75278cbcb96cae52b537d3ccdc299b60d6d0bc53e
-SHA512 (MuktiNarrow-0.94.tar.bz2) = f7abd429e2591eaa047d1ac982d97fa67dc1480c42e55b2a97861abd90918704dce90b6bb27dec7b6d696f188017a74de54a7b7f45281f0515923b90300959d1
-SHA512 (NotoSansCJKjp-hinted.zip) = e7bcbc53a10b8ec3679dcade5a8a94cea7e1f60875ab38f2193b4fa8e33968e1f0abc8184a3df1e5210f6f5c731f96c727c6aa8f519423a29707d2dee5ada193
-SHA512 (lohit-gurmukhi-ttf-2.91.2.tar.gz) = 714ed72d201e7f8956d24e9d9f1526207beb91a604e88c02a8b0d145f19d9bfe1408ca290d1665ebef462ab3854365dcd9850529803277738e2585addf3e280a
-SHA512 (Arimo-BoldItalic.ttf) = cb1f411f2630f2754dfb0244b3c56fde43650d603512d47c143bc0f24028da4d7ca2b35a633226ef9c502b97c63cfbd5a6d696934b3e60b2a98ad879b113a4c4
-SHA512 (Arimo-Bold.ttf) = 2853e5f41e6899baf226db2578aba09f2f88085eaea02da024621492d21e1af8bdefdefd354ea23dc4d5de5cb0d554085040a0108820f213e86dd532986fdb41
-SHA512 (Arimo-Italic.ttf) = 56ef918e5811dcd375e6cd8d79dc69f4db75d544639c0f6ac3a0343b3b4ef94b7dee5a6066f1558d8747a32bbee074256be68b943ff31cfbd2f5f32acfa7c1c5
-SHA512 (Arimo-Regular.ttf) = 05e6aa6b785b0038a8e0e0a8a618a1b8e907a700be302148eaebc91cfac3c9e2d9acf90b9d077ff3b9ff54bd5f8a9c522a039cff6103cdeee54be29b6a0b355f
-SHA512 (Cousine-BoldItalic.ttf) = 2125aa9f5db4ae4a3725d308b6afbfbce5957f3c96a3c5fcba8ebf5cd167017d9c7023391e947ed68d12fa97e2cba3f156a3acca276d9f5ed50df7d78c07f918
-SHA512 (Cousine-Bold.ttf) = 1759fd23419ae0e1bfc9be92abb9cb0c74084ce85e7f53c055d86ec3d62da83169d0d67ed96fd4e496b28acf382933d63448459108b109d8202db7f18f05caab
-SHA512 (Cousine-Italic.ttf) = ec3fc9d940b748dbbc64aa66184413a78ae2b085181eed563449df044b891e951e8feebd865be5be42f0cd001acf5bdce9084a006f9b5be32f096f7df0dc7700
-SHA512 (Cousine-Regular.ttf) = a665a6a4a5583079eb87509e2da7d6bd06965e6a7655217302b088caef942ae9ad63e6cffda18d0001fc9ab2284836766843e46bfdacd188b54f39d7855f36a0
-SHA512 (Tinos-BoldItalic.ttf) = 2574de2add94ef976b731fac688951fab49574c9b0ccd259ba647ea3598ca026bcfb88e2ea3f19effb3af71fdc0eb5fa9973f0b6e996c22185c5f2aab5a23fdd
-SHA512 (Tinos-Bold.ttf) = 54aeca804c06a4d5c57ade596e73df91a6a1c4401c4aadba55d987b3fb73045d35f3df02678b59abb77c4914ec741755536c0adf808c931e4b77848c52c229c4
-SHA512 (Tinos-Italic.ttf) = d4f4f096110ef98a781a2a0e0d319317e5f84e650fe6f4d4f6b0e22a16414278217f37497b904a18540273c0e2d79d4f1faabde3b0eb5446283b318c73bafb38
-SHA512 (Tinos-Regular.ttf) = 58085c5dac6d067d60ba2ab3220c4a0cc1efcf279cadfcfb8746a5e5fa1a6f6daa62750dc2051b3b2d8a51b4d2e9bb0f66594caf2253c0870ed9c7286fa45e8f
-SHA512 (chromium-67.0.3396.79-clean.tar.xz) = 253265e7b3a277821224a484faeb6993553b2aa636b92bab6eb2e839510d46fbee6ac9994d6a99075e47e046092437369c48eefba4cc98c9ba2889a54d6ee8a4
+49a7f897775cce21d2b69968b8af1cea depot_tools.git-master.tar.gz
+4d610887ff4d445cbc639aae7828d139 gelasio.zip
+314394b29c1d15a73c3f00316003810a MuktiNarrow-0.94.tar.bz2
+9af8a0b80e85db34b1c34928d81cc423 NotoSansCJKjp-hinted.zip
+85d8bf52bda23c1cd422be54dee113a6 lohit-gurmukhi-ttf-2.91.2.tar.gz
+08fb930e5cf38bab811efa91f368b248 Arimo-BoldItalic.ttf
+927b7dca5b947f69cb8e835f7f743d15 Arimo-Bold.ttf
+fa87472a877e70c5bce22e42be5c25a9 Arimo-Italic.ttf
+7ac02a544211773d9636e056e9da6c35 Arimo-Regular.ttf
+97415fecbce8ffd540f9f9af681cd398 Cousine-BoldItalic.ttf
+86fed5639322e2f033ad817ee406c2fe Cousine-Bold.ttf
+cef49e5506d6f09ea3064f7bd3191417 Cousine-Italic.ttf
+00d46771d6344fd0c8e3d05bfd092887 Cousine-Regular.ttf
+042b1967a334625c34b3ab6255242127 Tinos-BoldItalic.ttf
+b68a7149509c5f1f69153d2dc3d8dd17 Tinos-Bold.ttf
+0da96c8a7d54f8b8f6f7713c8524f2fc Tinos-Italic.ttf
+b25c0f936b23cccc0b92e85017e02bee Tinos-Regular.ttf
- febeb64d1fcdef2bf1b9ef5cdc3dab7f chromium-67.0.3396.62.tar.xz
++5ffdedb5ada2f919813c9325e17fa58f chromium-67.0.3396.79.tar.xz
5 years, 11 months
[chromium-freeworld: 4/5] update to 67.0.3396.79
by Miro Hrončok
commit 9cdea2b94c69910f92c1ecc347aa8073f1a6ef75
Author: Tom Callaway <spot(a)fedoraproject.org>
Date: Thu Jun 7 13:54:30 2018 -0400
update to 67.0.3396.79
.gitignore | 1 +
chromium.spec | 7 +++++--
sources | 2 +-
3 files changed, 7 insertions(+), 3 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index bf98cac..0bb4453 100644
--- a/.gitignore
+++ b/.gitignore
@@ -62,3 +62,4 @@
/Tinos-Bold.ttf
/Tinos-Italic.ttf
/Tinos-Regular.ttf
+/chromium-67.0.3396.79-clean.tar.xz
diff --git a/chromium.spec b/chromium.spec
index d612465..54d3c69 100644
--- a/chromium.spec
+++ b/chromium.spec
@@ -139,8 +139,8 @@ Name: chromium%{chromium_channel}%{?freeworld:-freeworld}
%else
Name: chromium%{chromium_channel}
%endif
-Version: %{majorversion}.0.3396.62
-Release: 2%{?dist}
+Version: %{majorversion}.0.3396.79
+Release: 1%{?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)
@@ -1709,6 +1709,9 @@ getent group chrome-remote-desktop >/dev/null || groupadd -r chrome-remote-deskt
%changelog
+* Thu Jun 7 2018 Tom Callaway <spot(a)fedoraproject.org> 67.0.3396.79-1
+- update to 67.0.3396.79
+
* Wed Jun 6 2018 Tom Callaway <spot(a)fedoraproject.org> 67.0.3396.62-2
- work around bug in RHEL7 python exec
diff --git a/sources b/sources
index 68e84f7..e8b818f 100644
--- a/sources
+++ b/sources
@@ -1,5 +1,4 @@
SHA512 (depot_tools.git-master.tar.gz) = d3d6a1873b2b0296a8cd99e0d8d2e629a17b1808934b4972556168f8b4ccea60577ebaeab4445baf15afb1b04080808db59a832a5b61d247bd48da14fa6acf03
-SHA512 (chromium-67.0.3396.62-clean.tar.xz) = 5c7784a70eca7e5cfc9442190c7addc2f14b6038431135062eed9e5bf0df684b37eb691316b889f801be69cf3837810de7bf8330cf1411b5c22b0722c806f7da
SHA512 (gelasio.zip) = 0a22def3eca8848161ee72453dc5f97cc52ed09ffe21834152f2535d3a71f404cdf1f6e1809564bacb86aae75278cbcb96cae52b537d3ccdc299b60d6d0bc53e
SHA512 (MuktiNarrow-0.94.tar.bz2) = f7abd429e2591eaa047d1ac982d97fa67dc1480c42e55b2a97861abd90918704dce90b6bb27dec7b6d696f188017a74de54a7b7f45281f0515923b90300959d1
SHA512 (NotoSansCJKjp-hinted.zip) = e7bcbc53a10b8ec3679dcade5a8a94cea7e1f60875ab38f2193b4fa8e33968e1f0abc8184a3df1e5210f6f5c731f96c727c6aa8f519423a29707d2dee5ada193
@@ -16,3 +15,4 @@ SHA512 (Tinos-BoldItalic.ttf) = 2574de2add94ef976b731fac688951fab49574c9b0ccd259
SHA512 (Tinos-Bold.ttf) = 54aeca804c06a4d5c57ade596e73df91a6a1c4401c4aadba55d987b3fb73045d35f3df02678b59abb77c4914ec741755536c0adf808c931e4b77848c52c229c4
SHA512 (Tinos-Italic.ttf) = d4f4f096110ef98a781a2a0e0d319317e5f84e650fe6f4d4f6b0e22a16414278217f37497b904a18540273c0e2d79d4f1faabde3b0eb5446283b318c73bafb38
SHA512 (Tinos-Regular.ttf) = 58085c5dac6d067d60ba2ab3220c4a0cc1efcf279cadfcfb8746a5e5fa1a6f6daa62750dc2051b3b2d8a51b4d2e9bb0f66594caf2253c0870ed9c7286fa45e8f
+SHA512 (chromium-67.0.3396.79-clean.tar.xz) = 253265e7b3a277821224a484faeb6993553b2aa636b92bab6eb2e839510d46fbee6ac9994d6a99075e47e046092437369c48eefba4cc98c9ba2889a54d6ee8a4
5 years, 11 months
[chromium-freeworld: 3/5] work around bug in RHEL7 python exec
by Miro Hrončok
commit 0b37303d5a782fad15707b55c596464d94bb16f2
Author: Tom Callaway <spot(a)fedoraproject.org>
Date: Wed Jun 6 10:17:14 2018 -0400
work around bug in RHEL7 python exec
chromium-67.0.3396.62-epel7-use-old-python-exec-syntax.patch | 12 ++++++++++++
chromium.spec | 12 +++++++++++-
2 files changed, 23 insertions(+), 1 deletion(-)
---
diff --git a/chromium-67.0.3396.62-epel7-use-old-python-exec-syntax.patch b/chromium-67.0.3396.62-epel7-use-old-python-exec-syntax.patch
new file mode 100644
index 0000000..1aa5600
--- /dev/null
+++ b/chromium-67.0.3396.62-epel7-use-old-python-exec-syntax.patch
@@ -0,0 +1,12 @@
+diff -up chromium-67.0.3396.62/tools/gn/bootstrap/bootstrap.py.oldexec chromium-67.0.3396.62/tools/gn/bootstrap/bootstrap.py
+--- chromium-67.0.3396.62/tools/gn/bootstrap/bootstrap.py.oldexec 2018-06-06 10:13:40.862084284 -0400
++++ chromium-67.0.3396.62/tools/gn/bootstrap/bootstrap.py 2018-06-06 10:14:08.809490819 -0400
+@@ -112,7 +112,7 @@ def windows_prepare_toolchain(tempdir):
+
+ _globals = {"__builtins__":None}
+ _locals = {}
+- exec(response, _globals, _locals)
++ exec response in _globals, _locals
+
+ return _locals
+
diff --git a/chromium.spec b/chromium.spec
index 0a596a9..d612465 100644
--- a/chromium.spec
+++ b/chromium.spec
@@ -140,7 +140,7 @@ Name: chromium%{chromium_channel}%{?freeworld:-freeworld}
Name: chromium%{chromium_channel}
%endif
Version: %{majorversion}.0.3396.62
-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)
@@ -254,6 +254,9 @@ Patch94: chromium-66.0.3359.117-GCC-fully-declare-ConfigurationPolicyProvider.pa
Patch98: chromium-66.0.3359.170-gcc8-alignof.patch
# https://chromium.googlesource.com/crashpad/crashpad/+/26ef5c910fc7e2edb44...
Patch99: chromium-67.0.3396.62-crashpad-aarch64-buildfix.patch
+# RHEL 7 has a bug in its python2.7 which does not propely handle exec with a tuple
+# https://bugs.python.org/issue21591
+Patch100: chromium-67.0.3396.62-epel7-use-old-python-exec-syntax.patch
# Use chromium-latest.py to generate clean tarball from released build tarballs, found here:
@@ -770,6 +773,10 @@ udev.
# %%patch97 -p1 -b .arm-init-fix
%patch98 -p1 -b .gcc8-alignof
%patch99 -p1 -b .crashpad-aarch64-fix
+%if 0%{?rhel} == 7
+%patch100 -p1 -b .oldexec
+%endif
+
# Change shebang in all relevant files in this directory and all subdirectories
# See `man find` for how the `-exec command {} +` syntax works
@@ -1702,6 +1709,9 @@ getent group chrome-remote-desktop >/dev/null || groupadd -r chrome-remote-deskt
%changelog
+* Wed Jun 6 2018 Tom Callaway <spot(a)fedoraproject.org> 67.0.3396.62-2
+- work around bug in RHEL7 python exec
+
* Wed May 30 2018 Tom Callaway <spot(a)fedoraproject.org> 67.0.3396.62-1
- 67 releases of chromium on the wall...
5 years, 11 months
[chromium-freeworld: 2/5] fix epel fonts
by Miro Hrončok
commit 27ff9a9cfc0ce4f24f3f12edd8bf8d1e7649b4cf
Author: Tom Callaway <spot(a)fedoraproject.org>
Date: Tue Jun 5 14:21:44 2018 -0400
fix epel fonts
.gitignore | 14 ++++++++++++++
chromium.spec | 51 +++++++++++++++++++++++++++++++++++++++++++++------
sources | 14 ++++++++++++++
3 files changed, 73 insertions(+), 6 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index adc3998..bf98cac 100644
--- a/.gitignore
+++ b/.gitignore
@@ -48,3 +48,17 @@
/chromium-67.0.3396.62-clean.tar.xz
/gelasio.zip
/MuktiNarrow-0.94.tar.bz2
+/NotoSansCJKjp-hinted.zip
+/lohit-gurmukhi-ttf-2.91.2.tar.gz
+/Arimo-BoldItalic.ttf
+/Arimo-Bold.ttf
+/Arimo-Italic.ttf
+/Arimo-Regular.ttf
+/Cousine-BoldItalic.ttf
+/Cousine-Bold.ttf
+/Cousine-Italic.ttf
+/Cousine-Regular.ttf
+/Tinos-BoldItalic.ttf
+/Tinos-Bold.ttf
+/Tinos-Italic.ttf
+/Tinos-Regular.ttf
diff --git a/chromium.spec b/chromium.spec
index 3de1213..0a596a9 100644
--- a/chromium.spec
+++ b/chromium.spec
@@ -443,16 +443,34 @@ BuildRequires: pkgconfig(gnome-keyring-1)
# remote desktop needs this
BuildRequires: pam-devel
BuildRequires: systemd
+# for third_party/test_fonts
+%if 0%{?rhel} == 7
+Source100: https://github.com/google/fonts/blob/master/apache/arimo/Arimo-Bold.ttf
+Source101: https://github.com/google/fonts/blob/master/apache/arimo/Arimo-BoldItalic...
+Source102: https://github.com/google/fonts/blob/master/apache/arimo/Arimo-Italic.ttf
+Source103: https://github.com/google/fonts/blob/master/apache/arimo/Arimo-Regular.ttf
+Source104: https://github.com/google/fonts/blob/master/apache/cousine/Cousine-Bold.ttf
+Source105: https://github.com/google/fonts/blob/master/apache/cousine/Cousine-BoldIt...
+Source106: https://github.com/google/fonts/blob/master/apache/cousine/Cousine-Italic...
+Source107: https://github.com/google/fonts/blob/master/apache/cousine/Cousine-Regula...
+Source108: https://github.com/google/fonts/blob/master/apache/tinos/Tinos-Bold.ttf
+Source109: https://github.com/google/fonts/blob/master/apache/tinos/Tinos-BoldItalic...
+Source110: https://github.com/google/fonts/blob/master/apache/tinos/Tinos-Italic.ttf
+Source111: https://github.com/google/fonts/blob/master/apache/tinos/Tinos-Regular.ttf
+Source112: https://releases.pagure.org/lohit/lohit-gurmukhi-ttf-2.91.2.tar.gz
+Source113: https://noto-website-2.storage.googleapis.com/pkgs/NotoSansCJKjp-hinted.zip
+%else
BuildRequires: google-croscore-arimo-fonts
BuildRequires: google-croscore-cousine-fonts
+BuildRequires: google-croscore-tinos-fonts
+BuildRequires: google-noto-sans-cjk-jp-fonts
+BuildRequires: lohit-gurmukhi-fonts
+%endif
BuildRequires: dejavu-sans-fonts
BuildRequires: thai-scalable-garuda-fonts
BuildRequires: lohit-devanagari-fonts
-BuildRequires: lohit-gurmukhi-fonts
BuildRequires: lohit-tamil-fonts
-BuildRequires: google-noto-sans-cjk-jp-fonts
BuildRequires: google-noto-sans-khmer-fonts
-BuildRequires: google-croscore-tinos-fonts
# using the built from source version on aarch64
BuildRequires: ninja-build
@@ -872,13 +890,34 @@ unzip %{SOURCE14}
tar xf %{SOURCE15}
mv MuktiNarrow0.94/MuktiNarrow.ttf .
rm -rf MuktiNarrow0.94
+%if 0%{?rhel} == 7
+cp %{SOURCE100} .
+cp %{SOURCE101} .
+cp %{SOURCE102} .
+cp %{SOURCE103} .
+cp %{SOURCE104} .
+cp %{SOURCE105} .
+cp %{SOURCE106} .
+cp %{SOURCE107} .
+cp %{SOURCE108} .
+cp %{SOURCE109} .
+cp %{SOURCE110} .
+cp %{SOURCE111} .
+tar xf %{SOURCE112}
+mv lohit-gurmukhi-ttf-2.91.2/Lohit-Gurmukhi.ttf .
+rm -rf lohit-gurmukhi-ttf-2.91.2
+unzip %{SOURCE113}
+%else
cp -a /usr/share/fonts/google-croscore/Arimo-*.ttf .
cp -a /usr/share/fonts/google-croscore/Cousine-*.ttf .
+cp -a /usr/share/fonts/google-croscore/Tinos-*.ttf .
+cp -a /usr/share/fonts/lohit-gurmukhi/Lohit-Gurmukhi.ttf .
+cp -a /usr/share/fonts/google-noto-cjk/NotoSansCJKjp-Regular.otf .
+%endif
cp -a /usr/share/fonts/dejavu/DejaVuSans.ttf /usr/share/fonts/dejavu/DejaVuSans-Bold.ttf .
cp -a /usr/share/fonts/thai-scalable/Garuda.ttf .
-cp -a /usr/share/fonts/lohit-devanagari/Lohit-Devanagari.ttf /usr/share/fonts/lohit-gurmukhi/Lohit-Gurmukhi.ttf /usr/share/fonts/lohit-tamil/Lohit-Tamil.ttf .
-cp -a /usr/share/fonts/google-noto-cjk/NotoSansCJKjp-Regular.otf /usr/share/fonts/google-noto/NotoSansKhmer-Regular.ttf .
-cp -a /usr/share/fonts/google-croscore/Tinos-*.ttf .
+cp -a /usr/share/fonts/lohit-devanagari/Lohit-Devanagari.ttf /usr/share/fonts/lohit-tamil/Lohit-Tamil.ttf .
+cp -a /usr/share/fonts/google-noto/NotoSansKhmer-Regular.ttf .
popd
# Core defines are flags that are true for both the browser and headless.
diff --git a/sources b/sources
index ac757ae..68e84f7 100644
--- a/sources
+++ b/sources
@@ -2,3 +2,17 @@ SHA512 (depot_tools.git-master.tar.gz) = d3d6a1873b2b0296a8cd99e0d8d2e629a17b180
SHA512 (chromium-67.0.3396.62-clean.tar.xz) = 5c7784a70eca7e5cfc9442190c7addc2f14b6038431135062eed9e5bf0df684b37eb691316b889f801be69cf3837810de7bf8330cf1411b5c22b0722c806f7da
SHA512 (gelasio.zip) = 0a22def3eca8848161ee72453dc5f97cc52ed09ffe21834152f2535d3a71f404cdf1f6e1809564bacb86aae75278cbcb96cae52b537d3ccdc299b60d6d0bc53e
SHA512 (MuktiNarrow-0.94.tar.bz2) = f7abd429e2591eaa047d1ac982d97fa67dc1480c42e55b2a97861abd90918704dce90b6bb27dec7b6d696f188017a74de54a7b7f45281f0515923b90300959d1
+SHA512 (NotoSansCJKjp-hinted.zip) = e7bcbc53a10b8ec3679dcade5a8a94cea7e1f60875ab38f2193b4fa8e33968e1f0abc8184a3df1e5210f6f5c731f96c727c6aa8f519423a29707d2dee5ada193
+SHA512 (lohit-gurmukhi-ttf-2.91.2.tar.gz) = 714ed72d201e7f8956d24e9d9f1526207beb91a604e88c02a8b0d145f19d9bfe1408ca290d1665ebef462ab3854365dcd9850529803277738e2585addf3e280a
+SHA512 (Arimo-BoldItalic.ttf) = cb1f411f2630f2754dfb0244b3c56fde43650d603512d47c143bc0f24028da4d7ca2b35a633226ef9c502b97c63cfbd5a6d696934b3e60b2a98ad879b113a4c4
+SHA512 (Arimo-Bold.ttf) = 2853e5f41e6899baf226db2578aba09f2f88085eaea02da024621492d21e1af8bdefdefd354ea23dc4d5de5cb0d554085040a0108820f213e86dd532986fdb41
+SHA512 (Arimo-Italic.ttf) = 56ef918e5811dcd375e6cd8d79dc69f4db75d544639c0f6ac3a0343b3b4ef94b7dee5a6066f1558d8747a32bbee074256be68b943ff31cfbd2f5f32acfa7c1c5
+SHA512 (Arimo-Regular.ttf) = 05e6aa6b785b0038a8e0e0a8a618a1b8e907a700be302148eaebc91cfac3c9e2d9acf90b9d077ff3b9ff54bd5f8a9c522a039cff6103cdeee54be29b6a0b355f
+SHA512 (Cousine-BoldItalic.ttf) = 2125aa9f5db4ae4a3725d308b6afbfbce5957f3c96a3c5fcba8ebf5cd167017d9c7023391e947ed68d12fa97e2cba3f156a3acca276d9f5ed50df7d78c07f918
+SHA512 (Cousine-Bold.ttf) = 1759fd23419ae0e1bfc9be92abb9cb0c74084ce85e7f53c055d86ec3d62da83169d0d67ed96fd4e496b28acf382933d63448459108b109d8202db7f18f05caab
+SHA512 (Cousine-Italic.ttf) = ec3fc9d940b748dbbc64aa66184413a78ae2b085181eed563449df044b891e951e8feebd865be5be42f0cd001acf5bdce9084a006f9b5be32f096f7df0dc7700
+SHA512 (Cousine-Regular.ttf) = a665a6a4a5583079eb87509e2da7d6bd06965e6a7655217302b088caef942ae9ad63e6cffda18d0001fc9ab2284836766843e46bfdacd188b54f39d7855f36a0
+SHA512 (Tinos-BoldItalic.ttf) = 2574de2add94ef976b731fac688951fab49574c9b0ccd259ba647ea3598ca026bcfb88e2ea3f19effb3af71fdc0eb5fa9973f0b6e996c22185c5f2aab5a23fdd
+SHA512 (Tinos-Bold.ttf) = 54aeca804c06a4d5c57ade596e73df91a6a1c4401c4aadba55d987b3fb73045d35f3df02678b59abb77c4914ec741755536c0adf808c931e4b77848c52c229c4
+SHA512 (Tinos-Italic.ttf) = d4f4f096110ef98a781a2a0e0d319317e5f84e650fe6f4d4f6b0e22a16414278217f37497b904a18540273c0e2d79d4f1faabde3b0eb5446283b318c73bafb38
+SHA512 (Tinos-Regular.ttf) = 58085c5dac6d067d60ba2ab3220c4a0cc1efcf279cadfcfb8746a5e5fa1a6f6daa62750dc2051b3b2d8a51b4d2e9bb0f66594caf2253c0870ed9c7286fa45e8f
5 years, 11 months
[chromium-freeworld: 1/5] fix crashpad issue on aarch64
by Miro Hrončok
commit 022abfe75fd1f6a2755a503f3a7a4db4313cf400
Author: Tom Callaway <spot(a)fedoraproject.org>
Date: Mon Jun 4 15:04:58 2018 -0400
fix crashpad issue on aarch64
chromium-67.0.3396.62-crashpad-aarch64-buildfix.patch | 13 +++++++++++++
chromium.spec | 3 +++
2 files changed, 16 insertions(+)
---
diff --git a/chromium-67.0.3396.62-crashpad-aarch64-buildfix.patch b/chromium-67.0.3396.62-crashpad-aarch64-buildfix.patch
new file mode 100644
index 0000000..e19d726
--- /dev/null
+++ b/chromium-67.0.3396.62-crashpad-aarch64-buildfix.patch
@@ -0,0 +1,13 @@
+diff -up chromium-67.0.3396.62/third_party/crashpad/crashpad/util/misc/capture_context_linux.S.aarch64fix chromium-67.0.3396.62/third_party/crashpad/crashpad/util/misc/capture_context_linux.S
+--- chromium-67.0.3396.62/third_party/crashpad/crashpad/util/misc/capture_context_linux.S.aarch64fix 2018-06-04 14:58:04.730083967 -0400
++++ chromium-67.0.3396.62/third_party/crashpad/crashpad/util/misc/capture_context_linux.S 2018-06-04 14:58:24.896572816 -0400
+@@ -288,7 +288,7 @@ CAPTURECONTEXT_SYMBOL2:
+ #elif defined(__aarch64__)
+
+ // Zero out fault_address, which is unused.
+- str x31, [x0, #0xb0] // context->uc_mcontext.fault_address
++ str xzr, [x0, #0xb0] // context->uc_mcontext.fault_address
+
+ // Save general purpose registers in context->uc_mcontext.regs[i].
+ // The original x0 can't be recovered.
+diff -up chromium-67.0.3396.62/third_party/skia/src/opts/SkRasterPipeline_opts.h.aarch64fix chromium-67.0.3396.62/third_party/skia/src/opts/SkRasterPipeline_opts.h
diff --git a/chromium.spec b/chromium.spec
index 1c3ae3b..3de1213 100644
--- a/chromium.spec
+++ b/chromium.spec
@@ -252,6 +252,8 @@ Patch94: chromium-66.0.3359.117-GCC-fully-declare-ConfigurationPolicyProvider.pa
# instead of the preferred alignment. This means int64_t is now 4 on i686 (instead of 8).
# Use __alignof__ to get the value we expect (and chromium checks for).
Patch98: chromium-66.0.3359.170-gcc8-alignof.patch
+# https://chromium.googlesource.com/crashpad/crashpad/+/26ef5c910fc7e2edb44...
+Patch99: chromium-67.0.3396.62-crashpad-aarch64-buildfix.patch
# Use chromium-latest.py to generate clean tarball from released build tarballs, found here:
@@ -749,6 +751,7 @@ udev.
# %%patch96 -p1 -b .flatsetfix
# %%patch97 -p1 -b .arm-init-fix
%patch98 -p1 -b .gcc8-alignof
+%patch99 -p1 -b .crashpad-aarch64-fix
# Change shebang in all relevant files in this directory and all subdirectories
# See `man find` for how the `-exec command {} +` syntax works
5 years, 11 months
[telegram-desktop/f27] Updated to version 1.3.7.
by Vitaly Zaitsev
commit 0c0db06a918615f8e985ca834ebeea58b0826d80
Author: Vitaly Zaitsev <vitaly(a)easycoding.org>
Date: Tue Jun 12 00:56:34 2018 +0200
Updated to version 1.3.7.
.gitignore | 2 ++
sources | 4 +--
telegram-desktop-api-tokens.patch | 8 +++---
telegram-desktop-build-fixes.patch | 50 +++++++++++++++++++-------------------
telegram-desktop.spec | 24 +++++++++++++++---
5 files changed, 54 insertions(+), 34 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 7e0cf68..07533b3 100644
--- a/.gitignore
+++ b/.gitignore
@@ -46,3 +46,5 @@
/tdesktop-1.2.16.tar.gz
/tdesktop-1.2.17.tar.gz
/tdesktop-1.3.0.tar.gz
+/crl-c739b14.tar.gz
+/tdesktop-1.3.7.tar.gz
diff --git a/sources b/sources
index 3f4086e..14b6f21 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-ed3d3121418d32866ae348ce75042770 crl-344cbde.tar.gz
-2bfaea91997754312c3b1857d0554f43 tdesktop-1.3.0.tar.gz
+d1a2a0fe64b34fbd74a5eb7322efd54b crl-c739b14.tar.gz
+47dc4b64dab195b7c39e8a1b36b995d4 tdesktop-1.3.7.tar.gz
diff --git a/telegram-desktop-api-tokens.patch b/telegram-desktop-api-tokens.patch
index b4c082f..a9d7079 100644
--- a/telegram-desktop-api-tokens.patch
+++ b/telegram-desktop-api-tokens.patch
@@ -1,4 +1,4 @@
-From c6a39ae561374ef2cc620f75a4f9839729544ef8 Mon Sep 17 00:00:00 2001
+From 68611ba0b2a923df5dd3b711c2db386c472e138a Mon Sep 17 00:00:00 2001
From: Vitaly Zaitsev <vitaly(a)easycoding.org>
Date: Mon, 9 Apr 2018 16:57:13 +0200
Subject: [PATCH] Changed default Telegram Desktop's test API keys to obtained
@@ -10,10 +10,10 @@ Subject: [PATCH] Changed default Telegram Desktop's test API keys to obtained
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/Telegram/SourceFiles/config.h b/Telegram/SourceFiles/config.h
-index 6384d44c..4aa105e4 100644
+index 5bcb92472..484cbecbb 100644
--- a/Telegram/SourceFiles/config.h
+++ b/Telegram/SourceFiles/config.h
-@@ -217,8 +217,8 @@ w/CVnbwQOw0g5GBwwFV3r0uTTvy44xx8XXxk+Qknu4eBCsmrAFNnAgMBAAE=\n\
+@@ -199,8 +199,8 @@ w/CVnbwQOw0g5GBwwFV3r0uTTvy44xx8XXxk+Qknu4eBCsmrAFNnAgMBAAE=\n\
#ifdef CUSTOM_API_ID
#include "../../../TelegramPrivate/custom_api_id.h" // Custom API id and API hash
#else
@@ -25,5 +25,5 @@ index 6384d44c..4aa105e4 100644
#if Q_BYTE_ORDER == Q_BIG_ENDIAN
--
-2.14.3
+2.17.1
diff --git a/telegram-desktop-build-fixes.patch b/telegram-desktop-build-fixes.patch
index bf446e5..d54209b 100644
--- a/telegram-desktop-build-fixes.patch
+++ b/telegram-desktop-build-fixes.patch
@@ -1,4 +1,4 @@
-From c4742c80a5af1f74b34fcd794a214cf3856f0cd8 Mon Sep 17 00:00:00 2001
+From b65b42d74da33e51598967b7f9110b6af8e2106b 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] Fixed build under Fedora using rpmbuild and mock.
@@ -24,7 +24,7 @@ Subject: [PATCH] Fixed build under Fedora using rpmbuild and mock.
create mode 100644 Telegram/gyp/CMakeLists.inj
diff --git a/Telegram/Resources/qrc/telegram_linux.qrc b/Telegram/Resources/qrc/telegram_linux.qrc
-index 0554fa17..3ea02740 100644
+index 0554fa179..3ea027406 100644
--- a/Telegram/Resources/qrc/telegram_linux.qrc
+++ b/Telegram/Resources/qrc/telegram_linux.qrc
@@ -1,5 +1,4 @@
@@ -34,10 +34,10 @@ index 0554fa17..3ea02740 100644
</qresource>
</RCC>
diff --git a/Telegram/SourceFiles/core/launcher.cpp b/Telegram/SourceFiles/core/launcher.cpp
-index 62662277..66598a1d 100644
+index 5c97c40eb..c4dc8d22c 100644
--- a/Telegram/SourceFiles/core/launcher.cpp
+++ b/Telegram/SourceFiles/core/launcher.cpp
-@@ -51,6 +51,7 @@ int Launcher::exec() {
+@@ -57,6 +57,7 @@ int Launcher::exec() {
Logs::start(this); // must be started before Platform is started
Platform::start(); // must be started before QApplication is created
@@ -47,7 +47,7 @@ index 62662277..66598a1d 100644
DEBUG_LOG(("Telegram finished, result: %1").arg(result));
diff --git a/Telegram/SourceFiles/qt_functions.cpp b/Telegram/SourceFiles/qt_functions.cpp
new file mode 100644
-index 00000000..4a722b8d
+index 000000000..4a722b8d7
--- /dev/null
+++ b/Telegram/SourceFiles/qt_functions.cpp
@@ -0,0 +1,94 @@
@@ -147,7 +147,7 @@ index 00000000..4a722b8d
+}
diff --git a/Telegram/gyp/CMakeLists.inj b/Telegram/gyp/CMakeLists.inj
new file mode 100644
-index 00000000..6207bc74
+index 000000000..6207bc741
--- /dev/null
+++ b/Telegram/gyp/CMakeLists.inj
@@ -0,0 +1,3 @@
@@ -155,7 +155,7 @@ index 00000000..6207bc74
+include(../../Telegram/gyp/PrecompiledHeader.cmake)
+add_precompiled_header(Telegram ../../Telegram/SourceFiles/stdafx.h)
diff --git a/Telegram/gyp/PrecompiledHeader.cmake b/Telegram/gyp/PrecompiledHeader.cmake
-index 5d6830e9..c3f08d3f 100644
+index 5d6830e96..c3f08d3f6 100644
--- a/Telegram/gyp/PrecompiledHeader.cmake
+++ b/Telegram/gyp/PrecompiledHeader.cmake
@@ -112,7 +112,7 @@ function(add_precompiled_header _target _input)
@@ -177,7 +177,7 @@ index 5d6830e9..c3f08d3f 100644
IMPLICIT_DEPENDS CXX "${_pch_header}"
COMMENT "Precompiling ${_name} for ${_target} (C++)")
diff --git a/Telegram/gyp/Telegram.gyp b/Telegram/gyp/Telegram.gyp
-index 62a4197f..9e5379b9 100644
+index 2261f6de9..883597579 100644
--- a/Telegram/gyp/Telegram.gyp
+++ b/Telegram/gyp/Telegram.gyp
@@ -18,7 +18,6 @@
@@ -188,7 +188,7 @@ index 62a4197f..9e5379b9 100644
'sp_media_key_tap_loc': '<(submodules_loc)/SPMediaKeyTap',
'emoji_suggestions_loc': '<(submodules_loc)/emoji_suggestions',
'style_files': [
-@@ -49,13 +48,11 @@
+@@ -50,13 +49,11 @@
'pt-BR',
],
'build_defines%': '',
@@ -203,7 +203,7 @@ index 62a4197f..9e5379b9 100644
'telegram_linux.gypi',
'qt.gypi',
'qt_moc.gypi',
-@@ -68,34 +65,23 @@
+@@ -69,34 +66,23 @@
'codegen.gyp:codegen_lang',
'codegen.gyp:codegen_numbers',
'codegen.gyp:codegen_style',
@@ -244,7 +244,7 @@ index 62a4197f..9e5379b9 100644
'<(submodules_loc)/crl/src',
],
'sources': [
-@@ -113,7 +99,6 @@
+@@ -114,7 +100,6 @@
'CUSTOM_API_ID',
],
'dependencies': [
@@ -253,7 +253,7 @@ index 62a4197f..9e5379b9 100644
}],
],
diff --git a/Telegram/gyp/codegen_rules.gypi b/Telegram/gyp/codegen_rules.gypi
-index bb611a87..a2e54f67 100644
+index bb611a87f..a2e54f67f 100644
--- a/Telegram/gyp/codegen_rules.gypi
+++ b/Telegram/gyp/codegen_rules.gypi
@@ -15,7 +15,7 @@
@@ -291,7 +291,7 @@ index bb611a87..a2e54f67 100644
],
'message': 'codegen_scheme-ing scheme.tl..',
diff --git a/Telegram/gyp/qt.gypi b/Telegram/gyp/qt.gypi
-index 0b783ec2..653562ff 100644
+index 0b783ec21..653562ffb 100644
--- a/Telegram/gyp/qt.gypi
+++ b/Telegram/gyp/qt.gypi
@@ -14,25 +14,21 @@
@@ -462,7 +462,7 @@ index 0b783ec2..653562ff 100644
'-rdynamic',
],
diff --git a/Telegram/gyp/qt_moc.gypi b/Telegram/gyp/qt_moc.gypi
-index 464d3c81..909c4c5a 100644
+index 464d3c818..909c4c5af 100644
--- a/Telegram/gyp/qt_moc.gypi
+++ b/Telegram/gyp/qt_moc.gypi
@@ -12,12 +12,13 @@
@@ -482,7 +482,7 @@ index 464d3c81..909c4c5a 100644
'<(RULE_INPUT_PATH)',
'-o', '<(SHARED_INTERMEDIATE_DIR)/<(_target_name)/moc/moc_<(RULE_INPUT_ROOT).cpp',
diff --git a/Telegram/gyp/qt_rcc.gypi b/Telegram/gyp/qt_rcc.gypi
-index f5624a82..b644ce29 100644
+index f5624a82b..b644ce29f 100644
--- a/Telegram/gyp/qt_rcc.gypi
+++ b/Telegram/gyp/qt_rcc.gypi
@@ -15,7 +15,7 @@
@@ -495,7 +495,7 @@ index f5624a82..b644ce29 100644
'-no-compress',
'<(RULE_INPUT_PATH)',
diff --git a/Telegram/gyp/settings_linux.gypi b/Telegram/gyp/settings_linux.gypi
-index 03284c1d..9b6f0c51 100644
+index 03284c1d0..9b6f0c510 100644
--- a/Telegram/gyp/settings_linux.gypi
+++ b/Telegram/gyp/settings_linux.gypi
@@ -9,10 +9,6 @@
@@ -518,7 +518,7 @@ index 03284c1d..9b6f0c51 100644
],
'cflags_c': [
diff --git a/Telegram/gyp/telegram_linux.gypi b/Telegram/gyp/telegram_linux.gypi
-index 22f3e161..10d73e48 100644
+index 22f3e161a..10d73e482 100644
--- a/Telegram/gyp/telegram_linux.gypi
+++ b/Telegram/gyp/telegram_linux.gypi
@@ -7,7 +7,7 @@
@@ -651,19 +651,19 @@ index 22f3e161..10d73e48 100644
],
}]
diff --git a/Telegram/gyp/telegram_sources.txt b/Telegram/gyp/telegram_sources.txt
-index f60aba58..d01a9eff 100644
+index b980b4cda..d699f2422 100644
--- a/Telegram/gyp/telegram_sources.txt
+++ b/Telegram/gyp/telegram_sources.txt
-@@ -753,7 +753,7 @@
+@@ -775,7 +775,7 @@
+ <(src_loc)/messenger.h
+ <(src_loc)/observer_peer.cpp
<(src_loc)/observer_peer.h
- <(src_loc)/passcodewidget.cpp
- <(src_loc)/passcodewidget.h
-<(src_loc)/qt_static_plugins.cpp
+<(src_loc)/qt_functions.cpp
<(src_loc)/settings.cpp
<(src_loc)/settings.h
<(src_loc)/shortcuts.cpp
-@@ -764,13 +764,6 @@
+@@ -786,13 +786,6 @@
<(emoji_suggestions_loc)/emoji_suggestions.h
platforms: !win
@@ -678,7 +678,7 @@ index f60aba58..d01a9eff 100644
platforms: mac
<(sp_media_key_tap_loc)/SPMediaKeyTap.m
diff --git a/lib/xdg/telegramdesktop.appdata.xml b/lib/xdg/telegramdesktop.appdata.xml
-index 7bcf8d83..4508c01c 100644
+index 7bcf8d835..4508c01cd 100644
--- a/lib/xdg/telegramdesktop.appdata.xml
+++ b/lib/xdg/telegramdesktop.appdata.xml
@@ -1,6 +1,6 @@
@@ -690,7 +690,7 @@ index 7bcf8d83..4508c01c 100644
<project_license>GPL-3.0</project_license>
<name>Telegram Desktop</name>
diff --git a/lib/xdg/telegramdesktop.desktop b/lib/xdg/telegramdesktop.desktop
-index 0a806951..550b9f78 100644
+index 0a8069512..550b9f785 100644
--- a/lib/xdg/telegramdesktop.desktop
+++ b/lib/xdg/telegramdesktop.desktop
@@ -1,9 +1,11 @@
@@ -708,5 +708,5 @@ index 0a806951..550b9f78 100644
StartupWMClass=TelegramDesktop
Type=Application
--
-2.17.0
+2.17.1
diff --git a/telegram-desktop.spec b/telegram-desktop.spec
index 4e51905..62a4166 100644
--- a/telegram-desktop.spec
+++ b/telegram-desktop.spec
@@ -2,7 +2,7 @@
%global appname tdesktop
# Git revision of crl...
-%global commit1 344cbde9ae8d89a6530408d3176d2754ae0ff0e2
+%global commit1 c739b14bc04ca3ce740893fef9bffe2bcca99629
%global shortcommit1 %(c=%{commit1}; echo ${c:0:7})
# Decrease debuginfo verbosity to reduce memory consumption...
@@ -10,7 +10,7 @@
Summary: Telegram Desktop official messaging app
Name: telegram-desktop
-Version: 1.3.0
+Version: 1.3.7
Release: 1%{?dist}
# Application and 3rd-party modules licensing:
@@ -46,12 +46,12 @@ BuildRequires: gyp
# Development packages for Telegram Desktop...
BuildRequires: guidelines-support-library-devel
+BuildRequires: libtgvoip-devel >= 2.1
BuildRequires: libappindicator-devel
BuildRequires: mapbox-variant-devel
BuildRequires: ffmpeg-devel >= 3.1
BuildRequires: openal-soft-devel
BuildRequires: qt5-qtbase-devel
-BuildRequires: libtgvoip-devel
BuildRequires: libstdc++-devel
BuildRequires: range-v3-devel
BuildRequires: openssl-devel
@@ -134,6 +134,24 @@ appstream-util validate-relax --nonet "%{buildroot}%{_datadir}/metainfo/%{name}.
%{_datadir}/metainfo/%{name}.appdata.xml
%changelog
+* Mon Jun 11 2018 Vitaly Zaitsev <vitaly(a)easycoding.org> - 1.3.7-1
+- Updated to 1.3.7.
+
+* Mon Jun 11 2018 Vitaly Zaitsev <vitaly(a)easycoding.org> - 1.3.6-1
+- Updated to 1.3.6 (alpha).
+
+* Sat Jun 09 2018 Vitaly Zaitsev <vitaly(a)easycoding.org> - 1.3.5-1
+- Updated to 1.3.5 (alpha).
+
+* Fri Jun 08 2018 Vitaly Zaitsev <vitaly(a)easycoding.org> - 1.3.4-1
+- Updated to 1.3.4 (alpha).
+
+* Thu Jun 07 2018 Vitaly Zaitsev <vitaly(a)easycoding.org> - 1.3.3-1
+- Updated to 1.3.3 (alpha).
+
+* Tue Jun 05 2018 Vitaly Zaitsev <vitaly(a)easycoding.org> - 1.3.1-1
+- Updated to 1.3.1 (alpha).
+
* Fri Jun 01 2018 Vitaly Zaitsev <vitaly(a)easycoding.org> - 1.3.0-1
- Updated to 1.3.0.
5 years, 11 months