From a978c074e4272bb901fbe4a10de0a7b2af574f17 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Tue, 4 May 2021 22:28:33 +0100 Subject: gentoo resync : 04.05.2021 --- net-im/Manifest.gz | Bin 10066 -> 10072 bytes net-im/bitlbee/Manifest | 4 +- net-im/bitlbee/bitlbee-3.6-r1.ebuild | 5 +- net-im/bitlbee/bitlbee-9999.ebuild | 5 +- net-im/coturn/Manifest | 4 +- net-im/coturn/coturn-4.5.2.ebuild | 14 +- net-im/coturn/coturn-9999.ebuild | 2 +- net-im/pidgin/Manifest | 6 +- net-im/pidgin/pidgin-2.14.2.ebuild | 295 --------------------- net-im/pidgin/pidgin-2.14.3-r1.ebuild | 2 +- net-im/pidgin/pidgin-2.14.4.ebuild | 289 ++++++++++++++++++++ net-im/prosody/Manifest | 2 +- net-im/prosody/prosody-0.11.8.ebuild | 5 +- net-im/telegram-desktop/Manifest | 6 +- .../tdesktop-2.7.3-disable-webkit-separately.patch | 80 ++++++ .../tdesktop-2.7.3-webview-include-gdkx.patch | 12 + .../telegram-desktop-2.7.1-r2.ebuild | 2 +- .../telegram-desktop/telegram-desktop-2.7.4.ebuild | 138 ++++++++++ 18 files changed, 548 insertions(+), 323 deletions(-) delete mode 100644 net-im/pidgin/pidgin-2.14.2.ebuild create mode 100644 net-im/pidgin/pidgin-2.14.4.ebuild create mode 100644 net-im/telegram-desktop/files/tdesktop-2.7.3-disable-webkit-separately.patch create mode 100644 net-im/telegram-desktop/files/tdesktop-2.7.3-webview-include-gdkx.patch create mode 100644 net-im/telegram-desktop/telegram-desktop-2.7.4.ebuild (limited to 'net-im') diff --git a/net-im/Manifest.gz b/net-im/Manifest.gz index 26fd2d3e0fa5..4a2d1cff5fd7 100644 Binary files a/net-im/Manifest.gz and b/net-im/Manifest.gz differ diff --git a/net-im/bitlbee/Manifest b/net-im/bitlbee/Manifest index 87086629e7b2..19f7db29bd47 100644 --- a/net-im/bitlbee/Manifest +++ b/net-im/bitlbee/Manifest @@ -5,6 +5,6 @@ AUX bitlbee-3.6-disabled-plugins-use.patch 1695 BLAKE2B 5c5ab3f330921a471da5fcc3 AUX bitlbee.confd-r2 303 BLAKE2B 01ac57be4d6d50be227d6528425909a98231d3e5e2d7718ee71195890123145169a4be1568514b41b9509b992e747c4169022d31fb33c62e00a00f757307d8d8 SHA512 4ba7b8a81d5b77bd8ccd94431b065d4850c97bb153ca715f5f4ea6a1f9a6c90ab2c99fb9d6342311ae948bd34904a9cc2b3696f1b8f09e2475b79d254f744ae4 AUX bitlbee.initd-r2 244 BLAKE2B 1f4900c9bcad2469ad97e4a4c34e58124e4e3634bbcb8d3c6d30b16ab343995870cfa27a33cfaff04df59fc52f888368d173966a2d5306b2adae98c72c28a305 SHA512 c965f8bbd2b3d13a6c66455a3cc503a94ea0c8000a0e41e283ce1828ee59105d162552979343e8ebb6513fd15bf44a4274b0558928ae0e89b424773cdb8b7b97 DIST bitlbee-3.6.tar.gz 534961 BLAKE2B 007681a384fcb2c0736b901dfdc213ba0829ca006ad3204aca1bc4520a3874760867df6165a9218a9deeabb13bc06f118c9e2f804a97e671a348734f6cb7e963 SHA512 ccbf0f23e228de2de147241f36f59744b2256cba958e2fabfba0cfa60935e55bbb7d7e20fffa54da9a345e55ffa9ca82cb62e9b99dc738ba35c6e268c6561a8d -EBUILD bitlbee-3.6-r1.ebuild 3402 BLAKE2B 06b1190172f199cad20186d00398277590023e23e9845a4b3c5a0f50237cb38932dabb04c24a761a2888ac459c362e6ec5aebec60bedcff25540cd05dd51bec6 SHA512 500bc7cd6535c0df95d2e744134362777cb274f048b5c93acf92b4e29077d8f8ce81fbdaa6c4775d5d9249b279f03c4c5a58ba8e4b93a9c92301720ef7d6b979 -EBUILD bitlbee-9999.ebuild 3278 BLAKE2B fe852f341161c46bb6e09f8160866928cc494cbb6cf0ddacd8544a8ec65cd4932c4a30bacd14b2b2be5106c4a5f587015515bda870b95e312c54b55b82e243d9 SHA512 3bd79912676d08ee353eecb7d8e84275da68910e9fb98c491a896d408099bb1267b955cf650281968d7443ab25e104d3ed4a210d56b009cabcc770db31bac7c3 +EBUILD bitlbee-3.6-r1.ebuild 3341 BLAKE2B e91afe4ad7be562ea05e9873a0727559da22a8f70caf33b7a3f8b1188713d42490df427d7dfe014a58cdc60d47313214721f4e2de03311cad1be7d377fb37c99 SHA512 2db04f8963adc260b2af110fa74b6b8b149d209b88cf1d249f67ea7da39b47a3d167139920525f4c2d535d4b8ce3924eebb3878c74811c14ff83373b64244be6 +EBUILD bitlbee-9999.ebuild 3217 BLAKE2B ad62dbddc0d6d83a76beea2ee75d94c3837bb3bc1f4a3bc7a176e672520d44b8960411ec7e13981549259273134e04d08e8eadfad033597dad59c190fe19d4ce SHA512 88c03d63ce6b8332b877c6de67a34f01eb33376bdbff33a554ba9667a68201a023e9a20e98fe42ce162e5338e44644bf12b94bd742e71dfd4c4ee4f42cbd7bd5 MISC metadata.xml 1168 BLAKE2B ad0a883cef4404c3a6ddec5951a009330b02396072691968834d3de0d2fdb1aa05ccaa3e819c2c9d3b89cbd0266782902f5fbc8c2fa97a49049b49d8e6f8913e SHA512 0093ff572bae101bcb8cf375f5b95609d0550f77150ec98cbc4a5d62f0006c6439647c528c45309351083b886d4bd95a556957c6ddaf4b2a0a34fa7f87cfa9ea diff --git a/net-im/bitlbee/bitlbee-3.6-r1.ebuild b/net-im/bitlbee/bitlbee-3.6-r1.ebuild index 0411dc061d1b..4a6f1db23842 100644 --- a/net-im/bitlbee/bitlbee-3.6-r1.ebuild +++ b/net-im/bitlbee/bitlbee-3.6-r1.ebuild @@ -21,7 +21,7 @@ HOMEPAGE="https://www.bitlbee.org/" LICENSE="GPL-2" SLOT="0" IUSE_PROTOCOLS="msn oscar purple twitter +xmpp" -IUSE="debug +gnutls ipv6 libevent libressl nss otr +plugins selinux test xinetd +IUSE="debug +gnutls ipv6 libevent nss otr +plugins selinux test xinetd ${IUSE_PROTOCOLS}" RESTRICT="!test? ( test )" @@ -43,8 +43,7 @@ COMMON_DEPEND=" !gnutls? ( nss? ( dev-libs/nss ) !nss? ( - libressl? ( dev-libs/libressl:= ) - !libressl? ( dev-libs/openssl:0= ) + dev-libs/openssl:0= ) ) " diff --git a/net-im/bitlbee/bitlbee-9999.ebuild b/net-im/bitlbee/bitlbee-9999.ebuild index b1eb2f2c62c0..e1f92087579b 100644 --- a/net-im/bitlbee/bitlbee-9999.ebuild +++ b/net-im/bitlbee/bitlbee-9999.ebuild @@ -21,7 +21,7 @@ HOMEPAGE="https://www.bitlbee.org/" LICENSE="GPL-2" SLOT="0" IUSE_PROTOCOLS="msn oscar purple twitter +xmpp" -IUSE="debug +gnutls ipv6 libevent libressl nss otr +plugins selinux test xinetd +IUSE="debug +gnutls ipv6 libevent nss otr +plugins selinux test xinetd ${IUSE_PROTOCOLS}" RESTRICT="!test? ( test )" @@ -43,8 +43,7 @@ COMMON_DEPEND=" !gnutls? ( nss? ( dev-libs/nss ) !nss? ( - libressl? ( dev-libs/libressl:= ) - !libressl? ( dev-libs/openssl:0= ) + dev-libs/openssl:0= ) ) " diff --git a/net-im/coturn/Manifest b/net-im/coturn/Manifest index aaaf3e71e0b8..0c0677c09be0 100644 --- a/net-im/coturn/Manifest +++ b/net-im/coturn/Manifest @@ -3,6 +3,6 @@ AUX coturn.service 470 BLAKE2B 21b1cc005b5b91a8cb80b05a45afc16d73ad88e5b0a851294 AUX logrotate.coturn 345 BLAKE2B 26edd2ad44d947bf943757fb3e3255cafea64fac5d495402bbc3a7088ed6ffd822cc8f07010669f9faf856eb8a893d9ba9ab48d4b417f8c3fd27772ffb71cae0 SHA512 ebfadc7e6435061b7120baffce76a65c224768ab85e59e3b8cd140e394fa6e4eaa258eccce76f3152fd6a1adab0c84e39feb51663c76359401e04df4d8db2c1d AUX turnserver.init 633 BLAKE2B 78da89afc2be30bac969bb2a393d454d32ba77e199f2ccb5e34557ce34cf3a242402210afe6e30400b4a47ef9dc7880cded44a1932f7769f21f4143261a3569e SHA512 3b86b2186499c96ec0cfd3a124ea058a622c21cc870e079414f6055f7ba85830a5b85c424c809c010144f9270fcada80ef20bcab4cbc9c7fe0949b24fef02b59 DIST coturn-4.5.2.tar.gz 442745 BLAKE2B c18d5f5cfedd600875c0bfa08b874ef6316a5aa9af34c27e2901825da412b794d437e08f0706f9651bdf6d3d19e151486af39a42f2326c7ab6bb802d33fd0ba4 SHA512 00e86a3a273a8e4e69deaefd338bdd6c44739a807f21a72a2d68efc089053e16efd1d5b34b0c6dea7a0fa2b66f70821d8c3e1107561e1f08dfac2c93933a6121 -EBUILD coturn-4.5.2.ebuild 2288 BLAKE2B 81bbaea6afc2a61ccf64f0bc8554ec3ccfff2c30178379d8a02a448adf65e447f3c28e4045774465a462d922026f69d26438548e4dd3de5a0e9bf45214db8d42 SHA512 ee11cd201f9fb4b1c6788b60cbad1a5f7ca24ba40e97d9adf3298750db6755ec964af8579723631568836443f8c55b37039a5286f7e62a7e0e3b75e0957644fa -EBUILD coturn-9999.ebuild 2288 BLAKE2B 81bbaea6afc2a61ccf64f0bc8554ec3ccfff2c30178379d8a02a448adf65e447f3c28e4045774465a462d922026f69d26438548e4dd3de5a0e9bf45214db8d42 SHA512 ee11cd201f9fb4b1c6788b60cbad1a5f7ca24ba40e97d9adf3298750db6755ec964af8579723631568836443f8c55b37039a5286f7e62a7e0e3b75e0957644fa +EBUILD coturn-4.5.2.ebuild 2194 BLAKE2B f2beeea9270851ec33b4a1c28151dea494998f1cd04da288796e8c86d0fa29b76ff72f810f5409c2f45c55592f6de7d152c70a22d756ab56677325294eac7bbd SHA512 3f27c40e27614d0272f681e11bc5882495dfe7bfefd96298bcead707d081310e3ffb22403ae1a49bc38b6d734621b7774ef502666a545858c2cf44daf24551b8 +EBUILD coturn-9999.ebuild 2201 BLAKE2B 11b741a774240b20e58d98e9ba8eb65b8ced1058cc526818946ad9b2b879ff6a00472c77605a3a80e36eb414f7ae58879ffb0fc7e7cbb54b8dbc5b0f399d2486 SHA512 1111bb530147683d5419a132cfdbe396d26252761b0086f11465bb8c9c81afe09ef468fb024f6d15d5fae2c6c0fa84a8df27bd109210d3e403b3e426b48d0ada MISC metadata.xml 497 BLAKE2B 522928095883e077064a9971e45e4e644461ce6d7a07720920a7bc96afc326b6ab337aa64704518a866f0df276f5bc284660e81561874631ff84c395035051dd SHA512 62689abd67427c6dd3de86c139b2cb94f7dc3ba8c8f9d3fced5b91b6de36cd30caa1a7805c0dc3aa64fa35e154e4509a607ef7eae62fe6894084383b2226b8bb diff --git a/net-im/coturn/coturn-4.5.2.ebuild b/net-im/coturn/coturn-4.5.2.ebuild index d8ac519acbc0..a183b67dbeae 100644 --- a/net-im/coturn/coturn-4.5.2.ebuild +++ b/net-im/coturn/coturn-4.5.2.ebuild @@ -20,13 +20,13 @@ LICENSE="BSD" SLOT="0" IUSE="mongodb mysql postgres redis sqlite" RDEPEND="acct-group/turnserver - acct-user/turnserver - || ( dev-libs/libevent[-ssl,libressl] dev-libs/libevent[ssl,-libressl] >dev-libs/libevent-2.1.8[ssl,libressl] ) - mongodb? ( dev-libs/mongo-c-driver ) - mysql? ( dev-db/mysql-connector-c ) - postgres? ( dev-db/postgresql:* ) - redis? ( dev-libs/hiredis ) - sqlite? ( dev-db/sqlite )" + acct-user/turnserver + >dev-libs/libevent-2.1.8 + mongodb? ( dev-libs/mongo-c-driver ) + mysql? ( dev-db/mysql-connector-c ) + postgres? ( dev-db/postgresql:* ) + redis? ( dev-libs/hiredis ) + sqlite? ( dev-db/sqlite )" DEPEND="${RDEPEND}" diff --git a/net-im/coturn/coturn-9999.ebuild b/net-im/coturn/coturn-9999.ebuild index d8ac519acbc0..4830d0550d0b 100644 --- a/net-im/coturn/coturn-9999.ebuild +++ b/net-im/coturn/coturn-9999.ebuild @@ -21,7 +21,7 @@ SLOT="0" IUSE="mongodb mysql postgres redis sqlite" RDEPEND="acct-group/turnserver acct-user/turnserver - || ( dev-libs/libevent[-ssl,libressl] dev-libs/libevent[ssl,-libressl] >dev-libs/libevent-2.1.8[ssl,libressl] ) + >dev-libs/libevent-2.1.8 mongodb? ( dev-libs/mongo-c-driver ) mysql? ( dev-db/mysql-connector-c ) postgres? ( dev-db/postgresql:* ) diff --git a/net-im/pidgin/Manifest b/net-im/pidgin/Manifest index 28bab1d55b2d..752f203ae589 100644 --- a/net-im/pidgin/Manifest +++ b/net-im/pidgin/Manifest @@ -7,10 +7,10 @@ AUX pidgin-2.14.0-gold.patch 284 BLAKE2B 3d658d69f4d226adf238cd6e624067741ea9d80 AUX pidgin-2.14.3-remove_oscar_tests.patch 396 BLAKE2B 139f898c82283b896a50edb8d2e6825513b8549dee63f51d0d90b4e71a55685a2e5886a4fe84cf361ef1fb5f607876469d0501c7711afacd9b722b3401e19bf8 SHA512 cf6fe751035d4756f13843141d0ead9ad25275702143c2b2b30f8e3160545c3c72e9bb0e67ea258a622f950b4c3431c28943b9d63cf185c73bed2cb559e93508 DIST pidgin-2.10.9-irc_join_sleep.patch 534 BLAKE2B 0215cebb93993e19e700e4d4974351ab5e9a00ea094775076d8f439569b34c0ec2faaed360965867df58bc42677516983ce11a2601dd322c1bdf2f288253a5b8 SHA512 8de0d6f05e48cd5a3e894576e06c7fb82e4bfc778cce8bb179fa22e2a05f5c2390a0e4c5b626ee4b910a18eab170d8f4be200f435ce408a86575af99e51e3bdf DIST pidgin-2.14.1.tar.bz2 8849275 BLAKE2B 27cd58a79f36c0176147c2e5bac7c4c18ec74c446c556e2326465c3607a95c3a58c1bdbbf9b4fb9741783ae982a6ce8fe0556ccff5b1608c9bba98626560412c SHA512 6ce5c58f32fa680d7f67e37a42b0f77c8253018cee21df2895d52166d9eb6ecaf0458b1610adbd46f337d00e75933db7578c2f9808654bd22838ba5db0a13030 -DIST pidgin-2.14.2.tar.bz2 8933924 BLAKE2B 8ca40cb9398f9f2e55b3dbb6aff12a55bfc27974c959476af8a7c779fa46df616e91474512b632658b280bf520eb43c9ddf62270b1553e17566b5c6a173bc88f SHA512 f1048644f39c37e210560f876412c0c63039c6045ba8e9477a00f05841078f6c9f6f97806e0c7824a8e60d2477dc835670920f5df58c5b434be76e6603e0005c DIST pidgin-2.14.3.tar.bz2 8688849 BLAKE2B 5d1f28ca5c452b13d2a6d6ab0c9101f14da3b5a291a838dab4b7cda99c76b3e411414b186ae493f08bd9764c65eab4b41eb9a45d340fe885f8bf9bf092911d43 SHA512 70f426900ce76afcdad76bcd06ebc320f562fe4089ec87c639d8d0d90823077f5e815932b62c3ff3da6270b3acfde3c8222d9b8c5cbb211421239c9dcc69b909 +DIST pidgin-2.14.4.tar.bz2 8724096 BLAKE2B 674b8cc306b5179c95a546f13e7ec7c2a13a22ff2ab502460435e2449e1a9fdb9e33baf2d8b81867a40251e3fe004dce5a0a371deab70587c694a10c6419f89d SHA512 78550b7c4678242861bc0b0a3c32ab03c9fd6e4f509a9b83f872f2e201fe69617c8407d4cc90205e74598f1b8fdddfeddc8f59b47179524a7af7a241eaf1fa0b DIST pidgin-eds-3.6.patch.bz2 2352 BLAKE2B 1d69dc55f43b9efe5d5278a017642702d67a297fe2587467ec0fdca7f9888e26640efe9ac2a18f77ae9c523bf125a2cec6d0bf621f0b2b16f55d30df1bf470df SHA512 a0195679ab55ed9c7ea18ace6dbf0fc994698f1f4eea9d8335dfdcdcd6a68975c0191bd22f150bf5a9a0a691ce7e9e73d79598e1e8be541efa1d9824a633d877 EBUILD pidgin-2.14.1.ebuild 7878 BLAKE2B 59062608078edceed4583384f9567c2fc6cd6da05ff9d70d99022fe8728c5ee7b083ca800a3f4d2ae0d572b3f637cbc1e3cadf91da16a213f1bcfca175d143e4 SHA512 edb48e42c5a84a00f29ce989fa3a130e8daf69156835fd857ef352a248edaab29ea11426d911ed917e28e0f21b20d81b16d616a9070998f7a5821eaebda19569 -EBUILD pidgin-2.14.2.ebuild 7856 BLAKE2B b3b1dbadf65170c4d6263450985d10ff402964a15c4116d970e82d0b892987ecc08fda22fe3f2b1ca860da6ade5df501f89653e0932c3e5145f63afc1d3c51ab SHA512 646f6e489dadc7da7df6173abd392f0015b3f8632f27841ecdb28d912f582e8e2c8d4a26615a4ad7610952129d29a1c42779937bd81bfe61f0974e0a115984a7 -EBUILD pidgin-2.14.3-r1.ebuild 7903 BLAKE2B eccbdb693a9b1c85d872c0e66b71bd66fdc657d5bcf9145ce0a156447375f9a56922a1f18947b87ea7213523ca34e34a68f13e25999d110b6e87b20a7d30cea7 SHA512 d499f7ff66a06397f24549a61f2a8963174d560bd461d534ecbb2dada570f6881f1bb98ed7e0a347a1b07a933600f62201bda1c4a3bad55981bb1f0528b233ae +EBUILD pidgin-2.14.3-r1.ebuild 7899 BLAKE2B 9ab1670f15b87d19c7301a8f3f3196fb0611401a51aff835bbf817ce1a40ad5ac404222f3553162ba6466d5bcb897d0fefd6c6d437607b0edf98b88d197d0006 SHA512 5851edaad3129cb9f3214af7444c982ba5deaafd3cb24fdb81a3cef857e35af06c8ceb97a004f08d5a14f93860136898cb1c6ef96f5cd6edfabb49fe805d4b81 +EBUILD pidgin-2.14.4.ebuild 7569 BLAKE2B 7d512481c9c9dc2e48e07d78c245cf604bdcaff4e597db838fecd1dcb077aae8f4eb21a9ccb449d9b57c0d4148b0dc90f3c39410972927ae83c16f6b903ba4e3 SHA512 0733a0adb26ac17a9b40f88b48e313a125532f64666d0f5ea7b98f3e20ea5630cc1272d075a8301b17b697c0e1f7a3222b44bc8fb76ee4e5bf288bc806250b97 MISC metadata.xml 1418 BLAKE2B b484d6c252dfa5f4c2bd4ef21b718cb449e3248506dab7f1f0e017e648323653e61a0f37bf2bb562f6a9b97b3fb0fcbaff897e3f030ad36e2e0813e27dfcbadc SHA512 13ff337bab4cf2924f9b652ad73d11a6d6ce268cc4aea4f9f2435acfefc85597b290de5785601ed8ad0e220047f3eff47c85150b7d81bf6e7e7b8ca9173161f7 diff --git a/net-im/pidgin/pidgin-2.14.2.ebuild b/net-im/pidgin/pidgin-2.14.2.ebuild deleted file mode 100644 index 4f3358fca714..000000000000 --- a/net-im/pidgin/pidgin-2.14.2.ebuild +++ /dev/null @@ -1,295 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -GENTOO_DEPEND_ON_PERL=no -PYTHON_COMPAT=( python3_{7..9} ) - -inherit autotools gnome2-utils flag-o-matic toolchain-funcs multilib perl-module python-single-r1 xdg - -DESCRIPTION="GTK Instant Messenger client" -HOMEPAGE="https://pidgin.im/" -SRC_URI=" - mirror://sourceforge/${PN}/${P}.tar.bz2 - https://dev.gentoo.org/~polynomial-c/${PN}-eds-3.6.patch.bz2 - https://gist.githubusercontent.com/imcleod/77f38d11af11b2413ada/raw/46e9d6cb4d2f839832dad2d697bb141a88028e04/pidgin-irc-join-sleep.patch -> ${PN}-2.10.9-irc_join_sleep.patch" - -LICENSE="GPL-2" -SLOT="0/2" # libpurple version -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux" -IUSE="aqua dbus debug doc eds gadu gnutls groupwise +gstreamer +gtk idn -meanwhile ncurses networkmanager nls perl pie prediction python sasl spell tcl -tk +xscreensaver zephyr zeroconf" - -# dbus requires python to generate C code for dbus bindings (thus DEPEND only). -# finch uses libgnt that links with libpython - {R,}DEPEND. But still there is -# no way to build dbus and avoid libgnt linkage with python. If you want this -# send patch upstream. -# purple-url-handler and purple-remote require dbus-python thus in reality we -# rdepend on python if dbus enabled. But it is possible to separate this dep. -RDEPEND=" - >=dev-libs/glib-2.16 - >=dev-libs/libxml2-2.6.18 - ncurses? ( - >=dev-libs/libgnt-$(ver_cut 1-2) - sys-libs/ncurses:0=[unicode] - dbus? ( ${PYTHON_DEPS} ) - python? ( ${PYTHON_DEPS} ) - ) - gtk? ( - >=x11-libs/gtk+-2.10:2[aqua=] - x11-libs/libSM - >=x11-libs/pango-1.4.0 - xscreensaver? ( x11-libs/libXScrnSaver ) - spell? ( >=app-text/gtkspell-2.0.2:2 ) - eds? ( >=gnome-extra/evolution-data-server-3.6:= ) - prediction? ( >=dev-db/sqlite-3.3:3 ) - ) - gstreamer? ( - media-libs/gstreamer:1.0 - media-libs/gst-plugins-base:1.0 - >=net-libs/farstream-0.2.7:0.2 - ) - zeroconf? ( net-dns/avahi[dbus] ) - dbus? ( - >=dev-libs/dbus-glib-0.71 - >=sys-apps/dbus-0.90 - $(python_gen_cond_dep ' - dev-python/dbus-python[${PYTHON_MULTI_USEDEP}] - ') - ) - perl? ( >=dev-lang/perl-5.16:= ) - gadu? ( >=net-libs/libgadu-1.11.0 ) - gnutls? ( net-libs/gnutls:= ) - !gnutls? ( - dev-libs/nspr - dev-libs/nss - ) - meanwhile? ( net-libs/meanwhile ) - tcl? ( dev-lang/tcl:0= ) - tk? ( dev-lang/tk:0= ) - sasl? ( dev-libs/cyrus-sasl:2 ) - networkmanager? ( net-misc/networkmanager ) - idn? ( net-dns/libidn:= ) -" - -# We want nls in case gtk is enabled, bug # -NLS_DEPEND=">=dev-util/intltool-0.41.1 sys-devel/gettext" - -DEPEND="${RDEPEND} - gtk? ( - x11-base/xorg-proto - ${NLS_DEPEND} - ) - dbus? ( ${PYTHON_DEPS} ) -" -BDEPEND=" - dev-lang/perl - dev-perl/XML-Parser - virtual/pkgconfig - doc? ( app-doc/doxygen ) - !gtk? ( nls? ( ${NLS_DEPEND} ) ) -" - -DOCS=( AUTHORS HACKING NEWS README ChangeLog ) - -REQUIRED_USE=" - dbus? ( ${PYTHON_REQUIRED_USE} ) - networkmanager? ( dbus ) - python? ( ${PYTHON_REQUIRED_USE} ) -" - -# Enable Default protocols -DYNAMIC_PRPLS="irc,jabber,oscar,simple" - -# List of plugins -# app-accessibility/pidgin-festival -# net-im/librvp -# x11-plugins/guifications -# x11-plugins/msn-pecan -# x11-plugins/pidgin-encryption -# x11-plugins/pidgin-extprefs -# x11-plugins/pidgin-hotkeys -# x11-plugins/pidgin-latex -# x11-plugins/pidgintex -# x11-plugins/pidgin-libnotify -# x11-plugins/pidgin-mbpurple -# x11-plugins/pidgin-bot-sentry -# x11-plugins/pidgin-otr -# x11-plugins/pidgin-rhythmbox -# x11-plugins/purple-plugin_pack -# x11-themes/pidgin-smileys -# x11-plugins/pidgin-knotify -# Plugins in Sunrise: -# x11-plugins/pidgin-audacious-remote -# x11-plugins/pidgin-autoanswer -# x11-plugins/pidgin-birthday-reminder -# x11-plugins/pidgin-blinklight -# x11-plugins/pidgin-convreverse -# x11-plugins/pidgin-embeddedvideo -# x11-plugins/pidgin-extended-blist-sort -# x11-plugins/pidgin-gfire -# x11-plugins/pidgin-lastfm -# x11-plugins/pidgin-sendscreenshot -# x11-plugins/pidgimpd - -PATCHES=( - "${FILESDIR}/${PN}-2.14.0-gold.patch" - "${WORKDIR}/${PN}-eds-3.6.patch" - "${FILESDIR}/${PN}-2.10.9-fix-gtkmedia.patch" - "${FILESDIR}/${PN}-2.10.10-eds-3.6-configure.ac.patch" - "${FILESDIR}/${PN}-2.10.11-tinfo.patch" - "${DISTDIR}/${PN}-2.10.9-irc_join_sleep.patch" # 577286 - "${FILESDIR}/${PN}-2.13.0-disable-one-jid-test.patch" # 593338 - "${FILESDIR}/${PN}-2.13.0-metainfo.patch" -) - -pkg_pretend() { - if ! use gtk && ! use ncurses ; then - elog "You did not pick the ncurses or gtk use flags, only libpurple" - elog "will be built." - fi - - # dbus is enabled, no way to disable linkage with python => python is enabled - #REQUIRED_USE="gtk? ( nls ) dbus? ( python )" - if use gtk && ! use nls ; then - ewarn "gtk build => nls is enabled!" - fi - if use dbus && ! use python ; then - elog "dbus is enabled, no way to disable linkage with python => python is enabled" - fi -} - -pkg_setup() { - if use python || use dbus ; then - python-single-r1_pkg_setup - fi -} - -src_prepare() { - default - eautoreconf -} - -src_configure() { - # Stabilize things, for your own good - strip-flags - replace-flags -O? -O2 - use pie && append-cflags -fPIE -pie - - use gadu && DYNAMIC_PRPLS+=",gg" - use groupwise && DYNAMIC_PRPLS+=",novell" - use meanwhile && DYNAMIC_PRPLS+=",sametime" - use zephyr && DYNAMIC_PRPLS+=",zephyr" - use zeroconf && DYNAMIC_PRPLS+=",bonjour" - - local myconf=( - --disable-mono - --disable-static - --with-dynamic-prpls="${DYNAMIC_PRPLS}" - --with-system-ssl-certs="${EPREFIX}/etc/ssl/certs/" - --x-includes="${EPREFIX}"/usr/include/X11 - $(use_enable ncurses consoleui) - $(use_enable gtk gtkui) - $(use_enable gtk sm) - $(usex gtk '--enable-nls' "$(use_enable nls)") - $(use gtk && use_enable xscreensaver screensaver) - $(use gtk && use_enable prediction cap) - $(use gtk && use_enable eds gevolution) - $(use gtk && use_enable spell gtkspell) - $(use_enable perl) - $(use_enable tk) - $(use_enable tcl) - $(use_enable debug) - $(use_enable dbus) - $(use_enable meanwhile) - $(use_enable gstreamer) - $(use_with gstreamer gstreamer 1.0) - $(use_enable gstreamer farstream) - $(use_enable gstreamer vv) - $(use_enable sasl cyrus-sasl ) - $(use_enable doc doxygen) - $(use_enable networkmanager nm) - $(use_enable zeroconf avahi) - $(use_enable idn) - ) - - if use gnutls; then - einfo "Disabling NSS, using GnuTLS" - myconf+=( - --enable-nss=no - --enable-gnutls=yes - --with-gnutls-includes="${EPREFIX}/usr/include/gnutls" - --with-gnutls-libs="${EPREFIX}/usr/$(get_libdir)" - ) - else - einfo "Disabling GnuTLS, using NSS" - myconf+=( - --enable-gnutls=no - --enable-nss=yes - ) - fi - - if use dbus || { use ncurses && use python ; } ; then - myconf+=( --with-python3=${PYTHON} ) - else - myconf+=( --without-python3 ) - fi - - econf "${myconf[@]}" -} - -src_install() { - # setting this here because gnome2.eclass is not EAPI-7 ready - export GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL="1" - default - - if use gtk ; then - # Fix tray paths for e16 (x11-wm/enlightenment) and other - # implementations that are not compliant with new hicolor theme yet, #323355 - local d f pixmapdir - for d in 16 22 32 48 ; do - pixmapdir="${ED}/usr/share/pixmaps/pidgin/tray/hicolor/${d}x${d}/actions" - mkdir "${pixmapdir}" || die - pushd "${pixmapdir}" >/dev/null || die - for f in ../status/*; do - ln -s ${f} || die - done - popd >/dev/null || die - done - fi - use perl && perl_delete_localpod - - if use python && use dbus ; then - python_fix_shebang "${ED}" - python_optimize - fi - - dodoc ${DOCS[@]} finch/plugins/pietray.py - docompress -x /usr/share/doc/${PF}/pietray.py - - find "${ED}" -type f -name "*.la" -delete || die -} - -src_test() { - # make default build logs slightly more useful - emake check VERBOSE=1 -} - -pkg_preinst() { - gnome2_gconf_savelist - xdg_pkg_preinst -} - -pkg_postinst() { - gnome2_gconf_install - gnome2_schemas_update - xdg_pkg_postinst -} - -pkg_postrm() { - gnome2_gconf_uninstall - gnome2_schemas_update - xdg_pkg_postrm -} diff --git a/net-im/pidgin/pidgin-2.14.3-r1.ebuild b/net-im/pidgin/pidgin-2.14.3-r1.ebuild index 30f6ab348b4f..bbc57e7ecaff 100644 --- a/net-im/pidgin/pidgin-2.14.3-r1.ebuild +++ b/net-im/pidgin/pidgin-2.14.3-r1.ebuild @@ -17,7 +17,7 @@ SRC_URI=" LICENSE="GPL-2" SLOT="0/2" # libpurple version -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux" +KEYWORDS="~alpha amd64 ~arm arm64 ~ia64 ~ppc ~ppc64 sparc x86 ~amd64-linux ~x86-linux" IUSE="aqua dbus debug doc eds gadu gnutls groupwise +gstreamer +gtk idn meanwhile ncurses networkmanager nls perl pie prediction python sasl spell tcl tk +xscreensaver zephyr zeroconf" diff --git a/net-im/pidgin/pidgin-2.14.4.ebuild b/net-im/pidgin/pidgin-2.14.4.ebuild new file mode 100644 index 000000000000..0dacd39bee84 --- /dev/null +++ b/net-im/pidgin/pidgin-2.14.4.ebuild @@ -0,0 +1,289 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +GENTOO_DEPEND_ON_PERL=no +PYTHON_COMPAT=( python3_{7..9} ) + +inherit autotools gnome2-utils flag-o-matic toolchain-funcs multilib perl-module python-single-r1 xdg + +DESCRIPTION="GTK Instant Messenger client" +HOMEPAGE="https://pidgin.im/" +SRC_URI=" + mirror://sourceforge/${PN}/${P}.tar.bz2 + https://gist.githubusercontent.com/imcleod/77f38d11af11b2413ada/raw/46e9d6cb4d2f839832dad2d697bb141a88028e04/pidgin-irc-join-sleep.patch -> ${PN}-2.10.9-irc_join_sleep.patch" + +LICENSE="GPL-2" +SLOT="0/2" # libpurple version +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux" +IUSE="aqua dbus debug doc eds gadu gnutls groupwise +gstreamer +gtk idn +meanwhile ncurses networkmanager nls perl pie prediction python sasl spell tcl +tk +xscreensaver zephyr zeroconf" + +# dbus requires python to generate C code for dbus bindings (thus DEPEND only). +# finch uses libgnt that links with libpython - {R,}DEPEND. But still there is +# no way to build dbus and avoid libgnt linkage with python. If you want this +# send patch upstream. +# purple-url-handler and purple-remote require dbus-python thus in reality we +# rdepend on python if dbus enabled. But it is possible to separate this dep. +RDEPEND=" + >=dev-libs/glib-2.16 + >=dev-libs/libxml2-2.6.18 + ncurses? ( + >=dev-libs/libgnt-$(ver_cut 1-2) + sys-libs/ncurses:0=[unicode] + dbus? ( ${PYTHON_DEPS} ) + python? ( ${PYTHON_DEPS} ) + ) + gtk? ( + >=x11-libs/gtk+-2.10:2[aqua=] + x11-libs/libSM + >=x11-libs/pango-1.4.0 + xscreensaver? ( x11-libs/libXScrnSaver ) + spell? ( >=app-text/gtkspell-2.0.2:2 ) + eds? ( >=gnome-extra/evolution-data-server-3.6:= ) + prediction? ( >=dev-db/sqlite-3.3:3 ) + ) + gstreamer? ( + media-libs/gstreamer:1.0 + media-libs/gst-plugins-base:1.0 + >=net-libs/farstream-0.2.7:0.2 + ) + zeroconf? ( net-dns/avahi[dbus] ) + dbus? ( + >=dev-libs/dbus-glib-0.71 + >=sys-apps/dbus-0.90 + $(python_gen_cond_dep ' + dev-python/dbus-python[${PYTHON_MULTI_USEDEP}] + ') + ) + perl? ( >=dev-lang/perl-5.16:= ) + gadu? ( >=net-libs/libgadu-1.11.0 ) + gnutls? ( net-libs/gnutls:= ) + !gnutls? ( + dev-libs/nspr + dev-libs/nss + ) + meanwhile? ( net-libs/meanwhile ) + tcl? ( dev-lang/tcl:0= ) + tk? ( dev-lang/tk:0= ) + sasl? ( dev-libs/cyrus-sasl:2 ) + networkmanager? ( net-misc/networkmanager ) + idn? ( net-dns/libidn:= ) +" + +# We want nls in case gtk is enabled, bug # +NLS_DEPEND=">=dev-util/intltool-0.41.1 sys-devel/gettext" + +DEPEND="${RDEPEND} + gtk? ( + x11-base/xorg-proto + ${NLS_DEPEND} + ) + dbus? ( ${PYTHON_DEPS} ) +" +BDEPEND=" + dev-lang/perl + dev-perl/XML-Parser + virtual/pkgconfig + doc? ( app-doc/doxygen ) + !gtk? ( nls? ( ${NLS_DEPEND} ) ) +" + +DOCS=( AUTHORS HACKING NEWS README ChangeLog ) + +REQUIRED_USE=" + dbus? ( ${PYTHON_REQUIRED_USE} ) + networkmanager? ( dbus ) + python? ( ${PYTHON_REQUIRED_USE} ) +" + +# Enable Default protocols +DYNAMIC_PRPLS="irc,jabber,simple" + +# List of plugins +# app-accessibility/pidgin-festival +# net-im/librvp +# x11-plugins/guifications +# x11-plugins/msn-pecan +# x11-plugins/pidgin-encryption +# x11-plugins/pidgin-extprefs +# x11-plugins/pidgin-hotkeys +# x11-plugins/pidgin-latex +# x11-plugins/pidgintex +# x11-plugins/pidgin-libnotify +# x11-plugins/pidgin-mbpurple +# x11-plugins/pidgin-bot-sentry +# x11-plugins/pidgin-otr +# x11-plugins/pidgin-rhythmbox +# x11-plugins/purple-plugin_pack +# x11-themes/pidgin-smileys +# x11-plugins/pidgin-knotify +# Plugins in Sunrise: +# x11-plugins/pidgin-audacious-remote +# x11-plugins/pidgin-autoanswer +# x11-plugins/pidgin-birthday-reminder +# x11-plugins/pidgin-blinklight +# x11-plugins/pidgin-convreverse +# x11-plugins/pidgin-embeddedvideo +# x11-plugins/pidgin-extended-blist-sort +# x11-plugins/pidgin-gfire +# x11-plugins/pidgin-lastfm +# x11-plugins/pidgin-sendscreenshot +# x11-plugins/pidgimpd + +PATCHES=( + "${FILESDIR}/${PN}-2.10.11-tinfo.patch" + "${DISTDIR}/${PN}-2.10.9-irc_join_sleep.patch" # 577286 + "${FILESDIR}/${PN}-2.13.0-disable-one-jid-test.patch" # 593338 +) + +pkg_pretend() { + if ! use gtk && ! use ncurses ; then + elog "You did not pick the ncurses or gtk use flags, only libpurple" + elog "will be built." + fi + + # dbus is enabled, no way to disable linkage with python => python is enabled + #REQUIRED_USE="gtk? ( nls ) dbus? ( python )" + if use gtk && ! use nls ; then + ewarn "gtk build => nls is enabled!" + fi + if use dbus && ! use python ; then + elog "dbus is enabled, no way to disable linkage with python => python is enabled" + fi +} + +pkg_setup() { + if use python || use dbus ; then + python-single-r1_pkg_setup + fi +} + +src_prepare() { + default + eautoreconf +} + +src_configure() { + # Stabilize things, for your own good + strip-flags + replace-flags -O? -O2 + use pie && append-cflags -fPIE -pie + + use gadu && DYNAMIC_PRPLS+=",gg" + use groupwise && DYNAMIC_PRPLS+=",novell" + use meanwhile && DYNAMIC_PRPLS+=",sametime" + use zephyr && DYNAMIC_PRPLS+=",zephyr" + use zeroconf && DYNAMIC_PRPLS+=",bonjour" + + local myconf=( + --disable-mono + --disable-static + --with-dynamic-prpls="${DYNAMIC_PRPLS}" + --with-system-ssl-certs="${EPREFIX}/etc/ssl/certs/" + --x-includes="${EPREFIX}"/usr/include/X11 + $(use_enable ncurses consoleui) + $(use_enable gtk gtkui) + $(use_enable gtk sm) + $(usex gtk '--enable-nls' "$(use_enable nls)") + $(use gtk && use_enable xscreensaver screensaver) + $(use gtk && use_enable prediction cap) + $(use gtk && use_enable eds gevolution) + $(use gtk && use_enable spell gtkspell) + $(use_enable perl) + $(use_enable tk) + $(use_enable tcl) + $(use_enable debug) + $(use_enable dbus) + $(use_enable meanwhile) + $(use_enable gstreamer) + $(use_with gstreamer gstreamer 1.0) + $(use_enable gstreamer farstream) + $(use_enable gstreamer vv) + $(use_enable sasl cyrus-sasl ) + $(use_enable doc doxygen) + $(use_enable networkmanager nm) + $(use_enable zeroconf avahi) + $(use_enable idn) + ) + + if use gnutls; then + einfo "Disabling NSS, using GnuTLS" + myconf+=( + --enable-nss=no + --enable-gnutls=yes + --with-gnutls-includes="${EPREFIX}/usr/include/gnutls" + --with-gnutls-libs="${EPREFIX}/usr/$(get_libdir)" + ) + else + einfo "Disabling GnuTLS, using NSS" + myconf+=( + --enable-gnutls=no + --enable-nss=yes + ) + fi + + if use dbus || { use ncurses && use python ; } ; then + myconf+=( --with-python3=${PYTHON} ) + else + myconf+=( --without-python3 ) + fi + + econf "${myconf[@]}" +} + +src_install() { + # setting this here because gnome2.eclass is not EAPI-7 ready + export GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL="1" + default + + if use gtk ; then + # Fix tray paths for e16 (x11-wm/enlightenment) and other + # implementations that are not compliant with new hicolor theme yet, #323355 + local d f pixmapdir + for d in 16 22 32 48 ; do + pixmapdir="${ED}/usr/share/pixmaps/pidgin/tray/hicolor/${d}x${d}/actions" + mkdir "${pixmapdir}" || die + pushd "${pixmapdir}" >/dev/null || die + for f in ../status/*; do + ln -s ${f} || die + done + popd >/dev/null || die + done + fi + use perl && perl_delete_localpod + + if use python || use dbus ; then + python_fix_shebang "${ED}" + python_optimize + fi + + dodoc ${DOCS[@]} finch/plugins/pietray.py + docompress -x /usr/share/doc/${PF}/pietray.py + + find "${ED}" -type f -name "*.la" -delete || die +} + +src_test() { + # make default build logs slightly more useful + emake check VERBOSE=1 +} + +pkg_preinst() { + gnome2_gconf_savelist + xdg_pkg_preinst +} + +pkg_postinst() { + gnome2_gconf_install + gnome2_schemas_update + xdg_pkg_postinst +} + +pkg_postrm() { + gnome2_gconf_uninstall + gnome2_schemas_update + xdg_pkg_postrm +} diff --git a/net-im/prosody/Manifest b/net-im/prosody/Manifest index f05fca24e450..836f47df74b2 100644 --- a/net-im/prosody/Manifest +++ b/net-im/prosody/Manifest @@ -3,5 +3,5 @@ AUX prosody.initd-r5 987 BLAKE2B 3e381f48cbc9c5361bdc6cb9ab4a13daf055cd35389036b AUX prosody.service-r2 228 BLAKE2B 61741cb7ecf64777b516a1fcb4e8e8c5c7b9c5d92dafbf7f691c36910f41d0b81d701bf8f287aea89fa368071c0c94a38f56ff3134055eb01842b578d8b57991 SHA512 0499588d1fd6e970575785b4bdaf631428601bec8a57051558c1d4c82bc74462f17d7568b8d433b14f15c51c94b181f4240d9f4574d51dcfeda291f0a68eb6f1 AUX prosody.tmpfilesd-r1 36 BLAKE2B dfb5025508cc62b4cd53de35b83f47bfee61821fbfe3301c1b67a4324ab753067cd3ecd84f56ae9a0241395a50d90ce2ec49c9333dc3378798a290e638a56cf9 SHA512 13a99fb925f7c3584dbfcbc98b3b929b67e165f70d700a25a861e512becd8a21ca48ee385da67ead23beeb68a43aaa10a2cfd342d1b3184883fede5d985cb599 DIST prosody-0.11.8.tar.gz 429762 BLAKE2B e7c945d0f99ed02cd54175f989241ee4731677600db39475365d3a4227afe2fa2b6f2075e3820fa9b7840d65014f43f786fa218a60765f7be319ddd7d30b67d4 SHA512 b0b7e1d3e41f47f0f88ad5b76444e4959b20f4c7a937f3cc605ba6ed5d92e713a3054dcb61ee6629063883a8f9ff1a03952893de4a0d840dcec4e5e42079eb57 -EBUILD prosody-0.11.8.ebuild 2914 BLAKE2B c1b8845b8644a5216d62e7466c584c48044ed1a67cd4e17f65e6bf2410ef5532cbfee66983a97a0cb8e22a7c9b4a4f0d2190d5f539d6a679e312ce56f555fb94 SHA512 01575c6eb92ff715f31b3a00e92d198ccd74349b1455905a2eb134eca68663d46254ba4c0a70501ff6c20e4d3b448a3f317961ac44510087ea4cc677c170b779 +EBUILD prosody-0.11.8.ebuild 2855 BLAKE2B 5ef0b0509a1785f01fd408585cbea1d9de23e65df65768eaa4f0e7e6aae65f321cc8e19c2a539283445b23034ba1a2238f14c7f51152d265c3d814668ac63ec2 SHA512 fdac2d0644f9e0f4f8544cca19ee3bedcecce696125d10af6709432f6001b0df02b24f57c6ad0367b2b89b67f03f6681e9a3d357f803c5c0a0db1956c1b7bba2 MISC metadata.xml 669 BLAKE2B e8f1d6b1df790563b92637351fe3f824f48c34b95234ad950b2376fcd010195d1d25d0023d468ab6ca98fc068df3e83db88513eb6c1a12a7b93426302516e71b SHA512 6336b469b3fee51cc6b2b7e23398430294ed7ce0b53525515d22dc1dd5f70b97a0388d654378d34fc809164aa5c9bdcd4a3d2078df75c2bac8a954f0fe549710 diff --git a/net-im/prosody/prosody-0.11.8.ebuild b/net-im/prosody/prosody-0.11.8.ebuild index 8c7e3ac8fd5a..a89c56614eb0 100644 --- a/net-im/prosody/prosody-0.11.8.ebuild +++ b/net-im/prosody/prosody-0.11.8.ebuild @@ -15,7 +15,7 @@ SRC_URI="https://prosody.im/downloads/source/${P}.tar.gz" LICENSE="MIT" SLOT="0" KEYWORDS="amd64 arm arm64 x86" -IUSE="icu +idn +libevent libressl mysql postgres selinux +sqlite +ssl test +zlib" +IUSE="icu +idn +libevent mysql postgres selinux +sqlite +ssl test +zlib" REQUIRED_USE=" ^^ ( icu idn ) ${LUA_REQUIRED_USE} @@ -30,8 +30,7 @@ DEPEND=" icu? ( dev-libs/icu:= ) idn? ( net-dns/libidn:= ) libevent? ( $(lua_gen_cond_dep 'dev-lua/luaevent[${LUA_USEDEP}]') ) - libressl? ( dev-libs/libressl:= ) - !libressl? ( dev-libs/openssl:0= ) + dev-libs/openssl:0= lua_single_target_lua5-1? ( $(lua_gen_cond_dep 'dev-lua/lua-bit32[lua_targets_lua5-1(-)]') ) mysql? ( $(lua_gen_cond_dep 'dev-lua/luadbi[mysql,${LUA_USEDEP}]') ) postgres? ( $(lua_gen_cond_dep 'dev-lua/luadbi[postgres,${LUA_USEDEP}]') ) diff --git a/net-im/telegram-desktop/Manifest b/net-im/telegram-desktop/Manifest index 385024ba75dc..44bd25f08afa 100644 --- a/net-im/telegram-desktop/Manifest +++ b/net-im/telegram-desktop/Manifest @@ -1,5 +1,9 @@ AUX fix-tgcalls-gcc10.patch 949 BLAKE2B 7a065fcbf5b8e7b49b6b866d199c67315484312ca527a517a09f890f09d39fa0c97787c586990ba92c0ce2ee83e7c2387eef100f630a74f003ddc06adb93c379 SHA512 dbc61a8520f3698fdeec6c9849cfd8241b8b778589f89277f82d6c748d8ed7a81db90daa0a69dedc3ab2b81bba848ee68e1df79a9cb3fb055f99bd7d19f46e5d AUX tdesktop-2.7.1-fix-disable-dbus-integration.patch 632 BLAKE2B 92aa9006febe4cb52e4273233f8592827e5d74afebc9d996c41cfc33588c0040b3b573a3730d0541ba8e0641e6733c491861c1bb60a5dc0f26f53b7941bf4572 SHA512 74557a9ac798f47d76cc9a0a514d3891c1a9f3c0667d5938be11d53d44704390dbf97d1e7be3c304cce2c9b8e3110ee04e6759ed28bf5f39d1cfee9f5c77f703 +AUX tdesktop-2.7.3-disable-webkit-separately.patch 3536 BLAKE2B 1bf255ba137c12a4d4a75321763327192f6cff81879843f042716daef0a9f9eb18b2a88e3048917adc5f36b9e4959be2a2c757f74a6aeeb9ca312ffcd7f55554 SHA512 aa62ae0319ad5ec86334e763e4c751f6508d7768a8916661fb217b91bf6a897802bc8f4820d058dc341bae69f6a0f0c34321e2a97e63bd0c715d36aa56532fef +AUX tdesktop-2.7.3-webview-include-gdkx.patch 570 BLAKE2B 4d92c1e14e9df4609ab332c057977a9485867b3a23fc96c46a97d092a5f7083fccb479f87681bfc66964e4be13b4883c0d86ee079e9fd67e932daa2140c9610b SHA512 446a59387f3a76270d9242a19648d86acc0e589833e3aaedff708da0a90d5b55ae0108f28d79da45b4c8dc68c5ac6f6af4ec50203b411c0fcf2eccf4f8c9c753 DIST tdesktop-2.7.1-full.tar.gz 36770178 BLAKE2B 21379cc970da07725e7a46d18a4f0bc459b1da1b730587595448b8f78133ce701e374e7faefc649a973342c203eee510872b5a4ed2ff6be92daec25157e400a4 SHA512 dffd184c4369c5c5947b1ca085add533e54313ce39aebcdca4f0958431a305aa5e95c2f2b48592f6992e666b2d33eeba5697f9e09f6048a53b807f2950fbd17b -EBUILD telegram-desktop-2.7.1-r2.ebuild 3964 BLAKE2B 17cc8bf8075b3cbe21f7c8bfd75b8bc5c20cf1598f7c511457c42886ffc154d2478a58b9dcb670eaf81ca7f900f154fe126a8d0d4a201c355bffb2f193287878 SHA512 71c7b9e3ab2892991e3fa01bf68d41041d11e61fe6ee8de829ff0ba4aa3ba5b2dbe905f0bfe7b4c116f3a7f0e36ca40ffaf374a552c4467a593042451d1f22c8 +DIST tdesktop-2.7.4-full.tar.gz 36894673 BLAKE2B e04749fb0168f8bae69a9ad85c5bff315faf0b355ff5f3a85a34ee36e3305c6b550553284d5179aff9283bbd1a94f9ec3c41e293d0ad8c86e4d08283189e42b3 SHA512 0a796d7a8c5e5982bc60f19c41da53996a609bf794fad224e7beea5fc3816b5cf35f16b0ec2cc7279085c69996063a44085f48e1596dfe746d260a2e8f1b2d14 +EBUILD telegram-desktop-2.7.1-r2.ebuild 3955 BLAKE2B ebd8a7ce7cbb217f7277879a0b65cf13d99a78af157fb85f7453f8239fce90523ac0644146cc7a0ad8f87e66eb327c061896df4fafbf40931475713e693f5d9c SHA512 6a388a597113e102213b591f91395a59eef26458d4d4173d6a2e6e8d76c45a1f6e4b34dd83ae495bf4ff1d2639861608a73031460c43f9af97542eb9c755a68a +EBUILD telegram-desktop-2.7.4.ebuild 4159 BLAKE2B 9ce7844f86fd7010d6ea8a3888b6876ba994f1ac5f430a8d9dd2e930e727d75016cffe94011dafc25a24594becf6fa3f6415320e5278c1ce880b1dca9c8238f3 SHA512 74870605d74efdcfef32a4edc37d598875a9f27a9c453640d97eb0eec7ad5479cdfefbed0b39d8a777b198a89ca55c0d66f5f42c67129a4f35a016f0a228aa7b MISC metadata.xml 587 BLAKE2B 1f49c91d650d26ba9fd95e9cbcb793ed527d58bf0ccc81ebddb624d54c4af38cc7aff3cf799814932a69b2a6f36dad7fe1c5ce4eb82e562e46dcebca9b751308 SHA512 5e74bb555b2b1a513bd8c7450a3db2f46daa426eecc0d3cebf11d46e58124ef117697bc422f7fccd8757f2e6e8ce6bd8ff0e317b58740dd302c1ea2f2476ff3f diff --git a/net-im/telegram-desktop/files/tdesktop-2.7.3-disable-webkit-separately.patch b/net-im/telegram-desktop/files/tdesktop-2.7.3-disable-webkit-separately.patch new file mode 100644 index 000000000000..a143071401a9 --- /dev/null +++ b/net-im/telegram-desktop/files/tdesktop-2.7.3-disable-webkit-separately.patch @@ -0,0 +1,80 @@ +Index: tdesktop-2.7.3-full/Telegram/lib_webview/CMakeLists.txt +=================================================================== +--- tdesktop-2.7.3-full.orig/Telegram/lib_webview/CMakeLists.txt ++++ tdesktop-2.7.3-full/Telegram/lib_webview/CMakeLists.txt +@@ -116,7 +116,7 @@ if (WIN32) + desktop-app::lib_webview_winrt + ) + elseif (LINUX) +- if (NOT DESKTOP_APP_DISABLE_GTK_INTEGRATION) ++ if (NOT DESKTOP_APP_DISABLE_WEBKIT_INTEGRATION) + find_package(PkgConfig REQUIRED) + + if (DESKTOP_APP_USE_PACKAGED AND NOT DESKTOP_APP_USE_PACKAGED_LAZY) +Index: tdesktop-2.7.3-full/Telegram/lib_webview/webview/platform/linux/webview_linux.cpp +=================================================================== +--- tdesktop-2.7.3-full.orig/Telegram/lib_webview/webview/platform/linux/webview_linux.cpp ++++ tdesktop-2.7.3-full/Telegram/lib_webview/webview/platform/linux/webview_linux.cpp +@@ -11,14 +11,14 @@ + namespace Webview { + + Available Availability() { +-#ifndef DESKTOP_APP_DISABLE_GTK_INTEGRATION ++#ifndef DESKTOP_APP_DISABLE_WEBKIT_INTEGRATION + return WebKit2Gtk::Availability(); +-#else // !DESKTOP_APP_DISABLE_GTK_INTEGRATION ++#else // !DESKTOP_APP_DISABLE_WEBKIT_INTEGRATION + return Available{ + .error = Available::Error::NoGtkOrWebkit2Gtk, + .details = "This feature was disabled at build time.", + }; +-#endif // DESKTOP_APP_DISABLE_GTK_INTEGRATION ++#endif // DESKTOP_APP_DISABLE_WEBKIT_INTEGRATION + } + + bool SupportsEmbedAfterCreate() { +@@ -26,11 +26,11 @@ bool SupportsEmbedAfterCreate() { + } + + std::unique_ptr CreateInstance(Config config) { +-#ifndef DESKTOP_APP_DISABLE_GTK_INTEGRATION ++#ifndef DESKTOP_APP_DISABLE_WEBKIT_INTEGRATION + return WebKit2Gtk::CreateInstance(std::move(config)); +-#else // !DESKTOP_APP_DISABLE_GTK_INTEGRATION ++#else // !DESKTOP_APP_DISABLE_WEBKIT_INTEGRATION + return nullptr; +-#endif // DESKTOP_APP_DISABLE_GTK_INTEGRATION ++#endif // DESKTOP_APP_DISABLE_WEBKIT_INTEGRATION + } + + } // namespace Webview +Index: tdesktop-2.7.3-full/cmake/options.cmake +=================================================================== +--- tdesktop-2.7.3-full.orig/cmake/options.cmake ++++ tdesktop-2.7.3-full/cmake/options.cmake +@@ -49,6 +49,13 @@ if (DESKTOP_APP_DISABLE_GTK_INTEGRATION) + ) + endif() + ++if (DESKTOP_APP_DISABLE_WEBKIT_INTEGRATION) ++ target_compile_definitions(common_options ++ INTERFACE ++ DESKTOP_APP_DISABLE_WEBKIT_INTEGRATION ++ ) ++endif() ++ + if (DESKTOP_APP_USE_PACKAGED) + target_compile_definitions(common_options + INTERFACE +Index: tdesktop-2.7.3-full/cmake/variables.cmake +=================================================================== +--- tdesktop-2.7.3-full.orig/cmake/variables.cmake ++++ tdesktop-2.7.3-full/cmake/variables.cmake +@@ -32,6 +32,7 @@ option(DESKTOP_APP_DISABLE_DBUS_INTEGRAT + option(DESKTOP_APP_DISABLE_X11_INTEGRATION "Disable all code for X11 integration (Linux only)." OFF) + option(DESKTOP_APP_DISABLE_WAYLAND_INTEGRATION "Disable all code for Wayland integration (Linux only)." OFF) + option(DESKTOP_APP_DISABLE_GTK_INTEGRATION "Disable all code for GTK integration (Linux only)." OFF) ++option(DESKTOP_APP_DISABLE_WEBKIT_INTEGRATION "Disable all code for WebkitGTK integration (Linux only)." OFF) + option(DESKTOP_APP_USE_GLIBC_WRAPS "Use wraps for new GLIBC features." OFF) + option(DESKTOP_APP_USE_PACKAGED "Find libraries using CMake instead of exact paths." ${no_special_target}) + option(DESKTOP_APP_USE_PACKAGED_LAZY "Bundle recommended Qt plugins for self-contained packages. (Linux only)" OFF) diff --git a/net-im/telegram-desktop/files/tdesktop-2.7.3-webview-include-gdkx.patch b/net-im/telegram-desktop/files/tdesktop-2.7.3-webview-include-gdkx.patch new file mode 100644 index 000000000000..2f06bda3272a --- /dev/null +++ b/net-im/telegram-desktop/files/tdesktop-2.7.3-webview-include-gdkx.patch @@ -0,0 +1,12 @@ +Index: tdesktop-2.7.3-full/Telegram/lib_webview/webview/platform/linux/webview_linux_webkit_gtk.h +=================================================================== +--- tdesktop-2.7.3-full.orig/Telegram/lib_webview/webview/platform/linux/webview_linux_webkit_gtk.h ++++ tdesktop-2.7.3-full/Telegram/lib_webview/webview/platform/linux/webview_linux_webkit_gtk.h +@@ -12,6 +12,7 @@ extern "C" { + #undef signals + #include + #include ++#include + #include + #include + #define signals public diff --git a/net-im/telegram-desktop/telegram-desktop-2.7.1-r2.ebuild b/net-im/telegram-desktop/telegram-desktop-2.7.1-r2.ebuild index ee4a0e5a5bfb..ef9ecd0fd657 100644 --- a/net-im/telegram-desktop/telegram-desktop-2.7.1-r2.ebuild +++ b/net-im/telegram-desktop/telegram-desktop-2.7.1-r2.ebuild @@ -16,7 +16,7 @@ SRC_URI="https://github.com/telegramdesktop/tdesktop/releases/download/v${PV}/${ LICENSE="BSD GPL-3-with-openssl-exception LGPL-2+" SLOT="0" KEYWORDS="amd64 ~ppc64" -IUSE="+dbus enchant +gtk +hunspell libressl pulseaudio +spell wayland +X" +IUSE="+dbus enchant +gtk +hunspell pulseaudio +spell wayland +X" RDEPEND=" !net-im/telegram-desktop-bin diff --git a/net-im/telegram-desktop/telegram-desktop-2.7.4.ebuild b/net-im/telegram-desktop/telegram-desktop-2.7.4.ebuild new file mode 100644 index 000000000000..609781f96cb7 --- /dev/null +++ b/net-im/telegram-desktop/telegram-desktop-2.7.4.ebuild @@ -0,0 +1,138 @@ +# Copyright 2020-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +PYTHON_COMPAT=( python3_{7,8,9} ) + +inherit xdg cmake python-any-r1 flag-o-matic + +MY_P="tdesktop-${PV}-full" + +DESCRIPTION="Official desktop client for Telegram" +HOMEPAGE="https://desktop.telegram.org" +SRC_URI="https://github.com/telegramdesktop/tdesktop/releases/download/v${PV}/${MY_P}.tar.gz" + +LICENSE="BSD GPL-3-with-openssl-exception LGPL-2+" +SLOT="0" +KEYWORDS="~amd64 ~ppc64" +IUSE="+dbus enchant +gtk +hunspell +spell wayland webkit +X" + +RDEPEND=" + !net-im/telegram-desktop-bin + app-arch/lz4:= + dev-cpp/glibmm:2 + dev-libs/xxhash + dev-qt/qtcore:5 + dev-qt/qtgui:5[dbus?,jpeg,png,wayland?,X(-)?] + dev-qt/qtimageformats:5 + dev-qt/qtnetwork:5[ssl] + dev-qt/qtsvg:5 + dev-qt/qtwidgets:5[png,X(-)?] + media-fonts/open-sans + media-libs/fontconfig:= + media-libs/opus:= + ~media-libs/libtgvoip-2.4.4_p20210302 + media-libs/openal + ~media-libs/tg_owt-0_pre20210422 + media-video/ffmpeg:=[opus] + sys-libs/zlib:=[minizip] + dbus? ( + dev-qt/qtdbus:5 + dev-libs/libdbusmenu-qt[qt5(+)] + ) + enchant? ( app-text/enchant:= ) + gtk? ( x11-libs/gtk+:3[X?] ) + hunspell? ( >=app-text/hunspell-1.7:= ) + wayland? ( kde-frameworks/kwayland:= ) + webkit? ( net-libs/webkit-gtk:= ) + X? ( x11-libs/libxcb:= ) +" +DEPEND="${RDEPEND} + dev-cpp/range-v3 + =dev-cpp/ms-gsl-3* +" +BDEPEND=" + ${PYTHON_DEPS} + >=dev-util/cmake-3.16 + virtual/pkgconfig +" +REQUIRED_USE=" + spell? ( + ^^ ( enchant hunspell ) + ) +" + +S="${WORKDIR}/${MY_P}" + +PATCHES=( + # https://github.com/desktop-app/cmake_helpers/pull/91 + # https://github.com/desktop-app/lib_webview/pull/2 + "${FILESDIR}/tdesktop-2.7.3-disable-webkit-separately.patch" + # https://github.com/desktop-app/lib_webview/commit/0b4100d7cecc4e748c51f3f51ebfd1392ec3978a + "${FILESDIR}/tdesktop-2.7.3-webview-include-gdkx.patch" +) + +pkg_pretend() { + if has ccache ${FEATURES}; then + ewarn + 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() { + # no explicit toggle, doesn't build with the system one #752417 + sed -i 's/DESKTOP_APP_USE_PACKAGED/NO_ONE_WILL_EVER_SET_THIS/' \ + cmake/external/rlottie/CMakeLists.txt || die + + cmake_src_prepare +} + +src_configure() { + # gtk is really needed for image copy-paste due to https://bugreports.qt.io/browse/QTBUG-56595 + local mycmakeargs=( + -DTDESKTOP_LAUNCHER_BASENAME="${PN}" + -DCMAKE_DISABLE_FIND_PACKAGE_tl-expected=ON # header only lib, some git version. prevents warnings. + + -DDESKTOP_APP_DISABLE_X11_INTEGRATION=$(usex X OFF ON) + -DDESKTOP_APP_DISABLE_WAYLAND_INTEGRATION=$(usex wayland OFF ON) + -DDESKTOP_APP_DISABLE_DBUS_INTEGRATION=$(usex dbus OFF ON) + -DDESKTOP_APP_DISABLE_GTK_INTEGRATION=$(usex gtk OFF ON) + -DDESKTOP_APP_DISABLE_WEBKIT_INTEGRATION=$(usex webkit OFF ON) + -DDESKTOP_APP_DISABLE_SPELLCHECK=$(usex spell OFF ON) # enables hunspell (recommended) + -DDESKTOP_APP_USE_ENCHANT=$(usex enchant ON OFF) # enables enchant and disables hunspell + ) + + 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 + use gtk || elog "enable 'gtk' useflag if you have image copy-paste problems" +} -- cgit v1.2.3