Telegram-Desktop: Fix build for secondary arch

* New icon
2026-05-06 06:58:57 +02:00 · 2018-05-13 23:55:42 +10:00
parent 4adb667db3
commit 1d30ff66ea
3 changed files with 183 additions and 45 deletions
--- a/net-im/telegram-desktop/patches/telegram_desktop-1.1.23.patchset
+++ b/net-im/telegram-desktop/patches/telegram_desktop-1.1.23.patchset
@@ -1,4 +1,4 @@
-From 1c421f8e6810895caef0f033f57855ee77896c36 Mon Sep 17 00:00:00 2001
+From 08c1e630cc18c54d2f106f136a8e1609ca4334f1 Mon Sep 17 00:00:00 2001
 From: Sergei Reznikov <diver@gelios.net>
 Date: Sat, 9 Sep 2017 02:14:52 +0300
 Subject: Haiku fixes
@@ -943,10 +943,10 @@ index 209c737..07d7438 100644
         'include_dirs': [
           '<(libs_loc)/openssl-xcode/include'
 -- 
-2.16.1
+2.16.2


-From 7a7de73511cd16f188349a03f0f529ad72c96119 Mon Sep 17 00:00:00 2001
+From d304f5ddaec7fe75676216eefe90af78a67d02f5 Mon Sep 17 00:00:00 2001
 From: Gerasim Troeglazov <3dEyes@gmail.com>
 Date: Fri, 15 Sep 2017 22:01:57 +1000
 Subject: Fix typo
@@ -966,10 +966,10 @@ index 0d09e7d..793310e 100644
 #endif
 }
 -- 
-2.16.1
+2.16.2


-From 3c7d443d74b25b1ef8f02d1d11795edb143ee654 Mon Sep 17 00:00:00 2001
+From 82ea07f309a7e29931b23568d327f01f0545a248 Mon Sep 17 00:00:00 2001
 From: Gerasim Troeglazov <3dEyes@gmail.com>
 Date: Fri, 15 Sep 2017 22:05:59 +1000
 Subject: Add haiku platform modules
@@ -2309,10 +2309,10 @@ index e303272..1bd4c74 100644
 #include "platform/win/notifications_manager_win.h"
 #endif // Q_OS_MAC || Q_OS_LINUX || Q_OS_WIN
 -- 
-2.16.1
+2.16.2


-From 07c78cd36e45e73e4013ba6aa5f99cd5b48abd56 Mon Sep 17 00:00:00 2001
+From 675dd69c915b5c765eec34ebeedccd16f2013930 Mon Sep 17 00:00:00 2001
 From: Gerasim Troeglazov <3dEyes@gmail.com>
 Date: Fri, 15 Sep 2017 22:09:06 +1000
 Subject: Add haiku platform for settings
@@ -2343,10 +2343,10 @@ index 4306551..df713a3 100644
 
 	auto path = Platform::CurrentExecutablePath(argc, argv);
 -- 
-2.16.1
+2.16.2


-From 6ecf1466e6ebfbc49e03d79cdc18b00588a70f4e Mon Sep 17 00:00:00 2001
+From 57d2303d08e0eb6108e775edd9219d6d1150e7de Mon Sep 17 00:00:00 2001
 From: Gerasim Troeglazov <3dEyes@gmail.com>
 Date: Fri, 15 Sep 2017 22:09:59 +1000
 Subject: Fix Qt plugins path
