[telegram-desktop/f27] Updated to version 1.3.8.
by Vitaly Zaitsev
commit 922ceb9da3e33ac97a0cab736c86c41b96de6afa
Author: Vitaly Zaitsev <vitaly(a)easycoding.org>
Date: Sun Jun 24 23:26:59 2018 +0200
Updated to version 1.3.8.
.gitignore | 2 +
sources | 4 +-
telegram-desktop-build-fixes.patch | 136 ++++++++++++++++++++++++------------
telegram-desktop-system-fonts.patch | 29 +++++---
telegram-desktop.spec | 7 +-
5 files changed, 120 insertions(+), 58 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 07533b3..b338edf 100644
--- a/.gitignore
+++ b/.gitignore
@@ -48,3 +48,5 @@
/tdesktop-1.3.0.tar.gz
/crl-c739b14.tar.gz
/tdesktop-1.3.7.tar.gz
+/crl-9bc641f.tar.gz
+/tdesktop-1.3.8.tar.gz
diff --git a/sources b/sources
index 14b6f21..c204545 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-d1a2a0fe64b34fbd74a5eb7322efd54b crl-c739b14.tar.gz
-47dc4b64dab195b7c39e8a1b36b995d4 tdesktop-1.3.7.tar.gz
+a83f06b2b163c242d20e1ff74711b7d5 crl-9bc641f.tar.gz
+c39c06c2ab3ee1c77a1dd1d8fbae51f9 tdesktop-1.3.8.tar.gz
diff --git a/telegram-desktop-build-fixes.patch b/telegram-desktop-build-fixes.patch
index d54209b..7b18e24 100644
--- a/telegram-desktop-build-fixes.patch
+++ b/telegram-desktop-build-fixes.patch
@@ -1,4 +1,4 @@
-From b65b42d74da33e51598967b7f9110b6af8e2106b Mon Sep 17 00:00:00 2001
+From 53b49781f0c34857ac25117d1ee79d1924c737ce 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.
@@ -7,19 +7,21 @@ Subject: [PATCH] Fixed build under Fedora using rpmbuild and mock.
Telegram/Resources/qrc/telegram_linux.qrc | 1 -
Telegram/SourceFiles/core/launcher.cpp | 1 +
Telegram/SourceFiles/qt_functions.cpp | 94 +++++++++++++++++++++++
- Telegram/gyp/CMakeLists.inj | 3 +
+ Telegram/gyp/CMakeLists.inj | 4 +
Telegram/gyp/PrecompiledHeader.cmake | 4 +-
Telegram/gyp/Telegram.gyp | 29 ++-----
- Telegram/gyp/codegen_rules.gypi | 8 +-
+ Telegram/gyp/codegen_rules.gypi | 6 +-
+ Telegram/gyp/lib_export.gyp | 6 +-
+ Telegram/gyp/lib_scheme.gyp | 2 +-
Telegram/gyp/qt.gypi | 87 ++++++---------------
Telegram/gyp/qt_moc.gypi | 5 +-
Telegram/gyp/qt_rcc.gypi | 2 +-
- Telegram/gyp/settings_linux.gypi | 5 --
- Telegram/gyp/telegram_linux.gypi | 86 +++++----------------
+ Telegram/gyp/settings_linux.gypi | 25 +-----
+ Telegram/gyp/telegram_linux.gypi | 73 +++++-------------
Telegram/gyp/telegram_sources.txt | 9 +--
lib/xdg/telegramdesktop.appdata.xml | 2 +-
lib/xdg/telegramdesktop.desktop | 6 +-
- 15 files changed, 165 insertions(+), 177 deletions(-)
+ 17 files changed, 170 insertions(+), 186 deletions(-)
create mode 100644 Telegram/SourceFiles/qt_functions.cpp
create mode 100644 Telegram/gyp/CMakeLists.inj
@@ -34,7 +36,7 @@ index 0554fa179..3ea027406 100644
</qresource>
</RCC>
diff --git a/Telegram/SourceFiles/core/launcher.cpp b/Telegram/SourceFiles/core/launcher.cpp
-index 5c97c40eb..c4dc8d22c 100644
+index 207885898..872438eea 100644
--- a/Telegram/SourceFiles/core/launcher.cpp
+++ b/Telegram/SourceFiles/core/launcher.cpp
@@ -57,6 +57,7 @@ int Launcher::exec() {
@@ -147,18 +149,19 @@ index 000000000..4a722b8d7
+}
diff --git a/Telegram/gyp/CMakeLists.inj b/Telegram/gyp/CMakeLists.inj
new file mode 100644
-index 000000000..6207bc741
+index 000000000..bbee42894
--- /dev/null
+++ b/Telegram/gyp/CMakeLists.inj
-@@ -0,0 +1,3 @@
+@@ -0,0 +1,4 @@
+set_target_properties(Telegram PROPERTIES SKIP_BUILD_RPATH TRUE)
+include(../../Telegram/gyp/PrecompiledHeader.cmake)
+add_precompiled_header(Telegram ../../Telegram/SourceFiles/stdafx.h)
++add_precompiled_header(lib_export ../../Telegram/SourceFiles/export/export_pch.h)
diff --git a/Telegram/gyp/PrecompiledHeader.cmake b/Telegram/gyp/PrecompiledHeader.cmake
-index 5d6830e96..c3f08d3f6 100644
+index a0e1e0489..bd9bce0c1 100644
--- a/Telegram/gyp/PrecompiledHeader.cmake
+++ b/Telegram/gyp/PrecompiledHeader.cmake
-@@ -112,7 +112,7 @@ function(add_precompiled_header _target _input)
+@@ -114,7 +114,7 @@ function(add_precompiled_header _target _input)
set(_compiler_FLAGS "@${_pch_c_flags_file}")
add_custom_command(
OUTPUT "${_output_c}"
@@ -167,7 +170,7 @@ index 5d6830e96..c3f08d3f6 100644
DEPENDS "${_pchfile}" "${_pch_c_flags_file}"
IMPLICIT_DEPENDS C "${_pch_header}"
COMMENT "Precompiling ${_name} for ${_target} (C)")
-@@ -123,7 +123,7 @@ function(add_precompiled_header _target _input)
+@@ -125,7 +125,7 @@ function(add_precompiled_header _target _input)
set(_compiler_FLAGS "@${_pch_cpp_flags_file}")
add_custom_command(
OUTPUT "${_output_cxx}"
@@ -175,9 +178,9 @@ index 5d6830e96..c3f08d3f6 100644
+ COMMAND "${CMAKE_CXX_COMPILER}" "$(CXX_DEFINES)" "$(CXX_INCLUDES)" "$(CXX_FLAGS)" -x c++-header -o "${_output_cxx}" -c "${_pchfile}"
DEPENDS "${_pchfile}" "${_pch_cpp_flags_file}"
IMPLICIT_DEPENDS CXX "${_pch_header}"
- COMMENT "Precompiling ${_name} for ${_target} (C++)")
+ COMMENT "Precompiling header ${_name} for ${_target} (C++)")
diff --git a/Telegram/gyp/Telegram.gyp b/Telegram/gyp/Telegram.gyp
-index 2261f6de9..883597579 100644
+index 65917d9b5..bb02ca01b 100644
--- a/Telegram/gyp/Telegram.gyp
+++ b/Telegram/gyp/Telegram.gyp
@@ -18,7 +18,6 @@
@@ -188,12 +191,14 @@ index 2261f6de9..883597579 100644
'sp_media_key_tap_loc': '<(submodules_loc)/SPMediaKeyTap',
'emoji_suggestions_loc': '<(submodules_loc)/emoji_suggestions',
'style_files': [
-@@ -50,13 +49,11 @@
+@@ -51,15 +50,13 @@
'pt-BR',
],
'build_defines%': '',
- 'list_sources_command': 'python <(DEPTH)/list_sources.py --input <(DEPTH)/telegram_sources.txt --replace src_loc=<(src_loc)',
+ 'list_sources_command': 'python2 <(DEPTH)/list_sources.py --input <(DEPTH)/telegram_sources.txt --replace src_loc=<(src_loc)',
+ 'pch_source': '<(src_loc)/stdafx.cpp',
+ 'pch_header': '<(src_loc)/stdafx.h',
},
'includes': [
'common_executable.gypi',
@@ -203,7 +208,7 @@ index 2261f6de9..883597579 100644
'telegram_linux.gypi',
'qt.gypi',
'qt_moc.gypi',
-@@ -69,34 +66,23 @@
+@@ -73,35 +70,24 @@
'codegen.gyp:codegen_lang',
'codegen.gyp:codegen_numbers',
'codegen.gyp:codegen_style',
@@ -211,6 +216,7 @@ index 2261f6de9..883597579 100644
- 'utils.gyp:Updater',
- '../ThirdParty/libtgvoip/libtgvoip.gyp:libtgvoip',
'crl.gyp:crl',
+ 'lib_export.gyp:lib_export',
],
'defines': [
@@ -244,7 +250,7 @@ index 2261f6de9..883597579 100644
'<(submodules_loc)/crl/src',
],
'sources': [
-@@ -114,7 +100,6 @@
+@@ -120,7 +106,6 @@
'CUSTOM_API_ID',
],
'dependencies': [
@@ -253,7 +259,7 @@ index 2261f6de9..883597579 100644
}],
],
diff --git a/Telegram/gyp/codegen_rules.gypi b/Telegram/gyp/codegen_rules.gypi
-index bb611a87f..a2e54f67f 100644
+index a901db3bb..424f70eea 100644
--- a/Telegram/gyp/codegen_rules.gypi
+++ b/Telegram/gyp/codegen_rules.gypi
@@ -15,7 +15,7 @@
@@ -281,15 +287,36 @@ index bb611a87f..a2e54f67f 100644
'-o', '<(SHARED_INTERMEDIATE_DIR)/update_dependent_qrc.timestamp',
'<@(qrc_files)',
],
-@@ -109,7 +109,7 @@
- '<(SHARED_INTERMEDIATE_DIR)/scheme.h',
+diff --git a/Telegram/gyp/lib_export.gyp b/Telegram/gyp/lib_export.gyp
+index 0d368e2e7..6250ef782 100644
+--- a/Telegram/gyp/lib_export.gyp
++++ b/Telegram/gyp/lib_export.gyp
+@@ -44,9 +44,9 @@
+ 'include_dirs': [
+ '<(src_loc)',
+ '<(SHARED_INTERMEDIATE_DIR)',
+- '<(libs_loc)/range-v3/include',
+- '<(submodules_loc)/GSL/include',
+- '<(submodules_loc)/variant/include',
++ '<!(rpm --eval "%{_includedir}")/range-v3',
++ '<!(rpm --eval "%{_includedir}")/guidelines-support-library',
++ '<!(rpm --eval "%{_includedir}")/mapbox',
+ '<(submodules_loc)/crl/src',
],
- 'action': [
-- 'python', '<(src_loc)/codegen/scheme/codegen_scheme.py',
-+ 'python2', '<(src_loc)/codegen/scheme/codegen_scheme.py',
- '-o', '<(SHARED_INTERMEDIATE_DIR)', '<(res_loc)/scheme.tl',
+ 'sources': [
+diff --git a/Telegram/gyp/lib_scheme.gyp b/Telegram/gyp/lib_scheme.gyp
+index b52a9d071..a74ac1646 100644
+--- a/Telegram/gyp/lib_scheme.gyp
++++ b/Telegram/gyp/lib_scheme.gyp
+@@ -35,7 +35,7 @@
+ 'include_dirs': [
+ '<(src_loc)',
+ '<(SHARED_INTERMEDIATE_DIR)',
+- '<(submodules_loc)/GSL/include',
++ '<!(rpm --eval "%{_includedir}")/guidelines-support-library',
],
- 'message': 'codegen_scheme-ing scheme.tl..',
+ 'actions': [{
+ 'action_name': 'codegen_scheme',
diff --git a/Telegram/gyp/qt.gypi b/Telegram/gyp/qt.gypi
index 0b783ec21..653562ffb 100644
--- a/Telegram/gyp/qt.gypi
@@ -495,7 +522,7 @@ index f5624a82b..b644ce29f 100644
'-no-compress',
'<(RULE_INPUT_PATH)',
diff --git a/Telegram/gyp/settings_linux.gypi b/Telegram/gyp/settings_linux.gypi
-index 03284c1d0..9b6f0c510 100644
+index 17219fa2c..9b6f0c510 100644
--- a/Telegram/gyp/settings_linux.gypi
+++ b/Telegram/gyp/settings_linux.gypi
@@ -9,10 +9,6 @@
@@ -509,7 +536,25 @@ index 03284c1d0..9b6f0c510 100644
'-fPIC',
'-Wno-unused-variable',
'-Wno-unused-parameter',
-@@ -47,7 +43,6 @@
+@@ -43,24 +39,10 @@
+ 'sources': [ '__Wrong_Official_Build_Target_<(official_build_target)_' ],
+ }],
+ ],
+- }], [ '"<!(uname -p)" == "x86_64"', {
+- # 32 bit version can't be linked with debug info or LTO,
+- # virtual memory exhausted :(
+- 'cflags_c': [ '-g' ],
+- 'cflags_cc': [ '-g' ],
+- 'ldflags': [ '-g' ],
+- 'configurations': {
+- 'Release': {
+- 'cflags_c': [ '-flto' ],
+- 'cflags_cc': [ '-flto' ],
+- 'ldflags': [ '-flto', '-fuse-linker-plugin' ],
+- },
+- },
+- }]
++ }],
],
'defines': [
'_REENTRANT',
@@ -517,8 +562,20 @@ index 03284c1d0..9b6f0c510 100644
'QT_PLUGIN',
],
'cflags_c': [
+@@ -72,11 +54,6 @@
+ '-std=c++1z',
+ '-Wno-register',
+ ],
+- 'make_global_settings': [
+- ['AR', '/usr/bin/gcc-ar'],
+- ['RANLIB', '/usr/bin/gcc-ranlib'],
+- ['NM', '/usr/bin/gcc-nm'],
+- ],
+ 'configurations': {
+ 'Debug': {
+ },
diff --git a/Telegram/gyp/telegram_linux.gypi b/Telegram/gyp/telegram_linux.gypi
-index 22f3e161a..10d73e482 100644
+index 01231c4d1..33b19fe06 100644
--- a/Telegram/gyp/telegram_linux.gypi
+++ b/Telegram/gyp/telegram_linux.gypi
@@ -7,7 +7,7 @@
@@ -598,7 +655,7 @@ index 22f3e161a..10d73e482 100644
# '<!(pkg-config 2> /dev/null --libs <@(pkgconfig_libs))',
],
'cflags_cc': [
-@@ -66,49 +45,24 @@
+@@ -66,36 +45,24 @@
'-Wno-maybe-uninitialized',
],
'ldflags': [
@@ -623,20 +680,7 @@ index 22f3e161a..10d73e482 100644
},
},
'conditions': [
-- [ '"<!(uname -p)" == "x86_64"', {
-- # 32 bit version can't be linked with debug info or LTO,
-- # virtual memory exhausted :(
-- 'cflags_c': [ '-g' ],
-- 'cflags_cc': [ '-g' ],
-- 'ldflags': [ '-g' ],
-- 'configurations': {
-- 'Release': {
-- 'cflags_c': [ '-flto' ],
-- 'cflags_cc': [ '-flto' ],
-- 'ldflags': [ '-flto' ],
-- },
-- },
-- }, {
+- [ '"<!(uname -p)" != "x86_64"', {
- 'ldflags': [
- '-Wl,-wrap,__divmoddi4',
- ],
@@ -651,10 +695,10 @@ index 22f3e161a..10d73e482 100644
],
}]
diff --git a/Telegram/gyp/telegram_sources.txt b/Telegram/gyp/telegram_sources.txt
-index b980b4cda..d699f2422 100644
+index 7a103286b..8a364e8ae 100644
--- a/Telegram/gyp/telegram_sources.txt
+++ b/Telegram/gyp/telegram_sources.txt
-@@ -775,7 +775,7 @@
+@@ -789,7 +789,7 @@
<(src_loc)/messenger.h
<(src_loc)/observer_peer.cpp
<(src_loc)/observer_peer.h
@@ -663,7 +707,7 @@ index b980b4cda..d699f2422 100644
<(src_loc)/settings.cpp
<(src_loc)/settings.h
<(src_loc)/shortcuts.cpp
-@@ -786,13 +786,6 @@
+@@ -798,13 +798,6 @@
<(emoji_suggestions_loc)/emoji_suggestions.h
platforms: !win
diff --git a/telegram-desktop-system-fonts.patch b/telegram-desktop-system-fonts.patch
index 8d6202d..ab1475d 100644
--- a/telegram-desktop-system-fonts.patch
+++ b/telegram-desktop-system-fonts.patch
@@ -1,14 +1,22 @@
-Description: Remove links to packaged Open Sans font
- This makes Telegram Desktop use system-wide fonts.
- Warnings about non-existent fonts in resources are also disabled.
-Author: Nicholas Guriev <guriev-ns(a)ya.ru>
-Bug-Debian: https://bugs.debian.org/890341
-Last-Update: Sat, 31 Mar 2018 14:36:39 +0300
+From b2dc2e3a61740b7a61ec1f7c916eeff49f849bd5 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] Backported and rebased patch from Debian maintainer Nicholas
+ Guriev. Removed links to packaged Open Sans fonts. Telegram Desktop will use
+ packaged versions.
+---
+ Telegram/Resources/qrc/telegram.qrc | 3 ---
+ Telegram/SourceFiles/ui/twidget.cpp | 6 +++---
+ 2 files changed, 3 insertions(+), 6 deletions(-)
+
+diff --git a/Telegram/Resources/qrc/telegram.qrc b/Telegram/Resources/qrc/telegram.qrc
+index 48b4398eb..be995db75 100644
--- a/Telegram/Resources/qrc/telegram.qrc
+++ b/Telegram/Resources/qrc/telegram.qrc
-@@ -1,8 +1,5 @@
- <RCC>
+@@ -3,9 +3,6 @@
+ <file alias="css/style.css">../css/export_style.css</file>
+ </qresource>
<qresource prefix="/gui">
- <file alias="fonts/OpenSans-Regular.ttf">../fonts/OpenSans-Regular.ttf</file>
- <file alias="fonts/OpenSans-Bold.ttf">../fonts/OpenSans-Bold.ttf</file>
@@ -16,6 +24,8 @@ Last-Update: Sat, 31 Mar 2018 14:36:39 +0300
<file alias="art/bg.jpg">../art/bg.jpg</file>
<file alias="art/bg_initial.jpg">../art/bg_initial.jpg</file>
<file alias="art/logo_256.png">../art/logo_256.png</file>
+diff --git a/Telegram/SourceFiles/ui/twidget.cpp b/Telegram/SourceFiles/ui/twidget.cpp
+index 0f610cb8a..3b06f27cd 100644
--- a/Telegram/SourceFiles/ui/twidget.cpp
+++ b/Telegram/SourceFiles/ui/twidget.cpp
@@ -70,9 +70,9 @@ void Start() {
@@ -31,3 +41,6 @@ Last-Update: Sat, 31 Mar 2018 14:36:39 +0300
#ifdef Q_OS_WIN
// Attempt to workaround a strange font bug with Open Sans Semibold not loading.
+--
+2.17.1
+
diff --git a/telegram-desktop.spec b/telegram-desktop.spec
index 62a4166..f18aa1c 100644
--- a/telegram-desktop.spec
+++ b/telegram-desktop.spec
@@ -2,7 +2,7 @@
%global appname tdesktop
# Git revision of crl...
-%global commit1 c739b14bc04ca3ce740893fef9bffe2bcca99629
+%global commit1 9bc641f2d4ab140a84aea64c7f2d4669f7633246
%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.7
+Version: 1.3.8
Release: 1%{?dist}
# Application and 3rd-party modules licensing:
@@ -134,6 +134,9 @@ appstream-util validate-relax --nonet "%{buildroot}%{_datadir}/metainfo/%{name}.
%{_datadir}/metainfo/%{name}.appdata.xml
%changelog
+* Sun Jun 24 2018 Vitaly Zaitsev <vitaly(a)easycoding.org> - 1.3.8-1
+- Updated to 1.3.8.
+
* Mon Jun 11 2018 Vitaly Zaitsev <vitaly(a)easycoding.org> - 1.3.7-1
- Updated to 1.3.7.
5 years, 10 months
[qt5-qtwebengine-freeworld] drop use_system_ffmpeg (QTBUG-65086)
by Rex Dieter
commit 4bd8ab6db7fb979c0fdc7d98dd8044218b729935
Author: Rex Dieter <rdieter(a)gmail.com>
Date: Sat Jun 23 21:46:55 2018 -0500
drop use_system_ffmpeg (QTBUG-65086)
qt5-qtwebengine-freeworld.spec | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
---
diff --git a/qt5-qtwebengine-freeworld.spec b/qt5-qtwebengine-freeworld.spec
index 6509b9f..3af6637 100644
--- a/qt5-qtwebengine-freeworld.spec
+++ b/qt5-qtwebengine-freeworld.spec
@@ -13,7 +13,8 @@
%global use_system_libwebp 1
%if 0%{?use_system_libwebp}
# only supported when using also libwebp from the system (see configure.json)
-%global use_system_ffmpeg 1
+# FTBFS: appears to be https://bugreports.qt.io/browse/QTBUG-65086
+#global use_system_ffmpeg 1
%endif
# NEON support on ARM (detected at runtime) - disable this if you are hitting
@@ -427,6 +428,7 @@ echo "%{_libdir}/%{name}" \
- rebase no-icudtl-dat.patch
- patches needswork: system-nspr-prtime,system-icu-utf,no-sse2,skia-neon,icu59
- use macros %%make_build %%ldconfig_scriptlets %%__ninja %%__ninja_common_opts
+- drop use_system_ffmpeg (QTBUG-65086)
* Mon May 21 2018 Kevin Kofler <Kevin(a)tigcc.ticalc.org> - 5.10.1-5
- Use the FFmpeg 4 patch from Arch Linux, the previous one crashed (rh#1563446)
5 years, 10 months
[qt5-qtwebengine-freeworld] 5.11.1 drop shadow build (to match other qt5 packages where it has been problematic) drop upstreamed
by Rex Dieter
commit c1f9f1ca2014b4d6db980265bcff7f93a9123b3c
Author: Rex Dieter <rdieter(a)gmail.com>
Date: Sat Jun 23 10:51:56 2018 -0500
5.11.1
drop shadow build (to match other qt5 packages where it has been problematic)
drop upstreamed patches
rebase no-icudtl-dat.patch
patches needswork: system-nspr-prtime,system-icu-utf,no-sse2,skia-neon,icu59
use macros %make_build %ldconfig_scriptlets %__ninja %__ninja_common_opts
.gitignore | 1 +
qt5-qtwebengine-freeworld.spec | 65 ++++++++++------------
...ngine-everywhere-src-5.11.0-no-icudtl-dat.patch | 22 +++++---
sources | 2 +-
4 files changed, 44 insertions(+), 46 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 7872c80..6548e2e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -7,3 +7,4 @@
/qtwebengine-opensource-src-5.9.3.tar.xz
/qtwebengine-everywhere-src-5.10.0.tar.xz
/qtwebengine-everywhere-src-5.10.1.tar.xz
+/qtwebengine-everywhere-src-5.11.1.tar.xz
diff --git a/qt5-qtwebengine-freeworld.spec b/qt5-qtwebengine-freeworld.spec
index d7bee1a..6509b9f 100644
--- a/qt5-qtwebengine-freeworld.spec
+++ b/qt5-qtwebengine-freeworld.spec
@@ -40,8 +40,8 @@
Summary: Qt5 - QtWebEngine components (freeworld version)
Name: qt5-qtwebengine-freeworld
-Version: 5.10.1
-Release: 5%{?dist}
+Version: 5.11.1
+Release: 1%{?dist}
%global major_minor %(echo %{version} | cut -d. -f-2)
%global major %(echo %{version} | cut -d. -f1)
@@ -58,7 +58,7 @@ Patch0: qtwebengine-everywhere-src-5.10.0-linux-pri.patch
# 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-opensource-src-5.6.0-no-icudtl-dat.patch
+Patch1: qtwebengine-everywhere-src-5.11.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.9.0-fix-extractcflag.patch
@@ -103,18 +103,6 @@ Patch22: qtwebengine-everywhere-src-5.10.0-icu59.patch
# to get the value we expect (and chromium checks for). Patch by spot.
Patch23: qtwebengine-everywhere-src-5.10.1-gcc8-alignof.patch
## Upstream patches:
-# drop support for obsolete Unicode "aspirational scripts" (dropped in UTS 31),
-# fixes #error with ICU >= 60 (which was a reminder to double-check the list)
-# see: http://www.unicode.org/reports/tr31/#Aspirational_Use_Scripts
-# backport of: https://chromium-review.googlesource.com/c/chromium/src/+/731871
-Patch100: qtwebengine-everywhere-src-5.10.0-no-aspirational-scripts.patch
-# forward-port security backports from 5.9.5 LTS (up to Chromium 65.0.3325.146)
-# see the patch metadata for the list of fixed CVEs and Chromium bug IDs
-# omit the Chromium bug 806122 fix because we use the system FFmpeg
-Patch101: qtwebengine-everywhere-src-5.10.1-security-5.9.5.patch
-# fix incomplete (and thus having no effect) fix for CVE-2018-6033 in 5.10.1
-# (forward-ported from 5.9.5, will also be included in 5.11)
-Patch102: qtwebengine-everywhere-src-5.10.1-CVE-2018-6033.patch
# fix build with FFmpeg 4 (apply conditionally because it breaks older FFmpeg)
# backport of: https://chromium-review.googlesource.com/c/chromium/src/+/754261
# https://chromium-review.googlesource.com/c/chromium/src/+/889686
@@ -337,22 +325,23 @@ This version is compiled with support for patent-encumbered codecs enabled.
%if !0%{?arm_neon}
%patch3 -p1 -b .no-neon
%endif
-%patch4 -p1 -b .system-nspr-prtime
-%patch5 -p1 -b .system-icu-utf
-%patch6 -p1 -b .no-sse2
+#patch4 -p1 -b .system-nspr-prtime
+#patch5 -p1 -b .system-icu-utf
+#patch6 -p1 -b .no-sse2
+%ifarch %{ix86}
+#global sse2 1
+%endif
%patch9 -p1 -b .arm-fpu-fix
%patch10 -p1 -b .openmax-dl-neon
-%patch11 -p1 -b .skia-neon
+#patch11 -p1 -b .skia-neon
%patch12 -p1 -b .webrtc-neon-detect
%patch21 -p1 -b .gn-bootstrap-verbose
-%patch22 -p1 -b .icu59
+#patch22 -p1 -b .icu59
%patch23 -p1 -b .gcc8
-%patch100 -p1 -b .no-aspirational-scripts
-%patch101 -p1 -b .security-5.9.5
-%patch102 -p1 -b .CVE-2018-6033
-%if 0%{?fedora} > 27
-%patch103 -p1 -b .ffmpeg4
-%endif
+## keep around in case it needs reverting for older ffmpeg
+#if 0%{?fedora} > 27
+#patch103 -p1 -b .ffmpeg4
+#endif
# fix // in #include in content/renderer/gpu to avoid debugedit failure
sed -i -e 's!gpu//!gpu/!g' \
src/3rdparty/chromium/content/renderer/gpu/compositor_forwarding_message_filter.cc
@@ -399,16 +388,13 @@ cp -p src/3rdparty/chromium/LICENSE LICENSE.Chromium
%build
export STRIP=strip
-export NINJAFLAGS="-v %{_smp_mflags}"
-export NINJA_PATH=%{_bindir}/ninja-build
-
-mkdir %{_target_platform}
-pushd %{_target_platform}
+export NINJAFLAGS="%{__ninja_common_opts}"
+export NINJA_PATH=%{__ninja}
%{qmake_qt5} CONFIG+="%{debug_config}" \
- QMAKE_EXTRA_ARGS+="-system-webengine-icu %{?system_ffmpeg_flag} -proprietary-codecs" ..
+ QMAKE_EXTRA_ARGS+="-system-webengine-icu %{?system_ffmpeg_flag} -proprietary-codecs" .
-make %{?_smp_mflags}
+%make_build
%install
# install the libraries to a special directory to avoid conflict with official
@@ -416,7 +402,7 @@ make %{?_smp_mflags}
# qt5-qtwebengine for them instead)
mkdir -p %{buildroot}%{_libdir}/%{name}
for i in libQt5WebEngineCore libQt5WebEngine libQt5WebEngineWidgets ; do
- install -m 755 -p %{_target_platform}/lib/$i.so.%{version} %{buildroot}%{_libdir}/%{name}/
+ install -m 755 -p lib/$i.so.%{version} %{buildroot}%{_libdir}/%{name}/
ln -sf $i.so.%{version} %{buildroot}%{_libdir}/%{name}/$i.so.%{major}
ln -sf $i.so.%{version} %{buildroot}%{_libdir}/%{name}/$i.so.%{major_minor}
done
@@ -426,8 +412,7 @@ mkdir -p %{buildroot}%{_sysconfdir}/ld.so.conf.d
echo "%{_libdir}/%{name}" \
>%{buildroot}%{_sysconfdir}/ld.so.conf.d/%{name}-%{_arch}.conf
-%post -p /sbin/ldconfig
-%postun -p /sbin/ldconfig
+%ldconfig_scriptlets
%files
%license LICENSE.* src/webengine/doc/src/qtwebengine-3rdparty.qdoc
@@ -435,6 +420,14 @@ echo "%{_libdir}/%{name}" \
%config(noreplace) %{_sysconfdir}/ld.so.conf.d/%{name}-%{_arch}.conf
%changelog
+* Sat Jun 23 2018 Rex Dieter <rdieter(a)fedoraproject.org> - 5.11.1-1
+- 5.11.1
+- drop shadow build (to match other qt5 packages where it has been problematic)
+- drop upstreamed patches
+- rebase no-icudtl-dat.patch
+- patches needswork: system-nspr-prtime,system-icu-utf,no-sse2,skia-neon,icu59
+- use macros %%make_build %%ldconfig_scriptlets %%__ninja %%__ninja_common_opts
+
* Mon May 21 2018 Kevin Kofler <Kevin(a)tigcc.ticalc.org> - 5.10.1-5
- Use the FFmpeg 4 patch from Arch Linux, the previous one crashed (rh#1563446)
- Add patch by spot from the Fedora Chromium RPM for FTBFS with GCC 8 on i686
diff --git a/qtwebengine-opensource-src-5.6.0-no-icudtl-dat.patch b/qtwebengine-everywhere-src-5.11.0-no-icudtl-dat.patch
similarity index 63%
rename from qtwebengine-opensource-src-5.6.0-no-icudtl-dat.patch
rename to qtwebengine-everywhere-src-5.11.0-no-icudtl-dat.patch
index 00cbfc2..59da86e 100644
--- a/qtwebengine-opensource-src-5.6.0-no-icudtl-dat.patch
+++ b/qtwebengine-everywhere-src-5.11.0-no-icudtl-dat.patch
@@ -1,12 +1,17 @@
-diff -ur qtwebengine-opensource-src-5.6.0/src/core/web_engine_library_info.cpp qtwebengine-opensource-src-5.6.0-no-icudtl-dat/src/core/web_engine_library_info.cpp
---- qtwebengine-opensource-src-5.6.0/src/core/web_engine_library_info.cpp 2016-03-03 17:02:28.000000000 +0100
-+++ qtwebengine-opensource-src-5.6.0-no-icudtl-dat/src/core/web_engine_library_info.cpp 2016-03-18 03:08:24.385444415 +0100
-@@ -207,24 +207,7 @@
+diff -up qtwebengine-everywhere-src-5.11.0/src/core/web_engine_library_info.cpp.no-icudtl-dat qtwebengine-everywhere-src-5.11.0/src/core/web_engine_library_info.cpp
+--- qtwebengine-everywhere-src-5.11.0/src/core/web_engine_library_info.cpp.no-icudtl-dat 2018-06-14 09:23:48.931195271 -0500
++++ qtwebengine-everywhere-src-5.11.0/src/core/web_engine_library_info.cpp 2018-06-14 09:27:26.248014325 -0500
+@@ -258,28 +258,12 @@ QString dictionariesPath()
+
+ QString icuDataPath()
+ {
+- static bool initialized = false;
+ static QString potentialResourcesPath =
#if defined(OS_MACOSX) && defined(QT_MAC_FRAMEWORK_BUILD)
- return getResourcesPath(frameworkBundle());
+ getResourcesPath(frameworkBundle());
#else
-- static bool initialized = false;
- static QString potentialResourcesPath = QLibraryInfo::location(QLibraryInfo::DataPath) % QLatin1String("/resources");
+ QLibraryInfo::location(QLibraryInfo::DataPath) % QLatin1String("/resources");
+ #endif
- if (!initialized) {
- initialized = true;
- if (!QFileInfo::exists(potentialResourcesPath % QLatin1String("/icudtl.dat"))) {
@@ -22,7 +27,6 @@ diff -ur qtwebengine-opensource-src-5.6.0/src/core/web_engine_library_info.cpp q
- potentialResourcesPath = fallbackDir();
- }
- }
--
+
return potentialResourcesPath;
- #endif
}
diff --git a/sources b/sources
index e5768f5..513105b 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-77374c184f2ff5005d1c61a32ea38491 qtwebengine-everywhere-src-5.10.1.tar.xz
+75d2ff31addba4ec41981b0f459cc587 qtwebengine-everywhere-src-5.11.1.tar.xz
5 years, 10 months
[snes9x/f27] Updated to 1.56.2
by Andrea Musuruane
Summary of changes:
c76179c... Updated to 1.56.2 (*)
(*) This commit already existed in another branch; no separate mail sent
5 years, 10 months
[snes9x/f28] Updated to 1.56.2
by Andrea Musuruane
Summary of changes:
c76179c... Updated to 1.56.2 (*)
(*) This commit already existed in another branch; no separate mail sent
5 years, 10 months
[snes9x] Updated to 1.56.2
by Andrea Musuruane
commit c76179cff25d71072a703b272d5d93b47d0ab9c7
Author: Andrea Musuruane <musuruan(a)gmail.com>
Date: Sat Jun 23 10:52:27 2018 +0200
Updated to 1.56.2
.gitignore | 1 +
snes9x-1.56.1-ppc64.patch | 22 ----------------------
snes9x.spec | 11 +++++------
sources | 2 +-
4 files changed, 7 insertions(+), 29 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index dbbc567..d76e58a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,3 +2,4 @@ snes9x-1.53-src.tar.bz2
/snes9x-1.54.1.tar.gz
/snes9x-1.55.tar.gz
/snes9x-1.56.1.tar.gz
+/snes9x-1.56.2.tar.gz
diff --git a/snes9x.spec b/snes9x.spec
index 3c30e80..fdb436a 100644
--- a/snes9x.spec
+++ b/snes9x.spec
@@ -1,16 +1,13 @@
Summary: Super Nintendo Entertainment System emulator
Name: snes9x
-Version: 1.56.1
-Release: 3%{?dist}
+Version: 1.56.2
+Release: 1%{?dist}
License: Other
URL: http://www.snes9x.com/
Source0: https://github.com/snes9xgit/snes9x/archive/%{version}.tar.gz#/%{name}-%{...
Source1: %{name}.appdata.xml
# Fix CFLAGS usage in CLI version
Patch0: %{name}-1.56.1-unix_flags.patch
-# Fix compiling on ppc64
-# https://github.com/snes9xgit/snes9x/issues/338
-Patch1: %{name}-1.56.1-ppc64.patch
BuildRequires: gcc-c++
BuildRequires: autoconf
BuildRequires: zlib-devel
@@ -52,7 +49,6 @@ This package contains a graphical user interface using GTK+.
%prep
%setup -q
%patch0 -p1
-%patch1 -p1
%build
@@ -116,6 +112,9 @@ appstream-util validate-relax --nonet %{buildroot}%{_datadir}/metainfo/*.appdata
%changelog
+* Sat Jun 23 2018 Andrea Musuruane <musuruan(a)gmail.com> - 1.56.2-1
+- Updated to 1.56.2
+
* Thu Jun 21 2018 Andrea Musuruane <musuruan(a)gmail.com> - 1.56.1-3
- Fixed joystick support (BZ #4947)
diff --git a/sources b/sources
index 1b1d445..d1ceed4 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-c0693887e54e775a4f971a27fb4975ab snes9x-1.56.1.tar.gz
+a92f7a31477caeeb68715d939443afd2 snes9x-1.56.2.tar.gz
5 years, 10 months
[xorg-x11-drv-nvidia] Readd devel sub-package for i686
by Leigh Scott
commit 485229cda93800035f905fb8b0ff652908e91c77
Author: leigh123linux <leigh123linux(a)googlemail.com>
Date: Fri Jun 22 14:25:08 2018 +0100
Readd devel sub-package for i686
xorg-x11-drv-nvidia.spec | 19 ++++++++-----------
1 file changed, 8 insertions(+), 11 deletions(-)
---
diff --git a/xorg-x11-drv-nvidia.spec b/xorg-x11-drv-nvidia.spec
index ef08af5..a26fce8 100644
--- a/xorg-x11-drv-nvidia.spec
+++ b/xorg-x11-drv-nvidia.spec
@@ -37,7 +37,7 @@
Name: xorg-x11-drv-nvidia
Epoch: 3
Version: 396.24
-Release: 2%{?dist}
+Release: 3%{?dist}
Summary: NVIDIA's proprietary display driver for NVIDIA graphic cards
License: Redistributable, no modification permitted
@@ -258,11 +258,7 @@ ldconfig -vn %{buildroot}%{_nvidia_libdir}/
ldconfig -vn %{buildroot}%{_libdir}/
# Libraries you can link against
-%ifarch x86_64
for lib in libcuda libnvcuvid libnvidia-encode; do
-%else
-for lib in libcuda; do
-%endif
ln -sf $lib.so.%{version} %{buildroot}%{_libdir}/$lib.so
done
@@ -292,6 +288,10 @@ sed -i -e 's|libGLX_nvidia.so.0|libGL.so.1|' %{buildroot}%{_datadir}/vulkan/icd.
touch -r nvidia_icd.json.template %{buildroot}%{_datadir}/vulkan/icd.d/nvidia_icd.%{_target_cpu}.json
%endif
+# Install headers
+install -m 0755 -d %{buildroot}%{_includedir}/nvidia/GL/
+install -p -m 0644 {gl.h,glext.h,glx.h,glxext.h} %{buildroot}%{_includedir}/nvidia/GL/
+
%ifarch x86_64
# X DDX driver and GLX extension
install -p -D -m 0755 libglx.so.%{version} %{buildroot}%{_nvidia_xorgdir}/libglx.so.%{version}
@@ -329,10 +329,6 @@ install -m 0755 -d %{buildroot}%{_bindir}
install -p -m 0755 nvidia-{bug-report.sh,debugdump,smi,cuda-mps-control,cuda-mps-server} \
%{buildroot}%{_bindir}
-# Install headers
-install -m 0755 -d %{buildroot}%{_includedir}/nvidia/GL/
-install -p -m 0644 {gl.h,glext.h,glx.h,glxext.h} %{buildroot}%{_includedir}/nvidia/GL/
-
# Install man pages
install -m 0755 -d %{buildroot}%{_mandir}/man1/
install -p -m 0644 nvidia-{cuda-mps-control,smi}.1.gz \
@@ -576,14 +572,15 @@ fi ||:
%{_libdir}/libnvidia-opencl.so.1
%{_libdir}/libnvidia-opencl.so.%{version}
-%ifarch x86_64
%files devel
%{_includedir}/nvidia/
%{_libdir}/libnvcuvid.so
%{_libdir}/libnvidia-encode.so
-%endif
%changelog
+* Fri Jun 22 2018 Leigh Scott <leigh123linux(a)googlemail.com> - 3:396.24-3
+- Readd devel sub-package for i686
+
* Fri May 04 2018 Leigh Scott <leigh123linux(a)googlemail.com> - 3:396.24-2
- Clean up
5 years, 10 months
[chromium-freeworld: 2/2] Merge Fedora, chromium-67.0.3396.87-1
by Miro Hrončok
commit 7bd87586810db600e9503372a3160435d864bf76
Merge: 33889a4 afed03b
Author: Miro Hrončok <miro(a)hroncok.cz>
Date: Fri Jun 22 14:27:05 2018 +0200
Merge Fedora, chromium-67.0.3396.87-1
.gitignore | 1 +
chromium-freeworld.spec | 5 ++++-
sources | 2 +-
3 files changed, 6 insertions(+), 2 deletions(-)
---
diff --cc .gitignore
index e8858f9,4386671..8185ef6
--- a/.gitignore
+++ b/.gitignore
@@@ -57,5 -62,5 +57,6 @@@
/Tinos-Bold.ttf
/Tinos-Italic.ttf
/Tinos-Regular.ttf
-/chromium-67.0.3396.79-clean.tar.xz
-/chromium-67.0.3396.87-clean.tar.xz
+/chromium-67.0.3396.62.tar.xz
+/chromium-67.0.3396.79.tar.xz
++/chromium-67.0.3396.87.tar.xz
diff --cc sources
index db80af4,3121cf4..8787d78
--- 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.87-clean.tar.xz) = 4eb152bb926c7fd953b62a963852d6b7d5ef29a6cb9ddff453c2d2edf14a8104c2d1fea818e0bb2d18ea9b1d4c64f058c69aaa85d2d2a865190f0409717aebcc
+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
- 5ffdedb5ada2f919813c9325e17fa58f chromium-67.0.3396.79.tar.xz
++65a8b027e184cb1364ad8f37c0a644f0 chromium-67.0.3396.87.tar.xz
5 years, 10 months
[chromium-freeworld: 1/2] 67.0.3396.87
by Miro Hrončok
commit afed03bdcdc0b467aef479c3c4133cbf2c55ac70
Author: Tom Callaway <spot(a)fedoraproject.org>
Date: Tue Jun 19 12:19:07 2018 -0400
67.0.3396.87
.gitignore | 1 +
chromium.spec | 5 ++++-
sources | 2 +-
3 files changed, 6 insertions(+), 2 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 0bb4453..4386671 100644
--- a/.gitignore
+++ b/.gitignore
@@ -63,3 +63,4 @@
/Tinos-Italic.ttf
/Tinos-Regular.ttf
/chromium-67.0.3396.79-clean.tar.xz
+/chromium-67.0.3396.87-clean.tar.xz
diff --git a/chromium.spec b/chromium.spec
index 54d3c69..de6127a 100644
--- a/chromium.spec
+++ b/chromium.spec
@@ -139,7 +139,7 @@ Name: chromium%{chromium_channel}%{?freeworld:-freeworld}
%else
Name: chromium%{chromium_channel}
%endif
-Version: %{majorversion}.0.3396.79
+Version: %{majorversion}.0.3396.87
Release: 1%{?dist}
Summary: A WebKit (Blink) powered web browser
Url: http://www.chromium.org/Home
@@ -1709,6 +1709,9 @@ getent group chrome-remote-desktop >/dev/null || groupadd -r chrome-remote-deskt
%changelog
+* Tue Jun 19 2018 Tom Callaway <spot(a)fedoraproject.org> 67.0.3396.87-1
+- update to 67.0.3396.87
+
* Thu Jun 7 2018 Tom Callaway <spot(a)fedoraproject.org> 67.0.3396.79-1
- update to 67.0.3396.79
diff --git a/sources b/sources
index e8b818f..3121cf4 100644
--- a/sources
+++ b/sources
@@ -15,4 +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
+SHA512 (chromium-67.0.3396.87-clean.tar.xz) = 4eb152bb926c7fd953b62a963852d6b7d5ef29a6cb9ddff453c2d2edf14a8104c2d1fea818e0bb2d18ea9b1d4c64f058c69aaa85d2d2a865190f0409717aebcc
5 years, 10 months