use gtk3 headers

4 files changed, 43 insertions, 6 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 7d1ba7e4f8f3..ae5b5d54c625 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,18 +1,19 @@
 # Generated by mksrcinfo v8
-# Sat Feb  4 04:38:11 UTC 2017
+# Tue Feb  7 16:10:22 UTC 2017
 pkgbase = telegram-desktop-systemqt
-	pkgdesc = Official desktop version of Telegram messaging app. (Use system Qt)
+	pkgdesc = Experimental build of Telegram Desktop (using system Qt)
 	pkgver = 1.0.6
-	pkgrel = 1
+	pkgrel = 3
 	url = https://desktop.telegram.org/
+	install = telegram-desktop.install
 	arch = i686
 	arch = x86_64
 	license = GPL3
 	makedepends = cmake
+	makedepends = libappindicator-gtk3
 	makedepends = dee
 	makedepends = git
 	makedepends = gyp-git
-	makedepends = libappindicator-gtk2
 	makedepends = libexif
 	makedepends = libva
 	makedepends = libwebp
@@ -24,6 +25,7 @@ pkgbase = telegram-desktop-systemqt
 	depends = minizip
 	depends = openal
 	depends = qt5-base
+	optdepends = libappindicator-gtk3: AppIndicator tray icon
 	provides = telegram-desktop
 	conflicts = telegram-desktop
 	source = tdesktop::git+https://github.com/telegramdesktop/tdesktop.git#tag=v1.0.6
@@ -33,6 +35,7 @@ pkgbase = telegram-desktop-systemqt
 	source = Fix-desktop-integration-issues.patch
 	source = Flags-for-precompiled-header-and-MOC.patch
 	source = Fix-rcc-path.patch
+	source = Use-gtk3-headers.patch
 	source = CMakeLists.inj
 	sha256sums = SKIP
 	sha256sums = 41c22fae6ae757936741e63aec3d0f17cafe86b2d6153cdd1d01a5581e871f17
@@ -41,6 +44,7 @@ pkgbase = telegram-desktop-systemqt
 	sha256sums = 4e1c87bad5f2538bf9fce0b54e7f984d7f269e3b1f6e44e1097b8abcc28c68e0
 	sha256sums = 952c7590cb05354c70037745d980fa97c36e36f96a1fa7d0db29a5c6a1d8dbd1
 	sha256sums = cf4dbb293afdbfd226861a00a42790a15b23bea296eccf35853d104e07ea345a
+	sha256sums = 5f3ac7c08df0293bed626293dbfb6040764abf28899db7681572cfb1d8bcaa6e
 	sha256sums = 7a06af83609168a8eaec59a65252caa41dcd0ecc805225886435eb65073e9c82
 
 pkgname = telegram-desktop-systemqt
diff --git a/PKGBUILD b/PKGBUILD
index ea6c46a081fc..3398b94a4afb 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -5,15 +5,17 @@
 
 pkgname=telegram-desktop-systemqt
 pkgver=1.0.6
-pkgrel=2
+pkgrel=3
 pkgdesc='Experimental build of Telegram Desktop (using system Qt)'
 arch=('i686' 'x86_64')
 url="https://desktop.telegram.org/"
 license=('GPL3')
 depends=('ffmpeg' 'hicolor-icon-theme' 'minizip' 'openal' 'qt5-base')
-makedepends=('cmake' 'dee' 'git' 'gyp-git' 'libappindicator-gtk2' 'libexif' 'libva' 'libwebp' 'mtdev' 'python' 'python2')
+makedepends=('cmake' 'libappindicator-gtk3' 'dee' 'git' 'gyp-git' 'libexif' 'libva' 'libwebp' 'mtdev' 'python' 'python2')
+optdepends=('libappindicator-gtk3: AppIndicator tray icon')
 conflicts=('telegram-desktop')
 provides=('telegram-desktop')
+install="telegram-desktop.install"
 source=(
     "tdesktop::git+https://github.com/telegramdesktop/tdesktop.git#tag=v$pkgver"
     "telegramdesktop.desktop"
@@ -22,6 +24,7 @@ source=(
     "Fix-desktop-integration-issues.patch"
     "Flags-for-precompiled-header-and-MOC.patch"
     "Fix-rcc-path.patch"
+    "Use-gtk3-headers.patch"
     "CMakeLists.inj"
 )
 sha256sums=('SKIP'
@@ -31,6 +34,7 @@ sha256sums=('SKIP'
             '4e1c87bad5f2538bf9fce0b54e7f984d7f269e3b1f6e44e1097b8abcc28c68e0'
             '952c7590cb05354c70037745d980fa97c36e36f96a1fa7d0db29a5c6a1d8dbd1'
             'cf4dbb293afdbfd226861a00a42790a15b23bea296eccf35853d104e07ea345a'
+            '5f3ac7c08df0293bed626293dbfb6040764abf28899db7681572cfb1d8bcaa6e'
             '7a06af83609168a8eaec59a65252caa41dcd0ecc805225886435eb65073e9c82')
 
 prepare() {
@@ -39,6 +43,7 @@ prepare() {
     git apply "$srcdir/Fix-desktop-integration-issues.patch"
     git apply "$srcdir/Flags-for-precompiled-header-and-MOC.patch"
     git apply "$srcdir/Fix-rcc-path.patch"
+    git apply "$srcdir/Use-gtk3-headers.patch"
 }
 
 build() {
diff --git a/Use-gtk3-headers.patch b/Use-gtk3-headers.patch
new file mode 100644
index 000000000000..f124dc31c653
--- /dev/null
+++ b/Use-gtk3-headers.patch
@@ -0,0 +1,16 @@
+diff --git a/Telegram/gyp/telegram_linux.gypi b/Telegram/gyp/telegram_linux.gypi
+index 29386a9b..06dd1abc 100644
+--- a/Telegram/gyp/telegram_linux.gypi
++++ b/Telegram/gyp/telegram_linux.gypi
+@@ -68,9 +68,8 @@
+ #      '<!(pkg-config 2> /dev/null --libs <@(pkgconfig_libs))',
+     ],
+     'cflags_cc': [
+-      '<!(pkg-config 2> /dev/null --cflags appindicator-0.1)',
+-      '<!(pkg-config 2> /dev/null --cflags gtk+-2.0)',
+-      '<!(pkg-config 2> /dev/null --cflags glib-2.0)',
++      '<!(pkg-config 2> /dev/null --cflags appindicator3-0.1)',
++      '<!(pkg-config 2> /dev/null --cflags gtk+-3.0)',
+       '<!(pkg-config 2> /dev/null --cflags dee-1.0)',
+     ],
+     'configurations': {
diff --git a/telegram-desktop.install b/telegram-desktop.install
new file mode 100644
index 000000000000..d75cab547d8a
--- /dev/null
+++ b/telegram-desktop.install
@@ -0,0 +1,12 @@
+post_install () {
+    cat <<EOF
+Telegram will crash if you only have libappindicator-gtk2 installed.
+
+Either removing libappindicator-gtk2 or installing libappindicator-gtk3
+should be enough to avoid the crash.
+EOF
+}
+
+post_upgrade () {
+    post_install
+}