Telegram: fix build

2026-05-01 04:28:53 +02:00 · 2017-12-12 14:44:20 +03:00
parent 19fb64efac
commit 7fc229e1b9
2 changed files with 71 additions and 25 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 6633953aa4444f43780107edcb5923690d781fdf Mon Sep 17 00:00:00 2001
+From a99908025182cde79a20f0501e2b3f86f7c7191e 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
@@ -513,7 +513,7 @@ index a653846..6ba9368 100644
 for replace in replaces:
   replace_parts = replace.split('=', 1)
 diff --git a/Telegram/gyp/qt.gypi b/Telegram/gyp/qt.gypi
-index 6032d06..0ed2dfd 100644
+index 6032d06..b9e1d5a 100644
 --- a/Telegram/gyp/qt.gypi
 +++ b/Telegram/gyp/qt.gypi
@@ -27,25 +27,21 @@
@@ -679,7 +679,7 @@ index 6032d06..0ed2dfd 100644
       # Silence "Note: No relevant classes found. No output generated."
       '--no-notes',
 diff --git a/Telegram/gyp/qt_rcc.gypi b/Telegram/gyp/qt_rcc.gypi
-index eebc696..392b124 100644
+index eebc696..4e03932 100644
 --- a/Telegram/gyp/qt_rcc.gypi
 +++ b/Telegram/gyp/qt_rcc.gypi
@@ -28,7 +28,7 @@
@@ -943,10 +943,10 @@ index 209c737..07d7438 100644
         'include_dirs': [
           '<(libs_loc)/openssl-xcode/include'
 -- 
-2.13.1
+2.15.0


-From ef4d838bf16701d96fe657ac422d1b5698019504 Mon Sep 17 00:00:00 2001
+From d09006a4f41efcf71ffa577ca0691230f804900c 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.13.1
+2.15.0


-From 6fca2e8b3c67a4479cfa71bf735a1ba91835013b Mon Sep 17 00:00:00 2001
+From 7fdcaab004a49b6a2bdf2ec6100b84bc68aae131 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.13.1
+2.15.0


-From c183162abdec7dd3ddea85c7e637912076ab35f6 Mon Sep 17 00:00:00 2001
+From b073caa08cbf894214deb586a0d5d128d954f412 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.13.1
+2.15.0


-From df87885512c1377a2a056053f661f5e74397c5af Mon Sep 17 00:00:00 2001
+From 2cc15beef78a8af7101e457588f31b65ca06621c 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.13.1
+2.15.0


-From 26f0a37bf988909edffff348f51e0a1b535bc4ac Mon Sep 17 00:00:00 2001
+From 03382e169fbff39886c19ea1f840732cc0031952 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.13.1
+2.15.0


-From ce1e1cfc24fac52864e13a95a974b3e588f0c204 Mon Sep 17 00:00:00 2001
+From 0516a4b29fc2b14ea02591755686b71e30ea8061 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.13.1
+2.15.0


-From 28ec800e587b2a67e9797044cbcffb949329b59c Mon Sep 17 00:00:00 2001
+From add8c54b71e8d2339b0a50497850e483e266292a 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
@@ -2498,7 +2498,7 @@ index d916756..3d61a91 100644
 #ifdef _DEBUG
 			cForceWorkingDir(cExeDir());
 diff --git a/Telegram/SourceFiles/platform/haiku/specific_haiku.cpp b/Telegram/SourceFiles/platform/haiku/specific_haiku.cpp
-index ce9091a..004017b 100644
+index ce9091a..b303e1d 100644
 --- a/Telegram/SourceFiles/platform/haiku/specific_haiku.cpp
 +++ b/Telegram/SourceFiles/platform/haiku/specific_haiku.cpp
@@ -285,28 +285,9 @@ void psActivateProcess(uint64 pid) {
@@ -2532,5 +2532,56 @@ index ce9091a..004017b 100644
 
 QString psDownloadPath() {
 -- 
-2.13.1
+2.15.0
+
+
+From a00a0ffae9003fdc3125d5aed889044b5f940bcd 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
+
+
+diff --git a/Telegram/gyp/qt.gypi b/Telegram/gyp/qt.gypi
+index b9e1d5a..26a27ed 100644
+--- a/Telegram/gyp/qt.gypi
+++ b/Telegram/gyp/qt.gypi
+@@ -27,7 +27,7 @@
+               [ 'build_macold', {
+                 'qt_version%': '5.3.2',
+               }, {
+-                'qt_version%': '5.9.2',
+                'qt_version%': '!@(pkg-config --modversion Qt5Core)',
+               }]
+             ],
+           },
+@@ -173,13 +173,20 @@
+   },
+ 
+   'include_dirs': [
+-    '/boot/system/develop/headers',
+-    '/boot/system/develop/headers/QtCore',
+-    '/boot/system/develop/headers/QtGui',
+-    '/boot/system/develop/headers/QtCore/<(qt_version)',
+-    '/boot/system/develop/headers/QtGui/<(qt_version)',
+-    '/boot/system/develop/headers/QtCore/<(qt_version)/QtCore',
+-    '/boot/system/develop/headers/QtGui/<(qt_version)/QtGui',
+    '/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',
+   ],
+   'library_dirs': [
+     '<(qt_loc)/lib',
+-- 
+2.15.0

--- a/net-im/telegram-desktop/telegram_desktop-1.1.23.recipe
+++ b/net-im/telegram-desktop/telegram_desktop-1.1.23.recipe
@@ -3,7 +3,7 @@ DESCRIPTION="Official desktop version of Telegram messaging app."
 HOMEPAGE="https://www.telegram.org/"
 COPYRIGHT="2013-2017 Telegram"
 LICENSE="GNU GPL v3"
-REVISION="8"
+REVISION="9"
 SOURCE_URI="https://github.com/telegramdesktop/tdesktop/archive/v$portVersion.tar.gz"
 SOURCE_DIR="tdesktop-$portVersion"
 CHECKSUM_SHA256="56b7fce84adf85a4af1c3174353169f32d0b0c052a4e7a284fc741fa96b04030"
@@ -78,11 +78,6 @@ BUILD_PREREQUIRES="
 	cmd:make
 	cmd:pkg_config$secondaryArchSuffix
 	"
-PATCH()
-{
-	local qt_version=`pkg-config --modversion Qt5Core`
-	sed -i "s/5.9.2/$qt_version/g" Telegram/gyp/qt.gypi
-}

 BUILD()
 {