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

Accepting request 897600 from home:nuklly:branches:server:messaging

Browse Source 
- Add 0003-priortize-gtk2.patch and enable GTK integration.
  Fixes boo#1149986 regression.

OBS-URL: https://build.opensuse.org/request/show/897600
OBS-URL: https://build.opensuse.org/package/show/server:messaging/telegram-desktop?expand=0&rev=196
This commit is contained in:
Marcel Kuehlhorn 2021-06-05 13:47:30 +00:00 committed by Git OBS Bridge
parent d69d3b49d0
commit 02366e1e42
3 changed files with 30 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
0003-prioritize-gtk2.patch Normal file
View File

@ -0,0 +1,19 @@
diff --git a/Telegram/lib_base/base/platform/linux/base_linux_gtk_integration.cpp b/Telegram/lib_base/base/platform/linux/base_linux_gtk_integration.cpp
index bafd075..315bab7 100644
--- a/Telegram/lib_base/base/platform/linux/base_linux_gtk_integration.cpp
+++ b/Telegram/lib_base/base/platform/linux/base_linux_gtk_integration.cpp
@@ -239,12 +239,12 @@ void GtkIntegration::load() {
DEBUG_LOG(("Icon theme: %1").arg(QIcon::themeName()));
DEBUG_LOG(("Fallback icon theme: %1").arg(QIcon::fallbackThemeName()));
- if (LoadGtkLibrary(_lib, "gtk-3", 0)) {
+ if (LoadGtkLibrary(_lib, "gtk-x11-2.0", 0)) {
Loaded = SetupGtkBase(_lib);
}
if (!Loaded
&& !TriedToInit
- && LoadGtkLibrary(_lib, "gtk-x11-2.0", 0)) {
+ && LoadGtkLibrary(_lib, "gtk-3", 0)) {
Loaded = SetupGtkBase(_lib);
}

6
telegram-desktop.changes
View File

@ -1,3 +1,9 @@
-------------------------------------------------------------------
Sat Jun 5 03:02:08 UTC 2021 - Xu Zhao <i@xuzhao.net>
- Add 0003-priortize-gtk2.patch and enable GTK integration.
Fixes boo#1149986 regression.
------------------------------------------------------------------- -------------------------------------------------------------------
Fri May 28 10:41:04 UTC 2021 - Marcel Kuehlhorn <tux93@opensuse.org> Fri May 28 10:41:04 UTC 2021 - Marcel Kuehlhorn <tux93@opensuse.org>

7
telegram-desktop.spec
View File

@ -43,6 +43,8 @@ Source1: tg_owt-master.zip
Patch1: 0001-use-bundled-ranged-exptected-gsl.patch Patch1: 0001-use-bundled-ranged-exptected-gsl.patch
# PATCH-FIX-OPENSUSE # PATCH-FIX-OPENSUSE
Patch2: 0002-tg_owt-fix-name-confliction.patch Patch2: 0002-tg_owt-fix-name-confliction.patch
# PATCH-FIX-OPENSUSE boo#1149986
Patch3: 0003-prioritize-gtk2.patch
# There is an (incomplete) patch available for part of the source: # There is an (incomplete) patch available for part of the source:
# https://github.com/desktop-app/lib_base.git 3582bca53a1e195a31760978dc41f67ce44fc7e4 # https://github.com/desktop-app/lib_base.git 3582bca53a1e195a31760978dc41f67ce44fc7e4
# but tdesktop itself still falls short, and it looks to be something # but tdesktop itself still falls short, and it looks to be something
@ -72,6 +74,7 @@ BuildRequires: libwebrtc_audio_processing-devel
BuildRequires: ninja BuildRequires: ninja
BuildRequires: pkgconfig BuildRequires: pkgconfig
BuildRequires: unzip BuildRequires: unzip
BuildRequires: webkit2gtk3-devel
BuildRequires: xorg-x11-devel BuildRequires: xorg-x11-devel
BuildRequires: xxhash-devel BuildRequires: xxhash-devel
BuildRequires: xz BuildRequires: xz
@ -153,6 +156,7 @@ The service also provides APIs to independent developers.
%prep %prep
%setup -q -n tdesktop-%{version}-full %setup -q -n tdesktop-%{version}-full
%patch1 -p2 %patch1 -p2
%patch3 -p1
cd ../ cd ../
unzip -q %{S:1} unzip -q %{S:1}
@ -198,8 +202,7 @@ cd %{_builddir}/tdesktop-%{version}-full
-DDESKTOP_APP_USE_PACKAGED_FONTS=ON \ -DDESKTOP_APP_USE_PACKAGED_FONTS=ON \
-DDESKTOP_APP_DISABLE_CRASH_REPORTS=ON \ -DDESKTOP_APP_DISABLE_CRASH_REPORTS=ON \
-DTDESKTOP_LAUNCHER_BASENAME=%{name} \ -DTDESKTOP_LAUNCHER_BASENAME=%{name} \
-DDESKTOP_APP_SPECIAL_TARGET="" \ -DDESKTOP_APP_SPECIAL_TARGET=""
-DDESKTOP_APP_DISABLE_GTK_INTEGRATION=ON
%cmake_build %cmake_build