rpm/telegram-desktop
SHA256
1
0
Fork 0
forked from pool/telegram-desktop
Code Pull Requests Activity

Accepting request 766976 from home:tux93

Browse Source 
- Update to 1.9.8
  * Bug fixes and other minor improvements.
- Update to 1.9.7
  * Create three new kinds of polls.
  * See who voted for what in polls with visible votes.
  * Vote for several options in polls that allow multiple answers.
  * Guess the correct answer in quiz-style polls.
  * Explore various ways of combining the different poll options.
  * Add polls from the '...' menu in any group or channel.
  * Use bots like @quizbot to create quizzes with several questions
    and media attachments.
  * Schedule messages to be sent when your recipient comes online
    (only works if you know their online status).
- Clean up spec file
- Update to 1.9.6
  * Bug fixes and other minor improvements.
- Removed 0005-Use-system-wide-fonts.patch and
  0006-Revert-Disable-DemiBold-fallback-for-Semibold.patch,
  option to use system fonts added upstream

OBS-URL: https://build.opensuse.org/request/show/766976
OBS-URL: https://build.opensuse.org/package/show/server:messaging/telegram-desktop?expand=0&rev=120
This commit is contained in:
Marcel Kuehlhorn 2020-01-24 22:44:24 +00:00 committed by Git OBS Bridge
parent 7852f1427c
commit 17e12b4eff
6 changed files with 55 additions and 148 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

64
0005-Use-system-wide-fonts.patch
View File

@ -1,64 +0,0 @@
Do not force custom fontconfig configuration.
--- a/Telegram/lib_ui/fonts/fonts.qrc
+++ b/Telegram/lib_ui/fonts/fonts.qrc
@@ -1,10 +1,4 @@
<RCC>
<qresource prefix="/gui/fonts">
- <file>DAOpenSansRegular.ttf</file>
- <file>DAOpenSansRegularItalic.ttf</file>
- <file>DAOpenSansBold.ttf</file>
- <file>DAOpenSansBoldItalic.ttf</file>
- <file>DAOpenSansSemibold.ttf</file>
- <file>DAOpenSansSemiboldItalic.ttf</file>
</qresource>
</RCC>
--- a/Telegram/lib_ui/ui/style/style_core_font.cpp
+++ b/Telegram/lib_ui/ui/style/style_core_font.cpp
@@ -94,12 +94,12 @@
FontTypesCount,
};
QString FontTypeNames[FontTypesCount] = {
- "DAOpenSansRegular",
- "DAOpenSansRegularItalic",
- "DAOpenSansBold",
- "DAOpenSansBoldItalic",
- "DAOpenSansSemibold",
- "DAOpenSansSemiboldItalic",
+ "Open Sans",
+ "Open Sans",
+ "Open Sans",
+ "Open Sans",
+ "Open Sans Semibold",
+ "Open Sans Semibold",
};
int32 FontTypeFlags[FontTypesCount] = {
0,
@@ -135,7 +135,7 @@
for (auto i = 0; i != FontTypesCount; ++i) {
const auto name = FontTypeNames[i];
const auto flags = FontTypeFlags[i];
- areGood[i] = LoadCustomFont(":/gui/fonts/" + name + ".ttf", name, flags);
+ areGood[i] = ValidateFont(name, flags);
Overrides[i] = name;
#ifdef Q_OS_WIN
// Attempt to workaround a strange font bug with Open Sans Semibold not loading.
--- a/Telegram/SourceFiles/platform/linux/specific_linux.cpp.orig 2020-01-17 22:34:25.882017929 +0100
+++ b/Telegram/SourceFiles/platform/linux/specific_linux.cpp 2020-01-17 22:34:56.362548378 +0100
@@ -82,8 +82,6 @@ void FallbackFontConfig() {
return;
}
}
-
- QFile(":/fc/fc-custom.conf").copy(custom);
#endif // !DESKTOP_APP_USE_PACKAGED
}
--- a/Telegram/lib_ui/qt_conf/linux.qrc.orig 2020-01-17 22:38:50.902630063 +0100
+++ b/Telegram/lib_ui/qt_conf/linux.qrc 2020-01-17 22:39:09.298950213 +0100
@@ -3,6 +3,5 @@
<file alias="qt.conf">qt_linux.conf</file>
</qresource>
<qresource prefix="/fc">
- <file>fc-custom.conf</file>
</qresource>
</RCC>

25
0006-Revert-Disable-DemiBold-fallback-for-Semibold.patch
View File

