diff options
Diffstat (limited to 'net-im')
118 files changed, 1951 insertions, 1908 deletions
diff --git a/net-im/bitlbee-facebook/metadata.xml b/net-im/bitlbee-facebook/metadata.xml index 4e8c1c1c58ad..1edcb6c6986c 100644 --- a/net-im/bitlbee-facebook/metadata.xml +++ b/net-im/bitlbee-facebook/metadata.xml @@ -1,14 +1,10 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> - <maintainer type="person" proxied="yes"> - <email>arkamar@atlas.cz</email> + <maintainer type="person"> + <email>arkamar@gentoo.org</email> <name>Petr Vaněk</name> </maintainer> - <maintainer type="project" proxied="proxy"> - <email>proxy-maint@gentoo.org</email> - <name>Proxy Maintainers</name> - </maintainer> <upstream> <maintainer status="active"> <email>jgeboski@gmail.com</email> diff --git a/net-im/bitlbee-steam/bitlbee-steam-1.4.2.ebuild b/net-im/bitlbee-steam/bitlbee-steam-1.4.2.ebuild index 485f9d30d9b9..e49b0bf478ea 100644 --- a/net-im/bitlbee-steam/bitlbee-steam-1.4.2.ebuild +++ b/net-im/bitlbee-steam/bitlbee-steam-1.4.2.ebuild @@ -1,7 +1,7 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=8 inherit autotools @@ -23,8 +23,8 @@ RDEPEND=" dev-libs/glib:2 dev-libs/libgcrypt:0= >=net-im/bitlbee-3.4[plugins]" -DEPEND="${RDEPEND} - virtual/pkgconfig" +DEPEND="${RDEPEND}" +BDEPEND="virtual/pkgconfig" src_prepare() { default diff --git a/net-im/bitlbee-steam/bitlbee-steam-9999.ebuild b/net-im/bitlbee-steam/bitlbee-steam-9999.ebuild index 485f9d30d9b9..e49b0bf478ea 100644 --- a/net-im/bitlbee-steam/bitlbee-steam-9999.ebuild +++ b/net-im/bitlbee-steam/bitlbee-steam-9999.ebuild @@ -1,7 +1,7 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=8 inherit autotools @@ -23,8 +23,8 @@ RDEPEND=" dev-libs/glib:2 dev-libs/libgcrypt:0= >=net-im/bitlbee-3.4[plugins]" -DEPEND="${RDEPEND} - virtual/pkgconfig" +DEPEND="${RDEPEND}" +BDEPEND="virtual/pkgconfig" src_prepare() { default diff --git a/net-im/bitlbee/metadata.xml b/net-im/bitlbee/metadata.xml index 0541d2f03527..99fc3dd0270a 100644 --- a/net-im/bitlbee/metadata.xml +++ b/net-im/bitlbee/metadata.xml @@ -1,14 +1,10 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> - <maintainer type="person" proxied="yes"> - <email>arkamar@atlas.cz</email> + <maintainer type="person"> + <email>arkamar@gentoo.org</email> <name>Petr Vaněk</name> </maintainer> - <maintainer type="project" proxied="proxy"> - <email>proxy-maint@gentoo.org</email> - <name>Proxy Maintainers</name> - </maintainer> <use> <flag name="libevent">Use libevent for event handling</flag> <flag name="nss">Prefer <pkg>dev-libs/nss</pkg> as SSL/TLS provider</flag> diff --git a/net-im/dino/Manifest b/net-im/dino/Manifest index d45bd4206da7..674adcabd18e 100644 --- a/net-im/dino/Manifest +++ b/net-im/dino/Manifest @@ -1 +1,2 @@ DIST dino-0.4.2.tar.gz 882421 BLAKE2B 36c0487a19202506e4de69afd923991c912e82c974f61e787ff4af37a40133fdbdb02315e82f7e85ccb8b3cd7d734aed7f8508ca31c1ffec49674ef68f71793b SHA512 b5d5b9e2ab2ff24f53778303e5428ed0613537944cf5d9139aa7e13558ee40ffb1566c6e9267dd802938a6abf0f0d5fbe94ef17fb3e18a11d47cc0d040928d19 +DIST dino-0.4.3.tar.gz 883558 BLAKE2B 31ea5eafedcaabbc1ec99c72b5a0c1a6f80462ce3f8288b2d54d68106cfb9a31d3ac525660cd1ff7bf0faf2fbfdb2f47dd37672cc0f2b3283121fd364f670092 SHA512 c3e5e3ba05d7190206a8a3144002eac94f162525ab229edd420215eff3d5644293d0c8737266f0ed9f112313b2e6e83fb02fcc10d0f568fb5b2295238ebe78ea diff --git a/net-im/dino/dino-0.4.2-r1.ebuild b/net-im/dino/dino-0.4.2-r2.ebuild index 5746d3e99bf0..de4977426bc8 100644 --- a/net-im/dino/dino-0.4.2-r1.ebuild +++ b/net-im/dino/dino-0.4.2-r2.ebuild @@ -28,7 +28,7 @@ RDEPEND=" dev-libs/icu:= dev-libs/libgee:0.8= gui-libs/gtk:4 - >=gui-libs/libadwaita-1.2.0:1 + >=gui-libs/libadwaita-1.2.0:1[vala] media-libs/graphene net-libs/glib-networking net-libs/gnutls:= @@ -77,6 +77,7 @@ src_configure() { "-DENABLED_PLUGINS=$(local IFS=";"; echo "${enabled_plugins[*]}")" "-DDISABLED_PLUGINS=$(local IFS=";"; echo "${disabled_plugins[*]}")" "-DVALA_EXECUTABLE=${VALAC}" + "-DSOUP_VERSION=2" "-DBUILD_TESTS=$(usex test)" ) diff --git a/net-im/dino/dino-0.4.3.ebuild b/net-im/dino/dino-0.4.3.ebuild new file mode 100644 index 000000000000..443a60ca974f --- /dev/null +++ b/net-im/dino/dino-0.4.3.ebuild @@ -0,0 +1,99 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit cmake vala xdg readme.gentoo-r1 + +DESCRIPTION="Modern Jabber/XMPP Client using GTK+/Vala" +HOMEPAGE="https://dino.im" + +LICENSE="GPL-3" +SLOT="0" +IUSE="+gpg +http +omemo +notification-sound +rtp test" +RESTRICT="!test? ( test )" + +MY_REPO_URI="https://github.com/dino/dino" +if [[ ${PV} == "9999" ]]; then + EGIT_REPO_URI="${MY_REPO_URI}.git" + inherit git-r3 +else + KEYWORDS="~amd64 ~arm64" + SRC_URI="${MY_REPO_URI}/releases/download/v${PV}/${P}.tar.gz" +fi + +RDEPEND=" + dev-db/sqlite:3 + dev-libs/glib:2 + dev-libs/icu:= + dev-libs/libgee:0.8= + gui-libs/gtk:4 + >=gui-libs/libadwaita-1.2.0:1[vala] + media-libs/graphene + net-libs/glib-networking + net-libs/gnutls:= + >=net-libs/libnice-0.1.15 + net-libs/libsignal-protocol-c + net-libs/libsrtp:2= + x11-libs/cairo + x11-libs/gdk-pixbuf:2 + x11-libs/pango + gpg? ( app-crypt/gpgme:= ) + http? ( net-libs/libsoup:2.4 ) + notification-sound? ( media-libs/libcanberra:0[sound] ) + omemo? ( + dev-libs/libgcrypt:= + media-gfx/qrencode:= + ) + rtp? ( + media-libs/gst-plugins-base:1.0 + media-libs/gstreamer:1.0 + media-libs/webrtc-audio-processing:0 + ) +" +DEPEND=" + ${RDEPEND} + media-libs/gst-plugins-base + media-libs/gstreamer +" +BDEPEND=" + sys-devel/gettext + $(vala_depend) +" + +src_configure() { + vala_setup + + local disabled_plugins=( + $(usex gpg "" "openpgp") + $(usex omemo "" "omemo") + $(usex http "" "http-files") + $(usex rtp "" rtp) + ) + local enabled_plugins=( + $(usex notification-sound "notification-sound" "") + ) + local mycmakeargs=( + "-DENABLED_PLUGINS=$(local IFS=";"; echo "${enabled_plugins[*]}")" + "-DDISABLED_PLUGINS=$(local IFS=";"; echo "${disabled_plugins[*]}")" + "-DVALA_EXECUTABLE=${VALAC}" + "-DSOUP_VERSION=2" + "-DBUILD_TESTS=$(usex test)" + ) + + cmake_src_configure +} + +src_test() { + "${BUILD_DIR}"/xmpp-vala-test || die +} + +src_install() { + cmake_src_install + readme.gentoo_create_doc +} + +pkg_postinst() { + xdg_pkg_postinst + readme.gentoo_print_elog +} diff --git a/net-im/dino/dino-9999.ebuild b/net-im/dino/dino-9999.ebuild index 2b090f8e836f..443a60ca974f 100644 --- a/net-im/dino/dino-9999.ebuild +++ b/net-im/dino/dino-9999.ebuild @@ -18,7 +18,7 @@ if [[ ${PV} == "9999" ]]; then EGIT_REPO_URI="${MY_REPO_URI}.git" inherit git-r3 else - KEYWORDS="amd64" + KEYWORDS="~amd64 ~arm64" SRC_URI="${MY_REPO_URI}/releases/download/v${PV}/${P}.tar.gz" fi @@ -28,7 +28,7 @@ RDEPEND=" dev-libs/icu:= dev-libs/libgee:0.8= gui-libs/gtk:4 - >=gui-libs/libadwaita-1.2.0:1 + >=gui-libs/libadwaita-1.2.0:1[vala] media-libs/graphene net-libs/glib-networking net-libs/gnutls:= @@ -77,6 +77,7 @@ src_configure() { "-DENABLED_PLUGINS=$(local IFS=";"; echo "${enabled_plugins[*]}")" "-DDISABLED_PLUGINS=$(local IFS=";"; echo "${disabled_plugins[*]}")" "-DVALA_EXECUTABLE=${VALAC}" + "-DSOUP_VERSION=2" "-DBUILD_TESTS=$(usex test)" ) diff --git a/net-im/discord/Manifest b/net-im/discord/Manifest index 24d8c28d11e5..c222761001f1 100644 --- a/net-im/discord/Manifest +++ b/net-im/discord/Manifest @@ -1 +1 @@ -DIST discord-0.0.27.tar.gz 92317071 BLAKE2B 5328abd5f6aba87c73ee26cc6387dd9af7745c003e67b70e168153a959f5f582d118d38ce0b45ff4a9165ff1423708b05d468824c880e4685755df41ceadd5e1 SHA512 285a0119b4740402a3fa94d3679a52bc8d883413ee32187e90087960a4d34aaf316788d2708bbccafe3f995c2b99767b45bc4b7c731704ef887a8de1b3d3926f +DIST discord-0.0.37.tar.gz 92978089 BLAKE2B ebdc2e74e4c92dac32d06c1039d6199e91d1a8e76bdb51a8caa1ef4f80fbbf82e93a54811104bb6144a4ebb0d0a61b114445d0049cea23312adb8c9d5755138f SHA512 495969155a99364a22fef5d830adec5c03c25ac118d560b1e346fa9190866f9a038c07664124f8f835b77ba4e4d2a268a8eab86dea54274de4904ec374a2c005 diff --git a/net-im/discord/discord-0.0.27.ebuild b/net-im/discord/discord-0.0.37.ebuild index 0c75ad505e10..2a6bf51369d6 100644 --- a/net-im/discord/discord-0.0.27.ebuild +++ b/net-im/discord/discord-0.0.37.ebuild @@ -6,7 +6,6 @@ EAPI=8 MY_PN="${PN/-bin/}" MY_PV="${PV/-r*/}" -CHROMIUM_VERSION="102" CHROMIUM_LANGS=" af am ar bg bn ca cs da de el en-GB en-US es es-419 et fa fi fil fr gu he hi hr hu id it ja kn ko lt lv ml mr ms nb nl pl pt-BR pt-PT ro ru sk sl sr sv diff --git a/net-im/ejabberd/Manifest b/net-im/ejabberd/Manifest index e8affd8a2f51..7b6645103ecf 100644 --- a/net-im/ejabberd/Manifest +++ b/net-im/ejabberd/Manifest @@ -1,4 +1,3 @@ -DIST ejabberd-22.05.tar.gz 2527957 BLAKE2B d7fc614b8fe88bc8997d78821334a5e26a4201a5d199e6a04fe668e192ed0c7a37b68aff2fd9c6740844634c005b492b1dd76de4b9ed841863d0285f6097edd9 SHA512 33f98a9c45ff8257d240e7b90181e399ecab84e361f5619dc8d57252642e81d4958467cfa89b90681f3cf0d1d56a3079eb98d4e80cc6af5ca11938bb2a69f865 -DIST ejabberd-22.05.tar.gz.asc 195 BLAKE2B 634cb0a338c68d8ee1d3b2e3e267a758deff3a925c93273c5aaa209d12a5bb40565831869cc7e81fa66de8648211eb60f9644ac7d4d0ec557e9332a8cdd9dfce SHA512 42ffc224915f3f0ac4df42cfe0c35e65861be38856e398ac6172cdcbf5de543ae808a4b201a1c1d64d10234d02d754d1376ff21ee9d679095497479c717c17da DIST ejabberd-22.10.tar.gz 2553163 BLAKE2B 670721da1800b489103df49c24bb961cb048e02faffa57921c9740f2effadb8fd5b70841afaf9fc56160e4bb00d6d6d73014cdd3e2aaa683c351fd0d42d53bf3 SHA512 3010b0767017d63c1b1a8b062f881d98be6308f2ae065c58302288096058ed8030e37c73eaf037ee1e61d1040f4e61071b2d62e146c61109ee782b9e6b708942 DIST ejabberd-23.01.tar.gz 2569272 BLAKE2B c8c06204ed6c4992d86b7fcc1a949883267364433fc5d6d05f2214f093301b3fc4cda7b5b078e3ebd1334a418173fd5decd902f582fe0492b2f2f19c39ac88e4 SHA512 3fe11123d24e430fa10d18aabb9cc9613bc25ee48d6c64a642ae1d0d458f220df638b94cde444241399e0d0777a4f64995ad7e37f963f1ee92bbb114ed431c4b +DIST ejabberd-23.04.tar.gz 2581686 BLAKE2B 292da892f62d6940418980bfaec63f3aa570f0af4c78be80ff6996d13269f5303ff9ecd88c0fa4ba8daecf5183a7eb31a7048f3425d128b03cc7029a3198ff0d SHA512 2edb437baae54afd625222f2b251549af3ec469b535a10109679f1edd27fc840579351499f9bc79e8d0d17f752065787eb52607f886e5599386dbed52c8aecab diff --git a/net-im/ejabberd/ejabberd-23.01.ebuild b/net-im/ejabberd/ejabberd-23.01.ebuild index 99ac7b8d7df3..82b509558d13 100644 --- a/net-im/ejabberd/ejabberd-23.01.ebuild +++ b/net-im/ejabberd/ejabberd-23.01.ebuild @@ -13,7 +13,7 @@ SRC_URI=" LICENSE="GPL-2" SLOT="0" -KEYWORDS="~amd64 ~arm ~ia64 ~sparc ~x86" +KEYWORDS="amd64 ~arm ~ia64 ~sparc ~x86" REQUIRED_USE="mssql? ( odbc )" # TODO: Add 'tools' flag. IUSE="captcha debug full-xml ldap mssql mysql odbc pam postgres redis diff --git a/net-im/ejabberd/ejabberd-22.05-r2.ebuild b/net-im/ejabberd/ejabberd-23.04.ebuild index ebb3a879d1e2..ff7f7e0f5d09 100644 --- a/net-im/ejabberd/ejabberd-22.05-r2.ebuild +++ b/net-im/ejabberd/ejabberd-23.04.ebuild @@ -1,21 +1,19 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 -inherit autotools pam rebar systemd verify-sig +inherit autotools pam rebar systemd DESCRIPTION="Robust, scalable and extensible XMPP server" HOMEPAGE="https://www.ejabberd.im/ https://github.com/processone/ejabberd/" SRC_URI=" https://github.com/processone/${PN}/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz - verify-sig? ( https://github.com/processone/${PN}/releases/download/${PV}/${P}.tar.gz.asc ) " -VERIFY_SIG_OPENPGP_KEY_PATH=${BROOT}/usr/share/openpgp-keys/process-one.net.asc LICENSE="GPL-2" SLOT="0" -KEYWORDS="amd64 ~arm ~ia64 ~sparc ~x86" +KEYWORDS="~amd64 ~arm ~ia64 ~sparc ~x86" REQUIRED_USE="mssql? ( odbc )" # TODO: Add 'tools' flag. IUSE="captcha debug full-xml ldap mssql mysql odbc pam postgres redis @@ -31,31 +29,31 @@ DEPEND=" >=dev-lang/erlang-19.3[odbc?,ssl] >=dev-erlang/cache_tab-1.0.30 >=dev-erlang/eimp-1.0.22 - >=dev-erlang/fast_tls-1.1.15 + >=dev-erlang/fast_tls-1.1.16 >=dev-erlang/fast_xml-1.1.49 - >=dev-erlang/fast_yaml-1.0.33 - >=dev-erlang/yconf-1.0.13 + >=dev-erlang/fast_yaml-1.0.36 + >=dev-erlang/yconf-1.0.15 >=dev-erlang/jiffy-1.0.5 - >=dev-erlang/jose-1.11.2 + >=dev-erlang/jose-1.11.5 >=dev-erlang/lager-3.9.1 >=dev-erlang/p1_oauth2-0.6.11 >=dev-erlang/p1_utils-1.0.25 - >=dev-erlang/stringprep-1.0.28 - >=dev-erlang/xmpp-1.5.6 + >=dev-erlang/stringprep-1.0.29 + >=dev-erlang/xmpp-1.6.2 >=dev-erlang/pkix-1.0.9 >=dev-erlang/mqtree-1.0.15 >=dev-erlang/idna-6.0.0-r1 - >=dev-erlang/p1_acme-1.0.19 + >=dev-erlang/p1_acme-1.0.22 >=dev-erlang/base64url-1.0.1 ldap? ( =net-nds/openldap-2* ) - mysql? ( >=dev-erlang/p1_mysql-1.0.19 ) + mysql? ( >=dev-erlang/p1_mysql-1.0.21 ) odbc? ( dev-db/unixODBC ) - pam? ( >=dev-erlang/epam-1.0.12 ) - postgres? ( >=dev-erlang/p1_pgsql-1.1.18 ) + pam? ( >=dev-erlang/epam-1.0.14 ) + postgres? ( >=dev-erlang/p1_pgsql-1.1.22 ) redis? ( >=dev-erlang/eredis-1.2.0 ) - sip? ( >=dev-erlang/esip-1.0.45 ) - sqlite? ( >=dev-erlang/sqlite3-1.1.13 ) - stun? ( >=dev-erlang/stun-1.2.2 ) + sip? ( >=dev-erlang/esip-1.0.49 ) + sqlite? ( >=dev-erlang/sqlite3-1.1.14 ) + stun? ( >=dev-erlang/stun-1.2.7 ) zlib? ( >=dev-erlang/ezlib-1.0.12 ) " RDEPEND=" @@ -64,11 +62,10 @@ RDEPEND=" captcha? ( media-gfx/imagemagick[truetype,png] ) selinux? ( sec-policy/selinux-jabber ) " -BDEPEND="verify-sig? ( sec-keys/openpgp-keys-processone )" DOCS=( CHANGELOG.md README.md ) PATCHES=( - "${FILESDIR}/adjust-ejabberd.service.template-to-Gentoo.patch" + "${FILESDIR}/ejabberd-22.10-adjust-ejabberd.service.template-to-Gentoo.patch" ) # Get path to ejabberd lib directory. @@ -92,9 +89,6 @@ src_prepare() { sed -e "/^EJABBERDDIR[[:space:]]*=/{s:ejabberd:${P}:}" \ -i "${S}/Makefile.in" \ || die 'failed to set ejabberd path in Makefile.in' - sed -e "/EJABBERD_BIN_PATH=/{s:ejabberd:${P}:}" \ - -i "${S}/ejabberdctl.template" \ - || die 'failed to set ejabberd path in ejabberdctl.template' # Get epam-wrapper from 'files' directory and correct path to lib directory in # it. epam-wrapper is placed into work directory. It is assumed no epam-wrapper @@ -150,7 +144,7 @@ src_compile() { # invoke the 'install' target (in src_install below), DESTDIR is # set, which causes DESTDIR to scope into the ejabberdctl.example # generation. - emake REBAR='rebar -v' src ejabberdctl.example + emake REBAR='rebar -v' src ejabberdctl.example ejabberd.service } src_install() { diff --git a/net-im/element-desktop-bin/Manifest b/net-im/element-desktop-bin/Manifest index 8536af54ee5d..f81956b558c3 100644 --- a/net-im/element-desktop-bin/Manifest +++ b/net-im/element-desktop-bin/Manifest @@ -1 +1 @@ -DIST element-desktop_1.11.31_amd64.deb 88304718 BLAKE2B 65a47125d08e36cfaeac54efebe74e24551aed987569de9252e6af35ecff88bc65fd072963ccfde29f988cbf616bcfceaa2740a69007302d111557c883f6e783 SHA512 d709ce23b3bffc8685cb8c0f818e0ddc19697db9abc832f170b29bf3fb8b7531f043b8456824a9633646a118629c037519e0be6d77a64bacbb39d772dd1d40ff +DIST element-desktop_1.11.50_amd64.deb 92742494 BLAKE2B 78b9121f38b133df85e0e11d16e9c82f783822e822931e5f63e551989ac10c9086de86c857844b37a586c13256af1bcab05fefe1bce44eaf2f4bff461672d3f4 SHA512 7ff9cca2ef99d20200392a296e1ffb514472523482376c3005025a14188f490375b851928881840d67d75d21efa6346c6d60715e93036ba7e8116a6fba190699 diff --git a/net-im/element-desktop-bin/element-desktop-bin-1.11.31.ebuild b/net-im/element-desktop-bin/element-desktop-bin-1.11.50.ebuild index 95f65db63e43..745bf248a60e 100644 --- a/net-im/element-desktop-bin/element-desktop-bin-1.11.31.ebuild +++ b/net-im/element-desktop-bin/element-desktop-bin-1.11.50.ebuild @@ -18,10 +18,7 @@ KEYWORDS="~amd64" RESTRICT="splitdebug" RDEPEND=" - || ( - >=app-accessibility/at-spi2-core-2.46.0:2 - ( app-accessibility/at-spi2-atk dev-libs/atk ) - ) + >=app-accessibility/at-spi2-core-2.46.0:2 app-crypt/libsecret dev-db/sqlcipher dev-libs/expat diff --git a/net-im/fractal/Manifest b/net-im/fractal/Manifest new file mode 100644 index 000000000000..089dd255f2f6 --- /dev/null +++ b/net-im/fractal/Manifest @@ -0,0 +1,4 @@ +DIST fractal-5-crates.tar.xz 42625036 BLAKE2B c63f3b7b0029d9c0d6519463c233c7f46b4541e3bfd202cc906318342eca49889e848408dc718caa55311066423acbc6c4936e6dfc97939683a9f3b89e678add SHA512 d2cb81a61de4abec67999598750226e7d19d0f0e46bea509f17beb45c04bcef2996c20244d6b28489e3ef91d597d0f973f1b0dad5a501ca0d17d72fdef413af2 +DIST fractal-5.tar.bz2 1362630 BLAKE2B 4fb7f638a535ae75c479d84730c5608165fe28c22b228b1ca2a69c340858cedc0fc5833a27d644804b62897f2466869af037a2634921915c5efd060e6e721277 SHA512 d7ed615edb16e30ad932d005298f72cf38b10f3f87c255622b2f8ec7551a8f0fc76bc54bc5e55538e07ff603a01355c7df86e56e63a0cbefa9e43843d9c9c3f7 +DIST matrix-authentication-service-357481b52e6dc092178a16b8a7d86df036aac608.gh.tar.gz 1406414 BLAKE2B 6f00cc3c9db792b29911be9efae6dfbd4c5d80d1251953ccad4b4e4e863e18b84db2235636208efc48a8e84b83b3c4b4acfd6630263d178db9aa98e448bedd88 SHA512 b9dfa13f6479a330c0da8529ac2a723df87c044f306a66a5887e70ae2d4089ba8e7cae2d7c59e8cb0c3d7e6076eae6c2072d314dab208565891a4bcbfc511f54 +DIST matrix-rust-sdk-8895ce40d13faa79012144c97044990284215758.gh.tar.gz 1677376 BLAKE2B 175062e6782fa9c435c5a9f32ed9e971762a7d387064faa0ffe59407235ea858028a200496d0f3ac2718814f1e5d36a7e5f3fa93c718a345b0ee8ed997442cd6 SHA512 6ed4601ca75d0182797a4036d61d0df6f99689ab7a77638863c697ba52395ca3ef35290c38871d4136e9f4406c8f0c527c57727d808328ec9401276bf024d88d diff --git a/net-im/fractal/files/fractal-5-secret-service.patch b/net-im/fractal/files/fractal-5-secret-service.patch new file mode 100644 index 000000000000..99d9554590ab --- /dev/null +++ b/net-im/fractal/files/fractal-5-secret-service.patch @@ -0,0 +1,168 @@ +From 2e867841619efc67e8d221b7d15833520d56f3be Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?K=C3=A9vin=20Commaille?= <zecakeh@tedomum.fr> +Date: Mon, 27 Nov 2023 13:10:22 +0100 +Subject: [PATCH] secret: Serialize secret as JSON + +MessagePack creates issues with Secret Service providers that expect a +valid string. +We don't really care about saving a few bytes when storing secrets. +--- + src/secret.rs | 80 ++++++++++++++++++++++++--------------------------- + 1 file changed, 38 insertions(+), 42 deletions(-) + +diff --git a/src/secret.rs b/src/secret.rs +index 1c7a6759f..88f757f5b 100644 +--- a/src/secret.rs ++++ b/src/secret.rs +@@ -13,14 +13,14 @@ use ruma::{DeviceId, OwnedDeviceId, OwnedUserId, UserId}; + use serde::{Deserialize, Serialize}; + use serde_json::error::Error as JsonError; + use thiserror::Error; +-use tracing::{debug, error, warn}; ++use tracing::{debug, error, info}; + use url::Url; + + use crate::{ + application::AppProfile, gettext_f, prelude::*, spawn_tokio, utils::matrix, APP_ID, PROFILE, + }; + +-pub const CURRENT_VERSION: u8 = 4; ++pub const CURRENT_VERSION: u8 = 5; + const SCHEMA_ATTRIBUTE: &str = "xdg:schema"; + + static DATA_PATH: Lazy<PathBuf> = Lazy::new(|| { +@@ -275,21 +275,21 @@ impl StoredSession { + }; + let secret = match item.secret().await { + Ok(secret) => { +- if version == 0 { +- match Secret::from_utf8(&secret) { ++ if version <= 4 { ++ match rmp_serde::from_slice::<Secret>(&secret) { + Ok(secret) => secret, + Err(error) => { +- error!("Could not parse secret in stored session: {error:?}"); ++ error!("Could not parse secret in stored session: {error}"); + return Err(SecretError::Invalid(gettext( + "Malformed secret in stored session", + ))); + } + } + } else { +- match rmp_serde::from_slice::<Secret>(&secret) { ++ match serde_json::from_slice(&secret) { + Ok(secret) => secret, + Err(error) => { +- error!("Could not parse secret in stored session: {error}"); ++ error!("Could not parse secret in stored session: {error:?}"); + return Err(SecretError::Invalid(gettext( + "Malformed secret in stored session", + ))); +@@ -407,7 +407,7 @@ impl StoredSession { + + let attrs = self.attributes(); + let attributes = attrs.iter().map(|(k, v)| (*k, v.as_ref())).collect(); +- let secret = rmp_serde::to_vec_named(&self.secret).unwrap(); ++ let secret = serde_json::to_string(&self.secret).unwrap(); + + keyring + .create_item( +@@ -478,34 +478,30 @@ impl StoredSession { + Ok(()) + } + +- /// Migrate this session to version 4. +- /// +- /// This implies moving the database under Fractal's directory. +- pub async fn migrate_to_v4(&mut self, item: Item) { +- warn!( +- "Session {} with version {} found for user {}, migrating to version 4…", +- self.id(), +- self.version, +- self.user_id, +- ); ++ /// Migrate this session to the current version. ++ pub async fn apply_migrations(&mut self, item: Item) { ++ if self.version < 4 { ++ info!("Migrating to version 4…"); + +- let target_path = DATA_PATH.join(self.id()); ++ let target_path = DATA_PATH.join(self.id()); + +- if self.path != target_path { +- debug!("Moving database to: {}", target_path.to_string_lossy()); ++ if self.path != target_path { ++ debug!("Moving database to: {}", target_path.to_string_lossy()); + +- if let Err(error) = fs::create_dir_all(&target_path) { +- error!("Failed to create new directory: {error}"); +- } ++ if let Err(error) = fs::create_dir_all(&target_path) { ++ error!("Failed to create new directory: {error}"); ++ } + +- if let Err(error) = fs::rename(&self.path, &target_path) { +- error!("Failed to move database: {error}"); +- } ++ if let Err(error) = fs::rename(&self.path, &target_path) { ++ error!("Failed to move database: {error}"); ++ } + +- self.path = target_path; ++ self.path = target_path; ++ } + } + +- self.version = 4; ++ info!("Migrating to version 5…"); ++ self.version = 5; + + let clone = self.clone(); + spawn_tokio!(async move { +@@ -548,14 +544,6 @@ pub struct Secret { + pub passphrase: String, + } + +-impl Secret { +- /// Converts a vector of bytes to a `Secret`. +- pub fn from_utf8(slice: &[u8]) -> Result<Self, FromUtf8SecretError> { +- let s = String::from_utf8(slice.to_owned())?; +- Ok(serde_json::from_str(&s)?) +- } +-} +- + /// Retrieves all sessions stored to the `SecretService` + pub async fn restore_sessions() -> Result<Vec<StoredSession>, SecretError> { + let keyring = Keyring::new().await?; +@@ -575,15 +563,23 @@ pub async fn restore_sessions() -> Result<Vec<StoredSession>, SecretError> { + Ok(session) => sessions.push(session), + Err(SecretError::OldVersion { item, mut session }) => { + if session.version == 0 { +- warn!( +- "Found old session for {} with sled store, removing…", ++ info!( ++ "Found old session for user {} with sled store, removing…", + session.user_id + ); + session.delete(Some(item), true).await; +- } else if session.version < 4 { +- session.migrate_to_v4(item).await; +- sessions.push(session); ++ continue; + } ++ ++ info!( ++ "Found session {} for user {} with old version {}, applying migrations…", ++ session.id(), ++ session.user_id, ++ session.version, ++ ); ++ session.apply_migrations(item).await; ++ ++ sessions.push(session); + } + Err(SecretError::WrongProfile) => {} + Err(error) => { +-- +GitLab + diff --git a/net-im/fractal/fractal-5-r1.ebuild b/net-im/fractal/fractal-5-r1.ebuild new file mode 100644 index 000000000000..9b994768ce31 --- /dev/null +++ b/net-im/fractal/fractal-5-r1.ebuild @@ -0,0 +1,92 @@ +# Copyright 2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +CRATES=" +" + +declare -A GIT_CRATES=( + [mas-http]='https://github.com/matrix-org/matrix-authentication-service;357481b52e6dc092178a16b8a7d86df036aac608;matrix-authentication-service-%commit%/crates/http' + [mas-iana]='https://github.com/matrix-org/matrix-authentication-service;357481b52e6dc092178a16b8a7d86df036aac608;matrix-authentication-service-%commit%/crates/iana' + [mas-jose]='https://github.com/matrix-org/matrix-authentication-service;357481b52e6dc092178a16b8a7d86df036aac608;matrix-authentication-service-%commit%/crates/jose' + [mas-keystore]='https://github.com/matrix-org/matrix-authentication-service;357481b52e6dc092178a16b8a7d86df036aac608;matrix-authentication-service-%commit%/crates/keystore' + [mas-oidc-client]='https://github.com/matrix-org/matrix-authentication-service;357481b52e6dc092178a16b8a7d86df036aac608;matrix-authentication-service-%commit%/crates/oidc-client' + [mas-tower]='https://github.com/matrix-org/matrix-authentication-service;357481b52e6dc092178a16b8a7d86df036aac608;matrix-authentication-service-%commit%/crates/tower' + [matrix-sdk-base]='https://github.com/matrix-org/matrix-rust-sdk;8895ce40d13faa79012144c97044990284215758;matrix-rust-sdk-%commit%/crates/matrix-sdk-base' + [matrix-sdk-common]='https://github.com/matrix-org/matrix-rust-sdk;8895ce40d13faa79012144c97044990284215758;matrix-rust-sdk-%commit%/crates/matrix-sdk-common' + [matrix-sdk-crypto]='https://github.com/matrix-org/matrix-rust-sdk;8895ce40d13faa79012144c97044990284215758;matrix-rust-sdk-%commit%/crates/matrix-sdk-crypto' + [matrix-sdk-indexeddb]='https://github.com/matrix-org/matrix-rust-sdk;8895ce40d13faa79012144c97044990284215758;matrix-rust-sdk-%commit%/crates/matrix-sdk-indexeddb' + [matrix-sdk-qrcode]='https://github.com/matrix-org/matrix-rust-sdk;8895ce40d13faa79012144c97044990284215758;matrix-rust-sdk-%commit%/crates/matrix-sdk-qrcode' + [matrix-sdk-sqlite]='https://github.com/matrix-org/matrix-rust-sdk;8895ce40d13faa79012144c97044990284215758;matrix-rust-sdk-%commit%/crates/matrix-sdk-sqlite' + [matrix-sdk-store-encryption]='https://github.com/matrix-org/matrix-rust-sdk;8895ce40d13faa79012144c97044990284215758;matrix-rust-sdk-%commit%/crates/matrix-sdk-store-encryption' + [matrix-sdk-ui]='https://github.com/matrix-org/matrix-rust-sdk;8895ce40d13faa79012144c97044990284215758;matrix-rust-sdk-%commit%/crates/matrix-sdk-ui' + [matrix-sdk]='https://github.com/matrix-org/matrix-rust-sdk;8895ce40d13faa79012144c97044990284215758;matrix-rust-sdk-%commit%/crates/matrix-sdk' + [oauth2-types]='https://github.com/matrix-org/matrix-authentication-service;357481b52e6dc092178a16b8a7d86df036aac608;matrix-authentication-service-%commit%/crates/oauth2-types' +) + +inherit cargo gnome2-utils meson + +DESCRIPTION="Matrix messaging app for GNOME written in Rust" +HOMEPAGE=" + https://wiki.gnome.org/Apps/Fractal + https://gitlab.gnome.org/GNOME/fractal/ +" +SRC_URI=" + https://gitlab.gnome.org/GNOME/fractal/-/archive/${PV}/${P}.tar.bz2 + https://dev.gentoo.org/~mgorny/dist/${P}-crates.tar.xz + ${CARGO_CRATE_URIS} +" + +LICENSE="GPL-3+" +# Dependent crate licenses +LICENSE+=" + Apache-2.0 Apache-2.0-with-LLVM-exceptions BSD-2 BSD GPL-3+ ISC MIT + MPL-2.0 MPL-2.0 Unicode-DFS-2016 ZLIB +" +SLOT="0" +KEYWORDS="~amd64" + +DEPEND=" + >=dev-libs/glib-2.72 + >=gui-libs/gtk-4.10.0:4 + >=gui-libs/libadwaita-1.4.0:1 + + >=media-libs/gstreamer-1.20:1.0 + >=media-libs/gst-plugins-bad-1.20:1.0 + >=media-libs/gst-plugins-base-1.20:1.0 + + >=gui-libs/gtksourceview-5.0.0:5 + >=media-video/pipewire-0.3.0:=[gstreamer] + >=dev-libs/openssl-1.0.1:= + >=media-libs/libshumate-1.0.0:1.0 + >=dev-db/sqlite-3.24.0:3 + >=sys-apps/xdg-desktop-portal-1.14.1 +" +RDEPEND=" + ${DEPEND} + virtual/secret-service +" + +# Rust +QA_FLAGS_IGNORED="usr/bin/fractal" + +PATCHES=( + # https://gitlab.gnome.org/GNOME/fractal/-/merge_requests/1462 + "${FILESDIR}/${P}-secret-service.patch" +) + +src_configure() { + meson_src_configure + ln -s "${CARGO_HOME}" "${BUILD_DIR}/cargo-home" || die +} + +pkg_postinst() { + gnome2_schemas_update + xdg_icon_cache_update +} + +pkg_postrm() { + gnome2_schemas_update + xdg_icon_cache_update +} diff --git a/net-im/fractal/metadata.xml b/net-im/fractal/metadata.xml new file mode 100644 index 000000000000..8e6f4d7f8149 --- /dev/null +++ b/net-im/fractal/metadata.xml @@ -0,0 +1,11 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> +<pkgmetadata> + <maintainer type="person"> + <email>mgorny@gentoo.org</email> + <name>Michał Górny</name> + </maintainer> + <upstream> + <remote-id type="gnome-gitlab">GNOME/fractal</remote-id> + </upstream> +</pkgmetadata> diff --git a/net-im/gajim/Manifest b/net-im/gajim/Manifest index ee06ad45b259..2f43efc8f76f 100644 --- a/net-im/gajim/Manifest +++ b/net-im/gajim/Manifest @@ -1,2 +1,3 @@ -DIST gajim-1.4.7.tar.gz 7184866 BLAKE2B 9be0ae485a372683623eff1f9ed1d209800c3088bf01c134bb5c6f1770e8ded1ebe6c2b301ad648c6cfb1793e2be43aade1410a701f7d0490f2ab1b0a4c3fdd5 SHA512 5988f6b7aa46166208b1693b9e1a5fe982cea2987f3f4170bcb14e4bb9be1154b1c6ceed020a949131a498db43d2dffee30bd3167cd56889c1cbb5641ed960f4 DIST gajim-1.7.3.tar.gz 3753831 BLAKE2B c7b8b1dc47b1faf9f1c0803e7931cb00bfbf31075fe481d557ec0f308c79e7580d0054d224781a67eaeea24dba40e40de5faf55d633d71f759022a1ac113f6e4 SHA512 66135e88784350bab79b61debc1b65144a82f8eee2c1841d21e4f511b3792361e57b60304d2478654e563687e8302426d76063e748236f4e1c959511c7c28665 +DIST gajim-1.8.0.tar.gz 3835799 BLAKE2B 030293fc8114877c6d060cd0feae0fecdcecbb26aac8817e1db7db59aee3ee79973efc94584434641ccd39adcf809e0c7a86a017ab46c9695666d898fb7b7905 SHA512 724290de6d438aacd929a9759d7a712068c303caf9002a1a70ddc0e9aa16387054d3e4efacf84eced28f49ef79749c764d5fe67fcb23c3baef3a2b7714df218e +DIST gajim-1.8.1.tar.gz 3844796 BLAKE2B b7bbd751a051cd2a46e814a9b3ebc08f10a6570dc071752838a2463019cdf6ea4198f2a349f3935c33d988cd6908cf31dba572bac31f9363675433328e6d679b SHA512 b417d76a4225f16730441dee7befacd6db5be782c9271b789d5f9c10232e342f2d46930eef79a58839c13b2887926591d953a87a7544e32c7bf80d2c65390e31 diff --git a/net-im/gajim/gajim-1.7.3-r1.ebuild b/net-im/gajim/gajim-1.7.3-r1.ebuild index 9d3183fcf836..8cdd33907dc9 100644 --- a/net-im/gajim/gajim-1.7.3-r1.ebuild +++ b/net-im/gajim/gajim-1.7.3-r1.ebuild @@ -16,7 +16,7 @@ SRC_URI="https://gajim.org/downloads/$(ver_cut 1-2)/${P/_p/-}.tar.gz" LICENSE="GPL-3" SLOT="0" -KEYWORDS="~amd64 ~arm64 ~riscv ~x86" +KEYWORDS="amd64 ~arm64 ~loong ~riscv x86" IUSE="+crypt geolocation jingle omemo remote rst +spell upnp +webp" COMMON_DEPEND=" diff --git a/net-im/gajim/gajim-1.4.7-r2.ebuild b/net-im/gajim/gajim-1.8.0.ebuild index 0c1f9e76c74a..0e911bf76b48 100644 --- a/net-im/gajim/gajim-1.4.7-r2.ebuild +++ b/net-im/gajim/gajim-1.8.0.ebuild @@ -1,10 +1,11 @@ # Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 -PYTHON_COMPAT=( python3_{9..11} ) +PYTHON_COMPAT=( python3_{10..11} ) PYTHON_REQ_USE="sqlite,xml(+)" +DISTUTILS_USE_PEP517=standalone DISTUTILS_SINGLE_IMPL=1 inherit distutils-r1 xdg-utils @@ -15,38 +16,46 @@ SRC_URI="https://gajim.org/downloads/$(ver_cut 1-2)/${P/_p/-}.tar.gz" LICENSE="GPL-3" SLOT="0" -KEYWORDS="amd64 ~arm64 ~riscv x86" -IUSE="+crypt geolocation jingle omemo remote rst +spell upnp +webp" -S="${WORKDIR}/${P%_p2}" +# KEYWORDS="~amd64 ~arm64 ~loong ~riscv ~x86" +# Gajim depends now on omemo-dr. Add KEYWORDS again, +# when https://bugs.gentoo.org/912285 is fixed. + +KEYWORDS="~amd64" +IUSE="+crypt geolocation jingle remote rst +spell upnp +webp" COMMON_DEPEND=" dev-libs/gobject-introspection[cairo(+)] >=x11-libs/gtk+-3.22:3[introspection] - x11-libs/gtksourceview:4" + x11-libs/gtksourceview:4[introspection]" DEPEND="${COMMON_DEPEND} app-arch/unzip virtual/pkgconfig + >=x11-libs/pango-1.5.0 >=sys-devel/gettext-0.17-r1" RDEPEND="${COMMON_DEPEND} $(python_gen_cond_dep ' dev-python/idna[${PYTHON_USEDEP}] - >=dev-python/nbxmpp-3.0.0[${PYTHON_USEDEP}] - <dev-python/nbxmpp-4.0.0[${PYTHON_USEDEP}] + >=dev-python/nbxmpp-4.2.2[${PYTHON_USEDEP}] + <dev-python/nbxmpp-5.0.0[${PYTHON_USEDEP}] dev-python/precis-i18n[${PYTHON_USEDEP}] dev-python/pyasn1[${PYTHON_USEDEP}] dev-python/pycairo[${PYTHON_USEDEP}] dev-python/pycurl[${PYTHON_USEDEP}] dev-python/pygobject:3[cairo,${PYTHON_USEDEP}] - dev-python/pyopenssl[${PYTHON_USEDEP}] x11-libs/libXScrnSaver app-crypt/libsecret[crypt,introspection] dev-python/keyring[${PYTHON_USEDEP}] >=dev-python/secretstorage-3.1.1[${PYTHON_USEDEP}] dev-python/css-parser[${PYTHON_USEDEP}] dev-python/packaging[${PYTHON_USEDEP}] - net-libs/libsoup:2.4[introspection] + net-libs/libsoup:3.0[introspection] media-libs/gsound[introspection] dev-python/pillow[${PYTHON_USEDEP}] + dev-python/jaraco-classes[${PYTHON_USEDEP}] + dev-python/python-axolotl[${PYTHON_USEDEP}] + dev-python/qrcode[${PYTHON_USEDEP}] + dev-python/cryptography[${PYTHON_USEDEP}] + dev-python/omemo-dr[${PYTHON_USEDEP}] crypt? ( dev-python/pycryptodome[${PYTHON_USEDEP}] >=dev-python/python-gnupg-0.4.0[${PYTHON_USEDEP}] ) @@ -58,12 +67,6 @@ RDEPEND="${COMMON_DEPEND} media-libs/gst-plugins-ugly:1.0 media-plugins/gst-plugins-gtk ) - omemo? ( - dev-python/jaraco-classes[${PYTHON_USEDEP}] - dev-python/python-axolotl[${PYTHON_USEDEP}] - dev-python/qrcode[${PYTHON_USEDEP}] - dev-python/cryptography[${PYTHON_USEDEP}] - ) remote? ( >=dev-python/dbus-python-1.2.0[${PYTHON_USEDEP}] sys-apps/dbus[X] @@ -76,12 +79,16 @@ RDEPEND="${COMMON_DEPEND} upnp? ( net-libs/gupnp-igd:0[introspection] ) ')" -src_install() { - distutils-r1_src_install +python_compile() { + distutils-r1_python_compile + ./pep517build/build_metadata.py -o dist/metadata +} + +python_install() { + distutils-r1_python_install + ./pep517build/install_metadata.py dist/metadata --prefix="${D}/usr" - # avoid precompressed man pages - rm -r "${D}/usr/share/man" - doman data/*.1 + gzip -d "${ED}"/usr/share/man/man1/*.gz || die } pkg_postinst() { diff --git a/net-im/gajim/gajim-1.8.1.ebuild b/net-im/gajim/gajim-1.8.1.ebuild new file mode 100644 index 000000000000..03dbc2058313 --- /dev/null +++ b/net-im/gajim/gajim-1.8.1.ebuild @@ -0,0 +1,105 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +PYTHON_COMPAT=( python3_{10..11} ) +PYTHON_REQ_USE="sqlite,xml(+)" +DISTUTILS_USE_PEP517=standalone +DISTUTILS_SINGLE_IMPL=1 + +inherit distutils-r1 xdg-utils + +DESCRIPTION="Jabber client written in PyGTK" +HOMEPAGE="https://gajim.org/" +SRC_URI="https://gajim.org/downloads/$(ver_cut 1-2)/${P/_p/-}.tar.gz" + +LICENSE="GPL-3" +SLOT="0" +# KEYWORDS="~amd64 ~arm64 ~loong ~riscv ~x86" +# Gajim depends now on omemo-dr. Add KEYWORDS again, +# when https://bugs.gentoo.org/912285 is fixed. + +KEYWORDS="~amd64 ~arm64 ~loong ~riscv ~x86" +IUSE="+crypt geolocation jingle remote rst +spell upnp +webp" + +COMMON_DEPEND=" + dev-libs/gobject-introspection[cairo(+)] + >=x11-libs/gtk+-3.22:3[introspection] + x11-libs/gtksourceview:4[introspection]" +DEPEND="${COMMON_DEPEND} + app-arch/unzip + virtual/pkgconfig + >=x11-libs/pango-1.5.0 + >=sys-devel/gettext-0.17-r1" +RDEPEND="${COMMON_DEPEND} + $(python_gen_cond_dep ' + dev-python/idna[${PYTHON_USEDEP}] + >=dev-python/nbxmpp-4.2.2[${PYTHON_USEDEP}] + <dev-python/nbxmpp-5.0.0[${PYTHON_USEDEP}] + dev-python/precis-i18n[${PYTHON_USEDEP}] + dev-python/pyasn1[${PYTHON_USEDEP}] + dev-python/pycairo[${PYTHON_USEDEP}] + dev-python/pycurl[${PYTHON_USEDEP}] + dev-python/pygobject:3[cairo,${PYTHON_USEDEP}] + x11-libs/libXScrnSaver + app-crypt/libsecret[crypt,introspection] + dev-python/keyring[${PYTHON_USEDEP}] + >=dev-python/secretstorage-3.1.1[${PYTHON_USEDEP}] + dev-python/css-parser[${PYTHON_USEDEP}] + dev-python/packaging[${PYTHON_USEDEP}] + net-libs/libsoup:3.0[introspection] + media-libs/gsound[introspection] + dev-python/pillow[${PYTHON_USEDEP}] + dev-python/jaraco-classes[${PYTHON_USEDEP}] + dev-python/python-axolotl[${PYTHON_USEDEP}] + dev-python/qrcode[${PYTHON_USEDEP}] + dev-python/cryptography[${PYTHON_USEDEP}] + dev-python/omemo-dr[${PYTHON_USEDEP}] + crypt? ( + dev-python/pycryptodome[${PYTHON_USEDEP}] + >=dev-python/python-gnupg-0.4.0[${PYTHON_USEDEP}] ) + geolocation? ( app-misc/geoclue[introspection] ) + jingle? ( + net-libs/farstream:0.2[introspection] + media-libs/gstreamer:1.0[introspection] + media-libs/gst-plugins-base:1.0[introspection] + media-libs/gst-plugins-ugly:1.0 + media-plugins/gst-plugins-gtk + ) + remote? ( + >=dev-python/dbus-python-1.2.0[${PYTHON_USEDEP}] + sys-apps/dbus[X] + ) + rst? ( dev-python/docutils[${PYTHON_USEDEP}] ) + spell? ( + app-text/gspell[introspection] + app-text/hunspell + ) + upnp? ( net-libs/gupnp-igd:0[introspection] ) + ')" + +python_compile() { + distutils-r1_python_compile + ./pep517build/build_metadata.py -o dist/metadata +} + +python_install() { + distutils-r1_python_install + ./pep517build/install_metadata.py dist/metadata --prefix="${D}/usr" + + gzip -d "${ED}"/usr/share/man/man1/*.gz || die +} + +pkg_postinst() { + xdg_icon_cache_update + xdg_desktop_database_update +} + +pkg_postrm() { + xdg_icon_cache_update + xdg_desktop_database_update +} + +# Tests are unfortunately regularly broken +RESTRICT="test" diff --git a/net-im/libcommuni/metadata.xml b/net-im/libcommuni/metadata.xml index c5a66b1305b1..e5cca9123839 100644 --- a/net-im/libcommuni/metadata.xml +++ b/net-im/libcommuni/metadata.xml @@ -14,4 +14,7 @@ <flag name="qml">Install optional qml files.</flag> <flag name="uchardet">Use <pkg>app-i18n/uchardet</pkg>, which is upstreams default, instead of <pkg>dev-libs/icu</pkg>, which makes impossible to run tests.</flag> </use> + <upstream> + <remote-id type="github">communi/libcommuni</remote-id> + </upstream> </pkgmetadata> diff --git a/net-im/librvp/librvp-0.9.7.ebuild b/net-im/librvp/librvp-0.9.7.ebuild index b87866183e5c..c51d20139da9 100644 --- a/net-im/librvp/librvp-0.9.7.ebuild +++ b/net-im/librvp/librvp-0.9.7.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -11,7 +11,8 @@ LICENSE="GPL-2" SLOT="0" KEYWORDS="amd64 x86" -RDEPEND="net-im/pidgin[gtk]" +RDEPEND="net-im/pidgin[gtk] + virtual/libcrypt:=" DEPEND="virtual/pkgconfig ${RDEPEND}" diff --git a/net-im/mattermost-desktop-bin/Manifest b/net-im/mattermost-desktop-bin/Manifest index 5ccf39d64c8e..4d2f6e83a2b0 100644 --- a/net-im/mattermost-desktop-bin/Manifest +++ b/net-im/mattermost-desktop-bin/Manifest @@ -1,4 +1,4 @@ -DIST mattermost-desktop-5.3.1-linux-arm64.tar.gz 99877249 BLAKE2B a519510d2d5e09b053012e10620fcc47418abab6ebb1276a3f4ecdc624a5f29852e61447954f125a23ec1c1e34cda17259ed44fa4381048ed105d4a12ed1db69 SHA512 6b047a5a7160957a38201e05df2cfdd395de7d25db2128e5b9f29cbcfb63a3733f4633f323973c334a705747c92be4f79c0ac94caf80af3dda258d8a24a2b3b0 -DIST mattermost-desktop-5.3.1-linux-x64.tar.gz 99666315 BLAKE2B 5d330cc70404e969c9a7e1ed65c0ad6361453c331639e20443ac25d9c7df179667bf55c737b4392eb738ae58cc708d6542ff1de9a53411381321dbdcafebf725 SHA512 94959fbd20598c7c13838e5ce8c95ed71756d4f59a377dd98662d23f70f8f600d35f8ac027d2fd0da63ae72af930814322cc57a1be1c43389e90cd58ad3b5cfb -DIST mattermost-desktop-5.4.0-rc.1-linux-arm64.tar.gz 98203300 BLAKE2B 7e012c44e2270846e52d06608f6a1bc1ae5cd3996213eed0595dc6ecb4bd48eb0c4d67743f20b546d05e632876423514d38975ecafa462ca473c8fdd9a1715a4 SHA512 721376179f5a7ee93039c058427e34002480d27b3ec5de01f434c4f299e11ffb8d92299882cd744ffa8653a889b4a598e88c061670608f998a452226abb8a1ea -DIST mattermost-desktop-5.4.0-rc.1-linux-x64.tar.gz 97476728 BLAKE2B 23cc225ff1456f0ec256fc4606fa8bcd63d35b45ad9eb1543f58662a01a03e963b1aacfae0faf8b2c96cd32c2e0f359cca3394aab3086ddcf3e7b996db5398e8 SHA512 232ca64f884ad756c45063fd7b4c8964195ca0267387b02a8c0055edb8552cf6ff77c303b17b58affacc3ff370939f979b4a483e23d0b269179fd8e23ca43981 +DIST mattermost-desktop-5.5.1-linux-arm64.tar.gz 100458081 BLAKE2B 2a58b40ef0ca5ad7d76a21bebab928817e49cf21a8b3fd61b59824a7382eb3fdd107dc02d20bdd118259530c07995105209096b40d49b9a73fbeb26e52278fc8 SHA512 2c680709a397475ec3ecf51249988bd9f104a51d70bf5947f4dbc7340bdebe05ed9d020c01eaf519bf80b104c27eda5901ce6477a16d7dec765a21864e1e4f83 +DIST mattermost-desktop-5.5.1-linux-x64.tar.gz 99899822 BLAKE2B da8bb0c3932f32ff12abc90e07d69d70e0f4d8ee86bd1881b5311496462630f3e43813acece1957027cf1968f7c7d532dd9892049e42761ee5ef437dc4cdd817 SHA512 fcb3f9c213323b5ede9f21765af8bb8ace9ed7f9469de13f05ffe44a8ce251d7305b978133142473c813bf94ffd50e7b5323bac64a7c585c01e803f15abdc46f +DIST mattermost-desktop-5.6.0-rc.1-linux-arm64.tar.gz 103187212 BLAKE2B 3aca700d0f705535e372c2165a97d9a2b1406ef444fbe274b39b0e84692a11d00eb42b79f7d29ea4ef00f6a1a081ff512a98abb02cc1e045ac2df8f94dd69d02 SHA512 25702488d3cbfa209a74a470779ee35d2663ffd4cb0b7b3ce8b476cd7246ffc37e96a534fa1d4e8b6f3421f8069560eb3dbc3ba0c3786f9bbd8fa2af8d45ab18 +DIST mattermost-desktop-5.6.0-rc.1-linux-x64.tar.gz 102835688 BLAKE2B b130c87db58051ce3f155227080a8c5fb574ed670cce16fe7227d1485ee5941bfce5ebe22ff242c5d3efb8dff1ce99adb880f320aa063a293e31807e7c075c8b SHA512 679bee6c8797e71ea84f6badc21c755054825546d57f9aa5ef5baf81d4dbe63fa636051a4572bef1f20b84931703cb5ff51086f6821e5f40a0a79677dcd09f93 diff --git a/net-im/mattermost-desktop-bin/mattermost-desktop-bin-5.4.0_rc1.ebuild b/net-im/mattermost-desktop-bin/mattermost-desktop-bin-5.5.1-r1.ebuild index 6239ac543889..75064aceabf4 100644 --- a/net-im/mattermost-desktop-bin/mattermost-desktop-bin-5.4.0_rc1.ebuild +++ b/net-im/mattermost-desktop-bin/mattermost-desktop-bin-5.5.1-r1.ebuild @@ -15,6 +15,7 @@ SRC_URI=" amd64? ( https://releases.mattermost.com/desktop/${MY_PV}/mattermost-desktop-${MY_PV}-linux-x64.tar.gz ) arm64? ( https://releases.mattermost.com/desktop/${MY_PV}/mattermost-desktop-${MY_PV}-linux-arm64.tar.gz ) " +S="${WORKDIR}" LICENSE="Apache-2.0 GPL-2+ LGPL-2.1+ MIT" SLOT="0" @@ -64,8 +65,6 @@ DOCS=( NOTICE.txt ) -S="${WORKDIR}" - src_install() { if use amd64; then cd mattermost-desktop-${MY_PV}-linux-x64 || die @@ -87,8 +86,10 @@ src_install() { dosym -r "/opt/${MY_PN}/${MY_PN}" "/usr/bin/${MY_PN}" - make_desktop_entry "${MY_PN} --enable-features=WaylandWindowDecorations --ozone-platform-hint=auto" \ - Mattermost "${MY_PN}" + make_desktop_entry \ + "${MY_PN} --enable-features=WaylandWindowDecorations --ozone-platform-hint=auto %U" \ + Mattermost "${MY_PN}" "Network;InstantMessaging;" \ + "MimeType=x-scheme-handler/mattermost;" einstalldocs } diff --git a/net-im/mattermost-desktop-bin/mattermost-desktop-bin-5.3.1.ebuild b/net-im/mattermost-desktop-bin/mattermost-desktop-bin-5.6.0_rc1.ebuild index 6239ac543889..75064aceabf4 100644 --- a/net-im/mattermost-desktop-bin/mattermost-desktop-bin-5.3.1.ebuild +++ b/net-im/mattermost-desktop-bin/mattermost-desktop-bin-5.6.0_rc1.ebuild @@ -15,6 +15,7 @@ SRC_URI=" amd64? ( https://releases.mattermost.com/desktop/${MY_PV}/mattermost-desktop-${MY_PV}-linux-x64.tar.gz ) arm64? ( https://releases.mattermost.com/desktop/${MY_PV}/mattermost-desktop-${MY_PV}-linux-arm64.tar.gz ) " +S="${WORKDIR}" LICENSE="Apache-2.0 GPL-2+ LGPL-2.1+ MIT" SLOT="0" @@ -64,8 +65,6 @@ DOCS=( NOTICE.txt ) -S="${WORKDIR}" - src_install() { if use amd64; then cd mattermost-desktop-${MY_PV}-linux-x64 || die @@ -87,8 +86,10 @@ src_install() { dosym -r "/opt/${MY_PN}/${MY_PN}" "/usr/bin/${MY_PN}" - make_desktop_entry "${MY_PN} --enable-features=WaylandWindowDecorations --ozone-platform-hint=auto" \ - Mattermost "${MY_PN}" + make_desktop_entry \ + "${MY_PN} --enable-features=WaylandWindowDecorations --ozone-platform-hint=auto %U" \ + Mattermost "${MY_PN}" "Network;InstantMessaging;" \ + "MimeType=x-scheme-handler/mattermost;" einstalldocs } diff --git a/net-im/mcabber/Manifest b/net-im/mcabber/Manifest deleted file mode 100644 index f7fef12c8c7c..000000000000 --- a/net-im/mcabber/Manifest +++ /dev/null @@ -1 +0,0 @@ -DIST mcabber-1.1.2.tar.bz2 651528 BLAKE2B d2160409d3a6e3c1a579bd1259438b11fae79612919a202a69a13c98c77fb5dbe4bc685939783f2a454ad5796c7d7f93e31d5fc92d96f2c6cc03e4efd4169f74 SHA512 bf53d593e84a4b4b2cf0230a4d94ea75f55008e3c2a839af5839519151209a61cce1685f9db14b65f5c4fa438bfabfeb25eb8e78e666b092c5c66af249788106 diff --git a/net-im/mcabber/files/README.gentoo b/net-im/mcabber/files/README.gentoo deleted file mode 100644 index dc394e6e5a4a..000000000000 --- a/net-im/mcabber/files/README.gentoo +++ /dev/null @@ -1,17 +0,0 @@ -MCabber requires you to create a subdirectory .mcabber in your home -directory and to place a configuration file there. -An example mcabberrc was installed as part of the documentation. -To create a new mcabberrc based on the example mcabberrc, execute the -following commands: - - mkdir -p ~/.mcabber - bzcat /usr/share/doc/mcabber*/mcabberrc.example.bz2 > ~/.mcabber/mcabberrc - -Then edit ~/.mcabber/mcabberrc with your favorite editor. - -See the CONFIGURATION FILE and FILES sections of the mcabber -manual page (section 1) for more information. - -MCabber supports PGP encryption of messages. See README_PGP.txt for details. - -Check out /usr/share/mcabber/ for contributed themes and event scripts. diff --git a/net-im/mcabber/mcabber-1.1.2-r1.ebuild b/net-im/mcabber/mcabber-1.1.2-r1.ebuild deleted file mode 100644 index bd5a83f961ef..000000000000 --- a/net-im/mcabber/mcabber-1.1.2-r1.ebuild +++ /dev/null @@ -1,99 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit readme.gentoo-r1 - -DESCRIPTION="A small Jabber console client with various features, like MUC, SSL, PGP" -HOMEPAGE="http://mcabber.com/" - -if [[ "${PV}" == 9999 ]]; then - inherit mercurial - EHG_REPO_URI="https://mcabber.com/hg/" - EHG_CHECKOUT_DIR="${WORKDIR}" - EHG_BOOTSTRAP="autogen.sh" - S="${WORKDIR}/${PN}" -else - SRC_URI="http://mcabber.com/files/${P}.tar.bz2" - KEYWORDS="~alpha amd64 ~arm ~mips ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos" -fi - -LICENSE="GPL-2" -SLOT="0" - -IUSE="aspell crypt idn otr spell ssl vim-syntax" - -LANGS="cs de fr it nl pl ru uk" -# localized help versions are installed only, when L10N var is set -for i in ${LANGS}; do - IUSE="${IUSE} l10n_${i}" -done; - -RDEPEND="crypt? ( app-crypt/gpgme:= ) - otr? ( >=net-libs/libotr-3.1.0 ) - aspell? ( app-text/aspell ) - vim-syntax? ( || ( app-editors/vim app-editors/gvim ) ) - idn? ( net-dns/libidn:= ) - spell? ( app-text/enchant:0 ) - dev-libs/glib:2 - net-libs/libnsl:0= - sys-libs/ncurses:0= - >=net-libs/loudmouth-1.4.3-r1[ssl?]" -DEPEND="${RDEPEND} - virtual/pkgconfig" - -DOCS=( AUTHORS ChangeLog NEWS README TODO mcabberrc.example doc/README_PGP.txt ) - -pkg_setup() { - if use aspell && use spell; then - ewarn "NOTE: You have both USE flags 'aspell' and 'spell' enabled, enchant (USE flag 'spell') will be preferred." - fi -} - -src_configure() { - econf \ - --enable-modules \ - $(use_enable crypt gpgme) \ - $(use_enable otr) \ - $(use_enable aspell) \ - $(use_enable spell enchant) \ - $(use_with idn libidn) -} - -src_install() { - default - - # clean unneeded language documentation - for i in ${LANGS}; do - use l10n_${i} || rm -rf "${ED}"/usr/share/${PN}/help/${i} - done - - # contrib themes - insinto /usr/share/${PN}/themes - doins "${S}"/contrib/themes/* - - # contrib generic scripts - exeinto /usr/share/${PN}/scripts - doexe "${S}"/contrib/*.{pl,py} - - # contrib event scripts - exeinto /usr/share/${PN}/scripts/events - doexe "${S}"/contrib/events/* - - if use vim-syntax; then - cd contrib/vim/ || die - - insinto /usr/share/vim/vimfiles/syntax - doins mcabber_log-syntax.vim - - insinto /usr/share/vim/vimfiles/ftdetect - doins mcabber_log-ftdetect.vim - fi - - readme.gentoo_create_doc -} - -pkg_postinst() { - readme.gentoo_print_elog -} diff --git a/net-im/mcabber/mcabber-9999.ebuild b/net-im/mcabber/mcabber-9999.ebuild deleted file mode 100644 index eb94b6002a7b..000000000000 --- a/net-im/mcabber/mcabber-9999.ebuild +++ /dev/null @@ -1,99 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit readme.gentoo-r1 - -DESCRIPTION="A small Jabber console client with various features, like MUC, SSL, PGP" -HOMEPAGE="http://mcabber.com/" - -if [[ "${PV}" == 9999 ]]; then - inherit mercurial - EHG_REPO_URI="https://mcabber.com/hg/" - EHG_CHECKOUT_DIR="${WORKDIR}" - EHG_BOOTSTRAP="autogen.sh" - S="${WORKDIR}/${PN}" -else - SRC_URI="http://mcabber.com/files/${P}.tar.bz2" - KEYWORDS="~alpha ~amd64 ~arm ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos" -fi - -LICENSE="GPL-2" -SLOT="0" - -IUSE="aspell crypt idn otr spell ssl vim-syntax" - -LANGS="cs de fr it nl pl ru uk" -# localized help versions are installed only, when L10N var is set -for i in ${LANGS}; do - IUSE="${IUSE} l10n_${i}" -done; - -RDEPEND="crypt? ( app-crypt/gpgme:= ) - otr? ( >=net-libs/libotr-3.1.0 ) - aspell? ( app-text/aspell ) - vim-syntax? ( || ( app-editors/vim app-editors/gvim ) ) - idn? ( net-dns/libidn:= ) - spell? ( app-text/enchant:0 ) - dev-libs/glib:2 - net-libs/libnsl:0= - sys-libs/ncurses:0= - >=net-libs/loudmouth-1.4.3-r1[ssl?]" -DEPEND="${RDEPEND} - virtual/pkgconfig" - -DOCS=( AUTHORS ChangeLog NEWS README TODO mcabberrc.example doc/README_PGP.txt ) - -pkg_setup() { - if use aspell && use spell; then - ewarn "NOTE: You have both USE flags 'aspell' and 'spell' enabled, enchant (USE flag 'spell') will be preferred." - fi -} - -src_configure() { - econf \ - --enable-modules \ - $(use_enable crypt gpgme) \ - $(use_enable otr) \ - $(use_enable aspell) \ - $(use_enable spell enchant) \ - $(use_with idn libidn) -} - -src_install() { - default - - # clean unneeded language documentation - for i in ${LANGS}; do - use l10n_${i} || rm -rf "${ED}"/usr/share/${PN}/help/${i} - done - - # contrib themes - insinto /usr/share/${PN}/themes - doins "${S}"/contrib/themes/* - - # contrib generic scripts - exeinto /usr/share/${PN}/scripts - doexe "${S}"/contrib/*.{pl,py} - - # contrib event scripts - exeinto /usr/share/${PN}/scripts/events - doexe "${S}"/contrib/events/* - - if use vim-syntax; then - cd contrib/vim/ || die - - insinto /usr/share/vim/vimfiles/syntax - doins mcabber_log-syntax.vim - - insinto /usr/share/vim/vimfiles/ftdetect - doins mcabber_log-ftdetect.vim - fi - - readme.gentoo_create_doc -} - -pkg_postinst() { - readme.gentoo_print_elog -} diff --git a/net-im/mcabber/metadata.xml b/net-im/mcabber/metadata.xml deleted file mode 100644 index afd4361828d1..000000000000 --- a/net-im/mcabber/metadata.xml +++ /dev/null @@ -1,20 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> -<pkgmetadata> - <!-- maintainer-needed --> - <longdescription lang="en"> - MCabber is a small Jabber console client that features - such as GPG encryption, SSL support, MUC (Multi-User Chat) support, - history logging, commands completion, and external actions triggers. - </longdescription> - <use> - <flag name="aspell">Adds support for <pkg>app-text/aspell</pkg> spell - checker.</flag> - <flag name="otr">Enable encrypted conversations using Off-The-Records - messaging - </flag> - </use> - <upstream> - <remote-id type="github">McKael/mcabber</remote-id> - </upstream> -</pkgmetadata> diff --git a/net-im/neochat/Manifest b/net-im/neochat/Manifest index 8790cd4c454e..b8ce83ee0572 100644 --- a/net-im/neochat/Manifest +++ b/net-im/neochat/Manifest @@ -1 +1,2 @@ -DIST neochat-23.04.2.tar.xz 565584 BLAKE2B 7e72214d7bfdb0a30e767ce91116fae71f341c37ef7f830f071a7303e25e35107d2f8c481f05373a8493d06c94c34a4f2d88dc424f3143144e41d8418b9be671 SHA512 f02e1cee3f71211f6dbf319ce983002046af27d08a6a82a41678384f68e5f0602fb18b30cad925deae7f6a0b352e4000e497f800020a89d5331f85557c9abf06 +DIST neochat-23.04.3.tar.xz 570776 BLAKE2B 7d5a9d724ecefc6f64a18629b24c80ef16f1e650ef3e8ae793590c44865d057d6f2905c199337dccf53c551fb4e00a8322238060731e2a3433e5e9e146acef67 SHA512 9e453c3bab98a45fe1d1d7139b574ff25e6d7a78749b38966eec17fa67ff366eea955aa82cde0743135c8ac35ca218a761abced055743545db760d67849e3a96 +DIST neochat-23.08.3.tar.xz 783024 BLAKE2B f37ed6acb2775a54e51f71dc36488d0fc6d3cf7a85e498d7cb5369785ae5b7ea89bc0492207c28a7e2d6266b5305d1402f6e2fae6d0eae49563820fda908bce1 SHA512 02bbfb982b3ca159948789b4d3734a24d0fa8957b81bfbacc6517dbed9aee630d793a98e1d0668a0b657c968e9f16a2d11759ce56fcc5cf77ad76aef2105d233 diff --git a/net-im/neochat/files/neochat-23.04.3-libquotient-0.8-1.patch b/net-im/neochat/files/neochat-23.04.3-libquotient-0.8-1.patch new file mode 100644 index 000000000000..9e4aaa3b19df --- /dev/null +++ b/net-im/neochat/files/neochat-23.04.3-libquotient-0.8-1.patch @@ -0,0 +1,91 @@ +From a94f46f90462dce1f817e9f28d24dad454e0dfb4 Mon Sep 17 00:00:00 2001 +From: Tobias Fella <fella@posteo.de> +Date: Fri, 26 May 2023 17:47:26 +0200 +Subject: [PATCH] Fix build against libQuotient 0.8 + +--- + src/controller.cpp | 24 ++++++++++++++++++++---- + src/login.cpp | 4 ++++ + 2 files changed, 24 insertions(+), 4 deletions(-) + +diff --git a/src/controller.cpp b/src/controller.cpp +index dd38ede9b..3835e312b 100644 +--- a/src/controller.cpp ++++ b/src/controller.cpp +@@ -109,18 +109,22 @@ Controller::Controller(QObject *parent) + } + #endif + ++#ifdef QUOTIENT_07 ++ connect(&Accounts, &AccountRegistry::accountCountChanged, this, &Controller::activeConnectionIndexChanged); ++#else + connect(&AccountRegistry::instance(), &AccountRegistry::accountCountChanged, this, &Controller::activeConnectionIndexChanged); ++#endif + + #ifdef QUOTIENT_07 + static int oldAccountCount = 0; +- connect(&AccountRegistry::instance(), &AccountRegistry::accountCountChanged, this, [=]() { +- if (AccountRegistry::instance().size() > oldAccountCount) { +- auto connection = AccountRegistry::instance().accounts()[AccountRegistry::instance().size() - 1]; ++ connect(&Accounts, &AccountRegistry::accountCountChanged, this, [=]() { ++ if (Accounts.size() > oldAccountCount) { ++ auto connection = Accounts.accounts()[Accounts.size() - 1]; + connect(connection, &Connection::syncDone, this, [=]() { + handleNotifications(connection); + }); + } +- oldAccountCount = AccountRegistry::instance().size(); ++ oldAccountCount = Accounts.size(); + }); + #endif + } +@@ -228,10 +232,18 @@ void Controller::logout(Connection *conn, bool serverSideLogout) + job.start(); + loop.exec(); + ++#ifdef QUOTIENT_07 ++ if (Accounts.count() > 1) { ++#else + if (AccountRegistry::instance().count() > 1) { ++#endif + // Only set the connection if the the account being logged out is currently active + if (conn == activeConnection()) { ++#ifdef QUOTIENT_07 ++ setActiveConnection(Accounts.accounts()[0]); ++#else + setActiveConnection(AccountRegistry::instance().accounts()[0]); ++#endif + } + } else { + setActiveConnection(nullptr); +@@ -495,7 +507,11 @@ NeochatChangePasswordJob::NeochatChangePasswordJob(const QString &newPassword, b + + int Controller::accountCount() const + { ++#ifdef QUOTIENT_07 ++ return Accounts.count(); ++#else + return AccountRegistry::instance().count(); ++#endif + } + + void Controller::setQuitOnLastWindowClosed() +diff --git a/src/login.cpp b/src/login.cpp +index 1121875f9..8b937abaa 100644 +--- a/src/login.cpp ++++ b/src/login.cpp +@@ -43,7 +43,11 @@ void Login::init() + return; + } + ++#ifdef QUOTIENT_07 ++ m_isLoggedIn = Accounts.isLoggedIn(m_matrixId); ++#else + m_isLoggedIn = AccountRegistry::instance().isLoggedIn(m_matrixId); ++#endif + Q_EMIT isLoggedInChanged(); + if (m_isLoggedIn) { + return; +-- +GitLab + diff --git a/net-im/neochat/files/neochat-23.04.3-libquotient-0.8-2.patch b/net-im/neochat/files/neochat-23.04.3-libquotient-0.8-2.patch new file mode 100644 index 000000000000..2bd85146b28f --- /dev/null +++ b/net-im/neochat/files/neochat-23.04.3-libquotient-0.8-2.patch @@ -0,0 +1,55 @@ +From 8f4e5a41c58986b68406251051c26beb059dd9ce Mon Sep 17 00:00:00 2001 +From: Tobias Fella <fella@posteo.de> +Date: Sun, 28 May 2023 11:22:40 +0200 +Subject: [PATCH] Drop reset*Count invocations + +Still coming from Spectral, where they were taken from Quaternion, where they were dropped because they don't work as expected. +Also, soon to be removed from libQuotient itself. +--- + src/neochatroom.cpp | 10 ---------- + src/neochatroom.h | 1 - + 2 files changed, 11 deletions(-) + +diff --git a/src/neochatroom.cpp b/src/neochatroom.cpp +index a98b6cdbe..101c0fc50 100644 +--- a/src/neochatroom.cpp ++++ b/src/neochatroom.cpp +@@ -66,8 +66,6 @@ NeoChatRoom::NeoChatRoom(Connection *connection, QString roomId, JoinState joinS + : Room(connection, std::move(roomId), joinState) + { + connect(connection, &Connection::accountDataChanged, this, &NeoChatRoom::updatePushNotificationState); +- connect(this, &NeoChatRoom::notificationCountChanged, this, &NeoChatRoom::countChanged); +- connect(this, &NeoChatRoom::highlightCountChanged, this, &NeoChatRoom::countChanged); + connect(this, &Room::fileTransferCompleted, this, [this] { + setFileUploadingProgress(0); + setHasFileUploading(false); +@@ -410,14 +408,6 @@ void NeoChatRoom::onRedaction(const RoomEvent &prevEvent, const RoomEvent & /*af + } + } + +-void NeoChatRoom::countChanged() +-{ +- if (displayed() && !hasUnreadMessages()) { +- resetNotificationCount(); +- resetHighlightCount(); +- } +-} +- + QDateTime NeoChatRoom::lastActiveTime() + { + if (timelineSize() == 0) { +diff --git a/src/neochatroom.h b/src/neochatroom.h +index d0795f383..6125cfa96 100644 +--- a/src/neochatroom.h ++++ b/src/neochatroom.h +@@ -866,7 +866,6 @@ private: + #endif + + private Q_SLOTS: +- void countChanged(); + void updatePushNotificationState(QString type); + + void cacheLastEvent(); +-- +GitLab + diff --git a/net-im/neochat/neochat-23.04.2.ebuild b/net-im/neochat/neochat-23.04.3-r1.ebuild index 77b0c006b60c..a76cc93cc5dc 100644 --- a/net-im/neochat/neochat-23.04.2.ebuild +++ b/net-im/neochat/neochat-23.04.3-r1.ebuild @@ -14,7 +14,7 @@ HOMEPAGE="https://apps.kde.org/neochat/" LICENSE="GPL-3+ handbook? ( CC-BY-SA-4.0 )" SLOT="0" -KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86" +KEYWORDS="amd64 arm64 ~ppc64 x86" DEPEND=" app-text/cmark:= @@ -41,7 +41,7 @@ DEPEND=" >=kde-frameworks/qqc2-desktop-style-${KFMIN}:5 >=kde-frameworks/sonnet-${KFMIN}:5[qml] media-libs/kquickimageeditor:5 - >=net-libs/libquotient-0.6:= + <net-libs/libquotient-0.8:= " RDEPEND="${DEPEND} >=dev-qt/qtgraphicaleffects-${QTMIN}:5 @@ -49,3 +49,5 @@ RDEPEND="${DEPEND} >=kde-frameworks/purpose-${KFMIN}:5 " BDEPEND="virtual/pkgconfig" + +PATCHES=( "${FILESDIR}"/${P}-libquotient-0.8-{1,2}.patch ) diff --git a/net-im/neochat/neochat-23.08.3-r1.ebuild b/net-im/neochat/neochat-23.08.3-r1.ebuild new file mode 100644 index 000000000000..aa9372d84a08 --- /dev/null +++ b/net-im/neochat/neochat-23.08.3-r1.ebuild @@ -0,0 +1,54 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +ECM_HANDBOOK="optional" +ECM_TEST="true" +KFMIN=5.106.0 +QTMIN=5.15.9 +inherit ecm gear.kde.org + +DESCRIPTION="Client for Matrix, the decentralized communication protocol" +HOMEPAGE="https://apps.kde.org/neochat/" + +LICENSE="GPL-3+ handbook? ( CC-BY-SA-4.0 )" +SLOT="0" +KEYWORDS="amd64 arm64 ~ppc64 x86" + +DEPEND=" + app-text/cmark:= + >=dev-libs/kirigami-addons-0.7.2:5 + dev-libs/qcoro5 + dev-libs/qtkeychain:=[qt5(+)] + >=dev-qt/qtdeclarative-${QTMIN}:5 + >=dev-qt/qtgui-${QTMIN}:5 + >=dev-qt/qtmultimedia-${QTMIN}:5[gstreamer] + >=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/kconfigwidgets-${KFMIN}:5 + >=kde-frameworks/kcoreaddons-${KFMIN}:5 + >=kde-frameworks/kdbusaddons-${KFMIN}:5 + >=kde-frameworks/ki18n-${KFMIN}:5 + >=kde-frameworks/kio-${KFMIN}:5 + >=kde-frameworks/kirigami-${KFMIN}:5 + >=kde-frameworks/kitemmodels-${KFMIN}:5[qml] + >=kde-frameworks/knotifications-${KFMIN}:5[qml] + >=kde-frameworks/kwindowsystem-${KFMIN}:5 + >=kde-frameworks/qqc2-desktop-style-${KFMIN}:5 + >=kde-frameworks/sonnet-${KFMIN}:5[qml] + media-libs/kquickimageeditor:5 + >=net-libs/libquotient-0.8:= +" +RDEPEND="${DEPEND} + >=dev-qt/qtgraphicaleffects-${QTMIN}:5 + >=dev-qt/qtlocation-${QTMIN}:5 + >=dev-qt/qtmultimedia-${QTMIN}:5[qml] + >=dev-qt/qtpositioning-${QTMIN}:5[qml] + >=kde-frameworks/kquickcharts-${KFMIN}:5 + >=kde-frameworks/purpose-${KFMIN}:5 +" +BDEPEND="virtual/pkgconfig" diff --git a/net-im/openmittsu/Manifest b/net-im/openmittsu/Manifest index 2937b3a1a154..f396862e2e46 100644 --- a/net-im/openmittsu/Manifest +++ b/net-im/openmittsu/Manifest @@ -1,2 +1 @@ DIST openmittsu-0.10.0.0.tar.xz 2345724 BLAKE2B 407fe07147b17e6ac6ec2381e77256d09824fce87f1d9d141d2940e566191e911b05fb3d6701d342be9bb667551903f4f8913cbb25f504100e92ab4a38339555 SHA512 d4334c8516efcd63a3e9dfcf9f9655922aa14b2574f39269cf7019a8c951144569138c2a0a75abb16e2746a33002f0c07ef6c86dbdb5405e11c315ec630eb0d0 -DIST openmittsu-0.9.15.0.tar.xz 2302908 BLAKE2B 2800004968a1965d0c91197402618ae4ebaeb7a7d977e79654f296d7d2ca1466d26b86d99810e0502e9eced27e5a664dbb4b0113ec344367fb7b85557ebc0381 SHA512 9e00828053506cf233a4cede49c501da903cc36d49379b891e4186cf10cacfbd596b4d2b7ac551e2e6340a878bfa1155f8696e179ed9dd1c2ecbff61430ed7f9 diff --git a/net-im/openmittsu/files/openmittsu-0.10.0.0-musl.patch b/net-im/openmittsu/files/openmittsu-0.10.0.0-musl.patch new file mode 100644 index 000000000000..7935ff5530d4 --- /dev/null +++ b/net-im/openmittsu/files/openmittsu-0.10.0.0-musl.patch @@ -0,0 +1,25 @@ +Fix compilation with MUSL libc +https://bugs.gentoo.org/907754 + +Patch backported from spdlog repository: +https://github.com/gabime/spdlog/commit/287a00d364990edbb621fe5e392aeb550135fb96 + +commit 287a00d364990edbb621fe5e392aeb550135fb96 +Author: Khem Raj <raj.khem@gmail.com> +Date: Tue Jan 3 09:54:50 2023 -0800 + + Do not use LFS64 functions on linux/musl (#2589) + +--- openmittsu-0.10.0.0/3rdparty/spdlog/include/spdlog/details/os-inl.h ++++ openmittsu-0.10.0.0/3rdparty/spdlog/include/spdlog/details/os-inl.h +@@ -230,8 +230,8 @@ + #else + int fd = ::fileno(f); + #endif +-// 64 bits(but not in osx or cygwin, where fstat64 is deprecated) +-#if (defined(__linux__) || defined(__sun) || defined(_AIX)) && (defined(__LP64__) || defined(_LP64)) ++// 64 bits(but not in osx, linux/musl or cygwin, where fstat64 is deprecated) ++#if ((defined(__linux__) && defined(__GLIBC__)) || defined(__sun) || defined(_AIX)) && (defined(__LP64__) || defined(_LP64)) + struct stat64 st; + if (::fstat64(fd, &st) == 0) + { diff --git a/net-im/openmittsu/files/openmittsu-0.9.13.32-fix-tests.patch b/net-im/openmittsu/files/openmittsu-0.9.13.32-fix-tests.patch deleted file mode 100644 index c89d24536ae9..000000000000 --- a/net-im/openmittsu/files/openmittsu-0.9.13.32-fix-tests.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- openmittsu-0.9.13.32-orig/CMakeLists.txt -+++ openmittsu-0.9.13.32/CMakeLists.txt -@@ -570,7 +570,7 @@ - target_link_libraries(openMittsu openMittsuCore Qt5::Core Qt5::Gui Qt5::Widgets Qt5::Network Qt5::Multimedia Qt5::MultimediaWidgets Qt5::Sql) - target_link_libraries(openMittsuVersionInfo Qt5::Core) - if (OPENMITTSU_ENABLE_TESTS) -- target_link_libraries(openMittsuTests openMittsuCore Qt5::Core Qt5::Network Qt5::Multimedia Qt5::MultimediaWidgets Qt5::Sql gmock gtest) -+ target_link_libraries(openMittsuTests openMittsuCore Qt5::Core Qt5::Network Qt5::Multimedia Qt5::MultimediaWidgets Qt5::Sql gmock gtest pthread) - endif (OPENMITTSU_ENABLE_TESTS) - - # Link against libc++abi if requested. diff --git a/net-im/openmittsu/openmittsu-0.10.0.0.ebuild b/net-im/openmittsu/openmittsu-0.10.0.0.ebuild index 23de4770cacf..dc31c3a2ca06 100644 --- a/net-im/openmittsu/openmittsu-0.10.0.0.ebuild +++ b/net-im/openmittsu/openmittsu-0.10.0.0.ebuild @@ -29,6 +29,8 @@ RDEPEND="dev-db/qt5-sqlcipher DEPEND="${RDEPEND} test? ( >=dev-cpp/gtest-1.8.0 )" +PATCHES=( "${FILESDIR}"/${P}-musl.patch ) + DOCS=( README.md Example-client-configuration-file.ini diff --git a/net-im/openmittsu/openmittsu-0.9.15.0.ebuild b/net-im/openmittsu/openmittsu-0.9.15.0.ebuild deleted file mode 100644 index 945996c436ae..000000000000 --- a/net-im/openmittsu/openmittsu-0.9.15.0.ebuild +++ /dev/null @@ -1,63 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit cmake desktop - -DESCRIPTION="Open source chat client for Threema-style end-to-end encrypted chat networks" -HOMEPAGE="https://www.openmittsu.de/" -# git-archive-all.sh snapshot of https://github.com/blizzard4591/openMittsu.git -SRC_URI="https://dev.gentoo.org/~ulm/distfiles/${P}.tar.xz" - -LICENSE="GPL-2+ BitstreamVera OFL-1.1 Apache-2.0 CC0-1.0 MIT BSD" -SLOT="0" -KEYWORDS="~amd64" -IUSE="test" -RESTRICT="!test? ( test )" - -RDEPEND="dev-db/qt5-sqlcipher - >=dev-libs/libsodium-1.0.11:= - >=dev-qt/qtcore-5.7.1:5= - >=dev-qt/qtgui-5.7.1:5= - >=dev-qt/qtmultimedia-5.7.1:5=[widgets] - >=dev-qt/qtnetwork-5.7.1:5=[ssl] - >=dev-qt/qtsql-5.7.1:5=[sqlite] - >=dev-qt/qtwidgets-5.7.1:5= - >=media-gfx/qrencode-3.4.4-r1:=" -DEPEND="${RDEPEND} - test? ( >=dev-cpp/gtest-1.8.0 )" - -PATCHES=( - "${FILESDIR}"/${PN}-0.9.13.32-fix-tests.patch -) - -DOCS=( - README.md - Example-client-configuration-file.ini - Example-contacts-file.txt -) - -src_configure() { - local mycmakeargs=( - # set version manually, since autodetection works only with git - "-DOPENMITTSU_CUSTOM_VERSION_STRING=${PV%.*}-${PV##*.}-00000000" - "-DOPENMITTSU_DISABLE_VERSION_UPDATE_CHECK=ON" - "-DOPENMITTSU_ENABLE_TESTS=$(usex test)" - ) - cmake_src_configure -} - -src_test() { - cd "${BUILD_DIR}" || die - ./openMittsuTests || die -} - -src_install() { - local my_pn="openMittsu" - cmake_src_install - newicon resources/icon.png ${my_pn}.png - make_desktop_entry ${my_pn} ${my_pn} ${my_pn} - rm "${ED}"/usr/bin/${my_pn}VersionInfo || die - rm -f "${ED}"/usr/bin/${my_pn}Tests || die -} diff --git a/net-im/poezio/poezio-0.14.ebuild b/net-im/poezio/poezio-0.14.ebuild index fabfb7c285fd..b1a80a0858a5 100644 --- a/net-im/poezio/poezio-0.14.ebuild +++ b/net-im/poezio/poezio-0.14.ebuild @@ -14,7 +14,7 @@ LICENSE="GPL-3+" SLOT="0" if [[ "${PV}" == "9999" ]]; then - EGIT_REPO_URI="https://lab.louiz.org/${PN}/${PN}.git" + EGIT_REPO_URI="https://lab.louiz.org/${PN}/${PN}.git https://github.com/poezio/poezio.git" inherit git-r3 # We build the html documentation using sphinx. diff --git a/net-im/poezio/poezio-9999.ebuild b/net-im/poezio/poezio-9999.ebuild index fc928f4f2798..7aa78a8fe0f9 100644 --- a/net-im/poezio/poezio-9999.ebuild +++ b/net-im/poezio/poezio-9999.ebuild @@ -14,7 +14,7 @@ LICENSE="GPL-3+" SLOT="0" if [[ "${PV}" == "9999" ]]; then - EGIT_REPO_URI="https://lab.louiz.org/${PN}/${PN}.git" + EGIT_REPO_URI="https://lab.louiz.org/${PN}/${PN}.git https://github.com/poezio/poezio.git" inherit git-r3 # We build the html documentation using sphinx. diff --git a/net-im/profanity/Manifest b/net-im/profanity/Manifest index d7bb1cf58108..9726decea4da 100644 --- a/net-im/profanity/Manifest +++ b/net-im/profanity/Manifest @@ -1 +1,5 @@ DIST profanity-0.13.1.tar.xz 621836 BLAKE2B e038fa01272150cb7974b03f88f64335bf1690115dbbb1c6fe04c79acb69db18c556edf41316af1d363f9715cd2e7aeb3f3bd867836704b620d9a87976b64fa9 SHA512 6d7d3c96c65e26c15cac1157bd296c1dbd3e2471aec959d6c319c68b70ec21cef0c40d7b4eed40c30c377a766db9f13a774ccb4880c227ee368e4dd607d9c267 +DIST profanity-0.14.0-ox-carbons.patch 1525 BLAKE2B 85fe9a76a8c735047365d56555c8e1df7906b5a676740a165fc5d9eab3933124b58abf6bdd0b448b5030a51cd1fad3ce8627cc03a2fbdacdd20c5dcc71d194e1 SHA512 36cfbb12ef7889ae5f318e35da2b0edf39dca067cefb9ac921f27cba0f52746eaae9d65b7631be392dd6e9a15d1fc8f8a3de36efe8707c756e9b008291e7f55e +DIST profanity-0.14.0-plugins-install.patch 2295 BLAKE2B 8b67718abdb620875b9040f550685189acf5a2776aa5f45422e3471c13ae05bd773c05652048940d5b8d10d88c9a013c3262742db7c84b0ff0c108f5f78ead45 SHA512 a8912d5a33d4d6eebf85733f616ed729a05688b4acf70c927aa733755527fd4e523c3a485bbb0390b2006225e8420e1d76db7e91d2122af41496c0081e3b0cea +DIST profanity-0.14.0-xscreensaver.patch 1678 BLAKE2B fe350b2249e45224b6510bb5730f38eafeb47e60a44035eaf88771940c9f0e556cc72ca737cb68c0b148b9faff442b9c9b6cdf9169a3db7ff6c7a60c2bdfc025 SHA512 2875df728b9957fc3bc8734a87c0e1a48913170b9718d6664ea65187327e26da1a7b2f5b80fe243a5ce5ab74983e4f3d22113747f44f8b8e8c13c871d31cf651 +DIST profanity-0.14.0.tar.gz 936272 BLAKE2B ec2ae625950a838ee50d6d3a87910bec76f28777bd662e909f394f18c277662694611a59d3be6c7f66821c2800a94b08f94b27a68d82e4de33b7d2f7b14ddf18 SHA512 25afd2f3146e6ed9f573f0e073cad0f06f7f8a21441c3c2c61641442d1aa5b9a7a817cdccc17354b32045ab9a965a95495a30c49088577a5060e8969725ea86e diff --git a/net-im/profanity/metadata.xml b/net-im/profanity/metadata.xml index 619a19eb9612..7b75b4cdd81c 100644 --- a/net-im/profanity/metadata.xml +++ b/net-im/profanity/metadata.xml @@ -16,7 +16,9 @@ <use> <flag name="gpg">Enable OpenPGP encryption</flag> <flag name="omemo">Enable OMEMO encryption</flag> + <flag name="omemo-qrcode">Enable exchanging OMEMO information via QR code</flag> <flag name="otr">Enable encrypted conversations using Off-The-Records messaging</flag> + <flag name="python">Enable Python plugins support</flag> </use> <upstream> <remote-id type="github">profanity-im/profanity</remote-id> diff --git a/net-im/profanity/profanity-0.14.0-r1.ebuild b/net-im/profanity/profanity-0.14.0-r1.ebuild new file mode 100644 index 000000000000..7ffbb30da303 --- /dev/null +++ b/net-im/profanity/profanity-0.14.0-r1.ebuild @@ -0,0 +1,96 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +PYTHON_COMPAT=( python3_{10..11} ) +inherit python-single-r1 + +DESCRIPTION="A console based XMPP client inspired by Irssi" +HOMEPAGE="https://profanity-im.github.io" +SRC_URI=" + https://github.com/profanity-im/profanity/releases/download/${PV}/${P}.tar.gz + https://github.com/profanity-im/profanity/commit/122434a.patch + -> ${PN}-0.14.0-ox-carbons.patch + https://github.com/profanity-im/profanity/commit/2ed6211c.patch + -> ${PN}-0.14.0-xscreensaver.patch +" + +LICENSE="GPL-3" +SLOT="0" +KEYWORDS="~amd64 ~arm64" +IUSE="libnotify omemo omemo-qrcode otr gpg test xscreensaver python" +RESTRICT="!test? ( test )" +REQUIRED_USE="omemo-qrcode? ( omemo ) python? ( ${PYTHON_REQUIRED_USE} )" + +RDEPEND=" + >=app-accessibility/at-spi2-core-2.46.0 + dev-db/sqlite:3 + dev-libs/glib:2 + >=dev-libs/libstrophe-0.12.3:= + media-libs/harfbuzz:= + net-misc/curl + sys-libs/ncurses:=[unicode(+)] + sys-libs/readline:= + x11-libs/cairo + x11-libs/gdk-pixbuf:2 + x11-libs/gtk+:3 + x11-libs/pango + x11-misc/shared-mime-info + gpg? ( app-crypt/gpgme:= ) + libnotify? ( x11-libs/libnotify ) + omemo? ( + dev-libs/libgcrypt:= + net-libs/libsignal-protocol-c + ) + omemo-qrcode? ( media-gfx/qrencode:= ) + otr? ( net-libs/libotr ) + python? ( ${PYTHON_DEPS} ) + xscreensaver? ( + x11-libs/libXScrnSaver + x11-libs/libX11 + ) +" +DEPEND=" + ${RDEPEND} + test? ( dev-util/cmocka ) + python? ( + $(python_gen_cond_dep ' + dev-python/cython[${PYTHON_USEDEP}] + ') + ) +" + +PATCHES=( + "${DISTDIR}/${PN}-0.14.0-ox-carbons.patch" + "${DISTDIR}/${PN}-0.14.0-xscreensaver.patch" +) + +pkg_setup() { + use python && python-single-r1_pkg_setup +} + +src_configure() { + local myeconfargs=( + --enable-gdk-pixbuf + $(use_enable libnotify notifications) + $(use_enable omemo) + $(use_enable omemo-qrcode) + $(use_enable otr) + $(use_enable python python-plugins) + $(use_enable gpg pgp) + $(use_with xscreensaver) + ) + + econf "${myeconfargs[@]}" +} + +src_compile() { + emake CFLAGS="${CFLAGS}" +} + +src_install() { + default + + find "${ED}" -type f -name '*.la' -delete || die +} diff --git a/net-im/profanity/profanity-0.14.0-r2.ebuild b/net-im/profanity/profanity-0.14.0-r2.ebuild new file mode 100644 index 000000000000..3426b20cecea --- /dev/null +++ b/net-im/profanity/profanity-0.14.0-r2.ebuild @@ -0,0 +1,99 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +PYTHON_COMPAT=( python3_{10..11} ) +inherit python-single-r1 + +DESCRIPTION="A console based XMPP client inspired by Irssi" +HOMEPAGE="https://profanity-im.github.io" +SRC_URI=" + https://github.com/profanity-im/profanity/releases/download/${PV}/${P}.tar.gz + https://github.com/profanity-im/profanity/commit/122434a.patch + -> ${PN}-0.14.0-ox-carbons.patch + https://github.com/profanity-im/profanity/commit/2ed6211c.patch + -> ${PN}-0.14.0-xscreensaver.patch + https://github.com/profanity-im/profanity/commit/b8817470.patch + -> ${PN}-0.14.0-plugins-install.patch +" + +LICENSE="GPL-3" +SLOT="0" +KEYWORDS="~amd64 ~arm64" +IUSE="libnotify omemo omemo-qrcode otr gpg test xscreensaver python" +RESTRICT="!test? ( test )" +REQUIRED_USE="omemo-qrcode? ( omemo ) python? ( ${PYTHON_REQUIRED_USE} )" + +RDEPEND=" + >=app-accessibility/at-spi2-core-2.46.0 + dev-db/sqlite:3 + dev-libs/glib:2 + >=dev-libs/libstrophe-0.12.3:= + media-libs/harfbuzz:= + net-misc/curl + sys-libs/ncurses:=[unicode(+)] + sys-libs/readline:= + x11-libs/cairo + x11-libs/gdk-pixbuf:2 + x11-libs/gtk+:3 + x11-libs/pango + x11-misc/shared-mime-info + gpg? ( app-crypt/gpgme:= ) + libnotify? ( x11-libs/libnotify ) + omemo? ( + dev-libs/libgcrypt:= + net-libs/libsignal-protocol-c + ) + omemo-qrcode? ( media-gfx/qrencode:= ) + otr? ( net-libs/libotr ) + python? ( ${PYTHON_DEPS} ) + xscreensaver? ( + x11-libs/libXScrnSaver + x11-libs/libX11 + ) +" +DEPEND=" + ${RDEPEND} + test? ( dev-util/cmocka ) + python? ( + $(python_gen_cond_dep ' + dev-python/cython[${PYTHON_USEDEP}] + ') + ) +" + +PATCHES=( + "${DISTDIR}/${PN}-0.14.0-ox-carbons.patch" + "${DISTDIR}/${PN}-0.14.0-xscreensaver.patch" + "${DISTDIR}/${PN}-0.14.0-plugins-install.patch" +) + +pkg_setup() { + use python && python-single-r1_pkg_setup +} + +src_configure() { + local myeconfargs=( + --enable-gdk-pixbuf + $(use_enable libnotify notifications) + $(use_enable omemo) + $(use_enable omemo-qrcode) + $(use_enable otr) + $(use_enable python python-plugins) + $(use_enable gpg pgp) + $(use_with xscreensaver) + ) + + econf "${myeconfargs[@]}" +} + +src_compile() { + emake CFLAGS="${CFLAGS}" +} + +src_install() { + default + + find "${ED}" -type f -name '*.la' -delete || die +} diff --git a/net-im/profanity/profanity-0.14.0.ebuild b/net-im/profanity/profanity-0.14.0.ebuild new file mode 100644 index 000000000000..1c3dbeb86ba2 --- /dev/null +++ b/net-im/profanity/profanity-0.14.0.ebuild @@ -0,0 +1,71 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +DESCRIPTION="A console based XMPP client inspired by Irssi" +HOMEPAGE="https://profanity-im.github.io" +SRC_URI="https://github.com/profanity-im/profanity/releases/download/${PV}/${P}.tar.gz" + +LICENSE="GPL-3" +SLOT="0" +KEYWORDS="amd64 ~arm64" +IUSE="libnotify omemo omemo-qrcode otr gpg test xscreensaver" +RESTRICT="!test? ( test )" +REQUIRED_USE="omemo-qrcode? ( omemo )" + +RDEPEND=" + >=app-accessibility/at-spi2-core-2.46.0 + dev-db/sqlite:3 + dev-libs/glib:2 + >=dev-libs/libstrophe-0.12.3:= + media-libs/harfbuzz:= + net-misc/curl + sys-libs/ncurses:=[unicode(+)] + sys-libs/readline:= + x11-libs/cairo + x11-libs/gdk-pixbuf:2 + x11-libs/gtk+:3 + x11-libs/pango + x11-misc/shared-mime-info + gpg? ( app-crypt/gpgme:= ) + libnotify? ( x11-libs/libnotify ) + omemo? ( + dev-libs/libgcrypt:= + net-libs/libsignal-protocol-c + ) + omemo-qrcode? ( media-gfx/qrencode:= ) + otr? ( net-libs/libotr ) + xscreensaver? ( + x11-libs/libXScrnSaver + x11-libs/libX11 + ) +" +DEPEND=" + ${RDEPEND} + test? ( dev-util/cmocka ) +" + +src_configure() { + local myeconfargs=( + --enable-gdk-pixbuf + $(use_enable libnotify notifications) + $(use_enable omemo) + $(use_enable omemo-qrcode) + $(use_enable otr) + $(use_enable gpg pgp) + $(use_with xscreensaver) + ) + + econf "${myeconfargs[@]}" +} + +src_compile() { + emake CFLAGS="${CFLAGS}" +} + +src_install() { + default + + find "${ED}" -type f -name '*.la' -delete || die +} diff --git a/net-im/prosody-modules/prosody-modules-0_pre20230221.ebuild b/net-im/prosody-modules/prosody-modules-0_pre20230221.ebuild index 9b0ba076aa2b..2950cf906871 100644 --- a/net-im/prosody-modules/prosody-modules-0_pre20230221.ebuild +++ b/net-im/prosody-modules/prosody-modules-0_pre20230221.ebuild @@ -51,5 +51,6 @@ pkg_postinst() { einfo "'/usr/$(get_libdir)/prosody/community-modules' into 'plugin_paths'" einfo "into your prosody configuration file '/etc/jabber/prosody.cfg.lua.'" einfo "" - einfo "Example: plugin_paths = { \"/usr/$(get_libdir)/prosody/modules\", \"/usr/$(get_libdir)/prosody/community-modules\" };" + einfo "Example: plugin_paths = { \"/usr/$(get_libdir)/prosody/modules\"," + einfo "\"/usr/$(get_libdir)/prosody/community-modules\" };" } diff --git a/net-im/prosody-modules/prosody-modules-9999.ebuild b/net-im/prosody-modules/prosody-modules-9999.ebuild index 5c9701070e68..fe62bc7a36e7 100644 --- a/net-im/prosody-modules/prosody-modules-9999.ebuild +++ b/net-im/prosody-modules/prosody-modules-9999.ebuild @@ -1,7 +1,7 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 inherit mercurial savedconfig @@ -51,5 +51,6 @@ pkg_postinst() { einfo "'/usr/$(get_libdir)/prosody/community-modules' into 'plugin_paths'" einfo "into your prosody configuration file '/etc/jabber/prosody.cfg.lua.'" einfo "" - einfo "Example: plugin_paths = { \"/usr/$(get_libdir)/prosody/modules\", \"/usr/$(get_libdir)/prosody/community-modules\" };" + einfo "Example: plugin_paths = { \"/usr/$(get_libdir)/prosody/modules\"," + einfo "\"/usr/$(get_libdir)/prosody/community-modules\" };" } diff --git a/net-im/prosody/Manifest b/net-im/prosody/Manifest index 0a90e39b2949..8454059a66ea 100644 --- a/net-im/prosody/Manifest +++ b/net-im/prosody/Manifest @@ -1 +1 @@ -DIST prosody-0.12.3.tar.gz 615302 BLAKE2B 07dc16950449086b5d1643efc29a13cde8e55f38b3402e6355665eed9dd4f7fbf38db237f511cb4f0e8cf08be536ce47a8aec502eff1961556dc47d8ec4b2b88 SHA512 5654aabd83561bea8a10387a242800e92df8db183b6273579d710599ffc458c5b545758ee742fb929a19a2fad9c33700787bc7aa348a8527caef03e80bc2edc4 +DIST prosody-0.12.4.tar.gz 616043 BLAKE2B 6bbe779424a6de6b5d266c3f6301282e010b96c9baca79d8dff46ab91365e6c5fdaa1b52c3caaaf33dad0990fa2c298f0447d37fcc018067f6efcc23d633b4fc SHA512 e035ec9af3831c596ababbc0320f352b7253d3ee968c9937998ffc255839173c9278912a0897fa9f0a0665bc43603f8570b5e15dfd1cba4571599e86a98d8cf4 diff --git a/net-im/prosody/prosody-0.12.3.ebuild b/net-im/prosody/prosody-0.12.4.ebuild index 29ac71036832..29ac71036832 100644 --- a/net-im/prosody/prosody-0.12.3.ebuild +++ b/net-im/prosody/prosody-0.12.4.ebuild diff --git a/net-im/qtox/qtox-1.17.6-r2.ebuild b/net-im/qtox/qtox-1.17.6-r2.ebuild new file mode 100644 index 000000000000..26c612874adc --- /dev/null +++ b/net-im/qtox/qtox-1.17.6-r2.ebuild @@ -0,0 +1,90 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit cmake xdg + +if [[ ${PV} == 9999 ]]; then + inherit git-r3 + EGIT_REPO_URI="https://github.com/qTox/qTox.git" +else + MY_P="qTox-${PV}" + SRC_URI="https://github.com/qTox/qTox/releases/download/v${PV}/v${PV}.tar.gz -> ${MY_P}.tar.gz" + KEYWORDS="~amd64 ~x86" + S="${WORKDIR}/qTox" +fi + +DESCRIPTION="Instant messaging client using the encrypted p2p Tox protocol" +HOMEPAGE="https://qtox.github.io/" + +LICENSE="GPL-3+" +SLOT="0" +IUSE="+spellcheck test X" + +RESTRICT="!test? ( test )" + +BDEPEND=" + dev-qt/linguist-tools:5 + virtual/pkgconfig +" +RDEPEND=" + dev-db/sqlcipher + dev-libs/libsodium:= + dev-qt/qtconcurrent:5 + dev-qt/qtcore:5 + dev-qt/qtgui:5[gif(+),jpeg,png,X(-)] + dev-qt/qtnetwork:5 + dev-qt/qtopengl:5 + dev-qt/qtsvg:5 + dev-qt/qtwidgets:5 + dev-qt/qtxml:5 + media-gfx/qrencode:= + media-libs/libexif + media-libs/openal + media-video/ffmpeg:=[webp,v4l] + >=net-libs/tox-0.2.13:=[av] + spellcheck? ( kde-frameworks/sonnet:5 ) + X? ( + x11-libs/libX11 + x11-libs/libXScrnSaver + ) +" +DEPEND="${RDEPEND} + test? ( dev-qt/qttest:5 ) + X? ( x11-base/xorg-proto ) +" + +DOCS=( CHANGELOG.md README.md doc/user_manual_en.md ) + +src_prepare() { + cmake_src_prepare + + # bug 628574 + if ! use test; then + sed -i CMakeLists.txt -e "/include(Testing)/d" || die + sed -i cmake/Dependencies.cmake -e "/find_package(Qt5Test/d" || die + fi +} + +src_configure() { + local mycmakeargs=( + -DPLATFORM_EXTENSIONS=$(usex X) + -DUPDATE_CHECK=OFF + -DUSE_CCACHE=OFF + -DSPELL_CHECK=$(usex spellcheck) + -DSVGZ_ICON=ON + -DASAN=OFF + -DDESKTOP_NOTIFICATIONS=OFF + -DSTRICT_OPTIONS=OFF + ) + + [[ ${PV} != 9999 ]] && mycmakeargs+=( -DGIT_DESCRIBE=${PV} ) + + cmake_src_configure +} + +src_test() { + # The excluded tests require network access. + cmake_src_test -E "test_(bsu|core)" +} diff --git a/net-im/qtox/qtox-9999.ebuild b/net-im/qtox/qtox-9999.ebuild index fe8a64494ea3..efe18c5045f9 100644 --- a/net-im/qtox/qtox-9999.ebuild +++ b/net-im/qtox/qtox-9999.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -20,7 +20,7 @@ HOMEPAGE="https://qtox.github.io/" LICENSE="GPL-3+" SLOT="0" -IUSE="notification +spellcheck test X" +IUSE="+spellcheck test X" RESTRICT="!test? ( test )" @@ -46,7 +46,6 @@ RDEPEND=" >=net-libs/tox-0.2.13:=[av] >=net-libs/toxext-0.0.3 >=net-libs/tox_extension_messages-0.0.3 - notification? ( x11-libs/snorenotify ) spellcheck? ( kde-frameworks/sonnet:5 ) X? ( x11-libs/libX11 @@ -78,7 +77,7 @@ src_configure() { -DSPELL_CHECK=$(usex spellcheck) -DSVGZ_ICON=ON -DASAN=OFF - -DDESKTOP_NOTIFICATIONS=$(usex notification) + -DDESKTOP_NOTIFICATIONS=OFF -DSTRICT_OPTIONS=OFF ) diff --git a/net-im/ricochet/Manifest b/net-im/ricochet/Manifest deleted file mode 100644 index 5b3657813636..000000000000 --- a/net-im/ricochet/Manifest +++ /dev/null @@ -1 +0,0 @@ -DIST ricochet-1.1.4.tar.gz 1292671 BLAKE2B 15a71496b01992060fbdbedb0c73365aa250d9e6c4b5bb6223cbcd727a1cf062b1b9cd094d17ae33471e6095a071b1ea6d553a1bb2168974d45486995e204e9b SHA512 9f20fe8e34ea1d8d5b252eee1e164f0a97bf5b3818e864270ea79c0f018b229ec04b1b27acf44415bb646d48b9d1a0ada455a4f77fafdb6e4d21e62292b778a1 diff --git a/net-im/ricochet/metadata.xml b/net-im/ricochet/metadata.xml deleted file mode 100644 index 3c27f902e41b..000000000000 --- a/net-im/ricochet/metadata.xml +++ /dev/null @@ -1,12 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> -<pkgmetadata> - <maintainer type="person" proxied="yes"> - <email>lucianposton@pm.me</email> - <name>Lucian Poston</name> - </maintainer> - <maintainer type="project" proxied="proxy"> - <email>proxy-maint@gentoo.org</email> - <name>Proxy Maintainers</name> - </maintainer> -</pkgmetadata> diff --git a/net-im/ricochet/ricochet-1.1.4.ebuild b/net-im/ricochet/ricochet-1.1.4.ebuild deleted file mode 100644 index 016274c26dde..000000000000 --- a/net-im/ricochet/ricochet-1.1.4.ebuild +++ /dev/null @@ -1,57 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit qmake-utils xdg-utils - -if [[ ${PV} == *9999* ]]; then - inherit git-r3 - 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" -fi - -DESCRIPTION="Privacy-focused instant messaging through Tor hidden services" -HOMEPAGE="https://ricochet.im" - -LICENSE="BSD" -SLOT="0" -IUSE="debug hardened" - -RDEPEND=" - dev-libs/openssl:0= - dev-libs/protobuf:0= - dev-qt/qtcore:5 - dev-qt/qtdeclarative:5 - dev-qt/qtgui:5 - dev-qt/qtmultimedia:5 - dev-qt/qtnetwork:5 - dev-qt/qtquickcontrols:5 - dev-qt/qtwidgets:5 - net-vpn/tor" -DEPEND="${RDEPEND}" -BDEPEND=" - dev-qt/linguist-tools:5 - virtual/pkgconfig" - -src_configure() { - local qmakeargs=( 'DEFINES+=RICOCHET_NO_PORTABLE' ) - qmakeargs+=( $(usex debug 'CONFIG+=debug' 'CONFIG+=release') ) - qmakeargs+=( $(usex hardened 'CONFIG+=hardened' 'CONFIG+=no-hardened') ) - - eqmake5 "${qmakeargs[@]}" -} - -src_install() { - emake INSTALL_ROOT="${D}" install -} - -pkg_postinst() { - xdg_icon_cache_update -} - -pkg_postrm() { - xdg_icon_cache_update -} diff --git a/net-im/ricochet/ricochet-9999.ebuild b/net-im/ricochet/ricochet-9999.ebuild deleted file mode 100644 index 2caa9d50609c..000000000000 --- a/net-im/ricochet/ricochet-9999.ebuild +++ /dev/null @@ -1,65 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit qmake-utils xdg-utils - -if [[ ${PV} == *9999* ]]; then - inherit git-r3 - 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" -fi - -DESCRIPTION="Privacy-focused instant messaging through Tor hidden services" -HOMEPAGE="https://ricochet.im" - -LICENSE="BSD" -SLOT="0" -IUSE="debug hardened" - -RDEPEND=" - dev-libs/openssl:0= - dev-libs/protobuf:0= - dev-qt/qtcore:5 - dev-qt/qtdeclarative:5 - dev-qt/qtgui:5 - dev-qt/qtmultimedia:5 - dev-qt/qtnetwork:5 - dev-qt/qtquickcontrols:5 - dev-qt/qtwidgets:5 - net-vpn/tor" -DEPEND="${RDEPEND}" -BDEPEND=" - dev-qt/linguist-tools:5 - virtual/pkgconfig" - -src_prepare() { - default - - # workaround bug https://github.com/ricochet-im/ricochet/issues/582 - cp contrib/usr.bin.ricochet-apparmor contrib/usr.bin.ricochet -} - -src_configure() { - local qmakeargs=( 'DEFINES+=RICOCHET_NO_PORTABLE' ) - qmakeargs+=( 'DEFINES+=APPARMOR' ) - qmakeargs+=( $(usex debug 'CONFIG+=debug' 'CONFIG+=release') ) - qmakeargs+=( $(usex hardened 'CONFIG+=hardened' 'CONFIG+=no-hardened') ) - - eqmake5 "${qmakeargs[@]}" -} - -src_install() { - emake INSTALL_ROOT="${D}" install -} - -pkg_postinst() { - xdg_icon_cache_update -} - -pkg_postrm() { - xdg_icon_cache_update -} diff --git a/net-im/rocketchat-desktop-bin/Manifest b/net-im/rocketchat-desktop-bin/Manifest index d57edf5d7a44..4ffcf7efd980 100644 --- a/net-im/rocketchat-desktop-bin/Manifest +++ b/net-im/rocketchat-desktop-bin/Manifest @@ -1 +1,2 @@ DIST rocketchat-3.8.16-linux-x86_64.rpm 68712989 BLAKE2B b572047c535b6bcbca9e2a7b37060674aca9a4b356955e8ddf2b3e396b9f60e169d65fe5ffae292e43962b2045eb27c440f497fe950c6d66764b903e7e1700e1 SHA512 3a891396c3f92b5a47f2436047a6724089072bc3f4bd8a56830dfcb3347550dd71e7a2c3ce7c56b5c2c3de99384cdd470ea1005c705649a40a642404dc9e689f +DIST rocketchat-3.9.10-linux-x86_64.rpm 73538525 BLAKE2B be674b902c9c75481c51b50d3de3922a296adbf44eade04a4e1b01988254d4635aa2915f7566b59535fb0026aa41bf8fee121f5748b29ccc44c89b271df3d484 SHA512 75df8faef6b775eaa0e405319ae3d9f69244a93c38b1cc4ccd87be21c7f66f1f03246b0fe1de09c9eeeb70e6898609e6906c64914e57d2a24b7ada908f2737d2 diff --git a/net-im/rocketchat-desktop-bin/rocketchat-desktop-bin-3.9.10.ebuild b/net-im/rocketchat-desktop-bin/rocketchat-desktop-bin-3.9.10.ebuild new file mode 100644 index 000000000000..75bd8b080cc3 --- /dev/null +++ b/net-im/rocketchat-desktop-bin/rocketchat-desktop-bin-3.9.10.ebuild @@ -0,0 +1,105 @@ +# Copyright 2019-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +CHROMIUM_LANGS=" + af am ar bg bn ca cs da de el en-GB en-US es es-419 et fa fi fil fr gu he + hi hr hu id it ja kn ko lt lv ml mr ms nb nl pl pt-BR pt-PT ro ru sk sl sr + sv sw ta te th tr uk ur vi zh-CN zh-TW +" + +inherit chromium-2 desktop 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}-linux-x86_64.rpm" +S="${WORKDIR}" + +KEYWORDS="-* ~amd64" +# Electron bundles a bunch of things +LICENSE=" + MIT BSD BSD-2 BSD-4 AFL-2.1 Apache-2.0 Ms-PL GPL-2 LGPL-2.1 APSL-2 + unRAR OFL CC-BY-SA-3.0 MPL-2.0 android public-domain all-rights-reserved +" +SLOT="0" +RESTRICT="bindist mirror" + +RDEPEND=" + >=app-accessibility/at-spi2-core-2.46.0:2 + dev-libs/expat + dev-libs/libayatana-appindicator + dev-libs/nspr + dev-libs/nss + media-fonts/noto-emoji + media-libs/alsa-lib + net-print/cups + sys-libs/glibc + 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/libxkbcommon + x11-libs/libXrandr + x11-libs/libXrender + x11-libs/libXtst + x11-libs/libXScrnSaver + x11-libs/pango +" + +QA_PREBUILT="opt/Rocket.Chat/*" + +pkg_pretend() { + chromium_suid_sandbox_check_kernel_config +} + +src_prepare() { + default + # cleanup languages + pushd "opt/Rocket.Chat/locales" || die + chromium_remove_language_paks + popd || die +} + +src_configure() { + chromium_suid_sandbox_check_kernel_config + default +} + +src_install() { + for size in {16,32,48,64,128,256,512,1024}; do + doicon -s ${size} "usr/share/icons/hicolor/${size}x${size}/apps/rocketchat-desktop.png" + done + + domenu usr/share/applications/rocketchat-desktop.desktop + + local DESTDIR="/opt/Rocket.Chat" + + # https://github.com/RocketChat/Rocket.Chat.Electron/issues/2536 + dosym ../../usr/lib64/libayatana-appindicator3.so "${DESTDIR}"/libappindicator3.so + + pushd "opt/Rocket.Chat" || die + + exeinto "${DESTDIR}" + doexe chrome-sandbox rocketchat-desktop *.so* + + insinto "${DESTDIR}" + doins *.pak *.bin *.json *.dat + insopts -m0755 + doins -r locales resources + + # Chrome-sandbox requires the setuid bit to be specifically set. + # see https://github.com/electron/electron/issues/17972 + fperms 4755 "${DESTDIR}"/chrome-sandbox + + dosym "${DESTDIR}"/rocketchat-desktop /opt/bin/rocketchat-desktop + popd || die +} diff --git a/net-im/sendxmpp-amm/metadata.xml b/net-im/sendxmpp-amm/metadata.xml index a7fa285c7476..8e918cf7058e 100644 --- a/net-im/sendxmpp-amm/metadata.xml +++ b/net-im/sendxmpp-amm/metadata.xml @@ -5,4 +5,7 @@ <name>Florian Schmaus</name> <email>flow@gentoo.org</email> </maintainer> + <upstream> + <remote-id type="github">flowdalic/sendxmpp</remote-id> + </upstream> </pkgmetadata> diff --git a/net-im/sendxmpp-amm/sendxmpp-amm-1.1.1.ebuild b/net-im/sendxmpp-amm/sendxmpp-amm-1.1.1-r1.ebuild index faee439560d1..4f057429d997 100644 --- a/net-im/sendxmpp-amm/sendxmpp-amm-1.1.1.ebuild +++ b/net-im/sendxmpp-amm/sendxmpp-amm-1.1.1-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -22,10 +22,20 @@ LICENSE="GPL-3+" SLOT="0" RDEPEND=" - dev-lang/ammonite-repl-bin + dev-lang/ammonite-repl-bin[scala2-13] !net-im/sendxmpp " +src_prepare() { + default + # Ensure that the script is using the right Scala version. + sed -i '1 s;^.*$;#!/usr/bin/env amm-2.13;' sendxmpp || die +} + +src_compile() { + : +} + src_install() { default dobin sendxmpp diff --git a/net-im/sendxmpp-amm/sendxmpp-amm-9999.ebuild b/net-im/sendxmpp-amm/sendxmpp-amm-9999.ebuild index 782316d17024..c5dec761f9fd 100644 --- a/net-im/sendxmpp-amm/sendxmpp-amm-9999.ebuild +++ b/net-im/sendxmpp-amm/sendxmpp-amm-9999.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -13,7 +13,7 @@ if [[ "${PV}" == "9999" ]] || [[ -n "${EGIT_COMMIT_ID}" ]]; then inherit git-r3 else SRC_URI="https://github.com/flowdalic/${ORIG_PN}/archive/${PV}.tar.gz -> ${P}.tar.gz" - KEYWORDS="~amd64" + KEYWORDS="amd64" S="${WORKDIR}/${ORIG_PN}-${PV}" fi @@ -22,6 +22,21 @@ LICENSE="GPL-3+" SLOT="0" RDEPEND=" - dev-lang/ammonite-repl-bin + dev-lang/ammonite-repl-bin[scala2-13] !net-im/sendxmpp " + +src_prepare() { + default + # Ensure that the script is using the right Scala version. + sed -i '1 s;^.*$;#!/usr/bin/env amm-2.13;' sendxmpp.sc || die +} + +src_compile() { + : +} + +src_install() { + default + newbin sendxmpp.sc sendxmpp +} diff --git a/net-im/signal-desktop-bin/Manifest b/net-im/signal-desktop-bin/Manifest index 532d9d545f83..48b7985f2bc0 100644 --- a/net-im/signal-desktop-bin/Manifest +++ b/net-im/signal-desktop-bin/Manifest @@ -1 +1 @@ -DIST signal-desktop_6.20.1_amd64.deb 112193082 BLAKE2B d1ef7f025e41ea0a4cae94c15d32d2ebb5c433c82d2072efd9f0265d4a7acf8d5839dd5ffd912b400ea95049c984551322982cc51484150270cbdf71064e4706 SHA512 839f848a275baadc22bfdcfb93c423cffd183ba0cb628c4cbd64a08be478adb4f36c5dfe2898285eeee19e6753b6aaf79b459e0028d52fc9b3dd2950bf2baa6e +DIST signal-desktop_6.40.0_amd64.deb 112025258 BLAKE2B 86eb174bdc9cab90218e6285a2b13b94dc1f3545312dfdae401f5c8c228fa54658b9d2683dbb6a47522dbd8f4b27b4245fd6b5f0029afe24c491fae32606dc0f SHA512 24f3b234938788046fdc9c40bd33a82571d747e0388a2ddba0aa4bb2f9b26061930b2926e1fcc02266753ad404aa94a093b91706ac6d1dc41f6fb7de60ca4a33 diff --git a/net-im/signal-desktop-bin/signal-desktop-bin-6.20.1.ebuild b/net-im/signal-desktop-bin/signal-desktop-bin-6.40.0.ebuild index 9368120568ad..0e583402923d 100644 --- a/net-im/signal-desktop-bin/signal-desktop-bin-6.20.1.ebuild +++ b/net-im/signal-desktop-bin/signal-desktop-bin-6.40.0.ebuild @@ -43,7 +43,7 @@ RDEPEND=" x11-libs/pango sound? ( || ( - media-sound/pulseaudio + media-libs/libpulse media-sound/apulse ) ) diff --git a/net-im/skypeforlinux/Manifest b/net-im/skypeforlinux/Manifest index 089cde0aafe5..5fa840a60d43 100644 --- a/net-im/skypeforlinux/Manifest +++ b/net-im/skypeforlinux/Manifest @@ -1,4 +1 @@ -DIST skypeforlinux_8.96.0.408_amd64.deb 124565400 BLAKE2B 56f8e20c3f192322267afb308fb211bb1af13f144c19e4d42ea2df3ac6a4f1648f47738ca9f1f44ed13f8f20b796726ffc41d9a658431bbd12ecb92579ae3d04 SHA512 b7aa70435c6d0f2b821a8f33b5b33ef6204dafe1467f92024389498c013260ea86649928d93c10ad3a29ffe5b277f0c57b2732d4ed6efe93568b7053ecdfbf44 -DIST skypeforlinux_8.97.0.204_amd64.deb 124991858 BLAKE2B 0b56817a9c181546348a9b34ef746be1040574709a127a8d421bbc698ac9f1e34aa1594dfc292c0c23459719aaedee6ba30bbac0d3f8aeef13b3894448c4f87a SHA512 4dbf16491d6a63d9c20c24a8d80671e968ca1fe7d7fa5cee700c3b411341b9432ee69fa723a231f4e992a5cacac69ad7700da06068a9e4a648c8d7e7b3924b8d -DIST skypeforlinux_8.97.0.404_amd64.deb 125585620 BLAKE2B 89cd0f30db4f644be52e0c3438ca1942573784b224c4d807a8084b501fde6eeff3105514a573a2a4604ef29d128751e2048ad0d3e54b45a2df4a9545ba37aa27 SHA512 a99f28522cd8f35ad4fedccc464545a64f3f4df3f488509596e31e53ee164e4f77c4973744b65c94e8a9441bbc01cf703e4f76c3d53a5b7da4eb0810a6901e04 -DIST skypeforlinux_8.98.0.206_amd64.deb 125269498 BLAKE2B a72e55587dff2e1fad81dabb54f788318d59e430963a5d1eae915014324d9c4f667585f42cb066e42ffa8d0e61363b1095c3133ab38745c78f3d4fa1451c6f5a SHA512 0d21528d6d0040bcfa28c397fe76165c9591cb233d77fa3f88a28494a7027c11023c3e46697f2edcbe8941650b1a521e554bcc16fd96297e2664ff8b7acdf3d2 +DIST skypeforlinux_8.108.0.205_amd64.deb 121989382 BLAKE2B 9881f81d46e8b89e737a78b8671fbdc0739eb349751791539531e0191a44512d2130371b40e302c6dccc3d15d3b6d6ddb006546732a1d39fca386bb3869bb57f SHA512 2d84ea37635f8b725f4654cf163202a372423eb6695af66b8e7cdd52f8780f6360571f67d780f11a4df08b3f0e99349b9e0253f3887d0821c79183ab0adc446b diff --git a/net-im/skypeforlinux/skypeforlinux-8.96.0.408.ebuild b/net-im/skypeforlinux/skypeforlinux-8.108.0.205.ebuild index aa8b927e61ba..a96df6bc8f2e 100644 --- a/net-im/skypeforlinux/skypeforlinux-8.96.0.408.ebuild +++ b/net-im/skypeforlinux/skypeforlinux-8.108.0.205.ebuild @@ -15,6 +15,7 @@ S="${WORKDIR}" LICENSE="Skype-TOS MIT MIT-with-advertising BSD-1 BSD-2 BSD Apache-2.0 Boost-1.0 ISC CC-BY-SA-3.0 CC0-1.0 openssl ZLIB APSL-2 icu Artistic-2 LGPL-2.1" SLOT="0" KEYWORDS="-* ~amd64" +IUSE="selinux" QA_PREBUILT="*" RESTRICT="mirror bindist strip" #299368 @@ -52,7 +53,9 @@ RDEPEND=" x11-libs/libxcb[${MULTILIB_USEDEP}] x11-libs/libxkbcommon[${MULTILIB_USEDEP}] x11-libs/libxkbfile[${MULTILIB_USEDEP}] - x11-libs/pango[${MULTILIB_USEDEP}]" + x11-libs/pango[${MULTILIB_USEDEP}] + selinux? ( sec-policy/selinux-skype ) +" pkg_setup() { chromium_suid_sandbox_check_kernel_config diff --git a/net-im/skypeforlinux/skypeforlinux-8.97.0.204.ebuild b/net-im/skypeforlinux/skypeforlinux-8.97.0.204.ebuild deleted file mode 100644 index aa8b927e61ba..000000000000 --- a/net-im/skypeforlinux/skypeforlinux-8.97.0.204.ebuild +++ /dev/null @@ -1,100 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -MULTILIB_COMPAT=( abi_x86_64 ) - -inherit chromium-2 desktop pax-utils unpacker multilib-build xdg - -DESCRIPTION="Instant messaging client, with support for audio and video" -HOMEPAGE="https://www.skype.com/" -SRC_URI="https://repo.skype.com/deb/pool/main/s/skypeforlinux/${PN}_${PV}_amd64.deb" -S="${WORKDIR}" - -LICENSE="Skype-TOS MIT MIT-with-advertising BSD-1 BSD-2 BSD Apache-2.0 Boost-1.0 ISC CC-BY-SA-3.0 CC0-1.0 openssl ZLIB APSL-2 icu Artistic-2 LGPL-2.1" -SLOT="0" -KEYWORDS="-* ~amd64" - -QA_PREBUILT="*" -RESTRICT="mirror bindist strip" #299368 - -RDEPEND=" - app-crypt/libsecret[${MULTILIB_USEDEP}] - app-accessibility/at-spi2-core:2[${MULTILIB_USEDEP}] - dev-libs/expat[${MULTILIB_USEDEP}] - dev-libs/glib:2[${MULTILIB_USEDEP}] - dev-libs/nspr[${MULTILIB_USEDEP}] - dev-libs/nss[${MULTILIB_USEDEP}] - media-libs/alsa-lib[${MULTILIB_USEDEP}] - media-libs/fontconfig:1.0[${MULTILIB_USEDEP}] - media-libs/freetype:2[${MULTILIB_USEDEP}] - media-libs/libv4l[${MULTILIB_USEDEP}] - net-print/cups[${MULTILIB_USEDEP}] - sys-apps/dbus[${MULTILIB_USEDEP}] - sys-devel/gcc[cxx] - sys-libs/glibc - virtual/ttf-fonts - x11-libs/cairo[${MULTILIB_USEDEP}] - x11-libs/gdk-pixbuf:2[${MULTILIB_USEDEP}] - x11-libs/gtk+:3[${MULTILIB_USEDEP}] - x11-libs/libX11[${MULTILIB_USEDEP}] - x11-libs/libXScrnSaver[${MULTILIB_USEDEP}] - x11-libs/libXcomposite[${MULTILIB_USEDEP}] - x11-libs/libXcursor[${MULTILIB_USEDEP}] - x11-libs/libXdamage[${MULTILIB_USEDEP}] - x11-libs/libXext[${MULTILIB_USEDEP}] - x11-libs/libXfixes[${MULTILIB_USEDEP}] - x11-libs/libXi[${MULTILIB_USEDEP}] - x11-libs/libXrandr[${MULTILIB_USEDEP}] - x11-libs/libXrender[${MULTILIB_USEDEP}] - x11-libs/libXtst[${MULTILIB_USEDEP}] - x11-libs/libxcb[${MULTILIB_USEDEP}] - x11-libs/libxkbcommon[${MULTILIB_USEDEP}] - x11-libs/libxkbfile[${MULTILIB_USEDEP}] - x11-libs/pango[${MULTILIB_USEDEP}]" - -pkg_setup() { - chromium_suid_sandbox_check_kernel_config -} - -src_unpack() { - unpack_deb ${A} -} - -src_prepare() { - default - sed -e "s!^SKYPE_PATH=.*!SKYPE_PATH=${EPREFIX}/opt/skypeforlinux/skypeforlinux!" \ - -i usr/bin/skypeforlinux || die - sed -e "s!^Categories=.*!Categories=Network;InstantMessaging;Telephony;!" \ - -e "/^OnlyShowIn=/d" \ - -i usr/share/applications/skypeforlinux.desktop || die -} - -src_install() { - dodir /opt - cp -a usr/share/skypeforlinux "${ED}"/opt || die - - # remove chrome-sandbox binary, users should use kernel namespaces - # https://bugs.gentoo.org/692692#c18 - rm "${ED}"/opt/skypeforlinux/chrome-sandbox || die - - dobin usr/bin/skypeforlinux - - dodoc usr/share/skypeforlinux/*.html - dodoc -r usr/share/doc/skypeforlinux/. - # symlink required for the "Help->3rd Party Notes" menu entry (otherwise frozen skype -> xdg-open) - dosym ${PF} usr/share/doc/skypeforlinux - - doicon usr/share/pixmaps/skypeforlinux.png - - local res - for res in 16 32 256 512; do - newicon -s ${res} usr/share/icons/hicolor/${res}x${res}/apps/skypeforlinux.png skypeforlinux.png - done - - domenu usr/share/applications/skypeforlinux.desktop - - pax-mark -m "${ED}"/opt/skypeforlinux/skypeforlinux - pax-mark -m "${ED}"/opt/skypeforlinux/resources/app.asar.unpacked/node_modules/slimcore/bin/slimcore.node -} diff --git a/net-im/skypeforlinux/skypeforlinux-8.97.0.404.ebuild b/net-im/skypeforlinux/skypeforlinux-8.97.0.404.ebuild deleted file mode 100644 index aa8b927e61ba..000000000000 --- a/net-im/skypeforlinux/skypeforlinux-8.97.0.404.ebuild +++ /dev/null @@ -1,100 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -MULTILIB_COMPAT=( abi_x86_64 ) - -inherit chromium-2 desktop pax-utils unpacker multilib-build xdg - -DESCRIPTION="Instant messaging client, with support for audio and video" -HOMEPAGE="https://www.skype.com/" -SRC_URI="https://repo.skype.com/deb/pool/main/s/skypeforlinux/${PN}_${PV}_amd64.deb" -S="${WORKDIR}" - -LICENSE="Skype-TOS MIT MIT-with-advertising BSD-1 BSD-2 BSD Apache-2.0 Boost-1.0 ISC CC-BY-SA-3.0 CC0-1.0 openssl ZLIB APSL-2 icu Artistic-2 LGPL-2.1" -SLOT="0" -KEYWORDS="-* ~amd64" - -QA_PREBUILT="*" -RESTRICT="mirror bindist strip" #299368 - -RDEPEND=" - app-crypt/libsecret[${MULTILIB_USEDEP}] - app-accessibility/at-spi2-core:2[${MULTILIB_USEDEP}] - dev-libs/expat[${MULTILIB_USEDEP}] - dev-libs/glib:2[${MULTILIB_USEDEP}] - dev-libs/nspr[${MULTILIB_USEDEP}] - dev-libs/nss[${MULTILIB_USEDEP}] - media-libs/alsa-lib[${MULTILIB_USEDEP}] - media-libs/fontconfig:1.0[${MULTILIB_USEDEP}] - media-libs/freetype:2[${MULTILIB_USEDEP}] - media-libs/libv4l[${MULTILIB_USEDEP}] - net-print/cups[${MULTILIB_USEDEP}] - sys-apps/dbus[${MULTILIB_USEDEP}] - sys-devel/gcc[cxx] - sys-libs/glibc - virtual/ttf-fonts - x11-libs/cairo[${MULTILIB_USEDEP}] - x11-libs/gdk-pixbuf:2[${MULTILIB_USEDEP}] - x11-libs/gtk+:3[${MULTILIB_USEDEP}] - x11-libs/libX11[${MULTILIB_USEDEP}] - x11-libs/libXScrnSaver[${MULTILIB_USEDEP}] - x11-libs/libXcomposite[${MULTILIB_USEDEP}] - x11-libs/libXcursor[${MULTILIB_USEDEP}] - x11-libs/libXdamage[${MULTILIB_USEDEP}] - x11-libs/libXext[${MULTILIB_USEDEP}] - x11-libs/libXfixes[${MULTILIB_USEDEP}] - x11-libs/libXi[${MULTILIB_USEDEP}] - x11-libs/libXrandr[${MULTILIB_USEDEP}] - x11-libs/libXrender[${MULTILIB_USEDEP}] - x11-libs/libXtst[${MULTILIB_USEDEP}] - x11-libs/libxcb[${MULTILIB_USEDEP}] - x11-libs/libxkbcommon[${MULTILIB_USEDEP}] - x11-libs/libxkbfile[${MULTILIB_USEDEP}] - x11-libs/pango[${MULTILIB_USEDEP}]" - -pkg_setup() { - chromium_suid_sandbox_check_kernel_config -} - -src_unpack() { - unpack_deb ${A} -} - -src_prepare() { - default - sed -e "s!^SKYPE_PATH=.*!SKYPE_PATH=${EPREFIX}/opt/skypeforlinux/skypeforlinux!" \ - -i usr/bin/skypeforlinux || die - sed -e "s!^Categories=.*!Categories=Network;InstantMessaging;Telephony;!" \ - -e "/^OnlyShowIn=/d" \ - -i usr/share/applications/skypeforlinux.desktop || die -} - -src_install() { - dodir /opt - cp -a usr/share/skypeforlinux "${ED}"/opt || die - - # remove chrome-sandbox binary, users should use kernel namespaces - # https://bugs.gentoo.org/692692#c18 - rm "${ED}"/opt/skypeforlinux/chrome-sandbox || die - - dobin usr/bin/skypeforlinux - - dodoc usr/share/skypeforlinux/*.html - dodoc -r usr/share/doc/skypeforlinux/. - # symlink required for the "Help->3rd Party Notes" menu entry (otherwise frozen skype -> xdg-open) - dosym ${PF} usr/share/doc/skypeforlinux - - doicon usr/share/pixmaps/skypeforlinux.png - - local res - for res in 16 32 256 512; do - newicon -s ${res} usr/share/icons/hicolor/${res}x${res}/apps/skypeforlinux.png skypeforlinux.png - done - - domenu usr/share/applications/skypeforlinux.desktop - - pax-mark -m "${ED}"/opt/skypeforlinux/skypeforlinux - pax-mark -m "${ED}"/opt/skypeforlinux/resources/app.asar.unpacked/node_modules/slimcore/bin/slimcore.node -} diff --git a/net-im/skypeforlinux/skypeforlinux-8.98.0.206.ebuild b/net-im/skypeforlinux/skypeforlinux-8.98.0.206.ebuild deleted file mode 100644 index aa8b927e61ba..000000000000 --- a/net-im/skypeforlinux/skypeforlinux-8.98.0.206.ebuild +++ /dev/null @@ -1,100 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -MULTILIB_COMPAT=( abi_x86_64 ) - -inherit chromium-2 desktop pax-utils unpacker multilib-build xdg - -DESCRIPTION="Instant messaging client, with support for audio and video" -HOMEPAGE="https://www.skype.com/" -SRC_URI="https://repo.skype.com/deb/pool/main/s/skypeforlinux/${PN}_${PV}_amd64.deb" -S="${WORKDIR}" - -LICENSE="Skype-TOS MIT MIT-with-advertising BSD-1 BSD-2 BSD Apache-2.0 Boost-1.0 ISC CC-BY-SA-3.0 CC0-1.0 openssl ZLIB APSL-2 icu Artistic-2 LGPL-2.1" -SLOT="0" -KEYWORDS="-* ~amd64" - -QA_PREBUILT="*" -RESTRICT="mirror bindist strip" #299368 - -RDEPEND=" - app-crypt/libsecret[${MULTILIB_USEDEP}] - app-accessibility/at-spi2-core:2[${MULTILIB_USEDEP}] - dev-libs/expat[${MULTILIB_USEDEP}] - dev-libs/glib:2[${MULTILIB_USEDEP}] - dev-libs/nspr[${MULTILIB_USEDEP}] - dev-libs/nss[${MULTILIB_USEDEP}] - media-libs/alsa-lib[${MULTILIB_USEDEP}] - media-libs/fontconfig:1.0[${MULTILIB_USEDEP}] - media-libs/freetype:2[${MULTILIB_USEDEP}] - media-libs/libv4l[${MULTILIB_USEDEP}] - net-print/cups[${MULTILIB_USEDEP}] - sys-apps/dbus[${MULTILIB_USEDEP}] - sys-devel/gcc[cxx] - sys-libs/glibc - virtual/ttf-fonts - x11-libs/cairo[${MULTILIB_USEDEP}] - x11-libs/gdk-pixbuf:2[${MULTILIB_USEDEP}] - x11-libs/gtk+:3[${MULTILIB_USEDEP}] - x11-libs/libX11[${MULTILIB_USEDEP}] - x11-libs/libXScrnSaver[${MULTILIB_USEDEP}] - x11-libs/libXcomposite[${MULTILIB_USEDEP}] - x11-libs/libXcursor[${MULTILIB_USEDEP}] - x11-libs/libXdamage[${MULTILIB_USEDEP}] - x11-libs/libXext[${MULTILIB_USEDEP}] - x11-libs/libXfixes[${MULTILIB_USEDEP}] - x11-libs/libXi[${MULTILIB_USEDEP}] - x11-libs/libXrandr[${MULTILIB_USEDEP}] - x11-libs/libXrender[${MULTILIB_USEDEP}] - x11-libs/libXtst[${MULTILIB_USEDEP}] - x11-libs/libxcb[${MULTILIB_USEDEP}] - x11-libs/libxkbcommon[${MULTILIB_USEDEP}] - x11-libs/libxkbfile[${MULTILIB_USEDEP}] - x11-libs/pango[${MULTILIB_USEDEP}]" - -pkg_setup() { - chromium_suid_sandbox_check_kernel_config -} - -src_unpack() { - unpack_deb ${A} -} - -src_prepare() { - default - sed -e "s!^SKYPE_PATH=.*!SKYPE_PATH=${EPREFIX}/opt/skypeforlinux/skypeforlinux!" \ - -i usr/bin/skypeforlinux || die - sed -e "s!^Categories=.*!Categories=Network;InstantMessaging;Telephony;!" \ - -e "/^OnlyShowIn=/d" \ - -i usr/share/applications/skypeforlinux.desktop || die -} - -src_install() { - dodir /opt - cp -a usr/share/skypeforlinux "${ED}"/opt || die - - # remove chrome-sandbox binary, users should use kernel namespaces - # https://bugs.gentoo.org/692692#c18 - rm "${ED}"/opt/skypeforlinux/chrome-sandbox || die - - dobin usr/bin/skypeforlinux - - dodoc usr/share/skypeforlinux/*.html - dodoc -r usr/share/doc/skypeforlinux/. - # symlink required for the "Help->3rd Party Notes" menu entry (otherwise frozen skype -> xdg-open) - dosym ${PF} usr/share/doc/skypeforlinux - - doicon usr/share/pixmaps/skypeforlinux.png - - local res - for res in 16 32 256 512; do - newicon -s ${res} usr/share/icons/hicolor/${res}x${res}/apps/skypeforlinux.png skypeforlinux.png - done - - domenu usr/share/applications/skypeforlinux.desktop - - pax-mark -m "${ED}"/opt/skypeforlinux/skypeforlinux - pax-mark -m "${ED}"/opt/skypeforlinux/resources/app.asar.unpacked/node_modules/slimcore/bin/slimcore.node -} diff --git a/net-im/slack/Manifest b/net-im/slack/Manifest index 0beb5a090033..65db3366be1e 100644 --- a/net-im/slack/Manifest +++ b/net-im/slack/Manifest @@ -1 +1,2 @@ -DIST slack-desktop-4.29.149-amd64.deb 72943850 BLAKE2B 1d36947c5b4da0a2e301b3510dff9e5d3dbc6a3a2f0411980792984a497578d239dbc90dfb6af5cfe6d87dbcb7c3acac3b79c86daf6d58a4a9e69223472447f6 SHA512 9771af26efdadfe7eed5945b57900360b50804642e62db42cb2af20c3246edfdadf491deb2d1004a02e6dc545def079ecf6ab175e4d27f1989bcc8cbaf12366c +DIST slack-desktop-4.35.126-amd64.deb 78399722 BLAKE2B 0cee9b9f33654a14b468071ea85cdba0391effc623f9d4896ca653b82e5c55eda0d46616185c8bc759ad79f8de16f0c53c27c60885fe04b53656c9c23efa0ff0 SHA512 64991f84ad2693d33e22a269e67fec0450dfc3e631a15dc4a4dfc708c0d0926f90555d18a79960e3af603a5ca53f0b60189b64eea59a13d0e601a25bc9e1ba9d +DIST slack-desktop-4.35.131-amd64.deb 78415154 BLAKE2B 9527c7ee4ac8f88dc6b38a30e3d0fc4759a9e57ef6966ee5059988bb8f0462e769a36efa90d4ad56725f5e0aeb5d0c4cd238d36b6913503877a40ac89d25f9b4 SHA512 696fe940be93673954faa3384c69d57be0089048216628cabae3d6972aebba60e2207f8388e9c4b0f97c4cd9687b3bead6d3420a9ea20a233d88c409daeb522d diff --git a/net-im/slack/metadata.xml b/net-im/slack/metadata.xml index 8361ed63d9fa..79be733db06d 100644 --- a/net-im/slack/metadata.xml +++ b/net-im/slack/metadata.xml @@ -5,6 +5,10 @@ <email>spiderx@spiderx.dp.ua</email> <name>Vladimir Pavljuchenkov</name> </maintainer> + <maintainer type="person"> + <email>dlan@gentoo.org</email> + <name>Yixun Lan</name> + </maintainer> <maintainer type="project" proxied="proxy"> <email>proxy-maint@gentoo.org</email> <name>Proxy Maintainers</name> @@ -16,6 +20,6 @@ and people. </longdescription> <upstream> - <doc>https://get.slack.help/hc/en-us</doc> + <doc>https://slack.com/intl/en-us/help</doc> </upstream> </pkgmetadata> diff --git a/net-im/slack/slack-4.29.149-r1.ebuild b/net-im/slack/slack-4.35.126.ebuild index b419bde7efde..f0291e2700fa 100644 --- a/net-im/slack/slack-4.29.149-r1.ebuild +++ b/net-im/slack/slack-4.35.126.ebuild @@ -17,9 +17,7 @@ KEYWORDS="-* ~amd64" IUSE="appindicator +seccomp suid wayland" RESTRICT="bindist mirror" -RDEPEND="app-accessibility/at-spi2-atk:2[${MULTILIB_USEDEP}] - app-accessibility/at-spi2-core:2[${MULTILIB_USEDEP}] - dev-libs/atk:0[${MULTILIB_USEDEP}] +RDEPEND="app-accessibility/at-spi2-core:2[${MULTILIB_USEDEP}] dev-libs/expat:0[${MULTILIB_USEDEP}] dev-libs/glib:2[${MULTILIB_USEDEP}] dev-libs/nspr:0[${MULTILIB_USEDEP}] diff --git a/net-im/slack/slack-4.35.131.ebuild b/net-im/slack/slack-4.35.131.ebuild new file mode 100644 index 000000000000..f0291e2700fa --- /dev/null +++ b/net-im/slack/slack-4.35.131.ebuild @@ -0,0 +1,114 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +MULTILIB_COMPAT=( abi_x86_64 ) + +inherit desktop multilib-build optfeature pax-utils unpacker xdg + +DESCRIPTION="Team collaboration tool" +HOMEPAGE="https://slack.com" +SRC_URI="https://downloads.slack-edge.com/releases/linux/${PV}/prod/x64/${PN}-desktop-${PV}-amd64.deb" + +LICENSE="all-rights-reserved" +SLOT="0" +KEYWORDS="-* ~amd64" +IUSE="appindicator +seccomp suid wayland" +RESTRICT="bindist mirror" + +RDEPEND="app-accessibility/at-spi2-core:2[${MULTILIB_USEDEP}] + dev-libs/expat:0[${MULTILIB_USEDEP}] + dev-libs/glib:2[${MULTILIB_USEDEP}] + dev-libs/nspr:0[${MULTILIB_USEDEP}] + dev-libs/nss:0[${MULTILIB_USEDEP}] + dev-libs/wayland[${MULTILIB_USEDEP}] + media-libs/alsa-lib:0[${MULTILIB_USEDEP}] + media-libs/mesa:0[${MULTILIB_USEDEP}] + net-print/cups:0[${MULTILIB_USEDEP}] + sys-apps/dbus:0[${MULTILIB_USEDEP}] + x11-libs/cairo:0[${MULTILIB_USEDEP}] + x11-libs/gdk-pixbuf:2[${MULTILIB_USEDEP}] + x11-libs/gtk+:3[${MULTILIB_USEDEP}] + x11-libs/libdrm:0[${MULTILIB_USEDEP}] + x11-libs/libX11:0[${MULTILIB_USEDEP}] + x11-libs/libxcb:0/1.12[${MULTILIB_USEDEP}] + x11-libs/libXcomposite:0[${MULTILIB_USEDEP}] + x11-libs/libXdamage:0[${MULTILIB_USEDEP}] + x11-libs/libXext:0[${MULTILIB_USEDEP}] + x11-libs/libXfixes:0[${MULTILIB_USEDEP}] + x11-libs/libxkbcommon:0[${MULTILIB_USEDEP}] + x11-libs/libxkbfile:0[${MULTILIB_USEDEP}] + x11-libs/libXrandr:0[${MULTILIB_USEDEP}] + x11-libs/pango:0[${MULTILIB_USEDEP}] + appindicator? ( dev-libs/libayatana-appindicator )" + +QA_PREBUILT="opt/slack/chrome-sandbox + opt/slack/chrome_crashpad_handler + opt/slack/libEGL.so + opt/slack/libGLESv2.so + opt/slack/libffmpeg.so + opt/slack/libvk_swiftshader.so + opt/slack/libvulkan.so.1 + opt/slack/resources/app.asar.unpacked/node_modules/* + opt/slack/slack + opt/slack/swiftshader/libEGL.so + opt/slack/swiftshader/libGLESv2.so" + +S="${WORKDIR}" + +src_prepare() { + default + + # remove hardcoded path, logging noise (wrt 694058, 711494) + sed -i -e '/Icon/s|/usr/share/pixmaps/slack.png|slack|' \ + -e '/Exec/s|slack|slack -s|' \ + usr/share/applications/slack.desktop \ + || die "sed failed in Icon for slack.desktop" + + if use appindicator ; then + sed -i '/Exec/s|=|=env XDG_CURRENT_DESKTOP=Unity |' \ + usr/share/applications/slack.desktop \ + || die "sed failed for appindicator" + fi + + if ! use seccomp ; then + sed -i '/Exec/s/%U/%U --disable-seccomp-filter-sandbox/' \ + usr/share/applications/slack.desktop \ + || die "sed failed for seccomp" + fi + + if use wayland ; then + sed -i '/Exec/s/%U/%U --enable-features=WebRTCPipeWireCapturer/' \ + usr/share/applications/slack.desktop \ + || die "sed failed for wayland" + fi + + rm usr/lib/slack/LICENSE{,S-linux.json} \ + || die "rm licenses failed" +} + +src_install() { + doicon usr/share/pixmaps/slack.png + doicon -s 512 usr/share/pixmaps/slack.png + domenu usr/share/applications/slack.desktop + + insinto /opt # wrt 720134 + cp -a usr/lib/slack "${ED}"/opt || die "cp failed" + + use suid && fperms u+s /opt/slack/chrome-sandbox # wrt 713094 + dosym ../../opt/slack/slack usr/bin/slack + + pax-mark -m "${ED}"/opt/slack/slack + + # https://bugs.gentoo.org/898912 + if use appindicator; then + dosym ../../usr/lib64/libayatana-appindicator3.so /opt/slack/libappindicator3.so + fi +} + +pkg_postinst() { + optfeature "storing passwords via gnome-keyring" app-crypt/libsecret + + xdg_pkg_postinst +} diff --git a/net-im/spectrum2/Manifest b/net-im/spectrum2/Manifest index 04897fd0b2ba..ff04b5209c99 100644 --- a/net-im/spectrum2/Manifest +++ b/net-im/spectrum2/Manifest @@ -1 +1 @@ -DIST spectrum2-2.2.0.tar.gz 666281 BLAKE2B aebf7d90a938ee62e5ae13955343a73c2f8a1484151519f59321b09d958cd49bd7b0914a3dc0a364d2469c691a653003bfc51324b69de38e3c59c9c248b3c672 SHA512 52125dd2b528b45cc814d4c62df6c0c431958dc5953af50731e765129e59a5dabdffd7f55d1709fe9854c81d6874d9549e8560f27b1b18a0af812299ef4c37ff +DIST spectrum2-2.2.1.tar.gz 666509 BLAKE2B c946cea46d99bd8126ad8270a8a01140d75ff989cf0cc0e2ff19ac830c01df4ad02a296959077f5a56707d509bafe937515f78adf7361a2e261497f5299dfe7d SHA512 c752f043f337157125da800ec5e5ed41b0f0f2bf8ee91c682a228779754557389469eb58610bef7793a0d68a303260f80a38a1519f61b62ba23e9a2222c6f399 diff --git a/net-im/spectrum2/files/spectrum2-2.1.3-log4cxx-1.0.0.patch b/net-im/spectrum2/files/spectrum2-2.1.3-log4cxx-1.0.0.patch deleted file mode 100644 index 852f4ad78027..000000000000 --- a/net-im/spectrum2/files/spectrum2-2.1.3-log4cxx-1.0.0.patch +++ /dev/null @@ -1,63 +0,0 @@ -Description: (newer) Debian log4cxx needs C++17 and used smart pointers. - This patch just enables C++17 for the build and using smart pointers - where needed. -Author: Tobias Frost <tobi@debian.org> -Forwarded: not yet. log4cxx 0.14 will come with some preprocessor macros that will enable properly gating the new code. -Last-Update: 2022-11-21 <YYYY-MM-DD, last update of the meta-information, optional> ---- -This patch header follows DEP-3: http://dep.debian.net/deps/dep3/ ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -2,7 +2,7 @@ - - project(libtransport) - --set(CMAKE_CXX_STANDARD 11) -+set(CMAKE_CXX_STANDARD 17) - if(WIN32) - set(CMAKE_CXX_STANDARD 17) - endif(WIN32) ---- a/plugin/cpp/Logging.cpp -+++ b/plugin/cpp/Logging.cpp -@@ -26,6 +26,7 @@ - #include <iterator> - #include <algorithm> - -+#include <memory> - - #include <boost/filesystem.hpp> - #include <boost/algorithm/string.hpp> -@@ -100,15 +101,17 @@ - #ifdef _MSC_VER - root->addAppender(new ConsoleAppender(new PatternLayout(L"%d %-5p %c: %m%n"))); - #else -- root->addAppender(new ConsoleAppender(new PatternLayout("%d %-5p %c: %m%n"))); -+ auto patternlayout = std::make_shared<PatternLayout>("%d %-5p %c: %m%n"); -+ auto consoleappender = std::make_shared<ConsoleAppender>(patternlayout); -+ root->addAppender(consoleappender); - #endif - } - else { - log4cxx::helpers::Properties p; - -- log4cxx::helpers::FileInputStream *istream = NULL; -+ log4cxx::helpers::InputStreamPtr istream; - try { -- istream = new log4cxx::helpers::FileInputStream(CONFIG_STRING(config, key)); -+ istream.reset(new log4cxx::helpers::FileInputStream(CONFIG_STRING(config, key))); - } - catch(log4cxx::helpers::IOException &ex) { - std::cerr << "Can't create FileInputStream logger instance: " << ex.what() << "\n"; ---- a/tests/libtransport/main.cpp -+++ b/tests/libtransport/main.cpp -@@ -23,7 +23,9 @@ - #ifdef WITH_LOG4CXX - LoggerPtr root = Logger::getRootLogger(); - #ifndef _MSC_VER -- root->addAppender(new FileAppender(new PatternLayout("%d %-5p %c: %m%n"), "libtransport_test.log", false)); -+ auto patternlayout = std::make_shared<PatternLayout>("%d %-5p %c: %m%n"); -+ auto fileappender = std::make_shared<FileAppender>(patternlayout, "libtransport_test.log", false); -+ root->addAppender(fileappender); - #else - root->addAppender(new FileAppender(new PatternLayout(L"%d %-5p %c: %m%n"), L"libtransport_test.log", false)); - #endif diff --git a/net-im/spectrum2/files/spectrum2.initd b/net-im/spectrum2/files/spectrum2.initd index 8a35dbe75bc9..0ab25819804d 100644 --- a/net-im/spectrum2/files/spectrum2.initd +++ b/net-im/spectrum2/files/spectrum2.initd @@ -1,5 +1,5 @@ #!/sbin/openrc-run -# Copyright 1999-2018 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 command="/usr/bin/spectrum2_manager" @@ -41,7 +41,7 @@ stop() { # Andrey Utkin <andrey_utkin@gentoo.org> (24 Nov 2018) # Conrad Kostecki <conrad@kostecki.com> (24 Nov 2018) # We are aware of many security issues caused by careless chowning, see -# http://michael.orlitzky.com/articles/end_root_chowning_now_(make_etc-init.d_great_again).xhtml +# https://michael.orlitzky.com/articles/end_root_chowning_now_(make_etc-init.d_great_again).xhtml # We believe none of these issues apply. # These pidfiles are not read by any privileged process. # checkpath here chowns only the dir itself and doesn't act recursively. diff --git a/net-im/spectrum2/spectrum2-2.2.0-r1.ebuild b/net-im/spectrum2/spectrum2-2.2.1.ebuild index 1c68b2e65d48..e9228d551d76 100644 --- a/net-im/spectrum2/spectrum2-2.2.0-r1.ebuild +++ b/net-im/spectrum2/spectrum2-2.2.1.ebuild @@ -58,8 +58,6 @@ DEPEND=" test? ( dev-util/cppunit ) " -PATCHES=( "${FILESDIR}/${PN}-2.1.3-log4cxx-1.0.0.patch" ) - src_prepare() { # Respect users LDFLAGS sed -i -e "s/-Wl,-export-dynamic/& ${LDFLAGS}/" spectrum/src/CMakeLists.txt || die diff --git a/net-im/swift/Manifest b/net-im/swift/Manifest index 197a384ef7aa..51cfbe5fc7ed 100644 --- a/net-im/swift/Manifest +++ b/net-im/swift/Manifest @@ -1,2 +1,2 @@ -DIST swift-4.0.2-python3-compatibility.patch.gz 14959 BLAKE2B 17b75950bba9252bb76e30eb9fadb9eaaaad6d693a09f6fa357fe174ade1bd283d00838e87b55059e0601edc5d72c02c952f53ca16dd597010c9f0ffe955662a SHA512 fac9cf0a85b55b1b9bba786cc6456ceaa6257d5f2cdd4d41c4fdee526c301de94bb6f7c71bc00aaec992d0aaf3787e2db3e9c7eed6ec88facea776db66941dba -DIST swift-4.0.2.tar.gz 19083393 BLAKE2B de4ad1c3d68dfc4d693cdebdf4e18809210aa4e83af31b77bf730c7018507877852b5ea634623c037250de4005606108bd0372d39177093769c5dc5f72bd4812 SHA512 b7d4b90f387d5ea4ac3ca31794eabd1f12a64274628d75c7570f40269777b9003182884730a6340c5e0b5b7928a68bda5e49be623b47da9fa64fe4c3f25be167 +DIST swift-4.0.3-python3-compatibility.patch.gz 14964 BLAKE2B ec98bee12734eb00037433b2791817d24a0a53effa653268a886b59358fb82f8e6c05739165f2518c9c5ad5b7ddfcef90734964eb6de647a24197e69b333ebc9 SHA512 95e1a0c49158cbf1392442103c960e2d458a99b34c3f32cdb47fec2d195b709d6c4b0c2961b4c49d05c19e590f2e2ca836c6f559b960015030bf8375b0604c3f +DIST swift-4.0.3.tar.bz2 15124142 BLAKE2B 23896b72ffecc5148ade806ec6610c5edfa67ae9000e28383c7cf5a3c8bf275a6fc8208d1d6e7c7715e75bf133869ed404fd35bfb13998849209def3aab46c07 SHA512 59ebf69391f2cbdce538f0ee925f55eec0e8463c2f9b90899cb314f2a036f40ebdc357c4b6a6d3b71ae800ccf6ee6df5ff6011949ea0bb189cdf3e9f231e9733 diff --git a/net-im/swift/files/swift-4.0.2-qt-5.11-compatibility.patch b/net-im/swift/files/swift-4.0.2-qt-5.11-compatibility.patch deleted file mode 100644 index db633945b49d..000000000000 --- a/net-im/swift/files/swift-4.0.2-qt-5.11-compatibility.patch +++ /dev/null @@ -1,35 +0,0 @@ -From 1d18148c86377787a8c77042b12ea66f20cb2ca9 Mon Sep 17 00:00:00 2001 -From: Tobias Markmann <tm@ayena.de> -Date: Thu, 21 Jun 2018 13:04:56 +0200 -Subject: Add missing include for QAbstractItemModel - -This fixes building Swift with Qt 5.11. - -Test-Information: - -Builds and tests pass on macOS 10.13.5 with Qt 5.11.0. - -Change-Id: I1be2cd081d8a520ec38ab7cca5ada0d7fc39b777 - -diff --git a/Swift/QtUI/UserSearch/QtUserSearchWindow.h b/Swift/QtUI/UserSearch/QtUserSearchWindow.h -index 0714ac1..fe536ab 100644 ---- a/Swift/QtUI/UserSearch/QtUserSearchWindow.h -+++ b/Swift/QtUI/UserSearch/QtUserSearchWindow.h -@@ -1,5 +1,5 @@ - /* -- * Copyright (c) 2010-2016 Isode Limited. -+ * Copyright (c) 2010-2018 Isode Limited. - * All rights reserved. - * See the COPYING file for more information. - */ -@@ -8,6 +8,7 @@ - - #include <set> - -+#include <QAbstractItemModel> - #include <QWizard> - - #include <Swiften/Base/Override.h> --- -cgit v0.10.2-6-g49f6 - diff --git a/net-im/swift/files/swift-4.0.3-gcc11-compatibility.patch b/net-im/swift/files/swift-4.0.3-gcc11-compatibility.patch new file mode 100644 index 000000000000..4d94c2d10503 --- /dev/null +++ b/net-im/swift/files/swift-4.0.3-gcc11-compatibility.patch @@ -0,0 +1,13 @@ +diff --git a/Swift/Controllers/ShowProfileController.h b/Swift/Controllers/ShowProfileController.h +index 0d01ba1a0..5dc7197ff 100644 +--- a/Swift/Controllers/ShowProfileController.h ++++ b/Swift/Controllers/ShowProfileController.h +@@ -18,6 +18,8 @@ + + #include <Swift/Controllers/UIEvents/UIEvent.h> + ++#include <map> ++ + namespace Swift { + class VCardManager; + class ProfileWindow; diff --git a/net-im/swift/files/swift-4.0.3-reproducible-build.patch b/net-im/swift/files/swift-4.0.3-reproducible-build.patch new file mode 100644 index 000000000000..951678f2303f --- /dev/null +++ b/net-im/swift/files/swift-4.0.3-reproducible-build.patch @@ -0,0 +1,21 @@ +commit 39a684108ae5938105498e7744e70962308cde7b +Author: kpcyrd <git@rxv.cc> +Date: Wed Aug 25 23:30:17 2021 +0200 + + Reproducible Builds: Sort directory contents at build + +diff --git a/Swiften/SConscript b/Swiften/SConscript +index f52637bdb..334f4489e 100644 +--- a/Swiften/SConscript ++++ b/Swiften/SConscript +@@ -567,7 +567,9 @@ if env["SCONS_STAGE"] == "build" : + swiften_includes = [] + swiften_public_includes = [] + top_path = env.Dir("..").abspath +- for root, dirs, files in os.walk(env.Dir(".").abspath) : ++ for root, dirs, files in sorted(os.walk(env.Dir(".").abspath)) : ++ dirs.sort() ++ files.sort() + if root.endswith("UnitTest") : + continue + for file in files : diff --git a/net-im/swift/swift-4.0.2-r102.ebuild b/net-im/swift/swift-4.0.3-r1.ebuild index 421396f2fea7..68610ca1aa45 100644 --- a/net-im/swift/swift-4.0.2-r102.ebuild +++ b/net-im/swift/swift-4.0.3-r1.ebuild @@ -11,8 +11,10 @@ inherit lua-single python-any-r1 scons-utils toolchain-funcs DESCRIPTION="An elegant, secure, adaptable and intuitive XMPP Client" HOMEPAGE="https://www.swift.im/" SRC_URI=" - https://swift.im/downloads/releases/${P}/${P}.tar.gz - https://dev.gentoo.org/~conikost/distfiles/patches/${P}-python3-compatibility.patch.gz" + https://swift.im/git/${PN}/snapshot/${PN}-${P}.tar.bz2 -> ${P}.tar.bz2 + https://dev.gentoo.org/~conikost/distfiles/patches/${P}-python3-compatibility.patch.gz +" +S="${WORKDIR}/${PN}-${P}" LICENSE="BSD BSD-1 CC-BY-3.0 GPL-3 OFL-1.1" SLOT="4/0" @@ -53,10 +55,11 @@ DOCS=( ) PATCHES=( - "${FILESDIR}"/${P}-boost-1.69-compatibility.patch - "${WORKDIR}"/${P}-python3-compatibility.patch - "${FILESDIR}"/${P}-qt-5.11-compatibility.patch - "${FILESDIR}"/${P}-qt-5.15-compatibility.patch + "${FILESDIR}"/${PN}-4.0.2-boost-1.69-compatibility.patch + "${FILESDIR}"/${PN}-4.0.2-qt-5.15-compatibility.patch + "${FILESDIR}"/${PN}-4.0.3-gcc11-compatibility.patch + "${WORKDIR}"/${PN}-4.0.3-python3-compatibility.patch + "${FILESDIR}"/${PN}-4.0.3-reproducible-build.patch ) pkg_setup() { @@ -109,6 +112,11 @@ src_prepare() { else rm -fr 3rdParty || die fi + + if [[ ! -f VERSION.swift ]] ; then + # Source tarball from git doesn't include this file + echo "${PV}" > VERSION.swift || die + fi } src_configure() { diff --git a/net-im/synapse/Manifest b/net-im/synapse/Manifest index 2bb18dfa856b..01e03d61226c 100644 --- a/net-im/synapse/Manifest +++ b/net-im/synapse/Manifest @@ -1,6 +1,5 @@ -DIST aho-corasick-0.7.19.crate 113070 BLAKE2B 5ddaa0d415d19cf9922b5723bf3480750634ea68cb66fd05bfa2bf57607eb6383ba86d8c55f70adb87b71b98caa73d8f6ebd075c006493530c81979032899b60 SHA512 0d63d29079650bde4e8a9f8529716b9d8c42db076a1d74715116240c2628173f1e86fb29c08a25ad07a0148e48789ab20de0c186a8b3dfb193cbfeb0d76ae78c -DIST anyhow-1.0.70.crate 43803 BLAKE2B 574da0e447592c12051deef171850b00ac2347dd336f71915dd21f45cc03439fbcdbaffe261097d53cc11fa0db75b1e3b21ba667f26c08db7125b1c6264973de SHA512 6fd1338e4cbe915cb01fcc5e05e7e0c051868701eeb27f03577a7cfdd59057493922b36e2308f7050608a851112d4d24cff2826456160ac8930fe961640e809b -DIST anyhow-1.0.71.crate 43808 BLAKE2B 1ec6b440758e26b2328738bab7c6b1fe8670959793cc24f61cecd0d8b0ebe60b9855ee1cdac9b5f5a5b238daf796eae5b7c82b903e7c822a5625d95130f8b61f SHA512 401b1c5d04fa0581f303395fcb3af5e7684ead367e2a173b4d90db9c04ac20010c5330a686f3ba91a541e1526a7185091b7dbfddce5134b5a74cc749b0338da5 +DIST aho-corasick-1.0.2.crate 167694 BLAKE2B fa5323cbe6cb73594dfa4c327c64676bc1e006dadc0b9def325974c83b9a769beba02d59a4657ec7a2d0cc511a7b7cc6f72cf57b8f9e639206d1c2bf13107a52 SHA512 5c75451f96fbbd670e6af0e1f54df2bdb57259dfe6898495ac46a5b2fc04f316a4698fd5cfd4ec31a94c298661937a8de08ce97cab3890fb3c015e4a2a67bb7b +DIST anyhow-1.0.75.crate 43901 BLAKE2B 6353557d7ec2cbfdd001c039fad62c95fea9e02b113149f726fd14bb36b31e637e8609dd5ee20a900e9c11bb783d9958d664b31ba7c467382fa7f51d477ad3aa SHA512 190d6be8ede0af9808210db53e4dc31ce69b126a26b0357220c4705a11e83cab2c2c09c59964a35794f3c434f717eaa6bb669e9e8f16012535c14246b17e8d40 DIST arc-swap-1.5.1.crate 66157 BLAKE2B 9060ef4f9d699fadc03be1a116d9301f6308fbb7f8bcad6f01926d584386d26d03f9dd2ea35b6771a6725ee7819e028d0e1b256e8b5f3b812cbd388e757491fb SHA512 8636149e92c068d5ff5352a19c9973e7bf2aba68b9363c783178903a8665f6edabbd30c25ad7992646635efe5830d67c958f8d41b44a4ed1fe5698628b41c074 DIST autocfg-1.1.0.crate 13272 BLAKE2B 7724055c337d562103f191f4e36cab469e578f0c51cc24d33624dea155d108a07578703766341fd6a4cc1ef52acda406e7dba1650d59115f18261281e5b40203 SHA512 df972c09abbdc0b6cb6bb55b1e29c7fed706ece38a62613d9e275bac46a19574a7f96f0152cccb0239efea04ee90083a146b58b15307696c4c81878cd12de28f DIST bitflags-1.3.2.crate 23021 BLAKE2B eb990bb27b2bdeb66fd7212ce582cb36e1c616debbac85df642d0c82b25439e6bf9b1e811fac76b59e58ea3c1bbea6170d03a61e8f9a395e4334a0e2e2987eda SHA512 3c698f757b5cc62f815f9a1cce365c3d2dd88e4db71f331dff8bba86c2865f755b81cb4c9bfc59bd86b7643b0943f9e09a7c4f8ad75eb2ab0e714803d0129f62 @@ -16,38 +15,39 @@ DIST itoa-1.0.4.crate 10601 BLAKE2B 95545252eaabc3114323a44c8b8ea12a91568d9fc8d2 DIST lazy_static-1.4.0.crate 10443 BLAKE2B 25b2e61bbac48f0dcbc79c81d7bf01f2403d8269ecb6be3ea6147bd00f7a588df15a91f44dfc18ada19b21faa71de4637c7d493a8628cbecd0e547d74e616a23 SHA512 e124c0521ec7c950f3c4a066821918da7a9c6e711115d98009ae7c351928fdddead852e7596fea5937a9c30e4e4ce8eee7099b20248b5d6e3b2494b6a6d88cb8 DIST libc-0.2.135.crate 604591 BLAKE2B 195f342d1136f63c308371f001c9fc270e151fbda7b316321d319b57bcd46f206bb8b06196f5e9cf8a35b0c397d909f370aef8b119f4bc0eb75b9e245d8e7b4a SHA512 dc8e8fc918c5184de6ae7414b523b06ae91cde252e837e863f8477e9722ccb206a0b27762ac204830e8d09071413029c03802a3ed93bff274c33b2a4055e7806 DIST lock_api-0.4.9.crate 25685 BLAKE2B 8adf5c3cccebdf6aff6ec977f230cd2a208b0b188ef57deacbbc6019431f0ede1a760b2384ba3cb49c96b8a589dc56c0f46a6359b3e62277e7ae1a1c3f586fa3 SHA512 9215381d9bb6b80d217c73a900db43df043b3e939b5bd7a292a02e9ab911cf0eacd8f883d35bdf72b3a0e78df8f1bc3e843ca4c775294c7a7a03091dc1a74990 -DIST log-0.4.17.crate 38028 BLAKE2B b46be3719fc0a53e50b1f342762e188587e9f1ceb692c72473ce2663edfb8253742d30024e68c1444780ab7fc0e2d5b0601b8ea7228dc3405a9342a57548e605 SHA512 2477d88db42b1d92c30708d88823212e236f613b3465e85eb425f83f8d16fadfaf0352f06c2999a1852102edd2f6ffb10ecb539d8a3b6c48f552a25622ccffa2 -DIST memchr-2.5.0.crate 65812 BLAKE2B 57966413a1f933dcb2d2d4ccb29c247070f65a83299b2a9f5aa83f5a48a5c5f1c4c7c632fa63bd19f9508e9291e7258db2f16e2813a56fd84e0856f70f1e67ab SHA512 444a163b484c233e78c0e2e4d51f01ce2da93d7d29f516a95e4b0866b20bdfd3f34137653abed53eb70387991ee3e2b5937d8d4360a85bbcb50a93005a75defa -DIST memoffset-0.6.5.crate 7686 BLAKE2B 9a797388702389076c426052c3d54dc62802d5db8bc5c9c83990429f2ffaec4fab4c7dd3f09cd0704d1ea555e87976563bb43408ba54b5e66ce7e406d4604009 SHA512 11bdd9185b99dfee8e659e051b09ee301c7142a372a8117864745a5085c015436d2efbb1478192886f09cbc562529e209d2e3325d94938a64bc75b1d91d2bf3f +DIST log-0.4.20.crate 38307 BLAKE2B cb9c9a401b49bd68c18d5e42f2ed94446f1aeb184caa23cefacad4ce54a2a357143af54a5595c45d6f3c3d20b054c451d9e6ccdc09c19cca99ffffdaf8bbfc72 SHA512 8661b0c71d3b7fc0d679aa3d7f06910e6d3da1c53862aa06526000e1bcaa0b0b068415a1a9ab317c318f00d15346dba8a4f5d2a60d8850790bed9cfaaf757b3e +DIST memchr-2.6.3.crate 94377 BLAKE2B 5f1603397d6703ddd9a1e68429cb6e9dae9021e14692c1e084f3b5c82d36645a1fa930c7a76b97df8e1919402fa7e1c621969ce85ce20c82b3087104afe18f25 SHA512 8d5e1425ea702a0950c95271dfd2e81610731496f77af0d683536b074a22922a7d7ec6da41577487d1d658e3b27257b7d1e142761b523e68760a2f5f24f049bc +DIST memoffset-0.9.0.crate 9033 BLAKE2B 19090c1af8b8cf54a2cf7593748aff4d3dc685ec7080aa476139c1721ef71555495e1bc513b1efaddc7e7702f83e0e1c2a8f71ff40009d266539484c9297e0ed SHA512 2f04f9b6fed31e94388c18162ad275897a835df7b9ac827f4df0f4b0ecf71064ef247f7ad11dbc27d7a6d448984a0f29d1c000e3c8d5fa6e121fa9571770ec55 DIST once_cell-1.15.0.crate 31460 BLAKE2B ae4481883865abe6a684d63520fb2e91b64d6ccdd0374464200015640122bd68b8a769309773226c8a31d0119f450ee821a2bd35c346fd86adb4474ea7c28fcf SHA512 934a7c3631e9ca4fa78d9577b6672ca0b2f926a8d6c3be9542b906c5968033446f98f76ae6f368a1a5b92ab9064c31a57d74ab6d2097108029a7ea951541ff7e DIST parking_lot-0.12.1.crate 40967 BLAKE2B 940a112a066e3cbd15e2f6df89bfff37e4ece2194118618a96fa14871813c91798f93181ab0f768d3e1f3d60805508f216724013afb7e3da95678d0d951a42d4 SHA512 07327d3b737a913508dffb66023766348ce7f9d555c224a099cabb05baefd16a28e15fec638e3a148a5169dbd980c4541b0f8820ae9d06dfe0704482838fbd5c DIST parking_lot_core-0.9.3.crate 32256 BLAKE2B 79a1924a983b948a5c2b0c074452a7b2b61abda973d3bc8040d9153d34b378f0ee330e36aa813f49544319c479665d6328be71481f2e1e41bc94abb9bfbd12a0 SHA512 fa30db0fc73b268ab8395adb8bda35d12dc15363b247a95b7c4bb848ff9b8dbfb971a20f320b4feff3317d5b533c59b62152e4c652c1809a422c5671310b30df -DIST proc-macro2-1.0.52.crate 42982 BLAKE2B c432e889c6d02e359863ca40d30e20b5c3567d065ea16e5963eb713ea9a02a9979ec996939efbb23aa37857ec37e6587b2519d8267a1a713d1b17fce014acca6 SHA512 76b24c82bfd37a7eed4dda59a56fa2101ec4e8d6ad726e3fdace9daa729090de2cb2bcfd4246dd691129645c613ae18c6fc448c940b459724681202f7a232f3f -DIST pyo3-0.17.3.crate 408939 BLAKE2B e67ce34c626dbede3c76abf66ba5078827e8a75644ff9fbd83eccf3d53096a3c2e0991da8b3489ea9984c665751308bcf4aa9c3d31dd62c72127694156a7a0a9 SHA512 5c83ea76202edce13c370d023562a9009382e36fdf3fcd7c4dea844ab8e5e048db4cc79a9c0ea98fb7017a83da16924ba0981ad98bd83e75e2fac434738e9740 -DIST pyo3-build-config-0.17.3.crate 29230 BLAKE2B 193df0c15a2150505c823338e76f4d75e2f28158626edf332da2b10b6a81bfaf7f95a3a32c9f218717504b2f0dd80d3fb61c78ab3df9cb9024c3686f8ca002b0 SHA512 92652ffdfb3f6c3c8a1c2f97f5e2ed19175ba6bad5cd0f0c113b569369193aa18d95adc780bbdb8202d815a1ec0b6aeaf40d93d64faab42f4e8b452c806906a2 -DIST pyo3-ffi-0.17.3.crate 62854 BLAKE2B 3f1c519b210de0aee19b832845c1d44237f780f18173ddc1b1cef5eac1060fab40fd8dbec067a49e4d28fc7edcd0bd751f54438ad42a8b98641de0517052c64b SHA512 c08481d1530207fee544a5dde14253415e5451c1c013b86ac1f0e9bcb3c1df7866764cd11bad523105b6821725560329b89ff689b3aa2f0698cdab148d0fc12e -DIST pyo3-log-0.8.1.crate 14082 BLAKE2B 1920a34d18f1f418857abca05c59f5f9a16d00fc460082c2cbe97bc55b8f429d6433780d667a211beecf4df81a2606aa502ce2a1ebb6c0833b74a604abb5eecb SHA512 d69f7c8e3d1997ca06201c15500a2e0e043f7c0b39c8bd826ce9dbced220b4b0fde0c31b865fbc41f94f188e4b9ea15b49e2e2e42068a82678668f3a51a2fca1 -DIST pyo3-macros-0.17.3.crate 7257 BLAKE2B 4c5e166a37c31f2cc21b7dce9b46dcdaeea0f12299c421430efe72b47ac954f10680bf6ecb28a5f0058abaf22519f6ce05d21e5de534e362ceb9847049601f4f SHA512 f99d38ea69b1d46599d203908d12eb3fe4869a48b21b3eaba0c9c8e52b9f2b3c5ea72505dcb9b3330450dd724eeba859eef724fe9624ebbd8bd3cbcff7372df1 -DIST pyo3-macros-backend-0.17.3.crate 49992 BLAKE2B a922c3c2c1f494002fa8592704c43ddbb4d9bf650187adcfc94f82c1275bcb69d444ede404d1b40bdf1e199427e8de880464b76c7385c2f96633544ad021c4b4 SHA512 b4dbddc3ac7ae542560459376127cabdbb4de83c04d70a4efe0976fa94e6ce94a7a62723f689a8fbb1d795fc235b1ac3611f8b4985ae2af0db4a9dc08de48927 -DIST pythonize-0.17.0.crate 10949 BLAKE2B 6d3c311aae1ef97a2a965124eb23e312f94c4d1e2a8ec17d9316c9fd2f72990b95977a87f722012e4fb54ce0a8be1a2eaac57b71e9d429dbbe59b0da387b2b81 SHA512 a9a46d27b8aa9e5bd7bb0b114b7457275131d90e20acd07110fbc18b3af3b9aa0683b9306fb645645f3801b64c0c479998665f3e4fcec0ed8e5b5947008b76bc -DIST quote-1.0.26.crate 28397 BLAKE2B b468a5e9350843ea81e540d17c9fcb302b46fbd450e10280c5fff6fd7c98a439df8c3d3d47e551bc6d67ed02052b5b5c65d215d5ff8ee34f045747e75c1ba37e SHA512 6fcfe4d31f601aa60beb858c25df217421b0a184d185eebc7a4cb9fbf97c687992b77bebd8671a9e6193716387c3e926fed9b75a08684eb2d9a5b155fbc321a5 +DIST proc-macro2-1.0.64.crate 44848 BLAKE2B 4422122d9299eff3bfbb4507c4a117fef7c0906cab5a680933d482b7f9b49480bcb9c8172b412e70bf87dd0737b8532e90c310bf083f144292cc72190059ba3b SHA512 884fd14ff23c19420692e35a38f88bb6a766a09da105759cd958c315b9360a2c49cfe61ceaa3122307d44040195ec9dffb12b6d0ce224fbac5d3701621a12b04 +DIST pyo3-0.19.2.crate 418228 BLAKE2B ee018b33383fada78cd22643aea9231a8c8a2f19d1eb297f40eec9206c5220f322fff4c926d939a93a24ac6d231a207ebb25afcc0709191151c7ed9af7465efa SHA512 58698183e0f2f0507f8f765bf3e90185c933e78d62f0a9be65c4b1ce8eea19a98fe0341abe7c58cafdacb63a012ec417876dccb7be6facc1360fcb22796fcaf9 +DIST pyo3-build-config-0.19.2.crate 29206 BLAKE2B 5b1cd80d643e448cf8f1d28a514333526061c178121b9a0dcb5bff6082f402ecfd166536d94d42065f6dc1f108a73f12bbb78eedf9ea053a6aa2e9c80ac00ddf SHA512 ccc73061ec1989258921c5b5800689170635fa5503d74a4ac458baef903dd31efa41995d238783f1e099ece1f66d0a0e95c4fcb4b772b9f653dbb20e838b4e28 +DIST pyo3-ffi-0.19.2.crate 66500 BLAKE2B b4139fba31ef17017b6b60784e41ccda34931a072c2638af1eed8d02d7af701c46fe38b12772d2301cff41d10a433ff0f00a69d79d40233eadafe82abe585f8d SHA512 789191bca537998dd23d72dce4f185b84bbe700f4171c47de35b9bbca15a180ad214392b4f465cc1ecb0be955ebec1cf5a3c497815073be18035bd8bf8c51a32 +DIST pyo3-log-0.8.4.crate 14329 BLAKE2B 666fcc4b04ae4d391d15238db67a132d40a9d1df454c80345918d62231181d6cb708c9e8c668a5ee7ee1d0a15e1427cc3313845060b09abd705394b792544afe SHA512 2f374c75b3e4a42041f44f2285388eb3a6da5b217f3fc5bd031d233c46dbc554b93934345b39b359d890efbea1f588f9683388ba777e0b9bd9ccacdb1119da05 +DIST pyo3-macros-0.19.2.crate 7173 BLAKE2B 8862f42a30929579b0b0bc2ba7f0b416518724480e197fa13288e49324e851f964183e1529b7f31bf5d4fe0ae194a412723b6b401100e66fba98bbcd9c283866 SHA512 852cc2792aa3d30d9ab8802a451be5617cae6536adced1bf0dde71704a3c7c1bfe862fba751b6d045249819a8ba5d87dfc50914d142a0b662f046498c06f8c2e +DIST pyo3-macros-backend-0.19.2.crate 49962 BLAKE2B 9d8a032c2205f55d2431b6bbc40df153339e08479df3a8a65506ade7d1f3d17cfaf664cbd09eaec9acff3f5a248598e37427d0c5a531eaf527137803adf49834 SHA512 fd708e6fdbd54ef7c676bedc62070175bac6b8f7ae11231578196dbf552b163a8a2499a1266f786bb6bfb85517fe83610902137d59a5c42efcb1a27c4235a07e +DIST pythonize-0.19.0.crate 11647 BLAKE2B 3cff5f6261926a58a61974eecc893864265e956e854cba40f1930c8dc0990b78356623b7dc591fdd170f124b0a7cf58a41b29e3d600e80c90c102e5aeb2d781d SHA512 f88c58e3507a59039d429f79a4f23364e9c4dbc309ab67819ad3c7265d749553309ddf12f12b56ea1bf09cdf8b53daf2a7e05dff718a06420fda4c77f7a11fe3 +DIST quote-1.0.29.crate 28345 BLAKE2B 3aeb637a4139730348775caab4d48173650d8bdce08247263d741ccc657dfff7f2facff05725bcaa73486818d394c392c64ecbc61bae3f5b612104aec16ff289 SHA512 d686a3943dca059a8e79689c77e6e8f6dbfa9b16a1a7ecdd27099339b77a55334252eaa8b4340e79c35ebb1f6e4deeb3f6356dfd02484f9c724e66a74387e30b DIST redox_syscall-0.2.16.crate 24012 BLAKE2B 9497a52044458b1435ea16e86ee072e379b6b11ee31602ea72d6b6072a4a99426f409c2e58108a4e9c36dc193fa49c83951e71f4fd4e158eafff18c594dc01ad SHA512 63b5d876baaf99f5cf737679bc6ac7a9e3d8a41aa93f5c59416ce7e3841e2513bff678773553cfe62fb452707f82acc384ea63aec932a31bf94679cd1caddd27 -DIST regex-1.7.3.crate 239886 BLAKE2B 8d9413178b626b09243e18a1c5e0336cd41e05659128d4026bd551df0c34b9e141e36c3134f3b22200b18828ef89082a08515047159afb4f4960e5fa840fd54b SHA512 f7e8dbcfaa10c2443b9a6dfa514edf0e149d33f1a135e4a828adf97dbb0f1af5a4b58a2bad75ea8cbecb9641f499b30ed06b8ba60c7eaba79409ca18ede85e4f -DIST regex-syntax-0.6.29.crate 299752 BLAKE2B 2408ebfe5f0dd6578c33f18e8ea9a0a7a84388420c5b67adcaedde477f3f67fb3e39ba9fab1f6892c7ae7fff754c4aca51314601529cabc6a8fc43af38a11f88 SHA512 28a58950d15df1f0ac4ff4185c05b535e8f5bf0b75f79fad24e40e17a02570d1c9bd9cfc919eed8756a1069bc489c5fdccfd04f6b8266c83e3412b7b4bdc262e +DIST regex-1.9.6.crate 254981 BLAKE2B e0341184d93703a32734f1081d8962723873ef558f4db764b1996dfa9eeb359ac530f7dd93f4d32947e91c056b8bdc51dde99b890c14f959b02763dc22bd996c SHA512 e0da225eeeb9d02b83992959889fa9360b9c549905e4ae4982e61743fccce6d721eb0283a5d2f3e9323193bd5c839a2d0da603849bf6ec5f8ad2b7ffc81c59ab +DIST regex-automata-0.3.9.crate 610489 BLAKE2B 6eccdf930979ff4e8657cdb8fc67feebe18d16f6deefda7e1692c6cb6f311bd3c360d9dc091938bdaba061669b003ff7689d7717489326aba70aee563a4f0e20 SHA512 c404677bf470f913c1ca70385a1b9694ec4c048d306380c23001bb746803ff70999c7e215efdf02c6bf03cd9a922e98a6ecb3be588fd4f05c1f57836dbe54c0f +DIST regex-syntax-0.7.5.crate 343366 BLAKE2B af07596e45e3525ffd253d6070ddad08dffc8f0409ea14843a135646da8b37a7a568c12ede809d9fa47eec2329f68da7a3b3c0e0cabfa200de64affe6ecefee3 SHA512 6388dbf68c8c86d8a5bd8cfb13a86e9ab2da1a339fd607c1a16848f85dd21c85d744d694c7b918954ea27eeefc90b589926c9da464343fb78ab639a5e2925efd DIST ryu-1.0.11.crate 47007 BLAKE2B d03e8df69c3b21c1b2e4ffa91ece794f141e9f9bce4e9ed1ebf394b1cb0f796147b86189885f0734df8f431b2d166d8f6ed6a261be398d6d088fd56046a85c2e SHA512 dd2642aab2d3017c31432436226d5350b894c8b88a09395eb7de6350964b3cc48451a829ce78b04a9e4e0480076fe1bddd0604f4e57700faa2d60cac6e361408 DIST scopeguard-1.1.0.crate 11470 BLAKE2B f774eb90b7d3ffb2efba47518e9d1dead4017ab4b38a4bd74914daa84a5af4bf9eb63da0496e3924499d79cd0439c37447aeda4a21226f95645bddcd6becfabe SHA512 368fa5726df8f42b599993681579a9ffd0196480ee3cd0f9f671e8493f3bedd1e1779bdf2beb329e77e0005fa09b816e3385f309490c0f2781568db275d4d17d -DIST serde-1.0.160.crate 77010 BLAKE2B 45d2585bd7e5dcd368b72c29046bd595c577826da4aea6d019adaf07d23adc096db7aba952037dfdac9dbf08a1e92ababd44cc784ace557fe2cfe83beca446cf SHA512 b03eb453ac01a483843829952462de4e8f6d0fa4a244d38a6f476a911e2e991a508121265befd108134ae7cce8a7a40c4d217f80f3e025f9a612a0bf80862306 -DIST serde-1.0.163.crate 77030 BLAKE2B 0d7ead66faab8ae01c693c9bbcadfd0a7a736c8bf46f50ef43ba261eec9e0f0c43477feadb2e134f0ed6dda3115dcbc3d22daa28592f343739f1ea03d9c25723 SHA512 752738ef5f67f1b4435bdd4e76e740ba192bd93e83cac55fd667809af26ceaf02db7083aaf7b2074644b38964021af206000b6130199e7994c12c9c57cd31a34 -DIST serde_derive-1.0.160.crate 55081 BLAKE2B 851cbd173bd758d46c9f545f05a17f65f7b0a2cd353cc75a985072e3772ca6d8395b63208d845dfba231d7cb5fcee97ec0df0bd0df010096577d618fad8bffb0 SHA512 14b2a2ad7131efa7ec95d5a6e7633a9d1e991b046c0b00cce9c3681edd73cb53ff477aa52a430d8465aa8b362696244ea80f12ffbf0e6f98e35605fe4c60f407 -DIST serde_derive-1.0.163.crate 54447 BLAKE2B 284d02fcbdd05c53c8da737fac422fd61ff53669b140686d1732ef727a1e873945b1ebdb85fbda1d79f2c563b2c7b81d3ac51c76fe0cf5205dc6ab4d46a9d4d8 SHA512 744c4235330781c8d9c6ab4f49f6ddd11fcd70b97c97fcbf1434ccac02ba7d29eacfed21ee8e005f5541dd8ab4a34023e95d85231f11c5f4d6e24fcf806f7283 -DIST serde_json-1.0.96.crate 144652 BLAKE2B 2754e63479aa07507015dcb0f989d6447f5b2c01e5f02cf8a843d90c90c6fd0acd3ecb68d80d76c249efdabe0bd0670649a9e576269928d2276ba00a3153131d SHA512 39779419900e1d395d81e70cff0e7a688564a66124b08e74da54ac30f389c912707f4bf5e29afab6fa106faf4bf4e0b841f42fef125cf7bec185482ff6bbba0e +DIST serde-1.0.190.crate 76455 BLAKE2B d0f6a52615136d810760c6da3078387abc67ff5119e25953004d470ec6f5c569abf1c324b777c004714b4b15bd49a9972ec592372c807b26f3b4f124d534c833 SHA512 7f1cbe819fbae803865beb20b5d8b9fa52d503e04083be7181c1d04b702aaecf553796db960bfea87dc17ef864246e78a919219588064fb083e77dd2c6c16ce1 +DIST serde-1.0.192.crate 76866 BLAKE2B 4920089921e23bbc9180d413cff34277683db1881d7e65c5fd9dc8bad2beae954d2429c9c2049b3e98bc04314ef059e59562c936d6c767681e75b84aa0a2a468 SHA512 b34cea6034a14a6785b3023d0a1c2cb5b1c2756c28f02ea20ba62a657ba54e9d04096a54c4fdde3ff4094913dba46c99713828de4287186bf9dd3f7d89dda0c3 +DIST serde_derive-1.0.190.crate 55676 BLAKE2B a6558987927298a6551a52d7a8e265acf1a3a0576716a881329803637b6f7ee7b3329e161bf5b37e410264c03913c2c16166df7dd25110b1295d61806600f4f2 SHA512 5b37b659c45ab95b0333d787cc5e8374076121d548837556774cbe768073b02aef4a6889e32b738ce5d85613264ba78570c0af48d049102d4d687ad791dd09ea +DIST serde_derive-1.0.192.crate 55690 BLAKE2B 1e9706fdf38880989cf907c36d1f72b5b211fc6f263a4ee35d5f7106aea0a792fd79a3361d09f831e06ce0a43680647952a8478bd1001f617d2571be428b5516 SHA512 67ad208291c8d7063adce4bface5d963488c43a326e77a89970f86f65e8f77856e173d134718f64eb80dce67283df1951022c12300dea0b4d9570fb7f637643a +DIST serde_json-1.0.107.crate 146458 BLAKE2B 753be6076826ee0ba41a067e81c031e6fd69b539086a2d649e6595136fd05d61b717c3d4cb6774af0a0c02102f7f4588e682bd21732450afa93877d093596880 SHA512 ecd4ef86538df402f2a397cb86c5b4b277a9a43d742e2af3d51ab5ac0ba31c677bfc72db06c10f8abbc970ee41d5f77d758f1f70ea18495d96bf78cb7d66c2bc +DIST serde_json-1.0.108.crate 146476 BLAKE2B 9c0ceae5566a4e0ce7a6264939862f9dd920bb47d18acebb179798b036c376d97a4e9b0717092903ab90cfbf6fb73d37518e3cc25f3217af010296f5644de396 SHA512 7d8d1b74515388d99983ffbc5696cba022305cf4c797d3ff5d2959fc8fc8f4ce01cc4c9e7ccae7097b06b5acf5307027f6b7315df1fd8f58e681cc5968e79fb6 DIST smallvec-1.10.0.crate 31564 BLAKE2B e3e46a0781d3a7892a739b001592d462d0704f010363984c439e3fe4f75aecb9720648aa1e9bcc56bb3be848dd40cee578212439f78f07a807c9441c3c3e0147 SHA512 a09110184582dcc01d7a0d3fa8f74c17bf726935126d3654667b8e9c4bc43ad16ccfd8fa94feae7d9b31913aa7ee030fe5936e4b44a36302b6ce5fe37372a7ae DIST subtle-2.4.1.crate 12630 BLAKE2B 05a90232bfdc2cf67522e2972bddcd8dc9a165b1d1cf775d0b1c8358fc7c4d0559b2b899126b6688b8ef77b8b7580b3b300f74a599a7ee77f99c064a3917693b SHA512 7fd8234b7ffa3ca7e473539cad958df0842186e1dd735905e0d4977564f40a5f2e18b58180fcbe52614a00964dc150bd9f6964500847ea658f22bffe030f5c6a DIST syn-1.0.104.crate 236683 BLAKE2B 865904923ecac469f1d92bab04ea9ee384be0592c7a303d9d0f2f4bc755744bd883372c215a8f1add8bc2728d7c2c27489ab292fc8a89bdce918fc4a32deae44 SHA512 8feabd8e6b1b5eb15077d7c92f0b3269e848d33b1f233b3df343b6d445ed332fb23e0222911a13edfd82cee969d25c43434268cd7a20ce1c0a608a1bbe327b29 -DIST syn-2.0.10.crate 240095 BLAKE2B d2def2e1354d41bfcc3ad9cfd80ed611a56fd8560dc1b3c45aabd1927847fe69a92eb7c9575f159a5d3a004e8463f7f13ed60a4aa4ec6055552c1f731badc6fb SHA512 31f9c461b296453dcc0b7fbc71c2350658f447d4d90644b1bb35782fdf4067405090a0f9875a96fce9473855275d800d5986200b7a575b9fafd48218157b673e -DIST synapse-1.82.0.gh.tar.gz 8239769 BLAKE2B b61c67af76255b240618497cdbf2ab7fdad0050e913a4ac5e3fc0a045a9566128315c68d4844e9f20c842872cb51d645fccfe47892e28da5ae45394ca6d5a46f SHA512 2c62e795cc927c1352d0387ca59fe9eceeefbff1aef93a7510dd423bead81f66a3bb579426c3f6ec592d4dda4743613131f895e5e626eb5aeb05d72b94d91dd0 -DIST synapse-1.83.0.gh.tar.gz 8259074 BLAKE2B 864f38b0f45577424e92ec589fb7290a0a1a6d316342788fb842b6bd92198ff35ac12669b1be966456a3ecf2831e1a678efd1117979ddafbc64b4c80cb0ace5a SHA512 c80bde4741b26182da52c6fc623075eda7cbe6c5aa74edcec4a3a52aabdba86e95d8f8433e071ee82664b5bcc75a5b25600b7b788b80ee217226ee045e2affad -DIST synapse-1.84.1.gh.tar.gz 8275282 BLAKE2B c37327ddfd0c41e29ffeff25a26fed9e2fed3346dbd4f3910d32488b86339c8c53d4a7579ef77b7d18f00db98c603211e59e72ee027d111af5c7273a94f29519 SHA512 c98a16229532fab49e5457bfd46bd61d27736c49eee5c125f9136f107b5a5c5c3b341e8a20d1afb8d9163562bf20783ed4950f1ae2057a4a0ec8035fcbf459d7 +DIST syn-2.0.28.crate 241635 BLAKE2B 5784468a0dd04eb298821ae5a3facf72c5fe5907cc469919b0a0b636bb55bd15e9e3a31c9ceb05b7b0f88e7a53e5891e6874641b61e5fde247a91361ae37047f SHA512 96e83979e70e2e1e46ca2af45d10fb259847d61e327809a51351a988282be9688a8c4942a284504674c8684970082dc15cd9ab9b3584bbfa68ac9716e071f9c5 +DIST synapse-1.96.0.gh.tar.gz 8419093 BLAKE2B 71feaa95ff2da8b7c49b752ce3e388fdf2da2e0528724d91dc1e9079e1ff97670c76e97f0c373b2f97da13a65e894a8d2fd0c3dc1614fe46a9a2967441cfcc69 SHA512 0276e2949c99d78096f6f86c41a507397795349f90b7533430a3bede65c9066a160967870963d4e2a6c854c9dede222a7b3182e7015cc27a23b1e12141e2bbdc +DIST synapse-1.97.0.gh.tar.gz 8441673 BLAKE2B 6ff559005722970ed61dea79042a0694c1fe7d0914640ab184e6d1638197ead70c46b0a1645875ae5a3eb5b1402d22a9189849d4d6ead77c04a7af03f3888c4b SHA512 75687a424ee62391e3e4ff99a8e16d614433447e98f926570d0de11f5f467ae830264f0ea0d49b4d188558beac7a4b5290a0b1906e1342fc7dfd05f2d1a33c21 DIST target-lexicon-0.12.4.crate 23020 BLAKE2B ad9780b9478b00b4fdcb07bd016d83216695413090ac29cca06388c3790e2832c978b1c7e69f6d34bb6fc9adc39c0a0b6b6636e50a9715a9f5f16445dba22d19 SHA512 194fe1946ad8d9fdb383bf8a65374e24d216382c1ed5379dabc98d58842512624c32838b8d6d0658d866f6559d37f1343a30c5809e8914dd85790399252b3e06 DIST typenum-1.15.0.crate 40741 BLAKE2B 5752d80396d0a37b0069b98ace9efe96d94ccaf41b33b8149c8b8c6a767537dbffe64251bbf61f3812465ecbc8cb45544f177dc97ac9735d84454282e4d1ed66 SHA512 a3c1ceac85e1aed98d0829449c35f4f36db860218b955b4e5f8f01da1d27ee6213f3c60e2b25c3745dcd67369049da5de737a9473fa9402db99cf7cddeb42288 DIST unicode-ident-1.0.5.crate 35455 BLAKE2B 7e14ce97ac53a88ccec015dea690918a673dc5b49e44de7fdcb5421871da35c4f514c6db9a363d6f4bfcf2e9a61a50a593d345d0b6f388ea882b17a00cd0335d SHA512 d355370daac356d900cd4c0a792d6c0eff114524c4bffce4d7e74469fe2117883ee00bf0e27d950b72e88739473f2045d5f83440a0aedfede97b4d9163b64a6c diff --git a/net-im/synapse/metadata.xml b/net-im/synapse/metadata.xml index b1f705d65680..921ea20c18f9 100644 --- a/net-im/synapse/metadata.xml +++ b/net-im/synapse/metadata.xml @@ -1,14 +1,10 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> - <maintainer type="person" proxied="yes"> - <email>arkamar@atlas.cz</email> + <maintainer type="person"> + <email>arkamar@gentoo.org</email> <name>Petr Vaněk</name> </maintainer> - <maintainer type="project" proxied="proxy"> - <email>proxy-maint@gentoo.org</email> - <name>Proxy Maintainers</name> - </maintainer> <upstream> <remote-id type="github">matrix-org/synapse</remote-id> <remote-id type="pypi">matrix-synapse</remote-id> diff --git a/net-im/synapse/synapse-1.82.0-r1.ebuild b/net-im/synapse/synapse-1.82.0-r1.ebuild deleted file mode 100644 index f350bba869ab..000000000000 --- a/net-im/synapse/synapse-1.82.0-r1.ebuild +++ /dev/null @@ -1,204 +0,0 @@ -# Copyright 2022-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -PYTHON_COMPAT=( python3_{9..11} ) -DISTUTILS_USE_PEP517=poetry - -CRATES=" - aho-corasick-0.7.19 - anyhow-1.0.70 - arc-swap-1.5.1 - autocfg-1.1.0 - bitflags-1.3.2 - blake2-0.10.6 - block-buffer-0.10.3 - cfg-if-1.0.0 - crypto-common-0.1.6 - digest-0.10.5 - generic-array-0.14.6 - hex-0.4.3 - indoc-1.0.7 - itoa-1.0.4 - lazy_static-1.4.0 - libc-0.2.135 - lock_api-0.4.9 - log-0.4.17 - memchr-2.5.0 - memoffset-0.6.5 - once_cell-1.15.0 - parking_lot-0.12.1 - parking_lot_core-0.9.3 - proc-macro2-1.0.52 - pyo3-0.17.3 - pyo3-build-config-0.17.3 - pyo3-ffi-0.17.3 - pyo3-log-0.8.1 - pyo3-macros-0.17.3 - pyo3-macros-backend-0.17.3 - pythonize-0.17.0 - quote-1.0.26 - redox_syscall-0.2.16 - regex-1.7.3 - regex-syntax-0.6.29 - ryu-1.0.11 - scopeguard-1.1.0 - serde-1.0.160 - serde_derive-1.0.160 - serde_json-1.0.96 - smallvec-1.10.0 - subtle-2.4.1 - syn-1.0.104 - syn-2.0.10 - target-lexicon-0.12.4 - typenum-1.15.0 - unicode-ident-1.0.5 - unindent-0.1.10 - version_check-0.9.4 - windows-sys-0.36.1 - windows_aarch64_msvc-0.36.1 - windows_i686_gnu-0.36.1 - windows_i686_msvc-0.36.1 - windows_x86_64_gnu-0.36.1 - windows_x86_64_msvc-0.36.1 -" - -inherit cargo distutils-r1 multiprocessing optfeature systemd - -DESCRIPTION="Reference implementation of Matrix homeserver" -HOMEPAGE=" - https://matrix.org/ - https://github.com/matrix-org/synapse/ -" -SRC_URI=" - https://github.com/matrix-org/${PN}/archive/v${PV}.tar.gz - -> ${P}.gh.tar.gz - $(cargo_crate_uris) -" - -LICENSE="Apache-2.0" -# Dependent crate licenses -LICENSE+=" - Apache-2.0 Apache-2.0-with-LLVM-exceptions BSD MIT Unicode-DFS-2016 -" -SLOT="0" -KEYWORDS="amd64 ~ppc64" -IUSE="postgres systemd test" -RESTRICT="!test? ( test )" - -DEPEND=" - acct-user/synapse - acct-group/synapse -" -RDEPEND=" - ${DEPEND} - dev-python/attrs[${PYTHON_USEDEP}] - dev-python/bcrypt[${PYTHON_USEDEP}] - dev-python/bleach[${PYTHON_USEDEP}] - >=dev-python/canonicaljson-2[${PYTHON_USEDEP}] - dev-python/cryptography[${PYTHON_USEDEP}] - dev-python/ijson[${PYTHON_USEDEP}] - dev-python/immutabledict[${PYTHON_USEDEP}] - >=dev-python/jinja-3.0[${PYTHON_USEDEP}] - dev-python/jsonschema[${PYTHON_USEDEP}] - >=dev-python/matrix-common-1.3.0[${PYTHON_USEDEP}] - dev-python/msgpack[${PYTHON_USEDEP}] - dev-python/netaddr[${PYTHON_USEDEP}] - dev-python/packaging[${PYTHON_USEDEP}] - dev-python/phonenumbers[${PYTHON_USEDEP}] - dev-python/pillow[${PYTHON_USEDEP},webp] - dev-python/prometheus-client[${PYTHON_USEDEP}] - dev-python/pyasn1-modules[${PYTHON_USEDEP}] - dev-python/pyasn1[${PYTHON_USEDEP}] - dev-python/pydantic[${PYTHON_USEDEP}] - dev-python/pymacaroons[${PYTHON_USEDEP}] - dev-python/pyopenssl[${PYTHON_USEDEP}] - dev-python/pyyaml[${PYTHON_USEDEP}] - dev-python/service_identity[${PYTHON_USEDEP}] - dev-python/signedjson[${PYTHON_USEDEP}] - dev-python/sortedcontainers[${PYTHON_USEDEP}] - dev-python/treq[${PYTHON_USEDEP}] - dev-python/twisted[${PYTHON_USEDEP}] - dev-python/typing-extensions[${PYTHON_USEDEP}] - dev-python/unpaddedbase64[${PYTHON_USEDEP}] - postgres? ( dev-python/psycopg:2[${PYTHON_USEDEP}] ) - systemd? ( dev-python/python-systemd[${PYTHON_USEDEP}] ) -" -BDEPEND=" - dev-python/setuptools-rust[${PYTHON_USEDEP}] - test? ( - dev-python/idna[${PYTHON_USEDEP}] - dev-python/parameterized[${PYTHON_USEDEP}] - dev-python/pyicu[${PYTHON_USEDEP}] - postgres? ( dev-db/postgresql[server] ) - ) -" - -# Rust extension -QA_FLAGS_IGNORED="usr/lib/python3.*/site-packages/synapse/synapse_rust.abi3.so" - -src_test() { - if use postgres; then - einfo "Preparing postgres test instance" - initdb --pgdata="${T}/pgsql" || die - pg_ctl --wait --pgdata="${T}/pgsql" start \ - --options="-h '' -k '${T}'" || die - createdb --host="${T}" synapse_test || die - - # See https://matrix-org.github.io/synapse/latest/development/contributing_guide.html#running-tests-under-postgresql - local -x SYNAPSE_POSTGRES=1 - local -x SYNAPSE_POSTGRES_HOST="${T}" - fi - - # This remove is necessary otherwise python is not able to locate - # synapse_rust.abi3.so. - rm -rf synapse || die - - nonfatal distutils-r1_src_test - local ret=${?} - - if use postgres; then - einfo "Stopping postgres test instance" - pg_ctl --wait --pgdata="${T}/pgsql" stop || die - fi - - [[ ${ret} -ne 0 ]] && die -} - -python_test() { - "${EPYTHON}" -m twisted.trial -j "$(makeopts_jobs)" tests -} - -src_install() { - distutils-r1_src_install - keepdir /var/{lib,log}/synapse /etc/synapse - fowners synapse:synapse /var/{lib,log}/synapse /etc/synapse - fperms 0750 /var/{lib,log}/synapse /etc/synapse - newinitd "${FILESDIR}/${PN}.initd-r1" "${PN}" - systemd_dounit "${FILESDIR}/synapse.service" -} - -pkg_postinst() { - optfeature "Improve user search for international display names" dev-python/pyicu - optfeature "VoIP relaying on your homeserver with turn" net-im/coturn - - if [[ -z "${REPLACING_VERSIONS}" ]]; then - einfo - elog "In order to generate initial configuration run:" - elog "sudo -u synapse synapse_homeserver \\" - elog " --server-name matrix.domain.tld \\" - elog " --config-path /etc/synapse/homeserver.yaml \\" - elog " --generate-config \\" - elog " --data-directory /var/lib/synapse \\" - elog " --report-stats=no" - einfo - else - einfo - elog "Please refer to upgrade notes if any special steps are required" - elog "to upgrade from the version you currently have installed:" - elog - elog " https://github.com/matrix-org/synapse/blob/develop/docs/upgrade.md" - einfo - fi -} diff --git a/net-im/synapse/synapse-1.84.1.ebuild b/net-im/synapse/synapse-1.96.0.ebuild index 8b3fd4e6a8bd..41cb2e7d6af8 100644 --- a/net-im/synapse/synapse-1.84.1.ebuild +++ b/net-im/synapse/synapse-1.96.0.ebuild @@ -5,64 +5,65 @@ EAPI=8 DISTUTILS_EXT=1 DISTUTILS_USE_PEP517=poetry -PYTHON_COMPAT=( python3_{10..11} ) +PYTHON_COMPAT=( python3_{10..12} ) CRATES=" - aho-corasick-0.7.19 - anyhow-1.0.71 - arc-swap-1.5.1 - autocfg-1.1.0 - bitflags-1.3.2 - blake2-0.10.6 - block-buffer-0.10.3 - cfg-if-1.0.0 - crypto-common-0.1.6 - digest-0.10.5 - generic-array-0.14.6 - hex-0.4.3 - indoc-1.0.7 - itoa-1.0.4 - lazy_static-1.4.0 - libc-0.2.135 - lock_api-0.4.9 - log-0.4.17 - memchr-2.5.0 - memoffset-0.6.5 - once_cell-1.15.0 - parking_lot-0.12.1 - parking_lot_core-0.9.3 - proc-macro2-1.0.52 - pyo3-0.17.3 - pyo3-build-config-0.17.3 - pyo3-ffi-0.17.3 - pyo3-log-0.8.1 - pyo3-macros-0.17.3 - pyo3-macros-backend-0.17.3 - pythonize-0.17.0 - quote-1.0.26 - redox_syscall-0.2.16 - regex-1.7.3 - regex-syntax-0.6.29 - ryu-1.0.11 - scopeguard-1.1.0 - serde-1.0.163 - serde_derive-1.0.163 - serde_json-1.0.96 - smallvec-1.10.0 - subtle-2.4.1 - syn-1.0.104 - syn-2.0.10 - target-lexicon-0.12.4 - typenum-1.15.0 - unicode-ident-1.0.5 - unindent-0.1.10 - version_check-0.9.4 - windows-sys-0.36.1 - windows_aarch64_msvc-0.36.1 - windows_i686_gnu-0.36.1 - windows_i686_msvc-0.36.1 - windows_x86_64_gnu-0.36.1 - windows_x86_64_msvc-0.36.1 + aho-corasick@1.0.2 + anyhow@1.0.75 + arc-swap@1.5.1 + autocfg@1.1.0 + bitflags@1.3.2 + blake2@0.10.6 + block-buffer@0.10.3 + cfg-if@1.0.0 + crypto-common@0.1.6 + digest@0.10.5 + generic-array@0.14.6 + hex@0.4.3 + indoc@1.0.7 + itoa@1.0.4 + lazy_static@1.4.0 + libc@0.2.135 + lock_api@0.4.9 + log@0.4.20 + memchr@2.6.3 + memoffset@0.9.0 + once_cell@1.15.0 + parking_lot@0.12.1 + parking_lot_core@0.9.3 + proc-macro2@1.0.64 + pyo3-build-config@0.19.2 + pyo3-ffi@0.19.2 + pyo3-log@0.8.4 + pyo3-macros-backend@0.19.2 + pyo3-macros@0.19.2 + pyo3@0.19.2 + pythonize@0.19.0 + quote@1.0.29 + redox_syscall@0.2.16 + regex-automata@0.3.9 + regex-syntax@0.7.5 + regex@1.9.6 + ryu@1.0.11 + scopeguard@1.1.0 + serde@1.0.190 + serde_derive@1.0.190 + serde_json@1.0.107 + smallvec@1.10.0 + subtle@2.4.1 + syn@1.0.104 + syn@2.0.28 + target-lexicon@0.12.4 + typenum@1.15.0 + unicode-ident@1.0.5 + unindent@0.1.10 + version_check@0.9.4 + windows-sys@0.36.1 + windows_aarch64_msvc@0.36.1 + windows_i686_gnu@0.36.1 + windows_i686_msvc@0.36.1 + windows_x86_64_gnu@0.36.1 + windows_x86_64_msvc@0.36.1 " inherit cargo distutils-r1 multiprocessing optfeature systemd @@ -75,7 +76,7 @@ HOMEPAGE=" SRC_URI=" https://github.com/matrix-org/${PN}/archive/v${PV}.tar.gz -> ${P}.gh.tar.gz - $(cargo_crate_uris) + ${CARGO_CRATE_URIS} " LICENSE="Apache-2.0" @@ -84,7 +85,7 @@ LICENSE+=" Apache-2.0 Apache-2.0-with-LLVM-exceptions BSD MIT Unicode-DFS-2016 " SLOT="0" -KEYWORDS="~amd64 ~ppc64" +KEYWORDS="amd64 ~ppc64" IUSE="postgres systemd test" RESTRICT="!test? ( test )" @@ -92,6 +93,7 @@ DEPEND=" acct-user/synapse acct-group/synapse " +# >twisted-23.8 breaks tests, see https://github.com/matrix-org/synapse/pull/16528 RDEPEND=" ${DEPEND} dev-python/attrs[${PYTHON_USEDEP}] @@ -108,7 +110,7 @@ RDEPEND=" dev-python/netaddr[${PYTHON_USEDEP}] dev-python/packaging[${PYTHON_USEDEP}] dev-python/phonenumbers[${PYTHON_USEDEP}] - dev-python/pillow[${PYTHON_USEDEP},webp] + >=dev-python/pillow-10.0.1[${PYTHON_USEDEP},webp] dev-python/prometheus-client[${PYTHON_USEDEP}] dev-python/pyasn1-modules[${PYTHON_USEDEP}] dev-python/pyasn1[${PYTHON_USEDEP}] @@ -116,11 +118,11 @@ RDEPEND=" dev-python/pymacaroons[${PYTHON_USEDEP}] dev-python/pyopenssl[${PYTHON_USEDEP}] dev-python/pyyaml[${PYTHON_USEDEP}] - dev-python/service_identity[${PYTHON_USEDEP}] + dev-python/service-identity[${PYTHON_USEDEP}] dev-python/signedjson[${PYTHON_USEDEP}] dev-python/sortedcontainers[${PYTHON_USEDEP}] dev-python/treq[${PYTHON_USEDEP}] - dev-python/twisted[${PYTHON_USEDEP}] + <dev-python/twisted-23.8.1[${PYTHON_USEDEP}] dev-python/typing-extensions[${PYTHON_USEDEP}] dev-python/unpaddedbase64[${PYTHON_USEDEP}] postgres? ( dev-python/psycopg:2[${PYTHON_USEDEP}] ) @@ -129,9 +131,11 @@ RDEPEND=" BDEPEND=" dev-python/setuptools-rust[${PYTHON_USEDEP}] test? ( + dev-python/hiredis[${PYTHON_USEDEP}] dev-python/idna[${PYTHON_USEDEP}] dev-python/parameterized[${PYTHON_USEDEP}] dev-python/pyicu[${PYTHON_USEDEP}] + dev-python/txredisapi[${PYTHON_USEDEP}] postgres? ( dev-db/postgresql[server] ) ) " diff --git a/net-im/synapse/synapse-1.83.0.ebuild b/net-im/synapse/synapse-1.97.0.ebuild index 3114073be20f..189c007c75ba 100644 --- a/net-im/synapse/synapse-1.83.0.ebuild +++ b/net-im/synapse/synapse-1.97.0.ebuild @@ -3,65 +3,67 @@ EAPI=8 -PYTHON_COMPAT=( python3_{10..11} ) +DISTUTILS_EXT=1 DISTUTILS_USE_PEP517=poetry +PYTHON_COMPAT=( python3_{10..12} ) CRATES=" - aho-corasick-0.7.19 - anyhow-1.0.71 - arc-swap-1.5.1 - autocfg-1.1.0 - bitflags-1.3.2 - blake2-0.10.6 - block-buffer-0.10.3 - cfg-if-1.0.0 - crypto-common-0.1.6 - digest-0.10.5 - generic-array-0.14.6 - hex-0.4.3 - indoc-1.0.7 - itoa-1.0.4 - lazy_static-1.4.0 - libc-0.2.135 - lock_api-0.4.9 - log-0.4.17 - memchr-2.5.0 - memoffset-0.6.5 - once_cell-1.15.0 - parking_lot-0.12.1 - parking_lot_core-0.9.3 - proc-macro2-1.0.52 - pyo3-0.17.3 - pyo3-build-config-0.17.3 - pyo3-ffi-0.17.3 - pyo3-log-0.8.1 - pyo3-macros-0.17.3 - pyo3-macros-backend-0.17.3 - pythonize-0.17.0 - quote-1.0.26 - redox_syscall-0.2.16 - regex-1.7.3 - regex-syntax-0.6.29 - ryu-1.0.11 - scopeguard-1.1.0 - serde-1.0.160 - serde_derive-1.0.160 - serde_json-1.0.96 - smallvec-1.10.0 - subtle-2.4.1 - syn-1.0.104 - syn-2.0.10 - target-lexicon-0.12.4 - typenum-1.15.0 - unicode-ident-1.0.5 - unindent-0.1.10 - version_check-0.9.4 - windows-sys-0.36.1 - windows_aarch64_msvc-0.36.1 - windows_i686_gnu-0.36.1 - windows_i686_msvc-0.36.1 - windows_x86_64_gnu-0.36.1 - windows_x86_64_msvc-0.36.1 + aho-corasick@1.0.2 + anyhow@1.0.75 + arc-swap@1.5.1 + autocfg@1.1.0 + bitflags@1.3.2 + blake2@0.10.6 + block-buffer@0.10.3 + cfg-if@1.0.0 + crypto-common@0.1.6 + digest@0.10.5 + generic-array@0.14.6 + hex@0.4.3 + indoc@1.0.7 + itoa@1.0.4 + lazy_static@1.4.0 + libc@0.2.135 + lock_api@0.4.9 + log@0.4.20 + memchr@2.6.3 + memoffset@0.9.0 + once_cell@1.15.0 + parking_lot@0.12.1 + parking_lot_core@0.9.3 + proc-macro2@1.0.64 + pyo3-build-config@0.19.2 + pyo3-ffi@0.19.2 + pyo3-log@0.8.4 + pyo3-macros-backend@0.19.2 + pyo3-macros@0.19.2 + pyo3@0.19.2 + pythonize@0.19.0 + quote@1.0.29 + redox_syscall@0.2.16 + regex-automata@0.3.9 + regex-syntax@0.7.5 + regex@1.9.6 + ryu@1.0.11 + scopeguard@1.1.0 + serde@1.0.192 + serde_derive@1.0.192 + serde_json@1.0.108 + smallvec@1.10.0 + subtle@2.4.1 + syn@1.0.104 + syn@2.0.28 + target-lexicon@0.12.4 + typenum@1.15.0 + unicode-ident@1.0.5 + unindent@0.1.10 + version_check@0.9.4 + windows-sys@0.36.1 + windows_aarch64_msvc@0.36.1 + windows_i686_gnu@0.36.1 + windows_i686_msvc@0.36.1 + windows_x86_64_gnu@0.36.1 + windows_x86_64_msvc@0.36.1 " inherit cargo distutils-r1 multiprocessing optfeature systemd @@ -74,7 +76,7 @@ HOMEPAGE=" SRC_URI=" https://github.com/matrix-org/${PN}/archive/v${PV}.tar.gz -> ${P}.gh.tar.gz - $(cargo_crate_uris) + ${CARGO_CRATE_URIS} " LICENSE="Apache-2.0" @@ -83,7 +85,7 @@ LICENSE+=" Apache-2.0 Apache-2.0-with-LLVM-exceptions BSD MIT Unicode-DFS-2016 " SLOT="0" -KEYWORDS="~amd64 ~ppc64" +KEYWORDS="~amd64 ~arm64 ~ppc64" IUSE="postgres systemd test" RESTRICT="!test? ( test )" @@ -91,6 +93,7 @@ DEPEND=" acct-user/synapse acct-group/synapse " +# >twisted-23.8 breaks tests, see https://github.com/matrix-org/synapse/pull/16528 RDEPEND=" ${DEPEND} dev-python/attrs[${PYTHON_USEDEP}] @@ -107,7 +110,7 @@ RDEPEND=" dev-python/netaddr[${PYTHON_USEDEP}] dev-python/packaging[${PYTHON_USEDEP}] dev-python/phonenumbers[${PYTHON_USEDEP}] - dev-python/pillow[${PYTHON_USEDEP},webp] + >=dev-python/pillow-10.0.1[${PYTHON_USEDEP},webp] dev-python/prometheus-client[${PYTHON_USEDEP}] dev-python/pyasn1-modules[${PYTHON_USEDEP}] dev-python/pyasn1[${PYTHON_USEDEP}] @@ -115,11 +118,11 @@ RDEPEND=" dev-python/pymacaroons[${PYTHON_USEDEP}] dev-python/pyopenssl[${PYTHON_USEDEP}] dev-python/pyyaml[${PYTHON_USEDEP}] - dev-python/service_identity[${PYTHON_USEDEP}] + dev-python/service-identity[${PYTHON_USEDEP}] dev-python/signedjson[${PYTHON_USEDEP}] dev-python/sortedcontainers[${PYTHON_USEDEP}] dev-python/treq[${PYTHON_USEDEP}] - dev-python/twisted[${PYTHON_USEDEP}] + <dev-python/twisted-23.8.1[${PYTHON_USEDEP}] dev-python/typing-extensions[${PYTHON_USEDEP}] dev-python/unpaddedbase64[${PYTHON_USEDEP}] postgres? ( dev-python/psycopg:2[${PYTHON_USEDEP}] ) @@ -128,9 +131,11 @@ RDEPEND=" BDEPEND=" dev-python/setuptools-rust[${PYTHON_USEDEP}] test? ( + dev-python/hiredis[${PYTHON_USEDEP}] dev-python/idna[${PYTHON_USEDEP}] dev-python/parameterized[${PYTHON_USEDEP}] dev-python/pyicu[${PYTHON_USEDEP}] + dev-python/txredisapi[${PYTHON_USEDEP}] postgres? ( dev-db/postgresql[server] ) ) " @@ -181,6 +186,7 @@ src_install() { pkg_postinst() { optfeature "Improve user search for international display names" dev-python/pyicu + optfeature "Redis support" dev-python/txredisapi optfeature "VoIP relaying on your homeserver with turn" net-im/coturn if [[ -z "${REPLACING_VERSIONS}" ]]; then diff --git a/net-im/telegram-desktop-bin/Manifest b/net-im/telegram-desktop-bin/Manifest index 1a544048d9c2..2adf38e5223c 100644 --- a/net-im/telegram-desktop-bin/Manifest +++ b/net-im/telegram-desktop-bin/Manifest @@ -1,6 +1,2 @@ -DIST tdesktop-4.7.1.tar.gz 17579419 BLAKE2B b1db92e645d605a8aa73bb479044bff1481e7e0dd9b957f5c7cbf3ea1b26a32128024149e337f6219cdf75b1eb52fdbbebfc25f1665cdc61b656cabbdc7a6a66 SHA512 62e9a8731928e03f5d7151f6c49baa2f8afef3f2678a33ef67dafac9e2950a1f5b94e9bc34ce6cb40775774301a41315357a61ef83a8a04644226d66be62dba9 -DIST tdesktop-4.8.1.tar.gz 17647125 BLAKE2B 154bce8111532f583cb27eb92d59a8218840fb65a2be479ece9f79824ed9ec364a76d97989513d9850a61c1a763b90c55cefbe9216a690a7bbffd8f85cca2bd9 SHA512 5a84eb49408e6e345cde330f4d969f1d22bc3849812b88a2199f1ac551198f58d21395150d64f86460d3e79682cbe41978495948caea66801e895c2b80257ff0 -DIST tdesktop-4.8.3.tar.gz 17647574 BLAKE2B e3884fc4c3f73200b34aafae2fca84abeb1d36afe19f73e924d6dd4c91754d411ae3e8cbcff8e2b8423333c3b7a808a77bff9c2e0ea08923c382e90ba88b36aa SHA512 4e42e30d69c02af35481cd1c9431bad159b47d56acdb25a7b20ad36cc7d4cad9fef3214dc2a512002fed8cf20f1c462f9e553fb3177bc324defb4da5a1d2af69 -DIST tsetup.4.7.1.tar.xz 51176468 BLAKE2B 73fefb01036ae16ab6bc203acea777bd8e173ae07bdcc773c81803081e9307274b9040f0e37d5054374b3a5f489b2e91848918c2d4edc83f85d59d81314ca8f6 SHA512 601f7ffc4aa1f779acec807ec40f9cb6b714dc25b4e9003e628dba94b242fc6351cad6d0b139a8688b7887a8eb18e386b400e769b402dce5bf23b608fa0205eb -DIST tsetup.4.8.1.tar.xz 51573568 BLAKE2B 257c8547954ab1d4b6aa22f935ba6af2af80094f78055eeb51a1363ddf8a8fea77edcb70ace240061e6681f2035fd8464750827c0c5a8306e6dad0fd2bd0ba50 SHA512 f3a66076dc285eb95c74eebef0fe5ab79dfeb21ebda8031623e5168c9ab9528f1cc09267a203bf41cd23aecf3683a0f007e413da318d24bc065b522eb7fcc244 -DIST tsetup.4.8.3.tar.xz 51381144 BLAKE2B a1e6754873ce89f878522625f86fac846eb118d3e2574a4239c7d46d016a646c0f47c21a891c06b42d8fd3de4fe0dd23fcfdd5d031b16f7fb236c49abecfbb17 SHA512 8d690d8bd05b04ee2fc1261494f164671a884c5edab93c68ed1bdfbb30fa41679942c72005c7df57d8c669df37ad001b1866dc00f0d8fb672e2e6ffb61414b56 +DIST tdesktop-4.11.7.tar.gz 18321400 BLAKE2B 5e7a22f7b20e9a14f15cc9d0e054bb303eca96777c47c0a4d9aaa4de3840049f0b2901d16b7f794d523db452eef2846454523424adcb7c7f02949ed33777c241 SHA512 a3f689181e54eea3278ec9b84861e416b51702464f9cb848a12365ad610dc5cc5846be9494aa0dfe7c626dbacc1b9e1271ba23bcd8fa97ae26884b0f0506e882 +DIST tsetup.4.11.7.tar.xz 53219368 BLAKE2B 704c12bced7c7d229f00828488c3a5426a85c9cf49a9883a46f642ebe4f280d78e143443495d98a12e68c6d1e9c4dcde67c7e53c08dbc03616352d0f7de88046 SHA512 adf023e3b4fbff87156fc1e15748ffc29b2d7007d04aecd64b60f66c05db4b325cd0f53cd1256ee7bd002906946bef0e702024a8113a143c591cc81933d93d9e diff --git a/net-im/telegram-desktop-bin/telegram-desktop-bin-4.7.1.ebuild b/net-im/telegram-desktop-bin/telegram-desktop-bin-4.11.7.ebuild index 0fe79450766d..d81c56fd7260 100644 --- a/net-im/telegram-desktop-bin/telegram-desktop-bin-4.7.1.ebuild +++ b/net-im/telegram-desktop-bin/telegram-desktop-bin-4.11.7.ebuild @@ -25,6 +25,7 @@ RDEPEND=" >=media-libs/fontconfig-2.13 media-libs/freetype:2 virtual/opengl + x11-libs/gtk+:3[X,wayland] x11-libs/libX11 >=x11-libs/libxcb-1.10 " @@ -33,13 +34,14 @@ S="${WORKDIR}/Telegram" src_prepare() { default - sed -i -e 's/@CMAKE_INSTALL_FULL_BINDIR@\///g' "${WORKDIR}/tdesktop-${PV}"/lib/xdg/org.telegram.desktop.desktop || die + + sed -i -e 's/^Exec=@CMAKE_INSTALL_FULL_BINDIR@\/telegram-desktop/Exec=\/usr\/bin\/telegram-desktop/' "${WORKDIR}/tdesktop-${PV}"/lib/xdg/org.telegram.desktop.service || die } src_install() { newbin Telegram telegram-desktop - insinto /etc/tdesktop + insinto /usr/share/TelegramDesktop/externalupdater.d/ newins - externalupdater <<<"${EPREFIX}/usr/bin/telegram-desktop" local icon_size @@ -50,6 +52,8 @@ src_install() { done domenu "${WORKDIR}/tdesktop-${PV}"/lib/xdg/org.telegram.desktop.desktop + insinto /usr/share/dbus-1/services + doins "${WORKDIR}/tdesktop-${PV}"/lib/xdg/org.telegram.desktop.service } pkg_postinst() { diff --git a/net-im/telegram-desktop-bin/telegram-desktop-bin-4.8.1.ebuild b/net-im/telegram-desktop-bin/telegram-desktop-bin-4.8.1.ebuild deleted file mode 100644 index 9b65f32181e0..000000000000 --- a/net-im/telegram-desktop-bin/telegram-desktop-bin-4.8.1.ebuild +++ /dev/null @@ -1,53 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit desktop optfeature xdg - -DESCRIPTION="Official desktop client for Telegram (binary package)" -HOMEPAGE="https://desktop.telegram.org" -SRC_URI=" - https://github.com/telegramdesktop/tdesktop/archive/v${PV}.tar.gz -> tdesktop-${PV}.tar.gz - amd64? ( https://updates.tdesktop.com/tlinux/tsetup.${PV}.tar.xz ) -" - -LICENSE="GPL-3-with-openssl-exception" -SLOT="0" -KEYWORDS="-* ~amd64" - -QA_PREBUILT="usr/bin/telegram-desktop" - -RDEPEND=" - !net-im/telegram-desktop - sys-libs/glibc - dev-libs/glib:2 - >=media-libs/fontconfig-2.13 - media-libs/freetype:2 - virtual/opengl - x11-libs/libX11 - >=x11-libs/libxcb-1.10 -" - -S="${WORKDIR}/Telegram" - -src_install() { - newbin Telegram telegram-desktop - - insinto /etc/tdesktop - newins - externalupdater <<<"${EPREFIX}/usr/bin/telegram-desktop" - - local icon_size - for icon_size in 16 32 48 64 128 256 512; do - newicon -s "${icon_size}" \ - "${WORKDIR}/tdesktop-${PV}/Telegram/Resources/art/icon${icon_size}.png" \ - telegram.png - done - - domenu "${WORKDIR}/tdesktop-${PV}"/lib/xdg/org.telegram.desktop.desktop -} - -pkg_postinst() { - xdg_pkg_postinst - optfeature "spell checker support" app-text/enchant -} diff --git a/net-im/telegram-desktop-bin/telegram-desktop-bin-4.8.3.ebuild b/net-im/telegram-desktop-bin/telegram-desktop-bin-4.8.3.ebuild deleted file mode 100644 index 9b65f32181e0..000000000000 --- a/net-im/telegram-desktop-bin/telegram-desktop-bin-4.8.3.ebuild +++ /dev/null @@ -1,53 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit desktop optfeature xdg - -DESCRIPTION="Official desktop client for Telegram (binary package)" -HOMEPAGE="https://desktop.telegram.org" -SRC_URI=" - https://github.com/telegramdesktop/tdesktop/archive/v${PV}.tar.gz -> tdesktop-${PV}.tar.gz - amd64? ( https://updates.tdesktop.com/tlinux/tsetup.${PV}.tar.xz ) -" - -LICENSE="GPL-3-with-openssl-exception" -SLOT="0" -KEYWORDS="-* ~amd64" - -QA_PREBUILT="usr/bin/telegram-desktop" - -RDEPEND=" - !net-im/telegram-desktop - sys-libs/glibc - dev-libs/glib:2 - >=media-libs/fontconfig-2.13 - media-libs/freetype:2 - virtual/opengl - x11-libs/libX11 - >=x11-libs/libxcb-1.10 -" - -S="${WORKDIR}/Telegram" - -src_install() { - newbin Telegram telegram-desktop - - insinto /etc/tdesktop - newins - externalupdater <<<"${EPREFIX}/usr/bin/telegram-desktop" - - local icon_size - for icon_size in 16 32 48 64 128 256 512; do - newicon -s "${icon_size}" \ - "${WORKDIR}/tdesktop-${PV}/Telegram/Resources/art/icon${icon_size}.png" \ - telegram.png - done - - domenu "${WORKDIR}/tdesktop-${PV}"/lib/xdg/org.telegram.desktop.desktop -} - -pkg_postinst() { - xdg_pkg_postinst - optfeature "spell checker support" app-text/enchant -} diff --git a/net-im/telegram-desktop/Manifest b/net-im/telegram-desktop/Manifest index f9b37088f842..3f39a2caadfb 100644 --- a/net-im/telegram-desktop/Manifest +++ b/net-im/telegram-desktop/Manifest @@ -1,2 +1,3 @@ -DIST tdesktop-4.6.5-full.tar.gz 63793549 BLAKE2B a425aaf8d1f1c633b3b8ddacff5bb7cc26e6063d4238413fea76db6a4608497d229061a614c79464373e7f1aa3bb854d9718083638e119538e989a202741b3d6 SHA512 4a337e375d7746cb1fa652f5851f8be5718b7b9d9676bba8ab040489b8492b2a665a51848adba28117a910789aa942c386318a01f6c99b4caa12a1eac682c780 +DIST tdesktop-4.10.3-full.tar.gz 67750018 BLAKE2B 395484594dc201019b5cdf3fdaabe1155dca99504b74e65951b6264b61ed0403bb1e016542c6c59370b3ee39d1449ea223409fc64fd6bff723c1be43b615570a SHA512 1e7c0f32b4e17c1f1c39aa9a4f35ce2867324c4410a30fde2c2d6ca5d5fe59a84f58f93cb6b4f8c7ad04fa0adcaf5a276dd2aa7dee0ef34446e6bb95fafa49d6 +DIST tdesktop-4.11.7-full.tar.gz 68388327 BLAKE2B 3be938534ff599e44b4ded384c47914a0e7992f5a3a6901e04c60e53386cf1994f19f6dec6195bf44bfbc93f965f16b05644a7ef786deacdc10c021a9ada882d SHA512 d8557a8e11a3b2f34fb65c5a3fafaebc31d93b5855f947b1049e5e7c7e5a5e161df708ba1882cc096f9a789fac56d3bbcbe640d2a026cb8355e946b735995501 DIST tdesktop-4.8.1-full.tar.gz 63997319 BLAKE2B daac461f0b3205bf647027329660b43f4646db987e27bfe2a2848bfbfb3309c503132d1533f26e95512520417d30f5063b1c395b174787aa7533727549ee77e5 SHA512 4dc495e4502bdba634c4468af4f1321aef1152d619c811f004489f8616504a465069508239eae41a08a83e190a61d26881733ebc38dd88160f81dce070bb0567 diff --git a/net-im/telegram-desktop/files/tdesktop-4.10.0-system-cppgir.patch b/net-im/telegram-desktop/files/tdesktop-4.10.0-system-cppgir.patch new file mode 100644 index 000000000000..39f30ff0d2d2 --- /dev/null +++ b/net-im/telegram-desktop/files/tdesktop-4.10.0-system-cppgir.patch @@ -0,0 +1,32 @@ +Use system cppgir + +https://github.com/desktop-app/cmake_helpers/issues/282 +https://github.com/desktop-app/cmake_helpers/pull/305 +--- tdesktop-4.10.0-full.orig/cmake/external/glib/CMakeLists.txt ++++ tdesktop-4.10.0-full/cmake/external/glib/CMakeLists.txt +@@ -7,14 +7,6 @@ + add_library(external_glib INTERFACE IMPORTED GLOBAL) + add_library(desktop-app::external_glib ALIAS external_glib) + +-function(add_cppgir) # isolate scope +- set(BUILD_TESTING OFF) +- set(BUILD_DOC OFF) +- set(BUILD_EXAMPLES OFF) +- add_subdirectory(cppgir EXCLUDE_FROM_ALL) +-endfunction() +-add_cppgir() +- + include(generate_cppgir.cmake) + generate_cppgir(external_glib Gio-2.0) + +--- tdesktop-4.10.0-full.orig/cmake/external/glib/generate_cppgir.cmake ++++ tdesktop-4.10.0-full/cmake/external/glib/generate_cppgir.cmake +@@ -4,6 +4,8 @@ + # For license and copyright information please follow this link: + # https://github.com/desktop-app/legal/blob/master/LEGAL + ++find_package(CppGir REQUIRED) ++ + function(generate_cppgir target_name gir) + # cppgir generates all the dependent headers everytime, better to have a global folder + set(gen_dst ${CMAKE_BINARY_DIR}/gen) diff --git a/net-im/telegram-desktop/files/tdesktop-4.10.3-fix-clang-libstdcxx.patch b/net-im/telegram-desktop/files/tdesktop-4.10.3-fix-clang-libstdcxx.patch new file mode 100644 index 000000000000..290eb2a6b2d9 --- /dev/null +++ b/net-im/telegram-desktop/files/tdesktop-4.10.3-fix-clang-libstdcxx.patch @@ -0,0 +1,13 @@ +Fix compilation with Clang + libstdc++ + +--- tdesktop-4.10.3-full.orig/Telegram/SourceFiles/platform/linux/notifications_manager_linux.cpp ++++ tdesktop-4.10.3-full/Telegram/SourceFiles/platform/linux/notifications_manager_linux.cpp +@@ -814,7 +814,7 @@ + + // A list of capabilities that offer feature parity + // with custom notifications +- return ranges::all_of(std::initializer_list{ ++ return ranges::all_of(std::array{ + // To show message content + "body", + // To have buttons on notifications diff --git a/net-im/telegram-desktop/files/tdesktop-4.10.5-qt_compare.patch b/net-im/telegram-desktop/files/tdesktop-4.10.5-qt_compare.patch new file mode 100644 index 000000000000..f481ddd74d7c --- /dev/null +++ b/net-im/telegram-desktop/files/tdesktop-4.10.5-qt_compare.patch @@ -0,0 +1,12 @@ +diff --git a/Telegram/lib_base/base/qt/qt_compare.h b/Telegram/lib_base/base/qt/qt_compare.h +index ca03fa2..d1eb6ab 100644 +--- a/Telegram/lib_base/base/qt/qt_compare.h ++++ b/Telegram/lib_base/base/qt/qt_compare.h +@@ -10,6 +10,7 @@ + #include <gsl/pointers> + + #include <QString> ++#include <variant> + + #if !defined(__apple_build_version__) || (__apple_build_version__ > 12000032) + diff --git a/net-im/telegram-desktop/files/tdesktop-4.2.4-jemalloc-only-telegram.patch b/net-im/telegram-desktop/files/tdesktop-4.2.4-jemalloc-only-telegram.patch deleted file mode 100644 index a7710e145443..000000000000 --- a/net-im/telegram-desktop/files/tdesktop-4.2.4-jemalloc-only-telegram.patch +++ /dev/null @@ -1,43 +0,0 @@ -Only link jemalloc for the Telegram binary - -Some combination of factors is making the different codegen tools hang when -jemalloc is linked for those, and they're ran under portage's sandbox. Since -this is only used during build-time, and jemalloc is merely necessary to -improve runtime memory use, it's unnecessary to use it for anything else. - -https://bugs.gentoo.org/802624 - ---- tdesktop-4.2.4-full.orig/Telegram/CMakeLists.txt -+++ tdesktop-4.2.4-full/Telegram/CMakeLists.txt -@@ -1478,6 +1478,14 @@ - desktop-app::external_wayland_client - ) - endif() -+ -+ if (NOT DESKTOP_APP_DISABLE_JEMALLOC) -+ target_link_libraries(Telegram -+ INTERFACE -+ $<TARGET_OBJECTS:desktop-app::linux_jemalloc_helper> -+ $<LINK_ONLY:desktop-app::external_jemalloc> -+ ) -+ endif() - endif() - - if (build_macstore) ---- tdesktop-4.2.4-full.orig/cmake/options_linux.cmake -+++ tdesktop-4.2.4-full/cmake/options_linux.cmake -@@ -78,14 +78,6 @@ - ) - endif() - --if (NOT DESKTOP_APP_DISABLE_JEMALLOC) -- target_link_libraries(common_options -- INTERFACE -- $<TARGET_OBJECTS:desktop-app::linux_jemalloc_helper> -- $<LINK_ONLY:desktop-app::external_jemalloc> -- ) --endif() -- - if (DESKTOP_APP_USE_ALLOCATION_TRACER) - target_link_options(common_options - INTERFACE diff --git a/net-im/telegram-desktop/metadata.xml b/net-im/telegram-desktop/metadata.xml index 733e70400bca..5f7d688bbb21 100644 --- a/net-im/telegram-desktop/metadata.xml +++ b/net-im/telegram-desktop/metadata.xml @@ -5,6 +5,10 @@ <email>esteve.varela@gmail.com</email> <name>Esteve Varela Colominas</name> </maintainer> + <maintainer type="person" proxied="proxy"> + <email>dlan@gentoo.org</email> + <name>Yixun Lan</name> + </maintainer> <maintainer type="project" proxied="proxy"> <email>proxy-maint@gentoo.org</email> <name>Proxy Maintainers</name> diff --git a/net-im/telegram-desktop/telegram-desktop-4.6.5-r2.ebuild b/net-im/telegram-desktop/telegram-desktop-4.10.3-r1.ebuild index a0dc810ebc7f..f2e0f095d515 100644 --- a/net-im/telegram-desktop/telegram-desktop-4.6.5-r2.ebuild +++ b/net-im/telegram-desktop/telegram-desktop-4.10.3-r1.ebuild @@ -3,7 +3,7 @@ EAPI=8 -PYTHON_COMPAT=( python3_{9..11} ) +PYTHON_COMPAT=( python3_{10..12} ) inherit xdg cmake python-any-r1 optfeature flag-o-matic @@ -16,8 +16,8 @@ S="${WORKDIR}/${MY_P}" LICENSE="BSD GPL-3-with-openssl-exception LGPL-2+" SLOT="0" -KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv" -IUSE="+dbus enchant +fonts +jemalloc screencast qt6 qt6-imageformats wayland +X" +KEYWORDS="~amd64 ~arm64 ~riscv" +IUSE="dbus enchant +fonts +jemalloc screencast qt6 qt6-imageformats wayland webkit +X" REQUIRED_USE=" qt6-imageformats? ( qt6 ) " @@ -27,70 +27,82 @@ KIMAGEFORMATS_RDEPEND=" media-libs/libheif:= media-libs/libjxl " -RDEPEND=" +CDEPEND=" !net-im/telegram-desktop-bin app-arch/lz4:= dev-cpp/abseil-cpp:= + >=dev-cpp/glibmm-2.77:2.68 dev-libs/glib:2 dev-libs/libdispatch - dev-libs/libsigc++:2 dev-libs/openssl:= + dev-libs/protobuf dev-libs/xxhash - media-libs/fontconfig:= media-libs/libjpeg-turbo:= ~media-libs/libtgvoip-2.4.4_p20221208 media-libs/openal - media-libs/opus:= + media-libs/opus media-libs/rnnoise - ~media-libs/tg_owt-0_pre20230428:=[screencast=,X=] + ~media-libs/tg_owt-0_pre20230921:=[screencast=,X=] media-video/ffmpeg:=[opus,vpx] sys-libs/zlib:=[minizip] virtual/opengl - dbus? ( dev-cpp/glibmm:2.68 ) !enchant? ( >=app-text/hunspell-1.7:= ) enchant? ( app-text/enchant:= ) jemalloc? ( dev-libs/jemalloc:=[-lazy-lock] ) !qt6? ( - >=dev-qt/qtcore-5.15:5 - >=dev-qt/qtgui-5.15:5[dbus?,jpeg,png,wayland?,X?] + >=dev-qt/qtcore-5.15:5= + >=dev-qt/qtgui-5.15:5=[dbus?,jpeg,png,wayland?,X?] >=dev-qt/qtimageformats-5.15:5 >=dev-qt/qtnetwork-5.15:5[ssl] >=dev-qt/qtsvg-5.15:5 >=dev-qt/qtwidgets-5.15:5[png,X?] - kde-frameworks/kcoreaddons:= + kde-frameworks/kcoreaddons:5 + webkit? ( + >=dev-qt/qtdeclarative-5.15:5 + >=dev-qt/qtwayland-5.15:5 + ) ) qt6? ( - dev-qt/qt5compat:6 - dev-qt/qtbase:6[dbus?,gui,network,opengl,widgets,X?] - dev-qt/qtimageformats:6 - dev-qt/qtsvg:6 - wayland? ( dev-qt/qtwayland:6 ) - qt6-imageformats? ( ${KIMAGEFORMATS_RDEPEND} ) + >=dev-qt/qtbase-6.5:6=[dbus?,gui,network,opengl,wayland?,widgets,X?] + >=dev-qt/qtimageformats-6.5:6 + >=dev-qt/qtsvg-6.5:6 + webkit? ( + >=dev-qt/qtdeclarative-6.5:6 + >=dev-qt/qtwayland-6.5:6[compositor] + ) + qt6-imageformats? ( + >=dev-qt/qtimageformats-6.5:6= + ${KIMAGEFORMATS_RDEPEND} + ) ) X? ( x11-libs/libxcb:= x11-libs/xcb-util-keysyms ) " -DEPEND="${RDEPEND} - dev-cpp/range-v3 +RDEPEND="${CDEPEND} + webkit? ( net-libs/webkit-gtk:4 ) +" +DEPEND="${CDEPEND} + >=dev-cpp/cppgir-0_p20230926 >=dev-cpp/ms-gsl-4 + dev-cpp/range-v3 " BDEPEND=" ${PYTHON_DEPS} + >=dev-cpp/cppgir-0_p20230926 >=dev-util/cmake-3.16 + dev-util/gdbus-codegen virtual/pkgconfig " # dev-libs/jemalloc:=[-lazy-lock] -> https://bugs.gentoo.org/803233 PATCHES=( "${FILESDIR}/tdesktop-4.2.4-jemalloc-only-telegram-r1.patch" - "${FILESDIR}/tdesktop-4.4.1-fix-dupe-main-decl.patch" + "${FILESDIR}/tdesktop-4.10.0-system-cppgir.patch" + "${FILESDIR}/tdesktop-4.10.3-fix-clang-libstdcxx.patch" ) -# Current desktop-file-utils-0.26 does not understand Version=1.5 -QA_DESKTOP_FILE="usr/share/applications/${PN}.desktop" - pkg_pretend() { if has ccache ${FEATURES}; then ewarn "ccache does not work with ${PN} out of the box" @@ -106,7 +118,7 @@ src_prepare() { if use qt6-imageformats; then sed -e 's/DESKTOP_APP_USE_PACKAGED_LAZY/TRUE/' -i \ cmake/external/kimageformats/CMakeLists.txt || die - printf "%s\n" \ + printf '%s\n' \ 'Q_IMPORT_PLUGIN(QAVIFPlugin)' \ 'Q_IMPORT_PLUGIN(HEIFPlugin)' \ 'Q_IMPORT_PLUGIN(QJpegXLPlugin)' \ @@ -116,6 +128,23 @@ src_prepare() { # kde-frameworks/kcoreaddons is bundled when using qt6, see: # cmake/external/kcoreaddons/CMakeLists.txt + # Happily fail if libraries aren't found... + find -type f \( -name 'CMakeLists.txt' -o -name '*.cmake' \) \ + \! -path './cmake/external/expected/CMakeLists.txt' \ + \! -path './cmake/external/qt/package.cmake' \ + \! -path './Telegram/lib_webview/CMakeLists.txt' \ + -print0 | xargs -0 sed -i \ + -e '/pkg_check_modules(/s/[^ ]*)/REQUIRED &/' \ + -e '/find_package(/s/)/ REQUIRED)/' || die + # Make sure to check the excluded files for new + # CMAKE_DISABLE_FIND_PACKAGE entries. + + # Control QtDBus dependency from here, to avoid messing with QtGui. + if ! use dbus; then + sed -e '/find_package(Qt[^ ]* OPTIONAL_COMPONENTS/s/DBus *//' \ + -i cmake/external/qt/package.cmake || die + fi + cmake_src_prepare } @@ -125,16 +154,26 @@ src_configure() { # See https://bugs.gentoo.org/866055 append-cppflags '-DNDEBUG' + local qt=$(usex qt6 6 5) local mycmakeargs=( - -DCMAKE_DISABLE_FIND_PACKAGE_tl-expected=ON # header only lib, some git version. prevents warnings. - -DQT_VERSION_MAJOR=$(usex qt6 6 5) + -DQT_VERSION_MAJOR=${qt} + + # Control automagic dependencies on certain packages + ## Header-only lib, some git version. + -DCMAKE_DISABLE_FIND_PACKAGE_tl-expected=ON + -DCMAKE_DISABLE_FIND_PACKAGE_Qt${qt}Quick=$(usex !webkit) + -DCMAKE_DISABLE_FIND_PACKAGE_Qt${qt}QuickWidgets=$(usex !webkit) + -DCMAKE_DISABLE_FIND_PACKAGE_Qt${qt}WaylandClient=$(usex !wayland) + ## Only used in Telegram/lib_webview/CMakeLists.txt + -DCMAKE_DISABLE_FIND_PACKAGE_Qt${qt}WaylandCompositor=$(usex !webkit) - -DDESKTOP_APP_DISABLE_DBUS_INTEGRATION=$(usex !dbus) -DDESKTOP_APP_DISABLE_X11_INTEGRATION=$(usex !X) -DDESKTOP_APP_DISABLE_WAYLAND_INTEGRATION=$(usex !wayland) -DDESKTOP_APP_DISABLE_JEMALLOC=$(usex !jemalloc) - -DDESKTOP_APP_USE_ENCHANT=$(usex enchant) # enables enchant and disables hunspell - -DDESKTOP_APP_USE_PACKAGED_FONTS=$(usex !fonts) # use system fonts instead of bundled ones + ## Enables enchant and disables hunspell + -DDESKTOP_APP_USE_ENCHANT=$(usex enchant) + ## Use system fonts instead of bundled ones + -DDESKTOP_APP_USE_PACKAGED_FONTS=$(usex !fonts) ) if [[ -n ${MY_TDESKTOP_API_ID} && -n ${MY_TDESKTOP_API_HASH} ]]; then @@ -169,11 +208,6 @@ pkg_postinst() { ewarn "both the 'X' and 'screencast' USE flags are disabled, screen sharing won't work!" ewarn fi - if has_version '<dev-qt/qtcore-5.15.2-r10'; then - ewarn "Versions of dev-qt/qtcore lower than 5.15.2-r10 might cause telegram" - ewarn "to crash when pasting big images from the clipboard." - ewarn - fi if ! use jemalloc && use elibc_glibc; then # https://github.com/telegramdesktop/tdesktop/issues/16084 # https://github.com/desktop-app/cmake_helpers/pull/91#issuecomment-881788003 @@ -181,12 +215,6 @@ pkg_postinst() { ewarn "Do NOT report issues about RAM usage without enabling this flag first." ewarn fi - if use qt6; then - ewarn "Qt6 support in gentoo is experimental." - ewarn "Please report any issues you may find, but don't expect" - ewarn "everything to work correctly as of yet." - ewarn - fi if use wayland && ! use qt6; then ewarn "Wayland-specific integrations have been deprecated with Qt5." ewarn "The app will continue to function under wayland, but some" @@ -199,7 +227,6 @@ pkg_postinst() { elog fi optfeature_header - optfeature "shop payment support (requires USE=dbus enabled)" net-libs/webkit-gtk:4 if ! use qt6; then optfeature "AVIF, HEIF and JpegXL image support" kde-frameworks/kimageformats[avif,heif,jpegxl] fi diff --git a/net-im/telegram-desktop/telegram-desktop-4.6.5.ebuild b/net-im/telegram-desktop/telegram-desktop-4.11.7.ebuild index c0b3b25958a1..158efde95a9c 100644 --- a/net-im/telegram-desktop/telegram-desktop-4.6.5.ebuild +++ b/net-im/telegram-desktop/telegram-desktop-4.11.7.ebuild @@ -3,7 +3,7 @@ EAPI=8 -PYTHON_COMPAT=( python3_{9..11} ) +PYTHON_COMPAT=( python3_{10..12} ) inherit xdg cmake python-any-r1 optfeature flag-o-matic @@ -16,8 +16,8 @@ S="${WORKDIR}/${MY_P}" LICENSE="BSD GPL-3-with-openssl-exception LGPL-2+" SLOT="0" -KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv" -IUSE="+dbus enchant +fonts +jemalloc screencast qt6 qt6-imageformats wayland +X" +KEYWORDS="~amd64 ~arm64 ~riscv" +IUSE="dbus enchant +fonts +jemalloc screencast qt6 qt6-imageformats wayland webkit +X" REQUIRED_USE=" qt6-imageformats? ( qt6 ) " @@ -25,72 +25,85 @@ REQUIRED_USE=" KIMAGEFORMATS_RDEPEND=" media-libs/libavif:= media-libs/libheif:= - media-libs/libjxl + >=media-libs/libjxl-0.8.0 " -RDEPEND=" +CDEPEND=" !net-im/telegram-desktop-bin app-arch/lz4:= dev-cpp/abseil-cpp:= + >=dev-cpp/glibmm-2.77:2.68 dev-libs/glib:2 dev-libs/libdispatch - dev-libs/libsigc++:2 dev-libs/openssl:= + dev-libs/protobuf dev-libs/xxhash - media-libs/fontconfig:= media-libs/libjpeg-turbo:= ~media-libs/libtgvoip-2.4.4_p20221208 media-libs/openal - media-libs/opus:= + media-libs/opus media-libs/rnnoise - ~media-libs/tg_owt-0_pre20230105:=[screencast=,X=] + ~media-libs/tg_owt-0_pre20230921:=[screencast=,X=] media-video/ffmpeg:=[opus,vpx] sys-libs/zlib:=[minizip] virtual/opengl - dbus? ( dev-cpp/glibmm:2.68 ) !enchant? ( >=app-text/hunspell-1.7:= ) enchant? ( app-text/enchant:= ) jemalloc? ( dev-libs/jemalloc:=[-lazy-lock] ) !qt6? ( - >=dev-qt/qtcore-5.15:5 - >=dev-qt/qtgui-5.15:5[dbus?,jpeg,png,wayland?,X?] + >=dev-qt/qtcore-5.15:5= + >=dev-qt/qtgui-5.15:5=[dbus?,jpeg,png,wayland?,X?] >=dev-qt/qtimageformats-5.15:5 >=dev-qt/qtnetwork-5.15:5[ssl] >=dev-qt/qtsvg-5.15:5 >=dev-qt/qtwidgets-5.15:5[png,X?] - kde-frameworks/kcoreaddons:= + kde-frameworks/kcoreaddons:5 + webkit? ( + >=dev-qt/qtdeclarative-5.15:5 + >=dev-qt/qtwayland-5.15:5 + ) ) qt6? ( - dev-qt/qt5compat:6 - dev-qt/qtbase:6[dbus?,gui,network,opengl,widgets,X?] - dev-qt/qtimageformats:6 - dev-qt/qtsvg:6 - wayland? ( dev-qt/qtwayland:6 ) - qt6-imageformats? ( ${KIMAGEFORMATS_RDEPEND} ) + >=dev-qt/qtbase-6.5:6=[dbus?,gui,network,opengl,wayland?,widgets,X?] + >=dev-qt/qtimageformats-6.5:6 + >=dev-qt/qtsvg-6.5:6 + webkit? ( + >=dev-qt/qtdeclarative-6.5:6 + >=dev-qt/qtwayland-6.5:6[compositor] + ) + qt6-imageformats? ( + >=dev-qt/qtimageformats-6.5:6= + ${KIMAGEFORMATS_RDEPEND} + ) ) X? ( x11-libs/libxcb:= x11-libs/xcb-util-keysyms ) " -DEPEND="${RDEPEND} - dev-cpp/range-v3 +RDEPEND="${CDEPEND} + webkit? ( net-libs/webkit-gtk:4 ) +" +DEPEND="${CDEPEND} + >=dev-cpp/cppgir-0_p20230926 >=dev-cpp/ms-gsl-4 + dev-cpp/range-v3 " BDEPEND=" ${PYTHON_DEPS} + >=dev-cpp/cppgir-0_p20230926 >=dev-util/cmake-3.16 + dev-util/gdbus-codegen virtual/pkgconfig + wayland? ( dev-util/wayland-scanner ) " # dev-libs/jemalloc:=[-lazy-lock] -> https://bugs.gentoo.org/803233 PATCHES=( - "${FILESDIR}/tdesktop-4.2.4-jemalloc-only-telegram.patch" - "${FILESDIR}/tdesktop-4.4.1-fix-dupe-main-decl.patch" + "${FILESDIR}/tdesktop-4.2.4-jemalloc-only-telegram-r1.patch" + "${FILESDIR}/tdesktop-4.10.0-system-cppgir.patch" + "${FILESDIR}/tdesktop-4.10.5-qt_compare.patch" ) -# Current desktop-file-utils-0.26 does not understand Version=1.5 -QA_DESKTOP_FILE="usr/share/applications/${PN}.desktop" - pkg_pretend() { if has ccache ${FEATURES}; then ewarn "ccache does not work with ${PN} out of the box" @@ -106,15 +119,31 @@ src_prepare() { if use qt6-imageformats; then sed -e 's/DESKTOP_APP_USE_PACKAGED_LAZY/TRUE/' -i \ cmake/external/kimageformats/CMakeLists.txt || die - printf "%s\n" \ + printf '%s\n' \ 'Q_IMPORT_PLUGIN(QAVIFPlugin)' \ 'Q_IMPORT_PLUGIN(HEIFPlugin)' \ 'Q_IMPORT_PLUGIN(QJpegXLPlugin)' \ >> cmake/external/qt/qt_static_plugins/qt_static_plugins.cpp || die fi - - # kde-frameworks/kcoreaddons is bundled when using qt6, see: - # cmake/external/kcoreaddons/CMakeLists.txt + # kde-frameworks/kcoreaddons is bundled when using qt6. + + # Happily fail if libraries aren't found... + find -type f \( -name 'CMakeLists.txt' -o -name '*.cmake' \) \ + \! -path './Telegram/lib_webview/CMakeLists.txt' \ + \! -path './cmake/external/expected/CMakeLists.txt' \ + \! -path './cmake/external/kcoreaddons/CMakeLists.txt' \ + \! -path './cmake/external/qt/package.cmake' \ + -print0 | xargs -0 sed -i \ + -e '/pkg_check_modules(/s/[^ ]*)/REQUIRED &/' \ + -e '/find_package(/s/)/ REQUIRED)/' || die + # Make sure to check the excluded files for new + # CMAKE_DISABLE_FIND_PACKAGE entries. + + # Control QtDBus dependency from here, to avoid messing with QtGui. + if ! use dbus; then + sed -e '/find_package(Qt[^ ]* OPTIONAL_COMPONENTS/s/DBus *//' \ + -i cmake/external/qt/package.cmake || die + fi cmake_src_prepare } @@ -125,16 +154,28 @@ src_configure() { # See https://bugs.gentoo.org/866055 append-cppflags '-DNDEBUG' + local qt=$(usex qt6 6 5) local mycmakeargs=( - -DCMAKE_DISABLE_FIND_PACKAGE_tl-expected=ON # header only lib, some git version. prevents warnings. - -DQT_VERSION_MAJOR=$(usex qt6 6 5) + -DQT_VERSION_MAJOR=${qt} + + # Control automagic dependencies on certain packages + ## Header-only lib, some git version. + -DCMAKE_DISABLE_FIND_PACKAGE_tl-expected=ON + -DCMAKE_DISABLE_FIND_PACKAGE_Qt${qt}Quick=$(usex !webkit) + -DCMAKE_DISABLE_FIND_PACKAGE_Qt${qt}QuickWidgets=$(usex !webkit) + -DCMAKE_DISABLE_FIND_PACKAGE_Qt${qt}WaylandClient=$(usex !wayland) + ## Only used in Telegram/lib_webview/CMakeLists.txt + -DCMAKE_DISABLE_FIND_PACKAGE_Qt${qt}WaylandCompositor=$(usex !webkit) + ## KF6CoreAddons is currently unavailable in ::gentoo + -DCMAKE_DISABLE_FIND_PACKAGE_KF${qt}CoreAddons=$(usex qt6) - -DDESKTOP_APP_DISABLE_DBUS_INTEGRATION=$(usex !dbus) -DDESKTOP_APP_DISABLE_X11_INTEGRATION=$(usex !X) -DDESKTOP_APP_DISABLE_WAYLAND_INTEGRATION=$(usex !wayland) -DDESKTOP_APP_DISABLE_JEMALLOC=$(usex !jemalloc) - -DDESKTOP_APP_USE_ENCHANT=$(usex enchant) # enables enchant and disables hunspell - -DDESKTOP_APP_USE_PACKAGED_FONTS=$(usex !fonts) # use system fonts instead of bundled ones + ## Enables enchant and disables hunspell + -DDESKTOP_APP_USE_ENCHANT=$(usex enchant) + ## Use system fonts instead of bundled ones + -DDESKTOP_APP_USE_PACKAGED_FONTS=$(usex !fonts) ) if [[ -n ${MY_TDESKTOP_API_ID} && -n ${MY_TDESKTOP_API_HASH} ]]; then @@ -169,11 +210,6 @@ pkg_postinst() { ewarn "both the 'X' and 'screencast' USE flags are disabled, screen sharing won't work!" ewarn fi - if has_version '<dev-qt/qtcore-5.15.2-r10'; then - ewarn "Versions of dev-qt/qtcore lower than 5.15.2-r10 might cause telegram" - ewarn "to crash when pasting big images from the clipboard." - ewarn - fi if ! use jemalloc && use elibc_glibc; then # https://github.com/telegramdesktop/tdesktop/issues/16084 # https://github.com/desktop-app/cmake_helpers/pull/91#issuecomment-881788003 @@ -181,12 +217,6 @@ pkg_postinst() { ewarn "Do NOT report issues about RAM usage without enabling this flag first." ewarn fi - if use qt6; then - ewarn "Qt6 support in gentoo is experimental." - ewarn "Please report any issues you may find, but don't expect" - ewarn "everything to work correctly as of yet." - ewarn - fi if use wayland && ! use qt6; then ewarn "Wayland-specific integrations have been deprecated with Qt5." ewarn "The app will continue to function under wayland, but some" @@ -199,7 +229,6 @@ pkg_postinst() { elog fi optfeature_header - optfeature "shop payment support (requires USE=dbus enabled)" net-libs/webkit-gtk:4 if ! use qt6; then optfeature "AVIF, HEIF and JpegXL image support" kde-frameworks/kimageformats[avif,heif,jpegxl] fi diff --git a/net-im/telegram-desktop/telegram-desktop-4.8.1-r2.ebuild b/net-im/telegram-desktop/telegram-desktop-4.8.1-r3.ebuild index 22674e426296..d4aa40df0c04 100644 --- a/net-im/telegram-desktop/telegram-desktop-4.8.1-r2.ebuild +++ b/net-im/telegram-desktop/telegram-desktop-4.8.1-r3.ebuild @@ -53,7 +53,7 @@ RDEPEND=" jemalloc? ( dev-libs/jemalloc:=[-lazy-lock] ) !qt6? ( >=dev-qt/qtcore-5.15:5 - >=dev-qt/qtgui-5.15:5[dbus?,jpeg,png,wayland?,X?] + >=dev-qt/qtgui-5.15:5=[dbus?,jpeg,png,wayland?,X?] >=dev-qt/qtimageformats-5.15:5 >=dev-qt/qtnetwork-5.15:5[ssl] >=dev-qt/qtsvg-5.15:5 @@ -62,11 +62,14 @@ RDEPEND=" ) qt6? ( dev-qt/qt5compat:6 - dev-qt/qtbase:6[dbus?,gui,network,opengl,widgets,X?] + dev-qt/qtbase:6=[dbus?,gui,network,opengl,widgets,X?] dev-qt/qtimageformats:6 dev-qt/qtsvg:6 wayland? ( dev-qt/qtwayland:6 ) - qt6-imageformats? ( ${KIMAGEFORMATS_RDEPEND} ) + qt6-imageformats? ( + dev-qt/qtimageformats:6= + ${KIMAGEFORMATS_RDEPEND} + ) ) X? ( x11-libs/libxcb:= diff --git a/net-im/telepathy-mission-control/telepathy-mission-control-5.16.6.ebuild b/net-im/telepathy-mission-control/telepathy-mission-control-5.16.6.ebuild index 74f7116d090d..9ba070ffee32 100644 --- a/net-im/telepathy-mission-control/telepathy-mission-control-5.16.6.ebuild +++ b/net-im/telepathy-mission-control/telepathy-mission-control-5.16.6.ebuild @@ -13,7 +13,7 @@ SRC_URI="https://telepathy.freedesktop.org/releases/${PN}/${P}.tar.gz" LICENSE="LGPL-2.1+" SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 ~ia64 ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux" +KEYWORDS="~alpha amd64 arm arm64 ~ia64 ~loong ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux" IUSE="debug networkmanager" RDEPEND=" diff --git a/net-im/tokodon/Manifest b/net-im/tokodon/Manifest index 23361d1bd179..fa0a3c668bba 100644 --- a/net-im/tokodon/Manifest +++ b/net-im/tokodon/Manifest @@ -1 +1,2 @@ -DIST tokodon-23.04.2.tar.xz 233084 BLAKE2B ab32b4bdc649f0175001173e715bdb5a171d078332109074eeef043d9874c244ed63cb1c6aea6d0bce5c24e85742401b66db7031a77a8a97ce43da2f760c8f86 SHA512 a867b19788a84dfd5eded1170050d944120a928156b1df1dcafeda7377c7b90efc0625cf47477d9181a697d3c1e67ea098a98dfa4f7ada8a5b2ba56b9b4747a4 +DIST tokodon-23.04.3.tar.xz 237344 BLAKE2B 22742d44e2ffa9346753072b11dcba20da163ab11a98d39cfb719cfe271844c994eba5c5dfaa776aa7b35122bfb59f92a401ebab9853dca2f082b11360e42b63 SHA512 defc13e91088affc5c840921ae052b94f6da96dbd935e3ed43ea1b6f330139a64bc53d81e5d31bcbb19d0bef3bfbcda6cb85cdd8f42bba7aa68f8431a64784b1 +DIST tokodon-23.08.3.tar.xz 328772 BLAKE2B aaf3e4491a3fddce97abe4b8871d27165f4511db2857faa95b247fc5cf471447604ac3c398e18d7749f3d9b6730f49c86b22952062229077725bf981d7877cb2 SHA512 f43160bb200b9b36a70e199c06507fbb0e64fb170a82354d6b84480dbb900c0d35284f246f22cfc4698f3a96b07b195355df4a0b0a4c8d98e2df4f8aea13f680 diff --git a/net-im/tokodon/tokodon-23.04.2.ebuild b/net-im/tokodon/tokodon-23.04.3.ebuild index 6ddac3b45100..ed97b28b7ef0 100644 --- a/net-im/tokodon/tokodon-23.04.2.ebuild +++ b/net-im/tokodon/tokodon-23.04.3.ebuild @@ -13,7 +13,7 @@ HOMEPAGE="https://apps.kde.org/tokodon/" LICENSE="CC-BY-SA-4.0 GPL-2+ GPL-3+ || ( LGPL-2.1+ LGPL-3+ ) MIT" SLOT="0" -KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86" +KEYWORDS="amd64 arm64 ~ppc64 x86" DEPEND=" >=dev-libs/kirigami-addons-0.7.2:5 diff --git a/net-im/tokodon/tokodon-23.08.3.ebuild b/net-im/tokodon/tokodon-23.08.3.ebuild new file mode 100644 index 000000000000..01703145f13b --- /dev/null +++ b/net-im/tokodon/tokodon-23.08.3.ebuild @@ -0,0 +1,44 @@ +# Copyright 2022-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +ECM_TEST="forceoptional" +KFMIN=5.106.0 +QTMIN=5.15.9 +inherit ecm gear.kde.org + +DESCRIPTION="Mastodon client for Plasma and Plasma Mobile" +HOMEPAGE="https://apps.kde.org/tokodon/" + +LICENSE="CC-BY-SA-4.0 GPL-2+ GPL-3+ || ( LGPL-2.1+ LGPL-3+ ) MIT" +SLOT="0" +KEYWORDS="amd64 arm64 ~ppc64 x86" + +DEPEND=" + >=dev-libs/kirigami-addons-0.10.0:5 + media-video/mpv:=[libmpv] + dev-libs/qtkeychain:=[qt5(+)] + >=dev-qt/qtdeclarative-${QTMIN}:5 + >=dev-qt/qtgui-${QTMIN}:5 + >=dev-qt/qtnetwork-${QTMIN}:5 + >=dev-qt/qtquickcontrols2-${QTMIN}:5 + >=dev-qt/qtsvg-${QTMIN}:5 + >=dev-qt/qtwebsockets-${QTMIN}:5 + >=dev-qt/qtwidgets-${QTMIN}:5 + >=kde-frameworks/breeze-icons-${KFMIN}:* + >=kde-frameworks/kconfig-${KFMIN}:5 + >=kde-frameworks/kconfigwidgets-${KFMIN}:5 + >=kde-frameworks/kcoreaddons-${KFMIN}:5 + >=kde-frameworks/kdbusaddons-${KFMIN}:5 + >=kde-frameworks/ki18n-${KFMIN}:5 + >=kde-frameworks/kio-${KFMIN}:5 + >=kde-frameworks/kirigami-${KFMIN}:5 + >=kde-frameworks/kitemmodels-${KFMIN}:5[qml] + >=kde-frameworks/knotifications-${KFMIN}:5 + >=kde-frameworks/kwindowsystem-${KFMIN}:5 + >=kde-frameworks/qqc2-desktop-style-${KFMIN}:5 + >=kde-frameworks/sonnet-${KFMIN}:5[qml] +" +RDEPEND="${DEPEND}" +BDEPEND="virtual/pkgconfig" diff --git a/net-im/transwhat/transwhat-0.2.2_p20190426-r3.ebuild b/net-im/transwhat/transwhat-0.2.2_p20190426-r3.ebuild index c0a6c0070ed6..a6fbc475149e 100644 --- a/net-im/transwhat/transwhat-0.2.2_p20190426-r3.ebuild +++ b/net-im/transwhat/transwhat-0.2.2_p20190426-r3.ebuild @@ -33,5 +33,7 @@ src_prepare() { default # Spectrum2 must be lower case - sed -e 's/Spectrum2/spectrum2/g' -i transWhat/{buddy,group,registersession,session,transwhat,whatsappbackend}.py || die + sed \ + -e 's/Spectrum2/spectrum2/g' \ + -i transWhat/{buddy,group,registersession,session,transwhat,whatsappbackend}.py || die } diff --git a/net-im/vacuum/Manifest b/net-im/vacuum/Manifest deleted file mode 100644 index e78a2c997862..000000000000 --- a/net-im/vacuum/Manifest +++ /dev/null @@ -1 +0,0 @@ -DIST vacuum-im-1.3.0.20180105-Alpha.tar.gz 2658247 BLAKE2B 823984f49687805c8e859984d6dfc9afcbdff864eef2f81825562dca11281286d5e736a986ed40e10bb915b7ee4f972dba10b073ea738cd8153f887c74b89f1b SHA512 83d830494c272145c3ad923ebb2897a8ab6323a301bdd0fc2b972f84b246e2de4eff29a93d92da97ed4deb6018c52e38e6fc5941c54722e1c37de207bca0c687 diff --git a/net-im/vacuum/metadata.xml b/net-im/vacuum/metadata.xml deleted file mode 100644 index 3873cad96d32..000000000000 --- a/net-im/vacuum/metadata.xml +++ /dev/null @@ -1,58 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> -<pkgmetadata> - <maintainer type="person" proxied="yes"> - <email>reagentoo@gmail.com</email> - <name>Dmitry Baranov</name> - </maintainer> - <maintainer type="project" proxied="proxy"> - <email>proxy-maint@gentoo.org</email> - <name>Proxy Maintainers</name> - </maintainer> - <use> - <flag name="annotations">Enable adding comments to the contacts in the roster</flag> - <flag name="autostatus">Change the status in accordance with the time of inactivity</flag> - <flag name="avatars">Enable assigning and displaying avatars</flag> - <flag name="birthdayreminder">Reminds about birthdays of your friends</flag> - <flag name="bitsofbinary">Allow other modules to receive or send a small amount of binary data in XMPP stanza</flag> - <flag name="bookmarks">Enable creating bookmarks of the Jabber conferences and Web pages</flag> - <flag name="captchaforms">Perform tests for humanity outside of Web browser</flag> - <flag name="chatstates">Post user's activity to the chat</flag> - <flag name="clientinfo">Enable sending and receiving peer's application version, local time and last activity info</flag> - <flag name="commands">Enable performing special commands provided by various services</flag> - <flag name="compress">Compress stream of messages</flag> - <flag name="console">Enable inspecting a raw XML stream</flag> - <flag name="dataforms">Allow other modules to process and display data forms intended for the user</flag> - <flag name="datastreamsmanager">Enable initiating a custom data stream between two XMPP entities</flag> - <flag name="emoticons">Enable using smiley images in messages</flag> - <flag name="filemessagearchive">Allows to save the history of conversations to local files</flag> - <flag name="filestreamsmanager">Enable transferring files between two XMPP entities</flag> - <flag name="filetransfer">Enable sending files to peers</flag> - <flag name="gateways">Simplify the interaction with gateways to other IM systems</flag> - <flag name="inbandstreams">Enable initiating in-band data stream between two XMPP enitites</flag> - <flag name="iqauth">Enable logging on Jabber servers withous SASL authentication support</flag> - <flag name="jabbersearch">Enable searching contacts in Jabber networks</flag> - <flag name="messagearchiver">Enable saving the communication history both locally and on the server</flag> - <flag name="messagecarbons">Allows to keep all user IM clients engaged in a conversation</flag> - <flag name="multiuserchat">Enable Jabber multi-user conferences</flag> - <flag name="pepmanager">Allows other plugins to receive and publish PEP events</flag> - <flag name="privacylists">Enable blocking the undesirable contacts</flag> - <flag name="privatestorage">Allow other modules to store arbitrary data on the server</flag> - <flag name="recentcontacts">Displays a recently used contacts</flag> - <flag name="registration">Enable creating accounts in Jabber services</flag> - <flag name="remotecontrol">Allows to remotely control the client</flag> - <flag name="rosteritemexchange">Allows to exchange contact list items</flag> - <flag name="rostersearch">Allows to search for contacts in the roster</flag> - <flag name="servermessagearchive">Allows to save the history of communications on the server</flag> - <flag name="servicediscovery">Enable receiving information about Jabber entities</flag> - <flag name="sessionnegotiation">Enable initiating the session between two entities with setting the rules for XMPP stanzas exchange</flag> - <flag name="shortcutmanager">Allows to setup user defined shortcuts</flag> - <flag name="socksstreams">Enable initiating SOCKS5 data streams between two XMPP entities</flag> - <flag name="urlprocessor">Allows other plugins to load data from custom types of URLs</flag> - <flag name="vcard">Enable obtaining peer's personal contact information</flag> - <flag name="xmppuriqueries">Allow other plugins to handle XMPP URI queries</flag> - <flag name="aspell">Select <pkg>app-text/aspell</pkg> spell checker backend</flag> - <flag name="enchant">Select <pkg>app-text/enchant</pkg> spell checker backend</flag> - <flag name="hunspell">Select <pkg>app-text/hunspell</pkg> spell checker backend</flag> - </use> -</pkgmetadata> diff --git a/net-im/vacuum/vacuum-1.3.0_pre20180105.ebuild b/net-im/vacuum/vacuum-1.3.0_pre20180105.ebuild deleted file mode 100644 index 1ce002e1d41c..000000000000 --- a/net-im/vacuum/vacuum-1.3.0_pre20180105.ebuild +++ /dev/null @@ -1,105 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -PLOCALES="de es pl ru uk" -inherit cmake plocale - -MY_PN="${PN}-im" -MY_PV="${PV/_pre/.}-Alpha" -MY_P="${MY_PN}-${MY_PV}" - -DESCRIPTION="Qt Crossplatform Jabber client" -HOMEPAGE="http://www.vacuum-im.org/" -SRC_URI="https://github.com/Vacuum-IM/${MY_PN}/archive/${MY_PV}.tar.gz -> ${MY_P}.tar.gz" - -LICENSE="GPL-3" -SLOT="0/37" # subslot = libvacuumutils soname version -KEYWORDS="~amd64 ~x86" -PLUGINS=( annotations autostatus avatars birthdayreminder bitsofbinary bookmarks captchaforms chatstates clientinfo commands compress console dataforms datastreamsmanager emoticons filemessagearchive filestreamsmanager filetransfer gateways inbandstreams iqauth jabbersearch messagearchiver messagecarbons multiuserchat pepmanager privacylists privatestorage recentcontacts registration remotecontrol rosteritemexchange rostersearch servermessagearchive servicediscovery sessionnegotiation shortcutmanager socksstreams urlprocessor vcard xmppuriqueries ) -SPELLCHECKER_BACKENDS="aspell +enchant hunspell" -IUSE="${PLUGINS[@]/#/+} ${SPELLCHECKER_BACKENDS} +spell" - -REQUIRED_USE=" - annotations? ( privatestorage ) - avatars? ( vcard ) - birthdayreminder? ( vcard ) - bookmarks? ( privatestorage ) - captchaforms? ( dataforms ) - commands? ( dataforms ) - datastreamsmanager? ( dataforms ) - filemessagearchive? ( messagearchiver ) - filestreamsmanager? ( datastreamsmanager ) - filetransfer? ( filestreamsmanager datastreamsmanager ) - messagecarbons? ( servicediscovery ) - pepmanager? ( servicediscovery ) - recentcontacts? ( privatestorage ) - registration? ( dataforms ) - remotecontrol? ( commands dataforms ) - servermessagearchive? ( messagearchiver ) - sessionnegotiation? ( dataforms ) - spell? ( ^^ ( ${SPELLCHECKER_BACKENDS//+/} ) ) -" - -BDEPEND=" - dev-qt/linguist-tools:5 -" -DEPEND=" - dev-qt/qtcore:5 - dev-qt/qtgui:5 - dev-qt/qtlockedfile[qt5(+)] - dev-qt/qtmultimedia:5 - dev-qt/qtnetwork:5[ssl] - dev-qt/qtxml:5 - net-dns/libidn - sys-libs/zlib[minizip] - x11-libs/libXScrnSaver - filemessagearchive? ( dev-qt/qtsql:5[sqlite] ) - messagearchiver? ( dev-qt/qtsql:5[sqlite] ) - spell? ( - aspell? ( app-text/aspell ) - enchant? ( app-text/enchant:0 ) - hunspell? ( app-text/hunspell ) - ) -" -RDEPEND="${DEPEND} - !net-im/vacuum-spellchecker -" - -DOCS=( AUTHORS CHANGELOG README TRANSLATORS ) - -S="${WORKDIR}/${MY_P}" - -src_prepare() { - cmake_src_prepare - - # Force usage of system libraries - rm -rf src/thirdparty/{hunspell,idn,minizip,qtlockedfile,zlib} || die - - # Suppress find thirdparty library in the system - sed -i -r -e "/find_library.+qxtglobalshortcut/d" CMakeLists.txt || die -} - -src_configure() { - local mycmakeargs=( - -DINSTALL_LIB_DIR="$(get_libdir)" - -DINSTALL_SDK=ON - -DLANGS="$(plocale_get_locales)" - -DINSTALL_DOCS=OFF - -DFORCE_BUNDLED_MINIZIP=OFF - -DPLUGIN_adiummessagestyle=OFF - -DPLUGIN_statistics=OFF - -DPLUGIN_spellchecker=$(usex spell) - ) - - for x in ${PLUGINS[@]}; do - mycmakeargs+=( -DPLUGIN_${x}=$(usex $x) ) - done - - for i in ${SPELLCHECKER_BACKENDS//+/}; do - use "${i}" && mycmakeargs+=( -DSPELLCHECKER_BACKEND="${i}" ) - done - - cmake_src_configure -} diff --git a/net-im/vacuum/vacuum-9999.ebuild b/net-im/vacuum/vacuum-9999.ebuild deleted file mode 100644 index 7eecd922f0b9..000000000000 --- a/net-im/vacuum/vacuum-9999.ebuild +++ /dev/null @@ -1,97 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -EGIT_REPO_URI="https://github.com/Vacuum-IM/vacuum-im" -PLOCALES="de es pl ru uk" -inherit cmake git-r3 plocale - -DESCRIPTION="Qt Crossplatform Jabber client" -HOMEPAGE="http://www.vacuum-im.org/" - -LICENSE="GPL-3" -SLOT="0/37" # subslot = libvacuumutils soname version -KEYWORDS="" -PLUGINS=( annotations autostatus avatars birthdayreminder bitsofbinary bookmarks captchaforms chatstates clientinfo commands compress console dataforms datastreamsmanager emoticons filemessagearchive filestreamsmanager filetransfer gateways inbandstreams iqauth jabbersearch messagearchiver messagecarbons multiuserchat pepmanager privacylists privatestorage recentcontacts registration remotecontrol rosteritemexchange rostersearch servermessagearchive servicediscovery sessionnegotiation shortcutmanager socksstreams urlprocessor vcard xmppuriqueries ) -SPELLCHECKER_BACKENDS="aspell +enchant hunspell" -IUSE="${PLUGINS[@]/#/+} ${SPELLCHECKER_BACKENDS} +spell" - -REQUIRED_USE=" - annotations? ( privatestorage ) - avatars? ( vcard ) - birthdayreminder? ( vcard ) - bookmarks? ( privatestorage ) - captchaforms? ( dataforms ) - commands? ( dataforms ) - datastreamsmanager? ( dataforms ) - filemessagearchive? ( messagearchiver ) - filestreamsmanager? ( datastreamsmanager ) - filetransfer? ( filestreamsmanager datastreamsmanager ) - messagecarbons? ( servicediscovery ) - pepmanager? ( servicediscovery ) - recentcontacts? ( privatestorage ) - registration? ( dataforms ) - remotecontrol? ( commands dataforms ) - servermessagearchive? ( messagearchiver ) - sessionnegotiation? ( dataforms ) - spell? ( ^^ ( ${SPELLCHECKER_BACKENDS//+/} ) ) -" - -BDEPEND=" - dev-qt/linguist-tools:5 -" -DEPEND=" - dev-qt/qtcore:5 - dev-qt/qtgui:5 - dev-qt/qtlockedfile[qt5(+)] - dev-qt/qtmultimedia:5 - dev-qt/qtnetwork:5[ssl] - dev-qt/qtxml:5 - net-dns/libidn - sys-libs/zlib[minizip] - x11-libs/libXScrnSaver - filemessagearchive? ( dev-qt/qtsql:5[sqlite] ) - messagearchiver? ( dev-qt/qtsql:5[sqlite] ) - spell? ( - aspell? ( app-text/aspell ) - enchant? ( app-text/enchant:0 ) - hunspell? ( app-text/hunspell ) - ) -" -RDEPEND="${DEPEND}" - -DOCS=( AUTHORS CHANGELOG README TRANSLATORS ) - -src_prepare() { - cmake_src_prepare - - # Force usage of system libraries - rm -rf src/thirdparty/{hunspell,idn,minizip,qtlockedfile,zlib} || die - - # Suppress find thirdparty library in the system - sed -i -r -e "/find_library.+qxtglobalshortcut/d" CMakeLists.txt || die -} - -src_configure() { - local mycmakeargs=( - -DINSTALL_LIB_DIR="$(get_libdir)" - -DINSTALL_SDK=ON - -DLANGS="$(plocale_get_locales)" - -DINSTALL_DOCS=OFF - -DFORCE_BUNDLED_MINIZIP=OFF - -DPLUGIN_adiummessagestyle=OFF - -DPLUGIN_statistics=OFF - -DPLUGIN_spellchecker=$(usex spell) - ) - - for x in ${PLUGINS[@]}; do - mycmakeargs+=( -DPLUGIN_${x}=$(usex $x) ) - done - - for i in ${SPELLCHECKER_BACKENDS//+/}; do - use "${i}" && mycmakeargs+=( -DSPELLCHECKER_BACKEND="${i}" ) - done - - cmake_src_configure -} diff --git a/net-im/whatsie/Manifest b/net-im/whatsie/Manifest index 3584749c18bc..c6c1fe39f53b 100644 --- a/net-im/whatsie/Manifest +++ b/net-im/whatsie/Manifest @@ -1,2 +1 @@ -DIST whatsie-4.13.0.tar.gz 21145212 BLAKE2B f53549fe4975da0c5fad140568b228cb3cbdf93308cba0ddcd5aa3370ed40a84d4463e589edd1d587659b67fceb6885370b826d1746d0f31f292df1d891b3c04 SHA512 ac2b89d14c64b17a1715510754fac5b0f02528250b78fbd5dcfb782d7243ccea43d01e1dcc8507bf3056b94b3d283d9f6359451a80525c58f7889f34cc77805a -DIST whatsie-4.14.1.tar.gz 21146781 BLAKE2B ca5d479f29356c92a64d62fa37d90dd328f19ccd774356d275bf1bbd9230ad1ea3773dd3b1fe345b50350bc1f17dba0cf263a85f78f20b3a4a87684ff0c301e9 SHA512 f425c87174ac14376be3d1f364e09e45a33e22ebe4595b78f9e5bf0943cac2ba296e23cca6e4b768f4949adfb5a0eeb5f93e824e4182ff980e3c6dfa66a5dc6f +DIST whatsie-4.14.2.tar.gz 21146777 BLAKE2B 3d923b9d4b109cbc894481fed9723fe84d992663ea953218cd4b128317aebe2fb8a60608d351cc9f4cfc5a976713ce2a3a642a122276068ed63a96e6cf656603 SHA512 b0b6ab0fab30723ee64b723f79776b6953229502e22f4c5e9fb809aa198e369ee05398abca218680adeea1acfcafd0026e13e424458fedad2c0260c2d956fffb diff --git a/net-im/whatsie/whatsie-4.14.1.ebuild b/net-im/whatsie/whatsie-4.14.1.ebuild deleted file mode 100644 index cecf52d1bc2d..000000000000 --- a/net-im/whatsie/whatsie-4.14.1.ebuild +++ /dev/null @@ -1,39 +0,0 @@ -# Copyright 2019-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit qmake-utils xdg - -DESCRIPTION="Qt Based WhatsApp Client" -HOMEPAGE="https://github.com/keshavbhatt/whatsie" -SRC_URI="https://github.com/keshavbhatt/whatsie/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz" -S="${WORKDIR}/${P}/src" - -KEYWORDS="~amd64" -LICENSE="MIT" -SLOT="0" - -QT_MIN="5.15" - -DEPEND=" - x11-libs/libX11 - x11-libs/libxcb:= - >=dev-qt/qtcore-${QT_MIN}:5 - >=dev-qt/qtgui-${QT_MIN}:5 - >=dev-qt/qtnetwork-${QT_MIN}:5 - >=dev-qt/qtpositioning-${QT_MIN}:5 - >=dev-qt/qtwebengine-${QT_MIN}:5[widgets] - >=dev-qt/qtwidgets-${QT_MIN}:5 -" - -RDEPEND="${DEPEND}" - -src_configure() { - eqmake5 -} - -src_install() { - einstalldocs - INSTALL_ROOT="${ED}" emake install -} diff --git a/net-im/whatsie/whatsie-4.13.0.ebuild b/net-im/whatsie/whatsie-4.14.2.ebuild index cecf52d1bc2d..cecf52d1bc2d 100644 --- a/net-im/whatsie/whatsie-4.13.0.ebuild +++ b/net-im/whatsie/whatsie-4.14.2.ebuild diff --git a/net-im/zoom/Manifest b/net-im/zoom/Manifest index 29de08fb223b..d942e73baa38 100644 --- a/net-im/zoom/Manifest +++ b/net-im/zoom/Manifest @@ -1,2 +1,2 @@ -DIST zoom-5.14.10.3738_x86_64.tar.xz 168546944 BLAKE2B b338c65b41c4b3caa277dd64cec42f6fbdd307557204fe4e2dafa9b0d48eeddeba0c5bd64bdda1ac1721de1c6f1e8bde7e65517d6c9be80cb7c3591aac007ac9 SHA512 c4d94adc295743519915a597b1e10dd10e38238857df399432acb9ef26d57dad3b9ea68d84ffcea1c782116e8121f54dac2b25e5740760d2ebea2e119fb33686 -DIST zoom-5.14.7.2928_x86_64.tar.xz 168160068 BLAKE2B f20dd7d87e14c2489517d229f18c395155fe56a51a10f57a35c62a4add54650d1c3831414740392cedb2cb13e2bb65274b7e2d59b52263aa079ff49bb0e4a9af SHA512 4b843533f300556773a31eedbd48dd46062ca5a607cf6241fb2af1d3bbb436333b0d3cabd03b091a61ed1088e40010adb971671b1fc79cd26ff4524bfb9e3b78 +DIST zoom-5.16.10.668_x86_64.tar.xz 186935984 BLAKE2B ba1e7f4c82feb226367f3450f6410693a51a63ef02d1d799b378cd582925a0d653db5e9756def5c1a64db88f283c36007d52ecd222b11e9d8b12b75b5d40a370 SHA512 a2f770af9392614105ff57919aec05401b792d3c7e2f96ce878862c00bdd401fe5054f1af0d644186aa6f8ab109a751e4d4dcf3d645c28372629117163412e34 +DIST zoom-5.16.6.382_x86_64.tar.xz 185859600 BLAKE2B 9d10cd7077db2f5ef6c51a96254c668ff13e5e8fb22ca03215377072d5d60f34c29a2cab196fdf4c20bac4769bb1d6b4acafc9753eb49c6142f78490d4de0359 SHA512 cb6ededad858fc29378668ed1af7285ef7fca4ef550892b00d010e36e4fbaa5fd6e545e71ece0c847eea50deed3dd7055a621c86e39f24bda624fdbd6ae964cf diff --git a/net-im/zoom/zoom-5.14.7.2928.ebuild b/net-im/zoom/zoom-5.16.10.668.ebuild index ca1f4dfb7b31..8f59563843f7 100644 --- a/net-im/zoom/zoom-5.14.7.2928.ebuild +++ b/net-im/zoom/zoom-5.16.10.668.ebuild @@ -34,6 +34,7 @@ RDEPEND="!games-engines/zoom sys-apps/dbus sys-apps/util-linux sys-libs/glibc + sys-libs/zlib virtual/opengl x11-libs/cairo x11-libs/libdrm @@ -72,6 +73,7 @@ RDEPEND="!games-engines/zoom dev-qt/qtsvg:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 + dev-qt/qtxml:5 wayland? ( dev-qt/qtwayland ) )" @@ -85,7 +87,7 @@ src_prepare() { default # The tarball doesn't contain an icon, so extract it from the binary - bbe -s -b '/<svg width="32" height="32"/:/<\x2fsvg>\n/' -e 'J 1;D' zoom \ + bbe -s -b '/<svg width="85" height="85"/:/<\x2fsvg>\n/' -e 'J 1;D' zoom \ >videoconference-zoom.svg && [[ -s videoconference-zoom.svg ]] \ || die "Extraction of icon failed" @@ -109,15 +111,16 @@ src_install() { doins -r calendar cef email json ringtone scheduler sip timezones \ translations doins *.pcm Embedded.properties version.txt - doexe zoom zopen ZoomLauncher *.sh + doexe zoom zopen ZoomLauncher *.sh \ + aomhost libaomagent.so libdvf.so libmkldnn.so \ + libavcodec.so* libavformat.so* libavutil.so* libswresample.so* fperms a+x /opt/zoom/cef/chrome-sandbox dosym -r {"/usr/$(get_libdir)",/opt/zoom}/libmpg123.so dosym -r "/usr/$(get_libdir)/libfdk-aac.so.2" /opt/zoom/libfdkaac2.so dosym -r "/usr/$(get_libdir)/libquazip1-qt5.so" /opt/zoom/libquazip.so if use opencl; then - doexe aomhost libaomagent.so libclDNN64.so libdvf.so libmkldnn.so \ - libavcodec.so* libavformat.so* libavutil.so* libswresample.so* + doexe libclDNN64.so dosym -r {"/usr/$(get_libdir)",/opt/zoom}/libOpenCL.so.1 fi @@ -143,7 +146,7 @@ src_install() { plugins/platforms/libqeglfs.so \ plugins/platforms/libqlinuxfb.so \ plugins/platformthemes/libqgtk3.so \ - qml/Qt/labs/lottieqt qml/QtQml/RemoteObjects \ + qml/QtQml/RemoteObjects \ qml/QtQuick/LocalStorage qml/QtQuick/Particles.2 \ qml/QtQuick/Scene2D qml/QtQuick/Scene3D \ qml/QtQuick/XmlListModel || die diff --git a/net-im/zoom/zoom-5.14.10.3738.ebuild b/net-im/zoom/zoom-5.16.6.382.ebuild index ca1f4dfb7b31..70e604ade31e 100644 --- a/net-im/zoom/zoom-5.14.10.3738.ebuild +++ b/net-im/zoom/zoom-5.16.6.382.ebuild @@ -34,6 +34,7 @@ RDEPEND="!games-engines/zoom sys-apps/dbus sys-apps/util-linux sys-libs/glibc + sys-libs/zlib virtual/opengl x11-libs/cairo x11-libs/libdrm @@ -72,6 +73,7 @@ RDEPEND="!games-engines/zoom dev-qt/qtsvg:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 + dev-qt/qtxml:5 wayland? ( dev-qt/qtwayland ) )" @@ -109,15 +111,16 @@ src_install() { doins -r calendar cef email json ringtone scheduler sip timezones \ translations doins *.pcm Embedded.properties version.txt - doexe zoom zopen ZoomLauncher *.sh + doexe zoom zopen ZoomLauncher *.sh \ + aomhost libaomagent.so libdvf.so libmkldnn.so \ + libavcodec.so* libavformat.so* libavutil.so* libswresample.so* fperms a+x /opt/zoom/cef/chrome-sandbox dosym -r {"/usr/$(get_libdir)",/opt/zoom}/libmpg123.so dosym -r "/usr/$(get_libdir)/libfdk-aac.so.2" /opt/zoom/libfdkaac2.so dosym -r "/usr/$(get_libdir)/libquazip1-qt5.so" /opt/zoom/libquazip.so if use opencl; then - doexe aomhost libaomagent.so libclDNN64.so libdvf.so libmkldnn.so \ - libavcodec.so* libavformat.so* libavutil.so* libswresample.so* + doexe libclDNN64.so dosym -r {"/usr/$(get_libdir)",/opt/zoom}/libOpenCL.so.1 fi @@ -143,7 +146,7 @@ src_install() { plugins/platforms/libqeglfs.so \ plugins/platforms/libqlinuxfb.so \ plugins/platformthemes/libqgtk3.so \ - qml/Qt/labs/lottieqt qml/QtQml/RemoteObjects \ + qml/QtQml/RemoteObjects \ qml/QtQuick/LocalStorage qml/QtQuick/Particles.2 \ qml/QtQuick/Scene2D qml/QtQuick/Scene3D \ qml/QtQuick/XmlListModel || die |