Telegram: fix 32bit build.

This commit is contained in:
Adrien Destugues
2018-03-31 20:14:59 +02:00
parent 145a7cb035
commit d9780adfdc

View File

@@ -1,4 +1,4 @@
From a99908025182cde79a20f0501e2b3f86f7c7191e Mon Sep 17 00:00:00 2001
From 1c421f8e6810895caef0f033f57855ee77896c36 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.15.0
2.16.1
From d09006a4f41efcf71ffa577ca0691230f804900c Mon Sep 17 00:00:00 2001
From 7a7de73511cd16f188349a03f0f529ad72c96119 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.15.0
2.16.1
From 7fdcaab004a49b6a2bdf2ec6100b84bc68aae131 Mon Sep 17 00:00:00 2001
From 3c7d443d74b25b1ef8f02d1d11795edb143ee654 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.15.0
2.16.1
From b073caa08cbf894214deb586a0d5d128d954f412 Mon Sep 17 00:00:00 2001
From 07c78cd36e45e73e4013ba6aa5f99cd5b48abd56 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.15.0
2.16.1
From 2cc15beef78a8af7101e457588f31b65ca06621c Mon Sep 17 00:00:00 2001
From 6ecf1466e6ebfbc49e03d79cdc18b00588a70f4e 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.15.0
2.16.1
From 03382e169fbff39886c19ea1f840732cc0031952 Mon Sep 17 00:00:00 2001
From a12698896b47adcc2c452c1d30550a3bc3fc6524 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.15.0
2.16.1
From 0516a4b29fc2b14ea02591755686b71e30ea8061 Mon Sep 17 00:00:00 2001
From f192014114fb2732e63570bc3c060bfda78d34b5 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.15.0
2.16.1
From add8c54b71e8d2339b0a50497850e483e266292a Mon Sep 17 00:00:00 2001
From da509bb01c74100b4e27168b5a7c00fb553ba03b 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,17 +2532,17 @@ index ce9091a..b303e1d 100644
QString psDownloadPath() {
--
2.15.0
2.16.1
From a00a0ffae9003fdc3125d5aed889044b5f940bcd Mon Sep 17 00:00:00 2001
From ef47c9788abeaed1a154c1f3ade4664f3dcaa7df 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
index b9e1d5a..a592932 100644
--- a/Telegram/gyp/qt.gypi
+++ b/Telegram/gyp/qt.gypi
@@ -27,7 +27,7 @@
@@ -2583,5 +2583,53 @@ index b9e1d5a..26a27ed 100644
'library_dirs': [
'<(qt_loc)/lib',
--
2.15.0
2.16.1
From eb267191d0e4a9950417f42e8682ab751151cada 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.
Avoids gcc running out of memory on 32bit systems.
diff --git a/Telegram/Resources/qrc/telegram_emoji.qrc b/Telegram/Resources/qrc/telegram_emoji.qrc
index bb9ce0a..47a0c05 100644
--- a/Telegram/Resources/qrc/telegram_emoji.qrc
+++ b/Telegram/Resources/qrc/telegram_emoji.qrc
@@ -2,7 +2,5 @@
<qresource prefix="/gui">
<file alias="art/emoji.webp">../art/emoji.webp</file>
<file alias="art/emoji_125x.webp">../art/emoji_125x.webp</file>
- <file alias="art/emoji_150x.webp">../art/emoji_150x.webp</file>
- <file alias="art/emoji_200x.webp">../art/emoji_200x.webp</file>
</qresource>
</RCC>
diff --git a/Telegram/Resources/qrc/telegram_emoji2.qrc b/Telegram/Resources/qrc/telegram_emoji2.qrc
new file mode 100644
index 0000000..14c9d39
--- /dev/null
+++ b/Telegram/Resources/qrc/telegram_emoji2.qrc
@@ -0,0 +1,7 @@
+<RCC>
+ <qresource prefix="/gui">
+ <file alias="art/emoji_150x.webp">../art/emoji_150x.webp</file>
+ <file alias="art/emoji_200x.webp">../art/emoji_200x.webp</file>
+ </qresource>
+</RCC>
+
diff --git a/Telegram/gyp/telegram_qrc.gypi b/Telegram/gyp/telegram_qrc.gypi
index 8fdd119..a10225b 100644
--- a/Telegram/gyp/telegram_qrc.gypi
+++ b/Telegram/gyp/telegram_qrc.gypi
@@ -22,6 +22,7 @@
'qrc_files': [
'<(res_loc)/qrc/telegram.qrc',
'<(res_loc)/qrc/telegram_emoji.qrc',
+ '<(res_loc)/qrc/telegram_emoji2.qrc',
'<(res_loc)/qrc/telegram_emoji_large.qrc',
'<(res_loc)/qrc/telegram_sounds.qrc',
],
--
2.16.1