[telegram-desktop/f28: 3/3] Merge branch 'master' into f28
by Vitaly Zaitsev
commit 355ce80d6d87d6087bfe46f1ad1df57687816e87
Merge: f2a9d71 9dd1427
Author: Vitaly Zaitsev <vitaly(a)easycoding.org>
Date: Tue Jan 22 02:10:38 2019 +0500
Merge branch 'master' into f28
.gitignore | 3 ++
sources | 4 +--
telegram-desktop-build-fixes.patch | 54 +++++++++++----------------------
telegram-desktop-system-fonts.patch | 4 +--
telegram-desktop-unbundle-minizip.patch | 6 ++--
telegram-desktop.spec | 19 ++++++++++--
6 files changed, 43 insertions(+), 47 deletions(-)
---
5 years, 10 months
[telegram-desktop/f28: 2/3] Updated to version 1.5.8.
by Vitaly Zaitsev
commit 9dd142770faa6186a37f92a9faa98ce87bdc3615
Author: Vitaly Zaitsev <vitaly(a)easycoding.org>
Date: Mon Jan 21 22:10:05 2019 +0100
Updated to version 1.5.8.
.gitignore | 1 +
sources | 2 +-
telegram-desktop-build-fixes.patch | 6 +++---
telegram-desktop-system-fonts.patch | 4 ++--
telegram-desktop-unbundle-minizip.patch | 6 +++---
telegram-desktop.spec | 5 ++++-
6 files changed, 14 insertions(+), 10 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 3cead3a..e890e47 100644
--- a/.gitignore
+++ b/.gitignore
@@ -68,3 +68,4 @@
/tdesktop-1.5.4.tar.gz
/crl-9b7c6b5.tar.gz
/tdesktop-1.5.7.tar.gz
+/tdesktop-1.5.8.tar.gz
diff --git a/sources b/sources
index 8785428..186d347 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
3ac19bcca9cb18f67bdb0ccb99445773 crl-9b7c6b5.tar.gz
-60cb64f403dfd0bc157737e435743485 tdesktop-1.5.7.tar.gz
+1c8649412b9c2ac36d5e79c9a1236610 tdesktop-1.5.8.tar.gz
diff --git a/telegram-desktop-build-fixes.patch b/telegram-desktop-build-fixes.patch
index ecd5906..0f1b24a 100644
--- a/telegram-desktop-build-fixes.patch
+++ b/telegram-desktop-build-fixes.patch
@@ -1,4 +1,4 @@
-From a5f5d043470a3b4e7387bb4511e5e2d3dca3f48b Mon Sep 17 00:00:00 2001
+From 1fd00618894c6f2ff7a04620883d123cf0aba7dd 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.
@@ -767,10 +767,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 9e6bc94d6..76604ac5a 100644
+index 2a2d718b8..d82413a3c 100644
--- a/Telegram/gyp/telegram_sources.txt
+++ b/Telegram/gyp/telegram_sources.txt
-@@ -813,7 +813,7 @@
+@@ -822,7 +822,7 @@
<(src_loc)/messenger.h
<(src_loc)/observer_peer.cpp
<(src_loc)/observer_peer.h
diff --git a/telegram-desktop-system-fonts.patch b/telegram-desktop-system-fonts.patch
index 6c44316..fa79d3d 100644
--- a/telegram-desktop-system-fonts.patch
+++ b/telegram-desktop-system-fonts.patch
@@ -1,4 +1,4 @@
-From cff25cf61be13f36908968359c821df33262c751 Mon Sep 17 00:00:00 2001
+From c29b7e8b28c044eae3d480bf69338dc1accadbd7 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 7f94c6d1d..89dc3d6bb 100644
+index be9ecce12..52da1540a 100644
--- a/Telegram/SourceFiles/ui/twidget.cpp
+++ b/Telegram/SourceFiles/ui/twidget.cpp
@@ -70,9 +70,9 @@ void Start() {
diff --git a/telegram-desktop-unbundle-minizip.patch b/telegram-desktop-unbundle-minizip.patch
index deb43bc..cfc1a4e 100644
--- a/telegram-desktop-unbundle-minizip.patch
+++ b/telegram-desktop-unbundle-minizip.patch
@@ -1,4 +1,4 @@
-From 4db0d20a95ce9f49d9265baced37ebeea5894024 Mon Sep 17 00:00:00 2001
+From 897c69f886c153bb5d5e7be1c57aff972adb5308 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 76604ac5a..b6252d019 100644
+index d82413a3c..a48fdbf7e 100644
--- a/Telegram/gyp/telegram_sources.txt
+++ b/Telegram/gyp/telegram_sources.txt
-@@ -820,13 +820,6 @@
+@@ -829,13 +829,6 @@
<(emoji_suggestions_loc)/emoji_suggestions.h
platforms: !win
diff --git a/telegram-desktop.spec b/telegram-desktop.spec
index 0b616d8..2e477c8 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.7
+Version: 1.5.8
Release: 1%{?dist}
# Application and 3rd-party modules licensing:
@@ -153,6 +153,9 @@ appstream-util validate-relax --nonet "%{buildroot}%{_datadir}/metainfo/%{name}.
%{_datadir}/metainfo/%{name}.appdata.xml
%changelog
+* Mon Jan 21 2019 Vitaly Zaitsev <vitaly(a)easycoding.org> - 1.5.8-1
+- Updated to 1.5.8.
+
* Fri Jan 11 2019 Vitaly Zaitsev <vitaly(a)easycoding.org> - 1.5.7-1
- Updated to 1.5.7 (beta).
5 years, 10 months
[VirtualBox-kmod/el7] Update to 5.2.24
by Sérgio M. Basto
commit 908ceede826874d92cfe61e22de5b10d90ffd60e
Author: Sérgio M. Basto <sergio(a)serjux.com>
Date: Mon Jan 21 18:30:03 2019 +0000
Update to 5.2.24
VirtualBox-kmod.spec | 12 +++++++-----
1 file changed, 7 insertions(+), 5 deletions(-)
---
diff --git a/VirtualBox-kmod.spec b/VirtualBox-kmod.spec
index e1bb301..f14736a 100644
--- a/VirtualBox-kmod.spec
+++ b/VirtualBox-kmod.spec
@@ -39,19 +39,18 @@
%global __arch_install_post /usr/lib/rpm/check-rpaths /usr/lib/rpm/check-buildroot
Name: VirtualBox-kmod
-Version: 5.2.22
+Version: 5.2.24
#Release: 1%%{?prerel:.%%{prerel}}%%{?dist}
-Release: 3%{?dist}
+Release: 1%{?dist}
Summary: Kernel module for VirtualBox
-Group: System Environment/Kernel
License: GPLv2 or CDDL
URL: http://www.virtualbox.org/wiki/VirtualBox
# This filters out the XEN kernel, since we don't run on XEN
Source1: VirtualBox-kmod-excludekernel-filter.txt
Source2: https://github.com/jwrdegoede/vboxsf/archive/master.zip
-Patch1: changeset_75402.diff
+#Patch1: changeset_75402.diff
%global AkmodsBuildRequires %{_bindir}/kmodtool, VirtualBox-kmodsrc >= %{version}%{vboxreltag}, xz, time
BuildRequires: %{AkmodsBuildRequires}
@@ -75,7 +74,7 @@ Kernel module for VirtualBox
%setup -T -c
tar --use-compress-program xz -xf %{_datadir}/%{name}-%{version}/%{name}-%{version}.tar.xz
pushd %{name}-%{version}
-%patch1 -p1 -b .rhel76_fix
+#patch1 -p1 -b .rhel76_fix
%if %{with newvboxsf}
rm -rf vboxsf/
unzip %{SOURCE2}
@@ -140,6 +139,9 @@ DIRS=$(ls %{name}-%{version} |wc -l)
%changelog
+* Mon Jan 21 2019 Sérgio Basto <sergio(a)serjux.com> - 5.2.24-1
+- Update to 5.2.24
+
* Thu Dec 13 2018 Sérgio Basto <sergio(a)serjux.com> - 5.2.22-3
- Fix vboxvideo.ko build on rhel76
5 years, 10 months