[telegram-desktop/f28: 2/2] Merge branch 'master' into f28
by Vitaly Zaitsev
commit d41443b8623c193feeffbc1d226beef3fd755d08
Merge: f767307 fbbe9d2
Author: Vitaly Zaitsev <vitaly(a)easycoding.org>
Date: Wed Oct 10 04:00:51 2018 +0500
Merge branch 'master' into f28
.gitignore | 1 +
sources | 2 +-
telegram-desktop-api-tokens.patch | 2 +-
telegram-desktop-build-fixes.patch | 10 +++++-----
telegram-desktop-system-fonts.patch | 2 +-
telegram-desktop.spec | 5 ++++-
6 files changed, 13 insertions(+), 9 deletions(-)
---
5 years, 7 months
[telegram-desktop/f28: 1/2] Updated to version 1.4.2.
by Vitaly Zaitsev
commit fbbe9d279d212b10cb0e90a3133c0bf5253e8323
Author: Vitaly Zaitsev <vitaly(a)easycoding.org>
Date: Wed Oct 10 01:00:33 2018 +0200
Updated to version 1.4.2.
.gitignore | 1 +
sources | 2 +-
telegram-desktop-api-tokens.patch | 2 +-
telegram-desktop-build-fixes.patch | 10 +++++-----
telegram-desktop-system-fonts.patch | 2 +-
telegram-desktop.spec | 5 ++++-
6 files changed, 13 insertions(+), 9 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 18d74b7..8a390fd 100644
--- a/.gitignore
+++ b/.gitignore
@@ -60,3 +60,4 @@
/tdesktop-1.3.16.tar.gz
/tdesktop-1.3.17.tar.gz
/tdesktop-1.4.0.tar.gz
+/tdesktop-1.4.2.tar.gz
diff --git a/sources b/sources
index 4c5e3f8..2996455 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
b92e75c44c9d4c9fd96b1d19eb3a666d crl-4291015.tar.gz
-65e0e847dfa8ab876a9fa4a75ccb608a tdesktop-1.4.0.tar.gz
+d9f6fbbbffc27b18922ff67a21fa82a0 tdesktop-1.4.2.tar.gz
diff --git a/telegram-desktop-api-tokens.patch b/telegram-desktop-api-tokens.patch
index a895e14..92b0f9e 100644
--- a/telegram-desktop-api-tokens.patch
+++ b/telegram-desktop-api-tokens.patch
@@ -1,4 +1,4 @@
-From 58bbe51190fdef71b769fa8e4155d62926f5a96a Mon Sep 17 00:00:00 2001
+From 73ea570088802ae28b3a7ac2f950f3dd965c61af 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 2/3] Changed default Telegram Desktop's test API keys to
diff --git a/telegram-desktop-build-fixes.patch b/telegram-desktop-build-fixes.patch
index 2f0fbda..4366277 100644
--- a/telegram-desktop-build-fixes.patch
+++ b/telegram-desktop-build-fixes.patch
@@ -1,4 +1,4 @@
-From 237d60b7f9814c04a4b278618278388d55c8f560 Mon Sep 17 00:00:00 2001
+From b081fb92d0fa68c99f03bfb2d814082bd41523d7 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.
@@ -184,7 +184,7 @@ index a0e1e0489..bd9bce0c1 100644
IMPLICIT_DEPENDS CXX "${_pch_header}"
COMMENT "Precompiling header ${_name} for ${_target} (C++)")
diff --git a/Telegram/gyp/Telegram.gyp b/Telegram/gyp/Telegram.gyp
-index 1cab5ae29..e0b1ebf1d 100644
+index dd7779c7e..d92e36b79 100644
--- a/Telegram/gyp/Telegram.gyp
+++ b/Telegram/gyp/Telegram.gyp
@@ -18,7 +18,6 @@
@@ -799,10 +799,10 @@ index 80259c687..1e1b14748 100644
],
}]
diff --git a/Telegram/gyp/telegram_sources.txt b/Telegram/gyp/telegram_sources.txt
-index f02296c8a..67457a64b 100644
+index a21f20b56..657fc8c5b 100644
--- a/Telegram/gyp/telegram_sources.txt
+++ b/Telegram/gyp/telegram_sources.txt
-@@ -747,7 +747,7 @@
+@@ -753,7 +753,7 @@
<(src_loc)/messenger.h
<(src_loc)/observer_peer.cpp
<(src_loc)/observer_peer.h
@@ -811,7 +811,7 @@ index f02296c8a..67457a64b 100644
<(src_loc)/settings.cpp
<(src_loc)/settings.h
<(src_loc)/shortcuts.cpp
-@@ -756,13 +756,6 @@
+@@ -762,13 +762,6 @@
<(emoji_suggestions_loc)/emoji_suggestions.h
platforms: !win
diff --git a/telegram-desktop-system-fonts.patch b/telegram-desktop-system-fonts.patch
index 1deeb62..d0700dd 100644
--- a/telegram-desktop-system-fonts.patch
+++ b/telegram-desktop-system-fonts.patch
@@ -1,4 +1,4 @@
-From e3c1c2ad2713e174039832f0798f7029e286f62f Mon Sep 17 00:00:00 2001
+From bee797f8a0c8e1517a44b004e9438a921cb7e6e5 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 3/3] Backported and rebased patch from Debian maintainer
diff --git a/telegram-desktop.spec b/telegram-desktop.spec
index 57b264f..7da18aa 100644
--- a/telegram-desktop.spec
+++ b/telegram-desktop.spec
@@ -10,7 +10,7 @@
Summary: Telegram Desktop official messaging app
Name: telegram-desktop
-Version: 1.4.0
+Version: 1.4.2
Release: 1%{?dist}
# Application and 3rd-party modules licensing:
@@ -143,6 +143,9 @@ appstream-util validate-relax --nonet "%{buildroot}%{_datadir}/metainfo/%{name}.
%{_datadir}/metainfo/%{name}.appdata.xml
%changelog
+* Tue Oct 09 2018 Vitaly Zaitsev <vitaly(a)easycoding.org> - 1.4.2-1
+- Updated to 1.4.2.
+
* Fri Sep 28 2018 Vitaly Zaitsev <vitaly(a)easycoding.org> - 1.4.0-1
- Updated to 1.4.0.
5 years, 7 months
[gstreamer1-plugins-ugly] 1.14.4
by Rex Dieter
commit 2ff7a2b48b8272b091c5d796c6c89a15dff6dde9
Author: Rex Dieter <rdieter(a)gmail.com>
Date: Tue Oct 9 15:20:28 2018 -0500
1.14.4
gstreamer1-plugins-ugly.spec | 7 +++++--
sources | 2 +-
2 files changed, 6 insertions(+), 3 deletions(-)
---
diff --git a/gstreamer1-plugins-ugly.spec b/gstreamer1-plugins-ugly.spec
index 99b3712..a325b3a 100644
--- a/gstreamer1-plugins-ugly.spec
+++ b/gstreamer1-plugins-ugly.spec
@@ -2,8 +2,8 @@
Summary: GStreamer 1.0 streaming media framework "ugly" plug-ins
Name: gstreamer1-plugins-ugly
-Version: 1.14.3
-Release: 2%{?dist}
+Version: 1.14.4
+Release: 1%{?dist}
License: LGPLv2+
Group: Applications/Multimedia
URL: https://gstreamer.freedesktop.org/
@@ -106,6 +106,9 @@ rm -fv %{buildroot}%{_datadir}/gtk-doc/html/%{src_name}-plugins-1.0/*
%changelog
+* Tue Oct 09 2018 Rex Dieter <rdieter(a)fedoraproject.org> - 1.14.4-1
+- 1.14.4
+
* Thu Oct 04 2018 Sérgio Basto <sergio(a)serjux.com> - 1.14.3-2
- Mass rebuild for x264 and/or x265
diff --git a/sources b/sources
index a060e93..e4d276c 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-4b23a9a9675ff62c83b117b519f10951 gst-plugins-ugly-1.14.3.tar.xz
+90768a0074db071175ce980064d9a1ac gst-plugins-ugly-1.14.4.tar.xz
5 years, 7 months
[gstreamer1-plugins-bad-nonfree] 1.14.4
by Rex Dieter
commit 359d2e93cfa9506a03bec290137cfc7b18f5caa9
Author: Rex Dieter <rdieter(a)gmail.com>
Date: Tue Oct 9 15:18:37 2018 -0500
1.14.4
gstreamer1-plugins-bad-nonfree.spec | 5 ++++-
sources | 2 +-
2 files changed, 5 insertions(+), 2 deletions(-)
---
diff --git a/gstreamer1-plugins-bad-nonfree.spec b/gstreamer1-plugins-bad-nonfree.spec
index 86fd6dc..bbb4f5a 100644
--- a/gstreamer1-plugins-bad-nonfree.spec
+++ b/gstreamer1-plugins-bad-nonfree.spec
@@ -3,7 +3,7 @@
Summary: GStreamer 1.0 streaming media framework "bad" non-free plug-ins
Name: gstreamer1-plugins-bad-nonfree
-Version: 1.14.3
+Version: 1.14.4
Release: 1%{?dist}
License: LGPLv2+
URL: http://gstreamer.freedesktop.org/
@@ -69,6 +69,9 @@ rm -fv %{buildroot}%{_libdir}/gstreamer-1.0/*.la
%{_libdir}/gstreamer-1.0/libgstfdkaac.so
%changelog
+* Tue Oct 09 2018 Rex Dieter <rdieter(a)fedoraproject.org> - 1.14.4-1
+- 1.14.4
+
* Tue Sep 18 2018 Leigh Scott <leigh123linux(a)googlemail.com> - 1.14.3-1
- 1.14.3
diff --git a/sources b/sources
index 168a327..3ea712e 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-caddacfa4ffff2b3171961ad278507c2 gst-plugins-bad-1.14.3.tar.xz
+5d20a91d027708abcf924f6c1279dd25 gst-plugins-bad-1.14.4.tar.xz
5 years, 7 months
[gstreamer1-plugins-bad-freeworld] 1.14.4
by Rex Dieter
commit 9ee43887cb2a6f06e941ad7c29960a2d2edc50bd
Author: Rex Dieter <rdieter(a)gmail.com>
Date: Tue Oct 9 15:16:25 2018 -0500
1.14.4
gstreamer1-plugins-bad-freeworld.spec | 7 +++++--
sources | 2 +-
2 files changed, 6 insertions(+), 3 deletions(-)
---
diff --git a/gstreamer1-plugins-bad-freeworld.spec b/gstreamer1-plugins-bad-freeworld.spec
index e2e558b..bc68141 100644
--- a/gstreamer1-plugins-bad-freeworld.spec
+++ b/gstreamer1-plugins-bad-freeworld.spec
@@ -4,8 +4,8 @@
Summary: GStreamer 1.0 streaming media framework "bad" plug-ins
Name: gstreamer1-plugins-bad-freeworld
-Version: 1.14.3
-Release: 2%{?dist}
+Version: 1.14.4
+Release: 1%{?dist}
License: LGPLv2+
Group: Applications/Multimedia
URL: http://gstreamer.freedesktop.org/
@@ -101,6 +101,9 @@ rm -fv %{buildroot}%{_libdir}/gstreamer-1.0/*.la
%changelog
+* Tue Oct 09 2018 Rex Dieter <rdieter(a)fedoraproject.org> - 1.14.4-1
+- 1.14.4
+
* Thu Oct 04 2018 Sérgio Basto <sergio(a)serjux.com> - 1.14.3-2
- Mass rebuild for x264 and/or x265
diff --git a/sources b/sources
index 168a327..3ea712e 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-caddacfa4ffff2b3171961ad278507c2 gst-plugins-bad-1.14.3.tar.xz
+5d20a91d027708abcf924f6c1279dd25 gst-plugins-bad-1.14.4.tar.xz
5 years, 7 months
[gstreamer1-libav] 1.14.4
by Rex Dieter
commit 9e5537dce09866944671c3dc964574a20f521d60
Author: Rex Dieter <rdieter(a)gmail.com>
Date: Tue Oct 9 15:15:27 2018 -0500
1.14.4
gstreamer1-libav.spec | 5 ++++-
sources | 2 +-
2 files changed, 5 insertions(+), 2 deletions(-)
---
diff --git a/gstreamer1-libav.spec b/gstreamer1-libav.spec
index da4f94a..c378a1e 100644
--- a/gstreamer1-libav.spec
+++ b/gstreamer1-libav.spec
@@ -1,5 +1,5 @@
Name: gstreamer1-libav
-Version: 1.14.3
+Version: 1.14.4
Release: 1%{?dist}
Summary: GStreamer 1.0 libav-based plug-ins
License: LGPLv2+
@@ -81,6 +81,9 @@ rm -fv %{buildroot}%{_libdir}/gstreamer-1.0/libgst*.la
%changelog
+* Tue Oct 09 2018 Rex Dieter <rdieter(a)fedoraproject.org> - 1.14.4-1
+- 1.14.4
+
* Tue Sep 18 2018 Leigh Scott <leigh123linux(a)googlemail.com> - 1.14.3-1
- 1.14.3
diff --git a/sources b/sources
index 3a22b13..ea65ccb 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-e4a2ad307f101b53c7d417d4d0b36955 gst-libav-1.14.3.tar.xz
+58342db11dbb201a66a62577dcf7bab5 gst-libav-1.14.4.tar.xz
5 years, 7 months
[chromium-freeworld/f28: 6/6] fix branches
by hellbanger
commit 2d0805bd9becb51f344ac1e5b00ab4146fb4599b
Author: Akarshan Biswas <hellbanger(a)ga-lmt-s2.biswasab.org>
Date: Tue Oct 9 22:00:28 2018 +0530
fix branches
sources | 5 +----
1 file changed, 1 insertion(+), 4 deletions(-)
---
diff --git a/sources b/sources
index 063da26..e3efddd 100644
--- a/sources
+++ b/sources
@@ -1,6 +1,3 @@
-<<<<<<< HEAD
-1779724693bdcf7b4e01ea1133abdde2 chromium-69.0.3497.100.tar.xz
-=======
da72b7ad3a595d0140ceba60e867b9b7 Ahem.ttf
288115b66e98afcc694dd6ec2896cea4 Arimo-Bold.ttf
ccaa8e13109cd38413b2932985d5eed8 Arimo-BoldItalic.ttf
@@ -20,4 +17,4 @@ f47f3969c349f68100eff6d6a60c801c Arimo-Italic.ttf
02b895625ab1d641cc25eb3261b172d4 Tinos-BoldItalic.ttf
012412bb679844077b2eb100d59f3a0f Tinos-Italic.ttf
c7b726b40d858a1f39e848b9b52a64a1 Tinos-Regular.ttf
->>>>>>> master
+
5 years, 7 months
[chromium-freeworld/f28: 5/6] Merge branch 'master' into f28
by hellbanger
commit da3defff5242defbbde05958d93b175144130634
Merge: ca74787 89cdd01
Author: Akarshan Biswas <hellbanger(a)ga-lmt-s2.biswasab.org>
Date: Tue Oct 9 21:59:25 2018 +0530
Merge branch 'master' into f28
.gitignore | 2 ++
sources | 22 ++++++++++++++++++++++
2 files changed, 24 insertions(+)
---
diff --cc sources
index 7d1e885,8f1cf20..063da26
--- a/sources
+++ b/sources
@@@ -1,1 -1,19 +1,23 @@@
++<<<<<<< HEAD
+1779724693bdcf7b4e01ea1133abdde2 chromium-69.0.3497.100.tar.xz
++=======
+ da72b7ad3a595d0140ceba60e867b9b7 Ahem.ttf
+ 288115b66e98afcc694dd6ec2896cea4 Arimo-Bold.ttf
+ ccaa8e13109cd38413b2932985d5eed8 Arimo-BoldItalic.ttf
+ f47f3969c349f68100eff6d6a60c801c Arimo-Italic.ttf
+ 0b354bcd98dc591b886fdc253ed89cbd Arimo-Regular.ttf
+ 1779724693bdcf7b4e01ea1133abdde2 chromium-69.0.3497.100.tar.xz
+ 826ffce6a2b7dc7775b6f5e21412797b Cousine-Bold.ttf
+ 80b219719676bdcfda35f722300f2456 Cousine-BoldItalic.ttf
+ 337a3d621d7b6d940b8dd1ba9430dd87 Cousine-Italic.ttf
+ 8c49cb0b03881a5f4178edc0fbe8567a Cousine-Regular.ttf
+ 49a7f897775cce21d2b69968b8af1cea depot_tools.git-master.tar.gz
+ 4d610887ff4d445cbc639aae7828d139 gelasio.zip
+ 85d8bf52bda23c1cd422be54dee113a6 lohit-gurmukhi-ttf-2.91.2.tar.gz
+ 314394b29c1d15a73c3f00316003810a MuktiNarrow-0.94.tar.bz2
+ 9af8a0b80e85db34b1c34928d81cc423 NotoSansCJKjp-hinted.zip
+ 7ac1d29dc1aea67dc8607fc6d403442c Tinos-Bold.ttf
+ 02b895625ab1d641cc25eb3261b172d4 Tinos-BoldItalic.ttf
+ 012412bb679844077b2eb100d59f3a0f Tinos-Italic.ttf
+ c7b726b40d858a1f39e848b9b52a64a1 Tinos-Regular.ttf
++>>>>>>> master
5 years, 7 months
[chromium-freeworld/f28] (6 commits) ...fix branches
by hellbanger
Summary of changes:
99be526... update to 69.0.3497.100 (*)
1799756... fix sources (*)
069ea17... re-fix sources (*)
89cdd01... Upload all available sources (*)
da3deff... Merge branch 'master' into f28
2d0805b... fix branches
(*) This commit already existed in another branch; no separate mail sent
5 years, 7 months