diff options
Diffstat (limited to 'media-gfx')
154 files changed, 2560 insertions, 4124 deletions
diff --git a/media-gfx/Manifest.gz b/media-gfx/Manifest.gz Binary files differindex 8dee1bc363ef..1e72582f855e 100644 --- a/media-gfx/Manifest.gz +++ b/media-gfx/Manifest.gz diff --git a/media-gfx/alembic/Manifest b/media-gfx/alembic/Manifest index 42ed1dc3ddef..88de7c9c6b12 100644 --- a/media-gfx/alembic/Manifest +++ b/media-gfx/alembic/Manifest @@ -1,6 +1,7 @@ AUX alembic-1.8.5-set-correct-libdir.patch 1593 BLAKE2B 4dec05376ed35261049886e38c851ded8f033040e5fe822337ec7655132f0b24b007e6b48caf9fb01cfc3a874a4a60b0f54649e3505f70464c1847423c684176 SHA512 befd7956ab3effb70d76648c15795cf8ea40d51687dab3988968a519267bdf1df945d475f1cd7a32747d6a5fd6cf1cf63c8f0bbbc058e9da704ba26b6bac443a AUX alembic-1.8.6-py312.patch 3861 BLAKE2B 307786b786aeb8868103e7d1564305fa7fa7d082acc43e2886bfda17413c993b506ba77ed54f254b87ca5123945596d0be445f558279ec1ff9b7f6cc23ea835c SHA512 70078658fc4b70618e9e2c1c694b50726eec510e30e1625f01cd1dcfae2f649162b7b94c791b12068f064c68e1deea7ccabb00a31de7fd32cc052299035662b8 DIST alembic-1.8.6.tar.gz 868945 BLAKE2B 1ac30ffa75a4b8bbb3f32820e6f67cebcd894465f16cd12ee0396c88611af821b13973f46228fd59726c6bc0cc8885afd4de81a0cebaa0f94cb30fd9daba9885 SHA512 6371b830242be90d4ea833248df5fd42d9e713e305d15eb1383d04410319acdae5743d48d65e8f75f1cedce777d2af7d969cde095f678b17322c19f1c69f477b +DIST alembic-1.8.8.tar.gz 933258 BLAKE2B 4f56f5addcf153407da14d6646255ee35b1126b307179fbcfa2c13398825680652b557772db0a08906d04a9bd46c1fa82862a65367d9ce162f2b9d948ff9b701 SHA512 02b7bf5782e83efb08a8653f130b02565fa997e857dbd8d0523e1b218ff58d929fbf9690db0980e8101a31f01a67341b6000af8794538890ef7d759fe0289e2f EBUILD alembic-1.8.6-r1.ebuild 1627 BLAKE2B ac7b599e3598e0110575705b009d4636fad6bf4fa8f2e1affe923b30db638a2d179d29dca37155d6f4527ffcc4d1d7c8aab49e2e1238541870953e4db8c73035 SHA512 3ea261fb8f288be876edad40e3aad6e001b7caaa75401065fd2071988250369f71c4cf482f1211fbd3a54d092dc812aaf58e5b483617fde4b8588afe10330d9a -EBUILD alembic-1.8.6.ebuild 1782 BLAKE2B afe666d245ea9301a735e4b1d830f9b5b3ab4d2c92d538b21cbc7e9c2935546205f587757f88a4c7a09e60151a9d55422c76873e170edfcd1514cb095d420209 SHA512 8233be7302f3645ba88e876048f46fcb46704b164f3aa30bd0b2a6431dc7c304c8c87fe6321397f7494a5ede99088dbf73e3916df4314fea7cf881ca1a0e4c1f +EBUILD alembic-1.8.8.ebuild 1576 BLAKE2B 27cca89e3312a4b54b5e194df19f7adc0c03ed93e966568da8cf5d940ab8a68e14fe08987cdcc85f8604eff0403ced7a350c61104169f03df02bd4d0a92c55e6 SHA512 7d831f396234dbc2e9ae643e402e919bcba54921d3a288ef3592b8d5775a860cf056ed3de52fc1daac34c061680a40c1d02aca3c8be1266d5726b7fbd7174fb6 MISC metadata.xml 825 BLAKE2B 6dca2b2671780fecd86e7be3b4c5840d3db5298f8ba809b0137e138dcfc253a7e2b31bd85ccfa1d66bac9d7e066eb14506e7e726ab3998578a5e53ad3477218d SHA512 0dc6c13d0a95ac7a961fbb3d0023c66f9f058ed943e5a28331d2d8cfad756ec1bbf90b39450f48e461eba8a075a000d0e038342a3598b9be8efdc3f3bbe56651 diff --git a/media-gfx/alembic/alembic-1.8.6.ebuild b/media-gfx/alembic/alembic-1.8.8.ebuild index de6bc765bcef..0a9d7c9073bc 100644 --- a/media-gfx/alembic/alembic-1.8.6.ebuild +++ b/media-gfx/alembic/alembic-1.8.8.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2024 Gentoo Authors +# Copyright 1999-2025 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 -PYTHON_COMPAT=( python3_{10..11} ) +PYTHON_COMPAT=( python3_{10..13} ) inherit cmake python-single-r1 @@ -13,7 +13,7 @@ SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz" LICENSE="BSD" SLOT="0" -KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~x86" +KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86" IUSE="examples hdf5 python test" REQUIRED_USE=" ${PYTHON_REQUIRED_USE} @@ -23,7 +23,7 @@ RESTRICT="!test? ( test )" RDEPEND=" ${PYTHON_DEPS} - dev-libs/imath:= + >=dev-libs/imath-3.1.11-r1:= python? ( dev-libs/imath:=[python,${PYTHON_SINGLE_USEDEP}] ) hdf5? ( >=sci-libs/hdf5-1.10.2:=[zlib(+)] @@ -33,15 +33,12 @@ RDEPEND=" " DEPEND="${RDEPEND}" -PATCHES=( "${FILESDIR}"/${PN}-1.8.5-set-correct-libdir.patch ) +PATCHES=( + "${FILESDIR}/${PN}-1.8.6-py312.patch" -DOCS=( ACKNOWLEDGEMENTS.txt FEEDBACK.txt NEWS.txt README.txt ) +) -src_prepare() { - cmake_src_prepare - # Tests are broken with python 3.11. See also: https://github.com/alembic/alembic/issues/411 - cmake_run_in "${S}/python/PyAlembic" cmake_comment_add_subdirectory Tests -} +DOCS=( ACKNOWLEDGEMENTS.txt FEEDBACK.txt NEWS.txt README.txt ) src_configure() { local mycmakeargs=( diff --git a/media-gfx/asymptote/Manifest b/media-gfx/asymptote/Manifest index 460895c4361e..0a7639750b56 100644 --- a/media-gfx/asymptote/Manifest +++ b/media-gfx/asymptote/Manifest @@ -5,7 +5,9 @@ AUX asymptote-2.92-xdg-utils.patch 813 BLAKE2B 3a56ae5835a88b36603aa43238a821bd2 DIST asymptote-2.89.src.tgz 15133552 BLAKE2B bde5acd3e76543b3c936e785ccf081c38687d535f336ee0e3da62f5fe078bb040dc162b64f02e94f392129c120bdf497b86e3862059abdb1b4544bab3cce3218 SHA512 a9874f0dc6eb05b95ef551611d85f39222af2a0628d7904160b08bdaf797c2b9ec6d12af7ae26dee69dbc056a5bffad4e450d4846a517d80990d89759e0c47a0 DIST asymptote-2.90.src.tgz 15154576 BLAKE2B 57e3c4287f2e8a6b6f3d660cdd04bb753b435294d4769bbcf84d6c7bf80c813609528767af7d19853d9f72f4f1ce9e6a8dcc6a75731a2f3d16098d5da5b81b6c SHA512 2d050f7a2cfc34d2d6b5382a48e7bf09031d98a77e61b654b4af84b5e8e11553a9a713a6dea8d09291761427d7134742a3d266e57ac57ffda3587ec0487ecfca DIST asymptote-2.92.src.tgz 17075592 BLAKE2B 426fe3bb652f2f227d6f8cdd8e05c4b4bf0e2a0c47b3c252c5efb189ad3e7a0946664d714f161f70a9715f75dadf5510445e404d8c2e7b33f9e710200965caf0 SHA512 242a91357e7f0d2a4fc786fa881498d09d5b3b679cf1ee83e6af49f645935699a6e703eb8069446e11098028bc0cb0549f527695d3ea289066124d707c592559 +DIST asymptote-2.95.src.tgz 32055059 BLAKE2B 89d8c512599f4ff4f21d43287176541fc539793f1d467028a99f866f663b8b5093626b6d166ce48749534cfec998059dc5add5cef0d54b49afb636791643e1ba SHA512 e1e2401d5d1aef8f594dadcf7c49f775a816e15d9fbd43c52581e9f135942c20adcc78af134f46b101c32e2fc68aa9e9f4f5985d19eee9f6bfcb069813194d15 EBUILD asymptote-2.89.ebuild 5547 BLAKE2B 8314b3258329322d6be911bacd9c5137d47ecc4515a2817be74c3784fbfd96bcb7cf2fa7c69e4396c2f0e9b752a292da4fbe00ca6931eedab0e91979fdf4186b SHA512 76dcde2b5e188c61728a933d264c541a795f0f808bba8eb565bb9e575d64f05ac38e163ac83cd747e9d3556acb9572a4934a33ca8833e2ba83bd9d58de3aead6 EBUILD asymptote-2.90.ebuild 5547 BLAKE2B 8314b3258329322d6be911bacd9c5137d47ecc4515a2817be74c3784fbfd96bcb7cf2fa7c69e4396c2f0e9b752a292da4fbe00ca6931eedab0e91979fdf4186b SHA512 76dcde2b5e188c61728a933d264c541a795f0f808bba8eb565bb9e575d64f05ac38e163ac83cd747e9d3556acb9572a4934a33ca8833e2ba83bd9d58de3aead6 EBUILD asymptote-2.92.ebuild 5549 BLAKE2B af0982ef5ed10cc7c5e21a24ffba2cb36f50c9443e428611f4c5433475dd6ceb17daa5e292dfa584d8869131f5d7ad3eb1b598e50f06dc948c97efcb862e94ec SHA512 cd18f9dfa1c630474a3405aae76d90358d6b5f7a6e7bd60d563272bd22a5118a8776bb8ce8fa79306b137b47f2a7387e5f9448587975886e28e7f0125d544a94 +EBUILD asymptote-2.95.ebuild 5550 BLAKE2B 8279325802d8413c661b18c8a299a1920d362d6731849f377f4a32550c6de3714ab2da0af7b1ef764eaf57a8d148434ea22fea75b5797ac6acb03a8ff77560db SHA512 9877f5d8cede8c11ed2f1df43d7c5cfe2393134c6a12b3d19e4707850cc9e0de42d401120e6ac12ba9f2d220e781c17e73f9d3bb86e0edf771a9dbac4f44a598 MISC metadata.xml 1423 BLAKE2B 64dd5d6c928a11d4a47297362223164cb19d91f6a08a0582b66831e2e8e2d7594389c2244fa1527dfe945da0e67985f5c639e3dae2482f57b510bf828a4605ed SHA512 1561e416e56bca130a72f90886981f63224c21e2a077a7b93e6fdd877f38dd12dfa9e0b747840e7f459e2df16c5b08e0177d26c526eb21bebe00fa8c91326bc9 diff --git a/media-gfx/asymptote/asymptote-2.95.ebuild b/media-gfx/asymptote/asymptote-2.95.ebuild new file mode 100644 index 000000000000..d1589a23dad5 --- /dev/null +++ b/media-gfx/asymptote/asymptote-2.95.ebuild @@ -0,0 +1,242 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +PYTHON_COMPAT=( python3_{10..12} ) + +inherit autotools elisp-common latex-package python-r1 + +DESCRIPTION="A vector graphics language that provides a framework for technical drawing" +HOMEPAGE="https://asymptote.sourceforge.io/" +SRC_URI="https://downloads.sourceforge.net/asymptote/${P}.src.tgz" + +LICENSE="GPL-3" +SLOT="0" +KEYWORDS="~amd64 ~ppc ~riscv ~x86 ~amd64-linux ~x86-linux ~ppc-macos" +IUSE="+boehm-gc context curl doc emacs examples fftw gsl +imagemagick latex lsp offscreen +opengl python sigsegv svg test vim-syntax X" +RESTRICT="!test? ( test )" + +REQUIRED_USE=" + ${PYTHON_REQUIRED_USE} + offscreen? ( opengl ) + doc? ( boehm-gc )" + +RDEPEND=" + >=sys-libs/ncurses-5.4-r5:0= + >=sys-libs/readline-4.3-r5:0= + net-libs/libtirpc:= + imagemagick? ( media-gfx/imagemagick[png] ) + opengl? ( media-libs/mesa[X(+)] media-libs/freeglut media-libs/glew:0 media-libs/glm ) + offscreen? ( media-libs/mesa[osmesa] ) + svg? ( app-text/dvisvgm ) + sigsegv? ( dev-libs/libsigsegv ) + boehm-gc? ( >=dev-libs/boehm-gc-7.0[cxx,threads] ) + fftw? ( >=sci-libs/fftw-3.0.1:= ) + gsl? ( sci-libs/gsl:= ) + python? ( ${PYTHON_DEPS} ) + curl? ( net-misc/curl ) + lsp? ( + dev-libs/boost + dev-libs/rapidjson + dev-libs/utfcpp + ) + X? ( + ${PYTHON_DEPS} + dev-python/pyqt5[${PYTHON_USEDEP},gui,widgets,svg] + dev-python/cson + dev-python/numpy + >=gnome-base/librsvg-2.40 + ) + latex? ( + virtual/latex-base + dev-texlive/texlive-latexextra + ) + context? ( dev-texlive/texlive-context ) + emacs? ( >=app-editors/emacs-23.1:* ) + vim-syntax? ( || ( app-editors/vim app-editors/gvim ) )" +DEPEND="${RDEPEND} + dev-lang/perl + doc? ( + media-gfx/imagemagick[png] + virtual/texi2dvi + virtual/latex-base + dev-texlive/texlive-latexextra + app-text/ghostscript-gpl ) + test? ( app-text/ghostscript-gpl )" + +TEXMF=/usr/share/texmf-site + +PATCHES=( + # Changing pdf, ps, image viewers to xdg-open + "${FILESDIR}/${PN}-2.92-xdg-utils.patch" + + # Bug #322473 + "${FILESDIR}/${PN}-2.70-info.patch" +) + +src_prepare() { + sed -e "s:Datadir/doc/asymptote:Datadir/doc/${PF}:" \ + -i configure.ac \ + || die "sed configure.ac failed" + + default + eautoreconf +} + +src_configure() { + # for the CPPFLAGS see + # https://sourceforge.net/forum/forum.php?thread_id=1683277&forum_id=409349 + econf \ + CPPFLAGS=-DHAVE_SYS_TYPES_H \ + CFLAGS="${CXXFLAGS}" \ + --disable-gc-debug \ + --disable-gc-full-debug \ + --with-latex=/usr/share/texmf-site/tex/latex \ + --with-context=/usr/share/texmf-site/tex/context \ + $(use_enable boehm-gc gc system) \ + $(use_enable curl) \ + $(use_enable lsp) \ + $(use_enable fftw) \ + $(use_enable gsl) \ + $(use_enable opengl gl) \ + $(use_enable offscreen) \ + $(use_enable sigsegv) +} + +src_compile() { + default + + emake doc/version.texi + cd doc || die + emake asy.1 + einfo "Making info" + emake ${PN}.info + if use doc; then + cd FAQ || die + emake + cd .. || die + # pdf + einfo "Making pdf docs" + export VARTEXFONTS="${T}"/fonts + # see bug #260606 + emake -j1 asymptote.pdf + emake CAD.pdf asy-latex.pdf asyRefCard.pdf + fi + cd .. || die + + if use emacs; then + einfo "Compiling emacs lisp files" + elisp-compile base/*.el + fi +} + +src_install() { + # the program + dobin asy + + # .asy files + insinto /usr/share/${PN} + doins -r base/*.asy base/*.js base/*.sh base/*.ps base/shaders base/webgl + chmod 755 "${D}"/usr/share/${PN}/shaders/* + + # documentation + dodoc README ReleaseNotes ChangeLog + cd doc || die + doman asy.1 + doinfo png/${PN}.info + if use doc; then + dodoc FAQ/asy-faq.ascii + dodoc CAD.pdf asy-latex.pdf asyRefCard.pdf asymptote.pdf + fi + cd .. || die + + # asymptote.py + if use python; then + python_moduleinto ${PN} + #python_foreach_impl python_domodule misc/aspy.py + python_foreach_impl python_domodule base/${PN}.py + fi + + # X GUI + if use X; then + cd GUI || die + python_setup + sed -e 1d -i xasy.py + echo "#!/usr/bin/env ${EPYTHON}" > xasy1 + cat xasy1 xasy.py > xasy + rm xasy1 xasy.py + mv xasy xasy.py + cd .. || die + python_domodule GUI + chmod 755 "${D}/$(python_get_sitedir)/${PN}/GUI/xasy.py" + dosym "$(python_get_sitedir)/${PN}/GUI/xasy.py" /usr/bin/xasy + doman doc/xasy.1x + fi + + # examples + if use examples; then + docinto examples + dodoc \ + examples/*.asy \ + examples/*.views \ + examples/*.dat \ + examples/*.bib \ + examples/*.png \ + examples/*.pdb1 \ + doc/*.asy \ + doc/*.csv \ + doc/*.dat \ + doc/pixel.pdf \ + doc/extra/*.asy + docinto examples/animations + dodoc examples/animations/*.asy + fi + + # LaTeX style + if use latex; then + cd doc || die + insinto "${TEXMF}"/tex/latex/${PN} + doins *.sty latexmkrc + if use examples; then + docinto examples + dodoc latexusage.tex externalprc.tex + docinto examples/animations + dodoc ../examples/animations/*.tex + fi + cd .. || die + fi + + # ConTeXt + if use context; then + insinto /usr/share/texmf-site/tex/context + doins doc/colo-asy.tex + fi + + # emacs mode + if use emacs; then + elisp-install ${PN} base/*.el base/*.elc asy-keywords.el + elisp-site-file-install "${FILESDIR}"/64${PN}-gentoo.el + fi + + # vim syntax + if use vim-syntax; then + insinto /usr/share/vim/vimfiles/syntax + doins base/asy.vim + insinto /usr/share/vim/vimfiles/ftdetect + doins base/asy_filetype.vim + fi +} + +pkg_postinst() { + use latex && latex-package_rehash + use emacs && elisp-site-regen + + elog 'Use the variable ASYMPTOTE_PSVIEWER to set the postscript viewer' + elog 'Use the variable ASYMPTOTE_PDFVIEWER to set the PDF viewer' +} + +pkg_postrm() { + use latex && latex-package_rehash + use emacs && elisp-site-regen +} diff --git a/media-gfx/blender/Manifest b/media-gfx/blender/Manifest index f10283fe651d..67c2dd2d7d1a 100644 --- a/media-gfx/blender/Manifest +++ b/media-gfx/blender/Manifest @@ -10,7 +10,7 @@ DIST blender-4.2.1.tar.xz 72789532 BLAKE2B 74494e851e9e2e9fdcf4a77fa4e1c177d6b9f DIST blender-4.2.4.tar.xz 72804204 BLAKE2B 613ae4671cc9263d18fe988b07e8744eb04f67fe53f1c14ad3fbc7d80c58a577e7753871ca775cd40ab5f26ef2bc9030cda57012dda0c4785769f04263aea15b SHA512 1f61c1866aaa680c91fc6e3402b1e10533c8cce32572ffb825c53dc7c15ca51f1157a32d10134ca9e612fbf719406421ccc920b2d8ddd2993675784797381c6a DIST blender-4.3.2.tar.xz 74473996 BLAKE2B 9a5c8973561f3296b0ec35990ab4951e34f7c0dd5bee3dd120a49989dc8ca7ebfc9610654e8be9d14463af2197626f490324cdd03118db755f5d0b1f7acce375 SHA512 44697faf9acc2c1e75783d432a1a0040339c3445834961a995e95974d4088e75ee5cb647a3908125259d1910d180910e5bc50d34d40d35f33e03197893581477 EBUILD blender-3.6.15.ebuild 14132 BLAKE2B 0f533ce9cc66019fb6410ca26cd3c434e360d7ac454676711597776c425ae7749d9ec5402c94206a20e3473dd1e7a13adfbc34c74a91457d641dde8de22dcce2 SHA512 7bf2d8f5d85909773f614335f668bb21d19d1de39fae83f06a81c28e678dc8584d00f08e00ae1409066c04d99cea24d402e495fe46afc6c37f66712ae33c4bee -EBUILD blender-3.6.18.ebuild 14133 BLAKE2B 97030e2d089b2bd7cc7e8a3e0c4b8b302c168f3b12be5e18366493776095fd4b95b2107691f467f67fb95e006b3d5ad5442dddff8e39fa53044dbaf263f79216 SHA512 3d90056f798ce49c5028ff860296e1c18201d44fea9056c59150b6b6815d3ac98e03e9b1ba2aa985e883996e7755dec6ef27a9799e889c21bd6d539940fe858c +EBUILD blender-3.6.18.ebuild 14132 BLAKE2B 10be9999a9fc9321afc73cb4c41234784020a8cd98c54c13be80970fb04679f579f4856a7a4c18e3bdf45cb1d0a8080979146da8d06fe6e22077bc3ba6b8156f SHA512 f1b7245dc53ede9d1aa5dc2eb310255cae8f57ec2e0dc52050eae7276b71c0e2f9c502990df4c6d9d494f906a715d03c3ded9cab0602da7402ddb046c598c13e EBUILD blender-3.6.8.ebuild 14127 BLAKE2B 1de13a7ef689f16a899698c7262bf0a59a9d6ca1a9ed27c446e11b1cfc4b39b94231f08d96b17323f2049b1ec05a28319718402c083061a2b805838ca90931ad SHA512 0647e31bef93c125c407611a690437de86c710beb5b7771801e27e2e561c3d7bfbc350e67fe0275bcbe4a5f049e87c3e600b95bcef9013f156677624b1ce445c EBUILD blender-4.1.1-r2.ebuild 17612 BLAKE2B 6c730678d9ee6f98127a3df5df269ee06a3bbb69e6bd2d4d06195ae8efa424484a83b3a77cd58c0e1a8e2d516f67e0d38737cd199f4ee66c59f1bfc045dfd308 SHA512 4afc54c172de9eb3fe0d71a23f59b32f232ce66847272bbe8b03e770bb228a0e22c0556bbc7338294d9488ad221e4c117e557e85f1f32c44ebecc1cf6bbb72bc EBUILD blender-4.1.1.ebuild 17169 BLAKE2B 96ac5b0d84b5c45008ca67d07f55617833801220064e77e37d1f6f0b47a141f29ddc063667ebf09f482899640b02830c31b1cd8b148f3f5fbe61421f931ffd53 SHA512 ed20d53f7bcb93b0f0541145dabf903a10fe3811288c3cebf80396885a4d7aa4552687e86608d5510f8fe87adea9432956e6c21dec47f1e08adc0cc6e399b1c4 diff --git a/media-gfx/blender/blender-3.6.18.ebuild b/media-gfx/blender/blender-3.6.18.ebuild index 698ccf250f72..bdf6973efd45 100644 --- a/media-gfx/blender/blender-3.6.18.ebuild +++ b/media-gfx/blender/blender-3.6.18.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 @@ -20,7 +20,7 @@ else # Update these between major releases. TEST_TARBALL_VERSION="$(ver_cut 1-2).0" # SRC_URI+=" test? ( https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${PN}-${TEST_TARBALL_VERSION}-tests.tar.xz )" - KEYWORDS="~amd64 ~arm ~arm64" + KEYWORDS="amd64 ~arm ~arm64" fi LICENSE="GPL-3+ cycles? ( Apache-2.0 )" diff --git a/media-gfx/clockphoto/Manifest b/media-gfx/clockphoto/Manifest index 2924a62797a1..5576c3f0fb5e 100644 --- a/media-gfx/clockphoto/Manifest +++ b/media-gfx/clockphoto/Manifest @@ -1,3 +1,4 @@ DIST clockphoto-1.2.tar.xz 717836 BLAKE2B b730ed9cca21ef7c23c6d6eeacbbdb59df6b5ac6c59b5f9821f4958ebc212df6c803cd062400c19e9e66e39c711a80cdf3355d53d6f6f10237cb67e40b818e28 SHA512 db5740b3c291df8cc79dec94196aa912afd316c601ddd6809b76d3a9f12a4df9b6530d4c9a031720cd5f309d7d05cbe62530ce1e2a9d8a7c2997d56a30b97739 +EBUILD clockphoto-1.2-r1.ebuild 514 BLAKE2B 74c8eed59134bc844641aff03d0fa259460e30d996b953aaa46ac56e0c89c4642715930abe82d62f5f59889f0b834a3d69e390054649115c275233b9fdd3b1e3 SHA512 83c445b46e0209f006b070f74d09c667c7e9536e73b01033e18d5046dc4fa9683b8f2990fc1c1a070a8d1e781769cf00be064eb669751205dc961e9eaeb0d698 EBUILD clockphoto-1.2.ebuild 535 BLAKE2B 42d9dfd777c29f77636b2d5e8d9e7ae180773d03178eb346d624bbed19dcdad62659ec14c5119f9cf6b469bb14263b92e9ef8df44d2d1a9d2d68af9f2f4fbcd9 SHA512 a80f18adda2f4fc196ccf927d5c52fb14dd01d0251899a941cb48f5c2cb31466b8d97db1e869a4cd2bdb6c18711869eb3413c4eeaac2acd597e4bcccfa117de8 MISC metadata.xml 251 BLAKE2B b1977a04e8904e65636648bd24804893bc0a317a7a20a8b4bac3874f0529dd15b2c058b0002b13febafcdfd93cbef59ef7bc1c646f3996c381b994d384b73ba3 SHA512 25f6fc31ee9e87d78b143500e706ac3417896e67a183470867130b23a42ec8ddd4cdd9a1da40f32903085ee4add969b4b07466b90fb0275308a2518d2d73a270 diff --git a/media-gfx/clockphoto/clockphoto-1.2-r1.ebuild b/media-gfx/clockphoto/clockphoto-1.2-r1.ebuild new file mode 100644 index 000000000000..609fa4a2539f --- /dev/null +++ b/media-gfx/clockphoto/clockphoto-1.2-r1.ebuild @@ -0,0 +1,30 @@ +# Copyright 1999-2025 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit qmake-utils + +DESCRIPTION="Adjusts photo timestamps based on clock photos" +HOMEPAGE="https://git.zx2c4.com/clockphoto/about/" +SRC_URI="https://git.zx2c4.com/clockphoto/snapshot/${P}.tar.xz" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="" + +DEPEND=" + dev-qt/qtbase:6[gui,widgets] +" +RDEPEND="${DEPEND} + media-gfx/exiv2 +" + +src_configure() { + eqmake6 +} + +src_install() { + dobin clockphoto +} diff --git a/media-gfx/converseen/Manifest b/media-gfx/converseen/Manifest index a526d9aad3ed..1319559286c4 100644 --- a/media-gfx/converseen/Manifest +++ b/media-gfx/converseen/Manifest @@ -1,9 +1,9 @@ AUX converseen-0.12.0.1-graphicsmagick-support.patch 3555 BLAKE2B 4f8880e02f893c0cb7533c4fd4e0d50f6e737917d0cec5a762c6a65f1febbefde79d1e0d973d3e5a72e0aabf138d6cecec285c81f16a83bed6fa1fcb90926c9d SHA512 d81214d953f3b83dab9c829ae26ebef318633c7ae02c6b467806ef60ac177d90bbb5f5f3dc8278da53b75083a1e7c145e4847b31ab6739594ce0909d45c68be6 -AUX converseen-0.9.11.1-graphicsmagick-support.patch 2051 BLAKE2B 463c48357df2f76b7e224e211e9c0f36356a1d143ffd5a7245f31c489fe91360262adf165a243b81798e084fee07923d2c89d7aaf45ecff2066928b2fea6547d SHA512 0c85c6ada5516c6b454bb57e829684b8ccbdb12f4de320cec01668df08ad86ea2088ae442ef3debbbf0fb947c72cd205c1aab3bb915d303d3ba9ac94329a7a96 +AUX converseen-0.12.2.4-appdata-path.patch 443 BLAKE2B 2612b12962d7f3dea8159f4990e0f9e940bb64994427f8d57f85f00278ed56cfc3626e590e8a0f9988fd919567a350269f3ae362a8d38102d016ccc328dc94e0 SHA512 e6f2cbad9e9a01e37579435a5a8c71a58600d50d7a07e1172a3b02867737f28ab64f3d5bb9a4f0cdd682fb359a4afb891ae9d27aabb5850ea9030a6200bc1503 AUX converseen-0.9.9.0-appdata-path.patch 604 BLAKE2B ca524ae4a52f74b687e0e0246d758178d4287b3e866651293233c7055a38cdf6330fd2c2dfb0728c0b07f37b631dbd1c59159039b56be35fbc349d183dfd0dbd SHA512 411696d39dcca09a33119537600efd80bcf675714ea72548500f9c2a1112e61d53edc6d891cef770aac3cdd2cb881e169b4ab833521ae152859609871807066e AUX converseen-0.9.9.0-no-update.patch 540 BLAKE2B b8a7bcf561a4be48fdf9137a40c1f5b1451915a6cf4b2043f9adaf8dd1aa853b331ee1499bb34d05ae9e7da2d9f3f0515c62dca8146d4957126054557ebfcceb SHA512 b5ed008bd7a01cb99ec97faa6c9bd412009f1d438c420e201d2605c713ff57c346391d5389ed019c0538a263154d1ed36c4a581d0582d2c2eadf8dc77a67b97b DIST converseen-0.12.0.1.tar.gz 2296100 BLAKE2B 83a0271e1451fa196852d717332fa7446cd22bac7b675f3f306692aa1e11d4c5500d033fd9bbb7dd4ec9190ff3b15149bad1e9646006f533d930fc1d686b0a9b SHA512 4e6efa44953b097f8c6af19e3d849caf570a0fa2db673133e1d8ca2abee98b43d2fbd2d12e6c8c2a8ec6a9dd61a1ca3f25ee7a7787791cc783d8c967eacb9d9d -DIST converseen-0.9.11.1.tar.gz 770024 BLAKE2B 671599099abf5b143bde7c57efc547626c14e15bebbd3a70ce4ec43d4febbaf69eebedebaaac935572b785afaa086c383b68bae0f02bc16ca68625dfb55b8c85 SHA512 1d61fa88d9e3d6ed23fb98d0495b00315adca880fd1d0d95e8322c48d9fdcd161ee00b5e2f5f52212c4db66d97e26ac0da561926e55de4bc047d3ad98b6f69dd +DIST converseen-0.12.2.4.tar.gz 941270 BLAKE2B 4ac582a2dc3bbbabb48c1d12fe4ba4ed1d61b20e946645edab4eb6ac2d62cfa2df149b61c60842b36b55239694013661af4dd7c27a5195ee25f808d0a9b29605 SHA512 7d207207859f57037038b595935e3b0c5b202eda6a39e64226f6e898d5c3762077424a52f2ae6029263eae672607d05e30bf4ad2005ce15fd50348cca374413a EBUILD converseen-0.12.0.1.ebuild 1749 BLAKE2B 33e5141dfbac0ed89edfcca3f02c4c6092e3da22260229f44f60b0f03a616a6870877adfd26ce082eb2989fa736723740c363509c676cf76add5137a77fdcd19 SHA512 0d15cf3903d400ea87874662cfb1377bac1bd6edb80722aac08419e79fa343d3b9140de3e7c527260375402ef4f158b3916bcfa762692e688a3df74cec2eae76 -EBUILD converseen-0.9.11.1.ebuild 1759 BLAKE2B 5e73dd22acb4bed2e4555c07f79a956fa6049ed32956509ed76609d1419dedd0bbb1f39dbf7ea04d414686236d2378a0e24a1d47b3a8dcc83384e41b3756b49b SHA512 383d4445fa649dd36adfb32bf4430dcecf6b5091491c70adbefccc4238a65c6d796b17afcde27052f5d6a419b3b7fb6ac2ad148498c74d2185ec85e9db65cf3d +EBUILD converseen-0.12.2.4.ebuild 1791 BLAKE2B 3e0ec07dadc38c435614891914ba56e955cf584e7451d00c991c46a26fd8958e58c185ef7183617634a4896643c8918ee39415dd4df1c5f38631fb1e338d07e4 SHA512 127821787c152a07f1551ff84be88a41d6b8ef26add62b2961875a0d222c96fe44301a139f8f95d13919b05cb56fa0fc2c52c203c1bf3cc3b6099c9dfbb17490 MISC metadata.xml 490 BLAKE2B 7ee59abe13eee7dff622a3e7b701f6e0128a208e3e49f5b22b3fcaf06357991a50ece3ffa9cb607675f94a7784efcec37c2176464e4c7741efbfb8b8427cb5dc SHA512 a56719d55ea41683315c5d3f98b8351d3b15b68fd8f598a9e692691c771a94bec23b8263c8a017e29d63a20a8de8b440db1acfd26558c6f8d51add12e4016ba6 diff --git a/media-gfx/converseen/converseen-0.9.11.1.ebuild b/media-gfx/converseen/converseen-0.12.2.4.ebuild index c77e1a0977df..8096327f78f3 100644 --- a/media-gfx/converseen/converseen-0.9.11.1.ebuild +++ b/media-gfx/converseen/converseen-0.12.2.4.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2025 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -9,31 +9,25 @@ DESCRIPTION="Batch image converter and resizer based on ImageMagick" HOMEPAGE="https://converseen.fasterland.net/ https://github.com/Faster3ck/Converseen/" SRC_URI="https://github.com/Faster3ck/Converseen/archive/v${PV}.tar.gz -> ${P}.tar.gz" +S="${WORKDIR}/${P^}" LICENSE="GPL-3+" SLOT="0" -KEYWORDS="amd64 x86" +KEYWORDS="~amd64 ~x86" IUSE="graphicsmagick debug" RDEPEND=" - dev-qt/qtcore:5 - dev-qt/qtgui:5 - dev-qt/qtnetwork:5 - dev-qt/qtwidgets:5 + dev-qt/qtbase:6[gui,network,widgets] graphicsmagick? ( media-gfx/graphicsmagick:=[cxx,imagemagick] ) !graphicsmagick? ( media-gfx/imagemagick:=[cxx] ) " DEPEND="${RDEPEND}" -BDEPEND=" - dev-qt/linguist-tools:5 -" - -S="${WORKDIR}/${P^}" +BDEPEND="dev-qt/qttools[linguist]" PATCHES=( - "${FILESDIR}/${PN}-0.9.9.0-appdata-path.patch" + "${FILESDIR}/${P}-appdata-path.patch" "${FILESDIR}/${PN}-0.9.9.0-no-update.patch" - "${FILESDIR}/${PN}-0.9.11.1-graphicsmagick-support.patch" + "${FILESDIR}/${PN}-0.12.0.1-graphicsmagick-support.patch" ) src_prepare() { @@ -52,6 +46,11 @@ src_prepare() { fi } +src_configure() { + local mycmakeargs=(-DUSE_QT6=yes) + cmake_src_configure +} + pkg_postinst() { elog "Please note that due to security policy restrictions" elog "on media-gfx/imagemagick the support for PS, PDF and" diff --git a/media-gfx/converseen/files/converseen-0.12.2.4-appdata-path.patch b/media-gfx/converseen/files/converseen-0.12.2.4-appdata-path.patch new file mode 100644 index 000000000000..2b07399b420d --- /dev/null +++ b/media-gfx/converseen/files/converseen-0.12.2.4-appdata-path.patch @@ -0,0 +1,11 @@ +--- a/converseen.pro 2024-10-29 16:39:33.000000000 +0100 ++++ b/converseen.pro 2025-01-01 19:30:59.323494846 +0100 +@@ -171,7 +171,7 @@ + desktopFile.files = res/converseen.desktop
+ kdeservicemenu.path = $${SHARE_DIR}/kio/servicemenus
+ kdeservicemenu.files = res/converseen_import.desktop
+- appdata.path = /usr/share/appdata/
++ appdata.path = /usr/share/metainfo/
+ appdata.files = converseen.appdata.xml
+
+ isEmpty(QMAKE_LRELEASE) {
diff --git a/media-gfx/converseen/files/converseen-0.9.11.1-graphicsmagick-support.patch b/media-gfx/converseen/files/converseen-0.9.11.1-graphicsmagick-support.patch deleted file mode 100644 index a76f108e335c..000000000000 --- a/media-gfx/converseen/files/converseen-0.9.11.1-graphicsmagick-support.patch +++ /dev/null @@ -1,53 +0,0 @@ -# See https://bugs.gentoo.org/628688 for further info and -# development discussion about this patch. ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -100,6 +100,14 @@ FIND_PACKAGE(ImageMagick REQUIRED) - FIND_PACKAGE(ImageMagick COMPONENTS Magick++)
- FIND_PACKAGE(ImageMagick COMPONENTS MagickWand)
- FIND_PACKAGE(ImageMagick COMPONENTS MagickCore)
-+if (NOT ImageMagick_MagickCore_FOUND)
-+ set(ImageMagick_INCLUDE_DIRS "GENTOO_INCLUDE/GraphicsMagick")
-+ set(ImageMagick_Magick++_INCLUDE_DIRS "GENTOO_INCLUDE/GraphicsMagick/Magick++")
-+ set(ImageMagick_MagickCore_INCLUDE_DIRS "")
-+ set(ImageMagick_LIBRARY "GENTOO_LIB/libGraphicsMagick.so")
-+ set(ImageMagick_Magick++_LIBRARY "GENTOO_LIB/libGraphicsMagick++.so")
-+ set(ImageMagick_MagickCore_LIBRARY "")
-+endif ()
-
- INCLUDE_DIRECTORIES(${Qt5Core_INCLUDE_DIRS})
- INCLUDE_DIRECTORIES(${Qt5Gui_INCLUDE_DIRS})
---- a/src/converter.cpp -+++ b/src/converter.cpp -@@ -254,8 +254,14 @@ bool Converter::writeImage(Image &my_image, const QString &format, const int &qu - - error_status = ""; - -+/* Workaround to compile with GraphicsMagick: -+ GraphicsMagick "MagickLibVersion" is greater that 0x100000 -+ e.g. GraphicsMagick-1.3.25 has "MagickLibVersion=0x181501" -+ or GraphicsMagick-1.3.26 has "MagickLibVersion=0x191600" */ - #if MagickLibVersion < 0x700 - hasTransparency = my_image.matte(); -+#elif MagickLibVersion > 0x100000 -+ hasTransparency = my_image.matte(); - #else - hasTransparency = my_image.alpha(); - #endif ---- a/src/globals.h -+++ b/src/globals.h -@@ -32,8 +32,14 @@ - using namespace Magick; - using namespace std; - -+/* Workaround to compile with GraphicsMagick: -+ GraphicsMagick "MagickLibVersion" is greater that 0x100000 -+ e.g. GraphicsMagick-1.3.25 has "MagickLibVersion=0x181501" -+ or GraphicsMagick-1.3.26 has "MagickLibVersion=0x191600" */ - #if MagickLibVersion < 0x700 - typedef FilterTypes IMFilterType; -+#elif MagickLibVersion > 0x100000 -+ typedef FilterTypes IMFilterType; - #else - typedef FilterType IMFilterType; - #endif diff --git a/media-gfx/darktable/Manifest b/media-gfx/darktable/Manifest index 9ce453b49e11..91b6151d07c3 100644 --- a/media-gfx/darktable/Manifest +++ b/media-gfx/darktable/Manifest @@ -1,16 +1,11 @@ AUX darktable-3.4.0_jsonschema-automagic.patch 891 BLAKE2B b0abdd7ea80a446e2556daf06f78343deeb781a12b670f3c3d2f8a34ec9877e16991f6a105c90d58f437915b30bd8bddfb995d515bc73563a44f3807258c9fee SHA512 57cdf87586c6382347334577fff71d415be0123ad101c073535e9d4e87e7edac275272e0b3be91bd34965bacf1f6166cfc64af34b4cdedfb27b409e27bc3bdc9 AUX darktable-3.4.1_libxcf-cmake.patch 788 BLAKE2B b6ecb84de804b0bf16f907f825d93d00a62c1d996077514b3e55f370347f47e561707cb8da6a270aa42c3320142437691cc8b132718c485b5b7df40068d41ee5 SHA512 d94247c4f2c3b4894bd6455cd036a62ef5edb90a77bf8f930efc3e540d00712000fe8eeb7d4c937fa826aef1dd129448223c8696ff094e823894b17ef2669a4e AUX darktable-4.2.1_cmake-musl.patch 796 BLAKE2B 2e26cc969f01dc948f4f92f42c768a28bb879b3592d98dc1de0c3b5b7335a2985fbb5659c58b421fbca896b1f2585a5cb993b5cdf3ee6f87d9834afe3fd1a23a SHA512 82c7a4f6d6112fa024503a99e05d3050922b120821c93922ae846f9da6b02cd6f2e27315448c20ed1032c5526b85cb6d01dd6eec5109db1af3f8e92e4818ea06 -AUX darktable-4.4.2_fix-has-attribute-musl.patch 779 BLAKE2B d22e3cc6a28f9b0df574f1e512926868c7dd921b57dacb0934fdbfe934fb14ccb5cb16cbef49646a00c9be183af4f426e8d656389e2a87bb1c8247a8d64fd4f8 SHA512 70e0bf5fd3fee861490c651b2d2e94f3c187852bbd4e71972873d4ad4d426156e0785d1ed96ee65d641333357aa9048852b056985d6678f1efe98026a3e1474b AUX darktable-4.8.0_fix-has-attribute-musl.patch 1233 BLAKE2B 1ac838bdf7d3345b30d71065bde9d915a36876febd34f58e1005fc4f87cfbc9b757ce4145e5cb173d9d965f7e6c161d1ecf45a6845b0a82cc8ca2fe1bc275e50 SHA512 fda9f858fc1594e208501c3c277c90c3d9c914bbe9420c8151120fafd3ad54e6fc36614ebcf95a0033537e308c5a9fa6d23a619e57eff663cf996c254e434397 -DIST darktable-4.6.0.tar.xz 6129572 BLAKE2B 170d874f6a35c4fe5a5555f308bc541885968b8b5535402f8087ad4d47ee93f3d22a78c633f9b3e14584d1925a7dd682a5f3e2bd187ef2f58d0dc2a407b9bb27 SHA512 825a63c9b8bd7420f5c4b53a9281587be92088e1cd617faaf1de2b455503092cc7476872803a1d82c7bf57fcc57f85a40fc4af8ca04367e48719030f08726df7 -DIST darktable-4.6.1.tar.xz 6240188 BLAKE2B cf0055a4dd5f0a246b8de8ca5a29488fd77162cf2e0d7b681235499da39e4dad69dc5e5f7083f67364171d89aa76e940e8338eadee959f6529fb27658f43b75b SHA512 a5bcbdded7cacbc22d82cc982ad1387dc316cf4c0369f6f215abf9f60906024f2236a988dc025c0553bc2d8d7ca9d7bee9eb28b164fa1d9312eef1a084156fb6 DIST darktable-4.8.0.tar.xz 6256036 BLAKE2B 386276776a68887c7b439bf71ecc2ba9cd4cf54c247073908eae0cafd1d1db390c39937dfd4a2fcbe5164317b6090e29f2d2caa66fb7da47a702ba8988833ed5 SHA512 cb0535274a2862dfb2c8d36149cfced828662e423e04347970c0e2546e4d70ed7ab52cb80b6d21785165a294dee74fc23ba749086aab0a78386936341eb8216a -DIST darktable-usermanual-4.4.en.pdf 34311705 BLAKE2B 98094ed8288be092ec9c0398bf1719992ce80723aa803e3924e9d28c1c5f2717b120ed618cbec6eebb958be59d15fe107428099efd87926622b5d08110e36b67 SHA512 90e8b8912776b674a436a7e2377d16b0ef374d879ba16501a1c8a0c8407776ef362b747121859884e0aac1d9fc94f3bf0a58bbccdc6fce27cbcaf4cf169d6ef3 -DIST darktable-usermanual-4.4.uk.pdf 33796107 BLAKE2B 060218ec9b7fbcec947506ea9fdf355411d0b1242d41b9ffb7abd8dd991ece29e75c06231251d2ec2701e319e1b1e8134c08603649fe7e933d21b4aef597f7c3 SHA512 f2a6837a05114d4254fade358382be5fabcbd980a3c4fad702b1102176c7e261fd8646aeef1c0328001da8f7cb25d50b06c9f1163a54987985f556c616728bf5 +DIST darktable-5.0.0.tar.xz 6928316 BLAKE2B 0fd2f6e73d2a78b09c7d7490885301420ceb93230dfc8372be66c165fa76dd51ae4400cb46561abca0a0f3222ab5749d9f3cdb7e4c9822e4bc8ee75fd616da7d SHA512 84ccf8e30911d2d8c3d2fc2e5bd51962701a1d755ff3859da3e630d0d405d00c03ae8a3968ede33ec53a3de5f8b185ffcb9063355f09149573ce01ede15039de DIST darktable-usermanual-4.6.en.pdf 26844087 BLAKE2B 5bdb5e012cd8ba7bace733006136b1f9e510214179e84a9cba0664a3c2e4b19828e2cc54addaf5999579b910b592bf0e9cd9796cf89f3a4e6ae369e8187fbfce SHA512 a1d610c42ae3d1ae4d0bf3e827ed9ccae6faeea20cbc03e7c12d74c3c41175bf3f61d9eba43406b9ba86750edf976c1539357ddf774733f566a076418c34f558 DIST darktable-usermanual-4.6.uk.pdf 27013345 BLAKE2B 4c0da0038576e8ea97da88a4481e1afdf4e5b5df6b8a52475d18b488ac10066db4ef679681a38a194dd84771e340f58beea0450ec60726abd19d600e73fc40f1 SHA512 6e2f036e3f845791aa8b6eb565230136bfb6ae7f9b1ee56a9201cd25bb09391fd2ec45ba7fa1ddd11b4c193ab6b097fae32107af6c11b6cd6eeada60b002d4b3 -EBUILD darktable-4.6.0.ebuild 5786 BLAKE2B 967ec4ba94689c1f4bbedf285949ad3b1e4f2889a1a53ca29341710de61d1e1c91ea135af993ef8468c0db87106497d472d9b2552367b18af630f1c03b36591d SHA512 7859367ab7d8f81a7d751cec74648cfe684a4d2432779c97d65db54face49efc984b2b6e6fe29e4357e18b8ba13b0c3e8dfb33c033bbb329527a3f720640da91 -EBUILD darktable-4.6.1.ebuild 5901 BLAKE2B 8cfb8eb41274b883e4a0ecf2ad159c926d9e80227470bfb05b1462b7c2a3d87a8c2e33baba39e6093adbc544d057e439aec2c7b68ff2a665cdc681efa97a25d5 SHA512 05f7b6ff1c986d67bc0e44963c6b0c53a214547c423a701e39bd589978d27a3e8c6096a9afd7785ea3f298cd6a16b5eccde1764ebffdeed6f09ce7ad277038eb -EBUILD darktable-4.8.0.ebuild 5895 BLAKE2B d28f1c99d07f91927f0d43a6915610f1c76d40b6681511203c8bb881917ce310bc5d0f64c32acc614bffecb0bc00080968fea73cabd9df1f012b1252a9d927d3 SHA512 3b15b5719e15e85d74e8373675d2155cd5a60f07c8ef57fc82feba9d96e38c705f65b99c8f1dcf0dd55b18e8b4092c479de9fbbad0524bf05f07d03e478fa82e +EBUILD darktable-4.8.0-r1.ebuild 5873 BLAKE2B 0e8ba369ae88de4be8737d015708259eebc89befc858c2b8be6889f144ce091880909592b307860d6251ddff6df91aebea232bb73e9d0a496e857a207e3722ec SHA512 558b2876a08c2b837965cf562a42ce67c7c480770e08a8623ae0ecdea507cd2798cc8ea3fa0540d388c0c3cfefdc11b4721e0ad2594ed5ec6aa215cf837ffac7 +EBUILD darktable-5.0.0-r1.ebuild 5742 BLAKE2B e3c4c6bf5e154258c1d3c579274f90f0524051848377b287fa313afbae28d8059b7ffb085d750962f21e7b0e6331c8420dbcddb170580d89fec9cfd6205f4e8c SHA512 b2c0425d41ce54e731a7c95e9f6467a8a97a54d13808206a61849d59a0f2c69a661f33844927ddee97bce873c78887d85a35fffbb965be75c2bfbddd85dc45ec MISC metadata.xml 911 BLAKE2B ae7f5d92e5a9bfd96ff14f531d7a54db3db85c6c310a97e9fde57e74dcb6940192d35f98c7ff17d44f627b53252106b5f917dd2123fa80b1d668b6e0f6865081 SHA512 a7bcb43a1859d366eb557c468b23eb60ed4ef250cc0179fa9c823b3d27347ef3692134ef336836b01ebfc9b53165c60ac88f28d6452b9bcfa6a94b32b5b6177d diff --git a/media-gfx/darktable/darktable-4.6.0.ebuild b/media-gfx/darktable/darktable-4.6.0.ebuild deleted file mode 100644 index a93a667684a9..000000000000 --- a/media-gfx/darktable/darktable-4.6.0.ebuild +++ /dev/null @@ -1,194 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -LUA_COMPAT=( lua5-4 ) - -inherit cmake flag-o-matic lua-single toolchain-funcs xdg - -DESCRIPTION="A virtual lighttable and darkroom for photographers" -HOMEPAGE="https://www.darktable.org/" -LICENSE="GPL-3 CC-BY-3.0" -SLOT="0" - -if [[ ${PV} == *9999 ]]; then - inherit git-r3 - EGIT_REPO_URI="https://github.com/darktable-org/${PN}.git" - - LANGS=" af ca cs da de el es fi fr gl he hu it ja nb nl pl pt-BR pt-PT ro ru sk sl sq sv th uk zh-CN zh-TW" -else - #DOC_PV=$(ver_cut 1-2) - DOC_PV="4.4" - MY_PV="${PV/_/}" - MY_P="${P/_/.}" - - SRC_URI="https://github.com/darktable-org/${PN}/releases/download/release-${MY_PV}/${MY_P}.tar.xz - doc? ( - https://docs.darktable.org/usermanual/${DOC_PV}/en/${PN}_user_manual.pdf -> ${PN}-usermanual-${DOC_PV}.en.pdf - l10n_uk? ( - https://docs.darktable.org/usermanual/${DOC_PV}/uk/${PN}_user_manual.pdf - -> ${PN}-usermanual-${DOC_PV}.uk.pdf - ) - )" - - KEYWORDS="amd64 ~arm64 -x86" - LANGS=" cs de es fi fr hu it ja nl pl pt-BR ru sl sq uk zh-CN zh-TW" -fi - -IUSE="avif colord cpu_flags_x86_avx cpu_flags_x86_sse3 cups doc gamepad geolocation keyring gphoto2 graphicsmagick heif jpeg2k jpegxl kwallet lto lua midi nls opencl openmp openexr test tools webp - ${LANGS// / l10n_}" - -REQUIRED_USE="lua? ( ${LUA_REQUIRED_USE} )" - -RESTRICT="!test? ( test )" - -# It is sometimes requested, by both users and certain devs, to have sys-devel/gcc[graphite] -# in BDEPEND. This has not been done *on purpose*, for the following reason: -# - darktable can also be built with llvm-core/clang so we'd have to have that, as an alternative, -# in BDEPEND too -# - there are at least two darktable dependencies (media-libs/mesa and dev-lang/rust) which -# by default pull in llvm-core/clang -# - as a result of the above, for most gcc users adding the above to BDEPEND is a no-op -# (and curiously enough, empirical observations suggest current versions of Portage are -# more likely to pull in Clang to build darktable with than to request enabling USE=graphite -# on GCC; that might be a bug though) -BDEPEND="dev-util/intltool - virtual/pkgconfig - nls? ( sys-devel/gettext ) - test? ( >=dev-python/jsonschema-3.2.0 )" -DEPEND="dev-db/sqlite:3 - dev-libs/icu:= - dev-libs/json-glib - dev-libs/libxml2:2 - >=dev-libs/pugixml-1.8:= - gnome-base/librsvg:2 - >=media-gfx/exiv2-0.25-r2:=[xmp] - media-libs/lcms:2 - >=media-libs/lensfun-0.2.3:= - media-libs/libjpeg-turbo:= - media-libs/libpng:= - media-libs/tiff:= - net-libs/libsoup:2.4 - net-misc/curl - sys-libs/zlib:= - x11-libs/cairo - >=x11-libs/gtk+-3.22:3 - x11-libs/pango - avif? ( >=media-libs/libavif-0.8.2:= ) - colord? ( x11-libs/colord-gtk:= ) - cups? ( net-print/cups ) - gamepad? ( media-libs/libsdl2 ) - geolocation? ( >=sci-geosciences/osm-gps-map-1.1.0 ) - keyring? ( >=app-crypt/libsecret-0.18 ) - gphoto2? ( media-libs/libgphoto2:= ) - graphicsmagick? ( media-gfx/graphicsmagick ) - heif? ( media-libs/libheif:= ) - jpeg2k? ( media-libs/openjpeg:2= ) - jpegxl? ( media-libs/libjxl:= ) - lua? ( ${LUA_DEPS} ) - midi? ( media-libs/portmidi ) - opencl? ( virtual/opencl ) - openexr? ( media-libs/openexr:= ) - webp? ( media-libs/libwebp:= )" -RDEPEND="${DEPEND} - kwallet? ( >=kde-frameworks/kwallet-5.34.0-r1:* )" - -PATCHES=( - "${FILESDIR}"/${PN}-3.4.0_jsonschema-automagic.patch - "${FILESDIR}"/${PN}-3.4.1_libxcf-cmake.patch - "${FILESDIR}"/${PN}-4.2.1_cmake-musl.patch - "${FILESDIR}"/${PN}-4.4.2_fix-has-attribute-musl.patch -) - -S="${WORKDIR}/${P/_/~}" - -pkg_pretend() { - if [[ ${MERGE_TYPE} != binary ]]; then - # Bug #695658 - if tc-is-gcc; then - if ! test-flags-CC -floop-block &> /dev/null; then - eerror "Building ${PN} with GCC requires Graphite support." - eerror "Please switch to a version of sys-devel/gcc built with USE=graphite, or use a different compiler." - die "Selected compiler is sys-devel/gcc[-graphite]" - fi - fi - - use openmp && tc-check-openmp - fi -} - -pkg_setup() { - [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp - use lua && lua-single_pkg_setup -} - -src_prepare() { - use cpu_flags_x86_avx && append-flags -mavx - use cpu_flags_x86_sse3 && append-flags -msse3 - - sed -i -e 's:/appdata:/metainfo:g' data/CMakeLists.txt || die - - cmake_src_prepare -} - -src_configure() { - local mycmakeargs=( - -DBUILD_CURVE_TOOLS=$(usex tools) - -DBUILD_NOISE_TOOLS=$(usex tools) - -DBUILD_PRINT=$(usex cups) - -DCUSTOM_CFLAGS=ON - -DDONT_USE_INTERNAL_LUA=ON - -DRAWSPEED_ENABLE_LTO=$(usex lto) - -DRAWSPEED_ENABLE_WERROR=OFF - -DRAWSPEED_MUSL_SYSTEM=$(usex elibc_musl) - -DTESTBUILD_OPENCL_PROGRAMS=OFF - -DUSE_AVIF=$(usex avif) - -DUSE_CAMERA_SUPPORT=$(usex gphoto2) - -DUSE_COLORD=$(usex colord) - -DUSE_GMIC=OFF - -DUSE_GRAPHICSMAGICK=$(usex graphicsmagick) - -DUSE_HEIF=$(usex heif) - -DUSE_JXL=$(usex jpegxl) - -DUSE_KWALLET=$(usex kwallet) - -DUSE_LIBSECRET=$(usex keyring) - -DUSE_LUA=$(usex lua) - -DUSE_MAP=$(usex geolocation) - -DUSE_NLS=$(usex nls) - -DUSE_OPENCL=$(usex opencl) - -DUSE_OPENEXR=$(usex openexr) - -DUSE_OPENJPEG=$(usex jpeg2k) - -DUSE_OPENMP=$(usex openmp) - -DUSE_PORTMIDI=$(usex midi) - -DUSE_SDL2=$(usex gamepad) - -DUSE_WEBP=$(usex webp) - -DWANT_JSON_VALIDATION=$(usex test) - ) - cmake_src_configure -} - -src_install() { - cmake_src_install - # This USE flag is masked for -9999 - use doc && dodoc "${DISTDIR}"/${PN}-usermanual-${DOC_PV}.*.pdf - - if use nls; then - for lang in ${LANGS} ; do - if ! use l10n_${lang}; then - rm -r "${ED}"/usr/share/locale/${lang/-/_} || die - fi - done - fi -} - -pkg_postinst() { - xdg_pkg_postinst - - elog - elog "When updating a major version," - elog "please bear in mind that your edits will be preserved during this process," - elog "but it will not be possible to downgrade any more." - elog - ewarn "It will not be possible to downgrade!" - ewarn -} diff --git a/media-gfx/darktable/darktable-4.8.0.ebuild b/media-gfx/darktable/darktable-4.8.0-r1.ebuild index e8d9a70a68b8..36af6f4a95c5 100644 --- a/media-gfx/darktable/darktable-4.8.0.ebuild +++ b/media-gfx/darktable/darktable-4.8.0-r1.ebuild @@ -69,7 +69,6 @@ DEPEND="dev-db/sqlite:3 media-libs/libjpeg-turbo:= media-libs/libpng:= media-libs/tiff:= - net-libs/libsoup:2.4 net-misc/curl sys-libs/zlib:= x11-libs/cairo diff --git a/media-gfx/darktable/darktable-4.6.1.ebuild b/media-gfx/darktable/darktable-5.0.0-r1.ebuild index 4057907968ec..12f75aea8309 100644 --- a/media-gfx/darktable/darktable-4.6.1.ebuild +++ b/media-gfx/darktable/darktable-5.0.0-r1.ebuild @@ -9,6 +9,7 @@ inherit cmake flag-o-matic lua-single toolchain-funcs xdg DESCRIPTION="A virtual lighttable and darkroom for photographers" HOMEPAGE="https://www.darktable.org/" +S="${WORKDIR}/${P/_/~}" LICENSE="GPL-3 CC-BY-3.0" SLOT="0" @@ -33,14 +34,13 @@ else )" KEYWORDS="~amd64 ~arm64 -x86" - LANGS=" cs de es fi fr hu it ja nl pl pt-BR ru sl sq tr uk zh-CN zh-TW" + LANGS=" cs de es fi fr ja nl pt-BR sl sq uk zh-CN zh-TW" fi -IUSE="avif colord cpu_flags_x86_avx cpu_flags_x86_sse3 cups doc gamepad geolocation keyring gphoto2 graphicsmagick heif jpeg2k jpegxl kwallet lto lua midi nls opencl openmp openexr test tools webp +IUSE="avif colord cpu_flags_x86_avx cpu_flags_x86_sse3 cups doc gamepad geolocation keyring gphoto2 graphicsmagick heif jpeg2k jpegxl kwallet lto lua midi opencl openmp openexr test tools webp ${LANGS// / l10n_}" REQUIRED_USE="lua? ( ${LUA_REQUIRED_USE} )" - RESTRICT="!test? ( test )" # It is sometimes requested, by both users and certain devs, to have sys-devel/gcc[graphite] @@ -54,8 +54,8 @@ RESTRICT="!test? ( test )" # more likely to pull in Clang to build darktable with than to request enabling USE=graphite # on GCC; that might be a bug though) BDEPEND="dev-util/intltool + sys-devel/gettext virtual/pkgconfig - nls? ( sys-devel/gettext ) test? ( >=dev-python/jsonschema-3.2.0 )" DEPEND="dev-db/sqlite:3 dev-libs/icu:= @@ -69,7 +69,6 @@ DEPEND="dev-db/sqlite:3 media-libs/libjpeg-turbo:= media-libs/libpng:= media-libs/tiff:= - net-libs/libsoup:2.4 net-misc/curl sys-libs/zlib:= x11-libs/cairo @@ -98,11 +97,8 @@ PATCHES=( "${FILESDIR}"/${PN}-3.4.0_jsonschema-automagic.patch "${FILESDIR}"/${PN}-3.4.1_libxcf-cmake.patch "${FILESDIR}"/${PN}-4.2.1_cmake-musl.patch - "${FILESDIR}"/${PN}-4.4.2_fix-has-attribute-musl.patch ) -S="${WORKDIR}/${P/_/~}" - pkg_pretend() { if [[ ${MERGE_TYPE} != binary ]]; then # Bug #695658 @@ -155,7 +151,6 @@ src_configure() { -DUSE_LIBSECRET=$(usex keyring) -DUSE_LUA=$(usex lua) -DUSE_MAP=$(usex geolocation) - -DUSE_NLS=$(usex nls) -DUSE_OPENCL=$(usex opencl) -DUSE_OPENEXR=$(usex openexr) -DUSE_OPENJPEG=$(usex jpeg2k) @@ -176,13 +171,11 @@ src_install() { use l10n_uk && dodoc "${DISTDIR}"/${PN}-usermanual-${DOC_PV}.uk.pdf fi - if use nls; then - for lang in ${LANGS} ; do - if ! use l10n_${lang}; then - rm -r "${ED}"/usr/share/locale/${lang/-/_} || die - fi - done - fi + for lang in ${LANGS} ; do + if ! use l10n_${lang}; then + rm -r "${ED}"/usr/share/locale/${lang/-/_} || die + fi + done } pkg_postinst() { diff --git a/media-gfx/darktable/files/darktable-4.4.2_fix-has-attribute-musl.patch b/media-gfx/darktable/files/darktable-4.4.2_fix-has-attribute-musl.patch deleted file mode 100644 index 0aad42605c9e..000000000000 --- a/media-gfx/darktable/files/darktable-4.4.2_fix-has-attribute-musl.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- a/src/common/darktable.h -+++ b/src/common/darktable.h -@@ -140,7 +140,7 @@ extern "C" { - /* Create cloned functions for various CPU SSE generations */ - /* See for instructions https://hannes.hauswedell.net/post/2017/12/09/fmv/ */ - /* TL;DR :Â use only on SIMD functions containing low-level paralellized/vectorized loops */ --#if __has_attribute(target_clones) && !defined(_WIN32) && !defined(NATIVE_ARCH) -+#if __has_attribute(target_clones) && !defined(_WIN32) && !defined(NATIVE_ARCH) && defined(__GLIBC__) - # if defined(__amd64__) || defined(__amd64) || defined(__x86_64__) || defined(__x86_64) - #define __DT_CLONE_TARGETS__ __attribute__((target_clones("default", "sse2", "sse3", "sse4.1", "sse4.2", "popcnt", "avx", "avx2", "avx512f", "fma4"))) - # elif defined(__PPC64__) diff --git a/media-gfx/digikam/Manifest b/media-gfx/digikam/Manifest index 2aafc60968ca..f575e997c621 100644 --- a/media-gfx/digikam/Manifest +++ b/media-gfx/digikam/Manifest @@ -1,8 +1,6 @@ AUX digikam-8.3.0-cmake-addressbook.patch 1245 BLAKE2B 22365de2072c5ce5e2eac3bc1d7138e820166b977e5894f29addcdb00ae3329c47965b2b7930a4725b01789add63b4416083e6e358ca6ffb4a0d60f3e80ad52c SHA512 a872aed53811642407c98e20f423cf5381a117e96d4e95d309da6f116a13aa2584671ef20af3e1059c3ed7e09fec178fdb77e7afecde21077252bb2c8f116158 AUX digikam-8.4.0-cmake.patch 7429 BLAKE2B 20d79867086e390c2a571bae76f2023e4ec5f26bdc137f28be6ec8eff54ba2c5e84ec15191ceed83eb8e9415a522165f5931cf6d972e1537806cbb6d7e22bbf0 SHA512 fd38773ce49a31d3fcd0d477c5e180b42d1a2ea586b41534b7dd3d08653fea4020af30bce3b20ba14c4a2710cde3fecbd13fbe8fcfd33bdca6b82989cf431214 -DIST digiKam-8.4.0.tar.xz 58025616 BLAKE2B 33441e023cd9d6edba2e7c01e482a6eea7a6b1972b6bad0fc804fb3e94f97cc62e2663690137b2445fb7043789b7e942d830b71209385de77ccffe57d22d09ff SHA512 4342d18a7c04ab239821de3cf908f8e7d676598778f0174164aa336e8cfdc0a76327d31c64e6c4e47dcf0d6fbef46b01918312e4622ce3359888a9a94948a22b +AUX digikam-8.5.0-cmake-have_ksane.patch 2752 BLAKE2B acdff8fd6b634e636db42b0a266553192939f68184791d7023caeabc5bfed63bb705d601947039c38e250f2e817e44ec4bd541801043bb025f8cbd1039c040d3 SHA512 4a30f625f2d6ece1ed2b821524efbd189cbc8aa11495cd19020f5f1ed94692478677d3afd45a7e4a66cb788baa86ff79121f4ced7f0946763f458406054358f7 DIST digiKam-8.5.0.tar.xz 62028432 BLAKE2B ef061b73e72d9b2ad3da361fcdd3e27a4758b1ef837adde1a405cfbd759cc950d373464765f5ff07f36e8457c6c9c15550002e3ebd94215b154d2c51723192ee SHA512 5610f0173043e29a2b5ff62b2ed2c2bea79e10cd20a0c2416ebb425457cee55aa8b8d575ba57e8e188a899cc909516ea05e6c80e73e3316742cc9e8119855509 -DIST digikam-8.4.0-patchset.tar.xz 11904 BLAKE2B 6ab167cae66710505eb81bb538fde2a81458b6580bf8c70d0c28500ca81a3c9c9b9e0a12ca288a4dc6f39ae1a175f7b2bd09e4d94624337348084c228eafcc38 SHA512 df1199d3aaecc0afc032090424af69c031e95afba1fed70b00cf61c5ef52fa2a7c3d97918592c167f9ea918dd2823e4cc52f12a470a9eede815b3ff43314001b -EBUILD digikam-8.4.0-r11.ebuild 4032 BLAKE2B bd5b43030acb8f92ee1dd9c09af52b38f6752daadfeeaba92e54f2242d87063d7baa726ffea7429008a20fc341afc38e5d15a24bcd5e8c756deafa77f8739f4d SHA512 96bd118cd133c5f34c6a2988ddcadc2952a1bcea7626717ee6028b3688b46928fa09caab442eb5e9dabe0f093b7549863b4ba14bdff71ad1790c038fb31a3f22 -EBUILD digikam-8.5.0.ebuild 4023 BLAKE2B 62b4839043995097c4bee151e69b056417aade9a50de9265de32051aa199203eb9bad9b208cb6043eb36b0d56549865a51cbca434cd553962f2961645bac6625 SHA512 cdf6b2b05b72ae2ebbbf1c27e3a6b1710abe297f3ad497e1b515a16c83666a008fb84c65ba337d59c46e686e66ee7eb84dd9c621ad48ea315cd3f7492defed7e +EBUILD digikam-8.5.0-r1.ebuild 4079 BLAKE2B 2fd808d054390c98e34cb1f59a7f2b3eff655323fcd9b4827792ae97473166792b565ff84efac0802ed02668ef32d08926a84c6ce96b950d91779ef35c6adb86 SHA512 23b10e38ec957640e064b8e54294e87630d6025402bac57d8026af13c28c43590ac80748b18266b589b0623397b2e0473b34170cee1b3d6c607c248194e3bb93 MISC metadata.xml 981 BLAKE2B 1c1494b9c7fd7207550ea214baafcab17aa12ecb93f08885dd7c873a15114d826341027b8a37e36138cf89d1ba1451c8fff247d9fde18c235bee062f3cda1ab9 SHA512 7f4602eafde8e22b18b7abc1a071eb27369d2ab7df01554253f142614577209828698b39614666fd6d4688ff44b3c1dc3d4820ec3398a6f8228710343ef65f85 diff --git a/media-gfx/digikam/digikam-8.4.0-r11.ebuild b/media-gfx/digikam/digikam-8.4.0-r11.ebuild deleted file mode 100644 index ab9884b9b338..000000000000 --- a/media-gfx/digikam/digikam-8.4.0-r11.ebuild +++ /dev/null @@ -1,134 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -KFMIN=6.3.0 -QTMIN=6.6.2 -inherit ecm kde.org toolchain-funcs - -DESCRIPTION="Digital photo management application" -HOMEPAGE="https://www.digikam.org/" -SRC_URI="mirror://kde/stable/${PN}/${PV}/digiKam-${PV/_/-}.tar.xz - https://dev.gentoo.org/~asturm/distfiles/${P}-patchset.tar.xz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="amd64 ~arm64" -IUSE="addressbook calendar geolocation gphoto2 heif +imagemagick jpegxl +lensfun mysql openmp +panorama scanner semantic-desktop spell video" - -# bug 366505 -RESTRICT="test" - -COMMON_DEPEND=" - dev-libs/expat - >=dev-qt/qtbase-${QTMIN}:6[concurrent,dbus,-gles2-only,gui,mysql?,network,opengl,sql,widgets,xml] - >=dev-qt/qtnetworkauth-${QTMIN}:6 - >=dev-qt/qtscxml-${QTMIN}:6 - >=dev-qt/qtsvg-${QTMIN}:6 - >=dev-qt/qtwebengine-${QTMIN}:6[widgets] - >=kde-frameworks/kconfig-${KFMIN}:6 - >=kde-frameworks/kconfigwidgets-${KFMIN}:6 - >=kde-frameworks/kcoreaddons-${KFMIN}:6 - >=kde-frameworks/ki18n-${KFMIN}:6 - >=kde-frameworks/kiconthemes-${KFMIN}:6 - >=kde-frameworks/kio-${KFMIN}:6 - >=kde-frameworks/knotifications-${KFMIN}:6 - >=kde-frameworks/knotifyconfig-${KFMIN}:6 - >=kde-frameworks/kservice-${KFMIN}:6 - >=kde-frameworks/kwidgetsaddons-${KFMIN}:6 - >=kde-frameworks/kwindowsystem-${KFMIN}:6 - >=kde-frameworks/kxmlgui-${KFMIN}:6 - >=kde-frameworks/solid-${KFMIN}:6 - >=media-gfx/exiv2-0.27.1:=[xmp] - media-libs/lcms:2 - media-libs/libjpeg-turbo:= - media-libs/liblqr - media-libs/libpng:= - >=media-libs/opencv-3.3.0:=[contrib,contribdnn,features2d] - media-libs/tiff:= - virtual/opengl - x11-libs/libX11 - addressbook? ( - >=kde-apps/akonadi-contacts-24.05.2:6 - >=kde-frameworks/kcontacts-${KFMIN}:6 - ) - calendar? ( >=kde-frameworks/kcalendarcore-${KFMIN}:6 ) - gphoto2? ( media-libs/libgphoto2:= ) - heif? ( - media-libs/libheif:= - media-libs/x265:= - ) - imagemagick? ( media-gfx/imagemagick:= ) - jpegxl? ( media-libs/libjxl:= ) - lensfun? ( media-libs/lensfun ) - panorama? ( >=kde-frameworks/threadweaver-${KFMIN}:6 ) - scanner? ( >=kde-apps/libksane-24.05.2:6 ) - semantic-desktop? ( >=kde-frameworks/kfilemetadata-${KFMIN}:6 ) - spell? ( >=kde-frameworks/sonnet-${KFMIN}:6 ) - video? ( >=dev-qt/qtmultimedia-${QTMIN}:6 ) -" -DEPEND="${COMMON_DEPEND} - dev-cpp/eigen:3 - dev-libs/boost - addressbook? ( >=kde-apps/akonadi-24.05.2:6 ) -" -RDEPEND="${COMMON_DEPEND} - !${CATEGORY}/${PN}:5 - media-libs/exiftool - mysql? ( virtual/mysql[server(+)] ) - panorama? ( media-gfx/hugin ) -" -BDEPEND=" - sys-devel/gettext - panorama? ( - app-alternatives/lex - app-alternatives/yacc - ) -" - -PATCHES=( - "${FILESDIR}/${PN}-8.4.0-cmake.patch" - "${FILESDIR}/${PN}-8.3.0-cmake-addressbook.patch" - # bug 936507; KDE-bugs 488662, 490611, 491007, 490484, 490821, - # 490859, 490828, 490690, 490552, 490385, 489751, 490128 - "${WORKDIR}/${P}-patchset" -) - -pkg_pretend() { - [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp - ecm_pkg_pretend -} - -pkg_setup() { - [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp - ecm_pkg_setup -} - -# FIXME: Unbundle libraw (libs/rawengine/libraw) -src_configure() { - local mycmakeargs=( - -DBUILD_WITH_QT6=ON - -DBUILD_TESTING=OFF # bug 698192 - -DENABLE_APPSTYLES=ON - -DCMAKE_DISABLE_FIND_PACKAGE_Jasper=ON - -DENABLE_SHOWFOTO=ON # built unconditionally so far, new option since 8.0 - -DENABLE_AKONADICONTACTSUPPORT=$(usex addressbook) - $(cmake_use_find_package calendar KF6CalendarCore) - -DENABLE_GEOLOCATION=$(usex geolocation) - $(cmake_use_find_package gphoto2 Gphoto2) - $(cmake_use_find_package heif Libheif) - $(cmake_use_find_package imagemagick ImageMagick) - $(cmake_use_find_package jpegxl Libjxl) - $(cmake_use_find_package lensfun LensFun) - -DENABLE_MYSQLSUPPORT=$(usex mysql) - -DENABLE_INTERNALMYSQL=$(usex mysql) - $(cmake_use_find_package panorama KF6ThreadWeaver) - $(cmake_use_find_package scanner KSaneWidgets6) - -DENABLE_KFILEMETADATASUPPORT=$(usex semantic-desktop) - $(cmake_use_find_package spell KF6Sonnet) - -DENABLE_MEDIAPLAYER=$(usex video) - ) - - ecm_src_configure -} diff --git a/media-gfx/digikam/digikam-8.5.0.ebuild b/media-gfx/digikam/digikam-8.5.0-r1.ebuild index 2b603c38c9a3..4c3b3f8ba5ce 100644 --- a/media-gfx/digikam/digikam-8.5.0.ebuild +++ b/media-gfx/digikam/digikam-8.5.0-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 @@ -90,6 +90,7 @@ BDEPEND=" PATCHES=( "${FILESDIR}/${PN}-8.4.0-cmake.patch" "${FILESDIR}/${PN}-8.3.0-cmake-addressbook.patch" + "${FILESDIR}/${P}-cmake-have_ksane.patch" # bug 947312 ) pkg_pretend() { diff --git a/media-gfx/digikam/files/digikam-8.5.0-cmake-have_ksane.patch b/media-gfx/digikam/files/digikam-8.5.0-cmake-have_ksane.patch new file mode 100644 index 000000000000..9099b2f37468 --- /dev/null +++ b/media-gfx/digikam/files/digikam-8.5.0-cmake-have_ksane.patch @@ -0,0 +1,28 @@ +diff --git a/core/CMakeLists.txt b/core/CMakeLists.txt +index 2cef54510c..95e33cfc2f 100644 +--- a/core/CMakeLists.txt ++++ b/core/CMakeLists.txt +@@ -201,7 +201,11 @@ MACOS_DEBUG_POLICIES() + message(STATUS "--------------------------------------------------") + message(STATUS "") + ++if(Qt6_FOUND) ++MACRO_BOOL_TO_01(KSaneWidgets6_FOUND HAVE_KSANE) ++else() + MACRO_BOOL_TO_01(KF${QT_VERSION_MAJOR}Sane_FOUND HAVE_KSANE) ++endif() + MACRO_BOOL_TO_01(KF${QT_VERSION_MAJOR}FileMetaData_FOUND HAVE_KFILEMETADATA) + MACRO_BOOL_TO_01(KF${QT_VERSION_MAJOR}CalendarCore_FOUND HAVE_KCALENDAR) + MACRO_BOOL_TO_01(KF${QT_VERSION_MAJOR}Notifications_FOUND HAVE_KNOTIFICATIONS) +@@ -294,7 +302,11 @@ PRINT_OPTIONAL_LIBRARY_STATUS("libkio" "https://invent.kde.org/framew + PRINT_OPTIONAL_LIBRARY_STATUS("libknotifications" "https://invent.kde.org/frameworks/knotifyconfig" "(version >= ${KF${QT_VERSION_MAJOR}_MIN_VERSION})" "digiKam will be compiled without KDE desktop notifications support." KF${QT_VERSION_MAJOR}Notifications_FOUND) + PRINT_OPTIONAL_LIBRARY_STATUS("libknotifyconfig" "https://invent.kde.org/frameworks/knotifications" "(version >= ${KF${QT_VERSION_MAJOR}_MIN_VERSION})" "digiKam will be compiled without KDE desktop notify configuration support." KF${QT_VERSION_MAJOR}NotifyConfig_FOUND) + PRINT_OPTIONAL_LIBRARY_STATUS("libsonnet" "https://invent.kde.org/frameworks/sonnet" "(version >= ${KF${QT_VERSION_MAJOR}_MIN_VERSION})" "digiKam will be compiled without spell-checking support." KF${QT_VERSION_MAJOR}Sonnet_FOUND) ++if(Qt6_FOUND) ++PRINT_OPTIONAL_LIBRARY_STATUS("libksane" "https://invent.kde.org/graphics/libksane" "(version >= ${KSANE_MIN_VERSION})" "digiKam will be compiled without flat scanners support." KSaneWidgets6_FOUND) ++else() + PRINT_OPTIONAL_LIBRARY_STATUS("libksane" "https://invent.kde.org/graphics/libksane" "(version >= ${KSANE_MIN_VERSION})" "digiKam will be compiled without flat scanners support." KF${QT_VERSION_MAJOR}Sane_FOUND) ++endif() + PRINT_OPTIONAL_LIBRARY_STATUS("liblensfun" "https://github.com/lensfun/lensfun" "(version >= 0.2.6)" "digiKam will be compiled without Lens Auto Correction tool support." LensFun_FOUND) + PRINT_OPTIONAL_LIBRARY_STATUS("libglib2" "https://developer.gnome.org/glib/" "(version >= 2.0.0)" "digiKam will be compiled without Contents Aware Resizer tool support." GLIB2_FOUND) + diff --git a/media-gfx/enblend/Manifest b/media-gfx/enblend/Manifest index 0405a67f33ca..f9b8950683ad 100644 --- a/media-gfx/enblend/Manifest +++ b/media-gfx/enblend/Manifest @@ -3,5 +3,5 @@ AUX enblend-4.2.0_p20161007-doc-scaleable-fonts.patch 650 BLAKE2B 633ae86947cfcb AUX enblend-4.2.0_p20161007-gcc-10.patch 312 BLAKE2B bbc8521bb1c2b9f3f67dedffdbcab952628fc252d2ed81c37e469f06596f2cb9ab5907c7fc97de1dbfe408e29312c55d08b189b8e6f46215540e64354fbfd60a SHA512 9ed03b22237e1bf297db0daca2b5dd6aa7ad5cd9bf333e507160b7bbf24eb37be173c79314ce1cff7a7df10ba262266ca54f52c8ec6d85a7a411b78bef76d91e AUX enblend-4.2.0_p20240424-doc-install-dir-fix.patch 1977 BLAKE2B bb747bd4d98f0d27d7930d0376ddcfef02186c998e869a0f3843e9fa32c2bf39fedb8074abdaa09d4a8425d2fb066ed2483ede75a3fddcba2d86f95042de3b25 SHA512 3c76b3fad97e918ac3849204d067c64c03e03dbbb61d4b4f35e5a7f0f895080f23518797d98050ca12fe101cde6f7476438fa59f89f736f84df23e1b9b5ecd1e DIST enblend-4.2.0_p20240424.tar.xz 505928 BLAKE2B 49a9cfd2cb332573a1d3882ce6d50513008ee71d7235f69bb7920fc9b71f6c0c6e5e7ae88de4c5879d4cb2ee94d437b1752d6c13117c07ad81a6832b45985684 SHA512 1eed2cac0dd6d0ddec41097c4d21ebbad01981e6abbb5fe3db69fc4ef50728ce997faad73dc17255997e8eee9af9d540e38bc2bdf106eb6ca338ef1650680894 -EBUILD enblend-4.2.0_p20240424.ebuild 1991 BLAKE2B 3848672da03b6b0bbda2f8cce23883328e9fba773b78e63043ca751d5be44c6bb980c3fe52525e10430a102f789245da0adccc2b4ce9884e337580682dfe2d82 SHA512 11540f7baa057d8ad2611d15a1ba6fcc0c700d270f8d58f5f27c618f9e24469c73e5dbba43d789db1dda812c7072d03516953808a8f5d17a8f32b5cacddeb6b3 +EBUILD enblend-4.2.0_p20240424.ebuild 1899 BLAKE2B d168a14f417c7ff30ba6067f501881cbf8075ec7c053c3846fa452ee8c918b5761c13fa97daedbae13abf319b2efe55de5144ff883ce928bc36661a01a7b9333 SHA512 528f234fdce620dd6208f37bfadcaeeef215016cc3855d8259fcc4d622942fd564443c796abd51607fe6a080127919083e363d4687713e00e4d2f03cf8a55269 MISC metadata.xml 438 BLAKE2B 6e1f7ffb0f56a8e668608a97c02e045546c76b90c18777a77c031a94f23ce59abd2df8b6688973b509872e9cca867d16d6b0c201e06f4e8026dcde7c1eb1632f SHA512 86a9f0ca54ad8c9f1409957d4bdbe7aec7b1992e4272ab5e9e3734442e4ca7fc599bafc0e1e55d30ef0220dbaaa3d4f38e7fc8e4dbe4972fb392c4b2a86e6181 diff --git a/media-gfx/enblend/enblend-4.2.0_p20240424.ebuild b/media-gfx/enblend/enblend-4.2.0_p20240424.ebuild index 109b429e2424..07b3b2dc1fd0 100644 --- a/media-gfx/enblend/enblend-4.2.0_p20240424.ebuild +++ b/media-gfx/enblend/enblend-4.2.0_p20240424.ebuild @@ -14,9 +14,7 @@ S=${WORKDIR}/enblend LICENSE="GPL-2+ FDL-1.2+" SLOT="0" KEYWORDS="amd64 arm64 x86" -IUSE="cpu_flags_x86_sse2 debug doc openmp tcmalloc" - -REQUIRED_USE="tcmalloc? ( !debug )" +IUSE="cpu_flags_x86_sse2 doc openmp tcmalloc" BDEPEND=" sys-apps/help2man @@ -40,7 +38,6 @@ RDEPEND=" media-libs/tiff:= media-libs/vigra[openexr] sci-libs/gsl:= - debug? ( dev-libs/dmalloc[threads] ) tcmalloc? ( dev-util/google-perftools ) " DEPEND="${RDEPEND} @@ -65,7 +62,7 @@ src_prepare() { src_configure() { local mycmakeargs=( -DENABLE_SSE2=$(usex cpu_flags_x86_sse2) - -DENABLE_DMALLOC=$(usex debug) + -DENABLE_DMALLOC=no -DDOC=$(usex doc) -DENABLE_OPENMP=$(usex openmp) -DENABLE_TCMALLOC=$(usex tcmalloc) diff --git a/media-gfx/eog/Manifest b/media-gfx/eog/Manifest index b9202d1aca8c..ee759b705dd2 100644 --- a/media-gfx/eog/Manifest +++ b/media-gfx/eog/Manifest @@ -1,5 +1,5 @@ -DIST eog-45.3.tar.xz 4656744 BLAKE2B ceebd9890da926ec7caea916ce2e4483fb398f1b5270f0a210bfc97fb844669ca8416a10cc020f145f8e0b1d2e5e2fd85dcaa4d948312e42b40c0850d657f988 SHA512 21693d659a5eb25bdec968266d7e6a1a6988bcec0bf5c3d914b098001ed4a8e64d7ff628181072fb1aabec1b89b56ed5e7c85e3b06ec79be1c9d7cf1c57d3145 DIST eog-45.4.tar.xz 4657420 BLAKE2B 422e9d9cfffe81fdd3af4948f371c11fcd6a2fba50df78469267747314cdcc840763a7057566c5e43c6eee9a0175e9dfaa1916736cfbef6d879076b9f2c11fcc SHA512 eb49d9c78b6e3d66eb20a714c2ebf5aad5c5547c2ca86e5c51e4b7f3c4c3bae5c4c356cec4c5815cc11d91c38ace58c00ea25c406de8cd9bf39a0ec65188baf8 -EBUILD eog-45.3.ebuild 1746 BLAKE2B 6e7aa0579e4a1b5af66cad95f4ba62cdf26e7934339b8f7f68605246a174dd0f1fbe178f240ca55f22028c4dfa33ab1a23eebc227a25b10a18566e4c36a8e60e SHA512 cf7c3e6c6c368738c3d31f4930301fd761af7b8af360fbac1a4addd7970245b74aa73e08e56791482ee6af7f5c223f4d4c2a636866f1e6e989d2d56b94e43dca +DIST eog-47.0.tar.xz 4658256 BLAKE2B 8e1162c3ca5ee89605eb8d6b616f3e2d034725948a32f568e3f1608247d6e35b67ad98351b5a0396b72031c0c3e1bcfa5f9e97f7e159e6020b7c7ba6c23a204a SHA512 5a3907988031360c53d7a2c9ba8c5e1c03c714f41f55bb980414e35591d522f32d9ae1c9e6c0ac6ca58e559074cd060572225417e30f39281a8f93473ec42159 EBUILD eog-45.4.ebuild 1707 BLAKE2B aa11762ae3696df2b0008d7057e356a4cea715e21626493a6e26b374a0a364790ab92a3021bb1d3379cc66798f597c25834e8e77e2305925f983f067619440d5 SHA512 7ab0ecbf40b1931d015d7b60e13a887c24316c5ad3bdc204789782364923d5704d44e1e0201961fe3c6007b33f5e97c46ea0316187107c737ac175531966e999 +EBUILD eog-47.0.ebuild 1710 BLAKE2B b454a6a4e4b054e690935ff3be6d5134ae0df4f9431952acb0fa92bd9f845d4ab28b901869d439a3ccf8a20f6f78d6f5a5168915d7478462ce065884ab46897f SHA512 38cd7fc517d0f373339040212ff975303c5e66e0523215d7f78780d8ab1b384308b3173e3a0cfc21c397ab8db9b4be99fa45ffe70d159ea2f9a185137380a023 MISC metadata.xml 580 BLAKE2B 7d6bf08b37ed06abb82e92621725ab2cbc9d0b28e5c50cd9dd25e449e98212da4911da450d5e80f6d2efd3cb65981b2726e69f48ae54fc7a0dd4363c896b9086 SHA512 3ae60a59ef2e07fd78b836eb828c0b9e37e49ea6115c52215b86dafff9cb6990567659a31cfb1e06e58890cf598c98065df1e473dc7994fef0ae950081c27a54 diff --git a/media-gfx/eog/eog-45.3.ebuild b/media-gfx/eog/eog-47.0.ebuild index d200bb7d2e69..176f838354cb 100644 --- a/media-gfx/eog/eog-45.3.ebuild +++ b/media-gfx/eog/eog-47.0.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 @@ -6,19 +6,19 @@ EAPI=8 inherit gnome.org gnome2-utils meson xdg DESCRIPTION="The Eye of GNOME image viewer" -HOMEPAGE="https://wiki.gnome.org/Apps/EyeOfGnome https://gitlab.gnome.org/GNOME/eog" +HOMEPAGE="https://gitlab.gnome.org/GNOME/eog" LICENSE="GPL-2+" SLOT="1" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86" + IUSE="+exif gtk-doc +introspection +jpeg lcms +svg xmp tiff" REQUIRED_USE=" exif? ( jpeg ) gtk-doc? ( introspection ) " -KEYWORDS="~alpha amd64 ~arm arm64 ~loong ~ppc ~ppc64 ~riscv ~sparc x86" - RDEPEND=" >=dev-libs/glib-2.73.2:2 >=dev-libs/libpeas-0.7.4:0[gtk] diff --git a/media-gfx/flameshot/Manifest b/media-gfx/flameshot/Manifest index 9b739993aa6f..2f2caebc2296 100644 --- a/media-gfx/flameshot/Manifest +++ b/media-gfx/flameshot/Manifest @@ -1,9 +1,3 @@ -DIST flameshot-0.10.2.tar.gz 7726687 BLAKE2B c7c7402d0cb6234473018571e67c39aebec3b4afa398fc2ef590f64527980ca218b1ebd8228ea47a3f9fd76e0edc2f8e1662965f79817bf6461bf0fc64d8b692 SHA512 b0eb1decd87dab1d4a375708448dd4c6f85c101d33814b76edbb328150d0e9ee7a588be698fddcb24e70e39cd4331f9aa2ff082525ff6975d52303a6d9c1ab12 -DIST flameshot-11.0.0.tar.gz 12662479 BLAKE2B 1adef0196a449c33ea57ecd214ad890f44a8530c9c1116d5bdc29074835c040c8fbbec207501e597fb09887ab1e80e937e8412acdc7eb38c8619aa993f986018 SHA512 de13f3c5bc18f164c6e37c0b3f42c8693d3ebfaba5f3d54360899df6479390e2a0c38970fa2595c9293304b4e52ca2198477f4f317abcb11df4c30a24ab1909f -DIST flameshot-12.0.0.tar.gz 15617684 BLAKE2B 0c878c1efae7b1dd7fccc50471bb810bbf6067bcb1fe26b73965d4f5a78e514e33d74f4a0c28e68ff4e15875ec5d6f9eccfc91ee1635b6e0d31bb50133182277 SHA512 8a7d0878ff57f9c3fcb12791c33f2c11de08b057a68bb50684dd9195fbba8557e71236bc4f8a5f50062af021ed970d5b4362fc2bfdc90415143d7597c3df50f0 DIST flameshot-12.1.0.tar.gz 15618560 BLAKE2B 975019d71a31f32785f081a05d224f72927628a1142697ba7ef9646f65d2cf1dcb5457633522143201716fe20a320224c95047904408dc411975c3e711e48002 SHA512 159bf3a8ff406b3881dcc77fc48d9e7cc0d595bd47ee2363396d7efc95f69160cf25ccf99cd1b2c2b527baeadf91c209784a7bca23ed5f17caacc385e161c83c -EBUILD flameshot-0.10.2.ebuild 938 BLAKE2B 505886905aaff0562c06b3dc13e8b79394af3691f8d44931671089dda29de09962cba1a630c0e7275c7117143e63b566afbd1d19e8231c9d9da48f5334bc4b01 SHA512 6069cd9fd339931aa00d9f06125a8708605b978001fff5eb1f71994c54a680eac1231f320c06de92f1e96cc447578d4023aab45ae33c9d8920bff4488e464c68 -EBUILD flameshot-11.0.0.ebuild 870 BLAKE2B c5e5fea8d2b32a01d098223db0c6a5d58624ac500bf2be34382a3740c9449212f355b1498345d4884a9bfb1d2a9837eb91751d931fdc41fc0f9ec5f2a4e33da5 SHA512 d9049678692def8377946b10929bbf244dc0b292720f8916e800ba968d90e19ed3cf76e9fb593544a30dbef06d6c146b285d4f2c003be50e69dd981e3fcdbc9b -EBUILD flameshot-12.0.0-r2.ebuild 969 BLAKE2B 490a48897bf56801194cb1afc94bbd52bb72644a72c0b5739133c73818cb02adb69db171494f6d5f64dce71107bdad75280fbd5bca20f19903725cd70ca11528 SHA512 d7dd73b964ae828839d5a42e5083b47d96103cedc2fa13041663a3269bd81c759d64454eb73f9fcb52c10cde795eb81e7ce300865042b27504a097969c590fbc EBUILD flameshot-12.1.0-r2.ebuild 1189 BLAKE2B 2afbe2cf52c5faaadc468281d108c1ec0b373a32253f2a12f6bfafcd2f1e8e99bab1e57fd15886ac80849e71f9a0c381d53a8a0dc330d5f0a65a564fa4ba0d53 SHA512 b947004d23bb33d9d3cdc09c9027ae44e7f64023448783ad8c4e0b53f88cc5c37f4489bf461a20b63c1c7d8482fb8339c3a0619df4b5982e61ba1b9dbe916765 MISC metadata.xml 843 BLAKE2B 13d22e8a896623ab7dab785fc73e9871814590bd43e601005d691b7ba7fa7c0690b929857c9b03e801e07691c9989403237ef0c623f178bdb1370d6ea6774bd1 SHA512 b94fec86fab6b8801b36f9a086a5cf2d62c48fd1ca6e41c60f6317acbb9d58382936222a873caad4e3efc1717974830a44bd95c4881194370c9a5826d7c0a620 diff --git a/media-gfx/flameshot/flameshot-0.10.2.ebuild b/media-gfx/flameshot/flameshot-0.10.2.ebuild deleted file mode 100644 index 9edb962ea42d..000000000000 --- a/media-gfx/flameshot/flameshot-0.10.2.ebuild +++ /dev/null @@ -1,47 +0,0 @@ -# Copyright 2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit cmake xdg - -DESCRIPTION="Powerful yet simple to use screenshot software" -HOMEPAGE="https://flameshot.org https://github.com/flameshot-org/flameshot" -SRC_URI="https://github.com/flameshot-org/flameshot/archive/v${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="Apache-2.0 Free-Art-1.3 GPL-3+" -SLOT="0" -KEYWORDS="amd64 x86" - -DEPEND=" - dev-qt/qtcore:5 - dev-qt/qtgui:5 - =dev-qt/qtsingleapplication-2.6*[qt5(+),X] - dev-qt/qtwidgets:5 - dev-qt/qtsvg:5 - dev-qt/qtnetwork:5 - dev-qt/qtdbus:5 - sys-apps/dbus - dev-libs/spdlog:= -" -BDEPEND=" - dev-qt/linguist-tools:5 -" -RDEPEND="${DEPEND}" - -src_prepare() { - rm -r external/spdlog || die - rm -r external/singleapplication || die - - cmake_src_prepare -} - -src_configure() { - local mycmakeargs=( - -DUSE_EXTERNAL_SPDLOG=1 - -DUSE_EXTERNAL_SINGLEAPPLICATION=1 - -DENABLE_CACHE=0 - ) - - cmake_src_configure -} diff --git a/media-gfx/flameshot/flameshot-11.0.0.ebuild b/media-gfx/flameshot/flameshot-11.0.0.ebuild deleted file mode 100644 index cccbfdf33cd5..000000000000 --- a/media-gfx/flameshot/flameshot-11.0.0.ebuild +++ /dev/null @@ -1,44 +0,0 @@ -# Copyright 2021-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit cmake xdg - -DESCRIPTION="Powerful yet simple to use screenshot software" -HOMEPAGE="https://flameshot.org https://github.com/flameshot-org/flameshot" -SRC_URI="https://github.com/flameshot-org/flameshot/archive/v${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="Apache-2.0 Free-Art-1.3 GPL-3+" -SLOT="0" -KEYWORDS="~amd64 ~x86" - -DEPEND=" - dev-qt/qtcore:5 - dev-qt/qtgui:5 - =dev-qt/qtsingleapplication-2.6*[qt5(+),X] - dev-qt/qtwidgets:5 - dev-qt/qtsvg:5 - dev-qt/qtnetwork:5 - dev-qt/qtdbus:5 - sys-apps/dbus -" -BDEPEND=" - dev-qt/linguist-tools:5 -" -RDEPEND="${DEPEND}" - -src_prepare() { - rm -r external/singleapplication || die - - cmake_src_prepare -} - -src_configure() { - local mycmakeargs=( - -DUSE_EXTERNAL_SINGLEAPPLICATION=1 - -DENABLE_CACHE=0 - ) - - cmake_src_configure -} diff --git a/media-gfx/flameshot/flameshot-12.0.0-r2.ebuild b/media-gfx/flameshot/flameshot-12.0.0-r2.ebuild deleted file mode 100644 index 708edafe52aa..000000000000 --- a/media-gfx/flameshot/flameshot-12.0.0-r2.ebuild +++ /dev/null @@ -1,47 +0,0 @@ -# Copyright 2021-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit cmake xdg - -DESCRIPTION="Powerful yet simple to use screenshot software" -HOMEPAGE="https://flameshot.org https://github.com/flameshot-org/flameshot" -SRC_URI="https://github.com/flameshot-org/flameshot/archive/v${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="Apache-2.0 Free-Art-1.3 GPL-3+" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="wayland" - -DEPEND=" - =dev-qt/qtsingleapplication-2.6*[qt5(+),X] - dev-qt/qtcore:5 - dev-qt/qtdbus:5 - dev-qt/qtgui:5 - dev-qt/qtnetwork:5 - dev-qt/qtsvg:5 - dev-qt/qtwidgets:5 - sys-apps/dbus - wayland? ( kde-frameworks/kguiaddons:5 ) -" -BDEPEND=" - dev-qt/linguist-tools:5 -" -RDEPEND="${DEPEND}" - -src_prepare() { - rm -r external/singleapplication || die - - cmake_src_prepare -} - -src_configure() { - local mycmakeargs=( - -DUSE_EXTERNAL_SINGLEAPPLICATION=1 - -DENABLE_CACHE=0 - -DUSE_WAYLAND_CLIPBOARD=$(usex wayland) - ) - - cmake_src_configure -} diff --git a/media-gfx/fotema/Manifest b/media-gfx/fotema/Manifest index e7b05c824e8c..c37c567f96bd 100644 --- a/media-gfx/fotema/Manifest +++ b/media-gfx/fotema/Manifest @@ -1,7 +1,10 @@ -DIST fotema-1.14.2.tar.xz 78468972 BLAKE2B 59974a873381dd40cf80f274bb2fcd3763fbf946f168491e25f76f56c1646754b7cf49dd174a25726133fd774d04a9cee370c81d3c01f9d276e588d42b232f82 SHA512 27d96b0a47e312b2a7674f140646f24785dbfae47ea1bde74630fbb979946f23b1e1f5fab5ba20edb38ef91790003e138dcf4043ff371e3bf458c691dfd2db56 -DIST fotema-1.14.3.tar.xz 78412372 BLAKE2B 821ebb70e14e3e0d1a72ab712ecfe50da2299c2050593af0d6c64a2fc04ae904d56a4448fbcc022e9c7b1604e7a7ed8e55d8cba34aae4f1e6023fdea221a1c6d SHA512 461b84de9b4636cfed2d4e5132e18c831341cbddf8decfc856f85fa18fa7e4ead9d4d210a6795e077f7b7532aca51fc7835cd648cd9d7f7d8f9cc17e18b1f7e6 DIST fotema-1.14.4.tar.xz 78458268 BLAKE2B 4f8cc8f1ba3df27eca16b41e11ae947fe15b83321bc2da23f01a16012d862999a0cf6572353bc74cf2868a91404b199712b4f4d9df63ed87970469d57bb5be16 SHA512 189638c8d7e4466b1318ec06324cd1bfb3eaa36b9b7116b7e44a654d4cd09fb38961c0a5fa02469180f66844614555773e2306becd590eb7b8ba8fb074e9c3cc -EBUILD fotema-1.14.2-r2.ebuild 1688 BLAKE2B 765c563f6e95998ef1f2557ae3044f01e12f1cf896cda117ab0c4cdfa9a1eabb8ee0f43c4e94aa4e52dd296922a6e3ca64e11c0fa1bb8062256ec0843eaee83e SHA512 ead13df6fcf02f163f97a8b13797208b048c5461bd9dd7183368da836ebb60c6ccf39f0cfdc334fc4ecfcbbabade7a4b10e512e89912e1047a7ddc05cf0edfbf -EBUILD fotema-1.14.3-r1.ebuild 1688 BLAKE2B 765c563f6e95998ef1f2557ae3044f01e12f1cf896cda117ab0c4cdfa9a1eabb8ee0f43c4e94aa4e52dd296922a6e3ca64e11c0fa1bb8062256ec0843eaee83e SHA512 ead13df6fcf02f163f97a8b13797208b048c5461bd9dd7183368da836ebb60c6ccf39f0cfdc334fc4ecfcbbabade7a4b10e512e89912e1047a7ddc05cf0edfbf +DIST fotema-1.18.3-crates.tar.xz 62354556 BLAKE2B 6b8af1e6edf5efb751f60803b27e8001d916854bd7cdcf4e9a06bc21cfdd856e80ee58cc59fbd7750da5f159f3b231c597f4660534b65cb38dcc7421cd24213f SHA512 811df7a370b500c1e1cb8e9218026bb30b17da3860a88d8972601459c9c54101c18a59885040a2306ccc7c18081a1c3e7148ebb8b9bd48d3dfdba86157345192 +DIST fotema-1.18.3.gh.tar.gz 8947271 BLAKE2B 7e1ba24aa38b1bd8b1e8291fa0bfcb7aad5d36f366bb5a0cc7114c5d72cef3083918f6a28cfcee713bf8e079822ee61146e1ee508dd0740f53591878078534aa SHA512 fa8bee36328b5a261eef7e1ef123dab724fb7521e77c5b8e3e4104d0693d4a16b486cc9f19149b6e4aeae8c598f910214a72c3d5ddb93cc1f74848f2100f66ec +DIST fotema-1.19.0-crates.tar.xz 62327412 BLAKE2B 099677191ca1634288d9f4e6055ddfaa3e6562d96fcd06dcc51aa1cb49fed648a61f60f2d47ac51c4fd97a8a238a8f064a8f9990768e2160fd9e002b4ffb978a SHA512 11b7510aae15359e0b2bb95a7e5b4b973f1438328f8fea075264bfb16da50876c4bec5bd82c0af965c8fc9bb5c2d1126c03c077ebd0d1cda704e6b89daf504c2 +DIST fotema-1.19.0.gh.tar.gz 8950038 BLAKE2B 131c013515b11ac068944e9d3c7e4ae1809ed75bf6d7d1eebdf10c09498d519363ab2b0d35b07a6f11c3e221d8665adf289ce9ff3f820585dd97b2065a5c1322 SHA512 4750028bd30a46f37a6ca85ff9d005dd99c4d4a0d1c0df60baadc094d9630bafeff21e898543c9ef41c612237fdfbe642f7abbbcb1fbd4c8c6d3dbed369f420f +DIST fotema-rust-faces-43c0d5acd6f3f4d90c6487708f2e511a73bf7c9e.gh.tar.gz 839519 BLAKE2B 7ba344d55c5d108e63556dda32aaf60cfbd2b14a05e2965ca69e54e2aab578f6ba49f7a7b89d6c32cb5ace4b80f7a84247dcbb43a98d5d709895810798966b0b SHA512 aac99659e2d82d342f52b5860d9f1e284e1658fa9e0986b1c54a81cc33f6391535a2773d79defc6a7bf1e52591dc91d91a1ef3742c38e599baed79975b42de51 EBUILD fotema-1.14.4-r1.ebuild 1688 BLAKE2B 765c563f6e95998ef1f2557ae3044f01e12f1cf896cda117ab0c4cdfa9a1eabb8ee0f43c4e94aa4e52dd296922a6e3ca64e11c0fa1bb8062256ec0843eaee83e SHA512 ead13df6fcf02f163f97a8b13797208b048c5461bd9dd7183368da836ebb60c6ccf39f0cfdc334fc4ecfcbbabade7a4b10e512e89912e1047a7ddc05cf0edfbf +EBUILD fotema-1.18.3.ebuild 1742 BLAKE2B f49bd88fd84ab14995405a310c7e982b379ebea5a990cbaccd51acfbc88afa60997a959b84cab92683c6a649423d2c86ce8309416d350153277bbc3d0cfa87d5 SHA512 b25b847abb8262bf1c079f7402c28f7d94a398eea27bda78437e6c29fac3014a8bc754955d1295e01158652e85edc2c41617bf7f2f96524cef1a729ef0ef97ef +EBUILD fotema-1.19.0.ebuild 1742 BLAKE2B f49bd88fd84ab14995405a310c7e982b379ebea5a990cbaccd51acfbc88afa60997a959b84cab92683c6a649423d2c86ce8309416d350153277bbc3d0cfa87d5 SHA512 b25b847abb8262bf1c079f7402c28f7d94a398eea27bda78437e6c29fac3014a8bc754955d1295e01158652e85edc2c41617bf7f2f96524cef1a729ef0ef97ef MISC metadata.xml 326 BLAKE2B 4ae1a2fadba80e1886d73fb01d493fbbaabae2b97dbffaa10d46e0dbec690e3cb6f8e604675aeb9d0167e50d53cb3f1ffcc2d2ec6c6aed14c36acfe8d6bc31bb SHA512 1f8f3199af710dd344962c425a5af0936be2f52cb41123bee1aba249c356c5c0cb74f3ac6ff7f0fdf71a7e6f8552269abb20cda7d6685e3f21fd5e95436bf552 diff --git a/media-gfx/fotema/fotema-1.14.2-r2.ebuild b/media-gfx/fotema/fotema-1.18.3.ebuild index 34219ad68ea2..33bdf6a09676 100644 --- a/media-gfx/fotema/fotema-1.14.2-r2.ebuild +++ b/media-gfx/fotema/fotema-1.18.3.ebuild @@ -1,27 +1,47 @@ -# Copyright 2024 Gentoo Authors +# Copyright 2024-2025 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 +CRATES=" +" + +declare -A GIT_CRATES=( + [rust-faces]='https://github.com/blissd/fotema-rust-faces;43c0d5acd6f3f4d90c6487708f2e511a73bf7c9e;fotema-rust-faces-%commit%' +) + inherit cargo gnome2-utils meson xdg-utils +CRATE_P=${P} DESCRIPTION="Photo gallery for Linux" HOMEPAGE="https://github.com/blissd/fotema" SRC_URI=" - https://github.com/blissd/fotema/releases/download/v${PV}/${P}.tar.xz + https://github.com/blissd/fotema/archive/v${PV}.tar.gz + -> ${P}.gh.tar.gz + ${CARGO_CRATE_URIS} " +if [[ ${PKGBUMPING} != ${PVR} ]]; then + SRC_URI+=" + https://dev.gentoo.org/~mgorny/dist/${CRATE_P}-crates.tar.xz + " +fi # see LICENSES/ LICENSE=" CC-BY-2.0 CC-BY-4.0 CC-BY-NC-SA-4.0 CC-BY-SA-4.0 CC0-1.0 FDL-1.3+ GPL-3+ MIT " +# Dependent crate licenses +LICENSE+=" + Apache-2.0 Apache-2.0-with-LLVM-exceptions BSD-2 BSD CC0-1.0 ISC MIT + MPL-2.0 Unicode-3.0 WTFPL-2 ZLIB +" SLOT="0" KEYWORDS="~amd64" DEPEND=" >=dev-libs/glib-2.66:2 - >=gui-libs/gtk-4.0.0:4 + >=gui-libs/gtk-4.16:4 " # indirect deps via crates DEPEND+=" @@ -47,27 +67,9 @@ BDEPEND=" dev-libs/glib:2 " -ECARGO_VENDOR=${S}/vendor - QA_FLAGS_IGNORED="/usr/bin/fotema" -src_prepare() { - default - - # patch the dependency on flatpak-spawn out (sigh) - find "${S}"/{core,src} -name '*.rs' \ - -exec sed -i -e '/FlatpakSpawn/d' {} + || die -} - src_configure() { - cat >> "${ECARGO_HOME}/config.toml" <<-EOF || die - - [source."git+https://github.com/blissd/rust-faces.git?branch=patch"] - git = "https://github.com/blissd/rust-faces.git" - branch = "patch" - replace-with = "gentoo" - EOF - local emesonargs=( -Dprofile=$(usex debug development default) ) diff --git a/media-gfx/fotema/fotema-1.14.3-r1.ebuild b/media-gfx/fotema/fotema-1.19.0.ebuild index 34219ad68ea2..33bdf6a09676 100644 --- a/media-gfx/fotema/fotema-1.14.3-r1.ebuild +++ b/media-gfx/fotema/fotema-1.19.0.ebuild @@ -1,27 +1,47 @@ -# Copyright 2024 Gentoo Authors +# Copyright 2024-2025 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 +CRATES=" +" + +declare -A GIT_CRATES=( + [rust-faces]='https://github.com/blissd/fotema-rust-faces;43c0d5acd6f3f4d90c6487708f2e511a73bf7c9e;fotema-rust-faces-%commit%' +) + inherit cargo gnome2-utils meson xdg-utils +CRATE_P=${P} DESCRIPTION="Photo gallery for Linux" HOMEPAGE="https://github.com/blissd/fotema" SRC_URI=" - https://github.com/blissd/fotema/releases/download/v${PV}/${P}.tar.xz + https://github.com/blissd/fotema/archive/v${PV}.tar.gz + -> ${P}.gh.tar.gz + ${CARGO_CRATE_URIS} " +if [[ ${PKGBUMPING} != ${PVR} ]]; then + SRC_URI+=" + https://dev.gentoo.org/~mgorny/dist/${CRATE_P}-crates.tar.xz + " +fi # see LICENSES/ LICENSE=" CC-BY-2.0 CC-BY-4.0 CC-BY-NC-SA-4.0 CC-BY-SA-4.0 CC0-1.0 FDL-1.3+ GPL-3+ MIT " +# Dependent crate licenses +LICENSE+=" + Apache-2.0 Apache-2.0-with-LLVM-exceptions BSD-2 BSD CC0-1.0 ISC MIT + MPL-2.0 Unicode-3.0 WTFPL-2 ZLIB +" SLOT="0" KEYWORDS="~amd64" DEPEND=" >=dev-libs/glib-2.66:2 - >=gui-libs/gtk-4.0.0:4 + >=gui-libs/gtk-4.16:4 " # indirect deps via crates DEPEND+=" @@ -47,27 +67,9 @@ BDEPEND=" dev-libs/glib:2 " -ECARGO_VENDOR=${S}/vendor - QA_FLAGS_IGNORED="/usr/bin/fotema" -src_prepare() { - default - - # patch the dependency on flatpak-spawn out (sigh) - find "${S}"/{core,src} -name '*.rs' \ - -exec sed -i -e '/FlatpakSpawn/d' {} + || die -} - src_configure() { - cat >> "${ECARGO_HOME}/config.toml" <<-EOF || die - - [source."git+https://github.com/blissd/rust-faces.git?branch=patch"] - git = "https://github.com/blissd/rust-faces.git" - branch = "patch" - replace-with = "gentoo" - EOF - local emesonargs=( -Dprofile=$(usex debug development default) ) diff --git a/media-gfx/fotocx/Manifest b/media-gfx/fotocx/Manifest index 6518ba6eb222..7233902f66fa 100644 --- a/media-gfx/fotocx/Manifest +++ b/media-gfx/fotocx/Manifest @@ -2,7 +2,9 @@ AUX fotocx-24.20-documentation.patch 1373 BLAKE2B ac442711ae3eea89f1fa7a272004a0 DIST fotocx-24.50-source.tar.gz 16197289 BLAKE2B 468a3cd7ef2cee5a65d2a06283732e0994f9eeb823ed2fd02e319c68f7cb4686a33fbc61e85eaeb8bdd2c7455d1cebada49d0da6004007ad15333b1c39050768 SHA512 3f30b4efb43313980a1be8b92e66c8260484e10a3e50c5351d5462004fe6e5685ecd39be263fbd85bde495a5f1c539bd262124478516d8ddcd40420fa6de699e DIST fotocx-24.60-source.tar.gz 15771741 BLAKE2B 89ab212cdaeb414637ad0b3c9833b0caea6c805422e3fccdd027912f1d32ed141cedaeb5826212e36e5b40591e40c85816ecc5d3cff7915693e11e78b962b890 SHA512 6a04e0d749865000b67497b897f691a5882c0d63dda8c64ffe824215582db051f9cc0ca528490112f26db41a58f1673affe2e2e55c90dbb9e6f24cef77e4d5d6 DIST fotocx-24.70-source.tar.gz 15771508 BLAKE2B 74343ee57a0611b470794ae211ac4923744ab5619895234b50ccf00e88d9fe4f15aa94a83112acbf160a5e0c2befbef070da258500d17f240f8ccd467784c8e5 SHA512 1b7b160ede154a80251ffd6935b8a10767e70fcb87e2071899ee1a8228c8d816323d947a631320d525f6a37768c32bcc2a998a30ee2ac4e1769354a85a0f7f27 +DIST fotocx-25.0-source.tar.gz 15651266 BLAKE2B e6330541a3a0d341055a326b0ab4e3cc7b79bd80ea1cebab7303302e3ec519fb732f1604fe4fce87de4a9690f0da1399a700a5400c7596bf4810c03a469cd768 SHA512 3f4dfdfdd5190599d7294ff10364f382effab5ccc8dde712b467e925c5823cd03bf67a5e85cad2177a194e49431d21b846eed2648a45a8855e922006f69cd4d8 EBUILD fotocx-24.50.ebuild 2288 BLAKE2B ab74c6ef40f963dc17b665783e0bfb9b72db4d2d2aa3aedd3d9c11f01cbd6c9bc06edbfdb7e7b060b4a2e9967ef6cf500e568ee0b13f0e77ab4b772d550ec075 SHA512 e4908a812733f629ee52d4116e9784205517992fb18f419e5eb8013614f8ce054ba36f190117c48b0114d658d93c634556ed3b0ab98d28394bc165ee2b23ba0b EBUILD fotocx-24.60.ebuild 2290 BLAKE2B ac644a95e6ef44d930373708544b28a9d75b00358c3e77be36bfaac5e8140f86a3815778e39efce0cb0676bda2d0bfb3d0a3edf8d58494c0f4391dee155e251a SHA512 bfa7e82236c754371ff92bdfa4db7804bb685b26bee97852d38c6be8b3f43e95ecb1f925ca30629470bebeaf0aa9e0eafee54975cefab45aadce7371621f998a EBUILD fotocx-24.70.ebuild 2290 BLAKE2B ac644a95e6ef44d930373708544b28a9d75b00358c3e77be36bfaac5e8140f86a3815778e39efce0cb0676bda2d0bfb3d0a3edf8d58494c0f4391dee155e251a SHA512 bfa7e82236c754371ff92bdfa4db7804bb685b26bee97852d38c6be8b3f43e95ecb1f925ca30629470bebeaf0aa9e0eafee54975cefab45aadce7371621f998a +EBUILD fotocx-25.0.ebuild 2290 BLAKE2B 02e4140840a388521852b0d6e23c416eb0bba205a6d4b17e96ce801b7c0c039bbacd35bba2889deee625f6ab731a599a4cec67e444ae58d4d0467a27e3b3d81d SHA512 eb586d26c3224255b72934d8f0314b5d1b4653b8f77ed411dea33428c1efb13debd605e87c1cbec375ff95d4343b8c8ef1c014b152a30c93d217f69502e854e1 MISC metadata.xml 851 BLAKE2B a6c60b79fb5646c3bd7d6959d4a1b974ee714bf6ed64f205d9c00d684b3da94672005658336c1c5fcb903605d11c9a5607616151b2f6262f3173e15b8fc44655 SHA512 2794ae92afa076875c7f725969efdcf9cb84435d0ea033adc28f5860a69438b754f4d22b0db27dc7392683439e51b51ae581a6da450719276e8df51a2a306ad9 diff --git a/media-gfx/fotocx/fotocx-25.0.ebuild b/media-gfx/fotocx/fotocx-25.0.ebuild new file mode 100644 index 000000000000..8c904f825206 --- /dev/null +++ b/media-gfx/fotocx/fotocx-25.0.ebuild @@ -0,0 +1,79 @@ +# Copyright 1999-2025 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit optfeature xdg-utils + +DESCRIPTION="Program for improving image files made with a digital camera" +HOMEPAGE="https://kornelix.net/fotocx/fotocx.html" +SRC_URI="https://kornelix.net/downloads/downloads/${P}-source.tar.gz" +S="${WORKDIR}/${PN}" + +LICENSE="GPL-3+" +SLOT="0" +KEYWORDS="~amd64 ~arm64 ~x86" + +# For required dependencies read doc/README, for required tools read +# data/userguide [INSTALLATION]. xdg-open (x11-misc/xdg-utils) is an +# alternative to firefox and chromium-browser. `grep '"which ' * -R` +# is helpful to report some required tools run via the shell. + +DEPEND=" + media-libs/clutter + media-libs/clutter-gtk + media-libs/lcms:2 + media-libs/libjpeg-turbo:= + media-libs/libpng:= + media-libs/tiff:= + media-libs/libchamplain[gtk] + x11-libs/gtk+:3" +RDEPEND=" + ${DEPEND} + media-gfx/dcraw + media-libs/exiftool + x11-misc/xdg-utils +" + +PATCHES=( "${FILESDIR}/${PN}-24.20-documentation.patch" ) + +DOCS=() +HTML_DOCS=() + +src_prepare() { + sed -i -e "/^DOCDIR/ s/${PN}$/${PF}/" Makefile || die + sed -i -e "/^Icon/ s/\.png$//" ${PN}.desktop || die + default +} + +src_install() { + # For the Help menu items to work, *.html must be in /usr/share/doc/${PF}, + # and README, changelog, copyright, license, etc. must not be compressed. + emake DESTDIR="${D}" PREFIX="/usr" install + rm -f "${D}"/usr/share/doc/${PF}/*.man || die + docompress -x /usr/share/doc +} + +pkg_postinst() { + optfeature "HEIC & AVIF file support" media-libs/libheif + optfeature "additional RAW file support" media-gfx/rawtherapee + optfeature "additional RAW file support" media-gfx/darktable + optfeature "video thumbnails & playback" media-video/ffmpeg + optfeature "copying images to optical media" app-cdr/dvd+rw-tools + optfeature "WEBP file support" media-libs/libwebp + + elog + elog "Please read the Help > User Guide for details. The source location is" + elog "/usr/share/fotocx/data/userguide and after running fotocx a copy will" + elog "be placed at /home/<user>/.fotocx/userguide." + elog + elog "To play videos, in Tools > Preferences set 'Video File Play Command'." + elog + xdg_desktop_database_update + xdg_mimeinfo_database_update +} + +pkg_postrm() { + xdg_desktop_database_update + xdg_mimeinfo_database_update +} diff --git a/media-gfx/freecad/Manifest b/media-gfx/freecad/Manifest index 4cacccee8f44..5f4382d7d07d 100644 --- a/media-gfx/freecad/Manifest +++ b/media-gfx/freecad/Manifest @@ -1,10 +1,9 @@ AUX freecad-0.21.0-0001-Gentoo-specific-disable-ccache-usage.patch 381 BLAKE2B 2fe05252a4e7846006c5f4e679eae5416ede589b9a6ad5fc30425933bedf933bf586b711c2c7d6a59c3881d454ea76ca39e0556a5a31c3769032694f0858e264 SHA512 731befc86267de4e5fa2caf619a8ae9692580d7025ebc26a80f6744a3104263622c38d87d0d8a263a1a15ef1c1d78c9ff3351aa463a9943941bd7d96d946e516 -AUX freecad-1.0.0-Gentoo-specific-don-t-check-vcs.patch 350 BLAKE2B e1b612ac81f73546a3a7ae93e447aba6e3f28dea1292f5d308f567307c8c6146b8dfdcc1cef946c64991d41c41fa9c8949f56e2e8573833bad2a3826bab960ba SHA512 f96678dbfe13668a9f65131996ddc5eb2cbe80296b7eb2cc7d248e3ee1d991bea95568b0241da8387106812aac5762c330afb1d8c38b2281c3ee2600db120627 AUX freecad-1.0.0-r1-Gentoo-specific-don-t-check-vcs.patch 347 BLAKE2B 1c8119aec9408d77db8e09c34b86ba6a8da268509959ba5839b1ad0bb6c5b4023326055170836bf164d0d1e0a13a91ac601bde7eb6b184e4f9b1425e93ce9d38 SHA512 63bb73d0de1e12d3a34a2d055e3ddc2bdbdae5c1c67cd7c9a26047abfeda48943d793f30d190ae28f6f8e9ee7072f671badd4b8f3df29824b401bed0dbf90ed5 AUX freecad-9999-Gentoo-specific-don-t-check-vcs.patch 322 BLAKE2B 431b69d749c5639d2407207632ab48f1af36319290c1016985ed2431fe7a5314a5df8373a0a5235fcd08de5762dd090dd89b73846703348d5e2e0fac7c9c7048 SHA512 f67b3bfa013a497d0372649d9339665dd5c48b2dd00814e55ee6fcad6580a8219139f6c1931f2da5e210d181205af55e19b91a4d08b4d0dc7d45fcef358eb0ed AUX freecad-9999-tests-src-Qt-only-build-test-for-BUILD_GUI-ON.patch 469 BLAKE2B 23e56fbc49b3c3d5ede85e6ec15d26c88c93590fce105e0b75e8b0bd3fee125c500cd59d8db0144c610edb371df318396e056333ec7a411f7647b38d18006efc SHA512 82737af95603ff1f667bf49ee43b85b411eeeb5fd9b577ad7fca6e02bcbfda5c3bbb6c70386e5f69d2181d6226574f82cb68b7e66dfe8f4bb14d946f594582cf DIST freecad-1.0.0.tar.gz 91599325 BLAKE2B 65540eb42e7d508456c9edbf2122e0f288708c33e6d00d3c8c45550e7a614f658f91ba25978a66819bc094b7138aab72a89c0172d0841be1ff798ade5a8bdc64 SHA512 afc1079ea04fd5bb8135f8ad1012d9e4e05c8839dd0a4e00253eada58fe018f445c1200d1ca7ac9f268644c946cbf55b7b313dc3d6bd010f9da3a3334103b7db -EBUILD freecad-1.0.0-r1.ebuild 8790 BLAKE2B c54aefe3eab6b32bb372b0ef40a821e7bb37534fd8b97654d91d2939ea87c5c47242333ffd06532208dea981438ec9795a96c7b63a27162d2601a18a56c0cbf1 SHA512 e7b8918fe4c37a875761da72c49b5235b44ab1e04468a9b929ae1e6cafc3876793d6bf222c80f7e89b750b470ca6e56367293108e5da532be6f22cce77be0a7a -EBUILD freecad-1.0.0-r2.ebuild 8779 BLAKE2B 5c45f071879b51f5d750737b3882f7ee0744236f2c3c78b8975de0be53ef4a8f990d0f7e80c3c10db0c1ad45d6c9a07b873e92ddc9374a61d345b25c493dc507 SHA512 0d66b4121cd7d9bbc815c88d491646b04ce91e0023a36b90ad3a88ddab09256870dad6bb7a09777610a20d6d85ce4268ff4e9d5bd6bd54be1a958a880a041c16 -EBUILD freecad-9999.ebuild 8691 BLAKE2B a29795687e54446fa908ee5273b8723c5a4848ae29edda76d4466a1fc9a2b50503c95beaac6a15a14ee43fd1b28be8e1ba9e0aa5b76532667e3d318e59a1c45f SHA512 fb0232a5992141eac4ef96507af2bb31ff30db2f1ef877ffd11e44598de85ebcd0ca8af629c592d3224d75cc6be5caa4b4cc89281527be4a8f381dcf46b46213 -MISC metadata.xml 2907 BLAKE2B caf71b22b1a242778cd62fef19796e442500ec16850d38e07c1773f773b4d8ca3a063ccb13aa044ae6c4efc3e3c9ee8ba5b03465ccc4b9758c8f08e75675f8e4 SHA512 9d336ec1b1f307ca510b470ba362144ad8ca579de2968483661b7d8868a0dd0f6cd18090dbdf1d0f7c98a746e39f43f2e25422c1dfec4d995c572ac6083272ea +EBUILD freecad-1.0.0-r2.ebuild 8778 BLAKE2B 4ebe1a3df409e68328d89dd95120441324a5587a9eb85e110de83c70c161688cc5dfd33eea393ee6b70fb2a561048d78b3b4ac7c0bbd7f060f88edad30fce183 SHA512 d86c72823c9a61fef30fc58e8adf5c8c7ee45d4de0c8c4959c2f785b6d1cd48f1ecee1b6d38f4af34077683e5046292676166df57bc6fe14e76920ec8db76f57 +EBUILD freecad-1.0.0-r3.ebuild 8865 BLAKE2B 74a81c59c1cc2ff3095519e4c1e089015f027f7db75ae300eebdeafdbe09d8c66b2f16ee479b421f165281fdd1d6e09587c8ca60bc11f74e19d02434d37d1ab4 SHA512 820f293d0bcd201fd1dd90a5e8ac7cd3556c4e9b7829de4c3b34c10a4f3ebc7e5a0b5eee9a3f1dfcc99007e6c5ee67a794487658a6f48a12522dbee32c5a196f +EBUILD freecad-9999.ebuild 8861 BLAKE2B dfd74cad390d926b078d72fe35d06aafc9575eb2ce3b065f4f1144152988def506e2761a9095a1cc6e69d5b20a91d5ec95a2cd56bafd477c1c4163ea21200928 SHA512 f0dc974806a3b1ba5248eaf26cd23c9bc578b22b6ae44856ed1deef2b51d92a3822e44023400f972169d7092ebaddfc1961e4b99f5360d1c0bb66dcdfa61a23e +MISC metadata.xml 3060 BLAKE2B 7ad73261d4457110b7fbfa4a9304fe0e9fe7461bb01f49960b22c5a6c8433e8af8d416d0d28850b25c29158fd73847b2f0302cac73102c83019da00a13cc6786 SHA512 5b5e7b44f22b7fadc8ee79adb59308f1c5e398438f8304bb78829b73a65fea145a71a7d8cf1c5b0a9193455f1570fe57fdbd8aaa49bea6ee3a121faa23258515 diff --git a/media-gfx/freecad/files/freecad-1.0.0-Gentoo-specific-don-t-check-vcs.patch b/media-gfx/freecad/files/freecad-1.0.0-Gentoo-specific-don-t-check-vcs.patch deleted file mode 100644 index 3c8b61ab56a4..000000000000 --- a/media-gfx/freecad/files/freecad-1.0.0-Gentoo-specific-don-t-check-vcs.patch +++ /dev/null @@ -1,15 +0,0 @@ ---- a/src/Tools/SubWCRev.py
-+++ b/src/Tools/SubWCRev.py
-@@ -509,12 +509,6 @@ def main():
- bindir = a
-
- vcs = [
-- GitControl(),
-- DebianGitHub(),
-- BazaarControl(),
-- Subversion(),
-- MercurialControl(),
-- DebianChangelog(),
- UnknownControl(),
- ]
- for i in vcs:
diff --git a/media-gfx/freecad/freecad-1.0.0-r2.ebuild b/media-gfx/freecad/freecad-1.0.0-r2.ebuild index 99df349496ff..7812856f8a98 100644 --- a/media-gfx/freecad/freecad-1.0.0-r2.ebuild +++ b/media-gfx/freecad/freecad-1.0.0-r2.ebuild @@ -18,7 +18,7 @@ if [[ ${PV} == *9999* ]]; then S="${WORKDIR}/freecad-${PV}" else SRC_URI="https://github.com/${MY_PN}/${MY_PN}/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz" - KEYWORDS="~amd64" + KEYWORDS="amd64" S="${WORKDIR}/FreeCAD-${PV}" fi diff --git a/media-gfx/freecad/freecad-1.0.0-r1.ebuild b/media-gfx/freecad/freecad-1.0.0-r3.ebuild index 5e1a1fb2945b..d90bcdea5bf9 100644 --- a/media-gfx/freecad/freecad-1.0.0-r1.ebuild +++ b/media-gfx/freecad/freecad-1.0.0-r3.ebuild @@ -18,7 +18,7 @@ if [[ ${PV} == *9999* ]]; then S="${WORKDIR}/freecad-${PV}" else SRC_URI="https://github.com/${MY_PN}/${MY_PN}/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz" - KEYWORDS="amd64" + KEYWORDS="~amd64" S="${WORKDIR}/FreeCAD-${PV}" fi @@ -31,7 +31,7 @@ IUSE="debug designer +gui netgen pcl +smesh spacenav test X" # cMake/FreeCAD_Helpers/InitializeFreeCADBuildOptions.cmake # To get their dependencies: # 'grep REQUIRES_MODS cMake/FreeCAD_Helpers/CheckInterModuleDependencies.cmake' -IUSE+=" addonmgr +bim cam cloud fem idf inspection +mesh openscad points reverse robot surface +techdraw" +IUSE+=" addonmgr assembly +bim cam cloud fem idf inspection +mesh openscad points reverse robot surface +techdraw" REQUIRED_USE=" ${PYTHON_REQUIRED_USE} @@ -66,6 +66,7 @@ RDEPEND=" dev-python/pybind11[${PYTHON_USEDEP}] dev-python/pyyaml[${PYTHON_USEDEP}] ') + assembly? ( sci-libs/ondselsolver ) cloud? ( dev-libs/openssl:= net-misc/curl @@ -82,8 +83,8 @@ RDEPEND=" $(python_gen_cond_dep ' dev-python/matplotlib[${PYTHON_USEDEP}] >=dev-python/pivy-0.6.5[${PYTHON_USEDEP}] - <dev-python/pyside6-6.8.0:=[designer,gui,svg,${PYTHON_USEDEP}] - <dev-python/shiboken6-6.8.0:=[${PYTHON_USEDEP}] + dev-python/pyside6:=[uitools(-),gui,svg,${PYTHON_USEDEP}] + dev-python/shiboken6:=[${PYTHON_USEDEP}] ' ) virtual/glu virtual/opengl @@ -148,7 +149,7 @@ src_configure() { # Modules -DBUILD_ADDONMGR=$(usex addonmgr) - -DBUILD_ASSEMBLY=OFF # Requires OndselSolver + -DBUILD_ASSEMBLY=$(usex assembly) -DBUILD_BIM=$(usex bim) -DBUILD_CAM=$(usex cam) -DBUILD_CLOUD=$(usex cloud) @@ -191,6 +192,7 @@ src_configure() { -DFREECAD_BUILD_DEBIAN=OFF + -DFREECAD_USE_EXTERNAL_ONDSELSOLVER=$(usex assembly) -DFREECAD_USE_EXTERNAL_SMESH=OFF # no package in Gentoo -DFREECAD_USE_EXTERNAL_ZIPIOS=OFF # doesn't work yet, also no package in Gentoo tree -DFREECAD_USE_FREETYPE=ON diff --git a/media-gfx/freecad/freecad-9999.ebuild b/media-gfx/freecad/freecad-9999.ebuild index 62ffcbe957a1..ed5c07ceb995 100644 --- a/media-gfx/freecad/freecad-9999.ebuild +++ b/media-gfx/freecad/freecad-9999.ebuild @@ -26,17 +26,18 @@ fi # examples are licensed CC-BY-SA (without note of specific version) LICENSE="LGPL-2 CC-BY-SA-4.0" SLOT="0" -IUSE="debug designer +gui netgen pcl smesh spacenav test X" +IUSE="debug designer +gui netgen pcl +smesh spacenav test X" # Modules are found in src/Mod/ and their options defined in: # cMake/FreeCAD_Helpers/InitializeFreeCADBuildOptions.cmake # To get their dependencies: # 'grep REQUIRES_MODS cMake/FreeCAD_Helpers/CheckInterModuleDependencies.cmake' -IUSE+=" addonmgr bim cam cloud fem idf inspection mesh openscad points reverse robot surface +techdraw" +IUSE+=" addonmgr assembly +bim cam cloud fem idf inspection +mesh openscad points reverse robot surface +techdraw" REQUIRED_USE=" ${PYTHON_REQUIRED_USE} bim? ( mesh ) cam? ( mesh ) + gui? ( bim ) designer? ( gui ) fem? ( smesh ) inspection? ( points ) @@ -45,6 +46,7 @@ REQUIRED_USE=" reverse? ( mesh points ) test? ( techdraw ) " +# Draft Workbench needs BIM RESTRICT="!test? ( test )" @@ -64,6 +66,7 @@ RDEPEND=" dev-python/pybind11[${PYTHON_USEDEP}] dev-python/pyyaml[${PYTHON_USEDEP}] ') + assembly? ( sci-libs/ondselsolver ) cloud? ( dev-libs/openssl:= net-misc/curl @@ -146,12 +149,12 @@ src_configure() { # Modules -DBUILD_ADDONMGR=$(usex addonmgr) - -DBUILD_ASSEMBLY=OFF # Requires OndselSolver + -DBUILD_ASSEMBLY=$(usex assembly) -DBUILD_BIM=$(usex bim) -DBUILD_CAM=$(usex cam) -DBUILD_CLOUD=$(usex cloud) -DBUILD_DRAFT=ON - -DBUILD_DRAWING=OFF # Unmaintained and not ported to Qt 6 + # see below for DRAWING -DBUILD_FEM=$(usex fem) -DBUILD_FEM_NETGEN=$(usex fem $(usex netgen)) -DBUILD_FLAT_MESH=$(usex mesh) # a submodule of MeshPart @@ -189,6 +192,7 @@ src_configure() { -DFREECAD_BUILD_DEBIAN=OFF + -DFREECAD_USE_EXTERNAL_ONDSELSOLVER=$(usex assembly) -DFREECAD_USE_EXTERNAL_SMESH=OFF # no package in Gentoo -DFREECAD_USE_EXTERNAL_ZIPIOS=OFF # doesn't work yet, also no package in Gentoo tree -DFREECAD_USE_FREETYPE=ON @@ -228,6 +232,8 @@ src_configure() { -DQt6Core_MOC_EXECUTABLE="$(qt6_get_bindir)/moc" -DQt6Core_RCC_EXECUTABLE="$(qt6_get_bindir)/rcc" -DBUILD_QT5=OFF + # Drawing module unmaintained and not ported to qt6 + -DBUILD_DRAWING=OFF ) fi diff --git a/media-gfx/freecad/metadata.xml b/media-gfx/freecad/metadata.xml index 35a605b4e6ef..7cc8bc2a327b 100644 --- a/media-gfx/freecad/metadata.xml +++ b/media-gfx/freecad/metadata.xml @@ -14,6 +14,10 @@ Build the addon manager module for automatic handling of 3rd party addons </flag> + <flag name="assembly"> + Build the assembly module to create 3D models composed of several + distinguishable parts as a conformed machine. + </flag> <flag name="bim"> Build the BIM module and workbench </flag> diff --git a/media-gfx/geeqie/Manifest b/media-gfx/geeqie/Manifest index 6cf49749027e..383d65026455 100644 --- a/media-gfx/geeqie/Manifest +++ b/media-gfx/geeqie/Manifest @@ -5,6 +5,6 @@ DIST geeqie-2.4.tar.xz 2178572 BLAKE2B df24f0b5d443cbd2033c0b382fe0d846c9073e896 DIST geeqie-2.5-docs.tar.xz 395716 BLAKE2B 177130f3a5afbf5791372fc2550f4443456a2bb3aad755774cf337362c38b1b20183eda311e245493a0ad9b8975747721ec5639d46135a9ee3f27318db360126 SHA512 0b8f6b165ec0feb38c2479054b1fa079bd08f053cf439cf19e0419f11b1fa3ba533adbb781022f401f599f9d83aca44e8613d63b82b6848f14fc7076736b9d1a DIST geeqie-2.5.tar.xz 2224492 BLAKE2B 911ea2e338c470255c70e83257b693c51b1171ed24f4b737d291cfd5ff20d8b7b39ba69e46f831ede33ce30d41945bb3de754b2a1c245dcff98f16633f31e562 SHA512 c1be6c5d9f7f7609dfab97320d79a4830eb866f000c3c52ea8ab2b69a1ba793b322dbab3f614572e1d6fc815d64bfeaf3ddd39dd633a5c87d7008b6afe35be21 EBUILD geeqie-2.4.ebuild 3209 BLAKE2B 16b1aae2c54429c4e1af9c2f5be74cfdbb5fcb239fffc1f75117b1e7e4676e6a50ce012d59fa7586802acc56440661f83b7fc8c712d1248a350a9d7b8719478c SHA512 f82daf07a212d749746d9f4c062ed35697a715f07cf3a39b6c885600feaf90bc7202720f5f8460c2e57b22b955b77820a88f3841ab7534b7aeca3b1add7df238 -EBUILD geeqie-2.5.ebuild 3211 BLAKE2B fafc9c9115f8328c78ab1d09e113315cc94c9fe4a864573a2ad3b8c0d6a3f96255fc721b42cc180c2e7adc4117f0dc29a8af40d555e0a59ce01fbeb8c4e351ac SHA512 513706a9b1ffde05f317fadeb785fbc75f124e7df47826c7eeff094b900539624f1f74f85dbe361b3c9bb0f4be71ed70f60b26a0a63022afa04062f85a688037 +EBUILD geeqie-2.5.ebuild 3209 BLAKE2B 19e8467017534a735edf2e8ec32ec7e0c6cf23ca3a1374775eca33375238fe4691db17126289478da1448e63ffe9828c083cf89b424e650e1f52cefcb14a176c SHA512 e215d44ab4800d8beea314e18b87d5dd5fa3963bbea3e0a8e61b5bfdb9f3d4cefc24e9433361c3209d943cdc8742a4a68a28356cb4a064207d32686a6fc22d40 EBUILD geeqie-9999.ebuild 2924 BLAKE2B f39a8c772b143a21a168778d5a6b465c8459218019c4724f42b9e2d101452f371b3b5fb8e297a60701c62d3bfbf9ee27bb27622c611ab6542e3b2067dcb80d62 SHA512 5417a817179e1bbc1d3b51ae39056b5d3a8d94149b0a7bdf812202baaac726065e9399f23f5dcc13e087f831482f9eab7c463782bce8ef3c2c403850986f31e9 MISC metadata.xml 816 BLAKE2B ed50c576f068626d95d99899b17508b7c48567707ff020988dc611be9b482893f008f904ce460565ed0f263c76f2e274640f6e662f827d0879de5a59a93e8c3b SHA512 45458e31201d1baee61f48fe452c3577bcb74fea6569d1afdd8787aff6714d3400f501d1dc6b3de31ea1d5151326d48593f5bb219ec5cfed603cfe8835690dcd diff --git a/media-gfx/geeqie/geeqie-2.5.ebuild b/media-gfx/geeqie/geeqie-2.5.ebuild index 8b572c0532f3..c5d6199a70b2 100644 --- a/media-gfx/geeqie/geeqie-2.5.ebuild +++ b/media-gfx/geeqie/geeqie-2.5.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 @@ -17,7 +17,7 @@ SRC_URI="https://github.com/BestImageViewer/${PN}/releases/download/v${PV}/${P}. LICENSE="GPL-2" SLOT="0" -KEYWORDS="~amd64 ~arm64 ~ppc ~x86" +KEYWORDS="amd64 ~arm64 ~ppc x86" IUSE="debug djvu exif ffmpegthumbnailer heif jpeg jpeg2k jpegxl lcms lua map pdf raw spell tiff webp xmp zip" RDEPEND="gnome-extra/zenity diff --git a/media-gfx/gimp/Manifest b/media-gfx/gimp/Manifest index 32f2fb2801ba..14aafcfd8339 100644 --- a/media-gfx/gimp/Manifest +++ b/media-gfx/gimp/Manifest @@ -1,21 +1,14 @@ AUX gimp-2.10.36_c99_metadata.patch 1087 BLAKE2B 4f984da3c38b66afdbffab7ed0ee0a7f09475b05dd78f3a8fd8636fb61ecdb697f98b94723c6837e80912ab6d82be468aecb459a817c9393e17d4ac0f89bd010 SHA512 d4294b4320774d3094b0f8e0a5ca0942a0fc2038f466afcd2e341d0efe3653eebc6ddd328c5165c6c0eff4f1a3d47cdca01ea52819f9596ade8878ce2c4d5374 AUX gimp-2.10.36_c99_tiff.patch 966 BLAKE2B 60abcfa47f10ff3c937475550ef6e5d1c6151347bfc5332268a3f5a3d51e5663a131b44fc9169c6e95036aee785d2edec14718495e1b53c868b17fe58600ade1 SHA512 e3c4c0179528d29a6c082536eab2977b7fa624235978b880d0f8aa36bced2408af8f91931628352b82fd0c198f0935949363d78402879aaf74a19e5eb1e9b8d3 -AUX gimp-2.10.36_fix_strict-aliasing.patch 1077 BLAKE2B 02bfb2b0836a4c8e31caac441c836e652edfce0570648f6db0232e34687621c68fab2b0ecd33b1552c5f9b269beaf41f71b0a6b9a047d148f37eece006ee3fe7 SHA512 e71a70fceb6d7104017306169acf6d5f28061e95498d0b0d21e218b060fd84649b5ac0d3c524f69033cc1d8ea95e7e8e0b91c2367b3b3e8889acd73611f5f3f5 AUX gimp-2.10_fix_configure_GCC13_implicit_function_declarations.patch 583 BLAKE2B 5c7feb3e666b496ea718d63cd3e8d415604397d0e78c95e4449812b48d7548c3b81d194c955555d7ad516c46012826475191786486140e0516c91bac56df027c SHA512 d90e6bc41bc91114ee8068e2d2cdd8c83e707b30eba876aa7b369c44d0ee125953b387a8f041dd5cb521d0eb16824bb8496a9751595c75c5a76b4cc0b3251cc3 AUX gimp-2.10_fix_musl_backtrace_backend_switch.patch 535 BLAKE2B 374433568330a4b5167e6f32bd9ecbe44e9ceb4004cce9504586b73dc31c7613d2766ae5615d74b2a51a05ff3592add2e7585b7d63eb43b219ebe6b37193edca SHA512 df0b9b357d085463ac3b791b6131dabfdd33d12e7b77f45f496379d08da1b0e8ae787b9b4b260ec221c22e3302d54b17493175db55514ec3e705782fdb80ec18 AUX gimp-2.10_fix_test-appdata.patch 902 BLAKE2B 2b1a131d874d65422d8bdd44732b9843d89a570a1ea3c058cdb2a424a7791c686aa0e2ae2a0b472f333f2465f6e1a26750a532e9003933c5dffa1af32343c1dc SHA512 2983e8572f5e8113c9e2f564d31c1a5fe7e11ef273c50d2be739089124c6ec1a457da28222020bbd6015b2cbbcbf403b88d8660b9b35241800deb4fb3ad79067 AUX gimp-2.10_libheif-1.18_unconditional_compat.patch 820 BLAKE2B 4e75ebc639bc6f985776861de119b85dd7bde2be3a2e385cb6c61bd6e44b29d80c9ff84736a7e518b76f092c72295c1bb7e2ed58eccbd52a54b7bc4c769b12e6 SHA512 4233e2d8c50222b4700e9f7c6b2e5a41e1d5b685899f4cb0db61aa96b9eba4a0538fcc74fe9fe77265932062ea4dc94e13036d381a96338a470bf00b5a53b437 -DIST gimp-2.10.34.tar.bz2 31405329 BLAKE2B 0b2d3a81abf89684bb90e2101896db3479a25c5da76738543dba8d0378e64608eee9aeb24888e15f5e347f72fa1df3e9b82aa27e503ee61d1c4d45d44fa7bddc SHA512 4802ce3758daba868570f1ac97a3f1cb41e1130fcc6376f9bf4c999441f8fd25937aa71b6f726d82d7c780f4153b11d2595bb76bc2356a42266909fbcc0bd34a -DIST gimp-2.10.36.tar.bz2 31532334 BLAKE2B d033cd1407df3399b5968b7e3f7838d288143080b516476a5dd46599b6a84ac2efca591521368cef7a1c3d9935b45ed3262fb469e1ae36ccf60a1199f5cfa44d SHA512 dbe6152ea6ff99cca59bbf2c88a64fb4ff6b529d98ace7723eadf5dfb0e10d9cbaf2de1e0d5251e9ecf9abca73da9ae1a501f229997802fd4077fb9594f4ba66 DIST gimp-2.10.38.tar.bz2 31698453 BLAKE2B 58c29e3e00d873e69a5e5f4e9c3ff4d868ccfb11914570306ef12c54ca7d3ef89a62d8c71fac1f2d1f426ac615dc4caf7a7260351c00301dce2b1aa4193bab6d SHA512 343bf1c3bd14bf8e7c7af79c05920faca213da68549127c1d8af53e2e872e55aeaf39a3cfcf578183a34fdc4f98e1c859be63956b0611067186eefd1fdee2aaa -DIST gimp-2.99.18.tar.xz 25418968 BLAKE2B ccb76bb5c375925d4d71505f3e1546f05ba0e20533859b1b6250a4d9054efb6bec4927a5e0c525272fa24d5a6bdf4fb7881d60a1d34b1210ee38b90e661ef707 SHA512 151ccd0322601e76ed0198b40832ab0b6c138428f2e75806dd558e29c9b3437d9226a243142bf4a86113fa5ea4f5965b99cf7cd0ab0ecb7bdfc48036de35a9c6 DIST gimp-3.0.0-RC1.tar.xz 28863948 BLAKE2B d9e1ae51809d1c8e5084a9e85b660cd0f3a763f8ee220075fe73f512940e9637d50675a06d0dca88c501571a26404cb6b53c9573348002586143c52736dfa196 SHA512 844896976b66b0498ba9149c7176f5442b2305fd3dc51fce7ff92eb05b7b0f86f16d0bd16e50a3c43ab2c6b9be4e610dbbfc50a99c84a62a4de80a6937d43985 -EBUILD gimp-2.10.34-r3.ebuild 6033 BLAKE2B 1a0c57ea0892099726875dfcdeb8b75d56e6101ccc63cf6006a8d56acc55f9d8bf4edf93f6a4c1e5de3c89b0951fecb2c06cc72ea14fcbf25ccef438df7bb901 SHA512 bdc9794b0d82172436b3b164e27d2de8697f33b9bbb8ae907dc9034bc8c6550075093d515cef82d900302745eaae856d22ead356ff1a55c49f7a2b758c6250c0 -EBUILD gimp-2.10.36-r3.ebuild 6005 BLAKE2B 2df114a4355ef257bd4b88b34b578883b044327c78282aa6239d082f382128cd35adea29af326e2288cd9110100b0e2fccf8c4d3f581e4bb2166dfb4fc188ca6 SHA512 487f909ee8c34a12d662b673b40551b8c80e0a340ce663c8937b216b61c3536ff3b85337b99ca85b33b238c3cece26f875e7195f381941f1f0a472a9c61c32f2 -EBUILD gimp-2.10.36-r4.ebuild 6152 BLAKE2B b0013afb683f05ea7b5dfd1e9ced41bafb6f394a7330b51932dd9021e53bf173ebdc1000062c6d2f8cd256877819805cf70e302b3741f9ec960286ad193c3821 SHA512 ed75fb99737b0e239ba569985cde4981e82a87b6e16286886f50dbe136293a084c872dfef99d086a29df6d940e3154cf9f6d108d60565ae767d3a2ec1e745bff +DIST gimp-3.0.0-RC2.tar.xz 26980968 BLAKE2B 56b98a7863df22cf81015a9da5d7535cfef5a154c47418b1b6c6212cc76423e0769a4aa8d76714d2eb22595b1f6e2c623e4444e35675db5fe7e40c8820fe71dd SHA512 c0a6e096d954f3048cb68fe4ff71dd2f49c802f800014ab8a3089a0e097e7d6f595e5716230c06e7edfddba948f0d01da14800935aa6ceb9dc2e12fb7f19d7e6 EBUILD gimp-2.10.38-r1.ebuild 6261 BLAKE2B 4256b91c88e2d677d894ab6ba90f387713320574cf404e3e794c0ff390e4d4feb16e27534530994f0083a051e5dba5e404b1ac357e78fcdcef3cb624d195890f SHA512 a86bea4cb6d8cabbf981d42a1ca220c0befffb1e0dd8785708087b1e2c62c3bea95386be2abbb22192d65ee90bfec60910f5279f734771742e5b955c4f643655 -EBUILD gimp-2.99.18-r1.ebuild 7253 BLAKE2B 0c95a252589be3d821a73b7651e866207928cee724d16e934f585bd9080869620d1b20546672ddf229ef59bd21f54d5906da19bf2bafab76d479b05b3adfc403 SHA512 042f9a4d904d2be0bedbb6dde123a7d12f8c43b7502990e2a0c6884c287522db8e0bfeebc0fa621a54992739482db4a8b8f3675ba7f5af33999ea4c390f6bf37 -EBUILD gimp-2.99.18-r2.ebuild 7334 BLAKE2B 48ac3cbc7462d69b6bb36611f72d0d1dc26dee5ca4764c8acf1e65c434fc106aa6ea6f05a10e81b62f8608e109cfae52be6d2e84f46e7c9e5e2443db5a92ebbc SHA512 084e3039ff16d1e6eccb02ca01beee6d702dbac2748ba87e9550949766454cf810357c06c978c5fcb35dc10413aa00a5eee69355cc90fe2103749e0f83a37296 EBUILD gimp-3.0.0_rc1.ebuild 7043 BLAKE2B bec2a409e288e90a58214febedf99b113bfc0c77412a823aef85a683b129ddc11876e8a3457d27380be780dc97ddd193be0b7341ecfce96aafceb77997575b2a SHA512 91396c43aa2beb6304a56cc84f9c088da4416a7b34e1d70b00f8fcb3c25eac22b96bdaac0c1523ae929014a5be17cd221cec5d56bd9dcf43e0f854222e5620a6 +EBUILD gimp-3.0.0_rc2.ebuild 7043 BLAKE2B 1d0051787aae0af6ee02665af6a15a3226b62fd1b6b05215f0fd9b245edf0a3fbcaf105427538a47e76221228cc19fde010b3310d5360d0a3d45c09c86458e02 SHA512 7bc058940dfccaedaa0f9e98be2617b9eb709cac0cfc94a22a3134c0972b98ce61e0c647a770be96074a7d0f1cbbe95655e14509e24f4a92a688086f83c262cb EBUILD gimp-9999.ebuild 7259 BLAKE2B 1ccbd31727bac846d9bef5d3221a859cccc2069e98831bb8aeb03b6f9c52f6d7d13e8ce57db087a6082754acbdf4f3ae25f46d53232bcb7baa5303d8c2b17224 SHA512 149dbbb73e0116fc9694bbb5659033156f585fe9c8208939ab6d391c99332cafb5b2bdb59498df729b9024c05a14b1243aa90a07fb3192131262e7a425c10c7c MISC metadata.xml 655 BLAKE2B f6628a2c5edb90b16db0f59af05446a3f31316f5558ece238d30c9350632713cf2db3d315c90b31229596659ec20859c17fde6b051f9ab8f8fe34d64902dad57 SHA512 712a259ae41d9052bde0761087928685b9b66a132db3f3b49121241d87728f51bf31a00541aa385bd03b57a2e2a03a0176356045dd4752485a8dca2bd61c5886 diff --git a/media-gfx/gimp/files/gimp-2.10.36_fix_strict-aliasing.patch b/media-gfx/gimp/files/gimp-2.10.36_fix_strict-aliasing.patch deleted file mode 100644 index 2acf31361278..000000000000 --- a/media-gfx/gimp/files/gimp-2.10.36_fix_strict-aliasing.patch +++ /dev/null @@ -1,34 +0,0 @@ -Gentoo issue: https://bugs.gentoo.org/917497 -Upstream issue: https://gitlab.gnome.org/GNOME/gimp/-/issues/10359 -Upstream patch: - -From b45a304df4f038eccb64e098f3643ae35d8f3e77 Mon Sep 17 00:00:00 2001 -From: Alx Sa <cmyk.student@gmail.com> -Date: Sun, 19 Nov 2023 13:54:00 +0000 -Subject: [PATCH] core: Fix strict-aliasing error on ASE load - -Resolves #10359 - -When compiled with -Werror=strict-aliasing, the build fails -on this line due to converting pointer datatypes. -This patch switches to using memcpy () instead. ---- - app/core/gimppalette-load.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/app/core/gimppalette-load.c b/app/core/gimppalette-load.c -index 7605b92fcfb..e9813ebb168 100644 ---- a/app/core/gimppalette-load.c -+++ b/app/core/gimppalette-load.c -@@ -1095,7 +1095,7 @@ gimp_palette_load_ase (GimpContext *context, - - /* Convert 4 bytes to a 32bit float value */ - tmp = GINT32_FROM_BE (tmp); -- pixels[j] = *(gfloat *) &tmp; -+ memcpy (&pixels[j], &tmp, 4); - } - - if (! valid_color) --- -GitLab - diff --git a/media-gfx/gimp/gimp-2.10.34-r3.ebuild b/media-gfx/gimp/gimp-2.10.34-r3.ebuild deleted file mode 100644 index d1af397feaf9..000000000000 --- a/media-gfx/gimp/gimp-2.10.34-r3.ebuild +++ /dev/null @@ -1,219 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 -GNOME2_EAUTORECONF=yes -WANT_AUTOMAKE= - -inherit autotools gnome2 toolchain-funcs virtualx - -DESCRIPTION="GNU Image Manipulation Program" -HOMEPAGE="https://www.gimp.org/" -SRC_URI="mirror://gimp/v$(ver_cut 1-2)/${P}.tar.bz2" -LICENSE="GPL-3+ LGPL-3+" -SLOT="0/2" -KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~loong ~ppc ppc64 ~riscv x86" - -IUSE="aalib alsa aqua debug doc gnome heif jpeg2k jpegxl mng openexr postscript udev unwind vector-icons webp wmf xpm cpu_flags_ppc_altivec cpu_flags_x86_mmx cpu_flags_x86_sse" - -RESTRICT="!test? ( test )" - -COMMON_DEPEND=" - >=app-accessibility/at-spi2-core-2.46.0 - >=app-text/poppler-0.50[cairo] - >=app-text/poppler-data-0.4.7 - >=dev-libs/glib-2.56.2:2 - >=dev-libs/json-glib-1.2.6 - dev-libs/libxml2:2 - dev-libs/libxslt - >=gnome-base/librsvg-2.40.6:2 - >=media-gfx/mypaint-brushes-2.0.2:= - >=media-libs/babl-0.1.98 - >=media-libs/fontconfig-2.12.4 - >=media-libs/freetype-2.1.7 - >=media-libs/gegl-0.4.40:0.4[cairo] - >=media-libs/gexiv2-0.10.6 - >=media-libs/harfbuzz-0.9.19:= - >=media-libs/lcms-2.8:2 - media-libs/libjpeg-turbo:= - >=media-libs/libmypaint-1.6.1:= - >=media-libs/libpng-1.6.25:0= - >=media-libs/tiff-3.5.7:= - net-libs/glib-networking[ssl] - sys-libs/zlib - >=x11-libs/cairo-1.12.2 - >=x11-libs/gdk-pixbuf-2.31:2 - >=x11-libs/gtk+-2.24.32:2 - x11-libs/libXcursor - >=x11-libs/pango-1.29.4 - aalib? ( media-libs/aalib ) - alsa? ( >=media-libs/alsa-lib-1.0.0 ) - aqua? ( >=x11-libs/gtk-mac-integration-2.0.0 ) - heif? ( >=media-libs/libheif-1.9.1:= ) - jpeg2k? ( >=media-libs/openjpeg-2.1.0:2= ) - jpegxl? ( >=media-libs/libjxl-0.7.0:= ) - mng? ( media-libs/libmng:= ) - openexr? ( >=media-libs/openexr-1.6.1:= ) - postscript? ( app-text/ghostscript-gpl:= ) - udev? ( dev-libs/libgudev:= ) - unwind? ( >=sys-libs/libunwind-1.1.0:= ) - webp? ( >=media-libs/libwebp-0.6.0:= ) - wmf? ( >=media-libs/libwmf-0.2.8 ) - xpm? ( x11-libs/libXpm ) -" - -RDEPEND=" - ${COMMON_DEPEND} - x11-themes/hicolor-icon-theme - gnome? ( gnome-base/gvfs ) -" - -DEPEND=" - ${COMMON_DEPEND} - >=dev-lang/perl-5.10.0 - dev-libs/appstream-glib - >=dev-build/gtk-doc-am-1 - dev-util/gtk-update-icon-cache - >=dev-util/intltool-0.40.1 - >=sys-devel/gettext-0.19 - >=dev-build/libtool-2.2 - virtual/pkgconfig -" - -DOCS=( "AUTHORS" "ChangeLog" "HACKING" "NEWS" "README" "README.i18n" ) - -PATCHES=( - "${FILESDIR}/${PN}-2.10_fix_test-appdata.patch" # Bugs 685210 (and duplicate 691070) - "${FILESDIR}/${PN}-2.10_fix_musl_backtrace_backend_switch.patch" #900148 - "${FILESDIR}/${PN}-2.10_fix_configure_GCC13_implicit_function_declarations.patch" #899796 -) - -src_prepare() { - sed -i -e 's/mypaint-brushes-1.0/mypaint-brushes-2.0/' configure.ac || die #737794 - - sed -i -e 's/== "xquartz"/= "xquartz"/' configure.ac || die #494864 - sed 's/-DGIMP_DISABLE_DEPRECATED/-DGIMP_protect_DISABLE_DEPRECATED/g' -i configure.ac || die #615144 - - if use heif ; then - has_version -d ">=media-libs/libheif-1.18.0" && eapply "${FILESDIR}/${PN}-2.10_libheif-1.18_unconditional_compat.patch" # 940915 - fi - - gnome2_src_prepare # calls eautoreconf - - sed 's/-DGIMP_protect_DISABLE_DEPRECATED/-DGIMP_DISABLE_DEPRECATED/g' -i configure || die #615144 - grep -F -q GIMP_DISABLE_DEPRECATED configure || die #615144, self-test - - export CC_FOR_BUILD="$(tc-getBUILD_CC)" -} - -_adjust_sandbox() { - # Bugs #569738 and #591214 - local nv - for nv in /dev/nvidia-uvm /dev/nvidiactl /dev/nvidia{0..9} ; do - # We do not check for existence as they may show up later - # https://bugs.gentoo.org/show_bug.cgi?id=569738#c21 - addwrite "${nv}" - done - - addwrite /dev/dri/ # bugs #574038 and #684886 - addwrite /dev/ati/ # bug #589198 - addwrite /proc/mtrr # bug #589198 -} - -src_configure() { - _adjust_sandbox - - local myconf=( - GEGL="${EPREFIX}"/usr/bin/gegl-0.4 - GDBUS_CODEGEN="${EPREFIX}"/bin/false - - --enable-default-binary - - --disable-check-update - --disable-python - --enable-mp - --with-appdata-test - --with-bug-report-url=https://bugs.gentoo.org/ - --with-xmc - --without-libbacktrace - --without-webkit - --without-xvfb-run - $(use_enable cpu_flags_ppc_altivec altivec) - $(use_enable cpu_flags_x86_mmx mmx) - $(use_enable cpu_flags_x86_sse sse) - $(use_enable debug) - $(use_enable vector-icons) - $(use_with aalib aa) - $(use_with alsa) - $(use_with !aqua x) - $(use_with heif libheif) - $(use_with jpeg2k jpeg2000) - $(use_with jpegxl) - $(use_with mng libmng) - $(use_with openexr) - $(use_with postscript gs) - $(use_with udev gudev) - $(use_with unwind libunwind) - $(use_with webp) - $(use_with wmf) - $(use_with xpm libxpm) - ) - - gnome2_src_configure "${myconf[@]}" -} - -src_compile() { - export XDG_DATA_DIRS="${EPREFIX}"/usr/share # bug 587004 - gnome2_src_compile -} - -# for https://bugs.gentoo.org/664938 -_rename_plugins() { - einfo 'Renaming plug-ins to not collide with pre-2.10.6 file layout (bug #664938)...' - local prename=gimp-org- - ( - cd "${ED}"/usr/$(get_libdir)/gimp/2.0/plug-ins || die - for plugin_slash in $(ls -d1 */); do - plugin=${plugin_slash%/} - if [[ -f ${plugin}/${plugin} ]]; then - # NOTE: Folder and file name need to match for Gimp to load that plug-in - # so "file-svg/file-svg" becomes "${prename}file-svg/${prename}file-svg" - mv ${plugin}/{,${prename}}${plugin} || die - mv {,${prename}}${plugin} || die - fi - done - ) -} - -src_test() { - virtx emake check -} - -src_install() { - gnome2_src_install - - # Workaround for bug #321111 to give GIMP the least - # precedence on PDF documents by default - mv "${ED}"/usr/share/applications/{,zzz-}gimp.desktop || die - - find "${ED}" -name '*.la' -type f -delete || die - - # Prevent dead symlink gimp-console.1 from downstream man page compression (bug #433527) - local gimp_app_version=$(ver_cut 1-2) - mv "${ED}"/usr/share/man/man1/gimp-console{-${gimp_app_version},}.1 || die - - # Remove gimp devel-docs html files if user doesn't need it - if ! use doc; then - rm -r "${ED}"/usr/share/gtk-doc || die - fi - - _rename_plugins || die -} - -pkg_postinst() { - gnome2_pkg_postinst -} - -pkg_postrm() { - gnome2_pkg_postrm -} diff --git a/media-gfx/gimp/gimp-2.10.36-r3.ebuild b/media-gfx/gimp/gimp-2.10.36-r3.ebuild deleted file mode 100644 index e0082d3fdfdb..000000000000 --- a/media-gfx/gimp/gimp-2.10.36-r3.ebuild +++ /dev/null @@ -1,218 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 -GNOME2_EAUTORECONF=yes -WANT_AUTOMAKE= - -inherit autotools gnome2 toolchain-funcs virtualx - -DESCRIPTION="GNU Image Manipulation Program" -HOMEPAGE="https://www.gimp.org/" -SRC_URI="mirror://gimp/v$(ver_cut 1-2)/${P}.tar.bz2" -LICENSE="GPL-3+ LGPL-3+" -SLOT="0/2" -KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~loong ~ppc ppc64 ~riscv x86" - -IUSE="aalib alsa aqua debug doc gnome heif jpeg2k jpegxl mng openexr postscript udev unwind vector-icons webp wmf xpm cpu_flags_ppc_altivec cpu_flags_x86_mmx cpu_flags_x86_sse" - -RESTRICT="!test? ( test )" - -DEPEND=" - >=app-accessibility/at-spi2-core-2.46.0 - >=app-text/poppler-0.50[cairo] - >=app-text/poppler-data-0.4.7 - >=dev-libs/glib-2.56.2:2 - >=dev-libs/json-glib-1.2.6 - dev-libs/libxml2:2 - dev-libs/libxslt - >=gnome-base/librsvg-2.40.6:2 - >=media-gfx/mypaint-brushes-2.0.2:= - >=media-libs/babl-0.1.98 - >=media-libs/fontconfig-2.12.4 - >=media-libs/freetype-2.1.7 - >=media-libs/gegl-0.4.40:0.4[cairo] - >=media-libs/gexiv2-0.10.6 - >=media-libs/harfbuzz-0.9.19:= - >=media-libs/lcms-2.8:2 - media-libs/libjpeg-turbo:= - >=media-libs/libmypaint-1.6.1:= - >=media-libs/libpng-1.6.25:0= - >=media-libs/tiff-3.5.7:= - net-libs/glib-networking[ssl] - sys-libs/zlib - >=x11-libs/cairo-1.12.2 - >=x11-libs/gdk-pixbuf-2.31:2 - >=x11-libs/gtk+-2.24.32:2 - x11-libs/libXcursor - >=x11-libs/pango-1.29.4 - aalib? ( media-libs/aalib ) - alsa? ( >=media-libs/alsa-lib-1.0.0 ) - aqua? ( >=x11-libs/gtk-mac-integration-2.0.0 ) - heif? ( >=media-libs/libheif-1.9.1:= ) - jpeg2k? ( >=media-libs/openjpeg-2.1.0:2= ) - jpegxl? ( >=media-libs/libjxl-0.7.0:= ) - mng? ( media-libs/libmng:= ) - openexr? ( >=media-libs/openexr-1.6.1:= ) - postscript? ( app-text/ghostscript-gpl:= ) - udev? ( dev-libs/libgudev:= ) - unwind? ( >=sys-libs/libunwind-1.1.0:= ) - webp? ( >=media-libs/libwebp-0.6.0:= ) - wmf? ( >=media-libs/libwmf-0.2.8 ) - xpm? ( x11-libs/libXpm ) -" - -RDEPEND=" - ${DEPEND} - x11-themes/hicolor-icon-theme - gnome? ( gnome-base/gvfs ) -" - -BDEPEND=" - >=dev-lang/perl-5.10.0 - dev-libs/appstream-glib - >=dev-build/gtk-doc-am-1 - dev-util/gtk-update-icon-cache - >=dev-util/intltool-0.40.1 - >=sys-devel/gettext-0.19.8 - >=dev-build/libtool-2.2 - virtual/pkgconfig -" - -DOCS=( "AUTHORS" "ChangeLog" "HACKING" "NEWS" "README" "README.i18n" ) - -PATCHES=( - "${FILESDIR}/${PN}-2.10_fix_test-appdata.patch" # Bugs 685210 (and duplicate 691070) - "${FILESDIR}/${PN}-2.10_fix_musl_backtrace_backend_switch.patch" #900148 - "${FILESDIR}/${PN}-2.10_fix_configure_GCC13_implicit_function_declarations.patch" #899796 -) - -src_prepare() { - sed -i -e 's/mypaint-brushes-1.0/mypaint-brushes-2.0/' configure.ac || die #737794 - - sed -i -e 's/== "xquartz"/= "xquartz"/' configure.ac || die #494864 - sed 's/-DGIMP_DISABLE_DEPRECATED/-DGIMP_protect_DISABLE_DEPRECATED/g' -i configure.ac || die #615144 - - if use heif ; then - has_version -d ">=media-libs/libheif-1.18.0" && eapply "${FILESDIR}/${PN}-2.10_libheif-1.18_unconditional_compat.patch" # 940915 - fi - - gnome2_src_prepare # calls eautoreconf - - sed 's/-DGIMP_protect_DISABLE_DEPRECATED/-DGIMP_DISABLE_DEPRECATED/g' -i configure || die #615144 - grep -F -q GIMP_DISABLE_DEPRECATED configure || die #615144, self-test - - export CC_FOR_BUILD="$(tc-getBUILD_CC)" -} - -_adjust_sandbox() { - # Bugs #569738 and #591214 - local nv - for nv in /dev/nvidia-uvm /dev/nvidiactl /dev/nvidia{0..9} ; do - # We do not check for existence as they may show up later - # https://bugs.gentoo.org/show_bug.cgi?id=569738#c21 - addwrite "${nv}" - done - - addwrite /dev/dri/ # bugs #574038 and #684886 - addwrite /dev/ati/ # bug #589198 - addwrite /proc/mtrr # bug #589198 -} - -src_configure() { - _adjust_sandbox - - local myconf=( - GEGL="${EPREFIX}"/usr/bin/gegl-0.4 - GDBUS_CODEGEN="${EPREFIX}"/bin/false - - --enable-default-binary - - --disable-check-update - --disable-python - --enable-mp - --with-appdata-test - --with-bug-report-url=https://bugs.gentoo.org/ - --with-xmc - --without-libbacktrace - --without-webkit - --without-xvfb-run - $(use_enable cpu_flags_ppc_altivec altivec) - $(use_enable cpu_flags_x86_mmx mmx) - $(use_enable cpu_flags_x86_sse sse) - $(use_enable debug) - $(use_enable vector-icons) - $(use_with aalib aa) - $(use_with alsa) - $(use_with !aqua x) - $(use_with heif libheif) - $(use_with jpeg2k jpeg2000) - $(use_with jpegxl) - $(use_with mng libmng) - $(use_with openexr) - $(use_with postscript gs) - $(use_with udev gudev) - $(use_with unwind libunwind) - $(use_with webp) - $(use_with wmf) - $(use_with xpm libxpm) - ) - - gnome2_src_configure "${myconf[@]}" -} - -src_compile() { - export XDG_DATA_DIRS="${EPREFIX}"/usr/share # bug 587004 - gnome2_src_compile -} - -# for https://bugs.gentoo.org/664938 -_rename_plugins() { - einfo 'Renaming plug-ins to not collide with pre-2.10.6 file layout (bug #664938)...' - local prename=gimp-org- - ( - cd "${ED}"/usr/$(get_libdir)/gimp/2.0/plug-ins || die - for plugin_slash in $(ls -d1 */); do - plugin=${plugin_slash%/} - if [[ -f ${plugin}/${plugin} ]]; then - # NOTE: Folder and file name need to match for Gimp to load that plug-in - # so "file-svg/file-svg" becomes "${prename}file-svg/${prename}file-svg" - mv ${plugin}/{,${prename}}${plugin} || die - mv {,${prename}}${plugin} || die - fi - done - ) -} - -src_test() { - virtx emake check -} - -src_install() { - gnome2_src_install - - # Workaround for bug #321111 to give GIMP the least - # precedence on PDF documents by default - mv "${ED}"/usr/share/applications/{,zzz-}gimp.desktop || die - - find "${ED}" -name '*.la' -type f -delete || die - - # Prevent dead symlink gimp-console.1 from downstream man page compression (bug #433527) - local gimp_app_version=$(ver_cut 1-2) - mv "${ED}"/usr/share/man/man1/gimp-console{-${gimp_app_version},}.1 || die - - # Remove gimp devel-docs html files if user doesn't need it - if ! use doc; then - rm -r "${ED}"/usr/share/gtk-doc || die - fi - - _rename_plugins || die -} - -pkg_postinst() { - gnome2_pkg_postinst -} - -pkg_postrm() { - gnome2_pkg_postrm -} diff --git a/media-gfx/gimp/gimp-2.10.36-r4.ebuild b/media-gfx/gimp/gimp-2.10.36-r4.ebuild deleted file mode 100644 index 1acf5d818486..000000000000 --- a/media-gfx/gimp/gimp-2.10.36-r4.ebuild +++ /dev/null @@ -1,221 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 -GNOME2_EAUTORECONF=yes -WANT_AUTOMAKE= - -inherit autotools gnome2 toolchain-funcs virtualx - -DESCRIPTION="GNU Image Manipulation Program" -HOMEPAGE="https://www.gimp.org/" -SRC_URI="mirror://gimp/v$(ver_cut 1-2)/${P}.tar.bz2" -LICENSE="GPL-3+ LGPL-3+" -SLOT="0/2" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~x86" - -IUSE="aalib alsa aqua debug doc gnome heif jpeg2k jpegxl mng openexr postscript udev unwind vector-icons webp wmf xpm cpu_flags_ppc_altivec cpu_flags_x86_mmx cpu_flags_x86_sse" - -RESTRICT="!test? ( test )" - -DEPEND=" - >=app-accessibility/at-spi2-core-2.46.0 - >=app-text/poppler-0.50[cairo] - >=app-text/poppler-data-0.4.7 - >=dev-libs/glib-2.56.2:2 - >=dev-libs/json-glib-1.2.6 - dev-libs/libxml2:2 - dev-libs/libxslt - >=gnome-base/librsvg-2.40.6:2 - >=media-gfx/mypaint-brushes-2.0.2:= - >=media-libs/babl-0.1.98 - >=media-libs/fontconfig-2.12.4 - >=media-libs/freetype-2.1.7 - >=media-libs/gegl-0.4.40:0.4[cairo] - >=media-libs/gexiv2-0.10.6 - >=media-libs/harfbuzz-0.9.19:= - >=media-libs/lcms-2.8:2 - media-libs/libjpeg-turbo:= - >=media-libs/libmypaint-1.6.1:= - >=media-libs/libpng-1.6.25:0= - >=media-libs/tiff-3.5.7:= - net-libs/glib-networking[ssl] - sys-libs/zlib - >=x11-libs/cairo-1.12.2 - >=x11-libs/gdk-pixbuf-2.31:2 - >=x11-libs/gtk+-2.24.32:2 - x11-libs/libXcursor - >=x11-libs/pango-1.29.4 - aalib? ( media-libs/aalib ) - alsa? ( >=media-libs/alsa-lib-1.0.0 ) - aqua? ( >=x11-libs/gtk-mac-integration-2.0.0 ) - heif? ( >=media-libs/libheif-1.9.1:= ) - jpeg2k? ( >=media-libs/openjpeg-2.1.0:2= ) - jpegxl? ( >=media-libs/libjxl-0.7.0:= ) - mng? ( media-libs/libmng:= ) - openexr? ( >=media-libs/openexr-1.6.1:= ) - postscript? ( app-text/ghostscript-gpl:= ) - udev? ( dev-libs/libgudev:= ) - unwind? ( >=sys-libs/libunwind-1.1.0:= ) - webp? ( >=media-libs/libwebp-0.6.0:= ) - wmf? ( >=media-libs/libwmf-0.2.8 ) - xpm? ( x11-libs/libXpm ) -" - -RDEPEND=" - ${DEPEND} - x11-themes/hicolor-icon-theme - gnome? ( gnome-base/gvfs ) -" - -BDEPEND=" - >=dev-lang/perl-5.10.0 - dev-libs/appstream-glib - >=dev-build/gtk-doc-am-1 - dev-util/gtk-update-icon-cache - >=dev-util/intltool-0.40.1 - >=sys-devel/gettext-0.19.8 - >=dev-build/libtool-2.2 - virtual/pkgconfig -" - -DOCS=( "AUTHORS" "ChangeLog" "HACKING" "NEWS" "README" "README.i18n" ) - -PATCHES=( - "${FILESDIR}/${PN}-2.10_fix_test-appdata.patch" # Bugs 685210 (and duplicate 691070) - "${FILESDIR}/${PN}-2.10_fix_musl_backtrace_backend_switch.patch" #900148 - "${FILESDIR}/${PN}-2.10_fix_configure_GCC13_implicit_function_declarations.patch" #899796 - "${FILESDIR}/${P}_fix_strict-aliasing.patch" #917497 - "${FILESDIR}/${P}_c99_tiff.patch" #919282 - "${FILESDIR}/${P}_c99_metadata.patch" #919282 -) - -src_prepare() { - sed -i -e 's/mypaint-brushes-1.0/mypaint-brushes-2.0/' configure.ac || die #737794 - - sed -i -e 's/== "xquartz"/= "xquartz"/' configure.ac || die #494864 - sed 's/-DGIMP_DISABLE_DEPRECATED/-DGIMP_protect_DISABLE_DEPRECATED/g' -i configure.ac || die #615144 - - if use heif ; then - has_version -d ">=media-libs/libheif-1.18.0" && eapply "${FILESDIR}/${PN}-2.10_libheif-1.18_unconditional_compat.patch" # 940915 - fi - - gnome2_src_prepare # calls eautoreconf - - sed 's/-DGIMP_protect_DISABLE_DEPRECATED/-DGIMP_DISABLE_DEPRECATED/g' -i configure || die #615144 - grep -F -q GIMP_DISABLE_DEPRECATED configure || die #615144, self-test - - export CC_FOR_BUILD="$(tc-getBUILD_CC)" -} - -_adjust_sandbox() { - # Bugs #569738 and #591214 - local nv - for nv in /dev/nvidia-uvm /dev/nvidiactl /dev/nvidia{0..9} ; do - # We do not check for existence as they may show up later - # https://bugs.gentoo.org/show_bug.cgi?id=569738#c21 - addwrite "${nv}" - done - - addwrite /dev/dri/ # bugs #574038 and #684886 - addwrite /dev/ati/ # bug #589198 - addwrite /proc/mtrr # bug #589198 -} - -src_configure() { - _adjust_sandbox - - local myconf=( - GEGL="${EPREFIX}"/usr/bin/gegl-0.4 - GDBUS_CODEGEN="${EPREFIX}"/bin/false - - --enable-default-binary - - --disable-check-update - --disable-python - --enable-mp - --with-appdata-test - --with-bug-report-url=https://bugs.gentoo.org/ - --with-xmc - --without-libbacktrace - --without-webkit - --without-xvfb-run - $(use_enable cpu_flags_ppc_altivec altivec) - $(use_enable cpu_flags_x86_mmx mmx) - $(use_enable cpu_flags_x86_sse sse) - $(use_enable debug) - $(use_enable vector-icons) - $(use_with aalib aa) - $(use_with alsa) - $(use_with !aqua x) - $(use_with heif libheif) - $(use_with jpeg2k jpeg2000) - $(use_with jpegxl) - $(use_with mng libmng) - $(use_with openexr) - $(use_with postscript gs) - $(use_with udev gudev) - $(use_with unwind libunwind) - $(use_with webp) - $(use_with wmf) - $(use_with xpm libxpm) - ) - - gnome2_src_configure "${myconf[@]}" -} - -src_compile() { - export XDG_DATA_DIRS="${EPREFIX}"/usr/share # bug 587004 - gnome2_src_compile -} - -# for https://bugs.gentoo.org/664938 -_rename_plugins() { - einfo 'Renaming plug-ins to not collide with pre-2.10.6 file layout (bug #664938)...' - local prename=gimp-org- - ( - cd "${ED}"/usr/$(get_libdir)/gimp/2.0/plug-ins || die - for plugin_slash in $(ls -d1 */); do - plugin=${plugin_slash%/} - if [[ -f ${plugin}/${plugin} ]]; then - # NOTE: Folder and file name need to match for Gimp to load that plug-in - # so "file-svg/file-svg" becomes "${prename}file-svg/${prename}file-svg" - mv ${plugin}/{,${prename}}${plugin} || die - mv {,${prename}}${plugin} || die - fi - done - ) -} - -src_test() { - virtx emake check -} - -src_install() { - gnome2_src_install - - # Workaround for bug #321111 to give GIMP the least - # precedence on PDF documents by default - mv "${ED}"/usr/share/applications/{,zzz-}gimp.desktop || die - - find "${ED}" -name '*.la' -type f -delete || die - - # Prevent dead symlink gimp-console.1 from downstream man page compression (bug #433527) - local gimp_app_version=$(ver_cut 1-2) - mv "${ED}"/usr/share/man/man1/gimp-console{-${gimp_app_version},}.1 || die - - # Remove gimp devel-docs html files if user doesn't need it - if ! use doc; then - rm -r "${ED}"/usr/share/gtk-doc || die - fi - - _rename_plugins || die -} - -pkg_postinst() { - gnome2_pkg_postinst -} - -pkg_postrm() { - gnome2_pkg_postrm -} diff --git a/media-gfx/gimp/gimp-2.99.18-r1.ebuild b/media-gfx/gimp/gimp-2.99.18-r1.ebuild deleted file mode 100644 index a206f158550c..000000000000 --- a/media-gfx/gimp/gimp-2.99.18-r1.ebuild +++ /dev/null @@ -1,269 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -LUA_COMPAT=( luajit ) -PYTHON_COMPAT=( python3_{10..12} ) -VALA_USE_DEPEND=vapigen - -inherit lua-single meson python-single-r1 toolchain-funcs vala xdg - -DESCRIPTION="GNU Image Manipulation Program" -HOMEPAGE="https://www.gimp.org/" -SRC_URI="mirror://gimp/v$(ver_cut 1-2)/${P}.tar.xz" - -LICENSE="GPL-3+ LGPL-3+" -SLOT="0/3" - -IUSE="X aalib alsa doc fits gnome heif javascript jpeg2k jpegxl lua mng openexr openmp postscript python test udev unwind vala vector-icons webp wmf xpm" -REQUIRED_USE=" - lua? ( ${LUA_REQUIRED_USE} ) - python? ( ${PYTHON_REQUIRED_USE} ) -" - -RESTRICT="!test? ( test )" - -# media-libs/{babl,gegl} are required to be built with USE="introspection" -# to fix the compilation checking of /usr/share/gir-1.0/{Babl-0.1gir,Gegl-0.4.gir} -COMMON_DEPEND=" - >=app-accessibility/at-spi2-core-2.46.0 - >=app-text/poppler-0.90.1[cairo] - >=app-text/poppler-data-0.4.9 - >=dev-libs/appstream-glib-0.7.16 - >=dev-libs/glib-2.70.0:2 - >=dev-libs/json-glib-1.4.4 - dev-libs/libxml2:2 - dev-libs/libxslt - >=gnome-base/librsvg-2.46.0:2 - >=media-gfx/mypaint-brushes-2.0.2:= - >=media-libs/babl-0.1.98[introspection,lcms,vala?] - >=media-libs/fontconfig-2.12.6 - >=media-libs/freetype-2.10.2 - >=media-libs/gegl-0.4.48:0.4[cairo,introspection,lcms,vala?] - >=media-libs/gexiv2-0.14.0 - >=media-libs/harfbuzz-2.6.5:= - >=media-libs/lcms-2.13.1:2 - media-libs/libjpeg-turbo:= - >=media-libs/libmypaint-1.6.1:= - >=media-libs/libpng-1.6.37:0= - >=media-libs/tiff-4.1.0:= - net-libs/glib-networking[ssl] - sys-libs/zlib - >=x11-libs/cairo-1.16.0 - >=x11-libs/gdk-pixbuf-2.40.0:2[introspection] - >=x11-libs/gtk+-3.24.16:3[introspection] - >=x11-libs/pango-1.50.0 - >=x11-libs/libXmu-1.1.4 - aalib? ( media-libs/aalib ) - alsa? ( >=media-libs/alsa-lib-1.0.0 ) - fits? ( sci-libs/cfitsio ) - heif? ( >=media-libs/libheif-1.13.0:= ) - javascript? ( dev-libs/gjs ) - jpeg2k? ( >=media-libs/openjpeg-2.3.1:2= ) - jpegxl? ( >=media-libs/libjxl-0.6.1:= ) - lua? ( - ${LUA_DEPS} - $(lua_gen_cond_dep ' - dev-lua/lgi[${LUA_USEDEP}] - ') - ) - mng? ( media-libs/libmng:= ) - openexr? ( >=media-libs/openexr-2.3.0:= ) - postscript? ( app-text/ghostscript-gpl:= ) - python? ( - ${PYTHON_DEPS} - $(python_gen_cond_dep ' - >=dev-python/pygobject-3.0:3[${PYTHON_USEDEP}] - ') - ) - udev? ( >=dev-libs/libgudev-167:= ) - unwind? ( >=sys-libs/libunwind-1.1.0:= ) - webp? ( >=media-libs/libwebp-0.6.0:= ) - wmf? ( >=media-libs/libwmf-0.2.8 ) - X? ( x11-libs/libXcursor ) - xpm? ( x11-libs/libXpm ) -" - -RDEPEND=" - ${COMMON_DEPEND} - x11-themes/hicolor-icon-theme - gnome? ( gnome-base/gvfs ) -" - -DEPEND=" - ${COMMON_DEPEND} - test? ( x11-misc/xvfb-run ) - vala? ( $(vala_depend) ) -" - -# TODO: there are probably more atoms in DEPEND which should be in BDEPEND now -BDEPEND=" - >=dev-lang/perl-5.30.3 - dev-util/gdbus-codegen - >=sys-devel/gettext-0.21 - doc? ( - app-text/yelp-tools - dev-libs/gobject-introspection[doctool] - dev-util/gi-docgen - ) - virtual/pkgconfig -" - -DOCS=( "AUTHORS" "NEWS" "README" "README.i18n" ) - -PATCHES=( - "${FILESDIR}/${PN}-2.10_fix_musl_backtrace_backend_switch.patch" #900148 -) - -pkg_pretend() { - [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp -} - -pkg_setup() { - [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp - - use lua && lua-single_pkg_setup - - if use python; then - python-single-r1_pkg_setup - fi -} - -src_prepare() { - default - - sed -i -e 's/mypaint-brushes-1.0/mypaint-brushes-2.0/' meson.build || die #737794 - - # Fix Gimp and GimpUI devel doc installation paths - sed -i -e "s/'doc'/'gtk-doc'/" devel-docs/reference/gimp/meson.build || die - sed -i -e "s/'doc'/'gtk-doc'/" devel-docs/reference/gimp-ui/meson.build || die - - # Fix pygimp.interp python implementation path. - # Meson @PYTHON_PATH@ use sandbox path e.g.: - # '/var/tmp/portage/media-gfx/gimp-2.99.12/temp/python3.10/bin/python3' - sed -i -e 's/@PYTHON_PATH@/'${EPYTHON}'/' plug-ins/python/pygimp.interp.in || die - - # Set proper intallation path of documentation logo - sed -i -e "s/'gimp-@0@'.format(gimp_app_version)/'gimp-${PVR}'/" data/images/meson.build || die -} - -_adjust_sandbox() { - # Bugs #569738 and #591214 - local nv - for nv in /dev/nvidia-uvm /dev/nvidiactl /dev/nvidia{0..9} ; do - # We do not check for existence as they may show up later - # https://bugs.gentoo.org/show_bug.cgi?id=569738#c21 - addwrite "${nv}" - done - - addwrite /dev/dri/ # bugs #574038 and #684886 - addwrite /dev/ati/ # bug #589198 - addwrite /proc/mtrr # bug #589198 -} - -src_configure() { - _adjust_sandbox - - use vala && vala_setup - - local emesonargs=( - -Denable-default-bin=enabled - - -Dcheck-update=no - -Denable-multiproc=true - -Dappdata-test=disabled - -Dbug-report-url=https://bugs.gentoo.org/ - -Dilbm=disabled - -Dlibbacktrace=false - -Dwebkit-unmaintained=false - $(meson_feature aalib aa) - $(meson_feature alsa) - $(meson_feature doc gi-docgen) - $(meson_feature fits) - $(meson_feature heif) - $(meson_feature javascript) - $(meson_feature jpeg2k jpeg2000) - $(meson_feature jpegxl jpeg-xl) - $(meson_feature lua) - $(meson_feature mng) - $(meson_feature openexr) - $(meson_feature openmp) - $(meson_feature postscript ghostscript) - $(meson_feature python) - $(meson_feature test headless-tests) - $(meson_feature udev gudev) - $(meson_feature vala) - $(meson_feature webp) - $(meson_feature wmf) - $(meson_feature X xcursor) - $(meson_feature xpm) - $(meson_use doc g-ir-doc) - $(meson_use unwind libunwind) - $(meson_use vector-icons) - ) - - meson_src_configure -} - -src_compile() { - export XDG_DATA_DIRS="${EPREFIX}"/usr/share # bug 587004 - meson_src_compile -} - -# for https://bugs.gentoo.org/664938 -_rename_plugins() { - einfo 'Renaming plug-ins to not collide with pre-2.10.6 file layout (bug #664938)...' - local prename=gimp-org- - ( - cd "${ED}"/usr/$(get_libdir)/gimp/2.99/plug-ins || exit 1 - for plugin_slash in $(ls -d1 */); do - plugin=${plugin_slash%/} - if [[ -f ${plugin}/${plugin} ]]; then - # NOTE: Folder and file name need to match for Gimp to load that plug-in - # so "file-svg/file-svg" becomes "${prename}file-svg/${prename}file-svg" - mv ${plugin}/{,${prename}}${plugin} || exit 1 - mv {,${prename}}${plugin} || exit 1 - fi - done - ) -} - -src_test() { - local -x LD_LIBRARY_PATH="${BUILD_DIR}/libgimp:${LD_LIBRARY_PATH}" - meson_src_test -} - -src_install() { - meson_src_install - - if use python; then - python_optimize - fi - - # Workaround for bug #321111 to give GIMP the least - # precedence on PDF documents by default - mv "${ED}"/usr/share/applications/{,zzz-}gimp.desktop || die - - find "${D}" -name '*.la' -type f -delete || die - - # Prevent dead symlink gimp-console.1 from downstream man page compression (bug #433527) - mv "${ED}"/usr/share/man/man1/gimp-console{-*,}.1 || die - - # Create symlinks for Gimp exec in /usr/bin - dosym "${ESYSROOT}"/usr/bin/gimp-2.99 /usr/bin/gimp - dosym "${ESYSROOT}"/usr/bin/gimp-console-2.99 /usr/bin/gimp-console - dosym "${ESYSROOT}"/usr/bin/gimp-script-fu-interpreter-3.0 /usr/bin/gimp-script-fu-interpreter - dosym "${ESYSROOT}"/usr/bin/gimp-test-clipboard-2.99 /usr/bin/gimp-test-clipboard - dosym "${ESYSROOT}"/usr/bin/gimptool-2.99 /usr/bin/gimptool - - _rename_plugins || die -} - -pkg_postinst() { - xdg_pkg_postinst -} - -pkg_postrm() { - xdg_pkg_postrm -} diff --git a/media-gfx/gimp/gimp-2.99.18-r2.ebuild b/media-gfx/gimp/gimp-3.0.0_rc2.ebuild index 9166dcd6ee43..1f159711d6dd 100644 --- a/media-gfx/gimp/gimp-2.99.18-r2.ebuild +++ b/media-gfx/gimp/gimp-3.0.0_rc2.ebuild @@ -4,22 +4,23 @@ EAPI=8 LUA_COMPAT=( luajit ) -PYTHON_COMPAT=( python3_{10..12} ) +PYTHON_COMPAT=( python3_{10..13} ) VALA_USE_DEPEND=vapigen inherit lua-single meson python-single-r1 toolchain-funcs vala xdg DESCRIPTION="GNU Image Manipulation Program" HOMEPAGE="https://www.gimp.org/" -SRC_URI="mirror://gimp/v$(ver_cut 1-2)/${P}.tar.xz" +SRC_URI="mirror://gimp/v$(ver_cut 1-2)/${PN}-$(ver_cut 1-3)-RC2.tar.xz" +S="${WORKDIR}/${PN}-$(ver_cut 1-3)-RC2" LICENSE="GPL-3+ LGPL-3+" SLOT="0/3" -IUSE="X aalib alsa doc fits gnome heif javascript jpeg2k jpegxl lua mng openexr openmp postscript python test udev unwind vala vector-icons webp wmf xpm" +IUSE="X aalib alsa doc fits gnome heif javascript jpeg2k jpegxl lua mng openexr openmp postscript test udev unwind vala vector-icons webp wmf xpm" REQUIRED_USE=" + ${PYTHON_REQUIRED_USE} lua? ( ${LUA_REQUIRED_USE} ) - python? ( ${PYTHON_REQUIRED_USE} ) test? ( X ) xpm? ( X ) " @@ -29,6 +30,10 @@ RESTRICT="!test? ( test )" # media-libs/{babl,gegl} are required to be built with USE="introspection" # to fix the compilation checking of /usr/share/gir-1.0/{Babl-0.1gir,Gegl-0.4.gir} COMMON_DEPEND=" + ${PYTHON_DEPS} + $(python_gen_cond_dep ' + >=dev-python/pygobject-3.0:3[${PYTHON_USEDEP}] + ') >=app-accessibility/at-spi2-core-2.46.0 >=app-text/poppler-0.90.1[cairo] >=app-text/poppler-data-0.4.9 @@ -37,12 +42,12 @@ COMMON_DEPEND=" >=dev-libs/json-glib-1.4.4 dev-libs/libxml2:2 dev-libs/libxslt - >=gnome-base/librsvg-2.46.0:2 + >=gnome-base/librsvg-2.57.3:2 >=media-gfx/mypaint-brushes-2.0.2:= - >=media-libs/babl-0.1.98[introspection,lcms,vala?] + >=media-libs/babl-0.1.110[introspection,lcms,vala?] >=media-libs/fontconfig-2.12.6 >=media-libs/freetype-2.10.2 - >=media-libs/gegl-0.4.48:0.4[cairo,introspection,lcms,vala?] + >=media-libs/gegl-0.4.52:0.4[cairo,introspection,lcms,vala?] >=media-libs/gexiv2-0.14.0 >=media-libs/harfbuzz-2.6.5:= >=media-libs/lcms-2.13.1:2 @@ -72,12 +77,6 @@ COMMON_DEPEND=" mng? ( media-libs/libmng:= ) openexr? ( >=media-libs/openexr-2.3.0:= ) postscript? ( app-text/ghostscript-gpl:= ) - python? ( - ${PYTHON_DEPS} - $(python_gen_cond_dep ' - >=dev-python/pygobject-3.0:3[${PYTHON_USEDEP}] - ') - ) udev? ( >=dev-libs/libgudev-167:= ) unwind? ( >=sys-libs/libunwind-1.1.0:= ) webp? ( >=media-libs/libwebp-0.6.0:= ) @@ -118,22 +117,14 @@ BDEPEND=" DOCS=( "AUTHORS" "NEWS" "README" "README.i18n" ) -PATCHES=( - "${FILESDIR}/${PN}-2.10_fix_musl_backtrace_backend_switch.patch" #900148 -) - pkg_pretend() { [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp } pkg_setup() { [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp - + python-single-r1_pkg_setup use lua && lua-single_pkg_setup - - if use python; then - python-single-r1_pkg_setup - fi } src_prepare() { @@ -151,7 +142,7 @@ src_prepare() { sed -i -e 's/@PYTHON_PATH@/'${EPYTHON}'/' plug-ins/python/pygimp.interp.in || die # Set proper intallation path of documentation logo - sed -i -e "s/'gimp-@0@'.format(gimp_app_version)/'gimp-${PVR}'/" data/images/meson.build || die + sed -i -e "s/'gimp-@0@'.format(gimp_app_version)/'gimp-${PVR}'/" gimp-data/images/logo/meson.build || die } _adjust_sandbox() { @@ -191,12 +182,10 @@ src_configure() { $(meson_feature javascript) $(meson_feature jpeg2k jpeg2000) $(meson_feature jpegxl jpeg-xl) - $(meson_feature lua) $(meson_feature mng) $(meson_feature openexr) $(meson_feature openmp) $(meson_feature postscript ghostscript) - $(meson_feature python) $(meson_feature test headless-tests) $(meson_feature udev gudev) $(meson_feature vala) @@ -205,6 +194,7 @@ src_configure() { $(meson_feature X xcursor) $(meson_feature xpm) $(meson_use doc g-ir-doc) + $(meson_use lua) $(meson_use unwind libunwind) $(meson_use vector-icons) ) @@ -222,7 +212,7 @@ _rename_plugins() { einfo 'Renaming plug-ins to not collide with pre-2.10.6 file layout (bug #664938)...' local prename=gimp-org- ( - cd "${ED}"/usr/$(get_libdir)/gimp/2.99/plug-ins || exit 1 + cd "${ED}"/usr/$(get_libdir)/gimp/3.0/plug-ins || exit 1 for plugin_slash in $(ls -d1 */); do plugin=${plugin_slash%/} if [[ -f ${plugin}/${plugin} ]]; then @@ -243,9 +233,7 @@ src_test() { src_install() { meson_src_install - if use python; then - python_optimize - fi + python_optimize # Workaround for bug #321111 to give GIMP the least # precedence on PDF documents by default @@ -253,15 +241,12 @@ src_install() { find "${D}" -name '*.la' -type f -delete || die - # Prevent dead symlink gimp-console.1 from downstream man page compression (bug #433527) - mv "${ED}"/usr/share/man/man1/gimp-console{-*,}.1 || die - # Create symlinks for Gimp exec in /usr/bin - dosym "${ESYSROOT}"/usr/bin/gimp-2.99 /usr/bin/gimp - dosym "${ESYSROOT}"/usr/bin/gimp-console-2.99 /usr/bin/gimp-console + dosym "${ESYSROOT}"/usr/bin/gimp-3.0 /usr/bin/gimp + dosym "${ESYSROOT}"/usr/bin/gimp-console-3.0 /usr/bin/gimp-console dosym "${ESYSROOT}"/usr/bin/gimp-script-fu-interpreter-3.0 /usr/bin/gimp-script-fu-interpreter - dosym "${ESYSROOT}"/usr/bin/gimp-test-clipboard-2.99 /usr/bin/gimp-test-clipboard - dosym "${ESYSROOT}"/usr/bin/gimptool-2.99 /usr/bin/gimptool + dosym "${ESYSROOT}"/usr/bin/gimp-test-clipboard-3.0 /usr/bin/gimp-test-clipboard + dosym "${ESYSROOT}"/usr/bin/gimptool-3.0 /usr/bin/gimptool _rename_plugins || die } diff --git a/media-gfx/gnome-font-viewer/Manifest b/media-gfx/gnome-font-viewer/Manifest index 84f2a105d4c3..72edf99be035 100644 --- a/media-gfx/gnome-font-viewer/Manifest +++ b/media-gfx/gnome-font-viewer/Manifest @@ -1,6 +1,6 @@ AUX 45.0-window-Fix-function-callback-definition.patch 1912 BLAKE2B 634b4d0c2653dcaa1d02a44844de949337021076499a4e8d73977d4c9bbf2a537ce48fe6318b25de08cba1930ea0e06481b20c4719c0d4a3addb8537999e4237 SHA512 cca22823a35aae3f1553dfd48d22949ce7973be881a9e99a5367fe03e9163f31b4972b4dccd3c7a5776579c4888a2b0f8542049a6780b1d35d769836b7de1770 -DIST gnome-font-viewer-45.0.tar.xz 300420 BLAKE2B 3cc71c056a1254447a9b0c5e838a8950e0414293b9788373b1de90657e364b55784fcef7749abd4e75e29cc6246b081baab66135276744020695ef1e8952a03f SHA512 94289be78831dbc9be8d73348fd423379ebe691b08cf2547acd2648e0e7b1dafcd6c63ffa2c9ec033786b7b65912187c782bb279cc0fb6227d6ee74c1541701e DIST gnome-font-viewer-46.0.tar.xz 304092 BLAKE2B 4128c343d5f139ebae6f342b47ef98c39846ce25561411b0b7821be1f9e985aaea4e9a2fd354328b41972df2771db5383cdc68b21cd6a6987aac24596b2b1d1a SHA512 c97e109c16d59b22afa1b8c9736b99cf687284783691e624e331218d39a5ac509e53555416672bf8967ed8611ac25e7817766f8d5c66ca73cd2309b2405c2ebe -EBUILD gnome-font-viewer-45.0.ebuild 793 BLAKE2B e2fd932de540e4c6a8770ee851a456a272840c090e7eed145fd48251d7c231bbc39183b6f810d5a65920bd5f288583e5e1791d56e7810f1780bbeb9dfa244177 SHA512 4ed4fd7f6855798a0c99d5ad558165ed723b072887913f9ad81635f86be38a7e57ecc4a15af0e6706a4f6e085e89239d1bda4ce242cd61ed49d4177f305a9dd9 +DIST gnome-font-viewer-47.0.tar.xz 201744 BLAKE2B 62370660dc48269eb23b817fbea9a976e5b9ff78ee5e4c80cc96a2a65e32c915beaae2cb9066be21b6cd20ea1bdec5e4482c8397024dae40b27681f8cf0df0ae SHA512 f81624999468d0a3041859623769bef3bc51350328e21bf20e890435dc8308afc620f6580d26f815f33b77994e21cbfc27d934aae33636b970d1fe62f60569d7 EBUILD gnome-font-viewer-46.0.ebuild 792 BLAKE2B aa6a5bcf12e91eb35c8483130b3b001d63451ec5084d5ba42b1d75a1f2bea20e466c02836d4d496ff31f82512cd72ce57bf13f66241096ca5a1e6fc4101ca22b SHA512 70260e86b29ad943913c6167fa98f3f00c4985869b0db8b43d02247c8e01ee32755af3e43fbb62298faca0170bd55988af23b292a2345c007d1fb01c9d8ba66e +EBUILD gnome-font-viewer-47.0.ebuild 681 BLAKE2B cadda7da5eb2e50908e01a2d35162008eb5222e142f2f157372955c15b3677654769f851d0d715e3dfa243d7de17451b75e4714ada273f6a5ddcb5c1a9a3f2b9 SHA512 b95dc4257b2c96209ea4e2331a23757cb2182a9f201b962a66d6ed9214090a0ba87264de0030e03f5d56cd1f99369f71a83ee844d28587143d38dcbf511fd486 MISC metadata.xml 358 BLAKE2B 68c01b7096e0cddca8924d5f631ff0f3b94871244392aece19d0ca59f9bfda7c66199325fd31646c425af984118f728e54fa1ad3fcdc05149e146a5bb7de0667 SHA512 8870277e5cfae6a6c10e66359d45ef4ebde8027cf90f356096e7f78452a525fcb1e3d06f76769a1b8c875498faa79c75432e766edd495398f08d858c4d18bccf diff --git a/media-gfx/gnome-font-viewer/gnome-font-viewer-45.0.ebuild b/media-gfx/gnome-font-viewer/gnome-font-viewer-47.0.ebuild index 37a17d7e48a6..c27b3be90c14 100644 --- a/media-gfx/gnome-font-viewer/gnome-font-viewer-45.0.ebuild +++ b/media-gfx/gnome-font-viewer/gnome-font-viewer-47.0.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 @@ -9,16 +9,15 @@ HOMEPAGE="https://gitlab.gnome.org/GNOME/gnome-font-viewer" LICENSE="GPL-2+ LGPL-2.1+" SLOT="0" -KEYWORDS="amd64 ~arm arm64 ~loong ~ppc ~ppc64 ~riscv x86 ~amd64-linux ~x86-linux" +KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux" DEPEND=" >=dev-libs/glib-2.56.0:2 >=gui-libs/gtk-4.5.0:4 - >=gui-libs/libadwaita-1.4_alpha:1 + >=gui-libs/libadwaita-1.5:1 >=media-libs/harfbuzz-0.9.9:= media-libs/fontconfig:1.0 media-libs/freetype:2 - gnome-base/gnome-desktop:4= dev-libs/fribidi " RDEPEND="${DEPEND}" @@ -28,7 +27,3 @@ BDEPEND=" >=sys-devel/gettext-0.19.8 virtual/pkgconfig " - -PATCHES=( - "${FILESDIR}"/${PV}-window-Fix-function-callback-definition.patch -) diff --git a/media-gfx/graphviz/Manifest b/media-gfx/graphviz/Manifest index 6309e7d02e5f..d4df0c1abb23 100644 --- a/media-gfx/graphviz/Manifest +++ b/media-gfx/graphviz/Manifest @@ -1,7 +1,9 @@ DIST graphviz-12.0.0.tar.xz 21279920 BLAKE2B 67d4444dcc31417fd01268b0fdc81538d86e26f961227d106ae57eb3d6d0e4a2e0ba684413a2d1b66f17340e0ad3a244ce5554c180873683e3ad4775f661739d SHA512 b5d4c8e9b565d4268fff28f169e3bfdb9ebf8b809996f7e35887430e5745aeac92c092fe2a9e15b23c9ba3364aa89fe2eeed85ab3fba61acce21634bc9632813 DIST graphviz-12.1.2.tar.xz 20939968 BLAKE2B 4c9ad31f9ce6c68e67a48330b6693c9d6dc9ecebd4ef74e0aa250fd6cb86f02a585c8b6fe16b1322aedfa844004327f72ac4cbcca782848d55202b8e4695371d SHA512 2c31c33bcc0a912b08bf837df318152f910452e3efa5e6c19cf76c49017c64d6dad4cde719d4713bb41343c4484381d94706c2e993233aaa45a334390338cde9 DIST graphviz-12.2.0.tar.xz 20940240 BLAKE2B 2ba832db442e43ea49ff0aa28f57709757f842efa6ff6188de84b1c11e1932c8c267182f59f7dbd0b1c86d625a686ecc826da6fea087a5f70fea1ac20c60e47c SHA512 542115aa4463e3383c13368d5abcab6715bc9fa2bb886700e6a9072be363641f4a3628d5f07297fde5f3650f2ef67ecdea42bc8f1600b1576abc3e1bf88bdf46 +DIST graphviz-12.2.1.tar.xz 20945996 BLAKE2B f16804eab1a08996934526a1ed03c855e681c67fef51ba99e57b5147355bedc6bfe31840dda07bf845e14e6948bc4f08a4a16aa86f258140699be450e7929922 SHA512 e0f93f69108c5b5bbde8a27a4359c2c834b03142f1e7dfda7c5c19a2fb780c23c287bacfa8724708b8ced604020554ea194bf0c3b1d9f584b3b5862445554c4e EBUILD graphviz-12.0.0-r100.ebuild 6489 BLAKE2B 54b8609d6e23b269e4c3f76dc5724a5292d7c982e083c3bf8aca2b1129a8b3be76804493b8fca43ff41ac9f36184a5a903e3d01dfcd1a0d84d8e753b4d50d1ac SHA512 19ae245e5581e0e00572321e4f3959ddb11c3125bb91cb0fe38b30169fe194b3d7dc591987e94556a45ce5d0db242d464938dc11b526afb5dde5890c6d979c23 EBUILD graphviz-12.1.2.ebuild 6497 BLAKE2B 73aac1004d0acebea0a1555260980a227d810bd8f194f2c271dc09f79884c364324e1d79129ecee5ad3a90156f9a41ea32dd3002a429d60e717ca8b52baff898 SHA512 889fc6a842a87092678a8b3c16428754e2bc03a1c8ae995be1e70654295dadb00d2b71d23252146405e44d965c9f4941d294895fc350fdfd2e4857be4b4f0063 EBUILD graphviz-12.2.0.ebuild 6497 BLAKE2B 73aac1004d0acebea0a1555260980a227d810bd8f194f2c271dc09f79884c364324e1d79129ecee5ad3a90156f9a41ea32dd3002a429d60e717ca8b52baff898 SHA512 889fc6a842a87092678a8b3c16428754e2bc03a1c8ae995be1e70654295dadb00d2b71d23252146405e44d965c9f4941d294895fc350fdfd2e4857be4b4f0063 +EBUILD graphviz-12.2.1.ebuild 6497 BLAKE2B 73aac1004d0acebea0a1555260980a227d810bd8f194f2c271dc09f79884c364324e1d79129ecee5ad3a90156f9a41ea32dd3002a429d60e717ca8b52baff898 SHA512 889fc6a842a87092678a8b3c16428754e2bc03a1c8ae995be1e70654295dadb00d2b71d23252146405e44d965c9f4941d294895fc350fdfd2e4857be4b4f0063 MISC metadata.xml 2309 BLAKE2B 261f100c9c78cf3bb50ffd84260594d34fa5af75f0b3789ce5640e0d633494405e64b3e9f7524e35ef87d11164c501e21fcef2cc483f60ad6ad2e350f500e3b2 SHA512 1a29d11154b72af3deeb0202136926f0871797086ce1a5a4d1fc71822e86d0e76ff789c684fabad85fac1abd5f29913a555be0916f42b90f5ce62fa395e1cbba diff --git a/media-gfx/graphviz/graphviz-12.2.1.ebuild b/media-gfx/graphviz/graphviz-12.2.1.ebuild new file mode 100644 index 000000000000..d66128a9fbcf --- /dev/null +++ b/media-gfx/graphviz/graphviz-12.2.1.ebuild @@ -0,0 +1,230 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +GUILE_COMPAT=( 2-2 3-0 ) +PYTHON_COMPAT=( python3_{10..13} ) +inherit guile-single libtool python-single-r1 + +DESCRIPTION="Open Source Graph Visualization Software" +HOMEPAGE="https://www.graphviz.org/ https://gitlab.com/graphviz/graphviz/" +# Unfortunately upstream uses an "artifact" store for the pre-generated +# tarball now, which makes predictable URLs impossible. +SRC_URI="https://gitlab.com/api/v4/projects/4207231/packages/generic/graphviz-releases/${PV}/${P}.tar.xz" + +LICENSE="CPL-1.0" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris" +IUSE="+cairo devil doc examples gtk2 gts guile lasi nls pdf perl postscript python qt5 ruby svg tcl webp X" + +REQUIRED_USE=" + !cairo? ( !X !gtk2 !postscript !lasi ) + guile? ( ${GUILE_REQUIRED_USE} ) + pdf? ( cairo ) + python? ( ${PYTHON_REQUIRED_USE} )" + +# Requires ksh, tests against installed package, missing files and directory +RESTRICT="test" + +RDEPEND=" + >=dev-libs/expat-2 + >=dev-libs/glib-2.11.1:2 + dev-libs/libltdl + >=media-libs/freetype-2.1.10 + >=media-libs/gd-2.0.34:=[fontconfig,jpeg,png,truetype,zlib] + media-libs/libjpeg-turbo:= + >=media-libs/libpng-1.2:= + sys-libs/zlib + virtual/libiconv + cairo? ( + >=x11-libs/cairo-1.1.10[svg(+)] + >=x11-libs/pango-1.12 + ) + devil? ( media-libs/devil[png,jpeg] ) + gtk2? ( + x11-libs/gdk-pixbuf:2 + x11-libs/gtk+:2 + ) + gts? ( sci-libs/gts ) + guile? ( ${GUILE_DEPS} ) + lasi? ( media-libs/lasi ) + pdf? ( app-text/poppler ) + perl? ( dev-lang/perl:= ) + postscript? ( app-text/ghostscript-gpl ) + python? ( ${PYTHON_DEPS} ) + qt5? ( + dev-qt/qtcore:5 + dev-qt/qtgui:5 + dev-qt/qtprintsupport:5 + dev-qt/qtwidgets:5 + ) + ruby? ( dev-lang/ruby:* ) + svg? ( gnome-base/librsvg ) + tcl? ( >=dev-lang/tcl-8.3:= ) + webp? ( media-libs/libwebp:= ) + X? ( x11-libs/libX11 )" +DEPEND="${RDEPEND} + X? ( x11-base/xorg-proto )" +BDEPEND=" + app-alternatives/lex + dev-build/libtool + virtual/pkgconfig + doc? ( + app-text/ghostscript-gpl + sys-apps/groff + ) + guile? ( + dev-lang/swig + ${GUILE_DEPS} + ) + nls? ( >=sys-devel/gettext-0.14.5 ) + perl? ( dev-lang/swig ) + python? ( dev-lang/swig ) + ruby? ( dev-lang/swig ) + tcl? ( dev-lang/swig )" + +# Dependency description / Maintainer info: + +# Rendering is done via the following plugins (/plugins): +# - core, dot_layout, neato_layout, gd , dot +# the ones which are always compiled in, depend on zlib, gd +# - gtk +# Directly depends on gtk-2. +# needs 'pangocairo' enabled in graphviz configuration +# gtk-2 depends on pango, cairo and libX11 directly. +# - gdk-pixbuf +# Directly depends on gtk-2 and gdk-pixbuf. +# needs 'pangocairo' enabled in graphviz configuration +# - ming +# flash plugin via -Tswf requires media-libs/ming-0.4. Disabled as it's +# incomplete. +# - cairo/pango: +# Needs pango for text layout, uses cairo methods to draw stuff +# - xlib: +# needs cairo+pango, +# can make use of gnomeui and inotify support (??? unsure), +# needs libXaw for UI +# UI also links directly against libX11, libXmu, and libXt +# and uses libXpm if available so we make sure it always is + +# There can be swig-generated bindings for the following languages (/tclpkg/gv): +# - c-sharp (disabled) +# - scheme (enabled via guile) ... no longer broken on ~x86 +# - go (disabled) +# - io (disabled) +# - lua (enabled via lua) +# - ocaml (enabled via ocaml) +# - perl (enabled via perl) *1 +# - php (enabled via php) *2 +# - python (enabled via python) *1 +# - ruby (enabled via ruby) *1 +# - tcl (enabled via tcl) +# *1 = The ${P}-bindings.patch takes care that those bindings are installed to the right location +# *2 = Those bindings don't build because the paths for the headers/libs aren't +# detected correctly and/or the options passed to swig are wrong (-php instead of -php4/5) + +# There are several other tools in /tclpkg: +# gdtclft, tcldot, tclhandle, tclpathplan, tclstubs ; enabled with: --with-tcl +# tkspline, tkstubs ; enabled with: --with-tk + +# And the commands (/cmd): +# - dot, gvedit, gvpr, smyrna, tools/* :) +# sci-libs/gts can be used for some of these +# - gvedit (via 'qt5'): +# based on ./configure it needs qt-core and qt-gui only +# - smyrna : experimental opengl front-end (via 'smyrna') +# currently disabled -- it segfaults a lot +# needs x11-libs/gtkglext, gnome-base/libglade, media-libs/freeglut +# sci-libs/gts, x11-libs/gtk. Also needs 'gtk','glade','glut','gts' and 'png' +# with flags enabled at configure time + +pkg_setup() { + use guile && guile-single_pkg_setup + use python && python-single-r1_pkg_setup +} + +src_prepare() { + if use guile; then + guile-single_src_prepare + else + default + fi + elibtoolize +} + +src_configure() { + local myconf=( + # Speeds up the libltdl configure + --cache-file="${S}"/config.cache + --enable-ltdl + $(use_enable doc man-pdfs) + $(use_with cairo pangocairo) + $(use_with examples demos '$(docdir)/examples') + $(use_with devil) + $(use_with gtk2 gdk) + $(use_with gtk2 gdk-pixbuf) + $(use_with gtk2) + $(use_with gts) + $(use_with qt5 qt) + $(use_with lasi) + $(use_with pdf poppler) + $(use_with postscript ghostscript) + $(use_with svg rsvg) + $(use_with webp) + $(use_with X x) + --with-digcola + --with-freetype2 + --with-ipsepcola + --with-libgd + --with-sfdp + --without-ming + # New/experimental features, to be tested, disable for now + --without-ipsepcola + --without-smyrna + # Bindings + $(use_enable guile) + $(use_enable perl) + $(use_enable python python3) + $(use_enable ruby) + $(use_enable tcl) + --disable-go + --disable-lua + --disable-java + --disable-ocaml + --disable-php + --disable-python + --disable-r + --disable-sharp + # libtool file collision, bug #276609 + --without-included-ltdl + --disable-ltdl-install + QMAKE=$(usev qt5 qmake5) + ) + # XXX: Temporary bash for bug #926600. It's been reverted upstream + # on master already: + # https://gitlab.com/graphviz/graphviz/-/merge_requests/3636 + CONFIG_SHELL="${BROOT}"/bin/bash econf "${myconf[@]}" +} + +src_install() { + default + + find "${ED}" -name '*.la' -delete || die + + use guile && guile_unstrip_ccache + + use python && python_optimize \ + "${D}"$(python_get_sitedir) \ + "${ED}"/usr/$(get_libdir)/graphviz/python3 +} + +pkg_postinst() { + # We need to register all plugins before they become usable + dot -c || die +} + +pkg_postrm() { + # Remove cruft, bug #547344 + rm -rf "${EROOT}"/usr/$(get_libdir)/graphviz/config{,6} || die +} diff --git a/media-gfx/inkscape/Manifest b/media-gfx/inkscape/Manifest index 2974b881556a..c6017b9a63ec 100644 --- a/media-gfx/inkscape/Manifest +++ b/media-gfx/inkscape/Manifest @@ -1,7 +1,8 @@ AUX inkscape-1.4-gcc15.patch 1088 BLAKE2B 56e9e4e14d87d20d7a03e388105ccdaa219fc26146c771c2c6942ca82abee54fb43d0807ce0ddf59cc77ec6e5184db5e628980209f5eda651ac6ee09af96f74e SHA512 b6f18c645c9946a7052c2d93df1475f1d9db626f200754b767f4372c17e056389c93fc129385d1c9ed3f0e329866696adfb8a61f6e4bc4058c23f20324287072 AUX inkscape-1.4-poppler-24.10-fix-backport.patch 19196 BLAKE2B 02f58958180e2362f1e11a1cbacd72611b37cdaa41abd922df6106ef5485f243ef105286a92727b5731a4d0f607846a3e0a48fa53e3b9542d3667f136fd07f9b SHA512 6283ccd63157bc8ccdcf6127afa72cb50a72a9f09ec2327a5f180f0eb2d212e5600ed0f3d31df845cf6d20c2fe84d01f1edb126f39456a27de36cca616495fb9 AUX inkscape-1.4-poppler-24.11.0.patch 2860 BLAKE2B e22bdc2ba2b394e3a3b5dcaa47297034b3bf0ef5198ad52d858f473ddb3f07b9b74c6ebc440705c0ca5c143dd5a2712cf70a46d0211a197afd909e177a55799f SHA512 e5a21326bc1191a5c037698a89d3022613a840736f0199954a4685027786126cc65f889241cd813d98807168dd3ddd9156b2cb927d62e29087d2cd51d5fd41f3 +AUX inkscape-1.4-poppler-24.12.0.patch 2049 BLAKE2B 23db3612e7c1527394c23de92a4ae25d5120012bfb3f61ddb2d99c282b49f14bee82f25873a8be3e21eff5da55cccfa694317b73726663f9810dbf2060211097 SHA512 99946d8266f818b26993860a96aba32d23d548970b94fe9fc66aefe3bec088c04fae9bdf2f146600f9588e7b4158ac2660e09697e57d7f5d50669d2d56eb4023 DIST inkscape-1.4.tar.xz 46321868 BLAKE2B 3f21402019995122f043f5ebd8f07e1c9548c507f27c494e4214e090c46acae016c21f950609c95cef2e1b0011693e6629326d733b257402391e2d919bcd0303 SHA512 3b81306b81416597073e7eda2a103112cee63493bcf96fa737bb1edfbd682ebb329e415bbbbfda877aef2a78dc376460040ebc5c0cc2c90c0fe60db5d7d12368 -EBUILD inkscape-1.4-r1.ebuild 5842 BLAKE2B fe1a661f60fdbbd5fa7756d983e3894b5518591339a94259967e0bf9c1e31a0b8738698dae019439d3e030c92936aa339e4b360ae660d03a082f6292e1c867d6 SHA512 569d883e4cde2214cb85c93cd9496d3ca30696436be0834c3b5d81166c56f5bdfd5f1f16936cff535385ac5f1c90d090600f3612d4b2662897da124a989856af +EBUILD inkscape-1.4-r1.ebuild 5897 BLAKE2B 270efa14f368ed220b2463ce7f75ce55f8f9cced82f827cf8c0bb82e31f5049e8e56fae3bdfd3139943064d2a0576c0601563a17c9ec90e0d25831cc7649924b SHA512 cb7212c9894cb5e5f5243a3a0eb0bd4d59412a77eda1cf0385686ce1fa0f2ec4dfce70aa97256b8046edebb847232f90ccb6c48aa97e53f20d00d4db3998f3a6 EBUILD inkscape-9999.ebuild 5683 BLAKE2B 9cb6edc014ae7b2f98a7c919ffd5a71a79168e406f4b6a2eb399e59200f9d0aa13990696c7f63b4910546bb02fd2cbd9a317337dfc184151ad6c625a6b105a47 SHA512 9ed2fcf53d8403a81903ecc62c1be47d36d3f8e62a08e7f1956f50fba72c3f241d542f5bcff0d8f3bf323ed668268643331d89dd7b2d9dc8fc1b09ae57818e09 MISC metadata.xml 982 BLAKE2B f44f534865614c8dd7bf71e92ce69cff708fc08e3eb701765bf93144b433ec52df52a506b69cc98969909c695015881b60592cccdf27613c6fe82812fc50727b SHA512 2963a9b473f139d06cefd1c3231ef148045c005adb4688850522c183f39ba15a36331b7eae7752e9bf15a26e6370f2af14ec02e59735f1753246c45821c0cdbc diff --git a/media-gfx/inkscape/files/inkscape-1.4-poppler-24.12.0.patch b/media-gfx/inkscape/files/inkscape-1.4-poppler-24.12.0.patch new file mode 100644 index 000000000000..f4e0a8391b78 --- /dev/null +++ b/media-gfx/inkscape/files/inkscape-1.4-poppler-24.12.0.patch @@ -0,0 +1,53 @@ +From c9046810d899a408bfbd489aad91872b1203ee6d Mon Sep 17 00:00:00 2001 +From: KrIr17 <elendil.krir17@gmail.com> +Date: Thu, 5 Dec 2024 15:03:47 +0100 +Subject: [PATCH] Fix building with poppler 24.12.0 + +Fixes https://gitlab.com/inkscape/inkscape/-/issues/5415 +--- + src/extension/internal/pdfinput/pdf-parser.cpp | 4 +++- + src/extension/internal/pdfinput/poppler-transition-api.h | 6 ++++++ + 2 files changed, 9 insertions(+), 1 deletion(-) + +diff --git a/src/extension/internal/pdfinput/pdf-parser.cpp b/src/extension/internal/pdfinput/pdf-parser.cpp +index 28000a87b0c..9ea30b90a48 100644 +--- a/src/extension/internal/pdfinput/pdf-parser.cpp ++++ b/src/extension/internal/pdfinput/pdf-parser.cpp +@@ -2403,6 +2403,7 @@ void PdfParser::doImage(Object * /*ref*/, Stream *str, GBool inlineImg) + int bits; + GBool interpolate; + StreamColorSpaceMode csMode; ++ GBool hasAlpha; + GBool mask; + GBool invert; + Object maskObj, smaskObj; +@@ -2414,7 +2415,8 @@ void PdfParser::doImage(Object * /*ref*/, Stream *str, GBool inlineImg) + // get info from the stream + bits = 0; + csMode = streamCSNone; +- str->getImageParams(&bits, &csMode); ++ hasAlpha = false; ++ str->_POPPLER_GET_IMAGE_PARAMS(&bits, &csMode, &hasAlpha); + + // get stream dict + dict = str->getDict(); +diff --git a/src/extension/internal/pdfinput/poppler-transition-api.h b/src/extension/internal/pdfinput/poppler-transition-api.h +index 8f03aa17779..b7a54828e74 100644 +--- a/src/extension/internal/pdfinput/poppler-transition-api.h ++++ b/src/extension/internal/pdfinput/poppler-transition-api.h +@@ -39,6 +39,12 @@ + #define _POPPLER_FUNCTION_TYPE_STITCHING 3 + #endif + ++#if POPPLER_CHECK_VERSION(24,12,0) ++#define _POPPLER_GET_IMAGE_PARAMS(bits, csMode, hasAlpha) getImageParams(bits, csMode, hasAlpha) ++#else ++#define _POPPLER_GET_IMAGE_PARAMS(bits, csMode, hasAlpha) getImageParams(bits, csMode) ++#endif ++ + #if POPPLER_CHECK_VERSION(22, 4, 0) + #define _POPPLER_FONTPTR_TO_GFX8(font_ptr) ((Gfx8BitFont *)font_ptr.get()) + #else +-- +GitLab + diff --git a/media-gfx/inkscape/inkscape-1.4-r1.ebuild b/media-gfx/inkscape/inkscape-1.4-r1.ebuild index ad760e5f993d..574250c2b239 100644 --- a/media-gfx/inkscape/inkscape-1.4-r1.ebuild +++ b/media-gfx/inkscape/inkscape-1.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 @@ -116,6 +116,7 @@ PATCHES=( "${FILESDIR}"/${PN}-1.4-gcc15.patch "${FILESDIR}"/${PN}-1.4-poppler-24.10-fix-backport.patch "${FILESDIR}"/${P}-poppler-24.11.0.patch # bug 943499 + "${FILESDIR}"/${P}-poppler-24.12.0.patch # bug 946597 ) pkg_pretend() { diff --git a/media-gfx/kgraphviewer/Manifest b/media-gfx/kgraphviewer/Manifest index 846c2a0723b7..89934b0a6db2 100644 --- a/media-gfx/kgraphviewer/Manifest +++ b/media-gfx/kgraphviewer/Manifest @@ -1,5 +1,5 @@ DIST kgraphviewer-24.08.3.tar.xz 1585380 BLAKE2B fc81b58297565e816ab6b7fae266d0e485b31792ae4796cb3d3ac3b9b51a5494a5209fe8f3176f003d1427cf34587376683c1700c6dc9919fe0caacddf3df4d5 SHA512 2508800733799ce554b929748129610fcc10dae6769de961b58aff4f21fed3260b100004284b472bc4e7b3be2b3bbd860f13215f643a9ff30cef255212f228e6 -DIST kgraphviewer-24.12.0.tar.xz 1590436 BLAKE2B db84f535f9139128e23d9ed69dbd2b1f9e59b57bbca4e8852e0f09832a98d7abdd5e4f076f4b838229e37f96fc7a4638959fd68b271be806633d226d0d0d34cd SHA512 13b37f25a6417e0ff655ff833f8b84060678f0eb91e0333bfab74d81f8759c9a6473cc4332794f531915929101e94bc4aa744288c493c5af15237e69ba2ce805 +DIST kgraphviewer-24.12.1.tar.xz 1590420 BLAKE2B 985b0efcc459de0139ee37cb23f8d6604da1763c00723658274650c8b5121f58a39ee337886d0b7671c85ee3819f1484faa5c62cdca0a5ce7b0c1c45169f1c76 SHA512 652682ba0da3b14a08c4515d0e1d8c32de947eeab248eda3d69bcb0c467e2721acbd0e54bc58313b0793124f943b6b452f7106e5dc23ceac475de14ed5c8918e EBUILD kgraphviewer-24.08.3.ebuild 856 BLAKE2B 4582fdb52e19b6b58df61b9907cc379b8ff44d7a43c06228226c9eb825f3012da511d49903d0a0bc9c42286f991f899fd9adb50ed3d28a11a665f31e7b29e29f SHA512 daa3e65d75ff9821192c5cb0256a8697589a20aeedddd547e93e3f5f6c0716be1b154396add319bf03509f3d53ff067c104cfa50f237103e58b659cf65a731dd -EBUILD kgraphviewer-24.12.0.ebuild 858 BLAKE2B 646c09a2ca50d7064248bff516f456c14467b1409de23ad93fa7b37d73bfba83c6eb6efdd0911af3cc73632804e0a646b4833071e3b8c0cea8074b8a6c50e591 SHA512 eddcaecdc7e6e39ceafe32e40370bdad0d0453bf1906dc036c49a9edc859ca2060847e08ac57bb327f2b2196e19076ab7563feb526b40183c5f2e0718206b8b1 +EBUILD kgraphviewer-24.12.1.ebuild 865 BLAKE2B 980c66ae0f7026419e8a838d5114ddc86348e062630295ee3f4d175e832819d5e69f4657234d4c84d5fd5f2862440ed4a82be5a2f19e9baa9291f47e6493c0c5 SHA512 3e1092162a95b42d594ad4b6d9972ef54cb21bca2f0af5101fc91a5514b130e29d5495cd2b1ab8613ec47f42ec123619e2f935e21093108495d41b847a3ce96c MISC metadata.xml 318 BLAKE2B 922a5e32e706b2976c5f359a14194d268d3f499398576c80ce5fad8c0fcea0fbf048de4480a80a6a1889c88b8b6c14147654a3ab4d5ffbcc258c2290da63f6d1 SHA512 614cb8dda7ad2088e5d6ef39b449bb4be0ac72cd0231c320188d76d1816dce6490c5114bb4798112c4b11d99d30a9e82ff8fcf08ffa8c049589682a5e38208f6 diff --git a/media-gfx/kgraphviewer/kgraphviewer-24.12.0.ebuild b/media-gfx/kgraphviewer/kgraphviewer-24.12.1.ebuild index 43f762c21ad9..c43c182e73d8 100644 --- a/media-gfx/kgraphviewer/kgraphviewer-24.12.0.ebuild +++ b/media-gfx/kgraphviewer/kgraphviewer-24.12.1.ebuild @@ -1,10 +1,10 @@ -# Copyright 1999-2024 Gentoo Authors +# Copyright 1999-2025 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 ECM_HANDBOOK="optional" -KFMIN=6.5.0 +KFMIN=6.7.0 QTMIN=6.7.2 inherit ecm gear.kde.org @@ -13,7 +13,7 @@ HOMEPAGE="https://apps.kde.org/kgraphviewer/" LICENSE="GPL-2 GPL-2+ LGPL-2+ LGPL-2.1+ handbook? ( FDL-1.2 )" SLOT="0" -KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86" +KEYWORDS="~amd64 ~arm64 ~loong ~ppc64 ~riscv ~x86" IUSE="" RDEPEND=" diff --git a/media-gfx/kio-blender-thumbnailer/Manifest b/media-gfx/kio-blender-thumbnailer/Manifest index c7e1087fe9c2..ceaf0abe73de 100644 --- a/media-gfx/kio-blender-thumbnailer/Manifest +++ b/media-gfx/kio-blender-thumbnailer/Manifest @@ -1,7 +1,5 @@ -DIST kdegraphics-thumbnailers-23.08.5.tar.xz 49436 BLAKE2B 943ad7bd93ca5e4d80854869d4d97f7121d259a82062afb7781d1845e94cbc6ea1732aff3d3476eb6db5ffe54f8f97b352ef8977ebdccc2b173594dd3cbccd6f SHA512 77c328e9532fbd12548d4d219d6da2ad369ee14825d3cf5d142ec11afb842640e1fd01e7e1f911147c93e7e93893b9ae10be66b3d568866ed8985b5e5b38663f DIST kdegraphics-thumbnailers-24.08.3.tar.xz 49092 BLAKE2B c42d05fb1fb3e0660bb247a98b4cf30b055ffcc41ba5a441c63173f4db68b4c357dff9cd60bfdfd1849a31e548cce84b4c0ef83db524f5f2715600e15cac9e0e SHA512 23411e41e12be1c4af78ae621ea61976a99d05bd19dbadff399cdfa51e06182d89337c240d728beda376b2ed16c9fa5ad1641629e80b5da00f3a7dadd48c602d -DIST kdegraphics-thumbnailers-24.12.0.tar.xz 49144 BLAKE2B bddb56749f58cd19eb4f367af2bc4ef5d78cccf1a98f47650189ca8596ca05d9b789b8b62bcc068c99c1c569386f01f66b1b7cf4ed587644d0f8b19ef50a1ab9 SHA512 fffb185b063a952a225c64ed6be567f916d36b3e7297be0f9549c19da9f12ed813e6c9031396fde43370725fa5addeaa1f551be9413a5387a5f766aa72da9a17 -EBUILD kio-blender-thumbnailer-23.08.5.ebuild 805 BLAKE2B 6c62037055739d24ed0754228a568269fc7f18da60316caf62744a9bd0e6fa565b134ea985646c771dfaf22ddedaf5f885caeb041f20406255bf9db85a400576 SHA512 175befa64a43a078a05f3c083030b9983a4543e7f6b39ea6d9413030aa924b497e8146415514b0aa8bd2ae1ed793bc6f81c450912a644263fac535b709dcf575 +DIST kdegraphics-thumbnailers-24.12.1.tar.xz 49160 BLAKE2B d41573f1810545164af68af6b51804d49cb2e505fffbc24347e3c364c7629afac18c6bf254f3ee6a85e2aeedcdce9e4dea259d5ceae95236a03cb0575cfa7fee SHA512 b0da43f23b580a1b0a446bd7f96a70bbcf1e2147cb71270de054a0dfcea87a1394732fcc8e35971dd772686ad2c67e487096243ebbb8059431b58b0599d4428b EBUILD kio-blender-thumbnailer-24.08.3.ebuild 803 BLAKE2B ab3a9cd9404387f0620fd3ff28028cad5e760a0d807d2db0506caf8a59226264550198a6db6a18f81a99ae9482ab5f7f49e79775e7909950d18f04d5efa798be SHA512 872129d73a2dedb5b6de704db0c8e80af49e0990f6d443fe0e3407c7d4e6a0db020d0bd545dec7dd8421ed5c88ee08629fe38ed977caef2dfae173d0cd7fd7b1 -EBUILD kio-blender-thumbnailer-24.12.0.ebuild 805 BLAKE2B 292d33b7c285bd150248dbf6edf3d2dd008d2c4342762698d292bead779f5577a9f7af847bbb9d885b7841860b170afb0738b1549b51b3593c33f15ebe791e62 SHA512 d95417a4f56559755373742130874c1a2d18c799cad411001176d2a05e5d1cc190e94c658a9d956050e3710fe60536ed3605b59a3112c005c9bb6adfd3ecce13 +EBUILD kio-blender-thumbnailer-24.12.1.ebuild 812 BLAKE2B d9a537eea54458b6ffbee2b1885aa1568b0c586a2f28ce931aad184ee05bfd021400988d70988eb054bce04f09efe811a913ccdc98f2ca0fdbf42e2b243a32f5 SHA512 c5c3d3267014715a735d060ef5a6ae57b37cb38a523ddddd5159b90ed6e058b9a65aa4b1485604a99ec10bc3ba71266078c0380c3681a25f9826974f107f7e36 MISC metadata.xml 395 BLAKE2B e3794bfe43e720ba54df37c3174ab9754e3c09ff986b80ce66511bf6fb739344eb49d4cf1e6daae63eb13d11deb82407945f48e4dd186905477155a624dd0787 SHA512 50a4cbb59e7411ccbdf6a135877b3103bee5dd58511b9030556df9a076c806032302e02ee067d917ba6b1d7e6a8233d93b3335ac21a14c59c00240150013d6b5 diff --git a/media-gfx/kio-blender-thumbnailer/kio-blender-thumbnailer-23.08.5.ebuild b/media-gfx/kio-blender-thumbnailer/kio-blender-thumbnailer-23.08.5.ebuild deleted file mode 100644 index 5c0f56be9ad1..000000000000 --- a/media-gfx/kio-blender-thumbnailer/kio-blender-thumbnailer-23.08.5.ebuild +++ /dev/null @@ -1,36 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -KDE_ORG_NAME="kdegraphics-thumbnailers" -KFMIN=5.106.0 -QTMIN=5.15.9 -inherit ecm gear.kde.org - -DESCRIPTION="KIO thumbnail generator for Blender files" -HOMEPAGE="https://apps.kde.org/kdegraphics_thumbnailers/" - -LICENSE="GPL-2+" -SLOT="5" -KEYWORDS="amd64 arm64 ~loong ~ppc64 ~riscv x86" - -DEPEND=" - >=dev-qt/qtgui-${QTMIN}:5 - >=kde-frameworks/karchive-${KFMIN}:5 - >=kde-frameworks/kio-${KFMIN}:5 -" -RDEPEND="${DEPEND} - !<kde-apps/thumbnailers-23.08.5-r1:5 -" - -src_configure() { - local mycmakeargs=( - -DBUILD_ps=OFF - -DDISABLE_MOBIPOCKET=ON - -DCMAKE_DISABLE_FIND_PACKAGE_QMobipocket=ON - -DCMAKE_DISABLE_FIND_PACKAGE_KF5KExiv2=ON - -DCMAKE_DISABLE_FIND_PACKAGE_KF5KDcraw=ON - ) - ecm_src_configure -} diff --git a/media-gfx/kio-blender-thumbnailer/kio-blender-thumbnailer-24.12.0.ebuild b/media-gfx/kio-blender-thumbnailer/kio-blender-thumbnailer-24.12.1.ebuild index 5ef7e9c0e3d1..e852be248b99 100644 --- a/media-gfx/kio-blender-thumbnailer/kio-blender-thumbnailer-24.12.0.ebuild +++ b/media-gfx/kio-blender-thumbnailer/kio-blender-thumbnailer-24.12.1.ebuild @@ -1,10 +1,10 @@ -# Copyright 1999-2024 Gentoo Authors +# Copyright 1999-2025 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 KDE_ORG_NAME="kdegraphics-thumbnailers" -KFMIN=6.5.0 +KFMIN=6.7.0 QTMIN=6.7.2 inherit ecm gear.kde.org @@ -13,7 +13,7 @@ HOMEPAGE="https://apps.kde.org/kdegraphics_thumbnailers/" LICENSE="GPL-2+" SLOT="6" -KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86" +KEYWORDS="~amd64 ~arm64 ~loong ~ppc64 ~riscv ~x86" DEPEND=" >=dev-qt/qtbase-${QTMIN}:6[gui] diff --git a/media-gfx/kio-mobi-thumbnailer/Manifest b/media-gfx/kio-mobi-thumbnailer/Manifest index 635de94a5301..ff27994aaea6 100644 --- a/media-gfx/kio-mobi-thumbnailer/Manifest +++ b/media-gfx/kio-mobi-thumbnailer/Manifest @@ -1,7 +1,5 @@ -DIST kdegraphics-thumbnailers-23.08.5.tar.xz 49436 BLAKE2B 943ad7bd93ca5e4d80854869d4d97f7121d259a82062afb7781d1845e94cbc6ea1732aff3d3476eb6db5ffe54f8f97b352ef8977ebdccc2b173594dd3cbccd6f SHA512 77c328e9532fbd12548d4d219d6da2ad369ee14825d3cf5d142ec11afb842640e1fd01e7e1f911147c93e7e93893b9ae10be66b3d568866ed8985b5e5b38663f DIST kdegraphics-thumbnailers-24.08.3.tar.xz 49092 BLAKE2B c42d05fb1fb3e0660bb247a98b4cf30b055ffcc41ba5a441c63173f4db68b4c357dff9cd60bfdfd1849a31e548cce84b4c0ef83db524f5f2715600e15cac9e0e SHA512 23411e41e12be1c4af78ae621ea61976a99d05bd19dbadff399cdfa51e06182d89337c240d728beda376b2ed16c9fa5ad1641629e80b5da00f3a7dadd48c602d -DIST kdegraphics-thumbnailers-24.12.0.tar.xz 49144 BLAKE2B bddb56749f58cd19eb4f367af2bc4ef5d78cccf1a98f47650189ca8596ca05d9b789b8b62bcc068c99c1c569386f01f66b1b7cf4ed587644d0f8b19ef50a1ab9 SHA512 fffb185b063a952a225c64ed6be567f916d36b3e7297be0f9549c19da9f12ed813e6c9031396fde43370725fa5addeaa1f551be9413a5387a5f766aa72da9a17 -EBUILD kio-mobi-thumbnailer-23.08.5.ebuild 850 BLAKE2B 8c1f1669e225adcec3a770a6de72e10f83290f30f85146bb7ea14152f42359ffedaea07c3f994836ddb3ce054bb30ba9f9b39425c87ec8830c42e7bc3584c826 SHA512 365764d72aa52f97e54f7effceda8833444e2a422e45d2cb8e552ffbbda6c27061f95d456694a937612827d8df91a20535710270f6bbb12afbe6e7fc82039cad +DIST kdegraphics-thumbnailers-24.12.1.tar.xz 49160 BLAKE2B d41573f1810545164af68af6b51804d49cb2e505fffbc24347e3c364c7629afac18c6bf254f3ee6a85e2aeedcdce9e4dea259d5ceae95236a03cb0575cfa7fee SHA512 b0da43f23b580a1b0a446bd7f96a70bbcf1e2147cb71270de054a0dfcea87a1394732fcc8e35971dd772686ad2c67e487096243ebbb8059431b58b0599d4428b EBUILD kio-mobi-thumbnailer-24.08.3.ebuild 847 BLAKE2B ecf5b032070fb717134d4efdb74ee340d42422f5bce1888609ecc090dd068f84272bb6d68eb7968dc36de46aee8472c1d29eb07e398af9975a506fc4087090aa SHA512 887a15b96073ab7b2fcc9b5c3dc1733957a5b982c7f428bdd0e686ec3cd1ea2dcc2a0ffd97ee19c068813b70a808fcff3fe7563343ae8c1aa439b4409761c101 -EBUILD kio-mobi-thumbnailer-24.12.0.ebuild 849 BLAKE2B fd575c9e28a0d947c6b29d7bb6ab4c5171740356e1b344251b14431e1147a90a0447e2202367ba058d50f5306a4be9c150a78448fc7b18979df7c667bf345750 SHA512 669682a91742a8939e0e9a0a114aa8e19e332de072da4c6b7367840003f461f17807aae73dbbcbd8157a0d818531fdbbacc70dfe1229886a4a1ecc7e6d1e2b2c +EBUILD kio-mobi-thumbnailer-24.12.1.ebuild 856 BLAKE2B bdba4e19ca63ab22cbde1d6cff6bb53914f12ab21f423287ddd283cc88eb087bbe34508da282f2f81e184ee0571a95c42776776b6babf278da09634dc7064743 SHA512 e1b4654abf5204813a5b40d231ae7c2b0284de4567f9095e0b3c705288aa12e05d0f8183fc21446b1cd9aee3653acc1164dcc309084fa3ede527942c98fbdbe7 MISC metadata.xml 395 BLAKE2B e3794bfe43e720ba54df37c3174ab9754e3c09ff986b80ce66511bf6fb739344eb49d4cf1e6daae63eb13d11deb82407945f48e4dd186905477155a624dd0787 SHA512 50a4cbb59e7411ccbdf6a135877b3103bee5dd58511b9030556df9a076c806032302e02ee067d917ba6b1d7e6a8233d93b3335ac21a14c59c00240150013d6b5 diff --git a/media-gfx/kio-mobi-thumbnailer/kio-mobi-thumbnailer-23.08.5.ebuild b/media-gfx/kio-mobi-thumbnailer/kio-mobi-thumbnailer-23.08.5.ebuild deleted file mode 100644 index 2c151ad528c0..000000000000 --- a/media-gfx/kio-mobi-thumbnailer/kio-mobi-thumbnailer-23.08.5.ebuild +++ /dev/null @@ -1,42 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -KDE_ORG_NAME="kdegraphics-thumbnailers" -PVCUT=$(ver_cut 1-3) -KFMIN=5.106.0 -QTMIN=5.15.9 -inherit ecm gear.kde.org - -DESCRIPTION="KIO thumbnail generator for Mobipocket files" -HOMEPAGE="https://apps.kde.org/kdegraphics_thumbnailers/" - -LICENSE="GPL-2+" -SLOT="5" -KEYWORDS="amd64 arm64 ~loong ~ppc64 ~riscv x86" - -DEPEND=" - >=dev-qt/qtgui-${QTMIN}:5 - >=kde-apps/kdegraphics-mobipocket-${PVCUT}:5 - >=kde-frameworks/kio-${KFMIN}:5 -" -RDEPEND="${DEPEND} - !<kde-apps/thumbnailers-23.08.5-r1:5 -" - -src_prepare() { - ecm_src_prepare - ecm_punt_kf_module Archive -} - -src_configure() { - local mycmakeargs=( - -DBUILD_ps=OFF - -DBUILD_blend=OFF - -DCMAKE_DISABLE_FIND_PACKAGE_KF5KExiv2=ON - -DCMAKE_DISABLE_FIND_PACKAGE_KF5KDcraw=ON - ) - - ecm_src_configure -} diff --git a/media-gfx/kio-mobi-thumbnailer/kio-mobi-thumbnailer-24.12.0.ebuild b/media-gfx/kio-mobi-thumbnailer/kio-mobi-thumbnailer-24.12.1.ebuild index 5333f1b82349..4c05aa88f6cc 100644 --- a/media-gfx/kio-mobi-thumbnailer/kio-mobi-thumbnailer-24.12.0.ebuild +++ b/media-gfx/kio-mobi-thumbnailer/kio-mobi-thumbnailer-24.12.1.ebuild @@ -1,11 +1,11 @@ -# Copyright 1999-2024 Gentoo Authors +# Copyright 1999-2025 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 KDE_ORG_NAME="kdegraphics-thumbnailers" PVCUT=$(ver_cut 1-3) -KFMIN=6.5.0 +KFMIN=6.7.0 QTMIN=6.7.2 inherit ecm gear.kde.org @@ -14,7 +14,7 @@ HOMEPAGE="https://apps.kde.org/kdegraphics_thumbnailers/" LICENSE="GPL-2+" SLOT="6" -KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86" +KEYWORDS="~amd64 ~arm64 ~loong ~ppc64 ~riscv ~x86" DEPEND=" >=dev-qt/qtbase-${QTMIN}:6[gui] diff --git a/media-gfx/kio-ps-thumbnailer/Manifest b/media-gfx/kio-ps-thumbnailer/Manifest index c6dea7f160de..454d081b8646 100644 --- a/media-gfx/kio-ps-thumbnailer/Manifest +++ b/media-gfx/kio-ps-thumbnailer/Manifest @@ -1,7 +1,5 @@ -DIST kdegraphics-thumbnailers-23.08.5.tar.xz 49436 BLAKE2B 943ad7bd93ca5e4d80854869d4d97f7121d259a82062afb7781d1845e94cbc6ea1732aff3d3476eb6db5ffe54f8f97b352ef8977ebdccc2b173594dd3cbccd6f SHA512 77c328e9532fbd12548d4d219d6da2ad369ee14825d3cf5d142ec11afb842640e1fd01e7e1f911147c93e7e93893b9ae10be66b3d568866ed8985b5e5b38663f DIST kdegraphics-thumbnailers-24.08.3.tar.xz 49092 BLAKE2B c42d05fb1fb3e0660bb247a98b4cf30b055ffcc41ba5a441c63173f4db68b4c357dff9cd60bfdfd1849a31e548cce84b4c0ef83db524f5f2715600e15cac9e0e SHA512 23411e41e12be1c4af78ae621ea61976a99d05bd19dbadff399cdfa51e06182d89337c240d728beda376b2ed16c9fa5ad1641629e80b5da00f3a7dadd48c602d -DIST kdegraphics-thumbnailers-24.12.0.tar.xz 49144 BLAKE2B bddb56749f58cd19eb4f367af2bc4ef5d78cccf1a98f47650189ca8596ca05d9b789b8b62bcc068c99c1c569386f01f66b1b7cf4ed587644d0f8b19ef50a1ab9 SHA512 fffb185b063a952a225c64ed6be567f916d36b3e7297be0f9549c19da9f12ed813e6c9031396fde43370725fa5addeaa1f551be9413a5387a5f766aa72da9a17 -EBUILD kio-ps-thumbnailer-23.08.5.ebuild 891 BLAKE2B 3c02646c14ee63032e2324bba9466680881a3ae03f41b8b9b0f1341227a800e3fc8313b2168526984afe6f9dbb1925cc7e4290bbf4bff3f0f6e95e4bcc8ee3c0 SHA512 000aab394868e1a260f6c7065810f727eb6da1bea3a76a56230c1194dc9dfe340982abe56e54a957290754dcaf76032e2c7dac33548cc6893cb972acc8cbe3f3 +DIST kdegraphics-thumbnailers-24.12.1.tar.xz 49160 BLAKE2B d41573f1810545164af68af6b51804d49cb2e505fffbc24347e3c364c7629afac18c6bf254f3ee6a85e2aeedcdce9e4dea259d5ceae95236a03cb0575cfa7fee SHA512 b0da43f23b580a1b0a446bd7f96a70bbcf1e2147cb71270de054a0dfcea87a1394732fcc8e35971dd772686ad2c67e487096243ebbb8059431b58b0599d4428b EBUILD kio-ps-thumbnailer-24.08.3.ebuild 889 BLAKE2B 05b642a21a5aad1aa3b2a9937abaeef4047ca0b616615348eafb3c32f8f4fec90f25edd24fe2769c3a67c9f4a776ddb3a920b0d089de3538518f69f6ec19d3aa SHA512 dc3c3701df8ac4dfd6d2881a8ef5a24cb90d369335aba9308e544c5e2a9dcfc965b98c8078392a79837409f1bc870d279db80758515b6a349153a84d67aae177 -EBUILD kio-ps-thumbnailer-24.12.0.ebuild 891 BLAKE2B 4c5ac8b57474148cf88b291a6242aa71c84a309340b5e249ec0eab583424357e0e0a46d970aa08809a3759e7a26be65fa985f99469a9f9f5651b7a805861ca2b SHA512 7aab6771f812694bb9414c8fb19dfef890f00cac29419b852ae9c70ef0f3dd74d6146f16221762aa8dc4ef191e0262a70b8a5623acad125fc9246d9beaf23403 +EBUILD kio-ps-thumbnailer-24.12.1.ebuild 898 BLAKE2B 3231785b75cf9ea1097a5eb53f4a0f9585595e06d84a50c8d9b58f60371238c2cf18d5bab25371c2bdf998d23e26997ce6b6cf5cfcf5d921d5974cf29be46fd2 SHA512 230f3339972bd147c2e808a5a59ed2575f9217b2fdecd94d3f9e1fcebf90c37a529663d09787c412cf063686e33f96817b4022b9b5bf42f8ddd3a5b6774ec7d3 MISC metadata.xml 395 BLAKE2B e3794bfe43e720ba54df37c3174ab9754e3c09ff986b80ce66511bf6fb739344eb49d4cf1e6daae63eb13d11deb82407945f48e4dd186905477155a624dd0787 SHA512 50a4cbb59e7411ccbdf6a135877b3103bee5dd58511b9030556df9a076c806032302e02ee067d917ba6b1d7e6a8233d93b3335ac21a14c59c00240150013d6b5 diff --git a/media-gfx/kio-ps-thumbnailer/kio-ps-thumbnailer-23.08.5.ebuild b/media-gfx/kio-ps-thumbnailer/kio-ps-thumbnailer-23.08.5.ebuild deleted file mode 100644 index c6e1caecc1b5..000000000000 --- a/media-gfx/kio-ps-thumbnailer/kio-ps-thumbnailer-23.08.5.ebuild +++ /dev/null @@ -1,43 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -KDE_ORG_NAME="kdegraphics-thumbnailers" -KFMIN=5.106.0 -QTMIN=5.15.9 -inherit ecm gear.kde.org - -DESCRIPTION="KIO thumbnail generator for DVI, EPS, PDF and PS files" -HOMEPAGE="https://apps.kde.org/kdegraphics_thumbnailers/" - -LICENSE="GPL-2+" -SLOT="5" -KEYWORDS="amd64 arm64 ~loong ~ppc64 ~riscv x86" - -DEPEND=" - >=dev-qt/qtgui-${QTMIN}:5 - >=kde-frameworks/kio-${KFMIN}:5 -" -RDEPEND="${DEPEND} - !<kde-apps/thumbnailers-23.08.5-r1:5 - app-text/dvipsk - app-text/ghostscript-gpl -" - -src_prepare() { - ecm_src_prepare - ecm_punt_kf_module Archive -} - -src_configure() { - local mycmakeargs=( - -DBUILD_blend=OFF - -DDISABLE_MOBIPOCKET=ON - -DCMAKE_DISABLE_FIND_PACKAGE_QMobipocket=ON - -DCMAKE_DISABLE_FIND_PACKAGE_KF5KExiv2=ON - -DCMAKE_DISABLE_FIND_PACKAGE_KF5KDcraw=ON - ) - - ecm_src_configure -} diff --git a/media-gfx/kio-ps-thumbnailer/kio-ps-thumbnailer-24.12.0.ebuild b/media-gfx/kio-ps-thumbnailer/kio-ps-thumbnailer-24.12.1.ebuild index e0ab87727184..d002dcff1a42 100644 --- a/media-gfx/kio-ps-thumbnailer/kio-ps-thumbnailer-24.12.0.ebuild +++ b/media-gfx/kio-ps-thumbnailer/kio-ps-thumbnailer-24.12.1.ebuild @@ -1,10 +1,10 @@ -# Copyright 1999-2024 Gentoo Authors +# Copyright 1999-2025 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 KDE_ORG_NAME="kdegraphics-thumbnailers" -KFMIN=6.5.0 +KFMIN=6.7.0 QTMIN=6.7.2 inherit ecm gear.kde.org @@ -13,7 +13,7 @@ HOMEPAGE="https://apps.kde.org/kdegraphics_thumbnailers/" LICENSE="GPL-2+" SLOT="6" -KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86" +KEYWORDS="~amd64 ~arm64 ~loong ~ppc64 ~riscv ~x86" DEPEND=" >=dev-qt/qtbase-${QTMIN}:6[gui] diff --git a/media-gfx/kio-raw-thumbnailer/Manifest b/media-gfx/kio-raw-thumbnailer/Manifest index 217bce24d1f1..b43c68f9f6ab 100644 --- a/media-gfx/kio-raw-thumbnailer/Manifest +++ b/media-gfx/kio-raw-thumbnailer/Manifest @@ -1,7 +1,5 @@ -DIST kdegraphics-thumbnailers-23.08.5.tar.xz 49436 BLAKE2B 943ad7bd93ca5e4d80854869d4d97f7121d259a82062afb7781d1845e94cbc6ea1732aff3d3476eb6db5ffe54f8f97b352ef8977ebdccc2b173594dd3cbccd6f SHA512 77c328e9532fbd12548d4d219d6da2ad369ee14825d3cf5d142ec11afb842640e1fd01e7e1f911147c93e7e93893b9ae10be66b3d568866ed8985b5e5b38663f DIST kdegraphics-thumbnailers-24.08.3.tar.xz 49092 BLAKE2B c42d05fb1fb3e0660bb247a98b4cf30b055ffcc41ba5a441c63173f4db68b4c357dff9cd60bfdfd1849a31e548cce84b4c0ef83db524f5f2715600e15cac9e0e SHA512 23411e41e12be1c4af78ae621ea61976a99d05bd19dbadff399cdfa51e06182d89337c240d728beda376b2ed16c9fa5ad1641629e80b5da00f3a7dadd48c602d -DIST kdegraphics-thumbnailers-24.12.0.tar.xz 49144 BLAKE2B bddb56749f58cd19eb4f367af2bc4ef5d78cccf1a98f47650189ca8596ca05d9b789b8b62bcc068c99c1c569386f01f66b1b7cf4ed587644d0f8b19ef50a1ab9 SHA512 fffb185b063a952a225c64ed6be567f916d36b3e7297be0f9549c19da9f12ed813e6c9031396fde43370725fa5addeaa1f551be9413a5387a5f766aa72da9a17 -EBUILD kio-raw-thumbnailer-23.08.5.ebuild 847 BLAKE2B ad607b3ce62e690781508dd78bdbcaaaf7bba07613088d1fc45dc49d2b6ad425cc84647a69ae899ca5d9d479acca0165fdf701a4dce00c8033a747f5bc101476 SHA512 933b3ac994eccf59b1951b54443df89de5b61386ff71a101c4aff16ec022f86df45d542db95f2abda5f4d35327a2ac88afd9996598d3f83b3dd6190688ac029e +DIST kdegraphics-thumbnailers-24.12.1.tar.xz 49160 BLAKE2B d41573f1810545164af68af6b51804d49cb2e505fffbc24347e3c364c7629afac18c6bf254f3ee6a85e2aeedcdce9e4dea259d5ceae95236a03cb0575cfa7fee SHA512 b0da43f23b580a1b0a446bd7f96a70bbcf1e2147cb71270de054a0dfcea87a1394732fcc8e35971dd772686ad2c67e487096243ebbb8059431b58b0599d4428b EBUILD kio-raw-thumbnailer-24.08.3.ebuild 845 BLAKE2B 760ce39feddec65a2080e2d4ca118082de57acc853c60671032045d7415436e7e36e90f8ad931ef36d70f6ea6a8e5f68b61888e08ab3255fb116886773ad5c0e SHA512 87d7584b7f949f93351ac11ae4249cf9d87a4e1a343008c699d992124a22bbcd66453df7d2e2d0d63c9617a7912b8de0084a61cd52f442b62be2906696b64f11 -EBUILD kio-raw-thumbnailer-24.12.0.ebuild 847 BLAKE2B f17933d56e401580dd8073ad355cf4e2abf315d3d595272769c69fcab4566ff5d4a4902098660ed74adb4b911f624c9be56d3ca32b626d6fdb9b4015bc245bfe SHA512 79315aecb999965da39cd092759bfa659f06985130e2dd100ac6a4afb5e2bb2cf4dad6f2054783386b732d22e0c6176cca6c6b5aa84a711c8a9c01a2cc29db41 +EBUILD kio-raw-thumbnailer-24.12.1.ebuild 854 BLAKE2B a98e6870ee93cec42a469ba159d61ff6cb015c09d954137a454a4b83f03de978cceebfaf7baf94c91648145a5e6fa4e22e8e7a4403bc2d0d79e3fcb713724161 SHA512 864a282a758b7e6ed63a9130cfa7e93f460c6294d3d05136526e81d893e9e116f6d7bf973008ca216cfb0c3747a6c462dd23cd4a81b38ba9f4eb9c7923a812e2 MISC metadata.xml 395 BLAKE2B e3794bfe43e720ba54df37c3174ab9754e3c09ff986b80ce66511bf6fb739344eb49d4cf1e6daae63eb13d11deb82407945f48e4dd186905477155a624dd0787 SHA512 50a4cbb59e7411ccbdf6a135877b3103bee5dd58511b9030556df9a076c806032302e02ee067d917ba6b1d7e6a8233d93b3335ac21a14c59c00240150013d6b5 diff --git a/media-gfx/kio-raw-thumbnailer/kio-raw-thumbnailer-23.08.5.ebuild b/media-gfx/kio-raw-thumbnailer/kio-raw-thumbnailer-23.08.5.ebuild deleted file mode 100644 index 632c1da4fcfb..000000000000 --- a/media-gfx/kio-raw-thumbnailer/kio-raw-thumbnailer-23.08.5.ebuild +++ /dev/null @@ -1,43 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -KDE_ORG_NAME="kdegraphics-thumbnailers" -PVCUT=$(ver_cut 1-3) -KFMIN=5.106.0 -QTMIN=5.15.9 -inherit ecm gear.kde.org - -DESCRIPTION="KIO thumbnail generator for RAW files" -HOMEPAGE="https://apps.kde.org/kdegraphics_thumbnailers/" - -LICENSE="GPL-2+" -SLOT="5" -KEYWORDS="amd64 arm64 ~loong ~ppc64 ~riscv x86" - -DEPEND=" - >=dev-qt/qtgui-${QTMIN}:5 - >=kde-apps/libkdcraw-${PVCUT}:5 - >=kde-apps/libkexiv2-${PVCUT}:5 - >=kde-frameworks/kio-${KFMIN}:5 -" -RDEPEND="${DEPEND} - !<kde-apps/thumbnailers-23.08.5-r1:5 -" - -src_prepare() { - ecm_src_prepare - ecm_punt_kf_module Archive -} - -src_configure() { - local mycmakeargs=( - -DBUILD_blend=OFF - -DBUILD_ps=OFF - -DDISABLE_MOBIPOCKET=ON - -DCMAKE_DISABLE_FIND_PACKAGE_QMobipocket=ON - ) - - ecm_src_configure -} diff --git a/media-gfx/kio-raw-thumbnailer/kio-raw-thumbnailer-24.12.0.ebuild b/media-gfx/kio-raw-thumbnailer/kio-raw-thumbnailer-24.12.1.ebuild index 369f5f44090d..339e42401a70 100644 --- a/media-gfx/kio-raw-thumbnailer/kio-raw-thumbnailer-24.12.0.ebuild +++ b/media-gfx/kio-raw-thumbnailer/kio-raw-thumbnailer-24.12.1.ebuild @@ -1,11 +1,11 @@ -# Copyright 1999-2024 Gentoo Authors +# Copyright 1999-2025 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 KDE_ORG_NAME="kdegraphics-thumbnailers" PVCUT=$(ver_cut 1-3) -KFMIN=6.5.0 +KFMIN=6.7.0 QTMIN=6.7.2 inherit ecm gear.kde.org @@ -14,7 +14,7 @@ HOMEPAGE="https://apps.kde.org/kdegraphics_thumbnailers/" LICENSE="GPL-2+" SLOT="6" -KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86" +KEYWORDS="~amd64 ~arm64 ~loong ~ppc64 ~riscv ~x86" DEPEND=" >=dev-qt/qtbase-${QTMIN}:6[gui] diff --git a/media-gfx/kphotoalbum/Manifest b/media-gfx/kphotoalbum/Manifest index 0e1c08e3fefc..e28b5f65dff1 100644 --- a/media-gfx/kphotoalbum/Manifest +++ b/media-gfx/kphotoalbum/Manifest @@ -1,5 +1,5 @@ DIST kphotoalbum-5.13.0.tar.xz 11477268 BLAKE2B 7127b544822aadb73fc94cc660065bab5ac682d2ce60c92d8e2d436de0fedfc06868c5117645141a9c1a0147abec5440bb91b66d923a3af6c23bd8436a77756a SHA512 0e26d0ee3ac94803427c09375325625122fbda2b1ec0974e9b6d5c5fea33f05c95707bc7e42cfc9ed2403003355c3ba55a8b0ada8c32e85d923c4c499aa28b13 -DIST kphotoalbum-6.0.0.tar.xz 11494344 BLAKE2B dea11859df652248b221cc85bf14062c47fa88de04dbccb3f8575bbd10342c5ba67dc171ec3225b4520ea4eeeef7728263a1d3c9bfbb499b9653f938fde30342 SHA512 5a72b9b0df0ff1a3871d636995ad7085ab9b7a3bb210822281cab8e3a52347ef89da4e5a276653e12d8b4ae137d09f136867e696997e0b3b34bdc5119579c952 +DIST kphotoalbum-6.0.1.tar.xz 11526784 BLAKE2B 2ebeb977ed902a66116305d3774f86820efa0eb1676af1f07847fc9374d1e6f51010e8953eafd9b95efd1f5f866b7ef0d1835c7e1cec8ed777e4b045fa52dc6b SHA512 9d0a9e45f32da3f129688b575021a6fff2dd6c0cdb0f8b8c479c33d5243f251d0598e331b8029a9e95d442a9b63cae8a43f2e1232a82b6c6a86daa5d0d6e7690 EBUILD kphotoalbum-5.13.0.ebuild 1885 BLAKE2B 669e5cf5c217083ef7dcb37bb0fed70bab917d605fd40489a85a617ecdc0696cdbcccf60f5fff765a6dd07baf73c9c1e7f900473e21a4365e7d549375b0b6b67 SHA512 19a8fccda02a5a436983f6720410c03ccd720f4fdd9dddcaeecfba3f65fc861092caab52d9a4517193c0a048d20033cf81f12acba3d007295fc9087e7618ce92 -EBUILD kphotoalbum-6.0.0.ebuild 1749 BLAKE2B 32bd5d010754e90b3a776a850eeb56aad3d2edd171636854d0d6c9b20150127f5853a749a046a6d014d58556ddee6ae523126b86cc755b737cf55470fde8089e SHA512 686f9575e560f9acc1641e9b641fa20c7b8216ce718692f677e0e46525164cb1fc651f85927f21e6fd12167e5668d0adc1bd2d48ae1824583f722e012f33129f +EBUILD kphotoalbum-6.0.1.ebuild 1748 BLAKE2B 45f5688f6394e8b5b3455607356b567b5612d105b773a2bca9e0a5d67209fd665a981300333ebffc410a1808e427204c01d48a123491c79a6fd3d7e0de1c0112 SHA512 25ca583786a30de9efe698b891ab63f0c73548696974ea7ad2b117e27f174acc580a9cadc67f47b63292beb7e8524891882994dead4e0436aa3a8ab75e8ac1de MISC metadata.xml 733 BLAKE2B 8925ee0f3c5e6e4d8592c3403781228f00cf39f39b0363920c86091fdb566e43889b522121112cf3f0f857cdb94f2da86cf6dd0029276e990ac197870a0ab718 SHA512 824eed39872862a0502dadf33cfee45ecc269bd0750286157abc08119b49c0fa3abf6ec66eb170a37251e141dd2842563219084a41245dc9b8cfe61fa8ad8a08 diff --git a/media-gfx/kphotoalbum/kphotoalbum-6.0.0.ebuild b/media-gfx/kphotoalbum/kphotoalbum-6.0.1.ebuild index 85ca068712dc..5e84b2de7265 100644 --- a/media-gfx/kphotoalbum/kphotoalbum-6.0.0.ebuild +++ b/media-gfx/kphotoalbum/kphotoalbum-6.0.1.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 @@ -14,7 +14,7 @@ HOMEPAGE="https://www.kphotoalbum.org/" if [[ ${KDE_BUILD_TYPE} != live ]]; then SRC_URI="mirror://kde/stable/${PN}/${PV}/${P}.tar.xz" - KEYWORDS="~amd64 ~x86" + KEYWORDS="amd64 ~x86" fi LICENSE="GPL-2+ FDL-1.2 CC-BY-SA-4.0" diff --git a/media-gfx/kxstitch/Manifest b/media-gfx/kxstitch/Manifest index b821a52a8449..d0a8bea3ba44 100644 --- a/media-gfx/kxstitch/Manifest +++ b/media-gfx/kxstitch/Manifest @@ -1,6 +1,3 @@ -AUX kxstitch-2.2.0-drop-xkeylock.patch 5150 BLAKE2B ebe404416d6c836f2326c31fc9fc76598ef5197a7c1804c1bad80b7bc8606b3884bec11486beeab237c0af875169f89f0af374bbe3a9aa07be6460a28d138f94 SHA512 27dd3d84dfc445cfff4c4927966f413e0b4a5fee462a46fbaec66fa49484a8f4ccb9ed52cc56f43a19f7819fba22f7cf020f754d96d7145da07584609b9eb95f -AUX kxstitch-2.2.0-fix-hidpi.patch 672 BLAKE2B 51f90ea504319a3e558d51c8a5d5eb8166f45880624c3680e3ea5aaad08b43efb6b50c56f6aa1eb95722f3241cafcd57defb9694669efb28fc5a54b24f5467a6 SHA512 e59439e147a57eb7085acf6c7b80cbb891945597add70e517d709f1ca34b8daa45c9f4a73abee825516e090b95ee7ba40ec940d471efad00ee1ae82fc12c6ee5 -AUX kxstitch-2.2.0-fix-render-scaled-painter.patch 7804 BLAKE2B 92d7b6677de47ddda7462e6cdcda96a57460c1540365096a0ab912452c6fc84434bbf2a802dbc881b8392d3222c773e90bfc286b673c9889645c274722d9e965 SHA512 fd1621d2aa789b305bc026a75bed9a0acd64e17e861628673beb4eb4a6f87e56e53a4f28585f056ae8a47d8adbdb3510aa21896d6400af41e1df97f3cc0620f5 -DIST kxstitch-2.2.0.tar.xz 1784360 BLAKE2B 6d06090bb33ccd4db7e8b8a3521b0e1377f253b472cc500862b1b8b0da1abf0d759a85a870b50a1a1f55f385274cdc94761e612a838d93aaffb76191df725150 SHA512 bf09130a35bc605db2bbd6e5e129ac494e8f02b920d4a8d6705b5030a9339306b3b302bd988839e1684da3e5e15e91d655dadf916eb4bf2dc9c1322fd435281d -EBUILD kxstitch-2.2.0-r1.ebuild 1170 BLAKE2B d363e212e1d955dc285b672460fb075d9442f248783e6bd4be3a2c17adce39d29502243dd503edce5c9a4d8d05928ee46b0bab1fc29cbd30c789ab82728c913a SHA512 431b1a42e3919b86c425b0f1b4dbd3d9d37ccd7e3f9fd310a1b6759d6714ec09531e2122ccb3400c8181cf7bdfe0ff1d4170e3f87a605c747837cc8767a352ea +DIST kxstitch-3.0.0_pre20250110-073debc5.tar.gz 2407504 BLAKE2B b564193a21094f25356cc2ef90815c90f975d307ef3fed2468ebf5f2a980e1976e5267a8362bb441ca7e67f4f53e3c64e481c285a243d0c0d5a77ee2b7ae0c41 SHA512 e4888f526c113425efad0a7de5705e5e9b28359ef581dc0445be6492754c61ff689233583907d953298532da025769b99ed2e54c3e9b2f4f7c0688c4265e5533 +EBUILD kxstitch-3.0.0_pre20250110.ebuild 998 BLAKE2B 4d04ec03827d1450b10a89f130333a6728fd0758132db1159ad5edb8eb1bb6ea9ab8775a4ba023d42016dbbf0466f203ce1ad320e912dd0c87207c502e1be796 SHA512 1fc7b296c2703d8e6e61226cea0a72ee86cfc3663944af2b9a4dce698dd89b515108e76712b90cbcade2ee22e0a06318d16301af4af49a867e4fd3425acc9e95 MISC metadata.xml 318 BLAKE2B 922a5e32e706b2976c5f359a14194d268d3f499398576c80ce5fad8c0fcea0fbf048de4480a80a6a1889c88b8b6c14147654a3ab4d5ffbcc258c2290da63f6d1 SHA512 614cb8dda7ad2088e5d6ef39b449bb4be0ac72cd0231c320188d76d1816dce6490c5114bb4798112c4b11d99d30a9e82ff8fcf08ffa8c049589682a5e38208f6 diff --git a/media-gfx/kxstitch/files/kxstitch-2.2.0-drop-xkeylock.patch b/media-gfx/kxstitch/files/kxstitch-2.2.0-drop-xkeylock.patch deleted file mode 100644 index 805a67ea97c8..000000000000 --- a/media-gfx/kxstitch/files/kxstitch-2.2.0-drop-xkeylock.patch +++ /dev/null @@ -1,180 +0,0 @@ -From f97d3eaf4c06b4740fcec63c9c0ca64a5bd56281 Mon Sep 17 00:00:00 2001 -From: Pino Toscano <pino@kde.org> -Date: Sun, 28 Jun 2020 12:01:49 +0200 -Subject: [PATCH] cmake: require KGuiAddons - -It will be used soon. ---- - CMakeLists.txt | 2 ++ - 1 file changed, 2 insertions(+) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 36e3169..7ccf7f0 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -32,6 +32,7 @@ find_package (KF5 REQUIRED COMPONENTS - Config - ConfigWidgets - Completion -+ GuiAddons - I18n - KIO - TextWidgets -@@ -145,6 +146,7 @@ target_link_libraries (kxstitch - Qt5::X11Extras - KF5::Completion - KF5::ConfigGui -+ KF5::GuiAddons - KF5::KIOFileWidgets - KF5::I18n - KF5::TextWidgets --- -GitLab - -From 817be56369a25de4dd12f2548f97e4ebcfb73571 Mon Sep 17 00:00:00 2001 -From: Pino Toscano <pino@kde.org> -Date: Sun, 28 Jun 2020 12:02:34 +0200 -Subject: [PATCH] Switch from XKeyLock to KModifierKeyInfo - -Use KModifierKeyInfo from the KGuiAddons framework to get the status -of keys. In particular, use it to get the status of the Caps Lock key -instead of the local XKeyLock implementation. - -The KModifierKeyInfo object is kept as class member to avoid recreating -it at each key press in Alphabet mode. ---- - src/Editor.cpp | 4 +--- - src/Editor.h | 4 ++++ - 2 files changed, 5 insertions(+), 3 deletions(-) - -diff --git a/src/Editor.cpp b/src/Editor.cpp -index bba0760..163e88e 100644 ---- a/src/Editor.cpp -+++ b/src/Editor.cpp -@@ -46,7 +46,6 @@ - #include "Scale.h" - #include "SchemeManager.h" - #include "TextToolDlg.h" --#include "XKeyLock.h" - - - const Editor::keyPressCallPointer Editor::keyPressCallPointers[] = { -@@ -858,10 +857,9 @@ void Editor::keyPressText(QKeyEvent *e) - - void Editor::keyPressAlphabet(QKeyEvent *e) - { -- XKeyLock keylock(QX11Info::display()); - Qt::KeyboardModifiers modifiers = e->modifiers(); - -- if (keylock.getCapsLock() && Configuration::alphabet_UseCapsLock()) { -+ if (m_keyInfo.isKeyPressed(Qt::Key_CapsLock) && Configuration::alphabet_UseCapsLock()) { - modifiers = static_cast<Qt::KeyboardModifiers>(modifiers ^ Qt::ShiftModifier); - } - -diff --git a/src/Editor.h b/src/Editor.h -index 3189249..8345a38 100644 ---- a/src/Editor.h -+++ b/src/Editor.h -@@ -16,6 +16,8 @@ - #include <QStack> - #include <QWidget> - -+#include <KModifierKeyInfo> -+ - #include "Stitch.h" - - #include "configuration.h" -@@ -337,6 +339,8 @@ private: - QStack<QPoint> m_cursorStack; - QMap<int, int> m_cursorCommands; - -+ KModifierKeyInfo m_keyInfo; -+ - typedef void (Editor::*keyPressCallPointer)(QKeyEvent*); - typedef void (Editor::*toolInitCallPointer)(); - typedef void (Editor::*toolCleanupCallPointer)(); --- -GitLab - -From 17d6a17830ce190cd21f266dd319e36e4865e30a Mon Sep 17 00:00:00 2001 -From: Pino Toscano <pino@kde.org> -Date: Sun, 28 Jun 2020 12:13:37 +0200 -Subject: [PATCH] Drop XKeyLock & X11 leftovers - -XKeyLock is not used anymore, so it can be dropped together with the -X11 and QX11Extras requirements. ---- - CMakeLists.txt | 6 -- - src/Editor.cpp | 1 - - src/XKeyLock.cpp | 202 ----------------------------------------------- - src/XKeyLock.h | 70 ---------------- - 4 files changed, 279 deletions(-) - delete mode 100644 src/XKeyLock.cpp - delete mode 100644 src/XKeyLock.h - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 7ccf7f0..c225859 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -23,7 +23,6 @@ find_package (Qt5 CONFIG REQUIRED - Core - PrintSupport - Widgets -- X11Extras - ) - - find_package (KF5DocTools) -@@ -41,7 +40,6 @@ find_package (KF5 REQUIRED COMPONENTS - ) - - find_package (ImageMagick COMPONENTS MagickCore Magick++ REQUIRED) --find_package (X11 REQUIRED) - find_package (Doxygen) - find_package (SharedMimeInfo) - -@@ -57,7 +55,6 @@ include_directories (BEFORE ${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_CURRENT_SOURCE_D - # only in older cmake versions, while the latter only in newer ones - include_directories (${ImageMagick_Magick++_INCLUDE_DIR} ${ImageMagick_MagickCore_INCLUDE_DIR}) - include_directories (${ImageMagick_Magick++_INCLUDE_DIRS} ${ImageMagick_MagickCore_INCLUDE_DIRS}) --include_directories (${X11_INCLUDE_DIR}) - - set (kxstitch_SRCS - src/BackgroundImage.cpp -@@ -96,7 +93,6 @@ set (kxstitch_SRCS - src/Symbol.cpp - src/SymbolLibrary.cpp - src/SymbolManager.cpp -- src/XKeyLock.cpp - - src/AlphaSelect.cpp - src/CalibrateFlossDlg.cpp -@@ -143,7 +139,6 @@ target_link_libraries (kxstitch - Qt5::Core - Qt5::PrintSupport - Qt5::Widgets -- Qt5::X11Extras - KF5::Completion - KF5::ConfigGui - KF5::GuiAddons -@@ -153,7 +148,6 @@ target_link_libraries (kxstitch - KF5::WidgetsAddons - KF5::XmlGui - ${ImageMagick_Magick++_LIBRARY} ${ImageMagick_MagickCore_LIBRARY} -- ${X11_LIBRARIES} - ) - - set (WITH_PROFILING OFF CACHE BOOL "Build with profiling support") -diff --git a/src/Editor.cpp b/src/Editor.cpp -index 163e88e..4d314e4 100644 ---- a/src/Editor.cpp -+++ b/src/Editor.cpp -@@ -24,7 +24,6 @@ - #include <QScrollArea> - #include <QStyleOptionRubberBand> - #include <QToolTip> --#include <QX11Info> - - #include <KLocalizedString> - #include <KMessageBox> --- -GitLab diff --git a/media-gfx/kxstitch/files/kxstitch-2.2.0-fix-hidpi.patch b/media-gfx/kxstitch/files/kxstitch-2.2.0-fix-hidpi.patch deleted file mode 100644 index bf5d94dae4d6..000000000000 --- a/media-gfx/kxstitch/files/kxstitch-2.2.0-fix-hidpi.patch +++ /dev/null @@ -1,26 +0,0 @@ -From 44d231b5604480601bedc623ca2f5204bd4a3ac8 Mon Sep 17 00:00:00 2001 -From: Nicolas Fella <nicolas.fella@gmx.de> -Date: Sun, 11 Sep 2022 15:55:44 +0200 -Subject: [PATCH] Enable highdpi scaling and pixmaps - ---- - src/Main.cpp | 3 +++ - 1 file changed, 3 insertions(+) - -diff --git a/src/Main.cpp b/src/Main.cpp -index 0af162a..4088d37 100644 ---- a/src/Main.cpp -+++ b/src/Main.cpp -@@ -85,6 +85,9 @@ - */ - int main(int argc, char *argv[]) - { -+ QGuiApplication::setAttribute(Qt::AA_UseHighDpiPixmaps); -+ QGuiApplication::setAttribute(Qt::AA_EnableHighDpiScaling); -+ - QApplication app(argc, argv); - KLocalizedString::setApplicationDomain("kxstitch"); - --- -GitLab - diff --git a/media-gfx/kxstitch/files/kxstitch-2.2.0-fix-render-scaled-painter.patch b/media-gfx/kxstitch/files/kxstitch-2.2.0-fix-render-scaled-painter.patch deleted file mode 100644 index 5b2bc07aa1ed..000000000000 --- a/media-gfx/kxstitch/files/kxstitch-2.2.0-fix-render-scaled-painter.patch +++ /dev/null @@ -1,202 +0,0 @@ -From c9e6a03c32fe6e6901fad8439bf2235ddb8c288c Mon Sep 17 00:00:00 2001 -From: Steve Allewell <steve.allewell@gmail.com> -Date: Sun, 3 Jan 2021 13:43:59 +0000 -Subject: [PATCH] Fix for rendering on scaled painter - -Fixes for rendering seletion areas on scaled painter in recent versions -of Qt which were half a square out. ---- - src/Editor.cpp | 74 ++++++++++++++++++++++++++++---------------------- - 1 file changed, 41 insertions(+), 33 deletions(-) - -diff --git a/src/Editor.cpp b/src/Editor.cpp -index 4d314e4..263df1e 100644 ---- a/src/Editor.cpp -+++ b/src/Editor.cpp -@@ -1388,11 +1388,12 @@ void Editor::renderRubberBandRectangle(QPainter *painter, const QRect&) - if (m_rubberBand.isValid()) { - painter->setRenderHint(QPainter::Qt4CompatiblePainting, true); - -+ painter->resetTransform(); - QStyleOptionRubberBand opt; - opt.initFrom(this); - opt.shape = QRubberBand::Rectangle; - opt.opaque = false; -- opt.rect = m_rubberBand.adjusted(0, 0, 1, 1); -+ opt.rect = rectToContents(m_rubberBand); - - style()->drawControl(QStyle::CE_RubberBand, &opt, painter); - } -@@ -1408,14 +1409,15 @@ void Editor::renderRubberBandEllipse(QPainter *painter, const QRect&) - if (m_rubberBand.isValid()) { - painter->setRenderHint(QPainter::Qt4CompatiblePainting, true); - -- painter->setPen(Qt::NoPen); -- painter->setBrush(QColor(200,225,255)); -- painter->setOpacity(0.5); -- painter->drawEllipse(m_rubberBand); -+ painter->resetTransform(); -+ QStyleOptionRubberBand opt; -+ opt.initFrom(this); - -- painter->setPen(Qt::darkBlue); -- painter->setBrush(Qt::NoBrush); -- painter->drawEllipse(m_rubberBand); -+ painter->setPen(opt.palette.color(QPalette::WindowText)); -+ painter->setBrush(QBrush(opt.palette.color(QPalette::Highlight), Qt::Dense4Pattern)); -+ painter->setBackground(QBrush(opt.palette.base())); -+ painter->setBackgroundMode(Qt::TransparentMode); -+ painter->drawEllipse(rectToContents(m_rubberBand)); - } - - painter->restore(); -@@ -1427,7 +1429,10 @@ void Editor::renderFillPolygon(QPainter *painter, const QRect&) - QPolygonF polyline; - painter->save(); - -- painter->setPen(Qt::green); // use green for the first point -+ QPen pen(Qt::green); -+ pen.setWidth(0); -+ -+ painter->setPen(pen); // use green for the first point - painter->setBrush(Qt::green); - - QVector<QPoint>::const_iterator i; -@@ -1435,7 +1440,8 @@ void Editor::renderFillPolygon(QPainter *painter, const QRect&) - for (i = m_polygon.constBegin() ; i != m_polygon.constEnd() ; ++i) { - QPointF cell = QPointF(*i) + QPointF(0.5, 0.5); - painter->drawEllipse(QRectF(-0.5, -0.5, 1, 1).translated(cell)); -- painter->setPen(Qt::blue); // use blue for subsequent points -+ pen.setColor(Qt::blue); -+ painter->setPen(pen); // use blue for subsequent points - painter->setBrush(Qt::blue); - polyline.append(cell); - } -@@ -1555,9 +1561,9 @@ void Editor::mouseMoveEvent_Draw(QMouseEvent *e) - - dynamic_cast<QScrollArea *>(parentWidget()->parentWidget())->ensureVisible(p.x(), p.y()); - -- m_cellTracking = contentsToCell(p); -- m_cellEnd = m_cellTracking; -- m_rubberBand = QRect(m_cellStart, m_cellEnd).normalized(); -+ m_cellEnd = m_cellTracking = contentsToCell(p); -+ m_rubberBand = QRect(m_cellStart, QSize(1, 1)).united(QRect(m_cellEnd, QSize(1, 1))); -+ - update(); - } - -@@ -1703,9 +1709,9 @@ void Editor::mouseMoveEvent_Rectangle(QMouseEvent *e) - - dynamic_cast<QScrollArea *>(parentWidget()->parentWidget())->ensureVisible(p.x(), p.y()); - -- m_cellTracking = contentsToCell(p); -- m_cellEnd = m_cellTracking; -- m_rubberBand = QRect(m_cellStart, m_cellEnd).normalized(); -+ m_cellEnd = m_cellTracking = contentsToCell(p); -+ m_rubberBand = QRect(m_cellStart, QSize(1, 1)).united(QRect(m_cellEnd, QSize(1, 1))); -+ - update(); - } - -@@ -1757,9 +1763,9 @@ void Editor::mouseMoveEvent_FillRectangle(QMouseEvent *e) - - dynamic_cast<QScrollArea *>(parentWidget()->parentWidget())->ensureVisible(p.x(), p.y()); - -- m_cellTracking = contentsToCell(p); -- m_cellEnd = m_cellTracking; -- m_rubberBand = QRect(m_cellStart, m_cellEnd).normalized(); -+ m_cellEnd = m_cellTracking = contentsToCell(p); -+ m_rubberBand = QRect(m_cellStart, QSize(1, 1)).united(QRect(m_cellEnd, QSize(1, 1))); -+ - update(); - } - -@@ -1793,9 +1799,9 @@ void Editor::mouseMoveEvent_Ellipse(QMouseEvent *e) - - dynamic_cast<QScrollArea *>(parentWidget()->parentWidget())->ensureVisible(p.x(), p.y()); - -- m_cellTracking = contentsToCell(p); -- m_cellEnd = m_cellTracking; -- m_rubberBand = QRect(m_cellStart, m_cellEnd).normalized(); -+ m_cellEnd = m_cellTracking = contentsToCell(p); -+ m_rubberBand = QRect(m_cellStart, QSize(1, 1)).united(QRect(m_cellEnd, QSize(1, 1))); -+ - update(); - } - -@@ -1848,9 +1854,9 @@ void Editor::mouseMoveEvent_FillEllipse(QMouseEvent *e) - - dynamic_cast<QScrollArea *>(parentWidget()->parentWidget())->ensureVisible(p.x(), p.y()); - -- m_cellTracking = contentsToCell(p); -- m_cellEnd = m_cellTracking; -- m_rubberBand = QRect(m_cellStart, m_cellEnd).normalized(); -+ m_cellEnd = m_cellTracking = contentsToCell(p); -+ m_rubberBand = QRect(m_cellStart, QSize(1, 1)).united(QRect(m_cellEnd, QSize(1, 1))); -+ - update(); - } - -@@ -1877,7 +1883,7 @@ void Editor::mouseReleaseEvent_FillEllipse(QMouseEvent*) - painter.setRenderHint(QPainter::Antialiasing, !useFractionals); - painter.setPen(QPen(Qt::color1)); - painter.setBrush(Qt::color1); -- painter.drawEllipse(QRect(m_cellStart, m_cellEnd).normalized()); -+ painter.drawEllipse(QRect(m_cellStart, QSize(1,1)).united(QRect(m_cellEnd, QSize(1, 1)))); - painter.end(); - - QUndoCommand *cmd = new FillEllipseCommand(m_document); -@@ -1894,6 +1900,7 @@ void Editor::mousePressEvent_FillPolygon(QMouseEvent *e) - { - m_cellStart = m_cellTracking = m_cellEnd = contentsToCell(e->pos()); - m_polygon.append(m_cellStart); -+ - update(); - } - -@@ -2001,6 +2008,7 @@ void Editor::mouseReleaseEvent_Alphabet(QMouseEvent *e) - - m_cellStart = m_cellTracking = m_cellEnd = contentsToCell(e->pos()); - m_cursorStack.push(m_cellEnd); -+ - update(); - } - -@@ -2023,9 +2031,9 @@ void Editor::mouseMoveEvent_Select(QMouseEvent *e) - - dynamic_cast<QScrollArea *>(parentWidget()->parentWidget())->ensureVisible(p.x(), p.y()); - -- m_cellTracking = contentsToCell(p); -- m_cellEnd = m_cellTracking; -- m_rubberBand = QRect(m_cellStart, m_cellEnd).normalized(); -+ m_cellEnd = m_cellTracking = contentsToCell(p); -+ m_rubberBand = QRect(m_cellStart, QSize(1, 1)).united(QRect(m_cellEnd, QSize(1, 1))); -+ - update(); - - QToolTip::showText(QCursor::pos(), QString::fromLatin1("%1,%2 %3 x %4").arg(m_rubberBand.left()).arg(m_rubberBand.top()).arg(m_rubberBand.width()).arg(m_rubberBand.height())); -@@ -2034,7 +2042,7 @@ void Editor::mouseMoveEvent_Select(QMouseEvent *e) - - void Editor::mouseReleaseEvent_Select(QMouseEvent*) - { -- m_selectionArea = QRect(m_cellStart, m_cellEnd).normalized(); -+ m_selectionArea = m_rubberBand; - emit(selectionMade(true)); - } - -@@ -2052,9 +2060,9 @@ void Editor::mouseMoveEvent_Backstitch(QMouseEvent *e) - - dynamic_cast<QScrollArea *>(parentWidget()->parentWidget())->ensureVisible(p.x(), p.y()); - -- m_cellTracking = contentsToSnap(p); -- m_cellEnd = m_cellTracking; -- m_rubberBand = (snapToCells(m_cellStart).united(snapToCells(m_cellEnd))).normalized(); -+ m_cellEnd = m_cellTracking = contentsToSnap(p); -+ m_rubberBand = snapToCells(m_cellStart).united(snapToCells(m_cellEnd)); -+ - update(); - } - --- -GitLab - diff --git a/media-gfx/kxstitch/kxstitch-2.2.0-r1.ebuild b/media-gfx/kxstitch/kxstitch-2.2.0-r1.ebuild deleted file mode 100644 index 927de1cf02ef..000000000000 --- a/media-gfx/kxstitch/kxstitch-2.2.0-r1.ebuild +++ /dev/null @@ -1,44 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -ECM_HANDBOOK="forceoptional" -KFMIN=5.82.0 -QTMIN=5.15.5 -inherit ecm kde.org - -DESCRIPTION="Program to create cross stitch patterns" -HOMEPAGE="https://apps.kde.org/kxstitch/ https://userbase.kde.org/KXStitch" -SRC_URI="mirror://kde/stable/${PN}/${PV}/${P}.tar.xz" - -LICENSE="GPL-2+" -SLOT="5" -KEYWORDS="~amd64" -IUSE="" - -DEPEND=" - >=dev-qt/qtgui-${QTMIN}:5 - >=dev-qt/qtprintsupport-${QTMIN}:5 - >=dev-qt/qtwidgets-${QTMIN}:5 - >=dev-qt/qtxml-${QTMIN}:5 - >=kde-frameworks/kcompletion-${KFMIN}:5 - >=kde-frameworks/kconfig-${KFMIN}:5 - >=kde-frameworks/kconfigwidgets-${KFMIN}:5 - >=kde-frameworks/kcoreaddons-${KFMIN}:5 - >=kde-frameworks/kguiaddons-${KFMIN}:5 - >=kde-frameworks/ki18n-${KFMIN}:5 - >=kde-frameworks/kio-${KFMIN}:5 - >=kde-frameworks/ktextwidgets-${KFMIN}:5 - >=kde-frameworks/kwidgetsaddons-${KFMIN}:5 - >=kde-frameworks/kxmlgui-${KFMIN}:5 - media-gfx/imagemagick[cxx] -" -RDEPEND="${DEPEND}" -BDEPEND="sys-devel/gettext" - -PATCHES=( - "${FILESDIR}/${P}-drop-xkeylock.patch" - "${FILESDIR}/${P}-fix-render-scaled-painter.patch" - "${FILESDIR}/${P}-fix-hidpi.patch" -) diff --git a/media-gfx/kxstitch/kxstitch-3.0.0_pre20250110.ebuild b/media-gfx/kxstitch/kxstitch-3.0.0_pre20250110.ebuild new file mode 100644 index 000000000000..3a9523862ca1 --- /dev/null +++ b/media-gfx/kxstitch/kxstitch-3.0.0_pre20250110.ebuild @@ -0,0 +1,40 @@ +# Copyright 1999-2025 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +KDE_ORG_COMMIT=073debc567d0d6e14bbe560b2322dd1571520a96 +ECM_HANDBOOK="forceoptional" +KFMIN=6.5.0 +QTMIN=6.7.2 +inherit ecm kde.org + +DESCRIPTION="Program to create cross stitch patterns" +HOMEPAGE="https://apps.kde.org/kxstitch/ https://userbase.kde.org/KXStitch" + +LICENSE="GPL-2+" +SLOT="0" +KEYWORDS="~amd64" +IUSE="" + +DEPEND=" + >=dev-qt/qtbase-${QTMIN}:6[gui,widgets,xml] + >=kde-frameworks/kcompletion-${KFMIN}:6 + >=kde-frameworks/kconfig-${KFMIN}:6 + >=kde-frameworks/kconfigwidgets-${KFMIN}:6 + >=kde-frameworks/kcoreaddons-${KFMIN}:6 + >=kde-frameworks/kguiaddons-${KFMIN}:6 + >=kde-frameworks/ki18n-${KFMIN}:6 + >=kde-frameworks/kio-${KFMIN}:6 + >=kde-frameworks/ktextwidgets-${KFMIN}:6 + >=kde-frameworks/kwidgetsaddons-${KFMIN}:6 + >=kde-frameworks/kxmlgui-${KFMIN}:6 + media-gfx/imagemagick[cxx] +" +RDEPEND="${DEPEND} + !${CATEGORY}/${PN}:5 +" +BDEPEND=" + sys-devel/gettext + virtual/pkgconfig +" diff --git a/media-gfx/librecad/Manifest b/media-gfx/librecad/Manifest index 9d484e14a9ad..c86d4c3f66fd 100644 --- a/media-gfx/librecad/Manifest +++ b/media-gfx/librecad/Manifest @@ -1,4 +1,6 @@ DIST librecad-2.2.0.2.tar.gz 13645528 BLAKE2B 43a9ada4d6fe8c0cb96dc1003a9e7aa3b4d21619ce9776de1e6d273dd884f2313f9e90abed9cadcd44aaac2131bb62ffb0105bc0d8a097513ac42b9886107021 SHA512 054c6e6cf35a30099e71dd022574864c42d99db8bfa73b544113573723f8e6db2c92f9b7a827b947528f8ad9c743bca73a77a81bc50a9dc66f290480bb38db05 +DIST librecad-2.2.1.tar.gz 14107087 BLAKE2B 44c7960b79348515661fb59ae9c04949e8ff51282e80ce8335ca4679c74880552d229afcd3cc63d36fe75e06ce7d2dfce399c75f3cb1786448b487765b8966db SHA512 6a76d846e812fbed185c87e0e8362f7c429f9bd78bf739f19bcb12f1f88e5be944e48a38427820907826adec8d33204b7ce51ca2fbacecd0f7b39c6cab09687c EBUILD librecad-2.2.0.2.ebuild 2355 BLAKE2B 16afc5c397a9d304a21542c1e642097c591997db0bd44816ac6a20c62ab9c9e59db6496d9c985d68279e1507ca8f53fe787a27d5b166c09de2881c6fe49529b9 SHA512 22bdefe9263b512008c74df3e272173a5b9dadaf782da131ffbdcf04984ab671e1250d1c1f274f2e8a7d11624a8d9a17a60a701b9a1b08a2b5de9cbee8ac839f +EBUILD librecad-2.2.1.ebuild 2369 BLAKE2B 4ed84f85078501e8735c3746d86db01d04be198a2aed22daa7110fff4a7acd1c0de81d1cfda1a1a6fbf78d4f2f0a15a49f7bd4cb3472629f93d1da576a05119e SHA512 f465053fce4f5ce13addaac32a89b6fc1cfcfcaa59622c2b80e77cc2709a177b0de26d2644d1ff69bb3b8f76406dd90beea87f88c189bf8146dd9ab234e75396 EBUILD librecad-9999.ebuild 2342 BLAKE2B 435e4e8c7d5d7e3c1fd3338b98bda4617cc1b246a0670bcda542d0e061593d4da6a176bdddc7508cf543121a42a7ae72c04948c52176a731da67f756b153c38b SHA512 6b3c27abf552b61ce21b30605ef31015a557424679940281a1516ec3f9f5ca296289896fbcc08f15764e8a9a6ef653ceb2e4672538d01b48f708b030af2f0c0e MISC metadata.xml 333 BLAKE2B 2790ea3fb043f1d8393fd715b4669edab3229e1de59e27cc70f3fd3cc13f83964ad1dc6a5534af981111b4ba1a2c7d29501015459e300905574fbc59fce88ee2 SHA512 bf932b64f53780d10e7e64845f4d50f1726f9d57e4625cb94ed2dcc761a0d7f409731b9e9cd1475880b283b43d7b0b979493b984cb243f09954a38f39baac5b9 diff --git a/media-gfx/librecad/librecad-2.2.1.ebuild b/media-gfx/librecad/librecad-2.2.1.ebuild new file mode 100644 index 000000000000..c143a61d0fa3 --- /dev/null +++ b/media-gfx/librecad/librecad-2.2.1.ebuild @@ -0,0 +1,85 @@ +# Copyright 1999-2025 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 +PLOCALES="ar ca cs da de el en en_au es es_ar es_bo es_cl es_co es_cr es_do es_ec es_gt es_hn es_mx es_ni es_pa es_pe es_pr es_py es_sv es_us es_uy es_ve et eu fi fr gl he hi hu id_ID it ja ka ko lv mk nl no pa pl pt_br pt_pt ro_ro ru sk sl sq_al sr sv ta th tr uk zh_cn zh_tw" + +inherit desktop edo plocale qmake-utils + +DESCRIPTION="Generic 2D CAD program" +HOMEPAGE="https://www.librecad.org/" + +if [[ ${PV} == *9999* ]]; then + EGIT_REPO_URI="https://github.com/LibreCAD/LibreCAD.git" + inherit git-r3 +else + SRC_URI="https://github.com/LibreCAD/LibreCAD/archive/${PV/_/}.tar.gz -> ${P}.tar.gz" + S="${WORKDIR}/LibreCAD-${PV}" + KEYWORDS="~amd64 ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux" +fi + +LICENSE="GPL-2" +SLOT="0" +IUSE="debug doc tools" + +RDEPEND=" + dev-cpp/muParser + dev-libs/boost:= + dev-qt/qtcore:5 + dev-qt/qtgui:5 + dev-qt/qtprintsupport:5 + dev-qt/qtsvg:5 + dev-qt/qtwidgets:5 + media-libs/freetype:2 +" +DEPEND="${RDEPEND} + dev-qt/qthelp:5 + dev-qt/qtxml:5 +" +BDEPEND=" + dev-qt/linguist-tools:5 +" + +src_prepare() { + default + + # Stock script doesn't work correctly on gentoo (see bug #847394) + # and also it compiles all translations regardles of selected locales. + # To avoid this just comment out locale building and do it manually + sed -i -e '/LRELEASE/s!^!# !' scripts/postprocess-unix.sh || die + + plocale_find_changes 'librecad/ts' 'librecad_' '.ts' +} + +src_configure() { + eqmake5 -r +} + +src_compile() { + default + + build_locale() { + local lrelease="$(qt5_get_bindir)/lrelease" + edo "${lrelease}" "librecad/ts/librecad_${1}.ts" \ + -qm "unix/resources/qm/librecad_${1}.qm" + edo "${lrelease}" "plugins/ts/plugins_${1}.ts" \ + -qm "unix/resources/qm/plugins_${1}.qm" + } + + plocale_for_each_locale build_locale + # We want the en locale to be always present. Otherwise it could + # be impossible to select the English command set which is quite crucial. + has en $(plocale_get_locales) || build_locale en +} + +src_install() { + dobin unix/librecad + use tools && dobin unix/ttf2lff + insinto /usr/share/${PN} + doins -r unix/resources/* + use doc && docinto html && dodoc -r librecad/support/doc/* + insinto /usr/share/metainfo + doins unix/appdata/org.librecad.librecad.appdata.xml + doicon librecad/res/main/${PN}.png + make_desktop_entry ${PN} LibreCAD ${PN} Graphics +} diff --git a/media-gfx/libredwg/Manifest b/media-gfx/libredwg/Manifest index a77bdcb1b282..c2bd645563aa 100644 --- a/media-gfx/libredwg/Manifest +++ b/media-gfx/libredwg/Manifest @@ -3,6 +3,6 @@ DIST libredwg-0.13.3.tar.gz 20749296 BLAKE2B c39a98dab385a2d2a1603eff6347a9c91ba DIST libredwg-0.13.tar.gz 20613784 BLAKE2B 26bab07b651b75b483b5211c77610a7d0af1f6adaca956a5766a6602c6c7e07fe0be3ec976a2119920c3d2df92c827cd9a9632563a91b4467159adb941ca39f7 SHA512 11585b4dcf83c2304e01010f68eb03da14c8d6affef944254a30067acb981d7f02507a932ad4509dfd65252e43d19c22966cc51945621764c4283daf0a1f0ab4 DIST libredwg-85695f3d5903b1cd5b4030efe50db3b4f5f3c928.tar.gz 12597 BLAKE2B cd01f6c446d5d129545fdae07c0101d133e1f4e69ee62e94c27c3c2853dcc30854f40aed0c6f38f6594c5f5eb9e7b2d18d3b2e4f487b7bf1a3f7f39facde38bc SHA512 1d08cfa6216e0fe671dab77a0bd0b4ef0c4eb174878eba909c680e0ee93a82079b3cbf60afe2de7b0078258de8bcc588961e59cf0c14fe5f2d1f70db639ef95a EBUILD libredwg-0.13.2.ebuild 2813 BLAKE2B 88933e9a647f6954e1e504b616c572c30b13a612ede54f86ff38f2a67e0728a41b2a151d1e5d3916280dc448ae08f8316b234da44b2abbd193c413e1c2723b62 SHA512 06a0ca942dfffd4b9a4f2df5cae242b039bbb5feb6ccc376a6cf9722f00ff052582d194f9ef4f55bf194dc52051585c14a718bb2b53406c5513ba6c1a4ace364 -EBUILD libredwg-0.13.3.ebuild 2724 BLAKE2B 5f0e1520b66eb3a12c650efa59677384a36b841d5bdf9b650da251833388829b01f26a6307c9bcf9a3df8b440ae13420cc1ef1fb595e06197b6d614b5f8a9537 SHA512 a1773d22cc71bd0930997757675fa3331aa02e3864bfe519f70919bd208497744ee4df6cde9741993b5ad6786758adcd9f4cbec5975df2837f2cc65cab2ae587 +EBUILD libredwg-0.13.3.ebuild 2724 BLAKE2B f6dc32a5c572a2a53389834d36d82607224c40ffde60f8aff5daf6e7ef29fac8af119b92b6ef4a1582041da75b4f8dc7fc7394d4bf7fa122f3b3a02288b6003a SHA512 639d5e51ae48002abe937a6fd75af3810f1fa2fabe42e2422386be4052359a5a1d61fe91d41fd0a1c4f1368ee373c7d2d5fa860b1d28804565e44fea237e76fe EBUILD libredwg-0.13.ebuild 2813 BLAKE2B 88933e9a647f6954e1e504b616c572c30b13a612ede54f86ff38f2a67e0728a41b2a151d1e5d3916280dc448ae08f8316b234da44b2abbd193c413e1c2723b62 SHA512 06a0ca942dfffd4b9a4f2df5cae242b039bbb5feb6ccc376a6cf9722f00ff052582d194f9ef4f55bf194dc52051585c14a718bb2b53406c5513ba6c1a4ace364 MISC metadata.xml 393 BLAKE2B 1c2dea49ad5b1502581fd144de4e1cf28bd6321c753b55c4aa8a1186138bfc6a6235d3dd19c48f9cfa5401e2bd7744822bef69187006afeda1f7e06f5f618d84 SHA512 2d65dfd97a0be9c12bce52ea43a4944c403988b9367c5f827ed62979f1d44d14d6bfc95715791db2bcbb022489146833a590b8471d178703d3d354b9489508cd diff --git a/media-gfx/libredwg/libredwg-0.13.3.ebuild b/media-gfx/libredwg/libredwg-0.13.3.ebuild index a1827a8c7b45..1f179a250623 100644 --- a/media-gfx/libredwg/libredwg-0.13.3.ebuild +++ b/media-gfx/libredwg/libredwg-0.13.3.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2024 Gentoo Authors +# Copyright 1999-2025 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 -PYTHON_COMPAT=( python3_{10..12} ) +PYTHON_COMPAT=( python3_{10..13} ) DOCS_BUILDER="doxygen" # File is hardcoded to be run from ../ so we use this instead of DOCS_DIR DOCS_CONFIG_NAME="doc/Doxyfile" @@ -23,12 +23,12 @@ LICENSE="GPL-3+ MIT" SLOT="0" KEYWORDS="~amd64" -# https://github.com/LibreDWG/libredwg/issues/342 -RESTRICT="test" - IUSE="debug python perl static-libs" REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" +# https://github.com/LibreDWG/libredwg/issues/342 +RESTRICT="test" + RDEPEND=" python? ( ${PYTHON_DEPS} ) perl? ( dev-lang/perl ) diff --git a/media-gfx/mandelbulber/Manifest b/media-gfx/mandelbulber/Manifest index af442ef23165..c82775ce786f 100644 --- a/media-gfx/mandelbulber/Manifest +++ b/media-gfx/mandelbulber/Manifest @@ -1,3 +1,3 @@ -DIST mandelbulber2-2.31.tar.gz 133379945 BLAKE2B c7b4cfa151f3bf0161b5871d0b22cd05567edc5a7145d64f38c4059b1f4b6f19f1ac3285d7a60cfb2979cd98f10041b7c7dd9100dab9ec93258e567034a03d63 SHA512 cf70c73f80c89731da6711af6ad6e1be33d43d7b014e16a6516eabf22d39b49469ee3e7b4ecc5e5adad3a1b26c8c1892c1a82d5891fe2b71fe524cdd1c3460c7 -EBUILD mandelbulber-2.31.ebuild 1868 BLAKE2B 941e1c9659c9790cbba07264d52c887a90e1ec9ee3f5bf02ed52d1398a0b9e9508ea8a3daf6aa65a9ca59a805eb18b814ca285118a609624086a5229141a5151 SHA512 c0d651bacb929937bab45e7700f8d697d97e8f4bc8370ab0bb800a8360d3bced36cc040cf582312efab36284cbcca4ac16659b8ebab47e6da581857a2ceda713 +DIST mandelbulber2-2.32.tar.gz 134765742 BLAKE2B a43ab2e445a65901190c42d6afb947e94d322ddb41f179a9a4763feee8ae5b8e510c2ab6f842b7f17b5b800184a73088b2a3ee4b8d359ffa5e15159eb7f957ad SHA512 f42cebd4939a7d1216c1c09f669bf3bf244e249a8428c02919a735959a5dd91c8614313d21b25cb6f26acd5f7d711287e3c10239c143f542887706f4f970fff4 +EBUILD mandelbulber-2.32.ebuild 1836 BLAKE2B 0f1b10b8948dd3de901810cc1635f6352fe4a932009cd834a1812c1d33772988f60772b403372d6cd9f75e27010d943eaca13e3bb428dda82b18015f04adc182 SHA512 706d1ef002d5268897e9b32df73582eb25d085d85cdb1e4414b30505665f43fcf2c6282cb2aa4b5b680184d59584bdcf4f1795d5155c87ad7b553a8dfa8772a7 MISC metadata.xml 672 BLAKE2B 8b7d423df1cd3f405b43bbeea9f6de9438951cf55b2020016b3174376e5498f2bc903295afde6626bf342b77050210eec78db8672cf2555f344f12248f1e58be SHA512 4005cd3324e642b6ea382e992949c1a3f459cef6f6094eb896e58fbc5651cd1d88c6575ef76896673bd0589e46285d3df9858a110f9b4b4c867c797a329dee77 diff --git a/media-gfx/mandelbulber/mandelbulber-2.31.ebuild b/media-gfx/mandelbulber/mandelbulber-2.32.ebuild index 97b894bb80c0..328c2a2bef17 100644 --- a/media-gfx/mandelbulber/mandelbulber-2.31.ebuild +++ b/media-gfx/mandelbulber/mandelbulber-2.32.ebuild @@ -8,26 +8,23 @@ inherit desktop qmake-utils toolchain-funcs xdg DESCRIPTION="Tool to render 3D fractals" HOMEPAGE="https://www.mandelbulber.com" -SRC_URI="https://github.com/buddhi1980/${PN}2/releases/download/${PV}/${MY_P}.tar.gz https://downloads.sourceforge.net/${PN}/${MY_P}.tar.gz" +SRC_URI="https://github.com/buddhi1980/${PN}2/releases/download/${PV}/${MY_P}.tar.gz + https://downloads.sourceforge.net/${PN}/${MY_P}.tar.gz" S="${WORKDIR}"/${MY_P} LICENSE="CC-BY-4.0 GPL-3+" SLOT="0" KEYWORDS="~amd64 ~x86" -IUSE="joystick opencl openexr sndfile tiff" +IUSE="opencl openexr sndfile tiff" +# IUSE="joystick" +# joystick? ( dev-qt/qtgamepad:6 ) RDEPEND=" dev-libs/lzo - dev-qt/qtcore:5 - dev-qt/qtconcurrent:5 - dev-qt/qtgui:5 - dev-qt/qtmultimedia:5[qml] - dev-qt/qtnetwork:5 - dev-qt/qttest:5 - dev-qt/qtwidgets:5 + dev-qt/qtbase:6[concurrent,gui,network,widgets] + dev-qt/qtmultimedia:6[qml] media-libs/libpng:= sci-libs/gsl:= - joystick? ( dev-qt/qtgamepad:5 ) opencl? ( dev-cpp/clhpp virtual/opencl @@ -40,7 +37,7 @@ RDEPEND=" tiff? ( media-libs/tiff:= ) " DEPEND="${RDEPEND} - dev-qt/designer:5 + dev-qt/qttools:6[designer] " BDEPEND="virtual/pkgconfig" @@ -55,7 +52,7 @@ pkg_setup() { src_prepare() { default - use joystick || sed -i -e "s/qtHaveModule(gamepad)/false/" makefiles/common.pri || die + sed -i -e "s/qtHaveModule(gamepad)/false/" makefiles/common.pri || die # TODO: dev-qt/qtgamepad:6 use openexr || sed -i -e "s/packagesExist(OpenEXR)/false/" makefiles/common.pri || die use sndfile || sed -i -e "s/packagesExist(sndfile)/false/" makefiles/common.pri || die use tiff || sed -i -e "s/packagesExist(libtiff-4)/false/" makefiles/common.pri || die @@ -63,9 +60,9 @@ src_prepare() { src_configure() { if use opencl; then - eqmake5 makefiles/${PN}-opencl.pro + eqmake6 makefiles/${PN}-opencl.pro else - eqmake5 makefiles/${PN}.pro + eqmake6 makefiles/${PN}.pro fi } diff --git a/media-gfx/monica/Manifest b/media-gfx/monica/Manifest index 267158b06f53..4282c88c2ef3 100644 --- a/media-gfx/monica/Manifest +++ b/media-gfx/monica/Manifest @@ -3,5 +3,5 @@ AUX monica-3.7-fprintf.patch 1835 BLAKE2B 06dedaded7424ced057b8b2298584e0d71c771 AUX monica-3.7-gcc44.patch 341 BLAKE2B c534884cca357cbc37a0092bb42faa9a3f29165e0e5622d811d08f4238a2d716f91a8ce731438a33323dd350e3b9da79e743b7d3f46fc5ba9eb084b14f359bd4 SHA512 837f3fc2c77d415067460f1aae80807daa9882b814494f2305be711db920a750ae183ec7b456527956b60ca3cf022729524990cd0febafeaab41bd1dbb080bfb AUX monica-3.7-makefile-cleanup.patch 921 BLAKE2B af1492ec9cd83971c34fe571b17ebfdde6223c14ffdef51148cdac2dd58ef78f283ff5160d88fce0c6eb022bcd46c65af5e4069ff590ad8954f65d6e416fbe72 SHA512 9e8a1d12bc9c97b86e6f613d8ea3a06d8ab318e4bb93c7c335a8a8b80a2a6a7aa8a1edc3b8e3a451167a1d0d18736cce46859104faea810701783ff1bd0ccfff DIST monica-3.7.tar.bz2 18330 BLAKE2B 26c5539d00867fd6ee80255a41fa363ee8cd3a720637b1b83546bfe9bf877f5b521ea47da456d965b65f57d7a351bc7c5dfe310ab9608b67a8db7b2b4d9cd1af SHA512 87565f33f3c3492b196905e5b8e17bd45a7eb8eb0a0281f02e23337eec888af82571ac6f2d229256ee97012d402b7f1b217cd56a8b87ff9c9296931bf63cb153 -EBUILD monica-3.7-r1.ebuild 906 BLAKE2B 6a4a01632dbeb621e3e07feae8521f49f66724094b78651ccdf37057fc1d91dd2f6c641e3be2b5a446559e6d5bb2ffe7ac8ac50b4c004c7349be8dee834c71df SHA512 204de6470f2ff3da14aac40fbf11d865911a59c876d4915178fe93a6a0bbfe85066c9dcd01a785a9f2cd70088156b34a43a75827076b80bc0e184c2e174d4956 +EBUILD monica-3.7-r2.ebuild 901 BLAKE2B d86e3ad904734f321c54db36395922a0d3e47b21cb2fdb1ebe9212f872150d18a94edd25256db6835d9b9928a5391de1123201b9cd355a17e984bb4586963665 SHA512 95eaae93664adaee6ef44f68a935fdba50f1989ed2edf3ec5bae199972ebb4bde02118372868354da2d2cafca5a4d191163fa59c9835ba6648043733550f1821 MISC metadata.xml 557 BLAKE2B f6319ce0a15222c7ae4adf7bbf7c326db5ebd05ad36732c56c9540a30ea35bb7fbffb136433eed4ba10b899c6ddde893be83aa6920e4b8a4f5dbd51e940b6a1d SHA512 ecd6b679940f992d4bbb27ab3b63316ce089c8857a1288cf89f05fd7aa3da24e81206f660ac1d5fbe86e71c4796bffcf3bdca5e4c546678b22dd9ab584e8b6a2 diff --git a/media-gfx/monica/monica-3.7-r1.ebuild b/media-gfx/monica/monica-3.7-r2.ebuild index b6be41461371..e93b87dfeff1 100644 --- a/media-gfx/monica/monica-3.7-r1.ebuild +++ b/media-gfx/monica/monica-3.7-r2.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -13,7 +13,7 @@ LICENSE="BSD" SLOT="0" KEYWORDS="amd64 ppc x86" -DEPEND=">=x11-libs/fltk-1.1:1" +DEPEND="x11-libs/fltk:1=" RDEPEND="${DEPEND} x11-apps/xgamma" diff --git a/media-gfx/netgen/Manifest b/media-gfx/netgen/Manifest index 0b2eb706d7fc..98da7e7abbf0 100644 --- a/media-gfx/netgen/Manifest +++ b/media-gfx/netgen/Manifest @@ -7,6 +7,11 @@ AUX netgen-6.2.2204-use-system-spdlog.patch 1390 BLAKE2B 541725d179a0b3f9f9430f1 AUX netgen-6.2.2301-find-libjpeg-turbo-library.patch 1280 BLAKE2B 47cbb27914badd316078acbf57d0ec13da80ade19c6f20602dec1bb42d9b6929cd017ee9120c651dfffcfb2e9c925798a327bd07561823f50702536487343a06 SHA512 c0c774d47bc405357c09454c528391062cec9d2f4a39757409894407bca28a8bf2332bfa60bdba3f99948d5d8871833cc56123ba212e97862f6cc7d09dedb3a8 AUX netgen-6.2.2301-fix-nullptr-deref-in-archive.patch 1012 BLAKE2B 2de4195438ce6dec88d1bc0d05f841bb959690b271cb1a40464ae81cc056e4520246c49533a2dc90ee88a29f450b9bf89a285342f9e8a08f0b9a44cee1933ec2 SHA512 3f28bce676c3db1d0dd05ff21716745dfc01b8d9f5cc6c278baed76f10514d283e78012f04fca956f71337f4a34287f949b06881a12cb84ae812a61bd1ff79ea AUX netgen-6.2.2302-opencascade-7.8.0.patch 3859 BLAKE2B 6a76eb5839aaa8e420dc4160fdaca2b2e6df7f7d7467026e5d86315403a875bbde2af2df87f0be34029c515659035e3ad434bbba68182bf9b994892e65873c8f SHA512 79edea3c079db0ae295d2692ebc07c6b5a9431697c424fbd57089a999f8882e76e06448ecc63a32c97f9c7317df16b86ad5830c0394ddb748f70c311b3f6824b +AUX netgen-6.2.2406-encoding_h.patch 3523 BLAKE2B 73608ec5530d671041f56e66a9b6c8eb1324d84a4e5dd65cd5a34a8bd68b34603abb2cfc67517f1e18a09a2193bb80b8859a032b0f280f1e9ff6afd8fd54567d SHA512 1b23ebc82a0f8fecb9e83c0edd1e2f8348c43b3d3124f8378ff370b9506d5fc4c3eb66b279b7e5e1961405cb38d6b420ff17660b032458e4f77282d205f94896 +AUX netgen-6.2.2406-find-libjpeg-turbo-library.patch 1051 BLAKE2B 6cacb2d6703a0e7a2fc534ed074f3c2f2a92aaaea541ab2267a2f69accbca9def673bd418bfdad563d59236b5e5c4f9eecc13cad8f5c313582122e126baf3180 SHA512 6b38ac7cfc09ef1ce619c2558bcf158cdb2561612c0768740d8673bf07d8f66d0b4a9494615f1059e4fbedae6814e0f359305ae323baa90da96d67c2949aded2 +AUX netgen-6.2.2406-link-against-ffmpeg.patch 700 BLAKE2B 25f7558145d99d60af13760ef3fa6029e482f337e41afdea98c508d1c48ac802ed5754a95986d10efaff6572770a9fb50a9e3e4d43b32572d76cfb8f034faecc SHA512 6f10df4fd24d33e574dafd8c2a9f6aabb13285308213ecd241799b175a91732725598750be0d76ed4e62726f3ac80e3e50bfa23a5f6e5e118acaacfdeeba22d3 DIST netgen-6.2.2302.tar.gz 3398683 BLAKE2B 7cf4626ee8163898864af0346cf2c4fa73dcca3ac2068d67f80b05ee926024b36552b33013c2ef8f74026ab942ae08c0628af0ce0c0dac2d004ba26e18bf4619 SHA512 da6e8e43d73af6b7bfae2e3c771d46e34601ff481c251924673f7330bae032a743fb9d5ff2792855e91ed5addb4d22fd4bf9cd7a9dcfb53f476e22a30f1eedb3 +DIST netgen-6.2.2406.tar.gz 3452436 BLAKE2B 4cb42f20e7627a98e54a9f2e6da5d1b4af174fa7e33c6f72a731b4879c3e4324b20016f1980d2ceb50976fedc2b001a0824e2edd03b03c434c49baa947ded126 SHA512 262e57dca39519c797ea58b32eb886d523926aa48979b31df0c61839f9db09eea76346d3519742b7173a78a80335c16960860772646edd20f365dab1e1a6bed8 EBUILD netgen-6.2.2302.ebuild 4143 BLAKE2B bf8b8af09769ba0b120d9ddf264ddc1994a84a02bbe8d19107e8eaf17a6c46b6d7070a38863d352f101bc6c2a9dabc6bb75b72bf925c9bc89017aea00e144642 SHA512 16197a671d6bec6da0cd144c270f3c0fceece515ce63bfa393faf6d11b9101f7752d5d09af36ba3b08bde41557b4a85fd7df8f53af9ad0a597fa3537d0e621e8 +EBUILD netgen-6.2.2406.ebuild 4671 BLAKE2B 1ea338d9a7a3669fb818515858173e85c25e8d556ff640a57bfdc6009182c2faf7d0042abb48f85974755086b04d4ea378b8a97327c45ad2ec89d552d3175e13 SHA512 f05465d75c38de34fb638d98075fa4c7875dcee0c38e74df9b1db93d753f0ace0844c057dd3e115b82d60a1dfd1ba3036f3d13ea88987baa519022f51f103155 MISC metadata.xml 649 BLAKE2B 01bb3d452a1f0002e2e5b8589c2ff83668b2135705599a3223fe37bc89287423f2bef8af15bd949e08c40e7e7ef304362fa8900b048f85b3ad95bcbbc1a7caed SHA512 072b3dc1049e26655316756255a96d34d2e2964296088d0768a8a6953703840d936aace4625b2a46bb36cc147c2814dfe537e01662294c3d5b02f397e5255d0b diff --git a/media-gfx/netgen/files/netgen-6.2.2406-encoding_h.patch b/media-gfx/netgen/files/netgen-6.2.2406-encoding_h.patch new file mode 100644 index 000000000000..9d9288412efb --- /dev/null +++ b/media-gfx/netgen/files/netgen-6.2.2406-encoding_h.patch @@ -0,0 +1,121 @@ +From 8504832e746b1581d5b51be7f04f24826440255f Mon Sep 17 00:00:00 2001 +From: Paul Zander <negril.nx+gentoo@gmail.com> +Date: Thu, 6 Jun 2024 15:59:51 +0200 +Subject: [PATCH 1/2] use std namespace prefix + +Signed-off-by: Paul Zander <negril.nx+gentoo@gmail.com> +--- + ng/encoding.hpp | 8 +++++++- + 1 file changed, 7 insertions(+), 1 deletion(-) + +diff --git a/ng/encoding.hpp b/ng/encoding.hpp +index 9ea2ffb..498431c 100644 +--- a/ng/encoding.hpp ++++ b/ng/encoding.hpp +@@ -16,6 +16,8 @@ extern "C" { + #include <libswresample/swresample.h> + } + ++#include <iostream> ++ + constexpr int BITRATE = 50000000; + + class Mpeg { +@@ -55,6 +57,8 @@ class Mpeg { + int height; + bool IsStarted() { return is_started; } + int AddFrame() { ++ using std::cerr; ++ using std::endl; + int ret; + int got_packet = 0; + AVPacket pkt = { 0 }; +@@ -113,7 +117,9 @@ class Mpeg { + return 0; + } + +- int Start(string filename) { ++ int Start(std::string filename) { ++ using std::cerr; ++ using std::endl; + AVCodec *video_codec; + if(is_started) { + cerr << "Stream already started" << endl; +-- +2.45.2 + + +From 2e52e913603745670cfc5c4a461845a6fb22e118 Mon Sep 17 00:00:00 2001 +From: Paul Zander <negril.nx+gentoo@gmail.com> +Date: Thu, 6 Jun 2024 16:00:40 +0200 +Subject: [PATCH 2/2] av_init_packet is deprecated + +Signed-off-by: Paul Zander <negril.nx+gentoo@gmail.com> +--- + ng/encoding.hpp | 18 +++++++++++------- + 1 file changed, 11 insertions(+), 7 deletions(-) + +diff --git a/ng/encoding.hpp b/ng/encoding.hpp +index 498431c..97b9e6a 100644 +--- a/ng/encoding.hpp ++++ b/ng/encoding.hpp +@@ -61,7 +61,6 @@ class Mpeg { + using std::endl; + int ret; + int got_packet = 0; +- AVPacket pkt = { 0 }; + + glReadPixels (0, 0, width, height, GL_RGB, GL_UNSIGNED_BYTE, rgb_buffer); + av_image_fill_arrays(rgb_frame->data, rgb_frame->linesize, rgb_buffer, AV_PIX_FMT_RGB24, width, height, 1); +@@ -77,8 +76,6 @@ class Mpeg { + sws_scale(sws_ctx, flipped_data, flipped_stride, 0, enc->height, frame->data, frame->linesize); + + +- av_init_packet(&pkt); +- + got_packet = 0; + ret = avcodec_send_frame(enc, frame); + if (ret < 0) +@@ -87,28 +84,35 @@ class Mpeg { + return(1); + } + +- ret = avcodec_receive_packet(enc, &pkt); ++ AVPacket* pkt = av_packet_alloc(); ++ ret = avcodec_receive_packet(enc, pkt); + if (!ret) + got_packet = 1; + if (ret == AVERROR(EAGAIN)) ++ { ++ av_packet_free(&pkt); + return 0; ++ } + + if (ret < 0) { + cerr << "Error encoding video frame: " << endl; ++ av_packet_free(&pkt); + return 1; + } + + if (got_packet) { + /* rescale output packet timestamp values from codec to stream timebase */ +- av_packet_rescale_ts(&pkt, enc->time_base, st->time_base); +- pkt.stream_index = st->index; ++ av_packet_rescale_ts(pkt, enc->time_base, st->time_base); ++ pkt->stream_index = st->index; + + /* Write the compressed frame to the media file. */ +- ret = av_interleaved_write_frame(oc, &pkt); ++ ret = av_interleaved_write_frame(oc, pkt); + } else { + ret = 0; + } + ++ av_packet_free(&pkt); ++ + if (ret < 0) { + cerr << "Error while writing video frame: " << endl; + return(1); +-- +2.45.2 + diff --git a/media-gfx/netgen/files/netgen-6.2.2406-find-libjpeg-turbo-library.patch b/media-gfx/netgen/files/netgen-6.2.2406-find-libjpeg-turbo-library.patch new file mode 100644 index 000000000000..17bf2ad95f61 --- /dev/null +++ b/media-gfx/netgen/files/netgen-6.2.2406-find-libjpeg-turbo-library.patch @@ -0,0 +1,29 @@ +From 49507f7708d72b25fd5e350f7f6b30aa80a50cb4 Mon Sep 17 00:00:00 2001 +From: Paul Zander <negril.nx+gentoo@gmail.com> +Date: Thu, 6 Jun 2024 15:40:10 +0200 +Subject: [PATCH] [PATCH] find libjpeg-turbo library + +Signed-off-by: Paul Zander <negril.nx+gentoo@gmail.com> +--- + nglib/CMakeLists.txt | 5 +++++ + 1 file changed, 5 insertions(+) + +diff --git a/nglib/CMakeLists.txt b/nglib/CMakeLists.txt +index b1036ea..78340b6 100644 +--- a/nglib/CMakeLists.txt ++++ b/nglib/CMakeLists.txt +@@ -13,6 +13,11 @@ if(EMSCRIPTEN) + target_link_libraries(nglib PRIVATE ${ZLIB_LIBRARIES} $<BUILD_INTERFACE:$<TARGET_PROPERTY:occ_libs,INTERFACE_LINK_LIBRARIES>>) + else(EMSCRIPTEN) + target_link_libraries(nglib PUBLIC ngcore) ++ if(TARGET JPEG::JPEG) ++ get_target_property(JPEG_LIBRARIES JPEG::JPEG IMPORTED_LOCATION_RELEASE) ++ else() ++ set(JPEG_LIBRARIES ${JPEG_LIBRARY_RELEASE}) ++ endif() + target_link_libraries( nglib PRIVATE ${CMAKE_THREAD_LIBS_INIT} ${JPEG_LIBRARIES} ${MKL_LIBRARIES} ${ZLIB_LIBRARIES} occ_libs netgen_cgns ) + endif(EMSCRIPTEN) + +-- +2.45.2 + diff --git a/media-gfx/netgen/files/netgen-6.2.2406-link-against-ffmpeg.patch b/media-gfx/netgen/files/netgen-6.2.2406-link-against-ffmpeg.patch new file mode 100644 index 000000000000..c609e06fe94b --- /dev/null +++ b/media-gfx/netgen/files/netgen-6.2.2406-link-against-ffmpeg.patch @@ -0,0 +1,17 @@ +From 69d9c2da29adc9b7a209e78aae950d9834683f58 Mon Sep 17 00:00:00 2001 +From: Bernd Waibel <waebbl-gentoo@posteo.net> +Date: Mon, 31 Oct 2022 13:07:05 +0100 +Subject: [PATCH] link against ffmpeg + +Signed-off-by: Bernd Waibel <waebbl-gentoo@posteo.net> +--- a/ng/CMakeLists.txt ++++ b/ng/CMakeLists.txt +@@ -28,7 +28,7 @@ if(USE_GUI) + if(APPLE) + set_target_properties(netgen PROPERTIES OUTPUT_NAME netgen) + endif(APPLE) +- target_link_libraries( netgen ${Python3_LIBRARIES} ${TCL_LIBRARY} ${TK_LIBRARY}) ++ target_link_libraries( netgen ${Python3_LIBRARIES} ${TCL_LIBRARY} ${TK_LIBRARY} ${FFMPEG_LIBRARIES}) + endif(NOT BUILD_FOR_CONDA) + + install(TARGETS nggui ${NG_INSTALL_DIR}) diff --git a/media-gfx/netgen/netgen-6.2.2406.ebuild b/media-gfx/netgen/netgen-6.2.2406.ebuild new file mode 100644 index 000000000000..35c30b24ff1d --- /dev/null +++ b/media-gfx/netgen/netgen-6.2.2406.ebuild @@ -0,0 +1,184 @@ +# Copyright 1999-2025 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +PYTHON_COMPAT=( python3_{10..13} ) +inherit cmake desktop flag-o-matic python-single-r1 xdg + +DESCRIPTION="Automatic 3d tetrahedral mesh generator" +HOMEPAGE="https://ngsolve.org/ https://github.com/NGSolve/netgen" +SRC_URI="https://github.com/NGSolve/netgen/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="LGPL-2.1" +SLOT="0" +KEYWORDS="~amd64 ~x86" + +IUSE="ffmpeg gui jpeg mpi +opencascade python test" +RESTRICT="!test? ( test )" + +REQUIRED_USE=" + ${PYTHON_REQUIRED_USE} + ffmpeg? ( gui ) + jpeg? ( gui ) + python? ( gui ) +" + +DEPEND=" + sys-libs/zlib + ffmpeg? ( media-video/ffmpeg:= ) + gui? ( + dev-lang/tcl:0/8.6 + dev-lang/tk:0/8.6 + media-libs/glu + media-libs/libglvnd[X] + x11-libs/libX11 + x11-libs/libXmu + x11-libs/libxcb:= + ) + jpeg? ( media-libs/libjpeg-turbo:0= ) + mpi? ( + sci-libs/metis + virtual/mpi + ) + opencascade? ( sci-libs/opencascade:= ) + python? ( + ${PYTHON_DEPS} + $(python_gen_cond_dep ' + dev-python/pybind11[${PYTHON_USEDEP}] + ' + ) + mpi? ( + $(python_gen_cond_dep 'dev-python/mpi4py[${PYTHON_USEDEP}]' ) + ) + ) +" +RDEPEND="${DEPEND}" +BDEPEND=" + sys-apps/lsb-release + virtual/pkgconfig + gui? ( virtual/imagemagick-tools[png] ) + test? ( + <dev-cpp/catch-3:0 + python? ( $(python_gen_cond_dep ' + dev-python/pytest-check[${PYTHON_USEDEP}] + ') ) + ) +" + +PATCHES=( + "${FILESDIR}/${PN}-6.2.2204-find-Tk-include-directories.patch" + "${FILESDIR}/${PN}-6.2.2406-link-against-ffmpeg.patch" + "${FILESDIR}/${PN}-6.2.2204-use-system-catch.patch" + "${FILESDIR}/${PN}-6.2.2406-find-libjpeg-turbo-library.patch" + "${FILESDIR}/${PN}-6.2.2301-fix-nullptr-deref-in-archive.patch" + "${FILESDIR}/${PN}-6.2.2406-encoding_h.patch" +) + +pkg_setup() { + if use python; then + python-single-r1_pkg_setup + + # NOTE This calls find_package(Python3) without specifying Interpreter in COMPONENTS. + # Python3_FIND_UNVERSIONED_NAMES=FIRST is thus never checked and we search the highest python version first. + pushd "${T}/${EPYTHON}/bin" > /dev/null || die + cp "python-config" "${EPYTHON}-config" || die + chmod +x "${EPYTHON}-config" || die + popd > /dev/null || die + fi +} + +src_prepare() { + # # NOTE: need to manually check and update this string on version bumps! + # # git describe --tags --match "v[0-9]*" --long --dirty + # cat <<- EOF > "${S}/version.txt" || die + # v${PV}-0-08eec44 + # EOF + + rm external_dependencies -r || die + + cmake_src_prepare +} + +src_configure() { + filter-lto + + local mycmakeargs=( + # currently not working in a sandbox, expects netgen to be installed + # see https://github.com/NGSolve/netgen/issues/132 + -DBUILD_STUB_FILES=OFF + -DENABLE_UNIT_TESTS=$(usex test) + -DINSTALL_PROFILES=OFF + -DNG_INSTALL_DIR_CMAKE="$(get_libdir)/cmake/${PN}" + -DNG_INSTALL_DIR_INCLUDE="include/${PN}" + -DNG_INSTALL_DIR_LIB="$(get_libdir)" + -DUSE_CCACHE=OFF + # doesn't build with this version + -DUSE_CGNS=OFF + -DUSE_GUI=$(usex gui) + -DUSE_INTERNAL_TCL=OFF + -DUSE_JPEG=$(usex jpeg) + -DUSE_MPEG=$(usex ffmpeg) + # respect users -march= choice + -DUSE_NATIVE_ARCH=OFF + -DUSE_MPI=$(usex mpi) + -DUSE_OCC=$(usex opencascade) + -DUSE_PYTHON="$(usex python)" + -DUSE_SUPERBUILD=OFF + -DNETGEN_VERSION_GIT="v${PV}" + ) + # no need to set this, if we only build the library + if use gui; then + mycmakeargs+=( -DTK_INCLUDE_PATH="/usr/$(get_libdir)/tk8.6/include" ) + fi + if use python; then + mycmakeargs+=( + -DPREFER_SYSTEM_PYBIND11=ON + # # needed, so the value gets passed to NetgenConfig.cmake instead of ${T}/pythonX.Y + # -DPYTHON_EXECUTABLE="${PYTHON}" + ) + fi + if use mpi && use python; then + mycmakeargs+=( -DUSE_MPI4PY=ON ) + else + mycmakeargs+=( -DUSE_MPI4PY=OFF ) + fi + cmake_src_configure +} + +src_test() { + DESTDIR="${T}" cmake_build install + + if use python; then + export PYTHONPATH="${T}/$(python_get_sitedir):${T}/usr/$(get_libdir):${BUILD_DIR}/libsrc/core" + fi + + CMAKE_SKIP_TESTS=( + '^unit_symboltable$' + '^pytest$' # SEGFAULT + ) + cmake_src_test +} + +src_install() { + cmake_src_install + use python && python_optimize + + local NETGENDIR="/usr/share/${PN}" + echo -e "NETGENDIR=${NETGENDIR}" > ./99netgen || die + doenvd 99netgen + + if use gui; then + mv "${ED}"/usr/bin/{*.tcl,*.ocf} "${ED}${NETGENDIR}" || die + + convert -deconstruct "${S}/windows/${PN}.ico" netgen.png || die + newicon -s 32 "${S}"/${PN}-2.png ${PN}.png + newicon -s 16 "${S}"/${PN}-3.png ${PN}.png + make_desktop_entry ${PN} "Netgen" netgen Graphics + fi + + mv "${ED}"/usr/share/${PN}/doc/ng4.pdf "${ED}"/usr/share/doc/${PF} || die + dosym -r /usr/share/doc/${PF}/ng4.pdf /usr/share/${PN}/doc/ng4.pdf + + use python || rm -r "${ED}${NETGENDIR}"/py_tutorials || die +} diff --git a/media-gfx/nomacs/Manifest b/media-gfx/nomacs/Manifest index a0b7360cf4f0..dcde255ea10e 100644 --- a/media-gfx/nomacs/Manifest +++ b/media-gfx/nomacs/Manifest @@ -1,12 +1,4 @@ -AUX nomacs-3.16.224-DkMath-ostream.patch 626 BLAKE2B 249c6092e77c784b70ce38e9c56e8e263684b3b7eae4a91e23444ede548b0b7a1773c95da4307bdb2179538ee9324145a8aec74af71cec153c40159e02f9b8ec SHA512 fe68ceb1498324be52974b0960c9e50b607f8e4cd364d658da0252ebcf80924becd3da002992b92114570bced57b3345372324998b2f5460983e83132e421575 -AUX nomacs-3.16.224-exiv2-0.28.patch 8575 BLAKE2B c6918ecb4e76919cae9a3080b6859477ec0139dcdef2680f05324251106cfab8b58f671a7f53f9ae9da20e86cff98ca07717f9bb84313a45a1b481738ff58429 SHA512 23180634c3f173a826cca7c85e3fbf851f2f69b135f69006dcbf358f298261f9d177d193a30967fb10874e45b10e32dda74e8bdd50cf630d5356abfd043c40f1 -AUX nomacs-3.16.224-libdir-plugins.patch 1083 BLAKE2B 19659194ba203c6d92693d00d4931a7e22684308456ccf218ad9664f5a19aa31f36fc302b89ef3625f5a4750b777c0b639e0371b8b6e01a3b25e6dc2de2ee8e7 SHA512 a5687c398ed9c97cbb999b2f28a8fed2cc8a8d1ff0e2964f1b3e25a45e303a76e438325b54f7859e3efd56d602ced8027f3faaddef55a34df0e4701486196968 -AUX nomacs-3.16.224-libdir.patch 1028 BLAKE2B 1a8076d5eb934a41599d94cba322413a8f96be9e8bc1bdcc5492b39da6210b9e0ac315e7b359d651c54b80154f9d07ceed742421ed0f83d362e5076996aab4be SHA512 930d95777696d7fd9ab56922dd8ec98beb10b51008bbfbc04daa268677e66d985b062d20c533e9627f7662844bbb2c8d7aa9647d74d4399787c40a78b5bb773d -AUX nomacs-3.16.224-quazip1.patch 3844 BLAKE2B 5d92aa57971f137e5009db945f739eaff57bbf2a5ea6ce842dafd51f0107f6c6dfb349da719e935e732cb7736d9a97d96806ee48fdd97ff953863ba920aff2ab SHA512 888c8125edcbbbc3034b132f776bf59e53e6259e66c55f4df4e9c7fa8a874928a2ea766b52c6ef8dcc0d493f81982ca4cb6ac737f677e3948dcedb9052603e9f -DIST nomacs-3.16.224.tar.gz 1932366 BLAKE2B 4a2dc6ef70b0ae5dc9c9397bd2c88ede0db2bb8660e1907d08b36c4a9cf5a9bd151180aa4b2d6b5f529c1786004a6621eff88fa4bc851d60835e8ba6d6269602 SHA512 7ca8e713eedd71bc3dd3804a9a09ece15badb74949b155ea4da72a0ea129be173c8d0951604a6139d4490525cd420da8635773c11f0d133f666a48dcd9064257 DIST nomacs-3.19.1.tar.gz 1928697 BLAKE2B ee8a10ebd777a589df179b51591893fe083505b066bf409e11a54a4bc21054d6d61d8c5e397cf01fa7907fd2e4b69401729a8fab7f1a8079769bfef53692230b SHA512 7cbe80d6c336547a00761c64e591444827998aa79a52d51219ca69aacca4d3361c1e7cbccba1f9c06c7e93f09f4b732abd25757107e1c50d8a43eb45ced0ee97 -DIST nomacs-plugins-3.16.tar.gz 561522 BLAKE2B 2bda4f36d56709653f6696af3404e416fd2d9fe7fa11de9636643c728028018ac769df3e2e519799322c5c42006cdc114d0e6406f9f60294234b07d9fd8d8409 SHA512 cd72f6ddbe3e07d7ed97f08405bac7574f4f3285c81e835f5630e011c8a9b105f23d892fed8084cb35ce521aca5524db071d0edb8bb04850dd2209d9ed019747 DIST nomacs-plugins-3.19.0.tar.gz 559925 BLAKE2B 4e3d8e07974d418510d2e806980bc9793567813b9418c0754dcaaa9e6f43e88d76e35264f05e05b2e21345467c8038db3c37ce3d1b003adcd3b019796a737080 SHA512 36b96b0270cb7cc34ee3f9f948eb1f2e5b4facd1f6eb273afe1fbf865c7712fb6487ef59f3d4e7723b9bca7930255f4247a8381c05ee8cfb9acf2b5cc225303c -EBUILD nomacs-3.16.224-r6.ebuild 1989 BLAKE2B 00d46fb6e2501fd71f69b256490c5899753498a6a144b8976f91edd1a660aa6c0daaac79d27f36bcc5af961abce8bf39c1a37625c1fde17af0ab130b29712edb SHA512 5a34f23eeb69b567f6e8aca96479599bdbfd0f9d683af1d08f6b1b41de62fe2bee259a8f07241740c43c1cc5ad1962d182aff03915c91612d14ad4408df80ec9 -EBUILD nomacs-3.19.1.ebuild 1685 BLAKE2B 18afd865899fd8c4fd44568845801bc41a063f8037af8a6b0fa775810c8effa5b6f26d66d3b34173525198f751557a64a897e591eb110a6b384ee1193383b1a9 SHA512 e26c13d5e00b317c2a13a49ef598ac85ba4a6e542b8cdd5857bb7220514949a95c6390f1417a81d2a8efbd7a8669e1706e9a7be62295ed4d1e4dfb2c37f8e58d +EBUILD nomacs-3.19.1-r1.ebuild 1700 BLAKE2B 16f9b8ed491594f72782cd1c988f9d103f6baa94919f586c6c315c1358f7d6b92ce5326487a1e15be5f025442af6eddc96698484cb37abad617f143d6c73ad17 SHA512 5791ad99cf402dffe908d11f70500ca93e2f5b4f9105c0b13449812617ba85aecc5a95675ac352d29ca5c8f630d07c99011768dce330e0b3eed9c9b8fa3efa5f MISC metadata.xml 513 BLAKE2B 89bb56aaec4fc3411a5460f33d5915b4c1910c1385d5c6370d47af01a89bdeb3342a9ce206f531c5dc47e1c93930a0aa3f19e721a555ecdaa7c853ecb9504028 SHA512 f451fc573bcf1e4e9e413d5346eb5bb0d3c2b728dfe3eb3c88ad6097402a1038d625361656169f445797c793ea9323de9b4b95856533355721576394f703f7ea diff --git a/media-gfx/nomacs/files/nomacs-3.16.224-DkMath-ostream.patch b/media-gfx/nomacs/files/nomacs-3.16.224-DkMath-ostream.patch deleted file mode 100644 index 318953f7896a..000000000000 --- a/media-gfx/nomacs/files/nomacs-3.16.224-DkMath-ostream.patch +++ /dev/null @@ -1,24 +0,0 @@ -From aca8443079ff926be873a77e3077b249a12487dd Mon Sep 17 00:00:00 2001 -From: Stephan Hartmann <sultan@gentoo.org> -Date: Sun, 23 Jan 2022 18:51:56 +0100 -Subject: [PATCH] IWYU: add missing ostream in DkMath - ---- - src/DkCore/DkMath.h | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/src/DkCore/DkMath.h b/src/DkCore/DkMath.h -index c37ef23..2c3a5be 100644 ---- a/src/DkCore/DkMath.h -+++ b/src/DkCore/DkMath.h -@@ -30,6 +30,7 @@ - #pragma warning(push, 0) // no warnings from includes - begin
- #include <cmath>
- #include <float.h>
-+#include <ostream>
- #include <QDebug>
- #include <QPointF>
- #include <QPolygonF>
--- -2.34.1 - diff --git a/media-gfx/nomacs/files/nomacs-3.16.224-exiv2-0.28.patch b/media-gfx/nomacs/files/nomacs-3.16.224-exiv2-0.28.patch deleted file mode 100644 index 280d7ec59e8b..000000000000 --- a/media-gfx/nomacs/files/nomacs-3.16.224-exiv2-0.28.patch +++ /dev/null @@ -1,241 +0,0 @@ -From 6785f15d9ed05ebc66ee200b3c94451c6c633646 Mon Sep 17 00:00:00 2001 -From: Andreas Sturmlechner <asturm@gentoo.org> -Date: Sun, 3 Sep 2023 13:30:43 +0200 -Subject: [PATCH] Fix 3.16.224 build with exiv2-0.28 - -Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org> ---- - ImageLounge/src/DkCore/DkMetaData.cpp | 59 ++++++++++++++++++--------- - ImageLounge/src/DkCore/DkMetaData.h | 4 +- - 2 files changed, 41 insertions(+), 22 deletions(-) - -diff --git a/ImageLounge/src/DkCore/DkMetaData.cpp b/ImageLounge/src/DkCore/DkMetaData.cpp -index bf1d111e..5eaeebf4 100644 ---- a/ImageLounge/src/DkCore/DkMetaData.cpp -+++ b/ImageLounge/src/DkCore/DkMetaData.cpp -@@ -73,8 +73,12 @@ void DkMetaDataT::readMetaData(const QString& filePath, QSharedPointer<QByteArra - mExifImg = Exiv2::ImageFactory::open(strFilePath); - } - else { -+#if EXIV2_TEST_VERSION(0, 28, 0) -+ mExifImg = Exiv2::ImageFactory::open((const byte *)ba->constData(), ba->size()); -+#else - Exiv2::BasicIo::AutoPtr exifBuffer(new Exiv2::MemIo((const byte*)ba->constData(), ba->size())); - mExifImg = Exiv2::ImageFactory::open(exifBuffer); -+#endif - } - } - catch (...) { -@@ -155,14 +159,18 @@ bool DkMetaDataT::saveMetaData(QSharedPointer<QByteArray>& ba, bool force) { - Exiv2::ExifData &exifData = mExifImg->exifData(); - Exiv2::XmpData &xmpData = mExifImg->xmpData(); - Exiv2::IptcData &iptcData = mExifImg->iptcData(); -- -- Exiv2::Image::AutoPtr exifImgN; -+ std::unique_ptr<Exiv2::Image> exifImgN; -+#if !EXIV2_TEST_VERSION(0, 28, 0) - Exiv2::MemIo::AutoPtr exifMem; -+#endif - - try { -- -+#if EXIV2_TEST_VERSION(0, 28, 0) -+ exifImgN = Exiv2::ImageFactory::open((byte *)ba->data(), ba->size()); -+#else - exifMem = Exiv2::MemIo::AutoPtr(new Exiv2::MemIo((byte*)ba->data(), ba->size())); - exifImgN = Exiv2::ImageFactory::open(exifMem); -+#endif - } - catch (...) { - -@@ -186,8 +194,13 @@ bool DkMetaDataT::saveMetaData(QSharedPointer<QByteArray>& ba, bool force) { - - // now get the data again - Exiv2::DataBuf exifBuf = exifImgN->io().read((long)exifImgN->io().size()); -+#if EXIV2_TEST_VERSION(0, 28, 0) -+ if (!exifBuf.empty()) { -+ QSharedPointer<QByteArray> tmp = QSharedPointer<QByteArray>(new QByteArray((const char *)exifBuf.c_data(), exifBuf.size())); -+#else - if (exifBuf.pData_) { - QSharedPointer<QByteArray> tmp = QSharedPointer<QByteArray>(new QByteArray((const char*)exifBuf.pData_, exifBuf.size_)); -+#endif - - if (tmp->size() > qRound(ba->size()*0.5f)) - ba = tmp; -@@ -197,7 +210,7 @@ bool DkMetaDataT::saveMetaData(QSharedPointer<QByteArray>& ba, bool force) { - else - return false; - -- mExifImg = exifImgN; -+ mExifImg.swap(exifImgN); - mExifState = loaded; - - return true; -@@ -250,7 +263,7 @@ int DkMetaDataT::getOrientationDegree() const { - - if (pos != exifData.end() && pos->count() != 0) { - -- Exiv2::Value::AutoPtr v = pos->getValue(); -+ std::unique_ptr<Exiv2::Value> v = pos->getValue(); - orientation = (int)pos->toFloat(); - - switch (orientation) { -@@ -315,7 +328,7 @@ int DkMetaDataT::getRating() const { - Exiv2::ExifData::iterator pos = exifData.findKey(key); - - if (pos != exifData.end() && pos->count() != 0) { -- Exiv2::Value::AutoPtr v = pos->getValue(); -+ std::unique_ptr<Exiv2::Value> v = pos->getValue(); - exifRating = v->toFloat(); - } - } -@@ -327,7 +340,7 @@ int DkMetaDataT::getRating() const { - - //xmp Rating tag - if (pos != xmpData.end() && pos->count() != 0) { -- Exiv2::Value::AutoPtr v = pos->getValue(); -+ std::unique_ptr<Exiv2::Value> v = pos->getValue(); - xmpRating = v->toFloat(); - } - -@@ -336,7 +349,7 @@ int DkMetaDataT::getRating() const { - key = Exiv2::XmpKey("Xmp.MicrosoftPhoto.Rating"); - pos = xmpData.findKey(key); - if (pos != xmpData.end() && pos->count() != 0) { -- Exiv2::Value::AutoPtr v = pos->getValue(); -+ std::unique_ptr<Exiv2::Value> v = pos->getValue(); - xmpRating = v->toFloat(); - } - } -@@ -399,7 +412,7 @@ QString DkMetaDataT::getNativeExifValue(const QString& key) const { - if (pos->count () < 2000) { // diem: this is about performance - adobe obviously embeds whole images into tiff exiv data - - //qDebug() << "pos count: " << pos->count(); -- //Exiv2::Value::AutoPtr v = pos->getValue(); -+ //std::unique_ptr<Exiv2::Value> v = pos->getValue(); - info = exiv2ToQString(pos->toString()); - - } -@@ -436,7 +449,7 @@ QString DkMetaDataT::getXmpValue(const QString& key) const { - } - - if (pos != xmpData.end() && pos->count() != 0) { -- Exiv2::Value::AutoPtr v = pos->getValue(); -+ std::unique_ptr<Exiv2::Value> v = pos->getValue(); - info = exiv2ToQString(pos->toString()); - } - } -@@ -478,7 +491,7 @@ QString DkMetaDataT::getExifValue(const QString& key) const { - } - - if (pos != exifData.end() && pos->count() != 0) { -- //Exiv2::Value::AutoPtr v = pos->getValue(); -+ //std::unique_ptr<Exiv2::Value> v = pos->getValue(); - info = exiv2ToQString(pos->toString()); - } - } -@@ -508,7 +521,7 @@ QString DkMetaDataT::getIptcValue(const QString& key) const { - } - - if (pos != iptcData.end() && pos->count() != 0) { -- Exiv2::Value::AutoPtr v = pos->getValue(); -+ std::unique_ptr<Exiv2::Value> v = pos->getValue(); - info = exiv2ToQString(pos->toString()); - } - } -@@ -653,8 +666,11 @@ QImage DkMetaDataT::getThumbnail() const { - try { - Exiv2::ExifThumb thumb(exifData); - Exiv2::DataBuf buffer = thumb.copy(); -- -+#if EXIV2_TEST_VERSION(0, 28, 0) -+ QByteArray ba = QByteArray((char *)buffer.c_data(), buffer.size()); -+#else - QByteArray ba = QByteArray((char*)buffer.pData_, buffer.size_); -+#endif - qThumb.loadFromData(ba); - } - catch (...) { -@@ -931,9 +947,12 @@ void DkMetaDataT::setThumbnail(QImage thumb) { - - try { - // whipe all exif data of the thumbnail -+#if EXIV2_TEST_VERSION(0, 28, 0) -+ Exiv2::Image::UniquePtr exifImgThumb = Exiv2::ImageFactory::open((const byte *)ba.constData(), ba.size()); -+#else - Exiv2::MemIo::AutoPtr exifBufferThumb(new Exiv2::MemIo((const byte*)ba.constData(), ba.size())); - Exiv2::Image::AutoPtr exifImgThumb = Exiv2::ImageFactory::open(exifBufferThumb); -- -+#endif - if (exifImgThumb.get() != 0 && exifImgThumb->good()) - exifImgThumb->clearExifData(); - } -@@ -1045,11 +1064,11 @@ void DkMetaDataT::setOrientation(int o) { - pos = exifData.findKey(key); - } - -- Exiv2::Value::AutoPtr v = pos->getValue(); -+ std::unique_ptr<Exiv2::Value> v = pos->getValue(); - Exiv2::UShortValue* prv = dynamic_cast<Exiv2::UShortValue*>(v.release()); - if (!prv) return; - -- Exiv2::UShortValue::AutoPtr rv = Exiv2::UShortValue::AutoPtr(prv); -+ std::unique_ptr<Exiv2::UShortValue> rv = std::unique_ptr<Exiv2::UShortValue>(prv); - if (rv->value_.empty()) return; - - orientation = (int) rv->value_[0]; -@@ -1110,7 +1129,7 @@ void DkMetaDataT::setRating(int r) { - exifData["Exif.Image.Rating"] = uint16_t(r); - exifData["Exif.Image.RatingPercent"] = uint16_t(r); - -- Exiv2::Value::AutoPtr v = Exiv2::Value::create(Exiv2::xmpText); -+ std::unique_ptr<Exiv2::Value> v = Exiv2::Value::create(Exiv2::xmpText); - v->read(sRating); - xmpData.add(Exiv2::XmpKey("Xmp.xmp.Rating"), v.get()); - v->read(sRatingPercent); -@@ -1354,9 +1373,9 @@ DkRotatingRect DkMetaDataT::getXMPRect(const QSize& size) const { - return DkRotatingRect(rr); - } - --Exiv2::Image::AutoPtr DkMetaDataT::loadSidecar(const QString& filePath) const { -+std::unique_ptr<Exiv2::Image> DkMetaDataT::loadSidecar(const QString& filePath) const { - -- Exiv2::Image::AutoPtr xmpImg; -+ std::unique_ptr<Exiv2::Image> xmpImg; - - //TODO: check if the file type supports xmp - -@@ -1409,7 +1428,7 @@ bool DkMetaDataT::setXMPValue(Exiv2::XmpData& xmpData, QString xmpKey, QString x - setXMPValueSuccessful = true; - } - else { -- Exiv2::Value::AutoPtr v = Exiv2::Value::create(Exiv2::xmpText); -+ std::unique_ptr<Exiv2::Value> v = Exiv2::Value::create(Exiv2::xmpText); - if (!v->read(xmpValue.toStdString())) { - if (!xmpData.add(Exiv2::XmpKey(key), v.get())) - setXMPValueSuccessful = true; -diff --git a/ImageLounge/src/DkCore/DkMetaData.h b/ImageLounge/src/DkCore/DkMetaData.h -index c1f73c93..183a906a 100644 ---- a/ImageLounge/src/DkCore/DkMetaData.h -+++ b/ImageLounge/src/DkCore/DkMetaData.h -@@ -148,7 +148,7 @@ public: - - protected: - -- Exiv2::Image::AutoPtr loadSidecar(const QString& filePath) const; -+ std::unique_ptr<Exiv2::Image> loadSidecar(const QString& filePath) const; - - enum { - not_loaded, -@@ -157,7 +157,7 @@ protected: - dirty, - }; - -- Exiv2::Image::AutoPtr mExifImg; -+ std::unique_ptr<Exiv2::Image> mExifImg; - QString mFilePath; - QStringList mQtKeys; - QStringList mQtValues; --- -2.42.0 - diff --git a/media-gfx/nomacs/files/nomacs-3.16.224-libdir-plugins.patch b/media-gfx/nomacs/files/nomacs-3.16.224-libdir-plugins.patch deleted file mode 100644 index 0c613929add0..000000000000 --- a/media-gfx/nomacs/files/nomacs-3.16.224-libdir-plugins.patch +++ /dev/null @@ -1,23 +0,0 @@ -From e1d32cd424462b2ac414d3a4ea3e1285d5ca2aef Mon Sep 17 00:00:00 2001 -From: Markus Diem <diemmarkus@gmail.com> -Date: Mon, 27 Jul 2020 13:11:31 +0200 -Subject: [PATCH] patches wrong plugin installation path - -- thanks to @tieugene ---- - ImageLounge/plugins/cmake/Utils.cmake | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/cmake/Utils.cmake b/cmake/Utils.cmake -index f2d1b62..5578aa7 100644 ---- a/ImageLounge/plugins/cmake/Utils.cmake -+++ b/ImageLounge/plugins/cmake/Utils.cmake -@@ -139,7 +139,7 @@ macro(NMC_CREATE_TARGETS) - - elseif(UNIX) - set_target_properties(${PROJECT_NAME} PROPERTIES LIBRARY_OUTPUT_DIRECTORY ${NOMACS_BUILD_DIRECTORY}/plugins) -- install(TARGETS ${PROJECT_NAME} RUNTIME LIBRARY DESTINATION lib/nomacs-plugins) -+ install(TARGETS ${PROJECT_NAME} RUNTIME LIBRARY DESTINATION lib${LIB_SUFFIX}/nomacs-plugins) - set_property(TARGET ${PROJECT_NAME} PROPERTY VERSION ${NOMACS_VERSION_MAJOR}.${NOMACS_VERSION_MINOR}.${NOMACS_VERSION_PATCH}) - set_property(TARGET ${PROJECT_NAME} PROPERTY SOVERSION ${NOMACS_VERSION_MAJOR}) - endif(MSVC) diff --git a/media-gfx/nomacs/files/nomacs-3.16.224-libdir.patch b/media-gfx/nomacs/files/nomacs-3.16.224-libdir.patch deleted file mode 100644 index 50b73028f303..000000000000 --- a/media-gfx/nomacs/files/nomacs-3.16.224-libdir.patch +++ /dev/null @@ -1,30 +0,0 @@ -From c8f6c325c5f5170bb473c41ee716b781d37bdd41 Mon Sep 17 00:00:00 2001 -From: Markus Diem <diemmarkus@gmail.com> -Date: Mon, 27 Jul 2020 13:19:01 +0200 -Subject: [PATCH] fixes plugin path for fedora - -- thanks @tieugene -- beta version: 3.17 ---- - ImageLounge/src/DkCore/DkPluginManager.cpp | 3 ++- - 1 file changed, 2 insertions(+), 1 deletion(-) - ---- a/ImageLounge/src/DkCore/DkPluginManager.cpp -+++ b/ImageLounge/src/DkCore/DkPluginManager.cpp -@@ -62,6 +62,7 @@ - #include <QAction> - #include <QMenu> - #include <QJsonValue> -+#include <QLibraryInfo> - #pragma warning(pop) // no warnings from includes - end - - #ifdef QT_NO_DEBUG_OUTPUT -@@ -1309,7 +1310,7 @@ void DkPluginManager::createPluginsPath() { - #ifdef Q_OS_WIN - QDir pluginsDir = QCoreApplication::applicationDirPath() + "/plugins"; - #else -- QDir pluginsDir = QCoreApplication::applicationDirPath() + "/../lib/nomacs-plugins/"; -+ QDir pluginsDir = QLibraryInfo::location(QLibraryInfo::LibrariesPath) + "/nomacs-plugins/"; - #endif // Q_OS_WIN - - if (!pluginsDir.exists()) diff --git a/media-gfx/nomacs/files/nomacs-3.16.224-quazip1.patch b/media-gfx/nomacs/files/nomacs-3.16.224-quazip1.patch deleted file mode 100644 index 06f6b8c2fb81..000000000000 --- a/media-gfx/nomacs/files/nomacs-3.16.224-quazip1.patch +++ /dev/null @@ -1,127 +0,0 @@ -From b4a1e98a83598072ea6d720ae4d56d380bee5a75 Mon Sep 17 00:00:00 2001 -From: Petr Vanek <petr@yarpen.cz> -Date: Sun, 15 Nov 2020 19:15:59 +0100 -Subject: [PATCH] fixed #569 Build fails with quazip 1.0 (#576) - ---- - cmake/Unix.cmake | 28 +++++++++++++++------ - src/DkCore/DkBasicLoader.cpp | 4 +++ - src/DkCore/DkImageContainer.cpp | 4 +++ - src/DkCore/DkImageLoader.cpp | 6 ++++- - src/DkGui/DkDialog.cpp | 4 +++ - 5 files changed, 37 insertions(+), 9 deletions(-) - -diff --git a/cmake/Unix.cmake b/cmake/Unix.cmake -index 5567084b..c90ba320 100644 ---- a/cmake/Unix.cmake -+++ b/cmake/Unix.cmake -@@ -102,14 +102,26 @@ unset(QT_ROOT CACHE) - - if(ENABLE_QUAZIP) - if(USE_SYSTEM_QUAZIP) -- SET(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${CMAKE_CURRENT_SOURCE_DIR}/cmake) -- -- find_package(QuaZip5 QUIET) -- if(NOT QUAZIP_FOUND) -- message(FATAL_ERROR "QUAZIP not found. It's mandatory when used with ENABLE_QUAZIP enabled, you can also disable USE_SYSTEM_QUAZIP") -- else() -- add_definitions(-DWITH_QUAZIP) -- endif() -+ # Let's try QuaZip1 first (it's the bright future) -+ find_package(QuaZip-Qt5 QUIET) -+ if (QuaZip-Qt5_FOUND) -+ message(STATUS "QUAZIP: QuaZip-1 for Qt5 found") -+ set(QUAZIP_LIBRARIES QuaZip::QuaZip) -+ add_definitions(-DWITH_QUAZIP1) -+ else () -+ message(WARNING "QUAZIP: 1.x not found. Trying to find 0.x") -+ # QuaZip < 1.0. This leg can be removed (including cmake/FindQuaZip5.cmake) -+ # ater the final migration to 1.x in Linux distros -+ SET(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${CMAKE_CURRENT_SOURCE_DIR}/cmake) -+ -+ find_package(QuaZip5 QUIET) -+ if(NOT QUAZIP_FOUND) -+ message(FATAL_ERROR "QUAZIP: even 0.x not found. It's mandatory when used with ENABLE_QUAZIP enabled, you can also disable USE_SYSTEM_QUAZIP") -+ endif() -+ -+ endif (QuaZip-Qt5_FOUND) -+ # we have any QuaZip after all -+ add_definitions(-DWITH_QUAZIP) - else() - find_package(ZLIB REQUIRED) - set(QUAZIP_INCLUDE_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/3rdparty/quazip-0.7/quazip ${CMAKE_CURRENT_SOURCE_DIR}/3rdparty/quazip-0.7/) -diff --git a/src/DkCore/DkBasicLoader.cpp b/src/DkCore/DkBasicLoader.cpp -index 7f9e889c..b7edfd43 100644 ---- a/src/DkCore/DkBasicLoader.cpp -+++ b/src/DkCore/DkBasicLoader.cpp -@@ -54,8 +54,12 @@ - - // quazip - #ifdef WITH_QUAZIP -+#ifdef WITH_QUAZIP1 -+#include <quazip/JlCompress.h> -+#else - #include <quazip5/JlCompress.h> - #endif -+#endif - - // opencv - #ifdef WITH_OPENCV -diff --git a/src/DkCore/DkImageContainer.cpp b/src/DkCore/DkImageContainer.cpp -index 810994d3..150da9c2 100644 ---- a/src/DkCore/DkImageContainer.cpp -+++ b/src/DkCore/DkImageContainer.cpp -@@ -41,8 +41,12 @@ - - // quazip - #ifdef WITH_QUAZIP -+#ifdef WITH_QUAZIP1 -+#include <quazip/JlCompress.h> -+#else - #include <quazip5/JlCompress.h> - #endif -+#endif - #pragma warning(pop) // no warnings from includes - end - - #pragma warning(disable: 4251) // TODO: remove -diff --git a/src/DkCore/DkImageLoader.cpp b/src/DkCore/DkImageLoader.cpp -index 09d25d23..e4186f2b 100644 ---- a/src/DkCore/DkImageLoader.cpp -+++ b/src/DkCore/DkImageLoader.cpp -@@ -79,8 +79,12 @@ - - // quazip - #ifdef WITH_QUAZIP -+#ifdef WITH_QUAZIP1 -+#include <quazip/JlCompress.h> -+#else - #include <quazip5/JlCompress.h> - #endif -+#endif - - // opencv - #ifdef WITH_OPENCV -@@ -2212,4 +2216,4 @@ QString DkImageLoader::fileName() const { - return mCurrentImage->fileName(); - } - --} -\ No newline at end of file -+} -diff --git a/src/DkGui/DkDialog.cpp b/src/DkGui/DkDialog.cpp -index 008c9a3b..85842eca 100644 ---- a/src/DkGui/DkDialog.cpp -+++ b/src/DkGui/DkDialog.cpp -@@ -97,8 +97,12 @@ - - // quazip - #ifdef WITH_QUAZIP -+#ifdef WITH_QUAZIP1 -+#include <quazip/JlCompress.h> -+#else - #include <quazip5/JlCompress.h> - #endif -+#endif - - #pragma warning(pop) // no warnings from includes - end - diff --git a/media-gfx/nomacs/nomacs-3.16.224-r6.ebuild b/media-gfx/nomacs/nomacs-3.16.224-r6.ebuild deleted file mode 100644 index d174453289b1..000000000000 --- a/media-gfx/nomacs/nomacs-3.16.224-r6.ebuild +++ /dev/null @@ -1,86 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -CMAKE_BUILD_TYPE="Release" # buildsys: what a mess -PLUGIN_PKG="${PN}-plugins-$(ver_cut 1-2)" -inherit cmake xdg - -DESCRIPTION="Qt-based image viewer" -HOMEPAGE="https://nomacs.org/" -SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz -plugins? ( https://github.com/${PN}/${PN}-plugins/archive/$(ver_cut 1-2).tar.gz -> ${PLUGIN_PKG}.tar.gz )" -CMAKE_USE_DIR="${S}/ImageLounge" - -LICENSE="GPL-3+" -SLOT="0" -KEYWORDS="amd64 ~arm64 ~riscv x86 ~amd64-linux" -IUSE="+opencv plugins raw +tiff zip" - -REQUIRED_USE=" - raw? ( opencv ) - tiff? ( opencv ) -" - -RDEPEND=" - dev-qt/qtconcurrent:5 - dev-qt/qtcore:5 - dev-qt/qtgui:5[jpeg] - dev-qt/qtnetwork:5 - dev-qt/qtprintsupport:5 - dev-qt/qtsvg:5 - dev-qt/qtwidgets:5 - media-gfx/exiv2:= - opencv? ( >=media-libs/opencv-3.4:= ) - raw? ( media-libs/libraw:= ) - tiff? ( - dev-qt/qtimageformats:5 - media-libs/tiff:= - ) - zip? ( dev-libs/quazip:0=[qt5(+)] ) -" -DEPEND="${RDEPEND}" -BDEPEND=" - dev-qt/linguist-tools:5 - virtual/pkgconfig -" - -DOCS=( src/changelog.txt ) - -PATCHES=( - "${FILESDIR}"/${P}-libdir.patch - "${FILESDIR}"/${P}-exiv2-0.28.patch # bug 906488 -) - -src_prepare() { - if use plugins ; then - rmdir ImageLounge/plugins || die - mv -v ../${PLUGIN_PKG} ImageLounge/plugins || die - fi - - # from git master # reuse existing patches w/o paths adjusted - pushd "ImageLounge" > /dev/null || die - eapply "${FILESDIR}"/${P}-quazip1.patch - eapply "${FILESDIR}"/${P}-DkMath-ostream.patch - popd > /dev/null || die - - use plugins && eapply "${FILESDIR}"/${P}-libdir-plugins.patch - - cmake_src_prepare -} - -src_configure() { - local mycmakeargs=( - -DQT_QMAKE_EXECUTABLE=qmake5 # bug 847112 - -DENABLE_CODE_COV=OFF - -DUSE_SYSTEM_QUAZIP=ON - -DENABLE_TRANSLATIONS=ON - -DENABLE_OPENCV=$(usex opencv) - -DENABLE_PLUGINS=$(usex plugins) - -DENABLE_RAW=$(usex raw) - -DENABLE_TIFF=$(usex tiff) - -DENABLE_QUAZIP=$(usex zip) - ) - cmake_src_configure -} diff --git a/media-gfx/nomacs/nomacs-3.19.1.ebuild b/media-gfx/nomacs/nomacs-3.19.1-r1.ebuild index 4b9b1ed6c616..7b47804f0c79 100644 --- a/media-gfx/nomacs/nomacs-3.19.1.ebuild +++ b/media-gfx/nomacs/nomacs-3.19.1-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 @@ -15,16 +15,16 @@ CMAKE_USE_DIR="${S}/ImageLounge" LICENSE="GPL-3+" SLOT="0" -KEYWORDS="~amd64 ~arm64 ~riscv ~x86 ~amd64-linux" +KEYWORDS="amd64 ~arm64 ~riscv x86 ~amd64-linux" IUSE="+opencv plugins raw +tiff test zip" -RESTRICT="!test? ( test )" - REQUIRED_USE=" raw? ( opencv ) tiff? ( opencv ) " +RESTRICT="!test? ( test )" RDEPEND=" + dev-qt/qt5compat:6 dev-qt/qtbase:6[concurrent,cups,gui,network,widgets] dev-qt/qtsvg:6 media-gfx/exiv2:= @@ -36,8 +36,7 @@ RDEPEND=" ) zip? ( dev-libs/quazip:0=[qt6(+)] ) " -DEPEND=" - ${RDEPEND} +DEPEND="${RDEPEND} test? ( dev-cpp/gtest ) " BDEPEND=" diff --git a/media-gfx/openscad/Manifest b/media-gfx/openscad/Manifest index bf443bdfd60c..8af15c0dc3da 100644 --- a/media-gfx/openscad/Manifest +++ b/media-gfx/openscad/Manifest @@ -1,18 +1,10 @@ AUX 50openscad-gentoo.el 167 BLAKE2B 36292439057e2b9a5993c73cf5d46e5b6b0b56695f46307114fcfffa79990be0b0622ec3a6918726d4a5f7e4343525b9e67f785996ec4eb7abb938b6df1cb2f7 SHA512 ce669eba45ab90e9dbcd770a7470ca9ed7088b1acabbc876fe4d31dc7a6edd36076063e4bd417d348c3e073113e3ad2bc2dd0ac89e02d3d8aeca7627ad7d2a1e -AUX openscad-2021.01-0001-Gentoo-specific-Disable-ccache-building.patch 790 BLAKE2B b08a024f81a29d7fb4e0860977b814d2ec6ce6dcbf8ab87655f5d36f51ea3bbce6559369363c33ca7593cbc3284de920f71be3c38e3ab7b5efa83d3466132b79 SHA512 2af887d7b085c49203e72ad41cb5c0e32b772a8abd35843485434cb11b263ba8a727a0ebc34c7138bff1e6852245f2bdaf7d91711184a5f16ed22603578a0892 -AUX openscad-2021.01-0002-fix-to-find-lib3mf-2.patch 1396 BLAKE2B a43872dd83427f28a48528fbac534924796db769bd0213ba1b6fca41a65c766aa3355aa9ee3f7d68dcbbf3d578cee984f2ad61f599fdf9551ef55724f460f4db SHA512 ffbf402976054c1e7294a0d661e0648bdb359cf57e676d818cf1140644b7a0d0943f5adf1d2f511ad17ca45a35e31785aae584dc7607f13bfc9d94795fc3812b -AUX openscad-2021.01-CGAL-build-fix-v5.4-renames-projection-traits-header.patch 1380 BLAKE2B b359211ef34bd0e1306f37fcf84f65fc8b3a03036608abb36ece8e134bee419646754fedb52134947f1a3943c02fc07d778127f544d873346d62e5cd36c3ce9a SHA512 4c0dea73a578db8e6ff499a4fc9b337292d66dc1d652559d73616e85ee57d4a5c06d93e96a4e543a9b7087d3f4939e98bd7e22f9a9305c612a487527454e4d38 -AUX openscad-2021.01-CVE-2022-0496-Out-of-bounds-memory-access-in-DXF-loa.patch 3690 BLAKE2B c320ddd5077e8f4c92f21e9ea18e741b6844f409d1be1ca90fcf8ed8fe0b394694d2a4198b068858b92d8b004e603070bd51a0de1ccafdd3afc1925377f00082 SHA512 1a08d7207a6c98493022a6019d44db468ad8b1b0a7623296302895ffcda789fd9ad90f3d361026b6309fbbd23051a5f686e1a21c01bd90a668dd5ce08fd6ba9f -AUX openscad-2021.01-CVE-2022-0497-Out-of-bounds-memory-access-in-comment.patch 752 BLAKE2B a54676bdf69a78cbc0ff1d11676de4b5913030093f06a2029bb44bb301dee681a7a971f3cd31b033061f5f4e03ac243c83b51d21576b0bbe21cdc8457632d885 SHA512 49f43408021397d8ca8a628de102dde9f55ccc4fa219f84f7a0e08db6b63232d5d31562814669728273379db521e98d819fe939521ba7a346232a05aa9dcdc89 -AUX openscad-2021.01-Fix-build-failure-with-generic_print_polyhedron-on-C.patch 1390 BLAKE2B 2c5e96675b15f9dc7020f21d5d2b5a9f7edcde154533dcda14762aef5cbe8bec78ac0fb9cc8b0426817027543313a6862c07dd5d17eb46fa101633ed55ed75d6 SHA512 58cfa61093edb3e18022b73cca93d4741ba2fddd259c37864d604ee66bc8f9f1f170677f2151b539ebdf70e3043c6d1650fa7578037c70c277d3eec4ca030a4e -AUX openscad-2021.01-Fix-build-issue-with-overloaded-join.patch 3336 BLAKE2B c92caab0f33551ee7e66c6527dfa61d5ae70c3820d51188b6b4fc042a66cd58d207d4dbcdc87641b79733784d1c088af34a85078899fa4468522b4653fed7ab7 SHA512 f8860ec827efcdf1e0037c22ec0c1f8364b5f9554d264d2bac5be57c1b86e79f6ab284b65f1763c1548e8e3479c0ca510954937907f18f0db745826338a4f2f8 -AUX openscad-2021.01-Remove-double-quoting-of-the-output-file-parameter-f.patch 775 BLAKE2B eed37277c3e7ea84635c0b8cd02cc4ffde7abea78400ee39e67bcc782800197c57dae07a82084df47705951ced8968be78243a1d0e14a551783b8adcb669d43f SHA512 94306e68e53b01e799a5feb6f16a8f44c965a4b653b60227833013712f23648d20ac8272a7bfe38bde201af42946f91fe17231f120adfbe5b16e42b07d9f8d10 -AUX openscad-2021.01-boost-1.85.patch 621 BLAKE2B f86fa92c1f3c4a059550017e7a16ee808bdd4ff4a4196c19dacf8b86fd97458f72ebbf0ef763b88115d56eb0cb6ec565b63dd789c4558d8011aaf252b9ceea00 SHA512 786bf3739f8296b83047ac6c36432d331f392a1d1cf67fc2135a98f227840ff1b099437f5157bf8472ea47206a7ff2ef0de09e2b8780830e235c94bfe6ccad5b -DIST openscad-2021.01.tar.gz 15817555 BLAKE2B 417857d704fa3c14312641ebda983eb85a1e3bc0d517a235fa3bd2523fce6f93c1ea526c330179bc35f03e6c73d3cd7c4c57cd71480088c21bfc99bb020ab7cd SHA512 8deaa26bf4c295c12da38f323d2b2e6f827851337f5bc1cc9c79afc083c9f913c19a263086e6e853bf2c8434c1ccc705ea22ddb02dc99d39bb1e5e03fc58d128 +DIST openscad-2024.12.30_pre.tar.gz 25338952 BLAKE2B 41baa7f5df30e46611a2ef59dc0aa05ccb85644dddfb979224b5b026f1b9338285eecd50e2078543163621c89fbc81e97b7593b641a223b48ca02029962f8076 SHA512 e63ac792c16852c1bbdf06a3cb044b453e05c20a95158adddbc09239bcf228fd113a6e33f83d5580e615ecab3cdab8436da9e21d2ab3c3f8846f66219218713b DIST openscad-20241114.tar.gz 25288312 BLAKE2B 0c1a9b4b15c12f4b3b600e81cdb5eeddb34887c83e2ae67735d7221b6660730dc5e7f97f80b84d187772adfa20d15e20f0cded1b4937e26305434847bbf2af27 SHA512 6c66c09e4b72ec5ef200d077b58fcb7a5a9acd359551a5daebdc3e24cb2cb7ed7d607b04e5563ea6f14d9d929310c3a9194ac889f2530c2c933235271040981a DIST openscad-MCAD-bd0a7ba3f042bfbced5ca1894b236cea08904e26.tar.gz 58895 BLAKE2B e154a38e1c36873a34f7c80b8fa484e4bbcb1b0c217e15b977e6cedc9a83fd2e1518791f9a58a4f0e893c2a55947d7eaddb660d8b725eca048c30f0ea41cf14a SHA512 c6208a90f6a58ebdc0477d3e1b6be2f52e4ce976ac619a87818437cb9696b7e83285564fde757d32efaf50033d5217b55f67b6ce342250de838dd09fef334f36 +DIST sanitizers-cmake-0573e2ea8651b9bb3083f193c41eb086497cc80a.tar.gz 7495 BLAKE2B 57efaac8861755fd7fe3a9c9db2a68f775169ef82b91fbcf44da375540dce7673f319908c0d1a8ac324584bc217f9e2a1e27d6f935fe84f1f640049324ea3b24 SHA512 80d1c471492a771b12291e36cc7523e65c8f9add5b14643c9554156bbcc3e1753772054998306c3f89d33b7f5c9969e89670e16428a72040033b41329c9cb71b DIST sanitizers-cmake-3f0542e4e034aab417c51b2b22c94f83355dee15.tar.gz 7451 BLAKE2B 2ca72e3ecda02d4f0eed05be0954af02706425e94626d5a4b9d897968e35c341413171e2388ece7e83dad9eb7b5e2c2f73811ea8db8fa33b0bce6d5dd53550b7 SHA512 10cd4eeb3bbb7bf5c6f5cf8b5bc6a531b1ec8bdc147583d8de028a3e4b8b9d0e258aad81f02135267ce8f7d87b30999dedd25b44c0754b5c31e00d8481cd412f -EBUILD openscad-2021.01-r5.ebuild 2902 BLAKE2B 02406d442221462d7b31201a6a7e08628f978b332768d5bdc829ca9bd1fc533aeb3ec1e106b0870f026844052fe2c95a2b314ccf8b26459e6c26ec08d7194041 SHA512 4a3461c8c586a12fba89edd04300e4def30dba724edba51aecb0b76b6f1dbba2efb8c98028c6faf7fc627d4b99bedfe3ce86808205b4e1ae3451c3f54ac041bb -EBUILD openscad-20241114.ebuild 5205 BLAKE2B df69b9f6b15d7183fefdd5bc206ff1b6a1e6c637f9d9b07128de34c3c16a0808269a1ab34ce95a9e9c25daead299437a87acd943613b388cdd0507b65f75a8e5 SHA512 e2701dd32cf7c6d7dca435679439233859d400a859b352408af5550177a559d50fd8d442dafed1ad5f80b28adef1eba67c93020d1ee0f939f69c91d8c654a4e7 -EBUILD openscad-99999999.ebuild 5205 BLAKE2B df69b9f6b15d7183fefdd5bc206ff1b6a1e6c637f9d9b07128de34c3c16a0808269a1ab34ce95a9e9c25daead299437a87acd943613b388cdd0507b65f75a8e5 SHA512 e2701dd32cf7c6d7dca435679439233859d400a859b352408af5550177a559d50fd8d442dafed1ad5f80b28adef1eba67c93020d1ee0f939f69c91d8c654a4e7 +EBUILD openscad-2024.11.14_pre.ebuild 5214 BLAKE2B c8ab3db3169109eb1c89caa47d755b8a915ccc666907bd049836b52e0922a90a12538c648553f6c7c0d244f42f2bc5a66f645b954607e3a3524f65a8853727b4 SHA512 f54d0b43727700affe64cf1fafb0904f5099bffb54cb4d4d87e0c77b6f93a194b6ec4493a1634cc8c9d863594c0742a87a4ac3622f47caeec80a1ab13967e23a +EBUILD openscad-2024.12.30_pre.ebuild 6162 BLAKE2B b29c9f84282a7f96b3247461f00f8ca341d3876c196ff30c9e2823246edd8c69b205083a6cf4d99cab0a3451c0d801b94b110aab543d6ebad164d54333de0974 SHA512 e48153024099dce1ada61fb46cb3835c9c7d2c76779d8f7bb70ea187daaf79ced201808b34837702b459cf5253b127e5ab77f43888b0ff7d1574e68f46b1335a +EBUILD openscad-9999.ebuild 6162 BLAKE2B b29c9f84282a7f96b3247461f00f8ca341d3876c196ff30c9e2823246edd8c69b205083a6cf4d99cab0a3451c0d801b94b110aab543d6ebad164d54333de0974 SHA512 e48153024099dce1ada61fb46cb3835c9c7d2c76779d8f7bb70ea187daaf79ced201808b34837702b459cf5253b127e5ab77f43888b0ff7d1574e68f46b1335a MISC metadata.xml 1765 BLAKE2B 8663817a4565428f0c78ddc70f5921e66709582773daad5edaf8b28b7603be9626de926c85b3b3ef300cf9932828417118b4f600f8e6e6dd47509efaedff9bda SHA512 5a4cdb759b3934c8e00e713f301c62d173ebfaffe6a2df2e0546c8940fd62573d75f7fa83f3edf881545adbef215b94297b971d386fa87ab7790a77500bf7288 diff --git a/media-gfx/openscad/files/openscad-2021.01-0001-Gentoo-specific-Disable-ccache-building.patch b/media-gfx/openscad/files/openscad-2021.01-0001-Gentoo-specific-Disable-ccache-building.patch deleted file mode 100644 index 6de581078d27..000000000000 --- a/media-gfx/openscad/files/openscad-2021.01-0001-Gentoo-specific-Disable-ccache-building.patch +++ /dev/null @@ -1,32 +0,0 @@ -From c138881767262b9f5c64a465a0e1e46ffcfc5899 Mon Sep 17 00:00:00 2001 -From: Bernd Waibel <waebbl-gentoo@posteo.net> -Date: Sun, 28 Feb 2021 16:51:30 +0100 -Subject: [PATCH] [Gentoo specific] Disable ccache building - -On Gentoo, we use a USE flag to determine whether ccache -should be used for building. - -Signed-off-by: Bernd Waibel <waebbl-gentoo@posteo.net> ---- - openscad.pro | 5 ----- - 1 file changed, 5 deletions(-) - -diff --git a/openscad.pro b/openscad.pro -index b76ca76..678e08d 100755 ---- a/openscad.pro -+++ b/openscad.pro -@@ -211,11 +211,6 @@ mdi { - DEFINES += ENABLE_MDI - } - --system("ccache -V >/dev/null 2>/dev/null") { -- CONFIG += ccache -- message("Using ccache") --} -- - include(common.pri) - - # mingw has to come after other items so OBJECT_DIRS will work properly --- -2.30.1 - diff --git a/media-gfx/openscad/files/openscad-2021.01-0002-fix-to-find-lib3mf-2.patch b/media-gfx/openscad/files/openscad-2021.01-0002-fix-to-find-lib3mf-2.patch deleted file mode 100644 index 1995bd6e0ac4..000000000000 --- a/media-gfx/openscad/files/openscad-2021.01-0002-fix-to-find-lib3mf-2.patch +++ /dev/null @@ -1,43 +0,0 @@ -From 16847a70cf05484a668d8f79aba4ccec7e16c025 Mon Sep 17 00:00:00 2001 -From: Bernd Waibel <waebbl-gentoo@posteo.net> -Date: Sat, 6 Mar 2021 22:59:17 +0100 -Subject: [PATCH] fix to find lib3mf-2 - -The pkgconfig file for lib3mf has been renamed in case -for lib3mf-2 versions. -This patch uses the news names. - -Signed-off-by: Bernd Waibel <waebbl-gentoo@posteo.net> ---- - features/lib3mf.prf | 8 ++++---- - 1 file changed, 4 insertions(+), 4 deletions(-) - -diff --git a/features/lib3mf.prf b/features/lib3mf.prf -index 2c512da..47be364 100644 ---- a/features/lib3mf.prf -+++ b/features/lib3mf.prf -@@ -15,8 +15,8 @@ isEmpty(LIB3MF_LIBPATH) { - } - - isEmpty(LIB3MF_INCLUDEPATH) { -- LIB3MF_CFLAGS = $$system("$$PKG_CONFIG --cflags lib3MF") -- LIB3MF_INCLUDEPATH = $$system("$$PKG_CONFIG --variable=includedir lib3MF") -+ LIB3MF_CFLAGS = $$system("$$PKG_CONFIG --cflags lib3mf") -+ LIB3MF_INCLUDEPATH = $$system("$$PKG_CONFIG --variable=includedir lib3mf") - !isEmpty(LIB3MF_CFLAGS) { - ENABLE_LIB3MF=yes - } -@@ -25,8 +25,8 @@ isEmpty(LIB3MF_INCLUDEPATH) { - } - - isEmpty(LIB3MF_LIBPATH) { -- LIB3MF_LIBS = $$system("$$PKG_CONFIG --libs lib3MF") -- LIB3MF_LIBPATH = $$system("$$PKG_CONFIG --variable=libdir lib3MF") -+ LIB3MF_LIBS = $$system("$$PKG_CONFIG --libs lib3mf") -+ LIB3MF_LIBPATH = $$system("$$PKG_CONFIG --variable=libdir lib3mf") - !isEmpty(LIB3MF_LIBS) { - ENABLE_LIB3MF=yes - } --- -2.30.1 - diff --git a/media-gfx/openscad/files/openscad-2021.01-CGAL-build-fix-v5.4-renames-projection-traits-header.patch b/media-gfx/openscad/files/openscad-2021.01-CGAL-build-fix-v5.4-renames-projection-traits-header.patch deleted file mode 100644 index 5fea4998683d..000000000000 --- a/media-gfx/openscad/files/openscad-2021.01-CGAL-build-fix-v5.4-renames-projection-traits-header.patch +++ /dev/null @@ -1,36 +0,0 @@ -https://bugs.gentoo.org/851189 -From https://github.com/openscad/openscad/commit/abfebc651343909b534ef337aacc7604c99cf0ea Mon Sep 17 00:00:00 2001 -From: Torsten Paul <Torsten.Paul@gmx.de> -Date: Wed, 2 Feb 2022 02:30:59 +0100 -Subject: [PATCH 09/11] CGAL build fix, v5.4 renames projection traits header - files and classes. - ---- a/src/cgalutils-tess.cc -+++ b/src/cgalutils-tess.cc -@@ -6,10 +6,12 @@ - #pragma push_macro("NDEBUG") - #undef NDEBUG - #include <CGAL/Constrained_Delaunay_triangulation_2.h> --#if CGAL_VERSION_NR >= CGAL_VERSION_NUMBER(4,11,0) -- #include <CGAL/Triangulation_2_projection_traits_3.h> -+#if CGAL_VERSION_NR < 1050401000 -+#include <CGAL/Triangulation_2_projection_traits_3.h> -+typedef CGAL::Triangulation_2_filtered_projection_traits_3<K> Projection; - #else -- #include <CGAL/Triangulation_2_filtered_projection_traits_3.h> -+#include <CGAL/Projection_traits_3.h> -+typedef CGAL::Filtered_projection_traits_3<K> Projection; - #endif - #include <CGAL/Triangulation_face_base_with_info_2.h> - #pragma pop_macro("NDEBUG") -@@ -19,7 +21,6 @@ struct FaceInfo { - bool in_domain() { return nesting_level%2 == 1; } - }; - --typedef CGAL::Triangulation_2_filtered_projection_traits_3<K> Projection; - typedef CGAL::Triangulation_face_base_with_info_2<FaceInfo, K> Fbb; - typedef CGAL::Triangulation_data_structure_2< - CGAL::Triangulation_vertex_base_2<Projection>, --- -2.35.1 - diff --git a/media-gfx/openscad/files/openscad-2021.01-CVE-2022-0496-Out-of-bounds-memory-access-in-DXF-loa.patch b/media-gfx/openscad/files/openscad-2021.01-CVE-2022-0496-Out-of-bounds-memory-access-in-DXF-loa.patch deleted file mode 100644 index 6c0a9558e3fb..000000000000 --- a/media-gfx/openscad/files/openscad-2021.01-CVE-2022-0496-Out-of-bounds-memory-access-in-DXF-loa.patch +++ /dev/null @@ -1,74 +0,0 @@ -From https://github.com/openscad/openscad/commit/00a4692989c4e2f191525f73f24ad8727bacdf41 Mon Sep 17 00:00:00 2001 -From: Torsten Paul <Torsten.Paul@gmx.de> -Date: Sat, 5 Feb 2022 18:38:31 +0100 -Subject: [PATCH 01/11] CVE-2022-0496 Out-of-bounds memory access in DXF - loader. - -Public issue: -https://github.com/openscad/openscad/issues/4037 - -Fix in master branch: -https://github.com/openscad/openscad/pull/4090 ---- a/src/dxfdata.cc -+++ b/src/dxfdata.cc -@@ -441,6 +441,11 @@ DxfData::DxfData(double fn, double fs, double fa, - auto lv = grid.data(this->points[lines[idx].idx[j]][0], this->points[lines[idx].idx[j]][1]); - for (size_t ki = 0; ki < lv.size(); ++ki) { - int k = lv.at(ki); -+ if (k < 0 || k >= lines.size()) { -+ LOG(message_group::Warning,Location::NONE,"", -+ "Bad DXF line index in %1$s.",QuotedString(boostfs_uncomplete(filename, fs::current_path()).generic_string())); -+ continue; -+ } - if (k == idx || lines[k].disabled) continue; - goto next_open_path_j; - } -@@ -466,13 +471,20 @@ DxfData::DxfData(double fn, double fs, double fa, - auto lv = grid.data(ref_point[0], ref_point[1]); - for (size_t ki = 0; ki < lv.size(); ++ki) { - int k = lv.at(ki); -+ if (k < 0 || k >= lines.size()) { -+ LOG(message_group::Warning,Location::NONE,"", -+ "Bad DXF line index in %1$s.",QuotedString(boostfs_uncomplete(filename, fs::current_path()).generic_string())); -+ continue; -+ } - if (lines[k].disabled) continue; -- if (grid.eq(ref_point[0], ref_point[1], this->points[lines[k].idx[0]][0], this->points[lines[k].idx[0]][1])) { -+ auto idk0 = lines[k].idx[0]; // make it easier to read and debug -+ auto idk1 = lines[k].idx[1]; -+ if (grid.eq(ref_point[0], ref_point[1], this->points[idk0][0], this->points[idk0][1])) { - current_line = k; - current_point = 0; - goto found_next_line_in_open_path; - } -- if (grid.eq(ref_point[0], ref_point[1], this->points[lines[k].idx[1]][0], this->points[lines[k].idx[1]][1])) { -+ if (grid.eq(ref_point[0], ref_point[1], this->points[idk1][0], this->points[idk1][1])) { - current_line = k; - current_point = 1; - goto found_next_line_in_open_path; -@@ -501,13 +513,20 @@ DxfData::DxfData(double fn, double fs, double fa, - auto lv = grid.data(ref_point[0], ref_point[1]); - for (size_t ki = 0; ki < lv.size(); ++ki) { - int k = lv.at(ki); -+ if (k < 0 || k >= lines.size()) { -+ LOG(message_group::Warning,Location::NONE,"", -+ "Bad DXF line index in %1$s.",QuotedString(boostfs_uncomplete(filename, fs::current_path()).generic_string())); -+ continue; -+ } - if (lines[k].disabled) continue; -- if (grid.eq(ref_point[0], ref_point[1], this->points[lines[k].idx[0]][0], this->points[lines[k].idx[0]][1])) { -+ auto idk0 = lines[k].idx[0]; // make it easier to read and debug -+ auto idk1 = lines[k].idx[1]; -+ if (grid.eq(ref_point[0], ref_point[1], this->points[idk0][0], this->points[idk0][1])) { - current_line = k; - current_point = 0; - goto found_next_line_in_closed_path; - } -- if (grid.eq(ref_point[0], ref_point[1], this->points[lines[k].idx[1]][0], this->points[lines[k].idx[1]][1])) { -+ if (grid.eq(ref_point[0], ref_point[1], this->points[idk1][0], this->points[idk1][1])) { - current_line = k; - current_point = 1; - goto found_next_line_in_closed_path; --- -2.35.1 - diff --git a/media-gfx/openscad/files/openscad-2021.01-CVE-2022-0497-Out-of-bounds-memory-access-in-comment.patch b/media-gfx/openscad/files/openscad-2021.01-CVE-2022-0497-Out-of-bounds-memory-access-in-comment.patch deleted file mode 100644 index 39ef72406f47..000000000000 --- a/media-gfx/openscad/files/openscad-2021.01-CVE-2022-0497-Out-of-bounds-memory-access-in-comment.patch +++ /dev/null @@ -1,25 +0,0 @@ -From https://github.com/openscad/openscad/commit/84addf3c1efbd51d8ff424b7da276400bbfa1a4b Mon Sep 17 00:00:00 2001 -From: Torsten Paul <Torsten.Paul@gmx.de> -Date: Sat, 5 Feb 2022 18:45:29 +0100 -Subject: [PATCH 02/11] CVE-2022-0497 Out-of-bounds memory access in comment - parser. - -Public issue: -https://github.com/openscad/openscad/issues/4043 - -Fix in master branch: -https://github.com/openscad/openscad/pull/4044 ---- a/src/comment.cpp -+++ b/src/comment.cpp -@@ -92,7 +92,7 @@ static std::string getComment(const std::string &fulltext, int line) - } - - int end = start + 1; -- while (fulltext[end] != '\n') end++; -+ while (end < fulltext.size() && fulltext[end] != '\n') end++; - - std::string comment = fulltext.substr(start, end - start); - --- -2.35.1 - diff --git a/media-gfx/openscad/files/openscad-2021.01-Fix-build-failure-with-generic_print_polyhedron-on-C.patch b/media-gfx/openscad/files/openscad-2021.01-Fix-build-failure-with-generic_print_polyhedron-on-C.patch deleted file mode 100644 index f09954bf01be..000000000000 --- a/media-gfx/openscad/files/openscad-2021.01-Fix-build-failure-with-generic_print_polyhedron-on-C.patch +++ /dev/null @@ -1,42 +0,0 @@ -https://bugs.gentoo.org/851189 -From https://github.com/openscad/openscad/commit/9aa0d7e9f2914fe5f547bdde69202161d1c6064d Mon Sep 17 00:00:00 2001 -From: Jordan Brown <github@jordan.maileater.net> -Date: Sun, 18 Jul 2021 21:01:46 -0700 -Subject: [PATCH 05/11] Fix build failure with "generic_print_polyhedron" on - CGAL-5.3. - ---- a/src/cgalutils-polyhedron.cc -+++ b/src/cgalutils-polyhedron.cc -@@ -337,19 +337,6 @@ namespace CGALUtils { - } - }; - -- template <typename Polyhedron> -- std::string printPolyhedron(const Polyhedron &p) { -- std::ostringstream sstream; -- sstream.precision(20); -- -- Polyhedron_writer writer; -- generic_print_polyhedron(sstream, p, writer); -- -- return sstream.str(); -- } -- -- template std::string printPolyhedron(const CGAL_Polyhedron &p); -- - }; // namespace CGALUtils - - #endif /* ENABLE_CGAL */ ---- a/src/cgalutils.h -+++ b/src/cgalutils.h -@@ -45,7 +45,6 @@ namespace CGALUtils { - bool is_approximately_convex(const PolySet &ps); - Geometry const* applyMinkowski(const Geometry::Geometries &children); - -- template <typename Polyhedron> std::string printPolyhedron(const Polyhedron &p); - template <typename Polyhedron> bool createPolySetFromPolyhedron(const Polyhedron &p, PolySet &ps); - template <typename Polyhedron> bool createPolyhedronFromPolySet(const PolySet &ps, Polyhedron &p); - template <class Polyhedron_A, class Polyhedron_B> --- -2.35.1 - diff --git a/media-gfx/openscad/files/openscad-2021.01-Fix-build-issue-with-overloaded-join.patch b/media-gfx/openscad/files/openscad-2021.01-Fix-build-issue-with-overloaded-join.patch deleted file mode 100644 index 7a70b183d447..000000000000 --- a/media-gfx/openscad/files/openscad-2021.01-Fix-build-issue-with-overloaded-join.patch +++ /dev/null @@ -1,60 +0,0 @@ -https://bugs.gentoo.org/851189 -From https://github.com/openscad/openscad/commit/08bf69b4115c989fc5671254e0d05735d01bcca5 Mon Sep 17 00:00:00 2001 -From: Torsten Paul <Torsten.Paul@gmx.de> -Date: Wed, 2 Feb 2022 00:50:43 +0100 -Subject: [PATCH 10/11] Fix build issue with overloaded join(). - ---- a/src/openscad.cc -+++ b/src/openscad.cc -@@ -65,7 +65,6 @@ - #include <chrono> - #include <boost/algorithm/string.hpp> - #include <boost/algorithm/string/split.hpp> --#include <boost/algorithm/string/join.hpp> - #include <boost/range/adaptor/transformed.hpp> - #include <boost/program_options.hpp> - #include <boost/filesystem.hpp> -@@ -307,7 +306,7 @@ void set_render_color_scheme(const std::string color_scheme, const bool exit_if_ - } - - if (exit_if_not_found) { -- LOG(message_group::None,Location::NONE,"",(boost::join(ColorMap::inst()->colorSchemeNames(), "\n"))); -+ LOG(message_group::None,Location::NONE,"",(boost::algorithm::join(ColorMap::inst()->colorSchemeNames(), "\n"))); - - exit(1); - } else { -@@ -885,7 +884,7 @@ struct CommaSeparatedVector - }; - - template <class Seq, typename ToString> --std::string join(const Seq &seq, const std::string &sep, const ToString &toString) -+std::string str_join(const Seq &seq, const std::string &sep, const ToString &toString) - { - return boost::algorithm::join(boost::adaptors::transform(seq, toString), sep); - } -@@ -947,7 +946,7 @@ int main(int argc, char **argv) - ("P,P", po::value<string>(), "customizer parameter set") - #ifdef ENABLE_EXPERIMENTAL - ("enable", po::value<vector<string>>(), ("enable experimental features: " + -- join(boost::make_iterator_range(Feature::begin(), Feature::end()), " | ", -+ str_join(boost::make_iterator_range(Feature::begin(), Feature::end()), " | ", - [](const Feature *feature) { - return feature->get_name(); - }) + -@@ -964,11 +963,11 @@ int main(int argc, char **argv) - ("render", po::value<string>()->implicit_value(""), "for full geometry evaluation when exporting png") - ("preview", po::value<string>()->implicit_value(""), "[=throwntogether] -for ThrownTogether preview png") - ("animate", po::value<unsigned>(), "export N animated frames") -- ("view", po::value<CommaSeparatedVector>(), ("=view options: " + boost::join(viewOptions.names(), " | ")).c_str()) -+ ("view", po::value<CommaSeparatedVector>(), ("=view options: " + boost::algorithm::join(viewOptions.names(), " | ")).c_str()) - ("projection", po::value<string>(), "=(o)rtho or (p)erspective when exporting png") - ("csglimit", po::value<unsigned int>(), "=n -stop rendering at n CSG elements when exporting png") - ("colorscheme", po::value<string>(), ("=colorscheme: " + -- join(ColorMap::inst()->colorSchemeNames(), " | ", -+ str_join(ColorMap::inst()->colorSchemeNames(), " | ", - [](const std::string& colorScheme) { - return (colorScheme == ColorMap::inst()->defaultColorSchemeName() ? "*" : "") + colorScheme; - }) + --- -2.35.1 - diff --git a/media-gfx/openscad/files/openscad-2021.01-Remove-double-quoting-of-the-output-file-parameter-f.patch b/media-gfx/openscad/files/openscad-2021.01-Remove-double-quoting-of-the-output-file-parameter-f.patch deleted file mode 100644 index 20167b910ee4..000000000000 --- a/media-gfx/openscad/files/openscad-2021.01-Remove-double-quoting-of-the-output-file-parameter-f.patch +++ /dev/null @@ -1,20 +0,0 @@ -From https://github.com/openscad/openscad/commit/45a5e3bdd6c8071cb50b9c3f2b14a62554aafc4a Mon Sep 17 00:00:00 2001 -From: Torsten Paul <Torsten.Paul@gmx.de> -Date: Thu, 14 Apr 2022 16:07:04 +0200 -Subject: [PATCH 11/11] Remove double quoting of the output file parameter for - ghostscript. - ---- a/tests/export_pngtest.py -+++ b/tests/export_pngtest.py -@@ -82,7 +82,7 @@ result = subprocess.call(export_cmd, env = fontenv) - if result != 0: - failquit('OpenSCAD failed with return code ' + str(result)) - --convert_cmd = gs_cmd + ["-sOutputFile=\"" + pngfile + "\"", exportfile] -+convert_cmd = gs_cmd + ["-sOutputFile=" + pngfile, exportfile] - print('Running Converter:', ' '.join(convert_cmd), file=sys.stderr) - result = subprocess.call(convert_cmd) - if result != 0: --- -2.35.1 - diff --git a/media-gfx/openscad/files/openscad-2021.01-boost-1.85.patch b/media-gfx/openscad/files/openscad-2021.01-boost-1.85.patch deleted file mode 100644 index e3370f32fc38..000000000000 --- a/media-gfx/openscad/files/openscad-2021.01-boost-1.85.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff '--color=auto' -ur openscad-2021.01-orig/src/FileModule.cc openscad-2021.01/src/FileModule.cc ---- openscad-2021.01-orig/src/FileModule.cc 2021-01-31 21:17:41.000000000 +0100 -+++ openscad-2021.01/src/FileModule.cc 2024-05-20 07:50:31.746487490 +0200 -@@ -65,7 +65,7 @@ - auto ext = fs::path(path).extension().generic_string(); - - if (boost::iequals(ext, ".otf") || boost::iequals(ext, ".ttf")) { -- if (fs::is_regular(path)) { -+ if (fs::is_regular_file(path)) { - FontCache::instance()->register_font_file(path); - } else { - LOG(message_group::Error,Location::NONE,"","Can't read font with path '%1$s'",path); diff --git a/media-gfx/openscad/openscad-2021.01-r5.ebuild b/media-gfx/openscad/openscad-2021.01-r5.ebuild deleted file mode 100644 index 3e4af4844ba7..000000000000 --- a/media-gfx/openscad/openscad-2021.01-r5.ebuild +++ /dev/null @@ -1,118 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit elisp-common flag-o-matic qmake-utils xdg - -SITEFILE="50${PN}-gentoo.el" - -DESCRIPTION="The Programmers Solid 3D CAD Modeller" -HOMEPAGE="https://openscad.org/" -SRC_URI="https://github.com/${PN}/${PN}/releases/download/${P}/${P}.src.tar.gz -> ${P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="amd64 ~arm64 ~ppc64 ~x86" -IUSE="emacs" -# tests are not fully working and need cmake which isn't yet -# officially supported. -RESTRICT="test" - -RDEPEND=" - dev-cpp/eigen:3 - dev-libs/boost:= - dev-libs/double-conversion:= - dev-libs/glib:2 - dev-libs/gmp:0= - dev-libs/hidapi - dev-libs/libspnav - dev-libs/libxml2 - dev-libs/libzip:= - dev-libs/mpfr:0= - dev-qt/qtconcurrent:5 - dev-qt/qtcore:5 - dev-qt/qtdbus:5 - dev-qt/qtgui:5[-gles2-only] - dev-qt/qtmultimedia:5 - dev-qt/qtnetwork:5 - dev-qt/qtopengl:5 - dev-qt/qtwidgets:5 - media-gfx/opencsg:= - media-libs/fontconfig - media-libs/freetype - >=media-libs/glew-2.0.0:0= - media-libs/harfbuzz:= - media-libs/lib3mf - sci-mathematics/cgal:= - x11-libs/cairo - >=x11-libs/qscintilla-2.10.3:=[qt5(+)] - emacs? ( >=app-editors/emacs-23.1:* ) -" -DEPEND="${RDEPEND}" -BDEPEND=" - dev-util/itstool - app-alternatives/yacc - app-alternatives/lex - sys-devel/gettext - virtual/pkgconfig -" - -PATCHES=( - "${FILESDIR}"/${P}-0001-Gentoo-specific-Disable-ccache-building.patch - "${FILESDIR}"/${P}-0002-fix-to-find-lib3mf-2.patch - "${FILESDIR}"/${P}-CVE-2022-0496-Out-of-bounds-memory-access-in-DXF-loa.patch - "${FILESDIR}"/${P}-CVE-2022-0497-Out-of-bounds-memory-access-in-comment.patch - "${FILESDIR}"/${P}-Fix-build-failure-with-generic_print_polyhedron-on-C.patch - "${FILESDIR}"/${P}-CGAL-build-fix-v5.4-renames-projection-traits-header.patch - "${FILESDIR}"/${P}-Fix-build-issue-with-overloaded-join.patch - "${FILESDIR}"/${P}-Remove-double-quoting-of-the-output-file-parameter-f.patch - "${FILESDIR}"/${P}-boost-1.85.patch -) - -src_configure() { - # -Werror=odr - # https://github.com/openscad/openscad/issues/5239 - filter-lto - - if has ccache ${FEATURES}; then - eqmake5 "PREFIX = ${ESYSROOT}/usr" "CONFIG += ccache" "${PN}.pro" - else - eqmake5 "PREFIX = ${ESYSROOT}/usr" "${PN}.pro" - fi -} - -src_compile() { - # We have random parallel build issues, bug #856430 - emake -j1 - - if use emacs ; then - elisp-compile contrib/*.el - fi -} - -src_install() { - emake install INSTALL_ROOT="${D}" - - if use emacs; then - elisp-site-file-install "${FILESDIR}/${SITEFILE}" - elisp-install ${PN} contrib/*.el contrib/*.elc - fi - - mv -i "${ED}"/usr/share/openscad/locale "${ED}"/usr/share || die "failed to move locales" - ln -sf ../locale "${ED}"/usr/share/openscad/locale || die - - einstalldocs -} - -pkg_postinst() { - use emacs && elisp-site-regen - xdg_desktop_database_update - xdg_mimeinfo_database_update -} - -pkg_postrm() { - use emacs && elisp-site-regen - xdg_desktop_database_update - xdg_mimeinfo_database_update -} diff --git a/media-gfx/openscad/openscad-20241114.ebuild b/media-gfx/openscad/openscad-2024.11.14_pre.ebuild index 238288a09864..e1239db68909 100644 --- a/media-gfx/openscad/openscad-20241114.ebuild +++ b/media-gfx/openscad/openscad-2024.11.14_pre.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 @@ -24,7 +24,7 @@ else SRC_URI=" https://github.com/openscad/openscad/archive/${COMMIT}.tar.gz - -> ${P}.tar.gz + -> ${PN}-20241114.tar.gz https://github.com/arsenm/sanitizers-cmake/archive/${SANITIZERS_CMAKE_COMMIT}.tar.gz -> sanitizers-cmake-${SANITIZERS_CMAKE_COMMIT}.tar.gz test? ( @@ -34,7 +34,7 @@ else # doc downloads are not versioned and found at: # https://files.openscad.org/documentation/ S="${WORKDIR}/${PN}-${COMMIT}" - KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86" + KEYWORDS="amd64 ~arm64 ~ppc64 ~x86" fi # Code is GPL-3+, MCAD library is LGPL-2.1 diff --git a/media-gfx/openscad/openscad-99999999.ebuild b/media-gfx/openscad/openscad-2024.12.30_pre.ebuild index 238288a09864..0361bac9f047 100644 --- a/media-gfx/openscad/openscad-99999999.ebuild +++ b/media-gfx/openscad/openscad-2024.12.30_pre.ebuild @@ -1,9 +1,10 @@ -# Copyright 1999-2024 Gentoo Authors +# Copyright 1999-2025 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 -inherit cmake flag-o-matic optfeature virtualx xdg +PYTHON_COMPAT=( python3_{10..13} ) +inherit cmake flag-o-matic optfeature python-any-r1 virtualx xdg DESCRIPTION="The Programmers Solid 3D CAD Modeller" HOMEPAGE="https://openscad.org/" @@ -18,22 +19,26 @@ if [[ ${PV} = *9999* ]] ; then '-OpenCSG' ) else - COMMIT="bc0d078e0361d7dba66723ac31bdb3b650ecff37" - SANITIZERS_CMAKE_COMMIT="3f0542e4e034aab417c51b2b22c94f83355dee15" - MCAD_COMMIT="bd0a7ba3f042bfbced5ca1894b236cea08904e26" - - SRC_URI=" - https://github.com/openscad/openscad/archive/${COMMIT}.tar.gz - -> ${P}.tar.gz - https://github.com/arsenm/sanitizers-cmake/archive/${SANITIZERS_CMAKE_COMMIT}.tar.gz - -> sanitizers-cmake-${SANITIZERS_CMAKE_COMMIT}.tar.gz - test? ( - https://github.com/openscad/MCAD/archive/${MCAD_COMMIT}.tar.gz -> ${PN}-MCAD-${MCAD_COMMIT}.tar.gz - ) - " - # doc downloads are not versioned and found at: - # https://files.openscad.org/documentation/ - S="${WORKDIR}/${PN}-${COMMIT}" + if [[ ${PV} = *pre* ]] ; then + COMMIT="756e080c7e49072d9926cf9ce766def180a0dcae" + SANITIZERS_CMAKE_COMMIT="0573e2ea8651b9bb3083f193c41eb086497cc80a" + MCAD_COMMIT="bd0a7ba3f042bfbced5ca1894b236cea08904e26" + + SRC_URI=" + https://github.com/openscad/openscad/archive/${COMMIT}.tar.gz + -> ${P}.tar.gz + https://github.com/arsenm/sanitizers-cmake/archive/${SANITIZERS_CMAKE_COMMIT}.tar.gz + -> sanitizers-cmake-${SANITIZERS_CMAKE_COMMIT}.tar.gz + test? ( + https://github.com/openscad/MCAD/archive/${MCAD_COMMIT}.tar.gz -> ${PN}-MCAD-${MCAD_COMMIT}.tar.gz + ) + " + # doc downloads are not versioned and found at: + # https://files.openscad.org/documentation/ + S="${WORKDIR}/${PN}-${COMMIT}" + else + SRC_URI="https://github.com/${PN}/${PN}/releases/download/${P}/${P}.src.tar.gz -> ${P}.tar.gz" + fi KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86" fi @@ -74,7 +79,7 @@ RDEPEND=" hidapi? ( dev-libs/hidapi ) manifold? ( dev-cpp/tbb - sci-mathematics/manifold + >=sci-mathematics/manifold-3.0.1 ) mimalloc? ( dev-libs/mimalloc:= ) pdf? ( x11-libs/cairo ) @@ -90,6 +95,13 @@ BDEPEND=" dev-util/itstool sys-devel/gettext virtual/pkgconfig + test? ( + $(python_gen_any_dep ' + dev-python/numpy[${PYTHON_USEDEP}] + dev-python/pillow[${PYTHON_USEDEP}] + dev-python/pip[${PYTHON_USEDEP}] + ') + ) " DOCS=( @@ -102,6 +114,17 @@ DOCS=( doc/translation.txt ) +# NOTE the build system sets up a venv for tests, we could use imagemagick with -DUSE_IMAGE_COMPARE_PY="no" +python_check_deps() { + python_has_version "dev-python/numpy[${PYTHON_USEDEP}]" && + python_has_version "dev-python/pillow[${PYTHON_USEDEP}]" && + python_has_version "dev-python/pip[${PYTHON_USEDEP}]" +} + +pkg_setup() { + use test && python-any-r1_pkg_setup +} + src_prepare() { if use test && [[ ${PV} != *9999* ]] ; then mv -f "${WORKDIR}/MCAD-${MCAD_COMMIT}"/* "${S}/libraries/MCAD/" || die @@ -134,6 +157,7 @@ src_configure() { -DEXPERIMENTAL="$(usex experimental)" -DHEADLESS="$(usex !gui)" + -DUSE_BUILTIN_CLIPPER2="no" -DUSE_BUILTIN_MANIFOLD="no" -DUSE_CCACHE="no" -DUSE_GLAD="yes" @@ -142,6 +166,7 @@ src_configure() { -DUSE_MIMALLOC="$(usex mimalloc)" -DUSE_QT6="$(usex gui)" -DOFFLINE_DOCS="no" # TODO + -DOPENCSG_DIR="${EPREFIX}/usr/$(get_libdir)" ) if use gui; then @@ -155,8 +180,18 @@ src_configure() { if [[ ${PV} != *9999* ]] ; then mycmakeargs+=( -DCMAKE_MODULE_PATH="${WORKDIR}/sanitizers-cmake-${SANITIZERS_CMAKE_COMMIT}/cmake" + ) + if [[ ${PV} = *pre* ]] ; then + mycmakeargs+=( + -DOPENSCAD_COMMIT="${COMMIT:0:9}" + -DOPENSCAD_VERSION="$(ver_cut 1-3)" + -DSNAPSHOT="yes" + ) + fi + else + mycmakeargs+=( -DOPENSCAD_COMMIT="${COMMIT:0:9}" - -DOPENSCAD_VERSION="${PV:0:4}.${PV:4:2}.${PV:6:2}" + -DSNAPSHOT="yes" ) fi diff --git a/media-gfx/openscad/openscad-9999.ebuild b/media-gfx/openscad/openscad-9999.ebuild new file mode 100644 index 000000000000..0361bac9f047 --- /dev/null +++ b/media-gfx/openscad/openscad-9999.ebuild @@ -0,0 +1,275 @@ +# Copyright 1999-2025 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +PYTHON_COMPAT=( python3_{10..13} ) +inherit cmake flag-o-matic optfeature python-any-r1 virtualx xdg + +DESCRIPTION="The Programmers Solid 3D CAD Modeller" +HOMEPAGE="https://openscad.org/" + +if [[ ${PV} = *9999* ]] ; then + inherit git-r3 + EGIT_REPO_URI="https://github.com/openscad/openscad.git" + EGIT_SUBMODULES=( + '*' + '-mimalloc' + '-submodules/manifold' + '-OpenCSG' + ) +else + if [[ ${PV} = *pre* ]] ; then + COMMIT="756e080c7e49072d9926cf9ce766def180a0dcae" + SANITIZERS_CMAKE_COMMIT="0573e2ea8651b9bb3083f193c41eb086497cc80a" + MCAD_COMMIT="bd0a7ba3f042bfbced5ca1894b236cea08904e26" + + SRC_URI=" + https://github.com/openscad/openscad/archive/${COMMIT}.tar.gz + -> ${P}.tar.gz + https://github.com/arsenm/sanitizers-cmake/archive/${SANITIZERS_CMAKE_COMMIT}.tar.gz + -> sanitizers-cmake-${SANITIZERS_CMAKE_COMMIT}.tar.gz + test? ( + https://github.com/openscad/MCAD/archive/${MCAD_COMMIT}.tar.gz -> ${PN}-MCAD-${MCAD_COMMIT}.tar.gz + ) + " + # doc downloads are not versioned and found at: + # https://files.openscad.org/documentation/ + S="${WORKDIR}/${PN}-${COMMIT}" + else + SRC_URI="https://github.com/${PN}/${PN}/releases/download/${P}/${P}.src.tar.gz -> ${P}.tar.gz" + fi + KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86" +fi + +# Code is GPL-3+, MCAD library is LGPL-2.1 +LICENSE="GPL-3+ LGPL-2.1" +SLOT="0" + +IUSE="dbus +egl experimental glx +gui hidapi +manifold mimalloc pdf spacenav test" +RESTRICT="!test? ( test )" + +REQUIRED_USE=" + dbus? ( gui ) + hidapi? ( gui ) + spacenav? ( gui ) + || ( egl glx ) +" + +RDEPEND=" + dev-libs/boost:= + dev-libs/double-conversion:= + dev-libs/glib:2 + dev-libs/libxml2 + dev-libs/libzip:= + media-gfx/opencsg:= + media-libs/fontconfig + media-libs/freetype + media-libs/harfbuzz:= + media-libs/lib3mf:= + sci-mathematics/cgal:= + media-libs/libglvnd[X] + gui? ( + dev-qt/qt5compat:6 + dev-qt/qtbase:6[concurrent,dbus?,-gles2-only,network,opengl,widgets] + dev-qt/qtmultimedia:6 + dev-qt/qtsvg:6 + x11-libs/qscintilla:=[qt6] + ) + hidapi? ( dev-libs/hidapi ) + manifold? ( + dev-cpp/tbb + >=sci-mathematics/manifold-3.0.1 + ) + mimalloc? ( dev-libs/mimalloc:= ) + pdf? ( x11-libs/cairo ) + spacenav? ( dev-libs/libspnav ) +" +DEPEND=" + ${RDEPEND} + dev-cpp/eigen:3 +" +BDEPEND=" + app-alternatives/yacc + app-alternatives/lex + dev-util/itstool + sys-devel/gettext + virtual/pkgconfig + test? ( + $(python_gen_any_dep ' + dev-python/numpy[${PYTHON_USEDEP}] + dev-python/pillow[${PYTHON_USEDEP}] + dev-python/pip[${PYTHON_USEDEP}] + ') + ) +" + +DOCS=( + README.md + RELEASE_NOTES.md + doc/TODO.txt + doc/contributor_copyright.txt + doc/hacking.md + doc/testing.txt + doc/translation.txt +) + +# NOTE the build system sets up a venv for tests, we could use imagemagick with -DUSE_IMAGE_COMPARE_PY="no" +python_check_deps() { + python_has_version "dev-python/numpy[${PYTHON_USEDEP}]" && + python_has_version "dev-python/pillow[${PYTHON_USEDEP}]" && + python_has_version "dev-python/pip[${PYTHON_USEDEP}]" +} + +pkg_setup() { + use test && python-any-r1_pkg_setup +} + +src_prepare() { + if use test && [[ ${PV} != *9999* ]] ; then + mv -f "${WORKDIR}/MCAD-${MCAD_COMMIT}"/* "${S}/libraries/MCAD/" || die + fi + + # NOTE adhere CMP0167 + # https://cmake.org/cmake/help/latest/policy/CMP0167.html + sed \ + -e '/find_package(Boost/s/)/ CONFIG)/g' \ + -i CMakeLists.txt || die + + cmake_src_prepare +} + +src_configure() { + # -Werror=odr + # https://github.com/openscad/openscad/issues/5239 + filter-lto + + local mycmakeargs=( + -DCLANG_TIDY="no" + -DENABLE_CAIRO="$(usex pdf)" + -DENABLE_CGAL="yes" + -DENABLE_EGL="$(usex egl)" + -DENABLE_GLX="$(usex glx)" + -DENABLE_MANIFOLD="$(usex manifold)" + -DENABLE_PYTHON="no" + -DENABLE_TESTS="$(usex test)" + + -DEXPERIMENTAL="$(usex experimental)" + + -DHEADLESS="$(usex !gui)" + -DUSE_BUILTIN_CLIPPER2="no" + -DUSE_BUILTIN_MANIFOLD="no" + -DUSE_CCACHE="no" + -DUSE_GLAD="yes" + -DUSE_GLEW="no" + -DUSE_LEGACY_RENDERERS="no" + -DUSE_MIMALLOC="$(usex mimalloc)" + -DUSE_QT6="$(usex gui)" + -DOFFLINE_DOCS="no" # TODO + -DOPENCSG_DIR="${EPREFIX}/usr/$(get_libdir)" + ) + + if use gui; then + mycmakeargs+=( + -DENABLE_HIDAPI="$(usex hidapi)" + -DENABLE_QTDBUS="$(usex dbus)" + -DENABLE_SPNAV="$(usex spacenav)" + ) + fi + + if [[ ${PV} != *9999* ]] ; then + mycmakeargs+=( + -DCMAKE_MODULE_PATH="${WORKDIR}/sanitizers-cmake-${SANITIZERS_CMAKE_COMMIT}/cmake" + ) + if [[ ${PV} = *pre* ]] ; then + mycmakeargs+=( + -DOPENSCAD_COMMIT="${COMMIT:0:9}" + -DOPENSCAD_VERSION="$(ver_cut 1-3)" + -DSNAPSHOT="yes" + ) + fi + else + mycmakeargs+=( + -DOPENSCAD_COMMIT="${COMMIT:0:9}" + -DSNAPSHOT="yes" + ) + fi + + cmake_src_configure +} + +src_test() { + local i WRITE=() + + if [[ -d "/dev/udmabuf" ]]; then + WRITE+=( + "/dev/udmabuf" + ) + fi + + if [[ -d /sys/module/nvidia ]]; then + # /dev/dri/card* + # /dev/dri/renderD* + readarray -t dri <<<"$( + find /sys/module/nvidia/drivers/*/*:*:*.*/drm \ + -mindepth 1 -maxdepth 1 -type d -exec basename {} \; \ + | sed 's:^:/dev/dri/:' + )" + + # /dev/nvidia{0-9} + readarray -t cards <<<"$(find /dev -regextype sed -regex '/dev/nvidia[0-9]*')" + + WRITE+=( + "${dri[@]}" + "${cards[@]}" + "/dev/nvidiactl" + "/dev/nvidia-caps/" + "/dev/nvidia-modeset" + "/dev/nvidia-uvm" + "/dev/nvidia-uvm-tools" + ) + fi + + WRITE+=( + # for portage + "/proc/self/task/" + ) + for i in "${WRITE[@]}"; do + if [[ ! -w "$i" ]]; then + eqawarn "addwrite $i" + addwrite "$i" + + if [[ ! -d "$i" ]] && [[ ! -w "$i" ]]; then + eqawarn "can not access $i after addwrite" + fi + fi + done + + sed \ + -e "s/OPENSCAD_BINARY/OPENSCADPATH/g" \ + -i tests/test_cmdline_tool.py || die + + cd "${BUILD_DIR}" || die + + # NOTE link in from CMAKE_USE_DIR + ln -s "${CMAKE_USE_DIR}/color-schemes" . || die + ln -s "${CMAKE_USE_DIR}/locale" . || die + ln -s "${CMAKE_USE_DIR}/shaders" . || die + + virtx cmake_src_test -j1 +} + +src_install() { + DOCS+=( doc/*.pdf ) + + cmake_src_install + + mv -i "${ED}"/usr/share/openscad/locale "${ED}"/usr/share || die "failed to move locales" + dosym -r /usr/share/locale /usr/share/openscad/locale +} + +pkg_postinst() { + xdg_pkg_postinst + + optfeature "support scad major mode in GNU Emacs" app-emacs/scad-mode +} diff --git a/media-gfx/pencil/Manifest b/media-gfx/pencil/Manifest index b91387bf12c6..ed80946b9737 100644 --- a/media-gfx/pencil/Manifest +++ b/media-gfx/pencil/Manifest @@ -1,4 +1,3 @@ -DIST catch.hpp 656886 BLAKE2B 590fabc7970b97f333457f409276688f69a66de7fa3c43d767994ed212a3b5bde6e6c113c36a0ff03dd95bbb0cdb38cc12b43a96d16644525ea7425e028485a6 SHA512 ca401efb224e87c4f9d9f3bd58102d3223ef3356149837be2474fa2dbae645272c1ecb17d7db96c2b43b97034aacb63f840f4ebec16f2f3d447c1cc80a500d40 -DIST pencil-0.6.6.tar.gz 3807612 BLAKE2B a4933399ea7f3103eb097756684f42061f5db4c419983458ce8ad317e7eab667ccc5c29c6bf9a3dec5fe57887c4456b64c6e93be889684bd2b567c247aa6dfeb SHA512 1cb976011a1270a2715568fc740db28e6b1a0f050ff7cc2630687edb6e4b57245bf8f58e69721dabab0a2bd65f58780176e2a59691ed0b19f7276c1aad950e7d -EBUILD pencil-0.6.6-r1.ebuild 1143 BLAKE2B 340348efb43e721af121328ca77e0a001cbf04e37537648db0b255f5095e4ca3b1be16efd59ee995b9fc957dcc563105af4072d67370dc9032f2fa86a29f136d SHA512 433bf1ac6a8fc8fb233352f3561a5e4d5be26a2a5e817a5a57db9df6e1d8041eb675ca36694d8182ea1cff48c4878939a2c795f00cb21e455a7361751870de56 +DIST pencil-0.7.0.tar.gz 3890882 BLAKE2B 56becddb43dd6e4cc1308238a2019aad3b7b056f2dfb182ea7c6591d502a7a0fda3f5d7783502c30c0c6f69b4e2a636e9461040c19c9818c74bfab2591c41ae0 SHA512 313ce4014b80ea94ba613d6d6a6e79894a224753ce083273d781e703617edd3f61a6fc33561d376cfdab8d99e2a13a645617943c91f40dec8b172d3ef0857e08 +EBUILD pencil-0.7.0.ebuild 805 BLAKE2B 901a23118fdee4b012975348e194bcfe934ef4d95ae03980da705b3409b70fed5d34276a41a90f750fe66f4979b23a58e7a1dad9be809031025f748c091f8107 SHA512 80f885d59076f1479392b6c73adf96130a4695edaa971d35772b2cd92b5ebcb2c83c60758dbd4fd68671d022e38933331c320ab09bdf0d65e56f26c1d52311fe MISC metadata.xml 325 BLAKE2B 19b0b8649907eede4a6de1f0a534f43f058d51b61e260fc94729899bb72f9e700893cb904ebb1e569c512040aaa68ff4d4da172a2cb8dafdfb1eae0907e13160 SHA512 50c8ce1c4c7e3f8f1f8150fb117981bc34147325fe68cb0fb8953c19b86290fa44f2ba8a9dcb565e31ce0030c1cda8998a4bc03a9f735837d5ffb555572583c3 diff --git a/media-gfx/pencil/pencil-0.6.6-r1.ebuild b/media-gfx/pencil/pencil-0.6.6-r1.ebuild deleted file mode 100644 index 5eb1e6e06838..000000000000 --- a/media-gfx/pencil/pencil-0.6.6-r1.ebuild +++ /dev/null @@ -1,55 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit qmake-utils xdg-utils - -DESCRIPTION="2D animation and drawing program based on Qt5" -HOMEPAGE="https://www.pencil2d.org/" -SRC_URI="https://github.com/pencil2d/${PN}/archive/v${PV/_/-}.tar.gz -> ${P}.tar.gz - https://raw.githubusercontent.com/pencil2d/pencil/617c8868fd27ce540de285ff75c8946fba0c975b/tests/src/catch.hpp" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~amd64 ~x86" - -IUSE="test" -RESTRICT="!test? ( test )" - -RDEPEND=" - dev-qt/qtcore:5 - dev-qt/qtgui:5 - dev-qt/qtmultimedia:5 - dev-qt/qtnetwork:5 - dev-qt/qtsvg:5 - dev-qt/qtwidgets:5 - dev-qt/qtxml:5 -" -DEPEND="${RDEPEND} - test? ( dev-qt/qttest:5 ) -" - -S="${WORKDIR}/${P/_/-}" - -src_prepare() { - cp "${DISTDIR}"/catch.hpp tests/src/ - default - sed -e "/^QT/s/xmlpatterns //" \ - -i core_lib/core_lib.pro tests/tests.pro || die -} - -src_configure() { - eqmake5 PREFIX=/usr $(usex test "" "CONFIG+=NO_TESTS") -} - -src_install() { - einstalldocs - emake INSTALL_ROOT="${D}" install - # TODO: Install l10n files -} - -pkg_postinst() { - xdg_mimeinfo_database_update - xdg_desktop_database_update -} diff --git a/media-gfx/pencil/pencil-0.7.0.ebuild b/media-gfx/pencil/pencil-0.7.0.ebuild new file mode 100644 index 000000000000..754e9dc03f06 --- /dev/null +++ b/media-gfx/pencil/pencil-0.7.0.ebuild @@ -0,0 +1,36 @@ +# Copyright 1999-2025 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit qmake-utils xdg + +DESCRIPTION="2D animation and drawing program based on Qt" +HOMEPAGE="https://www.pencil2d.org/" +SRC_URI="https://github.com/pencil2d/${PN}/archive/v${PV/_/-}.tar.gz -> ${P}.tar.gz" +S="${WORKDIR}/${P/_/-}" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="test" +RESTRICT="!test? ( test )" + +RDEPEND=" + dev-qt/qtbase:6[gui,network,widgets,xml] + dev-qt/qtmultimedia:6 + dev-qt/qtsvg:6 +" +DEPEND="${RDEPEND}" +# BDEPEND="dev-qt/qttools:6[linguist]" + +src_configure() { +# $(qt6_get_bindir)/lrelease gpxsee.pro || die + eqmake6 PREFIX=/usr $(usex test "" "CONFIG+=NO_TESTS") +} + +src_install() { + einstalldocs + emake INSTALL_ROOT="${D}" install + # TODO: Install l10n files +} diff --git a/media-gfx/photoqt/Manifest b/media-gfx/photoqt/Manifest index bc758df8eab0..2afb2185b5fb 100644 --- a/media-gfx/photoqt/Manifest +++ b/media-gfx/photoqt/Manifest @@ -1,4 +1,6 @@ AUX photoqt-3.2-exiv2-0.28.patch 5700 BLAKE2B d7387019460ed5b0edf7a79050f0ea8be4a4320c39cc53567d68d25a5f99f87c99e7aaf4932d2b96f8c0af22c7221082ba7323f720f5ea61ec461fa457b1c6ff SHA512 eadcfe4c5583cc6b6b1ab5e4036410c347ffee577e7231570736af8b405a631ad8bb86660854d2102cc9150f4fa7e439e2a3faa583806cbd4a04ba45015e8134 DIST photoqt-3.2.tar.gz 965895 BLAKE2B ae1e159401b24a1bede344e4d398dbd6c2ae13fd467a4eac9ef15ea2d15933dc1756325a5a4f305a5f447bfd1a9e2d636e0b9367d0201ca356393c033c4f2f0f SHA512 ab7030d0ed6edf79373b1a99b1b8469cd567f04e5c233a87496084424603d8c241f7b473c22d323f4df8480d3f74918a987d2d590ec5026f1b7ca2c92b5c6bba +DIST photoqt-4.7.tar.gz 3612004 BLAKE2B f4bfd07103e614e3b128668ee7b1dc4767d5c8bd6af4164315e75d537e4054ee2e13fd2f2d8f044669c80bfa31d0651a5a71f07d0947c6b8f1a3088d55123407 SHA512 41274b52ece3a905de7c274183b658b40fdc72ee291b008afdfb2c7e8bb49308ac54c66760397359838bcd9470aa0140bd769137d5a72cd1c11bc4b1a7accb66 EBUILD photoqt-3.2.ebuild 1871 BLAKE2B 8d34b625a17a7741bde801bc8ae5ec76872fabc7e9bf917b3bf0cc5afd45ffe0d30d5b4d90253b076d6da8161b4f08655923666779a7ba5fad3f30f5d5f3b2c1 SHA512 7615976119d9048e24d26f39b8e5736da06e6ef0a99c38a0510e535166ec771a7c9c8dbf517be24dc4583fef70eb7393b34fd9306ffc8106c70278273178d604 -MISC metadata.xml 543 BLAKE2B ee39b2a5c2b7141c3bf4f02d7c9ad6db79a61aefb33f46f552e852a1eb5d42db96b36202911fbea762109d81b33de184dbec3b0666126d526566476e0787672d SHA512 c1a0e0d3a14d998820effef5892f740064673a7c94105f3aff959873a1dd3ecb97fb0463714f5ce7cd3fea3b41d6fb907cbb302169526d46980a5ae3d7aea49a +EBUILD photoqt-4.7-r1.ebuild 2525 BLAKE2B a776ca2a33d8d1a3f9b88448fb278d572aa192dc4e530b6f69ad38cdd0fb61854940b4e7b9e4ae0099d955be42b3b6aeeda270e898b2edfa4e9ffa9dbbac0017 SHA512 8c0110cd7d65751ad6d75565add3599583d5fc4c857eb3dd4c449bb699e29c6d40526a70fd80928b5b803ba87dd9e6e277dcfd7966bb23fac4d333695e40e467 +MISC metadata.xml 840 BLAKE2B 690fda3779ef30e477a38e6c20c05d78974c077516ebc12646395078332ae816cf7166501b067d8224c901ec38777d4cc92b565010cb53bfcaf8c9022d01d8b4 SHA512 c22e1952541f697bfa99a14daa7e4e83261eb65f2194b0aeaf6c9e68fd49e3f5e60360d84de8a2be40ffeaf07e9f6a59b5ba523adf8040a60fb824f7dfbe7697 diff --git a/media-gfx/photoqt/metadata.xml b/media-gfx/photoqt/metadata.xml index 1b717b781d4d..3916fd4661ae 100644 --- a/media-gfx/photoqt/metadata.xml +++ b/media-gfx/photoqt/metadata.xml @@ -3,9 +3,12 @@ <pkgmetadata> <!-- maintainer-needed --> <use> + <flag name="barcode">Support for QR and barcodes detection using <pkg>media-libs/zxing-cpp</pkg></flag> + <flag name="chromecast">Enable Chromecast support using <pkg>dev-python/pychromecast</pkg></flag> <flag name="devil">Support additional image formats using <pkg>media-libs/devil</pkg></flag> <flag name="freeimage">Support additional image formats using <pkg>media-libs/freeimage</pkg></flag> <flag name="mpv">Support for video files using <pkg>media-video/mpv</pkg></flag> + <flag name="vips">Support for <pkg>media-libs/vips</pkg> image processing library</flag> </use> <upstream> <remote-id type="gitlab">lspies/photoqt</remote-id> diff --git a/media-gfx/photoqt/photoqt-4.7-r1.ebuild b/media-gfx/photoqt/photoqt-4.7-r1.ebuild new file mode 100644 index 000000000000..6c6467eee14f --- /dev/null +++ b/media-gfx/photoqt/photoqt-4.7-r1.ebuild @@ -0,0 +1,99 @@ +# Copyright 1999-2025 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +PYTHON_COMPAT=( python3_{10..12} ) +inherit cmake optfeature python-single-r1 toolchain-funcs xdg + +DESCRIPTION="Simple but powerful Qt-based image viewer" +HOMEPAGE="https://photoqt.org/" +SRC_URI="https://photoqt.org/downloads/source/${P}.tar.gz" + +LICENSE="GPL-2+" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="barcode chromecast devil exif freeimage geolocation graphicsmagick +imagemagick lcms mpv pdf raw vips" +REQUIRED_USE="chromecast? ( ${PYTHON_REQUIRED_USE} )" + +COMMON_DEPEND=" + app-arch/libarchive:= + dev-libs/pugixml + dev-qt/qtbase:6[dbus,concurrent,gui,network,sql,widgets,xml] + dev-qt/qtdeclarative:6[opengl] + dev-qt/qtimageformats:6 + dev-qt/qtmultimedia:6[qml] + dev-qt/qtsvg:6 + barcode? ( media-libs/zxing-cpp:= ) + chromecast? ( + ${PYTHON_DEPS} + $(python_gen_cond_dep 'dev-python/pychromecast') + ) + devil? ( media-libs/devil ) + exif? ( media-gfx/exiv2:=[bmff] ) + freeimage? ( media-libs/freeimage ) + imagemagick? ( + !graphicsmagick? ( media-gfx/imagemagick:=[cxx] ) + graphicsmagick? ( media-gfx/graphicsmagick:=[cxx] ) + ) + lcms? ( media-libs/lcms:2 ) + mpv? ( media-video/mpv:=[libmpv] ) + pdf? ( app-text/poppler[qt6] ) + raw? ( media-libs/libraw:= ) + vips? ( + dev-libs/glib:2 + media-libs/vips:= + ) +" +RDEPEND="${COMMON_DEPEND} + geolocation? ( + dev-qt/qtlocation:6 + dev-qt/qtpositioning:6[qml] + ) +" +DEPEND="${COMMON_DEPEND} + vips? ( x11-base/xorg-proto ) +" +BDEPEND=" + dev-qt/qttools:6[linguist] + >=kde-frameworks/extra-cmake-modules-6.5.0:* + virtual/pkgconfig + chromecast? ( ${PYTHON_DEPS} ) +" + +pkg_setup() { + use chromecast && python-single-r1_pkg_setup +} + +src_configure() { + local mycmakeargs=( + -DCHROMECAST=$(usex chromecast) + -DDEVIL=$(usex devil) + -DEXIV2=$(usex exif) + -DEXIV2_ENABLE_BMFF=$(usex exif) + -DFREEIMAGE=$(usex freeimage) + -DGRAPHICSMAGICK=$(usex graphicsmagick $(usex imagemagick)) + -DIMAGEMAGICK=$(usex imagemagick $(usex !graphicsmagick)) + -DLCMS2=$(usex lcms) + -DLOCATION=$(usex geolocation) + -DVIDEO_MPV=$(usex mpv) + -DPOPPLER=$(usex pdf) + -DRAW=$(usex raw) + -DRESVG=OFF # qt5 only + -DLIBVIPS=$(usex vips) + -DZXING=$(usex barcode) + ) + + if use imagemagick && use graphicsmagick; then + mycmakeargs+=( + -DMAGICK++_INCLUDE_DIR=$($(tc-getPKG_CONFIG) --variable=includedir GraphicsMagick++) + ) + fi + + cmake_src_configure +} + +pkg_postinst() { + optfeature "additional image formats like AVIF, EPS, HEIF/HEIC, PSD, etc." "kde-frameworks/kimageformats:6" + xdg_pkg_postinst +} diff --git a/media-gfx/phototonic/Manifest b/media-gfx/phototonic/Manifest index 8b52c58986d5..0817f83f6746 100644 --- a/media-gfx/phototonic/Manifest +++ b/media-gfx/phototonic/Manifest @@ -1,4 +1,5 @@ AUX phototonic-2.1-exiv2-0.28.patch 4324 BLAKE2B dc4620b32a6e0f27a71bed1ed43713af5f5a90028302ab50ff9b90308511199b0f85533af05d544f83d2242f4ede2e8e5a91630697fe31a54cad5c4994c7189c SHA512 1080a42b72159ed4d6232e4d0e068dcbe47cc3ff6af00bd737de5824d0fc9611bd1cd1bdb0b9d9405c48918bea62d006acc0ae507ace38ad4bc54b44febb9d0f DIST phototonic-2.1.tar.gz 488640 BLAKE2B bfbc14d06760c6f9d9244d5ed38d033a769f1eaf8116f55ea6aa5373578aa105fd28ef8e352d394939306af2ab3b617314aebc443a13f7abe9bb8be2fd0cb0cd SHA512 4789311cefa2d5a07ca5e2fd3c0530267f9ea2ffcbf6295c687db3d2aa55e0b7d91228047b2ca24590868b22ce93d0228785fcf49a105ee65c9826b0d9a8fa42 EBUILD phototonic-2.1.ebuild 864 BLAKE2B f6897d32a796a1d01c8ba48ce65e71f058593f9041f95d1e87f3ea5e4f4de60f27d579dadba09e5d5ca8b95e634c41f80fccea91c764a96c0603a25b77bcf392 SHA512 df40207e3399f8d496eb88a083855b3fd590741003daeb94e594ac4962b14e9316f2c4853bbf8f4337d939ab0780cf9ff08c9ad323332a44441c892881ae4262 -MISC metadata.xml 255 BLAKE2B 60882790373fe17b05aa0e2a7d75b5703211c3483ac0a929fe7c6c6aa3d4a51b23c9ba34f1e7080b6381fc13e4b19dcc12b9c3dd2e5c4de29c38c2db0b64837a SHA512 ce691a3b25203d70175fcf190d20a628853f985deb73f3c9d79c570e4e99e4ea1045a4cdb9dd73f3450efb9c444289b46a17d44a0c80447ddbe813de2264ce07 +EBUILD phototonic-9999.ebuild 726 BLAKE2B b26bb745c0016f2a986be7c28b6f63f84662acb802ad8e04fc5a675df07689f4b7e4691fd81c44b1e6e39aca7160ed401c3ceeac41ba74b6181d61eeaabb9e9b SHA512 baad7751ad6a5d9e08f6d709626772b53a6e41cac14024ef8e210c712e5350bbbd673e223595f8de3e6a4cfc0a6fabb3bf5380447d552cb25ef3e898d1cdbd58 +MISC metadata.xml 257 BLAKE2B c179506f69ad5d101a7c536b04f9eba29143098e38d9805361f29abad06277e08048b5d51edbf7c8209d319edef7af1bfe295a1f4ccb77abbe9b222803a5021f SHA512 8f2eafc711fec80ee2a83a5224da195e69aac9ac4aacede10b8559bb25ab36f212823b0668bb6f5d08a6a2bada7a8e61cf4871a479738d62fb3efe385c788be6 diff --git a/media-gfx/phototonic/metadata.xml b/media-gfx/phototonic/metadata.xml index f05b374d7585..a40d8d29c5ef 100644 --- a/media-gfx/phototonic/metadata.xml +++ b/media-gfx/phototonic/metadata.xml @@ -3,6 +3,6 @@ <pkgmetadata> <!-- maintainer-needed --> <upstream> - <remote-id type="github">oferkv/phototonic</remote-id> + <remote-id type="github">luebking/phototonic</remote-id> </upstream> </pkgmetadata> diff --git a/media-gfx/phototonic/phototonic-9999.ebuild b/media-gfx/phototonic/phototonic-9999.ebuild new file mode 100644 index 000000000000..00dd9c738ecc --- /dev/null +++ b/media-gfx/phototonic/phototonic-9999.ebuild @@ -0,0 +1,37 @@ +# Copyright 1999-2025 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit qmake-utils xdg + +DESCRIPTION="Image viewer and organizer" +HOMEPAGE="https://github.com/luebking/phototonic" + +if [[ ${PV} = *9999* ]]; then + inherit git-r3 + EGIT_REPO_URI="https://github.com/luebking/phototonic.git" +else + SRC_URI="https://github.com/luebking/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" + KEYWORDS="~amd64 ~x86" +fi + +LICENSE="GPL-3+" +SLOT="0" +IUSE="svg tiff" + +RDEPEND=" + dev-qt/qtbase:6[gui,opengl,widgets] + media-gfx/exiv2:= + svg? ( dev-qt/qtsvg:6 ) + tiff? ( dev-qt/qtimageformats:6 ) +" +DEPEND="${RDEPEND}" + +src_configure() { + eqmake6 +} + +src_install() { + emake install INSTALL_ROOT="${D}" +} diff --git a/media-gfx/prusaslicer/Manifest b/media-gfx/prusaslicer/Manifest index 151d42f7feca..0dd4db880f6d 100644 --- a/media-gfx/prusaslicer/Manifest +++ b/media-gfx/prusaslicer/Manifest @@ -1,17 +1,17 @@ AUX prusaslicer-2.6.0-dont-force-link-to-wayland-and-x11.patch 448 BLAKE2B 1d4a96762ed6da41e5f4322d6ac6019fb3894321da206ea354d1d9b57e1892155a109c329590bad4393cffd748f9e27542a7cc468803329c8f493789a2b497b1 SHA512 71a3eb2bbe3766be555e94f32219edfb908bdd5f86c74971c1c9b2586306d70724c45b06edbd4ade232017259fe4a99e504447cbbbdd5d5c91f4df03f4d52140 AUX prusaslicer-2.8.0-missing-includes.patch 575 BLAKE2B aef794b75d180176f6ba4b1ec05e4ddfe740ced6000225ce51e3a15bd1143209a340af28dc91660d3f07696f19ad525ef86f5e84f3ff4c96ad77c90940059352 SHA512 65c2c8a2046bf39a9d0f5c073998ec93906efbeb8b2d3b7d835f1a65b2edc00c473fb2bed7396e35e45d00b9420f3942f2e16af2e2c6a1405e90341e41b16cf2 AUX prusaslicer-2.8.0-wxwidgets-3.2.4.patch 1332 BLAKE2B a5e343f64e5f3c2150d170453579b87c3912b5bcb0a7cbd7d1076d2d1f1b10f4e586ed5237ef9faebdbfea23c0e8941a1d0c5f9c71fef2e0269c0120206f2155 SHA512 0fe1af19f8f55bbb11ca8b6685b73858f23b87e3785cb4babe4a8b5ae09694681df4d5f354af896ca1833be2d934da0cf8193285a25e8f28d588b52147ce96a2 +AUX prusaslicer-2.8.1-boost-1.87.patch 17579 BLAKE2B 4d5801287300d879f0fbb90ad05c613abbca76e2757d5d7e8a73d51f7cc61fb3e38e61b2bd9c151e6eff72715fc64d1ddaa43010e5ad56b78322510785f6a0e1 SHA512 0fcb9d0b470e7351b8a1cb91889bfb440009b36836990b4a2c87fe8fb007d5254b61078e21d42c37bb6c8b8d46493f3462a5b1e67262040c82ccfb34695b1998 AUX prusaslicer-2.8.1-cgal-6.0.patch 11183 BLAKE2B 3d0b7729fd0a64eb335b1bb8fd4af547c71ddbaec1e589dc4aba2f608073b394c44012d18b127cc17a3b2d5ef8eaad31b21c00623326cc818ec953103ea6dd1c SHA512 a8a3e7c9e7d39519ae93f78b1c6b220f419ef0141a11e9d68c8a3f599a57e164221a572b6989a5b5285b61419cc207ed091834b4de1a442db5806402524e9885 AUX prusaslicer-2.8.1-fix-libsoup-double-linking.patch 482 BLAKE2B 0b4f0ba5808ac3292609bcc9a503dce4fedbd6c7979ee4c8bc08d300ba248bae0a917e15a032b6ebc1b6ddc3fb372e09a6896b6aef4816a420839ade9a6bdd06 SHA512 9c657eab393d5552c1f37b57b564a38f69758a29f166471360fa93207c6c6b3eeed50a6471019a371db8f3f04dc419d9e035fca952a96a73d699f034eca32799 AUX prusaslicer-2.8.1-fixed-linking.patch 394 BLAKE2B bb4d6285ee9e199f4d8bed3ecf0a4e0ac814f311a5220958e8a6023a343954bc78454697704ce9ee8bc583a9a536cec249f42b8b3d28fff6515e2499c4de3442 SHA512 b84c966d22be5fda04c8a97421026855289038d69de11ac1a9b053381a35b2e5d3f3354ac51d37ad58f0ba4fec177894de67ef44360b050b9ca61cb06d5a178c AUX prusaslicer-2.8.1-fstream.patch 1682 BLAKE2B 2acebf6900b82e9b9fb94988d0d8c2ce57d470c6db3e282d6232ed3ffc312611317cede5292274dfdaa3d8aa599b074164a2b5d443d5653b35e3db5dca43f8e0 SHA512 385fc73a68a36466becf325cbf8621aa7428f0bfd18b396066382a8f2a91422d3320b7a257f8b251c04be36c13f52af4569e3d154758cf844238657672e22b22 AUX prusaslicer-2.8.1-opencascade-7.8.0.patch 401 BLAKE2B e2d3a859e418be897d093fb499248d0dda8ab5e3be783cd653591923feb0c4808c7451f4f8e8f0907daa12bd8bd82350a12794c5c8f3136cc73b5ba28e8ba37e SHA512 feecf49443aac23a78c88127e08133f6a6989da93cc187c923aec347286e7cdc8425fc8e4e449f47547a4310a3572bb6391eeb8e7fb16b510db52d4f7f48fc49 -AUX prusaslicer-2.9.0-fpic-all.patch 577 BLAKE2B 19bd43aad7d820f3bbd9ccfd6547d65624d79b6d610194e6c6df898e7d88e0715763cbf54b6e796fe9f65abf42ce43ec44d60498343d0dfee54d2e2c3b721e99 SHA512 d497114082debf2bf15d3fbd1d55f2837beb8685d50ea99edf5a0e2fa8570144ce2a225ecf6f7c27386409b7f7a0522be1fbe42b7fa76de032260227e0eb01f6 -AUX prusaslicer-2.9.0-fpic.patch 2470 BLAKE2B c2e97f6451b3b8f3eb791780ab49269767e7a47eb22f085f6559d5009c0dc66ad0f0fffd521f3262f595d8b21a783167094e0b8882c26d37c7bed645d8f51048 SHA512 22d708b0e077e15a83a6a515d10c2aad91674c7fcd0a855470431e1506b98b70f263eae5fe32f1a584b8ad079ed58c3610a9d4e5d88a296d4baebf3afda48ed5 +AUX prusaslicer-2.9.0-arrange-static.patch 1789 BLAKE2B 42a83e9b65985fe63631f60432b42cc7f1fb3960327307100273db5ee003e0ef660ea38f50183d0f3fd047f9d22e0ac016a26401b9e05db548c778c187b110c6 SHA512 1eaf97314118aec7bdb2e0d1ad03fb69645a23283b24ef2992146f0fd1e7ed0cb3b852a97d0eaec699c982ed968a69a2bbb078f771031b7f85ed5927f0d5f29a AUX prusaslicer-2.9.0-missing-includes.patch 306 BLAKE2B 8b8de2ad9c7adee8cddaff29eee2f4aae6a789b150f130846235dd0e76be053e36f1ad5c7396837c59b8246be0ff04ba9e365684ce8bffb30fbd8d18f271ee27 SHA512 0ebb829ff10e5214a19c77aec5f55874df3d04ab16ac70e5fd8219e7fb25e93ef5ab5b30d49cf71bdd154f36157183e2d6a27bb47f011baaeb1b00097e5b8166 -AUX prusaslicer-2.9.0-slic3r-arrange-wrapper.patch 781 BLAKE2B 1698fcb533b05da902a82fd4aad8d96604e0dfa80404a6a55e6fe5a35447fa3c33d9a10f53911292c211fc33e4292de522dd67b7ed08026c26f4f7bf9bbaf2a8 SHA512 e8069d12b2063ddec8861b46e8767f702637e1ce9d6ece75cea8292d8a33e62c6ec52ae6730cdfd2af7d8113a2ddd18f99381837717839d1a34d1ff8a57f904c -AUX prusaslicer-2.9.0-slic3r-arrange.patch 704 BLAKE2B 45088c902cd03af7f91c4ebc22d62b719e23f31b5bbd1f12fae06d70b6e7acebe5c0310a1369835ee111dae4865860ba64f3654295c54399211d1859243aa657 SHA512 4bb0b39b9e80faccd4f1f57d5829328b27c85d0b98e704ede5154ef1216651cf0d5afa68cd03a1c0e4b478203e4024b49e55a4539d6949433c7c8a94870252fd DIST prusaslicer-2.8.1.tar.gz 69409077 BLAKE2B dd3ee810ea00d03f1790386d1fe1fd044c038429700cd33f21299abdf5def12902f7a07c23aa3d2a6cfc5e18d1e2534080889d4a33beefb493a504978a742453 SHA512 0471fa579a494d66e6b49c0bc1a9fa91f3a5f9147d8b7fa8133c6f03391f8daddddb19ed222d1be44f6f22e2de3021f3fb839331e3c3ccdf5643caa8a61d6912 -EBUILD prusaslicer-2.8.1-r1.ebuild 2708 BLAKE2B 895f155bc49426f137807be45a3f2942d6255090cecc15657896e21f6fdb4ebc1c144ef474f69ae9487306b36cb83860dcebb09cef73e825e658206933b5d0cc SHA512 cf473a7b8978acffae92d579272ee69717b59e849a052422f0aaf66b6b82357ef85536025d8e6e1c32fada8e907be1ecb81ed19a16e14ade1b6fab132c636b3c -EBUILD prusaslicer-9999.ebuild 2717 BLAKE2B 789583bedc9feb04d3a911ddfc036f12c11a8627fbf12b3086c89160c647ee285f717ffb1d0a4a0eabc59ec0632c3c038dcb4133989d12c034679d56ec28f945 SHA512 ae2adbdebec5ca00e529c5f34394fd3a134c2cd6dd0a448dae3e0c534443f91b5350ab0fad17723f8d6853ad53c92b6de42c3d129f6f2a60639ef6d95c369d70 +DIST prusaslicer-2.9.0.tar.gz 70604482 BLAKE2B 14480ad6e4257d052e65f7158e14e6eb57f2e51c5c7ce3a6545b36a47007cb528aa38a1ff00eacd70374dfaef4ba7efd185dd5add1a6807f79148a124320126a SHA512 554099ba827f8b4af37727d4e99ad6b2f339c530f35a4f8e63f0c5aaf455a5fc3261b983939c487f76964c522ea8ecd13527efea7f881749f907a039cfe7ef89 +EBUILD prusaslicer-2.8.1-r1.ebuild 2752 BLAKE2B 43107bfa1a0026d7cf3eabd3b49dd43216997f99a0b56a27865e16406d80134a26f863fc8bbca5a2521e186c73059dfb9854554cbd7f904d1147b82efc296a92 SHA512 b0721b56b5ba73238b16e69a41e6c1effbe42c7ed38071591381880365891fcdac515a0f5a1a2a3eb3672c60565d1832d670af8d943b433f03b9785580f5446f +EBUILD prusaslicer-2.9.0.ebuild 2625 BLAKE2B 21dd02edd34dc43d181f286acff9cd80cf13ec4690d358aed66115c3346438b95c77f63b45e659da3595127ba59b1c61be0f9c909069a1b559f21e7ee7085fc3 SHA512 da4207cb458cb0af251771bf383eb832689cbfed43a2d7188ed5f478e585e741c484ccd9097703824dd51e7da49aefe8838c019c94ed2355a0b9b22d94104383 +EBUILD prusaslicer-9999.ebuild 2625 BLAKE2B 21dd02edd34dc43d181f286acff9cd80cf13ec4690d358aed66115c3346438b95c77f63b45e659da3595127ba59b1c61be0f9c909069a1b559f21e7ee7085fc3 SHA512 da4207cb458cb0af251771bf383eb832689cbfed43a2d7188ed5f478e585e741c484ccd9097703824dd51e7da49aefe8838c019c94ed2355a0b9b22d94104383 MISC metadata.xml 1028 BLAKE2B a267e6b0ee72a85b895046cc7d5f659cca379fd799a9ebb802dc1fafd7edfa1b989784b10eb93ac24f1ea6153153b892e28e20055b0a7d2021f6db7742e065b4 SHA512 5760ea954f5ccf09e5d69e101b6d68839a4517a9375adc3009b1bf846b98091ee0555e9c92bb0cf316670efec699cd24d04b4ebe7db5b65e363f83051d868512 diff --git a/media-gfx/prusaslicer/files/prusaslicer-2.8.1-boost-1.87.patch b/media-gfx/prusaslicer/files/prusaslicer-2.8.1-boost-1.87.patch new file mode 100644 index 000000000000..7666c26800ae --- /dev/null +++ b/media-gfx/prusaslicer/files/prusaslicer-2.8.1-boost-1.87.patch @@ -0,0 +1,374 @@ +https://bugs.gentoo.org/946495 +https://github.com/prusa3d/PrusaSlicer/issues/13799 + +diff '--color=auto' -urNp PrusaSlicer-version_2.8.1-orig/src/libslic3r/GCodeSender.cpp PrusaSlicer-version_2.8.1-dwok/src/libslic3r/GCodeSender.cpp +--- PrusaSlicer-version_2.8.1-orig/src/libslic3r/GCodeSender.cpp 2024-12-21 11:52:03.612595066 +0100 ++++ PrusaSlicer-version_2.8.1-dwok/src/libslic3r/GCodeSender.cpp 2024-12-21 12:34:03.859507724 +0100 +@@ -113,7 +113,7 @@ GCodeSender::connect(std::string devname + this->io.post(boost::bind(&GCodeSender::do_read, this)); + + // start reading in the background thread +- boost::thread t(boost::bind(&boost::asio::io_service::run, &this->io)); ++ boost::thread t(boost::bind(&boost::asio::io_context::run, &this->io)); + this->background_thread.swap(t); + + // always send a M105 to check for connection because firmware might be silent on connect +diff '--color=auto' -urNp PrusaSlicer-version_2.8.1-orig/src/libslic3r/GCodeSender.hpp PrusaSlicer-version_2.8.1-dwok/src/libslic3r/GCodeSender.hpp +--- PrusaSlicer-version_2.8.1-orig/src/libslic3r/GCodeSender.hpp 2024-12-21 11:52:03.612595066 +0100 ++++ PrusaSlicer-version_2.8.1-dwok/src/libslic3r/GCodeSender.hpp 2024-12-21 12:34:26.163427521 +0100 +@@ -40,7 +40,7 @@ class GCodeSender : private boost::nonco + void reset(); + + private: +- asio::io_service io; ++ asio::io_context io; + asio::serial_port serial; + boost::thread background_thread; + boost::asio::streambuf read_buffer, write_buffer; +diff '--color=auto' -urNp PrusaSlicer-version_2.8.1-orig/src/slic3r/GUI/FirmwareDialog.cpp PrusaSlicer-version_2.8.1-dwok/src/slic3r/GUI/FirmwareDialog.cpp +--- PrusaSlicer-version_2.8.1-orig/src/slic3r/GUI/FirmwareDialog.cpp 2024-12-21 11:52:03.632594994 +0100 ++++ PrusaSlicer-version_2.8.1-dwok/src/slic3r/GUI/FirmwareDialog.cpp 2024-12-21 12:33:40.507591681 +0100 +@@ -429,7 +429,7 @@ void FirmwareDialog::priv::avr109_wait_f + + void FirmwareDialog::priv::avr109_reboot(const SerialPortInfo &port) + { +- asio::io_service io; ++ asio::io_context io; + Serial serial(io, port.port, 1200); + std::this_thread::sleep_for(std::chrono::milliseconds(50)); + } +diff '--color=auto' -urNp PrusaSlicer-version_2.8.1-orig/src/slic3r/Utils/Bonjour.cpp PrusaSlicer-version_2.8.1-dwok/src/slic3r/Utils/Bonjour.cpp +--- PrusaSlicer-version_2.8.1-orig/src/slic3r/Utils/Bonjour.cpp 2024-12-21 11:52:03.644594950 +0100 ++++ PrusaSlicer-version_2.8.1-dwok/src/slic3r/Utils/Bonjour.cpp 2024-12-21 12:47:16.560667015 +0100 +@@ -624,11 +624,11 @@ UdpSession::UdpSession(Bonjour::ReplyFn + buffer.resize(DnsMessage::MAX_SIZE); + } + +-UdpSocket::UdpSocket( Bonjour::ReplyFn replyfn, const asio::ip::address& multicast_address, const asio::ip::address& interface_address, std::shared_ptr< boost::asio::io_service > io_service) ++UdpSocket::UdpSocket( Bonjour::ReplyFn replyfn, const asio::ip::address& multicast_address, const asio::ip::address& interface_address, std::shared_ptr< boost::asio::io_context > io_context) + : replyfn(replyfn) + , multicast_address(multicast_address) +- , socket(*io_service) +- , io_service(io_service) ++ , socket(*io_context) ++ , io_context(io_context) + { + try { + // open socket +@@ -658,11 +658,11 @@ UdpSocket::UdpSocket( Bonjour::ReplyFn r + } + + +-UdpSocket::UdpSocket( Bonjour::ReplyFn replyfn, const asio::ip::address& multicast_address, std::shared_ptr< boost::asio::io_service > io_service) ++UdpSocket::UdpSocket( Bonjour::ReplyFn replyfn, const asio::ip::address& multicast_address, std::shared_ptr< boost::asio::io_context > io_context) + : replyfn(replyfn) + , multicast_address(multicast_address) +- , socket(*io_service) +- , io_service(io_service) ++ , socket(*io_context) ++ , io_context(io_context) + { + try { + // open socket +@@ -714,7 +714,7 @@ void UdpSocket::receive_handler(SharedSe + // let io_service to handle the datagram on session + // from boost documentation io_service::post: + // The io_service guarantees that the handler will only be called in a thread in which the run(), run_one(), poll() or poll_one() member functions is currently being invoked. +- io_service->post(boost::bind(&UdpSession::handle_receive, session, error, bytes)); ++ boost::asio::post(*io_context, boost::bind(&UdpSession::handle_receive, session, error, bytes)); + // immediately accept new datagrams + async_receive(); + } +@@ -871,13 +871,13 @@ void Bonjour::priv::lookup_perform() + { + service_dn = (boost::format("_%1%._%2%.local") % service % protocol).str(); + +- std::shared_ptr< boost::asio::io_service > io_service(new boost::asio::io_service); ++ std::shared_ptr< boost::asio::io_context > io_context(new boost::asio::io_context); + + std::vector<LookupSocket*> sockets; + + // resolve intefaces - from PR#6646 + std::vector<boost::asio::ip::address> interfaces; +- asio::ip::udp::resolver resolver(*io_service); ++ asio::ip::udp::resolver resolver(*io_context); + boost::system::error_code ec; + // ipv4 interfaces + auto results = resolver.resolve(udp::v4(), asio::ip::host_name(), "", ec); +@@ -890,12 +890,12 @@ void Bonjour::priv::lookup_perform() + // create ipv4 socket for each interface + // each will send to querry to for both ipv4 and ipv6 + for (const auto& intrfc : interfaces) +- sockets.emplace_back(new LookupSocket(txt_keys, service, service_dn, protocol, replyfn, BonjourRequest::MCAST_IP4, intrfc, io_service)); ++ sockets.emplace_back(new LookupSocket(txt_keys, service, service_dn, protocol, replyfn, BonjourRequest::MCAST_IP4, intrfc, io_context)); + } else { + BOOST_LOG_TRIVIAL(info) << "Failed to resolve ipv4 interfaces: " << ec.message(); + } + if (sockets.empty()) +- sockets.emplace_back(new LookupSocket(txt_keys, service, service_dn, protocol, replyfn, BonjourRequest::MCAST_IP4, io_service)); ++ sockets.emplace_back(new LookupSocket(txt_keys, service, service_dn, protocol, replyfn, BonjourRequest::MCAST_IP4, io_context)); + // ipv6 interfaces + interfaces.clear(); + //udp::resolver::query query(host, PORT, boost::asio::ip::resolver_query_base::numeric_service); +@@ -910,9 +910,9 @@ void Bonjour::priv::lookup_perform() + // create ipv6 socket for each interface + // each will send to querry to for both ipv4 and ipv6 + for (const auto& intrfc : interfaces) +- sockets.emplace_back(new LookupSocket(txt_keys, service, service_dn, protocol, replyfn, BonjourRequest::MCAST_IP6, intrfc, io_service)); ++ sockets.emplace_back(new LookupSocket(txt_keys, service, service_dn, protocol, replyfn, BonjourRequest::MCAST_IP6, intrfc, io_context)); + if (interfaces.empty()) +- sockets.emplace_back(new LookupSocket(txt_keys, service, service_dn, protocol, replyfn, BonjourRequest::MCAST_IP6, io_service)); ++ sockets.emplace_back(new LookupSocket(txt_keys, service, service_dn, protocol, replyfn, BonjourRequest::MCAST_IP6, io_context)); + } else { + BOOST_LOG_TRIVIAL(info)<< "Failed to resolve ipv6 interfaces: " << ec.message(); + } +@@ -923,13 +923,13 @@ void Bonjour::priv::lookup_perform() + socket->send(); + + // timer settings +- asio::deadline_timer timer(*io_service); ++ asio::deadline_timer timer(*io_context); + retries--; + std::function<void(const error_code&)> timer_handler = [&](const error_code& error) { + // end + if (retries == 0 || error) { + // is this correct ending? +- io_service->stop(); ++ io_context->stop(); + if (completefn) { + completefn(); + } +@@ -947,7 +947,7 @@ void Bonjour::priv::lookup_perform() + timer.expires_from_now(boost::posix_time::seconds(timeout)); + timer.async_wait(timer_handler); + // start io_service, it will run until it has something to do - so in this case until stop is called in timer +- io_service->run(); ++ io_context->run(); + } + catch (std::exception& e) { + BOOST_LOG_TRIVIAL(error) << e.what(); +@@ -966,12 +966,12 @@ void Bonjour::priv::resolve_perform() + rpls.push_back(reply); + }; + +- std::shared_ptr< boost::asio::io_service > io_service(new boost::asio::io_service); ++ std::shared_ptr< boost::asio::io_context > io_context(new boost::asio::io_context); + std::vector<ResolveSocket*> sockets; + + // resolve interfaces - from PR#6646 + std::vector<boost::asio::ip::address> interfaces; +- asio::ip::udp::resolver resolver(*io_service); ++ asio::ip::udp::resolver resolver(*io_context); + boost::system::error_code ec; + // ipv4 interfaces + auto results = resolver.resolve(udp::v4(), asio::ip::host_name(), "", ec); +@@ -984,12 +984,12 @@ void Bonjour::priv::resolve_perform() + // create ipv4 socket for each interface + // each will send to querry to for both ipv4 and ipv6 + for (const auto& intrfc : interfaces) +- sockets.emplace_back(new ResolveSocket(hostname, reply_callback, BonjourRequest::MCAST_IP4, intrfc, io_service)); ++ sockets.emplace_back(new ResolveSocket(hostname, reply_callback, BonjourRequest::MCAST_IP4, intrfc, io_context)); + } else { + BOOST_LOG_TRIVIAL(info) << "Failed to resolve ipv4 interfaces: " << ec.message(); + } + if (sockets.empty()) +- sockets.emplace_back(new ResolveSocket(hostname, reply_callback, BonjourRequest::MCAST_IP4, io_service)); ++ sockets.emplace_back(new ResolveSocket(hostname, reply_callback, BonjourRequest::MCAST_IP4, io_context)); + + // ipv6 interfaces + interfaces.clear(); +@@ -1003,9 +1003,9 @@ void Bonjour::priv::resolve_perform() + // create ipv6 socket for each interface + // each will send to querry to for both ipv4 and ipv6 + for (const auto& intrfc : interfaces) +- sockets.emplace_back(new ResolveSocket(hostname, reply_callback, BonjourRequest::MCAST_IP6, intrfc, io_service)); ++ sockets.emplace_back(new ResolveSocket(hostname, reply_callback, BonjourRequest::MCAST_IP6, intrfc, io_context)); + if (interfaces.empty()) +- sockets.emplace_back(new ResolveSocket(hostname, reply_callback, BonjourRequest::MCAST_IP6, io_service)); ++ sockets.emplace_back(new ResolveSocket(hostname, reply_callback, BonjourRequest::MCAST_IP6, io_context)); + } else { + BOOST_LOG_TRIVIAL(info) << "Failed to resolve ipv6 interfaces: " << ec.message(); + } +@@ -1016,14 +1016,14 @@ void Bonjour::priv::resolve_perform() + socket->send(); + + // timer settings +- asio::deadline_timer timer(*io_service); ++ asio::deadline_timer timer(*io_context); + retries--; + std::function<void(const error_code&)> timer_handler = [&](const error_code& error) { + int replies_count = replies.size(); + // end + if (retries == 0 || error || replies_count > 0) { + // is this correct ending? +- io_service->stop(); ++ io_context->stop(); + if (replies_count > 0 && resolvefn) { + resolvefn(replies); + } +@@ -1041,7 +1041,7 @@ void Bonjour::priv::resolve_perform() + timer.expires_from_now(boost::posix_time::seconds(timeout)); + timer.async_wait(timer_handler); + // start io_service, it will run until it has something to do - so in this case until stop is called in timer +- io_service->run(); ++ io_context->run(); + } + catch (std::exception& e) { + BOOST_LOG_TRIVIAL(error) << e.what(); +diff '--color=auto' -urNp PrusaSlicer-version_2.8.1-orig/src/slic3r/Utils/Bonjour.hpp PrusaSlicer-version_2.8.1-dwok/src/slic3r/Utils/Bonjour.hpp +--- PrusaSlicer-version_2.8.1-orig/src/slic3r/Utils/Bonjour.hpp 2024-12-21 11:52:03.644594950 +0100 ++++ PrusaSlicer-version_2.8.1-dwok/src/slic3r/Utils/Bonjour.hpp 2024-12-21 12:23:16.573836269 +0100 +@@ -155,11 +155,11 @@ public: + UdpSocket(Bonjour::ReplyFn replyfn + , const boost::asio::ip::address& multicast_address + , const boost::asio::ip::address& interface_address +- , std::shared_ptr< boost::asio::io_service > io_service); ++ , std::shared_ptr< boost::asio::io_context > io_context); + + UdpSocket(Bonjour::ReplyFn replyfn + , const boost::asio::ip::address& multicast_address +- , std::shared_ptr< boost::asio::io_service > io_service); ++ , std::shared_ptr< boost::asio::io_context > io_context); + + void send(); + void async_receive(); +@@ -172,7 +172,7 @@ protected: + boost::asio::ip::address multicast_address; + boost::asio::ip::udp::socket socket; + boost::asio::ip::udp::endpoint mcast_endpoint; +- std::shared_ptr< boost::asio::io_service > io_service; ++ std::shared_ptr< boost::asio::io_context > io_context; + std::vector<BonjourRequest> requests; + }; + +@@ -186,8 +186,8 @@ public: + , Bonjour::ReplyFn replyfn + , const boost::asio::ip::address& multicast_address + , const boost::asio::ip::address& interface_address +- , std::shared_ptr< boost::asio::io_service > io_service) +- : UdpSocket(replyfn, multicast_address, interface_address, io_service) ++ , std::shared_ptr< boost::asio::io_context > io_context) ++ : UdpSocket(replyfn, multicast_address, interface_address, io_context) + , txt_keys(txt_keys) + , service(service) + , service_dn(service_dn) +@@ -203,8 +203,8 @@ public: + , std::string protocol + , Bonjour::ReplyFn replyfn + , const boost::asio::ip::address& multicast_address +- , std::shared_ptr< boost::asio::io_service > io_service) +- : UdpSocket(replyfn, multicast_address, io_service) ++ , std::shared_ptr< boost::asio::io_context > io_context) ++ : UdpSocket(replyfn, multicast_address, io_context) + , txt_keys(txt_keys) + , service(service) + , service_dn(service_dn) +@@ -241,8 +241,8 @@ public: + , Bonjour::ReplyFn replyfn + , const boost::asio::ip::address& multicast_address + , const boost::asio::ip::address& interface_address +- , std::shared_ptr< boost::asio::io_service > io_service) +- : UdpSocket(replyfn, multicast_address, interface_address, io_service) ++ , std::shared_ptr< boost::asio::io_context > io_context) ++ : UdpSocket(replyfn, multicast_address, interface_address, io_context) + , hostname(hostname) + + { +@@ -253,8 +253,8 @@ public: + ResolveSocket(const std::string& hostname + , Bonjour::ReplyFn replyfn + , const boost::asio::ip::address& multicast_address +- , std::shared_ptr< boost::asio::io_service > io_service) +- : UdpSocket(replyfn, multicast_address, io_service) ++ , std::shared_ptr< boost::asio::io_context > io_context) ++ : UdpSocket(replyfn, multicast_address, io_context) + , hostname(hostname) + + { +diff '--color=auto' -urNp PrusaSlicer-version_2.8.1-orig/src/slic3r/Utils/Serial.cpp PrusaSlicer-version_2.8.1-dwok/src/slic3r/Utils/Serial.cpp +--- PrusaSlicer-version_2.8.1-orig/src/slic3r/Utils/Serial.cpp 2024-12-21 11:52:03.644594950 +0100 ++++ PrusaSlicer-version_2.8.1-dwok/src/slic3r/Utils/Serial.cpp 2024-12-21 11:59:40.018945840 +0100 +@@ -282,12 +282,12 @@ std::vector<std::string> scan_serial_por + namespace asio = boost::asio; + using boost::system::error_code; + +-Serial::Serial(asio::io_service& io_service) : +- asio::serial_port(io_service) ++Serial::Serial(asio::io_context &io_context) : ++ asio::serial_port(io_context) + {} + +-Serial::Serial(asio::io_service& io_service, const std::string &name, unsigned baud_rate) : +- asio::serial_port(io_service, name) ++Serial::Serial(asio::io_context &io_context, const std::string &name, unsigned baud_rate) : ++ asio::serial_port(io_context, name) + { + set_baud_rate(baud_rate); + } +@@ -390,19 +390,19 @@ void Serial::reset_line_num() + + bool Serial::read_line(unsigned timeout, std::string &line, error_code &ec) + { +- auto& io_service = ++ auto& io_context = + #if BOOST_VERSION >= 107000 + //FIXME this is most certainly wrong! + (boost::asio::io_context&)this->get_executor().context(); + #else + this->get_io_service(); + #endif +- asio::deadline_timer timer(io_service); ++ asio::deadline_timer timer(io_context); + char c = 0; + bool fail = false; + + while (true) { +- io_service.reset(); ++ io_context.reset(); + + asio::async_read(*this, boost::asio::buffer(&c, 1), [&](const error_code &read_ec, size_t size) { + if (ec || size == 0) { +@@ -423,7 +423,7 @@ bool Serial::read_line(unsigned timeout, + }); + } + +- io_service.run(); ++ io_context.run(); + + if (fail) { + return false; +diff '--color=auto' -urNp PrusaSlicer-version_2.8.1-orig/src/slic3r/Utils/Serial.hpp PrusaSlicer-version_2.8.1-dwok/src/slic3r/Utils/Serial.hpp +--- PrusaSlicer-version_2.8.1-orig/src/slic3r/Utils/Serial.hpp 2024-12-21 11:52:03.644594950 +0100 ++++ PrusaSlicer-version_2.8.1-dwok/src/slic3r/Utils/Serial.hpp 2024-12-21 11:55:33.283837413 +0100 +@@ -43,8 +43,8 @@ extern std::vector<SerialPortInfo> scan + class Serial : public boost::asio::serial_port + { + public: +- Serial(boost::asio::io_service &io_service); +- Serial(boost::asio::io_service &io_service, const std::string &name, unsigned baud_rate); ++ Serial(boost::asio::io_context &io_context); ++ Serial(boost::asio::io_context &io_context, const std::string &name, unsigned baud_rate); + Serial(const Serial &) = delete; + Serial &operator=(const Serial &) = delete; + ~Serial(); +diff '--color=auto' -urNp PrusaSlicer-version_2.8.1-orig/src/slic3r/Utils/TCPConsole.cpp PrusaSlicer-version_2.8.1-dwok/src/slic3r/Utils/TCPConsole.cpp +--- PrusaSlicer-version_2.8.1-orig/src/slic3r/Utils/TCPConsole.cpp 2024-12-21 11:52:03.644594950 +0100 ++++ PrusaSlicer-version_2.8.1-dwok/src/slic3r/Utils/TCPConsole.cpp 2024-12-21 13:00:56.377754763 +0100 +@@ -9,6 +9,7 @@ + #include <boost/asio/read_until.hpp> + #include <boost/asio/steady_timer.hpp> + #include <boost/asio/write.hpp> ++#include <boost/asio/connect.hpp> + #include <boost/bind/bind.hpp> + #include <boost/format.hpp> + #include <boost/log/trivial.hpp> +@@ -161,7 +162,7 @@ bool TCPConsole::run_queue() + + auto endpoints = m_resolver.resolve(m_host_name, m_port_name); + +- m_socket.async_connect(endpoints->endpoint(), ++ boost::asio::async_connect(m_socket, endpoints, + boost::bind(&TCPConsole::handle_connect, this, boost::placeholders::_1) + ); + + diff --git a/media-gfx/prusaslicer/files/prusaslicer-2.9.0-arrange-static.patch b/media-gfx/prusaslicer/files/prusaslicer-2.9.0-arrange-static.patch new file mode 100644 index 000000000000..6bc8af73d03a --- /dev/null +++ b/media-gfx/prusaslicer/files/prusaslicer-2.9.0-arrange-static.patch @@ -0,0 +1,46 @@ +From a7c15a3ae9877dcf7da8c8fd80de8b128251db2b Mon Sep 17 00:00:00 2001 +From: Yuri D'Elia <wavexx@thregr.org> +Date: Fri, 3 Jan 2025 00:07:50 +0100 +Subject: [PATCH] Build libslic3r-arrange/wrapper as static + +Fix build on linux without SLIC3R_STATIC (these are for internal use +only). + +- Avoids the need for installation (fixes + https://github.com/prusa3d/PrusaSlicer/pull/13812) +- Fixes build without PIC (fixes + https://github.com/prusa3d/PrusaSlicer/pull/13810, + https://github.com/prusa3d/PrusaSlicer/issues/13694), which would + still result in broken behavior (duplicate static initialization + crashing on startup). +--- + src/slic3r-arrange-wrapper/CMakeLists.txt | 2 +- + src/slic3r-arrange/CMakeLists.txt | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +diff --git a/src/slic3r-arrange-wrapper/CMakeLists.txt b/src/slic3r-arrange-wrapper/CMakeLists.txt +index 3f723e5aed1..34b64fc2969 100644 +--- a/src/slic3r-arrange-wrapper/CMakeLists.txt ++++ b/src/slic3r-arrange-wrapper/CMakeLists.txt +@@ -1,7 +1,7 @@ + project(slic3r-arrange-wrapper) + cmake_minimum_required(VERSION 3.13) + +-add_library(slic3r-arrange-wrapper ++add_library(slic3r-arrange-wrapper STATIC + include/arrange-wrapper/Arrange.hpp + include/arrange-wrapper/ArrangeSettingsDb_AppCfg.hpp + include/arrange-wrapper/ArrangeSettingsView.hpp +diff --git a/src/slic3r-arrange/CMakeLists.txt b/src/slic3r-arrange/CMakeLists.txt +index 98ab2470535..36a54ca5985 100644 +--- a/src/slic3r-arrange/CMakeLists.txt ++++ b/src/slic3r-arrange/CMakeLists.txt +@@ -1,7 +1,7 @@ + project(slic3r-arrange) + cmake_minimum_required(VERSION 3.13) + +-add_library(slic3r-arrange ++add_library(slic3r-arrange STATIC + include/arrange/Beds.hpp + include/arrange/ArrangeItemTraits.hpp + include/arrange/PackingContext.hpp diff --git a/media-gfx/prusaslicer/files/prusaslicer-2.9.0-fpic-all.patch b/media-gfx/prusaslicer/files/prusaslicer-2.9.0-fpic-all.patch deleted file mode 100644 index f71a5b988424..000000000000 --- a/media-gfx/prusaslicer/files/prusaslicer-2.9.0-fpic-all.patch +++ /dev/null @@ -1,18 +0,0 @@ -From a48acef85b34b52085378b8ee39a79f7eaeac0fa Mon Sep 17 00:00:00 2001 -From: Andreas Schneider <asn@cryptomilk.org> -Date: Fri, 20 Dec 2024 20:49:23 +0100 -Subject: [PATCH] cmake: Turn on position independent code for all targets - -Fixes: #13694 ---- a/src/CMakeLists.txt -+++ b/src/CMakeLists.txt -@@ -1,6 +1,9 @@ - cmake_minimum_required(VERSION 3.13) - project(PrusaSlicer-native) - -+# This enables -fPIC for shared libaries and -fpie for binaries -+set(CMAKE_POSITION_INDEPENDENT_CODE ON) -+ - add_subdirectory(clipper) - find_package(Qhull 7.2 REQUIRED) - add_library(qhull INTERFACE) diff --git a/media-gfx/prusaslicer/files/prusaslicer-2.9.0-fpic.patch b/media-gfx/prusaslicer/files/prusaslicer-2.9.0-fpic.patch deleted file mode 100644 index ea6e297e96db..000000000000 --- a/media-gfx/prusaslicer/files/prusaslicer-2.9.0-fpic.patch +++ /dev/null @@ -1,57 +0,0 @@ ---- a/bundled_deps/admesh/CMakeLists.txt -+++ b/bundled_deps/admesh/CMakeLists.txt -@@ -14,3 +14,4 @@ add_library(admesh STATIC - target_include_directories(admesh PUBLIC .) - target_link_libraries(admesh PRIVATE boost_headeronly localesutils) - target_link_libraries(admesh PUBLIC Eigen3::Eigen) -+set_target_properties(admesh PROPERTIES POSITION_INDEPENDENT_CODE ON) ---- a/bundled_deps/glu-libtess/CMakeLists.txt -+++ b/bundled_deps/glu-libtess/CMakeLists.txt -@@ -34,3 +34,4 @@ if(UNIX) - endif(UNIX) - - target_include_directories(glu-libtess PRIVATE ${CMAKE_CURRENT_SOURCE_DIR} PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/include) -+set_target_properties(glu-libtess PROPERTIES POSITION_INDEPENDENT_CODE ON) ---- a/bundled_deps/miniz/CMakeLists.txt -+++ b/bundled_deps/miniz/CMakeLists.txt -@@ -7,6 +7,7 @@ add_library(miniz_static STATIC - miniz.c - miniz.h - ) -+set_target_properties(miniz_static PROPERTIES POSITION_INDEPENDENT_CODE ON) - - if(${CMAKE_C_COMPILER_ID} STREQUAL "GNU") - target_compile_definitions(miniz_static PRIVATE _GNU_SOURCE) ---- a/bundled_deps/CMakeLists.txt -+++ b/bundled_deps/CMakeLists.txt -@@ -33,6 +33,7 @@ add_library(localesutils STATIC - ) - target_include_directories(localesutils PUBLIC localesutils) - target_link_libraries(localesutils PRIVATE fastfloat) -+set_target_properties(localesutils PROPERTIES POSITION_INDEPENDENT_CODE ON) - - add_library(ankerl INTERFACE) - target_include_directories(ankerl INTERFACE ankerl) ---- a/src/libslic3r/CMakeLists.txt -+++ b/src/libslic3r/CMakeLists.txt -@@ -532,6 +532,7 @@ add_library(libslic3r_cgal STATIC - TryCatchSignal.hpp TryCatchSignal.cpp - Triangulation.hpp Triangulation.cpp - ) -+set_target_properties(libslic3r_cgal PROPERTIES POSITION_INDEPENDENT_CODE ON) - target_include_directories(libslic3r_cgal PRIVATE ${CMAKE_CURRENT_BINARY_DIR}) - target_include_directories(libslic3r_cgal PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/..) - -@@ -622,3 +623,5 @@ endif () - if (SLIC3R_PCH AND NOT SLIC3R_SYNTAXONLY) - add_precompiled_header(libslic3r pchheader.hpp FORCEINCLUDE) - endif () -+ -+set_target_properties(libslic3r PROPERTIES POSITION_INDEPENDENT_CODE ON) ---- a/src/clipper/CMakeLists.txt -+++ b/src/clipper/CMakeLists.txt -@@ -12,3 +12,4 @@ add_library(clipper STATIC - target_link_libraries(clipper PRIVATE TBB::tbb TBB::tbbmalloc int128) - target_link_libraries(clipper PUBLIC Eigen3::Eigen) - target_include_directories(clipper PUBLIC .) -+set_target_properties(clipper PROPERTIES POSITION_INDEPENDENT_CODE ON) diff --git a/media-gfx/prusaslicer/files/prusaslicer-2.9.0-slic3r-arrange-wrapper.patch b/media-gfx/prusaslicer/files/prusaslicer-2.9.0-slic3r-arrange-wrapper.patch deleted file mode 100644 index a5a77d8fc370..000000000000 --- a/media-gfx/prusaslicer/files/prusaslicer-2.9.0-slic3r-arrange-wrapper.patch +++ /dev/null @@ -1,18 +0,0 @@ -From 09c89be8732d4b11f64980c7ac5368cd506847dd Mon Sep 17 00:00:00 2001 -From: Andreas Schneider <asn@cryptomilk.org> -Date: Fri, 20 Dec 2024 20:15:51 +0100 -Subject: [PATCH] cmake: Install slic3r-arrange-wrapper - -Fixes #13805 ---- a/src/slic3r-arrange-wrapper/CMakeLists.txt -+++ b/src/slic3r-arrange-wrapper/CMakeLists.txt -@@ -33,3 +33,9 @@ add_library(slic3r-arrange-wrapper - target_include_directories(slic3r-arrange-wrapper PRIVATE src) - target_include_directories(slic3r-arrange-wrapper PUBLIC include) - target_link_libraries(slic3r-arrange-wrapper PUBLIC slic3r-arrange) -+ -+if (WIN32) -+ install(TARGETS slic3r-arrange-wrapper LIBRARY DESTINATION ${CMAKE_INSTALL_PREFIX}) -+else() -+ install(TARGETS slic3r-arrange-wrapper LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}) -+endif() diff --git a/media-gfx/prusaslicer/files/prusaslicer-2.9.0-slic3r-arrange.patch b/media-gfx/prusaslicer/files/prusaslicer-2.9.0-slic3r-arrange.patch deleted file mode 100644 index 7198d11f7464..000000000000 --- a/media-gfx/prusaslicer/files/prusaslicer-2.9.0-slic3r-arrange.patch +++ /dev/null @@ -1,18 +0,0 @@ -From 5f450dc269ff99af3f0e056ae4b30d254789500b Mon Sep 17 00:00:00 2001 -From: Andreas Schneider <asn@cryptomilk.org> -Date: Fri, 20 Dec 2024 20:14:52 +0100 -Subject: [PATCH] cmake: Install slic3r-arrange - -Fixes #13805 ---- a/src/slic3r-arrange/CMakeLists.txt -+++ b/src/slic3r-arrange/CMakeLists.txt -@@ -32,3 +32,9 @@ add_library(slic3r-arrange - target_include_directories(slic3r-arrange PRIVATE src) - target_include_directories(slic3r-arrange PUBLIC include) - target_link_libraries(slic3r-arrange PUBLIC libslic3r) -+ -+if (WIN32) -+ install(TARGETS slic3r-arrange LIBRARY DESTINATION ${CMAKE_INSTALL_PREFIX}) -+else() -+ install(TARGETS slic3r-arrange LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}) -+endif() diff --git a/media-gfx/prusaslicer/prusaslicer-2.8.1-r1.ebuild b/media-gfx/prusaslicer/prusaslicer-2.8.1-r1.ebuild index 6b3be9ea12e5..1b384bbdb9a9 100644 --- a/media-gfx/prusaslicer/prusaslicer-2.8.1-r1.ebuild +++ b/media-gfx/prusaslicer/prusaslicer-2.8.1-r1.ebuild @@ -68,6 +68,7 @@ PATCHES=( "${FILESDIR}/${PN}-2.8.1-cgal-6.0.patch" "${FILESDIR}/${PN}-2.8.1-fstream.patch" "${FILESDIR}/${PN}-2.8.1-fix-libsoup-double-linking.patch" + "${FILESDIR}/${PN}-2.8.1-boost-1.87.patch" ) src_prepare() { diff --git a/media-gfx/prusaslicer/prusaslicer-2.9.0.ebuild b/media-gfx/prusaslicer/prusaslicer-2.9.0.ebuild new file mode 100644 index 000000000000..2f4ebe6ec2af --- /dev/null +++ b/media-gfx/prusaslicer/prusaslicer-2.9.0.ebuild @@ -0,0 +1,113 @@ +# Copyright 1999-2025 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +WX_GTK_VER="3.2-gtk3" +MY_PN="PrusaSlicer" +MY_PV="$(ver_rs 3 -)" + +inherit cmake wxwidgets xdg + +if [[ ${PV} == *9999* ]]; then + inherit git-r3 + EGIT_REPO_URI="https://github.com/prusa3d/prusaslicer.git" +else + SRC_URI="https://github.com/prusa3d/PrusaSlicer/archive/refs/tags/version_${MY_PV}.tar.gz -> ${P}.tar.gz" + KEYWORDS="~amd64 ~arm64 ~x86" + S="${WORKDIR}/${MY_PN}-version_${MY_PV}" +fi + +DESCRIPTION="A mesh slicer to generate G-code for fused-filament-fabrication (3D printers)" +HOMEPAGE="https://www.prusa3d.com/prusaslicer/" + +LICENSE="AGPL-3 Boost-1.0 GPL-2 LGPL-3 MIT" +SLOT="0" +IUSE="test" + +RESTRICT="!test? ( test )" + +RDEPEND=" + dev-cpp/eigen:3 + dev-cpp/tbb:= + dev-libs/boost:=[nls] + dev-libs/cereal + dev-libs/expat + dev-libs/glib:2 + dev-libs/gmp:= + dev-libs/mpfr:= + media-gfx/openvdb:= + media-gfx/libbgcode + net-misc/curl[adns] + media-libs/glew:0= + media-libs/libjpeg-turbo:= + media-libs/libpng:0= + media-libs/qhull:= + net-libs/webkit-gtk:4.1 + sci-libs/libigl + sci-libs/nlopt + sci-libs/opencascade:= + sci-mathematics/cgal:= + sys-apps/dbus + sys-libs/zlib:= + virtual/opengl + x11-libs/gtk+:3 + >=x11-libs/wxGTK-3.2.2.1-r3:${WX_GTK_VER}[X,opengl,webkit] + media-libs/nanosvg:= +" +DEPEND="${RDEPEND} + media-libs/qhull[static-libs] + test? ( =dev-cpp/catch-2* ) +" + +PATCHES=( + "${FILESDIR}/${PN}-2.6.0-dont-force-link-to-wayland-and-x11.patch" + "${FILESDIR}/${PN}-2.8.0-wxwidgets-3.2.4.patch" + "${FILESDIR}/${PN}-2.8.1-cgal-6.0.patch" + "${FILESDIR}/${PN}-2.8.1-fstream.patch" + "${FILESDIR}/${PN}-2.8.1-fix-libsoup-double-linking.patch" + "${FILESDIR}/${PN}-2.8.1-boost-1.87.patch" + "${FILESDIR}/${PN}-2.9.0-missing-includes.patch" + "${FILESDIR}/${PN}-2.9.0-arrange-static.patch" +) + +src_prepare() { + if has_version ">=sci-libs/opencascade-7.8.0"; then + eapply "${FILESDIR}/prusaslicer-2.8.1-opencascade-7.8.0.patch" + fi + + sed -i -e 's/PrusaSlicer-${SLIC3R_VERSION}+UNKNOWN/PrusaSlicer-${SLIC3R_VERSION}+Gentoo/g' version.inc || die + + sed -i -e 's/find_package(OpenCASCADE 7.6.[0-9] REQUIRED)/find_package(OpenCASCADE REQUIRED)/g' \ + src/occt_wrapper/CMakeLists.txt || die + + cmake_src_prepare +} + +src_configure() { + CMAKE_BUILD_TYPE="Release" + + setup-wxwidgets + + local mycmakeargs=( + -DOPENVDB_FIND_MODULE_PATH="/usr/$(get_libdir)/cmake/OpenVDB" + + -DSLIC3R_BUILD_TESTS=$(usex test) + -DSLIC3R_FHS=ON + -DSLIC3R_GTK=3 + -DSLIC3R_GUI=ON + -DSLIC3R_PCH=OFF + -DSLIC3R_STATIC=OFF + -DSLIC3R_WX_STABLE=ON + -Wno-dev + ) + + cmake_src_configure +} + +src_test() { + CMAKE_SKIP_TESTS=( + "^libslic3r_tests$" + ) + cmake_src_test +} diff --git a/media-gfx/prusaslicer/prusaslicer-9999.ebuild b/media-gfx/prusaslicer/prusaslicer-9999.ebuild index 2fcf6ded9e4e..2f4ebe6ec2af 100644 --- a/media-gfx/prusaslicer/prusaslicer-9999.ebuild +++ b/media-gfx/prusaslicer/prusaslicer-9999.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 @@ -66,11 +66,9 @@ PATCHES=( "${FILESDIR}/${PN}-2.8.1-cgal-6.0.patch" "${FILESDIR}/${PN}-2.8.1-fstream.patch" "${FILESDIR}/${PN}-2.8.1-fix-libsoup-double-linking.patch" + "${FILESDIR}/${PN}-2.8.1-boost-1.87.patch" "${FILESDIR}/${PN}-2.9.0-missing-includes.patch" - "${FILESDIR}/${PN}-2.9.0-fpic.patch" - "${FILESDIR}/${PN}-2.9.0-fpic-all.patch" - "${FILESDIR}/${PN}-2.9.0-slic3r-arrange.patch" - "${FILESDIR}/${PN}-2.9.0-slic3r-arrange-wrapper.patch" + "${FILESDIR}/${PN}-2.9.0-arrange-static.patch" ) src_prepare() { diff --git a/media-gfx/quat/Manifest b/media-gfx/quat/Manifest index b4b43d087fcc..9113f2ed6046 100644 --- a/media-gfx/quat/Manifest +++ b/media-gfx/quat/Manifest @@ -1,4 +1,5 @@ AUX quat-1.20-fix-build-for-clang16.patch 2955 BLAKE2B f12610d484006de26bc42475af99269911e186bdc490b4c4d1e48d0ae152b97be162aa2ba178b10cef0ae1bb9e4199aaa79ab512ce8bad41a6bb414151d125f1 SHA512 53b2eb52f1c062da4b4f594ea0a62ca11c5b37bba3f7ac5028906412c03a2bdee831e9dbd42cf63798f5f5ff8a8aadac5a808c6596e5d6dff53358a6ca0cf206 +AUX quat-1.20-fltk1.4.patch 177 BLAKE2B 714e89eab91e8d23c788a2c41ea4dd89355e76b0f82701bf8394f3083e3f162816c28d80901f53c51223c245a9b96a06c3c2a66dd61d89534d1f8b55fcb2ac77 SHA512 29b99f85bd6475ccc872a6b50e605e536c97847377dfd5aa61591bb3ed9117b7fa8aaa4f0bf56ae849c99dc7bfec75b39f3bd8c5838bfd2041017579bde85314 DIST quat-1.20.tar.gz 474448 BLAKE2B 52a06460be261c622f0c30f8991762e91688da53ba2a9854cc5c94a6de7fa9c7d8028fc3f36608bf11f56c7bee8ca192a37c91ac993b3866ad7b630da3bee5ad SHA512 eb77d628ea0e329e8bda11124bfa57e4005f06ad4d54d8bdc31eaab09fc0cf7ebf1873e7dd47624781e8ee75c7644bfc75819ce5aeb5c150644f8b7a7c81e85b -EBUILD quat-1.20-r3.ebuild 972 BLAKE2B 3dba3013826bf82e854be298e994094f627cfd1ba504f610ea52b53b242f48d2d4232383949701d9423975078e189b2d9b36bd581deeb8bc3a76635d1430ca92 SHA512 dca80aa41fd6cacf7c3a16cb6d6134a65f7a3d29bf9bdc6cb3e7589e29239e4052aed0b04347c49a968277c85b3efd52d43a66f881471fa43de6a043a80f7f50 +EBUILD quat-1.20-r4.ebuild 1006 BLAKE2B 98e94a4ef28411e567190e5a45219684465139eba41a58f74fadbaca3aab1ed6fe24ae1cce5edd143955e21368b45a5fad8e4b5cc6baf18b3da43c605002d8de SHA512 ba778759583821a08b9d7a403d9cbd587101092e1f7d6d192a119f421c6600d1e62c61cad9283e5375510a61870c85ec622ed95074c044fc36c69f13dd261509 MISC metadata.xml 167 BLAKE2B 868e3b584722eaacf68273db062bb773d8c7e5d7ab2b81ca7e8397643bf7cc106c3a1033594401c99c54f667bb45d6b73f9048fc335580bbd44b4589ad26a832 SHA512 30caadd1496c3b9969136038239a1d8e01f236726b4022c2d7e19ca7575f25f735e556835e581afbf44fbd3e4104c40f2b5ef5fa70118d75c881fdf871962d0a diff --git a/media-gfx/quat/files/quat-1.20-fltk1.4.patch b/media-gfx/quat/files/quat-1.20-fltk1.4.patch new file mode 100644 index 000000000000..d3426b2db0b0 --- /dev/null +++ b/media-gfx/quat/files/quat-1.20-fltk1.4.patch @@ -0,0 +1,6 @@ +Deprecated compatibility symlinks are removed. +--- a/gui/MainWindow.cxx ++++ b/gui/MainWindow.cxx +@@ -56 +56 @@ +-#include <FL/fl_file_chooser.H> ++#include <FL/Fl_File_Chooser.H> diff --git a/media-gfx/quat/quat-1.20-r3.ebuild b/media-gfx/quat/quat-1.20-r4.ebuild index f237c96e4554..da95cfeec35c 100644 --- a/media-gfx/quat/quat-1.20-r3.ebuild +++ b/media-gfx/quat/quat-1.20-r4.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -17,7 +17,7 @@ IUSE="X debug" DEPEND=" >=sys-libs/zlib-1.1.4 X? ( - =x11-libs/fltk-1* + x11-libs/fltk:1= x11-libs/libX11 x11-libs/libXext x11-libs/libXft @@ -25,7 +25,10 @@ DEPEND=" " RDEPEND="${DEPEND}" -PATCHES=( "${FILESDIR}/${P}-fix-build-for-clang16.patch" ) +PATCHES=( + "${FILESDIR}/${P}-fix-build-for-clang16.patch" + "${FILESDIR}/${P}-fltk1.4.patch" +) src_configure() { # throws tons of warnings otherwise diff --git a/media-gfx/renderdoc/Manifest b/media-gfx/renderdoc/Manifest index acc837ab510a..c66f143fbd2c 100644 --- a/media-gfx/renderdoc/Manifest +++ b/media-gfx/renderdoc/Manifest @@ -4,14 +4,8 @@ AUX renderdoc-1.18-system-flags.patch 845 BLAKE2B 0d4aae31af353b2d199ae66ec999be AUX renderdoc-1.27-env-home.patch 438 BLAKE2B a42c86648314382bba7b93ee544fe6d82b4f1ec122c57d7b989475bd442dd7003de8bfd7f467e88693deac6212846103038f48501ffef9eae7d0c38100669eac SHA512 c0b340582de7c23637afa7a95dcd2f3f4c6f28ad9c244c92235e29e428ba40a991cbcac83197a3b52c1c689f4d07ede2fc0c96d4b1b3c67dc94866137a7ce4b7 AUX renderdoc-1.30-r1-system-compress.patch 4565 BLAKE2B 62ac93b27e7b2fd1962075241cab49acc3971f76b9046a53b0ccdb7707f849aca1c6b4306e07455bdb5e4c9df7f72bba5665a2b3927dfc782722486e2fc152c7 SHA512 7815ea6170583899ee6f48c1aec8a175082208c6b4d1f6c651f3274317c9b9575548f8bb900abc5137309df5448c4643b4fc4e74b367aa18c3dc7dacabba842a AUX renderdoc-1.31-lld.patch 604 BLAKE2B 175a2a54e18ae6a8051f54e058aa5b516cc8834a71f09d8a352e253a0b4a38cb3a43275c4cfbd8a7799698dca46553bb6319ce1963175757dbd0b3de0d6b5abb SHA512 f4db95aad6602197afc9fa6de7934638a0fd47903aa4488fc994a53bc67e557cd22450e9253aa047ca70c9af30cdc372c69528b64943878498cf781a1a703e96 -DIST renderdoc-1.30.tar.gz 50938458 BLAKE2B 2e9364a8eabca64384e066709c98be8df0ed3c970c173074f9d38eea21d4dc31a50b862818879ccb9f32be8b839643c2d01ddda70d9da8c338c2fc305549eaa9 SHA512 33437f7420d6a79f2b02536ae63bc31537cfab83cdac2d44efdef377e93db7c0c15f2e46ecc67a6ea780f36b162f04d7a00ac3fe5d382fe761fa986664aceb60 -DIST renderdoc-1.30.tar.gz.asc 833 BLAKE2B c829329806de5cfc672c2cc976596a5c126cd5f24bef189f6832de8f8f3721461e56688823d562e82eae89792c5fc4a500037cc97c2cce2b762b211a951c1d19 SHA512 f68a04aec4e304df0eba3dcba2876f99182fecff82b6b600d621e48c15bce42c07f20aebc811fd36aff5c04f550a51483af2b499051700a2c5bc936311a534de -DIST renderdoc-1.31.tar.gz 51193992 BLAKE2B a51e2d380b61f462e29b97679b0c2014e26cf108e3d9bc70874fedfbee5a9f391e8693f54c76fae51b9459b70d2197c362b95054a54c5e2e889c8ce85ba74305 SHA512 c119fdd7f27ef4f617b5b5aad94267326f403802648d6ed0970651e48b2467729ce5768ea64c77cab337ff0bdde4c17eaa01028dfebb15568bb4500693cf6d6e -DIST renderdoc-1.31.tar.gz.asc 833 BLAKE2B 82d360070eea9cf037b3ec7de899c58372e64540d2346cc209edb8cc3c321fd628954fbb1275b27366a2d91dd8604e9ebdd961cfd4dcab0abea1fb3bc793817b SHA512 878dd0a042aa8af97b7ba158fd88776cb2ea3ca662cfc95752d477727686342153db217302d9325f0f6bbd76628eb608820350981bf0d819812e57cea773f499 DIST renderdoc-1.32.tar.gz 51324019 BLAKE2B 5f138bd1fa5dbf3689def983b996385b8670ad83c9da82b7978fc25c94687aac9f6f2f35b93e6af9c994064698b6931eb7b544f43d8f00ef0fc6836695ef1447 SHA512 2b8efde5d4684b4b66fb4c12bbc0cd15c04dc8df98fb9a93b78e1a36ef17b652b3b50043cb8400bbe6859a4e34c3ab8ba01b1a44ea379569ad7f265399d8afe4 DIST renderdoc-1.32.tar.gz.asc 833 BLAKE2B f9769e654b03f73073e7a7c99a2148194879fab4a687ae44ed9096af881574b8ea945a8af02a4df019cb44808a1c65714146623aae8f879b396a8e4836bf09a8 SHA512 8c60ec37077fa6ef777585f4b55c15fe51c30ed6f6a852605e53abf982d6111210dccf031a4afba737bd7ce76004a44b7f52c6ed607e7525fe13ab7c03baae30 DIST swig-renderdoc-7.tar.gz 4006241 BLAKE2B 619f41239f4aef496264d61f44ae042cf80d3ff28491d452cf11ad07e898554c4a32df6119ee0e8e3de36e6bee61855358cd968ad01c9281976e24e9a6cac839 SHA512 5285a65924c069cfb9f73104ad8a95251badac4001293a1757b97ebead5953730c03289159741f82da4c5afe4f61f7c826b105eaf82df044ed2fa21810242c86 -EBUILD renderdoc-1.30-r2.ebuild 5017 BLAKE2B 4c22e5bd875ecbf7627467b86dbaca3a753c0539d432c7a14182c999a5d820e05a0d42321c626d2362a4c550392c5779974b1f39e41acfe34542512cc97d092f SHA512 a77878ca913bcb5c2864060364d2f0d2db2080ffa5e355dfb60a6c0d176ae109ed07103d0212fc9c4c5e364ff74563ee78a663006f0d053b2f90393f9d01eeab -EBUILD renderdoc-1.31.ebuild 5070 BLAKE2B 9dff8e948cb7b876c782d62631526579a5168fcc5ba94a77c9bb172948385ccd2a2ee10a3b418fda071619a3d7a16b10162105f32a8b6aba9b080b2e253cf2bf SHA512 07a20446e20bc3cfe1425fc2342ffcc1f9835118fce3c08746ee1ffc4a384de6ee1bac989a3e64d54fef7d5e079561e81fc06ad04fc00822fb2ec42dc1eb35a1 EBUILD renderdoc-1.32.ebuild 5069 BLAKE2B 521920beb5dd50ee7a8443bd3e955adaf8c8483dbe8a7c9e6318d5989cba5123e694fa4f4b5b6b686b0588cb2ffa9e8e9bb635870ee2be52e094112db4381b4c SHA512 778e590fda5e564a4ab03640fe78bcc0644a539f652ab4463f80d1f4676164b185d8ba1eee9cc7f831eb39d7c4eafc7176568e25174bbeb67474d2df29cb6ef6 MISC metadata.xml 350 BLAKE2B 3f4889e1015daa270d9429d31a152ff03ec814a1c76e7ecf4c11f15aed9e29f50c02b0a4beef722bcb0f1b349e4f5723245f6bd2d26b86095da916de90a4eee0 SHA512 1af993015e1f5e7d030fc03bbe10ec2ee777c7064daa7f1e562834c3024b6700d7207f8202fc8382e785ef3a5c992b559a0804b365d46e967583cac698850e7d diff --git a/media-gfx/renderdoc/renderdoc-1.30-r2.ebuild b/media-gfx/renderdoc/renderdoc-1.30-r2.ebuild deleted file mode 100644 index 474d3abb42fe..000000000000 --- a/media-gfx/renderdoc/renderdoc-1.30-r2.ebuild +++ /dev/null @@ -1,188 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -# The swig fork is required for compatibility with both provided and -# 3rd-party Python scripts. Required patch was sent to upstream in -# 2014: https://github.com/swig/swig/pull/251 -MY_SWIG_VER=7 -MY_SWIG=swig-${PN}-${MY_SWIG_VER} - -AUTOTOOLS_AUTO_DEPEND="no" -DOCS_BUILDER="sphinx" -DOCS_DIR="docs" -PYTHON_COMPAT=( python3_{9..12} ) -inherit autotools cmake flag-o-matic optfeature python-single-r1 docs qmake-utils verify-sig xdg - -DESCRIPTION="A stand-alone graphics debugging tool" -HOMEPAGE="https://renderdoc.org https://github.com/baldurk/renderdoc" -SRC_URI=" - https://github.com/baldurk/${PN}/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz - qt5? ( https://github.com/baldurk/swig/archive/${PN}-modified-${MY_SWIG_VER}.tar.gz -> ${MY_SWIG}.tar.gz ) - verify-sig? ( https://github.com/baldurk/renderdoc/releases/download/v${PV}/v${PV}.tar.gz.asc -> ${P}.tar.gz.asc ) -" - -# renderdoc: MIT -# + cmdline: BSD (not compatible with upstream lib) -# + farm fresh icons: CC-BY-3.0 -# + half: MIT (not compatible with system dev-libs/half) -# + include-bin ZLIB (upstream doesn't exist anymore, maintained in tree) -# + md5: public-domain -# + plthook: BSD-2 -# + pugixml: MIT -# + radeon gpu analyzer: MIT -# + source code pro: OFL-1.1 -# + stb: public-domain -# + tinyfiledialogs: ZLIB -# + glslang: BSD -# + docs? ( sphinx.paramlinks: MIT ) -# swig: GPL-3+ BSD BSD-2 -LICENSE="BSD BSD-2 CC-BY-3.0 GPL-3+ MIT OFL-1.1 public-domain ZLIB" -SLOT="0" -KEYWORDS="amd64" -IUSE="qt5" -REQUIRED_USE="doc? ( qt5 ) qt5? ( ${PYTHON_REQUIRED_USE} )" - -RDEPEND=" - app-arch/lz4:= - app-arch/zstd:= - dev-libs/miniz:= - x11-libs/libX11 - x11-libs/libxcb:= - x11-libs/xcb-util-keysyms - virtual/opengl - qt5? ( - ${PYTHON_DEPS} - dev-qt/qtcore:5 - dev-qt/qtgui:5 - dev-qt/qtnetwork:5[ssl] - dev-qt/qtsvg:5 - dev-qt/qtwidgets:5 - dev-qt/qtx11extras:5 - ) -" -DEPEND="${RDEPEND}" -# qtcore provides qmake, which is required to build the qrenderdoc gui. -BDEPEND=" - x11-base/xorg-proto - virtual/pkgconfig - qt5? ( - ${AUTOTOOLS_DEPEND} - ${PYTHON_DEPS} - dev-libs/libpcre - dev-qt/qtcore:5 - app-alternatives/yacc - ) - verify-sig? ( sec-keys/openpgp-keys-baldurkarlsson ) -" - -PATCHES=( - # The analytics seem very reasonable, and even without this patch - # they are NOT sent before the user accepts. But default the - # selection to off, just in case. - "${FILESDIR}"/${PN}-1.18-analytics-off.patch - - # Only search for PySide2 if pyside2 USE flag is set. - # Bug #833627 - "${FILESDIR}"/${PN}-1.18-conditional-pyside.patch - - # Pass CXXFLAGS and LDFLAGS through to qmake when qrenderdoc is - # built. - "${FILESDIR}"/${PN}-1.18-system-flags.patch - - # Needed to prevent sandbox violations during build. - "${FILESDIR}"/${PN}-1.27-env-home.patch - - "${FILESDIR}"/${PN}-1.30-r1-system-compress.patch -) - -DOCS=( util/LINUX_DIST_README ) - -VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/baldurkarlsson.gpg - -pkg_setup() { - use qt5 && python-single-r1_pkg_setup -} - -src_unpack() { - if use verify-sig; then - verify-sig_verify_detached "${DISTDIR}"/${P}.tar.gz{,.asc} - fi - - # Do not unpack the swig sources here. CMake will do that if - # required. - unpack ${P}.tar.gz -} - -src_prepare() { - cmake_src_prepare - - # Remove the calls to install the documentation files. Instead, - # install them with einstalldocs. - sed -i '/share\/doc\/renderdoc/d' \ - "${S}"/CMakeLists.txt "${S}"/qrenderdoc/CMakeLists.txt \ - || die 'sed remove doc install failed' - - # Assumes that the build directory is "${S}"/build, which it is not. - sed -i "s|../build/lib|${BUILD_DIR}/lib|" \ - "${S}"/docs/conf.py \ - || die 'sed patch doc sys.path failed' - - # Bug #836235 - sed -i '/#include <stdarg/i #include <time.h>' \ - "${S}"/renderdoc/os/os_specific.h \ - || die 'sed include time.h failed' -} - -src_configure() { - local mycmakeargs=( - # Build system does not know that this is a tagged release, as - # we just have the tarball and not the git repository. - -DBUILD_VERSION_STABLE=ON - - -DENABLE_EGL=ON - -DENABLE_GL=ON - -DENABLE_GLES=ON - -DENABLE_PYRENDERDOC=$(usex qt5) - -DENABLE_QRENDERDOC=$(usex qt5) - -DENABLE_VULKAN=ON - - # Upstream says that this option is unsupported and should not - # be used yet. - -DENABLE_UNSUPPORTED_EXPERIMENTAL_POSSIBLY_BROKEN_WAYLAND=OFF - - -DENABLE_XCB=ON - -DENABLE_XLIB=ON - - # renderdoc_capture.json is installed here - -DVULKAN_LAYER_FOLDER="${EPREFIX}"/etc/vulkan/implicit_layer.d - ) - - use qt5 && mycmakeargs+=( - -DPython3_EXECUTABLE="${PYTHON}" - -DRENDERDOC_SWIG_PACKAGE="${DISTDIR}"/${MY_SWIG}.tar.gz - - # Needed after qtchooser removal, bug #836474. - -DQMAKE_QT5_COMMAND="$(qt5_get_bindir)"/qmake - - # Bug #926549 - -DQRENDERDOC_ENABLE_PYSIDE2=OFF - ) - - # Lots of type mismatch issues. - filter-lto - - cmake_src_configure -} - -src_compile() { - cmake_src_compile - docs_compile -} - -pkg_postinst() { - xdg_pkg_postinst - optfeature "android remote contexts" dev-util/android-tools - optfeature "vulkan contexts" media-libs/vulkan-loader -} diff --git a/media-gfx/renderdoc/renderdoc-1.31.ebuild b/media-gfx/renderdoc/renderdoc-1.31.ebuild deleted file mode 100644 index c8d27b42b52d..000000000000 --- a/media-gfx/renderdoc/renderdoc-1.31.ebuild +++ /dev/null @@ -1,191 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -# The swig fork is required for compatibility with both provided and -# 3rd-party Python scripts. Required patch was sent to upstream in -# 2014: https://github.com/swig/swig/pull/251 -MY_SWIG_VER=7 -MY_SWIG=swig-${PN}-${MY_SWIG_VER} - -AUTOTOOLS_AUTO_DEPEND="no" -DOCS_BUILDER="sphinx" -DOCS_DIR="docs" -PYTHON_COMPAT=( python3_{9..12} ) -inherit autotools cmake flag-o-matic optfeature python-single-r1 docs qmake-utils verify-sig xdg - -DESCRIPTION="A stand-alone graphics debugging tool" -HOMEPAGE="https://renderdoc.org https://github.com/baldurk/renderdoc" -SRC_URI=" - https://github.com/baldurk/${PN}/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz - qt5? ( https://github.com/baldurk/swig/archive/${PN}-modified-${MY_SWIG_VER}.tar.gz -> ${MY_SWIG}.tar.gz ) - verify-sig? ( https://github.com/baldurk/renderdoc/releases/download/v${PV}/v${PV}.tar.gz.asc -> ${P}.tar.gz.asc ) -" - -# renderdoc: MIT -# + cmdline: BSD (not compatible with upstream lib) -# + farm fresh icons: CC-BY-3.0 -# + half: MIT (not compatible with system dev-libs/half) -# + include-bin ZLIB (upstream doesn't exist anymore, maintained in tree) -# + md5: public-domain -# + plthook: BSD-2 -# + pugixml: MIT -# + radeon gpu analyzer: MIT -# + source code pro: OFL-1.1 -# + stb: public-domain -# + tinyfiledialogs: ZLIB -# + glslang: BSD -# + docs? ( sphinx.paramlinks: MIT ) -# swig: GPL-3+ BSD BSD-2 -LICENSE="BSD BSD-2 CC-BY-3.0 GPL-3+ MIT OFL-1.1 public-domain ZLIB" -SLOT="0" -KEYWORDS="~amd64" -IUSE="qt5" -REQUIRED_USE="doc? ( qt5 ) qt5? ( ${PYTHON_REQUIRED_USE} )" - -RDEPEND=" - app-arch/lz4:= - app-arch/zstd:= - dev-libs/miniz:= - x11-libs/libX11 - x11-libs/libxcb:= - x11-libs/xcb-util-keysyms - virtual/opengl - qt5? ( - ${PYTHON_DEPS} - dev-qt/qtcore:5 - dev-qt/qtgui:5 - dev-qt/qtnetwork:5[ssl] - dev-qt/qtsvg:5 - dev-qt/qtwidgets:5 - dev-qt/qtx11extras:5 - ) -" -DEPEND="${RDEPEND}" -# qtcore provides qmake, which is required to build the qrenderdoc gui. -BDEPEND=" - x11-base/xorg-proto - virtual/pkgconfig - qt5? ( - ${AUTOTOOLS_DEPEND} - ${PYTHON_DEPS} - dev-libs/libpcre - dev-qt/qtcore:5 - app-alternatives/yacc - ) - verify-sig? ( sec-keys/openpgp-keys-baldurkarlsson ) -" - -PATCHES=( - # The analytics seem very reasonable, and even without this patch - # they are NOT sent before the user accepts. But default the - # selection to off, just in case. - "${FILESDIR}"/${PN}-1.18-analytics-off.patch - - # Only search for PySide2 if pyside2 USE flag is set. - # Bug #833627 - "${FILESDIR}"/${PN}-1.18-conditional-pyside.patch - - # Pass CXXFLAGS and LDFLAGS through to qmake when qrenderdoc is - # built. - "${FILESDIR}"/${PN}-1.18-system-flags.patch - - # Needed to prevent sandbox violations during build. - "${FILESDIR}"/${PN}-1.27-env-home.patch - - "${FILESDIR}"/${PN}-1.30-r1-system-compress.patch - - # Bug #925578 - "${FILESDIR}"/${PN}-1.31-lld.patch -) - -DOCS=( util/LINUX_DIST_README ) - -VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/baldurkarlsson.gpg - -pkg_setup() { - use qt5 && python-single-r1_pkg_setup -} - -src_unpack() { - if use verify-sig; then - verify-sig_verify_detached "${DISTDIR}"/${P}.tar.gz{,.asc} - fi - - # Do not unpack the swig sources here. CMake will do that if - # required. - unpack ${P}.tar.gz -} - -src_prepare() { - cmake_src_prepare - - # Remove the calls to install the documentation files. Instead, - # install them with einstalldocs. - sed -i '/share\/doc\/renderdoc/d' \ - "${S}"/CMakeLists.txt "${S}"/qrenderdoc/CMakeLists.txt \ - || die 'sed remove doc install failed' - - # Assumes that the build directory is "${S}"/build, which it is not. - sed -i "s|../build/lib|${BUILD_DIR}/lib|" \ - "${S}"/docs/conf.py \ - || die 'sed patch doc sys.path failed' - - # Bug #836235 - sed -i '/#include <stdarg/i #include <time.h>' \ - "${S}"/renderdoc/os/os_specific.h \ - || die 'sed include time.h failed' -} - -src_configure() { - local mycmakeargs=( - # Build system does not know that this is a tagged release, as - # we just have the tarball and not the git repository. - -DBUILD_VERSION_STABLE=ON - - -DENABLE_EGL=ON - -DENABLE_GL=ON - -DENABLE_GLES=ON - -DENABLE_PYRENDERDOC=$(usex qt5) - -DENABLE_QRENDERDOC=$(usex qt5) - -DENABLE_VULKAN=ON - - # Upstream says that this option is unsupported and should not - # be used yet. - -DENABLE_UNSUPPORTED_EXPERIMENTAL_POSSIBLY_BROKEN_WAYLAND=OFF - - -DENABLE_XCB=ON - -DENABLE_XLIB=ON - - # renderdoc_capture.json is installed here - -DVULKAN_LAYER_FOLDER="${EPREFIX}"/etc/vulkan/implicit_layer.d - ) - - use qt5 && mycmakeargs+=( - -DPython3_EXECUTABLE="${PYTHON}" - -DRENDERDOC_SWIG_PACKAGE="${DISTDIR}"/${MY_SWIG}.tar.gz - - # Needed after qtchooser removal, bug #836474. - -DQMAKE_QT5_COMMAND="$(qt5_get_bindir)"/qmake - - # Bug #926549 - -DQRENDERDOC_ENABLE_PYSIDE2=OFF - ) - - # Lots of type mismatch issues. - filter-lto - - cmake_src_configure -} - -src_compile() { - cmake_src_compile - docs_compile -} - -pkg_postinst() { - xdg_pkg_postinst - optfeature "android remote contexts" dev-util/android-tools - optfeature "vulkan contexts" media-libs/vulkan-loader -} diff --git a/media-gfx/ristretto/Manifest b/media-gfx/ristretto/Manifest index c1480418fada..59eec38ababe 100644 --- a/media-gfx/ristretto/Manifest +++ b/media-gfx/ristretto/Manifest @@ -1,5 +1,5 @@ -DIST ristretto-0.13.0.tar.bz2 624244 BLAKE2B ac0d6b391b17538e47a26f7643f083854f6654a7394f210fcc165d36a3d614b11354a81ab3a45a303e447c4221bf43ff92a913c64c425ef242810fdcdad584e1 SHA512 a8e25e0fdd2d31a904c616995438b47cf144557f589ed97a551fc5411cd7a3da9edab0c23c955e86c72ed0d10f1efccd61edf0aaf5a82cf601bf3333ea2b332b DIST ristretto-0.13.2.tar.bz2 852320 BLAKE2B 48451479e698672cd74dc85f32e8430e83026845ed09bee138e7da458bf0f0222e9aa756accec2a939f164ed59fbda4f18792a1238cd648d96dbe29b386ab9cd SHA512 ae4eb0159707a793cefe88b681f61e8c2ce41d57a64c7ad33853fc863bb1909b2a48ccf5543d3484f5710e7bf86ecbbd8520fb59eff11368f3a7a7028cd85914 -EBUILD ristretto-0.13.0.ebuild 931 BLAKE2B 2d000273fd2f8e5db0ce20b0829a5b007169b566eda86f342ef3d8e24608a861ac0fc5787807088dab8ff61deced0de9d9e91dc30bb243a7af2b14921a10b867 SHA512 c84b38f6f243ec0079405ef46a2ee3e391be37aa8affe8baf3b63166c1ccbe466f319e1bb79a3566d57afce88f0029b111bccfbd8e7035d4da93aadf3db60923 +DIST ristretto-0.13.3.tar.bz2 854176 BLAKE2B 5c10505c40418cb7ff31e29091dfa23ab168d4fb9ce449003357af1b67db84b3c2e469947637aa9c93b453b9ecc4d7d8eae4285aecfde6ef30e3b5cd365604d3 SHA512 92eb0993cbe64a83c80cd78972a64762a03766a055ac66ad16f86c2ee4360a2cc9114723a60d60257f56052ccd579c618df8110a909e45a5cab10ee7c4a3d0f3 EBUILD ristretto-0.13.2.ebuild 964 BLAKE2B d4ab2cac6ef7630db1f283d1b80104d3bec5d03f745cd17806a94c48f6b4cd8403c3e659bb251d9998b2b00eba5cf07e9d34d89ad6bb59a7a12dbeb4a7beeb8a SHA512 df0e6833fcd108733d1f3332342116336004d10254b02e149dfa6674740bc6e8fde033a3fc3c22da8447de9e38f29a341145d647f3721faaa4b8e3a4db668385 +EBUILD ristretto-0.13.3.ebuild 960 BLAKE2B b3d072f9c8b12e83a5ee5fa4aac67bc07c09601cb0e33884da4d70a584bca0e95515233cb0da2898cde2a0de664639d35eec6289183af593eb5986d84009cd3a SHA512 edf46eee8e235a972a35068f7983f7b87e2fb9974a531d6bb6e78994e0888bdd4c47004ba90a2c8003306e0893933a3a96fbee175079d5d2a32c9a62712080b4 MISC metadata.xml 248 BLAKE2B 83bf47dc3dbedea8a88932e922075f0ba8fd841433c4ab750e2ab61c22e8cbfaa1acb04a903d89ef5140a75dfc4c4899354623e0160df5b7c178c190f8494515 SHA512 b5200cfe30adef8e869fada87f1b4171210b2427cd3ac12edef70948f305d5e612ca5f24d377f9823a6022c8867db635db50ddd3d6cb362d6b0137c299fe07e5 diff --git a/media-gfx/ristretto/ristretto-0.13.0.ebuild b/media-gfx/ristretto/ristretto-0.13.3.ebuild index ba9b3440467e..584085600827 100644 --- a/media-gfx/ristretto/ristretto-0.13.0.ebuild +++ b/media-gfx/ristretto/ristretto-0.13.3.ebuild @@ -14,26 +14,25 @@ SRC_URI="https://archive.xfce.org/src/apps/${PN}/${PV%.*}/${P}.tar.bz2" LICENSE="GPL-2+" SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ppc ppc64 ~riscv ~sparc x86" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86" DEPEND=" - >=dev-libs/glib-2.56:2 - media-libs/libexif:0= + >=dev-libs/glib-2.56.0:2 + >=media-libs/libexif-0.6.0:0= sys-apps/file - x11-libs/cairo:0 - >=x11-libs/gtk+-3.22:3 - x11-libs/libX11:0= - >=xfce-base/libxfce4ui-4.16:0= - >=xfce-base/libxfce4util-4.16:0= + >=x11-libs/cairo-1.10.0:0 + >=x11-libs/gtk+-3.22.0:3 + >=x11-libs/libX11-1.6.7:0= + >=xfce-base/libxfce4ui-4.16.0:0= + >=xfce-base/libxfce4util-4.16.0:0= >=xfce-base/xfconf-4.12.1:0= " RDEPEND=" ${DEPEND} " BDEPEND=" - dev-util/intltool + >=sys-devel/gettext-0.19.8 virtual/pkgconfig - sys-devel/gettext " pkg_postinst() { diff --git a/media-gfx/skanpage/Manifest b/media-gfx/skanpage/Manifest index 17422772b427..4c3226baa8e2 100644 --- a/media-gfx/skanpage/Manifest +++ b/media-gfx/skanpage/Manifest @@ -1,5 +1,5 @@ DIST skanpage-24.08.3.tar.xz 1334020 BLAKE2B b2642c74dce6a3d8afdf25eebfcdcdf4059aea3b29ededb069993c0f7f089dc40716cc2567296fa9c815fecb95ab5689a571ab89b8bedd5c0aae5d06431fed31 SHA512 0bdd8d8f94aaabee32d2cd4975e8320d69c25afa1135de3fa672f154f447122ce8747d1a4960b0629bcc6118e078617641a7d0cbbb0c1344fa19733bff18f8ee -DIST skanpage-24.12.0.tar.xz 1337600 BLAKE2B 4333b2b4c20df70befd2a57a558eee244261ff3332d93750ebe5ae7eda5fd798b1f446573512cf7a4244ba6cefef87b9b2f5c2ab6ca077152276360fc4754c47 SHA512 1e61b08fea3878ab940fd10a176cc251f55c19664ee03cb1bbb93e9bc9b5ae49534d0ee5a4331702b369917186a651782c11f04c2188975b00baccb2b084cce5 +DIST skanpage-24.12.1.tar.xz 1337776 BLAKE2B 3806a71a9051c7bb7cb1ecfe4d35a17d027d77b9db14b39b3d5c2803a1ece6b670ede907f0286f4a198b906762ce287e7e376be128c07890556c1021ef2050c5 SHA512 b6f0eded7692b02fb134438e50fb8d07014a7eaf81fb8ec6bc96d800a497ce8ab7458e699804ed02df77c1f1ee20a62d9da92db48d96c9bc64b72991a3360c08 EBUILD skanpage-24.08.3.ebuild 1238 BLAKE2B 934b1cdb3a5be00ca0ef2ef826f9dde6c37cbdc1eebb0bd3848036ef63965aab05ea77b8c9450673b7358fd3145fde50c2e2936918a9a3d28126a29e42b7d433 SHA512 b2b4410e82e9f73b00be6e014adc0b4444bd6fb276ca1a985eb52f70787dff646724b4d56ec4e80dbc3d26be7292306aa32b7f0e5ab9420a8da2bcea4bd699d1 -EBUILD skanpage-24.12.0.ebuild 1240 BLAKE2B 9f3818d5d7a5fe493fc9846f21a524f876805bb14b4b97286795cd5c7c487acc22dc7a0a51b1b913126c5208fc9420029a929a395ecd95c0c4c216a84133f336 SHA512 52e1a0269cd9b483e1a02015793065d06a1ad5e9259f5d15d8ff770de71e256f8a0dbc90426d72c337c1860c44f3008e90ff0641ee451131b64092d1389e24bd +EBUILD skanpage-24.12.1.ebuild 1240 BLAKE2B 88e8bd406aa6e7b12048fe20983d6d1f6ad7e3cbd6414126f7927d6510d7537249e4663175e5033f5c393671541e4fb71a1d88f5a85f2385958839b61272cace SHA512 f779925a12de7440a213ea64a0407a33c4e38777a86b7b5df9c5a3d56dbb9cd04598918a88d6f6a162ad340e2e9f059facb258dfbae7a8556531b9c9a373687d MISC metadata.xml 374 BLAKE2B 3666d82bcae95e5b38d777c81491cc25488aff6b55e112f6eebbaf80ef603d40e8287fe33d649e647c2f97b9caca237f2b9785ee49ff9c2f5c81576a2cf33379 SHA512 fcc360165d6fa100c9d92c2528f4f2ba291a0bf6b05a7b252b5bb215514144e9b699915f98d7aecda6869bf50bfbb51b42b3186679e5db2c3901cb4d6151e6e8 diff --git a/media-gfx/skanpage/skanpage-24.12.0.ebuild b/media-gfx/skanpage/skanpage-24.12.1.ebuild index 73a1e52e8c7c..77a6baa9ab6a 100644 --- a/media-gfx/skanpage/skanpage-24.12.0.ebuild +++ b/media-gfx/skanpage/skanpage-24.12.1.ebuild @@ -1,11 +1,11 @@ -# Copyright 1999-2024 Gentoo Authors +# Copyright 1999-2025 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 KDE_ORG_CATEGORY="utilities" PVCUT=$(ver_cut 1-3) -KFMIN=6.5.0 +KFMIN=6.7.0 QTMIN=6.7.2 inherit ecm gear.kde.org diff --git a/media-gfx/ttfautohint/Manifest b/media-gfx/ttfautohint/Manifest index a32a031794e5..ee8a84ff1686 100644 --- a/media-gfx/ttfautohint/Manifest +++ b/media-gfx/ttfautohint/Manifest @@ -1,3 +1,3 @@ DIST ttfautohint-1.8.4.tar.gz 3539332 BLAKE2B 314c5196f01828d180d3b3e9b09c66fad9c8a8958f36003c8ae0d54b945391cb53c40f92cf57ff70e57b5a21a6aa46bc14ff9419d4b877421fdc2500ce9004e3 SHA512 983517c360f8e65ccbf17f28f045f1c0a45078707f2e30f465a7b6df4014f0ec212780ea2703bc16be1a3c6ede70f71ea3051c067fbfd06eff40ae3b20840eec -EBUILD ttfautohint-1.8.4-r3.ebuild 1239 BLAKE2B d4e08dd60da20c388e7cf06a028377e95914482d00d5f9faa317475bf70dbda1c3daead21c94222e729558898d2a48de38da710179a39ae960fae5e7bd01d28e SHA512 cdf00cf87a9d5656017ff0adf1a24af85d97534540be71b2ecd927ea43af934be0af034e2d9e65bdb6102713b63eb41b5ecbbda816831618cf3241991772111f +EBUILD ttfautohint-1.8.4-r3.ebuild 1225 BLAKE2B 89ee2b00edee7f3bdede5fb51fdf197a6aa3366ebd1489802a619c9d56a952e4da203c00efd21b4b708522c5eeec7aa6e5d80d62cb357b8e82b71f2d846a96a4 SHA512 36c5a3efeed4e2ae90d19949ad7d3cbc4e8be1bbcb313c4e85ff59e6f0fc702323ea05528c90b95008ef8dc346f3fffa6b8fe2ebc63502f4810fba68df0c7ab9 MISC metadata.xml 240 BLAKE2B 7383955337dcafd7da9cfd7fd9597e8543c054a4484e2761c141ed1ac472bee67609505972c5251da2fdfcb085877815add73e5995ae318efdca783c7bd9ca21 SHA512 82a8f1a45f126c30c170d574af01f547d575fa1888574b87556b8ad11910cf4c9e84d1acfeb694413aa1d17badf2bfdf574d6f47a0e8a616bd015e44e0736343 diff --git a/media-gfx/ttfautohint/ttfautohint-1.8.4-r3.ebuild b/media-gfx/ttfautohint/ttfautohint-1.8.4-r3.ebuild index 899fa682a711..7fa443841d05 100644 --- a/media-gfx/ttfautohint/ttfautohint-1.8.4-r3.ebuild +++ b/media-gfx/ttfautohint/ttfautohint-1.8.4-r3.ebuild @@ -1,4 +1,4 @@ -# Copyright 2022 Gentoo Authors +# Copyright 2022-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -12,12 +12,12 @@ SRC_URI="https://download.savannah.gnu.org/releases/freetype/${P}.tar.gz" LICENSE="|| ( FTL GPL-2+ )" SLOT="0/1.0.3" KEYWORDS="amd64" -IUSE="qt5" +IUSE="gui" RDEPEND=" media-libs/freetype media-libs/harfbuzz:=[truetype] - qt5? ( + gui? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 @@ -46,9 +46,8 @@ src_prepare() { src_configure() { local myeconfargs=( - --disable-static --without-doc - --with-qt="$(usex qt5 $(qt5_get_bindir) no)" + --with-qt="$(usex gui $(qt5_get_bindir) no)" ) econf "${myeconfargs[@]}" @@ -58,7 +57,7 @@ src_install() { default doman frontend/ttfautohint.1 - use qt5 && doman frontend/ttfautohintGUI.1 + use gui && doman frontend/ttfautohintGUI.1 find "${ED}" -name '*.la' -delete || die } diff --git a/media-gfx/tuxpaint/Manifest b/media-gfx/tuxpaint/Manifest index 6744eea32de2..e7c82d530c9c 100644 --- a/media-gfx/tuxpaint/Manifest +++ b/media-gfx/tuxpaint/Manifest @@ -1,5 +1,5 @@ AUX tuxpaint-0.9.31-Makefile.patch 7209 BLAKE2B 373c4ecd0f5bea700a630b61a4f3068477fbe02f146774631fa726dbd72ba2091b1206ede50be246fb4d10ed517c62f56fd029367955cc9ebbcea8dacf71001b SHA512 31d5891fa33f7c6c39c5cb1225d46be9c425cf284c1a31dd8b62d3250d35e93912f7b91803cb32d64fa0d1ec3ea59997ecfc5d6270601acaf2f9e7d4ff804a7f DIST tuxpaint-0.9.31.tar.gz 21733142 BLAKE2B 00041eacd062ac4e535451d4b4a6ac6d92fb7a0b6328dad4c7424b1bf0b95f0d3d2915e5ed7392cbf2f36174e56ceff5fadcf795c3368b3f2a958d794ce0b66a SHA512 7a3df8dce3e354cc22af34d55546de6e033e8ed4f44530b89986c3e1a07961e5e1a132f12f2d3fc5b699c500e7b9e7ab3503d2bafc5041d9fb2dbc8d1479b79f -EBUILD tuxpaint-0.9.31-r1.ebuild 1427 BLAKE2B 199c367c67aa6ed22c2b124c57640d0a63423613bd35bed20ecc3d991244e8ea9874a06dc34e6c6283a9cd7a0ba3b482a1db15e084b8e989da5e659d049dfb23 SHA512 12c036742278d2cc2e72ca557068eaf6f6566ed489d758909514169fcd899e7141e62d348ef93101e7aeb7ef01512c13f816390336b32d87547d6be37ba29cf7 +EBUILD tuxpaint-0.9.31-r1.ebuild 1426 BLAKE2B e939f6e6ed74f30ff91f1e9d4c3dc44a95834e7e18aff42e7930011d1f7c4d1d2332a3b93707c00d79b816fda77ea1190934392a2d6645c5a7ae4f858400cdff SHA512 be96b76cacd4edda73e38170ffc30d415de045475f02e5895bd4e07ffa2e19f10e50db94e4b29cde9f0b32e68ef858707851b609d619b3db03a708a6473624d7 EBUILD tuxpaint-0.9.31.ebuild 1425 BLAKE2B de29f9cd21b6c20c910dd59d5def7f8975957f65f2939643d43d6833b8c9401beb3c8b655acf43d6bc20f1169d19e59e137dbe74a2b070fa21f8c3dcd09731b9 SHA512 c2b509fba2c950ac3fd239242bd01df0e18293fc1a6324b0cfb4f690eb2591a6230cb3fa23f546473995152efbee69c0011c37818f4871c1814d1e68d14b9189 MISC metadata.xml 846 BLAKE2B 41e02607ee8987a7663ba72e7459a1845b73d9992e4939322db2b4ce654d06efb0d5acc935decb776aa50a20990244d0e422e4c32532fa0f17a76a9a637ac734 SHA512 59465c99f8f91e4def6ffd37f7bcfd22cb208c1f9dcbdd11c764e4f55d1e9db75169254b9ca3ed7642f57d45d4d10e9f97c80d5139cb0b80ccd20dc540185ade diff --git a/media-gfx/tuxpaint/tuxpaint-0.9.31-r1.ebuild b/media-gfx/tuxpaint/tuxpaint-0.9.31-r1.ebuild index 1be1e1d0fdb1..6b314f03d097 100644 --- a/media-gfx/tuxpaint/tuxpaint-0.9.31-r1.ebuild +++ b/media-gfx/tuxpaint/tuxpaint-0.9.31-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 @@ -12,7 +12,7 @@ S="${WORKDIR}"/${P} LICENSE="GPL-2" SLOT="0" -KEYWORDS="amd64 ~ppc ~x86" +KEYWORDS="amd64 ppc ~x86" RDEPEND=" app-text/libpaper:= diff --git a/media-gfx/wings/Manifest b/media-gfx/wings/Manifest index d8802b56e6ae..fd7709986792 100644 --- a/media-gfx/wings/Manifest +++ b/media-gfx/wings/Manifest @@ -2,6 +2,8 @@ AUX wings-2.3-nogit.patch 410 BLAKE2B 38d8fa6fc909ba2c35b29f34a0a715c86f8539fd66 AUX wings.sh-r1 181 BLAKE2B d892abf053f7f0039e50057869a4a0a26438f7312dca62561fc22280b2341621e17f13c97e7031072b242db42c533f4012b21ac46645cf32e121e5aad1884774 SHA512 739b8e68a1b47a3f4adbff8a1f34b713d7b0ac2d8103d85d3fdd6020bf08e81c231d210239c140d23e1dd135ff7122bfd43327a27585a333eafab473ea1480df DIST wings-2.2.6.1.tar.bz2 3266532 BLAKE2B a3ec86925632df7d231d620a47841781f8b2e66a50d13857c57fa6389890e7a03fed8bf5e0d09b03de00d6360ee0e4129a4178aec34270367879890f9430c208 SHA512 dba4b189c80180533b7a6c10be5c236a4a9fdacaa7dc491a0d1892149f7a75e636778acc11e38ef82a06718ae705e640da2e1618ec655828d2056e6b3864aba4 DIST wings-2.3.tar.bz2 3561319 BLAKE2B 0f3dce900dcae74516b57555f188aa578a5ea138d0e55e2b15ba946581652e470f5f596bd7e7661394674d437c8cbbe395bbf2e769af2a77d6940fddab1c86df SHA512 b5b054d974af2443cbe7d46a32cb8dfb7641054fa68aea9245e3d3100b21d223f443171572c3f371f25d937dca8cdb11870c61ba21e28632afef7886b4b2487b +DIST wings-2.4.tar.bz2 3420165 BLAKE2B d60220413f679af70d8300a6b1925ec15eee206756229ef6cd72eb3063ab04286bc2c64d140ace474c2de654b287e5ea5da51691b4b16097495d3ad563677072 SHA512 1873e57002eb83b404427ab36abf91c8182e4f0141b4792f86613fe5d33e8fb74978a3ed9eddfa78c1b21e86d256e542127956068e9bd596f7582d929518d8a4 EBUILD wings-2.2.6.1.ebuild 1132 BLAKE2B 3c9a58bd08768e35fa8dd8f506800bfbd4cfdbee735571150849efedb0455d0a226aedf7188e0f0ac8f4f728defff607496816a7002ca7bde826e18a43fa6d22 SHA512 39891a12f7827dbb35613fc4c8287eccc53673f97eaa8cdaeb742e922276d5da847e0d14ea6fae1a66762bcccabdcaa2284e5c0f8bd3773652ad1a00d7ebd0f1 EBUILD wings-2.3.ebuild 1305 BLAKE2B 66079c7002ab471455afcce591d7a5a865b372ec9f4557e4610ff5c8f2bb33088ebcaf1d69fe9e57ee25b00a8f5eeb013ad56b346555869f78758f46753bbc9a SHA512 3a7fc271f9d62024633b93fcdb96fcf1434709b66daa94c77fb9e64f95b9fe08b4b31e83be7e726c2b3816902f8c2087f9510d60febcb804f0719b3e4553028c +EBUILD wings-2.4.ebuild 1310 BLAKE2B d08ab6f0f22ac39512deb70d9b28a634022967caa7869969871251f30b3d038f432b300f9e4f9fd4472476b9b9380857064b3ec5f42e3f429ca26c64b1292c87 SHA512 c68a3a8a05f0a2786de7f4d17a7f0f1b2486b5c9837453cee02525ae1660da07e3b370112fe7f071a4787193515b2959de1deb07554da18c0a4900b8ac9bf6d3 MISC metadata.xml 568 BLAKE2B aa2315a1a8ac463ef344365b2273b5f54c4aa5df6239c412aea142f910123aee2dac95bc606a1bde609413475e93b17305b03b64bed320aeb3e93d7421b815ec SHA512 969a180e5b170e8eb27fcb971e320c838610b462ea42a7b1b8d758c084a81658d2d8777aa0d885881388942cbf2d66eddaeacb09346e09b55c0623ce5f688e46 diff --git a/media-gfx/wings/wings-2.4.ebuild b/media-gfx/wings/wings-2.4.ebuild new file mode 100644 index 000000000000..192b98a8625e --- /dev/null +++ b/media-gfx/wings/wings-2.4.ebuild @@ -0,0 +1,62 @@ +# Copyright 1999-2025 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 +inherit toolchain-funcs + +DESCRIPTION="Wings 3D is an advanced subdivision modeler" +HOMEPAGE="https://www.wings3d.com/" +SRC_URI="https://downloads.sourceforge.net/wings/${P}.tar.bz2" + +LICENSE="BSD" +SLOT="0" +KEYWORDS="~amd64 ~x86" + +RDEPEND=" + >dev-lang/erlang-21[wxwidgets] + dev-libs/cl + media-libs/glu + media-libs/libsdl[opengl] + virtual/opengl + dev-cpp/eigen + sci-libs/libigl +" +DEPEND=" + ${RDEPEND} +" + +PATCHES=( "${FILESDIR}"/${PN}-2.3-nogit.patch ) + +src_prepare() { + sed -i -e 's# -Werror##g;s# -O3##g' $(find -name Makefile) || die + sed -i \ + -e "s|IGL_INCLUDE = .*$|IGL_INCLUDE=-I/usr/include/eigen3|" \ + c_src/Makefile \ + || die + default +} + +src_compile() { + export ERL_PATH="/usr/$(get_libdir)/erlang/lib/" + tc-export CC + # Work around parallel make issues + # Set ER_LIBS to the top source directory + emake vsn.mk + for subdir in intl_tools e3d src plugins_src icons; do + emake -C ${subdir} opt ERL_LIBS="${S}" + done + default +} + +src_install() { + WINGS_PATH=${ERL_PATH}/${P} + dodir ${WINGS_PATH} + + find -name 'Makefile*' -exec rm -f '{}' \; + + insinto ${WINGS_PATH} + doins -r e3d ebin icons plugins priv psd shaders src textures tools + + newbin "${FILESDIR}"/wings.sh-r1 wings + dodoc AUTHORS +} diff --git a/media-gfx/xloadimage/Manifest b/media-gfx/xloadimage/Manifest index adcecd419643..026e274fe34b 100644 --- a/media-gfx/xloadimage/Manifest +++ b/media-gfx/xloadimage/Manifest @@ -13,5 +13,5 @@ DIST xloadimage-4.1-gentoo-r1.diff.bz2 41535 BLAKE2B 77cdbb2e6d5dda6084aae2831bc DIST xloadimage.4.1.tar.gz 596021 BLAKE2B 3c22facf05167d1836c21243799d8f66c211e44d659b4397668ed604cdd82b3bd8f11ab7b3be5e87c59a9b3aa8569d0d3d2e474b572c3bca07b6437b293014bf SHA512 2c91699c8ef07c101ff9b458708ace01cab2979a5e88cf8a4e47ec971f7b4cb5571108afa3e53271ade4e8ccfdcf72ef9e2e09edfc0be6b8afaba50847aa0586 EBUILD xloadimage-4.1-r15.ebuild 2482 BLAKE2B da71736b8f2ba9eb0e539e0d0ecf72f23b1b6636d0ceadcae6711f2586e6f480214f565caabc348d32eb35eeaaa5f659746208549fdcf54de90032a0ee4f2c14 SHA512 be5ef8f4ca1934bded0a8f21fac46db5c3f00fb3c779ddd99f6fc0e6914602b8dd29ec37afa9283280ecfec2a23661c305944af4ccd0b6a4b29d98db156994dd EBUILD xloadimage-4.1-r16.ebuild 2545 BLAKE2B 32e8f96d2df57893d49c053355f5dd3999495de59807236ea8349cf569a9b2c7ec6d3b695431fbc4a14c2b7d3c862854a049400cda85dcda583df0c5fecfc4d6 SHA512 aa2ecb526c49f3f58c6d8b822668eeceb6846782ca7a9a927b49d3940f0e18d86c6d719139fb3ecff86ff2228df571b6e6c83faff9669a2f41ecf71cf0b676a5 -EBUILD xloadimage-4.1-r17.ebuild 2622 BLAKE2B 23b6201ed616b1da79877ae805e08862eada4662466e16fa2c193a8dd726a5c677c0a41c3c65452996c178dc786371a6341e8bf485c505cdc2fbcf3dbae31a6d SHA512 cd9f8cd3a47353f368cf2636b77304aa6049e2477f87ba9d3c1f2c623a1b4a9aa6ae9f8681a5f3f72fb16831de214b5b8887f00765ee912545e1527f7ecc9448 +EBUILD xloadimage-4.1-r17.ebuild 2621 BLAKE2B 5f3336248857dd0d3f4a0acf13f1aad12144edac25ac591a35db61826af6c3bf2229a27e38f4ad4ebafa2347377580006a320fee5915b3e5b56c4a25d7036cf0 SHA512 9477605f5bb95995e928fadfdb98daa05078505a1d9cc4c8f49ff0a3e37bb7a9bd329c495b86c7d4da8f40769a8bfbc6c9d376671b3af437ac41daa0248d40bc MISC metadata.xml 169 BLAKE2B 25149b73446be31f3ea3dd3a6394230987e7d4c601d1605fd3827b37bd99b3301c2e0edb95d0f59a4577ed27919f43c2cc02b1edf62c4012b935a82e709e0c05 SHA512 55c53f74b001bae56ba8c54581a4168335b6b3a28dac23a2102b76795d5fd41de33b8b3e1ec03f9acc6e7a3a77e93b1a6ff3e3967c3156dcbf22b5b5a6245ef5 diff --git a/media-gfx/xloadimage/xloadimage-4.1-r17.ebuild b/media-gfx/xloadimage/xloadimage-4.1-r17.ebuild index 2fb51b27538d..13cc65fc73aa 100644 --- a/media-gfx/xloadimage/xloadimage-4.1-r17.ebuild +++ b/media-gfx/xloadimage/xloadimage-4.1-r17.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}"/${P/-/.} LICENSE="MIT" SLOT="0" -KEYWORDS="~alpha amd64 ~arm ~hppa ~mips ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos" +KEYWORDS="~alpha amd64 ~arm ~hppa ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos" IUSE="tiff jpeg png" RDEPEND="x11-libs/libX11 diff --git a/media-gfx/xpaint/Manifest b/media-gfx/xpaint/Manifest index ae2c80c1fe81..1fbaa81fd69a 100644 --- a/media-gfx/xpaint/Manifest +++ b/media-gfx/xpaint/Manifest @@ -5,6 +5,5 @@ AUX xpaint-3.1.4-gentoo-gcc-15.patch 470 BLAKE2B 8fa23cc40d674ea969d2d8eb0dbe793 AUX xpaint-3.1.4-gentoo-lto.patch 670 BLAKE2B 851334824d813029f2a78fb2b3698c85eee3cc79bd63f3db222f6c32fa75bd3f7af85f00fc898ee71e3f5851c1c8181b2f3e798865d7516f2bebbba794783e38 SHA512 d2211c291fca46c102ecb820eeda7e4441326e856e91819c6e3adadfde9dd02e1bda8610b305bb2fe056bd6c5d4ad8e1e6b52015dafad86c76005ef5d166e7de AUX xpaint-3.1.4-gentoo-shared-lib.patch 503 BLAKE2B 12bae42eb3a119c8acb3c5a6436191bf65c9697f6d743531633f0d64f5cdb26270f659eb0725a26efcc780cc06f91cf7f4e4f5032cf72f21614f3f7e48615b25 SHA512 971fb77386f2a896605d05346c4cf65fd68bdcc7b2f82e1319059f1c4ac37b0d76585c8ff0ce6d5841639bd94b420ac29b2e5275fe9309b31549cc540f2a9833 DIST xpaint-3.1.4.tar.bz2 1630009 BLAKE2B 6090156f0c27742487edfd24e803e814d7f2801c3847a5435a896e575ee3bf0b17f498e8ba8f4b7a87536780dd7c15ec7e0c0e0acb28b225d95ed0c835abfa97 SHA512 ea81f0f0eaad2072fe487efba933b6f0a4f2a4d8ae7548169b8e765cf1232c9944149a822173350af91309535d8f3625b8e58814811a5f4491fa3e2fcdf92e1d -EBUILD xpaint-3.1.4-r4.ebuild 1748 BLAKE2B 67ad09b81cbc78e7d609dbd6c6404bce63cf21581cd69f09b0f34a7f0b49611288fef904d6770385a30f6bc2bfac0f22380d51a02e6f5dfd13732ef432671222 SHA512 a433ef65a618cfdeee5041a7a637ca1dfb73df332f6d4bcd901c2e5155a24272344f406dbf67c1159055782886284478844e6e91b5436023e9bee4257d587c5f -EBUILD xpaint-3.1.4-r5.ebuild 1790 BLAKE2B 1a46c2fcdc98efad74a4c8e755bfecb5c8c4c40df7c582bd951008cb2fd7cba61404d8be303726c1cbf5294b1bfb258af378d4a45baf0810e03e2e7dffddaf1e SHA512 2ec89753cddfd97112c246d83f7249f471984085fb2ebc0fc11bad3ff450825a4b3e2806a88c96cde86bc78b756c325cf516506583896a2f27833e7b9fee3e1c +EBUILD xpaint-3.1.4-r5.ebuild 1788 BLAKE2B 25037019abf4597dab32aff3d7bcbddad6b4d20fb27c375093d977c4592cce9b411eb0db35ac072ee1b7dd9a5e7b88b92df9f9d1ac5c50414793294e2283f0f8 SHA512 70d4fbf3a1a3bce1341dbc11918bae5ab86b8370397b4f6ceee29523cde7073848281ad30c9d9044e0a2634e713f648d757096ecb2a14fc12ab056f8f4c6e18b MISC metadata.xml 1286 BLAKE2B 1a10d6e7ee2270c3b014e51d0f2deabef64f926dfcd54f46c898b0cea35d769eaaeafc061bfa95f0b1621cffae48732faf824590354883a86fb0f7e1ce0be5ba SHA512 3ef1cf69a09bfd7ab4963f3f4a76203b504d106307ce37a2bef7ac1623070d8c629b7e52a1e44f5d3380b21d6b660cdb1842e582b7fc26f052ed7d353ef7129d diff --git a/media-gfx/xpaint/xpaint-3.1.4-r4.ebuild b/media-gfx/xpaint/xpaint-3.1.4-r4.ebuild deleted file mode 100644 index 0a239d8a1b67..000000000000 --- a/media-gfx/xpaint/xpaint-3.1.4-r4.ebuild +++ /dev/null @@ -1,87 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit autotools desktop toolchain-funcs xdg - -DESCRIPTION="Image editor with tiff, jpeg and png support" -HOMEPAGE="https://sf-xpaint.sourceforge.net/" -SRC_URI="https://downloads.sourceforge.net/sf-xpaint/${P}.tar.bz2" - -LICENSE="GPL-3" -SLOT="0" -KEYWORDS="amd64 x86" -IUSE="pgf tiff" -# jpeg2k disabled for blocking media-libs/openjpeg:0 security cleanup, bug 735592 - -RDEPEND=" - media-libs/fontconfig - media-libs/libjpeg-turbo:= - media-libs/libpng:= - media-libs/netpbm - x11-libs/libX11 - >=x11-libs/libXaw3dXft-1.6.2h[unicode(+)] - x11-libs/libXext - x11-libs/libXft - x11-libs/libXmu - x11-libs/libXpm - x11-libs/libXt - pgf? ( media-libs/libpgf ) - tiff? ( media-libs/tiff:= ) -" -DEPEND="${RDEPEND}" -BDEPEND=" - app-alternatives/yacc - app-alternatives/lex - virtual/pkgconfig -" - -PATCHES=( - "${FILESDIR}"/${PN}-3.1.3-libtool-clang.patch - "${FILESDIR}"/${PN}-3.1.3-gentoo-qa.patch - "${FILESDIR}"/${PN}-3.1.3-gentoo-prefix.patch - "${FILESDIR}"/${P}-gentoo-shared-lib.patch - "${FILESDIR}"/${P}-gentoo-lto.patch -) - -src_prepare() { - default - eautoreconf -} - -src_configure() { - econf \ - $(use_enable tiff) \ - --disable-libdvipgm \ - --disable-libopenjpeg -} - -src_compile() { - # clean up - emake clean - emake -C util clean - - # parallel make still fails sometimes - emake substads - emake xpaint.1 - - default - emake \ - WITH_PGF="$(usex pgf "yes" "no")" \ - CC="$(tc-getCC)" \ - CXX="$(tc-getCXX)" \ - includedir="${EPREFIX}"/usr/include \ - -C util -} - -src_install() { - default - emake \ - WITH_PGF="$(usex pgf "yes" "no")" \ - DESTDIR="${ED}" \ - -C util install - doicon icons/xpaint.svg - make_desktop_entry "${PN}" - find "${ED}" -name '*.la' -delete || die -} diff --git a/media-gfx/xpaint/xpaint-3.1.4-r5.ebuild b/media-gfx/xpaint/xpaint-3.1.4-r5.ebuild index 063cff5eb62b..ab6575b0483c 100644 --- a/media-gfx/xpaint/xpaint-3.1.4-r5.ebuild +++ b/media-gfx/xpaint/xpaint-3.1.4-r5.ebuild @@ -11,7 +11,7 @@ SRC_URI="https://downloads.sourceforge.net/sf-xpaint/${P}.tar.bz2" LICENSE="GPL-3" SLOT="0" -KEYWORDS="~amd64 ~x86" +KEYWORDS="amd64 x86" IUSE="pgf tiff" # jpeg2k disabled for blocking media-libs/openjpeg:0 security cleanup, bug 735592 |