@ -1,25 +0,0 @@
From b7effa2fd838afc049ec5cc00df3bd0810a95da4 Mon Sep 17 00:00:00 2001
From: Jiachen YANG <farseerfc@gmail.com>
Date: Fri, 4 Oct 2019 16:59:26 +0900
Subject: [PATCH 3/6] Revert "Disable DemiBold fallback for Semibold."
This reverts commit 310c68a744ae8163c96b88944d96a6f6b14b3cdf.
---
Telegram/lib_ui/ui/style/style_core_font.cpp | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
--- a/Telegram/lib_ui/ui/style/style_core_font.cpp
+++ b/Telegram/lib_ui/ui/style/style_core_font.cpp
@@ -225,9 +225,9 @@
f.setPixelSize(size);
if (_flags & FontBold) {
- f.setBold(true);
- //} else if (fontFamilies[family] == "Open Sans Semibold") {
- // f.setWeight(QFont::DemiBold);
+ f.setBold(_flags & FontBold);
+ } else if (fontFamilies[family] == "Open Sans Semibold") {
+ f.setWeight(QFont::DemiBold);
}
f.setItalic(_flags & FontItalic);
f.setUnderline(_flags & FontUnderline);

3
tdesktop-1.9.4-full.tar.gz
View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:9ef7ac0e97629dec7ff68aea54f517a40c4a41fa9197f205bd4431d0e37abad1
size 25262385

3
tdesktop-1.9.8-full.tar.gz Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:4dcf14cff65777a176a4552b982e67fa802668f29d212025b0c05342010a03e7
size 25225784

31
telegram-desktop.changes
View File

@ -1,3 +1,34 @@
-------------------------------------------------------------------
Fri Jan 24 17:48:01 UTC 2020 - Marcel Kuehlhorn <tux93@opensuse.org>
- Update to 1.9.8
* Bug fixes and other minor improvements.
-------------------------------------------------------------------
Thu Jan 23 16:51:20 UTC 2020 - Marcel Kuehlhorn <tux93@opensuse.org>
- Update to 1.9.7
* Create three new kinds of polls.
* See who voted for what in polls with visible votes.
* Vote for several options in polls that allow multiple answers.
* Guess the correct answer in quiz-style polls.
* Explore various ways of combining the different poll options.
* Add polls from the '...' menu in any group or channel.
* Use bots like @quizbot to create quizzes with several questions
and media attachments.
* Schedule messages to be sent when your recipient comes online
(only works if you know their online status).
- Clean up spec file
-------------------------------------------------------------------
Wed Jan 22 10:24:14 UTC 2020 - Marcel Kuehlhorn <tux93@opensuse.org>
- Update to 1.9.6
* Bug fixes and other minor improvements.
- Removed 0005-Use-system-wide-fonts.patch and
0006-Revert-Disable-DemiBold-fallback-for-Semibold.patch,
option to use system fonts added upstream
------------------------------------------------------------------- -------------------------------------------------------------------
Fri Jan 17 20:12:33 UTC 2020 - Marcel Kuehlhorn <tux93@opensuse.org> Fri Jan 17 20:12:33 UTC 2020 - Marcel Kuehlhorn <tux93@opensuse.org>

77
telegram-desktop.spec
View File

