From ff0c814917b9685d27f35f29c1c70b4dedf440d1 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Thu, 16 Nov 2023 10:45:06 +0000 Subject: gentoo auto-resync : 16:11:2023 - 10:45:06 --- net-im/Manifest.gz | Bin 9237 -> 9236 bytes net-im/signal-desktop-bin/Manifest | 4 +- .../signal-desktop-bin-6.37.0.ebuild | 95 --------------------- .../signal-desktop-bin-6.39.0.ebuild | 95 +++++++++++++++++++++ net-im/telegram-desktop-bin/Manifest | 9 +- .../telegram-desktop-bin-4.11.3-r1.ebuild | 62 -------------- .../telegram-desktop-bin-4.11.5.ebuild | 62 -------------- .../telegram-desktop-bin-4.11.7.ebuild | 62 ++++++++++++++ 8 files changed, 162 insertions(+), 227 deletions(-) delete mode 100644 net-im/signal-desktop-bin/signal-desktop-bin-6.37.0.ebuild create mode 100644 net-im/signal-desktop-bin/signal-desktop-bin-6.39.0.ebuild delete mode 100644 net-im/telegram-desktop-bin/telegram-desktop-bin-4.11.3-r1.ebuild delete mode 100644 net-im/telegram-desktop-bin/telegram-desktop-bin-4.11.5.ebuild create mode 100644 net-im/telegram-desktop-bin/telegram-desktop-bin-4.11.7.ebuild (limited to 'net-im') diff --git a/net-im/Manifest.gz b/net-im/Manifest.gz index 3156b63a7c2f..fabecc15f538 100644 Binary files a/net-im/Manifest.gz and b/net-im/Manifest.gz differ diff --git a/net-im/signal-desktop-bin/Manifest b/net-im/signal-desktop-bin/Manifest index 9279fdd832dd..ec3c5d23d480 100644 --- a/net-im/signal-desktop-bin/Manifest +++ b/net-im/signal-desktop-bin/Manifest @@ -1,3 +1,3 @@ -DIST signal-desktop_6.37.0_amd64.deb 112027364 BLAKE2B b1dff732c6566a9ec50c26627aae3c278e2fb516089d014770bafbfec4a39a56d779a34a15b176e53b5c94410d631e9f8d602633b5bc2dccf3ec8d894469133e SHA512 264e7d5c4d2dc9375b81efd9f4b9f32f94e0f29a09a407833a540aeeed6212f9fe3763cf791aa36311cf819bcbc26122c1d9218379290d1081a5c900e031f019 -EBUILD signal-desktop-bin-6.37.0.ebuild 2356 BLAKE2B 6f1229074228e042ba9a654f4b8fe930272c6488eae085168572821e989c44c6be9cce5e8e23ed49c01feaff1a5d1fc86a40374c4dfa03393fa27589e20516b3 SHA512 11f872e1b01235411c4402116560a3083baf297378cf8726975a9676527fb0cbfe6b58b6adcc21da9d5cc87979b728bebb44ba5e8a876b87ae0761d1260cbb7a +DIST signal-desktop_6.39.0_amd64.deb 112042954 BLAKE2B 12758946914739dc5f79867027584669a7baa628f654c402846e0ec3491496d664b6552a9e43e0314a32cdbfb461d3f880d28ed28b57e508c876352d920315ea SHA512 50a8b6c2f8dbd42c03364008e9d3dfe4228ceba96a72d2bca1781f9a64ec000e0c51c36632ba481ea68143a82eca06471b07bf05886c740b1242b17675ed0d96 +EBUILD signal-desktop-bin-6.39.0.ebuild 2356 BLAKE2B 6f1229074228e042ba9a654f4b8fe930272c6488eae085168572821e989c44c6be9cce5e8e23ed49c01feaff1a5d1fc86a40374c4dfa03393fa27589e20516b3 SHA512 11f872e1b01235411c4402116560a3083baf297378cf8726975a9676527fb0cbfe6b58b6adcc21da9d5cc87979b728bebb44ba5e8a876b87ae0761d1260cbb7a MISC metadata.xml 486 BLAKE2B cfc118c5488c5c50b4de72443e6b836992a4ba7a6fb94358552c814006a49b00580b5ab0a57141b17809e1d2a898b9e23e6fee0837778edfa7f6de53ccc09d01 SHA512 4ab7dc5fd6fb03e7296164d0d924ab4eb11c6fd31c2fc651706892eda53b29be5db65cd94da8e6aa743e9b7ed10ee3e5f25f14dd2d1be99459daa11f529dbb95 diff --git a/net-im/signal-desktop-bin/signal-desktop-bin-6.37.0.ebuild b/net-im/signal-desktop-bin/signal-desktop-bin-6.37.0.ebuild deleted file mode 100644 index 0e583402923d..000000000000 --- a/net-im/signal-desktop-bin/signal-desktop-bin-6.37.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/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-libs/libpulse - 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.39.0.ebuild b/net-im/signal-desktop-bin/signal-desktop-bin-6.39.0.ebuild new file mode 100644 index 000000000000..0e583402923d --- /dev/null +++ b/net-im/signal-desktop-bin/signal-desktop-bin-6.39.0.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-libs/libpulse + 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/telegram-desktop-bin/Manifest b/net-im/telegram-desktop-bin/Manifest index 0c69a2a0fbe6..8a01bc90f686 100644 --- a/net-im/telegram-desktop-bin/Manifest +++ b/net-im/telegram-desktop-bin/Manifest @@ -1,7 +1,4 @@ -DIST tdesktop-4.11.3.tar.gz 18254355 BLAKE2B 0f24ca31bc1b0f5eec6c21c00048f6d15c3c1e491eaf387b8506382cafffbc8afb9fa4b14f26985ab093945371e68681ee1e90f0dcbf3835e7547c02885d7586 SHA512 ec17e6f2f3ca59e3697798055b42d4eed02c9f0eb1fd60ea4cf3946be68d1a0a4b720cda5db705a0127902329de96894e6c190842ae6287732ffd02d7ae0b327 -DIST tdesktop-4.11.5.tar.gz 18283215 BLAKE2B 81beb626179162ad005c2dc8335438c47f3b9b215e58fb96e0dc3baf29293c4bd6c7cc5ce7167080998e4ab30e551e1364ee69b119d477a923546f5fc5c60643 SHA512 d38ec10e9d0c3967577f2fa18b40cd8333576ac916b377fcbac8be768cd05774a23039bba6bc063b58214e4ad20eb47875593834725741bc4fe51d133a90e4a9 -DIST tsetup.4.11.3.tar.xz 52997540 BLAKE2B fd722374fe18d860eed437f31f0a3c1da696e02a09111f289a801b34071d24da204df52db93eb80e4bb64220e20ca1d0a4915a8993890d4a74253597b143c261 SHA512 6b2ef6a95dde09497249cf09ecd9c3e65764771714e3fed4ace547e56bae5ceb346ff288ad9a51dbae499266d42ee2e549a16c91553a0b6be98cb336dd166a23 -DIST tsetup.4.11.5.tar.xz 53092984 BLAKE2B 6c24678e18ce3485538833ec1b903da97e3be6eb253eabe8bd2913832b94539f13d6f5c27736dc3c2073139f968edc9fe201891f414c21d262db27a6a0377da0 SHA512 8dd2ec33d19bd5ebcbd3ba311bf888f4c248165d42beb9504450cff649623eb929d783657aced8d8adbe0bc80ecc620cbc028a7446e159fc03082e84b15b7454 -EBUILD telegram-desktop-bin-4.11.3-r1.ebuild 1615 BLAKE2B d6504a0028c7d0c659773298a52df5225a2e0b27118fbab31c6579a2250f6992aaef21b8ded42b32a140fa26cb3a3b44d5b0e57bb373a70c07063057f90677de SHA512 195f50c7fba99c5304567afb6d9cb9ebabbbe9bd27955177eed66a23825b2b53e0550400a8d293bb74e2ff3221600f4764ea4695c4e71e371e2512ca4060b9b4 -EBUILD telegram-desktop-bin-4.11.5.ebuild 1615 BLAKE2B d6504a0028c7d0c659773298a52df5225a2e0b27118fbab31c6579a2250f6992aaef21b8ded42b32a140fa26cb3a3b44d5b0e57bb373a70c07063057f90677de SHA512 195f50c7fba99c5304567afb6d9cb9ebabbbe9bd27955177eed66a23825b2b53e0550400a8d293bb74e2ff3221600f4764ea4695c4e71e371e2512ca4060b9b4 +DIST tdesktop-4.11.7.tar.gz 18321400 BLAKE2B 5e7a22f7b20e9a14f15cc9d0e054bb303eca96777c47c0a4d9aaa4de3840049f0b2901d16b7f794d523db452eef2846454523424adcb7c7f02949ed33777c241 SHA512 a3f689181e54eea3278ec9b84861e416b51702464f9cb848a12365ad610dc5cc5846be9494aa0dfe7c626dbacc1b9e1271ba23bcd8fa97ae26884b0f0506e882 +DIST tsetup.4.11.7.tar.xz 53219368 BLAKE2B 704c12bced7c7d229f00828488c3a5426a85c9cf49a9883a46f642ebe4f280d78e143443495d98a12e68c6d1e9c4dcde67c7e53c08dbc03616352d0f7de88046 SHA512 adf023e3b4fbff87156fc1e15748ffc29b2d7007d04aecd64b60f66c05db4b325cd0f53cd1256ee7bd002906946bef0e702024a8113a143c591cc81933d93d9e +EBUILD telegram-desktop-bin-4.11.7.ebuild 1615 BLAKE2B d6504a0028c7d0c659773298a52df5225a2e0b27118fbab31c6579a2250f6992aaef21b8ded42b32a140fa26cb3a3b44d5b0e57bb373a70c07063057f90677de SHA512 195f50c7fba99c5304567afb6d9cb9ebabbbe9bd27955177eed66a23825b2b53e0550400a8d293bb74e2ff3221600f4764ea4695c4e71e371e2512ca4060b9b4 MISC metadata.xml 501 BLAKE2B 94aa66404772e94f51d8c59e36d19e6454f37173aaac352fe3539bcc09e72c267e69001c41f8356f19ca2830107164144d907865ad7fb3ad1def8771f5ef6d9a SHA512 3cd8e818062cd40787f12c9530ed202ea23c3f60a70f1ab50c95a7b3310197590be5a75378c598dabe5a1fce310fa8acf409a36e7446b66c2046a109d59a5ff8 diff --git a/net-im/telegram-desktop-bin/telegram-desktop-bin-4.11.3-r1.ebuild b/net-im/telegram-desktop-bin/telegram-desktop-bin-4.11.3-r1.ebuild deleted file mode 100644 index d81c56fd7260..000000000000 --- a/net-im/telegram-desktop-bin/telegram-desktop-bin-4.11.3-r1.ebuild +++ /dev/null @@ -1,62 +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/gtk+:3[X,wayland] - x11-libs/libX11 - >=x11-libs/libxcb-1.10 -" - -S="${WORKDIR}/Telegram" - -src_prepare() { - default - - 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 /usr/share/TelegramDesktop/externalupdater.d/ - 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 - insinto /usr/share/dbus-1/services - doins "${WORKDIR}/tdesktop-${PV}"/lib/xdg/org.telegram.desktop.service -} - -pkg_postinst() { - xdg_pkg_postinst - optfeature "spell checker support" app-text/enchant -} diff --git a/net-im/telegram-desktop-bin/telegram-desktop-bin-4.11.5.ebuild b/net-im/telegram-desktop-bin/telegram-desktop-bin-4.11.5.ebuild deleted file mode 100644 index d81c56fd7260..000000000000 --- a/net-im/telegram-desktop-bin/telegram-desktop-bin-4.11.5.ebuild +++ /dev/null @@ -1,62 +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/gtk+:3[X,wayland] - x11-libs/libX11 - >=x11-libs/libxcb-1.10 -" - -S="${WORKDIR}/Telegram" - -src_prepare() { - default - - 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 /usr/share/TelegramDesktop/externalupdater.d/ - 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 - insinto /usr/share/dbus-1/services - doins "${WORKDIR}/tdesktop-${PV}"/lib/xdg/org.telegram.desktop.service -} - -pkg_postinst() { - xdg_pkg_postinst - optfeature "spell checker support" app-text/enchant -} diff --git a/net-im/telegram-desktop-bin/telegram-desktop-bin-4.11.7.ebuild b/net-im/telegram-desktop-bin/telegram-desktop-bin-4.11.7.ebuild new file mode 100644 index 000000000000..d81c56fd7260 --- /dev/null +++ b/net-im/telegram-desktop-bin/telegram-desktop-bin-4.11.7.ebuild @@ -0,0 +1,62 @@ +# 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/gtk+:3[X,wayland] + x11-libs/libX11 + >=x11-libs/libxcb-1.10 +" + +S="${WORKDIR}/Telegram" + +src_prepare() { + default + + 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 /usr/share/TelegramDesktop/externalupdater.d/ + 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 + insinto /usr/share/dbus-1/services + doins "${WORKDIR}/tdesktop-${PV}"/lib/xdg/org.telegram.desktop.service +} + +pkg_postinst() { + xdg_pkg_postinst + optfeature "spell checker support" app-text/enchant +} -- cgit v1.2.3