Bump to 1.2.6-5

From community-x86_64 commit 330230ab7fb84e465d293c1a0f62b59618088076

3 files changed, 35 insertions, 2 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 9813f2af56b9..3c6cef629615 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = telegram-desktop-systemqt-notoemoji
 	pkgdesc = Official Telegram Desktop client
 	pkgver = 1.2.6
-	pkgrel = 4
+	pkgrel = 5
 	url = https://desktop.telegram.org/
 	arch = x86_64
 	license = GPL3
@@ -30,6 +30,7 @@ pkgbase = telegram-desktop-systemqt-notoemoji
 	source = tg.protocol
 	source = CMakeLists.inj
 	source = tdesktop.patch
+	source = no-gtk2.patch
 	source = libtgvoip.patch
 	source = emoji.webp_db4c66e311a160b3f849d6c76890932c50701bf8::https://github.com/PeterCxy/tdesktop/raw/db4c66e311a160b3f849d6c76890932c50701bf8/Telegram/Resources/art/emoji.webp
 	source = emoji_125x.webp_db4c66e311a160b3f849d6c76890932c50701bf8::https://github.com/PeterCxy/tdesktop/raw/db4c66e311a160b3f849d6c76890932c50701bf8/Telegram/Resources/art/emoji_125x.webp
@@ -45,6 +46,7 @@ pkgbase = telegram-desktop-systemqt-notoemoji
 	sha256sums = d4cdad0d091c7e47811d8a26d55bbee492e7845e968c522e86f120815477e9eb
 	sha256sums = 7a06af83609168a8eaec59a65252caa41dcd0ecc805225886435eb65073e9c82
 	sha256sums = c0a71a540c6263d4e6cbba326a9b9d61cd57ef6db6054e87058dc49cbb707a23
+	sha256sums = 8d707debe027c7cb658825501dc30fb3beb57ab21b1b6df2f01c5f76ca39a0e6
 	sha256sums = 0e55b150b91aeeddcb813fb242a62fe4d1977bcac457eb9d65997faef643f075
 	sha256sums = fccd084805b4621e3614d2a0584bb78a0ad44f502a79b4a4534e901881677555
 	sha256sums = 668a2371c3dae8e95187f0c9f8fec9b0e535157482747d2f9c6034c6b9eefa16
diff --git a/PKGBUILD b/PKGBUILD
index ce1e30124444..586df4a32599 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -6,7 +6,7 @@
 
 pkgname=telegram-desktop-systemqt-notoemoji
 pkgver=1.2.6
-pkgrel=4
+pkgrel=5
 pkgdesc='Official Telegram Desktop client'
 arch=('x86_64')
 url="https://desktop.telegram.org/"
@@ -28,6 +28,7 @@ source=(
     "tg.protocol"
     "CMakeLists.inj"
     "tdesktop.patch"
+    "no-gtk2.patch"
     "libtgvoip.patch"
     "emoji.webp_${_emoji_res_commit}::https://github.com/PeterCxy/tdesktop/raw/${_emoji_res_commit}/Telegram/Resources/art/emoji.webp"
     "emoji_125x.webp_${_emoji_res_commit}::https://github.com/PeterCxy/tdesktop/raw/${_emoji_res_commit}/Telegram/Resources/art/emoji_125x.webp"
@@ -44,6 +45,7 @@ sha256sums=('SKIP'
             'd4cdad0d091c7e47811d8a26d55bbee492e7845e968c522e86f120815477e9eb'
             '7a06af83609168a8eaec59a65252caa41dcd0ecc805225886435eb65073e9c82'
             'c0a71a540c6263d4e6cbba326a9b9d61cd57ef6db6054e87058dc49cbb707a23'
+            '8d707debe027c7cb658825501dc30fb3beb57ab21b1b6df2f01c5f76ca39a0e6'
             '0e55b150b91aeeddcb813fb242a62fe4d1977bcac457eb9d65997faef643f075'
             'fccd084805b4621e3614d2a0584bb78a0ad44f502a79b4a4534e901881677555'
             '668a2371c3dae8e95187f0c9f8fec9b0e535157482747d2f9c6034c6b9eefa16'
@@ -60,6 +62,7 @@ prepare() {
     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"
 
     for x in "" "_125x" "_150x" "_200x" "_250x"; do
         cp -vf "$srcdir/emoji$x.webp_${_emoji_res_commit}" "$srcdir/tdesktop/Telegram/Resources/art/emoji$x.webp"
diff --git a/no-gtk2.patch b/no-gtk2.patch
new file mode 100644
index 000000000000..f2384e322dc0
--- /dev/null
+++ b/no-gtk2.patch
@@ -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) {