haikuprojects/haikuports
1
0
Fork 0
mirror of https://github.com/yann64/haikuports.git synced 2026-05-03 13:38:52 +02:00
Code Issues Packages Projects Releases Wiki Activity

Telegram: bump version

Browse Source
This commit is contained in:
Gerasim Troeglazov
2020-05-06 09:59:14 +10:00
parent c60ddb85e2
commit 76451443cc
2 changed files with 46 additions and 88 deletions
Download Patch File Download Diff File Expand all files Collapse all files

132
net-im/telegram-desktop/patches/telegram_desktop-2.1.1.patchset → net-im/telegram-desktop/patches/telegram_desktop-2.1.2.patchset
View File

@@ -1,6 +1,6 @@
From 406046a6b536d038e20a4bbe2818fc7f4c5a7b2d Mon Sep 17 00:00:00 2001 From 46889c47cabbce84b9829e261fa303e9469ac4df Mon Sep 17 00:00:00 2001
From: Gerasim Troeglazov <3dEyes@gmail.com> From: Gerasim Troeglazov <3dEyes@gmail.com>
Date: Fri, 24 Apr 2020 23:12:18 +1000 Date: Wed, 6 May 2020 09:23:14 +1000
Subject: Add Haiku support Subject: Add Haiku support
@@ -40,10 +40,10 @@ index 645d886..3a0a0e9 100644
add_subdirectory(cmake) add_subdirectory(cmake)
add_subdirectory(Telegram) add_subdirectory(Telegram)
diff --git a/Telegram/CMakeLists.txt b/Telegram/CMakeLists.txt diff --git a/Telegram/CMakeLists.txt b/Telegram/CMakeLists.txt
index 629c2db..5d6a93e 100644 index e05853f..7e8843e 100644
--- a/Telegram/CMakeLists.txt --- a/Telegram/CMakeLists.txt
+++ b/Telegram/CMakeLists.txt +++ b/Telegram/CMakeLists.txt
@@ -98,7 +98,7 @@ PRIVATE @@ -119,7 +119,7 @@ PRIVATE
desktop-app::external_minizip desktop-app::external_minizip
desktop-app::external_qt desktop-app::external_qt
desktop-app::external_qr_code_generator desktop-app::external_qr_code_generator
@@ -52,7 +52,7 @@ index 629c2db..5d6a93e 100644
desktop-app::external_auto_updates desktop-app::external_auto_updates
tdesktop::lib_tgvoip tdesktop::lib_tgvoip
desktop-app::external_openssl desktop-app::external_openssl
@@ -813,6 +813,18 @@ PRIVATE @@ -829,6 +829,18 @@ PRIVATE
platform/win/windows_event_filter.cpp platform/win/windows_event_filter.cpp
platform/win/windows_event_filter.h platform/win/windows_event_filter.h
platform/win/wrapper_wrl_implements_h.h platform/win/wrapper_wrl_implements_h.h
@@ -71,7 +71,7 @@ index 629c2db..5d6a93e 100644
platform/platform_audio.h platform/platform_audio.h
platform/platform_file_utilities.h platform/platform_file_utilities.h
platform/platform_launcher.h platform/platform_launcher.h
@@ -1188,7 +1200,7 @@ endif() @@ -1194,7 +1206,7 @@ endif()
set_target_properties(Telegram PROPERTIES RUNTIME_OUTPUT_DIRECTORY ${output_folder}) set_target_properties(Telegram PROPERTIES RUNTIME_OUTPUT_DIRECTORY ${output_folder})
@@ -179,10 +179,10 @@ index b44f0e5..28c8d47 100644
} }
diff --git a/Telegram/SourceFiles/platform/haiku/file_utilities_haiku.cpp b/Telegram/SourceFiles/platform/haiku/file_utilities_haiku.cpp diff --git a/Telegram/SourceFiles/platform/haiku/file_utilities_haiku.cpp b/Telegram/SourceFiles/platform/haiku/file_utilities_haiku.cpp
new file mode 100644 new file mode 100644
index 0000000..6b37269 index 0000000..dee383c
--- /dev/null --- /dev/null
+++ b/Telegram/SourceFiles/platform/haiku/file_utilities_haiku.cpp +++ b/Telegram/SourceFiles/platform/haiku/file_utilities_haiku.cpp
@@ -0,0 +1,131 @@ @@ -0,0 +1,137 @@
+/* +/*
+This file is part of Telegram Desktop for Haiku, +This file is part of Telegram Desktop for Haiku,
+ +
@@ -262,6 +262,12 @@ index 0000000..6b37269
+ return true; + return true;
+} +}
+ +
+void UnsafeOpenUrl(const QString &url) {
+ const QStringList arguments{url};
+ QProcess process;
+ process.startDetached(qsl("open"), arguments);
+}
+
+} // namespace File +} // namespace File
+ +
+namespace FileDialog { +namespace FileDialog {
@@ -2779,7 +2785,7 @@ index 0bc42eb..c87cde9 100644
typedef pid_t PlatformThreadId; typedef pid_t PlatformThreadId;
typedef pthread_t PlatformThreadRef; typedef pthread_t PlatformThreadRef;
diff --git a/Telegram/cmake/lib_tgvoip.cmake b/Telegram/cmake/lib_tgvoip.cmake diff --git a/Telegram/cmake/lib_tgvoip.cmake b/Telegram/cmake/lib_tgvoip.cmake
index cd78cd0..6db9b54 100644 index 3d13596..fcd485d 100644
--- a/Telegram/cmake/lib_tgvoip.cmake --- a/Telegram/cmake/lib_tgvoip.cmake
+++ b/Telegram/cmake/lib_tgvoip.cmake +++ b/Telegram/cmake/lib_tgvoip.cmake
@@ -119,6 +119,14 @@ else() @@ -119,6 +119,14 @@ else()
@@ -3735,10 +3741,10 @@ index 0000000..a6c28f1
+ endif() + endif()
+endforeach() +endforeach()
diff --git a/cmake/external/CMakeLists.txt b/cmake/external/CMakeLists.txt diff --git a/cmake/external/CMakeLists.txt b/cmake/external/CMakeLists.txt
index f311761..5b2d6ac 100644 index d1f7b07..62c42ba 100644
--- a/cmake/external/CMakeLists.txt --- a/cmake/external/CMakeLists.txt
+++ b/cmake/external/CMakeLists.txt +++ b/cmake/external/CMakeLists.txt
@@ -12,23 +12,23 @@ macro(add_checked_subdirectory name) @@ -12,7 +12,7 @@ macro(add_checked_subdirectory name)
endmacro() endmacro()
add_checked_subdirectory(auto_updates) add_checked_subdirectory(auto_updates)
@@ -3747,17 +3753,28 @@ index f311761..5b2d6ac 100644
if (LINUX AND NOT DESKTOP_APP_DISABLE_DBUS_INTEGRATION) if (LINUX AND NOT DESKTOP_APP_DISABLE_DBUS_INTEGRATION)
add_checked_subdirectory(dbusmenu_qt) add_checked_subdirectory(dbusmenu_qt)
endif() endif()
add_checked_subdirectory(expected) @@ -20,7 +20,7 @@ add_checked_subdirectory(expected)
if (LINUX AND NOT DESKTOP_APP_DISABLE_DBUS_INTEGRATION)
add_checked_subdirectory(fcitx_qt5)
endif()
-add_checked_subdirectory(ffmpeg) -add_checked_subdirectory(ffmpeg)
+#add_checked_subdirectory(ffmpeg) +#add_checked_subdirectory(ffmpeg)
add_checked_subdirectory(gsl) add_checked_subdirectory(gsl)
if (add_hunspell_library) if (LINUX AND NOT DESKTOP_APP_DISABLE_DBUS_INTEGRATION)
add_checked_subdirectory(hunspell) add_checked_subdirectory(hime_im_client)
@@ -33,7 +33,7 @@ add_checked_subdirectory(iconv)
if (LINUX AND NOT DESKTOP_APP_DISABLE_DBUS_INTEGRATION)
add_checked_subdirectory(lxqt_qtplugin)
endif() endif()
add_checked_subdirectory(iconv)
-add_checked_subdirectory(lz4) -add_checked_subdirectory(lz4)
+#add_checked_subdirectory(lz4) +#add_checked_subdirectory(lz4)
add_checked_subdirectory(minizip) if (LINUX)
add_checked_subdirectory(materialdecoration)
endif()
@@ -41,10 +41,10 @@ add_checked_subdirectory(minizip)
if (LINUX)
add_checked_subdirectory(nimf_qt5)
endif()
-add_checked_subdirectory(openal) -add_checked_subdirectory(openal)
-add_checked_subdirectory(openssl) -add_checked_subdirectory(openssl)
-add_checked_subdirectory(opus) -add_checked_subdirectory(opus)
@@ -3766,12 +3783,12 @@ index f311761..5b2d6ac 100644
+#add_checked_subdirectory(openssl) +#add_checked_subdirectory(openssl)
+#add_checked_subdirectory(opus) +#add_checked_subdirectory(opus)
+#add_checked_subdirectory(qt) +#add_checked_subdirectory(qt)
add_checked_subdirectory(qr_code_generator) if (LINUX)
add_checked_subdirectory(ranges) add_checked_subdirectory(qt5ct)
add_checked_subdirectory(rlottie) add_checked_subdirectory(qt5ct_qtplugin)
@@ -41,4 +41,4 @@ endif() @@ -65,4 +65,4 @@ if (LINUX)
add_checked_subdirectory(ton) add_checked_subdirectory(xdgiconloader)
add_checked_subdirectory(variant) endif()
add_checked_subdirectory(xxhash) add_checked_subdirectory(xxhash)
-add_checked_subdirectory(zlib) -add_checked_subdirectory(zlib)
+#add_checked_subdirectory(zlib) +#add_checked_subdirectory(zlib)
@@ -3818,10 +3835,10 @@ index 2ac58d4..6aed2b8 100644
set_source_files_properties(${not_linux_sources} PROPERTIES HEADER_FILE_ONLY TRUE) set_source_files_properties(${not_linux_sources} PROPERTIES HEADER_FILE_ONLY TRUE)
set_source_files_properties(${not_linux_sources} PROPERTIES SKIP_AUTOGEN TRUE) set_source_files_properties(${not_linux_sources} PROPERTIES SKIP_AUTOGEN TRUE)
diff --git a/cmake/options.cmake b/cmake/options.cmake diff --git a/cmake/options.cmake b/cmake/options.cmake
index 46186c6..822a6f0 100644 index 79845bf..014f486 100644
--- a/cmake/options.cmake --- a/cmake/options.cmake
+++ b/cmake/options.cmake +++ b/cmake/options.cmake
@@ -44,6 +44,8 @@ if (WIN32) @@ -58,6 +58,8 @@ if (WIN32)
include(cmake/options_win.cmake) include(cmake/options_win.cmake)
elseif (APPLE) elseif (APPLE)
include(cmake/options_mac.cmake) include(cmake/options_mac.cmake)
@@ -3867,10 +3884,10 @@ index 0000000..063f1ce
+ $<IF:$<CONFIG:Debug>,,-Ofast> + $<IF:$<CONFIG:Debug>,,-Ofast>
+) +)
diff --git a/cmake/variables.cmake b/cmake/variables.cmake diff --git a/cmake/variables.cmake b/cmake/variables.cmake
index a45a6b6..10c9cc1 100644 index c110591..4935bbe 100644
--- a/cmake/variables.cmake --- a/cmake/variables.cmake
+++ b/cmake/variables.cmake +++ b/cmake/variables.cmake
@@ -60,6 +60,7 @@ set(build_osx 0) @@ -62,6 +62,7 @@ set(build_osx 0)
set(build_macstore 0) set(build_macstore 0)
set(build_winstore 0) set(build_winstore 0)
set(build_linux32 0) set(build_linux32 0)
@@ -3878,7 +3895,7 @@ index a45a6b6..10c9cc1 100644
if (WIN32) if (WIN32)
if (DESKTOP_APP_SPECIAL_TARGET STREQUAL "uwp") if (DESKTOP_APP_SPECIAL_TARGET STREQUAL "uwp")
@@ -71,6 +72,12 @@ elseif (APPLE) @@ -73,6 +74,12 @@ elseif (APPLE)
elseif (DESKTOP_APP_SPECIAL_TARGET STREQUAL "macstore") elseif (DESKTOP_APP_SPECIAL_TARGET STREQUAL "macstore")
set(build_macstore 1) set(build_macstore 1)
endif() endif()
@@ -3891,7 +3908,7 @@ index a45a6b6..10c9cc1 100644
else() else()
if (CMAKE_SIZEOF_VOID_P EQUAL 4) if (CMAKE_SIZEOF_VOID_P EQUAL 4)
set(build_linux32 1) set(build_linux32 1)
@@ -91,8 +98,8 @@ else() @@ -93,8 +100,8 @@ else()
endif() endif()
endif() endif()
@@ -3905,62 +3922,3 @@ index a45a6b6..10c9cc1 100644
-- --
2.26.0 2.26.0
From d40ea32a380b3a1cd1682b7ac186a5c2f56196c2 Mon Sep 17 00:00:00 2001
From: Gerasim Troeglazov <3dEyes@gmail.com>
Date: Sat, 25 Apr 2020 11:42:37 +1000
Subject: Use system font
diff --git a/Telegram/lib_ui/ui/style/style_core_font.cpp b/Telegram/lib_ui/ui/style/style_core_font.cpp
index aacd7e2..5e3b72b 100644
--- a/Telegram/lib_ui/ui/style/style_core_font.cpp
+++ b/Telegram/lib_ui/ui/style/style_core_font.cpp
@@ -87,7 +87,7 @@ bool LoadCustomFont(const QString &filePath, const QString &familyName, int flag
QString MonospaceFont() {
static const auto family = [&]() -> QString {
-#ifndef Q_OS_LINUX
+#if !defined Q_OS_LINUX && !defined Q_OS_HAIKU
const auto kTryFirst = std::initializer_list<QString>{
"Consolas",
"Liberation Mono",
@@ -100,7 +100,7 @@ QString MonospaceFont() {
return family;
}
}
-#endif // !Q_OS_LINUX
+#endif // !Q_OS_LINUX && !Q_OS_HAIKU
const auto type = QFontDatabase::FixedFont;
return QFontDatabase::systemFont(type).family();
--
2.26.0
From 6cdbc771a17351f5cec75f466f2285cfb773234f Mon Sep 17 00:00:00 2001
From: Gerasim Troeglazov <3dEyes@gmail.com>
Date: Sat, 2 May 2020 20:32:47 +1000
Subject: Add UnsafeOpenUrl function
diff --git a/Telegram/SourceFiles/platform/haiku/file_utilities_haiku.cpp b/Telegram/SourceFiles/platform/haiku/file_utilities_haiku.cpp
index 6b37269..dee383c 100644
--- a/Telegram/SourceFiles/platform/haiku/file_utilities_haiku.cpp
+++ b/Telegram/SourceFiles/platform/haiku/file_utilities_haiku.cpp
@@ -77,6 +77,12 @@ bool UnsafeShowOpenWith(const QString &filepath) {
return true;
}
+void UnsafeOpenUrl(const QString &url) {
+ const QStringList arguments{url};
+ QProcess process;
+ process.startDetached(qsl("open"), arguments);
+}
+
} // namespace File
namespace FileDialog {
--
2.26.0

2
net-im/telegram-desktop/telegram_desktop-2.1.1.recipe → net-im/telegram-desktop/telegram_desktop-2.1.2.recipe
View File

@@ -6,7 +6,7 @@ LICENSE="GNU GPL v3"
REVISION="1" REVISION="1"
SOURCE_URI="https://github.com/telegramdesktop/tdesktop/releases/download/v$portVersion/tdesktop-$portVersion-full.tar.gz" SOURCE_URI="https://github.com/telegramdesktop/tdesktop/releases/download/v$portVersion/tdesktop-$portVersion-full.tar.gz"
CHECKSUM_SHA256="52e1ef6aff5d78fa979ed0e31129662decf78e9e317184912a7e39fe9f666200" CHECKSUM_SHA256="444455aa166448c43b46abad604e59f630225962b3fbebb32caccea2993e6858"
SOURCE_FILENAME="tdesktop-$portVersion-full.tar.gz" SOURCE_FILENAME="tdesktop-$portVersion-full.tar.gz"
SOURCE_DIR="tdesktop-$portVersion-full" SOURCE_DIR="tdesktop-$portVersion-full"
srcGitRev_2="0663103551379b958b2e79c51d51d163ec484300" srcGitRev_2="0663103551379b958b2e79c51d51d163ec484300"