From 2ca31eebd5b7496656193e0aa6ae39200d69a017 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Fri, 16 Aug 2024 12:22:56 +0100 Subject: gentoo auto-resync : 16:08:2024 - 12:22:56 --- app-text/Manifest.gz | Bin 50451 -> 50454 bytes app-text/calibre/Manifest | 4 - app-text/calibre/calibre-5.44.0-r3.ebuild | 273 --------------------- app-text/calibre/calibre-7.13.0.ebuild | 243 ------------------ app-text/libmspub/Manifest | 3 +- app-text/libmspub/files/libmspub-0.1.4-gcc15.patch | 42 ++++ app-text/libmspub/libmspub-0.1.4.ebuild | 7 +- app-text/libodfgen/Manifest | 3 +- .../files/libodfgen-0.1.8-gcc15-cstdint.patch | 12 + app-text/libodfgen/libodfgen-0.1.8.ebuild | 4 + app-text/ronn-ng/Manifest | 2 +- app-text/ronn-ng/ronn-ng-0.10.1.ebuild | 2 +- 12 files changed, 70 insertions(+), 525 deletions(-) delete mode 100644 app-text/calibre/calibre-5.44.0-r3.ebuild delete mode 100644 app-text/calibre/calibre-7.13.0.ebuild create mode 100644 app-text/libmspub/files/libmspub-0.1.4-gcc15.patch create mode 100644 app-text/libodfgen/files/libodfgen-0.1.8-gcc15-cstdint.patch (limited to 'app-text') diff --git a/app-text/Manifest.gz b/app-text/Manifest.gz index c9a1de361d3c..b0e078da3c93 100644 Binary files a/app-text/Manifest.gz and b/app-text/Manifest.gz differ diff --git a/app-text/calibre/Manifest b/app-text/calibre/Manifest index 9ca23a6239b0..3dda4e0dcecb 100644 --- a/app-text/calibre/Manifest +++ b/app-text/calibre/Manifest @@ -10,12 +10,8 @@ AUX calibre-server-3.init 1796 BLAKE2B f87d785d6f6fc10fa648d40944ec8538027854bb8 AUX e9cc00560a28f56a303cca97630ab58e519dd9c8.patch 1335 BLAKE2B eb71cb5510d2259bbc7a4fe7b54652bb543aa3d26816654da7e22a6effb0c81770a91eccccecff5fe711d0495ff5b1ab378231e3cb10dd18f3faeb301acab1ba SHA512 211ea8c0fab1de5bd076eb965eda51ee1330a69e54251fc6a16e5aa0d6ef7721aea14a57a27eb75a99c8e37418aa15bd311e6f4d03f1f05d80cd87d2f00fb995 DIST calibre-5.44.0.tar.xz 41015696 BLAKE2B c7053e728da20fccfa981ed4f56e24a4d5b382b7687c92ecb039b078fd4828de0529380093e4ab33f77d78aa54a59758c1620cf8f918937a9a64f13decdf77ee SHA512 3d79e76d820cd1a41605dfd4c1d992599a6e4a759e57a8383d42d86982177e4539313f59e647758ab1896ce5874cb2a93c7678bf962e332c44171651aabf0230 DIST calibre-5.44.0.tar.xz.sig 566 BLAKE2B 413b95855d79bdb5b17ca5d760f834006797b4d3e413604f27d351a3392e16d647e772dc063306bf973e1156c34f68cb38152a66164bca849ebed5484e7f6065 SHA512 59957bf35a73f218241bf76cc86994d5af87cea11d3b0800e83f157bf0b2cfcaf4b6c1314562e74a1141d0c167fdb1619cb9a90e93b67f55dd55ceed77045059 -DIST calibre-7.13.0.tar.xz 44331860 BLAKE2B d5d9d04740dff52e59af0efff30e1044d52d188d58a91a9c8191084e021218feffca15cbde27f12a742e38d6db49168c6c6b64b1df9de5384c1b361ef66ba10b SHA512 b64bba8b6982e2f41b6e1e1d9392a07f15307781a1da3b2f2daca464f1d1303a7ff44af398c0c0edc84dda8090cd47461bf1570daa8ba12496661eae2f3c3bca -DIST calibre-7.13.0.tar.xz.sig 566 BLAKE2B 40ee9d53eb658623f0047601ddf26bde232b9f4575309faa09ab2ea74b70d8c43fa82a7dc80bb322fca908923661ed8ec33050917196c0f22ff490f9348b266f SHA512 6943ea01c30c8c2ed49f115873cbe1d75484a79deedf734d77ba2326b6f2a2d35994b0219d8e81789e46e8a56d01a19efe8f124c8ebb546b86fa287d8449bf6e DIST calibre-7.16.0.tar.xz 44833684 BLAKE2B 2b609a0d014d43998f693a69c10f6d8b0165bf97f8c9d388cf4e1e398e7254b300d53b26e5ec24af651e03bb625bb088331dc77aa2ed6edea13de2beb0e75339 SHA512 5ea11badd972422299ce143e2aa33f58f7abcfd2837acba47d2a7aa6f0997a711245273205ed043c783e5e82bbaaf7cab44e5c03c00e274a03a4ba29be53a708 DIST calibre-7.16.0.tar.xz.sig 566 BLAKE2B 1d09e8dd49ad53c88632dc23573fa9cd5403d45a308598ac4ed7d4f2dd5a84cc3ae6812ac652ff4a98fc5d67589ad1584411f7746b6b98468bf03a35a0585de6 SHA512 91f3897d95d234a8d673006273974d32cb6c5aa4953d247700d6d89d511c9b1450dc8e222eabf5d1e4d82de206e425ee440defaff38d1ca83efdbf4bcada7c7c -EBUILD calibre-5.44.0-r3.ebuild 8986 BLAKE2B 3055654a1132d06eb936157d827a147a32be85a0a181ef04b9937375413bfdf7fcf5595c0e60b19a813ef167e40bc5e2f3ab115cfb9c167621ba6b68b9eacfe8 SHA512 486f7b728ecc6fdf2834fdbffc5d46c0dd27a83f73af65aab435f083486726f00b321f6bd2c350dd0bb0676596e0a3602c11a2c65700c89e121e88edbe706e25 EBUILD calibre-5.44.0-r5.ebuild 8978 BLAKE2B aefccace3b939a72817f8c9cf36f4687d492af4ea84f8b588199dab1134989ebf030ddcf7609c834f4ea3b313dfb403e50af8c5e007309f0b3aa6e036128706b SHA512 63cadd04ff3ffb9b2d27fde04caf7caf43f981dd012cacd36569efc305db15aca09ddaf1875308368a8001e6b047cf44f55ff6a513d9d03428963fb171d4c45b -EBUILD calibre-7.13.0.ebuild 7987 BLAKE2B 15c5678554e68f5187d228175e6f65548a1ea9807bf06b7020c8e11b41a7a3e6fd03100d86ca32abc296c300309df7d9165364539cbaec15ca56c1dce03278e9 SHA512 af7c748f66e8a76338d96d20fa7d91d9d09b1bc00d8d187c9b44f952e827fbca63a3eb3d9d81302ce8b84ba911fe4ef711cba9df5b8d4a2dd9ed6d06f3b04c2d EBUILD calibre-7.16.0.ebuild 7987 BLAKE2B 15c5678554e68f5187d228175e6f65548a1ea9807bf06b7020c8e11b41a7a3e6fd03100d86ca32abc296c300309df7d9165364539cbaec15ca56c1dce03278e9 SHA512 af7c748f66e8a76338d96d20fa7d91d9d09b1bc00d8d187c9b44f952e827fbca63a3eb3d9d81302ce8b84ba911fe4ef711cba9df5b8d4a2dd9ed6d06f3b04c2d MISC metadata.xml 745 BLAKE2B 2e1e831d9e6a1f32596b4544a7237c020e2c027a3e872fc517e2557bd8b1be6d0ddb0335f5266159c0e0fbb8776e8d048916e716b77cd011da14bbd51779922d SHA512 3d0ef51069731cac8f751af461367d74151df517cab48c0fd66f1c3a2fab1d3a92f9a06118c700dd782fddbe0055bd379bd79f81f2dbb1adcc5b2a22a443e94d diff --git a/app-text/calibre/calibre-5.44.0-r3.ebuild b/app-text/calibre/calibre-5.44.0-r3.ebuild deleted file mode 100644 index 1ca560b39c37..000000000000 --- a/app-text/calibre/calibre-5.44.0-r3.ebuild +++ /dev/null @@ -1,273 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -PYTHON_COMPAT=( python3_{10..12} ) -PYTHON_REQ_USE="ipv6(+),sqlite,ssl" - -inherit toolchain-funcs python-single-r1 qmake-utils verify-sig xdg-utils - -DESCRIPTION="Ebook management application" -HOMEPAGE="https://calibre-ebook.com/" -SRC_URI=" - https://download.calibre-ebook.com/${PV}/${P}.tar.xz - verify-sig? ( https://calibre-ebook.com/signatures/${P}.tar.xz.sig ) -" -VERIFY_SIG_OPENPGP_KEY_PATH="/usr/share/openpgp-keys/kovidgoyal.gpg" - -LICENSE=" - GPL-3+ - GPL-3 - GPL-2+ - GPL-2 - GPL-1+ - LGPL-3+ - LGPL-2.1+ - LGPL-2.1 - BSD - MIT - Old-MIT - Apache-2.0 - public-domain - || ( Artistic GPL-1+ ) - CC-BY-3.0 - OFL-1.1 - PSF-2 -" -SLOT="0" -KEYWORDS="amd64" -IUSE="ios speech test +udisks" - -RESTRICT="!test? ( test )" - -REQUIRED_USE="${PYTHON_REQUIRED_USE}" - -# Qt slotted dependencies are used because the libheadless.so plugin links to -# QT_*_PRIVATE_ABI. It only uses core/gui/dbus. -COMMON_DEPEND="${PYTHON_DEPS} - >=app-text/hunspell-1.7:= - >=app-text/podofo-0.9.6_pre20171027:= - =dev-libs/icu-57.1:= - dev-libs/openssl:= - dev-libs/snowball-stemmer:= - $(python_gen_cond_dep ' - >=dev-python/apsw-3.25.2_p1[${PYTHON_USEDEP}] - dev-python/beautifulsoup4[${PYTHON_USEDEP}] - dev-python/cchardet[${PYTHON_USEDEP}] - >=dev-python/css-parser-1.0.4[${PYTHON_USEDEP}] - dev-python/dnspython[${PYTHON_USEDEP}] - >=dev-python/feedparser-5.2.1[${PYTHON_USEDEP}] - >=dev-python/html2text-2019.8.11[${PYTHON_USEDEP}] - >=dev-python/html5-parser-0.4.9[${PYTHON_USEDEP}] - dev-python/jeepney[${PYTHON_USEDEP}] - >=dev-python/lxml-3.8.0[${PYTHON_USEDEP}] - >=dev-python/markdown-3.0.1[${PYTHON_USEDEP}] - >=dev-python/mechanize-0.3.5[${PYTHON_USEDEP}] - >=dev-python/msgpack-0.6.2[${PYTHON_USEDEP}] - >=dev-python/netifaces-0.10.5[${PYTHON_USEDEP}] - >=dev-python/pillow-3.2.0[jpeg,truetype,webp,zlib,${PYTHON_USEDEP}] - >=dev-python/psutil-4.3.0[${PYTHON_USEDEP}] - >=dev-python/pychm-0.8.6[${PYTHON_USEDEP}] - >=dev-python/pygments-2.3.1[${PYTHON_USEDEP}] - >=dev-python/python-dateutil-2.5.3[${PYTHON_USEDEP}] - dev-python/zeroconf[${PYTHON_USEDEP}] - >=dev-python/PyQt5-5.15.5_pre2107091435[gui,widgets,network,printsupport,svg,${PYTHON_USEDEP}] - >=dev-python/PyQtWebEngine-5.15.5_pre2108100905[${PYTHON_USEDEP}] - dev-python/regex[${PYTHON_USEDEP}] - ') - dev-qt/qtimageformats:5 - dev-qt/qtcore:5= - dev-qt/qtdbus:5= - dev-qt/qtgui:5=[jpeg,png] - dev-qt/qtwidgets:5 - dev-util/desktop-file-utils - dev-util/gtk-update-icon-cache - media-fonts/liberation-fonts - media-libs/fontconfig:= - >=media-libs/freetype-2:= - >=media-libs/libmtp-1.1.11:= - >=media-gfx/optipng-0.7.6 - virtual/libusb:1= - x11-misc/shared-mime-info - >=x11-misc/xdg-utils-1.0.2-r2 - ios? ( - >=app-pda/usbmuxd-1.0.8 - >=app-pda/libimobiledevice-1.2.0 - ) - speech? ( $(python_gen_cond_dep 'app-accessibility/speech-dispatcher[python,${PYTHON_USEDEP}]') ) - udisks? ( virtual/libudev )" -RDEPEND="${COMMON_DEPEND} - udisks? ( sys-fs/udisks:2 )" -DEPEND="${COMMON_DEPEND} - test? ( $(python_gen_cond_dep '>=dev-python/chardet-3.0.3[${PYTHON_USEDEP}]') ) -" -BDEPEND="$(python_gen_cond_dep ' - >=dev-python/PyQt-builder-1.10.3[${PYTHON_USEDEP}] - >=dev-python/sip-5[${PYTHON_USEDEP}] - ') - >=virtual/podofo-build-0.9.6_pre20171027 - +Date: Thu, 15 Aug 2024 20:55:25 -0400 +Subject: [PATCH] fix missing include + +int64_t comes from stdint.h, but it was never included. This is +transitively provided by some headers, on some versions of GCC, but in +GCC 15 a bit of routine cleanup means this header is no longer silently +exposed to arbitrary codebases without asking. + +As such, it fails to build. + +In upstream libmspub commit 28c545e7d04d58af998bcf4af5d1bb326d29836c, +the boost cstdint header was added as part of other work. I am not sure +why -- maybe to fix this missing header? :D But using all of boost for +this is a bit odd and unnecessary, especially when not backporting an +entire commit. + +Add in the correct stdlib header as a local backport while distros wait +for libmspub to release a new version. + +Signed-off-by: Eli Schwartz +--- + src/lib/Coordinate.h | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/src/lib/Coordinate.h b/src/lib/Coordinate.h +index bec3fe2..b87608d 100644 +--- a/src/lib/Coordinate.h ++++ b/src/lib/Coordinate.h +@@ -10,6 +10,8 @@ + #ifndef INCLUDED_COORDINATE_H + #define INCLUDED_COORDINATE_H + ++#include ++ + #include "MSPUBConstants.h" + + namespace libmspub +-- +2.44.2 + diff --git a/app-text/libmspub/libmspub-0.1.4.ebuild b/app-text/libmspub/libmspub-0.1.4.ebuild index 78d0df1963cf..40612b0cc463 100644 --- a/app-text/libmspub/libmspub-0.1.4.ebuild +++ b/app-text/libmspub/libmspub-0.1.4.ebuild @@ -33,7 +33,12 @@ BDEPEND=" doc? ( app-text/doxygen ) " -PATCHES=( "${FILESDIR}/${P}-gcc10.patch" ) +PATCHES=( + # upstream backport + "${FILESDIR}/${P}-gcc10.patch" + # manually backported + "${FILESDIR}/${P}-gcc15.patch" +) src_prepare() { default diff --git a/app-text/libodfgen/Manifest b/app-text/libodfgen/Manifest index 9a60b5469002..369a5894955f 100644 --- a/app-text/libodfgen/Manifest +++ b/app-text/libodfgen/Manifest @@ -1,4 +1,5 @@ +AUX libodfgen-0.1.8-gcc15-cstdint.patch 265 BLAKE2B a3d9482f888a3a25b5c236308eaf15ac0e51d1f8506ea1f711a366aa5b6d3b67db1a52aed3fbcf07d2603378e8a9f7ef526e1571e9d54db44d8ad2445f7be535 SHA512 66cf72953d65556ef7346213b37c96210ec5d0d61857f3ae7c773645d83b13d102ed72dc521852d72b06000b5a461f4387ba0ee35f0410961f0f115640ba76d6 DIST libodfgen-0.1.8.tar.xz 386156 BLAKE2B 8cc55cd6ad39927ca1fec459cb484362877f0eb0a044d806a93ec573ca2d840fece17fdbb58b0b30869af945fe9ddaa23a88729c1802b2b1321d5551f94a32c5 SHA512 e4a15aa7f1db483cdbb9c531bfb234b4794890cc583c70e8aa3374771be8928e7917105d48dab80d1ab6d57e43fa78415097d9b897cb12fb2a609f4647ee99d6 -EBUILD libodfgen-0.1.8.ebuild 1157 BLAKE2B 7e77c1a5379f37b80abd335b92cfd91f9cc4fa6fe4bf1398fc30d506c59391c2aa9555c10602088c1aa711306e515901cfc4395966fd4f01700e9bdd439ec9cc SHA512 aebfa11f07a63c3573703bc3a35a95609faed31d7e28efffe128199f2e6b0fe391d893ca7c0245ecc52e2e8b635eb94e9befd7ebd0529c89b4f55882e3682bba +EBUILD libodfgen-0.1.8.ebuild 1217 BLAKE2B 15d6d6a25550270c737300cfaf8f5861f9845b73c704b222fe38a59a1b27cb144298f80db8d8f7046967b5440f4414d8a562e0362a059d1fa6f43564471ba189 SHA512 9d4fab31d444d2154bce0b442c2a96c062b2e31c541c41b00335d1abbddeb0af8ed09965b98aeb7f6291d8bb20380088188a8caa612502b038218960e76cc4a4 EBUILD libodfgen-9999.ebuild 1098 BLAKE2B 4697806cf2574440d2b6cf26d377d19ba20b71e99e4cd77f71b20246a49334742beb2549bd656465baed9db28d35b6ef4ed3c699e8779a290fbc316f4925989c SHA512 bbcb60d84be9af9da0e3d59e3af6ddfdd63eec324e73112d51c436432e56c3ffc7df00853f4e20d25238167777e4d8344858e14de538b7f629ec2ec24c9d2c77 MISC metadata.xml 332 BLAKE2B e634e10175b4d69d73bb785dd430f4d23a2b4c679bf00b8b725c3fa89f9b34d77a5e7bdbc60ffaf9f2207e4d71d29a0cbf53264b57c33b0e7a7ea92c8a806b72 SHA512 d5c038b2dd6f35c0b66f877ca94d05e294c6da83c68763af2ff75e44e0bde91111b48d7cacafe8510294476a230e9bdb0ae74664bf77555d45463d24fa2d668c diff --git a/app-text/libodfgen/files/libodfgen-0.1.8-gcc15-cstdint.patch b/app-text/libodfgen/files/libodfgen-0.1.8-gcc15-cstdint.patch new file mode 100644 index 000000000000..1fcf58d88e8a --- /dev/null +++ b/app-text/libodfgen/files/libodfgen-0.1.8-gcc15-cstdint.patch @@ -0,0 +1,12 @@ +https://bugs.gentoo.org/937527 +https://sourceforge.net/p/libwpd/tickets/27/ +--- a/src/OdfGenerator.cxx ++++ b/src/OdfGenerator.cxx +@@ -33,6 +33,7 @@ + #include + + #include ++#include + #include + #include + #include diff --git a/app-text/libodfgen/libodfgen-0.1.8.ebuild b/app-text/libodfgen/libodfgen-0.1.8.ebuild index 13c381630736..56e3812647de 100644 --- a/app-text/libodfgen/libodfgen-0.1.8.ebuild +++ b/app-text/libodfgen/libodfgen-0.1.8.ebuild @@ -31,6 +31,10 @@ BDEPEND=" doc? ( app-text/doxygen ) " +PATCHES=( + "${FILESDIR}"/${PN}-0.1.8-gcc15-cstdint.patch +) + src_prepare() { default [[ ${PV} == 9999 ]] && eautoreconf diff --git a/app-text/ronn-ng/Manifest b/app-text/ronn-ng/Manifest index fc3b7afd3aac..b2db74a2a667 100644 --- a/app-text/ronn-ng/Manifest +++ b/app-text/ronn-ng/Manifest @@ -1,6 +1,6 @@ AUX ronn-ng-0.9.1-psych-4-tests.patch 1640 BLAKE2B 52ec0e314d9253c06874ce95ab5be8bb9fa9e5ff8b04b6df385a7e14c3edb919b0f2b9a7e2048552cf235c91d77877485e4fb3239eb222c99f53c412a46983d8 SHA512 803f7f4368599e8b55ed78d8444d585bc9f7568af4f9ab3d4b53c12d31fdc412776c259bff91a9b905b3482c68ce29ed2827682d2d7541669b9e5a4bdf1ebe3b DIST ronn-ng-0.10.1.tar.gz 78696 BLAKE2B 1e56b90c5919e0a1af317da78161b34124268521fbc379fbba09ff9cb344073665460abc53fd961e4773ee444f33fba7e72ae3f6af84f8a170cfb1e89e557922 SHA512 3f6ee5355c7a19d5cb04c1b677028dd13ad2ff620acdb2e83d9b6f154a7b1e7b5a77ea0bcfbcef4bbb46a60b1c0fbc52fda079ff860c83a71f89b8fed0b83665 DIST ronn-ng-0.9.1.gem 69120 BLAKE2B 9da30156104ef448c458199ee33fb5369f7d97c7bbeac8072567127b964456a34226bcc15f72d6f2875f524175d31ec9652a282b369e818748790cd07f290786 SHA512 5ad7dc426d9bc77bca86fbb06775a3b19f1b8d79f5a4331d117e9fa394e7a9c3b0440b70b993672d77a24f56f5da3ebd0e41a5183f4330707b7ddb83c9108bdf -EBUILD ronn-ng-0.10.1.ebuild 1302 BLAKE2B e0bd1b84e3e05ef8220cb72f481f6365e32f3939530656f7ee9ad5d5e3cf635a459c982df0dc84b328d53b7eb2993b848f6f98a57cb79e3889a1d854ccf19512 SHA512 f8459d3a9d920f1b16d9323e813b0d85c0e798d2b9579e4999701b1754c5373c31f45115c3c4290d1bc156eaed07d56717a8c33eba6b45fbea9c2a8f0c2ae8cc +EBUILD ronn-ng-0.10.1.ebuild 1301 BLAKE2B b4ff13860c5efe45610698520c9050addeffa002b44a6ccc7fa42f3312894a2fc1058894de83f176adebbb41155aeaabd52a38c488327a980be9848a63e4bc5e SHA512 0a991d53c96f803fd3a9a79bce2e97b90dd2a31ffdcd7f4300903c03cebf2f13da1e74b9a0acf6c57ac1c19b99b603bcd5b87fb7760e1dcf466906a7dbe61fe4 EBUILD ronn-ng-0.9.1-r3.ebuild 1324 BLAKE2B 07a801ced9834a24c67b30cc897bb674823e79bd26fe246f78aa5b13e92d6d01f2fc8c66bba0ca36b1e1302a389475f4c3296d5f8d20778544f983a5a290d163 SHA512 ab57b427ec2a02eb5595d4ca4d124e52f3b5e884ef7f00dc13f7d9544d38f67cda2fe7a4bab3645dc67ba0130c493021bd02f42e7b943b9d386cb3fdd96f2b9a MISC metadata.xml 342 BLAKE2B 71ab5a2d2a9e2d20165f54c1cf79f483768c3637cc87a32acf80708d79b3be9d24408a330ed23ad837848933b0a40f1165f60d7b7e08146a28088a4d9d558630 SHA512 92e6778f8a2f44a81dfdbbd6699ce2186cc48b801f5c462c99b4bc35f79806ff154d72bec2916d79dc7435c1a9b75f2bf3842b7dba2b132335afc38d00d22780 diff --git a/app-text/ronn-ng/ronn-ng-0.10.1.ebuild b/app-text/ronn-ng/ronn-ng-0.10.1.ebuild index d1fb0d67cc93..a972f9234dd4 100644 --- a/app-text/ronn-ng/ronn-ng-0.10.1.ebuild +++ b/app-text/ronn-ng/ronn-ng-0.10.1.ebuild @@ -15,7 +15,7 @@ SRC_URI="https://github.com/apjanke/ronn-ng/archive/refs/tags/v${PV}.tar.gz -> $ LICENSE="MIT" SLOT="0" -KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86" +KEYWORDS="~amd64 ~arm arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86" RDEPEND+="!app-text/ronn" -- cgit v1.2.3