@ -16,20 +16,15 @@
# #
# We need at least gcc8 or higher to build
%if 0%{?suse_version} < 01550 && 0%{?is_opensuse}
%bcond_without gcc8
%else
%bcond_with gcc8
%endif
# Disable LTO on TW due to build failures # Disable LTO on TW due to build failures
%if 0%{?suse_version} > 01500 %if 0%{?suse_version} > 01500
%define _lto_cflags %{nil} %define _lto_cflags %{nil}
%endif %endif
%define __builder ninja
Name: telegram-desktop Name: telegram-desktop
Version: 1.9.4 Version: 1.9.8
Release: 0 Release: 0
Summary: Messaging application with a focus on speed and security Summary: Messaging application with a focus on speed and security
License: GPL-3.0-only License: GPL-3.0-only
@ -38,22 +33,17 @@ URL: https://github.com/telegramdesktop/tdesktop
Source0: https://github.com/telegramdesktop/tdesktop/releases/download/v%{version}/tdesktop-%{version}-full.tar.gz Source0: https://github.com/telegramdesktop/tdesktop/releases/download/v%{version}/tdesktop-%{version}-full.tar.gz
# curl https://codeload.github.com/ericniebler/range-v3/zip/master -o range-v3-master.zip # curl https://codeload.github.com/ericniebler/range-v3/zip/master -o range-v3-master.zip
Source1: range-v3-master.zip Source1: range-v3-master.zip
Patch0: 0000-gtk2-default.patch Patch0: 0000-gtk2-default.patch
Patch1: 0001-use-bundled-range.patch Patch1: 0001-use-bundled-range.patch
Patch2: 0002-use-bundled-rlottie.patch Patch2: 0002-use-bundled-rlottie.patch
Patch4: 0005-Use-system-wide-fonts.patch BuildRequires: appstream-glib
Patch5: 0006-Revert-Disable-DemiBold-fallback-for-Semibold.patch
BuildRequires: chrpath BuildRequires: chrpath
BuildRequires: cmake BuildRequires: cmake
BuildRequires: desktop-file-utils BuildRequires: desktop-file-utils
BuildRequires: enchant-devel
BuildRequires: ffmpeg-devel BuildRequires: ffmpeg-devel
BuildRequires: freetype-devel BuildRequires: freetype-devel
%if %{with gcc8}
BuildRequires: gcc8-c++
%else
BuildRequires: gcc-c++ BuildRequires: gcc-c++
%endif
BuildRequires: enchant-devel
BuildRequires: glibc-devel BuildRequires: glibc-devel
BuildRequires: libQt5Core-private-headers-devel BuildRequires: libQt5Core-private-headers-devel
BuildRequires: libQt5Gui-private-headers-devel BuildRequires: libQt5Gui-private-headers-devel
@ -61,6 +51,7 @@ BuildRequires: libjpeg-devel
BuildRequires: liblz4-devel BuildRequires: liblz4-devel
BuildRequires: libqt5-qtbase-common-devel BuildRequires: libqt5-qtbase-common-devel
BuildRequires: libqt5-qtimageformats-devel BuildRequires: libqt5-qtimageformats-devel
BuildRequires: memory-constraints
BuildRequires: ninja BuildRequires: ninja
BuildRequires: pkgconfig BuildRequires: pkgconfig
BuildRequires: unzip BuildRequires: unzip
@ -145,16 +136,11 @@ mv %{_builddir}/Libraries/range-v3-master %{_builddir}/Libraries/range-v3
%patch0 -p1 %patch0 -p1
%patch1 -p1 %patch1 -p1
%patch2 -p1 %patch2 -p1
%patch4 -p1
%patch5 -p1
%build %build
%if %{with gcc8} %limit_build -m 2048
export CC=/usr/bin/gcc-8
export CXX=/usr/bin/g++-8
%endif
cmake -B build -G Ninja . \ %cmake \
-DCMAKE_INSTALL_PREFIX=/usr \ -DCMAKE_INSTALL_PREFIX=/usr \
-DCMAKE_BUILD_TYPE=Release \ -DCMAKE_BUILD_TYPE=Release \
-DTDESKTOP_API_ID=340630 \ -DTDESKTOP_API_ID=340630 \
@ -162,46 +148,25 @@ cmake -B build -G Ninja . \
-DDESKTOP_APP_USE_GLIBC_WRAPS=OFF \ -DDESKTOP_APP_USE_GLIBC_WRAPS=OFF \
-DDESKTOP_APP_USE_PACKAGED=ON \ -DDESKTOP_APP_USE_PACKAGED=ON \
-DTDESKTOP_USE_PACKAGED_TGVOIP=OFF \ -DTDESKTOP_USE_PACKAGED_TGVOIP=OFF \
-DDESKTOP_APP_USE_PACKAGED_FONTS=ON \
-DDESKTOP_APP_DISABLE_CRASH_REPORTS=ON \ -DDESKTOP_APP_DISABLE_CRASH_REPORTS=ON \
-DTDESKTOP_DISABLE_AUTOUPDATE=ON \ -DTDESKTOP_DISABLE_AUTOUPDATE=ON \
-DTDESKTOP_DISABLE_REGISTER_CUSTOM_SCHEME=ON \ -DTDESKTOP_LAUNCHER_BASENAME=%{name} \
-DTDESKTOP_DISABLE_DESKTOP_FILE_GENERATION=ON \
-DDESKTOP_APP_SPECIAL_TARGET="" -DDESKTOP_APP_SPECIAL_TARGET=""
ninja -C build %cmake_build
%install %install
# Install binary %cmake_install
install -dm755 %{buildroot}%{_bindir}
install -m755 build/bin/Telegram %{buildroot}%{_bindir}/%{name}
# Install desktop file appstream-util validate-relax --nonet %{buildroot}%{_datadir}/metainfo/*.appdata.xml
install -d %{buildroot}%{_datadir}/applications
desktop-file-install \
--dir %{buildroot}%{_datadir}/applications \
--add-category InstantMessaging \
lib/xdg/telegramdesktop.desktop
# Install protocol
install -d %{buildroot}%{_datadir}/kservices5
install -m644 lib/xdg/tg.protocol \
%{buildroot}%{_datadir}/kservices5/tg.protocol
# Install icons
for icon_size in 16 32 48 64 128 256 512; do
icon_dir="%{buildroot}%{_datadir}/icons/hicolor/${icon_size}x${icon_size}/apps"
install -d "${icon_dir}"
install -m644 "Telegram/Resources/art/icon${icon_size}.png" \
"${icon_dir}/telegram.png"
done
%files %files
%license LICENSE %license LICENSE LEGAL
%doc README.md %doc README.md changelog.txt
%{_bindir}/%{name} %{_bindir}/%{name}
%{_datadir}/applications/telegramdesktop.desktop %{_datadir}/applications/%{name}.desktop
%dir %{_datadir}/kservices5 %{_datadir}/icons/hicolor/*/apps/*.png
%{_datadir}/kservices5/tg.protocol %{_datadir}/metainfo/*.appdata.xml
%{_datadir}/icons/hicolor/*/apps/telegram.png
%changelog %changelog