[arch-commits] Commit in telegram-desktop/trunk (PKGBUILD no-gtk2.patch)

[Balló György]

    Date: Wednesday, January 17, 2018 @ 11:13:25
  Author: bgyorgy
Revision: 283641

upgpkg: telegram-desktop 1.2.6-5

Don't try to load gtk2 if gtk3 may already loaded (FS#57125)

Added:
  telegram-desktop/trunk/no-gtk2.patch
Modified:
  telegram-desktop/trunk/PKGBUILD

---------------+
 PKGBUILD      |    5 ++++-
 no-gtk2.patch |   28 ++++++++++++++++++++++++++++
 2 files changed, 32 insertions(+), 1 deletion(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2018-01-17 10:55:06 UTC (rev 283640)
+++ PKGBUILD	2018-01-17 11:13:25 UTC (rev 283641)
@@ -6,7 +6,7 @@
 
 pkgname=telegram-desktop
 pkgver=1.2.6
-pkgrel=4
+pkgrel=5
 pkgdesc='Official Telegram Desktop client'
 arch=('x86_64')
 url="https://desktop.telegram.org/"
@@ -24,6 +24,7 @@
     "tg.protocol"
     "CMakeLists.inj"
     "tdesktop.patch"
+    "no-gtk2.patch"
     "libtgvoip.patch"
 )
 sha256sums=('SKIP'
@@ -35,6 +36,7 @@
             'd4cdad0d091c7e47811d8a26d55bbee492e7845e968c522e86f120815477e9eb'
             '7a06af83609168a8eaec59a65252caa41dcd0ecc805225886435eb65073e9c82'
             'c0a71a540c6263d4e6cbba326a9b9d61cd57ef6db6054e87058dc49cbb707a23'
+            '8d707debe027c7cb658825501dc30fb3beb57ab21b1b6df2f01c5f76ca39a0e6'
             '0e55b150b91aeeddcb813fb242a62fe4d1977bcac457eb9d65997faef643f075')
 
 prepare() {
@@ -46,6 +48,7 @@
     git config submodule.Telegram/ThirdParty/Catch.url "$srcdir/Catch"
     git submodule update
     patch -Np1 -i "$srcdir/tdesktop.patch"
+    patch -Np1 -i "$srcdir/no-gtk2.patch"
 
     cd "Telegram/ThirdParty/libtgvoip"
     patch -Np1 -i "$srcdir/libtgvoip.patch"

Added: no-gtk2.patch
===================================================================
--- no-gtk2.patch	                        (rev 0)
+++ no-gtk2.patch	2018-01-17 11:13:25 UTC (rev 283641)
@@ -0,0 +1,28 @@
+diff -Naur tdesktop-1.2.6.orig/Telegram/SourceFiles/platform/linux/linux_libs.cpp tdesktop-1.2.6/Telegram/SourceFiles/platform/linux/linux_libs.cpp
+--- tdesktop-1.2.6.orig/Telegram/SourceFiles/platform/linux/linux_libs.cpp	2017-12-30 11:13:48.000000000 +0100
++++ tdesktop-1.2.6/Telegram/SourceFiles/platform/linux/linux_libs.cpp	2018-01-17 11:41:49.593275952 +0100
+@@ -253,24 +253,12 @@
+ 			indicatorLoaded = setupAppIndicator(lib_indicator);
+ 		}
+ 	}
+-	if (!gtkLoaded || !indicatorLoaded) {
+-		if (loadLibrary(lib_indicator, "appindicator", 1)) {
+-			if (loadLibrary(lib_gtk, "gtk-x11-2.0", 0)) {
+-				gtkLoaded = indicatorLoaded = false;
+-				gtkLoaded = setupGtkBase(lib_gtk);
+-				indicatorLoaded = setupAppIndicator(lib_indicator);
+-			}
+-		}
+-	}
+ 
+ 	// If no appindicator, try at least load gtk.
+ 	if (!gtkLoaded && !indicatorLoaded) {
+ 		if (loadLibrary(lib_gtk, "gtk-3", 0)) {
+ 			gtkLoaded = setupGtkBase(lib_gtk);
+ 		}
+-		if (!gtkLoaded && loadLibrary(lib_gtk, "gtk-x11-2.0", 0)) {
+-			gtkLoaded = setupGtkBase(lib_gtk);
+-		}
+ 	}
+ 
+ 	if (gtkLoaded) {