Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package telegram-desktop for
openSUSE:Factory checked in at 2021-06-05 23:31:52
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/telegram-desktop (Old)
and /work/SRC/openSUSE:Factory/.telegram-desktop.new.1898 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "telegram-desktop"
Sat Jun 5 23:31:52 2021 rev:60 rq:897722 version:2.7.5
Changes:
--------
--- /work/SRC/openSUSE:Factory/telegram-desktop/telegram-desktop.changes
2021-06-01 10:39:58.941070529 +0200
+++
/work/SRC/openSUSE:Factory/.telegram-desktop.new.1898/telegram-desktop.changes
2021-06-05 23:32:20.440522327 +0200
@@ -1,0 +2,6 @@
+Sat Jun 5 03:02:08 UTC 2021 - Xu Zhao <[email protected]>
+
+- Add 0003-prioritize-gtk2.patch and enable GTK integration.
+ Fixes boo#1149986 regression.
+
+-------------------------------------------------------------------
New:
----
0003-prioritize-gtk2.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ telegram-desktop.spec ++++++
--- /var/tmp/diff_new_pack.pbFiP8/_old 2021-06-05 23:32:21.124523516 +0200
+++ /var/tmp/diff_new_pack.pbFiP8/_new 2021-06-05 23:32:21.124523516 +0200
@@ -43,6 +43,8 @@
Patch1: 0001-use-bundled-ranged-exptected-gsl.patch
# PATCH-FIX-OPENSUSE
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:
# https://github.com/desktop-app/lib_base.git
3582bca53a1e195a31760978dc41f67ce44fc7e4
# but tdesktop itself still falls short, and it looks to be something
@@ -72,6 +74,7 @@
BuildRequires: ninja
BuildRequires: pkgconfig
BuildRequires: unzip
+BuildRequires: webkit2gtk3-devel
BuildRequires: xorg-x11-devel
BuildRequires: xxhash-devel
BuildRequires: xz
@@ -153,6 +156,7 @@
%prep
%setup -q -n tdesktop-%{version}-full
%patch1 -p2
+%patch3 -p1
cd ../
unzip -q %{S:1}
@@ -198,8 +202,7 @@
-DDESKTOP_APP_USE_PACKAGED_FONTS=ON \
-DDESKTOP_APP_DISABLE_CRASH_REPORTS=ON \
-DTDESKTOP_LAUNCHER_BASENAME=%{name} \
- -DDESKTOP_APP_SPECIAL_TARGET="" \
- -DDESKTOP_APP_DISABLE_GTK_INTEGRATION=ON
+ -DDESKTOP_APP_SPECIAL_TARGET=""
%cmake_build
++++++ 0003-prioritize-gtk2.patch ++++++
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);
}
