From 4553f48776be0777503579a9852d731fae6cc916 Mon Sep 17 00:00:00 2001 From: Gerasim Troeglazov <3dEyes@gmail.com> Date: Thu, 24 May 2018 08:44:19 +1000 Subject: [PATCH] Telegram: fix build for secondary arch --- .../patches/telegram_desktop-1.2.21.patchset | 50 +++++++++++++++++++ .../telegram_desktop-1.2.21.recipe | 15 +++++- 2 files changed, 64 insertions(+), 1 deletion(-) diff --git a/net-im/telegram-desktop/patches/telegram_desktop-1.2.21.patchset b/net-im/telegram-desktop/patches/telegram_desktop-1.2.21.patchset index a1a8dd556..30bfc4ea6 100644 --- a/net-im/telegram-desktop/patches/telegram_desktop-1.2.21.patchset +++ b/net-im/telegram-desktop/patches/telegram_desktop-1.2.21.patchset @@ -2206,3 +2206,53 @@ index 622462e..e3ba800 100644 -- 2.16.2 + +From 931c088bf9ae6e2d31c77fe8c3347aa1098023d2 Mon Sep 17 00:00:00 2001 +From: Gerasim Troeglazov <3dEyes@gmail.com> +Date: Thu, 24 May 2018 08:30:00 +1000 +Subject: gypi files templating + + +diff --git a/Telegram/gyp/qt.gypi b/Telegram/gyp/qt.gypi +index a9f6881..8f3e531 100644 +--- a/Telegram/gyp/qt.gypi ++++ b/Telegram/gyp/qt.gypi +@@ -161,13 +161,13 @@ + }, + + 'include_dirs': [ +- '/system/develop/headers', +- '/system/develop/headers/QtCore', +- '/system/develop/headers/QtGui', +- '/system/develop/headers/QtCore/<(qt_version)', +- '/system/develop/headers/QtGui/<(qt_version)', +- '/system/develop/headers/QtCore/<(qt_version)/QtCore', +- '/system/develop/headers/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', +diff --git a/Telegram/gyp/telegram_haiku.gypi b/Telegram/gyp/telegram_haiku.gypi +index 5a95d31..3be76fc 100644 +--- a/Telegram/gyp/telegram_haiku.gypi ++++ b/Telegram/gyp/telegram_haiku.gypi +@@ -20,8 +20,8 @@ + { + 'conditions': [[ 'build_haiku', { + 'variables': { +- 'haiku_path_include%': '/system/develop/headers', +- 'haiku_path_lib%': '/system/develop/lib', ++ 'haiku_path_include%': '@HAIKU_HEADERS@', ++ 'haiku_path_lib%': '@HAIKU_LIBS@', + }, + 'include_dirs': [ + '<(haiku_path_include)', +-- +2.16.2 + diff --git a/net-im/telegram-desktop/telegram_desktop-1.2.21.recipe b/net-im/telegram-desktop/telegram_desktop-1.2.21.recipe index a159df28c..eca1f0d27 100644 --- a/net-im/telegram-desktop/telegram_desktop-1.2.21.recipe +++ b/net-im/telegram-desktop/telegram_desktop-1.2.21.recipe @@ -3,7 +3,7 @@ DESCRIPTION="Official desktop version of Telegram messaging app." HOMEPAGE="https://www.telegram.org/" COPYRIGHT="2013-2018 Telegram" LICENSE="GNU GPL v3" -REVISION="1" +REVISION="2" SOURCE_URI="https://github.com/telegramdesktop/tdesktop/archive/v$portVersion.tar.gz" SOURCE_DIR="tdesktop-$portVersion" @@ -98,6 +98,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