diff --git a/x11-packages/telegram-desktop/0006-libtd-no-android.patch b/x11-packages/telegram-desktop/0004-libtd-no-android.patch similarity index 100% rename from x11-packages/telegram-desktop/0006-libtd-no-android.patch rename to x11-packages/telegram-desktop/0004-libtd-no-android.patch diff --git a/x11-packages/telegram-desktop/0004-libtgvoip-no-android.patch b/x11-packages/telegram-desktop/0004-libtgvoip-no-android.patch deleted file mode 100644 index 2485bf3091ad115..000000000000000 --- a/x11-packages/telegram-desktop/0004-libtgvoip-no-android.patch +++ /dev/null @@ -1,203 +0,0 @@ -diff -uNr a/Telegram/ThirdParty/libtgvoip/VoIPController.cpp b/Telegram/ThirdParty/libtgvoip/VoIPController.cpp ---- a/Telegram/ThirdParty/libtgvoip/VoIPController.cpp -+++ b/Telegram/ThirdParty/libtgvoip/VoIPController.cpp -@@ -60,7 +60,7 @@ - bool VoIPController::didInitWin32TimeScale = false; - #endif - --#ifdef __ANDROID__ -+#if defined(__ANDROID__) && !defined(__TERMUX__) - #include "os/android/JNIUtilities.h" - #include "os/android/AudioInputAndroid.h" - extern jclass jniUtilitiesClass; -@@ -611,7 +611,7 @@ - network["mnc"]=carrier.mnc; - } - }else if(networkType==NET_TYPE_WIFI){ --#ifdef __ANDROID__ -+#if defined(__ANDROID__) && !defined(__TERMUX__) - jni::DoWithJNI([&](JNIEnv* env){ - jmethodID getWifiInfoMethod=env->GetStaticMethodID(jniUtilitiesClass, "getWifiInfo", "()[I"); - jintArray res=static_cast(env->CallStaticObjectMethod(jniUtilitiesClass, getWifiInfoMethod)); -@@ -988,7 +988,7 @@ - CellularCarrierInfo VoIPController::GetCarrierInfo(){ - #if defined(__APPLE__) && TARGET_OS_IOS - return DarwinSpecific::GetCarrierInfo(); --#elif defined(__ANDROID__) -+#elif defined(__ANDROID__) && !defined(__TERMUX__) - CellularCarrierInfo carrier; - jni::DoWithJNI([&carrier](JNIEnv* env){ - jmethodID getCarrierInfoMethod=env->GetStaticMethodID(jniUtilitiesClass, "getCarrierInfo", "()[Ljava/lang/String;"); -@@ -1122,7 +1122,7 @@ - } - audioInput=audioIO->GetInput(); - audioOutput=audioIO->GetOutput(); --#ifdef __ANDROID__ -+#if defined(__ANDROID__) && !defined(__TERMUX__) - audio::AudioInputAndroid* androidInput=dynamic_cast(audioInput); - if(androidInput){ - unsigned int effects=androidInput->GetEnabledEffects(); -diff -uNr a/Telegram/ThirdParty/libtgvoip/audio/AudioIO.cpp b/Telegram/ThirdParty/libtgvoip/audio/AudioIO.cpp ---- a/Telegram/ThirdParty/libtgvoip/audio/AudioIO.cpp -+++ b/Telegram/ThirdParty/libtgvoip/audio/AudioIO.cpp -@@ -14,7 +14,7 @@ - - #if defined(TGVOIP_USE_CALLBACK_AUDIO_IO) - #include "AudioIOCallback.h" --#elif defined(__ANDROID__) -+#elif defined(__ANDROID__) && !defined(__TERMUX__) - #include "../os/android/AudioInputAndroid.h" - #include "../os/android/AudioOutputAndroid.h" - #elif defined(__APPLE__) -@@ -50,7 +50,7 @@ - AudioIO* AudioIO::Create(std::string inputDevice, std::string outputDevice){ - #if defined(TGVOIP_USE_CALLBACK_AUDIO_IO) - return new AudioIOCallback(); --#elif defined(__ANDROID__) -+#elif defined(__ANDROID__) && !defined(__TERMUX__) - return new ContextlessAudioIO(); - #elif defined(__APPLE__) - #if TARGET_OS_OSX -diff -uNr a/Telegram/ThirdParty/libtgvoip/audio/AudioInput.cpp b/Telegram/ThirdParty/libtgvoip/audio/AudioInput.cpp ---- a/Telegram/ThirdParty/libtgvoip/audio/AudioInput.cpp -+++ b/Telegram/ThirdParty/libtgvoip/audio/AudioInput.cpp -@@ -13,7 +13,7 @@ - - #if defined(TGVOIP_USE_CALLBACK_AUDIO_IO) - // nothing --#elif defined(__ANDROID__) -+#elif defined(__ANDROID__) && !defined(__TERMUX__) - #include "../os/android/AudioInputAndroid.h" - #elif defined(__APPLE__) - #include -@@ -72,7 +72,7 @@ - } - #endif - AudioInputWASAPI::EnumerateDevices(devs); --#elif (defined(__linux__) && !defined(__ANDROID__)) || defined(__FreeBSD__) || defined(__OpenBSD__) -+#elif (defined(__linux__) && !defined(__ANDROID__)) || defined(__TERMUX__) || defined(__FreeBSD__) || defined(__OpenBSD__) - #if !defined(WITHOUT_PULSE) && !defined(WITHOUT_ALSA) - if(!AudioInputPulse::EnumerateDevices(devs)) - AudioInputALSA::EnumerateDevices(devs); -diff -uNr a/Telegram/ThirdParty/libtgvoip/audio/AudioOutput.cpp b/Telegram/ThirdParty/libtgvoip/audio/AudioOutput.cpp ---- a/Telegram/ThirdParty/libtgvoip/audio/AudioOutput.cpp -+++ b/Telegram/ThirdParty/libtgvoip/audio/AudioOutput.cpp -@@ -14,7 +14,7 @@ - - #if defined(TGVOIP_USE_CALLBACK_AUDIO_IO) - // nothing --#elif defined(__ANDROID__) -+#elif defined(__ANDROID__) && !defined(__TERMUX__) - #include "../os/android/AudioOutputOpenSLES.h" - #include "../os/android/AudioOutputAndroid.h" - #include -@@ -60,7 +60,7 @@ - - - int32_t AudioOutput::GetEstimatedDelay(){ --#if defined(__ANDROID__) -+#if defined(__ANDROID__) && !defined(__TERMUX__) - char sdkNum[PROP_VALUE_MAX]; - __system_property_get("ro.build.version.sdk", sdkNum); - int systemVersion=atoi(sdkNum); -@@ -83,7 +83,7 @@ - } - #endif - AudioOutputWASAPI::EnumerateDevices(devs); --#elif (defined(__linux__) && !defined(__ANDROID__)) || defined(__FreeBSD__) || defined(__OpenBSD__) -+#elif (defined(__linux__) && !defined(__ANDROID__)) || defined(__TERMUX__) || defined(__FreeBSD__) || defined(__OpenBSD__) - #if !defined(WITHOUT_PULSE) && !defined(WITHOUT_ALSA) - if(!AudioOutputPulse::EnumerateDevices(devs)) - AudioOutputALSA::EnumerateDevices(devs); -diff -uNr a/Telegram/ThirdParty/libtgvoip/video/VideoRenderer.cpp b/Telegram/ThirdParty/libtgvoip/video/VideoRenderer.cpp ---- a/Telegram/ThirdParty/libtgvoip/video/VideoRenderer.cpp -+++ b/Telegram/ThirdParty/libtgvoip/video/VideoRenderer.cpp -@@ -4,14 +4,14 @@ - - #include "VideoRenderer.h" - --#ifdef __ANDROID__ -+#if defined(__ANDROID__) && !defined(__TERMUX__) - #include "../os/android/VideoRendererAndroid.h" - #elif defined(__APPLE__) && !defined(TARGET_OSX) - #include "../os/darwin/SampleBufferDisplayLayerRenderer.h" - #endif - - std::vector tgvoip::video::VideoRenderer::GetAvailableDecoders(){ --#ifdef __ANDROID__ -+#if defined(__ANDROID__) && !defined(__TERMUX__) - return VideoRendererAndroid::availableDecoders; - #elif defined(__APPLE__) && !defined(TARGET_OSX) - return SampleBufferDisplayLayerRenderer::GetAvailableDecoders(); -@@ -20,7 +20,7 @@ - } - - int tgvoip::video::VideoRenderer::GetMaximumResolution(){ --#ifdef __ANDROID__ -+#if defined(__ANDROID__) && !defined(__TERMUX__) - return VideoRendererAndroid::maxResolution; - #elif defined(__APPLE__) && !defined(TARGET_OSX) - return SampleBufferDisplayLayerRenderer::GetMaximumResolution(); -diff -uNr a/Telegram/ThirdParty/libtgvoip/video/VideoSource.cpp b/Telegram/ThirdParty/libtgvoip/video/VideoSource.cpp ---- a/Telegram/ThirdParty/libtgvoip/video/VideoSource.cpp -+++ b/Telegram/ThirdParty/libtgvoip/video/VideoSource.cpp -@@ -4,7 +4,7 @@ - - #include "VideoSource.h" - --#ifdef __ANDROID__ -+#if defined(__ANDROID__) && !defined(__TERMUX__) - #include "../os/android/VideoSourceAndroid.h" - #elif defined(__APPLE__) && !defined(TARGET_OSX) - #include "../os/darwin/VideoToolboxEncoderSource.h" -@@ -14,7 +14,7 @@ - using namespace tgvoip::video; - - std::shared_ptr VideoSource::Create(){ --#ifdef __ANDROID__ -+#if defined(__ANDROID__) && !defined(__TERMUX__) - //return std::make_shared(); - return nullptr; - #endif -@@ -35,7 +35,7 @@ - } - - std::vector VideoSource::GetAvailableEncoders(){ --#ifdef __ANDROID__ -+#if defined(__ANDROID__) && !defined(__TERMUX__) - return VideoSourceAndroid::availableEncoders; - #elif defined(__APPLE__) && !defined(TARGET_OSX) - return VideoToolboxEncoderSource::GetAvailableEncoders(); -diff -uNr a/Telegram/ThirdParty/libtgvoip/os/posix/NetworkSocketPosix.cpp b/Telegram/ThirdParty/libtgvoip/os/posix/NetworkSocketPosix.cpp ---- a/Telegram/ThirdParty/libtgvoip/os/posix/NetworkSocketPosix.cpp -+++ b/Telegram/ThirdParty/libtgvoip/os/posix/NetworkSocketPosix.cpp -@@ -18,7 +18,7 @@ - #include "../../VoIPController.h" - #include "../../Buffers.h" - --#ifdef __ANDROID__ -+#if defined(__ANDROID__) && !defined(__TERMUX__) - #include - #include - extern JavaVM* sharedJVM; -@@ -365,7 +365,7 @@ - std::string NetworkSocketPosix::GetLocalInterfaceInfo(IPv4Address *v4addr, IPv6Address *v6addr){ - std::string name=""; - // Android doesn't support ifaddrs --#ifdef __ANDROID__ -+#if defined(__ANDROID__) && !defined(__TERMUX__) - JNIEnv *env=NULL; - bool didAttach=false; - sharedJVM->GetEnv((void **) &env, JNI_VERSION_1_6); -diff -uNr a/Telegram/ThirdParty/libtgvoip/logging.h b/Telegram/ThirdParty/libtgvoip/logging.h ---- a/Telegram/ThirdParty/libtgvoip/logging.h -+++ b/Telegram/ThirdParty/libtgvoip/logging.h -@@ -18,7 +18,7 @@ - void tgvoip_log_file_printf(char level, const char* msg, ...); - void tgvoip_log_file_write_header(FILE* file); - --#if defined(__ANDROID__) -+#if defined(__ANDROID__) && !defined(__TERMUX__) - - #include - diff --git a/x11-packages/telegram-desktop/0007-libtg_owt-absl-20250814.patch b/x11-packages/telegram-desktop/0005-libtg_owt-absl-20250814.patch similarity index 100% rename from x11-packages/telegram-desktop/0007-libtg_owt-absl-20250814.patch rename to x11-packages/telegram-desktop/0005-libtg_owt-absl-20250814.patch diff --git a/x11-packages/telegram-desktop/0005-memfd-create.patch b/x11-packages/telegram-desktop/0005-memfd-create.patch deleted file mode 100644 index 1ecec6d378d9b8d..000000000000000 --- a/x11-packages/telegram-desktop/0005-memfd-create.patch +++ /dev/null @@ -1,19 +0,0 @@ ---- a/Telegram/lib_webview/webview/webview_data_stream_memory.cpp -+++ b/Telegram/lib_webview/webview/webview_data_stream_memory.cpp -@@ -7,9 +7,16 @@ - #include "webview/webview_data_stream_memory.h" - - #if !defined Q_OS_WIN && !defined Q_OS_MAC -+#include - #include - #endif // !Q_OS_WIN && !Q_OS_MAC - -+#if defined(__ANDROID__) && __ANDROID_API__ < 30 -+#include -+#include -+#define memfd_create(name,flags) syscall(SYS_memfd_create,name,flags) -+#endif -+ - namespace Webview { - - DataStreamFromMemory::DataStreamFromMemory( diff --git a/x11-packages/telegram-desktop/build.sh b/x11-packages/telegram-desktop/build.sh index 14ad96c4e74d2ff..2512bb02f5445ac 100644 --- a/x11-packages/telegram-desktop/build.sh +++ b/x11-packages/telegram-desktop/build.sh @@ -4,10 +4,9 @@ TERMUX_PKG_DESCRIPTION="Telegram Desktop Client" TERMUX_PKG_LICENSE="custom" TERMUX_PKG_LICENSE_FILE="LICENSE, LEGAL" TERMUX_PKG_MAINTAINER="@termux" -TERMUX_PKG_VERSION=5.15.4 -TERMUX_PKG_REVISION=2 +TERMUX_PKG_VERSION=6.1.2 TERMUX_PKG_SRCURL=https://github.com/telegramdesktop/tdesktop/releases/download/v$TERMUX_PKG_VERSION/tdesktop-$TERMUX_PKG_VERSION-full.tar.gz -TERMUX_PKG_SHA256=3705dc2ecf51e9290a565b7a06dcdfc5ecbac13ec536afe582f3411653ad50d9 +TERMUX_PKG_SHA256=efb92b09d7531ca7e29f27adef472e5207fe2b66e18499fa74d1b693211cfcce TERMUX_PKG_DEPENDS="abseil-cpp, boost, ffmpeg, glib, hicolor-icon-theme, hunspell, kf6-kcoreaddons, libandroid-shmem, libc++, libdispatch, libdrm, libjxl, liblz4, libminizip, protobuf, librnnoise, libsigc++-3.0, libx11, libxcomposite, libxdamage, libxrandr, libxtst, openal-soft, opengl, openh264, openssl, pipewire, pulseaudio, qt6-qtbase, qt6-qtimageformats, qt6-qtsvg, xxhash, zlib" TERMUX_PKG_BUILD_DEPENDS="ada, aosp-libs, boost-headers, glib-cross, qt6-qtbase-cross-tools" TERMUX_PKG_VERSIONED_GIR=false @@ -25,8 +24,6 @@ TERMUX_PKG_EXTRA_CONFIGURE_ARGS=" -DDESKTOP_APP_DISABLE_AUTOUPDATE=ON -DTDESKTOP_API_ID=611335 -DTDESKTOP_API_HASH=d524b414d21f4d37f08684c1df41ac9c --DLIBTGVOIP_DISABLE_ALSA=ON --DLIBTGVOIP_DISABLE_PULSEAUDIO=OFF " __tg_owt_fetch_source() { @@ -76,15 +73,6 @@ __libtd_fetch_source() { termux_step_post_get_source() { __tg_owt_fetch_source __libtd_fetch_source - - # Dummy some files to make sure that the usage of code path of Linux rather than Android - mv Telegram/ThirdParty/libtgvoip/os/android Telegram/ThirdParty/libtgvoip/os/android.unused - mkdir -p Telegram/ThirdParty/libtgvoip/os/android - local _file - for _file in Telegram/ThirdParty/libtgvoip/os/android.unused/*.h; do - local _name=$(basename $_file) - echo "#error \"DO NOT INCLUDE THIS FILE\"" > Telegram/ThirdParty/libtgvoip/os/android/"$_name" - done } __cppgir_build() { @@ -190,7 +178,9 @@ __libtd_build() { fi # Prepare cross-compiling for libtd - __libtd_host_build + if [ "$TERMUX_ON_DEVICE_BUILD" = false ]; then + __libtd_host_build + fi # Backup vars local __old_srcdir="$TERMUX_PKG_SRCDIR" @@ -208,6 +198,10 @@ __libtd_build() { -DTDE2E_INSTALL_INCLUDES=ON " + if [ "$TERMUX_ON_DEVICE_BUILD" = true ]; then + TERMUX_PKG_EXTRA_CONFIGURE_ARGS+=" -DCMAKE_CROSSCOMPILING=FALSE" + fi + # Configure mkdir -p "$TERMUX_PKG_BUILDDIR" cd "$TERMUX_PKG_BUILDDIR" diff --git a/x11-packages/telegram-desktop/gir/Webview-1.0.xml b/x11-packages/telegram-desktop/gir/Webview-1.0.xml index ab2db6dec1fd40e..51a23989f4b0fb6 100644 --- a/x11-packages/telegram-desktop/gir/Webview-1.0.xml +++ b/x11-packages/telegram-desktop/gir/Webview-1.0.xml @@ -30,12 +30,9 @@ - - - + + - - @@ -57,7 +54,6 @@ - @@ -87,17 +83,6 @@ - - - - - - - - - - -