[telegram-desktop/el7] Updated to version 1.1.11. Fixed problems with launch on some Fedora 26+ installations.
by Vitaly Zaitsev
commit 1b0693e675038245308948043302f54480079f57
Author: Vitaly Zaitsev <vitaly(a)easycoding.org>
Date: Sun Jul 9 23:28:05 2017 +0500
Updated to version 1.1.11. Fixed problems with launch on some Fedora 26+ installations.
.gitignore | 1 +
fix_build_under_fedora.patch | 37 +++++++++++++++++++++++--------------
fix_libtgvoip.patch | 4 ++--
sources | 2 +-
telegram-desktop.spec | 11 +++++++++--
5 files changed, 36 insertions(+), 19 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 65150cd..3495a34 100644
--- a/.gitignore
+++ b/.gitignore
@@ -21,3 +21,4 @@
/tdesktop-1.1.9.tar.gz
/libtgvoip-445433f.tar.gz
/tdesktop-1.1.10.tar.gz
+/tdesktop-1.1.11.tar.gz
diff --git a/fix_build_under_fedora.patch b/fix_build_under_fedora.patch
index ed766c4..08e2e2d 100644
--- a/fix_build_under_fedora.patch
+++ b/fix_build_under_fedora.patch
@@ -1,17 +1,17 @@
-From 337972b43b01c29248229015d86c672dac0c4f5d Mon Sep 17 00:00:00 2001
+From 9da328a48a8b44d9b4c61f60331251788d18e432 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.
---
- Telegram/SourceFiles/main.cpp | 7 ++-
+ Telegram/SourceFiles/main.cpp | 11 +++-
Telegram/SourceFiles/qt_functions.cpp | 94 +++++++++++++++++++++++++++++
Telegram/SourceFiles/qt_static_plugins.cpp | 9 ---
Telegram/SourceFiles/ui/text/text.cpp | 6 +-
Telegram/SourceFiles/ui/text/text_block.cpp | 2 +-
Telegram/SourceFiles/ui/twidget.cpp | 4 +-
Telegram/gyp/PrecompiledHeader.cmake | 4 +-
- Telegram/gyp/Telegram.gyp | 18 ++----
+ Telegram/gyp/Telegram.gyp | 19 ++----
Telegram/gyp/qt.gypi | 80 +++++++-----------------
Telegram/gyp/qt_rcc.gypi | 2 +-
Telegram/gyp/settings_linux.gypi | 8 +--
@@ -20,11 +20,11 @@ Subject: [PATCH] Fixed build under Fedora using rpmbuild and mock.
Telegram/gyp/utils.gyp | 4 +-
lib/xdg/telegramdesktop.appdata.xml | 2 +-
lib/xdg/telegramdesktop.desktop | 6 +-
- 16 files changed, 159 insertions(+), 153 deletions(-)
+ 16 files changed, 163 insertions(+), 154 deletions(-)
create mode 100644 Telegram/SourceFiles/qt_functions.cpp
diff --git a/Telegram/SourceFiles/main.cpp b/Telegram/SourceFiles/main.cpp
-index 6cd942e..0268e39 100644
+index 6cd942e..d45bf82 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
@@ -40,12 +40,16 @@ index 6cd942e..0268e39 100644
QCoreApplication::setApplicationName(qsl("TelegramDesktop"));
settingsParseArgs(argc, argv);
-@@ -38,6 +39,8 @@ int main(int argc, char *argv[]) {
+@@ -38,6 +39,12 @@ int main(int argc, char *argv[]) {
// both are finished in Application::closeApplication
Logs::start(); // must be started before Platform is started
Platform::start(); // must be started before QApplication is created
++#if defined(Q_OS_LINUX64)
+ QCoreApplication::addLibraryPath("/usr/lib64/qt5/plugins");
++#else
+ QCoreApplication::addLibraryPath("/usr/lib/qt5/plugins");
++#endif
++ setenv("QT_STYLE_OVERRIDE", "qwerty", false);
int result = 0;
{
@@ -168,10 +172,10 @@ 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 044f871..0865a5b 100644
+index 9ab1394..cec6589 100644
--- a/Telegram/SourceFiles/ui/text/text.cpp
+++ b/Telegram/SourceFiles/ui/text/text.cpp
-@@ -1692,11 +1692,11 @@ private:
+@@ -1688,11 +1688,11 @@ private:
if (item == -1)
return;
@@ -184,8 +188,8 @@ index 044f871..0865a5b 100644
-#endif // OS_MAC_OLD
+#endif
- int blockIndex = _lineStartBlock;
- ITextBlock *currentBlock = _t->_blocks[blockIndex];
+ 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
--- a/Telegram/SourceFiles/ui/text/text_block.cpp
@@ -238,7 +242,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..1c0ab91 100644
+index 80160d1..9dcdeb4 100644
--- a/Telegram/gyp/Telegram.gyp
+++ b/Telegram/gyp/Telegram.gyp
@@ -31,7 +31,6 @@
@@ -249,7 +253,12 @@ index 80160d1..1c0ab91 100644
'sp_media_key_tap_loc': '<(submodules_loc)/SPMediaKeyTap',
'style_files': [
'<(res_loc)/colors.palette',
-@@ -83,23 +82,18 @@
+@@ -78,28 +77,22 @@
+ 'codegen.gyp:codegen_lang',
+ 'codegen.gyp:codegen_numbers',
+ 'codegen.gyp:codegen_style',
+- 'utils.gyp:Updater',
+ '../ThirdParty/libtgvoip/libtgvoip.gyp:libtgvoip',
],
'defines': [
@@ -577,10 +586,10 @@ index 2c46492..1b14723 100644
},
},
diff --git a/Telegram/gyp/telegram_sources.txt b/Telegram/gyp/telegram_sources.txt
-index bfc18fd..4a1c525 100644
+index fbe63ec..d7da420 100644
--- a/Telegram/gyp/telegram_sources.txt
+++ b/Telegram/gyp/telegram_sources.txt
-@@ -579,13 +579,7 @@
+@@ -581,13 +581,7 @@
<(src_loc)/structs.h
platforms: !win
diff --git a/fix_libtgvoip.patch b/fix_libtgvoip.patch
index 7e7cd19..9283fa3 100644
--- a/fix_libtgvoip.patch
+++ b/fix_libtgvoip.patch
@@ -1,6 +1,6 @@
-From 24a204f5fb232e19dc3513ae828e6cf6dd525c93 Mon Sep 17 00:00:00 2001
+From 28e80ce3b5f63ce9e5bf41136e5b2413e50d1ea4 Mon Sep 17 00:00:00 2001
From: Vitaly Zaitsev <vitaly(a)easycoding.org>
-Date: Wed, 10 May 2017 13:19:54 +0200
+Date: Thu, 6 Jul 2017 17:27:01 +0200
Subject: [PATCH] Fixed build of libtgvoip under Fedora as shared library.
---
diff --git a/sources b/sources
index 298c6f7..1337d5e 100644
--- a/sources
+++ b/sources
@@ -1,4 +1,4 @@
ba90e749953f2ac1c013011601a58598 GSL-c5851a8.tar.gz
0373c28165f86474f8abdce278320c1a gyp-a478c1a.tar.gz
8bec9e667cd66f92381bae426117e8ea libtgvoip-445433f.tar.gz
-139a00aa95ab3823908ccbe1c65d2ceb tdesktop-1.1.10.tar.gz
+2d3cafdd06fced7415b8f7088482e8f2 tdesktop-1.1.11.tar.gz
diff --git a/telegram-desktop.spec b/telegram-desktop.spec
index 496b5ef..963d6f7 100644
--- a/telegram-desktop.spec
+++ b/telegram-desktop.spec
@@ -16,8 +16,8 @@
Summary: Telegram is a new era of messaging
Name: telegram-desktop
-Version: 1.1.10
-Release: 1%{?dist}
+Version: 1.1.11
+Release: 2%{?dist}
# Application and 3rd-party modules licensing:
# * S0 (Telegram Desktop) - GPLv3+ with OpenSSL exception -- main source;
@@ -41,6 +41,7 @@ Patch1: fix_libtgvoip.patch
Provides: libtgvoip = %{voipver}
Requires: hicolor-icon-theme
Requires: qt5-qtimageformats%{?_isa}
+Requires: gtk3%{?_isa}
%if 0%{?fedora} >= 24
Recommends: libappindicator-gtk3%{?_isa}
%endif
@@ -226,6 +227,12 @@ fi
%{_datadir}/appdata/%{name}.appdata.xml
%changelog
+* Sun Jul 09 2017 Vitaly Zaitsev <vitaly(a)easycoding.org> - 1.1.11-2
+- Fixed some small bugs.
+
+* Fri Jul 07 2017 Vitaly Zaitsev <vitaly(a)easycoding.org> - 1.1.11-1
+- Updated to 1.1.11 (alpha).
+
* Tue Jul 04 2017 Vitaly Zaitsev <vitaly(a)easycoding.org> - 1.1.10-1
- Updated to 1.1.10.
7 years, 4 months
[rpmfusion-nonfree-appstream-data/f26] Regenerate and update
by Ankur Sinha
commit 19bf7c093e56883a2db9b48e80f9592c295c9c90
Author: Ankur Sinha (Ankur Sinha Gmail) <sanjay.ankur(a)gmail.com>
Date: Sun Jul 9 19:03:12 2017 +0100
Regenerate and update
rpmfusion-nonfree-appstream-data.spec | 5 ++++-
sources | 2 +-
2 files changed, 5 insertions(+), 2 deletions(-)
---
diff --git a/rpmfusion-nonfree-appstream-data.spec b/rpmfusion-nonfree-appstream-data.spec
index 8762b49..41b3d78 100644
--- a/rpmfusion-nonfree-appstream-data.spec
+++ b/rpmfusion-nonfree-appstream-data.spec
@@ -3,7 +3,7 @@
Name: %{reponame}-%{repoversion}-appstream-data
Version: 26
-Release: 1%{?dist}
+Release: 2%{?dist}
Summary: Appstream metadata for the RPM Fusion nonfree repository
BuildArch: noarch
@@ -51,6 +51,9 @@ DESTDIR=%{buildroot} appstream-util install %{SOURCE0} %{SOURCE1}
%dir %{_datadir}/app-info/xmls
%changelog
+* Sun Jul 09 2017 Ankur Sinha <ankursinha AT fedoraproject DOT org> - 26-2
+- Regenerate and update
+
* Mon Nov 14 2016 Ankur Sinha <ankursinha AT fedoraproject DOT org> - 26-1
- Bump version and regenerate data with correct version
diff --git a/sources b/sources
index 7b3407a..7ab9bf7 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
ec5b2cc46c9aad73ebd5f9c9ea867696 rpmfusion-nonfree-26-icons.tar.gz
-bdb690e218f213dcc7387894322a8548 rpmfusion-nonfree-26.xml.gz
+2f4b565f5dfcbc52acb5c251fdaa92d8 rpmfusion-nonfree-26.xml.gz
7 years, 4 months
[rpmfusion-free-appstream-data/f26] Regenerate and update
by Ankur Sinha
commit 21793d26234dbbbff46140278885a50c151142c7
Author: Ankur Sinha (Ankur Sinha Gmail) <sanjay.ankur(a)gmail.com>
Date: Sun Jul 9 18:54:00 2017 +0100
Regenerate and update
rpmfusion-free-appstream-data.spec | 5 ++++-
sources | 4 ++--
2 files changed, 6 insertions(+), 3 deletions(-)
---
diff --git a/rpmfusion-free-appstream-data.spec b/rpmfusion-free-appstream-data.spec
index c3226a5..f6a719d 100644
--- a/rpmfusion-free-appstream-data.spec
+++ b/rpmfusion-free-appstream-data.spec
@@ -3,7 +3,7 @@
Name: %{reponame}-%{repoversion}-appstream-data
Version: 26
-Release: 1%{?dist}
+Release: 2%{?dist}
Summary: Appstream metadata for the RPM Fusion free repository
BuildArch: noarch
@@ -50,6 +50,9 @@ DESTDIR=%{buildroot} appstream-util install %{SOURCE0} %{SOURCE1}
%dir %{_datadir}/app-info/xmls
%changelog
+* Sun Jul 09 2017 Ankur Sinha <ankursinha AT fedoraproject DOT org> - 26-2
+- Regenerate and update for GA
+
* Mon Nov 14 2016 Ankur Sinha <ankursinha AT fedoraproject DOT org> - 26-1
- Regenerate and update for f26
diff --git a/sources b/sources
index e50f08f..9c088f5 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-39ea9d69467d73d17f5e583e60487948 rpmfusion-free-26-icons.tar.gz
-8f95ceaf2c6a2df5d45d6aacc79a8b74 rpmfusion-free-26.xml.gz
+13c3d3641a51653633687ff3e40d6a71 rpmfusion-free-26-icons.tar.gz
+1f53748a1af5c7e63d1b31e935d2e546 rpmfusion-free-26.xml.gz
7 years, 4 months
[xpra-codecs-freeworld/f25: 2/2] Update to 2.0.3
by Antonio
commit 3caa0434905497796f326f9f254e22eaed0ee5e8
Merge: d0e96ac b062bd1
Author: sagitter <sagitter(a)fedoraproject.org>
Date: Sun Jul 9 14:14:16 2017 +0200
Update to 2.0.3
.gitignore | 1 +
sources | 2 +-
xpra-codecs-freeworld.spec | 7 +++++--
3 files changed, 7 insertions(+), 3 deletions(-)
---
diff --cc .gitignore
index 926fd92,3ebcfe9..664b53b
--- a/.gitignore
+++ b/.gitignore
@@@ -1,2 -1,8 +1,3 @@@
-xpra-0.14.21.tar.xz
-xpra-0.15.10.tar.xz
-xpra-0.16.3.tar.xz
-/xpra-0.17.4.tar.xz
-/xpra-0.17.5.tar.xz
/xpra-1.0.2.tar.xz
/xpra-2.0.2.tar.xz
+ /xpra-2.0.3.tar.xz
7 years, 4 months
