[telegram-desktop/f28: 2/2] Merge branch 'master' into f28
by Vitaly Zaitsev
commit 460cb7c0e9e2f53e8fa0eb5663cb63eeb2ae4a52
Merge: 27f84de b19eefb
Author: Vitaly Zaitsev <vitaly(a)easycoding.org>
Date: Sun Dec 23 14:58:27 2018 +0500
Merge branch 'master' into f28
.gitignore | 1 +
sources | 2 +-
telegram-desktop-build-fixes.patch | 8 ++++----
telegram-desktop-system-fonts.patch | 6 +++---
telegram-desktop-unbundle-minizip.patch | 8 ++++----
telegram-desktop.spec | 5 ++++-
6 files changed, 17 insertions(+), 13 deletions(-)
---
5 years, 5 months
[telegram-desktop/f28: 1/2] Updated to version 1.5.3.
by Vitaly Zaitsev
commit b19eefbb8b35198cc970ee431451c4c262a29af1
Author: Vitaly Zaitsev <vitaly(a)easycoding.org>
Date: Sun Dec 23 10:57:19 2018 +0100
Updated to version 1.5.3.
.gitignore | 1 +
sources | 2 +-
telegram-desktop-build-fixes.patch | 8 ++++----
telegram-desktop-system-fonts.patch | 6 +++---
telegram-desktop-unbundle-minizip.patch | 8 ++++----
telegram-desktop.spec | 5 ++++-
6 files changed, 17 insertions(+), 13 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 584a82c..d405880 100644
--- a/.gitignore
+++ b/.gitignore
@@ -64,3 +64,4 @@
/tdesktop-1.4.3.tar.gz
/tdesktop-1.5.1.tar.gz
/tdesktop-1.5.2.tar.gz
+/tdesktop-1.5.3.tar.gz
diff --git a/sources b/sources
index 002d2e5..1e1da13 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
b92e75c44c9d4c9fd96b1d19eb3a666d crl-4291015.tar.gz
-4a0fd047e6fdf231e46f53a276b837f1 tdesktop-1.5.2.tar.gz
+547e3921cdca9fdcb24d1965402ac102 tdesktop-1.5.3.tar.gz
diff --git a/telegram-desktop-build-fixes.patch b/telegram-desktop-build-fixes.patch
index cb5f69e..2193c71 100644
--- a/telegram-desktop-build-fixes.patch
+++ b/telegram-desktop-build-fixes.patch
@@ -1,4 +1,4 @@
-From 1efe1e41298d624802735a02ff37a6a8bfb9c6b9 Mon Sep 17 00:00:00 2001
+From f3abd4b1fe9c40fa81959a32ef22b2c34b1e18e6 Mon Sep 17 00:00:00 2001
From: Vitaly Zaitsev <vitaly(a)easycoding.org>
Date: Fri, 31 Mar 2017 14:29:58 +0200
Subject: [PATCH 1/3] Fixed build under Fedora using rpmbuild and mock.
@@ -787,10 +787,10 @@ index ffe0e5a96..9bc686d44 100644
],
}], ['<!(pkg-config ayatana-appindicator3-0.1; echo $?) == 0', {
diff --git a/Telegram/gyp/telegram_sources.txt b/Telegram/gyp/telegram_sources.txt
-index 03c8a1335..b3a385064 100644
+index 482979736..f8fa95b10 100644
--- a/Telegram/gyp/telegram_sources.txt
+++ b/Telegram/gyp/telegram_sources.txt
-@@ -769,7 +769,7 @@
+@@ -799,7 +799,7 @@
<(src_loc)/messenger.h
<(src_loc)/observer_peer.cpp
<(src_loc)/observer_peer.h
@@ -829,5 +829,5 @@ index bb2a8ea79..960eaef0f 100644
StartupWMClass=TelegramDesktop
Type=Application
--
-2.19.2
+2.20.1
diff --git a/telegram-desktop-system-fonts.patch b/telegram-desktop-system-fonts.patch
index 7382d6e..7086373 100644
--- a/telegram-desktop-system-fonts.patch
+++ b/telegram-desktop-system-fonts.patch
@@ -1,4 +1,4 @@
-From 23db1b91deb7f7d69e30f468d1aaf2585077c68e Mon Sep 17 00:00:00 2001
+From b718fe89aa765b21837a7ea5dc17075e0b553f96 Mon Sep 17 00:00:00 2001
From: Vitaly Zaitsev <vitaly(a)easycoding.org>
Date: Sun, 24 Jun 2018 22:59:34 +0200
Subject: [PATCH 2/3] Backported and rebased patch from Debian maintainer
@@ -25,7 +25,7 @@ index 99f66c5cb..b3b241c9f 100644
<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 69cec0005..61437bf5a 100644
+index 7f94c6d1d..89dc3d6bb 100644
--- a/Telegram/SourceFiles/ui/twidget.cpp
+++ b/Telegram/SourceFiles/ui/twidget.cpp
@@ -70,9 +70,9 @@ void Start() {
@@ -42,5 +42,5 @@ index 69cec0005..61437bf5a 100644
#ifdef Q_OS_WIN
// Attempt to workaround a strange font bug with Open Sans Semibold not loading.
--
-2.19.2
+2.20.1
diff --git a/telegram-desktop-unbundle-minizip.patch b/telegram-desktop-unbundle-minizip.patch
index 8622030..3ff9b22 100644
--- a/telegram-desktop-unbundle-minizip.patch
+++ b/telegram-desktop-unbundle-minizip.patch
@@ -1,4 +1,4 @@
-From 2b878e1d211d871adbe59896ddbaebaf5d9ee5c9 Mon Sep 17 00:00:00 2001
+From f9a4b9b980a83341fbefcd3c7591520a0a290203 Mon Sep 17 00:00:00 2001
From: Vitaly Zaitsev <vitaly(a)easycoding.org>
Date: Wed, 17 Oct 2018 17:57:59 +0200
Subject: [PATCH 3/3] Use packaged version of minizip on Fedora <= 29.
@@ -50,10 +50,10 @@ index 9bc686d44..806374202 100644
'lzma',
'xxhash',
diff --git a/Telegram/gyp/telegram_sources.txt b/Telegram/gyp/telegram_sources.txt
-index b3a385064..10895dc5e 100644
+index f8fa95b10..20e74b465 100644
--- a/Telegram/gyp/telegram_sources.txt
+++ b/Telegram/gyp/telegram_sources.txt
-@@ -776,13 +776,6 @@
+@@ -806,13 +806,6 @@
<(emoji_suggestions_loc)/emoji_suggestions.h
platforms: !win
@@ -68,5 +68,5 @@ index b3a385064..10895dc5e 100644
platforms: win
<(res_loc)/winrc/Telegram.rc
--
-2.19.2
+2.20.1
diff --git a/telegram-desktop.spec b/telegram-desktop.spec
index db17c9e..9837171 100644
--- a/telegram-desktop.spec
+++ b/telegram-desktop.spec
@@ -12,7 +12,7 @@
Summary: Telegram Desktop official messaging app
Name: telegram-desktop
-Version: 1.5.2
+Version: 1.5.3
Release: 1%{?dist}
# Application and 3rd-party modules licensing:
@@ -152,6 +152,9 @@ appstream-util validate-relax --nonet "%{buildroot}%{_datadir}/metainfo/%{name}.
%{_datadir}/metainfo/%{name}.appdata.xml
%changelog
+* Sun Dec 23 2018 Vitaly Zaitsev <vitaly(a)easycoding.org> - 1.5.3-1
+- Updated to 1.5.3.
+
* Fri Dec 14 2018 Vitaly Zaitsev <vitaly(a)easycoding.org> - 1.5.2-1
- Updated to 1.5.2.
5 years, 5 months
[kodi-pvr-mythtv/f29] Update to 5.10.2 (rfbz #5121)
by Leigh Scott
commit dbf1bdc3d7a0b22416c6aa889af9370a5d77aa00
Author: Leigh Scott <leigh123linux(a)googlemail.com>
Date: Sun Dec 23 09:04:27 2018 +0000
Update to 5.10.2 (rfbz #5121)
kodi-pvr-mythtv.spec | 7 +++++--
1 file changed, 5 insertions(+), 2 deletions(-)
---
diff --git a/kodi-pvr-mythtv.spec b/kodi-pvr-mythtv.spec
index 7b1663e..d2d3b58 100644
--- a/kodi-pvr-mythtv.spec
+++ b/kodi-pvr-mythtv.spec
@@ -9,8 +9,8 @@ Name: kodi-%(tr "." "-" <<<%{kodi_addon})
# Use Epoch to manage upgrades from older upstream
# (https://github.com/opdenkamp/xbmc-pvr-addons/)
Epoch: 1
-Version: 5.8.6
-Release: 2%{?dist}
+Version: 5.10.2
+Release: 1%{?dist}
Summary: MythTV PVR for Kodi
# Some cppmyth private headers are LGPLv2+
@@ -61,6 +61,9 @@ find lib/cppmyth/ -type f -not -path "lib/cppmyth/src/private/*" -delete
%changelog
+* Sun Dec 23 2018 Leigh Scott <leigh123linux(a)googlemail.com> - 1:5.10.2-1
+- Update to 5.10.2 (rfbz #5121)
+
* Mon Oct 15 2018 Mohamed El Morabity <melmorabity(a)fedoraproject.org> - 1:5.8.6-2
- Enable arm build
5 years, 5 months
[kodi-pvr-mythtv] Update to 5.10.2 (rfbz #5121)
by Leigh Scott
commit 2980d53ac3d4a50f30b246145bb03b25844fa016
Author: Leigh Scott <leigh123linux(a)googlemail.com>
Date: Sun Dec 23 09:04:27 2018 +0000
Update to 5.10.2 (rfbz #5121)
kodi-pvr-mythtv.spec | 7 +++++--
1 file changed, 5 insertions(+), 2 deletions(-)
---
diff --git a/kodi-pvr-mythtv.spec b/kodi-pvr-mythtv.spec
index 7b1663e..d2d3b58 100644
--- a/kodi-pvr-mythtv.spec
+++ b/kodi-pvr-mythtv.spec
@@ -9,8 +9,8 @@ Name: kodi-%(tr "." "-" <<<%{kodi_addon})
# Use Epoch to manage upgrades from older upstream
# (https://github.com/opdenkamp/xbmc-pvr-addons/)
Epoch: 1
-Version: 5.8.6
-Release: 2%{?dist}
+Version: 5.10.2
+Release: 1%{?dist}
Summary: MythTV PVR for Kodi
# Some cppmyth private headers are LGPLv2+
@@ -61,6 +61,9 @@ find lib/cppmyth/ -type f -not -path "lib/cppmyth/src/private/*" -delete
%changelog
+* Sun Dec 23 2018 Leigh Scott <leigh123linux(a)googlemail.com> - 1:5.10.2-1
+- Update to 5.10.2 (rfbz #5121)
+
* Mon Oct 15 2018 Mohamed El Morabity <melmorabity(a)fedoraproject.org> - 1:5.8.6-2
- Enable arm build
5 years, 5 months
[chromium-vaapi/f28] Re enable the non effective enable_widevine flag
by Akarshan Biswas
commit 714117033bc9101f8bb66617f9a56b65819285f5
Author: Akarshan Biswas <akarshan.biswas(a)gmail.com>
Date: Fri Dec 21 21:39:28 2018 +0530
Re enable the non effective enable_widevine flag
chromium-vaapi.spec | 5 ++++-
widevine.patch | 25 ++++++++++++++++++-------
2 files changed, 22 insertions(+), 8 deletions(-)
---
diff --git a/chromium-vaapi.spec b/chromium-vaapi.spec
index 589afaf..fe2502b 100644
--- a/chromium-vaapi.spec
+++ b/chromium-vaapi.spec
@@ -76,7 +76,7 @@
##############################Package Definitions######################################
Name: chromium-vaapi
Version: 71.0.3578.98
-Release: 1%{?dist}
+Release: 2%{?dist}
Summary: A Chromium web browser with video decoding acceleration
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)
URL: https://www.chromium.org/Home
@@ -692,6 +692,9 @@ appstream-util validate-relax --nonet "%{buildroot}%{_metainfodir}/%{name}.appda
%{chromiumdir}/locales/*.pak
#########################################changelogs#################################################
%changelog
+* Fri Dec 21 2018 Akarshan Biswas <akarshan.biswas(a)hotmail.com> 71.0.3578.98-2
+- Re enable the non effective enable_widevine flag
+
* Sat Dec 15 2018 Akarshan Biswas <akarshan.biswas(a)hotmail.com> 71.0.3578.98-1
- Update to 71.0.3578.98
diff --git a/widevine.patch b/widevine.patch
index 4a9f78f..3ecf0e7 100644
--- a/widevine.patch
+++ b/widevine.patch
@@ -1,11 +1,22 @@
-Index: chromium-71.0.3573.0/third_party/widevine/cdm/widevine_cdm_version.h
-===================================================================
---- chromium-71.0.3573.0.orig/third_party/widevine/cdm/widevine_cdm_version.h
-+++ chromium-71.0.3573.0/third_party/widevine/cdm/widevine_cdm_version.h
-@@ -11,5 +11,6 @@
- // If the Widevine CDM is available define the following:
+diff -upr chromium-71.0.3578.80.orig/chrome/common/chrome_content_client.cc chromium-71.0.3578.80/chrome/common/chrome_content_client.cc
+--- chromium-71.0.3578.80.orig/chrome/common/chrome_content_client.cc 2018-12-21 20:16:43.000000000 +0000
++++ chromium-71.0.3578.80/chrome/common/chrome_content_client.cc 2018-12-21 21:34:28.658206942 +0000
+@@ -99,7 +99,7 @@
+ // Registers Widevine CDM if Widevine is enabled, the Widevine CDM is
+ // bundled and not a component. When the Widevine CDM is a component, it is
+ // registered in widevine_cdm_component_installer.cc.
+-#if BUILDFLAG(BUNDLE_WIDEVINE_CDM) && !BUILDFLAG(ENABLE_WIDEVINE_CDM_COMPONENT)
++#if BUILDFLAG(ENABLE_WIDEVINE) && !BUILDFLAG(ENABLE_WIDEVINE_CDM_COMPONENT)
+ #define REGISTER_BUNDLED_WIDEVINE_CDM
+ #include "third_party/widevine/cdm/widevine_cdm_common.h" // nogncheck
+ // TODO(crbug.com/663554): Needed for WIDEVINE_CDM_VERSION_STRING. Support
+diff -upr chromium-71.0.3578.80.orig/third_party/widevine/cdm/widevine_cdm_version.h chromium-71.0.3578.80/third_party/widevine/cdm/widevine_cdm_version.h
+--- chromium-71.0.3578.80.orig/third_party/widevine/cdm/widevine_cdm_version.h 2018-12-03 20:18:01.000000000 +0000
++++ chromium-71.0.3578.80/third_party/widevine/cdm/widevine_cdm_version.h 2018-12-04 21:37:45.635374949 +0000
+@@ -12,4 +12,6 @@
// - WIDEVINE_CDM_VERSION_STRING (with the version of the CDM that's available
// as a string, e.g., "1.0.123.456").
-+#define WIDEVINE_CDM_VERSION_STRING "unknown"
++#define WIDEVINE_CDM_VERSION_STRING "unknown"
++
#endif // WIDEVINE_CDM_VERSION_H_
5 years, 5 months
[chromium-vaapi/f29] Re enable the non effective enable_widevine flag
by Akarshan Biswas
commit bf8d2ade7d78d817705b2b6cd42567b22c2e68d3
Author: Akarshan Biswas <akarshan.biswas(a)gmail.com>
Date: Fri Dec 21 21:39:28 2018 +0530
Re enable the non effective enable_widevine flag
chromium-vaapi.spec | 5 ++++-
widevine.patch | 25 ++++++++++++++++++-------
2 files changed, 22 insertions(+), 8 deletions(-)
---
diff --git a/chromium-vaapi.spec b/chromium-vaapi.spec
index 589afaf..fe2502b 100644
--- a/chromium-vaapi.spec
+++ b/chromium-vaapi.spec
@@ -76,7 +76,7 @@
##############################Package Definitions######################################
Name: chromium-vaapi
Version: 71.0.3578.98
-Release: 1%{?dist}
+Release: 2%{?dist}
Summary: A Chromium web browser with video decoding acceleration
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)
URL: https://www.chromium.org/Home
@@ -692,6 +692,9 @@ appstream-util validate-relax --nonet "%{buildroot}%{_metainfodir}/%{name}.appda
%{chromiumdir}/locales/*.pak
#########################################changelogs#################################################
%changelog
+* Fri Dec 21 2018 Akarshan Biswas <akarshan.biswas(a)hotmail.com> 71.0.3578.98-2
+- Re enable the non effective enable_widevine flag
+
* Sat Dec 15 2018 Akarshan Biswas <akarshan.biswas(a)hotmail.com> 71.0.3578.98-1
- Update to 71.0.3578.98
diff --git a/widevine.patch b/widevine.patch
index 4a9f78f..3ecf0e7 100644
--- a/widevine.patch
+++ b/widevine.patch
@@ -1,11 +1,22 @@
-Index: chromium-71.0.3573.0/third_party/widevine/cdm/widevine_cdm_version.h
-===================================================================
---- chromium-71.0.3573.0.orig/third_party/widevine/cdm/widevine_cdm_version.h
-+++ chromium-71.0.3573.0/third_party/widevine/cdm/widevine_cdm_version.h
-@@ -11,5 +11,6 @@
- // If the Widevine CDM is available define the following:
+diff -upr chromium-71.0.3578.80.orig/chrome/common/chrome_content_client.cc chromium-71.0.3578.80/chrome/common/chrome_content_client.cc
+--- chromium-71.0.3578.80.orig/chrome/common/chrome_content_client.cc 2018-12-21 20:16:43.000000000 +0000
++++ chromium-71.0.3578.80/chrome/common/chrome_content_client.cc 2018-12-21 21:34:28.658206942 +0000
+@@ -99,7 +99,7 @@
+ // Registers Widevine CDM if Widevine is enabled, the Widevine CDM is
+ // bundled and not a component. When the Widevine CDM is a component, it is
+ // registered in widevine_cdm_component_installer.cc.
+-#if BUILDFLAG(BUNDLE_WIDEVINE_CDM) && !BUILDFLAG(ENABLE_WIDEVINE_CDM_COMPONENT)
++#if BUILDFLAG(ENABLE_WIDEVINE) && !BUILDFLAG(ENABLE_WIDEVINE_CDM_COMPONENT)
+ #define REGISTER_BUNDLED_WIDEVINE_CDM
+ #include "third_party/widevine/cdm/widevine_cdm_common.h" // nogncheck
+ // TODO(crbug.com/663554): Needed for WIDEVINE_CDM_VERSION_STRING. Support
+diff -upr chromium-71.0.3578.80.orig/third_party/widevine/cdm/widevine_cdm_version.h chromium-71.0.3578.80/third_party/widevine/cdm/widevine_cdm_version.h
+--- chromium-71.0.3578.80.orig/third_party/widevine/cdm/widevine_cdm_version.h 2018-12-03 20:18:01.000000000 +0000
++++ chromium-71.0.3578.80/third_party/widevine/cdm/widevine_cdm_version.h 2018-12-04 21:37:45.635374949 +0000
+@@ -12,4 +12,6 @@
// - WIDEVINE_CDM_VERSION_STRING (with the version of the CDM that's available
// as a string, e.g., "1.0.123.456").
-+#define WIDEVINE_CDM_VERSION_STRING "unknown"
++#define WIDEVINE_CDM_VERSION_STRING "unknown"
++
#endif // WIDEVINE_CDM_VERSION_H_
5 years, 5 months
[chromium-vaapi] Re enable the non effective enable_widevine flag
by Akarshan Biswas
commit 44e517bb2ec6466234ae979142c59637e68e6be1
Author: Akarshan Biswas <akarshan.biswas(a)gmail.com>
Date: Fri Dec 21 21:39:28 2018 +0530
Re enable the non effective enable_widevine flag
chromium-vaapi.spec | 5 ++++-
widevine.patch | 25 ++++++++++++++++++-------
2 files changed, 22 insertions(+), 8 deletions(-)
---
diff --git a/chromium-vaapi.spec b/chromium-vaapi.spec
index da9093c..d2a0769 100644
--- a/chromium-vaapi.spec
+++ b/chromium-vaapi.spec
@@ -76,7 +76,7 @@
##############################Package Definitions######################################
Name: chromium-vaapi
Version: 71.0.3578.98
-Release: 1%{?dist}
+Release: 2%{?dist}
Summary: A Chromium web browser with video decoding acceleration
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)
URL: https://www.chromium.org/Home
@@ -692,6 +692,9 @@ appstream-util validate-relax --nonet "%{buildroot}%{_metainfodir}/%{name}.appda
%{chromiumdir}/locales/*.pak
#########################################changelogs#################################################
%changelog
+* Fri Dec 21 2018 Akarshan Biswas <akarshan.biswas(a)hotmail.com> 71.0.3578.98-2
+- Re enable the non effective enable_widevine flag
+
* Sat Dec 15 2018 Akarshan Biswas <akarshan.biswas(a)hotmail.com> 71.0.3578.98-1
- Update to 71.0.3578.98
diff --git a/widevine.patch b/widevine.patch
index 4a9f78f..3ecf0e7 100644
--- a/widevine.patch
+++ b/widevine.patch
@@ -1,11 +1,22 @@
-Index: chromium-71.0.3573.0/third_party/widevine/cdm/widevine_cdm_version.h
-===================================================================
---- chromium-71.0.3573.0.orig/third_party/widevine/cdm/widevine_cdm_version.h
-+++ chromium-71.0.3573.0/third_party/widevine/cdm/widevine_cdm_version.h
-@@ -11,5 +11,6 @@
- // If the Widevine CDM is available define the following:
+diff -upr chromium-71.0.3578.80.orig/chrome/common/chrome_content_client.cc chromium-71.0.3578.80/chrome/common/chrome_content_client.cc
+--- chromium-71.0.3578.80.orig/chrome/common/chrome_content_client.cc 2018-12-21 20:16:43.000000000 +0000
++++ chromium-71.0.3578.80/chrome/common/chrome_content_client.cc 2018-12-21 21:34:28.658206942 +0000
+@@ -99,7 +99,7 @@
+ // Registers Widevine CDM if Widevine is enabled, the Widevine CDM is
+ // bundled and not a component. When the Widevine CDM is a component, it is
+ // registered in widevine_cdm_component_installer.cc.
+-#if BUILDFLAG(BUNDLE_WIDEVINE_CDM) && !BUILDFLAG(ENABLE_WIDEVINE_CDM_COMPONENT)
++#if BUILDFLAG(ENABLE_WIDEVINE) && !BUILDFLAG(ENABLE_WIDEVINE_CDM_COMPONENT)
+ #define REGISTER_BUNDLED_WIDEVINE_CDM
+ #include "third_party/widevine/cdm/widevine_cdm_common.h" // nogncheck
+ // TODO(crbug.com/663554): Needed for WIDEVINE_CDM_VERSION_STRING. Support
+diff -upr chromium-71.0.3578.80.orig/third_party/widevine/cdm/widevine_cdm_version.h chromium-71.0.3578.80/third_party/widevine/cdm/widevine_cdm_version.h
+--- chromium-71.0.3578.80.orig/third_party/widevine/cdm/widevine_cdm_version.h 2018-12-03 20:18:01.000000000 +0000
++++ chromium-71.0.3578.80/third_party/widevine/cdm/widevine_cdm_version.h 2018-12-04 21:37:45.635374949 +0000
+@@ -12,4 +12,6 @@
// - WIDEVINE_CDM_VERSION_STRING (with the version of the CDM that's available
// as a string, e.g., "1.0.123.456").
-+#define WIDEVINE_CDM_VERSION_STRING "unknown"
++#define WIDEVINE_CDM_VERSION_STRING "unknown"
++
#endif // WIDEVINE_CDM_VERSION_H_
5 years, 5 months