From d5f634cc738f2f7c3533a72ff4ff9780a64349ee7bac020c82a32fefb03e3e13 Mon Sep 17 00:00:00 2001
From: Xu Zhao <i@xuzhao.net>
Date: Thu, 23 Feb 2017 17:29:08 +0000
Subject: [PATCH] Upgrade to 1.0.14

OBS-URL: https://build.opensuse.org/package/show/server:messaging/telegram-desktop?expand=0&rev=12
---
 patch-1.0.14.diff      | 186 +++++++++++++++++++++++++++++++++++++++++
 tdesktop-1.0.14.tar.gz |   3 +
 telegram-desktop.spec  |   2 +-
 3 files changed, 190 insertions(+), 1 deletion(-)
 create mode 100644 patch-1.0.14.diff
 create mode 100644 tdesktop-1.0.14.tar.gz

diff --git a/patch-1.0.14.diff b/patch-1.0.14.diff
new file mode 100644
index 0000000..9178d47
--- /dev/null
+++ b/patch-1.0.14.diff
@@ -0,0 +1,186 @@
+diff --git a/Telegram/gyp/Telegram.gyp b/Telegram/gyp/Telegram.gyp
+index 2503f1e..da2fe9d 100644
+--- a/Telegram/gyp/Telegram.gyp
++++ b/Telegram/gyp/Telegram.gyp
+@@ -79,8 +79,11 @@
+     ],
+ 
+     'defines': [
+-      'AL_LIBTYPE_STATIC',
+       '<!@(python -c "for s in \'<(build_defines)\'.split(\',\'): print(s)")',
++      '__STDC_FORMAT_MACROS',
++      'TDESKTOP_DISABLE_AUTOUPDATE',
++      'TDESKTOP_DISABLE_REGISTER_CUSTOM_SCHEME',
++      'TDESKTOP_DISABLE_UNITY_INTEGRATION',
+     ],
+ 
+     'include_dirs': [
+diff --git a/Telegram/gyp/qt.gypi b/Telegram/gyp/qt.gypi
+index 24ededb..7002c13 100644
+--- a/Telegram/gyp/qt.gypi
++++ b/Telegram/gyp/qt.gypi
+@@ -38,7 +38,6 @@
+             'Qt5Network',
+             'Qt5Widgets',
+             'Qt5Gui',
+-            'qtharfbuzzng',
+           ],
+           'qt_version%': '<(qt_version)',
+           'linux_path_qt%': '/usr/local/tdesktop/Qt-<(qt_version)',
+@@ -56,7 +55,6 @@
+               'qtmain',
+               'qwindows',
+               'qtfreetype',
+-              'qtpcre',
+             ],
+           }],
+           [ 'build_mac', {
+@@ -75,7 +73,6 @@
+               '<@(qt_libs)',
+               'Qt5Core',
+               'qtfreetype',
+-              'qtpcre',
+             ],
+           }],
+           [ 'build_linux', {
+@@ -91,19 +88,6 @@
+               '<@(qt_libs)',
+               'Qt5DBus',
+               'Qt5Core',
+-              'qtpcre',
+-              'Xi',
+-              'Xext',
+-              'Xfixes',
+-              'SM',
+-              'ICE',
+-              'fontconfig',
+-              'expat',
+-              'freetype',
+-              'xcb-shm',
+-              'xcb-xfixes',
+-              'xcb-render',
+-              'xcb-static',
+             ],
+           }],
+         ],
+@@ -208,7 +192,6 @@
+         '<(qt_loc)/plugins/platforminputcontexts',
+       ],
+       'libraries': [
+-        '<(linux_path_xkbcommon)/lib/libxkbcommon.a',
+         '<@(qt_libs_release)',
+         '<(linux_lib_ssl)',
+         '<(linux_lib_crypto)',
+@@ -219,14 +202,28 @@
+         'dbus-1',
+         'dl',
+         'gthread-2.0',
++	'jpeg',
+         'glib-2.0',
+         'pthread',
++	'GL',
++	'freetype',
++	'fontconfig',
++	'Xi',
++	'SM',
++	'ICE',
++	'proxy',
++	'<!(pkg-config 2> /dev/null --libs xkbcommon xkbcommon-x11)',
++	'<!(pkg-config 2> /dev/null --libs libpcre16)',
++	'<!(pkg-config 2> /dev/null --libs zlib)',
++	'<!(pkg-config 2> /dev/null --libs libpng16)',
++	'<!(pkg-config 2> /dev/null --libs libwebp)',
++	'<!(pkg-config 2> /dev/null --libs harfbuzz)',
++        '<!(pkg-config 2> /dev/null --libs xcb-shm xcb-xfixes xcb-render xcb-renderutil xcb-sync xcb-randr xcb-xinerama xcb-xkb xcb-icccm xcb-image xcb-shape xcb-keysyms xcb-util)',
+       ],
+       'include_dirs': [
+         '<(qt_loc)/mkspecs/linux-g++',
+       ],
+       'ldflags': [
+-        '-static-libstdc++',
+         '-pthread',
+         '-g',
+         '-rdynamic',
+diff --git a/Telegram/gyp/telegram_linux.gypi b/Telegram/gyp/telegram_linux.gypi
+index b42e744..d791379 100644
+--- a/Telegram/gyp/telegram_linux.gypi
++++ b/Telegram/gyp/telegram_linux.gypi
+@@ -21,11 +21,20 @@
+   'conditions': [[ 'build_linux', {
+     'variables': {
+       'pkgconfig_libs': [
+-# In order to work libxkbcommon must be linked statically,
+-# PKGCONFIG links it like "-L/usr/local/lib -lxkbcommon"
+-# which makes a dynamic link which leads to segfault in
+-# QApplication() -> createPlatformIntegration -> QXcbIntegrationPlugin::create
+-        #'xkbcommon',
++        'liblzma',
++        'openal',
++        'libavformat',
++        'libavcodec',
++        'libswresample',
++        'libswscale',
++        'libavutil',
++        'opus',
++        'libva-x11',
++        'libva-drm',
++        'libva',
++        'libdrm',
++        'zlib',
++
+       ],
+       'linux_path_ffmpeg%': '/usr/local',
+       'linux_path_openal%': '/usr/local',
+@@ -35,46 +44,26 @@
+       'linux_path_breakpad%': '<(libs_loc)/breakpad',
+     },
+     'include_dirs': [
+-      '/usr/local/include',
+-      '<(linux_path_ffmpeg)/include',
+-      '<(linux_path_openal)/include',
++      '/usr/include',
+       '<(linux_path_breakpad)/include/breakpad',
+     ],
+     'library_dirs': [
+-      '/usr/local/lib',
+-      '<(linux_path_ffmpeg)/lib',
+-      '<(linux_path_openal)/lib',
+-      '<(linux_path_libexif_lib)',
+-      '<(linux_path_va)/lib',
+-      '<(linux_path_vdpau)/lib',
+-      '<(linux_path_breakpad)/lib',
++      '/usr/lib',
++      '<(linux_path_breakpad)/src/client/linux',
+     ],
+     'libraries': [
+-      'breakpad_client',
+       'composeplatforminputcontextplugin',
+       'ibusplatforminputcontextplugin',
+       'fcitxplatforminputcontextplugin',
+-      'liblzma.a',
+-      'libopenal.a',
+-      'libavformat.a',
+-      'libavcodec.a',
+-      'libswresample.a',
+-      'libswscale.a',
+-      'libavutil.a',
+-      'libopus.a',
+-      'libva-x11.a',
+-      'libva-drm.a',
+-      'libva.a',
+-      'libvdpau.a',
+-      'libdrm.a',
+-      'libz.a',
+-#      '<!(pkg-config 2> /dev/null --libs <@(pkgconfig_libs))',
++      '<!(pkg-config 2> /dev/null --libs <@(pkgconfig_libs))',
++      'libbreakpad_client.a',
+     ],
+     '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 dee-1.0)',
++      '<!(pkg-config 2> /dev/null --cflags <@(pkgconfig_libs))',
+     ],
+     'configurations': {
+       'Release': {
diff --git a/tdesktop-1.0.14.tar.gz b/tdesktop-1.0.14.tar.gz
new file mode 100644
index 0000000..18584e2
--- /dev/null
+++ b/tdesktop-1.0.14.tar.gz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:3900da4ffaf229eaa2d679fbd7b890011823e9196c01d3c8563598dcfdef5c8a
+size 15532607
diff --git a/telegram-desktop.spec b/telegram-desktop.spec
index 01de7a5..4b5c532 100644
--- a/telegram-desktop.spec
+++ b/telegram-desktop.spec
@@ -1,6 +1,6 @@
 Name: telegram-desktop
 Summary: A new era of messaging
-Version: 1.0.0
+Version: 1.0.14
 Release: 1
 License: GPL-3.0
 URL: https://github.com/telegramdesktop/tdesktop