From 268b364b67eede7cbc2519ba40419544bc528fb6 Mon Sep 17 00:00:00 2001 From: Gerasim Troeglazov <3dEyes@gmail.com> Date: Sun, 13 May 2018 23:09:36 +0000 Subject: [PATCH] Telegram-Desktop: fix qt5 add-ons path for secondary arch --- .../patches/telegram_desktop-1.1.23.patchset | 53 ++++++++++++++----- .../telegram_desktop-1.1.23.recipe | 2 +- 2 files changed, 42 insertions(+), 13 deletions(-) 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 65eb60933..ff649df20 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 08c1e630cc18c54d2f106f136a8e1609ca4334f1 Mon Sep 17 00:00:00 2001 +From 1a550aac69bc6f7ebc336e3a7267f8a5535257ee Mon Sep 17 00:00:00 2001 From: Sergei Reznikov Date: Sat, 9 Sep 2017 02:14:52 +0300 Subject: Haiku fixes @@ -946,7 +946,7 @@ index 209c737..07d7438 100644 2.16.2 -From d304f5ddaec7fe75676216eefe90af78a67d02f5 Mon Sep 17 00:00:00 2001 +From ed09692c9368815a32939102fe0cc1dc721ad69d 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 @@ -969,7 +969,7 @@ index 0d09e7d..793310e 100644 2.16.2 -From 82ea07f309a7e29931b23568d327f01f0545a248 Mon Sep 17 00:00:00 2001 +From b1e9d35446433dd6be798b142dc304f132a5c238 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 @@ -2312,7 +2312,7 @@ index e303272..1bd4c74 100644 2.16.2 -From 675dd69c915b5c765eec34ebeedccd16f2013930 Mon Sep 17 00:00:00 2001 +From 4f0f835b6240da38a0ad1d041f3100f87d100acb 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 @@ -2346,7 +2346,7 @@ index 4306551..df713a3 100644 2.16.2 -From 57d2303d08e0eb6108e775edd9219d6d1150e7de Mon Sep 17 00:00:00 2001 +From a93de62231eb3724938b5f3b8f28a95977d57f5f 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 @@ -2371,7 +2371,7 @@ index 4684e2a..c65879b 100644 2.16.2 -From 3f6f0eec31e9ea47a90aedbb0b8702f9776036b4 Mon Sep 17 00:00:00 2001 +From df4847382e8320e60c3c99fcdf3f770d5dec691a 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 @@ -2402,7 +2402,7 @@ index b0a1ade..9c84a34 100644 2.16.2 -From 72f642bb9a225993cbd9cee7826de80e1f5f0031 Mon Sep 17 00:00:00 2001 +From 7499c1b40e600dfd23819a13043c6b463cf8c288 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 @@ -2478,7 +2478,7 @@ index 58f2789..f86e6e6 100644 2.16.2 -From 77181ff4cf544cc27b5f115705661b24abf919e0 Mon Sep 17 00:00:00 2001 +From 79ddabd435ce60dc0c104e9546d00d4d0918a747 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 @@ -2535,7 +2535,7 @@ index ce9091a..b303e1d 100644 2.16.2 -From 879d763b7337e6c0c5269a4a9c32b58638edc0dd Mon Sep 17 00:00:00 2001 +From bb80a1982f948ae40b8d33a0c0cdcbd4da2ec3c9 Mon Sep 17 00:00:00 2001 From: Sergei Reznikov Date: Tue, 12 Dec 2017 14:37:08 +0300 Subject: Fix Qt search paths @@ -2586,7 +2586,7 @@ index b9e1d5a..a592932 100644 2.16.2 -From d2ecd2fd6cc4b5b76ad90529189de75b57836a42 Mon Sep 17 00:00:00 2001 +From 437f64789b6917d33f927c2ae5466a0eff09481e Mon Sep 17 00:00:00 2001 From: Adrien Destugues Date: Sat, 31 Mar 2018 20:13:20 +0200 Subject: Split large resource file. @@ -2634,7 +2634,7 @@ index 8fdd119..a10225b 100644 2.16.2 -From 7c9ab2d43c9e04c9070cce3837f6069cf153398a Mon Sep 17 00:00:00 2001 +From 5f5d48fa84adbbb5b8f25edd9948e48c2e509690 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 @@ -2722,7 +2722,7 @@ index eec9f5b..9a7846c 100644 2.16.2 -From edd4c6b3218cc03dcec2ef490658437f9b5c952d Mon Sep 17 00:00:00 2001 +From df40180759b04f7e9dcb6c0d57ad9670c56be47b 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 @@ -2764,3 +2764,32 @@ index 504af0d..6029935 100644 -- 2.16.2 + +From 27b4637f57badb7787f3f691c214ca90e53ae46e Mon Sep 17 00:00:00 2001 +From: Gerasim Troeglazov <3dEyes@gmail.com> +Date: Sun, 13 May 2018 23:03:55 +0000 +Subject: Fix Qt add-ons path for secondary arch + + +diff --git a/Telegram/SourceFiles/main.cpp b/Telegram/SourceFiles/main.cpp +index c65879b..afae2f5 100644 +--- a/Telegram/SourceFiles/main.cpp ++++ b/Telegram/SourceFiles/main.cpp +@@ -41,7 +41,13 @@ int main(int argc, char *argv[]) { + Platform::start(); // must be started before QApplication is created + + // I don't know why path is not in QT_PLUGIN_PATH by default +- QCoreApplication::addLibraryPath("/boot/system/add-ons/Qt5"); ++#if defined(__HAIKU__) && defined(__X86_64__) ++ QCoreApplication::addLibraryPath("/system/add-ons/Qt5"); ++#endif ++ ++#if defined(__HAIKU__) && !defined(__X86_64__) ++ QCoreApplication::addLibraryPath("/system/add-ons/x86/Qt5"); ++#endif + + int result = 0; + { +-- +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 8fadd9f3c..267270d16 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="12" +REVISION="13" SOURCE_URI="https://github.com/telegramdesktop/tdesktop/archive/v$portVersion.tar.gz" SOURCE_DIR="tdesktop-$portVersion" CHECKSUM_SHA256="56b7fce84adf85a4af1c3174353169f32d0b0c052a4e7a284fc741fa96b04030"