From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id E6AFA15801B for ; Sat, 15 Jul 2023 16:25:30 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id DFB61E0887; Sat, 15 Jul 2023 16:25:29 +0000 (UTC) Received: from smtp.gentoo.org (mail.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id C7F45E0887 for ; Sat, 15 Jul 2023 16:25:29 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id C8655335D4F for ; Sat, 15 Jul 2023 16:25:28 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 08C0AA6A for ; Sat, 15 Jul 2023 16:25:27 +0000 (UTC) From: "Sam James" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Sam James" Message-ID: <1689438296.4283d28a7c19e4139e4de82bc0220a46d0ea1a55.sam@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: net-im/telegram-desktop/, net-im/telegram-desktop/files/ X-VCS-Repository: repo/gentoo X-VCS-Files: net-im/telegram-desktop/Manifest net-im/telegram-desktop/files/tdesktop-4.8.3-system-cppgir.patch net-im/telegram-desktop/telegram-desktop-4.8.3.ebuild X-VCS-Directories: net-im/telegram-desktop/files/ net-im/telegram-desktop/ X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: 4283d28a7c19e4139e4de82bc0220a46d0ea1a55 X-VCS-Branch: master Date: Sat, 15 Jul 2023 16:25:27 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: e8572464-5f05-47e2-88cb-a9538b421eb7 X-Archives-Hash: 90b1364f20d70496611e9a3b552dd644 commit: 4283d28a7c19e4139e4de82bc0220a46d0ea1a55 Author: Esteve Varela Colominas gmail com> AuthorDate: Thu Jun 29 13:22:57 2023 +0000 Commit: Sam James gentoo org> CommitDate: Sat Jul 15 16:24:56 2023 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4283d28a net-im/telegram-desktop: Drop old Closes: https://bugs.gentoo.org/909038 Thanks-to: orion_cygnus protonmail.com Signed-off-by: Esteve Varela Colominas gmail.com> Signed-off-by: Sam James gentoo.org> net-im/telegram-desktop/Manifest | 1 - .../files/tdesktop-4.8.3-system-cppgir.patch | 50 ----- .../telegram-desktop/telegram-desktop-4.8.3.ebuild | 210 --------------------- 3 files changed, 261 deletions(-) diff --git a/net-im/telegram-desktop/Manifest b/net-im/telegram-desktop/Manifest index 6b9248e40432..03864bb57aea 100644 --- a/net-im/telegram-desktop/Manifest +++ b/net-im/telegram-desktop/Manifest @@ -1,3 +1,2 @@ DIST tdesktop-4.8.1-full.tar.gz 63997319 BLAKE2B daac461f0b3205bf647027329660b43f4646db987e27bfe2a2848bfbfb3309c503132d1533f26e95512520417d30f5063b1c395b174787aa7533727549ee77e5 SHA512 4dc495e4502bdba634c4468af4f1321aef1152d619c811f004489f8616504a465069508239eae41a08a83e190a61d26881733ebc38dd88160f81dce070bb0567 -DIST tdesktop-4.8.3-full.tar.gz 64351425 BLAKE2B b2f18abee66364f9075dc9a924221092b511d092f755ebf44705efdc96b2cbfe71b77a1a375624fa48e072f2b3f9bd19795b456c5f03f236b164dba35febacf9 SHA512 11fdd39319d1fdae07094d0ab2cb919355015bee14567d88daf98f9e5332bfee7a938415800397e6f24224e97f6425fe0a1d7549d7de14b63f84ab7cb7741872 DIST tdesktop-4.8.4-full.tar.gz 69090626 BLAKE2B e2c6072b7b90911068ed57ed651176fb4d772f14710d2a4012bda47dae50be7f3050242c3a6950035f3f33a4041257cadac54e639691735f6acfda98c8db8b7b SHA512 7988d047cb72888e303f9902f04bd2168f67fb18a4451e5122ce80b0aef726173f0ee10f83b8bb713a46e02c9ec4150ad6128e4288be432ed3d590011f80e4dd diff --git a/net-im/telegram-desktop/files/tdesktop-4.8.3-system-cppgir.patch b/net-im/telegram-desktop/files/tdesktop-4.8.3-system-cppgir.patch deleted file mode 100644 index 54c79b3e5a0c..000000000000 --- a/net-im/telegram-desktop/files/tdesktop-4.8.3-system-cppgir.patch +++ /dev/null @@ -1,50 +0,0 @@ -Use system cppgir - ---- tdesktop-4.8.3-full.orig/cmake/external/glib/CMakeLists.txt -+++ tdesktop-4.8.3-full/cmake/external/glib/CMakeLists.txt -@@ -7,14 +7,6 @@ - add_library(external_glib INTERFACE IMPORTED GLOBAL) - add_library(desktop-app::external_glib ALIAS external_glib) - --function(add_cppgir) # isolate scope -- set(BUILD_TESTING OFF) -- set(BUILD_DOC OFF) -- set(CMAKE_DISABLE_FIND_PACKAGE_Qt5Core ON) -- add_subdirectory(cppgir) --endfunction() --add_cppgir() -- - include(generate_cppgir.cmake) - generate_cppgir(external_glib Gio-2.0) - ---- tdesktop-4.8.3-full.orig/cmake/external/glib/generate_cppgir.cmake -+++ tdesktop-4.8.3-full/cmake/external/glib/generate_cppgir.cmake -@@ -4,6 +4,8 @@ - # For license and copyright information please follow this link: - # https://github.com/desktop-app/legal/blob/master/LEGAL - -+find_package(CppGir REQUIRED) -+ - function(generate_cppgir target_name gir) - # cppgir generates all the dependent headers everytime, better to have a global folder - set(gen_dst ${CMAKE_BINARY_DIR}/gen) -@@ -32,17 +34,16 @@ - echo 1> ${gen_timestamp} - COMMENT "Generating C++ wrapper for ${gir} (${target_name})" - DEPENDS -- cppgir - ${gir_path} - ) - generate_target(${target_name} cppgir ${gen_timestamp} "" ${gen_dst}) - - get_target_property(target_type ${target_name} TYPE) - if (${target_type} STREQUAL "INTERFACE_LIBRARY") -- target_link_libraries(${target_name} INTERFACE gi) -+ target_link_libraries(${target_name} INTERFACE CppGir::gi) - target_compile_definitions(${target_name} INTERFACE GI_INLINE GI_OBJECT_NEWV) - else() -- target_link_libraries(${target_name} PUBLIC gi) -+ target_link_libraries(${target_name} PUBLIC CppGir::gi) - target_compile_definitions(${target_name} PUBLIC GI_INLINE GI_OBJECT_NEWV) - endif() - endfunction() diff --git a/net-im/telegram-desktop/telegram-desktop-4.8.3.ebuild b/net-im/telegram-desktop/telegram-desktop-4.8.3.ebuild deleted file mode 100644 index cbc4a581fa36..000000000000 --- a/net-im/telegram-desktop/telegram-desktop-4.8.3.ebuild +++ /dev/null @@ -1,210 +0,0 @@ -# Copyright 2020-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -PYTHON_COMPAT=( python3_{9..12} ) - -inherit xdg cmake python-any-r1 optfeature flag-o-matic - -DESCRIPTION="Official desktop client for Telegram" -HOMEPAGE="https://desktop.telegram.org" - -MY_P="tdesktop-${PV}-full" -SRC_URI="https://github.com/telegramdesktop/tdesktop/releases/download/v${PV}/${MY_P}.tar.gz" -S="${WORKDIR}/${MY_P}" - -LICENSE="BSD GPL-3-with-openssl-exception LGPL-2+" -SLOT="0" -KEYWORDS="~amd64 ~riscv" -IUSE="enchant +fonts +jemalloc screencast qt6 qt6-imageformats wayland +X" -REQUIRED_USE=" - qt6-imageformats? ( qt6 ) -" - -KIMAGEFORMATS_RDEPEND=" - media-libs/libavif:= - media-libs/libheif:= - media-libs/libjxl -" -RDEPEND=" - !net-im/telegram-desktop-bin - app-arch/lz4:= - dev-cpp/abseil-cpp:= - >=dev-cpp/glibmm-2.76:2.68 - dev-libs/glib:2 - dev-libs/libdispatch - dev-libs/libsigc++:2 - dev-libs/openssl:= - dev-libs/protobuf - dev-libs/xxhash - media-libs/fontconfig:= - media-libs/libjpeg-turbo:= - ~media-libs/libtgvoip-2.4.4_p20221208 - media-libs/openal - media-libs/opus:= - media-libs/rnnoise - ~media-libs/tg_owt-0_pre20230428:=[screencast=,X=] - media-video/ffmpeg:=[opus,vpx] - sys-libs/zlib:=[minizip] - virtual/opengl - !enchant? ( >=app-text/hunspell-1.7:= ) - enchant? ( app-text/enchant:= ) - jemalloc? ( dev-libs/jemalloc:=[-lazy-lock] ) - !qt6? ( - >=dev-qt/qtcore-5.15:5 - >=dev-qt/qtgui-5.15:5[dbus,jpeg,png,wayland?,X?] - >=dev-qt/qtimageformats-5.15:5 - >=dev-qt/qtnetwork-5.15:5[ssl] - >=dev-qt/qtsvg-5.15:5 - >=dev-qt/qtwidgets-5.15:5[png,X?] - kde-frameworks/kcoreaddons:= - ) - qt6? ( - dev-qt/qtbase:6[dbus,gui,network,opengl,widgets,X?] - dev-qt/qtimageformats:6 - dev-qt/qtsvg:6 - wayland? ( dev-qt/qtwayland:6 ) - qt6-imageformats? ( ${KIMAGEFORMATS_RDEPEND} ) - ) - X? ( - x11-libs/libxcb:= - x11-libs/xcb-util-keysyms - ) -" -DEPEND="${RDEPEND} - dev-cpp/cppgir - >=dev-cpp/ms-gsl-4 - dev-cpp/range-v3 -" -BDEPEND=" - ${PYTHON_DEPS} - dev-cpp/cppgir - >=dev-util/cmake-3.16 - dev-util/gdbus-codegen - virtual/pkgconfig -" -# dev-libs/jemalloc:=[-lazy-lock] -> https://bugs.gentoo.org/803233 - -PATCHES=( - "${FILESDIR}/tdesktop-4.2.4-jemalloc-only-telegram-r1.patch" - "${FILESDIR}/tdesktop-4.4.1-fix-dupe-main-decl.patch" - "${FILESDIR}/tdesktop-4.8.3-system-cppgir.patch" - "${FILESDIR}/tdesktop-4.8.3-fix-clang.patch" -) - -# Current desktop-file-utils-0.26 does not understand Version=1.5 -QA_DESKTOP_FILE="usr/share/applications/${PN}.desktop" - -pkg_pretend() { - if has ccache ${FEATURES}; then - ewarn "ccache does not work with ${PN} out of the box" - ewarn "due to usage of precompiled headers" - ewarn "check bug https://bugs.gentoo.org/715114 for more info" - ewarn - fi -} - -src_prepare() { - # Bundle kde-frameworks/kimageformats for qt6, since it's impossible to - # build in gentoo right now. - if use qt6-imageformats; then - sed -e 's/DESKTOP_APP_USE_PACKAGED_LAZY/TRUE/' -i \ - cmake/external/kimageformats/CMakeLists.txt || die - printf '%s\n' \ - 'Q_IMPORT_PLUGIN(QAVIFPlugin)' \ - 'Q_IMPORT_PLUGIN(HEIFPlugin)' \ - 'Q_IMPORT_PLUGIN(QJpegXLPlugin)' \ - >> cmake/external/qt/qt_static_plugins/qt_static_plugins.cpp || die - fi - - # kde-frameworks/kcoreaddons is bundled when using qt6, see: - # cmake/external/kcoreaddons/CMakeLists.txt - - cmake_src_prepare -} - -src_configure() { - # The ABI of media-libs/tg_owt breaks if the -DNDEBUG flag doesn't keep - # the same state across both projects. - # See https://bugs.gentoo.org/866055 - append-cppflags '-DNDEBUG' - - local mycmakeargs=( - -DCMAKE_DISABLE_FIND_PACKAGE_tl-expected=ON # header only lib, some git version. prevents warnings. - -DQT_VERSION_MAJOR=$(usex qt6 6 5) - - -DDESKTOP_APP_DISABLE_X11_INTEGRATION=$(usex !X) - -DDESKTOP_APP_DISABLE_WAYLAND_INTEGRATION=$(usex !wayland) - -DDESKTOP_APP_DISABLE_JEMALLOC=$(usex !jemalloc) - -DDESKTOP_APP_USE_ENCHANT=$(usex enchant) # enables enchant and disables hunspell - -DDESKTOP_APP_USE_PACKAGED_FONTS=$(usex !fonts) # use system fonts instead of bundled ones - ) - - if [[ -n ${MY_TDESKTOP_API_ID} && -n ${MY_TDESKTOP_API_HASH} ]]; then - einfo "Found custom API credentials" - mycmakeargs+=( - -DTDESKTOP_API_ID="${MY_TDESKTOP_API_ID}" - -DTDESKTOP_API_HASH="${MY_TDESKTOP_API_HASH}" - ) - else - # https://github.com/telegramdesktop/tdesktop/blob/dev/snap/snapcraft.yaml - # Building with snapcraft API credentials by default - # Custom API credentials can be obtained here: - # https://github.com/telegramdesktop/tdesktop/blob/dev/docs/api_credentials.md - # After getting credentials you can export variables: - # export MY_TDESKTOP_API_ID="17349"" - # export MY_TDESKTOP_API_HASH="344583e45741c457fe1862106095a5eb" - # and restart the build" - # you can set above variables (without export) in /etc/portage/env/net-im/telegram-desktop - # portage will use custom variable every build automatically - mycmakeargs+=( - -DTDESKTOP_API_ID="611335" - -DTDESKTOP_API_HASH="d524b414d21f4d37f08684c1df41ac9c" - ) - fi - - cmake_src_configure -} - -pkg_postinst() { - xdg_pkg_postinst - if ! use X && ! use screencast; then - ewarn "both the 'X' and 'screencast' USE flags are disabled, screen sharing won't work!" - ewarn - fi - if has_version '