@@ -2368,10 +2368,10 @@ index 4684e2a..c65879b 100644
 	int result = 0;
 	{
 -- 
-2.16.1
+2.16.2


-From a12698896b47adcc2c452c1d30550a3bc3fc6524 Mon Sep 17 00:00:00 2001
+From 3f6f0eec31e9ea47a90aedbb0b8702f9776036b4 Mon Sep 17 00:00:00 2001
 From: Gerasim Troeglazov <3dEyes@gmail.com>
 Date: Fri, 15 Sep 2017 22:10:59 +1000
 Subject: Fix crash
@@ -2399,10 +2399,10 @@ index b0a1ade..9c84a34 100644
 		LOG(("Audio Capture Default Device: %1").arg(QString::fromLocal8Bit(device)));
 	} else {
 -- 
-2.16.1
+2.16.2


-From f192014114fb2732e63570bc3c060bfda78d34b5 Mon Sep 17 00:00:00 2001
+From 72f642bb9a225993cbd9cee7826de80e1f5f0031 Mon Sep 17 00:00:00 2001
 From: Gerasim Troeglazov <3dEyes@gmail.com>
 Date: Fri, 15 Sep 2017 22:14:32 +1000
 Subject: Add haiku platform files to build
@@ -2475,10 +2475,10 @@ index 58f2789..f86e6e6 100644
 <(src_loc)/platform/haiku/main_window_haiku.h
 <(src_loc)/platform/haiku/specific_haiku.cpp
 -- 
-2.16.1
+2.16.2


-From da509bb01c74100b4e27168b5a7c00fb553ba03b Mon Sep 17 00:00:00 2001
+From 77181ff4cf544cc27b5f115705661b24abf919e0 Mon Sep 17 00:00:00 2001
 From: Gerasim Troeglazov <3dEyes@gmail.com>
 Date: Sat, 16 Sep 2017 23:06:27 +1000
 Subject: Move working dir to user settings
@@ -2532,10 +2532,10 @@ index ce9091a..b303e1d 100644
 
 QString psDownloadPath() {
 -- 
-2.16.1
+2.16.2


-From ef47c9788abeaed1a154c1f3ade4664f3dcaa7df Mon Sep 17 00:00:00 2001
+From 879d763b7337e6c0c5269a4a9c32b58638edc0dd Mon Sep 17 00:00:00 2001
 From: Sergei Reznikov <diver@gelios.net>
 Date: Tue, 12 Dec 2017 14:37:08 +0300
 Subject: Fix Qt search paths
@@ -2583,10 +2583,10 @@ index b9e1d5a..a592932 100644
   'library_dirs': [
     '<(qt_loc)/lib',
 -- 
-2.16.1
+2.16.2


-From eb267191d0e4a9950417f42e8682ab751151cada Mon Sep 17 00:00:00 2001
+From d2ecd2fd6cc4b5b76ad90529189de75b57836a42 Mon Sep 17 00:00:00 2001
 From: Adrien Destugues <pulkomandy@pulkomandy.tk>
 Date: Sat, 31 Mar 2018 20:13:20 +0200
 Subject: Split large resource file.
@@ -2631,5 +2631,136 @@ index 8fdd119..a10225b 100644
       '<(res_loc)/qrc/telegram_sounds.qrc',
     ],
 -- 
-2.16.1
+2.16.2
+
+
+From 7c9ab2d43c9e04c9070cce3837f6069cf153398a Mon Sep 17 00:00:00 2001
+From: Gerasim Troeglazov <3dEyes@gmail.com>
+Date: Sun, 13 May 2018 23:30:34 +1000
+Subject: gypi files templating
+
+
+diff --git a/Telegram/gyp/qt.gypi b/Telegram/gyp/qt.gypi
+index a592932..504af0d 100644
+--- a/Telegram/gyp/qt.gypi
+++ b/Telegram/gyp/qt.gypi
+@@ -90,6 +90,7 @@
+             ],
+           }],
+           [ 'build_haiku', {
+            'haiku_path_include': '@HAIKU_HEADERS@',
+             'qt_lib_prefix': '',
+             'qt_lib_debug_postfix': '',
+             'qt_lib_release_postfix': '',
+@@ -173,20 +174,13 @@
+   },
+ 
+   'include_dirs': [
+-    '/system/develop/headers',
+-    '/system/develop/headers/x86',
+-    '/system/develop/headers/QtCore',
+-    '/system/develop/headers/x86/QtCore',
+-    '/system/develop/headers/QtGui',
+-    '/system/develop/headers/x86/QtGui',
+-    '/system/develop/headers/QtCore/<(qt_version)',
+-    '/system/develop/headers/x86/QtCore/<(qt_version)',
+-    '/system/develop/headers/QtGui/<(qt_version)',
+-    '/system/develop/headers/x86/QtGui/<(qt_version)',
+-    '/system/develop/headers/QtCore/<(qt_version)/QtCore',
+-    '/system/develop/headers/x86/QtCore/<(qt_version)/QtCore',
+-    '/system/develop/headers/QtGui/<(qt_version)/QtGui',
+-    '/system/develop/headers/x86/QtGui/<(qt_version)/QtGui',
+    '<(haiku_path_include)',
+    '<(haiku_path_include)/QtCore',
+    '<(haiku_path_include)/QtGui',
+    '<(haiku_path_include)/QtCore/<(qt_version)',
+    '<(haiku_path_include)/QtGui/<(qt_version)',
+    '<(haiku_path_include)/QtCore/<(qt_version)/QtCore',
+    '<(haiku_path_include)/QtGui/<(qt_version)/QtGui',
+   ],
+   'library_dirs': [
+     '<(qt_loc)/lib',
+diff --git a/Telegram/gyp/telegram_haiku.gypi b/Telegram/gyp/telegram_haiku.gypi
+index eec9f5b..9a7846c 100644
+--- a/Telegram/gyp/telegram_haiku.gypi
+++ b/Telegram/gyp/telegram_haiku.gypi
+@@ -20,24 +20,19 @@
+ {
+   'conditions': [[ 'build_haiku', {
+     'variables': {
+-      'haiku_path_ffmpeg%': '/system/develop/headers/libavcodec',
+-      'haiku_path_openal%': '/system/develop/headers/AL',
+-      'haiku_path_libexif_lib%': '/system/develop/lib',
+-      'haiku_path_breakpad%': '/system/develop/lib',
+-      'haiku_path_opus_include%': '/system/develop/headers/opus',
+      'haiku_path_include%': '@HAIKU_HEADERS@',
+      'haiku_path_lib%': '@HAIKU_LIBS@',
+     },
+     'include_dirs': [
+-      '/system/develop/headers/openssl',
+-      '<(haiku_path_ffmpeg)/include',
+-      '<(haiku_path_openal)/include',
+-      '<(haiku_path_breakpad)/include/breakpad',
+-      '<(haiku_path_opus_include)',
+      '<(haiku_path_include)',
+      '<(haiku_path_include)/openssl',
+      '<(haiku_path_include)/libavcodec',
+      '<(haiku_path_include)/AL',
+      '<(haiku_path_include)/breakpad',
+      '<(haiku_path_include)/opus',
+     ],
+     'library_dirs': [
+-      '/system/develop/lib',
+-      '<(haiku_path_ffmpeg)/lib',
+-      '<(haiku_path_openal)/lib',
+-      '<(haiku_path_libexif_lib)',
+      '<(haiku_path_lib)',
+     ],
+     'libraries': [
+       'openal',
+-- 
+2.16.2
+
+
+From edd4c6b3218cc03dcec2ef490658437f9b5c952d Mon Sep 17 00:00:00 2001
+From: Gerasim Troeglazov <3dEyes@gmail.com>
+Date: Sun, 13 May 2018 23:42:48 +1000
+Subject: Fix qt headers variable for qt.gypi
+
+
+diff --git a/Telegram/gyp/qt.gypi b/Telegram/gyp/qt.gypi
+index 504af0d..6029935 100644
+--- a/Telegram/gyp/qt.gypi
+++ b/Telegram/gyp/qt.gypi
+@@ -90,7 +90,6 @@
+             ],
+           }],
+           [ 'build_haiku', {
+-            'haiku_path_include': '@HAIKU_HEADERS@',
+             'qt_lib_prefix': '',
+             'qt_lib_debug_postfix': '',
+             'qt_lib_release_postfix': '',
+@@ -174,13 +173,13 @@
+   },
+ 
+   'include_dirs': [
+-    '<(haiku_path_include)',
+-    '<(haiku_path_include)/QtCore',
+-    '<(haiku_path_include)/QtGui',
+-    '<(haiku_path_include)/QtCore/<(qt_version)',
+-    '<(haiku_path_include)/QtGui/<(qt_version)',
+-    '<(haiku_path_include)/QtCore/<(qt_version)/QtCore',
+-    '<(haiku_path_include)/QtGui/<(qt_version)/QtGui',
+    '@HAIKU_HEADERS@',
+    '@HAIKU_HEADERS@/QtCore',
+    '@HAIKU_HEADERS@/QtGui',
+    '@HAIKU_HEADERS@/QtCore/<(qt_version)',
+    '@HAIKU_HEADERS@/QtGui/<(qt_version)',
+    '@HAIKU_HEADERS@/QtCore/<(qt_version)/QtCore',
+    '@HAIKU_HEADERS@/QtGui/<(qt_version)/QtGui',
+   ],
+   'library_dirs': [
+     '<(qt_loc)/lib',
+-- 
+2.16.2