summaryrefslogtreecommitdiff
path: root/net-im
diff options
context:
space:
mode:
Diffstat (limited to 'net-im')
-rw-r--r--net-im/Manifest.gzbin9723 -> 9733 bytes
-rw-r--r--net-im/skypeforlinux/Manifest2
-rw-r--r--net-im/skypeforlinux/skypeforlinux-8.98.0.402.ebuild100
-rw-r--r--net-im/telegram-desktop/Manifest8
-rw-r--r--net-im/telegram-desktop/files/tdesktop-4.2.4-jemalloc-only-telegram.patch43
-rw-r--r--net-im/telegram-desktop/files/tdesktop-4.8.3-fix-clang.patch52
-rw-r--r--net-im/telegram-desktop/files/tdesktop-4.8.3-system-cppgir.patch50
-rw-r--r--net-im/telegram-desktop/telegram-desktop-4.6.5.ebuild206
-rw-r--r--net-im/telegram-desktop/telegram-desktop-4.8.3.ebuild (renamed from net-im/telegram-desktop/telegram-desktop-4.6.5-r2.ebuild)26
9 files changed, 223 insertions, 264 deletions
diff --git a/net-im/Manifest.gz b/net-im/Manifest.gz
index 9b7f9e7bce43..a3085e241dd5 100644
--- a/net-im/Manifest.gz
+++ b/net-im/Manifest.gz
Binary files differ
diff --git a/net-im/skypeforlinux/Manifest b/net-im/skypeforlinux/Manifest
index bbca17d4c5e2..a9a370ebee6d 100644
--- a/net-im/skypeforlinux/Manifest
+++ b/net-im/skypeforlinux/Manifest
@@ -2,8 +2,10 @@ DIST skypeforlinux_8.96.0.408_amd64.deb 124565400 BLAKE2B 56f8e20c3f192322267afb
DIST skypeforlinux_8.97.0.204_amd64.deb 124991858 BLAKE2B 0b56817a9c181546348a9b34ef746be1040574709a127a8d421bbc698ac9f1e34aa1594dfc292c0c23459719aaedee6ba30bbac0d3f8aeef13b3894448c4f87a SHA512 4dbf16491d6a63d9c20c24a8d80671e968ca1fe7d7fa5cee700c3b411341b9432ee69fa723a231f4e992a5cacac69ad7700da06068a9e4a648c8d7e7b3924b8d
DIST skypeforlinux_8.97.0.404_amd64.deb 125585620 BLAKE2B 89cd0f30db4f644be52e0c3438ca1942573784b224c4d807a8084b501fde6eeff3105514a573a2a4604ef29d128751e2048ad0d3e54b45a2df4a9545ba37aa27 SHA512 a99f28522cd8f35ad4fedccc464545a64f3f4df3f488509596e31e53ee164e4f77c4973744b65c94e8a9441bbc01cf703e4f76c3d53a5b7da4eb0810a6901e04
DIST skypeforlinux_8.98.0.206_amd64.deb 125269498 BLAKE2B a72e55587dff2e1fad81dabb54f788318d59e430963a5d1eae915014324d9c4f667585f42cb066e42ffa8d0e61363b1095c3133ab38745c78f3d4fa1451c6f5a SHA512 0d21528d6d0040bcfa28c397fe76165c9591cb233d77fa3f88a28494a7027c11023c3e46697f2edcbe8941650b1a521e554bcc16fd96297e2664ff8b7acdf3d2
+DIST skypeforlinux_8.98.0.402_amd64.deb 126997184 BLAKE2B 9c86ea96dfd3ff63fb229a15537a08983ec99379e802665ec655678edba6cb6f4e50b98e382dd6c56d29ad2da6ac25b18ad119f215368290b4baa09dcc13f0ed SHA512 399ee6f25d8e1ff94e8f9ec5f3c57d4ff5eaffd2fdbb8b122a48e0dafce94db26243aed546fc4600513242143ce9d58c6cfef1bd240739f71b83661f041c6ff5
EBUILD skypeforlinux-8.96.0.408.ebuild 3213 BLAKE2B 4fc27cac27364a037d25a1baee0b60caef291968df48356766c463a729df7a68e3b1dd1ded650092fec2b4d898de4d78e2775ccd1fddb86644e3cd4610beaf3f SHA512 72ffd827f647e3e6749a24e8f8dbf6831afbd10353c2590d88f9ad8a03ba413d31024dfd2212a381709a8a8848ef1ae7e47219c1eb858c590891a1dce7e4ea11
EBUILD skypeforlinux-8.97.0.204.ebuild 3213 BLAKE2B 4fc27cac27364a037d25a1baee0b60caef291968df48356766c463a729df7a68e3b1dd1ded650092fec2b4d898de4d78e2775ccd1fddb86644e3cd4610beaf3f SHA512 72ffd827f647e3e6749a24e8f8dbf6831afbd10353c2590d88f9ad8a03ba413d31024dfd2212a381709a8a8848ef1ae7e47219c1eb858c590891a1dce7e4ea11
EBUILD skypeforlinux-8.97.0.404.ebuild 3213 BLAKE2B 4fc27cac27364a037d25a1baee0b60caef291968df48356766c463a729df7a68e3b1dd1ded650092fec2b4d898de4d78e2775ccd1fddb86644e3cd4610beaf3f SHA512 72ffd827f647e3e6749a24e8f8dbf6831afbd10353c2590d88f9ad8a03ba413d31024dfd2212a381709a8a8848ef1ae7e47219c1eb858c590891a1dce7e4ea11
EBUILD skypeforlinux-8.98.0.206.ebuild 3213 BLAKE2B 4fc27cac27364a037d25a1baee0b60caef291968df48356766c463a729df7a68e3b1dd1ded650092fec2b4d898de4d78e2775ccd1fddb86644e3cd4610beaf3f SHA512 72ffd827f647e3e6749a24e8f8dbf6831afbd10353c2590d88f9ad8a03ba413d31024dfd2212a381709a8a8848ef1ae7e47219c1eb858c590891a1dce7e4ea11
+EBUILD skypeforlinux-8.98.0.402.ebuild 3213 BLAKE2B 4fc27cac27364a037d25a1baee0b60caef291968df48356766c463a729df7a68e3b1dd1ded650092fec2b4d898de4d78e2775ccd1fddb86644e3cd4610beaf3f SHA512 72ffd827f647e3e6749a24e8f8dbf6831afbd10353c2590d88f9ad8a03ba413d31024dfd2212a381709a8a8848ef1ae7e47219c1eb858c590891a1dce7e4ea11
MISC metadata.xml 461 BLAKE2B 9bcbfe1d6892c40ce917a76c600baad338b5b86967e5656f79b9bf29e75c3ba474dc11444d8e347769f37934610a971097f96b22ae171ea46cd3f1aef2e9f3e5 SHA512 81df3ef175eafabad357f3d5792c71534b85ffd2c1bd9280ea7ef9cbea17aceb396bc7ac65abdb09e5fba8c3d98384c0d67c58a8daa2d42a657e1a7b150b52e7
diff --git a/net-im/skypeforlinux/skypeforlinux-8.98.0.402.ebuild b/net-im/skypeforlinux/skypeforlinux-8.98.0.402.ebuild
new file mode 100644
index 000000000000..aa8b927e61ba
--- /dev/null
+++ b/net-im/skypeforlinux/skypeforlinux-8.98.0.402.ebuild
@@ -0,0 +1,100 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+MULTILIB_COMPAT=( abi_x86_64 )
+
+inherit chromium-2 desktop pax-utils unpacker multilib-build xdg
+
+DESCRIPTION="Instant messaging client, with support for audio and video"
+HOMEPAGE="https://www.skype.com/"
+SRC_URI="https://repo.skype.com/deb/pool/main/s/skypeforlinux/${PN}_${PV}_amd64.deb"
+S="${WORKDIR}"
+
+LICENSE="Skype-TOS MIT MIT-with-advertising BSD-1 BSD-2 BSD Apache-2.0 Boost-1.0 ISC CC-BY-SA-3.0 CC0-1.0 openssl ZLIB APSL-2 icu Artistic-2 LGPL-2.1"
+SLOT="0"
+KEYWORDS="-* ~amd64"
+
+QA_PREBUILT="*"
+RESTRICT="mirror bindist strip" #299368
+
+RDEPEND="
+ app-crypt/libsecret[${MULTILIB_USEDEP}]
+ app-accessibility/at-spi2-core:2[${MULTILIB_USEDEP}]
+ dev-libs/expat[${MULTILIB_USEDEP}]
+ dev-libs/glib:2[${MULTILIB_USEDEP}]
+ dev-libs/nspr[${MULTILIB_USEDEP}]
+ dev-libs/nss[${MULTILIB_USEDEP}]
+ media-libs/alsa-lib[${MULTILIB_USEDEP}]
+ media-libs/fontconfig:1.0[${MULTILIB_USEDEP}]
+ media-libs/freetype:2[${MULTILIB_USEDEP}]
+ media-libs/libv4l[${MULTILIB_USEDEP}]
+ net-print/cups[${MULTILIB_USEDEP}]
+ sys-apps/dbus[${MULTILIB_USEDEP}]
+ sys-devel/gcc[cxx]
+ sys-libs/glibc
+ virtual/ttf-fonts
+ x11-libs/cairo[${MULTILIB_USEDEP}]
+ x11-libs/gdk-pixbuf:2[${MULTILIB_USEDEP}]
+ x11-libs/gtk+:3[${MULTILIB_USEDEP}]
+ x11-libs/libX11[${MULTILIB_USEDEP}]
+ x11-libs/libXScrnSaver[${MULTILIB_USEDEP}]
+ x11-libs/libXcomposite[${MULTILIB_USEDEP}]
+ x11-libs/libXcursor[${MULTILIB_USEDEP}]
+ x11-libs/libXdamage[${MULTILIB_USEDEP}]
+ x11-libs/libXext[${MULTILIB_USEDEP}]
+ x11-libs/libXfixes[${MULTILIB_USEDEP}]
+ x11-libs/libXi[${MULTILIB_USEDEP}]
+ x11-libs/libXrandr[${MULTILIB_USEDEP}]
+ x11-libs/libXrender[${MULTILIB_USEDEP}]
+ x11-libs/libXtst[${MULTILIB_USEDEP}]
+ x11-libs/libxcb[${MULTILIB_USEDEP}]
+ x11-libs/libxkbcommon[${MULTILIB_USEDEP}]
+ x11-libs/libxkbfile[${MULTILIB_USEDEP}]
+ x11-libs/pango[${MULTILIB_USEDEP}]"
+
+pkg_setup() {
+ chromium_suid_sandbox_check_kernel_config
+}
+
+src_unpack() {
+ unpack_deb ${A}
+}
+
+src_prepare() {
+ default
+ sed -e "s!^SKYPE_PATH=.*!SKYPE_PATH=${EPREFIX}/opt/skypeforlinux/skypeforlinux!" \
+ -i usr/bin/skypeforlinux || die
+ sed -e "s!^Categories=.*!Categories=Network;InstantMessaging;Telephony;!" \
+ -e "/^OnlyShowIn=/d" \
+ -i usr/share/applications/skypeforlinux.desktop || die
+}
+
+src_install() {
+ dodir /opt
+ cp -a usr/share/skypeforlinux "${ED}"/opt || die
+
+ # remove chrome-sandbox binary, users should use kernel namespaces
+ # https://bugs.gentoo.org/692692#c18
+ rm "${ED}"/opt/skypeforlinux/chrome-sandbox || die
+
+ dobin usr/bin/skypeforlinux
+
+ dodoc usr/share/skypeforlinux/*.html
+ dodoc -r usr/share/doc/skypeforlinux/.
+ # symlink required for the "Help->3rd Party Notes" menu entry (otherwise frozen skype -> xdg-open)
+ dosym ${PF} usr/share/doc/skypeforlinux
+
+ doicon usr/share/pixmaps/skypeforlinux.png
+
+ local res
+ for res in 16 32 256 512; do
+ newicon -s ${res} usr/share/icons/hicolor/${res}x${res}/apps/skypeforlinux.png skypeforlinux.png
+ done
+
+ domenu usr/share/applications/skypeforlinux.desktop
+
+ pax-mark -m "${ED}"/opt/skypeforlinux/skypeforlinux
+ pax-mark -m "${ED}"/opt/skypeforlinux/resources/app.asar.unpacked/node_modules/slimcore/bin/slimcore.node
+}
diff --git a/net-im/telegram-desktop/Manifest b/net-im/telegram-desktop/Manifest
index ff5b51968c92..66b557e083f8 100644
--- a/net-im/telegram-desktop/Manifest
+++ b/net-im/telegram-desktop/Manifest
@@ -1,9 +1,9 @@
AUX tdesktop-4.2.4-jemalloc-only-telegram-r1.patch 1307 BLAKE2B b27f65973a6fa8c83469e0c6419a600ca04ebbf35f6c4a406129867eee644082c4f0164fb71afbc6ae729bb4037d0cf6c68ea1ad78f6268bfe245b83e4290400 SHA512 d2c33dd18e354ebe6cb7143b58e9f61dc4cd664bb1e7ad9c60f562efbb05cc72d5b36270af96b866583b366b59cc34cadee3a62dcbd40433276b80b2511e1fcb
-AUX tdesktop-4.2.4-jemalloc-only-telegram.patch 1309 BLAKE2B c6ed3e2cfcce9540e367fb90fcaacab81fa6dbb150be7207634facfef77361b830175e4e5e2781d884f101833fde022f496b7c39702d97990de4d16585b5c33d SHA512 83d8c3eaafc2947fbe3555d9acf5c78ad07e89009b89f05908dc5cd088652063766c297e4b726ee69423b15804faf79f52815405b09bba554538e664a99ce0e7
AUX tdesktop-4.4.1-fix-dupe-main-decl.patch 853 BLAKE2B 6a3ce346467a3b6450674a77157f3fa45d9e1991160ce33e9cc58292a8441310468943225d5d5b2ba5e5c23feaba544d52f19c964130a8e8c724a99392072abe SHA512 edaad94a901181f0bca4a64b4ab2277a247073005b351156df02532dfff470a4060e6b709197da0778b5484d39a4c1bc1f75e9df068872d68209dd47eca9ac54
-DIST tdesktop-4.6.5-full.tar.gz 63793549 BLAKE2B a425aaf8d1f1c633b3b8ddacff5bb7cc26e6063d4238413fea76db6a4608497d229061a614c79464373e7f1aa3bb854d9718083638e119538e989a202741b3d6 SHA512 4a337e375d7746cb1fa652f5851f8be5718b7b9d9676bba8ab040489b8492b2a665a51848adba28117a910789aa942c386318a01f6c99b4caa12a1eac682c780
+AUX tdesktop-4.8.3-fix-clang.patch 2217 BLAKE2B d487e97730032d81e063fd509aa2bea642d471c103da8754b56e9b5096861762f719ef891ae9ba7f7d275247904af616d614e6c5581d6b1b2ac53598ba8bf967 SHA512 e9d603ef61d819e2cbaacdd0e77439ee1580e7613b3867e468f0fc9d670558489915e4c12a30841685af6cead8d44bc6b23f6c839cfc04720e293322f794d4c7
+AUX tdesktop-4.8.3-system-cppgir.patch 1865 BLAKE2B 2f95ded0cca158eb8c6245d72338ef12914965bad04aacd53710293f0ab3f279e884f6e57ddbe689100291ba1a2b51ee2303c108f0e6005bc1292fa5f8a03253 SHA512 62c4233b703ad5016b4f95cc5d399bbad30738ac481d0aaedaf9b8415946d082f8d5acbc09fb6e0abe3c7326f3215d407fb47a5f8df29a982af08e7942012cac
DIST tdesktop-4.8.1-full.tar.gz 63997319 BLAKE2B daac461f0b3205bf647027329660b43f4646db987e27bfe2a2848bfbfb3309c503132d1533f26e95512520417d30f5063b1c395b174787aa7533727549ee77e5 SHA512 4dc495e4502bdba634c4468af4f1321aef1152d619c811f004489f8616504a465069508239eae41a08a83e190a61d26881733ebc38dd88160f81dce070bb0567
-EBUILD telegram-desktop-4.6.5-r2.ebuild 6477 BLAKE2B 811b7eb3e8d91ecfa505af28caf7d5350259f746e10ec90ae2f4aabadb223c51b01898a8265e99a95a9d02828c60b649b85523b12057e3d2935b6ca5719a4d2f SHA512 512bfe912a43c6a614039067e6cadb4a94d851fa9895d5c25cb162c81ee5e6b5752f2915bd62189edbd34f1ec8cd44cbfabc216d6b670eb712dc21c2f6e96fa5
-EBUILD telegram-desktop-4.6.5.ebuild 6473 BLAKE2B 1d7eb299b8d73fced8f786fc125b9de39855e04d016871a0cecf4f7c299d10c028e4a6f3a0de0fe7b104264c4eb06cede3f850b88a144e95d9ac183a46241a99 SHA512 86e54a6a8909d5123f3fef8d1e209d9e824fe7cbb345520a0f80c670fec6ea7be8d3456e23c69386af0e34fc563438cb446d1e96dff26f4402982340304caad8
+DIST tdesktop-4.8.3-full.tar.gz 64351425 BLAKE2B b2f18abee66364f9075dc9a924221092b511d092f755ebf44705efdc96b2cbfe71b77a1a375624fa48e072f2b3f9bd19795b456c5f03f236b164dba35febacf9 SHA512 11fdd39319d1fdae07094d0ab2cb919355015bee14567d88daf98f9e5332bfee7a938415800397e6f24224e97f6425fe0a1d7549d7de14b63f84ab7cb7741872
EBUILD telegram-desktop-4.8.1-r2.ebuild 6502 BLAKE2B 97677472923a77720a1be13ca921ed1e33bd57cf594988e6408e201555665d4ed1689bb4e074feacd1d48dc9e97e580d45651cd585dac86690efd756711b2167 SHA512 dbaed713e5a546538257c7f305d9a44e51b7045b01cdcf9fc53611ed05d82a3551c641a545ab2cdfdacfc2876b9f6055d9b0672d59e4c383295b37fbe047a073
+EBUILD telegram-desktop-4.8.3.ebuild 6512 BLAKE2B 636574c2b08bea0c461028ee6edae0391220ded4c6688957243dbbf663bf44cd952e5e010a354a6b9ed09b097adb6070932a67c7129836b7b846dd456a1b202d SHA512 abb20dab2a56549449fd67ef835bfe0a02de08a60a9b755dbd9c0e7060a2589e6eb93b30583ba8f60a2d3366e49a9a0540557f16bf122e425cfc3706900e3ed1
MISC metadata.xml 1055 BLAKE2B a8f873793835f741c0a5efef1c4ef7231b0d2b90b6237093625e351de26e230c6ce5a0eedfb36706bb266ae472370034bbb60a6ef90d05e0f7b4f847c9f0116a SHA512 72d90db2dd9e96ff0f6e6ea2d078242ae6cc6c8ec0afed4df8c84acf100706bbd7cb3bff4d5603a11718250c43ae8d22b18687f4c16676173ca84527f53a5c1d
diff --git a/net-im/telegram-desktop/files/tdesktop-4.2.4-jemalloc-only-telegram.patch b/net-im/telegram-desktop/files/tdesktop-4.2.4-jemalloc-only-telegram.patch
deleted file mode 100644
index a7710e145443..000000000000
--- a/net-im/telegram-desktop/files/tdesktop-4.2.4-jemalloc-only-telegram.patch
+++ /dev/null
@@ -1,43 +0,0 @@
-Only link jemalloc for the Telegram binary
-
-Some combination of factors is making the different codegen tools hang when
-jemalloc is linked for those, and they're ran under portage's sandbox. Since
-this is only used during build-time, and jemalloc is merely necessary to
-improve runtime memory use, it's unnecessary to use it for anything else.
-
-https://bugs.gentoo.org/802624
-
---- tdesktop-4.2.4-full.orig/Telegram/CMakeLists.txt
-+++ tdesktop-4.2.4-full/Telegram/CMakeLists.txt
-@@ -1478,6 +1478,14 @@
- desktop-app::external_wayland_client
- )
- endif()
-+
-+ if (NOT DESKTOP_APP_DISABLE_JEMALLOC)
-+ target_link_libraries(Telegram
-+ INTERFACE
-+ $<TARGET_OBJECTS:desktop-app::linux_jemalloc_helper>
-+ $<LINK_ONLY:desktop-app::external_jemalloc>
-+ )
-+ endif()
- endif()
-
- if (build_macstore)
---- tdesktop-4.2.4-full.orig/cmake/options_linux.cmake
-+++ tdesktop-4.2.4-full/cmake/options_linux.cmake
-@@ -78,14 +78,6 @@
- )
- endif()
-
--if (NOT DESKTOP_APP_DISABLE_JEMALLOC)
-- target_link_libraries(common_options
-- INTERFACE
-- $<TARGET_OBJECTS:desktop-app::linux_jemalloc_helper>
-- $<LINK_ONLY:desktop-app::external_jemalloc>
-- )
--endif()
--
- if (DESKTOP_APP_USE_ALLOCATION_TRACER)
- target_link_options(common_options
- INTERFACE
diff --git a/net-im/telegram-desktop/files/tdesktop-4.8.3-fix-clang.patch b/net-im/telegram-desktop/files/tdesktop-4.8.3-fix-clang.patch
new file mode 100644
index 000000000000..5135c3c5ef4b
--- /dev/null
+++ b/net-im/telegram-desktop/files/tdesktop-4.8.3-fix-clang.patch
@@ -0,0 +1,52 @@
+Fix build issues with clang
+
+/var/tmp/portage/net-im/telegram-desktop-4.8.3/work/tdesktop-4.8.3-full/Telegram/lib_base/base/platform/linux/base_system_media_controls_linux.cpp:198:4: error: reference to 'GObject' is ambiguous
+ GObject::Object,
+ ^
+/usr/include/glib-2.0/gobject/gobject.h:192:42: note: candidate found by name lookup is 'GObject'
+typedef struct _GObject GObject;
+ ^
+/var/tmp/portage/net-im/telegram-desktop-4.8.3/work/tdesktop-4.8.3-full_build/gen/gobject/_functions_impl.hpp:10:11: note: candidate found by name lookup is 'gi::repository::GObject'
+namespace GObject {
+ ^
+--- tdesktop-4.8.3-full.orig/Telegram/lib_base/base/platform/linux/base_system_media_controls_linux.cpp
++++ tdesktop-4.8.3-full/Telegram/lib_base/base/platform/linux/base_system_media_controls_linux.cpp
+@@ -195,7 +195,7 @@
+ player().set_loop_status("None");
+ player().set_rate(1.0);
+ const auto executeCommand = [=](
+- GObject::Object,
++ gi::repository::GObject::Object,
+ Gio::DBusMethodInvocation invocation) {
+ base::Integration::Instance().enterFromEventLoop([&] {
+ _commandRequests.fire_copy(
+@@ -232,23 +232,23 @@
+ return true;
+ });
+ player().property_loop_status().signal_notify().connect([=](
+- GObject::Object,
+- GObject::ParamSpec) {
++ gi::repository::GObject::Object,
++ gi::repository::GObject::ParamSpec) {
+ base::Integration::Instance().enterFromEventLoop([&] {
+ _commandRequests.fire_copy(
+ LoopStatusToCommand(player().get_loop_status()));
+ });
+ });
+ player().property_shuffle().signal_notify().connect([=](
+- GObject::Object,
+- GObject::ParamSpec) {
++ gi::repository::GObject::Object,
++ gi::repository::GObject::ParamSpec) {
+ base::Integration::Instance().enterFromEventLoop([&] {
+ _commandRequests.fire_copy(Command::Shuffle);
+ });
+ });
+ player().property_volume().signal_notify().connect([=](
+- GObject::Object,
+- GObject::ParamSpec) {
++ gi::repository::GObject::Object,
++ gi::repository::GObject::ParamSpec) {
+ base::Integration::Instance().enterFromEventLoop([&] {
+ _volumeChangeRequests.fire_copy(player().get_volume());
+ });
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
new file mode 100644
index 000000000000..54c79b3e5a0c
--- /dev/null
+++ b/net-im/telegram-desktop/files/tdesktop-4.8.3-system-cppgir.patch
@@ -0,0 +1,50 @@
+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.6.5.ebuild b/net-im/telegram-desktop/telegram-desktop-4.6.5.ebuild
deleted file mode 100644
index c0b3b25958a1..000000000000
--- a/net-im/telegram-desktop/telegram-desktop-4.6.5.ebuild
+++ /dev/null
@@ -1,206 +0,0 @@
-# Copyright 2020-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{9..11} )
-
-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 ~arm64 ~ppc64 ~riscv"
-IUSE="+dbus 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-libs/glib:2
- dev-libs/libdispatch
- dev-libs/libsigc++:2
- dev-libs/openssl:=
- 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_pre20230105:=[screencast=,X=]
- media-video/ffmpeg:=[opus,vpx]
- sys-libs/zlib:=[minizip]
- virtual/opengl
- dbus? ( dev-cpp/glibmm:2.68 )
- !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/qt5compat:6
- 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/range-v3
- >=dev-cpp/ms-gsl-4
-"
-BDEPEND="
- ${PYTHON_DEPS}
- >=dev-util/cmake-3.16
- virtual/pkgconfig
-"
-# dev-libs/jemalloc:=[-lazy-lock] -> https://bugs.gentoo.org/803233
-
-PATCHES=(
- "${FILESDIR}/tdesktop-4.2.4-jemalloc-only-telegram.patch"
- "${FILESDIR}/tdesktop-4.4.1-fix-dupe-main-decl.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_DBUS_INTEGRATION=$(usex !dbus)
- -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 '<dev-qt/qtcore-5.15.2-r10'; then
- ewarn "Versions of dev-qt/qtcore lower than 5.15.2-r10 might cause telegram"
- ewarn "to crash when pasting big images from the clipboard."
- ewarn
- fi
- if ! use jemalloc && use elibc_glibc; then
- # https://github.com/telegramdesktop/tdesktop/issues/16084
- # https://github.com/desktop-app/cmake_helpers/pull/91#issuecomment-881788003
- ewarn "Disabling USE=jemalloc on glibc systems may cause very high RAM usage!"
- ewarn "Do NOT report issues about RAM usage without enabling this flag first."
- ewarn
- fi
- if use qt6; then
- ewarn "Qt6 support in gentoo is experimental."
- ewarn "Please report any issues you may find, but don't expect"
- ewarn "everything to work correctly as of yet."
- ewarn
- fi
- if use wayland && ! use qt6; then
- ewarn "Wayland-specific integrations have been deprecated with Qt5."
- ewarn "The app will continue to function under wayland, but some"
- ewarn "functionality may be reduced."
- ewarn "These integrations are only supported when built with Qt6."
- ewarn
- fi
- if use qt6 && ! use qt6-imageformats; then
- elog "Enable USE=qt6-imageformats for AVIF, HEIF and JpegXL support"
- elog
- fi
- optfeature_header
- optfeature "shop payment support (requires USE=dbus enabled)" net-libs/webkit-gtk:4
- if ! use qt6; then
- optfeature "AVIF, HEIF and JpegXL image support" kde-frameworks/kimageformats[avif,heif,jpegxl]
- fi
-}
diff --git a/net-im/telegram-desktop/telegram-desktop-4.6.5-r2.ebuild b/net-im/telegram-desktop/telegram-desktop-4.8.3.ebuild
index a0dc810ebc7f..4060dde670a2 100644
--- a/net-im/telegram-desktop/telegram-desktop-4.6.5-r2.ebuild
+++ b/net-im/telegram-desktop/telegram-desktop-4.8.3.ebuild
@@ -3,7 +3,7 @@
EAPI=8
-PYTHON_COMPAT=( python3_{9..11} )
+PYTHON_COMPAT=( python3_{9..12} )
inherit xdg cmake python-any-r1 optfeature flag-o-matic
@@ -16,8 +16,8 @@ S="${WORKDIR}/${MY_P}"
LICENSE="BSD GPL-3-with-openssl-exception LGPL-2+"
SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv"
-IUSE="+dbus enchant +fonts +jemalloc screencast qt6 qt6-imageformats wayland +X"
+KEYWORDS="~amd64"
+IUSE="enchant +fonts +jemalloc screencast qt6 qt6-imageformats wayland +X"
REQUIRED_USE="
qt6-imageformats? ( qt6 )
"
@@ -31,10 +31,12 @@ 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:=
@@ -46,13 +48,12 @@ RDEPEND="
media-video/ffmpeg:=[opus,vpx]
sys-libs/zlib:=[minizip]
virtual/opengl
- dbus? ( dev-cpp/glibmm:2.68 )
!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/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
@@ -60,8 +61,7 @@ RDEPEND="
kde-frameworks/kcoreaddons:=
)
qt6? (
- dev-qt/qt5compat:6
- dev-qt/qtbase:6[dbus?,gui,network,opengl,widgets,X?]
+ dev-qt/qtbase:6[dbus,gui,network,opengl,widgets,X?]
dev-qt/qtimageformats:6
dev-qt/qtsvg:6
wayland? ( dev-qt/qtwayland:6 )
@@ -73,12 +73,15 @@ RDEPEND="
)
"
DEPEND="${RDEPEND}
- dev-cpp/range-v3
+ 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
@@ -86,6 +89,8 @@ BDEPEND="
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
@@ -106,7 +111,7 @@ src_prepare() {
if use qt6-imageformats; then
sed -e 's/DESKTOP_APP_USE_PACKAGED_LAZY/TRUE/' -i \
cmake/external/kimageformats/CMakeLists.txt || die
- printf "%s\n" \
+ printf '%s\n' \
'Q_IMPORT_PLUGIN(QAVIFPlugin)' \
'Q_IMPORT_PLUGIN(HEIFPlugin)' \
'Q_IMPORT_PLUGIN(QJpegXLPlugin)' \
@@ -129,7 +134,6 @@ src_configure() {
-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_DBUS_INTEGRATION=$(usex !dbus)
-DDESKTOP_APP_DISABLE_X11_INTEGRATION=$(usex !X)
-DDESKTOP_APP_DISABLE_WAYLAND_INTEGRATION=$(usex !wayland)
-DDESKTOP_APP_DISABLE_JEMALLOC=$(usex !jemalloc)
@@ -199,7 +203,7 @@ pkg_postinst() {
elog
fi
optfeature_header
- optfeature "shop payment support (requires USE=dbus enabled)" net-libs/webkit-gtk:4
+ optfeature "shop payment support" net-libs/webkit-gtk:4
if ! use qt6; then
optfeature "AVIF, HEIF and JpegXL image support" kde-frameworks/kimageformats[avif,heif,jpegxl]
fi
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-10 02:36:38 +0000