diff options
Diffstat (limited to 'dev-util')
21 files changed, 641 insertions, 30 deletions
diff --git a/dev-util/Manifest.gz b/dev-util/Manifest.gz Binary files differindex a616e09d2891..69bd13e300b9 100644 --- a/dev-util/Manifest.gz +++ b/dev-util/Manifest.gz diff --git a/dev-util/ccls/Manifest b/dev-util/ccls/Manifest index 0f330d146432..7082c09e8362 100644 --- a/dev-util/ccls/Manifest +++ b/dev-util/ccls/Manifest @@ -4,6 +4,6 @@ DIST ccls-0.20240505.tar.gz 162441 BLAKE2B 881481d0d420d5e56e872271629051077c44e DIST ccls-0.20241108.tar.gz 161114 BLAKE2B 83cb61c92707eb3c08c05f36e644dea00a08e5b12baafb45477f44a806a265825788ff431e4cf115ac70f543462e9ea15500b5e8086d2194285d8101a3e036c5 SHA512 b271b175ea64eb10a052789c5527135b5aff7f9088aa20158895263262c1c93541cc4f987e7d7a73b702db0b85f9366ed57a9b38bf1e245e50f3c4e3eeed7277 EBUILD ccls-0.20240202.ebuild 966 BLAKE2B b91f47bcfc857226ebe6a03e6b009b40fca170e2f71dd174714bf99a2ab4558edd2bf7351daed37a52b2cdfe753acf56d490a0c29440fdc3b2815d3b58eb5427 SHA512 06f5f5b65e7c3de82dedb88db667f3eed76873456baa2a5b15dc6f5f5c97d315360fc7633b6d22d92c1e2e12e422da4bb989785166e5d0c77ce19304dff8c0c2 EBUILD ccls-0.20240505.ebuild 920 BLAKE2B cce675f2fce12d16d46e0cffadebbea09e8e756240d8e378769c25752e97d034a052a65a4f451a2958dd7a57619b29a8ff841969bfb074eaeba24f43add62a7f SHA512 a25e68b698113a6193cc17ea4411708dcc199e25c1ccd6f140582843c64078084509942a8b9a234d1c258c0d077a5bff5c0aed24c56f119a38a16b04e687e4c4 -EBUILD ccls-0.20241108.ebuild 857 BLAKE2B f80c36b55b1f92a30d4644425b40d5502c51c871620056a625365322d772621b559119a38141f7882e3159323a42e85c7aed72dcd336dcc99a980f7d500984dc SHA512 e6f294d602de5c36498df09e65ce68fd87075e479974a272e157caeec89fe49e3f58ac7f910de7fd37800100aa0f2c8c2b317077fa9b174c512f1b5dd2efa9d5 +EBUILD ccls-0.20241108.ebuild 856 BLAKE2B 00ea40bc9bdd060b73d9965fed81b623ce02d6ce0f434e8fc81b9b8d1f4a3dad18bbc12b94bbcdde358f1d8b6ec97416ecfe0512d80bb82bd1f0cc98029fff5d SHA512 e6e4172d65e52682652e4b95ceaaa9d0433a919e33a7deee40cb8b0c361e63235a91a5c550df065122abc1128fb91e277d0e556a6c9d3f846427bd3586661f83 EBUILD ccls-9999.ebuild 857 BLAKE2B f80c36b55b1f92a30d4644425b40d5502c51c871620056a625365322d772621b559119a38141f7882e3159323a42e85c7aed72dcd336dcc99a980f7d500984dc SHA512 e6f294d602de5c36498df09e65ce68fd87075e479974a272e157caeec89fe49e3f58ac7f910de7fd37800100aa0f2c8c2b317077fa9b174c512f1b5dd2efa9d5 MISC metadata.xml 324 BLAKE2B 83e4ab413a926db1ddf998ec8e5566a9a58fc2b3472b9d137356ebf3c08d4ca888a5252baeb0e10f298e31eca4bb4ea1a9b67c752590807be3ce27f8b3742327 SHA512 00dfaff2972f7ea5df02c207b8211475acafcbba5bef4c5ce3ceb09924db2bb3f009e155aab43866903e7442008d058261f07464f43f9295a4d1be6ed0cfec02 diff --git a/dev-util/ccls/ccls-0.20241108.ebuild b/dev-util/ccls/ccls-0.20241108.ebuild index 3096200e66e5..4dfa5a1ba9b1 100644 --- a/dev-util/ccls/ccls-0.20241108.ebuild +++ b/dev-util/ccls/ccls-0.20241108.ebuild @@ -1,4 +1,4 @@ -# Copyright 2020-2024 Gentoo Authors +# Copyright 2020-2025 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -19,7 +19,7 @@ HOMEPAGE="https://github.com/MaskRay/ccls" if [[ ${PV} != *9999 ]] ; then SRC_URI="https://github.com/MaskRay/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz" - KEYWORDS="~amd64 ~arm64 ~riscv" + KEYWORDS="amd64 ~arm64 ~riscv" fi LICENSE="Apache-2.0" diff --git a/dev-util/difftastic/Manifest b/dev-util/difftastic/Manifest index b2b7cb839ee2..27cde4c7d520 100644 --- a/dev-util/difftastic/Manifest +++ b/dev-util/difftastic/Manifest @@ -146,5 +146,5 @@ DIST yansi-0.5.1.crate 16525 BLAKE2B 3b5a93b98293daae72f53bf3f13bfc05feba8d5b279 DIST zerocopy-0.7.32.crate 151096 BLAKE2B 12c7c329ec0e0865467af08306ff4b55ce1e39fd77b094ee48ed9c6e266dfa807bda9ea72a3f7ea989916327f4d9e803d8868995728bfe2fb1c2dc1e5ecff78e SHA512 6729b05eb88029555b88c75feff4f8bc28ad9675edb02b07486381f775c8650c95e2e59612906bd9c34c5e390fd339857ca91573ee9f9ca7948572cff4171c82 DIST zerocopy-derive-0.7.32.crate 37623 BLAKE2B 8b583d39d7bf9c3dbbba578120751c664f87363c5ba3fc45f6506a4059b9e599c43d9fc7bd498a257ff7c9d872af77d39bebdb0e65fb8009eaa2ae9903dece46 SHA512 3ce8528871fd18d6abe92b98503927451d25791c9c4af0ba39a3b6ba2006030bdc137084d080e9b1ac8b5ddf5f2121e0a3ef34bb2033a040f2c72c8149a9fc0d EBUILD difftastic-0.60.0-r1.ebuild 3610 BLAKE2B 79ddb7589098de4e0feeb30e54ff3dd64676379b347eacb9ef2a2047a7e19029ccea1eea3ec2b1f1a3a9fea2969d5c47a846855750aceb058a389d32961d8779 SHA512 1339f4e39020defac2bd6a255cc4f57d637fea29f7365359cc91ee7973a65d7a5724818e7eb149b1c91c679c9da71d9c1ab05f206f4f0c3c7522dfed227e1815 -EBUILD difftastic-0.61.0-r1.ebuild 3527 BLAKE2B 0aca253882e7b4c71f855f17c11b57958aa0b36648d5b90c19bebc6764c4deebfb8f4d151fd5cccdf8cec349afb39f7a70ab4e1dd49eca5b62c003c6cbf637b8 SHA512 a7df4b144b9e4546d93d9c56cd0121475dc2de35e0ed89c934f26f669b828e6babeb07586de0861ab6029d1020f212b34500f572bf8033bc5186b9187aef256f +EBUILD difftastic-0.61.0-r1.ebuild 3803 BLAKE2B b46dec5006377c772ebee05ce147a9c58bdbe099063f8fa2ac5c622b9312802d9752b4ce94f46530c7621ad037c4ce28bc1adec22d8e8eeca9f77df9938db4db SHA512 7f77eceaeacf92962a0e2446e05d5bda6ba9f6c9d28fa96154ebc08d608c59478285901f8e4f91626a7229a6f1800ad568277c5d4c9335155515cb4ec21623db MISC metadata.xml 333 BLAKE2B 3ba43124273c8969651c7ff68c86718cf0484850e98b2e5de2b4aaacea67e95609b286c6156dc74cb1fa1201e198f0cb685b9cb1f80a6c81cfb8b712dec96a05 SHA512 0726b7ca030ff47d0a304f30f97671e7274905c9c5187edd61eba9224207430ad1cd98d76ecb4120f8b9d722e628834f7bc3d0a3734ef22f0df48fcb44c6c2b3 diff --git a/dev-util/difftastic/difftastic-0.61.0-r1.ebuild b/dev-util/difftastic/difftastic-0.61.0-r1.ebuild index 4f9224cf6950..5c47cc323130 100644 --- a/dev-util/difftastic/difftastic-0.61.0-r1.ebuild +++ b/dev-util/difftastic/difftastic-0.61.0-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 2024 Gentoo Authors +# Copyright 2024-2025 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 # Autogenerated by pycargoebuild 0.13.3 @@ -151,7 +151,7 @@ CRATES=" zerocopy@0.7.32 " -inherit cargo +inherit cargo flag-o-matic DESCRIPTION="A structural diff that understands syntax." HOMEPAGE="http://difftastic.wilfred.me.uk/" @@ -183,6 +183,14 @@ src_prepare() { default } +src_configure() { + # Workaround for old bundled mimalloc in mimalloc crate, see + # bug #944110, but updating it should be done with caution, see + # https://github.com/purpleprotocol/mimalloc_rust/issues/109. + append-cflags -std=gnu17 + cargo_src_configure +} + src_install() { cargo_src_install dodoc -r "${DOCS[@]}" diff --git a/dev-util/gtk-doc/Manifest b/dev-util/gtk-doc/Manifest index 18324cb72c74..41317dbdaaa5 100644 --- a/dev-util/gtk-doc/Manifest +++ b/dev-util/gtk-doc/Manifest @@ -1,6 +1,9 @@ AUX 61gtk-doc-gentoo.el 283 BLAKE2B 116d2b43d42b05130482c5bff7a10f13930a0d04f34874d25bfa6c61dc8920efe60ae615e6d54de1eeed87044a7232a992a37582d608b0756f0b099b5ee62d03 SHA512 d9e7c8bacd97a5147dbbe9ad568323356c9c38ad982ce88c63ef5f8e3955289274393a91e07d2159c082ac2a058455a1905c251ff3676f60bad596379fb12837 AUX gtk-doc-1.33.2-gtkdocize-don-t-backslash-escape-regular-characters-.patch 8013 BLAKE2B 4b8206306598fac8f3a54f39ef7a188e0db71451e0a9b8c5ca9d0c2f7acb561b355876356a55e84cdee772e0ddb72e1594d035dd720fe9d62766ef9e8bd953a3 SHA512 982b99fc70cec029b095d3f2e4228985cdbfe575ebf58784675e19674c7ab902ee3a6c9d0b63e6f5d3c838624de669c12a7fb0e7100fee582a98be8812828be7 +AUX gtk-doc-1.34.0-mkhtml-test.patch 1001 BLAKE2B 385d6b8b9f6910f79d9ccafce843d646d24e152732b19234477f53f80395d8c80f78b36474360227aa58e36a2fec610e9906ad7ee44ebe9e5e94ec6e89772ea6 SHA512 a21a37419aa98a8ec02bf3639d2cc29f0fbad91d3e8a03e3f5c1a1cf527d2b5f88735d3765cab5bf276dc0d87e40ff805747471146cccc0908d554fa1259c85c AUX gtk-doc-1.8-emacs-keybindings.patch 582 BLAKE2B 9591f8f58dbd2c5897abf020f96a3ad8124830c274bfa581756ccaa43c67002264cc6d5a04c0316e4bb2dfa75a3cb08b5de6217a81a295b3a31e18dae8d1ad7d SHA512 360e97c0d2603c17dd1c1ca92739eb5ac229f3bcda6dc76267b95cac73db1008a52164ac9cba5a0e43f7b6359b5e6d3b242fde757fa1b7409051bade5f6f35a6 DIST gtk-doc-1.33.2.tar.xz 507852 BLAKE2B dea3030060ecec89433fe3783dfacc2f58373780c49560a48ab1a32bedfe888692183de8396c92414255e4c8f537358cbc373fd307638ab8e7dbfd9ae44de58f SHA512 f50f68ab6b4bc59f55e84b49c1481f05700171cbf79eca9ba8f3a142a30a4ba88fe096983ebb8d117a9ef8bcea40934674096683d956f5c54cae457d31f651ab +DIST gtk-doc-1.34.0.tar.xz 494116 BLAKE2B cb8550debed9f32b967de9d4ebdde8dbe83551eb8527221d2d788355431f34e62a4beedda3e7f5722516ae8e23794a56b97a4f761ede0f7f2c0ef288624b5f7a SHA512 d962fe31949b5f7c70122c7ebbd98f4d21725697804bf5dd75fd7a6662753a91c9350fd1e8bed22a58a957b173f35e200fcbb4c7c2ebc45ccbc0db2e916b27ea EBUILD gtk-doc-1.33.2-r1.ebuild 2677 BLAKE2B 7f77b0e734466cbef117e939ec2d6e1c346c90423ccf33e19462872d9108cb220ae1783e62e99cc966302e144bd7a1984666f66d7f31ab715b95a22e075c617f SHA512 fc8e3d574a2b099ac0c1e8578ba2118a5def2c163857a2981162f4c9b6ce6280dedbdd8a2da8ad9e85c912f2a04107dc27302b18967c1667a48baf98f21ea8a3 +EBUILD gtk-doc-1.34.0.ebuild 2696 BLAKE2B 241102877f6792f4153765db1bbf8303653471c1ee9e5ec9828b05f37830214276a07bab40e583cd2dc44812eda22a8fc246d71d299c6588b77e99f3f81c5a12 SHA512 d8d52900978454782e0f05c27e1eff01e7e31b0366b1becb921cbbe4867984de00b0c33b46dba093938f984e0df115f9ebb5acb58ae8692ba00e38ea0afe93f3 MISC metadata.xml 605 BLAKE2B 1f39610cb7bb45a71462268a6c7b14b6af94502839882b36342099e171b0aa976e773d25b1fd8eb49ef502cbdb961e3a5a82103286667eac7aad728d51b0b052 SHA512 712a1cca5e2cc349412cabb8bdc5a0a0a859629877d5a9615afc3e499a67e3e24905a9dfc1d7c22e1dce1f678a5d0632ac04f20fae9c3c7dd1d8df096e4be8c5 diff --git a/dev-util/gtk-doc/files/gtk-doc-1.34.0-mkhtml-test.patch b/dev-util/gtk-doc/files/gtk-doc-1.34.0-mkhtml-test.patch new file mode 100644 index 000000000000..982b5bd11f7a --- /dev/null +++ b/dev-util/gtk-doc/files/gtk-doc-1.34.0-mkhtml-test.patch @@ -0,0 +1,33 @@ +From 951743698610eaaa0cc9030f7d7d02437419ac24 Mon Sep 17 00:00:00 2001 +From: Neil Hanlon <neil@shrug.pw> +Date: Fri, 9 Feb 2024 15:32:38 -0500 +Subject: [PATCH] Add gobject example source code to path for mkhtml test + +Fixes #150 + +I'm not really sure why this is required, but I suspect it has to do +with changes in how GCC handles path traversal due to recent (ish) +security issues, as the code here is evaluated to +`../xml/../../examples/gobject.c` which probably looks unhealthy to +automatically include. + +Signed-off-by: Neil Hanlon <neil@shrug.pw> +--- + tests/gobject/docs/meson.build | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/tests/gobject/docs/meson.build b/tests/gobject/docs/meson.build +index a1dd66c..236a1cc 100644 +--- a/tests/gobject/docs/meson.build ++++ b/tests/gobject/docs/meson.build +@@ -119,6 +119,7 @@ test( + '--path=@0@'.format(':'.join([ + gobject_test_docs_dir, + srcdir, ++ join_paths(srcdir, 'tests/gobject/examples'), + ]) + ), + ], +-- +GitLab + diff --git a/dev-util/gtk-doc/gtk-doc-1.34.0.ebuild b/dev-util/gtk-doc/gtk-doc-1.34.0.ebuild new file mode 100644 index 000000000000..49e15e21f1e3 --- /dev/null +++ b/dev-util/gtk-doc/gtk-doc-1.34.0.ebuild @@ -0,0 +1,113 @@ +# Copyright 1999-2025 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 +PYTHON_COMPAT=( python3_{10..13} ) + +inherit elisp-common gnome.org meson python-single-r1 readme.gentoo-r1 + +DESCRIPTION="GTK+ Documentation Generator" +HOMEPAGE="https://gitlab.gnome.org/GNOME/gtk-doc" + +LICENSE="GPL-2+ FDL-1.1" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-solaris" + +IUSE="emacs test" +REQUIRED_USE="${PYTHON_REQUIRED_USE}" +RESTRICT="!test? ( test )" + +RDEPEND=" + ${PYTHON_DEPS} + >=dev-libs/glib-2.38:2 + dev-libs/libxslt + >=dev-libs/libxml2-2.3.6:2 + ~app-text/docbook-xml-dtd-4.3 + app-text/docbook-xsl-stylesheets + ~app-text/docbook-sgml-dtd-3.0 + >=app-text/docbook-dsssl-stylesheets-1.40 + emacs? ( >=app-editors/emacs-23.1:* ) + $(python_gen_cond_dep ' + dev-python/pygments[${PYTHON_USEDEP}] + ') +" +DEPEND="${RDEPEND} + test? ( + $(python_gen_cond_dep ' + dev-python/parameterized[${PYTHON_USEDEP}] + ') + ) +" +BDEPEND=" + ~dev-build/gtk-doc-am-${PV} + dev-util/itstool + virtual/pkgconfig +" + +PATCHES=( + # Remove global Emacs keybindings, bug #184588 + "${FILESDIR}"/${PN}-1.8-emacs-keybindings.patch + + # https://gitlab.gnome.org/GNOME/gtk-doc/-/issues/150 + "${FILESDIR}"/${PN}-1.34.0-mkhtml-test.patch +) + +pkg_setup() { + DOC_CONTENTS="gtk-doc does no longer define global key bindings for Emacs. + You may set your own key bindings for \"gtk-doc-insert\" and + \"gtk-doc-insert-section\" in your ~/.emacs file." + SITEFILE=61${PN}-gentoo.el + python-single-r1_pkg_setup +} + +src_prepare() { + default + + # Requires the unpackaged Python "anytree" module + sed -i -e '/mkhtml2/d' "${S}"/tests/meson.build || die +} + +src_configure() { + local emesonargs=( + -Dautotools_support=true + -Dcmake_support=true + -Dyelp_manual=true + $(meson_use test tests) + ) + meson_src_configure +} + +src_compile() { + meson_src_compile + use emacs && elisp-compile tools/gtk-doc.el +} + +src_install() { + meson_src_install + + # The meson build system configures the shebangs to the temporary python + # used during the build. We need to fix it. + sed -i -e 's:^#!.*python3:#!/usr/bin/env python3:' "${ED}"/usr/bin/* || die + python_fix_shebang "${ED}"/usr/bin + + # Don't install this file, it's in gtk-doc-am now + rm "${ED}"/usr/share/aclocal/gtk-doc.m4 || die "failed to remove gtk-doc.m4" + rmdir "${ED}"/usr/share/aclocal || die + + if use emacs; then + elisp-install ${PN} tools/gtk-doc.el* + elisp-site-file-install "${FILESDIR}/${SITEFILE}" + readme.gentoo_create_doc + fi +} + +pkg_postinst() { + if use emacs; then + elisp-site-regen + readme.gentoo_print_elog + fi +} + +pkg_postrm() { + use emacs && elisp-site-regen +} diff --git a/dev-util/opencl-headers/Manifest b/dev-util/opencl-headers/Manifest index a9b0b5bce4a3..a8786b3a74b9 100644 --- a/dev-util/opencl-headers/Manifest +++ b/dev-util/opencl-headers/Manifest @@ -1,5 +1,5 @@ DIST opencl-headers-2024.05.08.tar.gz 76977 BLAKE2B cd4e0464e2613912134946b43b8b69ccd61f0ba850825c8182e46dcb042478338fda5d993e9e48612ba42152a007be172e6da9afcfda3eb51c71e52dd2f15793 SHA512 2f1a46d58a5a9329470bab4c3662f17e81aab9558bfd9e1aafa14d3e1ab129513ab9493eeeb3cc48f0f91f0bc6b61bd54e28d7083eed58af9f34cd973cc93de1 DIST opencl-headers-2024.10.24.tar.gz 85151 BLAKE2B d35c2ea06a1162e1716d5973b3587bd8c50420cf15cb7c13c61d16df9b94ec1df9b3e4621291d0384de40672f2f919b8df3edb5067755df2e236e596c82acfd5 SHA512 9d2ed2a8346bc3f967989091d8cc36148ffe5ff13fe30e12354cc8321c09328bbe23e74817526b99002729c884438a3b1834e175a271f6d36e8341fd86fc1ad5 -EBUILD opencl-headers-2024.05.08.ebuild 630 BLAKE2B 29382ce5180221550cfa947f32573686f172b2eac2f9e876e270456de31a7220f0d43ec390469d7d9bbec27659441131dc9c5eaca635951b46cc3aba01399959 SHA512 1e493341e494fdbc0156c16dc7fb4b4a886ddd29ca072eac55ed0af21b0bcf7cf10ee23800be558e36e13de4e8baef855b69758ab2c3908963a4486557b84712 +EBUILD opencl-headers-2024.05.08.ebuild 629 BLAKE2B 40e87f65b91f5e6c0d67b143d56c6fea936a66866142e7053235016a62f23d63a5244d74778d260787bb055b9ed2e1b45914d15b65a48b3f6e48a44b3129b086 SHA512 54432ef8fbc1e72c1689c995a4708c237b88bd5bc394013a5b9143acd812ae53d102b01534794772a1cea037dd19d9f0fe2a0f16ee7d51a40289681064718e57 EBUILD opencl-headers-2024.10.24.ebuild 632 BLAKE2B 01da39e6336291f50a17effa74f14ccda86a9e93f77896c911d5fdd11087c88284fe379bb24e7feb0e57312089b5cc918075fe5e31baf0ec57a58fd97df67e8b SHA512 e981518d6861ae3e56dc882df4b2590fe2e86ec6f343dddecffbf8fe29763ed496938c02405461329157a8bf10a95b4ff33788dc36247bd520c5081d0cb22cdb MISC metadata.xml 977 BLAKE2B a28879e1c5b9880d50132b721fd4ddd73cf2e1ccbb29178feaebf3397a55badbcb8f38a4686f1b6623228595a2087b3b41cfaeae76877891872e62d494dda335 SHA512 ac8d04d9200c88d5c628d92722a2fbf19dc22271304ffcc16cd0229f42f97ffb3b5196bb9d4931f0f59f36d0be93d174f2b8448c78274935a00a566b0f07f869 diff --git a/dev-util/opencl-headers/opencl-headers-2024.05.08.ebuild b/dev-util/opencl-headers/opencl-headers-2024.05.08.ebuild index d62c43061409..359715508939 100644 --- a/dev-util/opencl-headers/opencl-headers-2024.05.08.ebuild +++ b/dev-util/opencl-headers/opencl-headers-2024.05.08.ebuild @@ -16,7 +16,7 @@ S="${WORKDIR}"/${MY_P} LICENSE="Apache-2.0" SLOT="0" -KEYWORDS="amd64 ~arm64 ~loong ppc64 ~riscv x86" +KEYWORDS="amd64 arm64 ~loong ppc64 ~riscv x86" IUSE="test" RESTRICT="!test? ( test )" diff --git a/dev-util/pkgcruft/Manifest b/dev-util/pkgcruft/Manifest index 9dc5111a0d43..0b99bf5bf60a 100644 --- a/dev-util/pkgcruft/Manifest +++ b/dev-util/pkgcruft/Manifest @@ -6,5 +6,5 @@ EBUILD pkgcruft-0.0.4.ebuild 1367 BLAKE2B 4275680972e21d9a218fa2409b44401bedb7cd EBUILD pkgcruft-0.0.6.ebuild 1367 BLAKE2B 4275680972e21d9a218fa2409b44401bedb7cda325b678830257e04f636cab0db1c4e43c3f55285352753ad97c1295122e4f01070c5c0c03b6268632c25f7e2c SHA512 021c31e0f618882a854679bc9ae49ba34b48fa3b3de555906044ac9344f747b6a6ab729ecd5e4a161d69bc09e89bf4e5f251bea737407eb331ae34cef4b2106c EBUILD pkgcruft-0.0.8.ebuild 1553 BLAKE2B 2e13539e2c9959257c759b29d42db588fab51926b9bfbc8da37cc177ccb2a131f17dd66b14cdbd6824114e675a94b9e0b33ee397d5ddbeec9708a0398631ef3a SHA512 2cc4ffb8d0a9ae5635b5e7553ca36849cfe09c0185c1a9a2469b54742c8cd62fec39f04b4c840ce806b97016e7eb438f8afae178a4edc813f53d3946c93d9a00 EBUILD pkgcruft-0.0.9.ebuild 1441 BLAKE2B 927bda94771290019115b9670a4d27c0f5e410164d86673edddfdbacd586368134f56c56e0e87e7183a38f98a2a8027c8b92a91f7345396fb3e6f7fa37a6f638 SHA512 d665583fd88897452d7f59ebf67c9b1573d6d324ed954def02f982aa1a78aa60d3701151b41924fc8fea4267d20317cb488119309f4ee14ff70821526ff91375 -EBUILD pkgcruft-9999.ebuild 1441 BLAKE2B 927bda94771290019115b9670a4d27c0f5e410164d86673edddfdbacd586368134f56c56e0e87e7183a38f98a2a8027c8b92a91f7345396fb3e6f7fa37a6f638 SHA512 d665583fd88897452d7f59ebf67c9b1573d6d324ed954def02f982aa1a78aa60d3701151b41924fc8fea4267d20317cb488119309f4ee14ff70821526ff91375 +EBUILD pkgcruft-9999.ebuild 1511 BLAKE2B 61efaa065108e9135c4636123a866ce966e0f9cd19c57d5a2940da3d8cbef5c2c9b4d5472df7e042e314c9edd028087195b8d29bff7ff7725b89509388eb76e8 SHA512 81c37306cc8f7c6292e454b40fd91d7be2de39ef9b38e1f6c6e46cc423d2f8946a8f74a97879901d0a0cf64c8cd82aab8b24c51abeb8ff49f668b246cc4a1aef MISC metadata.xml 322 BLAKE2B b0ee0fc53eb8b4b485f74806a78b5560aaf53f1772d7bd3e5af4e03385b3f3aed18fc52462c2d49de6c0d735db0cae3fab175b8adc0e5f7c4baa89e28973776f SHA512 9343cd5028750182fe9325c44f4c4c7df0976b79e0422b66e0fd16f94be76eaa203e8ecad5ec2cbed3535f455f038e51968850ced9afb27af9a98b6b968df88a diff --git a/dev-util/pkgcruft/pkgcruft-9999.ebuild b/dev-util/pkgcruft/pkgcruft-9999.ebuild index 77a30535553a..df5d0d4e8e53 100644 --- a/dev-util/pkgcruft/pkgcruft-9999.ebuild +++ b/dev-util/pkgcruft/pkgcruft-9999.ebuild @@ -61,6 +61,7 @@ src_compile() { tc-export AR CC cargo_src_compile + edo cargo run --features shell --bin pkgcruft-shell-comp -p pkgcruft } src_test() { diff --git a/dev-util/qdevicemonitor/Manifest b/dev-util/qdevicemonitor/Manifest index 214fdc614043..c1a2d7ce0a0e 100644 --- a/dev-util/qdevicemonitor/Manifest +++ b/dev-util/qdevicemonitor/Manifest @@ -3,8 +3,9 @@ AUX qdevicemonitor-1.0.1-disable-pedantic-errors.patch 924 BLAKE2B 1d1fedbc7dba2 AUX qdevicemonitor-1.0.1-disable-warnings-as-errors.patch 1058 BLAKE2B fbb82781ff4946cb60430a9e4c5b9298ec57db30d3475cd3f1597f5fa33cddc45eb4bc4240b3604a0ed98455e031cd0a18965cb709fcea265d788c99322efea1 SHA512 13e8681185a00cf31136fcfc53b8973ea4f03cc2d53c3beaeb89f8183668774227df6f4bcfd1f02a6c70a0820225d9116d3cc945e4a4f30dcdc8bee2ef7f9c6c AUX qdevicemonitor-1.0.1-endl-is-deprecated.patch 839 BLAKE2B 87f40970a9f4f068fd3636bfa9cb31429a5b7793c7de0ebe82037fe5ab9b74c0856e9f8ffb3aa447f36aecb9bdac3f7d63f47f5abcbfbb2457292dabc00d1adc SHA512 19d21cb203e8fb67292272a9181bb205c35b4e9052a62dfc59e1aa31187ac59a3c9cae08a9b82633b748b2e3a2b5d1282fcfffc9a4333fdd233b881d8f638e34 AUX qdevicemonitor-1.0.1-qt-5.11.patch 734 BLAKE2B 4aa5ca1b4581b5f65ac434595a2d61cbc7efbfe82e15b62e8e384da20442975cf4c4122505508f1551aac95366e6fd38c00f089ed241ccfd7c6e292132999276 SHA512 5a02bd095a027cb36d30bec0d169ab700fa13489fa2c65791e7714222e366dd3fa12a7c78e87a381440d2f6d54a5743e2e035a79a0b69acf5ed2f35317e5e1cf +AUX qdevicemonitor-1.0.1-qt-6.patch 19692 BLAKE2B db6e29e0a288ddcf5567a7fcc605397ba9543cdaf5f7f4b5a569068ce4a65877b67978638f8f4ddc2ab479f60c8c74174a6f984a11a4244498cf52346d1140a6 SHA512 19a05fab280ee762839bf10b06400df4059bea39c3e49c3527a1a05f78867df212013fed974e2d68a29e9e99096cdbf10a51ec2f29238becf9b8db4d6f798ceb AUX qdevicemonitor-1.0.1-screen-geometry-is-deprecated.patch 1316 BLAKE2B ae704d2ebd35b4919f71a1ad0b8386aa3ae525edc31fa89eb286803356f8d27c1629d9c17e56af2c3378cd30c0771b9a40b498bec3ef27bc024744686e51cbd6 SHA512 78de2233a32b9aee0d37b836b5c15b9228f81a18414f9b5b78ba92b7c00642ddb1c1ba47de49daba88619f0d3c3e13a9ad7af05ca440951f69e7b8e320ef6a8a DIST qdevicemonitor-1.0.1.tar.gz 955052 BLAKE2B 9efbc2d5575b09056d2e52e3d6208a2cb70ba2cab0cede574faab9845decbf9758d3cc1ce41905ba0a915de12c8ac474fb2933522fa5e5be5543ab7c780ca5b9 SHA512 c393d8e33aa6234c2b62af8c25e5fc2e6ccacf9734b77500a512fbd584ecde723b9d5717dbe268d65565d3d30801d297236b3546263ba2689ba246d2b13b8f55 -EBUILD qdevicemonitor-1.0.1-r2.ebuild 1238 BLAKE2B 955fc6c1a745e6822b3918ed9ba4f5aa5f2bd2bbd812087f340da12ba3d5a2c389276f94095c73e08c100e6195d246f33877ff269f08be6165cfa36b77578f8f SHA512 d60fa2d748a8084432ddb65e7e310eab6135497a03c56e888a38d80d9b37e6522eb6c26a67aa4e1940bb3a2fa334d5c6426099817a36767c4a8db5cfd2b00514 -EBUILD qdevicemonitor-9999.ebuild 915 BLAKE2B e05fb16f77410c0478ad212b0ae18616cc8c98072b1c06e81163df9fa55694af652eeaf6d5aba943ceb9c999187210922827d12d4cd41425279e1ecad8ef5fdc SHA512 4088257b67415a9ec932ab62b2ecdaada1c544df2f828279249a49b5346a8fa3dd906561cf2549212e0caebcac8b43c7c8cf725d01c9c778193a0de9b3f16be9 +EBUILD qdevicemonitor-1.0.1-r3.ebuild 1246 BLAKE2B 20bab7c1ec69fd7ec9314cd3b9d62d8e337f21fd41b1aa907090f13eebc22d55d0361714c9b8bf3652767f6bc14830044c63b8ac111cb71ab6d47ec6c596a8d6 SHA512 42c27bffda086e92c4b6ee20e7f21d9c9819d07d1afa25d15df157f10215a60a414e4726bdeeb9e46bce1158938ded28f3fa3dbf9184ad105b29c4d9c851919b +EBUILD qdevicemonitor-9999.ebuild 912 BLAKE2B 334381619ff5b6d97cb92a4267c1f15e62703f2eaddcf10945b31e168386e502a5e0e59a591a5061ce96ee714f2e7dd8f29c661762a748e7e8ac5bbcdf9d9df4 SHA512 56cab01a7b4b989d0de1fb85f17704b4618d44097756e010758607b28873aa84d3c8ce867609f1dccae9c9d16dd93ac39d2e181396bf21f595a635376aa4b511 MISC metadata.xml 496 BLAKE2B 5546ce5ae6a8e1f1818ac784858d0902bb165d171e3b9bedc32f37a9e6c66ed0c70fa8f58c433b1379a884abd10f20ae36cbe2345b9b4cef8f79f7ee573430ac SHA512 d1feb18db592308fb1b32a675d9230868c759d25fe9bbf1f3dbd868ad154bc89e6a3dcdf336437ce4e5b6641ccbf6e9fbfd0421b07551020bd270761d45650ae diff --git a/dev-util/qdevicemonitor/files/qdevicemonitor-1.0.1-qt-6.patch b/dev-util/qdevicemonitor/files/qdevicemonitor-1.0.1-qt-6.patch new file mode 100644 index 000000000000..fe182b7e2f31 --- /dev/null +++ b/dev-util/qdevicemonitor/files/qdevicemonitor-1.0.1-qt-6.patch @@ -0,0 +1,454 @@ +From 4d90f45d6c204ad87b2198791fe522be092bed98 Mon Sep 17 00:00:00 2001 +From: Alexander Lopatin <alopatindev@codonaft.com> +Date: Tue, 14 Jan 2025 23:52:00 +0800 +Subject: [PATCH] Port to Qt 6 + +https://bugs.gentoo.org/948065 +--- + qdevicemonitor/StringRingBuffer.h | 1 + + qdevicemonitor/devices/AndroidDevice.cpp | 24 +++++++++++-------- + qdevicemonitor/devices/AndroidDevice.h | 8 +++---- + qdevicemonitor/devices/BaseDevice.cpp | 10 +++++--- + qdevicemonitor/devices/BaseDevice.h | 5 ++-- + qdevicemonitor/devices/IOSDevice.cpp | 24 ++++++++++++------- + qdevicemonitor/devices/IOSDevice.h | 2 +- + qdevicemonitor/devices/TextFileDevice.cpp | 16 +++++++------ + qdevicemonitor/devices/TextFileDevice.h | 2 +- + .../trackers/AndroidDevicesTracker.cpp | 4 ++++ + .../devices/trackers/IOSDevicesTracker.cpp | 4 ++++ + qdevicemonitor/ui/DeviceWidget.cpp | 10 +++++--- + qdevicemonitor/ui/DeviceWidget.h | 4 ++-- + qdevicemonitor/ui/MainWindow.cpp | 3 +-- + 14 files changed, 73 insertions(+), 44 deletions(-) + +diff --git a/qdevicemonitor/StringRingBuffer.h b/qdevicemonitor/StringRingBuffer.h +index 5c6537b..76dee9d 100644 +--- a/qdevicemonitor/StringRingBuffer.h ++++ b/qdevicemonitor/StringRingBuffer.h +@@ -18,6 +18,7 @@ + #ifndef RINGBUFFER_H + #define RINGBUFFER_H + ++#include <QObject> + #include <QPointer> + #include <QString> + #include <QVector> +diff --git a/qdevicemonitor/devices/AndroidDevice.cpp b/qdevicemonitor/devices/AndroidDevice.cpp +index e0785e9..a11e79f 100644 +--- a/qdevicemonitor/devices/AndroidDevice.cpp ++++ b/qdevicemonitor/devices/AndroidDevice.cpp +@@ -146,7 +146,11 @@ void AndroidDevice::startLogger() + m_logFile.setFileName(currentLogAbsFileName); + m_logFile.open(QIODevice::ReadWrite | QIODevice::Text | QIODevice::Truncate); + m_logFileStream = QSharedPointer<QTextStream>::create(&m_logFile); ++#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0) + m_logFileStream->setCodec("UTF-8"); ++#else ++ m_logFileStream->setEncoding(QStringConverter::Utf8); ++#endif + + startLogProcess(); + +@@ -230,13 +234,13 @@ void AndroidDevice::filterAndAddToTextEdit(const QString& line) + const QRegularExpressionMatch match = re.match(line); + if (match.hasMatch()) + { +- const QStringRef date = match.capturedRef("date"); +- const QStringRef time = match.capturedRef("time"); +- const QStringRef pid = match.capturedRef("pid"); +- const QStringRef tid = match.capturedRef("tid"); +- const QStringRef verbosity = match.capturedRef("verbosity"); +- const QStringRef tag = match.capturedRef("tag").trimmed(); +- const QStringRef text = line.midRef(match.capturedEnd("tag") + 1); ++ const QStringView date = match.captured("date"); ++ const QStringView time = match.captured("time"); ++ const QStringView pid = match.captured("pid"); ++ const QStringView tid = match.captured("tid"); ++ const QStringView verbosity = match.captured("verbosity"); ++ const QStringView tag = match.captured("tag").trimmed(); ++ const QStringView text = line.mid(match.capturedEnd("tag") + 1); + + const auto verbosityLevel = static_cast<VerbosityEnum>(Utils::verbosityCharacterToInt(verbosity.at(0).toLatin1())); + +@@ -261,7 +265,7 @@ void AndroidDevice::filterAndAddToTextEdit(const QString& line) + checkFilters(filtersMatch, m_filtersValid); + if (filtersMatch) + { +- m_deviceWidget->addText(ColorTheme::VerbosityVerbose, QStringRef(&line)); ++ m_deviceWidget->addText(ColorTheme::VerbosityVerbose, QStringView(line)); + m_deviceWidget->flushText(); + } + } +@@ -269,7 +273,7 @@ void AndroidDevice::filterAndAddToTextEdit(const QString& line) + m_deviceWidget->highlightFilterLineEdit(!m_filtersValid); + } + +-void AndroidDevice::checkFilters(bool& filtersMatch, bool& filtersValid, const VerbosityEnum verbosityLevel, const QStringRef& pid, const QStringRef& tid, const QStringRef& tag, const QStringRef& text) ++void AndroidDevice::checkFilters(bool& filtersMatch, bool& filtersValid, const VerbosityEnum verbosityLevel, const QStringView pid, const QStringView tid, const QStringView tag, const QStringView text) + { + filtersMatch = verbosityLevel <= m_deviceWidget->getVerbosityLevel(); + +@@ -283,7 +287,7 @@ void AndroidDevice::checkFilters(bool& filtersMatch, bool& filtersValid, const V + + for (auto it = m_filters.constBegin(); it != m_filters.constEnd(); ++it) + { +- const QStringRef filter(&(*it)); ++ const QStringView filter(*it); + bool columnFound = false; + if (!columnMatches("pid:", filter, pid, filtersValid, columnFound) || + !columnMatches("tid:", filter, tid, filtersValid, columnFound) || +diff --git a/qdevicemonitor/devices/AndroidDevice.h b/qdevicemonitor/devices/AndroidDevice.h +index 1012c43..f908d07 100644 +--- a/qdevicemonitor/devices/AndroidDevice.h ++++ b/qdevicemonitor/devices/AndroidDevice.h +@@ -77,10 +77,10 @@ private: + void checkFilters(bool& filtersMatch, + bool& filtersValid, + const VerbosityEnum verbosityLevel = Verbose, +- const QStringRef& pid = QStringRef(), +- const QStringRef& tid = QStringRef(), +- const QStringRef& tag = QStringRef(), +- const QStringRef& text = QStringRef()); ++ const QStringView pid = QStringView(), ++ const QStringView tid = QStringView(), ++ const QStringView tag = QStringView(), ++ const QStringView text = QStringView()); + }; + + #endif // ANDROIDDEVICE_H +diff --git a/qdevicemonitor/devices/BaseDevice.cpp b/qdevicemonitor/devices/BaseDevice.cpp +index 21ee82c..628d7a4 100644 +--- a/qdevicemonitor/devices/BaseDevice.cpp ++++ b/qdevicemonitor/devices/BaseDevice.cpp +@@ -47,7 +47,11 @@ BaseDevice::BaseDevice( + { + qDebug() << "new BaseDevice; type" << type << "; id" << id; + ++#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0) + m_tempStream.setCodec("UTF-8"); ++#else ++ m_tempStream.setEncoding(QStringConverter::Utf8); ++#endif + m_tempStream.setString(&m_tempBuffer, QIODevice::ReadWrite | QIODevice::Text); + + updateLogBufferSpace(); +@@ -195,12 +199,12 @@ void BaseDevice::filterAndAddFromLogBufferToTextEdit() + } + } + +-bool BaseDevice::columnMatches(const QString& column, const QStringRef& filter, const QStringRef& originalValue, bool& filtersValid, bool& columnFound) ++bool BaseDevice::columnMatches(const QString& column, const QStringView filter, const QStringView originalValue, bool& filtersValid, bool& columnFound) + { + if (filter.startsWith(column)) + { + columnFound = true; +- const QStringRef value = filter.mid(column.length()); ++ const QStringView value = filter.mid(column.length()); + if (value.isEmpty()) + { + filtersValid = false; +@@ -213,7 +217,7 @@ bool BaseDevice::columnMatches(const QString& column, const QStringRef& filter, + return true; + } + +-bool BaseDevice::columnTextMatches(const QStringRef& filter, const QString& text) ++bool BaseDevice::columnTextMatches(const QStringView filter, const QString& text) + { + if (filter.isEmpty() || text.contains(filter)) + { +diff --git a/qdevicemonitor/devices/BaseDevice.h b/qdevicemonitor/devices/BaseDevice.h +index 504b78d..2990b02 100644 +--- a/qdevicemonitor/devices/BaseDevice.h ++++ b/qdevicemonitor/devices/BaseDevice.h +@@ -28,7 +28,6 @@ + #include <QRegularExpression> + #include <QSharedPointer> + #include <QString> +-#include <QStringRef> + #include <QTabWidget> + #include <QTextStream> + #include <QTimer> +@@ -93,8 +92,8 @@ public: + + void updateLogBufferSpace(); + void filterAndAddFromLogBufferToTextEdit(); +- bool columnMatches(const QString& column, const QStringRef& filter, const QStringRef& originalValue, bool& filtersValid, bool& columnFound); +- bool columnTextMatches(const QStringRef& filter, const QString& text); ++ bool columnMatches(const QString& column, const QStringView filter, const QStringView originalValue, bool& filtersValid, bool& columnFound); ++ bool columnTextMatches(const QStringView filter, const QString& text); + + void scheduleLogReady(); + void stopLogReadyTimer(); +diff --git a/qdevicemonitor/devices/IOSDevice.cpp b/qdevicemonitor/devices/IOSDevice.cpp +index 98fca1c..d47d200 100644 +--- a/qdevicemonitor/devices/IOSDevice.cpp ++++ b/qdevicemonitor/devices/IOSDevice.cpp +@@ -38,7 +38,11 @@ IOSDevice::IOSDevice( + { + qDebug() << "IOSDevice::IOSDevice"; + ++#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0) + m_tempErrorsStream.setCodec("UTF-8"); ++#else ++ m_tempErrorsStream.setEncoding(QStringConverter::Utf8); ++#endif + m_tempErrorsStream.setString(&m_tempErrorsBuffer, QIODevice::ReadWrite | QIODevice::Text); + + m_deviceWidget->getFilterLineEdit().setToolTip(tr("Search for messages. Accepts<ul><li>Plain Text</li><li>Prefix <b>text:</b> with Plain Text</li><li>Regular Expressions</li></ul>")); +@@ -160,7 +164,11 @@ void IOSDevice::startLogger() + m_logFile.setFileName(currentLogAbsFileName); + m_logFile.open(QIODevice::ReadWrite | QIODevice::Text | QIODevice::Truncate); + m_logFileStream = QSharedPointer<QTextStream>::create(&m_logFile); ++#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0) + m_logFileStream->setCodec("UTF-8"); ++#else ++ m_logFileStream->setEncoding(QStringConverter::Utf8); ++#endif + + startLogProcess(); + +@@ -193,14 +201,14 @@ void IOSDevice::onUpdateFilter(const QString& filter) + maybeAddCompletionAfterDelay(filter); + } + +-void IOSDevice::checkFilters(bool& filtersMatch, bool& filtersValid, const QStringRef& text) ++void IOSDevice::checkFilters(bool& filtersMatch, bool& filtersValid, const QStringView text) + { + QString textString; + bool textStringInitialized = false; + + for (auto it = m_filters.constBegin(); it != m_filters.constEnd(); ++it) + { +- const QStringRef filter(&(*it)); ++ const QStringView filter(*it); + bool columnFound = false; + if (!columnMatches("text:", filter, text, filtersValid, columnFound)) + { +@@ -242,9 +250,9 @@ void IOSDevice::filterAndAddToTextEdit(const QString& line) + const QRegularExpressionMatch match = re.match(line); + if (match.hasMatch()) + { +- const QStringRef prefix = match.capturedRef("prefix"); +- const QStringRef deviceName = match.capturedRef("deviceName"); +- const QStringRef text = line.midRef(match.capturedEnd("deviceName") + 1); ++ const QStringView prefix = match.captured("prefix"); ++ const QStringView deviceName = match.captured("deviceName"); ++ const QStringView text = QStringView(line).mid(match.capturedEnd("deviceName") + 1); + + checkFilters(filtersMatch, m_filtersValid, text); + +@@ -258,11 +266,11 @@ void IOSDevice::filterAndAddToTextEdit(const QString& line) + } + else + { +- checkFilters(filtersMatch, m_filtersValid, QStringRef(&line)); ++ checkFilters(filtersMatch, m_filtersValid, QStringView(line)); + + if (filtersMatch) + { +- m_deviceWidget->addText(ColorTheme::VerbosityVerbose, QStringRef(&line)); ++ m_deviceWidget->addText(ColorTheme::VerbosityVerbose, QStringView(line)); + m_deviceWidget->flushText(); + } + } +@@ -323,7 +331,7 @@ void IOSDevice::maybeReadErrorsPart() + if (m_tempErrorsStream.readLineInto(&line)) + #endif + { +- m_deviceWidget->addText(ColorTheme::VerbosityAssert, QStringRef(&line)); ++ m_deviceWidget->addText(ColorTheme::VerbosityAssert, QStringView(line)); + m_deviceWidget->flushText(); + } + } +diff --git a/qdevicemonitor/devices/IOSDevice.h b/qdevicemonitor/devices/IOSDevice.h +index e9ba086..cca3a15 100644 +--- a/qdevicemonitor/devices/IOSDevice.h ++++ b/qdevicemonitor/devices/IOSDevice.h +@@ -62,7 +62,7 @@ private: + void stopInfoProcess(); + void startLogger(); + void stopLogger(); +- void checkFilters(bool& filtersMatch, bool& filtersValid, const QStringRef& text); ++ void checkFilters(bool& filtersMatch, bool& filtersValid, const QStringView text); + + void maybeReadErrorsPart(); + void maybeReadLogPart(); +diff --git a/qdevicemonitor/devices/TextFileDevice.cpp b/qdevicemonitor/devices/TextFileDevice.cpp +index 353d162..bd11b45 100644 +--- a/qdevicemonitor/devices/TextFileDevice.cpp ++++ b/qdevicemonitor/devices/TextFileDevice.cpp +@@ -90,7 +90,7 @@ void TextFileDevice::onUpdateFilter(const QString& filter) + maybeAddCompletionAfterDelay(filter); + } + +-void TextFileDevice::checkFilters(bool& filtersMatch, bool& filtersValid, const QStringRef& text) ++void TextFileDevice::checkFilters(bool& filtersMatch, bool& filtersValid, const QStringView text) + { + filtersValid = true; + +@@ -98,7 +98,7 @@ void TextFileDevice::checkFilters(bool& filtersMatch, bool& filtersValid, const + + for (auto it = m_filters.constBegin(); it != m_filters.constEnd(); ++it) + { +- const QStringRef filter(&(*it)); ++ const QStringView filter(*it); + if (!columnTextMatches(filter, textString)) + { + filtersMatch = false; +@@ -113,14 +113,16 @@ void TextFileDevice::filterAndAddToTextEdit(const QString& line) + "(?<prefix>[A-Za-z]{3} +[\\d]{1,2} [\\d:]{8}) (?<hostname>.+) ", + QRegularExpression::InvertedGreedinessOption | QRegularExpression::DotMatchesEverythingOption + ); ++ static const QString prefixPattern("prefix"); ++ static const QString hostnamePattern("hostname"); + + bool filtersMatch = true; + const QRegularExpressionMatch match = re.match(line); + if (match.hasMatch()) + { +- const QStringRef prefix = match.capturedRef("prefix"); +- const QStringRef hostname = match.capturedRef("hostname"); +- const QStringRef text = line.midRef(match.capturedEnd("hostname") + 1); ++ const QStringView prefix = match.capturedView(QStringView(prefixPattern)); ++ const QStringView hostname = match.capturedView(QStringView(hostnamePattern)); ++ const QStringView text = QStringView(line).mid(match.capturedEnd("hostname") + 1); + + checkFilters(filtersMatch, m_filtersValid, text); + +@@ -134,10 +136,10 @@ void TextFileDevice::filterAndAddToTextEdit(const QString& line) + } + else + { +- checkFilters(filtersMatch, m_filtersValid, QStringRef(&line)); ++ checkFilters(filtersMatch, m_filtersValid, QStringView(line)); + if (filtersMatch) + { +- m_deviceWidget->addText(ColorTheme::VerbosityVerbose, QStringRef(&line)); ++ m_deviceWidget->addText(ColorTheme::VerbosityVerbose, QStringView(line)); + m_deviceWidget->flushText(); + } + } +diff --git a/qdevicemonitor/devices/TextFileDevice.h b/qdevicemonitor/devices/TextFileDevice.h +index b943ff2..23622d7 100644 +--- a/qdevicemonitor/devices/TextFileDevice.h ++++ b/qdevicemonitor/devices/TextFileDevice.h +@@ -51,7 +51,7 @@ private: + void startLogger(); + void stopLogger(); + +- void checkFilters(bool& filtersMatch, bool& filtersValid, const QStringRef& text); ++ void checkFilters(bool& filtersMatch, bool& filtersValid, const QStringView text); + + private slots: + void onLogReady() override; +diff --git a/qdevicemonitor/devices/trackers/AndroidDevicesTracker.cpp b/qdevicemonitor/devices/trackers/AndroidDevicesTracker.cpp +index e83d598..713805b 100644 +--- a/qdevicemonitor/devices/trackers/AndroidDevicesTracker.cpp ++++ b/qdevicemonitor/devices/trackers/AndroidDevicesTracker.cpp +@@ -21,7 +21,11 @@ + + AndroidDevicesTracker::AndroidDevicesTracker() + { ++#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0) + m_codecStream.setCodec("UTF-8"); ++#else ++ m_codecStream.setEncoding(QStringConverter::Utf8); ++#endif + m_codecStream.setString(&m_buffer, QIODevice::ReadWrite | QIODevice::Text); + } + +diff --git a/qdevicemonitor/devices/trackers/IOSDevicesTracker.cpp b/qdevicemonitor/devices/trackers/IOSDevicesTracker.cpp +index e66a21d..da64678 100644 +--- a/qdevicemonitor/devices/trackers/IOSDevicesTracker.cpp ++++ b/qdevicemonitor/devices/trackers/IOSDevicesTracker.cpp +@@ -21,7 +21,11 @@ + + IOSDevicesTracker::IOSDevicesTracker() + { ++#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0) + m_codecStream.setCodec("UTF-8"); ++#else ++ m_codecStream.setEncoding(QStringConverter::Utf8); ++#endif + m_codecStream.setString(&m_buffer, QIODevice::ReadWrite | QIODevice::Text); + } + +diff --git a/qdevicemonitor/ui/DeviceWidget.cpp b/qdevicemonitor/ui/DeviceWidget.cpp +index a665ab2..e317434 100644 +--- a/qdevicemonitor/ui/DeviceWidget.cpp ++++ b/qdevicemonitor/ui/DeviceWidget.cpp +@@ -39,7 +39,11 @@ DeviceWidget::DeviceWidget(QPointer<QWidget> parent, QPointer<DeviceFacade> devi + m_redPalette = QPalette(Qt::red); + m_redPalette.setColor(QPalette::Highlight, Qt::red); + ++#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0) + m_textStream.setCodec("UTF-8"); ++#else ++ m_textStream.setEncoding(QStringConverter::Utf8); ++#endif + m_textStream.setString(&m_stringStream, QIODevice::ReadWrite | QIODevice::Text); + + //ui->textEdit->setFontFamily(m_deviceFacade->getFont()); +@@ -97,12 +101,12 @@ void DeviceWidget::maybeScrollTextEditToEnd() + } + } + +-void DeviceWidget::addText(const ColorTheme::ColorType color, const QStringRef& text) ++void DeviceWidget::addText(const ColorTheme::ColorType color, const QStringView text) + { + addText(m_deviceFacade->getThemeColor(color), text); + } + +-void DeviceWidget::addText(const QColor& color, const QStringRef& text) ++void DeviceWidget::addText(const QColor& color, const QStringView text) + { + m_textStream + << "<font style=\"font-family: " << m_deviceFacade->getFont() +@@ -187,7 +191,7 @@ void DeviceWidget::focusFilterInput() + + void DeviceWidget::on_markLogButton_clicked() + { +- addText(ColorTheme::VerbosityVerbose, QStringRef(&MARK_LINE)); ++ addText(ColorTheme::VerbosityVerbose, QStringView(MARK_LINE)); + m_deviceFacade->writeToLogFile(m_id, MARK_LINE); + flushText(); + } +diff --git a/qdevicemonitor/ui/DeviceWidget.h b/qdevicemonitor/ui/DeviceWidget.h +index 9dcd608..9dcd7b4 100644 +--- a/qdevicemonitor/ui/DeviceWidget.h ++++ b/qdevicemonitor/ui/DeviceWidget.h +@@ -55,8 +55,8 @@ public: + inline int getVerbosityLevel() const { return m_ui->verbositySlider->value(); } + void highlightFilterLineEdit(bool red); + void maybeScrollTextEditToEnd(); +- void addText(const ColorTheme::ColorType color, const QStringRef& text); +- void addText(const QColor& color, const QStringRef& text); ++ void addText(const ColorTheme::ColorType color, const QStringView text); ++ void addText(const QColor& color, const QStringView text); + void flushText(); + void clearTextEdit(); + void onLogFileNameChanged(const QString& logFileName); +diff --git a/qdevicemonitor/ui/MainWindow.cpp b/qdevicemonitor/ui/MainWindow.cpp +index 69d4433..56ffb40 100644 +--- a/qdevicemonitor/ui/MainWindow.cpp ++++ b/qdevicemonitor/ui/MainWindow.cpp +@@ -23,7 +23,6 @@ + #include <cstdlib> + #include <QApplication> + #include <QDebug> +-#include <QDesktopWidget> + #include <QDir> + #include <QFileDialog> + #include <QFileInfo> +@@ -162,7 +161,7 @@ void MainWindow::keyReleaseEvent(QKeyEvent* event) + + void MainWindow::mouseReleaseEvent(QMouseEvent* event) + { +- if (event->button() == Qt::MidButton) ++ if (event->button() == Qt::MiddleButton) + { + const QTabBar& tabBar = *(m_ui->tabWidget->tabBar()); + const QPoint mousePos = tabBar.mapFrom(this, event->pos()); +-- +2.45.2 + diff --git a/dev-util/qdevicemonitor/qdevicemonitor-1.0.1-r2.ebuild b/dev-util/qdevicemonitor/qdevicemonitor-1.0.1-r3.ebuild index edf5f5dbf0ce..4021c398400d 100644 --- a/dev-util/qdevicemonitor/qdevicemonitor-1.0.1-r2.ebuild +++ b/dev-util/qdevicemonitor/qdevicemonitor-1.0.1-r3.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2024 Gentoo Authors +# Copyright 1999-2025 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -22,9 +22,7 @@ IUSE="" RDEPEND=" app-pda/usbmuxd - dev-qt/qtcore:5 - dev-qt/qtgui:5 - dev-qt/qtwidgets:5 + dev-qt/qtbase:6[gui,widgets] dev-util/android-tools" DEPEND="${RDEPEND}" @@ -35,12 +33,13 @@ PATCHES=( "${FILESDIR}"/${P}-endl-is-deprecated.patch "${FILESDIR}"/${P}-disable-warnings-as-errors.patch "${FILESDIR}"/${P}-disable-pedantic-errors.patch + "${FILESDIR}"/${P}-qt-6.patch ) src_configure() { cd "${PN}" || die export VERSION_WITH_BUILD_NUMBER="${PV}" - eqmake5 + eqmake6 } src_compile() { diff --git a/dev-util/qdevicemonitor/qdevicemonitor-9999.ebuild b/dev-util/qdevicemonitor/qdevicemonitor-9999.ebuild index 0dd22c27ff48..7eaed85fcca5 100644 --- a/dev-util/qdevicemonitor/qdevicemonitor-9999.ebuild +++ b/dev-util/qdevicemonitor/qdevicemonitor-9999.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2025 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -22,15 +22,14 @@ IUSE="" RDEPEND=" app-pda/usbmuxd - dev-qt/qtcore:5 - dev-qt/qtgui:5 + dev-qt/qtbase:6[gui,widgets] dev-util/android-tools" DEPEND="${RDEPEND}" src_configure() { cd "${PN}" || die export VERSION_WITH_BUILD_NUMBER="${PV}" - eqmake5 + eqmake6 } src_compile() { diff --git a/dev-util/spirv-llvm-translator/Manifest b/dev-util/spirv-llvm-translator/Manifest index 6538d4108308..6415af6b3c67 100644 --- a/dev-util/spirv-llvm-translator/Manifest +++ b/dev-util/spirv-llvm-translator/Manifest @@ -11,10 +11,10 @@ DIST spirv-llvm-translator-18.1.8.tar.gz 1718242 BLAKE2B e35b5e4e2f9f3d9fe896ae7 DIST spirv-llvm-translator-19.1.1.tar.gz 1762107 BLAKE2B 60b248253185e241f5f5786b3d73194b24a2022047764ad95c0a14fc897ef89d40551f7b9b517ee5a3404adfcf2b2d25808e419a5f9863219feec9e1f5ce8cc5 SHA512 fb97ba38bfaefa1dbd181a1ab710dd94780db73aa3de2bbf60ff2eb62b9ab387962468ab71cbf910fb842fd217dcf2961148452c4a57d84013aa61b2458ae1c1 DIST spirv-llvm-translator-19.1.2.tar.gz 1767303 BLAKE2B c96b0640082c83a20258932824919479dece2973de2eeb17066ffeaa372083699322787a451465d754b419a7a7ad0d2eeb9c9372ba4695be4d333d65861500ae SHA512 91d768324f835ed891be51a7de1f752100b2d4df7f138137979cc928b23394a0d9c5ad4dbb06a203f7bc101483a667cba84b8eacc7d66e011426dda169cc14fd DIST spirv-llvm-translator-19.1.3.tar.gz 1766986 BLAKE2B 09124989ed78b62d2e9dbbf112a35249f960e4892b1abe24465908c508316e23cd6f98ada95d9fc3993bece746e038bd26a609604c1e37068ad5eedd20c02d3f SHA512 8370ca2192e7df3aff2e2336155d3ab5519103cc31f84a1d199b34d78ad77397be0e3944d2d5eb815497fb297dcb1b4ca063d2f667dfe8e0a75c896389a9ad0b -EBUILD spirv-llvm-translator-15.0.4-r1.ebuild 1293 BLAKE2B 64a5b0e0ff4ef6f553b6f16ee73eba38970b1e5dbe5d114b2141dbaf0fe9794feb1e30c1110061cc70b367355722bf84aa35ba05f41f88e3d56f45c78db48c7e SHA512 6f1b458918dccaad866b91b1d8a4cbfd5a1de64ec6e9ce251e25e1ec1e3f471df85370e3ecefe68961966b5c4b0233623fe5f6827d473014b993ceeb727c21a4 -EBUILD spirv-llvm-translator-15.0.8.ebuild 1295 BLAKE2B bb67931b89911f78a385f1562a0a8162c5bf672a412cbf551faf2cb1470fe218ce9aa6c051f817bfb9aec297d3b84e9df0a433973ed903fdd67a44920f440bc1 SHA512 f21c9c4486eab9f46de15ac7db656cd53484b96487475186d30efc9632f10ace8141a001bef9dc3d63b8d06488d213fea37f958d3941c21a852cf8ddb1b09b48 -EBUILD spirv-llvm-translator-16.0.4-r1.ebuild 1410 BLAKE2B db9257e65e87099d33a60558bbdf1557cf629366c2af2e2cecb10fe83885321881d6df6d6ef681f9968e21add67c354a2199d5768b2d699a90161f2504003e20 SHA512 1269fe0f60f55cc01d589523005a5726d296742bcfcfb260d8183404ec77ee2c7aa7c19d738db16102f172343c8cd7aa237457b02f392f308736bcb3bdd198e6 -EBUILD spirv-llvm-translator-16.0.8.ebuild 1412 BLAKE2B c0d929b55aec4a157021401336b3eb2d9548efb7a309c9a965e7ffa9b1ea27f6a5c3f8844d5f22bd3463a290e0d47dd25ac4758432b8acd23e699ebf90df0c0a SHA512 9e891abc44576c640b9c0a9820599236b4104834bcf5ca1f36ef5ad2506d33d611c9cd59ce841b2ac51d62ff7e502a4cbb1f279a053161ae8ebe21b230ab501b +EBUILD spirv-llvm-translator-15.0.4-r1.ebuild 1299 BLAKE2B 49bd4cffe754280740883ece2f296c4eccbb4a6d3c00a1a9169dd47cb2b642ceef320362cf151f1c75d21298304201d42e340cce1948c1f757b825de59be0047 SHA512 5d85b7b2f860f79c25f68674068faf2a786e46c1376f4f2ca22885d5789243d004f7dcba79e4d2f1045f7fcae5a75ff509e162c58ea069a20e026bff74129b95 +EBUILD spirv-llvm-translator-15.0.8.ebuild 1302 BLAKE2B 02ed3247978c7c33194c0c7d109c9746b032fbeab9b7740c690733387545040a711e981ac0a7775138f92bdcbc167cedc75f006290ad087c9cf3bf1c16a1ec29 SHA512 b49d40aceecfdf8773a9d90104c51e349b70e47d7e3e05d2312c96bba68da980e60ba24b2cc1bc1cf3bae88d3ad8b33a057f1ea2cb47ae53cd398c6684924092 +EBUILD spirv-llvm-translator-16.0.4-r1.ebuild 1416 BLAKE2B bbc3000784b390210fa515605c566dc021a730503b8ea4d18c20cda151169dbe79e57615c32ca99e6ea6e3f40d0a3fdeddca5f470cf62bb25fb502a366eb285d SHA512 58575f0d0bc05a2f97627f00560115728daa4026202931213fb6d2346476d0d2bafb03d735db001ca02ed247feecbf76dd9ad42e365333df658144cb2283111d +EBUILD spirv-llvm-translator-16.0.8.ebuild 1419 BLAKE2B 043733a01fbc73013f8eab1f3f4895b33652c2c13044f7aaf3f5cb971fac7d490430c3018d06c8fd2c0d4989a04ecad002ec9809ebba4e0d544004770c7f5e27 SHA512 d27d46b4145cf2b0010c23c89bfdaa48d72c2b3aea740683959de0d4a79026a2b2b1c3e1ca8ca09d22be590afa45c570a15a82db67aa149aa5878fd902e82aeb EBUILD spirv-llvm-translator-17.0.4-r1.ebuild 1363 BLAKE2B c34a7f7b8aab6d5797e3bd5144da1bb69516c9024d376b242c554927c08fa3185d871c330a54378578fec2daef520258054b8d2ea41d7455bf70ad8d117258a5 SHA512 6703333d818ad50742679e40a7deb508951e419b4f99cd5241f2401feda0a593eb8c8ead951b205334fa45be10241c1074b4c54be1a5d94290dc6199d649a771 EBUILD spirv-llvm-translator-17.0.8.ebuild 1373 BLAKE2B 78a2caf548628d5854e860c4597cc575d1b0883b3cc589a15401a39d9e5fb5a80b43f285c4e15b8a832609e92a7a6a2eb1dcc29a3a06e9f31c569a84c5697114 SHA512 9995a6b08063945c3bcf19d55c862725729e544ccb8fbcb88c36439bfe69b91a8e5e24294962de9a88d805c1c36723fd0df6a53a907e8d5f9cb4e43040ad9756 EBUILD spirv-llvm-translator-18.1.4.ebuild 1443 BLAKE2B a2034d194932551f6f92f0df9fb5baab68df91552f271e4222e169011e60c2a9a826c954a4cd50533c78bab84922d96f52b31fee2acd8289ec7c19ad89e25c93 SHA512 ee3db3b644276ddbee5919f1856cdcd6d0fa96850a7b226ebe0d8e74d5ad4f1d3f5e1daa485a1c272f39dcc2b7173a9a42f9c9c3f8ee9d331f7dbce1fa7eae73 diff --git a/dev-util/spirv-llvm-translator/spirv-llvm-translator-15.0.4-r1.ebuild b/dev-util/spirv-llvm-translator/spirv-llvm-translator-15.0.4-r1.ebuild index 57c49c326325..387a8f7a6471 100644 --- a/dev-util/spirv-llvm-translator/spirv-llvm-translator-15.0.4-r1.ebuild +++ b/dev-util/spirv-llvm-translator/spirv-llvm-translator-15.0.4-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2024 Gentoo Authors +# Copyright 1999-2025 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -16,7 +16,7 @@ S="${WORKDIR}/${MY_P}" LICENSE="UoI-NCSA" SLOT="$(ver_cut 1)" -KEYWORDS="amd64 ~riscv x86" +KEYWORDS="amd64 arm64 ~riscv x86" IUSE="test" RESTRICT="!test? ( test )" diff --git a/dev-util/spirv-llvm-translator/spirv-llvm-translator-15.0.8.ebuild b/dev-util/spirv-llvm-translator/spirv-llvm-translator-15.0.8.ebuild index 4d629410521c..86bce5e11561 100644 --- a/dev-util/spirv-llvm-translator/spirv-llvm-translator-15.0.8.ebuild +++ b/dev-util/spirv-llvm-translator/spirv-llvm-translator-15.0.8.ebuild @@ -16,7 +16,7 @@ S="${WORKDIR}/${MY_P}" LICENSE="UoI-NCSA" SLOT="$(ver_cut 1)" -KEYWORDS="~amd64 ~riscv ~x86" +KEYWORDS="~amd64 ~arm64 ~riscv ~x86" IUSE="test" RESTRICT="!test? ( test )" diff --git a/dev-util/spirv-llvm-translator/spirv-llvm-translator-16.0.4-r1.ebuild b/dev-util/spirv-llvm-translator/spirv-llvm-translator-16.0.4-r1.ebuild index cb749f2628eb..6f2cd0f9be8f 100644 --- a/dev-util/spirv-llvm-translator/spirv-llvm-translator-16.0.4-r1.ebuild +++ b/dev-util/spirv-llvm-translator/spirv-llvm-translator-16.0.4-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2024 Gentoo Authors +# Copyright 1999-2025 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -16,7 +16,7 @@ S="${WORKDIR}/${MY_P}" LICENSE="UoI-NCSA" SLOT="$(ver_cut 1)" -KEYWORDS="amd64 ~riscv x86" +KEYWORDS="amd64 arm64 ~riscv x86" IUSE="test" RESTRICT="!test? ( test )" diff --git a/dev-util/spirv-llvm-translator/spirv-llvm-translator-16.0.8.ebuild b/dev-util/spirv-llvm-translator/spirv-llvm-translator-16.0.8.ebuild index 723c1ef1fe7e..a6c60fea8258 100644 --- a/dev-util/spirv-llvm-translator/spirv-llvm-translator-16.0.8.ebuild +++ b/dev-util/spirv-llvm-translator/spirv-llvm-translator-16.0.8.ebuild @@ -16,7 +16,7 @@ S="${WORKDIR}/${MY_P}" LICENSE="UoI-NCSA" SLOT="$(ver_cut 1)" -KEYWORDS="~amd64 ~riscv ~x86" +KEYWORDS="~amd64 ~arm64 ~riscv ~x86" IUSE="test" RESTRICT="!test? ( test )" |