Compare commits

...

2 Commits

  1. 18
      net-im/telegram-desktop/Makefile
  2. 17
      net-im/telegram-desktop/files/patch-Telegram_lib__base_base_platform_linux_base__system__media__controls__linux.cpp
  3. 13
      net-im/telegram-desktop/files/patch-cmake_external_glib_cppgir_CMakeLists.txt
  4. 13
      net-im/telegram-desktop/files/patch-cmake_external_glib_cppgir_tools_cppgir.cpp
  5. 8
      net-im/telegram-desktop/files/patch-cmake_external_glib_cppgir_tools_function.hpp
  6. 8
      net-im/telegram-desktop/files/patch-cmake_external_glib_cppgir_tools_genbase.cpp
  7. 13
      net-im/telegram-desktop/files/patch-cmake_external_glib_cppgir_tools_genns.cpp

18
net-im/telegram-desktop/Makefile

@ -39,7 +39,6 @@ LIB_DEPENDS= libabsl_base.so:devel/abseil \
libprotobuf.so:devel/protobuf \
libqrcodegencpp.so:graphics/qr-code-generator \
librnnoise.so:audio/rnnoise \
libxcb-keysyms.so:x11/xcb-util-keysyms \
libxkbcommon.so:x11/libxkbcommon \
libxxhash.so:devel/xxhash \
libvpx.so:multimedia/libvpx
@ -52,7 +51,7 @@ qt5_CONFLICTS_INSTALL= ${PORTNAME}-qt6
qt6_CONFLICTS_INSTALL= ${PORTNAME}
USES= cmake desktop-file-utils gl gnome jpeg localbase \
minizip openal pkgconfig python:build ssl xorg
minizip openal pkgconfig python:build ssl
USE_GITHUB= nodefault
GH_ACCOUNT= telegramdesktop
@ -70,7 +69,7 @@ USE_QT= 5compat base imageformats lottie shadertools svg tools:build
USE_GL= gl
USE_GNOME= glib20 glibmm26 introspection
USE_XORG= x11 xcb xcomposite xdamage xext xfixes xrandr xrender xtst
#USE_XORG= x11 xcb xcomposite xdamage xext xfixes xrandr xrender xtst
CMAKE_ARGS= -DTDESKTOP_API_ID=${TELEGRAM_API_ID} -DTDESKTOP_API_HASH=${TELEGRAM_API_HASH}
CMAKE_ON= DESKTOP_APP_USE_PACKAGED DESKTOP_APP_DISABLE_CRASH_REPORTS
@ -84,12 +83,15 @@ LDFLAGS+= -lBlocksRuntime
# Telegram uses OpenAL for its audio, but libtgvoip (for voice calls) can use PulseAudio or ALSA.
# It dynamically loads PulseAudio, and if this fails, it loads ALSA.
# If both of them are not installed, then voice calls do not work, but other functionalities still work.
OPTIONS_DEFINE= SYSTEM_FONTS WAYLAND
OPTIONS_DEFAULT= ALSA
OPTIONS_DEFINE= SYSTEM_FONTS
OPTIONS_DEFAULT= ALSA X11
OPTIONS_GROUP= AUDIO
OPTIONS_GROUP_AUDIO= ALSA PULSEAUDIO
OPTIONS_SINGLE= DESKTOP
OPTIONS_SINGLE_DESKTOP= X11 WAYLAND
AUDIO_DESC= Audio backend for voice calls
DESKTOP_DESC= Desktop integration
SYSTEM_FONTS_DESC= Use system fonts instead of bundled patched ones
ALSA_LIB_DEPENDS= libasound.so:audio/alsa-lib
@ -97,8 +99,12 @@ PULSEAUDIO_LIB_DEPENDS= libpulse.so:audio/pulseaudio
ALSA_CMAKE_BOOL_OFF= LIBTGVOIP_DISABLE_ALSA
PULSEAUDIO_CMAKE_BOOL_OFF= LIBTGVOIP_DISABLE_PULSEAUDIO
SYSTEM_FONTS_CMAKE_BOOL_OFF= DESKTOP_APP_USE_PACKAGED_FONTS
WAYLAND_CMAKE_BOOL_OFF= DESKTOP_APP_DISABLE_WAYLAND_INTEGRATION
WAYLAND_CMAKE_BOOL_OFF= DESKTOP_APP_DISABLE_WAYLAND_INTEGRATION
WAYLAND_USE= qt=wayland
X11_CMAKE_BOOL_OFF= DESKTOP_APP_DISABLE_X11_INTEGRATION
X11_USES= xorg
X11_USE= xorg=x11,xcb,xcomposite,xdamage,xext,xfixes,xrandr,xrender,xtst
X11_LIB_DEPENDS= libxcb-keysyms.so:x11/xcb-util-keysyms \
# Telegram asks each custom build to have its own API ID and hash.
TELEGRAM_API_HASH= 20a3432aab43f24bb4460fceac5ba38d

