From d5599da3055bf9b900513a61c3c6e4bdbb524503 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Thu, 8 Jun 2023 15:45:39 +0100 Subject: gentoo auto-resync : 08:06:2023 - 15:45:39 --- net-im/Manifest.gz | Bin 9717 -> 9729 bytes net-im/neochat/Manifest | 4 +- net-im/neochat/neochat-23.04.1.ebuild | 51 ----------- net-im/neochat/neochat-23.04.2.ebuild | 51 +++++++++++ net-im/signal-desktop-bin/Manifest | 4 +- .../signal-desktop-bin-6.19.0.ebuild | 95 --------------------- .../signal-desktop-bin-6.20.1.ebuild | 95 +++++++++++++++++++++ net-im/tokodon/Manifest | 5 +- .../tokodon-23.04.0-tokodon-not-neochat.patch | 47 ---------- net-im/tokodon/tokodon-23.04.1.ebuild | 50 ----------- net-im/tokodon/tokodon-23.04.2.ebuild | 43 ++++++++++ 11 files changed, 195 insertions(+), 250 deletions(-) delete mode 100644 net-im/neochat/neochat-23.04.1.ebuild create mode 100644 net-im/neochat/neochat-23.04.2.ebuild delete mode 100644 net-im/signal-desktop-bin/signal-desktop-bin-6.19.0.ebuild create mode 100644 net-im/signal-desktop-bin/signal-desktop-bin-6.20.1.ebuild delete mode 100644 net-im/tokodon/files/tokodon-23.04.0-tokodon-not-neochat.patch delete mode 100644 net-im/tokodon/tokodon-23.04.1.ebuild create mode 100644 net-im/tokodon/tokodon-23.04.2.ebuild (limited to 'net-im') diff --git a/net-im/Manifest.gz b/net-im/Manifest.gz index b2a46fdb1fe5..fce62d19fb5a 100644 Binary files a/net-im/Manifest.gz and b/net-im/Manifest.gz differ diff --git a/net-im/neochat/Manifest b/net-im/neochat/Manifest index a52c36bcdc8c..5535549604d8 100644 --- a/net-im/neochat/Manifest +++ b/net-im/neochat/Manifest @@ -1,3 +1,3 @@ -DIST neochat-23.04.1.tar.xz 566288 BLAKE2B 5b4950a65b17b384197bafbd8b1d51625208127b09eda4c276c848398c8df2bc592597af8e2952fa4f12687cccd89032aeeb903f55b087b9c912d64cbcb02ce7 SHA512 be036156e1facac03b9846110d7b7c8d119f7ceefdb8597eec7fefc62cb90623a235195f58bc463c7412e847c5a1add93374ed98d7499e4373b506ea12cb11be -EBUILD neochat-23.04.1.ebuild 1472 BLAKE2B 2fa4683150045d980c813d68cb02fa84650921140e52c52de4df0d145987df7c6a259ac84caa31ca236f240ff8adfa61176ae3df86f896d9a9ecf9485bf001a8 SHA512 02f2d75053cb99f99cf123caf4821da27eda0c29db114b381a9000e42afbcc8a93cae1b3a4574d4334d42fd729f470dbd83160eedfc00f0946bc8ca509d6cc90 +DIST neochat-23.04.2.tar.xz 565584 BLAKE2B 7e72214d7bfdb0a30e767ce91116fae71f341c37ef7f830f071a7303e25e35107d2f8c481f05373a8493d06c94c34a4f2d88dc424f3143144e41d8418b9be671 SHA512 f02e1cee3f71211f6dbf319ce983002046af27d08a6a82a41678384f68e5f0602fb18b30cad925deae7f6a0b352e4000e497f800020a89d5331f85557c9abf06 +EBUILD neochat-23.04.2.ebuild 1472 BLAKE2B cbbfcc6e9c94ff5afefbbd93db9a045165a0952cfe71432bca66df93a97219a8402cf1d0997b68ea9c18ee4efbd106a4d3d10d2255686feef9d11de1a1178087 SHA512 4243ba43aef28855100b6fd7328d293a68a507c00d9a215d3b85b11480587fd095a73e1037bafa333f3f0c433f422f041e4db412315abb9258cce9b386f2afe6 MISC metadata.xml 318 BLAKE2B 922a5e32e706b2976c5f359a14194d268d3f499398576c80ce5fad8c0fcea0fbf048de4480a80a6a1889c88b8b6c14147654a3ab4d5ffbcc258c2290da63f6d1 SHA512 614cb8dda7ad2088e5d6ef39b449bb4be0ac72cd0231c320188d76d1816dce6490c5114bb4798112c4b11d99d30a9e82ff8fcf08ffa8c049589682a5e38208f6 diff --git a/net-im/neochat/neochat-23.04.1.ebuild b/net-im/neochat/neochat-23.04.1.ebuild deleted file mode 100644 index da33b95301d5..000000000000 --- a/net-im/neochat/neochat-23.04.1.ebuild +++ /dev/null @@ -1,51 +0,0 @@ -# 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.104.0 -QTMIN=5.15.5 -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 - >=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.6:= -" -RDEPEND="${DEPEND} - >=dev-qt/qtgraphicaleffects-${QTMIN}:5 - >=dev-qt/qtmultimedia-${QTMIN}:5[qml] - >=kde-frameworks/purpose-${KFMIN}:5 -" -BDEPEND="virtual/pkgconfig" diff --git a/net-im/neochat/neochat-23.04.2.ebuild b/net-im/neochat/neochat-23.04.2.ebuild new file mode 100644 index 000000000000..77b0c006b60c --- /dev/null +++ b/net-im/neochat/neochat-23.04.2.ebuild @@ -0,0 +1,51 @@ +# 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 + >=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.6:= +" +RDEPEND="${DEPEND} + >=dev-qt/qtgraphicaleffects-${QTMIN}:5 + >=dev-qt/qtmultimedia-${QTMIN}:5[qml] + >=kde-frameworks/purpose-${KFMIN}:5 +" +BDEPEND="virtual/pkgconfig" diff --git a/net-im/signal-desktop-bin/Manifest b/net-im/signal-desktop-bin/Manifest index 019ffcea641a..594dfb0e7700 100644 --- a/net-im/signal-desktop-bin/Manifest +++ b/net-im/signal-desktop-bin/Manifest @@ -1,3 +1,3 @@ -DIST signal-desktop_6.19.0_amd64.deb 112142884 BLAKE2B 4fc0421a0f61777f061c748b1bf49a2d461d64d60030a62c13848c24f22fd51b22f0dc475ceda5f86cfc016b26be9d50cfe55929a57528051ec315b4bb77d7dd SHA512 5d816fe91a61e08b219c79abefef0f32f89ff2bd880a2d2b01a64c4b5ace74c97e5eb0c9d343f24459177fb00e0952dcf7db3f9d1c1ac4c758fefc75461db7c6 -EBUILD signal-desktop-bin-6.19.0.ebuild 2364 BLAKE2B 7c84ce1504022bf755df2ac3d76a700d2151875db3b2ce94acd1a17f30c9f3adb8bfd98c194b713e5e0fe72746eb462228c5f4f48d246e3b6d6c0f28b2935c8f SHA512 916240972bdc6c6d005bbc7073e837a78a672dbfafac12ee8567262cc91158e81a50f4e01b22a85743bfa1f0ec10bd1f844abc3b98b742bc2c7a594e3f92442c +DIST signal-desktop_6.20.1_amd64.deb 112193082 BLAKE2B d1ef7f025e41ea0a4cae94c15d32d2ebb5c433c82d2072efd9f0265d4a7acf8d5839dd5ffd912b400ea95049c984551322982cc51484150270cbdf71064e4706 SHA512 839f848a275baadc22bfdcfb93c423cffd183ba0cb628c4cbd64a08be478adb4f36c5dfe2898285eeee19e6753b6aaf79b459e0028d52fc9b3dd2950bf2baa6e +EBUILD signal-desktop-bin-6.20.1.ebuild 2359 BLAKE2B 5674c91e89c9c10e53a83c949c86034ec235ac4cc89d1e3d754c10b6e025af62fefd318d69c7c0cfb6d00672f91e94b597436ee31b22146668f6de89357e8c65 SHA512 92692a3bc6520d7aae59b705b8b3837773f9d7dadc9aa5c83d1ad2fc8b03e66a21c55906a9a7f9f9f813f26a76c942e188754887e8050e264bd5c552bca1e2dd MISC metadata.xml 486 BLAKE2B cfc118c5488c5c50b4de72443e6b836992a4ba7a6fb94358552c814006a49b00580b5ab0a57141b17809e1d2a898b9e23e6fee0837778edfa7f6de53ccc09d01 SHA512 4ab7dc5fd6fb03e7296164d0d924ab4eb11c6fd31c2fc651706892eda53b29be5db65cd94da8e6aa743e9b7ed10ee3e5f25f14dd2d1be99459daa11f529dbb95 diff --git a/net-im/signal-desktop-bin/signal-desktop-bin-6.19.0.ebuild b/net-im/signal-desktop-bin/signal-desktop-bin-6.19.0.ebuild deleted file mode 100644 index 1b6e912201c3..000000000000 --- a/net-im/signal-desktop-bin/signal-desktop-bin-6.19.0.ebuild +++ /dev/null @@ -1,95 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -MY_PN="${PN/-bin/}" - -inherit pax-utils unpacker xdg - -DESCRIPTION="Allows you to send and receive messages of Signal Messenger on your computer" -HOMEPAGE="https://signal.org/ - https://github.com/signalapp/Signal-Desktop" -SRC_URI="https://updates.signal.org/desktop/apt/pool/main/s/${MY_PN}/${MY_PN}_${PV}_amd64.deb" -S="${WORKDIR}" - -LICENSE="GPL-3 MIT MIT-with-advertising BSD-1 BSD-2 BSD Apache-2.0 ISC openssl ZLIB APSL-2 icu Artistic-2 LGPL-2.1" -SLOT="0" -KEYWORDS="-* amd64" -IUSE="+sound" -RESTRICT="splitdebug" - -RDEPEND=" - >=app-accessibility/at-spi2-core-2.46.0:2 - dev-libs/expat - dev-libs/glib:2 - dev-libs/nspr - dev-libs/nss - media-libs/alsa-lib - media-libs/mesa[X(+)] - net-print/cups - sys-apps/dbus[X] - x11-libs/cairo - x11-libs/gtk+:3[X] - x11-libs/libdrm - x11-libs/libX11 - x11-libs/libxcb - x11-libs/libxkbcommon - x11-libs/libXcomposite - x11-libs/libXdamage - x11-libs/libXext - x11-libs/libXfixes - x11-libs/libXrandr - x11-libs/pango - sound? ( - || ( - media-sound/pulseaudio - media-sound/apulse - ) - ) -" - -QA_PREBUILT=" - opt/Signal/chrome_crashpad_handler - opt/Signal/chrome-sandbox - opt/Signal/libEGL.so - opt/Signal/libGLESv2.so - opt/Signal/libffmpeg.so - opt/Signal/libvk_swiftshader.so - opt/Signal/libvulkan.so.1 - opt/Signal/resources/app.asar.unpacked/node_modules/* - opt/Signal/signal-desktop - opt/Signal/swiftshader/libEGL.so - opt/Signal/swiftshader/libGLESv2.so" - -src_prepare() { - default - sed -e 's| --no-sandbox||g' \ - -i usr/share/applications/signal-desktop.desktop || die - unpack usr/share/doc/signal-desktop/changelog.gz -} - -src_install() { - insinto / - dodoc changelog - doins -r opt - insinto /usr/share - - if has_version media-sound/apulse[-sdk] && ! has_version media-sound/pulseaudio; then - sed -i 's/Exec=/Exec=apulse /g' usr/share/applications/signal-desktop.desktop || die - fi - - doins -r usr/share/applications - doins -r usr/share/icons - fperms +x /opt/Signal/signal-desktop /opt/Signal/chrome-sandbox - fperms u+s /opt/Signal/chrome-sandbox - pax-mark m opt/Signal/signal-desktop opt/Signal/chrome-sandbox - - dosym -r /opt/Signal/${MY_PN} /usr/bin/${MY_PN} -} - -pkg_postinst() { - xdg_pkg_postinst - elog "For using the tray icon on compatible desktop environments, start Signal with" - elog " '--start-in-tray' or '--use-tray-icon'." -} 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.20.1.ebuild new file mode 100644 index 000000000000..9368120568ad --- /dev/null +++ b/net-im/signal-desktop-bin/signal-desktop-bin-6.20.1.ebuild @@ -0,0 +1,95 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +MY_PN="${PN/-bin/}" + +inherit pax-utils unpacker xdg + +DESCRIPTION="Allows you to send and receive messages of Signal Messenger on your computer" +HOMEPAGE="https://signal.org/ + https://github.com/signalapp/Signal-Desktop" +SRC_URI="https://updates.signal.org/desktop/apt/pool/s/${MY_PN}/${MY_PN}_${PV}_amd64.deb" +S="${WORKDIR}" + +LICENSE="GPL-3 MIT MIT-with-advertising BSD-1 BSD-2 BSD Apache-2.0 ISC openssl ZLIB APSL-2 icu Artistic-2 LGPL-2.1" +SLOT="0" +KEYWORDS="-* amd64" +IUSE="+sound" +RESTRICT="splitdebug" + +RDEPEND=" + >=app-accessibility/at-spi2-core-2.46.0:2 + dev-libs/expat + dev-libs/glib:2 + dev-libs/nspr + dev-libs/nss + media-libs/alsa-lib + media-libs/mesa[X(+)] + net-print/cups + sys-apps/dbus[X] + x11-libs/cairo + x11-libs/gtk+:3[X] + x11-libs/libdrm + x11-libs/libX11 + x11-libs/libxcb + x11-libs/libxkbcommon + x11-libs/libXcomposite + x11-libs/libXdamage + x11-libs/libXext + x11-libs/libXfixes + x11-libs/libXrandr + x11-libs/pango + sound? ( + || ( + media-sound/pulseaudio + media-sound/apulse + ) + ) +" + +QA_PREBUILT=" + opt/Signal/chrome_crashpad_handler + opt/Signal/chrome-sandbox + opt/Signal/libEGL.so + opt/Signal/libGLESv2.so + opt/Signal/libffmpeg.so + opt/Signal/libvk_swiftshader.so + opt/Signal/libvulkan.so.1 + opt/Signal/resources/app.asar.unpacked/node_modules/* + opt/Signal/signal-desktop + opt/Signal/swiftshader/libEGL.so + opt/Signal/swiftshader/libGLESv2.so" + +src_prepare() { + default + sed -e 's| --no-sandbox||g' \ + -i usr/share/applications/signal-desktop.desktop || die + unpack usr/share/doc/signal-desktop/changelog.gz +} + +src_install() { + insinto / + dodoc changelog + doins -r opt + insinto /usr/share + + if has_version media-sound/apulse[-sdk] && ! has_version media-sound/pulseaudio; then + sed -i 's/Exec=/Exec=apulse /g' usr/share/applications/signal-desktop.desktop || die + fi + + doins -r usr/share/applications + doins -r usr/share/icons + fperms +x /opt/Signal/signal-desktop /opt/Signal/chrome-sandbox + fperms u+s /opt/Signal/chrome-sandbox + pax-mark m opt/Signal/signal-desktop opt/Signal/chrome-sandbox + + dosym -r /opt/Signal/${MY_PN} /usr/bin/${MY_PN} +} + +pkg_postinst() { + xdg_pkg_postinst + elog "For using the tray icon on compatible desktop environments, start Signal with" + elog " '--start-in-tray' or '--use-tray-icon'." +} diff --git a/net-im/tokodon/Manifest b/net-im/tokodon/Manifest index 25a7649eee09..bdfad9f8b1fd 100644 --- a/net-im/tokodon/Manifest +++ b/net-im/tokodon/Manifest @@ -1,4 +1,3 @@ -AUX tokodon-23.04.0-tokodon-not-neochat.patch 1679 BLAKE2B 6a77997b7dbeeba7d7f126655fa6dde19e67bb9838544a24f504b0bdd5d46e035e5cafe174383de1c71d554e7da3649304f3c4101e3aae63f53d9a7fe6145b9e SHA512 64840ded6a91f1cf75cd2df11f3c72eacca509a171fbd3aa4184511aad71d12b0e4a2e8a373573e4835422e5681f9d75063792fb7e1ec759750eb55fe2260c2a -DIST tokodon-23.04.1.tar.xz 233048 BLAKE2B c6e9f0652ac9920339fe70119c03eaf08143c42546338966875151b7c95e52952bfb1fdb7192befa928ec912b4f0b21481cced9f2a787de1b42b9dff1ec610aa SHA512 693783f9a27b9370fe892310680797a46c1a894a718122ae64cb479f15ed3293981adfd83255608e52ec03a25befa76b0cfbd36722d6afb97662880cdfbe3bfd -EBUILD tokodon-23.04.1.ebuild 1425 BLAKE2B 6d464b4238277286ec5b69dadafbc8de0d355cf1b89cc1ddebfb15d8c54da9e15a83b4276f527015a48afe7a7194abc0bedee16fb078746622b48ba5a30e2d7e SHA512 e416df70e51bc146f3a7af3d487309d51636856bd32ad51bcb4979c74dd54487aa1d098a491905f4bf8c4d9f508ba56fd0b49a6f030c9316628ab9ecf8c328bf +DIST tokodon-23.04.2.tar.xz 233084 BLAKE2B ab32b4bdc649f0175001173e715bdb5a171d078332109074eeef043d9874c244ed63cb1c6aea6d0bce5c24e85742401b66db7031a77a8a97ce43da2f760c8f86 SHA512 a867b19788a84dfd5eded1170050d944120a928156b1df1dcafeda7377c7b90efc0625cf47477d9181a697d3c1e67ea098a98dfa4f7ada8a5b2ba56b9b4747a4 +EBUILD tokodon-23.04.2.ebuild 1279 BLAKE2B 68feb5c67f55a5c83135dfec8fa613286c5800afed5a247dee897b062d875cac894a182fd11fab133c5073851e07f05ea0f732791db76b308c3233284bf6a311 SHA512 e859036247f52f96d4c50c763fc96737dcbcceaca121b691f918b545612da28bbdda474d99315eca925dac957cd27a0cd3cc06a13991595d7af3917bf41ee8b8 MISC metadata.xml 377 BLAKE2B e70a23a324a1d14fbba036ceeeb7e5a974eca12759fee38b1869fd486f2386f4552c5a0172b4c13b937da414b6cf3bb762cea06a553447868d21911c9946b06c SHA512 914e345e6869d9d18210855bb27cc02206e62fcc4917be7968411f9b82d640ac71d40d07f3494a756971cc1412de529cf4b12a9ae47852208dfbe2920d56c3b3 diff --git a/net-im/tokodon/files/tokodon-23.04.0-tokodon-not-neochat.patch b/net-im/tokodon/files/tokodon-23.04.0-tokodon-not-neochat.patch deleted file mode 100644 index e9ec12d64a99..000000000000 --- a/net-im/tokodon/files/tokodon-23.04.0-tokodon-not-neochat.patch +++ /dev/null @@ -1,47 +0,0 @@ -From bc361013894ebd1a56f3d9b64da2da730e9487ca Mon Sep 17 00:00:00 2001 -From: Andreas Sturmlechner -Date: Thu, 20 Apr 2023 20:08:45 +0200 -Subject: [PATCH] Fix obvious copy/paste mistakes - -Signed-off-by: Andreas Sturmlechner ---- - src/abstractaccount.cpp | 4 ++-- - src/networkcontroller.cpp | 2 +- - 2 files changed, 3 insertions(+), 3 deletions(-) - -diff --git a/src/abstractaccount.cpp b/src/abstractaccount.cpp -index b3f75444..5fb4d458 100644 ---- a/src/abstractaccount.cpp -+++ b/src/abstractaccount.cpp -@@ -175,7 +175,7 @@ void AbstractAccount::setInstanceUri(const QString &instance_uri) - instance_url.setScheme("https"); // getting token from http is not supported - - m_instance_uri = instance_url.toString(); -- registerApplication("Tokodon", "https://app.kde.org/neochat"); -+ registerApplication("Tokodon", "https://apps.kde.org/tokodon"); - } - - QString AbstractAccount::instanceUri() const -@@ -488,4 +488,4 @@ bool AbstractAccount::isRegistered() const - QString AbstractAccount::settingsGroupName() const - { - return m_name + QLatin1Char('@') + QUrl(m_instance_uri).host(); --} -\ No newline at end of file -+} -diff --git a/src/networkcontroller.cpp b/src/networkcontroller.cpp -index 677e45c1..58a43cbb 100644 ---- a/src/networkcontroller.cpp -+++ b/src/networkcontroller.cpp -@@ -33,7 +33,7 @@ void NetworkController::setApplicationProxy() - Config *cfg = Config::self(); - QNetworkProxy proxy; - -- // type match to ProxyType from neochatconfig.kcfg -+ // type match to ProxyType from config.kcfg - switch (cfg->proxyType()) { - case 1: // HTTP - proxy.setType(QNetworkProxy::HttpProxy); --- -GitLab - diff --git a/net-im/tokodon/tokodon-23.04.1.ebuild b/net-im/tokodon/tokodon-23.04.1.ebuild deleted file mode 100644 index e11e41db902a..000000000000 --- a/net-im/tokodon/tokodon-23.04.1.ebuild +++ /dev/null @@ -1,50 +0,0 @@ -# Copyright 2022-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -ECM_TEST="forceoptional" -KFMIN=5.104.0 -QTMIN=5.15.5 -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.7.2:5 - dev-libs/qtkeychain:=[qt5(+)] - >=dev-qt/qtdeclarative-${QTMIN}:5 - >=dev-qt/qtgui-${QTMIN}:5 - >=dev-qt/qtmultimedia-${QTMIN}:5 - >=dev-qt/qtnetwork-${QTMIN}:5 - >=dev-qt/qtquickcontrols2-${QTMIN}:5 - >=dev-qt/qtsvg-${QTMIN}:5 - >=dev-qt/qtwebsockets-${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 - >=kde-frameworks/kwindowsystem-${KFMIN}:5 - >=kde-frameworks/qqc2-desktop-style-${KFMIN}:5 - >=kde-frameworks/sonnet-${KFMIN}:5[qml] -" -RDEPEND="${DEPEND}" -BDEPEND="virtual/pkgconfig" - -PATCHES=( "${FILESDIR}/${PN}-23.04.0-tokodon-not-neochat.patch" ) # git master - -src_test() { - local -x QT_QPA_PLATFORM=offscreen - ecm_src_test -} diff --git a/net-im/tokodon/tokodon-23.04.2.ebuild b/net-im/tokodon/tokodon-23.04.2.ebuild new file mode 100644 index 000000000000..6ddac3b45100 --- /dev/null +++ b/net-im/tokodon/tokodon-23.04.2.ebuild @@ -0,0 +1,43 @@ +# 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.7.2:5 + dev-libs/qtkeychain:=[qt5(+)] + >=dev-qt/qtdeclarative-${QTMIN}:5 + >=dev-qt/qtgui-${QTMIN}:5 + >=dev-qt/qtmultimedia-${QTMIN}:5 + >=dev-qt/qtnetwork-${QTMIN}:5 + >=dev-qt/qtquickcontrols2-${QTMIN}:5 + >=dev-qt/qtsvg-${QTMIN}:5 + >=dev-qt/qtwebsockets-${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 + >=kde-frameworks/kwindowsystem-${KFMIN}:5 + >=kde-frameworks/qqc2-desktop-style-${KFMIN}:5 + >=kde-frameworks/sonnet-${KFMIN}:5[qml] +" +RDEPEND="${DEPEND}" +BDEPEND="virtual/pkgconfig" -- cgit v1.2.3