diff options
Diffstat (limited to 'net-im')
23 files changed, 605 insertions, 82 deletions
diff --git a/net-im/Manifest.gz b/net-im/Manifest.gz Binary files differindex 8f27f5b6d68d..b189fec04ba9 100644 --- a/net-im/Manifest.gz +++ b/net-im/Manifest.gz diff --git a/net-im/neochat/Manifest b/net-im/neochat/Manifest index 22db95d79ea3..0350dc15fffc 100644 --- a/net-im/neochat/Manifest +++ b/net-im/neochat/Manifest @@ -1,5 +1,3 @@ -DIST neochat-1.1.1.tar.xz 195780 BLAKE2B b9eae0344d4e99c3b5ef9d7be0d633216fa989064c8499cd24b7fc65371bffc34551875a84edfabd2f359b091b588b04720309bb84b8fcfb1123f759bacd4dbd SHA512 ee50dfb7ba2aae8c6b03728e1326b03b0bc21df459397f137547b4684596fd07c42ae494037af894b2b37b53ade010463ee2f067ccede559ca868a723c83e17b DIST neochat-1.2.0.tar.xz 244064 BLAKE2B dcf728036269e3aefc524c1fea56f07f76c4132d810e2edb2c199ff8df7fd77ff8d90a5fbd6d13d59dae8894ccc312cf38107a3b5ba5a08fd80b31a0f8a53a0c SHA512 50837f44b899999753208363283c20a6b858bdaf26bba9e9762a04c2e65534014df88a9404ce7659a87d5e896e08a5e5f4ac23e3922ebe4cb6c7715b07058af7 -EBUILD neochat-1.1.1.ebuild 1178 BLAKE2B aaf035503fe6dbc079158e022279a3ad28cfcfdda5c46a360d0a5022952a08e8bf42432ecbe7f573fcd39ee702c43a8e6297e2acd365fb3193d5ed1523d7ed4c SHA512 ec8a90a38708c229d40c088c5374955eb2bf86f3471990ab0f2a4144d2866c95403c8c3fd6e251bb71e1a8335f2db07edc7dbacd8de7b8ded9e45a1e5b08cf5c EBUILD neochat-1.2.0.ebuild 1223 BLAKE2B e47931d4fae6c76714030e9d9cbc868359e1c862944c7c6818749ad9351ebc304c69d7608c087a8375b717514899fa2fbf40fda82ca00ecace0d8a46fb40260d SHA512 14f2f41b9ccde648165d71322d6bb533fee2db0ebc079fee942d066dfcc0ce8b6cd61557bae43251765f14aed5e072952e2414647c8b82373c81e05b086bac38 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3 diff --git a/net-im/neochat/neochat-1.1.1.ebuild b/net-im/neochat/neochat-1.1.1.ebuild deleted file mode 100644 index 29cd32e584dc..000000000000 --- a/net-im/neochat/neochat-1.1.1.ebuild +++ /dev/null @@ -1,47 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -KFMIN=5.77.0 -QTMIN=5.15.2 -inherit ecm kde.org - -DESCRIPTION="Client for Matrix, the decentralized communication protocol" -HOMEPAGE="https://apps.kde.org/neochat/" - -if [[ ${KDE_BUILD_TYPE} = release ]]; then - SRC_URI="mirror://kde/stable/${PN}/${PV}/${P}.tar.xz" - KEYWORDS="~amd64 ~ppc64" -fi - -LICENSE="GPL-3" -SLOT="0" - -DEPEND=" - app-text/cmark:= - dev-libs/qtkeychain:= - >=dev-qt/qtdeclarative-${QTMIN}:5 - >=dev-qt/qtgui-${QTMIN}:5 - >=dev-qt/qtmultimedia-${QTMIN}:5 - >=dev-qt/qtnetwork-${QTMIN}:5 - >=dev-qt/qtquickcontrols2-${QTMIN}:5 - >=dev-qt/qtsvg-${QTMIN}:5 - >=dev-qt/qtwidgets-${QTMIN}:5 - >=kde-frameworks/kconfig-${KFMIN}:5 - >=kde-frameworks/kcoreaddons-${KFMIN}:5 - >=kde-frameworks/kdbusaddons-${KFMIN}:5 - >=kde-frameworks/ki18n-${KFMIN}:5 - >=kde-frameworks/kirigami-${KFMIN}:5 - >=kde-frameworks/knotifications-${KFMIN}:5 - media-libs/kquickimageeditor:5 - >=net-libs/libquotient-0.6 -" -RDEPEND="${DEPEND} - >=dev-qt/qtgraphicaleffects-${QTMIN}:5 - >=dev-qt/qtmultimedia-${QTMIN}:5[qml] - >=kde-frameworks/kitemmodels-${KFMIN}:5[qml] -" -BDEPEND=" - virtual/pkgconfig -" diff --git a/net-im/pidgin/Manifest b/net-im/pidgin/Manifest index 0ffed0c0470c..24142f5142b6 100644 --- a/net-im/pidgin/Manifest +++ b/net-im/pidgin/Manifest @@ -11,6 +11,6 @@ DIST pidgin-2.14.5.tar.bz2 8696780 BLAKE2B 4563b6aabdaba8af7dd7a1f8978418bcdcc34 DIST pidgin-2.14.6.tar.bz2 8672222 BLAKE2B d2e6428728f18096c957b10d7cc5e79704c0fbb403967e3968f59393db125307fc6fc84c90d66788b4a27bd9707b126c1f0df532c2a1e7d1b62356127e87371c SHA512 19ea12b6c9e99b6215a7d955f02d52ad19de8c4beb00806276c8c184d5cc338db119197e0cc9f4685705bd8b83f35c8f63565095b49a319f9696aab37735951b DIST pidgin-eds-3.6.patch.bz2 2352 BLAKE2B 1d69dc55f43b9efe5d5278a017642702d67a297fe2587467ec0fdca7f9888e26640efe9ac2a18f77ae9c523bf125a2cec6d0bf621f0b2b16f55d30df1bf470df SHA512 a0195679ab55ed9c7ea18ace6dbf0fc994698f1f4eea9d8335dfdcdcd6a68975c0191bd22f150bf5a9a0a691ce7e9e73d79598e1e8be541efa1d9824a633d877 EBUILD pidgin-2.14.3-r1.ebuild 7896 BLAKE2B da92c7b805ada2398e14ac3bea9e7bf18e2e6ff8e22681a09ccfa26a2f042baa425c81820deb95ebe55d314c67f94d1f8bc5dba681a172033ccae7895aa0d5b6 SHA512 75eeee3de9fc161a67c9113b34b2533b927b42882745ad1ced19717aaa99e0e325ab239f67d084ab7093282434ba25ad49c5923f17b1b9b74c090c52888c61ce -EBUILD pidgin-2.14.5.ebuild 7564 BLAKE2B ce2a64defa1f3146e49a7bc3614dbd071e9ab492206125ce9a679ca917f0c37d102cc168d54577ae89ef458af79002c1eaebe0c4bce7673a29e5a2e7abb092fa SHA512 c3a65efb90af2cc9496c63159bdd83080f5237ca698db8651bf6412250e9668b579a2447fccd30a84dc0cc67674a34d8b0a7aa234407d28ec2fbedf7fa2514ec +EBUILD pidgin-2.14.5.ebuild 7562 BLAKE2B d8d867a76c4a95379cfc95638c8e15b2433792d49fbc7c98a26d4aee840842cbff97c748924cca9e2fefc5ce7e66be7c7effbf1f1cbe76ac5dc90217dc807d58 SHA512 fb64ce4d38c7327b2e4c0ef66b356f63077d955f2c3c468fb9fc300d866d03f185454a392e8080e785c4d73cf7343d4bb514dfc575d60071ae32fe5fade80b5d EBUILD pidgin-2.14.6.ebuild 7528 BLAKE2B e52ef0a392052d35a9d5baef958e8e090212d7fd51aabe20648dae787cddc0cc84c1ef46d99deff8cfd7e29f64c4677aa7a495d052198764c90d05d75fb70113 SHA512 e78ebfd31d3297d6c4932622c02762d73ab6c5ea195bd509ab8262d91eb77e3c1df649b251da3516139420809a8bd2f49f7f7c784a43d5f4cd642c4b8f66f6f2 MISC metadata.xml 1418 BLAKE2B b484d6c252dfa5f4c2bd4ef21b718cb449e3248506dab7f1f0e017e648323653e61a0f37bf2bb562f6a9b97b3fb0fcbaff897e3f030ad36e2e0813e27dfcbadc SHA512 13ff337bab4cf2924f9b652ad73d11a6d6ce268cc4aea4f9f2435acfefc85597b290de5785601ed8ad0e220047f3eff47c85150b7d81bf6e7e7b8ca9173161f7 diff --git a/net-im/pidgin/pidgin-2.14.5.ebuild b/net-im/pidgin/pidgin-2.14.5.ebuild index 1c4eac7d357c..602e11022512 100644 --- a/net-im/pidgin/pidgin-2.14.5.ebuild +++ b/net-im/pidgin/pidgin-2.14.5.ebuild @@ -16,7 +16,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/poezio/Manifest b/net-im/poezio/Manifest index cbd8c503047f..59eee9975898 100644 --- a/net-im/poezio/Manifest +++ b/net-im/poezio/Manifest @@ -1,4 +1,6 @@ +AUX Do-not-install-man-pages-and-files-in-usr-share-poez.patch 1171 BLAKE2B e9b4e52563be878b51556df03d63f12abc5cab1029a4ef37ee342247aa8fdbcfc6d4b92a8c87c5ec1186892e987ed899bce721a767f27e57ce1259eae67e2fa1 SHA512 25dd661bd43016381c0360b3039fdc1e0b93515869310579a7e22ea265e966ff0433ce59cc42e43192741a38e4bad52d9d0d1b7522287f74f3d6fb98d1eac6de DIST poezio-0.13.1.tar.gz 632572 BLAKE2B e8d3d34c5ca8d236a5a434b4b339cab5ea7286c60db3ef5a6012d406848537b587e834b86f7b6049ee8e637a82e883b2d874134bc1f7d64106e0b0f81aab218f SHA512 6c211ef0fa2fc4bd4cce6ab896166eec6bcdc16ad9e774f4d6bf261b404c9ef68b18d934097da0e165b0cce9bd7779da520ac9c3eac30ccf8280f98ef6aa19c6 -EBUILD poezio-0.13.1-r1.ebuild 1160 BLAKE2B 34b4dd398b936f9c3adbbe6c3a89a954a1749d92089541612288e6063c34035c3017218fc518c5aff71df67b368fb233ee818acb55aa499e79475c2d4a9ebc56 SHA512 2248557d7659952914bd24c0f03f8847177b2f7e0a46c88f6654dd7a584ec1b0317a8269abf94e2731c91382026063ee54cb062ecfeb18ba399f7441e8cb28e1 -EBUILD poezio-9999.ebuild 1161 BLAKE2B f0d80d98f10e133038c23578d3ba37d0b5a7b2f489413767554181fc52f709796e9c9d3df1e91c2a176a8a0e15ec0899a23586a193528890547cccd78973e354 SHA512 a61e2738d03662435d88bcb643b5537d3e96f4ca2d50a95fb27004f5e4e110304fe771ed5127f0fc35da029a0a4dcf15a4fd7730bc7638b11603c6bdba4a07b5 +EBUILD poezio-0.13.1-r1.ebuild 1161 BLAKE2B a7976c7b606455b2c9254f068ced7b172b3c61ef0849ae89053f6cb04db9b6433acb807c08e918b303037d5277529fe2c31284b06780eb332ac174b623040519 SHA512 0c71b88d20078f1be6fe0e5b45d7868ebd070ee019236363400db24c3330b7f4cea034e82dbf3e365dea1cb60c47bbcb04406dbe8e5d35993c65f48cd6338999 +EBUILD poezio-0.13.1-r2.ebuild 1413 BLAKE2B df4598dbc7901d42f3c05aac396bb8f9648157788ce831625a3d1b005e008c162bc7cf5614636c870d2f07aeaa5f88f164a4621d733f125470bcb0e9023f1086 SHA512 8101f429724b49eb448bf195f70e90d82d6bc5d2fb1298b319f045ab30c2b0a1e951caa7ac2a32d25907168d6fe4be1c2fab867cece022c5a5a624a6e6c8e99d +EBUILD poezio-9999.ebuild 1414 BLAKE2B 6259c3f7ce2e922c0f2f080e3800d97a0514458c8fc3dc4566fc7a55e5f1666a604006daf4db116f31734dcf04759ce4979a60cdab81d6297f31ab9313b21ec2 SHA512 e39dd8db7ca0760b18fab75003ba91a8ed0831ba4dd04d37fd58419b31ced344b1a8d6923a2faf2d0c4063f734e0310f5105193cf57fc94b8a474ef3074874d7 MISC metadata.xml 427 BLAKE2B c73646308afc13732dd104f4123e42f0906fdd14fd635dc64b8ec30519f4295e2577452a2c6a595f31b6ce91e0ffbee53a6b16e7a1938d5d072b7a24412ecec4 SHA512 ef402902e54cacbe357137c8f64bfbe081c151e39c7c1bbf715ad6e7d7acc0a7cabaf5e184184b0034973368b2fb70ad5787074d3570bc8cfd0caf0635119c71 diff --git a/net-im/poezio/files/Do-not-install-man-pages-and-files-in-usr-share-poez.patch b/net-im/poezio/files/Do-not-install-man-pages-and-files-in-usr-share-poez.patch new file mode 100644 index 000000000000..9506cdb14908 --- /dev/null +++ b/net-im/poezio/files/Do-not-install-man-pages-and-files-in-usr-share-poez.patch @@ -0,0 +1,31 @@ +From 343c1e9be4cbf76c0ae437143b4000e36a1488ca Mon Sep 17 00:00:00 2001 +From: Florian Schmaus <flo@geekplace.eu> +Date: Mon, 12 Jul 2021 15:08:30 +0200 +Subject: [PATCH] Do not install man pages and files in /usr/share/poezio + +Signed-off-by: Florian Schmaus <flo@geekplace.eu> +--- + setup.py | 4 ---- + 1 file changed, 4 deletions(-) + +diff --git a/setup.py b/setup.py +index d1dde4d2f02f..bee8e4834b81 100755 +--- a/setup.py ++++ b/setup.py +@@ -156,13 +156,9 @@ setup( + scripts=['scripts/poezio_logs'], + entry_points={'console_scripts': ['poezio = poezio.__main__:run']}, + data_files=([ +- ('share/man/man1/', ['data/poezio.1', 'data/poezio_logs.1']), +- ('share/poezio/', ['README.rst', 'COPYING', 'CHANGELOG']), + ('share/applications/', ['data/io.poez.Poezio.desktop']), + ('share/metainfo/', ['data/io.poez.Poezio.appdata.xml']) + ] +- + find_doc('share/doc/poezio/source', 'source') +- + find_doc('share/doc/poezio/html', 'build/html') + + sphinx_files_found + ), + install_requires=['slixmpp>=1.6.0', 'aiodns', 'pyasn1_modules', 'pyasn1', 'typing_extensions', 'setuptools'], +-- +2.31.1 + diff --git a/net-im/poezio/poezio-0.13.1-r1.ebuild b/net-im/poezio/poezio-0.13.1-r1.ebuild index ae4c009726e2..a080438c959f 100644 --- a/net-im/poezio/poezio-0.13.1-r1.ebuild +++ b/net-im/poezio/poezio-0.13.1-r1.ebuild @@ -4,7 +4,7 @@ EAPI=7 DISTUTILS_USE_SETUPTOOLS=rdepend -PYTHON_COMPAT=( python3_{7,8} ) +PYTHON_COMPAT=( python3_{7..9} ) inherit distutils-r1 readme.gentoo-r1 diff --git a/net-im/poezio/poezio-0.13.1-r2.ebuild b/net-im/poezio/poezio-0.13.1-r2.ebuild new file mode 100644 index 000000000000..df3051da179c --- /dev/null +++ b/net-im/poezio/poezio-0.13.1-r2.ebuild @@ -0,0 +1,69 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +DISTUTILS_USE_SETUPTOOLS=rdepend +PYTHON_COMPAT=( python3_{8..9} ) + +inherit distutils-r1 optfeature xdg + +DESCRIPTION="Console XMPP client that looks like most famous IRC clients" +HOMEPAGE="https://poez.io/" +LICENSE="ZLIB" +SLOT="0" + +if [[ "${PV}" == "9999" ]]; then + EGIT_REPO_URI="https://lab.louiz.org/${PN}/${PN}.git" + inherit git-r3 + + # We build the html documentation using sphinx. + BDEPEND="dev-python/sphinx" +else + SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" + KEYWORDS="~amd64" +fi + +RDEPEND=" + dev-python/aiodns[${PYTHON_USEDEP}] + dev-python/pyasn1-modules[${PYTHON_USEDEP}] + dev-python/pyasn1[${PYTHON_USEDEP}] + >=dev-python/slixmpp-1.5.0[${PYTHON_USEDEP}] +" + +PATCHES=( + "${FILESDIR}/Do-not-install-man-pages-and-files-in-usr-share-poez.patch" +) + +distutils_enable_tests pytest + +src_prepare() { + default + # Delete unmaintained plugin which requires an excessive external dep + rm plugins/mpd_client.py || die +} + +src_compile() { + distutils-r1_src_compile + + if [[ -n "${EGIT_REPO_URI}" ]]; then + emake -C doc html + fi +} + +src_install() { + distutils-r1_src_install + + doman data/poezio.1 data/poezio_logs.1 + + if [[ -n "${EGIT_REPO_URI}" ]]; then + docinto html + dodoc -r doc/build/html/* + fi +} + +pkg_postinst() { + xdg_pkg_postinst + + optfeature "screen autoaway support" dev-python/pyinotify +} diff --git a/net-im/poezio/poezio-9999.ebuild b/net-im/poezio/poezio-9999.ebuild index f39bc56b1eb6..608644fde1b2 100644 --- a/net-im/poezio/poezio-9999.ebuild +++ b/net-im/poezio/poezio-9999.ebuild @@ -1,12 +1,12 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 DISTUTILS_USE_SETUPTOOLS=rdepend -PYTHON_COMPAT=( python3_{7,8} ) +PYTHON_COMPAT=( python3_{7..10} ) -inherit distutils-r1 readme.gentoo-r1 +inherit distutils-r1 optfeature xdg DESCRIPTION="Console XMPP client that looks like most famous IRC clients" HOMEPAGE="https://poez.io/" @@ -16,6 +16,9 @@ SLOT="0" if [[ "${PV}" == "9999" ]]; then EGIT_REPO_URI="https://lab.louiz.org/${PN}/${PN}.git" inherit git-r3 + + # We build the html documentation using sphinx. + BDEPEND="dev-python/sphinx" else SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" KEYWORDS="~amd64" @@ -25,16 +28,14 @@ RDEPEND=" dev-python/aiodns[${PYTHON_USEDEP}] dev-python/pyasn1-modules[${PYTHON_USEDEP}] dev-python/pyasn1[${PYTHON_USEDEP}] - >=dev-python/slixmpp-1.5.2[${PYTHON_USEDEP}] + >=dev-python/slixmpp-1.7.1[${PYTHON_USEDEP}] " -distutils_enable_tests pytest +PATCHES=( + "${FILESDIR}/Do-not-install-man-pages-and-files-in-usr-share-poez.patch" +) -DOC_CONTENTS=" -Install these optional runtime dependencies for additional features. -* dev-python/pyinotify for screen autoaway plugin support. -" -DISABLE_AUTOFORMATTING=true +distutils_enable_tests pytest src_prepare() { default @@ -42,11 +43,27 @@ src_prepare() { rm plugins/mpd_client.py || die } +src_compile() { + distutils-r1_src_compile + + if [[ -n "${EGIT_REPO_URI}" ]]; then + emake -C doc html + fi +} + src_install() { distutils-r1_src_install - readme.gentoo_create_doc + + doman data/poezio.1 data/poezio_logs.1 + + if [[ -n "${EGIT_REPO_URI}" ]]; then + docinto html + dodoc -r doc/build/html/* + fi } pkg_postinst() { - readme.gentoo_print_elog + xdg_pkg_postinst + + optfeature "screen autoaway support" dev-python/pyinotify } diff --git a/net-im/ricochet/Manifest b/net-im/ricochet/Manifest index 0cefa0115574..25f8f6d22705 100644 --- a/net-im/ricochet/Manifest +++ b/net-im/ricochet/Manifest @@ -1,4 +1,4 @@ DIST ricochet-1.1.4.tar.gz 1292671 BLAKE2B 15a71496b01992060fbdbedb0c73365aa250d9e6c4b5bb6223cbcd727a1cf062b1b9cd094d17ae33471e6095a071b1ea6d553a1bb2168974d45486995e204e9b SHA512 9f20fe8e34ea1d8d5b252eee1e164f0a97bf5b3818e864270ea79c0f018b229ec04b1b27acf44415bb646d48b9d1a0ada455a4f77fafdb6e4d21e62292b778a1 -EBUILD ricochet-1.1.4.ebuild 1189 BLAKE2B 3fb8f5b0ebc1f430685ddcbebc45fb147aebe5a6d700c7235081c1751ce3d7c1bee9ed470b12ea841b816e9ebf880003db4d6c7a6ede2e045996bf49e445ba69 SHA512 3f29132f06e5bf9585edf41b8223530fb924719c4329c1ac7978cfe69c759e65ebda4e98d3d198e5d0f8a0bf490aad650ad7708bf9133fa59d9dec53be80443f +EBUILD ricochet-1.1.4.ebuild 1187 BLAKE2B 7508b27bf257a4ac1028559dd636155a72aec1fa4ce1d6ace1bc62e80ef053e366408d9399367ab572b8e3e997c0512a0483e48796fe7b7d815bf0a145e9aae3 SHA512 888e9d1379c3ac0c60210b714a24e2a94ae1944658e8b134a153ba89f9da4c02e9aff474c3db4d907803f4949ec4afb0b7426b5578a5a2838b5a03613287d78f EBUILD ricochet-9999.ebuild 1386 BLAKE2B de9f48d1c8f32a1e6da667c1c6ec1ec8d8de17358fa0b8f808bdf6d6c9983e9c2ad17bd3ab2f512c242bad1d415ffb125702455f4336f3b6bb99f852df5a9165 SHA512 07d4cb78a76185e183f0aab83f39d01f0bab8b47f3845816c3ba31ce6cfa5f0c876da95386a9d98f9e42808ed58be8d1a34f965221aff14852a9c9feb2e5d553 MISC metadata.xml 394 BLAKE2B 6f163c48ab23759d5b574e628a3ee88ff40d9a6a0e460799cda903edf6be1e5fd60646452713eeb20f062cdd57971767af7e3344a55b0a60d798bc47f3b2d12c SHA512 ad270cdc7063ae6c541d29e1224ce6608ebada07b212d836030ee3377c0596ea37789fa6cdb8e96bcfa84b295611a95d450c37726e88876d66c5a8ece4f327da diff --git a/net-im/ricochet/ricochet-1.1.4.ebuild b/net-im/ricochet/ricochet-1.1.4.ebuild index 44bcd7daf218..016274c26dde 100644 --- a/net-im/ricochet/ricochet-1.1.4.ebuild +++ b/net-im/ricochet/ricochet-1.1.4.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -10,7 +10,7 @@ if [[ ${PV} == *9999* ]]; then EGIT_REPO_URI="https://github.com/ricochet-im/ricochet" else SRC_URI="https://github.com/ricochet-im/ricochet/archive/v${PV}.tar.gz -> ${P}.tar.gz" - KEYWORDS="~amd64 ~x86" + KEYWORDS="amd64 x86" fi DESCRIPTION="Privacy-focused instant messaging through Tor hidden services" diff --git a/net-im/rocketchat-desktop-bin/Manifest b/net-im/rocketchat-desktop-bin/Manifest index 2b1db4704b83..b3736a3acb05 100644 --- a/net-im/rocketchat-desktop-bin/Manifest +++ b/net-im/rocketchat-desktop-bin/Manifest @@ -1,3 +1,5 @@ +DIST rocketchat-3.2.3.x86_64.rpm 55375960 BLAKE2B e72e0f29662bc9667c782866c42d334239fbe39b20a7ca232aeafe5f16244248ee940f301b0a0f4d2101150746e48d0ff47bdf55d99371a06226937876dd9765 SHA512 ced1fce3b7f12ceda10a1879612065a0e65dc6ccc4cb3a3a282cae578267a03468ea85820a6a765af3d1d72dbde9a04a0d5199a150ce257dd4d44151e4d6ca06 DIST rocketchat-3.3.0.x86_64.rpm 56322356 BLAKE2B 9d1caaceb16fa68fdfb11d41dae4a7d464e7bb9f92fa3f734f273447228faee53e958e0e87934e9cc5c4b1a133e18ebe610dcf429b780993a20e9a44251d7480 SHA512 e3bda69d0395823a40c56909ef4ae6faee1dcc733eee20ef3067cd7bf57066056505efa2a3817d2640ea7bee0cc0920cdf187dddd53320c224cbe2c3efc21088 +EBUILD rocketchat-desktop-bin-3.2.3.ebuild 1054 BLAKE2B af7071c42fb61e4360912f65503c13d34ad5602c4098a4a5e75f59b29c5639135be010ba654a56889153cf2be104071e2b437b61e5a05c92ad95c90fea3751b7 SHA512 27bf6e40c117830db529e11a2c0efe5fb8940553001eff84c1e420eeb100bc3bbe1a132d7109ee9b55fc195a0e8d802a7d3d11c1cd21333038e6e86b2c92f6a6 EBUILD rocketchat-desktop-bin-3.3.0.ebuild 1054 BLAKE2B af7071c42fb61e4360912f65503c13d34ad5602c4098a4a5e75f59b29c5639135be010ba654a56889153cf2be104071e2b437b61e5a05c92ad95c90fea3751b7 SHA512 27bf6e40c117830db529e11a2c0efe5fb8940553001eff84c1e420eeb100bc3bbe1a132d7109ee9b55fc195a0e8d802a7d3d11c1cd21333038e6e86b2c92f6a6 MISC metadata.xml 433 BLAKE2B 2a8918ee8e1f2c6995797e050b172cf935e2f5a484ff5ece8d6fdc672a98032e07e52841c5698f030c93eff16fc087bf35c9f8fee2dc8c8d5f2de79066a9bab0 SHA512 f7a8f577fa0298a391e3aabc9388e78c1cbc0f093c739d41f970f02c165569d69133391e9acb746606ad054c974b0ab7a8f8da9652f83362e0c8e63980bb6d4a diff --git a/net-im/rocketchat-desktop-bin/rocketchat-desktop-bin-3.2.3.ebuild b/net-im/rocketchat-desktop-bin/rocketchat-desktop-bin-3.2.3.ebuild new file mode 100644 index 000000000000..0c6ba72c3682 --- /dev/null +++ b/net-im/rocketchat-desktop-bin/rocketchat-desktop-bin-3.2.3.ebuild @@ -0,0 +1,53 @@ +# Copyright 2019-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit rpm xdg + +DESCRIPTION="The Ultimate Open Source Web Chat Platform" +HOMEPAGE="https://rocket.chat" +SRC_URI="https://github.com/RocketChat/Rocket.Chat.Electron/releases/download/${PV}/rocketchat-${PV}.x86_64.rpm" + +KEYWORDS="-* ~amd64" +LICENSE="MIT" +SLOT="0" + +RDEPEND=" + app-accessibility/at-spi2-atk:2 + dev-libs/atk + dev-libs/expat + dev-libs/libappindicator + dev-libs/nspr + dev-libs/nss + media-fonts/noto-emoji + media-libs/alsa-lib + net-print/cups + x11-libs/cairo + x11-libs/gdk-pixbuf:2 + x11-libs/gtk+:3 + x11-libs/libnotify + x11-libs/libxcb + x11-libs/libX11 + x11-libs/libXcomposite + x11-libs/libXcursor + x11-libs/libXdamage + x11-libs/libXext + x11-libs/libXfixes + x11-libs/libXi + x11-libs/libXrandr + x11-libs/libXrender + x11-libs/libXtst + x11-libs/libXScrnSaver + x11-libs/pango +" + +QA_PREBUILT="/opt/Rocket.Chat/*" + +S="${WORKDIR}" + +src_install() { + # remove files useless for Gentoo + rm -r usr/lib || die + cp -a "${S}"/* "${ED}" || die +} diff --git a/net-im/signal-desktop-bin/Manifest b/net-im/signal-desktop-bin/Manifest index ad400056cda7..d3a90deeba15 100644 --- a/net-im/signal-desktop-bin/Manifest +++ b/net-im/signal-desktop-bin/Manifest @@ -1,3 +1,3 @@ -DIST signal-desktop_5.7.1_amd64.deb 111629162 BLAKE2B 59166fbe11a92d15155af01f64dac541485dfe57e62925106495eb5111030943696b5d63958658ccb9f3f0c0acffd25e08f441f64748da9314962c0b802979b1 SHA512 be5f5df7579ef1641e96afe7315e5b687ad9cd622df0d601f351f218f7b4b0413499f925b2f349402027ef95ef67b116ef183ce5b8bee6cd730bbb04f947684b -EBUILD signal-desktop-bin-5.7.1.ebuild 4539 BLAKE2B 68fbffd904eb5151818c7a09c390b15ab6a3cb274cd334bbbb670ec93e88ba8e67a66cfce553c442344e22c9400f6799d6514172f05018eb6211e0deaa374bc2 SHA512 3b107e732006c53e882c3dce1aaae720a9992ddca0833aa4f8926f23e59bef2277fef788ae1241bbcfe2f73d75ea31d4791eadd9bcf0007ad5fa13bf09c1f4a5 +DIST signal-desktop_5.8.0_amd64.deb 111604106 BLAKE2B 33a6e3a6cc57e193f4a5d85fee99f10a20a3eeacf39d8fc82bd23a7b62f43d17a605e1111b84ad1ded7292ca04f4cd1dcb367b5b44d69edc91fe32084a3ab7b1 SHA512 a85242647370913de2e623798f0851ff9c50c3dd67e7990637450537120ad75d8473424ef7c41efc08df549384392844df9e6851a19600bd3a436309db5da3b7 +EBUILD signal-desktop-bin-5.8.0.ebuild 5012 BLAKE2B a1643e0d6e909fdd2314b8889b971b94099863c554ac23b03faabdbd915fde783580b2bc4327b11395a52d507719864a163e0b425980a247d3c9298a11a6ab11 SHA512 b96169f7370e9523d01a2809d685553ef4701c95d4e16de86dea786ca1d2711cf7c6bb489cde64d45352deb9ec1f1834a95c0d0b5dc244d77201622db2f3d081 MISC metadata.xml 396 BLAKE2B 38a79e09275e5b085003b4fd511917b1ada4b25a7f7d8693da9fa35be6f924fd3a8cac88aa689a482391b3ccc89a07ec1946b8d0dc1ec5c45f23b94f65095ade SHA512 e173a6d2920e003012ffa756fc3e0aa15bbea2eb63b37b9387ec016680cdef7d7db0d510f4663e2a941df4b587c367d3af66ef0fa8d0c4b069648b1dbfd0d4ad diff --git a/net-im/signal-desktop-bin/signal-desktop-bin-5.7.1.ebuild b/net-im/signal-desktop-bin/signal-desktop-bin-5.8.0.ebuild index 31d7022a98d0..4af36932f98e 100644 --- a/net-im/signal-desktop-bin/signal-desktop-bin-5.7.1.ebuild +++ b/net-im/signal-desktop-bin/signal-desktop-bin-5.8.0.ebuild @@ -72,6 +72,8 @@ QA_PREBUILT="opt/Signal/signal-desktop opt/Signal/resources/app.asar.unpacked/node_modules/better-sqlite3/build/Release/better_sqlite3.node opt/Signal/resources/app.asar.unpacked/node_modules/curve25519-n/build/Release/curve.node opt/Signal/resources/app.asar.unpacked/node_modules/ffi-napi/build/Release/ffi_bindings.node + opt/Signal/resources/app.asar.unpacked/node_modules/ffi-napi/node_modules/ref-napi/prebuilds/linux-x64/electron.napi.node + opt/Signal/resources/app.asar.unpacked/node_modules/ffi-napi/node_modules/ref-napi/prebuilds/linux-x64/node.napi.node opt/Signal/resources/app.asar.unpacked/node_modules/ffi-napi/prebuilds/linux-x64/node.napi.uv1.node opt/Signal/resources/app.asar.unpacked/node_modules/libsignal-client/build/libsignal_client_linux.node opt/Signal/resources/app.asar.unpacked/node_modules/libsignal-client/build/libsignal_client_linux_x64.node @@ -84,6 +86,7 @@ QA_PREBUILT="opt/Signal/signal-desktop opt/Signal/resources/app.asar.unpacked/node_modules/sharp/build/Release/sharp.node opt/Signal/resources/app.asar.unpacked/node_modules/sharp/vendor/8.10.6/lib/libvips-cpp.so.42 opt/Signal/resources/app.asar.unpacked/node_modules/zkgroup/libzkgroup.so + opt/Signal/resources/app.asar.unpacked/node_modules/zkgroup/libzkgroup-x64.so opt/Signal/resources/app.asar.unpacked/node_modules/zkgroup/node_modules/ref-napi/build/Release/binding.node" RESTRICT="splitdebug" @@ -96,7 +99,7 @@ src_prepare() { -i usr/share/applications/signal-desktop.desktop || die unpack usr/share/doc/signal-desktop/changelog.gz - rm opt/Signal/resources/app.asar.unpacked/node_modules/{ffi-napi/prebuilds/linux-arm64/node.napi.uv1.armv8.node,ref-napi/prebuilds/linux-arm64/electron.napi.armv8.node,ref-napi/prebuilds/linux-arm64/node.napi.armv8.node} || die + rm opt/Signal/resources/app.asar.unpacked/node_modules/{ffi-napi/node_modules/ref-napi/prebuilds/linux-arm64/electron.napi.armv8.node,ffi-napi/node_modules/ref-napi/prebuilds/linux-arm64/node.napi.armv8.node,ffi-napi/prebuilds/linux-arm64/node.napi.uv1.armv8.node,ref-napi/prebuilds/linux-arm64/electron.napi.armv8.node,ref-napi/prebuilds/linux-arm64/node.napi.armv8.node} || die } src_install() { diff --git a/net-im/teams/Manifest b/net-im/teams/Manifest index 29883372b476..cf22c704145a 100644 --- a/net-im/teams/Manifest +++ b/net-im/teams/Manifest @@ -1,4 +1,3 @@ -AUX fix-url-opening-1.4.00.4855.patch 439 BLAKE2B 57c5a432cf829c58942ac5b9910fee17fe6e08c7bd200d72e474e3919a46258f169b364c999c9b177236e55c318da20d9527475859e55e7f76d919563b3653d9 SHA512 a06d8e576b8a687e552173cff26071778f75b85a5ce3e36c40ba15b7d21d4c9e8323a07dbac2e6d7a5e834d9cbdc359c31868aaef796e4a17e968771d8aa070e DIST teams_1.4.00.13653_amd64.deb 83232268 BLAKE2B bc59aa1f4b9d5f1740fedc7bfc3c2cec6f8b4c1979a55e5a68742c36ea4399ba0e8c276de2d9e5b8de39363a9359136a5d1be59a6019af8bd5ac9922a5aab2c9 SHA512 d15b6cca0321e5e569e6a1f4ad0801f7a2de1e9312e8f584f07a4bc8bcac8a55626eb060a41baf31b9f4cfcd1cf2757e2f2b946f671f0e4c95c81f9eea0f8e2c DIST teams_1.4.00.7556_amd64.deb 77232550 BLAKE2B f663a79a9edb29aecb240722f46cb29aa6f4e2cca6dbe1a29801aee2e9c408b1ad00ab0d2b8fac3c7c4c227429b0382a06b46114921d2f435fbe1c80415ea9d4 SHA512 0afe2714e290e8b2d30039e27a2af4d22cbd03bc4bfe90d6979714ae1cc75bc5226af8932dc38528a5dc5bd6b4820c4b9d9444abcb558a76438c62cff285ffac EBUILD teams-1.4.00.13653-r1.ebuild 3461 BLAKE2B b1dc71a2776ee581fe3ad3d3a91f4e2f47a87d63dea88b5081ea3269565ece5644ca1f2445dd8b01fc59d02a9bbf4a4763a4dd06bad85521ee1bee786ba92859 SHA512 5aacf0035908751601a5bba7821cec053f9a9672c43bd41de29563e4c69d48a22c9d3217d0302eaa8c2d528683ac8865bc58adc745d1ee69c1fa0e5b33758150 diff --git a/net-im/teams/files/fix-url-opening-1.4.00.4855.patch b/net-im/teams/files/fix-url-opening-1.4.00.4855.patch deleted file mode 100644 index 9ff555305119..000000000000 --- a/net-im/teams/files/fix-url-opening-1.4.00.4855.patch +++ /dev/null @@ -1,9 +0,0 @@ ---- a/usr/bin/teams 2021-03-12 09:58:20.095552303 +0100 -+++ b/usr/bin/teams 2021-03-12 09:58:41.938137585 +0100 -@@ -8,5 +8,5 @@ TEAMS_LOGS="$HOME/.config/Microsoft/Micr - - mkdir -p "$TEAMS_LOGS" - --nohup "$TEAMS_PATH" --disable-namespace-sandbox --disable-setuid-sandbox "$@" > "$TEAMS_LOGS/teams-startup.log" 2>&1 & -+nohup "$TEAMS_PATH" "$@" --disable-namespace-sandbox --disable-setuid-sandbox > "$TEAMS_LOGS/teams-startup.log" 2>&1 & - diff --git a/net-im/telegram-desktop/Manifest b/net-im/telegram-desktop/Manifest index 67e6595d805d..6a15a2f9a7ac 100644 --- a/net-im/telegram-desktop/Manifest +++ b/net-im/telegram-desktop/Manifest @@ -4,8 +4,13 @@ AUX tdesktop-2.7.4-fix-disable-dbus-integration.patch 494 BLAKE2B 75e8be933873cc AUX tdesktop-2.7.4-voice-crash.patch 8437 BLAKE2B 6d03b16e8d60318e135340feeb39d6a077bc935f3ca6789da72ab063575128f356f8d4187552ac1ae1c270aed857802375016f84f8d2666facb7ea89c72284c3 SHA512 cabdadddc7a6873c7c6fc8128ceddf2712c0c73d3316520482162e5c67937bda2a627ddb2f078558a52e812c2a876351196488a5a75381d84a43815b873bac5b AUX tdesktop-2.7.4-voice-ffmpeg44.patch 1118 BLAKE2B 21b34c6fbb002be362beb807a8323119b46bf6875de3367006a981808d4648fa56e859728ee10ae51a5655fc921e49412ac4bb81e17667b2e28017a64a10a3f2 SHA512 72ef9bddef1f40e09b9c4334153f1ab8aaddf63d95d9f25dc1b0a0826b7f2ae24f7c5fc4cb5ce90aae2c3144a5d52c4cb870d643f447d654190c4a2c78079354 AUX tdesktop-2.7.4-webview-fix-gcc11.patch 1035 BLAKE2B 929ff52fdadc65d7ce8bc53850adc48ec17c80d6f1e450a50e421c2fc28ee4f07ca88f1371f9812f3e7e2ef402d465418755ce392abd60fe032fa31c216c2753 SHA512 545e307974eff96ff27d9e99ba1272ff0094c403bcbfed4f67f72d8c45c2c6d0682edcee873a11d6aaed8d4f2b7dd820cbc13dc89e7c1072e04105b99a638831 +AUX tdesktop-2.8.9-disable-jemalloc-separately.patch 3723 BLAKE2B 1597dff53ee7a7045b0216ef263fd4c10656a270d0b4fdc3fa9827ba8f2d58288e053c230910717e892854fcf7bb7513b08693d8377f301f5a9d1b74d71d9eb3 SHA512 7cf20bd994a48322f9d3034617a5bf041a1ae7ab5e7cc3da0ac2a9e741ca74975dc5a4188036412317fc77da6b7badf56c582f831daa6a1badfcfb82b6cc2bd3 +AUX tdesktop-2.8.9-disable-webkit-separately.patch 4643 BLAKE2B 7d84cedd4b7b5879fb402193774e40c2b72f6028592e4dc1df1c4a9002dd4e9cbaff505dceb77e443b84c26b4dff6abfc5a99ff28699fb031cc9cb0ea3612280 SHA512 fc3da934e04d19b6f1be42cb095e3aba2a13f0e6a14164558f3da45152b9fa19bc8235d08fd6537933b9fb25d7aee27ec7763173e6395f55bcb9869f71b31088 +AUX tdesktop-2.8.9-webview-fix-glib.patch 1838 BLAKE2B 16b861f0fda72ba1725779880eb67b3adfd0a3dad4c7614beb8f96fa55fecc613f248477557569904c44e6875adbf7912ac9281f1ff71b4b8a6e5d97f9f71e97 SHA512 c3932b6471150d71469606bdbc93d26b57e8eb556e24df9366bad9e51aed073ab18dd7ee14b7445f8df180806a0ca591afdc8c00b0ce34db29575d2dc114b58a DIST tdesktop-2.7.4-full.tar.gz 36894673 BLAKE2B e04749fb0168f8bae69a9ad85c5bff315faf0b355ff5f3a85a34ee36e3305c6b550553284d5179aff9283bbd1a94f9ec3c41e293d0ad8c86e4d08283189e42b3 SHA512 0a796d7a8c5e5982bc60f19c41da53996a609bf794fad224e7beea5fc3816b5cf35f16b0ec2cc7279085c69996063a44085f48e1596dfe746d260a2e8f1b2d14 DIST tdesktop-2.8.1-full.tar.gz 37129127 BLAKE2B 06f2a3050f0e0f321c766c54e19faf3ea172c41088e2ffdbb5928a41ba01de1fc845a84addded17d113316857c68f265642a8ab32feb79a87beef548c739b56c SHA512 df35cc00dc47a8c65b32b62c139cc3a49333f573aa88fb70cc65197524f9b9b4756c58752866c843704ea4df5d6224eb4cba5b32953dd9a4d721b0ee0e1efc69 +DIST tdesktop-2.8.10-full.tar.gz 37105631 BLAKE2B 71a08e0d2fda90898e711dd285478e565ddf7f6bd71db8910688c7f0bb550f04136cb3ccec101d5e89860471ffdd7a868dd90a6317924e96c8ad558d4e3079f2 SHA512 910e34718a061d643937393fa105f2236549059eaecc56aab1203a0efa3a7538f7a2d9b432c8b0a9269118ef3bff56dc1edf856476629efe666d16851e68932f EBUILD telegram-desktop-2.7.4-r1.ebuild 4589 BLAKE2B fee2f81578a4c774fe33592641a6a19592e8fd67623f3424ea599c2adbf425861478f34f01fad970fca31d9fe7545f15fe3d53ec195f60933e701fe287fa59d5 SHA512 ed7de5b99a43621b38ee7589a1f842647f7a9e2619b6984d061183ea3ec5d891c55df2cc5e04568924e30252de26bd3450ec1abce6e8d8edd2ff8be6104900dd EBUILD telegram-desktop-2.8.1.ebuild 4362 BLAKE2B 8388d5963edc83635719974c4c1372becc37e3a4c53aab0b63883c0c4b3c49f8f312d6781ce7a976dde5f066738398245b0fddb899e5440e96622ad99b736b2d SHA512 b351769398c4585e65382200954732e4574d0bb19e05899f67a600102e2ec604086cf07cbc724a6d108f42081a367f47170bfef94bdf356cef1de8665e8e9c19 +EBUILD telegram-desktop-2.8.10.ebuild 4492 BLAKE2B 1499b0b473e0d4be84048009de7279a6b47795b9242ec2e3eee3e126f7902bb67963e22888cb10a67e8fdc33589d6591cf9905c38f1a3e8b68a84a2c84dd3fb0 SHA512 258dcacb57cb3326d4e17638c593f71227d8a277e9255183be6548c136dadb7d9e925618df37066611cf121c5647a6b58000047cdde6020eb992215b2b2e9345 MISC metadata.xml 587 BLAKE2B 1f49c91d650d26ba9fd95e9cbcb793ed527d58bf0ccc81ebddb624d54c4af38cc7aff3cf799814932a69b2a6f36dad7fe1c5ce4eb82e562e46dcebca9b751308 SHA512 5e74bb555b2b1a513bd8c7450a3db2f46daa426eecc0d3cebf11d46e58124ef117697bc422f7fccd8757f2e6e8ce6bd8ff0e317b58740dd302c1ea2f2476ff3f diff --git a/net-im/telegram-desktop/files/tdesktop-2.8.9-disable-jemalloc-separately.patch b/net-im/telegram-desktop/files/tdesktop-2.8.9-disable-jemalloc-separately.patch new file mode 100644 index 000000000000..dff2455d4e3d --- /dev/null +++ b/net-im/telegram-desktop/files/tdesktop-2.8.9-disable-jemalloc-separately.patch @@ -0,0 +1,100 @@ +Allow controlling the use of jemalloc + +Jemalloc is often controlled through USE=jemalloc in Gentoo. Removing or +replacing it is trivial, and I'm not aware of any particular advantages that +come with using this allocator, especially for an IM client. Benchmarks +regarding this allocator provide a huge variety of results depending on the +workload and system, so it's hard to establish when this allocator provides any +tangible advantage. + +Considering things like Hardened Gentoo, the user might prefer to use a more +exploit-resistant allocator, like GrapheneOS/hardened_malloc, and I've heard +Musl is hardening their allocator as well. + +I trust the user can better judge if they need this in their particular setup. + +If a telegram dev is reading this, feel free to drop me a message (metadata.xml +contains the maintainer's address), if you believe it should be forced due to +usability concerns, or if you can provide me with some context I might be +missing. Jemalloc is currently enabled by default. + +--- tdesktop-2.8.9-full.orig/Telegram/SourceFiles/platform/linux/specific_linux.cpp ++++ tdesktop-2.8.9-full/Telegram/SourceFiles/platform/linux/specific_linux.cpp +@@ -48,7 +48,10 @@ + #include <gio/gio.h> + #include <glibmm.h> + #include <giomm.h> ++ ++#ifndef DESKTOP_APP_DISABLE_JEMALLOC + #include <jemalloc/jemalloc.h> ++#endif // !DESKTOP_APP_DISABLE_JEMALLOC + + #include <sys/stat.h> + #include <sys/types.h> +@@ -727,8 +730,10 @@ + namespace Platform { + + void start() { ++#ifndef DESKTOP_APP_DISABLE_JEMALLOC + auto backgroundThread = true; + mallctl("background_thread", nullptr, nullptr, &backgroundThread, sizeof(bool)); ++#endif // !DESKTOP_APP_DISABLE_JEMALLOC + + LOG(("Launcher filename: %1").arg(QGuiApplication::desktopFileName())); + +--- tdesktop-2.8.9-full.orig/cmake/external/CMakeLists.txt ++++ tdesktop-2.8.9-full/cmake/external/CMakeLists.txt +@@ -37,7 +37,7 @@ + add_checked_subdirectory(hunspell) + endif() + add_checked_subdirectory(iconv) +-if (LINUX) ++if (LINUX AND NOT DESKTOP_APP_DISABLE_JEMALLOC) + add_checked_subdirectory(jemalloc) + endif() + add_checked_subdirectory(jpeg) +--- tdesktop-2.8.9-full.orig/cmake/options.cmake ++++ tdesktop-2.8.9-full/cmake/options.cmake +@@ -56,6 +56,13 @@ + ) + endif() + ++if (DESKTOP_APP_DISABLE_JEMALLOC) ++ target_compile_definitions(common_options ++ INTERFACE ++ DESKTOP_APP_DISABLE_JEMALLOC ++ ) ++endif() ++ + if (DESKTOP_APP_USE_PACKAGED) + target_compile_definitions(common_options + INTERFACE +--- tdesktop-2.8.9-full.orig/cmake/options_linux.cmake ++++ tdesktop-2.8.9-full/cmake/options_linux.cmake +@@ -58,10 +58,12 @@ + endif() + endif() + +-target_link_libraries(common_options +-INTERFACE +- desktop-app::external_jemalloc +-) ++if (NOT DESKTOP_APP_DISABLE_JEMALLOC) ++ target_link_libraries(common_options ++ INTERFACE ++ desktop-app::external_jemalloc ++ ) ++endif() + + if (DESKTOP_APP_USE_PACKAGED) + find_library(ATOMIC_LIBRARY atomic) +--- tdesktop-2.8.9-full.orig/cmake/variables.cmake ++++ tdesktop-2.8.9-full/cmake/variables.cmake +@@ -38,6 +38,7 @@ + option(DESKTOP_APP_USE_PACKAGED_FFMPEG_STATIC "Link ffmpeg statically in packaged mode." OFF) + option(DESKTOP_APP_DISABLE_SPELLCHECK "Disable spellcheck library." ${osx_special_target}) + option(DESKTOP_APP_DISABLE_WEBKIT "Disable WebkitGTK library (Linux only)." OFF) ++option(DESKTOP_APP_DISABLE_JEMALLOC "Disable use of the jemalloc allocator (Linux only)." OFF) + option(DESKTOP_APP_DISABLE_CRASH_REPORTS "Disable crash report generation." ${no_special_target}) + option(DESKTOP_APP_DISABLE_AUTOUPDATE "Disable autoupdate." ${disable_autoupdate}) + option(DESKTOP_APP_USE_HUNSPELL_ONLY "Disable system spellchecker and use bundled Hunspell only. (For debugging purposes)" OFF) diff --git a/net-im/telegram-desktop/files/tdesktop-2.8.9-disable-webkit-separately.patch b/net-im/telegram-desktop/files/tdesktop-2.8.9-disable-webkit-separately.patch new file mode 100644 index 000000000000..388e09fa58d2 --- /dev/null +++ b/net-im/telegram-desktop/files/tdesktop-2.8.9-disable-webkit-separately.patch @@ -0,0 +1,122 @@ +Allow controlling the use of webkit-gtk + +WebKitGTK is used to display payment pages when buying things in Telegram +shops. This library can be disabled properly alongside the GTK integration with +its flag. However, I reckon *most* users want the GTK integration (fixes +pasting big images, amongst other things), but hardly anyone actually buys +things through Telegram. Controlling these two things separately is trivial, and +the user gets a nice dialog telling them WebKitGTK isn't available in the event +they *do* attempt to use the related features. + +NOTE: GTK integration *must* be enabled for WebKitGTK to work. + +--- tdesktop-2.8.9-full.orig/Telegram/SourceFiles/platform/linux/linux_gtk_integration.cpp ++++ tdesktop-2.8.9-full/Telegram/SourceFiles/platform/linux/linux_gtk_integration.cpp +@@ -587,9 +587,11 @@ + if (const auto integration = BaseGtkIntegration::Instance()) { + return integration->exec(parentDBusName); + } ++#ifndef DESKTOP_APP_DISABLE_WEBKIT + } else if (type == Type::Webview) { + Webview::WebKit2Gtk::SetServiceName(serviceName.toStdString()); + return Webview::WebKit2Gtk::Exec(parentDBusName.toStdString()); ++#endif + } else if (type == Type::TDesktop) { + ServiceName = serviceName.toStdString(); + if (const auto integration = Instance()) { +@@ -602,7 +604,9 @@ + + void GtkIntegration::Start(Type type) { + if (type != Type::Base ++#ifndef DESKTOP_APP_DISABLE_WEBKIT + && type != Type::Webview ++#endif + && type != Type::TDesktop) { + return; + } +@@ -613,11 +617,13 @@ + + if (type == Type::Base) { + BaseGtkIntegration::SetServiceName(kBaseService.utf16().arg(h)); ++#ifndef DESKTOP_APP_DISABLE_WEBKIT + } else if (type == Type::Webview) { + Webview::WebKit2Gtk::SetServiceName( + kWebviewService.utf16().arg(h).arg("%1").toStdString()); + + return; ++#endif + } else { + ServiceName = kService.utf16().arg(h).toStdString(); + } +--- tdesktop-2.8.9-full.orig/Telegram/lib_webview/CMakeLists.txt ++++ tdesktop-2.8.9-full/Telegram/lib_webview/CMakeLists.txt +@@ -48,7 +48,7 @@ + nuget_add_webview(lib_webview) + nuget_add_winrt(lib_webview) + elseif (LINUX) +- if (NOT DESKTOP_APP_DISABLE_GTK_INTEGRATION) ++ if (NOT DESKTOP_APP_DISABLE_WEBKIT) + find_package(PkgConfig REQUIRED) + + if (DESKTOP_APP_USE_PACKAGED AND NOT DESKTOP_APP_USE_PACKAGED_LAZY) +--- tdesktop-2.8.9-full.orig/Telegram/lib_webview/webview/platform/linux/webview_linux.cpp ++++ tdesktop-2.8.9-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 + return WebKit2Gtk::Availability(); +-#else // !DESKTOP_APP_DISABLE_GTK_INTEGRATION ++#else // !DESKTOP_APP_DISABLE_WEBKIT + 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 + } + + bool SupportsEmbedAfterCreate() { +@@ -26,11 +26,11 @@ + } + + std::unique_ptr<Interface> CreateInstance(Config config) { +-#ifndef DESKTOP_APP_DISABLE_GTK_INTEGRATION ++#ifndef DESKTOP_APP_DISABLE_WEBKIT + return WebKit2Gtk::CreateInstance(std::move(config)); +-#else // !DESKTOP_APP_DISABLE_GTK_INTEGRATION ++#else // !DESKTOP_APP_DISABLE_WEBKIT + return nullptr; +-#endif // DESKTOP_APP_DISABLE_GTK_INTEGRATION ++#endif // DESKTOP_APP_DISABLE_WEBKIT + } + + } // namespace Webview +--- tdesktop-2.8.9-full.orig/cmake/options.cmake ++++ tdesktop-2.8.9-full/cmake/options.cmake +@@ -49,6 +49,13 @@ + ) + endif() + ++if (DESKTOP_APP_DISABLE_WEBKIT) ++ target_compile_definitions(common_options ++ INTERFACE ++ DESKTOP_APP_DISABLE_WEBKIT ++ ) ++endif() ++ + if (DESKTOP_APP_USE_PACKAGED) + target_compile_definitions(common_options + INTERFACE +--- tdesktop-2.8.9-full.orig/cmake/variables.cmake ++++ tdesktop-2.8.9-full/cmake/variables.cmake +@@ -37,6 +37,7 @@ + option(DESKTOP_APP_USE_PACKAGED_LAZY "Bundle recommended Qt plugins for self-contained packages. (Linux only)" OFF) + option(DESKTOP_APP_USE_PACKAGED_FFMPEG_STATIC "Link ffmpeg statically in packaged mode." OFF) + option(DESKTOP_APP_DISABLE_SPELLCHECK "Disable spellcheck library." ${osx_special_target}) ++option(DESKTOP_APP_DISABLE_WEBKIT "Disable WebkitGTK library (Linux only)." OFF) + option(DESKTOP_APP_DISABLE_CRASH_REPORTS "Disable crash report generation." ${no_special_target}) + option(DESKTOP_APP_DISABLE_AUTOUPDATE "Disable autoupdate." ${disable_autoupdate}) + option(DESKTOP_APP_USE_HUNSPELL_ONLY "Disable system spellchecker and use bundled Hunspell only. (For debugging purposes)" OFF) diff --git a/net-im/telegram-desktop/files/tdesktop-2.8.9-webview-fix-glib.patch b/net-im/telegram-desktop/files/tdesktop-2.8.9-webview-fix-glib.patch new file mode 100644 index 000000000000..02c96d28b2c1 --- /dev/null +++ b/net-im/telegram-desktop/files/tdesktop-2.8.9-webview-fix-glib.patch @@ -0,0 +1,31 @@ +Fixes an issue with glib headers including a C++ header inside extern "C" + +This patch is a hacky workaround, proper solution doesn't seem trivial. + +In file included from /usr/include/glib-2.0/glib/gatomic.h:31, + from /usr/include/glib-2.0/glib/gthread.h:32, + from /usr/include/glib-2.0/glib/gasyncqueue.h:32, + from /usr/include/glib-2.0/glib.h:32, + from /usr/include/gtk-3.0/gdk/gdkconfig.h:13, + from /usr/include/gtk-3.0/gdk/gdk.h:30, + from /usr/include/gtk-3.0/gtk/gtk.h:30, + from /var/tmp/portage/net-im/telegram-desktop-2.8.9/work/tdesktop-2.8.9-full/Telegram/lib_webview/webview/platform/linux/webview_linux_webkit_gtk.h:11, + from /var/tmp/portage/net-im/telegram-desktop-2.8.9/work/tdesktop-2.8.9-full/Telegram/lib_webview/webview/platform/linux/webview_linux_webkit_gtk.cpp:7: +/usr/lib/gcc/x86_64-pc-linux-gnu/11.1.0/include/g++-v11/type_traits:56:3: error: template with C linkage + 56 | template<typename _Tp, _Tp __v> + | ^~~~~~~~ +In file included from /var/tmp/portage/net-im/telegram-desktop-2.8.9/work/tdesktop-2.8.9-full/Telegram/lib_webview/webview/platform/linux/webview_linux_webkit_gtk.cpp:7: +/var/tmp/portage/net-im/telegram-desktop-2.8.9/work/tdesktop-2.8.9-full/Telegram/lib_webview/webview/platform/linux/webview_linux_webkit_gtk.h:9:1: note: extern "C" linkage started here + 9 | extern "C" { + | ^~~~~~~~~~ + +--- tdesktop-2.8.9-full.orig/Telegram/lib_webview/webview/platform/linux/webview_linux_webkit_gtk.h ++++ tdesktop-2.8.9-full/Telegram/lib_webview/webview/platform/linux/webview_linux_webkit_gtk.h +@@ -6,6 +6,7 @@ + // + #pragma once + ++#include <type_traits> // Required for glib/gatomic.h + extern "C" { + #include <JavaScriptCore/JavaScript.h> + #include <gtk/gtk.h> diff --git a/net-im/telegram-desktop/telegram-desktop-2.8.10.ebuild b/net-im/telegram-desktop/telegram-desktop-2.8.10.ebuild new file mode 100644 index 000000000000..69bfb7c3a172 --- /dev/null +++ b/net-im/telegram-desktop/telegram-desktop-2.8.10.ebuild @@ -0,0 +1,147 @@ +# Copyright 2020-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +PYTHON_COMPAT=( python3_{7..10} ) + +inherit xdg cmake python-any-r1 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" + +LICENSE="BSD GPL-3-with-openssl-exception LGPL-2+" +SLOT="0" +KEYWORDS="~amd64 ~ppc64" +IUSE="+dbus enchant +gtk +hunspell +jemalloc +spell wayland webkit +X" +REQUIRED_USE=" + spell? ( + ^^ ( enchant hunspell ) + ) + webkit? ( gtk ) + gtk? ( dbus ) +" + +RDEPEND=" + !net-im/telegram-desktop-bin + app-arch/lz4:= + dev-cpp/glibmm:2 + dev-libs/xxhash + >=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(-)?] + media-fonts/open-sans + media-libs/fontconfig:= + ~media-libs/libtgvoip-2.4.4_p20210302 + >=media-libs/libtgvoip-2.4.4_p20210302-r2 + media-libs/openal + media-libs/opus:= + media-libs/rnnoise + ~media-libs/tg_owt-0_pre20210626 + 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?,wayland?] ) + hunspell? ( >=app-text/hunspell-1.7:= ) + jemalloc? ( dev-libs/jemalloc:= ) + 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 +" + +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.8.9-disable-webkit-separately.patch" + # Not going to attempt upstreaming this after the reaction to + # "disable-webkit-separately" + "${FILESDIR}/tdesktop-2.8.9-disable-jemalloc-separately.patch" + # Not a proper fix, not upstreamed + "${FILESDIR}/tdesktop-2.8.9-webview-fix-glib.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=$(usex webkit OFF ON) + -DDESKTOP_APP_DISABLE_JEMALLOC=$(usex jemalloc 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" +} |