[telegram-desktop] Updated to version 1.1.14.
by Vitaly Zaitsev
commit 09be6eda7907ec2ee387c0c13669fe4ce01bf860
Author: Vitaly Zaitsev <vitaly(a)easycoding.org>
Date: Wed Jul 19 21:52:18 2017 +0500
Updated to version 1.1.14.
.gitignore | 1 +
fix_build_under_fedora.patch | 36 ++++++++++----------
sources | 2 +-
telegram-desktop.spec | 80 ++++++++++++++++++--------------------------
4 files changed, 53 insertions(+), 66 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 439cf1b..8c672ff 100644
--- a/.gitignore
+++ b/.gitignore
@@ -24,3 +24,4 @@
/tdesktop-1.1.11.tar.gz
/libtgvoip-de33700.tar.gz
/tdesktop-1.1.13.tar.gz
+/tdesktop-1.1.14.tar.gz
diff --git a/fix_build_under_fedora.patch b/fix_build_under_fedora.patch
index 07663cb..1ae0a56 100644
--- a/fix_build_under_fedora.patch
+++ b/fix_build_under_fedora.patch
@@ -1,4 +1,4 @@
-From 969ddbc6cff0decc00d189ee2ec257e4c3f2c0b5 Mon Sep 17 00:00:00 2001
+From d962adafed6e0b840b507e6c0e7537d5e993dc2f 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/SourceFiles/qt_functions.cpp
diff --git a/Telegram/SourceFiles/main.cpp b/Telegram/SourceFiles/main.cpp
-index 6cd942e..d7d1b53 100644
+index 6cd942ec..d7d1b535 100644
--- a/Telegram/SourceFiles/main.cpp
+++ b/Telegram/SourceFiles/main.cpp
@@ -23,9 +23,10 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org
@@ -56,7 +56,7 @@ index 6cd942e..d7d1b53 100644
{
diff --git a/Telegram/SourceFiles/qt_functions.cpp b/Telegram/SourceFiles/qt_functions.cpp
new file mode 100644
-index 0000000..4a722b8
+index 00000000..4a722b8d
--- /dev/null
+++ b/Telegram/SourceFiles/qt_functions.cpp
@@ -0,0 +1,94 @@
@@ -155,7 +155,7 @@ index 0000000..4a722b8
+ flags |= QTextItem::StrikeOut;
+}
diff --git a/Telegram/SourceFiles/qt_static_plugins.cpp b/Telegram/SourceFiles/qt_static_plugins.cpp
-index b975c7a..f2f876b 100644
+index b975c7a8..f2f876b3 100644
--- a/Telegram/SourceFiles/qt_static_plugins.cpp
+++ b/Telegram/SourceFiles/qt_static_plugins.cpp
@@ -28,13 +28,4 @@ Q_IMPORT_PLUGIN(QWebpPlugin)
@@ -173,7 +173,7 @@ index b975c7a..f2f876b 100644
-Q_IMPORT_PLUGIN(QHimePlatformInputContextPlugin)
#endif // Q_OS_WIN | Q_OS_MAC | Q_OS_LINUX
diff --git a/Telegram/SourceFiles/ui/text/text.cpp b/Telegram/SourceFiles/ui/text/text.cpp
-index 9ab1394..cec6589 100644
+index 9ab13940..cec6589e 100644
--- a/Telegram/SourceFiles/ui/text/text.cpp
+++ b/Telegram/SourceFiles/ui/text/text.cpp
@@ -1688,11 +1688,11 @@ private:
@@ -192,7 +192,7 @@ index 9ab1394..cec6589 100644
auto blockIndex = _lineStartBlock;
auto currentBlock = _t->_blocks[blockIndex].get();
diff --git a/Telegram/SourceFiles/ui/text/text_block.cpp b/Telegram/SourceFiles/ui/text/text_block.cpp
-index f89644e..35230cf 100644
+index f89644e1..35230cfc 100644
--- a/Telegram/SourceFiles/ui/text/text_block.cpp
+++ b/Telegram/SourceFiles/ui/text/text_block.cpp
@@ -330,7 +330,7 @@ TextBlock::TextBlock(const style::font &font, const QString &str, QFixed minResi
@@ -205,7 +205,7 @@ index f89644e..35230cf 100644
layout.createLine();
diff --git a/Telegram/SourceFiles/ui/twidget.cpp b/Telegram/SourceFiles/ui/twidget.cpp
-index e9848ef..dcee47e 100644
+index e9848ef2..dcee47ee 100644
--- a/Telegram/SourceFiles/ui/twidget.cpp
+++ b/Telegram/SourceFiles/ui/twidget.cpp
@@ -191,9 +191,9 @@ void sendSynteticMouseEvent(QWidget *widget, QEvent::Type type, Qt::MouseButton
@@ -221,7 +221,7 @@ index e9848ef..dcee47e 100644
ev.setTimestamp(getms());
QGuiApplication::sendEvent(windowHandle, &ev);
diff --git a/Telegram/gyp/PrecompiledHeader.cmake b/Telegram/gyp/PrecompiledHeader.cmake
-index 5d6830e..c3f08d3 100644
+index 5d6830e9..c3f08d3f 100644
--- a/Telegram/gyp/PrecompiledHeader.cmake
+++ b/Telegram/gyp/PrecompiledHeader.cmake
@@ -112,7 +112,7 @@ function(add_precompiled_header _target _input)
@@ -243,7 +243,7 @@ index 5d6830e..c3f08d3 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 80160d1..9dcdeb4 100644
+index 80160d16..9dcdeb4d 100644
--- a/Telegram/gyp/Telegram.gyp
+++ b/Telegram/gyp/Telegram.gyp
@@ -31,7 +31,6 @@
@@ -290,7 +290,7 @@ index 80160d1..9dcdeb4 100644
'<(submodules_loc)/GSL/include',
'<(submodules_loc)/variant/include',
diff --git a/Telegram/gyp/qt.gypi b/Telegram/gyp/qt.gypi
-index 81c13a1..899af14 100644
+index 81c13a18..899af140 100644
--- a/Telegram/gyp/qt.gypi
+++ b/Telegram/gyp/qt.gypi
@@ -27,25 +27,21 @@
@@ -449,7 +449,7 @@ index 81c13a1..899af14 100644
# Silence "Note: No relevant classes found. No output generated."
'--no-notes',
diff --git a/Telegram/gyp/qt_rcc.gypi b/Telegram/gyp/qt_rcc.gypi
-index eebc696..3efa7d0 100644
+index eebc6967..3efa7d05 100644
--- a/Telegram/gyp/qt_rcc.gypi
+++ b/Telegram/gyp/qt_rcc.gypi
@@ -28,7 +28,7 @@
@@ -462,7 +462,7 @@ index eebc696..3efa7d0 100644
'-no-compress',
'<(RULE_INPUT_PATH)',
diff --git a/Telegram/gyp/settings_linux.gypi b/Telegram/gyp/settings_linux.gypi
-index fde88dc..7d60322 100644
+index fde88dcd..7d603220 100644
--- a/Telegram/gyp/settings_linux.gypi
+++ b/Telegram/gyp/settings_linux.gypi
@@ -22,11 +22,6 @@
@@ -495,7 +495,7 @@ index fde88dc..7d60322 100644
'Debug': {
},
diff --git a/Telegram/gyp/telegram_linux.gypi b/Telegram/gyp/telegram_linux.gypi
-index 2c46492..1b14723 100644
+index 2c464928..1b14723d 100644
--- a/Telegram/gyp/telegram_linux.gypi
+++ b/Telegram/gyp/telegram_linux.gypi
@@ -27,73 +27,43 @@
@@ -587,7 +587,7 @@ index 2c46492..1b14723 100644
},
},
diff --git a/Telegram/gyp/telegram_sources.txt b/Telegram/gyp/telegram_sources.txt
-index 8363ab4..b5f631c 100644
+index 8363ab4f..b5f631c2 100644
--- a/Telegram/gyp/telegram_sources.txt
+++ b/Telegram/gyp/telegram_sources.txt
@@ -579,13 +579,7 @@
@@ -606,7 +606,7 @@ index 8363ab4..b5f631c 100644
platforms: mac
<(sp_media_key_tap_loc)/SPMediaKeyTap.m
diff --git a/Telegram/gyp/utils.gyp b/Telegram/gyp/utils.gyp
-index 209c737..27ce77f 100644
+index 209c7370..27ce77f5 100644
--- a/Telegram/gyp/utils.gyp
+++ b/Telegram/gyp/utils.gyp
@@ -134,7 +134,7 @@
@@ -628,7 +628,7 @@ index 209c737..27ce77f 100644
}]
],
diff --git a/lib/xdg/telegramdesktop.appdata.xml b/lib/xdg/telegramdesktop.appdata.xml
-index 7bcf8d8..4508c01 100644
+index 7bcf8d83..4508c01c 100644
--- a/lib/xdg/telegramdesktop.appdata.xml
+++ b/lib/xdg/telegramdesktop.appdata.xml
@@ -1,6 +1,6 @@
@@ -640,7 +640,7 @@ index 7bcf8d8..4508c01 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 0a80695..550b9f7 100644
+index 0a806951..550b9f78 100644
--- a/lib/xdg/telegramdesktop.desktop
+++ b/lib/xdg/telegramdesktop.desktop
@@ -1,9 +1,11 @@
@@ -658,5 +658,5 @@ index 0a80695..550b9f7 100644
StartupWMClass=TelegramDesktop
Type=Application
--
-2.9.4
+2.13.3
diff --git a/sources b/sources
index 0836665..493bc18 100644
--- a/sources
+++ b/sources
@@ -1,4 +1,4 @@
ba90e749953f2ac1c013011601a58598 GSL-c5851a8.tar.gz
0373c28165f86474f8abdce278320c1a gyp-a478c1a.tar.gz
64d96402e97bc7bd11e36668d4e129e9 libtgvoip-de33700.tar.gz
-437d8bcbe05428f7cd427b57b90edbc3 tdesktop-1.1.13.tar.gz
+cec5c09cd3f4d36ed33ee74023a6a325 tdesktop-1.1.14.tar.gz
diff --git a/telegram-desktop.spec b/telegram-desktop.spec
index 30c8ad7..d8b3a16 100644
--- a/telegram-desktop.spec
+++ b/telegram-desktop.spec
@@ -16,7 +16,7 @@
Summary: Telegram is a new era of messaging
Name: telegram-desktop
-Version: 1.1.13
+Version: 1.1.14
Release: 1%{?dist}
# Application and 3rd-party modules licensing:
@@ -42,54 +42,37 @@ Provides: libtgvoip = %{voipver}
Requires: hicolor-icon-theme
Requires: qt5-qtimageformats%{?_isa}
Requires: gtk3%{?_isa}
-%if 0%{?fedora} >= 24
+%if 0%{?fedora} && 0%{?fedora} >= 24
Recommends: libappindicator-gtk3%{?_isa}
%endif
+# Compilers and tools...
BuildRequires: desktop-file-utils
BuildRequires: libappstream-glib
-BuildRequires: ffmpeg-devel >= 3.1
-BuildRequires: gcc
BuildRequires: gcc-c++
-BuildRequires: qt5-qtbase-devel
-BuildRequires: qt5-qtimageformats
BuildRequires: chrpath
BuildRequires: cmake
-BuildRequires: libproxy-devel
-BuildRequires: libxcb-devel
-BuildRequires: libogg-devel
-BuildRequires: xz-devel
-BuildRequires: minizip-devel
+BuildRequires: gcc
+
+# Development packages for Telegram Desktop...
BuildRequires: libappindicator-devel
-BuildRequires: libunity-devel
-BuildRequires: libstdc++-devel
-BuildRequires: libwebp-devel
-BuildRequires: libpng-devel
-BuildRequires: xorg-x11-util-macros
-BuildRequires: gettext-devel
-BuildRequires: libICE-devel
-BuildRequires: libSM-devel
-BuildRequires: libXi-devel
-BuildRequires: zlib-devel
-BuildRequires: opus-devel
-BuildRequires: portaudio-devel
+BuildRequires: mapbox-variant-devel
+BuildRequires: ffmpeg-devel >= 3.1
BuildRequires: openal-soft-devel
-BuildRequires: xcb-util-devel
-BuildRequires: xcb-util-wm-devel
-BuildRequires: xcb-util-xrm-devel
-BuildRequires: xcb-util-image-devel
-BuildRequires: xcb-util-cursor-devel
-BuildRequires: xcb-util-keysyms-devel
-BuildRequires: xcb-util-renderutil-devel
-BuildRequires: libva-devel
-BuildRequires: libvdpau-devel
-BuildRequires: libxkbcommon-devel
-BuildRequires: libxkbcommon-x11-devel
-BuildRequires: harfbuzz-devel
+BuildRequires: qt5-qtbase-devel
+BuildRequires: libstdc++-devel
+BuildRequires: minizip-devel
BuildRequires: gtk3-devel
+BuildRequires: dee-devel
+BuildRequires: xz-devel
+
+# Development packages for libtgvoip...
BuildRequires: pulseaudio-libs-devel
-BuildRequires: mapbox-variant-devel
-%if 0%{?fedora} >= 26
+BuildRequires: alsa-lib-devel
+BuildRequires: opus-devel
+
+# Additional development packages...
+%if 0%{?fedora} && 0%{?fedora} >= 26
BuildRequires: compat-openssl10-devel
%else
BuildRequires: openssl-devel
@@ -157,11 +140,11 @@ popd
# Installing executables...
mkdir -p "%{buildroot}%{_bindir}"
chrpath -d out/Release/Telegram
-install -m 755 out/Release/Telegram "%{buildroot}%{_bindir}/%{name}"
+install -m 0755 -p out/Release/Telegram "%{buildroot}%{_bindir}/%{name}"
# Installing shared libraries...
mkdir -p "%{buildroot}%{_libdir}"
-install -m 755 out/Release/lib.target/libtgvoip.so.%{voipver} "%{buildroot}%{_libdir}/libtgvoip.so.%{voipver}"
+install -m 0755 -p out/Release/lib.target/libtgvoip.so.%{voipver} "%{buildroot}%{_libdir}/libtgvoip.so.%{voipver}"
ln -s libtgvoip.so.%{voipver} "%{buildroot}%{_libdir}/libtgvoip.so.0"
ln -s libtgvoip.so.%{voipver} "%{buildroot}%{_libdir}/libtgvoip.so"
@@ -173,45 +156,45 @@ desktop-file-install --dir="%{buildroot}%{_datadir}/applications" lib/xdg/%{name
for size in 16 32 48 64 128 256 512; do
dir="%{buildroot}%{_datadir}/icons/hicolor/${size}x${size}/apps"
install -d "$dir"
- install -m 644 -p Telegram/Resources/art/icon${size}.png "$dir/%{name}.png"
+ install -m 0644 -p Telegram/Resources/art/icon${size}.png "$dir/%{name}.png"
done
# Installing tg protocol handler...
install -d "%{buildroot}%{_datadir}/kde4/services"
-install -m 644 -p lib/xdg/tg.protocol "%{buildroot}%{_datadir}/kde4/services/tg.protocol"
+install -m 0644 -p lib/xdg/tg.protocol "%{buildroot}%{_datadir}/kde4/services/tg.protocol"
# Installing appdata for Gnome Software...
install -d "%{buildroot}%{_datadir}/appdata"
-install -m 644 -p lib/xdg/telegramdesktop.appdata.xml "%{buildroot}%{_datadir}/appdata/%{name}.appdata.xml"
+install -m 0644 -p lib/xdg/telegramdesktop.appdata.xml "%{buildroot}%{_datadir}/appdata/%{name}.appdata.xml"
%check
appstream-util validate-relax --nonet "%{buildroot}%{_datadir}/appdata/%{name}.appdata.xml"
%post
/sbin/ldconfig
-%if 0%{?fedora} <= 23 || 0%{?rhel} == 7
+%if (0%{?fedora} && 0%{?fedora} <= 23) || (0%{?rhel} && 0%{?rhel} <= 7)
/bin/touch --no-create %{_datadir}/mime/packages &>/dev/null || :
%endif
/bin/touch --no-create %{_datadir}/icons/hicolor &>/dev/null || :
-%if 0%{?fedora} <= 24 || 0%{?rhel} == 7
+%if (0%{?fedora} && 0%{?fedora} <= 24) || (0%{?rhel} && 0%{?rhel} <= 7)
/usr/bin/update-desktop-database &> /dev/null || :
%endif
%postun
/sbin/ldconfig
if [ $1 -eq 0 ] ; then
- %if 0%{?fedora} <= 23 || 0%{?rhel} == 7
+ %if (0%{?fedora} && 0%{?fedora} <= 23) || (0%{?rhel} && 0%{?rhel} <= 7)
/usr/bin/update-mime-database %{_datadir}/mime &> /dev/null || :
%endif
/bin/touch --no-create %{_datadir}/icons/hicolor &>/dev/null
/usr/bin/gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
fi
-%if 0%{?fedora} <= 24 || 0%{?rhel} == 7
+%if (0%{?fedora} && 0%{?fedora} <= 24) || (0%{?rhel} && 0%{?rhel} <= 7)
/usr/bin/update-desktop-database &> /dev/null || :
%endif
%posttrans
-%if 0%{?fedora} <= 23 || 0%{?rhel} == 7
+%if (0%{?fedora} && 0%{?fedora} <= 23) || (0%{?rhel} && 0%{?rhel} <= 7)
/usr/bin/update-mime-database %{?fedora:-n} %{_datadir}/mime &> /dev/null || :
%endif
/usr/bin/gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
@@ -227,6 +210,9 @@ fi
%{_datadir}/appdata/%{name}.appdata.xml
%changelog
+* Wed Jul 19 2017 Vitaly Zaitsev <vitaly(a)easycoding.org> - 1.1.14-1
+- Updated to 1.1.14 (alpha).
+
* Fri Jul 14 2017 Vitaly Zaitsev <vitaly(a)easycoding.org> - 1.1.13-1
- Updated to 1.1.13 (alpha).
6 years, 11 months
[chromium-libs-media-freeworld] Add missing sources for f865964
by Miro Hrončok
commit 07cee7535e8962ad425c09576d905f66b47a7571
Author: Miro Hrončok <miro(a)hroncok.cz>
Date: Wed Jul 19 13:16:15 2017 +0200
Add missing sources for f865964
sources | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
---
diff --git a/sources b/sources
index 167f02c..b9a3381 100644
--- a/sources
+++ b/sources
@@ -1,3 +1,4 @@
-ba48a28cf7ebc531a0775284e3a6809f policy_templates.zip
+e3b580196d31ba2fe66ad12f17974a1e policy_templates.zip
49a7f897775cce21d2b69968b8af1cea depot_tools.git-master.tar.gz
249b4ce6844d5e2424967287c638c55c chromium-59.0.3071.115.tar.xz
+4dbfa58c3f84c57391ba2842abe134a4 chromium-59.0.3071.109-freetype.tar.bz2
6 years, 11 months
[chromium-libs-media-freeworld: 8/8] Merge 'fedora/master' b7162c3, 59.0.3071.115-2
by Miro Hrončok
commit f865964f59aa08da44264b5e94607604c8ebac70
Merge: d9ae7f1 b7162c3
Author: Miro Hrončok <miro(a)hroncok.cz>
Date: Wed Jul 19 12:44:01 2017 +0200
Merge 'fedora/master' b7162c3, 59.0.3071.115-2
.gitignore | 3 +
chromium-59.0.3071.115-ucontext-fix.patch | 214 ++++
chromium-libs-media-freeworld.spec | 1927 ++++++++++++++++++++++++++---
sources | 4 +-
4 files changed, 1980 insertions(+), 168 deletions(-)
---
diff --cc .gitignore
index 1b635bc,ce8a184..baad048
--- a/.gitignore
+++ b/.gitignore
@@@ -20,10 -20,8 +20,13 @@@
/chromium-57.0.2987.133-clean.tar.xz
/chromium-58.0.3029.81-clean.tar.xz
/chromium-58.0.3029.110-clean.tar.xz
+/chromium-58.0.3029.110.tar.xz
/chromium-59.0.3071.86-clean.tar.xz
+/chromium-59.0.3071.86.tar.xz
/chromium-59.0.3071.104-clean.tar.xz
+/chromium-59.0.3071.104.tar.xz
/chromium-59.0.3071.109-clean.tar.xz
+/chromium-59.0.3071.109.tar.xz
+ /chromium-59.0.3071.115-clean.tar.xz
+ /chromium-59.0.3071.109-freetype.tar.bz2
++/chromium-59.0.3071.115.tar.xz
diff --cc chromium-libs-media-freeworld.spec
index e7a943c,b3b2262..e7d294c
--- a/chromium-libs-media-freeworld.spec
+++ b/chromium-libs-media-freeworld.spec
@@@ -1,5 -1,10 +1,10 @@@
- # gn is the new new new buildtool. *sigh*
- %global use_gn 1
+ # NEVER EVER EVER turn this on in official builds
-%global freeworld 0
++%global freeworld 1
+ %if %{freeworld}
+ %global lsuffix freeworld
+ %else
+ %global lsuffix fedora
+ %endif
# Leave this alone, please.
%global target out/Release
diff --cc sources
index 1d68007,db65c06..167f02c
--- a/sources
+++ b/sources
@@@ -1,3 -1,4 +1,3 @@@
- 81885367434a85aecdb7b5a8d666590d chromium-59.0.3071.109.tar.xz
-SHA512 (depot_tools.git-master.tar.gz) = d3d6a1873b2b0296a8cd99e0d8d2e629a17b1808934b4972556168f8b4ccea60577ebaeab4445baf15afb1b04080808db59a832a5b61d247bd48da14fa6acf03
-SHA512 (policy_templates.zip) = a997bd5d410cf8f0f104fb5b69b60699c9e60eb3f99b42e0aff167843f3a45923a9a99c881cac9cd4472a60ca9c7d1ba897e15d485fbfd66c996419e7fadd3f8
-SHA512 (chromium-59.0.3071.115-clean.tar.xz) = 001e6d9b4cae244767de7e85575d4071421d588422ca434461939e9652549bcd43c56fe0c510ab0d7d0a050e97d98f4086b8bf102dbadd7f83dc8827b9ea7ed1
-SHA512 (chromium-59.0.3071.109-freetype.tar.bz2) = 62a698c0229c0eb5ed4d31efd211db70f1183f4f86558bd68a6110214b2f0a61eecdde27efcab359ecee684b3df819b37a75505c1b9ea6bec407d289d6e78a66
++ba48a28cf7ebc531a0775284e3a6809f policy_templates.zip
+49a7f897775cce21d2b69968b8af1cea depot_tools.git-master.tar.gz
- e3b580196d31ba2fe66ad12f17974a1e policy_templates.zip
++249b4ce6844d5e2424967287c638c55c chromium-59.0.3071.115.tar.xz
6 years, 11 months
[chromium-libs-media-freeworld: 7/8] add missing \ in freeworld scriptlet
by Miro Hrončok
commit b7162c3694417dea98c380eb254affe6acc62898
Author: Tom Callaway <spot(a)fedoraproject.org>
Date: Mon Jul 17 12:56:43 2017 -0400
add missing \ in freeworld scriptlet
chromium.spec | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
---
diff --git a/chromium.spec b/chromium.spec
index 7486118..b3b2262 100644
--- a/chromium.spec
+++ b/chromium.spec
@@ -1551,7 +1551,7 @@ fi
%{_libdir}/chromium-browser/libffmpeg.so libffmpeg.so \
%{_libdir}/chromium-browser/libffmpeg.so.freeworld 5 \
--slave %{_libdir}/chromium-browser/libffmpeg.so.TOC libffmpeg.so.TOC \
- %{_libdir}/chromium-browser/libffmpeg.so.TOC.freeworld
+ %{_libdir}/chromium-browser/libffmpeg.so.TOC.freeworld \
--slave %{_libdir}/chromium-browser/libmedia.so libmedia.so \
%{_libdir}/chromium-browser/libmedia.so.freeworld \
--slave %{_libdir}/chromium-browser/libmedia.so.TOC libmedia.so.TOC \
6 years, 11 months
[chromium-libs-media-freeworld: 6/8] fix scriptlets
by Miro Hrončok
commit 7c2fb50f20ceb9c3ddc44616ecf83348acc6c564
Author: Tom Callaway <spot(a)fedoraproject.org>
Date: Thu Jul 13 14:00:05 2017 -0400
fix scriptlets
chromium.spec | 15 +++++++++------
1 file changed, 9 insertions(+), 6 deletions(-)
---
diff --git a/chromium.spec b/chromium.spec
index d1a58a0..7486118 100644
--- a/chromium.spec
+++ b/chromium.spec
@@ -115,7 +115,7 @@ BuildRequires: libicu-devel >= 5.4
Name: chromium%{chromium_channel}
Version: %{majorversion}.0.3071.115
-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)
@@ -1549,11 +1549,11 @@ fi
%post libs-media-freeworld
%{_sbindir}/update-alternatives --install \
%{_libdir}/chromium-browser/libffmpeg.so libffmpeg.so \
- %{_libdir}/chromium-browser/libffmpeg.so.freeworld 5
+ %{_libdir}/chromium-browser/libffmpeg.so.freeworld 5 \
--slave %{_libdir}/chromium-browser/libffmpeg.so.TOC libffmpeg.so.TOC \
%{_libdir}/chromium-browser/libffmpeg.so.TOC.freeworld
--slave %{_libdir}/chromium-browser/libmedia.so libmedia.so \
- %{_libdir}/chromium-browser/libmedia.so.freeworld
+ %{_libdir}/chromium-browser/libmedia.so.freeworld \
--slave %{_libdir}/chromium-browser/libmedia.so.TOC libmedia.so.TOC \
%{_libdir}/chromium-browser/libmedia.so.TOC.freeworld
@@ -1566,11 +1566,11 @@ fi
%post libs-media
%{_sbindir}/update-alternatives --install \
%{_libdir}/chromium-browser/libffmpeg.so libffmpeg.so \
- %{_libdir}/chromium-browser/libffmpeg.so.fedora 10
+ %{_libdir}/chromium-browser/libffmpeg.so.fedora 10 \
--slave %{_libdir}/chromium-browser/libffmpeg.so.TOC libffmpeg.so.TOC \
- %{_libdir}/chromium-browser/libffmpeg.so.TOC.fedora
+ %{_libdir}/chromium-browser/libffmpeg.so.TOC.fedora \
--slave %{_libdir}/chromium-browser/libmedia.so libmedia.so \
- %{_libdir}/chromium-browser/libmedia.so.fedora
+ %{_libdir}/chromium-browser/libmedia.so.fedora \
--slave %{_libdir}/chromium-browser/libmedia.so.TOC libmedia.so.TOC \
%{_libdir}/chromium-browser/libmedia.so.TOC.fedora
@@ -1740,6 +1740,9 @@ getent group chrome-remote-desktop >/dev/null || groupadd -r chrome-remote-deskt
%changelog
+* Thu Jul 13 2017 Tom Callaway <spot(a)fedoraproject.org> 59.0.3071.115-2
+- fix scriptlets
+
* Wed Jul 12 2017 Tom Callaway <spot(a)fedoraproject.org> 59.0.3071.115-1
- 59.0.3071.115
- conditionalize spec so it can be easily used to make -libs-media-freeworld
6 years, 11 months
[chromium-libs-media-freeworld: 5/8] include copy of third_party/freetype from previous source tree
by Miro Hrončok
commit 03f0b9be077019eb073d32292cc30e2fdb2c97de
Author: Tom Callaway <spot(a)fedoraproject.org>
Date: Wed Jul 12 16:32:37 2017 -0400
include copy of third_party/freetype from previous source tree
.gitignore | 1 +
chromium.spec | 8 ++++++--
sources | 2 +-
3 files changed, 8 insertions(+), 3 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 8c60af5..ce8a184 100644
--- a/.gitignore
+++ b/.gitignore
@@ -24,3 +24,4 @@
/chromium-59.0.3071.104-clean.tar.xz
/chromium-59.0.3071.109-clean.tar.xz
/chromium-59.0.3071.115-clean.tar.xz
+/chromium-59.0.3071.109-freetype.tar.bz2
diff --git a/chromium.spec b/chromium.spec
index 2bf42f7..d1a58a0 100644
--- a/chromium.spec
+++ b/chromium.spec
@@ -220,6 +220,10 @@ Source9: chromium-browser.xml
Source10: https://dl.google.com/dl/edgedl/chrome/policy/policy_templates.zip
Source11: chrome-remote-desktop@.service
Source13: master_preferences
+# Upstream did not include third_party/freetype source code in the tarball for 59.0.3071.115
+# So we copy it from the previous build. :/
+Source14: chromium-59.0.3071.109-freetype.tar.bz2
+
# We can assume gcc and binutils.
BuildRequires: gcc-c++
@@ -545,9 +549,9 @@ members of the Chromium and WebDriver teams.
%setup -q -T -c -n %{name}-policies -a 10
%setup -q -T -c -n depot_tools -a 2
%if 0%{tests}
-%setup -q -n chromium-%{version} -b 1
+%setup -q -n chromium-%{version} -b 1 -a 14
%else
-%setup -q -n chromium-%{version}
+%setup -q -n chromium-%{version} -a 14
%endif
### Chromium Fedora Patches ###
diff --git a/sources b/sources
index 0cd1635..db65c06 100644
--- a/sources
+++ b/sources
@@ -1,4 +1,4 @@
-SHA512 (chromium-59.0.3071.109-clean.tar.xz) = 7158a5b1c228c077275cf1bde79c34d9eabf607c04424df02056700703f2fd2907fc011ad658d759d7c6dd78c303f9c2983eb811cc9f9b6b424b0af615f6eaa7
SHA512 (depot_tools.git-master.tar.gz) = d3d6a1873b2b0296a8cd99e0d8d2e629a17b1808934b4972556168f8b4ccea60577ebaeab4445baf15afb1b04080808db59a832a5b61d247bd48da14fa6acf03
SHA512 (policy_templates.zip) = a997bd5d410cf8f0f104fb5b69b60699c9e60eb3f99b42e0aff167843f3a45923a9a99c881cac9cd4472a60ca9c7d1ba897e15d485fbfd66c996419e7fadd3f8
SHA512 (chromium-59.0.3071.115-clean.tar.xz) = 001e6d9b4cae244767de7e85575d4071421d588422ca434461939e9652549bcd43c56fe0c510ab0d7d0a050e97d98f4086b8bf102dbadd7f83dc8827b9ea7ed1
+SHA512 (chromium-59.0.3071.109-freetype.tar.bz2) = 62a698c0229c0eb5ed4d31efd211db70f1183f4f86558bd68a6110214b2f0a61eecdde27efcab359ecee684b3df819b37a75505c1b9ea6bec407d289d6e78a66
6 years, 11 months