diff --git a/net-im/kotatogram-desktop/kotatogram_desktop-1.4.5.recipe b/net-im/kotatogram-desktop/kotatogram_desktop-1.4.6.recipe similarity index 83% rename from net-im/kotatogram-desktop/kotatogram_desktop-1.4.5.recipe rename to net-im/kotatogram-desktop/kotatogram_desktop-1.4.6.recipe index fef07fd54..3dd0a799e 100644 --- a/net-im/kotatogram-desktop/kotatogram_desktop-1.4.5.recipe +++ b/net-im/kotatogram-desktop/kotatogram_desktop-1.4.6.recipe @@ -7,19 +7,19 @@ COPYRIGHT="2013-2021 Telegram LICENSE="GNU GPL v3" REVISION="1" SOURCE_URI="https://github.com/kotatogram/kotatogram-desktop/archive/refs/tags/k$portVersion.tar.gz" -CHECKSUM_SHA256="e823aaad624a87895811001fa235c938749c9558b4ca300345bbd58477414984" +CHECKSUM_SHA256="91fb24a1e0e022be313826a83ff0edeee15a0629acd71bca1795fe9cafeed63d" SOURCE_FILENAME="kotatogram-$portVersion.tar.gz" SOURCE_DIR="kotatogram-desktop-k$portVersion" #libtgvoip -srcGitRev_2="373e41668b265864f8976b83bb66dd6e9a583915" +srcGitRev_2="2cffda6222f07cd7d0aa4627a06fa99b05a3956d" SOURCE_URI_2="https://github.com/telegramdesktop/libtgvoip/archive/$srcGitRev_2.tar.gz" -CHECKSUM_SHA256_2="6bdf3af434004617018988decd47e0eeb839fbff26574f5adaf129410d5463ce" +CHECKSUM_SHA256_2="50bd82ae31431d16b4e800e0c2996a2322852c01d4f28b0f4adbbd099538ad08" SOURCE_FILENAME_2="libtgvoip-$srcGitRev_2.tar.gz" SOURCE_DIR_2="libtgvoip-$srcGitRev_2" #rlottie -srcGitRev_3="cbd43984ebdf783e94c8303c41385bf82aa36d5b" +srcGitRev_3="8c69fc20cf2e150db304311f1233a4b55a8892d7" SOURCE_URI_3="https://github.com/desktop-app/rlottie/archive/$srcGitRev_3.tar.gz" -CHECKSUM_SHA256_3="0946541630edf1b4172a59b1fb167468f52945a9c0d5076a698c916c8488e5bd" +CHECKSUM_SHA256_3="cbc1f4bf8c28ffeb89852eda7056ff6aa80d49cb45736a583c931d5ceeccdcdd" SOURCE_FILENAME_3="rlottie-$srcGitRev_3.tar.gz" SOURCE_DIR_3="rlottie-$srcGitRev_3" #lib_crl @@ -29,27 +29,27 @@ CHECKSUM_SHA256_4="64edbf9083c9ce7f6e98e741596e47dafc9dbcc818e45b3288186c9668fad SOURCE_FILENAME_4="lib_crl-$srcGitRev_4.tar.gz" SOURCE_DIR_4="lib_crl-$srcGitRev_4" #lib_rpl -srcGitRev_5="df721be3fa14a27dfc230d2e3c42bb1a7c9d0617" +srcGitRev_5="94a42b775ab4e46e5edeb88d8ed6c06f9e869c61" SOURCE_URI_5="https://github.com/desktop-app/lib_rpl/archive/$srcGitRev_5.tar.gz" -CHECKSUM_SHA256_5="574a680d488bb25402463c3ef5f263df76635a805cfb00da87b59ab8c39c198d" +CHECKSUM_SHA256_5="355477e3b53ffff6260bab92f8acd859db4e6cfc7a69286ec49da85ad67decd3" SOURCE_FILENAME_5="lib_rpl-$srcGitRev_5.tar.gz" SOURCE_DIR_5="lib_rpl-$srcGitRev_5" #lib_base -srcGitRev_6="e5a3b470d6524cdeb3e2deb92f04b0d290ceec24" +srcGitRev_6="087bf4e6159678fada93eea39e923ce634f51caf" SOURCE_URI_6="https://github.com/desktop-app/lib_base/archive/$srcGitRev_6.tar.gz" -CHECKSUM_SHA256_6="579b60f2ea4c0a6874b7d0c383ec46896e56e4dc2d44156a5eb7c75187924313" +CHECKSUM_SHA256_6="95e29518b33f775c03d9fdd22d459d5bb4576178d1a10ad845b847d50a1724b8" SOURCE_FILENAME_6="lib_base-$srcGitRev_6.tar.gz" SOURCE_DIR_6="lib_base-$srcGitRev_6" #codegen -srcGitRev_7="15026c5b6c5be43edae5c7737dbc011eec486e16" +srcGitRev_7="a60edf917419407cfe5c6095a56ccf363417ebd8" SOURCE_URI_7="https://github.com/desktop-app/codegen/archive/$srcGitRev_7.tar.gz" -CHECKSUM_SHA256_7="435f2d18ec0916028a1611b4439ad7f69f2df16c6ea0d5303ba84227d7ec0af2" +CHECKSUM_SHA256_7="06ee75ceb3be9cbd1471f14c1edce07b30189b012edb71a3c8ea1fdf8e30ad52" SOURCE_FILENAME_7="codegen-$srcGitRev_7.tar.gz" SOURCE_DIR_7="codegen-$srcGitRev_7" #lib_ui -srcGitRev_8="30a82625a82bd2af3d7923f9259b70425f9d7379" +srcGitRev_8="d9274f06bddccf0e5f4deabe641bafdd3b453c3f" SOURCE_URI_8="https://github.com/kotatogram/lib_ui/archive/$srcGitRev_8.tar.gz" -CHECKSUM_SHA256_8="5b7f0acf9ebf5d8ac3bd698e463549602059dcf3ba7741022272eb8bd194963d" +CHECKSUM_SHA256_8="b6ac135ef5dfabd938a89e8c7d341585ad4a7892c94822d9a4d43ff2431839a6" SOURCE_FILENAME_8="lib_ui-$srcGitRev_8.tar.gz" SOURCE_DIR_8="lib_ui-$srcGitRev_8" #lib_rlottie @@ -59,9 +59,9 @@ CHECKSUM_SHA256_9="28b68af080b03bf0dd66bab5f9dceb712e0b3203fd5ad7f80960502722349 SOURCE_FILENAME_9="lib_rlottie-$srcGitRev_9.tar.gz" SOURCE_DIR_9="lib_rlottie-$srcGitRev_9" #lib_lottie -srcGitRev_10="d134c0361ef96b5061c2719a0e984eaaed2c1a81" +srcGitRev_10="ad7fce76f3b403471a296c928bae67cd36b8b2cf" SOURCE_URI_10="https://github.com/desktop-app/lib_lottie/archive/$srcGitRev_10.tar.gz" -CHECKSUM_SHA256_10="56800257be2d4d284b5dd2db8466206063bb13594d6c407b13670dc60ddaf6a9" +CHECKSUM_SHA256_10="b206fa1af74bf81bc54abcf14dc573e22d4e647de38b3c977d9e3fe18c99ec95" SOURCE_FILENAME_10="lib_lottie-$srcGitRev_10.tar.gz" SOURCE_DIR_10="lib_lottie-$srcGitRev_10" #lib_tl @@ -71,9 +71,9 @@ CHECKSUM_SHA256_11="1db86a372f9c5d87b836a60ee16bf6a69dd343840498bc0121118ac9fc2b SOURCE_FILENAME_11="lib_tl-$srcGitRev_11.tar.gz" SOURCE_DIR_11="lib_tl-$srcGitRev_11" #lib_spellcheck -srcGitRev_12="212d660cbbb49592103de7a98fcb1c0f16efc36b" +srcGitRev_12="b1b295fee18e44534d9a96ec9858baa4c932f7d2" SOURCE_URI_12="https://github.com/desktop-app/lib_spellcheck/archive/$srcGitRev_12.tar.gz" -CHECKSUM_SHA256_12="29b76026b4da7f146b238f25909b5f6acbbc6e233ecd861b1d98f3974e065ab8" +CHECKSUM_SHA256_12="2a3958a2d7b5db14b73508dd525b847e5fac20b2168a58fad83d4e33ac007ed1" SOURCE_FILENAME_12="lib_spellcheck-$srcGitRev_12.tar.gz" SOURCE_DIR_12="lib_spellcheck-$srcGitRev_12" #lib_storage @@ -83,9 +83,9 @@ CHECKSUM_SHA256_13="ce440ae1cbfc35a4e1f04adfe14497991a9347045970620b199abfd3f162 SOURCE_FILENAME_13="lib_storage-$srcGitRev_13.tar.gz" SOURCE_DIR_13="lib_storage-$srcGitRev_13" #cmake_helpers -srcGitRev_14="883846c92f8cf858d5bf8c034ba42e6a17b89ced" +srcGitRev_14="37c59a2d5773eb4cea7803fa6f72933b3c5374f7" SOURCE_URI_14="https://github.com/kotatogram/cmake_helpers/archive/$srcGitRev_14.tar.gz" -CHECKSUM_SHA256_14="2a18fdf5b5a7ce5147f1f00c87c4fbd7ace6a89d72ce25dc149caa367ae9e3ff" +CHECKSUM_SHA256_14="4224b9d0e7a6b582654929ccadaf9a91e57e05b449697915e3f7c4a1b115b44d" SOURCE_FILENAME_14="cmake_helpers-$srcGitRev_14.tar.gz" SOURCE_DIR_14="cmake_helpers-$srcGitRev_14" #QR-Code-generator @@ -101,21 +101,21 @@ CHECKSUM_SHA256_16="f1aee181ebbcec2e8b8f4d8321d966f8a51ee0f015153602987e88113d68 SOURCE_FILENAME_16="lib_qr-$srcGitRev_16.tar.gz" SOURCE_DIR_16="lib_qr-$srcGitRev_16" #lib_webrtc -srcGitRev_17="29d51317915ca43db45d436cba8eac3f40dea36b" +srcGitRev_17="04cc1ff4a6fdade551e26441488ac0d0a208e96c" SOURCE_URI_17="https://github.com/desktop-app/lib_webrtc/archive/$srcGitRev_17.tar.gz" -CHECKSUM_SHA256_17="c5488b1d32d8509df2053413388f3b4e3adeb6da573552ac540d83a1edb6a63c" +CHECKSUM_SHA256_17="e2fd20f6b059ad6654abe640a48dea183cfc880c7c33424c168c5e86fad316c4" SOURCE_FILENAME_17="lib_webrtc-$srcGitRev_17.tar.gz" SOURCE_DIR_17="lib_webrtc-$srcGitRev_17" #tgcalls -srcGitRev_18="f76a9290fa502a8df473dd872aedf9a553b089cc" +srcGitRev_18="6dbefa5bfc0fdf07eb42af103d8af0f481511c2a" SOURCE_URI_18="https://github.com/TelegramMessenger/tgcalls/archive/$srcGitRev_18.tar.gz" -CHECKSUM_SHA256_18="6d5e4505e10c1be5ed1674ddb3a314bc8274cd216090a5f02cdc86c3c276a1b1" +CHECKSUM_SHA256_18="4166f0122376c2e386f7db549ebd9fec31fb7c1dc5c7b60d7c5483e5d4563a04" SOURCE_FILENAME_18="tgcalls-$srcGitRev_18.tar.gz" SOURCE_DIR_18="tgcalls-$srcGitRev_18" #lib_webview -srcGitRev_19="0a3584b8d8e37f9745a0cb0fae725e8e8ea0d989" +srcGitRev_19="8be9c0ff274569cbb1bc9dd4ea9ed9089c37ca93" SOURCE_URI_19="https://github.com/desktop-app/lib_webview/archive/$srcGitRev_19.tar.gz" -CHECKSUM_SHA256_19="16122bd4c13fc47ae19c10b7a2af6c9138b4cdd8a0b6e472148d7ce659d88b33" +CHECKSUM_SHA256_19="1dce150a586ca8ab8716c7880723ae5a8c390eeb689ed727bcd4f64311d3e88d" SOURCE_FILENAME_19="lib_webview-$srcGitRev_19.tar.gz" SOURCE_DIR_19="lib_webview-$srcGitRev_19" #expected @@ -173,12 +173,15 @@ REQUIRES=" lib:libminizip$secondaryArchSuffix lib:libopenal$secondaryArchSuffix lib:libopus$secondaryArchSuffix - lib:libQt5Core$secondaryArchSuffix - lib:libQt5Gui$secondaryArchSuffix - lib:libQt5Network$secondaryArchSuffix - lib:libQt5Widgets$secondaryArchSuffix + lib:libQt6Core$secondaryArchSuffix + lib:libQt6Core5Compat$secondaryArchSuffix + lib:libQt6Gui$secondaryArchSuffix + lib:libQt6Network$secondaryArchSuffix + lib:libQt6Svg$secondaryArchSuffix + lib:libQt6Widgets$secondaryArchSuffix lib:librnnoise$secondaryArchSuffix lib:libsigc_2.0$secondaryArchSuffix + lib:libstdc++$secondaryArchSuffix lib:libswresample$secondaryArchSuffix lib:libswscale$secondaryArchSuffix lib:libxxhash$secondaryArchSuffix @@ -187,6 +190,7 @@ REQUIRES=" BUILD_REQUIRES=" haiku${secondaryArchSuffix}_devel + qt6_tools${secondaryArchSuffix}_devel devel:libabsl_strings$secondaryArchSuffix devel:libabsl_throw_delegate$secondaryArchSuffix devel:libavcodec$secondaryArchSuffix @@ -204,10 +208,12 @@ BUILD_REQUIRES=" devel:libopenal$secondaryArchSuffix devel:libopus$secondaryArchSuffix devel:libqrcodegen$secondaryArchSuffix - devel:libQt5Core$secondaryArchSuffix - devel:libQt5Gui$secondaryArchSuffix - devel:libQt5Network$secondaryArchSuffix - devel:libQt5Widgets$secondaryArchSuffix + devel:libQt6Core$secondaryArchSuffix + devel:libQt6Core5Compat$secondaryArchSuffix + devel:libQt6Gui$secondaryArchSuffix + devel:libQt6Network$secondaryArchSuffix + devel:libQt6Svg$secondaryArchSuffix + devel:libQt6Widgets$secondaryArchSuffix devel:librapidjson$secondaryArchSuffix devel:librnnoise$secondaryArchSuffix devel:libswresample$secondaryArchSuffix @@ -221,7 +227,6 @@ BUILD_PREREQUIRES=" cmd:cmake cmd:gawk cmd:gcc$secondaryArchSuffix - cmd:lrelease$secondaryArchSuffix >= 5 cmd:make cmd:pkg_config$secondaryArchSuffix cmd:python @@ -282,6 +287,7 @@ BUILD() cmake .. \ -DCMAKE_BUILD_TYPE=Release \ + -DDESKTOP_APP_QT6=ON \ -DTDESKTOP_API_TEST=OFF \ -DTDESKTOP_DISABLE_GTK_INTEGRATION=ON \ -DDESKTOP_APP_DISABLE_CRASH_REPORTS=ON \ diff --git a/net-im/kotatogram-desktop/patches/cmake_helpers-1.4.5.patchset b/net-im/kotatogram-desktop/patches/cmake_helpers-1.4.6.patchset similarity index 100% rename from net-im/kotatogram-desktop/patches/cmake_helpers-1.4.5.patchset rename to net-im/kotatogram-desktop/patches/cmake_helpers-1.4.6.patchset diff --git a/net-im/kotatogram-desktop/patches/kotatogram_desktop-1.4.5.patchset b/net-im/kotatogram-desktop/patches/kotatogram_desktop-1.4.6.patchset similarity index 81% rename from net-im/kotatogram-desktop/patches/kotatogram_desktop-1.4.5.patchset rename to net-im/kotatogram-desktop/patches/kotatogram_desktop-1.4.6.patchset index 1f7215f4c..aac422151 100644 --- a/net-im/kotatogram-desktop/patches/kotatogram_desktop-1.4.5.patchset +++ b/net-im/kotatogram-desktop/patches/kotatogram_desktop-1.4.6.patchset @@ -1,14 +1,14 @@ -From 116afdf52d051c7eec50258c47885b93e8c9d2ed Mon Sep 17 00:00:00 2001 +From 5783d0558915c272cf0b413302c2de6311a642e1 Mon Sep 17 00:00:00 2001 From: Gerasim Troeglazov <3dEyes@gmail.com> -Date: Wed, 10 Nov 2021 19:31:53 +1000 +Date: Wed, 22 Dec 2021 23:20:41 +1000 Subject: Add Haiku support diff --git a/Telegram/CMakeLists.txt b/Telegram/CMakeLists.txt -index 6567be6..f9d7122 100644 +index bc35728..a0b0531 100644 --- a/Telegram/CMakeLists.txt +++ b/Telegram/CMakeLists.txt -@@ -89,6 +89,15 @@ PRIVATE +@@ -95,6 +95,15 @@ PRIVATE desktop-app::external_xxhash ) @@ -24,7 +24,7 @@ index 6567be6..f9d7122 100644 target_precompile_headers(Telegram PRIVATE ${src_loc}/stdafx.h) nice_target_sources(Telegram ${src_loc} PRIVATE -@@ -1182,6 +1191,16 @@ else() +@@ -1240,6 +1249,16 @@ else() ) endif() @@ -41,7 +41,7 @@ index 6567be6..f9d7122 100644 if (DESKTOP_APP_DISABLE_WAYLAND_INTEGRATION) remove_target_sources(Telegram ${src_loc} platform/linux/linux_wayland_integration.cpp -@@ -1311,7 +1330,7 @@ else() +@@ -1379,7 +1398,7 @@ else() endif() set(bundle_identifier "io.github.kotatogram") @@ -71,7 +71,7 @@ index 0fdaf4c..ea0f606 100644 if (const auto strong = weak.get()) { showBox(Box(SettingsBox, strong)); diff --git a/Telegram/SourceFiles/calls/group/calls_group_panel.cpp b/Telegram/SourceFiles/calls/group/calls_group_panel.cpp -index c71c522..2c3d1dc 100644 +index 0181b16..099a5fa 100644 --- a/Telegram/SourceFiles/calls/group/calls_group_panel.cpp +++ b/Telegram/SourceFiles/calls/group/calls_group_panel.cpp @@ -1935,7 +1935,9 @@ void Panel::updateButtonsGeometry() { @@ -99,10 +99,10 @@ index c71c522..2c3d1dc 100644 _video->moveToLeft(left, buttonsTop); left += _video->width() + skip; diff --git a/Telegram/SourceFiles/core/core_settings.h b/Telegram/SourceFiles/core/core_settings.h -index 9b896a5..2eb6523 100644 +index 4e0b6d6..c7121c5 100644 --- a/Telegram/SourceFiles/core/core_settings.h +++ b/Telegram/SourceFiles/core/core_settings.h -@@ -707,7 +707,7 @@ private: +@@ -784,7 +784,7 @@ private: rpl::variable _dialogsWidthRatio; // per-window rpl::variable _thirdColumnWidth = kDefaultThirdColumnWidth; // p-w bool _notifyFromAll = true; @@ -156,10 +156,10 @@ index 453ccfd..c8374f9 100644 if (internal::ShowXDPOpenWithDialog(filepath)) { return true; diff --git a/Telegram/SourceFiles/platform/linux/main_window_linux.cpp b/Telegram/SourceFiles/platform/linux/main_window_linux.cpp -index 5fb5fbb..52b7711 100644 +index 500b5b6..d9248d8 100644 --- a/Telegram/SourceFiles/platform/linux/main_window_linux.cpp +++ b/Telegram/SourceFiles/platform/linux/main_window_linux.cpp -@@ -935,11 +935,17 @@ bool MainWindow::hasTrayIcon() const { +@@ -934,11 +934,17 @@ bool MainWindow::hasTrayIcon() const { bool MainWindow::isActiveForTrayMenu() { updateIsActive(); @@ -177,18 +177,18 @@ index 5fb5fbb..52b7711 100644 } void MainWindow::psTrayMenuUpdated() { -@@ -971,7 +977,9 @@ void MainWindow::psSetupTrayIcon() { - if (!trayIcon) { - trayIcon = new QSystemTrayIcon(this); - trayIcon->setIcon(TrayIconGen(counter, muted)); -- -+#ifdef Q_OS_HAIKU -+ trayIcon->setContextMenu(trayIconMenu); -+#endif - attachToTrayIcon(trayIcon); +@@ -975,8 +981,9 @@ void MainWindow::psSetupTrayIcon() { + if (_sniAvailable) { + trayIcon->setContextMenu(trayIconMenu); } - updateIconCounters(); -@@ -1063,8 +1071,10 @@ void MainWindow::updateIconCounters() { ++#ifdef Q_OS_HAIKU + trayIcon->setIcon(TrayIconGen(counter, muted)); +- ++#endif + attachToTrayIcon(trayIcon); + } + updateIconCounters(); +@@ -1067,8 +1074,10 @@ void MainWindow::updateIconCounters() { } void MainWindow::initTrayMenuHook() { @@ -201,10 +201,10 @@ index 5fb5fbb..52b7711 100644 void MainWindow::createGlobalMenu() { diff --git a/Telegram/SourceFiles/platform/linux/notifications_manager_haiku.cpp b/Telegram/SourceFiles/platform/linux/notifications_manager_haiku.cpp new file mode 100644 -index 0000000..72bda83 +index 0000000..8605b28 --- /dev/null +++ b/Telegram/SourceFiles/platform/linux/notifications_manager_haiku.cpp -@@ -0,0 +1,270 @@ +@@ -0,0 +1,268 @@ +/* +This file is part of Telegram Desktop for Haiku, + @@ -313,8 +313,7 @@ index 0000000..72bda83 + const QString &title, + const QString &subtitle, + const QString &msg, -+ bool hideNameAndPhoto, -+ bool hideReplyButton); ++ DisplayOptions options); + + ~Private(); + @@ -373,7 +372,7 @@ index 0000000..72bda83 + if (message.Unflatten(buffer) == B_OK) { + uint64 sessionId = message.GetUInt64("session", 0); + uint64 peerId = message.GetUInt64("peer", 0); -+ int32 messageId = message.GetInt32("message", 0); ++ int64 messageId = message.GetInt64("message", 0); + + const auto key = FullPeer{ + .sessionId = sessionId, @@ -395,13 +394,12 @@ index 0000000..72bda83 + const QString &title, + const QString &subtitle, + const QString &msg, -+ bool hideNameAndPhoto, -+ bool hideReplyButton) { ++ DisplayOptions options) { + auto titleText = title; + auto subtitleText = subtitle; + auto msgText = msg; + -+ const auto key = hideNameAndPhoto ++ const auto key = options.hideNameAndPhoto + ? InMemoryKey() + : peer->userpicUniqueKey(userpicView); + @@ -412,8 +410,8 @@ index 0000000..72bda83 + "target:tg_notify " + "session:uint64:%1 " + "peer:uint64:%2 " -+ "message:int32:%3") -+ .arg(peer->session().uniqueId()).arg(peer->id.value).arg(msgId); ++ "message:int64:%3") ++ .arg(peer->session().uniqueId()).arg(peer->id.value).arg(msgId.bare); + BNotification notify(B_INFORMATION_NOTIFICATION); + if (icon) + notify.SetIcon(icon); @@ -442,8 +440,7 @@ index 0000000..72bda83 + const QString &title, + const QString &subtitle, + const QString &msg, -+ bool hideNameAndPhoto, -+ bool hideReplyButton) { ++ DisplayOptions options) { + _private->showNotification( + peer, + userpicView, @@ -451,12 +448,13 @@ index 0000000..72bda83 + title, + subtitle, + msg, -+ hideNameAndPhoto, -+ hideReplyButton); ++ options); +} + +void Manager::doClearAllFast() { } + ++void Manager::doClearFromItem(not_null item) { } ++ +void Manager::doClearFromHistory(not_null history) { } + +void Manager::doClearFromSession(not_null session) { } @@ -476,12 +474,12 @@ index 0000000..72bda83 +} // namespace Notifications +} // namespace Platform diff --git a/Telegram/SourceFiles/platform/linux/specific_linux.cpp b/Telegram/SourceFiles/platform/linux/specific_linux.cpp -index dcdb784..7529ac6 100644 +index 26168ba..1706cbb 100644 --- a/Telegram/SourceFiles/platform/linux/specific_linux.cpp +++ b/Telegram/SourceFiles/platform/linux/specific_linux.cpp -@@ -38,6 +38,10 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL - #include "webview/platform/linux/webview_linux_webkit2gtk.h" - #endif // !DESKTOP_APP_DISABLE_WEBKITGTK +@@ -34,6 +34,10 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL + #include "base/platform/linux/base_linux_xsettings.h" + #endif // !DESKTOP_APP_DISABLE_X11_INTEGRATION +#ifdef Q_OS_HAIKU +#include @@ -489,8 +487,8 @@ index dcdb784..7529ac6 100644 + #include #include - #include -@@ -49,7 +53,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL + #include +@@ -44,7 +48,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL #ifdef Q_OS_FREEBSD #include @@ -499,25 +497,79 @@ index dcdb784..7529ac6 100644 #include #endif // Q_OS_FREEBSD -@@ -591,7 +595,7 @@ void psActivateProcess(uint64 pid) { +@@ -78,6 +82,33 @@ constexpr auto kXDGDesktopPortalObjectPath = "/org/freedesktop/portal/desktop"_c + constexpr auto kIBusPortalService = "org.freedesktop.portal.IBus"_cs; + constexpr auto kWebviewService = "io.github.kotatogram.GtkIntegration.WebviewHelper-%1-%2"_cs; - namespace { - --#ifdef __HAIKU__ +#ifdef Q_OS_HAIKU - void HaikuAutostart(bool start) { - const auto home = QDir::homePath(); - if (home.isEmpty()) { -@@ -616,7 +620,7 @@ void HaikuAutostart(bool start) { - file.remove(); - } - } --#endif // __HAIKU__ ++void HaikuAutostart(bool start) { ++ const auto home = QDir::homePath(); ++ if (home.isEmpty()) { ++ return; ++ } ++ ++ QFile file(home + "/config/settings/boot/launch/kotatogram-desktop"); ++ if (start) { ++ if (file.open(QIODevice::WriteOnly | QIODevice::Text)) { ++ QTextStream out(&file); ++ out ++ << "#!/bin/bash" << Qt::endl ++ << "cd /system/apps" << Qt::endl ++ << "./Kotatogram -autostart" << " &" << Qt::endl; ++ file.close(); ++ file.setPermissions(file.permissions() ++ | QFileDevice::ExeOwner ++ | QFileDevice::ExeGroup ++ | QFileDevice::ExeOther); ++ } ++ } else { ++ file.remove(); ++ } ++} +#endif // Q_OS_HAIKU ++ + #ifndef DESKTOP_APP_DISABLE_DBUS_INTEGRATION + void PortalAutostart(bool start, bool silent) { + if (cExeName().isEmpty()) { +@@ -618,37 +649,6 @@ void psActivateProcess(uint64 pid) { + // objc_activateProgram(); + } - } // namespace - -@@ -635,7 +639,11 @@ QString psAppDataPath() { +-namespace { +- +-#ifdef __HAIKU__ +-void HaikuAutostart(bool start) { +- const auto home = QDir::homePath(); +- if (home.isEmpty()) { +- return; +- } +- +- QFile file(home + "/config/settings/boot/launch/kotatogram-desktop"); +- if (start) { +- if (file.open(QIODevice::WriteOnly | QIODevice::Text)) { +- QTextStream out(&file); +- out +- << "#!/bin/bash" << Qt::endl +- << "cd /system/apps" << Qt::endl +- << "./Kotatogram -autostart" << " &" << Qt::endl; +- file.close(); +- file.setPermissions(file.permissions() +- | QFileDevice::ExeOwner +- | QFileDevice::ExeGroup +- | QFileDevice::ExeOther); +- } +- } else { +- file.remove(); +- } +-} +-#endif // __HAIKU__ +- +-} // namespace +- + QString psAppDataPath() { + // We should not use ~/.TelegramDesktop, since it's a fork. + /* +@@ -664,7 +664,11 @@ QString psAppDataPath() { } */ @@ -530,7 +582,7 @@ index dcdb784..7529ac6 100644 } void psDoCleanup() { -@@ -663,8 +671,9 @@ namespace Platform { +@@ -692,8 +696,9 @@ namespace Platform { void start() { auto backgroundThread = true; @@ -541,7 +593,7 @@ index dcdb784..7529ac6 100644 // Prevent any later calls into setlocale() by Qt QCoreApplicationPrivate::initLocale(); -@@ -796,7 +805,7 @@ bool OpenSystemSettings(SystemSettingsType type) { +@@ -829,7 +834,7 @@ bool OpenSystemSettings(SystemSettingsType type) { } else if (DesktopEnvironment::IsMATE()) { add("mate-volume-control"); } @@ -551,10 +603,10 @@ index dcdb784..7529ac6 100644 #endif // __ HAIKU__ add("pavucontrol-qt"); diff --git a/Telegram/cmake/lib_tgvoip.cmake b/Telegram/cmake/lib_tgvoip.cmake -index f332b18..73c1930 100644 +index 68a64ba..319e5b4 100644 --- a/Telegram/cmake/lib_tgvoip.cmake +++ b/Telegram/cmake/lib_tgvoip.cmake -@@ -123,6 +123,14 @@ if (NOT TGVOIP_FOUND) +@@ -116,6 +116,14 @@ if (NOT TGVOIP_FOUND) os/linux/AudioPulse.cpp os/linux/AudioPulse.h @@ -569,7 +621,7 @@ index f332b18..73c1930 100644 # POSIX os/posix/NetworkSocketPosix.cpp os/posix/NetworkSocketPosix.h -@@ -160,6 +168,25 @@ if (NOT TGVOIP_FOUND) +@@ -153,6 +161,25 @@ if (NOT TGVOIP_FOUND) TGVOIP_NO_OSX_PRIVATE_API ) endif() diff --git a/net-im/kotatogram-desktop/patches/lib_base-1.4.5.patchset b/net-im/kotatogram-desktop/patches/lib_base-1.4.6.patchset similarity index 100% rename from net-im/kotatogram-desktop/patches/lib_base-1.4.5.patchset rename to net-im/kotatogram-desktop/patches/lib_base-1.4.6.patchset diff --git a/net-im/kotatogram-desktop/patches/lib_ui-1.4.5.patchset b/net-im/kotatogram-desktop/patches/lib_ui-1.4.6.patchset similarity index 54% rename from net-im/kotatogram-desktop/patches/lib_ui-1.4.5.patchset rename to net-im/kotatogram-desktop/patches/lib_ui-1.4.6.patchset index 95baa18a6..e7a52001a 100644 --- a/net-im/kotatogram-desktop/patches/lib_ui-1.4.5.patchset +++ b/net-im/kotatogram-desktop/patches/lib_ui-1.4.6.patchset @@ -1,14 +1,14 @@ -From 4abc5f9628b9b0e9a82aec9de03a0a43abf3618e Mon Sep 17 00:00:00 2001 +From 44831be8f21e06291cb1d8cbfd911eb621bde849 Mon Sep 17 00:00:00 2001 From: Gerasim Troeglazov <3dEyes@gmail.com> Date: Wed, 10 Nov 2021 18:18:12 +1000 Subject: Fixes for Haiku diff --git a/ui/platform/linux/ui_utility_linux.cpp b/ui/platform/linux/ui_utility_linux.cpp -index 87c3c04..9d1ef4f 100644 +index 2a7fb2d..8eaae4c 100644 --- a/ui/platform/linux/ui_utility_linux.cpp +++ b/ui/platform/linux/ui_utility_linux.cpp -@@ -612,7 +612,7 @@ TitleControls::Layout TitleControlsLayout() { +@@ -609,7 +609,7 @@ TitleControls::Layout TitleControlsLayout() { } #endif // !DESKTOP_APP_DISABLE_DBUS_INTEGRATION @@ -17,7 +17,7 @@ index 87c3c04..9d1ef4f 100644 return TitleControls::Layout{ .left = { TitleControls::Control::Close, -@@ -622,7 +622,7 @@ TitleControls::Layout TitleControlsLayout() { +@@ -619,7 +619,7 @@ TitleControls::Layout TitleControlsLayout() { TitleControls::Control::Maximize, } }; @@ -26,7 +26,7 @@ index 87c3c04..9d1ef4f 100644 return TitleControls::Layout{ .right = { TitleControls::Control::Minimize, -@@ -630,7 +630,7 @@ TitleControls::Layout TitleControlsLayout() { +@@ -627,7 +627,7 @@ TitleControls::Layout TitleControlsLayout() { TitleControls::Control::Close, } }; @@ -35,6 +35,21 @@ index 87c3c04..9d1ef4f 100644 } } // namespace Platform +diff --git a/ui/ui_utility.cpp b/ui/ui_utility.cpp +index e66055d..e31d635 100644 +--- a/ui/ui_utility.cpp ++++ b/ui/ui_utility.cpp +@@ -9,6 +9,10 @@ + #include "ui/platform/ui_platform_utility.h" + #include "ui/style/style_core.h" + ++#ifdef Q_OS_HAIKU ++#include ++#endif ++ + #include + #include + #include -- 2.30.2 diff --git a/net-im/kotatogram-desktop/patches/lib_webrtc-1.4.5.patchset b/net-im/kotatogram-desktop/patches/lib_webrtc-1.4.6.patchset similarity index 100% rename from net-im/kotatogram-desktop/patches/lib_webrtc-1.4.5.patchset rename to net-im/kotatogram-desktop/patches/lib_webrtc-1.4.6.patchset diff --git a/net-im/kotatogram-desktop/patches/libtgvoip-1.4.5.patchset b/net-im/kotatogram-desktop/patches/libtgvoip-1.4.6.patchset similarity index 100% rename from net-im/kotatogram-desktop/patches/libtgvoip-1.4.5.patchset rename to net-im/kotatogram-desktop/patches/libtgvoip-1.4.6.patchset diff --git a/net-im/kotatogram-desktop/patches/tgcalls-1.4.5.patchset b/net-im/kotatogram-desktop/patches/tgcalls-1.4.6.patchset similarity index 100% rename from net-im/kotatogram-desktop/patches/tgcalls-1.4.5.patchset rename to net-im/kotatogram-desktop/patches/tgcalls-1.4.6.patchset