From 398d9172b9154d9142921d08bd850f99fa8601e4 Mon Sep 17 00:00:00 2001 From: Alexey Zapparov Date: Wed, 20 Nov 2024 03:33:02 +0100 Subject: [PATCH 1/9] app-admin/pulumi-bin: add 3.140.0, drop 3.136.0 Signed-off-by: Alexey Zapparov --- app-admin/pulumi-bin/Manifest | 2 +- .../{pulumi-bin-3.136.0.ebuild => pulumi-bin-3.140.0.ebuild} | 0 2 files changed, 1 insertion(+), 1 deletion(-) rename app-admin/pulumi-bin/{pulumi-bin-3.136.0.ebuild => pulumi-bin-3.140.0.ebuild} (100%) diff --git a/app-admin/pulumi-bin/Manifest b/app-admin/pulumi-bin/Manifest index 352b796a4d..5326021c0b 100644 --- a/app-admin/pulumi-bin/Manifest +++ b/app-admin/pulumi-bin/Manifest @@ -1,4 +1,4 @@ -DIST pulumi-v3.136.0-linux-x64.tar.gz 164101932 BLAKE2B a2919c7911cd934d4160b4318c46cc3ebf9dfbc931ae2f4a98388e3e8a3260f481a718a828e430db3ead92d69244a873f4053bbe5ae15d7206920242bf32031b SHA512 e7b8c603bd10d259153764d9748a67ad2b366b6aa3f481eb97e11380d27d6d5e639a47e7840221efa68ff052581aa64313fc976dca1a8ae397cb2a391a2ddf51 DIST pulumi-v3.137.0-linux-x64.tar.gz 137028913 BLAKE2B a6074ab1dc05a5309fe04cda746b841382937c406cb01b445ca223056061f182c76d16b6810d865547271232a9f2b482704211ba3ace3fc7c9020dd19244c6c3 SHA512 aa8519294d19c9fdfc7e123e52b744afe5065243e5bd8d2e075df2758adeed24289801689c95b511c722f995b431444025bf46b9e4bcee7f6ade54565b8e76fb DIST pulumi-v3.138.0-linux-x64.tar.gz 137933838 BLAKE2B 554da287cea3103b2843218daad4568d70803734042fee49d317df4d25db6eda63f008415b90ced484e0479a5cae9b021ab0d0b5117e0a193fa63324ed55b038 SHA512 85db740bcacab2dbfea7631b7c09331f891f546493bab321910104a94cc7c9883cb1d92d978cab2244e092b84cb7d2b12d8e26e1886cc32fdfb622452d9ac3e1 DIST pulumi-v3.139.0-linux-x64.tar.gz 138048062 BLAKE2B 6de83f6a70c683d8c048e6a0515ef8b32411a67a4650735665452f209e17a27c78d01f98e057a7fdea6c41cc4114cf310b4d37e420f8a873fdf48b7dc70f3f74 SHA512 fb259aa56f9c1cdfc201db687409c2a6d280009f439a7bccba030b2cf415284b9504a7681cc2eb4b3adea6dcd8989a52a211c60ef4517de8b42c8349a255b2a4 +DIST pulumi-v3.140.0-linux-x64.tar.gz 138052465 BLAKE2B 4b5b6c3fc3e474405fa17a4897578da15019258469e2a5f169df88ba876029b32a6656e4fe779167873543ecd79eb1975110c9dca99b5e5217cadb857d4afa3b SHA512 7de4af4258963dd4a01b45d3fb8be8c0d323be46a67f17f44e8998ff86bf397d4202809b1ed5a52917705cca2d4a5c4a3dc8bfabd8241d2c67e9bc4f94599d70 diff --git a/app-admin/pulumi-bin/pulumi-bin-3.136.0.ebuild b/app-admin/pulumi-bin/pulumi-bin-3.140.0.ebuild similarity index 100% rename from app-admin/pulumi-bin/pulumi-bin-3.136.0.ebuild rename to app-admin/pulumi-bin/pulumi-bin-3.140.0.ebuild From 0fd4388f8e81db03a48408f083a6128461b1cbb5 Mon Sep 17 00:00:00 2001 From: Alexander Golubev Date: Wed, 20 Nov 2024 08:05:57 +0300 Subject: [PATCH 2/9] media-gfx/pdf4qt: fix tests Also simplify ebuild with xdg eclass. Signed-off-by: Alexander Golubev --- media-gfx/pdf4qt/pdf4qt-9999.ebuild | 33 +++++++++++++++++------------ 1 file changed, 19 insertions(+), 14 deletions(-) diff --git a/media-gfx/pdf4qt/pdf4qt-9999.ebuild b/media-gfx/pdf4qt/pdf4qt-9999.ebuild index 3ec4564ab0..da9e894ccc 100644 --- a/media-gfx/pdf4qt/pdf4qt-9999.ebuild +++ b/media-gfx/pdf4qt/pdf4qt-9999.ebuild @@ -2,7 +2,7 @@ # Distributed under the terms of the GNU General Public License v2 EAPI=8 -inherit cmake xdg-utils +inherit cmake xdg DESCRIPTION="Open source PDF WYSIWYG editor based on Qt" HOMEPAGE="https://jakubmelka.github.io/" @@ -20,6 +20,8 @@ fi LICENSE="LGPL-3+" SLOT="0" +IUSE="test" +RESTRICT="!test? ( test )" RDEPEND=" dev-cpp/tbb:= @@ -34,21 +36,30 @@ RDEPEND=" media-libs/openjpeg sys-libs/zlib " -DEPEND="$RDEPEND" -# test ? ( dev-qt/qtbase:6[test] ) -# Note: testing is disabled because as for now the only test is failing. -# See https://github.com/JakubMelka/PDF4QT/issues/222 +DEPEND="$RDEPEND + test? ( dev-qt/qtbase:6[test] ) +" DOCS=( NOTES.txt README.md RELEASES.txt ) PATCHES=( "${FILESDIR}/pdf4qt-1.4.0.0-minor-fix-remove-extention-from-Icon-endtry-in-a-des.patch" "${FILESDIR}/pdf4qt-1.4.0.0-Minimal-cmake-fixes.patch" - "${FILESDIR}/pdf4qt-1.4.0.0-Disable-test-building.patch" "${FILESDIR}/pdf4qt-1.4.0.0-Make-runtime-respect-cmake-s-plugin-dir-settings.patch" # remove when Qt6.8 is stable "${FILESDIR}/pdf4qt-1.4.9999-Support-build-against-Qt-6.7.patch" ) +src_prepare() { + cmake_src_prepare + + # Conditionally dissable test build + if ! use test; then + sed -i -e '/find_package(Qt6/s/Test//' \ + -e '/add_subdirectory(UnitTests)/d' \ + CMakeLists.txt || die + fi +} + src_configure() { local mycmakeargs=( -DPDF4QT_INSTALL_DEPENDENCIES=OFF @@ -58,12 +69,6 @@ src_configure() { cmake_src_configure } -pkg_postinst() { - xdg_icon_cache_update - xdg_desktop_database_update -} - -pkg_postrm() { - xdg_icon_cache_update - xdg_desktop_database_update +src_test() { + "${BUILD_DIR}"/bin/UnitTests || die "tests failed" } From 59c8d0564a7fe1419816722f7069e741a63c5066 Mon Sep 17 00:00:00 2001 From: "Anna (cybertailor) Vyalkova" Date: Tue, 19 Nov 2024 20:13:22 +0500 Subject: [PATCH 3/9] app-admin/i2pd-tools: add 2024.09.25, drop 2023.09.06 Signed-off-by: Anna (cybertailor) Vyalkova --- app-admin/i2pd-tools/Manifest | 4 ++-- ....09.06.ebuild => i2pd-tools-2024.09.25.ebuild} | 15 ++++++++++++--- 2 files changed, 14 insertions(+), 5 deletions(-) rename app-admin/i2pd-tools/{i2pd-tools-2023.09.06.ebuild => i2pd-tools-2024.09.25.ebuild} (78%) diff --git a/app-admin/i2pd-tools/Manifest b/app-admin/i2pd-tools/Manifest index 170b9c09e2..6663be554f 100644 --- a/app-admin/i2pd-tools/Manifest +++ b/app-admin/i2pd-tools/Manifest @@ -1,4 +1,4 @@ -DIST i2pd-a6bd827.tar.gz 650322 BLAKE2B 74a9c686f0468c10b09d54d02445ced9df79bf152b7953cf999b2914fcf61ea38b189524692af7318a1c064a31ab3a888d4cf8a0c01734f6225c4705717cd280 SHA512 008d59c5b7edae2664dcd0bef712572f51f7520de5f5f25da69cba2b81278d3b9ee8a323cabd1c96bc73d28234085e12247f5d2e796e00bb7a4a322b42278367 +DIST i2pd-9668ea9.tar.gz 681244 BLAKE2B 9361d04703ac1d78d3ad828e9a25d8b8c68e9549d3a104a183670abb756065a16807676a71e023ffabd3d7ca43a4db79294b678719f1135f47ff14c68e440a7e SHA512 92476f51a9bc5eebbaa73a62b64baf7ca2604065c469c59195149692f42ef7c643af8cf27a3772a56f13cdf1bcfa28a540a798b4c4ffa5ddc72b9b99da9cb642 DIST i2pd-c98926a.tar.gz 673645 BLAKE2B 3197b78573e2b1f8b6592e804f6342ffc84c625fa3f9aafbe610e81c13a5e8c84c33f225c45ecb653be45c3c727057ce2fccad1c04347b41de36717fb67de934 SHA512 ba12fda3124bcf1e1bdc3e1594c065241b80cb61a532352c2f9632cc3f309e3d957013adf4fc0a16f97624503a7a02b958d128833747b083777629fdc89cb5f4 -DIST i2pd-tools-2023.09.06.tar.gz 22556 BLAKE2B a3c93c8f7e7f359099c3f730587d38870e44bf4dd0314df7be146e2423cf099691871702064c7b77d8f0e8d588ac991390cdad03be6ee72afb2304639e53cee4 SHA512 366ad92232889550ef3a4463b967d2959823cd8b423185b38b294b3d8d1790adcb821c609dde86bc0cda4b6ec86c20340a1496c57577599e699621545d247427 DIST i2pd-tools-2024.05.08.tar.gz 22594 BLAKE2B af3abcb44e437c8a84da3be3cfbc830e12b3f141fea34b4fa644bf01c9a0cc6dda9ac4049a6d68ec26e63e611871ca070310e70a8732fdab00aada9b9e604cb1 SHA512 a5073c9dac1addc0e91d6fa7601b7f140c9ff084bdad2e5bf29448afc918a50441c5326bd5e616e8cf0323251a3bb7ba1ffd13e4fbdac2ecb3a02b021359cb07 +DIST i2pd-tools-2024.09.25.tar.gz 25971 BLAKE2B 30e2e6e57754a4b903779abf939a0e68e05553f1342e51d085c56e22bc9af91cfc33c935ec863e0743a8b6900efa050e29336e9a42c6023b02c7c17d21d0110f SHA512 c5febce35fe624e9c09bf0d7d3b0830b8d6b8d9a2452147cd4fea6913cd2fc0ab33434b1dc376a77dced9556448fc4ca7e8b93e9f73e490ac54df45f1a58fe0f diff --git a/app-admin/i2pd-tools/i2pd-tools-2023.09.06.ebuild b/app-admin/i2pd-tools/i2pd-tools-2024.09.25.ebuild similarity index 78% rename from app-admin/i2pd-tools/i2pd-tools-2023.09.06.ebuild rename to app-admin/i2pd-tools/i2pd-tools-2024.09.25.ebuild index 33e9be7c22..f44753f9dc 100644 --- a/app-admin/i2pd-tools/i2pd-tools-2023.09.06.ebuild +++ b/app-admin/i2pd-tools/i2pd-tools-2024.09.25.ebuild @@ -5,8 +5,8 @@ EAPI=8 inherit toolchain-funcs -COMMIT="cf0c9c9d74fc06acb001bbeb2db845083397fa20" -I2PD_COMMIT="a6bd8275ca496c75c84d7eb890c0071569d28f55" # keep in sync with bundled version +COMMIT="e872010153d9a01a7d1ac2eb8d89dfb583b0f895" +I2PD_COMMIT="9668ea9338fe8524781d6966f576227775129769" # keep in sync with bundled version DESCRIPTION="Some useful tools for I2P" HOMEPAGE="https://github.com/PurpleI2P/i2pd-tools" SRC_URI=" @@ -59,8 +59,17 @@ src_install() { binaries=( vain keygen keyinfo famtool routerinfo regaddr regaddr_3ld i2pbase64 offlinekeys b33address regaddralias x25519 verifyhost + autoconf ) - dobin "${binaries[@]}" + + for bin in "${binaries[@]}"; do + newbin "${bin}" "ip2d-${bin}" + done einstalldocs } + +pkg_postinst() { + elog "All binaries are prefixed with 'i2pd-' to avoid file collisions," + elog "e.g. 'vain' becomes 'i2pd-vain'." +} From 17430360e96f00ebb718183f1172bbf85508f2ca Mon Sep 17 00:00:00 2001 From: Sebastian Engel Date: Wed, 20 Nov 2024 09:50:26 +0100 Subject: [PATCH 4/9] app-editors/notepadnext: add 0.9 Signed-off-by: Sebastian Engel --- app-editors/notepadnext/Manifest | 3 + .../notepadnext/notepadnext-0.9.ebuild | 66 +++++++++++++++++++ 2 files changed, 69 insertions(+) create mode 100644 app-editors/notepadnext/notepadnext-0.9.ebuild diff --git a/app-editors/notepadnext/Manifest b/app-editors/notepadnext/Manifest index 3944c92902..1244644a27 100644 --- a/app-editors/notepadnext/Manifest +++ b/app-editors/notepadnext/Manifest @@ -1,6 +1,9 @@ DIST QSimpleUpdater-791c8e2d148943f1f3147753591e9d5bcf637c15.tar.gz 299359 BLAKE2B ea5c14a094a37091cc42efc11b003f8b4c56f95cd53be9af803db21d4cf8d7b104f6bc0459a1f6064dbc868155eb633bc71065c58e6ff6c026e559283ad25c7b SHA512 0d6bdf6b3ff694527a7f8f9cf2bed38e8090d48fae934908451c4f0f8fa84892c70248ddea30da9e1aa21e4afddd3c7090f364a830777ca6648e3f869c0ea337 +DIST QSimpleUpdater-911727370d90001077f93ea94545099e197400a0.tar.gz 302416 BLAKE2B caf04a3d37fb6768c3fb0147b07d5da3fe8dcee36d6d7715d11a3fe3820d442c3a8be05f996f47c13f3646d94ec776ee7b28b52e4434e55385eec7c360c6c355 SHA512 4200cc4d2c05a10c05f5a31615926d83d89a8e152a388f53563de131ea4f5b3eb91c902d29ca29d5c8823ef4078092db1ffc3c48c4865a5a76e0e4301a429e29 DIST Qt-Advanced-Docking-System-952131a1e9730636e0ee87e99fcc8bdb259f6451.tar.gz 21523386 BLAKE2B e0e2446a211073652e1062b618f01488ab3a4c7a1747cd2ec3fb5b13b9b68dedb0ec5b1704f133625c3be8b3746023d95a41204f343fbc180df0387475448584 SHA512 e51b0adee1e55abf0daaa3cc7909b440364d8d3ef0caa11e653eff4409da59981f4037787f8783fd0ed2d27d7506cb8e6b9b003843d320f19871b93897377d1a +DIST Qt-Advanced-Docking-System-e857421fdf32e3dd438a1b5dd73b1ffe837f2ab8.tar.gz 21796419 BLAKE2B fba180ab5db0055469c9eaeb25dc134d05665445f53b16b02645e948bcf75741494869d8aa771ec5e90ba8df18735af645057731e49fc8da2d8bfb762a88817c SHA512 a913fafa1a6519e30cddf8746b72af5c34158e66f4cf070f7e7d9f60b2081ceede99cbf1356f68f75b8220ba8273734f69baa40c0de96000f20efe768ddb2d4d DIST SingleApplication-494772e98cef0aa88124f154feb575cc60b08b38.tar.gz 23324 BLAKE2B eccf28a712e058f2ad997cd0ccd8f2117eec06e34846f87c1d6e51b0ca04ef1da0169fdd20f8f8de80a81ffa280c4045db7a1321691a5cfac8de3e5f60260f5d SHA512 98178e86fa85fcaa3e2f0030ce4e26c70489f364448c79b3e0cae304ad8fe698a4d29c0030810cef0edd32c17ebdaafc2223e32506381ade6705dcf831537221 DIST editorconfig-core-qt-ee967262db4fdbd735f9971cc0c90cf4f3100d3a.tar.gz 7309 BLAKE2B 09f384d1d2392f64d847793f27ce9fb6ced30b028958182d32453c9367f778e3d1891fb4a6b3759294c9d383091acc8b590e7972214eb0d790347d49d00dafec SHA512 7b965f8528572e9c3b491e4d31599787574394dc7da8e086f61f5a7fb01cff8bfa2405d30acd7d43e628c5d4b9f00da4f0d45dc0e9a4513254c56d2713fd37a9 DIST notepadnext-0.8_p20240828.tar.gz 5260067 BLAKE2B c52b4ae22c75c96ff68f974c39ef862f21c837368b66faafc004ee6e5e2eca45767dbbeb0e9eeb467633f120e50e33c6d618f955c25f7a32f47cd52c8a1b7c5f SHA512 cea6c3b01d409769998ec059aa5befa2bf64bc81f42fd7c0afdbd918e1fcdba58f1110f28879e177aa2b6e86d59e48a3b3e6d66d19b6a5f5ac2ce443ee67b585 +DIST notepadnext-0.9.tar.gz 5317728 BLAKE2B f432be11aaf1035999d882aa6f66ba4fe77f2e8e00700d67ba23c12379bb0d13ba4dd17f781c82779ddfeb54bfdd87361c1b70c116fbc67976b1cd1d216ef868 SHA512 da432cad7dd7301fb2eb3af199a8f5a43c1f69267eb24257bc297e6443b0da986e82a0f4e54eac103c564e6e361fbdad380728d935dc3a6f0d25092d68ead600 DIST uchardet-edae8e81cfb8092496f94da1a306c4c9f0ce32bb.tar.gz 463130 BLAKE2B 1007657b22439187e40bbbd524818ffdcf4468ae0cbf7ec2708311bf3f9c7daa596bec03f812b2c37fa134df70b024505ce41918d8612154835e4dbe1daea2f7 SHA512 003c5155bbfd6cb1f657338970033e25a97a54aabe30a991696e6e4fc7536e1c2715fcc768a2a8ae3ed3fc9feae523723ea7a3b38dec5efc07b72d86733f1742 diff --git a/app-editors/notepadnext/notepadnext-0.9.ebuild b/app-editors/notepadnext/notepadnext-0.9.ebuild new file mode 100644 index 0000000000..647481c247 --- /dev/null +++ b/app-editors/notepadnext/notepadnext-0.9.ebuild @@ -0,0 +1,66 @@ +# Copyright 2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit qmake-utils xdg + +MY_PN="NotepadNext" +COMMIT_NOTEPADNEXT="8319f2cac535fed26b3152478f30bf494df969f8" +COMMIT_SINGLEAPPLICATION="494772e98cef0aa88124f154feb575cc60b08b38" +COMMIT_UCHARDET="edae8e81cfb8092496f94da1a306c4c9f0ce32bb" +COMMIT_EDITORCONFIG="ee967262db4fdbd735f9971cc0c90cf4f3100d3a" +COMMIT_QADS="e857421fdf32e3dd438a1b5dd73b1ffe837f2ab8" +COMMIT_QSIMPLEUPDATER="911727370d90001077f93ea94545099e197400a0" + +DESCRIPTION="A cross-platform reimplementation of Notepad++ based on Qt" +HOMEPAGE="https://github.com/dail8859/NotepadNext" +SRC_URI=" + https://github.com/dail8859/${MY_PN}/archive/${COMMIT_NOTEPADNEXT}.tar.gz + -> ${P}.tar.gz + https://github.com/itay-grudev/SingleApplication/archive/${COMMIT_SINGLEAPPLICATION}.tar.gz + -> SingleApplication-${COMMIT_SINGLEAPPLICATION}.tar.gz + https://gitlab.freedesktop.org/uchardet/uchardet/-/archive/${COMMIT_UCHARDET}.tar.gz + -> uchardet-${COMMIT_UCHARDET}.tar.gz + https://github.com/editorconfig/editorconfig-core-qt/archive/${COMMIT_EDITORCONFIG}.tar.gz + -> editorconfig-core-qt-${COMMIT_EDITORCONFIG}.tar.gz + https://github.com/githubuser0xFFFF/Qt-Advanced-Docking-System/archive/${COMMIT_QADS}.tar.gz + -> Qt-Advanced-Docking-System-${COMMIT_QADS}.tar.gz + https://github.com/alex-spataru/QSimpleUpdater/archive/${COMMIT_QSIMPLEUPDATER}.tar.gz + -> QSimpleUpdater-${COMMIT_QSIMPLEUPDATER}.tar.gz +" +S="${WORKDIR}/${MY_PN}-${COMMIT_NOTEPADNEXT}" + +LICENSE="GPL-3" +# submodule licenses +LICENSE+=" MIT LGPL-2.1 MIT-no-machine-learning || ( MPL-1.1 GPL-2+ LGPL-2.1+ )" +SLOT="0" +KEYWORDS="~amd64" + +RDEPEND=" + x11-libs/libxcb:= + dev-qt/qtbase:6[gui,network,widgets] + dev-qt/qt5compat:6 +" +DEPEND="${RDEPEND}" +BDEPEND=" + dev-qt/qttools:6 +" + +src_prepare() { + default + mv -T "${WORKDIR}"/QSimpleUpdater-"${COMMIT_QSIMPLEUPDATER}" "${S}"/src/QSimpleUpdater || die + mv -T "${WORKDIR}"/Qt-Advanced-Docking-System-"${COMMIT_QADS}" "${S}"/src/ads || die + mv -T "${WORKDIR}"/editorconfig-core-qt-"${COMMIT_EDITORCONFIG}" "${S}"/src/editorconfig-core-qt || die + mv -T "${WORKDIR}"/SingleApplication-"${COMMIT_SINGLEAPPLICATION}" "${S}"/src/singleapplication || die + mv -T "${WORKDIR}"/uchardet-"${COMMIT_UCHARDET}" "${S}"/src/uchardet || die +} + +src_configure() { + eqmake6 src/NotepadNext.pro +} + +src_install() { + einstalldocs + emake INSTALL_ROOT="${ED}" install +} From deb85a86b3bdae3cbbee7c6e6d4fd6238a25319f Mon Sep 17 00:00:00 2001 From: Sebastian Engel Date: Wed, 20 Nov 2024 10:00:39 +0100 Subject: [PATCH 5/9] sys-apps/zmem: Add QA_FLAGS_IGNORED for this rust package Closes: https://bugs.gentoo.org/943887 Signed-off-by: Sebastian Engel --- sys-apps/zmem/zmem-0.2.1.ebuild | 2 ++ 1 file changed, 2 insertions(+) diff --git a/sys-apps/zmem/zmem-0.2.1.ebuild b/sys-apps/zmem/zmem-0.2.1.ebuild index 055c6b1da0..42d783cada 100644 --- a/sys-apps/zmem/zmem-0.2.1.ebuild +++ b/sys-apps/zmem/zmem-0.2.1.ebuild @@ -106,6 +106,8 @@ LICENSE+=" MIT MPL-2.0 Unicode-DFS-2016" SLOT="0" KEYWORDS="~amd64" +QA_FLAGS_IGNORED="usr/bin/zmem" + src_prepare() { default if ! tc-is-lto; then From 93416d41ab391bb529a0ad4fc331f730399a9a75 Mon Sep 17 00:00:00 2001 From: Sebastian Engel Date: Wed, 20 Nov 2024 10:12:34 +0100 Subject: [PATCH 6/9] app-backup/restic-browser: Add QA_FLAGS_IGNORED for this rust package Closes: https://bugs.gentoo.org/943043 Signed-off-by: Sebastian Engel --- app-backup/restic-browser/restic-browser-0.3.1-r1.ebuild | 2 ++ 1 file changed, 2 insertions(+) diff --git a/app-backup/restic-browser/restic-browser-0.3.1-r1.ebuild b/app-backup/restic-browser/restic-browser-0.3.1-r1.ebuild index 300662a1a2..ecffb2d9dd 100644 --- a/app-backup/restic-browser/restic-browser-0.3.1-r1.ebuild +++ b/app-backup/restic-browser/restic-browser-0.3.1-r1.ebuild @@ -448,6 +448,8 @@ BDEPEND=" net-libs/nodejs[npm] " +QA_FLAGS_IGNORED="usr/bin/restic-browser" + src_prepare() { pushd .. >/dev/null || die default From 85d3e49fb6524a4ce365511fcc4dab8d7ccebd4b Mon Sep 17 00:00:00 2001 From: David Roman Date: Wed, 20 Nov 2024 10:37:15 +0100 Subject: [PATCH 7/9] net-im/revolt-desktop: fix symlinks Closes: https://bugs.gentoo.org/944087 Signed-off-by: David Roman --- ...desktop-1.0.8-r1.ebuild => revolt-desktop-1.0.8-r2.ebuild} | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) rename net-im/revolt-desktop/{revolt-desktop-1.0.8-r1.ebuild => revolt-desktop-1.0.8-r2.ebuild} (91%) diff --git a/net-im/revolt-desktop/revolt-desktop-1.0.8-r1.ebuild b/net-im/revolt-desktop/revolt-desktop-1.0.8-r2.ebuild similarity index 91% rename from net-im/revolt-desktop/revolt-desktop-1.0.8-r1.ebuild rename to net-im/revolt-desktop/revolt-desktop-1.0.8-r2.ebuild index b056c6d504..7b7d4edcbc 100644 --- a/net-im/revolt-desktop/revolt-desktop-1.0.8-r1.ebuild +++ b/net-im/revolt-desktop/revolt-desktop-1.0.8-r2.ebuild @@ -17,7 +17,7 @@ KEYWORDS="-* ~amd64" RDEPEND=" app-accessibility/at-spi2-core:2 - dev-lang/python + dev-lang/python-exec dev-libs/expat dev-libs/glib:2 dev-libs/nspr @@ -50,7 +50,7 @@ src_install() { exeinto "${DESTDIR}" doexe "${PN}" chrome-sandbox libEGL.so libffmpeg.so libGLESv2.so libvk_swiftshader.so - ln -sf "$(command -v python)" resources/app.asar.unpacked/node_modules/register-scheme/build/node_gyp_bins/python3 + ln -sf "$(command -v python3)" resources/app.asar.unpacked/node_modules/register-scheme/build/node_gyp_bins/python3 || die insinto "${DESTDIR}" doins chrome_crashpad_handler chrome_{100,200}_percent.pak icudtl.dat resources.pak snapshot_blob.bin v8_context_snapshot.bin From fc1f0be76ad80dfd8563061a9086e5c3dff65440 Mon Sep 17 00:00:00 2001 From: Sebastian Engel Date: Wed, 20 Nov 2024 11:12:34 +0100 Subject: [PATCH 8/9] games-util/xone: Add a patch to fix building with kernels 6.12 and newer Signed-off-by: Sebastian Engel --- .../xone-0.3_p20240425-kernel_6.12.patch | 74 +++++++++++++++++++ games-util/xone/xone-0.3_p20240425.ebuild | 3 +- 2 files changed, 76 insertions(+), 1 deletion(-) create mode 100644 games-util/xone/files/xone-0.3_p20240425-kernel_6.12.patch diff --git a/games-util/xone/files/xone-0.3_p20240425-kernel_6.12.patch b/games-util/xone/files/xone-0.3_p20240425-kernel_6.12.patch new file mode 100644 index 0000000000..ee7175a9bb --- /dev/null +++ b/games-util/xone/files/xone-0.3_p20240425-kernel_6.12.patch @@ -0,0 +1,74 @@ +From d88ea1e8b430d4b96134e43ca1892ac48334578e Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Torleif=20Sk=C3=A5r?= + <16509259+tskaar@users.noreply.github.com> +Date: Mon, 30 Sep 2024 21:07:13 +0200 +Subject: [PATCH] fix: build on kernel v6.12 + +Upstream "Drop of obsoloted vmalloc PCM buffer helper API"; +https://lore.kernel.org/all/20240807152725.18948-3-tiwai@suse.de/ + +Code taken from the driver; +https://lore.kernel.org/all/20240807152725.18948-2-tiwai@suse.de/ +--- + driver/headset.c | 30 ++++++++++++++++++++++++++---- + 1 file changed, 26 insertions(+), 4 deletions(-) + +diff --git a/driver/headset.c b/driver/headset.c +index ebee92d..c736351 100644 +--- a/driver/headset.c ++++ b/driver/headset.c +@@ -5,6 +5,7 @@ + + #include + #include ++#include + #include + #include + #include +@@ -90,13 +91,34 @@ static int gip_headset_pcm_close(struct snd_pcm_substream *sub) + static int gip_headset_pcm_hw_params(struct snd_pcm_substream *sub, + struct snd_pcm_hw_params *params) + { +- return snd_pcm_lib_alloc_vmalloc_buffer(sub, +- params_buffer_bytes(params)); ++ struct snd_pcm_runtime *runtime = sub->runtime; ++ size_t size = params_buffer_bytes(params); ++ ++ if (runtime->dma_area) { ++ if (runtime->dma_bytes >= size) ++ return 0; /* Already large enough */ ++ vfree(runtime->dma_area); ++ } ++ runtime->dma_area = vzalloc(size); ++ if (!runtime->dma_area) ++ return -ENOMEM; ++ runtime->dma_bytes = size; ++ return 1; + } + + static int gip_headset_pcm_hw_free(struct snd_pcm_substream *sub) + { +- return snd_pcm_lib_free_vmalloc_buffer(sub); ++ struct snd_pcm_runtime *runtime = sub->runtime; ++ ++ vfree(runtime->dma_area); ++ runtime->dma_area = NULL; ++ return 0; ++} ++ ++static struct page *gip_headset_pcm_get_page(struct snd_pcm_substream *sub, ++ unsigned long offset) ++{ ++ return vmalloc_to_page(sub->runtime->dma_area + offset); + } + + static int gip_headset_pcm_prepare(struct snd_pcm_substream *sub) +@@ -157,7 +179,7 @@ static const struct snd_pcm_ops gip_headset_pcm_ops = { + .prepare = gip_headset_pcm_prepare, + .trigger = gip_headset_pcm_trigger, + .pointer = gip_headset_pcm_pointer, +- .page = snd_pcm_lib_get_vmalloc_page, ++ .page = gip_headset_pcm_get_page, + }; + + static bool gip_headset_advance_pointer(struct gip_headset_stream *stream, diff --git a/games-util/xone/xone-0.3_p20240425.ebuild b/games-util/xone/xone-0.3_p20240425.ebuild index e624737642..4936a742d1 100644 --- a/games-util/xone/xone-0.3_p20240425.ebuild +++ b/games-util/xone/xone-0.3_p20240425.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2024 Gentoo Authors +# Copyright 2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -29,6 +29,7 @@ CONFIG_CHECK="SND CFG80211 INPUT_FF_MEMLESS USB POWER_SUPPLY LEDS_CLASS HID" MODULES_KERNEL_MIN=5.11 PATCHES=( "${FILESDIR}/${PN}-0.3_p20240425-kernel_6.11.patch" + "${FILESDIR}/${PN}-0.3_p20240425-kernel_6.12.patch" "${FILESDIR}/${PN}-0.3_p20240425-sysfs_pairing.patch" ) From 0c514a20ce02c165d54e6f89d480f06eac09e0cb Mon Sep 17 00:00:00 2001 From: Takuya Wakazono Date: Wed, 20 Nov 2024 21:20:10 +0900 Subject: [PATCH 9/9] app-misc/dpscreenocr: fix RDEPEND Closes: https://bugs.gentoo.org/916986 Signed-off-by: Takuya Wakazono --- app-misc/dpscreenocr/Manifest | 2 +- ...4.0.ebuild => dpscreenocr-1.4.0-r1.ebuild} | 30 +++++++++++-------- 2 files changed, 18 insertions(+), 14 deletions(-) rename app-misc/dpscreenocr/{dpscreenocr-1.4.0.ebuild => dpscreenocr-1.4.0-r1.ebuild} (50%) diff --git a/app-misc/dpscreenocr/Manifest b/app-misc/dpscreenocr/Manifest index 5e32bf02dd..e093905bd0 100644 --- a/app-misc/dpscreenocr/Manifest +++ b/app-misc/dpscreenocr/Manifest @@ -1 +1 @@ -DIST v1.4.0.tar.gz 280237 BLAKE2B 1fe2241f29592729066e26e8ba7bbe02bbc5898457b1bbbd0b6155a6cd56c00c59481ddf7695b3337f1db5865c8d9e89f1c2bf01b855e18849dc6ccb5ea88b92 SHA512 8732c9f618479f84152e426651e9769cb61ee84f1ef2b46fe0b3679ae82627affe443a8162e68453a7bd70e21b79f621847b03c1a6e8771d1c188ebffaae4d19 +DIST dpscreenocr-1.4.0.tar.gz 280237 BLAKE2B 1fe2241f29592729066e26e8ba7bbe02bbc5898457b1bbbd0b6155a6cd56c00c59481ddf7695b3337f1db5865c8d9e89f1c2bf01b855e18849dc6ccb5ea88b92 SHA512 8732c9f618479f84152e426651e9769cb61ee84f1ef2b46fe0b3679ae82627affe443a8162e68453a7bd70e21b79f621847b03c1a6e8771d1c188ebffaae4d19 diff --git a/app-misc/dpscreenocr/dpscreenocr-1.4.0.ebuild b/app-misc/dpscreenocr/dpscreenocr-1.4.0-r1.ebuild similarity index 50% rename from app-misc/dpscreenocr/dpscreenocr-1.4.0.ebuild rename to app-misc/dpscreenocr/dpscreenocr-1.4.0-r1.ebuild index 92791f3744..8e87efe88b 100644 --- a/app-misc/dpscreenocr/dpscreenocr-1.4.0.ebuild +++ b/app-misc/dpscreenocr/dpscreenocr-1.4.0-r1.ebuild @@ -1,28 +1,32 @@ -# Copyright 2023 Gentoo Authors +# Copyright 2023-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 -CMAKE_MAKEFILE_GENERATOR="emake" -inherit desktop cmake +inherit cmake desktop DESCRIPTION="Program to recognize text on screen" HOMEPAGE="https://danpla.github.io/dpscreenocr/" -SRC_URI="https://github.com/danpla/dpscreenocr/archive/refs/tags/v${PV}.tar.gz" +SRC_URI="https://github.com/danpla/dpscreenocr/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz" LICENSE="ZLIB" SLOT="0" KEYWORDS="~amd64" # Add Qt and Xorg dependencies too -RDEPEND="app-text/tesseract - x11-libs/libXext - dev-qt/qtcore:5" +RDEPEND=" + app-text/tesseract:= + dev-qt/qtcore:5 + dev-qt/qtgui:5 + dev-qt/qtwidgets:5 + x11-libs/libX11 + x11-libs/libXext +" DEPEND="${RDEPEND}" src_configure() { local mycmakeargs=( - '-DCMAKE_BUILD_TYPE=Release' + -DDPSO_GEN_HTML_MANUAL=OFF ) cmake_src_configure } @@ -30,9 +34,9 @@ src_configure() { src_install() { # the following installs non sense : #cmake_src_install - dobin "${WORKDIR}/${P}_build/dpscreenocr" - domenu "${WORKDIR}/${P}_build/dpscreenocr.desktop" - dolib.so "${WORKDIR}/${P}_build/src/dpso/libdpso.so" - dolib.so "${WORKDIR}/${P}_build/src/dpso_ext/libdpso_ext.so" - dolib.so "${WORKDIR}/${P}_build/src/dpso_utils/libdpso_utils.so" + dobin "${BUILD_DIR}/dpscreenocr" + domenu "${BUILD_DIR}/dpscreenocr.desktop" + dolib.so "${BUILD_DIR}/src/dpso/libdpso.so" + dolib.so "${BUILD_DIR}/src/dpso_ext/libdpso_ext.so" + dolib.so "${BUILD_DIR}/src/dpso_utils/libdpso_utils.so" }