17
net-im/telegram-desktop/files/patch-Telegram_lib__base_base_platform_linux_base__system__media__controls__linux.cpp

@ -1,17 +0,0 @@
--- Telegram/lib_base/base/platform/linux/base_system_media_controls_linux.cpp.orig 2023-06-03 03:29:41 UTC
+++ Telegram/lib_base/base/platform/linux/base_system_media_controls_linux.cpp
@@ -16,11 +16,12 @@
#include <QtGui/QImage>
#include <ksandbox.h>
-using namespace gi::repository;
-
namespace base::Platform {
namespace {
+
+using namespace gi::repository;
+namespace GObject = gi::repository::GObject;
// QString to GLib::Variant.
inline auto Q2V(const QString &s) {

13
net-im/telegram-desktop/files/patch-cmake_external_glib_cppgir_CMakeLists.txt

@ -1,13 +0,0 @@
--- cmake/external/glib/cppgir/CMakeLists.txt.orig 2023-05-17 06:10:31 UTC
+++ cmake/external/glib/cppgir/CMakeLists.txt
@@ -65,8 +65,8 @@ target_compile_definitions(cppgir PRIVATE
-DDEFAULT_GIRPATH=${GI_DEFAULT_GIRPATH})
target_compile_definitions(cppgir PRIVATE
-DDEFAULT_IGNORE_FILE=${GI_IGNORE_FILE_INSTALL_DIR}/${GI_IGNORE_FILE}:${GI_IGNORE_FILE_INSTALL_DIR}/${GI_IGNORE_FILE_PLATFORM})
-target_link_libraries(cppgir Boost::program_options stdc++fs ${FORMAT_LIBRARIES})
-set_property(TARGET cppgir PROPERTY CXX_STANDARD 14)
+target_link_libraries(cppgir Boost::program_options ${FORMAT_LIBRARIES})
+set_property(TARGET cppgir PROPERTY CXX_STANDARD 17)
add_library(gi INTERFACE)
target_include_directories(gi INTERFACE

13
net-im/telegram-desktop/files/patch-cmake_external_glib_cppgir_tools_cppgir.cpp

@ -1,13 +0,0 @@
--- cmake/external/glib/cppgir/tools/cppgir.cpp.orig 2023-06-15 00:49:41 UTC
+++ cmake/external/glib/cppgir/tools/cppgir.cpp
@@ -3,8 +3,8 @@
#include "genns.hpp"
#include "repository.hpp"
-#include <experimental/filesystem>
-namespace fs = std::experimental::filesystem;
+#include <filesystem>
+namespace fs = std::filesystem;
#include <boost/algorithm/string/classification.hpp>
#include <boost/algorithm/string/split.hpp>

8
net-im/telegram-desktop/files/patch-cmake_external_glib_cppgir_tools_function.hpp

@ -1,8 +0,0 @@
--- cmake/external/glib/cppgir/tools/function.hpp.orig 2023-06-15 00:41:50 UTC
+++ cmake/external/glib/cppgir/tools/function.hpp
@@ -1,3 +1,5 @@
+#include <map>
+
#ifndef FUNCTION_HPP
#define FUNCTION_HPP

8
net-im/telegram-desktop/files/patch-cmake_external_glib_cppgir_tools_genbase.cpp

@ -1,8 +0,0 @@
--- cmake/external/glib/cppgir/tools/genbase.cpp.orig 2023-06-15 00:42:39 UTC
+++ cmake/external/glib/cppgir/tools/genbase.cpp
@@ -1,3 +1,5 @@
+#include <map>
+
#include "genbase.hpp"
static std::string

13
net-im/telegram-desktop/files/patch-cmake_external_glib_cppgir_tools_genns.cpp

@ -1,13 +0,0 @@
--- cmake/external/glib/cppgir/tools/genns.cpp.orig 2023-06-15 00:40:47 UTC
+++ cmake/external/glib/cppgir/tools/genns.cpp
@@ -5,8 +5,8 @@
#include <boost/algorithm/string/join.hpp>
#include <boost/format.hpp>
-#include <experimental/filesystem>
-namespace fs = std::experimental::filesystem;
+#include <filesystem>
+namespace fs = std::filesystem;
#include <boost/property_tree/xml_parser.hpp>
Loading…
Cancel
Save