From 1d30ff66ea8a4b5e4244fe89c625c88db19e26d9 Mon Sep 17 00:00:00 2001 From: Gerasim Troeglazov <3dEyes@gmail.com> Date: Sun, 13 May 2018 23:55:42 +1000 Subject: [PATCH] Telegram-Desktop: Fix build for secondary arch * New icon --- .../additional-files/telegram_desktop.rdef.in | 42 ++--- .../patches/telegram_desktop-1.1.23.patchset | 171 ++++++++++++++++-- .../telegram_desktop-1.1.23.recipe | 15 +- 3 files changed, 183 insertions(+), 45 deletions(-) diff --git a/net-im/telegram-desktop/additional-files/telegram_desktop.rdef.in b/net-im/telegram-desktop/additional-files/telegram_desktop.rdef.in index 8e47b824c..1307de22f 100644 --- a/net-im/telegram-desktop/additional-files/telegram_desktop.rdef.in +++ b/net-im/telegram-desktop/additional-files/telegram_desktop.rdef.in @@ -16,28 +16,22 @@ resource app_version { resource app_signature "@APP_SIGNATURE@"; resource vector_icon { - $"6E63696604031D93CF03EBF5FB03C1D7E9039DBFD605000BBF08B41EBF08B41E" - $"C1B3B3EDC68BB65DC46AB4C2C883B7D2CAAABC47C9FBB9EECB6CBEC4CA41C3E7" - $"CB43C183C936C673C4B9C9C9C732C893C2BDCABDBE4ACAD8C079CB24BC4CCA99" - $"B8C8C899BA5FC9D3B70FC74AB4FDC374B5BCC57CB450C196B473BD98B41BBF8D" - $"B4E7BAD4B8A2B68BB670B846BA74B51ABF08B41EBCB6B43DBF08B41E020FC499" - $"BA94C4DBBA77C0DABBFCB963BED9BD20BD70B90FBEF9B86DBF44B8BABF17B81B" - $"BF6AB87FC00DB828BFF5B984C068BB90C11ABA87C0C9BBF6C249BCB6C4ACBC4E" - $"C37EBCC7C4D0BD05C50CBCD4C50DBD05C50CBD04C526BD04C526BD4FC528BDB0" - $"C4BBBD7DC4E7BE37C442BF4D49BEC0C3C9C035C3FEC200C555C11AC4A9C23BC5" - $"7FC2CFC598C283C5B2C31AC586C344C4F4C333C536C404C203C52FBC0CC4B1BF" - $"0CC53CBBA84EBADEC55BBB44C53FBA8F0212C499BA94C0DABBFCC4DBBA774EBA" - $"DEC53FBA8FC55BBB44C52FBC0CC53CBBA8C4B1BF0CC344C4F4C404C203C333C5" - $"36C2CFC598C31AC586C283C5B2C200C555C23BC57FC11AC4A9BF4D49C035C3FE" - $"BEACC2DDBD69C1F2BE0EC264BD89C1B2BDFAC15ABDC9C18BBF04C05EC11FBE70" - $"C015BF6BC1AFBDFCC2BBBCF9C228BD6CC2E0BCD2C31EBC76C31EBCB3C2D9BC76" - $"C26CBCC3C2A3BCA1C09CBDEFBCF9C03FBEC9BF14BC80C086BB90C11ABC10C0DE" - $"BA87C0C9B87FC00DB984C068B828BFF5B86DBF44B81BBF6AB8BABF17B963BED9" - $"B90FBEF9BD20BD70020AC26CBCC3C09CBDEFC2A3BCA1C31EBC76C2D9BC76C31E" - $"BCB3C2BBBCF9C2E0BCD2C228BD6CC11FBE70C1AFBDFCC015BF6BBDFAC15ABF04" - $"C05EBDC9C18BBD69C1F2BD89C1B2BD35C2F8BD05C50CBD21C404BCD4C50DBCB6" - $"C4ACBCC7C4D0BC4EC37EBB90C11ABBF6C249BC10C0DEBCF9C03FBC80C086BEC9" - $"BF140205BD69C1F2BD35C2F8BE0EC264BF4D49BEACC2DDBEC0C3C9BDB0C4BBBE" - $"37C442BD7DC4E7BD04C526BD4FC528BD04C526BD05C50CBD05C50CBD21C40404" - $"0A00020001000A010102000A020103000A03010400" + $"6E6369660604005A0500030099FF03EEEEEC02000602BA03853AD9423A1A7E3A" + $"5AE34BD8904DC08F00888A85FFB0B2AE03D3D7CF090208BC09CCA7B7AECE11C0" + $"64CB3E6A5DC881CAACD106CB59715FD2CDCBF1D3B3CC3F7463746174CE376E68" + $"73666B69CF1FD06AD0D5D04ECF18D0A6CA91D3AECA91D3AECA91D3AE4B6C526E" + $"BC6FCF150204B454C190B454C991B454B98FC2D2B312BAD1B312CAD3B312D150" + $"C190D150B98FD150C991C2D2D00ECAD3D00EBAD1D00E0204B578C190B578C8F0" + $"B578BA30C2D2B435BB72B435CA32B435D02DC190D02DBA30D02DC8F0C2D2CEEA" + $"CA32CEEABB72CEEB0A08BD13B904D0EEBB14BF76C965BC40C6D5B582CA40B954" + $"C275BCD4C187BAF4BE820A08BD13B904D0EEBB14BF76C965BC40C6D5B582CA40" + $"B954C275BCD4C187BAF4BE820A03BB01BE6FD12FBB02BD2EB9250A03BBFEC63A" + $"BF76C93BD09BBB160A03D0C0BB40B971C27CB5A4CA110A03BAF4BE68BCDFC17A" + $"D0D9BB1D090A000100023F1851000000000000401D1BBFF9D9C8D5350A010101" + $"023F28320000000000003F1EC9C24BDB36864D0A020102023F28320000000000" + $"003F1EC9C24BDB36864D0A030103023F5FC20000000000003F3403C2809BBB8D" + $"630A010104123F5FC20000000000003F3403C2809BBB8D6301178522040A0301" + $"05023F5FC20000000000003F3403C2809BBB8D630A040106023F5FC200000000" + $"00003F3403C2809BBB8D630A030107023F5FC20000000000003F3403C2809BBB" + $"8D630A050108023F5FC20000000000003F3403C2809BBB8D63" }; diff --git a/net-im/telegram-desktop/patches/telegram_desktop-1.1.23.patchset b/net-im/telegram-desktop/patches/telegram_desktop-1.1.23.patchset index b81059a28..65eb60933 100644 --- 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 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 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 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 diff --git a/net-im/telegram-desktop/telegram_desktop-1.1.23.recipe b/net-im/telegram-desktop/telegram_desktop-1.1.23.recipe index 3c7fea6cc..8fadd9f3c 100644 --- 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="11" +REVISION="12" SOURCE_URI="https://github.com/telegramdesktop/tdesktop/archive/v$portVersion.tar.gz" SOURCE_DIR="tdesktop-$portVersion" CHECKSUM_SHA256="56b7fce84adf85a4af1c3174353169f32d0b0c052a4e7a284fc741fa96b04030" @@ -79,6 +79,19 @@ BUILD_PREREQUIRES=" cmd:pkg_config$secondaryArchSuffix " +PATCH() +{ + if [ -n "$secondaryArchSuffix" ]; then + sed -i "s|@HAIKU_HEADERS@|/system/develop/headers/x86|" Telegram/gyp/telegram_haiku.gypi + sed -i "s|@HAIKU_HEADERS@|/system/develop/headers/x86|" Telegram/gyp/qt.gypi + sed -i "s|@HAIKU_LIBS@|/system/develop/lib/x86|" Telegram/gyp/telegram_haiku.gypi + else + sed -i "s|@HAIKU_HEADERS@|/system/develop/headers|" Telegram/gyp/telegram_haiku.gypi + sed -i "s|@HAIKU_HEADERS@|/system/develop/headers|" Telegram/gyp/qt.gypi + sed -i "s|@HAIKU_LIBS@|/system/develop/lib|" Telegram/gyp/telegram_haiku.gypi + fi +} + BUILD() { # link submodules