diff options
Diffstat (limited to 'media-gfx')
545 files changed, 9484 insertions, 12805 deletions
diff --git a/media-gfx/Manifest.gz b/media-gfx/Manifest.gz Binary files differindex 7de638e188e9..97319abbcafb 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/argyllcms/Manifest b/media-gfx/argyllcms/Manifest index 262f4f1c16a8..ed7a558d27d1 100644 --- a/media-gfx/argyllcms/Manifest +++ b/media-gfx/argyllcms/Manifest @@ -1,10 +1,5 @@ -AUX argyllcms-2.1.2-fno-common.patch 5132 BLAKE2B 5398d60a364a36ea24d6cce682330db177aaaec874a39e4f2a9c754a8862504938471851a14ce0871bb7863a9fd9a794f7ede2144090e1f44718f001344032e8 SHA512 d60f0eb9bd6d32b85d8ac88aa32558d1446357c6643fbdb393e90eba08f8f701ba8185741879b2320bda73e08ed14989cc1a16ffd4d2996d5e9afb05774e4e76 -DIST Argyll_V2.1.2_src.zip 13837056 BLAKE2B cf6181549e37b1deda11bdd4a63b27e101180a1e82b132ea8dca5af6830a74d5e2f940633f5aecf9a8d62fe8c2b0cdce8f2af44124ce7432b33d2a1bdbaa2c21 SHA512 f49b588c5f0a39edcc30a068a8bde8c7b74611d3feb15d07d4a61b205ed1231c288629f65e1a5a60a3921d552a28e075667ada555401a0d9694fd882bddd4b06 -DIST Argyll_V2.3.1_src.zip 14098636 BLAKE2B 0f215d5852c3ad383833dd643d78729a03e178b2bfad1a955a4ca8108a7b33b5a98507436c2a3bfa9f030ad968787e933e50940a0a7cc045b1082f4c8d519c6a SHA512 a8c2b02638569727015ad8e6e16999e398214fa5d11656bae0a9fe0b3268e81674621e3a7de96b727c578c5fc612ada39b37a94ca8b62f4221c56917654a22e8 -DIST Argyll_V3.1.0_src.zip 14671869 BLAKE2B a2cf0fa2f4d7924d847c56a6a30b5751576d9298736b751bb644317952c366f9f9be40668d5855417c3852dd39ba3dcfffeed5384b187a3164f1d9485ad8d8aa SHA512 a39e107327c89af46af3101a58ab796bc5e37ca979b93626f635ec66e32e099d0d1ebc14559133a804c0b4898fa4a93cbc25b5c5cf06ea7963025a1946ab619d DIST Argyll_V3.2.0_src.zip 14690714 BLAKE2B a2bd45883c213c0906ce94be525f6d7fa6e7378925ad08cb8577819fb2d1b5f6a16b6600a9d4b15972df6048323726fbe8fd16a23010c4dc7461007e45f20362 SHA512 17e73e74d0581bf2c0bab17598bcaf8c2cc556e675e944a315cccc9ddf8c3a0b946c7d88f87b1e4d29d9edba222bc76a497f570affe1d15d08c5ceec2b1b995d -EBUILD argyllcms-2.1.2-r3.ebuild 2120 BLAKE2B 0f7b414ceb466e2b710f4da0bb50942891f0c9c92ce55598bd4922758192bf220d4fc557bff3a4c39f1efd7df03a95c80f6b6b3f89b7dd87ac16115a789c2826 SHA512 0d85fb8555dd82d6e8995efc995796d99005dc3363ed9e0d7202f9f3b0772a4a790f3f8446a04f9c0e257976f4741c581469b786651ff5f72a300fc758e9ce7b -EBUILD argyllcms-2.3.1-r1.ebuild 2226 BLAKE2B 7847ca2064b2504be0322c146d21f390b971bd5ee235abe94ebfca29808afa44985ea11ae4b5d5fbb639987fbd2acd687fb518f6a065366d872661313a9bfdb4 SHA512 305ad5bb1feacfdd4166bf8bae5992171fe258a2f42ac0de456af5739b6f278bf81bebe44ac94f5321c0110b6f816e3ead2d3ecde3842ea8d1d28e71dd16e833 -EBUILD argyllcms-3.1.0.ebuild 2113 BLAKE2B f797decc319584451498e0b9a012c3205987ebf8c28804aa86dd43981be7f77dd0b981d1e710d19f52b86bc4efa1d7a12955cc16205b789c8784e7174b94dc02 SHA512 f850af284f8860179dc298e621775f42a726875109659005da025e357f719f90ae46328245959831971d05c729eaa4b8ae98f24f54fec0785ab818a9e184584b -EBUILD argyllcms-3.2.0.ebuild 2112 BLAKE2B eebf1e90d90c36126f1ae7b312005af8916101de80599b35eb211cbb42437084c9e192475f49cecd197aede42b2275b22773a2a75d179886aa01bd6fa3c45541 SHA512 71c3e73313fbc6ea16bba83950436f8b4e3fd63f833767cd4b13a18f61125d316fff8921de2e51b83925845f21e70a80d994ecf4163dfaffb963f0d8ef078e22 +DIST Argyll_V3.3.0_src.zip 14761699 BLAKE2B 2ae04cbc973b9613f33f3b4ef4498a88a9bab8db4b26165e6bbb59478e3a8094a05714cdf4ac4aa7a41c65406596579e9ab33e59bbd7bbd5b38f4082542ee512 SHA512 96e9aeaec991ae005ea7156a691c1cff508fa1cad538261b1a128bceb763d641b93ab86b586eaa8b89eb37334f3eaaf97ac412db51b116690a9228232361651d +EBUILD argyllcms-3.2.0.ebuild 2109 BLAKE2B a132bd6147e3fa90fc2997e98f41ebc04afce2177551f964ed03c7ce668a3133bdfe2d2f07cce7ad270d0c1427c6067985bd11dc20cbac5829b836c21d77733e SHA512 38df7fa7507f8042db4fbb1d08dfedae7c2c67a76a8178ef4c1bc758590dde2dd3890e3cba02bacbf3699a2d7eca2c8ec42df93211ea32bd63805d7ca1c1fd14 +EBUILD argyllcms-3.3.0.ebuild 2112 BLAKE2B eebf1e90d90c36126f1ae7b312005af8916101de80599b35eb211cbb42437084c9e192475f49cecd197aede42b2275b22773a2a75d179886aa01bd6fa3c45541 SHA512 71c3e73313fbc6ea16bba83950436f8b4e3fd63f833767cd4b13a18f61125d316fff8921de2e51b83925845f21e70a80d994ecf4163dfaffb963f0d8ef078e22 MISC metadata.xml 253 BLAKE2B 8557c513beef73e834b0a000c523a3241da961c6307b6e98ac857dad0888c4bbd028c98f8499f01086c24e8f2f57c64bc75db20154dab232adefc2510fccac03 SHA512 67dd372ef7b684101d9198c6199a6403f8750132d80aab4f4daa4b31ebaea3d82eb9a18e904734e2ac10c77b237d67210055949ff1c6d5aad4f75951a096884a diff --git a/media-gfx/argyllcms/argyllcms-2.1.2-r3.ebuild b/media-gfx/argyllcms/argyllcms-2.1.2-r3.ebuild deleted file mode 100644 index b5f8e47cfd60..000000000000 --- a/media-gfx/argyllcms/argyllcms-2.1.2-r3.ebuild +++ /dev/null @@ -1,93 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit flag-o-matic multiprocessing toolchain-funcs udev - -MY_P="Argyll_V${PV}" - -DESCRIPTION="Open source, ICC compatible color management system" -HOMEPAGE="http://www.argyllcms.com/" -SRC_URI="http://www.argyllcms.com/${MY_P}_src.zip" - -LICENSE="AGPL-3" -SLOT="0" -KEYWORDS="amd64 arm64 ~hppa x86" -IUSE="doc" - -RDEPEND=" - media-libs/libjpeg-turbo:= - media-libs/tiff:= - sys-libs/zlib - x11-libs/libX11 - x11-libs/libXau - x11-libs/libXdmcp - x11-libs/libXext - x11-libs/libXinerama - x11-libs/libXrandr - x11-libs/libXxf86vm - x11-libs/libXScrnSaver - dev-libs/openssl:= -" -DEPEND="${RDEPEND}" -BDEPEND="app-arch/unzip - dev-util/ftjam" - -PATCHES=( "${FILESDIR}"/${P}-fno-common.patch ) - -S="${WORKDIR}/${MY_P}" - -src_compile() { - # Make it respect LDFLAGS - echo "LINKFLAGS += ${LDFLAGS} ;" >> Jamtop - - # Evil hack to get --as-needed working. The build system unfortunately lists all - # the shared libraries by default on the command line _before_ the object to be built... - echo "STDLIBS += -ldl -lrt -lX11 -lXext -lXxf86vm -lXinerama -lXrandr -lXau -lXdmcp -lXss -ltiff -ljpeg ;" >> Jamtop - - append-cflags -DUNIX -D_THREAD_SAFE - - sed \ - -e 's:CCFLAGS:CFLAGS:g' \ - -e "s:ar rusc:$(tc-getAR) rusc:g" \ - -i Jambase || die - - tc-export CC RANLIB - - jam -dx -fJambase "-j$(makeopts_jobs)" || die -} - -src_install() { - jam -dx -fJambase install || die - - rm bin/License.txt || die - - pushd bin > /dev/null - local binname - for binname in * ; do - newbin ${binname} argyll-${binname} - done - popd > /dev/null - - dodoc log.txt Readme.txt ttbd.txt notes.txt - if use doc; then - docinto html - dodoc doc/*html doc/*jpg doc/*gif - fi - - insinto /usr/share/${PN} - doins -r ref - - udev_dorules usb/55-Argyll.rules -} - -pkg_postinst() { - elog "If you have a Spyder2 you need to extract the firmware" - elog "from the CVSpyder.dll of the windows driver package" - elog "and store it as /usr/share/color/spyd2PLD.bin" - echo - elog "For further info on setting up instrument access read" - elog "http://www.argyllcms.com/doc/Installing_Linux.html" - echo -} diff --git a/media-gfx/argyllcms/argyllcms-2.3.1-r1.ebuild b/media-gfx/argyllcms/argyllcms-2.3.1-r1.ebuild deleted file mode 100644 index cb9dd790126a..000000000000 --- a/media-gfx/argyllcms/argyllcms-2.3.1-r1.ebuild +++ /dev/null @@ -1,102 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit flag-o-matic multiprocessing toolchain-funcs udev - -MY_P="Argyll_V${PV}" - -DESCRIPTION="Open source, ICC compatible color management system" -HOMEPAGE="http://www.argyllcms.com/" -SRC_URI="http://www.argyllcms.com/${MY_P}_src.zip" - -LICENSE="AGPL-3" -SLOT="0" -KEYWORDS="~amd64 ~arm64 ~hppa ~loong ~mips ~riscv ~x86" -IUSE="doc" - -RDEPEND=" - dev-libs/openssl:= - media-libs/libjpeg-turbo:= - media-libs/tiff:= - sys-libs/zlib - x11-libs/libX11 - x11-libs/libXScrnSaver - x11-libs/libXau - x11-libs/libXdmcp - x11-libs/libXext - x11-libs/libXinerama - x11-libs/libXrandr - x11-libs/libXxf86vm -" -DEPEND="${RDEPEND}" -BDEPEND="app-arch/unzip - dev-util/ftjam" - -S="${WORKDIR}/${MY_P}" - -src_prepare() { - default - sed -e "s/static eset/static int eset/" -i spectro/i1d3.c || die -} - -src_compile() { - # Make it respect LDFLAGS - echo "LINKFLAGS += ${LDFLAGS} ;" >> Jamtop - - # Evil hack to get --as-needed working. The build system unfortunately lists all - # the shared libraries by default on the command line _before_ the object to be built... - echo "STDLIBS += -ldl -lrt -lX11 -lXext -lXxf86vm -lXinerama -lXrandr -lXau -lXdmcp -lXss -ltiff -ljpeg ;" >> Jamtop - - append-cflags -DUNIX -D_THREAD_SAFE - - sed \ - -e 's:CCFLAGS:CFLAGS:g' \ - -i Jambase || die - - tc-export CC RANLIB - export AR="$(tc-getAR) ruscU" - - jam -dx -fJambase "-j$(makeopts_jobs)" || die -} - -src_install() { - jam -dx -fJambase install || die - - rm bin/License.txt || die - - pushd bin > /dev/null - local binname - for binname in * ; do - newbin ${binname} argyll-${binname} - done - popd > /dev/null - - dodoc log.txt Readme.txt ttbd.txt notes.txt - if use doc; then - docinto html - dodoc doc/*html doc/*jpg doc/*gif - fi - - insinto /usr/share/${PN} - doins -r ref - - udev_dorules usb/55-Argyll.rules -} - -pkg_postinst() { - udev_reload - - elog "If you have a Spyder2 you need to extract the firmware" - elog "from the CVSpyder.dll of the windows driver package" - elog "and store it as /usr/share/color/spyd2PLD.bin" - echo - elog "For further info on setting up instrument access read" - elog "http://www.argyllcms.com/doc/Installing_Linux.html" - echo -} - -pkg_postrm() { - udev_reload -} diff --git a/media-gfx/argyllcms/argyllcms-3.2.0.ebuild b/media-gfx/argyllcms/argyllcms-3.2.0.ebuild index daa1311058c2..b8979f958b6a 100644 --- a/media-gfx/argyllcms/argyllcms-3.2.0.ebuild +++ b/media-gfx/argyllcms/argyllcms-3.2.0.ebuild @@ -14,7 +14,7 @@ S="${WORKDIR}/${MY_P}" LICENSE="AGPL-3" SLOT="0" -KEYWORDS="~amd64 ~arm64 ~hppa ~loong ~mips ~riscv ~x86" +KEYWORDS="amd64 arm64 ~hppa ~loong ~mips ~riscv x86" IUSE="doc" RDEPEND=" diff --git a/media-gfx/argyllcms/argyllcms-3.1.0.ebuild b/media-gfx/argyllcms/argyllcms-3.3.0.ebuild index 9830286f0e37..daa1311058c2 100644 --- a/media-gfx/argyllcms/argyllcms-3.1.0.ebuild +++ b/media-gfx/argyllcms/argyllcms-3.3.0.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 @@ -10,6 +10,7 @@ MY_P="Argyll_V${PV}" DESCRIPTION="Open source, ICC compatible color management system" HOMEPAGE="http://www.argyllcms.com/" SRC_URI="http://www.argyllcms.com/${MY_P}_src.zip" +S="${WORKDIR}/${MY_P}" LICENSE="AGPL-3" SLOT="0" @@ -34,8 +35,6 @@ DEPEND="${RDEPEND}" BDEPEND="app-arch/unzip dev-util/ftjam" -S="${WORKDIR}/${MY_P}" - src_compile() { # Make it respect LDFLAGS echo "LINKFLAGS += ${LDFLAGS} ;" >> Jamtop @@ -68,7 +67,7 @@ src_install() { done popd > /dev/null - dodoc log.txt Readme.txt + dodoc log.txt ReadMe.txt if use doc; then docinto html dodoc doc/*html doc/*jpg doc/*gif diff --git a/media-gfx/argyllcms/files/argyllcms-2.1.2-fno-common.patch b/media-gfx/argyllcms/files/argyllcms-2.1.2-fno-common.patch deleted file mode 100644 index 36bf87d12550..000000000000 --- a/media-gfx/argyllcms/files/argyllcms-2.1.2-fno-common.patch +++ /dev/null @@ -1,134 +0,0 @@ -argyllcms: Fix compilation with GCC 10 - -A common mistake in C is omitting extern when declaring a global variable -in a header file. If the header is included by several files it results -in multiple definitions of the same variable. In previous GCC versions -this error is ignored. GCC 10 defaults to -fno-common, which means a -linker error will now be reported. To fix this, use extern in header -files when declaring global variables, and ensure each global is defined -in exactly one C file. As a workaround, legacy C code can be compiled -with -fcommon. - - int x; // tentative definition - avoid in header files - extern int y; // correct declaration in a header file - -References: -https://bugzilla.opensuse.org/show_bug.cgi?id=1160244 -https://bugzilla.opensuse.org/show_bug.cgi?id=1160256 - -In case of vinflate.c and inflate.c, both files define local variables -with the same name as global. It is no more possible with GCC 10. To -prevent sharing variables across files, add "static" to all local -variables. - -Index: Argyll_V2.1.2/gamut/gamut.h -=================================================================== ---- Argyll_V2.1.2.orig/gamut/gamut.h -+++ Argyll_V2.1.2/gamut/gamut.h -@@ -36,7 +36,7 @@ - #define MAXGAMN 10 /* Maximum gamut point neighbors returned */ - #define NSLOTS 6 /* Number of maximum direction slots */ - --struct _vrml *wrl; /* Declared in vrml.h, which may be #included after this */ -+struct _vrml; /* Declared in vrml.h, which may be #included after this */ - - /* ------------------------------------ */ - #define NODE_STRUCT \ -Index: Argyll_V2.1.2/spectro/vinflate.c -=================================================================== ---- Argyll_V2.1.2.orig/spectro/vinflate.c -+++ Argyll_V2.1.2/spectro/vinflate.c -@@ -92,7 +92,7 @@ int vinflate(void); - */ - - #define WSIZE 0x8000 --unsigned int wp; /* current position in slide */ -+static unsigned int wp; /* current position in slide */ - uch slide[32768]; - - static int vflush_output(unsigned int w) { -@@ -160,8 +160,8 @@ static ush cpdext[] = { /* Extra - the stream. - */ - --ulg bb; /* bit buffer */ --unsigned bk; /* bits in bit buffer */ -+static ulg bb; /* bit buffer */ -+static unsigned bk; /* bits in bit buffer */ - - ush vmask_bits[] = { - 0x0000, -@@ -230,8 +230,8 @@ ush vmask_bits[] = { - */ - - --int vlbits = 9; /* bits in base literal/length lookup table */ --int vdbits = 6; /* bits in base distance lookup table */ -+static int vlbits = 9; /* bits in base literal/length lookup table */ -+static int vdbits = 6; /* bits in base distance lookup table */ - - - /* If BMAX needs to be larger than 16, then h and x[] should be ulg. */ -@@ -239,7 +239,7 @@ int vdbits = 6; /* bits in base - #define N_MAX 288 /* maximum number of codes in any set */ - - --unsigned hufts; /* track memory usage */ -+static unsigned hufts; /* track memory usage */ - - /* Given a list of code lengths and a maximum table size, make a set of - tables to decode that set of codes. Return zero on success, one if -Index: Argyll_V2.1.2/spectro/inflate.c -=================================================================== ---- Argyll_V2.1.2.orig/spectro/inflate.c -+++ Argyll_V2.1.2/spectro/inflate.c -@@ -49,7 +49,7 @@ typedef unsigned int ulg; - the next table, which codes e - 16 bits, and lastly e == 99 indicates - an unused code. If a code with e == 99 is looked up, this implies an - error in the data. */ --struct huft { -+static struct huft { - uch e; /* number of extra bits or operation */ - uch b; /* number of bits in this code or subcode */ - union { -@@ -87,7 +87,7 @@ int inflate(void); - /* unsigned wp; current position in slide */ - - #define WSIZE 0x8000 --unsigned int wp; /* current position in slide */ -+static unsigned int wp; /* current position in slide */ - uch slide[32768]; - - static int flush_output(unsigned int w) { -@@ -155,8 +155,8 @@ static ush cpdext[] = { /* Extra - the stream. - */ - --ulg bb; /* bit buffer */ --unsigned bk; /* bits in bit buffer */ -+static ulg bb; /* bit buffer */ -+static unsigned bk; /* bits in bit buffer */ - - ush mask_bits[] = { - 0x0000, -@@ -201,8 +201,8 @@ ush mask_bits[] = { - */ - - --int lbits = 9; /* bits in base literal/length lookup table */ --int dbits = 6; /* bits in base distance lookup table */ -+static int lbits = 9; /* bits in base literal/length lookup table */ -+static int dbits = 6; /* bits in base distance lookup table */ - - - /* If BMAX needs to be larger than 16, then h and x[] should be ulg. */ -@@ -210,7 +210,7 @@ int dbits = 6; /* bits in base - #define N_MAX 288 /* maximum number of codes in any set */ - - --unsigned hufts; /* track memory usage */ -+static unsigned hufts; /* track memory usage */ - - - static int huft_build(b, n, s, d, e, t, m) - diff --git a/media-gfx/asymptote/Manifest b/media-gfx/asymptote/Manifest index 177dc6e4cf19..0a7639750b56 100644 --- a/media-gfx/asymptote/Manifest +++ b/media-gfx/asymptote/Manifest @@ -1,8 +1,13 @@ AUX 64asymptote-gentoo.el 337 BLAKE2B 56b028184573dd8db6babd90ae45838b9788671134d625df5960744b71b377db3cacf1dd4fc78d9800ffdf4e83a2413b7e87680ab0fcf45c31ecad9dc538388a SHA512 c8c74d5464f500e9bc3ca2fd89065e4f68a834c1b82a444820efd70abf9d2bd7c52ecbecd7ea5fad916259512acf4aedf8aed803a707733121211e59ef300c86 AUX asymptote-2.70-info.patch 436 BLAKE2B 70eac7625341e21f9cf03cf1ea08e4864fe102627349f2411680b9c18f4df508f5cd6972f9e6dc719795f0323c51b6a5d096e9e3cae81cc1ee497f3f9325fafd SHA512 5b7494351bef5240bd4dba531a3eb68d3a6025990f32fe4064df31e351df9cfb27be29c69b16309929a63ec8d164eb4f2b14315406e546c7dba9dc416ae6b8d4 AUX asymptote-2.85-xdg-utils.patch 762 BLAKE2B 4b5ea874e89723e0a26b3a16a55660703a78316bc0df1b8cc2a23963aac51d4d0b2107598c67316cfcee132a1b88b90b3c600bc279b098f2e709c65911f37a51 SHA512 8c6f85518968fbf10ac66b7bc1819bcc90562076475c5405d4f21da0de64406de4c26de2ba9481e15dc21d9f086cd2920b263c7bb483c90a5ed40900dfaf937c +AUX asymptote-2.92-xdg-utils.patch 813 BLAKE2B 3a56ae5835a88b36603aa43238a821bd230706595ffa8d2154195657557b399fef5fb31bfc792e548d4e0048e009c1c4ebe407258ecf05375aa38e21eb4d1b8b SHA512 3a5bb68a43100d8759ce8c6302251bcfc46a883ec1ab204d9d1adecc4363e6626cea377139f85712fe99e9b2bc79a8060d0edc3054c393f795e1082a70c3d3cf DIST asymptote-2.89.src.tgz 15133552 BLAKE2B bde5acd3e76543b3c936e785ccf081c38687d535f336ee0e3da62f5fe078bb040dc162b64f02e94f392129c120bdf497b86e3862059abdb1b4544bab3cce3218 SHA512 a9874f0dc6eb05b95ef551611d85f39222af2a0628d7904160b08bdaf797c2b9ec6d12af7ae26dee69dbc056a5bffad4e450d4846a517d80990d89759e0c47a0 DIST asymptote-2.90.src.tgz 15154576 BLAKE2B 57e3c4287f2e8a6b6f3d660cdd04bb753b435294d4769bbcf84d6c7bf80c813609528767af7d19853d9f72f4f1ce9e6a8dcc6a75731a2f3d16098d5da5b81b6c SHA512 2d050f7a2cfc34d2d6b5382a48e7bf09031d98a77e61b654b4af84b5e8e11553a9a713a6dea8d09291761427d7134742a3d266e57ac57ffda3587ec0487ecfca -EBUILD asymptote-2.89.ebuild 5547 BLAKE2B 1ebd17a78dd79edb0eac18b054f7fe786227ccee3eefc1f397b759d698cf400e8a19ab2cebee15cd21edd299c26027ca39f6fb707db3e54ee0e650bc11ed6794 SHA512 8f9aeb3295c7c8252f1ea974769e1cf82357ac088b576bf2ee277c7bcd1967b236e563000cdeb61e459922dfabb17776eae68c380ebdd4eb8c2002ff6949e73b -EBUILD asymptote-2.90.ebuild 5549 BLAKE2B 243717d534c43198a016f434bb5456f6c75baca9e90a16ada3bb4eb0521946a1b62a54f3f09f9d2d96733731b57f0cd8366e3c168816a31ae462b394216aca98 SHA512 a8b40bae9beaaf9505026158e50cc6436c7e839c82f14e7c66b7beb03d032f55eab7bd788426ebd21ca77c6b05d16c7e1c024c6c727e5e256f49bfdb2d4dfa16 +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.89.ebuild b/media-gfx/asymptote/asymptote-2.89.ebuild index 8d3f1ada6331..cd7a9a255ce7 100644 --- a/media-gfx/asymptote/asymptote-2.89.ebuild +++ b/media-gfx/asymptote/asymptote-2.89.ebuild @@ -43,7 +43,7 @@ RDEPEND=" ) X? ( ${PYTHON_DEPS} - dev-python/PyQt5[${PYTHON_USEDEP},gui,widgets,svg] + dev-python/pyqt5[${PYTHON_USEDEP},gui,widgets,svg] dev-python/cson dev-python/numpy >=gnome-base/librsvg-2.40 diff --git a/media-gfx/asymptote/asymptote-2.90.ebuild b/media-gfx/asymptote/asymptote-2.90.ebuild index 41e78e722943..cd7a9a255ce7 100644 --- a/media-gfx/asymptote/asymptote-2.90.ebuild +++ b/media-gfx/asymptote/asymptote-2.90.ebuild @@ -13,7 +13,7 @@ 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" +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 )" @@ -43,7 +43,7 @@ RDEPEND=" ) X? ( ${PYTHON_DEPS} - dev-python/PyQt5[${PYTHON_USEDEP},gui,widgets,svg] + dev-python/pyqt5[${PYTHON_USEDEP},gui,widgets,svg] dev-python/cson dev-python/numpy >=gnome-base/librsvg-2.40 diff --git a/media-gfx/asymptote/asymptote-2.92.ebuild b/media-gfx/asymptote/asymptote-2.92.ebuild new file mode 100644 index 000000000000..c8ddba443b11 --- /dev/null +++ b/media-gfx/asymptote/asymptote-2.92.ebuild @@ -0,0 +1,243 @@ +# 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 + + cd doc || die + emake asy.1 + einfo "Making info" + cd png || die + emake ${PN}.info + cd .. || die + 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 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/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/asymptote/files/asymptote-2.92-xdg-utils.patch b/media-gfx/asymptote/files/asymptote-2.92-xdg-utils.patch new file mode 100644 index 000000000000..a8367f5deab9 --- /dev/null +++ b/media-gfx/asymptote/files/asymptote-2.92-xdg-utils.patch @@ -0,0 +1,23 @@ +diff '--color=auto' -r -U3 asymptote-2.92.orig/settings.cc asymptote-2.92/settings.cc +--- asymptote-2.92.orig/settings.cc 2024-10-08 01:22:37.000000000 +0700 ++++ asymptote-2.92/settings.cc 2024-11-02 13:48:32.771147121 +0700 +@@ -101,14 +101,14 @@ + string defaultPDFViewer="open"; + string defaultHTMLViewer="open"; + #else +-string defaultPSViewer="evince"; +-string defaultPDFViewer="evince"; +-string defaultHTMLViewer="google-chrome"; ++string defaultPSViewer="xdg-open"; ++string defaultPDFViewer="xdg-open"; ++string defaultHTMLViewer="xdg-open"; + #endif + string defaultGhostscript="gs"; + string defaultGhostscriptLibrary=""; +-string defaultDisplay="display"; +-string defaultAnimate="magick"; ++string defaultDisplay="xdg-open"; ++string defaultAnimate="xdg-open"; + void queryRegistry() {} + const string dirsep="/"; + diff --git a/media-gfx/blender/Manifest b/media-gfx/blender/Manifest index 5f155b022dd0..67c2dd2d7d1a 100644 --- a/media-gfx/blender/Manifest +++ b/media-gfx/blender/Manifest @@ -1,31 +1,21 @@ -AUX blender-3.2.2-Cycles-add-option-to-specify-OptiX-runtime-root-dire.patch 4517 BLAKE2B 703b5c8b04a187941caaefaa51e71266a96bb64d3e623bdfe9192bfc57fda1ceb5e1e83e57d1d585f9e8358169a49e91dcbaecd4aa9fe809213a8fc1b3372be2 SHA512 91b12b5bf161b48ef192981d12cdda03ce23e0d5a7f3b30c5232598f3122872f53e98ba1ba154f12558ce6abc4a015760f1898dbeb16810ba52850e985a58ab6 -AUX blender-3.2.2-Fix-T100845-wrong-Cycles-OptiX-runtime-compilation-i.patch 986 BLAKE2B 6055d38fded76be0c3f1f42f1e17e434ba69be90a0fb032856b1a339683a28c6786e945fc88d7b39006efc090e198586e5ebebb8fa542e93bcb07b9b91f6ce1f SHA512 8c5259d54e687ae03316fa69efcee02dbbf2a374de6fa9151484795af7d602c2d603900f1b38b7d4a09d8cb66e73666e500cb37004cbca5a13241d9cb5442ab0 -AUX blender-3.2.2-support-building-with-musl-libc.patch 5583 BLAKE2B 193548ea61608b6a355912cdd11eba60c58ac7975612890ff26b95b0d8974e3ed871e9e3d5437b7e36fc22b6a711e7af672b87a4e4f0b0765b95e4065dbcb934 SHA512 225065ac63344084918585272badfd58dc542e4b9370351fa4ff246fb8568d18027bd1d07fc139ac247236b75690578bb598731e00ea18767ed8e9d34d35b2fc -AUX blender-3.3.0-fix-build-with-boost-1.81.patch 490 BLAKE2B ff9625bec6783a5a55d2d0a8b9afeae718e0c8d714aee42e89577158504b72f6cdc325a3aa4b21291319ed886f722d6216af8ba4680ff5cb046289c9f2dc9f61 SHA512 9a7bad9947c03e3265c07266fb901319665cb2869395c46e5a9a63953772a5af880b6f038e38a695bb9e0cbfaae1f1a08fa61b8a565d2081e6c8d9e6c7a80547 -AUX blender-3.3.6-cycles-gcc13.patch 299 BLAKE2B c20c113bf845cb55188cd53c4c3e52e2876430d5b708161afbfd6afd0a50fb7cc4cf099df2202fa8c149bb18dc82e9e880cd083f35b61faaff80852a39358e3f SHA512 8986fd86e1f060c7310e5ecbae8f968faae5257af92f248874d7bccade4b75890a51a97706be653a6441292f0a459aa88b9935f545733eb34ac3b324c0d3b2df -AUX blender-4.0.1-fix-cflags-cleaner.patch 2222 BLAKE2B 2006ddd28ad270417e7832dbb4499752c90e8f6e5372c601a6694ee53aa0f47ed8eaef356e9b605f5add6144ff8fd200a7d9642441a1f213ec92e50e23806842 SHA512 5e130d917db80706b85e49b79803bd19b229bcf6e317789812ff5c0dc706b2c7bf31af43e6a226ee6dea9ee478f76eaefc903657c693f1d2dbcd85f552f2578c -AUX blender-4.0.1-openvdb-11.patch 3236 BLAKE2B e749db26f88b1e5329741a09c306ddd109f3feb4249bc5c50299477145f21f6a465a9dd2daf347c95c2cac7bf446300f47ab5feecc7887cff061fbeacc611feb SHA512 f6bd6db94ff631328e6b9aabe678a5a55a32e9f0a02aada90c843b31548d151533cbfcd1a61652bdad7060dc1f31db9269133c4f115bda13b77fa34c930631ed AUX blender-4.0.2-CUDA_NVCC_FLAGS.patch 627 BLAKE2B 45c9f327ee6d2fbd45446ba0787f6de9dd77364a9a0b8b1b7683acfc5f359c5745df5747e4359ba0609cbc7dfbcb569e5f6ebace433f1ab9b87305435c9fd680 SHA512 13784a75a7fc303fa548c1d8c79e4435c40c32beb1f00c05dbe2731d1d3cd19ae202ff0b4ef9eff10e9bbd6c6f52024220a843d237dd91c27077bd91552dd6a2 AUX blender-4.0.2-FindClang.patch 451 BLAKE2B 4b57395d440b590f9b2e097b74fbcf46dbe12fd13536cb335b914246995ede928f1208872c5044e1d0ecb1a702d0c46b656eb4b3abc3b0ed149abaf0d74bd433 SHA512 21aa3e158585184dfc1ccd931b53142cf436507a9126f4cee465214e7183553d02451babc5a636d3eb4ae0fd3ed0f0effb7b8962889f6dbec3e9476a61d0bbb2 -AUX blender-4.0.2-r1-osl-1.13.patch 14364 BLAKE2B fdee46fa3c5b1dc9a48499573e6bda242e2aa5d57f17e8b1e1a262673c5c2912c75cc8c531a30bcc0fd5019c4ff50ae089d0987e15ff1d57137e00f903356738 SHA512 2020b4f34c50ab1bb911a3b37b95a3da2a7f754e0b0ead7f651664131aa19debc00f8a8d32871b467bfdce9d83c43ca4597309351512635fdaf35f98c82266ff AUX blender-4.1.1-FindLLVM.patch 1388 BLAKE2B 721ba19ba6bdfde1672889d530bbd252665c12568363920561b7cfb7491e98a130cf0accc197f46a760c1bc57357183ce89903f2555125097d23361f1fe39ea7 SHA512 b13e8efaaf711bfba2a015b65153988c7ca9042e58785a483987634110c2bbdaec311744c633b7402dfaaca321984a5dc3fc549689c21fe0bfd6c27d890289da AUX blender-4.1.1-numpy.patch 1060 BLAKE2B 76b4c83e852f25be042c2a8267ad2b55fcbf8c3d4c3c2d1e8640e349174029de13a791d53e66215126dc76cdefca40b1e9f253e317f02f6d40a04652e9519bd5 SHA512 d3047c0eba1ce6d4cb68df65bd1563b7eb7c14253ff82edfcdae0a19d8270027a45273442258e0afef19bf1e805b99b91ae76a95fb4a0ada0454ee75f36c43b1 -DIST blender-3.3.15.tar.xz 41928632 BLAKE2B d93d7d47183fcd7afa547b8d3f0bd7240ea204dcce885f42d79d29352ebacac43a2f92e380f576c2688d2d90d910caff069484e22669847b0eea71079a8bdc7e SHA512 d55223b7b9ae9f9c6fdbf5ed2988e997693fcb8262196acb08bbe58bae86f9f34474ed1cf5a213ee0247225601726265ded3cb4ad4d89910fc247f9cf5fec1ff -DIST blender-3.3.21.tar.xz 41940868 BLAKE2B 74874226a0f690d2b81c0f96c441f519bd37ff0fec5c2dcae0f4f673d55863e2b2edbd60d2ed05890c440c5287e4cab943646cf4029d7c8287a636ac405e9bce SHA512 715a9808b25fe4c90ee3097edf21bdb3facfec51df0f6b6c6404a95bafe417d1e4998994f532ae9bac1e95de84cc8fd8fce8f8e672f9117646ad840074344d0e -DIST blender-3.3.8.tar.xz 41915180 BLAKE2B 7fb24afe2151bba53d8c25160bd697145aced74a8cd9a7ac92b2f66bc0ab59e995009f20f9e9bb622b05d614919137153805a2e233de5b0bb0a41a2ac3405a76 SHA512 63aef1e543a9c8bbc5f8838292ad2e8d0d9a8ee6fd2d71a419c1edc1a0ee1f59f7e9eab59bc20bf32ca56ba440bab1534c6c94c6ca2c5ab964e80bd452b7e519 DIST blender-3.6.15.tar.xz 67906200 BLAKE2B 8709b20347e78f3f71d22fee9799b1c0e20a39521b35cff83d6cd3462d4b172e31c1656812d7ce51eef25341a0cff2e9efdcdab0bc9a361ec843a666fc8c3185 SHA512 dfd1d80850fe6ab0616fd99ab039345da621418890b1a006e5320a4b739d1cf6f4ca313e8f8aed6e27c976400c75e8d6085847623d933de71932aefe82f3fd32 +DIST blender-3.6.18.tar.xz 67900952 BLAKE2B d4a619197abc3e4969846913f3c88cd64fd679bbefe007354af6ba2e83d47a8fcd27b3bcbaf6d850d28960eedeb3c50ff9336d0e61fd488d4916b6628bfd67dd SHA512 48a8b3e8b2fe75305061d7cb9b7b8491cef4f23fbd809d1fc34663a4f97f487d6e7e6e92848110fe6aa5a2fed18a2c1a2a0c1c928aa813e2456f7786681eae60 DIST blender-3.6.8.tar.xz 70453744 BLAKE2B 5361977951fa1720899fad26092b967cc78b7ba82c8823f92fe1e6a14419edae1f3914f639e88dd8b5fb3ec7c124783e1ece56199a80b9b51a0f320764e1eba7 SHA512 a5e15dc9de7024cebb955fc531ae592a4c58336196a07fd63ed5bb4eb14d66751a3697ea8b120283ca5078c92d8c87966e882862011ebb4368f132e2de004a45 -DIST blender-4.0.2.tar.xz 73281252 BLAKE2B 6ec72baa360049681c8ba18ae668041e87745bad51113cf50bca93d18f52ef5db84c58f9a2dc5b341ef1f0439e76288a1b1eda892a19033fb494e79cd3b2f983 SHA512 c37b85d06f5cf8b48cb8c657a9fb6b0ab1325271706fa34039f2993420f7606cd1e2c052173cdea94e9bec2924e7aa4df373e3a0fc1f9c4be336e62211b6bc4b DIST blender-4.1.1.tar.xz 82146268 BLAKE2B 1ab4a6c1046851ef619394c62fc73794430dc091e2cab26d3d1d542e9d4519889e9b9731606385e9dc8657448ca3827875526f4a57dd1b5c326a73d8a6f9be8d SHA512 13ad0cdd09879b5c28554faca5a54172f43dc3dcb749d2d1723d3e89e741e6255179af3bd88309b735e058b9b350191e44f3158e882e55f1cedea70b8b21540e DIST blender-4.2.1.tar.xz 72789532 BLAKE2B 74494e851e9e2e9fdcf4a77fa4e1c177d6b9f01ab1cde9daec40468e5399d84b04225ff3a6919191e685624e9094ea4cb2257a62344d3b0e87072f339253aa82 SHA512 20162bd1185e34c481a0520f4999f8c76018471b485fa72afa446f590638c564a370d036cc4a941bf204fce821d8305d4244b3ba9ec7f09f1839b8a276dfde39 -EBUILD blender-3.3.15.ebuild 13723 BLAKE2B b22a4fa62e27aa0f25f2e769de636d87a80ad959c4271005dccb01bc19596a19d81b8cba19034d20e433ebd9eeb7f51d235ad10f6e145c912a343db31ad7364e SHA512 de3eb7c4453a48297b50dbd2ce10a25151673fafb29ff6c1241cd8c1be9865727c128f6265e66a39ac48f095b9e5ec5b5f70510ad2ec5f861a2f5129bb81db5a -EBUILD blender-3.3.21.ebuild 13726 BLAKE2B 8641e7d81d4d5ae7647a58bf5dce2f031c043714608501d4b4c1febae164741330467dc1253ea521fc4534b9323f2ee5ad043321674d13cd53ba2548193ab2b3 SHA512 ec16526c86f685824629a9a5f97e4a1f44439101781a07179f28f30b4502537d14c469dd83f474fe544cf8e1ae363b3f7d9810f346d94b32d83fb67f2642d0ea -EBUILD blender-3.3.8.ebuild 13722 BLAKE2B 12465f59bb137aaa869216b623df34fb8758a742bc517cd467865ecfbff6856429c7fda725b6a3e14d1581964b22adb27956e0b74838c1da5e9a573560269fdf SHA512 8d985d8efd20233d111b7efe2aaa0b8fe486d3de36d676575347d66b24a7fd14904c04d9edfcfc1e03c34956419dc3ec06c4e20175749254f120ae52e79a1396 -EBUILD blender-3.6.15.ebuild 14133 BLAKE2B 97030e2d089b2bd7cc7e8a3e0c4b8b302c168f3b12be5e18366493776095fd4b95b2107691f467f67fb95e006b3d5ad5442dddff8e39fa53044dbaf263f79216 SHA512 3d90056f798ce49c5028ff860296e1c18201d44fea9056c59150b6b6815d3ac98e03e9b1ba2aa985e883996e7755dec6ef27a9799e889c21bd6d539940fe858c +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 14132 BLAKE2B 10be9999a9fc9321afc73cb4c41234784020a8cd98c54c13be80970fb04679f579f4856a7a4c18e3bdf45cb1d0a8080979146da8d06fe6e22077bc3ba6b8156f SHA512 f1b7245dc53ede9d1aa5dc2eb310255cae8f57ec2e0dc52050eae7276b71c0e2f9c502990df4c6d9d494f906a715d03c3ded9cab0602da7402ddb046c598c13e EBUILD blender-3.6.8.ebuild 14127 BLAKE2B 1de13a7ef689f16a899698c7262bf0a59a9d6ca1a9ed27c446e11b1cfc4b39b94231f08d96b17323f2049b1ec05a28319718402c083061a2b805838ca90931ad SHA512 0647e31bef93c125c407611a690437de86c710beb5b7771801e27e2e561c3d7bfbc350e67fe0275bcbe4a5f049e87c3e600b95bcef9013f156677624b1ce445c -EBUILD blender-4.0.2-r1.ebuild 17323 BLAKE2B da8dd2e98235314e7acf564867c688ce8ca258ef154b6fecfee4b247360bfd1eda7d2d0a42b37356cf79b061bf3f2d3c862f19db77f29b74701a29c3e36e4eed SHA512 f6ec16f31c2ecb1578b1d0222fb02041753cf225347cefdd0b75ab28386ecf9840d54be5366e9e7231b05aca1a84f3d52a10c801a2431a289182e1a1a0ac0aa8 EBUILD blender-4.1.1-r2.ebuild 17612 BLAKE2B 6c730678d9ee6f98127a3df5df269ee06a3bbb69e6bd2d4d06195ae8efa424484a83b3a77cd58c0e1a8e2d516f67e0d38737cd199f4ee66c59f1bfc045dfd308 SHA512 4afc54c172de9eb3fe0d71a23f59b32f232ce66847272bbe8b03e770bb228a0e22c0556bbc7338294d9488ad221e4c117e557e85f1f32c44ebecc1cf6bbb72bc EBUILD blender-4.1.1.ebuild 17169 BLAKE2B 96ac5b0d84b5c45008ca67d07f55617833801220064e77e37d1f6f0b47a141f29ddc063667ebf09f482899640b02830c31b1cd8b148f3f5fbe61421f931ffd53 SHA512 ed20d53f7bcb93b0f0541145dabf903a10fe3811288c3cebf80396885a4d7aa4552687e86608d5510f8fe87adea9432956e6c21dec47f1e08adc0cc6e399b1c4 -EBUILD blender-4.2.1.ebuild 17468 BLAKE2B 6c4dc64995717956cc7dbbcca9e1420920d4ed0cfa4c484ab4eb38a27ba7d03b25b4987c067f88c214506baacbab24c8cee6c2a9a89969ec0a8df7a265781389 SHA512 e1c1ce5f0178b47c894610773e08991ea5affab1abb72b6b0a9085ae90c1cd577b272cb6b9dae794c0cd5544b954dad4eb8e69c659309acc8fd5593c9593f510 -EBUILD blender-9999.ebuild 17468 BLAKE2B 6c4dc64995717956cc7dbbcca9e1420920d4ed0cfa4c484ab4eb38a27ba7d03b25b4987c067f88c214506baacbab24c8cee6c2a9a89969ec0a8df7a265781389 SHA512 e1c1ce5f0178b47c894610773e08991ea5affab1abb72b6b0a9085ae90c1cd577b272cb6b9dae794c0cd5544b954dad4eb8e69c659309acc8fd5593c9593f510 -MISC metadata.xml 3679 BLAKE2B cca8c2f8568be6c83244cf5a90b2db0df11faffa4f55820692990e02ce0bfd84cf3e6c2fdb146af9e6c8e09d1c72fe297c73f126e04ad918e709dc9064908aca SHA512 ac8bdbc0e00442f56d9d077d7d8c97deba90121e7dd34aac9d51b7ae6348bbaa875d2fcd01fe20ff7e9b1c3bf332a5cde63fd0b406a1e29c3f4de323225a17a9 +EBUILD blender-4.2.1.ebuild 17467 BLAKE2B 5e764bea5de6b0f689b161a1081768253cb7dcfc7906eb6b1bd30bac13671224344a861dfbff8380ed450237363a91dcf16e8e152bacbe92162d70a897914940 SHA512 aaaa65b695f0292894e0bcc6f521c3933a1be4550a2511b5b0c8cdb7a672c79da80ae0aa2d6e84c2ecd39e7dccbdaea67018db387f2b53bf9b45ed64f75320c1 +EBUILD blender-4.2.4.ebuild 17435 BLAKE2B 5ea860e1b4b5d816549fdf79023026c8e69985a56c245c5326919f410e8ae80b85eb366ef671c5f231cde620cc707004183f8d224c47efc24071239c570728c1 SHA512 d945dc321834317f587176d16e24c2490406181a11bd5824bb52d5b839c3699cf1bfd051ed5453613b48d17ea61148e667e5ab04f4cbc8eea1826b40d8270ac3 +EBUILD blender-4.3.2.ebuild 17435 BLAKE2B 5ea860e1b4b5d816549fdf79023026c8e69985a56c245c5326919f410e8ae80b85eb366ef671c5f231cde620cc707004183f8d224c47efc24071239c570728c1 SHA512 d945dc321834317f587176d16e24c2490406181a11bd5824bb52d5b839c3699cf1bfd051ed5453613b48d17ea61148e667e5ab04f4cbc8eea1826b40d8270ac3 +EBUILD blender-9999.ebuild 17436 BLAKE2B fb52cefb5e098c267e7467afea434f151a9f060f73edb0d4b83202f444bf3955d82fc2a0690ef2aefc8fe0c170df6d1a40f0defa5da78c27d54b3f2ed70a5d02 SHA512 e4a32560ba91f1593ddc9c292ac4b8a53c44567cc4e51f0df996ae3a2da946edd444a1495973b92cf8177f79cc69a485512190b557311975e69596133fe7ec90 +MISC metadata.xml 3459 BLAKE2B 6fb5c60150a6ff87ef3011bd439886dbba0d41137cd7eb36afe5ce13daf4038178880f19a3afda52decc576132d6b44b17d99bafb611207b8417790706b299f9 SHA512 8057e29057a0a2d3851c44c95116b5ac8c04fbbf3efd1540df63ffe7837201007a99883fca9c6e31f89fb20a099959a81f97d88b14f99cf4910ae9e771b5fdbc diff --git a/media-gfx/blender/blender-3.3.15.ebuild b/media-gfx/blender/blender-3.3.15.ebuild deleted file mode 100644 index aa58233b6a81..000000000000 --- a/media-gfx/blender/blender-3.3.15.ebuild +++ /dev/null @@ -1,432 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -PYTHON_COMPAT=( python3_10 python3_11 ) - -inherit check-reqs cmake flag-o-matic pax-utils python-single-r1 toolchain-funcs xdg-utils - -DESCRIPTION="3D Creation/Animation/Publishing System" -HOMEPAGE="https://www.blender.org" - -if [[ ${PV} = *9999* ]] ; then - # Subversion is needed for downloading unit test files - inherit git-r3 subversion - EGIT_REPO_URI="https://git.blender.org/blender.git" -else - SRC_URI="https://download.blender.org/source/${P}.tar.xz" - # 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" -fi - -LICENSE="GPL-3+ cycles? ( Apache-2.0 )" -SLOT="${PV%.*}" -IUSE="+bullet +dds +fluid +openexr +tbb \ - alembic collada +color-management cuda +cycles \ - debug doc +embree +ffmpeg +fftw +gmp headless jack jemalloc jpeg2k \ - man +nanovdb ndof nls openal +oidn +openimageio +openmp +opensubdiv \ - +openvdb optix osl +pdf +potrace +pugixml pulseaudio sdl +sndfile \ - test +tiff valgrind" -RESTRICT="!test? ( test ) test" - -REQUIRED_USE="${PYTHON_REQUIRED_USE} - alembic? ( openexr ) - cuda? ( cycles ) - cycles? ( openexr tiff openimageio ) - fluid? ( tbb ) - openvdb? ( tbb ) - optix? ( cuda ) - osl? ( cycles ) - test? ( color-management )" - -# Library versions for official builds can be found in the blender source directory in: -# build_files/build_environment/install_deps.sh -# -# <opencolorio-2.3.0 for https://projects.blender.org/blender/blender/issues/112917. -RDEPEND="${PYTHON_DEPS} - dev-libs/boost:=[nls?] - dev-libs/lzo:2= - $(python_gen_cond_dep ' - dev-python/cython[${PYTHON_USEDEP}] - dev-python/numpy[${PYTHON_USEDEP}] - dev-python/zstandard[${PYTHON_USEDEP}] - dev-python/requests[${PYTHON_USEDEP}] - ') - media-libs/freetype:=[brotli] - media-libs/glew:* - media-libs/libjpeg-turbo:= - media-libs/libpng:= - media-libs/libsamplerate - sys-libs/zlib:= - virtual/glu - virtual/libintl - virtual/opengl - alembic? ( >=media-gfx/alembic-1.8.3-r2[boost(+),hdf(+)] ) - collada? ( >=media-libs/opencollada-1.6.68 ) - color-management? ( <media-libs/opencolorio-2.3.0:= ) - cuda? ( dev-util/nvidia-cuda-toolkit:= ) - embree? ( >=media-libs/embree-3.10.0:=[raymask] ) - ffmpeg? ( media-video/ffmpeg:=[x264,mp3,encode,theora,jpeg2k?,vpx,vorbis,opus,xvid] ) - fftw? ( sci-libs/fftw:3.0= ) - gmp? ( dev-libs/gmp ) - !headless? ( - x11-libs/libX11 - x11-libs/libXi - x11-libs/libXxf86vm - ) - jack? ( virtual/jack ) - jemalloc? ( dev-libs/jemalloc:= ) - jpeg2k? ( media-libs/openjpeg:2= ) - ndof? ( - app-misc/spacenavd - dev-libs/libspnav - ) - nls? ( virtual/libiconv ) - openal? ( media-libs/openal ) - oidn? ( >=media-libs/oidn-1.4.1 ) - openimageio? ( >=media-libs/openimageio-2.3.12.0-r3:= ) - openexr? ( - >=dev-libs/imath-3.1.4-r2:= - >=media-libs/openexr-3:0= - ) - opensubdiv? ( >=media-libs/opensubdiv-3.4.0 ) - openvdb? ( - <media-gfx/openvdb-11.0.0:=[nanovdb?] - dev-libs/c-blosc:= - ) - optix? ( <dev-libs/optix-7.5.0 ) - osl? ( <media-libs/osl-1.13:= ) - pdf? ( media-libs/libharu ) - potrace? ( media-gfx/potrace ) - pugixml? ( dev-libs/pugixml ) - pulseaudio? ( media-libs/libpulse ) - sdl? ( media-libs/libsdl2[sound,joystick] ) - sndfile? ( media-libs/libsndfile ) - tbb? ( dev-cpp/tbb:= ) - tiff? ( media-libs/tiff:= ) - valgrind? ( dev-debug/valgrind ) -" - -DEPEND="${RDEPEND} - dev-cpp/eigen:= -" - -BDEPEND=" - virtual/pkgconfig - doc? ( - app-text/doxygen[dot] - dev-python/sphinx[latex] - dev-texlive/texlive-bibtexextra - dev-texlive/texlive-fontsextra - dev-texlive/texlive-fontutils - dev-texlive/texlive-latex - dev-texlive/texlive-latexextra - ) - nls? ( sys-devel/gettext ) -" - -PATCHES=( - "${FILESDIR}/${PN}-3.2.2-support-building-with-musl-libc.patch" - "${FILESDIR}/${PN}-3.2.2-Cycles-add-option-to-specify-OptiX-runtime-root-dire.patch" - "${FILESDIR}/${PN}-3.2.2-Fix-T100845-wrong-Cycles-OptiX-runtime-compilation-i.patch" - "${FILESDIR}/${PN}-3.3.0-fix-build-with-boost-1.81.patch" - "${FILESDIR}/${PN}-3.3.6-cycles-gcc13.patch" -) - -blender_check_requirements() { - [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp - - if use doc; then - CHECKREQS_DISK_BUILD="4G" check-reqs_pkg_pretend - fi -} - -blender_get_version() { - # Get blender version from blender itself. - BV=$(grep "BLENDER_VERSION " source/blender/blenkernel/BKE_blender_version.h | cut -d " " -f 3; assert) - if ((${BV:0:1} < 3)) ; then - # Add period (290 -> 2.90). - BV=${BV:0:1}.${BV:1} - else - # Add period and skip the middle number (301 -> 3.1) - BV=${BV:0:1}.${BV:2} - fi -} - -pkg_pretend() { - blender_check_requirements -} - -pkg_setup() { - blender_check_requirements - python-single-r1_pkg_setup -} - -src_unpack() { - if [[ ${PV} = *9999* ]] ; then - git-r3_src_unpack - if use test; then - TESTS_SVN_URL=https://svn.blender.org/svnroot/bf-blender/trunk/lib/tests - subversion_fetch ${TESTS_SVN_URL} ../lib/tests - fi - else - default - if use test; then - #The tests are downloaded from: https://svn.blender.org/svnroot/bf-blender/tags/blender-${SLOT}-release/lib/tests - mkdir -p lib || die - mv "${WORKDIR}/blender-${TEST_TARBALL_VERSION}-tests/tests" lib || die - fi - fi - -} - -src_prepare() { - cmake_src_prepare - - blender_get_version - - # Disable MS Windows help generation. The variable doesn't do what it - # it sounds like. - sed -e "s|GENERATE_HTMLHELP = YES|GENERATE_HTMLHELP = NO|" \ - -i doc/doxygen/Doxyfile || die - - # Prepare icons and .desktop files for slotting. - sed -e "s|blender.svg|blender-${BV}.svg|" -i source/creator/CMakeLists.txt || die - sed -e "s|blender-symbolic.svg|blender-${BV}-symbolic.svg|" -i source/creator/CMakeLists.txt || die - sed -e "s|blender.desktop|blender-${BV}.desktop|" -i source/creator/CMakeLists.txt || die - - sed -e "s|Name=Blender|Name=Blender ${PV}|" -i release/freedesktop/blender.desktop || die - sed -e "s|Exec=blender|Exec=blender-${BV}|" -i release/freedesktop/blender.desktop || die - sed -e "s|Icon=blender|Icon=blender-${BV}|" -i release/freedesktop/blender.desktop || die - - mv release/freedesktop/icons/scalable/apps/blender.svg "release/freedesktop/icons/scalable/apps/blender-${BV}.svg" || die - mv release/freedesktop/icons/symbolic/apps/blender-symbolic.svg "release/freedesktop/icons/symbolic/apps/blender-${BV}-symbolic.svg" || die - mv release/freedesktop/blender.desktop "release/freedesktop/blender-${BV}.desktop" || die - - if use test; then - # Without this the tests will try to use /usr/bin/blender and /usr/share/blender/ to run the tests. - sed -e "s|string(REPLACE.*|set(TEST_INSTALL_DIR ${T}/usr)|g" -i tests/CMakeLists.txt || die - sed -e "s|string(REPLACE.*|set(TEST_INSTALL_DIR ${T}/usr)|g" -i build_files/cmake/Modules/GTestTesting.cmake || die - fi -} - -src_configure() { - # -Werror=odr, -Werror=lto-type-mismatch - # https://bugs.gentoo.org/859607 - # https://projects.blender.org/blender/blender/issues/120444 - filter-lto - - # Workaround for bug #922600 - append-ldflags $(test-flags-CCLD -Wl,--undefined-version) - - append-lfs-flags - - local mycmakeargs=( - -DBUILD_SHARED_LIBS=OFF - -DPYTHON_INCLUDE_DIR="$(python_get_includedir)" - -DPYTHON_LIBRARY="$(python_get_library_path)" - -DPYTHON_VERSION="${EPYTHON/python/}" - -DWITH_ALEMBIC=$(usex alembic) - -DWITH_ASSERT_ABORT=$(usex debug) - -DWITH_BOOST=ON - -DWITH_BULLET=$(usex bullet) - -DWITH_CODEC_FFMPEG=$(usex ffmpeg) - -DWITH_CODEC_SNDFILE=$(usex sndfile) - -DWITH_CXX_GUARDEDALLOC=$(usex debug) - -DWITH_CYCLES=$(usex cycles) - -DWITH_CYCLES_DEVICE_CUDA=$(usex cuda TRUE FALSE) - -DWITH_CYCLES_DEVICE_OPTIX=$(usex optix) - -DWITH_CYCLES_EMBREE=$(usex embree) - -DWITH_CYCLES_OSL=$(usex osl) - -DWITH_CYCLES_STANDALONE=OFF - -DWITH_CYCLES_STANDALONE_GUI=OFF - -DWITH_DOC_MANPAGE=$(usex man) - -DWITH_FFTW3=$(usex fftw) - -DWITH_GMP=$(usex gmp) - -DWITH_GTESTS=$(usex test) - -DWITH_HARU=$(usex pdf) - -DWITH_HEADLESS=$(usex headless) - -DWITH_INSTALL_PORTABLE=OFF - -DWITH_IMAGE_DDS=$(usex dds) - -DWITH_IMAGE_OPENEXR=$(usex openexr) - -DWITH_IMAGE_OPENJPEG=$(usex jpeg2k) - -DWITH_IMAGE_TIFF=$(usex tiff) - -DWITH_INPUT_NDOF=$(usex ndof) - -DWITH_INTERNATIONAL=$(usex nls) - -DWITH_JACK=$(usex jack) - -DWITH_MEM_JEMALLOC=$(usex jemalloc) - -DWITH_MEM_VALGRIND=$(usex valgrind) - -DWITH_MOD_FLUID=$(usex fluid) - -DWITH_MOD_OCEANSIM=$(usex fftw) - -DWITH_NANOVDB=$(usex nanovdb) - -DWITH_OPENAL=$(usex openal) - -DWITH_OPENCOLLADA=$(usex collada) - -DWITH_OPENCOLORIO=$(usex color-management) - -DWITH_OPENIMAGEDENOISE=$(usex oidn) - -DWITH_OPENIMAGEIO=$(usex openimageio) - -DWITH_OPENMP=$(usex openmp) - -DWITH_OPENSUBDIV=$(usex opensubdiv) - -DWITH_OPENVDB=$(usex openvdb) - -DWITH_OPENVDB_BLOSC=$(usex openvdb) - -DWITH_POTRACE=$(usex potrace) - -DWITH_PUGIXML=$(usex pugixml) - -DWITH_PULSEAUDIO=$(usex pulseaudio) - -DWITH_PYTHON_INSTALL=OFF - -DWITH_SDL=$(usex sdl) - -DWITH_STATIC_LIBS=OFF - -DWITH_SYSTEM_EIGEN3=ON - -DWITH_SYSTEM_FREETYPE=ON - -DWITH_SYSTEM_GLEW=ON - -DWITH_SYSTEM_LZO=ON - -DWITH_TBB=$(usex tbb) - -DWITH_USD=OFF - -DWITH_XR_OPENXR=OFF - ) - - if use optix; then - mycmakeargs+=( - -DCYCLES_RUNTIME_OPTIX_ROOT_DIR="${EPREFIX}"/opt/optix - -DOPTIX_ROOT_DIR="${EPREFIX}"/opt/optix - ) - fi - - # This is currently needed on arm64 to get the NEON SIMD wrapper to compile the code successfully - use arm64 && append-flags -flax-vector-conversions - - append-flags $(usex debug '-DDEBUG' '-DNDEBUG') - - if tc-is-gcc ; then - # These options only exist when GCC is detected. - # We disable these to respect the user's choice of linker. - mycmakeargs+=( - -DWITH_LINKER_GOLD=OFF - -DWITH_LINKER_LLD=OFF - ) - fi - - cmake_src_configure -} - -src_test() { - # A lot of tests needs to have access to the installed data files. - # So install them into the image directory now. - DESTDIR="${T}" cmake_build install - - blender_get_version - # Define custom blender data/script file paths not be able to find them otherwise during testing. - # (Because the data is in the image directory and it will default to look in /usr/share) - export BLENDER_SYSTEM_SCRIPTS="${T}/usr/share/blender/${BV}/scripts" - export BLENDER_SYSTEM_DATAFILES="${T}/usr/share/blender/${BV}/datafiles" - - # Sanity check that the script and datafile path is valid. - # If they are not vaild, blender will fallback to the default path which is not what we want. - [ -d "$BLENDER_SYSTEM_SCRIPTS" ] || die "The custom script path is invalid, fix the ebuild!" - [ -d "$BLENDER_SYSTEM_DATAFILES" ] || die "The custom datafiles path is invalid, fix the ebuild!" - - cmake_src_test - - # Clean up the image directory for src_install - rm -fr "${T}"/usr || die -} - -src_install() { - blender_get_version - - # Pax mark blender for hardened support. - pax-mark m "${BUILD_DIR}"/bin/blender - - cmake_src_install - - if use man; then - # Slot the man page - mv "${ED}/usr/share/man/man1/blender.1" "${ED}/usr/share/man/man1/blender-${BV}.1" || die - fi - - if use doc; then - # Define custom blender data/script file paths. Otherwise Blender will not be able to find them during doc building. - # (Because the data is in the image directory and it will default to look in /usr/share) - export BLENDER_SYSTEM_SCRIPTS=${ED}/usr/share/blender/${BV}/scripts - export BLENDER_SYSTEM_DATAFILES=${ED}/usr/share/blender/${BV}/datafiles - - # Workaround for binary drivers. - addpredict /dev/ati - addpredict /dev/dri - addpredict /dev/nvidiactl - - einfo "Generating Blender C/C++ API docs ..." - cd "${CMAKE_USE_DIR}"/doc/doxygen || die - doxygen -u Doxyfile || die - doxygen || die "doxygen failed to build API docs." - - cd "${CMAKE_USE_DIR}" || die - einfo "Generating (BPY) Blender Python API docs ..." - "${BUILD_DIR}"/bin/blender --background --python doc/python_api/sphinx_doc_gen.py -noaudio || die "sphinx failed." - - cd "${CMAKE_USE_DIR}"/doc/python_api || die - sphinx-build sphinx-in BPY_API || die "sphinx failed." - - docinto "html/API/python" - dodoc -r "${CMAKE_USE_DIR}"/doc/python_api/BPY_API/. - - docinto "html/API/blender" - dodoc -r "${CMAKE_USE_DIR}"/doc/doxygen/html/. - fi - - # Fix doc installdir - docinto html - dodoc "${CMAKE_USE_DIR}"/release/text/readme.html - rm -r "${ED}"/usr/share/doc/blender || die - - python_optimize "${ED}/usr/share/blender/${BV}/scripts" - - mv "${ED}/usr/bin/blender-thumbnailer" "${ED}/usr/bin/blender-${BV}-thumbnailer" || die - mv "${ED}/usr/bin/blender" "${ED}/usr/bin/blender-${BV}" || die -} - -pkg_postinst() { - elog - elog "Blender uses python integration. As such, may have some" - elog "inherent risks with running unknown python scripts." - elog - elog "It is recommended to change your blender temp directory" - elog "from /tmp to /home/user/tmp or another tmp file under your" - elog "home directory. This can be done by starting blender, then" - elog "changing the 'Temporary Files' directory in Blender preferences." - elog - - if use osl; then - ewarn "" - ewarn "OSL is know to cause runtime segfaults if Mesa has been linked to" - ewarn "an other LLVM version than what OSL is linked to." - ewarn "See https://bugs.gentoo.org/880671 for more details" - ewarn "" - fi - - if ! use python_single_target_python3_10; then - elog "You are building Blender with a newer python version than" - elog "supported by this version upstream." - elog "If you experience breakages with e.g. plugins, please switch to" - elog "python_single_target_python3_10 instead." - elog "Bug: https://bugs.gentoo.org/737388" - elog - fi - - xdg_icon_cache_update - xdg_mimeinfo_database_update - xdg_desktop_database_update -} - -pkg_postrm() { - xdg_icon_cache_update - xdg_mimeinfo_database_update - xdg_desktop_database_update - - ewarn "" - ewarn "You may want to remove the following directory." - ewarn "~/.config/${PN}/${SLOT}/cache/" - ewarn "It may contain extra render kernels not tracked by portage" - ewarn "" -} diff --git a/media-gfx/blender/blender-3.3.21.ebuild b/media-gfx/blender/blender-3.3.21.ebuild deleted file mode 100644 index 66c872c02cea..000000000000 --- a/media-gfx/blender/blender-3.3.21.ebuild +++ /dev/null @@ -1,432 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -PYTHON_COMPAT=( python3_10 python3_11 ) - -inherit check-reqs cmake flag-o-matic pax-utils python-single-r1 toolchain-funcs xdg-utils - -DESCRIPTION="3D Creation/Animation/Publishing System" -HOMEPAGE="https://www.blender.org" - -if [[ ${PV} = *9999* ]] ; then - # Subversion is needed for downloading unit test files - inherit git-r3 subversion - EGIT_REPO_URI="https://git.blender.org/blender.git" -else - SRC_URI="https://download.blender.org/source/${P}.tar.xz" - # 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" -fi - -LICENSE="GPL-3+ cycles? ( Apache-2.0 )" -SLOT="${PV%.*}" -IUSE="+bullet +dds +fluid +openexr +tbb \ - alembic collada +color-management cuda +cycles \ - debug doc +embree +ffmpeg +fftw +gmp headless jack jemalloc jpeg2k \ - man +nanovdb ndof nls openal +oidn +openimageio +openmp +opensubdiv \ - +openvdb optix osl +pdf +potrace +pugixml pulseaudio sdl +sndfile \ - test +tiff valgrind" -RESTRICT="!test? ( test ) test" - -REQUIRED_USE="${PYTHON_REQUIRED_USE} - alembic? ( openexr ) - cuda? ( cycles ) - cycles? ( openexr tiff openimageio ) - fluid? ( tbb ) - openvdb? ( tbb ) - optix? ( cuda ) - osl? ( cycles ) - test? ( color-management )" - -# Library versions for official builds can be found in the blender source directory in: -# build_files/build_environment/install_deps.sh -# -# <opencolorio-2.3.0 for https://projects.blender.org/blender/blender/issues/112917. -RDEPEND="${PYTHON_DEPS} - dev-libs/boost:=[nls?] - dev-libs/lzo:2= - $(python_gen_cond_dep ' - dev-python/cython[${PYTHON_USEDEP}] - dev-python/numpy[${PYTHON_USEDEP}] - dev-python/zstandard[${PYTHON_USEDEP}] - dev-python/requests[${PYTHON_USEDEP}] - ') - media-libs/freetype:=[brotli] - media-libs/glew:* - media-libs/libjpeg-turbo:= - media-libs/libpng:= - media-libs/libsamplerate - sys-libs/zlib:= - virtual/glu - virtual/libintl - virtual/opengl - alembic? ( >=media-gfx/alembic-1.8.3-r2[boost(+),hdf(+)] ) - collada? ( >=media-libs/opencollada-1.6.68 ) - color-management? ( <media-libs/opencolorio-2.3.0:= ) - cuda? ( dev-util/nvidia-cuda-toolkit:= ) - embree? ( <media-libs/embree-4.0.0:=[raymask] ) - ffmpeg? ( media-video/ffmpeg:=[x264,mp3,encode,theora,jpeg2k?,vpx,vorbis,opus,xvid] ) - fftw? ( sci-libs/fftw:3.0= ) - gmp? ( dev-libs/gmp[cxx] ) - !headless? ( - x11-libs/libX11 - x11-libs/libXi - x11-libs/libXxf86vm - ) - jack? ( virtual/jack ) - jemalloc? ( dev-libs/jemalloc:= ) - jpeg2k? ( media-libs/openjpeg:2= ) - ndof? ( - app-misc/spacenavd - dev-libs/libspnav - ) - nls? ( virtual/libiconv ) - openal? ( media-libs/openal ) - oidn? ( >=media-libs/oidn-1.4.1 ) - openimageio? ( >=media-libs/openimageio-2.3.12.0-r3:= ) - openexr? ( - >=dev-libs/imath-3.1.4-r2:= - >=media-libs/openexr-3:0= - ) - opensubdiv? ( >=media-libs/opensubdiv-3.4.0 ) - openvdb? ( - <media-gfx/openvdb-11.0.0:=[nanovdb?] - dev-libs/c-blosc:= - ) - optix? ( <dev-libs/optix-7.5.0 ) - osl? ( <media-libs/osl-1.13:= ) - pdf? ( media-libs/libharu ) - potrace? ( media-gfx/potrace ) - pugixml? ( dev-libs/pugixml ) - pulseaudio? ( media-libs/libpulse ) - sdl? ( media-libs/libsdl2[sound,joystick] ) - sndfile? ( media-libs/libsndfile ) - tbb? ( dev-cpp/tbb:= ) - tiff? ( media-libs/tiff:= ) - valgrind? ( dev-debug/valgrind ) -" - -DEPEND="${RDEPEND} - dev-cpp/eigen:= -" - -BDEPEND=" - virtual/pkgconfig - doc? ( - app-text/doxygen[dot] - dev-python/sphinx[latex] - dev-texlive/texlive-bibtexextra - dev-texlive/texlive-fontsextra - dev-texlive/texlive-fontutils - dev-texlive/texlive-latex - dev-texlive/texlive-latexextra - ) - nls? ( sys-devel/gettext ) -" - -PATCHES=( - "${FILESDIR}/${PN}-3.2.2-support-building-with-musl-libc.patch" - "${FILESDIR}/${PN}-3.2.2-Cycles-add-option-to-specify-OptiX-runtime-root-dire.patch" - "${FILESDIR}/${PN}-3.2.2-Fix-T100845-wrong-Cycles-OptiX-runtime-compilation-i.patch" - "${FILESDIR}/${PN}-3.3.0-fix-build-with-boost-1.81.patch" - "${FILESDIR}/${PN}-3.3.6-cycles-gcc13.patch" -) - -blender_check_requirements() { - [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp - - if use doc; then - CHECKREQS_DISK_BUILD="4G" check-reqs_pkg_pretend - fi -} - -blender_get_version() { - # Get blender version from blender itself. - BV=$(grep "BLENDER_VERSION " source/blender/blenkernel/BKE_blender_version.h | cut -d " " -f 3; assert) - if ((${BV:0:1} < 3)) ; then - # Add period (290 -> 2.90). - BV=${BV:0:1}.${BV:1} - else - # Add period and skip the middle number (301 -> 3.1) - BV=${BV:0:1}.${BV:2} - fi -} - -pkg_pretend() { - blender_check_requirements -} - -pkg_setup() { - blender_check_requirements - python-single-r1_pkg_setup -} - -src_unpack() { - if [[ ${PV} = *9999* ]] ; then - git-r3_src_unpack - if use test; then - TESTS_SVN_URL=https://svn.blender.org/svnroot/bf-blender/trunk/lib/tests - subversion_fetch ${TESTS_SVN_URL} ../lib/tests - fi - else - default - if use test; then - #The tests are downloaded from: https://svn.blender.org/svnroot/bf-blender/tags/blender-${SLOT}-release/lib/tests - mkdir -p lib || die - mv "${WORKDIR}/blender-${TEST_TARBALL_VERSION}-tests/tests" lib || die - fi - fi - -} - -src_prepare() { - cmake_src_prepare - - blender_get_version - - # Disable MS Windows help generation. The variable doesn't do what it - # it sounds like. - sed -e "s|GENERATE_HTMLHELP = YES|GENERATE_HTMLHELP = NO|" \ - -i doc/doxygen/Doxyfile || die - - # Prepare icons and .desktop files for slotting. - sed -e "s|blender.svg|blender-${BV}.svg|" -i source/creator/CMakeLists.txt || die - sed -e "s|blender-symbolic.svg|blender-${BV}-symbolic.svg|" -i source/creator/CMakeLists.txt || die - sed -e "s|blender.desktop|blender-${BV}.desktop|" -i source/creator/CMakeLists.txt || die - - sed -e "s|Name=Blender|Name=Blender ${PV}|" -i release/freedesktop/blender.desktop || die - sed -e "s|Exec=blender|Exec=blender-${BV}|" -i release/freedesktop/blender.desktop || die - sed -e "s|Icon=blender|Icon=blender-${BV}|" -i release/freedesktop/blender.desktop || die - - mv release/freedesktop/icons/scalable/apps/blender.svg "release/freedesktop/icons/scalable/apps/blender-${BV}.svg" || die - mv release/freedesktop/icons/symbolic/apps/blender-symbolic.svg "release/freedesktop/icons/symbolic/apps/blender-${BV}-symbolic.svg" || die - mv release/freedesktop/blender.desktop "release/freedesktop/blender-${BV}.desktop" || die - - if use test; then - # Without this the tests will try to use /usr/bin/blender and /usr/share/blender/ to run the tests. - sed -e "s|string(REPLACE.*|set(TEST_INSTALL_DIR ${T}/usr)|g" -i tests/CMakeLists.txt || die - sed -e "s|string(REPLACE.*|set(TEST_INSTALL_DIR ${T}/usr)|g" -i build_files/cmake/Modules/GTestTesting.cmake || die - fi -} - -src_configure() { - # -Werror=odr, -Werror=lto-type-mismatch - # https://bugs.gentoo.org/859607 - # https://projects.blender.org/blender/blender/issues/120444 - filter-lto - - # Workaround for bug #922600 - append-ldflags $(test-flags-CCLD -Wl,--undefined-version) - - append-lfs-flags - - local mycmakeargs=( - -DBUILD_SHARED_LIBS=OFF - -DPYTHON_INCLUDE_DIR="$(python_get_includedir)" - -DPYTHON_LIBRARY="$(python_get_library_path)" - -DPYTHON_VERSION="${EPYTHON/python/}" - -DWITH_ALEMBIC=$(usex alembic) - -DWITH_ASSERT_ABORT=$(usex debug) - -DWITH_BOOST=ON - -DWITH_BULLET=$(usex bullet) - -DWITH_CODEC_FFMPEG=$(usex ffmpeg) - -DWITH_CODEC_SNDFILE=$(usex sndfile) - -DWITH_CXX_GUARDEDALLOC=$(usex debug) - -DWITH_CYCLES=$(usex cycles) - -DWITH_CYCLES_DEVICE_CUDA=$(usex cuda TRUE FALSE) - -DWITH_CYCLES_DEVICE_OPTIX=$(usex optix) - -DWITH_CYCLES_EMBREE=$(usex embree) - -DWITH_CYCLES_OSL=$(usex osl) - -DWITH_CYCLES_STANDALONE=OFF - -DWITH_CYCLES_STANDALONE_GUI=OFF - -DWITH_DOC_MANPAGE=$(usex man) - -DWITH_FFTW3=$(usex fftw) - -DWITH_GMP=$(usex gmp) - -DWITH_GTESTS=$(usex test) - -DWITH_HARU=$(usex pdf) - -DWITH_HEADLESS=$(usex headless) - -DWITH_INSTALL_PORTABLE=OFF - -DWITH_IMAGE_DDS=$(usex dds) - -DWITH_IMAGE_OPENEXR=$(usex openexr) - -DWITH_IMAGE_OPENJPEG=$(usex jpeg2k) - -DWITH_IMAGE_TIFF=$(usex tiff) - -DWITH_INPUT_NDOF=$(usex ndof) - -DWITH_INTERNATIONAL=$(usex nls) - -DWITH_JACK=$(usex jack) - -DWITH_MEM_JEMALLOC=$(usex jemalloc) - -DWITH_MEM_VALGRIND=$(usex valgrind) - -DWITH_MOD_FLUID=$(usex fluid) - -DWITH_MOD_OCEANSIM=$(usex fftw) - -DWITH_NANOVDB=$(usex nanovdb) - -DWITH_OPENAL=$(usex openal) - -DWITH_OPENCOLLADA=$(usex collada) - -DWITH_OPENCOLORIO=$(usex color-management) - -DWITH_OPENIMAGEDENOISE=$(usex oidn) - -DWITH_OPENIMAGEIO=$(usex openimageio) - -DWITH_OPENMP=$(usex openmp) - -DWITH_OPENSUBDIV=$(usex opensubdiv) - -DWITH_OPENVDB=$(usex openvdb) - -DWITH_OPENVDB_BLOSC=$(usex openvdb) - -DWITH_POTRACE=$(usex potrace) - -DWITH_PUGIXML=$(usex pugixml) - -DWITH_PULSEAUDIO=$(usex pulseaudio) - -DWITH_PYTHON_INSTALL=OFF - -DWITH_SDL=$(usex sdl) - -DWITH_STATIC_LIBS=OFF - -DWITH_SYSTEM_EIGEN3=ON - -DWITH_SYSTEM_FREETYPE=ON - -DWITH_SYSTEM_GLEW=ON - -DWITH_SYSTEM_LZO=ON - -DWITH_TBB=$(usex tbb) - -DWITH_USD=OFF - -DWITH_XR_OPENXR=OFF - ) - - if use optix; then - mycmakeargs+=( - -DCYCLES_RUNTIME_OPTIX_ROOT_DIR="${EPREFIX}"/opt/optix - -DOPTIX_ROOT_DIR="${EPREFIX}"/opt/optix - ) - fi - - # This is currently needed on arm64 to get the NEON SIMD wrapper to compile the code successfully - use arm64 && append-flags -flax-vector-conversions - - append-flags $(usex debug '-DDEBUG' '-DNDEBUG') - - if tc-is-gcc ; then - # These options only exist when GCC is detected. - # We disable these to respect the user's choice of linker. - mycmakeargs+=( - -DWITH_LINKER_GOLD=OFF - -DWITH_LINKER_LLD=OFF - ) - fi - - cmake_src_configure -} - -src_test() { - # A lot of tests needs to have access to the installed data files. - # So install them into the image directory now. - DESTDIR="${T}" cmake_build install - - blender_get_version - # Define custom blender data/script file paths not be able to find them otherwise during testing. - # (Because the data is in the image directory and it will default to look in /usr/share) - export BLENDER_SYSTEM_SCRIPTS="${T}/usr/share/blender/${BV}/scripts" - export BLENDER_SYSTEM_DATAFILES="${T}/usr/share/blender/${BV}/datafiles" - - # Sanity check that the script and datafile path is valid. - # If they are not vaild, blender will fallback to the default path which is not what we want. - [ -d "$BLENDER_SYSTEM_SCRIPTS" ] || die "The custom script path is invalid, fix the ebuild!" - [ -d "$BLENDER_SYSTEM_DATAFILES" ] || die "The custom datafiles path is invalid, fix the ebuild!" - - cmake_src_test - - # Clean up the image directory for src_install - rm -fr "${T}"/usr || die -} - -src_install() { - blender_get_version - - # Pax mark blender for hardened support. - pax-mark m "${BUILD_DIR}"/bin/blender - - cmake_src_install - - if use man; then - # Slot the man page - mv "${ED}/usr/share/man/man1/blender.1" "${ED}/usr/share/man/man1/blender-${BV}.1" || die - fi - - if use doc; then - # Define custom blender data/script file paths. Otherwise Blender will not be able to find them during doc building. - # (Because the data is in the image directory and it will default to look in /usr/share) - export BLENDER_SYSTEM_SCRIPTS=${ED}/usr/share/blender/${BV}/scripts - export BLENDER_SYSTEM_DATAFILES=${ED}/usr/share/blender/${BV}/datafiles - - # Workaround for binary drivers. - addpredict /dev/ati - addpredict /dev/dri - addpredict /dev/nvidiactl - - einfo "Generating Blender C/C++ API docs ..." - cd "${CMAKE_USE_DIR}"/doc/doxygen || die - doxygen -u Doxyfile || die - doxygen || die "doxygen failed to build API docs." - - cd "${CMAKE_USE_DIR}" || die - einfo "Generating (BPY) Blender Python API docs ..." - "${BUILD_DIR}"/bin/blender --background --python doc/python_api/sphinx_doc_gen.py -noaudio || die "sphinx failed." - - cd "${CMAKE_USE_DIR}"/doc/python_api || die - sphinx-build sphinx-in BPY_API || die "sphinx failed." - - docinto "html/API/python" - dodoc -r "${CMAKE_USE_DIR}"/doc/python_api/BPY_API/. - - docinto "html/API/blender" - dodoc -r "${CMAKE_USE_DIR}"/doc/doxygen/html/. - fi - - # Fix doc installdir - docinto html - dodoc "${CMAKE_USE_DIR}"/release/text/readme.html - rm -r "${ED}"/usr/share/doc/blender || die - - python_optimize "${ED}/usr/share/blender/${BV}/scripts" - - mv "${ED}/usr/bin/blender-thumbnailer" "${ED}/usr/bin/blender-${BV}-thumbnailer" || die - mv "${ED}/usr/bin/blender" "${ED}/usr/bin/blender-${BV}" || die -} - -pkg_postinst() { - elog - elog "Blender uses python integration. As such, may have some" - elog "inherent risks with running unknown python scripts." - elog - elog "It is recommended to change your blender temp directory" - elog "from /tmp to /home/user/tmp or another tmp file under your" - elog "home directory. This can be done by starting blender, then" - elog "changing the 'Temporary Files' directory in Blender preferences." - elog - - if use osl; then - ewarn "" - ewarn "OSL is know to cause runtime segfaults if Mesa has been linked to" - ewarn "an other LLVM version than what OSL is linked to." - ewarn "See https://bugs.gentoo.org/880671 for more details" - ewarn "" - fi - - if ! use python_single_target_python3_10; then - elog "You are building Blender with a newer python version than" - elog "supported by this version upstream." - elog "If you experience breakages with e.g. plugins, please switch to" - elog "python_single_target_python3_10 instead." - elog "Bug: https://bugs.gentoo.org/737388" - elog - fi - - xdg_icon_cache_update - xdg_mimeinfo_database_update - xdg_desktop_database_update -} - -pkg_postrm() { - xdg_icon_cache_update - xdg_mimeinfo_database_update - xdg_desktop_database_update - - ewarn "" - ewarn "You may want to remove the following directory." - ewarn "~/.config/${PN}/${SLOT}/cache/" - ewarn "It may contain extra render kernels not tracked by portage" - ewarn "" -} diff --git a/media-gfx/blender/blender-3.6.15.ebuild b/media-gfx/blender/blender-3.6.15.ebuild index 698ccf250f72..8780d66cc455 100644 --- a/media-gfx/blender/blender-3.6.15.ebuild +++ b/media-gfx/blender/blender-3.6.15.ebuild @@ -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/blender/blender-3.3.8.ebuild b/media-gfx/blender/blender-3.6.18.ebuild index 69f830424c87..bdf6973efd45 100644 --- a/media-gfx/blender/blender-3.3.8.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 @@ -13,29 +13,30 @@ HOMEPAGE="https://www.blender.org" if [[ ${PV} = *9999* ]] ; then # Subversion is needed for downloading unit test files inherit git-r3 subversion - EGIT_REPO_URI="https://git.blender.org/blender.git" + EGIT_REPO_URI="https://projects.blender.org/blender/blender.git" + ADDONS_EGIT_REPO_URI="https://projects.blender.org/blender/blender-addons.git" else SRC_URI="https://download.blender.org/source/${P}.tar.xz" # 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 )" + # SRC_URI+=" test? ( https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${PN}-${TEST_TARBALL_VERSION}-tests.tar.xz )" KEYWORDS="amd64 ~arm ~arm64" fi LICENSE="GPL-3+ cycles? ( Apache-2.0 )" SLOT="${PV%.*}" -IUSE="+bullet +dds +fluid +openexr +tbb \ - alembic collada +color-management cuda +cycles \ - debug doc +embree +ffmpeg +fftw +gmp headless jack jemalloc jpeg2k \ - man +nanovdb ndof nls openal +oidn +openimageio +openmp +opensubdiv \ - +openvdb optix osl +pdf +potrace +pugixml pulseaudio sdl +sndfile \ - test +tiff valgrind" -RESTRICT="!test? ( test ) test" +IUSE="+bullet +dds +fluid +openexr +tbb + alembic collada +color-management cuda +cycles cycles-bin-kernels + debug doc +embree +ffmpeg +fftw +gmp jack jemalloc jpeg2k + man +nanovdb ndof nls openal +oidn +openmp +openpgl +opensubdiv + +openvdb optix osl +pdf +potrace +pugixml pulseaudio sdl + +sndfile test +tiff valgrind wayland X" +RESTRICT="!test? ( test )" REQUIRED_USE="${PYTHON_REQUIRED_USE} alembic? ( openexr ) cuda? ( cycles ) - cycles? ( openexr tiff openimageio ) + cycles? ( openexr tiff ) fluid? ( tbb ) openvdb? ( tbb ) optix? ( cuda ) @@ -44,8 +45,6 @@ REQUIRED_USE="${PYTHON_REQUIRED_USE} # Library versions for official builds can be found in the blender source directory in: # build_files/build_environment/install_deps.sh -# -# <opencolorio-2.3.0 for https://projects.blender.org/blender/blender/issues/112917. RDEPEND="${PYTHON_DEPS} dev-libs/boost:=[nls?] dev-libs/lzo:2= @@ -56,27 +55,23 @@ RDEPEND="${PYTHON_DEPS} dev-python/requests[${PYTHON_USEDEP}] ') media-libs/freetype:=[brotli] - media-libs/glew:* + media-libs/libepoxy:= media-libs/libjpeg-turbo:= media-libs/libpng:= media-libs/libsamplerate + >=media-libs/openimageio-2.4.6.0:= sys-libs/zlib:= virtual/glu virtual/libintl virtual/opengl alembic? ( >=media-gfx/alembic-1.8.3-r2[boost(+),hdf(+)] ) collada? ( >=media-libs/opencollada-1.6.68 ) - color-management? ( <media-libs/opencolorio-2.3.0:= ) + color-management? ( media-libs/opencolorio:= ) cuda? ( dev-util/nvidia-cuda-toolkit:= ) embree? ( >=media-libs/embree-3.10.0:=[raymask] ) ffmpeg? ( media-video/ffmpeg:=[x264,mp3,encode,theora,jpeg2k?,vpx,vorbis,opus,xvid] ) fftw? ( sci-libs/fftw:3.0= ) - gmp? ( dev-libs/gmp ) - !headless? ( - x11-libs/libX11 - x11-libs/libXi - x11-libs/libXxf86vm - ) + gmp? ( dev-libs/gmp[cxx] ) jack? ( virtual/jack ) jemalloc? ( dev-libs/jemalloc:= ) jpeg2k? ( media-libs/openjpeg:2= ) @@ -87,11 +82,11 @@ RDEPEND="${PYTHON_DEPS} nls? ( virtual/libiconv ) openal? ( media-libs/openal ) oidn? ( >=media-libs/oidn-1.4.1 ) - openimageio? ( >=media-libs/openimageio-2.3.12.0-r3:= ) openexr? ( >=dev-libs/imath-3.1.4-r2:= >=media-libs/openexr-3:0= ) + openpgl? ( media-libs/openpgl:0/0.5 ) opensubdiv? ( >=media-libs/opensubdiv-3.4.0 ) openvdb? ( <media-gfx/openvdb-11.0.0:=[nanovdb?] @@ -108,6 +103,18 @@ RDEPEND="${PYTHON_DEPS} tbb? ( dev-cpp/tbb:= ) tiff? ( media-libs/tiff:= ) valgrind? ( dev-debug/valgrind ) + wayland? ( + >=dev-libs/wayland-1.12 + >=dev-libs/wayland-protocols-1.15 + >=x11-libs/libxkbcommon-0.2.0 + media-libs/mesa[wayland] + sys-apps/dbus + ) + X? ( + x11-libs/libX11 + x11-libs/libXi + x11-libs/libXxf86vm + ) " DEPEND="${RDEPEND} @@ -126,16 +133,11 @@ BDEPEND=" dev-texlive/texlive-latexextra ) nls? ( sys-devel/gettext ) + wayland? ( + dev-util/wayland-scanner + ) " -PATCHES=( - "${FILESDIR}/${PN}-3.2.2-support-building-with-musl-libc.patch" - "${FILESDIR}/${PN}-3.2.2-Cycles-add-option-to-specify-OptiX-runtime-root-dire.patch" - "${FILESDIR}/${PN}-3.2.2-Fix-T100845-wrong-Cycles-OptiX-runtime-compilation-i.patch" - "${FILESDIR}/${PN}-3.3.0-fix-build-with-boost-1.81.patch" - "${FILESDIR}/${PN}-3.3.6-cycles-gcc13.patch" -) - blender_check_requirements() { [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp @@ -168,10 +170,16 @@ pkg_setup() { src_unpack() { if [[ ${PV} = *9999* ]] ; then git-r3_src_unpack + + git-r3_fetch "${ADDONS_EGIT_REPO_URI}" + git-r3_checkout "${ADDONS_EGIT_REPO_URI}" "${S}/scripts/addons" + if use test; then TESTS_SVN_URL=https://svn.blender.org/svnroot/bf-blender/trunk/lib/tests subversion_fetch ${TESTS_SVN_URL} ../lib/tests fi + ASSETS_SVN_URL=https://svn.blender.org/svnroot/bf-blender/trunk/lib/assets + subversion_fetch ${ASSETS_SVN_URL} ../lib/assets else default if use test; then @@ -208,7 +216,7 @@ src_prepare() { if use test; then # Without this the tests will try to use /usr/bin/blender and /usr/share/blender/ to run the tests. - sed -e "s|string(REPLACE.*|set(TEST_INSTALL_DIR ${T}/usr)|g" -i tests/CMakeLists.txt || die + sed -e "s|set(TEST_INSTALL_DIR.*|set(TEST_INSTALL_DIR ${T}/usr)|g" -i tests/CMakeLists.txt || die sed -e "s|string(REPLACE.*|set(TEST_INSTALL_DIR ${T}/usr)|g" -i build_files/cmake/Modules/GTestTesting.cmake || die fi } @@ -223,6 +231,7 @@ src_configure() { append-ldflags $(test-flags-CCLD -Wl,--undefined-version) append-lfs-flags + blender_get_version local mycmakeargs=( -DBUILD_SHARED_LIBS=OFF @@ -237,18 +246,26 @@ src_configure() { -DWITH_CODEC_SNDFILE=$(usex sndfile) -DWITH_CXX_GUARDEDALLOC=$(usex debug) -DWITH_CYCLES=$(usex cycles) + -DWITH_CYCLES_CUDA_BINARIES=$(usex cycles-bin-kernels) -DWITH_CYCLES_DEVICE_CUDA=$(usex cuda TRUE FALSE) -DWITH_CYCLES_DEVICE_OPTIX=$(usex optix) -DWITH_CYCLES_EMBREE=$(usex embree) -DWITH_CYCLES_OSL=$(usex osl) + -DWITH_CYCLES_PATH_GUIDING=$(usex openpgl) -DWITH_CYCLES_STANDALONE=OFF -DWITH_CYCLES_STANDALONE_GUI=OFF -DWITH_DOC_MANPAGE=$(usex man) -DWITH_FFTW3=$(usex fftw) + -DWITH_GHOST_WAYLAND=$(usex wayland) + -DWITH_GHOST_WAYLAND_APP_ID="blender-${BV}" + -DWITH_GHOST_WAYLAND_DBUS=$(usex wayland) + -DWITH_GHOST_WAYLAND_DYNLOAD=OFF + -DWITH_GHOST_WAYLAND_LIBDECOR=OFF + -DWITH_GHOST_X11=$(usex X) -DWITH_GMP=$(usex gmp) -DWITH_GTESTS=$(usex test) -DWITH_HARU=$(usex pdf) - -DWITH_HEADLESS=$(usex headless) + -DWITH_HEADLESS=$($(use X || use wayland) && echo OFF || echo ON) -DWITH_INSTALL_PORTABLE=OFF -DWITH_IMAGE_DDS=$(usex dds) -DWITH_IMAGE_OPENEXR=$(usex openexr) @@ -266,7 +283,6 @@ src_configure() { -DWITH_OPENCOLLADA=$(usex collada) -DWITH_OPENCOLORIO=$(usex color-management) -DWITH_OPENIMAGEDENOISE=$(usex oidn) - -DWITH_OPENIMAGEIO=$(usex openimageio) -DWITH_OPENMP=$(usex openmp) -DWITH_OPENSUBDIV=$(usex opensubdiv) -DWITH_OPENVDB=$(usex openvdb) @@ -279,7 +295,6 @@ src_configure() { -DWITH_STATIC_LIBS=OFF -DWITH_SYSTEM_EIGEN3=ON -DWITH_SYSTEM_FREETYPE=ON - -DWITH_SYSTEM_GLEW=ON -DWITH_SYSTEM_LZO=ON -DWITH_TBB=$(usex tbb) -DWITH_USD=OFF diff --git a/media-gfx/blender/blender-4.2.1.ebuild b/media-gfx/blender/blender-4.2.1.ebuild index 88bb85849015..3a809e39731f 100644 --- a/media-gfx/blender/blender-4.2.1.ebuild +++ b/media-gfx/blender/blender-4.2.1.ebuild @@ -27,7 +27,7 @@ else # https://projects.blender.org/blender/blender-test-data/archive/blender-v$(ver_cut 1-2)-release.tar.gz # ) # " - KEYWORDS="~amd64 ~arm ~arm64" + KEYWORDS="amd64 ~arm ~arm64" RESTRICT="test" # the test archive returns LFS references. fi diff --git a/media-gfx/blender/blender-4.0.2-r1.ebuild b/media-gfx/blender/blender-4.2.4.ebuild index ae693845b6b7..b062e630b1a5 100644 --- a/media-gfx/blender/blender-4.0.2-r1.ebuild +++ b/media-gfx/blender/blender-4.2.4.ebuild @@ -3,9 +3,10 @@ EAPI=8 -PYTHON_COMPAT=( python3_{10..11} ) -# matches media-libs/osl -LLVM_COMPAT=( {15..17} ) +PYTHON_COMPAT=( python3_{11..12} ) +# NOTE must match media-libs/osl +LLVM_COMPAT=( {15..18} ) +LLVM_OPTIONAL=1 inherit check-reqs cmake cuda flag-o-matic llvm-r1 pax-utils python-single-r1 toolchain-funcs xdg-utils @@ -17,7 +18,6 @@ if [[ ${PV} = *9999* ]] ; then inherit git-r3 EGIT_REPO_URI="https://projects.blender.org/blender/blender.git" EGIT_SUBMODULES=( '*' '-lib/*' ) - ADDONS_EGIT_REPO_URI="https://projects.blender.org/blender/blender-addons.git" RESTRICT="!test? ( test )" else SRC_URI=" @@ -35,9 +35,9 @@ LICENSE="GPL-3+ cycles? ( Apache-2.0 )" SLOT="${PV%.*}" IUSE=" alembic +bullet collada +color-management cuda +cycles +cycles-bin-kernels - debug doc +embree experimental +ffmpeg +fftw +fluid +gmp gnome hip jack - jemalloc jpeg2k man +nanovdb ndof nls +oidn oneapi openal +openexr +openmp openpgl - +opensubdiv +openvdb optix osl +pdf +potrace +pugixml pulseaudio + debug doc +embree +ffmpeg +fftw +fluid +gmp gnome hip jack + jemalloc jpeg2k man +nanovdb ndof nls +oidn oneapi openal +openexr +openmp +openpgl + +opensubdiv +openvdb optix osl +otf +pdf +potrace +pugixml pulseaudio renderdoc sdl +sndfile +tbb test +tiff valgrind vulkan wayland +webp X " @@ -71,7 +71,7 @@ RDEPEND="${PYTHON_DEPS} media-libs/libjpeg-turbo:= media-libs/libpng:= media-libs/libsamplerate - >=media-libs/openimageio-2.4.6.0:= + >=media-libs/openimageio-2.5.6.0:= sys-libs/zlib:= virtual/glu virtual/libintl @@ -85,7 +85,14 @@ RDEPEND="${PYTHON_DEPS} fftw? ( sci-libs/fftw:3.0= ) gmp? ( dev-libs/gmp[cxx] ) gnome? ( gui-libs/libdecor ) - hip? ( >=dev-util/hip-5.7:= ) + hip? ( + llvm_slot_17? ( + dev-util/hip:0/5.7 + ) + llvm_slot_18? ( + >=dev-util/hip-6.1:=[llvm_slot_18(-)] + ) + ) jack? ( virtual/jack ) jemalloc? ( dev-libs/jemalloc:= ) jpeg2k? ( media-libs/openjpeg:2= ) @@ -95,13 +102,13 @@ RDEPEND="${PYTHON_DEPS} ) nls? ( virtual/libiconv ) openal? ( media-libs/openal ) - oidn? ( >=media-libs/oidn-2.1.0 ) + oidn? ( >=media-libs/oidn-2.1.0[${LLVM_USEDEP}] ) oneapi? ( dev-libs/intel-compute-runtime[l0] ) openexr? ( - >=dev-libs/imath-3.1.4-r2:= - >=media-libs/openexr-3:0= + >=dev-libs/imath-3.1.7:= + >=media-libs/openexr-3.2.1:0= ) - openpgl? ( media-libs/openpgl:0/0.5 ) + openpgl? ( media-libs/openpgl:= ) opensubdiv? ( >=media-libs/opensubdiv-3.5.0 ) openvdb? ( >=media-gfx/openvdb-11.0.0:=[nanovdb?] @@ -109,11 +116,8 @@ RDEPEND="${PYTHON_DEPS} ) optix? ( dev-libs/optix ) osl? ( - >=media-libs/osl-1.13:= - $(llvm_gen_dep ' - >=media-libs/osl-1.13[llvm_slot_${LLVM_SLOT}] - media-libs/mesa[llvm_slot_${LLVM_SLOT}] - ') + >=media-libs/osl-1.13:=[${LLVM_USEDEP}] + media-libs/mesa[${LLVM_USEDEP}] ) pdf? ( media-libs/libharu ) potrace? ( media-gfx/potrace ) @@ -138,6 +142,9 @@ RDEPEND="${PYTHON_DEPS} dev-util/glslang media-libs/vulkan-loader ) + otf? ( + media-libs/harfbuzz + ) renderdoc? ( media-gfx/renderdoc ) @@ -177,11 +184,10 @@ BDEPEND=" " PATCHES=( - "${FILESDIR}/${PN}-4.0.1-fix-cflags-cleaner.patch" # to be dropped for releases after Dec 8, 2023 - "${FILESDIR}/${PN}-4.0.1-openvdb-11.patch" "${FILESDIR}/${PN}-4.0.2-FindClang.patch" "${FILESDIR}/${PN}-4.0.2-CUDA_NVCC_FLAGS.patch" - "${FILESDIR}/${PN}-4.0.2-r1-osl-1.13.patch" + "${FILESDIR}/${PN}-4.1.1-FindLLVM.patch" + "${FILESDIR}/${PN}-4.1.1-numpy.patch" ) blender_check_requirements() { @@ -206,6 +212,12 @@ blender_get_version() { pkg_pretend() { blender_check_requirements + + if use oneapi; then + einfo "The Intel oneAPI support is rudimentary." + einfo "" + einfo "Please report any bugs you find to https://bugs.gentoo.org/" + fi } pkg_setup() { @@ -223,9 +235,6 @@ src_unpack() { EGIT_SUBMODULES+=( '-tests/*' ) fi git-r3_src_unpack - - git-r3_fetch "${ADDONS_EGIT_REPO_URI}" - git-r3_checkout "${ADDONS_EGIT_REPO_URI}" "${S}/scripts/addons" else default @@ -308,6 +317,7 @@ src_configure() { -DWITH_BULLET=$(usex bullet) -DWITH_CODEC_FFMPEG=$(usex ffmpeg) -DWITH_CODEC_SNDFILE=$(usex sndfile) + -DWITH_CPU_CHECK=no -DWITH_CYCLES=$(usex cycles) @@ -330,16 +340,13 @@ src_configure() { -DWITH_DOC_MANPAGE=$(usex man) -DWITH_DRACO="no" # TODO: Package Draco - -DWITH_EXPERIMENTAL_FEATURES="$(usex experimental)" -DWITH_FFTW3=$(usex fftw) -DWITH_GHOST_WAYLAND=$(usex wayland) - -DWITH_GHOST_WAYLAND_APP_ID="blender-${BV}" - -DWITH_GHOST_WAYLAND_DBUS=$(usex wayland) - -DWITH_GHOST_WAYLAND_DYNLOAD="$(usex gnome)" # https://bugs.gentoo.org/930412 fixed in 4.1 # no - -DWITH_GHOST_WAYLAND_LIBDECOR="$(usex gnome)" + -DWITH_GHOST_WAYLAND_DYNLOAD="no" -DWITH_GHOST_X11=$(usex X) -DWITH_GMP=$(usex gmp) -DWITH_GTESTS=$(usex test) + -DWITH_HARFBUZZ="$(usex otf)" -DWITH_HARU=$(usex pdf) -DWITH_HEADLESS=$($(use X || use wayland) && echo OFF || echo ON) -DWITH_HYDRA="no" # TODO: Package Hydra @@ -383,6 +390,13 @@ src_configure() { -DWITH_XR_OPENXR=no ) + if has_version ">=dev-python/numpy-2"; then + mycmakeargs+=( + -DPYTHON_NUMPY_INCLUDE_DIRS="$(python_get_sitedir)/numpy/_core/include" + -DPYTHON_NUMPY_PATH="$(python_get_sitedir)/numpy/_core/include" + ) + fi + # requires dev-vcs/git if [[ ${PV} = *9999* ]] ; then mycmakeargs+=( -DWITH_BUILDINFO="yes" ) @@ -398,6 +412,7 @@ src_configure() { if use hip; then mycmakeargs+=( + -DROCM_PATH="$(hipconfig -R)" -DHIP_HIPCC_FLAGS="-fcf-protection=none" ) fi @@ -409,6 +424,13 @@ src_configure() { ) fi + if use wayland; then + mycmakeargs+=( + -DWITH_GHOST_WAYLAND_APP_ID="blender-${BV}" + -DWITH_GHOST_WAYLAND_LIBDECOR="$(usex gnome)" + ) + fi + # This is currently needed on arm64 to get the NEON SIMD wrapper to compile the code successfully use arm64 && append-flags -flax-vector-conversions @@ -457,15 +479,16 @@ src_test() { DESTDIR="${T}" cmake_build install blender_get_version - # Define custom blender data/script file paths not be able to find them otherwise during testing. - # (Because the data is in the image directory and it will default to look in /usr/share) - export BLENDER_SYSTEM_SCRIPTS="${T}/usr/share/blender/${BV}/scripts" - export BLENDER_SYSTEM_DATAFILES="${T}/usr/share/blender/${BV}/datafiles" + # By default, blender will look for system scripts and data in + # /usr/share/, but until this is installed, they are not necessarily + # available there. Use this to have blender search the intermediate + # install directory instead. + export BLENDER_SYSTEM_RESOURCES="${T}/usr/share/blender/${BV}" - # Sanity check that the script and datafile path is valid. - # If they are not vaild, blender will fallback to the default path which is not what we want. - [ -d "$BLENDER_SYSTEM_SCRIPTS" ] || die "The custom script path is invalid, fix the ebuild!" - [ -d "$BLENDER_SYSTEM_DATAFILES" ] || die "The custom datafiles path is invalid, fix the ebuild!" + # Brake check: Make sure the above path is valid. + # If not, blender will fallback to the default path which is not what + # we want. + [ -d "$BLENDER_SYSTEM_RESOURCES" ] || die "The custom script path is invalid, fix the ebuild!" if use cuda; then cuda_add_sandbox -w @@ -477,6 +500,8 @@ src_test() { xdg_environment_reset fi + addwrite /dev/dri + cmake_src_test # Clean up the image directory for src_install @@ -489,21 +514,24 @@ src_install() { # Pax mark blender for hardened support. pax-mark m "${BUILD_DIR}"/bin/blender - if use man; then - # XXX: Stupid temporary hack for bug #925254 - cmake_src_install -j1 + cmake_src_install + if use man; then # Slot the man page mv "${ED}/usr/share/man/man1/blender.1" "${ED}/usr/share/man/man1/blender-${BV}.1" || die - else - cmake_src_install fi if use doc; then - # Define custom blender data/script file paths. Otherwise Blender will not be able to find them during doc building. - # (Because the data is in the image directory and it will default to look in /usr/share) - export BLENDER_SYSTEM_SCRIPTS=${ED}/usr/share/blender/${BV}/scripts - export BLENDER_SYSTEM_DATAFILES=${ED}/usr/share/blender/${BV}/datafiles + # By default, blender will look for system scripts and data in + # /usr/share/, but until this is installed, they are not necessarily + # available there. Use this to have blender search the intermediate + # install directory instead. + export BLENDER_SYSTEM_RESOURCES="${ED}/usr/share/blender/${BV}" + + # Brake check: Make sure the above path is valid. + # If not, blender will fallback to the default path which is not what + # we want. + [ -d "$BLENDER_SYSTEM_RESOURCES" ] || die "The custom script path is invalid, fix the ebuild!" # Workaround for binary drivers. addpredict /dev/ati @@ -559,11 +587,11 @@ pkg_postinst() { ewarn "" fi - if ! use python_single_target_python3_10; then + if ! use python_single_target_python3_11; then elog "You are building Blender with a newer python version than" elog "supported by this version upstream." elog "If you experience breakages with e.g. plugins, please switch to" - elog "python_single_target_python3_10 instead." + elog "python_single_target_python3_11 instead." elog "Bug: https://bugs.gentoo.org/737388" elog fi diff --git a/media-gfx/blender/blender-4.3.2.ebuild b/media-gfx/blender/blender-4.3.2.ebuild new file mode 100644 index 000000000000..b062e630b1a5 --- /dev/null +++ b/media-gfx/blender/blender-4.3.2.ebuild @@ -0,0 +1,614 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +PYTHON_COMPAT=( python3_{11..12} ) +# NOTE must match media-libs/osl +LLVM_COMPAT=( {15..18} ) +LLVM_OPTIONAL=1 + +inherit check-reqs cmake cuda flag-o-matic llvm-r1 pax-utils python-single-r1 toolchain-funcs xdg-utils + +DESCRIPTION="3D Creation/Animation/Publishing System" +HOMEPAGE="https://www.blender.org" + +if [[ ${PV} = *9999* ]] ; then + EGIT_LFS="yes" + inherit git-r3 + EGIT_REPO_URI="https://projects.blender.org/blender/blender.git" + EGIT_SUBMODULES=( '*' '-lib/*' ) + RESTRICT="!test? ( test )" +else + SRC_URI=" + https://download.blender.org/source/${P}.tar.xz + " + # test? ( + # https://projects.blender.org/blender/blender-test-data/archive/blender-v$(ver_cut 1-2)-release.tar.gz + # ) + # " + KEYWORDS="~amd64 ~arm ~arm64" + RESTRICT="test" # the test archive returns LFS references. +fi + +LICENSE="GPL-3+ cycles? ( Apache-2.0 )" +SLOT="${PV%.*}" +IUSE=" + alembic +bullet collada +color-management cuda +cycles +cycles-bin-kernels + debug doc +embree +ffmpeg +fftw +fluid +gmp gnome hip jack + jemalloc jpeg2k man +nanovdb ndof nls +oidn oneapi openal +openexr +openmp +openpgl + +opensubdiv +openvdb optix osl +otf +pdf +potrace +pugixml pulseaudio + renderdoc sdl +sndfile +tbb test +tiff valgrind vulkan wayland +webp X +" + +REQUIRED_USE="${PYTHON_REQUIRED_USE} + alembic? ( openexr ) + cuda? ( cycles ) + cycles? ( openexr tiff tbb ) + fluid? ( tbb ) + gnome? ( wayland ) + hip? ( cycles ) + nanovdb? ( openvdb ) + openvdb? ( tbb openexr ) + optix? ( cuda ) + osl? ( cycles pugixml ) + test? ( color-management )" + +# Library versions for official builds can be found in the blender source directory in: +# build_files/build_environment/cmake/versions.cmake +RDEPEND="${PYTHON_DEPS} + app-arch/zstd + dev-libs/boost:=[nls?] + dev-libs/lzo:2= + $(python_gen_cond_dep ' + dev-python/cython[${PYTHON_USEDEP}] + dev-python/numpy[${PYTHON_USEDEP}] + dev-python/zstandard[${PYTHON_USEDEP}] + dev-python/requests[${PYTHON_USEDEP}] + ') + media-libs/freetype:=[brotli] + media-libs/libepoxy:= + media-libs/libjpeg-turbo:= + media-libs/libpng:= + media-libs/libsamplerate + >=media-libs/openimageio-2.5.6.0:= + sys-libs/zlib:= + virtual/glu + virtual/libintl + virtual/opengl + alembic? ( >=media-gfx/alembic-1.8.3-r2[boost(+),hdf(+)] ) + collada? ( >=media-libs/opencollada-1.6.68 ) + color-management? ( media-libs/opencolorio:= ) + cuda? ( dev-util/nvidia-cuda-toolkit:= ) + embree? ( media-libs/embree:=[raymask] ) + ffmpeg? ( media-video/ffmpeg:=[x264,mp3,encode,theora,jpeg2k?,vpx,vorbis,opus,xvid] ) + fftw? ( sci-libs/fftw:3.0= ) + gmp? ( dev-libs/gmp[cxx] ) + gnome? ( gui-libs/libdecor ) + hip? ( + llvm_slot_17? ( + dev-util/hip:0/5.7 + ) + llvm_slot_18? ( + >=dev-util/hip-6.1:=[llvm_slot_18(-)] + ) + ) + jack? ( virtual/jack ) + jemalloc? ( dev-libs/jemalloc:= ) + jpeg2k? ( media-libs/openjpeg:2= ) + ndof? ( + app-misc/spacenavd + dev-libs/libspnav + ) + nls? ( virtual/libiconv ) + openal? ( media-libs/openal ) + oidn? ( >=media-libs/oidn-2.1.0[${LLVM_USEDEP}] ) + oneapi? ( dev-libs/intel-compute-runtime[l0] ) + openexr? ( + >=dev-libs/imath-3.1.7:= + >=media-libs/openexr-3.2.1:0= + ) + openpgl? ( media-libs/openpgl:= ) + opensubdiv? ( >=media-libs/opensubdiv-3.5.0 ) + openvdb? ( + >=media-gfx/openvdb-11.0.0:=[nanovdb?] + dev-libs/c-blosc:= + ) + optix? ( dev-libs/optix ) + osl? ( + >=media-libs/osl-1.13:=[${LLVM_USEDEP}] + media-libs/mesa[${LLVM_USEDEP}] + ) + pdf? ( media-libs/libharu ) + potrace? ( media-gfx/potrace ) + pugixml? ( dev-libs/pugixml ) + pulseaudio? ( media-libs/libpulse ) + sdl? ( media-libs/libsdl2[sound,joystick] ) + sndfile? ( media-libs/libsndfile ) + tbb? ( dev-cpp/tbb:= ) + tiff? ( media-libs/tiff:= ) + valgrind? ( dev-debug/valgrind ) + wayland? ( + >=dev-libs/wayland-1.12 + >=dev-libs/wayland-protocols-1.15 + >=x11-libs/libxkbcommon-0.2.0 + dev-util/wayland-scanner + media-libs/mesa[wayland] + sys-apps/dbus + ) + vulkan? ( + media-libs/shaderc + dev-util/spirv-tools + dev-util/glslang + media-libs/vulkan-loader + ) + otf? ( + media-libs/harfbuzz + ) + renderdoc? ( + media-gfx/renderdoc + ) + X? ( + x11-libs/libX11 + x11-libs/libXi + x11-libs/libXxf86vm + ) +" + +DEPEND="${RDEPEND} + dev-cpp/eigen:= + vulkan? ( + dev-util/spirv-headers + dev-util/vulkan-headers + ) +" + +BDEPEND=" + virtual/pkgconfig + doc? ( + app-text/doxygen[dot] + dev-python/sphinx[latex] + dev-texlive/texlive-bibtexextra + dev-texlive/texlive-fontsextra + dev-texlive/texlive-fontutils + dev-texlive/texlive-latex + dev-texlive/texlive-latexextra + ) + nls? ( sys-devel/gettext ) + wayland? ( + dev-util/wayland-scanner + ) + X? ( + x11-base/xorg-proto + ) +" + +PATCHES=( + "${FILESDIR}/${PN}-4.0.2-FindClang.patch" + "${FILESDIR}/${PN}-4.0.2-CUDA_NVCC_FLAGS.patch" + "${FILESDIR}/${PN}-4.1.1-FindLLVM.patch" + "${FILESDIR}/${PN}-4.1.1-numpy.patch" +) + +blender_check_requirements() { + [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp + + if use doc; then + CHECKREQS_DISK_BUILD="4G" check-reqs_pkg_pretend + fi +} + +blender_get_version() { + # Get blender version from blender itself. + BV=$(grep "BLENDER_VERSION " source/blender/blenkernel/BKE_blender_version.h | cut -d " " -f 3; assert) + if ((${BV:0:1} < 3)) ; then + # Add period (290 -> 2.90). + BV=${BV:0:1}.${BV:1} + else + # Add period and skip the middle number (301 -> 3.1) + BV=${BV:0:1}.${BV:2} + fi +} + +pkg_pretend() { + blender_check_requirements + + if use oneapi; then + einfo "The Intel oneAPI support is rudimentary." + einfo "" + einfo "Please report any bugs you find to https://bugs.gentoo.org/" + fi +} + +pkg_setup() { + if use osl; then + llvm-r1_pkg_setup + fi + + blender_check_requirements + python-single-r1_pkg_setup +} + +src_unpack() { + if [[ ${PV} = *9999* ]] ; then + if ! use test; then + EGIT_SUBMODULES+=( '-tests/*' ) + fi + git-r3_src_unpack + else + default + + if use test; then + mkdir -p "${S}/tests/data/" || die + mv blender-test-data/* "${S}/tests/data/" || die + fi + fi +} + +src_prepare() { + use cuda && cuda_src_prepare + + cmake_src_prepare + + blender_get_version + + # Disable MS Windows help generation. The variable doesn't do what it + # it sounds like. + sed -e "s|GENERATE_HTMLHELP = YES|GENERATE_HTMLHELP = NO|" \ + -i doc/doxygen/Doxyfile || die + + # Prepare icons and .desktop files for slotting. + sed \ + -e "s|blender.svg|blender-${BV}.svg|" \ + -e "s|blender-symbolic.svg|blender-${BV}-symbolic.svg|" \ + -e "s|blender.desktop|blender-${BV}.desktop|" \ + -e "s|org.blender.Blender.metainfo.xml|blender-${BV}.metainfo.xml|" \ + -i source/creator/CMakeLists.txt || die + + sed \ + -e "s|Name=Blender|Name=Blender ${BV}|" \ + -e "s|Exec=blender|Exec=blender-${BV}|" \ + -e "s|Icon=blender|Icon=blender-${BV}|" \ + -i release/freedesktop/blender.desktop || die + + sed -e "s|\${CMAKE_INSTALL_PREFIX}/\${BLENDER_BIN}|${T}/usr/\${BLENDER_BIN}|g" -i source/creator/CMakeLists.txt || die + + mv \ + release/freedesktop/icons/scalable/apps/blender.svg \ + "release/freedesktop/icons/scalable/apps/blender-${BV}.svg" || die + mv \ + release/freedesktop/icons/symbolic/apps/blender-symbolic.svg \ + "release/freedesktop/icons/symbolic/apps/blender-${BV}-symbolic.svg" || die + mv release/freedesktop/blender.desktop "release/freedesktop/blender-${BV}.desktop" || die + mv release/freedesktop/org.blender.Blender.metainfo.xml "release/freedesktop/blender-${BV}.metainfo.xml" + mv release/freedesktop/org.blender.Blender.appdata.xml "release/freedesktop/blender-${BV}.appdata.xml" + + if use test; then + # Without this the tests will try to use /usr/bin/blender and /usr/share/blender/ to run the tests. + sed -e "s|set(TEST_INSTALL_DIR.*|set(TEST_INSTALL_DIR ${T}/usr)|g" -i tests/CMakeLists.txt || die + sed -e "s|string(REPLACE.*|set(TEST_INSTALL_DIR ${T}/usr)|g" -i build_files/cmake/testing.cmake || die + fi + + if use vulkan; then + sed -e "s/extern_vulkan_memory_allocator/extern_vulkan_memory_allocator\nSPIRV-Tools-opt\nSPIRV-Tools\nSPIRV-Tools-link\nglslang\nSPIRV\nSPVRemapper/" -i source/blender/gpu/CMakeLists.txt || die + fi +} + +src_configure() { + # -Werror=odr, -Werror=lto-type-mismatch + # https://bugs.gentoo.org/859607 + # https://projects.blender.org/blender/blender/issues/120444 + filter-lto + + # Workaround for bug #922600 + append-ldflags $(test-flags-CCLD -Wl,--undefined-version) + + append-lfs-flags + blender_get_version + + local mycmakeargs=( + -DWITH_LIBS_PRECOMPILED=no + -DBUILD_SHARED_LIBS=no + -DPYTHON_INCLUDE_DIR="$(python_get_includedir)" + -DPYTHON_LIBRARY="$(python_get_library_path)" + -DPYTHON_VERSION="${EPYTHON/python/}" + -DWITH_ALEMBIC=$(usex alembic) + -DWITH_BOOST=yes + -DWITH_BULLET=$(usex bullet) + -DWITH_CODEC_FFMPEG=$(usex ffmpeg) + -DWITH_CODEC_SNDFILE=$(usex sndfile) + -DWITH_CPU_CHECK=no + + -DWITH_CYCLES=$(usex cycles) + + -DWITH_CYCLES_DEVICE_CUDA=$(usex cuda) + -DWITH_CYCLES_CUDA_BINARIES="$(usex cuda $(usex cycles-bin-kernels))" + -DWITH_CYCLES_DEVICE_OPTIX=$(usex optix) + + -DWITH_CYCLES_DEVICE_HIP="$(usex hip)" + -DWITH_CYCLES_HIP_BINARIES=$(usex hip $(usex cycles-bin-kernels)) + + -DWITH_CYCLES_DEVICE_ONEAPI="$(usex oneapi)" + -DWITH_CYCLES_ONEAPI_BINARIES="$(usex oneapi $(usex cycles-bin-kernels))" + + -DWITH_CYCLES_HYDRA_RENDER_DELEGATE="no" # TODO: package Hydra + -DWITH_CYCLES_EMBREE="$(usex embree)" + -DWITH_CYCLES_OSL=$(usex osl) + -DWITH_CYCLES_PATH_GUIDING=$(usex openpgl) + -DWITH_CYCLES_STANDALONE=no + -DWITH_CYCLES_STANDALONE_GUI=no + + -DWITH_DOC_MANPAGE=$(usex man) + -DWITH_DRACO="no" # TODO: Package Draco + -DWITH_FFTW3=$(usex fftw) + -DWITH_GHOST_WAYLAND=$(usex wayland) + -DWITH_GHOST_WAYLAND_DYNLOAD="no" + -DWITH_GHOST_X11=$(usex X) + -DWITH_GMP=$(usex gmp) + -DWITH_GTESTS=$(usex test) + -DWITH_HARFBUZZ="$(usex otf)" + -DWITH_HARU=$(usex pdf) + -DWITH_HEADLESS=$($(use X || use wayland) && echo OFF || echo ON) + -DWITH_HYDRA="no" # TODO: Package Hydra + -DWITH_IMAGE_OPENEXR=$(usex openexr) + -DWITH_IMAGE_OPENJPEG=$(usex jpeg2k) + -DWITH_IMAGE_WEBP=$(usex webp) + -DWITH_INPUT_NDOF=$(usex ndof) + -DWITH_INSTALL_PORTABLE="no" + -DWITH_INTERNATIONAL=$(usex nls) + -DWITH_JACK=$(usex jack) + -DWITH_MATERIALX="no" # TODO: Package MaterialX + -DWITH_MEM_JEMALLOC=$(usex jemalloc) + -DWITH_MEM_VALGRIND=$(usex valgrind) + -DWITH_MOD_FLUID=$(usex fluid) + -DWITH_MOD_OCEANSIM=$(usex fftw) + -DWITH_NANOVDB=$(usex nanovdb) + -DWITH_OPENAL=$(usex openal) + -DWITH_OPENCOLLADA=$(usex collada) + -DWITH_OPENCOLORIO=$(usex color-management) + -DWITH_OPENIMAGEDENOISE=$(usex oidn) + -DWITH_OPENMP=$(usex openmp) + -DWITH_OPENSUBDIV=$(usex opensubdiv) + -DWITH_OPENVDB=$(usex openvdb) + -DWITH_OPENVDB_BLOSC=$(usex openvdb) + -DWITH_POTRACE=$(usex potrace) + -DWITH_PUGIXML=$(usex pugixml) + -DWITH_PULSEAUDIO=$(usex pulseaudio) + -DWITH_PYTHON_INSTALL=no + -DWITH_PYTHON_INSTALL_NUMPY=no + -DWITH_PYTHON_INSTALL_ZSTANDARD=no + -DWITH_RENDERDOC="$(usex renderdoc)" + -DWITH_SDL=$(usex sdl) + -DWITH_STATIC_LIBS=no + -DWITH_STRICT_BUILD_OPTIONS=yes + -DWITH_SYSTEM_EIGEN3=yes + -DWITH_SYSTEM_FREETYPE=yes + -DWITH_SYSTEM_LZO=yes + -DWITH_TBB=$(usex tbb) + -DWITH_USD="no" # TODO: Package USD + -DWITH_VULKAN_BACKEND="$(usex vulkan)" + -DWITH_XR_OPENXR=no + ) + + if has_version ">=dev-python/numpy-2"; then + mycmakeargs+=( + -DPYTHON_NUMPY_INCLUDE_DIRS="$(python_get_sitedir)/numpy/_core/include" + -DPYTHON_NUMPY_PATH="$(python_get_sitedir)/numpy/_core/include" + ) + fi + + # requires dev-vcs/git + if [[ ${PV} = *9999* ]] ; then + mycmakeargs+=( -DWITH_BUILDINFO="yes" ) + else + mycmakeargs+=( -DWITH_BUILDINFO="no" ) + fi + + if use cuda; then + mycmakeargs+=( + -DCUDA_NVCC_FLAGS="--compiler-bindir;$(cuda_gccdir)" + ) + fi + + if use hip; then + mycmakeargs+=( + -DROCM_PATH="$(hipconfig -R)" + -DHIP_HIPCC_FLAGS="-fcf-protection=none" + ) + fi + + if use optix; then + mycmakeargs+=( + -DCYCLES_RUNTIME_OPTIX_ROOT_DIR="${EPREFIX}"/opt/optix + -DOPTIX_ROOT_DIR="${EPREFIX}"/opt/optix + ) + fi + + if use wayland; then + mycmakeargs+=( + -DWITH_GHOST_WAYLAND_APP_ID="blender-${BV}" + -DWITH_GHOST_WAYLAND_LIBDECOR="$(usex gnome)" + ) + fi + + # This is currently needed on arm64 to get the NEON SIMD wrapper to compile the code successfully + use arm64 && append-flags -flax-vector-conversions + + append-cflags "$(usex debug '-DDEBUG' '-DNDEBUG')" + append-cppflags "$(usex debug '-DDEBUG' '-DNDEBUG')" + + if tc-is-gcc ; then + # These options only exist when GCC is detected. + # We disable these to respect the user's choice of linker. + mycmakeargs+=( + -DWITH_LINKER_GOLD=no + -DWITH_LINKER_LLD=no + ) + # Ease compiling with required gcc similar to cuda_sanitize but for cmake + use cuda && use cycles-bin-kernels && mycmakeargs+=( -DCUDA_HOST_COMPILER="$(cuda_gccdir)" ) + fi + + if tc-is-clang || use osl; then + mycmakeargs+=( + -DWITH_CLANG=yes + -DWITH_LLVM=yes + ) + fi + + if use test ; then + local CYCLES_TEST_DEVICES=( "CPU" ) + if use cycles-bin-kernels; then + use cuda && CYCLES_TEST_DEVICES+=( "CUDA" ) + use optix && CYCLES_TEST_DEVICES+=( "OPTIX" ) + use hip && CYCLES_TEST_DEVICES+=( "HIP" ) + fi + mycmakeargs+=( + -DCYCLES_TEST_DEVICES:STRING="$(local IFS=";"; echo "${CYCLES_TEST_DEVICES[*]}")" + -DWITH_COMPOSITOR_REALTIME_TESTS=yes + -DWITH_GPU_DRAW_TESTS=yes + -DWITH_GPU_RENDER_TESTS=yes + ) + fi + + cmake_src_configure +} + +src_test() { + # A lot of tests needs to have access to the installed data files. + # So install them into the image directory now. + DESTDIR="${T}" cmake_build install + + blender_get_version + # By default, blender will look for system scripts and data in + # /usr/share/, but until this is installed, they are not necessarily + # available there. Use this to have blender search the intermediate + # install directory instead. + export BLENDER_SYSTEM_RESOURCES="${T}/usr/share/blender/${BV}" + + # Brake check: Make sure the above path is valid. + # If not, blender will fallback to the default path which is not what + # we want. + [ -d "$BLENDER_SYSTEM_RESOURCES" ] || die "The custom script path is invalid, fix the ebuild!" + + if use cuda; then + cuda_add_sandbox -w + addwrite "/dev/dri/renderD128" + addwrite "/dev/char/" + fi + + if use X; then + xdg_environment_reset + fi + + addwrite /dev/dri + + cmake_src_test + + # Clean up the image directory for src_install + rm -fr "${T}/usr" || die +} + +src_install() { + blender_get_version + + # Pax mark blender for hardened support. + pax-mark m "${BUILD_DIR}"/bin/blender + + cmake_src_install + + if use man; then + # Slot the man page + mv "${ED}/usr/share/man/man1/blender.1" "${ED}/usr/share/man/man1/blender-${BV}.1" || die + fi + + if use doc; then + # By default, blender will look for system scripts and data in + # /usr/share/, but until this is installed, they are not necessarily + # available there. Use this to have blender search the intermediate + # install directory instead. + export BLENDER_SYSTEM_RESOURCES="${ED}/usr/share/blender/${BV}" + + # Brake check: Make sure the above path is valid. + # If not, blender will fallback to the default path which is not what + # we want. + [ -d "$BLENDER_SYSTEM_RESOURCES" ] || die "The custom script path is invalid, fix the ebuild!" + + # Workaround for binary drivers. + addpredict /dev/ati + addpredict /dev/dri + addpredict /dev/nvidiactl + + einfo "Generating Blender C/C++ API docs ..." + cd "${CMAKE_USE_DIR}"/doc/doxygen || die + doxygen -u Doxyfile || die + doxygen || die "doxygen failed to build API docs." + + cd "${CMAKE_USE_DIR}" || die + einfo "Generating (BPY) Blender Python API docs ..." + "${BUILD_DIR}"/bin/blender --background --python doc/python_api/sphinx_doc_gen.py -noaudio || die "sphinx failed." + + cd "${CMAKE_USE_DIR}"/doc/python_api || die + sphinx-build sphinx-in BPY_API || die "sphinx failed." + + docinto "html/API/python" + dodoc -r "${CMAKE_USE_DIR}"/doc/python_api/BPY_API/. + + docinto "html/API/blender" + dodoc -r "${CMAKE_USE_DIR}"/doc/doxygen/html/. + fi + + # Fix doc installdir + docinto html + dodoc "${CMAKE_USE_DIR}"/release/text/readme.html + rm -r "${ED}"/usr/share/doc/blender || die + + python_optimize "${ED}/usr/share/blender/${BV}/scripts" + + mv "${ED}/usr/bin/blender-thumbnailer" "${ED}/usr/bin/blender-${BV}-thumbnailer" || die + mv "${ED}/usr/bin/blender" "${ED}/usr/bin/blender-${BV}" || die +} + +pkg_postinst() { + elog + elog "Blender uses python integration. As such, may have some" + elog "inherent risks with running unknown python scripts." + elog + elog "It is recommended to change your blender temp directory" + elog "from /tmp to /home/user/tmp or another tmp file under your" + elog "home directory. This can be done by starting blender, then" + elog "changing the 'Temporary Files' directory in Blender preferences." + elog + + if use osl; then + ewarn "" + ewarn "OSL is know to cause runtime segfaults if Mesa has been linked to" + ewarn "an other LLVM version than what OSL is linked to." + ewarn "See https://bugs.gentoo.org/880671 for more details" + ewarn "" + fi + + if ! use python_single_target_python3_11; then + elog "You are building Blender with a newer python version than" + elog "supported by this version upstream." + elog "If you experience breakages with e.g. plugins, please switch to" + elog "python_single_target_python3_11 instead." + elog "Bug: https://bugs.gentoo.org/737388" + elog + fi + + xdg_icon_cache_update + xdg_mimeinfo_database_update + xdg_desktop_database_update +} + +pkg_postrm() { + xdg_icon_cache_update + xdg_mimeinfo_database_update + xdg_desktop_database_update + + ewarn "" + ewarn "You may want to remove the following directory." + ewarn "~/.config/${PN}/${BV}/cache/" + ewarn "It may contain extra render kernels not tracked by portage" + ewarn "" +} diff --git a/media-gfx/blender/blender-9999.ebuild b/media-gfx/blender/blender-9999.ebuild index 88bb85849015..cd2204670f17 100644 --- a/media-gfx/blender/blender-9999.ebuild +++ b/media-gfx/blender/blender-9999.ebuild @@ -35,7 +35,7 @@ LICENSE="GPL-3+ cycles? ( Apache-2.0 )" SLOT="${PV%.*}" IUSE=" alembic +bullet collada +color-management cuda +cycles +cycles-bin-kernels - debug doc +embree experimental +ffmpeg +fftw +fluid +gmp gnome hip jack + debug doc +embree +ffmpeg +fftw +fluid +gmp gnome hip jack jemalloc jpeg2k man +nanovdb ndof nls +oidn oneapi openal +openexr +openmp +openpgl +opensubdiv +openvdb optix osl +otf +pdf +potrace +pugixml pulseaudio renderdoc sdl +sndfile +tbb test +tiff valgrind vulkan wayland +webp X @@ -339,8 +339,7 @@ src_configure() { -DWITH_CYCLES_STANDALONE_GUI=no -DWITH_DOC_MANPAGE=$(usex man) - -DWITH_DRACO="no" # TODO: Package Draco - -DWITH_EXPERIMENTAL_FEATURES="$(usex experimental)" + -DWITH_DRACO="yes" # TODO: Package Draco -DWITH_FFTW3=$(usex fftw) -DWITH_GHOST_WAYLAND=$(usex wayland) -DWITH_GHOST_WAYLAND_DYNLOAD="no" @@ -480,15 +479,16 @@ src_test() { DESTDIR="${T}" cmake_build install blender_get_version - # Define custom blender data/script file paths not be able to find them otherwise during testing. - # (Because the data is in the image directory and it will default to look in /usr/share) - export BLENDER_SYSTEM_SCRIPTS="${T}/usr/share/blender/${BV}/scripts" - export BLENDER_SYSTEM_DATAFILES="${T}/usr/share/blender/${BV}/datafiles" + # By default, blender will look for system scripts and data in + # /usr/share/, but until this is installed, they are not necessarily + # available there. Use this to have blender search the intermediate + # install directory instead. + export BLENDER_SYSTEM_RESOURCES="${T}/usr/share/blender/${BV}" - # Sanity check that the script and datafile path is valid. - # If they are not vaild, blender will fallback to the default path which is not what we want. - [ -d "$BLENDER_SYSTEM_SCRIPTS" ] || die "The custom script path is invalid, fix the ebuild!" - [ -d "$BLENDER_SYSTEM_DATAFILES" ] || die "The custom datafiles path is invalid, fix the ebuild!" + # Brake check: Make sure the above path is valid. + # If not, blender will fallback to the default path which is not what + # we want. + [ -d "$BLENDER_SYSTEM_RESOURCES" ] || die "The custom script path is invalid, fix the ebuild!" if use cuda; then cuda_add_sandbox -w @@ -522,10 +522,16 @@ src_install() { fi if use doc; then - # Define custom blender data/script file paths. Otherwise Blender will not be able to find them during doc building. - # (Because the data is in the image directory and it will default to look in /usr/share) - export BLENDER_SYSTEM_SCRIPTS=${ED}/usr/share/blender/${BV}/scripts - export BLENDER_SYSTEM_DATAFILES=${ED}/usr/share/blender/${BV}/datafiles + # By default, blender will look for system scripts and data in + # /usr/share/, but until this is installed, they are not necessarily + # available there. Use this to have blender search the intermediate + # install directory instead. + export BLENDER_SYSTEM_RESOURCES="${ED}/usr/share/blender/${BV}" + + # Brake check: Make sure the above path is valid. + # If not, blender will fallback to the default path which is not what + # we want. + [ -d "$BLENDER_SYSTEM_RESOURCES" ] || die "The custom script path is invalid, fix the ebuild!" # Workaround for binary drivers. addpredict /dev/ati diff --git a/media-gfx/blender/files/blender-3.2.2-Cycles-add-option-to-specify-OptiX-runtime-root-dire.patch b/media-gfx/blender/files/blender-3.2.2-Cycles-add-option-to-specify-OptiX-runtime-root-dire.patch deleted file mode 100644 index 2a7b33cf8ac4..000000000000 --- a/media-gfx/blender/files/blender-3.2.2-Cycles-add-option-to-specify-OptiX-runtime-root-dire.patch +++ /dev/null @@ -1,108 +0,0 @@ -From https://developer.blender.org/rB74caf773619bbf6a0f95c598b66261a6bef392ee -From: Brecht Van Lommel <brecht@blender.org> -Date: Mon, 29 Aug 2022 19:12:15 +0200 -Subject: [PATCH 001/539] Cycles: add option to specify OptiX runtime root - directory - -This allows individual users or Linux distributions to specify a directory -Cycles will automatically look for the OptiX include folder, to compile kernels -at runtime. - -It is still possible to override this with the OPTIX_ROOT_DIR environment -variable at runtime. - -Based on patch by Sebastian Parborg. - -Ref D15792 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -435,10 +435,16 @@ if(NOT APPLE) - option(WITH_CYCLES_CUBIN_COMPILER "Build cubins with nvrtc based compiler instead of nvcc" OFF) - option(WITH_CYCLES_CUDA_BUILD_SERIAL "Build cubins one after another (useful on machines with limited RAM)" OFF) - option(WITH_CUDA_DYNLOAD "Dynamically load CUDA libraries at runtime (for developers, makes cuda-gdb work)" ON) -+ -+ set(OPTIX_ROOT_DIR "" CACHE PATH "Path to the OptiX SDK root directory, for building Cycles OptiX kernels.") -+ set(CYCLES_RUNTIME_OPTIX_ROOT_DIR "" CACHE PATH "Path to the OptiX SDK root directory. When set, this path will be used at runtime to compile OptiX kernels.") -+ - mark_as_advanced(CYCLES_CUDA_BINARIES_ARCH) - mark_as_advanced(WITH_CYCLES_CUBIN_COMPILER) - mark_as_advanced(WITH_CYCLES_CUDA_BUILD_SERIAL) - mark_as_advanced(WITH_CUDA_DYNLOAD) -+ mark_as_advanced(OPTIX_ROOT_DIR) -+ mark_as_advanced(CYCLES_RUNTIME_OPTIX_ROOT_DIR) - endif() - - # AMD HIP ---- a/intern/cycles/device/CMakeLists.txt -+++ b/intern/cycles/device/CMakeLists.txt -@@ -19,6 +19,8 @@ if(WITH_CYCLES_DEVICE_OPTIX OR WITH_CYCLES_DEVICE_CUDA) - ) - add_definitions(-DCYCLES_CUDA_NVCC_EXECUTABLE="${CUDA_NVCC_EXECUTABLE}") - endif() -+ -+ add_definitions(-DCYCLES_RUNTIME_OPTIX_ROOT_DIR="${CYCLES_RUNTIME_OPTIX_ROOT_DIR}") - endif() - - if(WITH_CYCLES_DEVICE_HIP AND WITH_HIP_DYNLOAD) ---- a/intern/cycles/device/optix/device_impl.cpp -+++ b/intern/cycles/device/optix/device_impl.cpp -@@ -342,15 +342,29 @@ BVHLayoutMask OptiXDevice::get_bvh_layout_mask() const - return BVH_LAYOUT_OPTIX; - } - -+static string get_optix_include_dir() -+{ -+ const char *env_dir = getenv("OPTIX_ROOT_DIR"); -+ const char *default_dir = CYCLES_RUNTIME_OPTIX_ROOT_DIR; -+ -+ if (env_dir && env_dir[0]) { -+ const string env_include_dir = path_join(env_dir, "include"); -+ return env_include_dir; -+ } -+ else if (default_dir[0]) { -+ const string default_include_dir = path_join(default_dir, "include"); -+ return default_include_dir; -+ } -+ -+ return string(); -+} -+ - string OptiXDevice::compile_kernel_get_common_cflags(const uint kernel_features) - { - string common_cflags = CUDADevice::compile_kernel_get_common_cflags(kernel_features); - - /* Add OptiX SDK include directory to include paths. */ -- const char *optix_sdk_path = getenv("OPTIX_ROOT_DIR"); -- if (optix_sdk_path) { -- common_cflags += string_printf(" -I\"%s/include\"", optix_sdk_path); -- } -+ common_cflags += string_printf(" -I\"%s/include\"", get_optix_include_dir().c_str()); - - /* Specialization for shader raytracing. */ - if (kernel_features & KERNEL_FEATURE_NODE_RAYTRACE) { -@@ -460,10 +474,19 @@ bool OptiXDevice::load_kernels(const uint kernel_features) - "lib/kernel_optix_shader_raytrace.ptx" : - "lib/kernel_optix.ptx"); - if (use_adaptive_compilation() || path_file_size(ptx_filename) == -1) { -- if (!getenv("OPTIX_ROOT_DIR")) { -+ std::string optix_include_dir = get_optix_include_dir(); -+ if (optix_include_dir.empty()) { - set_error( -- "Missing OPTIX_ROOT_DIR environment variable (which must be set with the path to " -- "the Optix SDK to be able to compile Optix kernels on demand)."); -+ "Unable to compile OptiX kernels at runtime. Set OPTIX_ROOT_DIR environment variable " -+ "to a directory containing the OptiX SDK."); -+ return false; -+ } -+ else if (!path_is_directory(optix_include_dir)) { -+ set_error(string_printf( -+ "OptiX headers not found at %s, unable to compile OptiX kernels at runtime. Install " -+ "OptiX SDK in the specified location, or set OPTIX_ROOT_DIR environment variable to a " -+ "directory containing the OptiX SDK.", -+ optix_include_dir.c_str())); - return false; - } - ptx_filename = compile_kernel( --- -2.37.3 - diff --git a/media-gfx/blender/files/blender-3.2.2-Fix-T100845-wrong-Cycles-OptiX-runtime-compilation-i.patch b/media-gfx/blender/files/blender-3.2.2-Fix-T100845-wrong-Cycles-OptiX-runtime-compilation-i.patch deleted file mode 100644 index 921b648ca388..000000000000 --- a/media-gfx/blender/files/blender-3.2.2-Fix-T100845-wrong-Cycles-OptiX-runtime-compilation-i.patch +++ /dev/null @@ -1,23 +0,0 @@ -From https://developer.blender.org/rB74477149dddfddeca71be6770d520f870c0b5bc9 -From: Josh Whelchel <soundofjw> -Date: Tue, 6 Sep 2022 15:39:39 +0200 -Subject: [PATCH 663/965] Fix T100845: wrong Cycles OptiX runtime compilation - include path - -Causing OptiX kernel build errors on Arch Linux. - -Differential Revision: https://developer.blender.org/D15891 ---- a/intern/cycles/device/optix/device_impl.cpp -+++ b/intern/cycles/device/optix/device_impl.cpp -@@ -364,7 +364,7 @@ string OptiXDevice::compile_kernel_get_common_cflags(const uint kernel_features) - string common_cflags = CUDADevice::compile_kernel_get_common_cflags(kernel_features); - - /* Add OptiX SDK include directory to include paths. */ -- common_cflags += string_printf(" -I\"%s/include\"", get_optix_include_dir().c_str()); -+ common_cflags += string_printf(" -I\"%s\"", get_optix_include_dir().c_str()); - - /* Specialization for shader raytracing. */ - if (kernel_features & KERNEL_FEATURE_NODE_RAYTRACE) { --- -2.37.3 - diff --git a/media-gfx/blender/files/blender-3.2.2-support-building-with-musl-libc.patch b/media-gfx/blender/files/blender-3.2.2-support-building-with-musl-libc.patch deleted file mode 100644 index fb3f2584f0fe..000000000000 --- a/media-gfx/blender/files/blender-3.2.2-support-building-with-musl-libc.patch +++ /dev/null @@ -1,177 +0,0 @@ -CMake: support building with musl libc - -Instead of using macros like GLIBC we can use the CMake build -systems internal functions to check if some header or functions are -present on the running system's libc. - -Add ./build_files/cmake/have_features.cmake to add checks for -platform features which can be used to set defines for source -files that require them. - -Please refer: https://github.com/blender/blender/commit/f197b1a1f1bbc0334310fb1c911327246767a1a3 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -112,6 +112,11 @@ blender_project_hack_post() - - enable_testing() - -+#----------------------------------------------------------------------------- -+# Test compiler/library features. -+ -+include(build_files/cmake/have_features.cmake) -+ - #----------------------------------------------------------------------------- - # Redirect output files - ---- /dev/null -+++ b/build_files/cmake/have_features.cmake -@@ -0,0 +1,33 @@ -+# SPDX-License-Identifier: GPL-2.0-or-later -+# Copyright 2022 Blender Foundation. All rights reserved. -+ -+# This file is used to test the system for headers & symbols. -+# Variables should use the `HAVE_` prefix. -+# Defines should use the same name as the CMAKE variable. -+ -+include(CheckSymbolExists) -+ -+# Used for: `intern/guardedalloc/intern/mallocn_intern.h`. -+# Function `malloc_stats` is only available on GLIBC, -+# so check that before defining `HAVE_MALLOC_STATS`. -+check_symbol_exists(malloc_stats "malloc.h" HAVE_MALLOC_STATS_H) -+ -+# Used for: `source/creator/creator_signals.c`. -+# The function `feenableexcept` is not present non-GLIBC systems, -+# hence we need to check if it's available in the `fenv.h` file. -+set(HAVE_FEENABLEEXCEPT OFF) -+if(CMAKE_SYSTEM_NAME STREQUAL "Linux") -+ check_symbol_exists(feenableexcept "fenv.h" HAVE_FEENABLEEXCEPT) -+endif() -+ -+# Used for: `source/blender/blenlib/intern/system.c`. -+# `execinfo` is not available on non-GLIBC systems (at least not on MUSL-LIBC), -+# so check the presence of the header before including it and using the it for back-trace. -+set(HAVE_EXECINFO_H OFF) -+if(NOT MSVC) -+ include(CheckIncludeFiles) -+ check_include_files("execinfo.h" HAVE_EXECINFO_H) -+ if(HAVE_EXECINFO_H) -+ add_definitions(-DHAVE_EXECINFO_H) -+ endif() -+endif() ---- a/intern/guardedalloc/CMakeLists.txt -+++ b/intern/guardedalloc/CMakeLists.txt -@@ -1,6 +1,10 @@ - # SPDX-License-Identifier: GPL-2.0-or-later - # Copyright 2006 Blender Foundation. All rights reserved. - -+if(HAVE_MALLOC_STATS_H) -+ add_definitions(-DHAVE_MALLOC_STATS_H) -+endif() -+ - set(INC - . - ../atomic ---- a/intern/guardedalloc/intern/mallocn_intern.h -+++ b/intern/guardedalloc/intern/mallocn_intern.h -@@ -17,8 +17,7 @@ - #undef HAVE_MALLOC_STATS - #define USE_MALLOC_USABLE_SIZE /* internal, when we have malloc_usable_size() */ - --#if defined(__linux__) || (defined(__FreeBSD_kernel__) && !defined(__FreeBSD__)) || \ -- defined(__GLIBC__) -+#if defined(HAVE_MALLOC_STATS_H) - # include <malloc.h> - # define HAVE_MALLOC_STATS - #elif defined(__FreeBSD__) ---- a/source/blender/blenlib/CMakeLists.txt -+++ b/source/blender/blenlib/CMakeLists.txt -@@ -1,6 +1,10 @@ - # SPDX-License-Identifier: GPL-2.0-or-later - # Copyright 2006 Blender Foundation. All rights reserved. - -+if(HAVE_EXECINFO_H) -+ add_definitions(-DHAVE_EXECINFO_H) -+endif() -+ - set(INC - . - # ../blenkernel # don't add this back! ---- a/source/blender/blenlib/intern/system.c -+++ b/source/blender/blenlib/intern/system.c -@@ -21,7 +21,9 @@ - - # include "BLI_winstuff.h" - #else --# include <execinfo.h> -+# if defined(HAVE_EXECINFO_H) -+# include <execinfo.h> -+# endif - # include <unistd.h> - #endif - -@@ -61,9 +63,9 @@ int BLI_cpu_support_sse2(void) - #if !defined(_MSC_VER) - void BLI_system_backtrace(FILE *fp) - { -- /* ------------- */ -- /* Linux / Apple */ --# if defined(__linux__) || defined(__APPLE__) -+ /* ----------------------- */ -+ /* If system as execinfo.h */ -+# if defined(HAVE_EXECINFO_H) - - # define SIZE 100 - void *buffer[SIZE]; ---- a/source/blender/makesdna/intern/CMakeLists.txt -+++ b/source/blender/makesdna/intern/CMakeLists.txt -@@ -5,6 +5,11 @@ - - add_definitions(-DWITH_DNA_GHASH) - -+# Needed for `mallocn.c`. -+if(HAVE_MALLOC_STATS_H) -+ add_definitions(-DHAVE_MALLOC_STATS_H) -+endif() -+ - blender_include_dirs( - ../../../../intern/atomic - ../../../../intern/guardedalloc ---- a/source/blender/makesrna/intern/CMakeLists.txt -+++ b/source/blender/makesrna/intern/CMakeLists.txt -@@ -6,6 +6,11 @@ if(CMAKE_COMPILER_IS_GNUCC) - string(APPEND CMAKE_C_FLAGS " -Werror=implicit-function-declaration") - endif() - -+# Needed for `mallocn.c`. -+if(HAVE_MALLOC_STATS_H) -+ add_definitions(-DHAVE_MALLOC_STATS_H) -+endif() -+ - # files rna_access.c rna_define.c makesrna.c intentionally excluded. - set(DEFSRC - rna_ID.c ---- a/source/creator/CMakeLists.txt -+++ b/source/creator/CMakeLists.txt -@@ -22,6 +22,10 @@ set(LIB - bf_windowmanager - ) - -+if(HAVE_FEENABLEEXCEPT) -+ add_definitions(-DHAVE_FEENABLEEXCEPT) -+endif() -+ - if(WITH_TBB) - # Force TBB libraries to be in front of MKL (part of OpenImageDenoise), so - # that it is initialized before MKL and static library initialization order ---- a/source/creator/creator_signals.c -+++ b/source/creator/creator_signals.c -@@ -258,7 +258,7 @@ void main_signal_setup_fpe(void) - * set breakpoints on sig_handle_fpe */ - signal(SIGFPE, sig_handle_fpe); - --# if defined(__linux__) && defined(__GNUC__) -+# if defined(__linux__) && defined(__GNUC__) && defined(HAVE_FEENABLEEXCEPT) - feenableexcept(FE_DIVBYZERO | FE_INVALID | FE_OVERFLOW); - # endif /* defined(__linux__) && defined(__GNUC__) */ - # if defined(OSX_SSE_FPE) diff --git a/media-gfx/blender/files/blender-3.3.0-fix-build-with-boost-1.81.patch b/media-gfx/blender/files/blender-3.3.0-fix-build-with-boost-1.81.patch deleted file mode 100644 index 3a544811e484..000000000000 --- a/media-gfx/blender/files/blender-3.3.0-fix-build-with-boost-1.81.patch +++ /dev/null @@ -1,17 +0,0 @@ -https://bugs.gentoo.org/887059 - -Adding include as suggested by the compiler: - -"intern/locale/boost_locale_wrapper.cpp:12:1: note: ‘std::cout’ is defined -in header ‘<iostream>’; did you forget to ‘#include <iostream>’?" - ---- a/intern/locale/boost_locale_wrapper.cpp -+++ b/intern/locale/boost_locale_wrapper.cpp -@@ -9,6 +9,7 @@ - #include <stdio.h> - - #include "boost_locale_wrapper.h" -+#include <iostream> - - static std::string messages_path; - static std::string default_domain; diff --git a/media-gfx/blender/files/blender-3.3.6-cycles-gcc13.patch b/media-gfx/blender/files/blender-3.3.6-cycles-gcc13.patch deleted file mode 100644 index 955be2424e19..000000000000 --- a/media-gfx/blender/files/blender-3.3.6-cycles-gcc13.patch +++ /dev/null @@ -1,12 +0,0 @@ -https://bugs.gentoo.org/914740 ---- a/intern/cycles/util/thread.cpp -+++ b/intern/cycles/util/thread.cpp -@@ -6,6 +6,8 @@ - #include "util/system.h" - #include "util/windows.h" - -+#include <system_error> -+ - CCL_NAMESPACE_BEGIN - - thread::thread(function<void()> run_cb) : run_cb_(run_cb), joined_(false) diff --git a/media-gfx/blender/files/blender-4.0.1-fix-cflags-cleaner.patch b/media-gfx/blender/files/blender-4.0.1-fix-cflags-cleaner.patch deleted file mode 100644 index d28db84d8c36..000000000000 --- a/media-gfx/blender/files/blender-4.0.1-fix-cflags-cleaner.patch +++ /dev/null @@ -1,39 +0,0 @@ -Fix CMake Error: string sub-command REGEX, mode REPLACE needs at least 6 arguments total to command. -https://bugs.gentoo.org/922324 -https://github.com/blender/blender/commit/ecd307041e4181f721bf5d2248c02ffe980edcba ---- a/build_files/cmake/macros.cmake -+++ b/build_files/cmake/macros.cmake -@@ -750,11 +750,11 @@ macro(remove_c_flag - _flag) - - foreach(f ${ARGV}) -- string(REGEX REPLACE ${f} "" CMAKE_C_FLAGS ${CMAKE_C_FLAGS}) -- string(REGEX REPLACE ${f} "" CMAKE_C_FLAGS_DEBUG ${CMAKE_C_FLAGS_DEBUG}) -- string(REGEX REPLACE ${f} "" CMAKE_C_FLAGS_RELEASE ${CMAKE_C_FLAGS_RELEASE}) -- string(REGEX REPLACE ${f} "" CMAKE_C_FLAGS_MINSIZEREL ${CMAKE_C_FLAGS_MINSIZEREL}) -- string(REGEX REPLACE ${f} "" CMAKE_C_FLAGS_RELWITHDEBINFO ${CMAKE_C_FLAGS_RELWITHDEBINFO}) -+ string(REGEX REPLACE ${f} "" CMAKE_C_FLAGS "${CMAKE_C_FLAGS}") -+ string(REGEX REPLACE ${f} "" CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG}") -+ string(REGEX REPLACE ${f} "" CMAKE_C_FLAGS_RELEASE "${CMAKE_C_FLAGS_RELEASE}") -+ string(REGEX REPLACE ${f} "" CMAKE_C_FLAGS_MINSIZEREL "${CMAKE_C_FLAGS_MINSIZEREL}") -+ string(REGEX REPLACE ${f} "" CMAKE_C_FLAGS_RELWITHDEBINFO "${CMAKE_C_FLAGS_RELWITHDEBINFO}") - endforeach() - unset(f) - endmacro() -@@ -763,11 +763,11 @@ macro(remove_cxx_flag - _flag) - - foreach(f ${ARGV}) -- string(REGEX REPLACE ${f} "" CMAKE_CXX_FLAGS ${CMAKE_CXX_FLAGS}) -- string(REGEX REPLACE ${f} "" CMAKE_CXX_FLAGS_DEBUG ${CMAKE_CXX_FLAGS_DEBUG}) -- string(REGEX REPLACE ${f} "" CMAKE_CXX_FLAGS_RELEASE ${CMAKE_CXX_FLAGS_RELEASE}) -- string(REGEX REPLACE ${f} "" CMAKE_CXX_FLAGS_MINSIZEREL ${CMAKE_CXX_FLAGS_MINSIZEREL}) -- string(REGEX REPLACE ${f} "" CMAKE_CXX_FLAGS_RELWITHDEBINFO ${CMAKE_CXX_FLAGS_RELWITHDEBINFO}) -+ string(REGEX REPLACE ${f} "" CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS}") -+ string(REGEX REPLACE ${f} "" CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG}") -+ string(REGEX REPLACE ${f} "" CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE}") -+ string(REGEX REPLACE ${f} "" CMAKE_CXX_FLAGS_MINSIZEREL "${CMAKE_CXX_FLAGS_MINSIZEREL}") -+ string(REGEX REPLACE ${f} "" CMAKE_CXX_FLAGS_RELWITHDEBINFO "${CMAKE_CXX_FLAGS_RELWITHDEBINFO}") - endforeach() - unset(f) - endmacro()
\ No newline at end of file diff --git a/media-gfx/blender/files/blender-4.0.1-openvdb-11.patch b/media-gfx/blender/files/blender-4.0.1-openvdb-11.patch deleted file mode 100644 index 1f1561e8e7db..000000000000 --- a/media-gfx/blender/files/blender-4.0.1-openvdb-11.patch +++ /dev/null @@ -1,75 +0,0 @@ -From: Paul Zander <negril.nx+gentoo@gmail.com> -Change lookup for OpenVDB-11 ---- a/intern/cycles/scene/image_vdb.cpp 2023-11-23 14:42:38.772685628 +0100 -+++ b/intern/cycles/scene/image_vdb.cpp 2023-11-23 15:19:55.475804922 +0100 -@@ -11,7 +11,14 @@ - # include <openvdb/tools/Dense.h> - #endif - #ifdef WITH_NANOVDB --# include <nanovdb/util/OpenToNanoVDB.h> -+# include <nanovdb/NanoVDB.h> -+# define NANOVDB_VERSION(major, minor, patch) (major << 21 | minor << 10 | patch) -+# if NANOVDB_VERSION(NANOVDB_MAJOR_VERSION_NUMBER, NANOVDB_MINOR_VERSION_NUMBER, NANOVDB_PATCH_VERSION_NUMBER) >= NANOVDB_VERSION(32, 6, 0) -+# include <nanovdb/util/CreateNanoGrid.h> -+# else -+# include <nanovdb/util/OpenToNanoVDB.h> -+# endif -+# undef NANOVDB_VERSION - #endif - - CCL_NAMESPACE_BEGIN -@@ -55,20 +62,35 @@ - FloatGridType floatgrid(*openvdb::gridConstPtrCast<GridType>(grid)); - if constexpr (std::is_same_v<FloatGridType, openvdb::FloatGrid>) { - if (precision == 0) { -- nanogrid = nanovdb::openToNanoVDB<nanovdb::HostBuffer, -- typename FloatGridType::TreeType, -- nanovdb::FpN>(floatgrid); -+ if constexpr (nanovdb::Version() >= nanovdb::Version(32,6,0)) { -+ nanogrid = nanovdb::createNanoGrid(floatgrid); -+ } -+ else { -+ nanogrid = nanovdb::openToNanoVDB<nanovdb::HostBuffer, -+ typename FloatGridType::TreeType, -+ nanovdb::FpN>(floatgrid); -+ } - return true; - } -- else if (precision == 16) { -- nanogrid = nanovdb::openToNanoVDB<nanovdb::HostBuffer, -- typename FloatGridType::TreeType, -- nanovdb::Fp16>(floatgrid); -+ if (precision == 16) { -+ if constexpr (nanovdb::Version() > nanovdb::Version(32,4,0)) { -+ nanogrid = nanovdb::createNanoGrid(floatgrid); -+ } -+ else { -+ nanogrid = nanovdb::openToNanoVDB<nanovdb::HostBuffer, -+ typename FloatGridType::TreeType, -+ nanovdb::Fp16>(floatgrid); -+ } - return true; - } - } - -- nanogrid = nanovdb::openToNanoVDB(floatgrid); -+ if constexpr (nanovdb::Version() > nanovdb::Version(32,4,0)) { -+ nanogrid = nanovdb::createNanoGrid(floatgrid); -+ } -+ else { -+ nanogrid = nanovdb::openToNanoVDB(floatgrid); -+ } - } - catch (const std::exception &e) { - VLOG_WARNING << "Error converting OpenVDB to NanoVDB grid: " << e.what(); ---- a/CMakeLists.txt 2023-11-23 15:59:58.715805024 +0100 -+++ b/CMakeLists.txt 2023-11-23 16:06:42.352711508 +0100 -@@ -1461,7 +1461,7 @@ - endif() - - if(WITH_OPENVDB) -- list(APPEND OPENVDB_DEFINITIONS -DWITH_OPENVDB) -+ list(APPEND OPENVDB_DEFINITIONS -DWITH_OPENVDB -DNANOVDB_USE_OPENVDB) - - if(WITH_OPENVDB_3_ABI_COMPATIBLE) - list(APPEND OPENVDB_DEFINITIONS -DOPENVDB_3_ABI_COMPATIBLE) diff --git a/media-gfx/blender/files/blender-4.0.2-r1-osl-1.13.patch b/media-gfx/blender/files/blender-4.0.2-r1-osl-1.13.patch deleted file mode 100644 index 064abf21c6a6..000000000000 --- a/media-gfx/blender/files/blender-4.0.2-r1-osl-1.13.patch +++ /dev/null @@ -1,342 +0,0 @@ -From 798a0b301e640e73ae12e6f8a36a66746893bff1 Mon Sep 17 00:00:00 2001 -From: Brecht Van Lommel <brecht@blender.org> -Date: Sun, 10 Dec 2023 17:08:47 +0100 -Subject: [PATCH] Cycles: update OSL to work with version 1.13.5 - -This keeps compatibility with older stable versions, but not -older unreleased versions in the 1.13.x series. - -Ref #113157 - -Pull Request: https://projects.blender.org/blender/blender/pulls/116004 ---- - intern/cycles/device/cpu/device_impl.cpp | 2 +- - .../device/cpu/kernel_thread_globals.cpp | 6 ++- - .../cycles/device/cpu/kernel_thread_globals.h | 3 +- - intern/cycles/kernel/device/cpu/globals.h | 1 + - intern/cycles/kernel/osl/closures.cpp | 52 ++++++++++++++++++- - intern/cycles/kernel/osl/globals.cpp | 3 +- - intern/cycles/kernel/osl/globals.h | 4 +- - intern/cycles/kernel/osl/osl.h | 5 ++ - intern/cycles/kernel/osl/services.cpp | 27 ++++++++-- - intern/cycles/kernel/osl/services.h | 21 +++++++- - intern/cycles/kernel/osl/types.h | 4 +- - 11 files changed, 115 insertions(+), 13 deletions(-) - -diff --git a/intern/cycles/device/cpu/device_impl.cpp b/intern/cycles/device/cpu/device_impl.cpp -index cbbdb844323..ba838233855 100644 ---- a/intern/cycles/device/cpu/device_impl.cpp -+++ b/intern/cycles/device/cpu/device_impl.cpp -@@ -313,7 +313,7 @@ void CPUDevice::get_cpu_kernel_thread_globals( - kernel_thread_globals.clear(); - void *osl_memory = get_cpu_osl_memory(); - for (int i = 0; i < info.cpu_threads; i++) { -- kernel_thread_globals.emplace_back(kernel_globals, osl_memory, profiler); -+ kernel_thread_globals.emplace_back(kernel_globals, osl_memory, profiler, i); - } - } - -diff --git a/intern/cycles/device/cpu/kernel_thread_globals.cpp b/intern/cycles/device/cpu/kernel_thread_globals.cpp -index 546061a5086..998a63aa334 100644 ---- a/intern/cycles/device/cpu/kernel_thread_globals.cpp -+++ b/intern/cycles/device/cpu/kernel_thread_globals.cpp -@@ -12,14 +12,16 @@ CCL_NAMESPACE_BEGIN - - CPUKernelThreadGlobals::CPUKernelThreadGlobals(const KernelGlobalsCPU &kernel_globals, - void *osl_globals_memory, -- Profiler &cpu_profiler) -+ Profiler &cpu_profiler, -+ const int thread_index) - : KernelGlobalsCPU(kernel_globals), cpu_profiler_(cpu_profiler) - { - clear_runtime_pointers(); - - #ifdef WITH_OSL -- OSLGlobals::thread_init(this, static_cast<OSLGlobals *>(osl_globals_memory)); -+ OSLGlobals::thread_init(this, static_cast<OSLGlobals *>(osl_globals_memory), thread_index); - #else -+ (void)thread_index; - (void)osl_globals_memory; - #endif - -diff --git a/intern/cycles/device/cpu/kernel_thread_globals.h b/intern/cycles/device/cpu/kernel_thread_globals.h -index dc4b693702a..3dbc35fefa3 100644 ---- a/intern/cycles/device/cpu/kernel_thread_globals.h -+++ b/intern/cycles/device/cpu/kernel_thread_globals.h -@@ -23,7 +23,8 @@ class CPUKernelThreadGlobals : public KernelGlobalsCPU { - * without OSL support. Will avoid need to those unnamed pointers and casts. */ - CPUKernelThreadGlobals(const KernelGlobalsCPU &kernel_globals, - void *osl_globals_memory, -- Profiler &cpu_profiler); -+ Profiler &cpu_profiler, -+ const int thread_index); - - ~CPUKernelThreadGlobals(); - -diff --git a/intern/cycles/kernel/device/cpu/globals.h b/intern/cycles/kernel/device/cpu/globals.h -index 90a274b2bcf..d0495883e27 100644 ---- a/intern/cycles/kernel/device/cpu/globals.h -+++ b/intern/cycles/kernel/device/cpu/globals.h -@@ -49,6 +49,7 @@ typedef struct KernelGlobalsCPU { - OSLGlobals *osl = nullptr; - OSLShadingSystem *osl_ss = nullptr; - OSLThreadData *osl_tdata = nullptr; -+ int osl_thread_index = 0; - #endif - - #ifdef __PATH_GUIDING__ -diff --git a/intern/cycles/kernel/osl/closures.cpp b/intern/cycles/kernel/osl/closures.cpp -index 808e13f48d6..4a5906873af 100644 ---- a/intern/cycles/kernel/osl/closures.cpp -+++ b/intern/cycles/kernel/osl/closures.cpp -@@ -110,7 +110,17 @@ void osl_eval_nodes<SHADER_TYPE_SURFACE>(const KernelGlobalsCPU *kg, - if (sd->object == OBJECT_NONE && sd->lamp == LAMP_NONE) { - /* background */ - if (kg->osl->background_state) { -+#if OSL_LIBRARY_VERSION_CODE >= 11304 -+ ss->execute(*octx, -+ *(kg->osl->background_state), -+ kg->osl_thread_index, -+ 0, -+ *globals, -+ nullptr, -+ nullptr); -+#else - ss->execute(octx, *(kg->osl->background_state), *globals); -+#endif - } - } - else { -@@ -150,8 +160,18 @@ void osl_eval_nodes<SHADER_TYPE_SURFACE>(const KernelGlobalsCPU *kg, - globals->dPdy = TO_VEC3(tmp_dP.dy); - } - -- /* execute bump shader */ -+/* execute bump shader */ -+#if OSL_LIBRARY_VERSION_CODE >= 11304 -+ ss->execute(*octx, -+ *(kg->osl->bump_state[shader]), -+ kg->osl_thread_index, -+ 0, -+ *globals, -+ nullptr, -+ nullptr); -+#else - ss->execute(octx, *(kg->osl->bump_state[shader]), *globals); -+#endif - - /* reset state */ - sd->P = P; -@@ -164,7 +184,17 @@ void osl_eval_nodes<SHADER_TYPE_SURFACE>(const KernelGlobalsCPU *kg, - - /* surface shader */ - if (kg->osl->surface_state[shader]) { -+#if OSL_LIBRARY_VERSION_CODE >= 11304 -+ ss->execute(*octx, -+ *(kg->osl->surface_state[shader]), -+ kg->osl_thread_index, -+ 0, -+ *globals, -+ nullptr, -+ nullptr); -+#else - ss->execute(octx, *(kg->osl->surface_state[shader]), *globals); -+#endif - } - } - -@@ -208,7 +238,17 @@ void osl_eval_nodes<SHADER_TYPE_VOLUME>(const KernelGlobalsCPU *kg, - int shader = sd->shader & SHADER_MASK; - - if (kg->osl->volume_state[shader]) { -+#if OSL_LIBRARY_VERSION_CODE >= 11304 -+ ss->execute(*octx, -+ *(kg->osl->volume_state[shader]), -+ kg->osl_thread_index, -+ 0, -+ *globals, -+ nullptr, -+ nullptr); -+#else - ss->execute(octx, *(kg->osl->volume_state[shader]), *globals); -+#endif - } - - /* flatten closure tree */ -@@ -245,7 +285,17 @@ void osl_eval_nodes<SHADER_TYPE_DISPLACEMENT>(const KernelGlobalsCPU *kg, - int shader = sd->shader & SHADER_MASK; - - if (kg->osl->displacement_state[shader]) { -+#if OSL_LIBRARY_VERSION_CODE >= 11304 -+ ss->execute(*octx, -+ *(kg->osl->displacement_state[shader]), -+ kg->osl_thread_index, -+ 0, -+ *globals, -+ nullptr, -+ nullptr); -+#else - ss->execute(octx, *(kg->osl->displacement_state[shader]), *globals); -+#endif - } - - /* get back position */ -diff --git a/intern/cycles/kernel/osl/globals.cpp b/intern/cycles/kernel/osl/globals.cpp -index c4f055af7f7..573ddb6f362 100644 ---- a/intern/cycles/kernel/osl/globals.cpp -+++ b/intern/cycles/kernel/osl/globals.cpp -@@ -14,7 +14,7 @@ - - CCL_NAMESPACE_BEGIN - --void OSLGlobals::thread_init(KernelGlobalsCPU *kg, OSLGlobals *osl_globals) -+void OSLGlobals::thread_init(KernelGlobalsCPU *kg, OSLGlobals *osl_globals, const int thread_index) - { - /* no osl used? */ - if (!osl_globals->use) { -@@ -37,6 +37,7 @@ void OSLGlobals::thread_init(KernelGlobalsCPU *kg, OSLGlobals *osl_globals) - - kg->osl_ss = (OSLShadingSystem *)ss; - kg->osl_tdata = tdata; -+ kg->osl_thread_index = thread_index; - } - - void OSLGlobals::thread_free(KernelGlobalsCPU *kg) -diff --git a/intern/cycles/kernel/osl/globals.h b/intern/cycles/kernel/osl/globals.h -index 9656ef08306..cf24c62613b 100644 ---- a/intern/cycles/kernel/osl/globals.h -+++ b/intern/cycles/kernel/osl/globals.h -@@ -45,7 +45,9 @@ struct OSLGlobals { - } - - /* per thread data */ -- static void thread_init(struct KernelGlobalsCPU *kg, OSLGlobals *osl_globals); -+ static void thread_init(struct KernelGlobalsCPU *kg, -+ OSLGlobals *osl_globals, -+ const int thread_init); - static void thread_free(struct KernelGlobalsCPU *kg); - - bool use; -diff --git a/intern/cycles/kernel/osl/osl.h b/intern/cycles/kernel/osl/osl.h -index 347b635632a..3238eb5096b 100644 ---- a/intern/cycles/kernel/osl/osl.h -+++ b/intern/cycles/kernel/osl/osl.h -@@ -52,6 +52,11 @@ ccl_device_inline void shaderdata_to_shaderglobals(KernelGlobals kg, - - /* shader data to be used in services callbacks */ - globals->renderstate = sd; -+#if OSL_LIBRARY_VERSION_CODE >= 11304 -+ globals->shadingStateUniform = nullptr; -+ globals->thread_index = 0; -+ globals->shade_index = 0; -+#endif - - /* hacky, we leave it to services to fetch actual object matrix */ - globals->shader2common = sd; -diff --git a/intern/cycles/kernel/osl/services.cpp b/intern/cycles/kernel/osl/services.cpp -index 02dc1cd1aec..93595b0a458 100644 ---- a/intern/cycles/kernel/osl/services.cpp -+++ b/intern/cycles/kernel/osl/services.cpp -@@ -1165,7 +1165,18 @@ bool OSLRenderServices::get_userdata( - return false; /* disabled by lockgeom */ - } - --#if OSL_LIBRARY_VERSION_CODE >= 11100 -+#if OSL_LIBRARY_VERSION_CODE >= 11304 -+TextureSystem::TextureHandle *OSLRenderServices::get_texture_handle(OSLUStringHash filename, -+ OSL::ShadingContext *context, -+ const TextureOpt *opt) -+{ -+ return get_texture_handle(to_ustring(filename), context, opt); -+} -+ -+TextureSystem::TextureHandle *OSLRenderServices::get_texture_handle(OSL::ustring filename, -+ OSL::ShadingContext *, -+ const TextureOpt *) -+#elif OSL_LIBRARY_VERSION_CODE >= 11100 - TextureSystem::TextureHandle *OSLRenderServices::get_texture_handle(OSLUStringHash filename, - OSL::ShadingContext *) - #else -@@ -1616,7 +1627,17 @@ bool OSLRenderServices::environment(OSLUStringHash filename, - return status; - } - --#if OSL_LIBRARY_VERSION_CODE >= 11100 -+#if OSL_LIBRARY_VERSION_CODE >= 11304 -+bool OSLRenderServices::get_texture_info(OSLUStringHash filename, -+ TextureHandle *texture_handle, -+ TexturePerthread *texture_thread_info, -+ OSL::ShaderGlobals *, -+ int subimage, -+ OSLUStringHash dataname, -+ TypeDesc datatype, -+ void *data, -+ OSLUStringHash *) -+#elif OSL_LIBRARY_VERSION_CODE >= 11100 - bool OSLRenderServices::get_texture_info(OSLUStringHash filename, - TextureHandle *texture_handle, - TexturePerthread *texture_thread_info, -@@ -1627,7 +1648,7 @@ bool OSLRenderServices::get_texture_info(OSLUStringHash filename, - void *data, - OSLUStringHash *) - #else --bool OSLRenderServices::get_texture_info(OSL::ShaderGlobals *sg, -+bool OSLRenderServices::get_texture_info(OSL::ShaderGlobals *, - OSLUStringHash filename, - TextureHandle *texture_handle, - int subimage, -diff --git a/intern/cycles/kernel/osl/services.h b/intern/cycles/kernel/osl/services.h -index b674fa7c7a7..62d8a4c5416 100644 ---- a/intern/cycles/kernel/osl/services.h -+++ b/intern/cycles/kernel/osl/services.h -@@ -189,7 +189,14 @@ class OSLRenderServices : public OSL::RendererServices { - void *val, - bool derivatives) override; - --#if OSL_LIBRARY_VERSION_CODE >= 11100 -+#if OSL_LIBRARY_VERSION_CODE >= 11304 -+ TextureSystem::TextureHandle *get_texture_handle(OSL::ustring filename, -+ OSL::ShadingContext *context, -+ const TextureOpt *options) override; -+ TextureSystem::TextureHandle *get_texture_handle(OSLUStringHash filename, -+ OSL::ShadingContext *context, -+ const TextureOpt *options) override; -+#elif OSL_LIBRARY_VERSION_CODE >= 11100 - TextureSystem::TextureHandle *get_texture_handle(OSLUStringHash filename, - OSL::ShadingContext *context) override; - #else -@@ -245,7 +252,17 @@ class OSLRenderServices : public OSL::RendererServices { - float *dresultdt, - OSLUStringHash *errormessage) override; - --#if OSL_LIBRARY_VERSION_CODE >= 11100 -+#if OSL_LIBRARY_VERSION_CODE >= 11304 -+ bool get_texture_info(OSLUStringHash filename, -+ TextureHandle *texture_handle, -+ TexturePerthread *texture_thread_info, -+ OSL::ShaderGlobals *sg, -+ int subimage, -+ OSLUStringHash dataname, -+ TypeDesc datatype, -+ void *data, -+ OSLUStringHash *errormessage) override; -+#elif OSL_LIBRARY_VERSION_CODE >= 11100 - bool get_texture_info(OSLUStringHash filename, - TextureHandle *texture_handle, - TexturePerthread *texture_thread_info, -diff --git a/intern/cycles/kernel/osl/types.h b/intern/cycles/kernel/osl/types.h -index 71c808ff91b..8cb5779961a 100644 ---- a/intern/cycles/kernel/osl/types.h -+++ b/intern/cycles/kernel/osl/types.h -@@ -86,8 +86,10 @@ struct ShaderGlobals { - ccl_private void *tracedata; - ccl_private void *objdata; - void *context; --#if OSL_LIBRARY_VERSION_CODE >= 11302 -+#if OSL_LIBRARY_VERSION_CODE >= 11304 - void *shadingStateUniform; -+ int thread_index; -+ int shade_index; - #endif - void *renderer; - ccl_private void *object2common; diff --git a/media-gfx/blender/metadata.xml b/media-gfx/blender/metadata.xml index e9c0f2846ae7..927ab93cc1a5 100644 --- a/media-gfx/blender/metadata.xml +++ b/media-gfx/blender/metadata.xml @@ -37,8 +37,7 @@ Build cycles renderer with AMD HIP support. </flag> <flag name="cycles"> - Build cycles renderer (requires <pkg>media-libs/openimageio</pkg> and - <pkg>dev-libs/boost</pkg>). + Enable the Cycles raytracing render engine. </flag> <flag name="cycles-bin-kernels"> Precompile the cycles render kernels for the CUDA/HIP/OneAPI backends, if they are enabled, at compile time. @@ -57,9 +56,6 @@ <flag name="fluid"> Adds fluid simulation support via the built-in Mantaflow library. </flag> - <flag name="headless"> - Build without graphical support (renderfarm, server mode only). - </flag> <flag name="nanovdb"> Enable nanoVDB support in Cycles. Uses less memory than regular openVDB when rendering. </flag> @@ -68,7 +64,6 @@ </flag> <flag name="oidn">Enable OpenImageDenoiser Support</flag> <flag name="oneapi">Build OIDN with Intel oneAPI SyCL support</flag> - <flag name="openimageio">Enable OpenImageIO Support</flag> <flag name="openpgl">Enable path guiding support in Cycles</flag> <flag name="opensubdiv"> Add rendering support form OpenSubdiv from Dreamworks Animation diff --git a/media-gfx/chafa/Manifest b/media-gfx/chafa/Manifest index 56b538fe9558..496ddfee5556 100644 --- a/media-gfx/chafa/Manifest +++ b/media-gfx/chafa/Manifest @@ -1,5 +1,5 @@ DIST chafa-1.12.5.tar.xz 939792 BLAKE2B 82fbcd7b071dba8534fdd391b6ce22f6de63b1e3eb30228ba1ce6e751c442efbc4a5141d30fa767cc0789b01518da016a4245f9c560837530daa4d92534a9eca SHA512 d0b719294bdc8880f2c65c1bd777ac0eb98d47d48147bc6f883f1917d4f9a6b246c4e9365bc0128b1332d4a268611ac7e479f346f13c49d2e56ff4f446f22d94 DIST chafa-1.14.1.tar.xz 991656 BLAKE2B 1a7ba4c7d3958396c89b7b2f2873b4c1dfcf5209ae0d53fd0b2e014c3012a316a2d197a2f593c230e02bed01ed3119d6d0659d21b5f5d02dacd7eaaa626f2cb8 SHA512 61872acc3370318ab1a363cd21839978825d722d64225f968fd12acae1b7cf4a9be0f011fa2ab69a62cf61e32f095bb47aaf9d8796b97f25844703e7dfdfea35 -EBUILD chafa-1.12.5-r1.ebuild 917 BLAKE2B 3ee34e90b08a4e70d8a54cedb6d786e50ad8a5aecb09b0dd9b55ab995a4cbc009c3089f567c1f18e20b725ebb71ea6462645e48cd5cd03f37c04a30055ae4c50 SHA512 c0962397f20f465e0a8d8c7356809fc9f379217f39de8b9330707f62f75eeefef565fc313f58c96ffacb85968c3010e7f4c223f1a8e00443438316b502218785 -EBUILD chafa-1.14.1.ebuild 854 BLAKE2B 2b185dba35bcbcfaa68feb2bec65de6e9d9ba689bf24d1a9d06ac1248713776c4c469a147389d0c5c8b0a4e3042d689f683f8f8fb04065f550e9b415b542f3ba SHA512 6c4e875b1abb9434f2604e546514be227f10c9ada298cbb9e9d683646702e247cc472aabff90a5bf64c259438fc0a8c1d1686516d43f7b886dbef908c8426794 +EBUILD chafa-1.12.5-r1.ebuild 1083 BLAKE2B cc02a07997dba904e0ba7841b4ed25846bdeec242204dcd4a2f2fd071c3d9f2e235486983fd2f32cea45781d6ac017cb6b4c4f624edcfbb6c24c7f9b1e92a7bc SHA512 d0131c1a979f1f27dcb76736180713a7e9e1f196420e129dc7dc3b3105f35cb1d434d1ff3a02ba9062d24a13123b34b9f283bd6f2e319db9afe083a351243815 +EBUILD chafa-1.14.1.ebuild 1017 BLAKE2B 1a484415610709600ab38955d4f38f947631a1c9da97cf435aa1ff0e143e3da12a17aaebd2895f7b14e13d789f022b514e7de5b58d1fc7dd484cb6512e55b2c9 SHA512 5f09b3202d1b7893fcb80caee639433c47e17d81c11a6013e5450859414fa9054fe9fdfc45477c9bd0a181accb98af056b94e53896ba18604c1d6d65d75b9cd3 MISC metadata.xml 316 BLAKE2B 2a0c72d22e04271cea1887a17cd6a61b0aadb0ae6bf53385e2aae5ae4add3b47a32892dabdab8a328a78a89a63aee2d62fd47de97f389ed7eb15cbe0dde1ea24 SHA512 aa9c46f2b48f8b5413492a32e0bc7397cbd3acc23d040e6f77a05428bc964e1412345e7516be5406261f00665e16e89f1bd00b93f0f2757466514a82762fd01b diff --git a/media-gfx/chafa/chafa-1.12.5-r1.ebuild b/media-gfx/chafa/chafa-1.12.5-r1.ebuild index 5086db9e3356..06c118fd88ee 100644 --- a/media-gfx/chafa/chafa-1.12.5-r1.ebuild +++ b/media-gfx/chafa/chafa-1.12.5-r1.ebuild @@ -3,7 +3,7 @@ EAPI=8 -inherit flag-o-matic +inherit flag-o-matic libtool DESCRIPTION="versatile and fast Unicode/ASCII/ANSI graphics renderer" HOMEPAGE="https://hpjansson.org/chafa/ https://github.com/hpjansson/chafa" @@ -23,6 +23,16 @@ RDEPEND=" DEPEND="${RDEPEND}" BDEPEND="virtual/pkgconfig" +QA_CONFIG_IMPL_DECL_SKIP=( + # checking for intrinsics, will fail where not supported. bug #927102 + _mm_popcnt_u64 +) + +src_prepare() { + default + elibtoolize +} + src_configure() { # bug 909429 use webp && append-ldflags -lwebp diff --git a/media-gfx/chafa/chafa-1.14.1.ebuild b/media-gfx/chafa/chafa-1.14.1.ebuild index 06484a9f1cb7..7b4ded23c6ce 100644 --- a/media-gfx/chafa/chafa-1.14.1.ebuild +++ b/media-gfx/chafa/chafa-1.14.1.ebuild @@ -3,7 +3,7 @@ EAPI=8 -inherit flag-o-matic +inherit flag-o-matic libtool DESCRIPTION="versatile and fast Unicode/ASCII/ANSI graphics renderer" HOMEPAGE="https://hpjansson.org/chafa/ https://github.com/hpjansson/chafa" @@ -11,7 +11,7 @@ SRC_URI="https://hpjansson.org/chafa/releases/${P}.tar.xz" LICENSE="LGPL-3+" SLOT="0" -KEYWORDS="~amd64 ~arm ~arm64 ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86" +KEYWORDS="amd64 ~arm arm64 ~loong ~mips ~ppc ppc64 ~riscv ~sparc ~x86" IUSE="+tools webp" RDEPEND=" @@ -22,6 +22,16 @@ RDEPEND=" DEPEND="${RDEPEND}" BDEPEND="virtual/pkgconfig" +QA_CONFIG_IMPL_DECL_SKIP=( + # checking for intrinsics, will fail where not supported. bug #927102 + _mm_popcnt_u64 +) + +src_prepare() { + default + elibtoolize +} + src_configure() { # bug 909429 use webp && append-ldflags -lwebp diff --git a/media-gfx/clockphoto/Manifest b/media-gfx/clockphoto/Manifest index 2924a62797a1..9bdce4e91801 100644 --- a/media-gfx/clockphoto/Manifest +++ b/media-gfx/clockphoto/Manifest @@ -1,3 +1,3 @@ DIST clockphoto-1.2.tar.xz 717836 BLAKE2B b730ed9cca21ef7c23c6d6eeacbbdb59df6b5ac6c59b5f9821f4958ebc212df6c803cd062400c19e9e66e39c711a80cdf3355d53d6f6f10237cb67e40b818e28 SHA512 db5740b3c291df8cc79dec94196aa912afd316c601ddd6809b76d3a9f12a4df9b6530d4c9a031720cd5f309d7d05cbe62530ce1e2a9d8a7c2997d56a30b97739 -EBUILD clockphoto-1.2.ebuild 535 BLAKE2B 42d9dfd777c29f77636b2d5e8d9e7ae180773d03178eb346d624bbed19dcdad62659ec14c5119f9cf6b469bb14263b92e9ef8df44d2d1a9d2d68af9f2f4fbcd9 SHA512 a80f18adda2f4fc196ccf927d5c52fb14dd01d0251899a941cb48f5c2cb31466b8d97db1e869a4cd2bdb6c18711869eb3413c4eeaac2acd597e4bcccfa117de8 +EBUILD clockphoto-1.2-r1.ebuild 512 BLAKE2B e23ed275f6f06e10f955297bc8881c0fa5da34c1b9e54742d9887cfa7390a838828d8a1dd7f6d1aa29490cfc535f5363cfb18d0fff3238822f7d1aee2bbae7bb SHA512 8f797c1146677bbc94a4fc786bf075a8ffe4390ede1232753dbc493ef96b8b1eff9348f60854f5643019c0d96e1ea88002b30741730d01fd6b573da492fd86a1 MISC metadata.xml 251 BLAKE2B b1977a04e8904e65636648bd24804893bc0a317a7a20a8b4bac3874f0529dd15b2c058b0002b13febafcdfd93cbef59ef7bc1c646f3996c381b994d384b73ba3 SHA512 25f6fc31ee9e87d78b143500e706ac3417896e67a183470867130b23a42ec8ddd4cdd9a1da40f32903085ee4add969b4b07466b90fb0275308a2518d2d73a270 diff --git a/media-gfx/clockphoto/clockphoto-1.2.ebuild b/media-gfx/clockphoto/clockphoto-1.2-r1.ebuild index 65ac45e140a5..05cf24100029 100644 --- a/media-gfx/clockphoto/clockphoto-1.2.ebuild +++ b/media-gfx/clockphoto/clockphoto-1.2-r1.ebuild @@ -1,7 +1,7 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2025 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 inherit qmake-utils @@ -15,16 +15,14 @@ KEYWORDS="amd64 x86" IUSE="" DEPEND=" - dev-qt/qtcore:5 - dev-qt/qtgui:5 - dev-qt/qtwidgets:5 + dev-qt/qtbase:6[gui,widgets] " RDEPEND="${DEPEND} media-gfx/exiv2 " src_configure() { - eqmake5 + eqmake6 } src_install() { diff --git a/media-gfx/converseen/Manifest b/media-gfx/converseen/Manifest index a526d9aad3ed..988995dccb28 100644 --- a/media-gfx/converseen/Manifest +++ b/media-gfx/converseen/Manifest @@ -1,9 +1,6 @@ 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.9.9.0-appdata-path.patch 604 BLAKE2B ca524ae4a52f74b687e0e0246d758178d4287b3e866651293233c7055a38cdf6330fd2c2dfb0728c0b07f37b631dbd1c59159039b56be35fbc349d183dfd0dbd SHA512 411696d39dcca09a33119537600efd80bcf675714ea72548500f9c2a1112e61d53edc6d891cef770aac3cdd2cb881e169b4ab833521ae152859609871807066e +AUX converseen-0.12.2.4-appdata-path.patch 443 BLAKE2B 2612b12962d7f3dea8159f4990e0f9e940bb64994427f8d57f85f00278ed56cfc3626e590e8a0f9988fd919567a350269f3ae362a8d38102d016ccc328dc94e0 SHA512 e6f2cbad9e9a01e37579435a5a8c71a58600d50d7a07e1172a3b02867737f28ab64f3d5bb9a4f0cdd682fb359a4afb891ae9d27aabb5850ea9030a6200bc1503 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 -EBUILD converseen-0.12.0.1.ebuild 1749 BLAKE2B 33e5141dfbac0ed89edfcca3f02c4c6092e3da22260229f44f60b0f03a616a6870877adfd26ce082eb2989fa736723740c363509c676cf76add5137a77fdcd19 SHA512 0d15cf3903d400ea87874662cfb1377bac1bd6edb80722aac08419e79fa343d3b9140de3e7c527260375402ef4f158b3916bcfa762692e688a3df74cec2eae76 -EBUILD converseen-0.9.11.1.ebuild 1759 BLAKE2B 5e73dd22acb4bed2e4555c07f79a956fa6049ed32956509ed76609d1419dedd0bbb1f39dbf7ea04d414686236d2378a0e24a1d47b3a8dcc83384e41b3756b49b SHA512 383d4445fa649dd36adfb32bf4430dcecf6b5091491c70adbefccc4238a65c6d796b17afcde27052f5d6a419b3b7fb6ac2ad148498c74d2185ec85e9db65cf3d +DIST converseen-0.12.2.4.tar.gz 941270 BLAKE2B 4ac582a2dc3bbbabb48c1d12fe4ba4ed1d61b20e946645edab4eb6ac2d62cfa2df149b61c60842b36b55239694013661af4dd7c27a5195ee25f808d0a9b29605 SHA512 7d207207859f57037038b595935e3b0c5b202eda6a39e64226f6e898d5c3762077424a52f2ae6029263eae672607d05e30bf4ad2005ce15fd50348cca374413a +EBUILD converseen-0.12.2.4.ebuild 1789 BLAKE2B 9854accb048f03cbadb6f0d1a7828719cfdb48154b66236f507c53abf64bcd49b86aa9551ffdc78fb41277d62f662f2c9a70653874d0e2b310cf66499851d818 SHA512 1ae9a8d7ece1a12ccf779492a6dfbda46b1c77f61762556fe03561177a545f2b60f6c53e1eaf94b1f931e3177e63fb0a416690614b8dd5409ca5f3fed88fb75f MISC metadata.xml 490 BLAKE2B 7ee59abe13eee7dff622a3e7b701f6e0128a208e3e49f5b22b3fcaf06357991a50ece3ffa9cb607675f94a7784efcec37c2176464e4c7741efbfb8b8427cb5dc SHA512 a56719d55ea41683315c5d3f98b8351d3b15b68fd8f598a9e692691c771a94bec23b8263c8a017e29d63a20a8de8b440db1acfd26558c6f8d51add12e4016ba6 diff --git a/media-gfx/converseen/converseen-0.12.0.1.ebuild b/media-gfx/converseen/converseen-0.12.2.4.ebuild index 0535af0f44b8..ecda01d49008 100644 --- a/media-gfx/converseen/converseen-0.12.0.1.ebuild +++ b/media-gfx/converseen/converseen-0.12.2.4.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,6 +9,7 @@ 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" @@ -16,24 +17,17 @@ 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}/${P}-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/converseen-0.9.11.1.ebuild b/media-gfx/converseen/converseen-0.9.11.1.ebuild deleted file mode 100644 index c77e1a0977df..000000000000 --- a/media-gfx/converseen/converseen-0.9.11.1.ebuild +++ /dev/null @@ -1,68 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit cmake xdg-utils - -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" - -LICENSE="GPL-3+" -SLOT="0" -KEYWORDS="amd64 x86" -IUSE="graphicsmagick debug" - -RDEPEND=" - dev-qt/qtcore:5 - dev-qt/qtgui:5 - dev-qt/qtnetwork:5 - dev-qt/qtwidgets:5 - graphicsmagick? ( media-gfx/graphicsmagick:=[cxx,imagemagick] ) - !graphicsmagick? ( media-gfx/imagemagick:=[cxx] ) -" -DEPEND="${RDEPEND}" -BDEPEND=" - dev-qt/linguist-tools:5 -" - -S="${WORKDIR}/${P^}" - -PATCHES=( - "${FILESDIR}/${PN}-0.9.9.0-appdata-path.patch" - "${FILESDIR}/${PN}-0.9.9.0-no-update.patch" - "${FILESDIR}/${PN}-0.9.11.1-graphicsmagick-support.patch" -) - -src_prepare() { - cmake_src_prepare - - if use graphicsmagick; then - # Replace variables in CMakeLists.txt - sed -i -e "s/GENTOO_LIB/\/usr\/$(get_libdir)/g" \ - -e "s/GENTOO_INCLUDE/\/usr\/include/g" \ - "${S}/CMakeLists.txt" || - die "Failed to sed graphicsmagick patch" - - # Replace MagickCore in globals.cpp - sed -i -e "s/MagickCore/MagickLib/" "${S}/src/globals.cpp" || - die "Failed to sed globals.cpp" - fi -} - -pkg_postinst() { - elog "Please note that due to security policy restrictions" - elog "on media-gfx/imagemagick the support for PS, PDF and" - elog "XPS files must be explicitly enabled by commenting out" - elog "the respective policies in /etc/ImageMagick-7/policy.xml." - elog "See https://wiki.gentoo.org/wiki/ImageMagick#Troubleshooting" - elog "for more information." - - xdg_icon_cache_update -} - -pkg_postrm() { - xdg_icon_cache_update -} 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/converseen/files/converseen-0.9.9.0-appdata-path.patch b/media-gfx/converseen/files/converseen-0.9.9.0-appdata-path.patch deleted file mode 100644 index 127fc7ad926c..000000000000 --- a/media-gfx/converseen/files/converseen-0.9.9.0-appdata-path.patch +++ /dev/null @@ -1,17 +0,0 @@ -Description: install appdata to package directory - The CMAKE_INSTALL_PREFIX was not set to install path and set its correct - location. -Author: Laszlo Boszormenyi (GCS) <gcs@debian.org> -Last-Update: 2018-08-21 - ---- a/converseen.pro -+++ b/converseen.pro -@@ -122,7 +122,7 @@ loc/converseen_uk_UA.qm - desktopFile.files = res/converseen.desktop - kdeservicemenu.path = $${SHARE_DIR}/kservices5/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/cropgui/Manifest b/media-gfx/cropgui/Manifest index e2e1d7ccca60..f5be51b36835 100644 --- a/media-gfx/cropgui/Manifest +++ b/media-gfx/cropgui/Manifest @@ -1,5 +1,7 @@ DIST cropgui-0.7.tar.gz 855705 BLAKE2B d2693034b3e3a4355f58c4d17d355721189da8442b5d49ba4c11dc0033371c74301a99c001613c427375bdb9cd733f56a870186a6a59b631feaae93dbd69b232 SHA512 ea06527bdd80382bf4986ea1eea8d3c0e11ea60c472bebb489fdc3bd8206f087d0377d769e8fe86ec4573f6d510266443fd25134894b91206e1c5c9d6f7cf563 DIST cropgui-0.8.tar.gz 857102 BLAKE2B 0fb1dd24c282e6c5595de97dc2c52d20e7c1200d7092edb8e3173276873c49512088f1fc8deed0c1e3d6b606009fe06f3c38cf98c7dac15dd74ccbdab2d71539 SHA512 911bea2b989ce53afeaf067fe5d718440b0a15c26b9488259569f1a287c8128cb7244bcb0721b15ec3564644a0ba8e9ed2991d275420bf3e3659cb0be2e8622d +DIST cropgui-0.9.tar.gz 857265 BLAKE2B 8df3f1451b5a663fb9fdd7d414ec7f5e15f0db307c2b15c0bbd67a42b0e0358ffc8ca9cd5f5fcf837d289b3c76c27c54feddd440a0d43c2589c5d465f969345c SHA512 dd5b329d9da71a5764403099e379398aa352aca57574975799e74081d31933fb3f93fd8e2ea4657972a4d7e8a198b4195b37bc6a4778ae645b490b0f0318ac16 EBUILD cropgui-0.7.ebuild 1148 BLAKE2B 49ad93c2abdab01eb9a198916f550a77e8a8d9368cc88f9e65902c1ce1ca57fa1fa9b420732b56c51ba2f1f772a652b19b70f70e3395ac3f50c0a7086eb6000a SHA512 cfe0ca8e18ba085dd2f0ffbb8555a75e1fbd1c3b81a6a63a742e03dbb0ce2cfb55f8596df1776415ae1513eef9c1ef8e624e2e77cde3812c9a5df21b6439e12e EBUILD cropgui-0.8.ebuild 1148 BLAKE2B c6d8c21c7868f9278a74c9c57c83a03eddb8ccf1a5f709e4355f664865054ed2513730f330e6a540d1cba6f3764ae1e4d0621b70eb6d182c22b8438df1383428 SHA512 0788661bfe89640b70f22969fa80ba15dcb1b35772c592d05941881fdd6b4f0c51eeed54fcba782b9191afce3750b87797ac896c94a8605bb91856a6275423d5 +EBUILD cropgui-0.9.ebuild 1151 BLAKE2B 97c6f67d0220308f35e26130107f36be24475aaaa300d8caccb2d4899b30c4b0fb973c10178183d39243098cefdaf1bd76109b854fd1531a3da64859f69e702e SHA512 5cea272e28cb7fe05f870a08883710322316110a0734e058351423e64c2ed548707416f7902805599b4778900096d5f075b671607493c6cd1766f4fe5ffffc4d MISC metadata.xml 323 BLAKE2B 4f4655c7441d04e7d3840d96e9230c3f479955d01b44344b2b424af910b48e60fdf33a21c5ba6cc5490255a38bcb7f6359516e41ac5569446c7e000e23dda693 SHA512 b40805e072a6f3588784f689fcf6c90525f1b9c23c20570ecc5e647e6d151ab3fd81b953a0263a3c0429947cfca5ef23f2a48a242ee9aa789e2c543ca29eaf86 diff --git a/media-gfx/cropgui/cropgui-0.9.ebuild b/media-gfx/cropgui/cropgui-0.9.ebuild new file mode 100644 index 000000000000..39b2dd8f684b --- /dev/null +++ b/media-gfx/cropgui/cropgui-0.9.ebuild @@ -0,0 +1,47 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +PYTHON_COMPAT=( python3_{9,10,11,12,13} ) +inherit python-r1 desktop wrapper xdg-utils + +DESCRIPTION="GUI for lossless cropping of jpeg images" +HOMEPAGE="https://emergent.unpythonic.net/01248401946" +SRC_URI="https://github.com/jepler/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64 ~x86" + +REQUIRED_USE="${PYTHON_REQUIRED_USE}" + +DEPEND="${PYTHON_DEPS}" +RDEPEND="${PYTHON_DEPS} + dev-python/pillow[${PYTHON_USEDEP}] + dev-python/pygobject:3[${PYTHON_USEDEP}] + media-libs/exiftool + media-gfx/imagemagick" + +install_cropgui_wrapper() { + python_domodule cropgtk.py cropgui_common.py filechooser.py cropgui.glade + make_wrapper "${PN}.tmp" "${PYTHON} $(python_get_sitedir)/${PN}/cropgtk.py" + python_newexe "${ED}/usr/bin/${PN}.tmp" "${PN}" + rm "${ED}/usr/bin/${PN}.tmp" || die +} + +src_install() { + python_moduleinto "${PN}" + python_foreach_impl install_cropgui_wrapper + + domenu "${PN}.desktop" + doicon "${PN}.png" +} + +pkg_postinst() { + xdg_desktop_database_update +} + +pkg_postrm() { + xdg_desktop_database_update +} diff --git a/media-gfx/crwinfo/Manifest b/media-gfx/crwinfo/Manifest index d1293fac02ae..3505f454ef42 100644 --- a/media-gfx/crwinfo/Manifest +++ b/media-gfx/crwinfo/Manifest @@ -1,4 +1,4 @@ AUX crwinfo-0.2.patch 1009 BLAKE2B 0d4ac95f748b9a0c82d9819a951cefa97c6a1bef06f7495623bc2e3b245ef32e63e8fa9d387d4408c136f58e9606a1b591d802bf3cb76c27ea7079df59d7a711 SHA512 b02efcaf211603b5901b316d286ba0baf7e74776a2f92d6f321b154c8713a7fe653b5652137de8ae25d7a9f9eca6f217a4bab1c6839e7bb144ac5fdd804c001b DIST CRWInfo-0.2.tar.gz 10717 BLAKE2B fce230c1913cd924b554697bb1a26661671ec2ec274fbb5f8918f2f5bdb8923897dd1f9b3a4a844f8d0f380f39f50ee08418c6d3cfac39fe7a3e50255aa0632d SHA512 54e386266570460dd43f5a6d4b0eea7d6c37d9327dca8ffc1fa10462f97e23fc080404159723ce6558c3dc6c77eccba6ede628097d95f699a47f57a114e1eb0a -EBUILD crwinfo-0.2.ebuild 596 BLAKE2B 2e948a0873510fc6e296a0480a2b58ecc93453aeeedb9f54b3e30df68821aa08ee20c51b4baa6d27a89ceb66ebd705380a132c93ec8c42db11cb3ede612ea345 SHA512 efbd17d4e327fdbc6b1ffa43a396d39fdf57fb79fb332370fd5135675f9c094e4ba37e2bc11bd70bb03177abd3739b2e662be6980920a5e970e0fe331c9101b1 +EBUILD crwinfo-0.2.ebuild 590 BLAKE2B 817a9fcba56c32b5bccff306e629bf3103e127e7dd2cbf42e679ca109fd44ec3c72cff3c4d545ef173e2ac89b7132d2b0698cf4931feca374a8e4a136461effc SHA512 14659ee47527a82ee0f699d68ddebd277a5b6fe11cf2082e26bb8630384c96f8e62352973deae7a0b55cc47f31373888b4e17a7460af7fd919c0aeb98f8593a8 MISC metadata.xml 168 BLAKE2B 2e0e000b4c3b6ca04c12903fdbe278415c05a822623c52e9aa95cbbf3d50bcb1246b7edbda7d2f6b559af8950c6374e6e0a69b76319964cfe686bf50b0604a57 SHA512 4dcf45d1809e8390a2d8155c8ebfe0dd610203e392aeab0ccd8a10f42cc8532a4925eff32b35e7a6c35598a4efd288229034ec0732299dbd8cfa0acff705fed3 diff --git a/media-gfx/crwinfo/crwinfo-0.2.ebuild b/media-gfx/crwinfo/crwinfo-0.2.ebuild index 399e3208c0fb..7e9513ab11d6 100644 --- a/media-gfx/crwinfo/crwinfo-0.2.ebuild +++ b/media-gfx/crwinfo/crwinfo-0.2.ebuild @@ -11,7 +11,7 @@ SRC_URI="http://neuemuenze.heim1.tu-clausthal.de/~sven/crwinfo/CRWInfo-${PV}.tar LICENSE="GPL-2" SLOT="0" -KEYWORDS="~alpha amd64 ~hppa ~ia64 ppc ppc64 sparc x86" +KEYWORDS="~alpha amd64 ~hppa ppc ppc64 sparc x86" S="${WORKDIR}/CRWInfo-${PV}" diff --git a/media-gfx/curtail/Manifest b/media-gfx/curtail/Manifest index 2060b36de2e2..688595aaa9b7 100644 --- a/media-gfx/curtail/Manifest +++ b/media-gfx/curtail/Manifest @@ -1,5 +1,5 @@ -DIST curtail-1.10.0.tar.gz 205428 BLAKE2B 7a9d1c56542648cd1c4c6fe1355276896bea96a8f054d03c2e4a174e392867db05c3a6548897d31f078b2416eac8b3695cafd3977236f0b66fd10f3020e35d3a SHA512 6bd76b4cefd693199e25db112e90acaa990d2a8dbc2016bd9d55e8d1857bd9c6e94f9164691855231afeff65ae3b070c646a8dc8b446591a08509683dd4a9fb7 -DIST curtail-1.9.1.tar.gz 199785 BLAKE2B 689aa8f61f3c48ed51a85c35bbc6bee136a20064cd2d03c48f630fd80c8c85b64421e77327a71a41f266bd8f9d6f0dcdc197c15657159ae74056e1b52cc8ef12 SHA512 7ff0ff10068c5ff2694f6674376edf84957759b6274740d47d11a584943b026183b13a59b777c27569b6997c3cb358694fa93c55a1136b9d1fab08e768d1a1a4 -EBUILD curtail-1.10.0.ebuild 1318 BLAKE2B 273f62277284e309bdc4faab09b34ff2a9caa2ee39dfbf8c2283bdb9aa255527421878ef87a506757aac118e15b882aac740366ca0b9ae18d19f22d3e1576b36 SHA512 20418b1be77b65f02639e21c4dc773d9da885688bc77593a0082276e60e575d72c772a69afa803890077a21b427dcda4b62ac7f76bb166ae081c51ecba4f29fa -EBUILD curtail-1.9.1.ebuild 1308 BLAKE2B 32b03b1e5cfd3fecbb26da094e2e2014494aaf443cde54a960d73a315d5977c79431b77b2d4883bea9d39936ba3dafb12c94c85b4143b269372855463ee58685 SHA512 786684d07b13960900f45419595ab8d217411d32d652521ef7a1b36e11c2666da887b266bfb6ca1f2de57de7dba92565dd1b68439f5d4f2ed9f4a68ebb7bc254 +DIST curtail-1.11.1.tar.gz 208910 BLAKE2B 6a8ed78ba5e09242d0ae497541d41e310b18c6a26cdc5292503d15c003b1e265ee79e6ca057964aac0782041efcbf2beeb16912802aff534465ea0e96c0a750d SHA512 d59bcad4e774a9aa1d195f6b18964d05e41b47e81cd6fcdd86638488c0a63702c0c2ee97e20712eed4e81a0de562b7218df5519573707ace53191c14ac875b86 +DIST curtail-1.12.0.tar.gz 223113 BLAKE2B 43521421e184e484a35938aae918c580298314cf8da877f593578183ad5849765a7ae7c4436d719b6d0ef00bc70c00ada625d5893fd41dba24c681c5f7f4362e SHA512 2d7d7db0a3f804653ba0fd5510dd3d51cfe5504b89fddb6c08b5ec8062e27dc76add63030ddc7b22bddd809655c7800e438c67afaf034dca772fe9d92bfae45e +EBUILD curtail-1.11.1.ebuild 1318 BLAKE2B 273f62277284e309bdc4faab09b34ff2a9caa2ee39dfbf8c2283bdb9aa255527421878ef87a506757aac118e15b882aac740366ca0b9ae18d19f22d3e1576b36 SHA512 20418b1be77b65f02639e21c4dc773d9da885688bc77593a0082276e60e575d72c772a69afa803890077a21b427dcda4b62ac7f76bb166ae081c51ecba4f29fa +EBUILD curtail-1.12.0.ebuild 1319 BLAKE2B 8774d1531609b1cf15a7a90d77fad8525e98f2a7bfe1a7e82193c6e6a9b449b24919378aea08b3596d675eee7920148c41ba34c5303942055d886cc764cdbcbc SHA512 86f6041775c08a333c6f9330224acfc9cb3a8fcf8ecfcfd8297b6c08a172a5b0d66935e43c610c9023bbe20469d65598c3c6703d3f77638b557b8782a86352ae MISC metadata.xml 817 BLAKE2B ea01ae4c58024699aae770d6e7f21a03adfc8da5f5f658a0b1708824bfda730a2fce4557de4fbccbc079c66a11ab08d6faef020bf897d47870f6581b5e0d68e6 SHA512 3d573feda8c750a08903203c1d2f2e1385e17242356c6f319e29944e530b2199a27e4e432a806dfe1f2c8c783dd67c4fe347d5160d4df99911f67623a3168eee diff --git a/media-gfx/curtail/curtail-1.10.0.ebuild b/media-gfx/curtail/curtail-1.11.1.ebuild index c698273b9338..c698273b9338 100644 --- a/media-gfx/curtail/curtail-1.10.0.ebuild +++ b/media-gfx/curtail/curtail-1.11.1.ebuild diff --git a/media-gfx/curtail/curtail-1.9.1.ebuild b/media-gfx/curtail/curtail-1.12.0.ebuild index 036a248fd7e7..d2791e61121b 100644 --- a/media-gfx/curtail/curtail-1.9.1.ebuild +++ b/media-gfx/curtail/curtail-1.12.0.ebuild @@ -1,35 +1,38 @@ -# 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_{11..13} ) inherit gnome2-utils meson python-single-r1 xdg DESCRIPTION="Image compressor, supporting PNG, JPEG and WebP" HOMEPAGE="https://github.com/Huluti/Curtail/" -if [[ ${PV} == *9999* ]] ; then +if [[ "${PV}" == *9999* ]] ; then inherit git-r3 + EGIT_REPO_URI="https://github.com/Huluti/${PN^}.git" else SRC_URI="https://github.com/Huluti/${PN^}/archive/${PV}.tar.gz -> ${P}.tar.gz" S="${WORKDIR}/${P^}" - KEYWORDS="amd64 ~x86" + KEYWORDS="~amd64 ~x86" fi LICENSE="GPL-3+" SLOT="0" REQUIRED_USE="${PYTHON_REQUIRED_USE}" -RESTRICT="test" # Just desktop / schema / appstream file validation (fails). +RESTRICT="test" # Just desktop / schema / appstream file validation (fails). RDEPEND=" ${PYTHON_DEPS} gui-libs/gtk:4[introspection] - $(python_gen_cond_dep 'dev-python/pygobject:3[${PYTHON_USEDEP}]') + $(python_gen_cond_dep ' + dev-python/pygobject:3[${PYTHON_USEDEP}] + ') " BDEPEND=" ${RDEPEND} @@ -47,7 +50,7 @@ RDEPEND+=" DOCS=( CHANGELOG.md README.md ) src_prepare() { - sed -i "s|@PYTHON@|${PYTHON}|" "${S}"/src/${PN}.in || die + sed -i "s|@PYTHON@|${PYTHON}|" "${S}/src/${PN}.in" || die default } diff --git a/media-gfx/darktable/Manifest b/media-gfx/darktable/Manifest index 868c09b0961b..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 5785 BLAKE2B 564d6a22f7ea68d29164d9b64b026183557469c1c0c2d387522f1c32c905cb44698506df084eb8e24d7730d4a6cb4d9e8b85924001a09f5a439d866af0689349 SHA512 1814f05967b57c9511cc9d07a7e1896ff1bf894029b1c5e063a3576eaeb0a4370a9e0d4b9b8f1e2f1050587664da822f307418042d89a93b333c54fc3926a3a8 -EBUILD darktable-4.6.1.ebuild 5900 BLAKE2B f2e7c0dfc905193fb4caac74365a32954e5ef27037b05823fc229f308d8538e3957aa2be23f20be1e4b3e7aea4b2869d26b7ef2815e8645e2312ae921e16c7d9 SHA512 90c7866efa1204b966f8186ff9ff16cd9d4f8705a019ad5324991b0c1be174f969da12b9b794db1ea71eaf8ae2f47424a705db94704a319615801e06915e0018 -EBUILD darktable-4.8.0.ebuild 5895 BLAKE2B 591b7d195ccf6643eb3fc9e75b3449d0cef390618eebf89bd92c96d71cdd57df77cdf0382b23e4caac69f00603fefa9b131adcc14f853cb18a08b7633f0685f0 SHA512 49c2df019fb1946e978372cecded21f917be17c58a54c4b019c80aeaa623ec35a9cfbe9f5e32082bcbeab6be9b768baab6a07d39cb8109c955cb7cfa31a40ce9 +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 860bbe9e07a7..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 sys-devel/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 virtual/rust) which -# by default pull in sys-devel/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 7d5982a7686d..36af6f4a95c5 100644 --- a/media-gfx/darktable/darktable-4.8.0.ebuild +++ b/media-gfx/darktable/darktable-4.8.0-r1.ebuild @@ -33,7 +33,7 @@ else ) )" - KEYWORDS="~amd64 ~arm64 -x86" + 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 @@ -45,10 +45,10 @@ 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 sys-devel/clang so we'd have to have that, as an alternative, +# - 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 virtual/rust) which -# by default pull in sys-devel/clang +# - 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 @@ -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 43f3c82865fb..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,29 +34,28 @@ 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] # in BDEPEND. This has not been done *on purpose*, for the following reason: -# - darktable can also be built with sys-devel/clang so we'd have to have that, as an alternative, +# - 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 virtual/rust) which -# by default pull in sys-devel/clang +# - 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 + 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/dcraw/Manifest b/media-gfx/dcraw/Manifest index 68c12172c81f..96f7e75d9845 100644 --- a/media-gfx/dcraw/Manifest +++ b/media-gfx/dcraw/Manifest @@ -1,13 +1,10 @@ AUX conversion-examples.txt 545 BLAKE2B 4bda8339c0ae2f427ae0432b09da54aa5c194318b5cc0d3131c2e96f2b26ed0f91f6f419f0830fc773ab9be543019143755e039866146c6ce0eb361f9172ae4c SHA512 47213effb868ac4754075e43a6194ccbbe3e1431ef47280a670ad7e843cf727ad63ebf76849210672a72a79b1f702ca112aeece12284191f11c859a54fc090a9 AUX dcraw-9.28.0-fix-LC_CTYPE-undeclared.patch 377 BLAKE2B 91587f7f388b490cd4a9df193ce7602bf8dd6e60068c93f8e372cacd4c234ec905a02036a3942057dcca3f91efb7cb3c095449b34a4e48997874fff7d86fcfd3 SHA512 278fd2fc0d526dfe6f7b23f367dd398cf44c990266722f2878b3f86af7ef175b078df8217574b5bc718d381fff83550cab66d9d9684e19da5692e4ff5742057b -AUX dcraw-9.28.0-fix-memmem-wrong-return-type.patch 373 BLAKE2B 767ebce05bff02c33a23ae4fc3ead18bf6be03c144a52688d31974cfd915a77833842f0d6e9c88a33ba51c60bb4d6acd0ded008bddd81dd79311ec69b0193728 SHA512 76c0ffbb94596d12afdb9400c52919d002464882389d49bff72266a19fefc030304b0a6eb377e93742b346e47a2f263a0badca61f0315ca74e168f65a5fe4f21 AUX dcraw-9.28.0-gimp-2.10.patch 1182 BLAKE2B 25a71d36fe20ea97b17f13a65e09fbbe786bffb4c57ea398adc83933bb8cdae27a5db8f0b12cc1e51671aa70e2da14755e5aefa2f035060d08da99c7d51e23bf SHA512 e237cf9e917f451bb141dc86dd80c4a78eeb7b42ccda28eabb94b2516dff4ef7148b97a34b61ab27fb9743b3a40f81ab2e416ff0950ffdffdae3a98925896c0c AUX dcraw-9.28.0-glibc-2.38.patch 800 BLAKE2B 5b6836b85060c786e1d83acc9584959c5df0384f100b7dba2c20262284b4bb7254fcf1ff12cbaa950cd6146bdc67e6fb808c90e7fb63ccbcea8277215f800028 SHA512 eb3815ec13e8fa9b8aba282f12ef70d1c412f6829e29460fe8858bc719efe7c55b04073604926e218b33aa1b4d80a3fb6991f9749ebad352d1132be8569e29f8 AUX dcwrap 437 BLAKE2B ec88784e059ab07990acf3a47517f243502a140b451040c77f9320bd7b7767d45b88d7c139bb038816448c50a682c6645095f79be9d2836c6f896e27a8ffc20c SHA512 ba872972125a5394e8d29bf6e5b612959b228265885218061eeff6a17f87dd1891e33876c49fd4071a76517843b6709d16f1fa976994c49c9357d7dc7211af9e DIST dcraw-9.28.0.tar.gz 194193 BLAKE2B d39a2d76dbbe74a2aed21c6b132ac25c9dd17312813e7f640a4a6d4abd4e8f1868ad596296ca9bfe61427b8b4764821e32679128747ff5a9452988814b77c638 SHA512 04609c4ddd5d1c9fa0ee1617d2ef25efdc22451e1fa6cf669d93abb1fa630a18198b30a289400f1814c8dca285547da8b081a1b00b085c00bb9318ad25c48a30 DIST parse-1.73.tar.bz2 8186 BLAKE2B 4d7d69bbaad3fd69caeae24e4dfc77fa580d969f903c925f76cf0a7bdb13ff34c96ab6dc9917609ce886365f6971290b3af63aec9fed43b1876aa44dd951521d SHA512 06ffaf72695dc86bfc2bdd10d4f732bc428b72d427f4c10e93fc58536513477cf297adb56fb9cfc5ba5fd5b6b4cd197c33d8dac957a0a1bbe65b23393b64278c DIST rawphoto-1.32.tar.bz2 3841 BLAKE2B db7a80af4b06fc3709a9ae69d9f166c3323097821bb561af4e0ac9a1ef677cab6cfd5cd7896d1e1fce85e6fab545ced7d00ce809f97332bec594b94a27f77e23 SHA512 6ee5b6c4e4266c8e04221c894c4e737f8a6d2c6f0cc9c82db73064afd68488bd60de19b86b2d7b82780283bbb9f8156ef3149c1c730f09a00dce632744b44d56 -EBUILD dcraw-9.28.0-r2.ebuild 2962 BLAKE2B 90a57136615f9b9b6345174a51f0beed8105afca5e1ce4bbcc321fb6e4b7ff87432e59401f3b75f49ce7e6614aec77530ea77bbe24a8477ffa570502c9b8651e SHA512 c7b51592fb736d9e3e76ee0a420ea99db898fca7c1c1efc06bd67bfa7709c0c60df9c84bfa85f47ae15d39ee2bd50b9efe8dbe21d87cf1fad18337edb595678f -EBUILD dcraw-9.28.0-r3.ebuild 3515 BLAKE2B 19940b4dcccf16588dc487bfd97314c052b543c579c505f2da139b77326323d19b68f090ebc39774a57a834b4304363dc52211e5f22cda1040146034e44287fa SHA512 cc33a1af42dca687c86daae3269c8ac9d57c9808ec901733d4a6b429cf264fa31d0e64c885850facf65ee355f8ae7a334690918fde5d1badc498635e6ce961fd -EBUILD dcraw-9.28.0-r4.ebuild 3472 BLAKE2B 61ac9a4e0643907c439cb97b6e1f3010aa8944521623ac63b23d4aeb7a4853b28a578417f14921bc229df6cf32c39738fbb7c8b9855f88f07ddb5ffa46aaf34f SHA512 bbdb1fdeb89b9dcefa0366fa1afadd4326ef1e85992fbf655ffaf742e76f9976e1bd605920304e40704797c851a499f8ee6b0290d7a6e0c467e8174c9b31b94e +EBUILD dcraw-9.28.0-r4.ebuild 3466 BLAKE2B b5974e4bb56ec5a135037ab70cbddd6444588f69098efe8e306be37d8869a569548ea732cb998e15c08619ea724cd0a678c1ac1eb29af68e99d47e9a1f4ffc31 SHA512 f532ac811cb48636f0b277f05edc9448612f3774f1655faf4a991e4b5e9d03f93f9c055ae6c1b95475d86fb933ac3a1e0f8eb485d94b6bf86186b7f85d20e07e MISC metadata.xml 610 BLAKE2B 1546712a5da3c3f29a1f1e632a8f3c7d600ce72d90fc05bfd54e5921d6047e60561cde7be1b110f0151c05220b3b1b8f2287e8330c0a65f523c5ce8d8fd00036 SHA512 a175c151e37ff8eaf827e0ecdf41a35761c44ed816f17b37f40bc0b3fefc9bbaf41bab44da907c4eecf512b55cf86792f8610bbfe2a54130c44c2d85c8b0c090 diff --git a/media-gfx/dcraw/dcraw-9.28.0-r2.ebuild b/media-gfx/dcraw/dcraw-9.28.0-r2.ebuild deleted file mode 100644 index 607282673bfd..000000000000 --- a/media-gfx/dcraw/dcraw-9.28.0-r2.ebuild +++ /dev/null @@ -1,113 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 -inherit readme.gentoo-r1 toolchain-funcs - -DESCRIPTION="Command-line decoder for raw digital photos" -HOMEPAGE="https://www.cybercom.net/~dcoffin/dcraw/" -SRC_URI="https://www.cybercom.net/~dcoffin/dcraw/archive/${P}.tar.gz - mirror://gentoo/parse-1.73.tar.bz2 - gimp? ( mirror://gentoo/rawphoto-1.32.tar.bz2 )" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux" -LANGS=" ca cs de da eo es fr hu it nl pl pt ru sv zh_CN zh_TW" -IUSE="nls gimp jpeg lcms" - -COMMON_DEPEND=" - jpeg? ( virtual/jpeg:0 ) - lcms? ( media-libs/lcms:2 ) - gimp? ( media-gfx/gimp:0/2 ) -" -DEPEND="${COMMON_DEPEND}" -BDEPEND=" - nls? ( sys-devel/gettext ) - gimp? ( virtual/pkgconfig ) -" -RDEPEND="${COMMON_DEPEND} - media-libs/netpbm -" - -S="${WORKDIR}/dcraw" - -DOC_CONTENTS=" - See conversion-examples.txt.gz on how to convert - the PPM files produced by dcraw to other image formats.\n - - \nThe functionality of the external program 'fujiturn' was - incorporated into dcraw and is automatically used now.\n - - \nThere's an example wrapper script included called 'dcwrap'. - This package also includes 'dcparse', which extracts - thumbnail images (preferably JPEGs) from any raw digital - camera formats that have them, and shows table contents. -" - -run_build() { - einfo "${@}" - ${@} || die -} - -src_prepare() { - default - - # Support gimp-2.10, bug #655390 - use gimp && eapply "${FILESDIR}"/${PN}-9.28.0-gimp-2.10.patch - - rename dcraw_ dcraw. dcraw_*.1 || die "Failed to rename" -} - -src_compile() { - local ECFLAGS="-O2 -DNO_JASPER=yes" # Without optimisation build fails - local ELIBS="-lm" - - use lcms && ELIBS="-llcms2 ${ELIBS}" || ECFLAGS+=" -DNO_LCMS=yes" - use jpeg && ELIBS="-ljpeg ${ELIBS}" || ECFLAGS+=" -DNO_JPEG=yes" - use nls && ECFLAGS+=" -DLOCALEDIR=\"/usr/share/locale/\"" - - run_build $(tc-getCC) ${ECFLAGS} ${CFLAGS} ${LDFLAGS} -o dcraw dcraw.c ${ELIBS} - - run_build $(tc-getCC) -O2 ${CFLAGS} ${LDFLAGS} -o dcparse parse.c - - # rawphoto gimp plugin - if use gimp; then - run_build $(tc-getCC) ${CFLAGS} ${LDFLAGS} \ - $($(tc-getPKG_CONFIG) --cflags gimpui-2.0) rawphoto.c -o rawphoto \ - $($(tc-getPKG_CONFIG) --libs gimpui-2.0) - fi - - if use nls; then - for lang in ${LANGS}; do - has ${lang} ${LINGUAS-${lang}} \ - && run_build msgfmt -c -o dcraw_${lang}.mo dcraw_${lang}.po - done - fi -} - -src_install() { - dobin dcraw dcparse - dodoc "${FILESDIR}"/{conversion-examples.txt,dcwrap} - - # rawphoto gimp plugin - if use gimp; then - insinto "$($(tc-getPKG_CONFIG) --variable=gimplibdir gimp-2.0)/plug-ins" - insopts -m0755 - doins rawphoto - fi - - doman dcraw.1 - - if use nls; then - for lang in ${LANGS}; do - if has ${lang} ${LINGUAS-${lang}}; then - [[ -f dcraw.${lang}.1 ]] && doman dcraw.${lang}.1 - insinto /usr/share/locale/${lang}/LC_MESSAGES - newins dcraw_${lang}.mo dcraw.mo - fi - done - fi - - readme.gentoo_create_doc -} diff --git a/media-gfx/dcraw/dcraw-9.28.0-r3.ebuild b/media-gfx/dcraw/dcraw-9.28.0-r3.ebuild deleted file mode 100644 index a56277206cec..000000000000 --- a/media-gfx/dcraw/dcraw-9.28.0-r3.ebuild +++ /dev/null @@ -1,130 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 -inherit readme.gentoo-r1 toolchain-funcs - -DESCRIPTION="Command-line decoder for raw digital photos" -HOMEPAGE="https://www.dechifro.org/dcraw/" -SRC_URI="https://www.cybercom.net/~dcoffin/dcraw/archive/${P}.tar.gz - mirror://gentoo/parse-1.73.tar.bz2 - gimp? ( mirror://gentoo/rawphoto-1.32.tar.bz2 )" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux" -LANGS=" ca cs de da eo es fr hu it nl pl pt ru sv zh_CN zh_TW" -IUSE="nls gimp jpeg lcms" - -COMMON_DEPEND=" - jpeg? ( media-libs/libjpeg-turbo:0 ) - lcms? ( media-libs/lcms:2 ) - gimp? ( - dev-libs/atk - media-gfx/gimp:0/2 - media-libs/harfbuzz - x11-libs/cairo - x11-libs/gdk-pixbuf:2 - x11-libs/gtk+:2 - x11-libs/pango -) -" -DEPEND="${COMMON_DEPEND}" -BDEPEND=" - nls? ( sys-devel/gettext ) - gimp? ( virtual/pkgconfig ) -" -RDEPEND="${COMMON_DEPEND} - media-libs/netpbm -" - -S="${WORKDIR}/dcraw" - -DOC_CONTENTS=" - See conversion-examples.txt.gz on how to convert - the PPM files produced by dcraw to other image formats.\n - - \nThe functionality of the external program 'fujiturn' was - incorporated into dcraw and is automatically used now.\n - - \nThere's an example wrapper script included called 'dcwrap'. - This package also includes 'dcparse', which extracts - thumbnail images (preferably JPEGs) from any raw digital - camera formats that have them, and shows table contents. -" - -PATCHES=( "${FILESDIR}/${P}-fix-memmem-wrong-return-type.patch" - "${FILESDIR}/${P}-fix-LC_CTYPE-undeclared.patch" -) - -run_build() { - einfo "${@}" - ${@} || die -} - -src_prepare() { - default - - # Support gimp-2.10, bug #655390 - use gimp && eapply "${FILESDIR}"/${PN}-9.28.0-gimp-2.10.patch - - rename dcraw_ dcraw. dcraw_*.1 || die "Failed to rename" -} - -src_compile() { - local ECFLAGS="-O2 -DNO_JASPER=yes " # Without optimisation build fails - local ELIBS="-lm" - local RP_ECFLAGS="-I/usr/include/gtk-2.0/ -I/usr/include/glib-2.0/ \ - -I/usr/$(get_libdir)/glib-2.0/include -I/usr/include/cairo \ - -I/usr/include/pango-1.0 -I/usr/include/harfbuzz \ - -I/usr/lib64/gtk-2.0/include -I/usr/include/gdk-pixbuf-2.0 \ - -I/usr/include/atk-1.0" - - use lcms && ELIBS="-llcms2 ${ELIBS}" || ECFLAGS+=" -DNO_LCMS=yes" - use jpeg && ELIBS="-ljpeg ${ELIBS}" || ECFLAGS+=" -DNO_JPEG=yes" - use nls && ECFLAGS+=" -DLOCALEDIR=\"/usr/share/locale/\"" - - run_build $(tc-getCC) ${ECFLAGS} ${CFLAGS} ${LDFLAGS} -o dcraw dcraw.c ${ELIBS} - - run_build $(tc-getCC) -O2 ${CFLAGS} ${LDFLAGS} -o dcparse parse.c - - # rawphoto gimp plugin - if use gimp; then - run_build $(tc-getCC) ${RP_ECFLAGS} ${CFLAGS} ${LDFLAGS} \ - $($(tc-getPKG_CONFIG) --cflags gimpui-2.0) rawphoto.c -o rawphoto \ - $($(tc-getPKG_CONFIG) --libs gimpui-2.0) - fi - - if use nls; then - for lang in ${LANGS}; do - has ${lang} ${LINGUAS-${lang}} \ - && run_build msgfmt -c -o dcraw_${lang}.mo dcraw_${lang}.po - done - fi -} - -src_install() { - dobin dcraw dcparse - dodoc "${FILESDIR}"/{conversion-examples.txt,dcwrap} - - # rawphoto gimp plugin - if use gimp; then - insinto "$($(tc-getPKG_CONFIG) --variable=gimplibdir gimp-2.0)/plug-ins" - insopts -m0755 - doins rawphoto - fi - - doman dcraw.1 - - if use nls; then - for lang in ${LANGS}; do - if has ${lang} ${LINGUAS-${lang}}; then - [[ -f dcraw.${lang}.1 ]] && doman dcraw.${lang}.1 - insinto /usr/share/locale/${lang}/LC_MESSAGES - newins dcraw_${lang}.mo dcraw.mo - fi - done - fi - - readme.gentoo_create_doc -} diff --git a/media-gfx/dcraw/dcraw-9.28.0-r4.ebuild b/media-gfx/dcraw/dcraw-9.28.0-r4.ebuild index 4271ab7d0680..bcb1dbb29da1 100644 --- a/media-gfx/dcraw/dcraw-9.28.0-r4.ebuild +++ b/media-gfx/dcraw/dcraw-9.28.0-r4.ebuild @@ -12,7 +12,7 @@ SRC_URI="https://www.cybercom.net/~dcoffin/dcraw/archive/${P}.tar.gz LICENSE="GPL-2" SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux" +KEYWORDS="~alpha amd64 arm arm64 ~hppa ppc ppc64 sparc x86 ~amd64-linux ~x86-linux" LANGS=" ca cs de da eo es fr hu it nl pl pt ru sv zh_CN zh_TW" IUSE="nls gimp jpeg lcms" diff --git a/media-gfx/dcraw/files/dcraw-9.28.0-fix-memmem-wrong-return-type.patch b/media-gfx/dcraw/files/dcraw-9.28.0-fix-memmem-wrong-return-type.patch deleted file mode 100644 index 93f299e4d2aa..000000000000 --- a/media-gfx/dcraw/files/dcraw-9.28.0-fix-memmem-wrong-return-type.patch +++ /dev/null @@ -1,17 +0,0 @@ -Memmem returns void* - -# Pascal Jäger <pascal.jaeger@leimstift.de> (2023-09-22) - -Bug: https://bugs.gentoo.org/911753 - ---- a/parse.c -+++ b/parse.c -@@ -965,7 +965,7 @@ void parse_phase_one (int base) - } - } - --char *memmem (char *haystack, size_t haystacklen, -+void *memmem (char *haystack, size_t haystacklen, - char *needle, size_t needlelen) - { - char *c; diff --git a/media-gfx/digikam/Manifest b/media-gfx/digikam/Manifest index ff2d87343fef..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 -AUX digikam-8.4.0-fix-find_libheif-regex.patch 856 BLAKE2B 5b2f2bea0c4a7cae5aed2d385123082576c95fd7ea66521c7245db844af0bb86422279674a3f46ba56075547ff161d1bfbf30c37fb57efcfd15e10b55c255b36 SHA512 bedcc963511afd0037ab1dbfa05b06e72c0b6785b222a33f15dbe84535e62820d9b1e437a3cb11a3fffe5c6e4f474609e63dcc515482a14b09e98a5fa5dd34f6 -DIST digiKam-8.4.0.tar.xz 58025616 BLAKE2B 33441e023cd9d6edba2e7c01e482a6eea7a6b1972b6bad0fc804fb3e94f97cc62e2663690137b2445fb7043789b7e942d830b71209385de77ccffe57d22d09ff SHA512 4342d18a7c04ab239821de3cf908f8e7d676598778f0174164aa336e8cfdc0a76327d31c64e6c4e47dcf0d6fbef46b01918312e4622ce3359888a9a94948a22b -DIST digikam-8.4.0-patchset.tar.xz 11904 BLAKE2B 6ab167cae66710505eb81bb538fde2a81458b6580bf8c70d0c28500ca81a3c9c9b9e0a12ca288a4dc6f39ae1a175f7b2bd09e4d94624337348084c228eafcc38 SHA512 df1199d3aaecc0afc032090424af69c031e95afba1fed70b00cf61c5ef52fa2a7c3d97918592c167f9ea918dd2823e4cc52f12a470a9eede815b3ff43314001b -EBUILD digikam-8.4.0-r11.ebuild 4033 BLAKE2B 5e5c262e2ff5a56dc1a744d7acdeb0c3a840dc20867419eaa9a33c4aa486d7fbe33552848e48cb77bc18fdb2ed35e51f9932f7a034b67db5b9b79051d909a11d SHA512 d333537e818eb1f6a89afd6dfaa2557dd0ee2905d108fd02ba937e292c9998ad78daff87b94356ae1312cbfb10683999c1ac396ab6b35430ba203ff47e6595b2 -EBUILD digikam-8.4.0.ebuild 4317 BLAKE2B 451131ac82a5507fb0f563c2795176bf74d8481ee73b7b1686ef7bf00c092d8002e99af431fb4d5c5547fdc54d2d43c38c05f23ede974e614e92c288fa848c0f SHA512 38d03dbd4b924c2e92d593a79a9be6fe45b03057f51a2448265723f59a2bbd249bd1ded30da0e41d768af3f10632ce43b890489528390935d289cc6c64c7ccf8 +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 +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.ebuild b/media-gfx/digikam/digikam-8.4.0.ebuild deleted file mode 100644 index b3d5ace50bc3..000000000000 --- a/media-gfx/digikam/digikam-8.4.0.ebuild +++ /dev/null @@ -1,148 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -KFMIN=5.115.0 -QTMIN=5.15.12 -inherit ecm kde.org toolchain-funcs - -if [[ ${KDE_BUILD_TYPE} != live ]]; then - TARNAME="digiKam-${PV/_/-}" - if [[ ${PV} =~ beta[0-9]$ ]]; then - SRC_URI="mirror://kde/unstable/${PN}/${TARNAME}.tar.xz" - else - SRC_URI="mirror://kde/stable/${PN}/${PV}/${TARNAME}.tar.xz" - fi - KEYWORDS="amd64 ~arm64 ~x86" -fi - -DESCRIPTION="Digital photo management application" -HOMEPAGE="https://www.digikam.org/" - -LICENSE="GPL-2" -SLOT="5" -IUSE="addressbook calendar geolocation gphoto2 heif +imagemagick jpegxl +lensfun mysql opengl openmp +panorama scanner semantic-desktop spell" - -# bug 366505 -RESTRICT="test" - -COMMON_DEPEND=" - dev-libs/expat - >=dev-qt/qtconcurrent-${QTMIN}:5 - >=dev-qt/qtdbus-${QTMIN}:5 - >=dev-qt/qtgui-${QTMIN}:5[-gles2-only] - >=dev-qt/qtnetwork-${QTMIN}:5 - >=dev-qt/qtnetworkauth-${QTMIN}:5 - >=dev-qt/qtprintsupport-${QTMIN}:5 - >=dev-qt/qtsql-${QTMIN}:5[mysql?] - >=dev-qt/qtwebengine-${QTMIN}:5[widgets] - >=dev-qt/qtwidgets-${QTMIN}:5 - >=dev-qt/qtx11extras-${QTMIN}:5 - >=dev-qt/qtxml-${QTMIN}:5 - >=dev-qt/qtxmlpatterns-${QTMIN}:5 - >=kde-frameworks/kconfig-${KFMIN}:5 - >=kde-frameworks/kconfigwidgets-${KFMIN}:5 - >=kde-frameworks/kcoreaddons-${KFMIN}:5 - >=kde-frameworks/ki18n-${KFMIN}:5 - >=kde-frameworks/kiconthemes-${KFMIN}:5 - >=kde-frameworks/kio-${KFMIN}:5 - >=kde-frameworks/knotifications-${KFMIN}:5 - >=kde-frameworks/knotifyconfig-${KFMIN}:5 - >=kde-frameworks/kservice-${KFMIN}:5 - >=kde-frameworks/kwidgetsaddons-${KFMIN}:5 - >=kde-frameworks/kwindowsystem-${KFMIN}:5 - >=kde-frameworks/kxmlgui-${KFMIN}:5 - >=kde-frameworks/solid-${KFMIN}:5 - >=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:= - x11-libs/libX11 - addressbook? ( - >=kde-apps/akonadi-contacts-23.08.3:5 - >=kde-frameworks/kcontacts-${KFMIN}:5 - ) - calendar? ( >=kde-frameworks/kcalendarcore-${KFMIN}:5 ) - gphoto2? ( media-libs/libgphoto2:= ) - heif? ( - media-libs/libheif:= - media-libs/x265:= - ) - imagemagick? ( media-gfx/imagemagick:= ) - jpegxl? ( media-libs/libjxl:= ) - lensfun? ( media-libs/lensfun ) - opengl? ( - >=dev-qt/qtopengl-${QTMIN}:5 - virtual/opengl - ) - panorama? ( >=kde-frameworks/threadweaver-${KFMIN}:5 ) - scanner? ( >=kde-apps/libksane-23.08.3:5 ) - semantic-desktop? ( >=kde-frameworks/kfilemetadata-${KFMIN}:5 ) - spell? ( >=kde-frameworks/sonnet-${KFMIN}:5 ) -" -DEPEND="${COMMON_DEPEND} - dev-cpp/eigen:3 - dev-libs/boost - addressbook? ( >=kde-apps/akonadi-23.08.3:5 ) -" -RDEPEND="${COMMON_DEPEND} - media-libs/exiftool - mysql? ( virtual/mysql[server(+)] ) - panorama? ( media-gfx/hugin ) -" -BDEPEND=" - sys-devel/gettext - panorama? ( - app-alternatives/lex - app-alternatives/yacc - ) -" - -PATCHES=( - "${FILESDIR}/${P}-cmake.patch" - "${FILESDIR}/${PN}-8.3.0-cmake-addressbook.patch" - "${FILESDIR}/${P}-fix-find_libheif-regex.patch" # bug 936507 -) - -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=OFF # KF6 not stable upstream yet - -DBUILD_TESTING=OFF # bug 698192 - -DENABLE_APPSTYLES=ON - -DCMAKE_DISABLE_FIND_PACKAGE_Jasper=ON - -DENABLE_MEDIAPLAYER=OFF # bug 758641; bundled as of 8.0, KDE-bug 448681 - -DENABLE_SHOWFOTO=ON # built unconditionally so far, new option since 8.0 - -DENABLE_AKONADICONTACTSUPPORT=$(usex addressbook) - $(cmake_use_find_package calendar KF5CalendarCore) - -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 opengl OpenGL) - $(cmake_use_find_package panorama KF5ThreadWeaver) - $(cmake_use_find_package scanner KF5Sane) - $(cmake_use_find_package spell KF5Sonnet) - -DENABLE_KFILEMETADATASUPPORT=$(usex semantic-desktop) - ) - - ecm_src_configure -} diff --git a/media-gfx/digikam/digikam-8.4.0-r11.ebuild b/media-gfx/digikam/digikam-8.5.0-r1.ebuild index b5e242ad01f2..4c3b3f8ba5ce 100644 --- a/media-gfx/digikam/digikam-8.4.0-r11.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 @@ -9,20 +9,20 @@ 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" +SRC_URI="mirror://kde/stable/${PN}/${PV}/digiKam-${PV/_/-}.tar.xz" LICENSE="GPL-2" SLOT="0" -KEYWORDS="~amd64 ~arm64" +KEYWORDS="amd64 ~arm64" IUSE="addressbook calendar geolocation gphoto2 heif +imagemagick jpegxl +lensfun mysql openmp +panorama scanner semantic-desktop spell video" # bug 366505 RESTRICT="test" +# slot op: Uses Qt::GuiPrivate for qtx11extras_p.h COMMON_DEPEND=" dev-libs/expat - >=dev-qt/qtbase-${QTMIN}:6[concurrent,dbus,-gles2-only,gui,mysql?,network,opengl,sql,widgets,xml] + >=dev-qt/qtbase-${QTMIN}:6=[concurrent,dbus,-gles2-only,gui,mysql?,network,opengl,sql,widgets,X,xml] >=dev-qt/qtnetworkauth-${QTMIN}:6 >=dev-qt/qtscxml-${QTMIN}:6 >=dev-qt/qtsvg-${QTMIN}:6 @@ -90,9 +90,7 @@ BDEPEND=" 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" + "${FILESDIR}/${P}-cmake-have_ksane.patch" # bug 947312 ) pkg_pretend() { @@ -106,6 +104,8 @@ pkg_setup() { } # FIXME: Unbundle libraw (libs/rawengine/libraw) +# TODO: adding IUSE X requires upstreaming WITH_X11 option for libX11, +# see core/cmake/rules/RulesX11.cmake; only used in core/libs/dimg/filters/icc src_configure() { local mycmakeargs=( -DBUILD_WITH_QT6=ON diff --git a/media-gfx/digikam/files/digikam-8.4.0-fix-find_libheif-regex.patch b/media-gfx/digikam/files/digikam-8.4.0-fix-find_libheif-regex.patch deleted file mode 100644 index cd18ea3ed475..000000000000 --- a/media-gfx/digikam/files/digikam-8.4.0-fix-find_libheif-regex.patch +++ /dev/null @@ -1,25 +0,0 @@ -From a3ff8ad14c1373f7a7d3c1c9aee4e80954e1859e Mon Sep 17 00:00:00 2001 -From: Maik Qualmann <metzpinguin@gmail.com> -Date: Tue, 23 Jul 2024 12:33:13 +0200 -Subject: [PATCH] escape the input from REGEX MATCHALL CCBUGS: 490690 - ---- - core/cmake/modules/FindLibheif.cmake | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/core/cmake/modules/FindLibheif.cmake b/core/cmake/modules/FindLibheif.cmake -index fdaf73a4b9e..38876ecc38a 100644 ---- a/core/cmake/modules/FindLibheif.cmake -+++ b/core/cmake/modules/FindLibheif.cmake -@@ -54,7 +54,7 @@ else() - if(HEIF_INCLUDES_DIR) - - file(STRINGS "${HEIF_INCLUDES_DIR}/libheif/heif_version.h" TMP REGEX "^#define LIBHEIF_VERSION[ \t].*$") -- string(REGEX MATCHALL "[0-9.]+" HEIF_VERSION ${TMP}) -+ string(REGEX MATCHALL "[0-9.]+" HEIF_VERSION "${TMP}") - - endif() - --- -GitLab - 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/displaycal-py3/Manifest b/media-gfx/displaycal-py3/Manifest index 89fcdaaa4a10..e88ee088a199 100644 --- a/media-gfx/displaycal-py3/Manifest +++ b/media-gfx/displaycal-py3/Manifest @@ -1,4 +1,7 @@ AUX displaycal-py3-3.9.10-python-3.11.patch 3134 BLAKE2B 3110f39ecab47eff46a97389c2164bfbb2b44f80fd30bb848856dae050738cd6590905b2b9ce603eb9d919f2811674b378b1562396b1437bea8247798868313f SHA512 98bb7ea8a0b29ffbb455f8666183489d1571bdcd1829398ce4535c7581f797582ed7c1a5035b2bdf9a0d19397ef14e5f8068ec2baf5078f64b614c901be48f33 +AUX displaycal-py3-3.9.13_pre20240925-Fix-build.patch 1802 BLAKE2B 54113c2ed486f35efc338843ce58ab4425d845dddacd38e7a017ae01acb1bb1d384503d6aec2c3ee551e9b13d0191231ded357d82b326617fc0def8a1e992dfc SHA512 253f6dfed9b3851df53a05035313f85c933bfdd96d7b14af1214f5f3005990710196a98d32fee2e8cb192520b1f5b32cfa9116ca7eb779bdea03164e55a02fbd DIST DisplayCAL-3.9.10.tar.gz 10676033 BLAKE2B 94bfa3ac95bfc16788421fa5b9a31920c40da66d2875e4037b3b20b6792a1005ee9fea11b5325a94ffae845f56583647e42de9d4d7d96d149264a86e6d1158a6 SHA512 fc1b981925c6f4660557d8f0935a62d0112b39664b0c74cdb1a907e0e7b7e3f61ec76986fa2072f8ada1d105ebfa61bb116df75dc10f902ff545db3368634fc5 +DIST DisplayCAL-3.9.13_pre20240925.tar.gz 14027557 BLAKE2B 915ef1b74e26da9efdb2dbb70ac0920fdb773868d7cbfc9ef7be5e4d60b300fe22ff54a7d762e3ef901c0ea70e0ba073881df055fecfec38afc8df873879064b SHA512 82993dd4f922b2316954f29ec976851aecc263acbe0e01c1cc158013e04d829c0387b5440092a78bd61743cee416a3bc3cde905843dce9c8233eb18f68915184 EBUILD displaycal-py3-3.9.10-r3.ebuild 1635 BLAKE2B 21a1b93ab0c78fc50824f49e1e6a2e4704e9e4fcc6db91eef854c9d119528e5ddfbebafa597e614540aa8143d732925c311211a5d25b24f77d60f69d2c397fd7 SHA512 e85c78550a5eb370d14532aaaa33f2055f657856754b3067c83a51ea48ae5665405f067e0b979956aa5e56d689de819764858b26a76d60699189a1333791f752 -MISC metadata.xml 790 BLAKE2B aa3f32f061f4840bbc0e29c36e6154cc37b85a9fa76a92e7f69a32ccadef16fa5a9680266c35b51c3351c4f4d65e2e1659515550e2366c9c9516e8c26c049694 SHA512 d4fad45e53ac19ede7f26709878ff36b55906a4c642b1ce7ce2e49ef56a1285582700d07170f702263a3a99ea0bfa2c2cfbc842978f565291d3322fb9a6a5c0d +EBUILD displaycal-py3-3.9.13_pre20240925.ebuild 1903 BLAKE2B 90056c7e089bfa9e1d6b76b235af17b0fa5a958f382a32808c5ef044d0eb0f8febd11925637569436dc37e5042ab1b9c7923f7d3db2f73eb0aa416f4e13a18f8 SHA512 1ba9bd07b13f211e5562758fa63fc001d3e40cf344e697b5acfa45be1934e7813c855c6d466e6b7fce8d20b064128a8930bcf03f876ecbaf04d0e7bea50f9557 +MISC metadata.xml 791 BLAKE2B 23150c53c4e023fea7070ada4b1dcc415000fa909a61a895825df1c2e56798ab44bdf50d916d7ce3de3e6f8cf909bda94125d057551959d287c164ac0b7139eb SHA512 d62e573f9b9334dcf90522a18b0402948fdf7adb7c4175aa8cdb3888c77fc736ffd80339ab0916d7e7dccfb85f4254a356be3c26c612995dc0e8440881aa4af5 diff --git a/media-gfx/displaycal-py3/displaycal-py3-3.9.13_pre20240925.ebuild b/media-gfx/displaycal-py3/displaycal-py3-3.9.13_pre20240925.ebuild new file mode 100644 index 000000000000..8602a8c66ea1 --- /dev/null +++ b/media-gfx/displaycal-py3/displaycal-py3-3.9.13_pre20240925.ebuild @@ -0,0 +1,78 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 +PYTHON_COMPAT=( python3_{9..12} ) +DISTUTILS_EXT=1 +DISTUTILS_USE_PEP517=setuptools + +inherit distutils-r1 xdg + +DESCRIPTION="Modernize the DisplayCAL code including Python 3 support" +HOMEPAGE="https://github.com/eoyilmaz/displaycal-py3" + +MY_PN="DisplayCAL" +MY_P="${MY_PN}-${PV}" +MY_COMMIT="eda424388be5dc18f76b02f8d015d6b2ddafa174" +SRC_URI="https://github.com/eoyilmaz/displaycal-py3/archive/${MY_COMMIT}.tar.gz -> ${MY_P}.tar.gz" + +LICENSE="GPL-3" + +SLOT="0" +KEYWORDS="~amd64" + +RESTRICT="test" + +PATCHES="${FILESDIR}/${P}-Fix-build.patch" + +DEPEND=" + dev-python/build[${PYTHON_USEDEP}] + dev-python/dbus-python[${PYTHON_USEDEP}] + dev-python/distro[${PYTHON_USEDEP}] + dev-python/numpy[${PYTHON_USEDEP}] + dev-python/pillow[${PYTHON_USEDEP}] + dev-python/pychromecast[${PYTHON_USEDEP}] + dev-python/send2trash[${PYTHON_USEDEP}] + dev-python/zeroconf[${PYTHON_USEDEP}] + >=dev-python/wxpython-4.2.0[${PYTHON_USEDEP}] + dev-python/installer[${PYTHON_USEDEP}] + dev-python/certifi[${PYTHON_USEDEP}] + dev-python/wheel[${PYTHON_USEDEP}] + media-gfx/argyllcms + x11-libs/libXxf86vm" + +RDEPEND="${DEPEND}" + +src_unpack() { + default + # Upstream build system is very sensitive to the build folder name + mv "${WORKDIR}/${PN}-${MY_COMMIT}" "${S}" || die +} + +src_prepare() { + sed -e 's/license_file/license_files/g' -i setup.cfg || die + + # remove dependency only imported if `sys.platform in ("darwin", "win32")` + sed -e '/certifi/d' -i setup.cfg || die + + # Remove x-world MIME + sed -i 's|x-world/x-vrml;||g' \ + misc/displaycal-vrml-to-x3d-converter.desktop || die + + distutils-r1_src_prepare +} + +src_install() { + distutils-r1_src_install + + # Use Gentoo package name for doc folder + mv "${ED}/usr/share/doc/${MY_P}" "${ED}/usr/share/doc/${PF}" || die +} + +pkg_postinst() { + xdg_pkg_postinst +} + +pkg_postrm() { + xdg_pkg_postrm +} diff --git a/media-gfx/displaycal-py3/files/displaycal-py3-3.9.13_pre20240925-Fix-build.patch b/media-gfx/displaycal-py3/files/displaycal-py3-3.9.13_pre20240925-Fix-build.patch new file mode 100644 index 000000000000..6d7ad881054b --- /dev/null +++ b/media-gfx/displaycal-py3/files/displaycal-py3-3.9.13_pre20240925-Fix-build.patch @@ -0,0 +1,57 @@ +diff --git a/DisplayCAL/__version__.py b/DisplayCAL/__version__.py +new file mode 100644 +index 00000000..28eceb81 +--- /dev/null ++++ b/DisplayCAL/__version__.py +@@ -0,0 +1,7 @@ ++# generated by setup.py ++ ++BUILD_DATE = "2022-11-21T22:56:25Z" ++LASTMOD = '2022-11-21T22:55:57Z' ++VERSION = (3, 9, 13) ++VERSION_BASE = (3, 9, 13) ++VERSION_STRING = '3.9.13_pre20240925' +diff --git a/DisplayCAL/setup.py b/DisplayCAL/setup.py +index 27425a18..43b6143b 100644 +--- a/DisplayCAL/setup.py ++++ b/DisplayCAL/setup.py +@@ -384,9 +384,12 @@ def get_data(tgt_dir, key, pkgname=None, subkey=None, excludes=None): + data = [] + for pth in files: + if not [exclude for exclude in excludes or [] if fnmatch(pth, exclude)]: +- normalized_path = os.path.normpath(os.path.join(tgt_dir, os.path.dirname(pth))) +- safe_path = [relpath(p, src_dir) for p in safe_glob(os.path.join(src_dir, pth))] +- data.append((normalized_path, safe_path)) ++ data.append( ++ ( ++ os.path.normpath(os.path.join(tgt_dir, os.path.dirname(pth))), ++ safe_glob(os.path.join(src_dir, pth)), ++ ) ++ ) + return data + + +@@ -659,20 +662,6 @@ def setup(): + ) + ) + +- # metainfo / appdata.xml +- data_files.append( +- ( +- os.path.join(os.path.dirname(data), "metainfo"), +- [ +- relpath( +- os.path.normpath( +- os.path.join(pydir, "..", "dist", f"{appstream_id}.appdata.xml") +- ), +- source_dir, +- ) +- ], +- ) +- ) + + if sys.platform not in ("darwin", "win32") or do_py2app or do_py2exe: + # Linux/Unix or py2app/py2exe +-- +2.45.2 + diff --git a/media-gfx/displaycal-py3/metadata.xml b/media-gfx/displaycal-py3/metadata.xml index 6ee5175df506..9a7eb4b74544 100644 --- a/media-gfx/displaycal-py3/metadata.xml +++ b/media-gfx/displaycal-py3/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="person"> <email>sarnex@gentoo.org</email> diff --git a/media-gfx/ditaa/Manifest b/media-gfx/ditaa/Manifest index fba02463b60b..e22a9a795c8b 100644 --- a/media-gfx/ditaa/Manifest +++ b/media-gfx/ditaa/Manifest @@ -68,5 +68,5 @@ DIST xml-apis-ext-1.3.04.jar 85686 BLAKE2B 8ab0f8e8ff2c944765261155fe26aae84807a DIST xml-apis-ext-1.3.04.pom 1837 BLAKE2B a1db75a095c5a007fe95088428aa84efc6d94ced3702470e24e324e7cee89aceb4508cbfad79486e2b2eecbf0453266c652c825e2e048919fc938ff92fc97721 SHA512 f5c4cc21a9b8f359e610c5661f866c2bbbe4f6e887dd678bee9036dd5ec0e6f771a7e0f302f00d10f7f454d1c7376f3813e880a3ad733449fc81927cd2384e17 DIST xmlgraphics-commons-2.6.jar 674607 BLAKE2B fe2702760b6b2fb633254dbee49e9c72dc721db47d904e1297145ae8bdaec3006abcd1f2205da61ba89742cee7b97c2b2f35500bb74ec8596a8c23c1202ef448 SHA512 7df1eb0cd5a73ad78259f4905b8363610711cc660f3590133da8376f771ec5990e8dbea1b4d7e3a8264df17c632713a66610538916291a3ce91506de6d3a023c DIST xmlgraphics-commons-2.6.pom 3480 BLAKE2B 0185976d3673122b8f86fade7a1f965480ada78b54fbd1640690bcb5c7c20bd22dd141402d12209c8389ce1812ef0b694c1ecb402d6672cb84d3527f7b0ea65c SHA512 1a601a75035a19ba8c17ca4df936cfd891528a64093004b36dd373ad94c47c51a6deaf68c4c35d8cfd95309666049a25b9dd317df6f70ea3312c0ba130ec9091 -EBUILD ditaa-0.11.0-r1.ebuild 8040 BLAKE2B a8605dfb5911db9baa765cc73cf19cc111476171c6b8b305f65bf7ed7cd2bdfc0c49a011caa45379af27e363222a7b4696269ff39a98761e85c8881374267fe6 SHA512 de0dd1f965326b5e386a4f4fa6676fd411d7aae2ae83453b8e3a659ac240565263e5d796393bc146c5ff4ad03b13c55ad54dbf55f5d2a6b39bb62896789a63d8 +EBUILD ditaa-0.11.0-r1.ebuild 8035 BLAKE2B 449223376647c1fbe69fedd81a82a6782a633065a90ec9d5377252eb9725dbf96b45985340acdaa3fb4d74fdc4dee091ab5f266326c7174920e553b273773274 SHA512 66a5bef1d87393a3f4bd82f4f837360658d01c3660ef8bd533a7b2b447fd42c51e5f767208d74cd28c87b484888c4b78254426453f76e063ccd0b5606a8a1ea8 MISC metadata.xml 354 BLAKE2B 5a0b871f04047f94815dd840bebd1a68bc776965a70d9f346751681914edb5920c564a66df694d44cbd454477f53d046905e30fe45612149a8c5c9408b506b10 SHA512 98c30a65e92092662dc310d46570023bcf3e4a2069d9989cb425dc0053c908759e013c493811858cbee924334a52cadbb1d8073fb47bce95f955f89165787d0f diff --git a/media-gfx/ditaa/ditaa-0.11.0-r1.ebuild b/media-gfx/ditaa/ditaa-0.11.0-r1.ebuild index 9c7d804181c5..bc595391d871 100644 --- a/media-gfx/ditaa/ditaa-0.11.0-r1.ebuild +++ b/media-gfx/ditaa/ditaa-0.11.0-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -11,7 +11,7 @@ SRC_URI="https://github.com/stathissideris/${PN}/archive/v${PV}.tar.gz -> ${P}.t LICENSE="LGPL-3+" SLOT="0" -KEYWORDS="amd64 arm64 ~x86" +KEYWORDS="amd64 arm64" IUSE="" DEPEND="dev-java/leiningen-bin diff --git a/media-gfx/ebdftopcf/Manifest b/media-gfx/ebdftopcf/Manifest index 65ec747b319b..2281d086fef9 100644 --- a/media-gfx/ebdftopcf/Manifest +++ b/media-gfx/ebdftopcf/Manifest @@ -1,3 +1,3 @@ DIST ebdftopcf-2.tar.bz2 7774 BLAKE2B 4dc1bde62b796f441332511e1b9206f9eadd216ab66dc1a6858dc467f9dfbbaaeb4a7de494eaae4584d8a57d59a0eb96f69047d1a57bd007cbb8e2f7aaccd1c6 SHA512 4631f1591290e0ddc778d5c557aff1e698d8dd7e5ac7e659fda7752642034fbabb091c840dcfad5695e9fc19909203a7fdc0b7a69d57a162ce6bb8fe710ef0f4 -EBUILD ebdftopcf-2-r1.ebuild 613 BLAKE2B 7552a2f6d7ee130176369d7361a9999a4b6dc28acc7ededa46111487cc1883d742b25864b1ce6e7b6965b784f17b5366f34792f1e41c0d29f8cd2ef6260daff5 SHA512 6cdd08f865457773228c4f5d89cad07b480a75bf4e534e02468dcc3b373dff68fd6e9333fd8700283c25e6f7ad9d308843e807d78136c1aeb755508b823304b0 +EBUILD ebdftopcf-2-r1.ebuild 607 BLAKE2B 9ce5971ce6196764b3fcb0b0fea7d2bc40aeaad5784285376a5ddc3084946a60ab211bfb9c10e4d74b18dac4dc63235a393b8898504456180fbaa5890247c7ac SHA512 432ea88511ddb22fe2d435113c60ebe869716cdaf9069d06338e44ffb610c453994920eb9385b001bdda97295632bc8b54439dff57fff7e69cf53761f9e216da MISC metadata.xml 318 BLAKE2B 2387c47086bae1b1a5cb1122d7dd7f94fd93d872699be57d10daddc963c1118a09f3b2bfdd9491e2db795be3211b1247ee5dc210d508b8ac14bced1ba5485722 SHA512 e0585b332a03dce7407bcc19144a40e2648c137dedab1334ce68df011e624f1707c8a47038a1fd643482bf552190cc1e077a65b8f79cebcb282a84efdaedd803 diff --git a/media-gfx/ebdftopcf/ebdftopcf-2-r1.ebuild b/media-gfx/ebdftopcf/ebdftopcf-2-r1.ebuild index a98815fff2bd..61705816f7a7 100644 --- a/media-gfx/ebdftopcf/ebdftopcf-2-r1.ebuild +++ b/media-gfx/ebdftopcf/ebdftopcf-2-r1.ebuild @@ -9,7 +9,7 @@ SRC_URI="mirror://gentoo/${P}.tar.bz2" LICENSE="GPL-2" SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos" +KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos" # these apps are used at runtime by ebdftopcf RDEPEND=" diff --git a/media-gfx/enblend/Manifest b/media-gfx/enblend/Manifest index 1020d6405521..f9b8950683ad 100644 --- a/media-gfx/enblend/Manifest +++ b/media-gfx/enblend/Manifest @@ -1,10 +1,7 @@ -AUX enblend-4.2-doc-install-dir-fix.patch 2705 BLAKE2B a5bfb43521095bc088aef980f849cfb9cb2e7e9ae2a10b2fcd4b56cd7b27888047567c3b95b40e3a8feefe7ee9209db49688800986cc895731e0949acd3bae1c SHA512 a22730295c44da4f9feb3d541b17f298adf98f0328cf01d6a85206087c782e1aebac6509968d1a5433efb5fc3d72e48301ec3d5a2516f01c1f6d923d5032ab03 AUX enblend-4.2.0_p20161007-cmake.patch 477 BLAKE2B 9a27d95e78cc611c723824a300dbc3eaeb7c2ffe6bcacb19baeb8a24180450f2912310ae9584f450899ececca11636304d36631f8c57f6d4b7c2450043d6f147 SHA512 5b79944beabd97f71f05657ce17e31d9eab60506dfce27fefc3a8f9a10c92f33b1b4fa1411c6d1a33d23819a4020a50f130b9083fecaf3e1a072fda71e5f9ff0 AUX enblend-4.2.0_p20161007-doc-scaleable-fonts.patch 650 BLAKE2B 633ae86947cfcb6d4f83c4aaf55a2056fc571ee3973379327f6416a4667b7c5d1d94a5e6b26bfc49a0207608d3b5de0d99cd6678d298de605d6eae5ec731c874 SHA512 b2c3e5367d83bd1b2e0053dd41d92737834045969db32fd9e07f294a8cd5ca120fa913f9fc4fab70abea893d974d8e92fd1ace38845cd1324d21c2455c961ab4 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_p20161007.tar.xz 494060 BLAKE2B 8842dd70a1400a27170794246cb5c89d60b6798373e3a9d63e88738ad569e1174cb4303ccb5a2bc79846651e982e05f8cb9ac3e09b83ee33958b6ccf043ebda9 SHA512 ede037f19a7c3b358f533ecfb235f70824261eaf189d0bdcde6f9cedaa5952be2a6940884e688418b725cb3a67fc1b7d366483a76b7c62326ca857b8efe3a3f3 DIST enblend-4.2.0_p20240424.tar.xz 505928 BLAKE2B 49a9cfd2cb332573a1d3882ce6d50513008ee71d7235f69bb7920fc9b71f6c0c6e5e7ae88de4c5879d4cb2ee94d437b1752d6c13117c07ad81a6832b45985684 SHA512 1eed2cac0dd6d0ddec41097c4d21ebbad01981e6abbb5fe3db69fc4ef50728ce997faad73dc17255997e8eee9af9d540e38bc2bdf106eb6ca338ef1650680894 -EBUILD enblend-4.2.0_p20161007-r6.ebuild 1896 BLAKE2B 4fefdf5984d6fe55a3dcf0e241b2bd60dbc2d671980b047ec35c236de101587b74be6c26dfb86bb091bf6de5353292cdf2980a5f0b59f8d6239cd50c451fe968 SHA512 6509c2e7d4e97f79be3b65f452c0211fb09dbf3327b943515acab7212476f353f91fc8a2ec48eb48e1591c749e416ad9d4bf8b5e8b82c2ee965da0c67d622b9b -EBUILD enblend-4.2.0_p20240424.ebuild 1994 BLAKE2B b0265a0000b0f71ea0f3433fcdd54d27a2afd772cd941712f430b20346de82ac5c8a9091fcf0a2e426dae83f92e5a74f7266ad9bbe6c8749967640088330cc45 SHA512 4d4e47af88feaca19ef724abacecb97a1fdc6b2b994328dc0308f755148b2f6c0f040403da5aabf82838a5cb0ee6f6319fb79e1c17902efbdd82cf1b985ef391 +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_p20161007-r6.ebuild b/media-gfx/enblend/enblend-4.2.0_p20161007-r6.ebuild deleted file mode 100644 index 76a89f6ab151..000000000000 --- a/media-gfx/enblend/enblend-4.2.0_p20161007-r6.ebuild +++ /dev/null @@ -1,89 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit cmake - -DESCRIPTION="Image Blending with Multiresolution Splines" -HOMEPAGE="http://enblend.sourceforge.net/" -SRC_URI="https://dev.gentoo.org/~soap/distfiles/${P}.tar.xz" - -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 )" - -BDEPEND=" - sys-apps/help2man - virtual/pkgconfig - doc? ( - app-text/ghostscript-gpl - app-text/texlive - dev-lang/perl - dev-perl/Readonly - dev-tex/hevea - gnome-base/librsvg - media-gfx/graphviz - >=media-gfx/fig2dev-3.2.9-r1 - sci-visualization/gnuplot[cairo,gd] - virtual/imagemagick-tools[tiff] - ) -" -RDEPEND=" - media-libs/lcms:2 - media-libs/tiff:= - media-libs/vigra[openexr] - sci-libs/gsl:= - debug? ( dev-libs/dmalloc[threads] ) - tcmalloc? ( dev-util/google-perftools ) -" -DEPEND="${RDEPEND} - dev-libs/boost - media-libs/libpng:0 - media-libs/libjpeg-turbo:= -" - -PATCHES=( - "${FILESDIR}"/${PN}-4.2-doc-install-dir-fix.patch - "${FILESDIR}"/${P}-cmake.patch - "${FILESDIR}"/${P}-gcc-10.patch - "${FILESDIR}"/${P}-doc-scaleable-fonts.patch -) - -src_prepare() { - cmake_src_prepare - - sed -i -e "s:share/doc/enblend:share/doc/${PF}:" doc/CMakeLists.txt || die -} - -src_configure() { - local mycmakeargs=( - -DENABLE_SSE2=$(usex cpu_flags_x86_sse2) - -DENABLE_DMALLOC=$(usex debug) - -DDOC=$(usex doc) - -DENABLE_OPENMP=$(usex openmp) - -DENABLE_TCMALLOC=$(usex tcmalloc) - ) - if use doc; then - mycmakeargs+=( - -DINSTALL_HTML_DOC=ON - -DINSTALL_PDF_DOC=ON - ) - fi - - cmake_src_configure -} - -src_compile() { - # To allow icon resizing with renderers (no way to disable) - addpredict /dev/dri - - # To compile fonts in the temp directory - export VARTEXFONTS="${T}/fonts" - - # forcing -j1 as every parallel compilation process needs about 1 GB RAM. - cmake_src_compile -j1 -} diff --git a/media-gfx/enblend/enblend-4.2.0_p20240424.ebuild b/media-gfx/enblend/enblend-4.2.0_p20240424.ebuild index 8dfc5ef79971..07b3b2dc1fd0 100644 --- a/media-gfx/enblend/enblend-4.2.0_p20240424.ebuild +++ b/media-gfx/enblend/enblend-4.2.0_p20240424.ebuild @@ -13,10 +13,8 @@ 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 )" +KEYWORDS="amd64 arm64 x86" +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/enblend/files/enblend-4.2-doc-install-dir-fix.patch b/media-gfx/enblend/files/enblend-4.2-doc-install-dir-fix.patch deleted file mode 100644 index c952eeb7780a..000000000000 --- a/media-gfx/enblend/files/enblend-4.2-doc-install-dir-fix.patch +++ /dev/null @@ -1,66 +0,0 @@ -* Remove the CMAKE_BUILD_TYPE conditional code, in order to build using CMAKE_BUILD_TYPE=Gentoo -* Install html files in html subdir of doc dir - ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -11,9 +11,6 @@ - set(CMAKE_ALLOW_LOOSE_LOOP_CONSTRUCTS true) - - project(enblend) --IF(NOT MSVC) -- SET(CMAKE_BUILD_TYPE Release CACHE STRING "Choose the type of build, options are: None Debug Release RelWithDebInfo MinSizeRel" FORCE) --ENDIF(NOT MSVC) - # where to look first for cmake modules, before ${CMAKE_ROOT}/Modules/ - # is checked - # For now, reuse the hugin modules directory -@@ -130,7 +127,6 @@ - ENDIF() - - IF(CMAKE_COMPILER_IS_GNUCXX) -- SET(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -O3 -ffast-math -DNDEBUG -Wall") - IF(APPLE AND CMAKE_MAJOR_VERSION EQUAL 2 AND CMAKE_MINOR_VERSION LESS 5) - ## Add needed Compiler and Linker flags for OSX - SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -flat_namespace -undefined suppress") -@@ -154,20 +150,6 @@ - SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /bigobj") - ENDIF(CMAKE_CL_64) - -- # compile everything for the static C runtime -- FOREACH(TYPE C CXX) -- # makefiles use blank configuration -- FOREACH(CFG "_DEBUG" "_MINSIZEREL" "_RELEASE" "_RELWITHDEBINFO") -- #MESSAGE("Replacing CMAKE_${TYPE}_FLAGS${CFG}: ${CMAKE_${TYPE}_FLAGS${CFG}}") -- SET(NEW_FLAGS "${CMAKE_${TYPE}_FLAGS${CFG}}") -- # fix up static libc flags -- STRING(REPLACE "/MD" "/MT" NEW_FLAGS "${NEW_FLAGS}") -- # *FORCE* to override whats already placed into the cache -- SET(CMAKE_${TYPE}_FLAGS${CFG} "${NEW_FLAGS}" CACHE STRING -- "CMAKE_${TYPE}_FLAGS${CFG} (overwritten to ensure static build)" FORCE) -- #MESSAGE("New CMAKE_${TYPE}_FLAGS${CFG}: ${CMAKE_${TYPE}_FLAGS${CFG}}") -- ENDFOREACH(CFG) -- ENDFOREACH(TYPE) - # link only with the static C runtime !! THIS IS A MUST !! - SET(NEW_FLAGS "${CMAKE_EXE_LINKER_FLAGS}") - # ensure that the flags are not duplicated on subsequent runs ---- a/doc/CMakeLists.txt -+++ b/doc/CMakeLists.txt -@@ -406,7 +406,7 @@ - "${CMAKE_BINARY_DIR}/doc/enfuse.html" - ${ENBLEND_PNGFILES} - ${ENFUSE_PNGFILES} -- DESTINATION ${DocumentsDirectory} -+ DESTINATION ${DocumentsDirectory}/html - ) - endif() - ---- a/src/CMakeLists.txt -+++ b/src/CMakeLists.txt -@@ -102,7 +102,7 @@ - endif(OpenMP_CXX_FLAGS AND NOT MSVC) - target_link_libraries(enblend ${common_libs} ${additional_libs}) - target_link_libraries(enfuse ${common_libs} ${additional_libs}) --install(TARGETS enblend enfuse DESTINATION bin CONFIGURATIONS Release RelWithDebInfo MinSizeRel) -+install(TARGETS enblend enfuse DESTINATION bin) - - if(NOT WIN32) - # create enblend.1 and enfuse.1 diff --git a/media-gfx/engauge/Manifest b/media-gfx/engauge/Manifest index a14fa6e6aa44..fbacee07e577 100644 --- a/media-gfx/engauge/Manifest +++ b/media-gfx/engauge/Manifest @@ -1,6 +1,3 @@ -AUX engauge-10.6-qt-5.11.patch 662 BLAKE2B 7f287da70c06f71bd115541f636e4b5803149c9a6a8855dad388be234ba6f2981f63dc6ad97f89a890d796f4138f4d1318be1d7994b31a23232071a5999a5527 SHA512 9056af93efa32bb8619820ae990abc4ab172b2ceecc262b1f41c2e33a4b08417a4793a201a7cb7c79c648688c6366b10cb1849e1f03f4c3b5407dc2544cd12ce -DIST engauge-digitizer-10.6.tar.gz 68463313 BLAKE2B 2f939b383d2b2ca7d3ac73196ae6c9f4cd3380f7cb1bc7703d23ffe2554bfd6dfb6f206d3b9c33953757791855c908c7899f078c1c1472549859258d406e5796 SHA512 f571978298f0646f338ee786aae692800bd73242f68a4f35509023d3ea0daaa16ede6a1d45cbc28a31efc277697315c63fe3d2cce1f0cf80334bdeea11599a67 DIST engauge-digitizer-12.1.tar.gz 72358942 BLAKE2B c7581734f3c5591ee5c17e16f2e68d8f75fa083d4b53933d16ea15d36890664f375ac53b5e37872eb0d2ffb5980946fe920412ee56d8a1aa16b0a81e66fcb115 SHA512 54ae573eb1e82ec3a81403c3c64af43207e139a2d97eb633993ffe31e03fedb1c1a5fe63157011851ad4a89822a3109b87a2c90a71f77865b3629a517a353a61 -EBUILD engauge-10.6.ebuild 2037 BLAKE2B 0a1bc802686216484e86d1f78541411ec96065f71669a34eee5a8aa77d1d8df73a10d15a62c9d58f1903de07347f41d8c83d8b44a23df1f974d7011e32d4e39e SHA512 f5df8d4e5fba4b72f59e35660cb690daf4ad03d20224fd4dc806260b67d2516881bf8db7995d3443b41f876da04b829c791f7d03e80ab7a0fc0af5f1afb39daf EBUILD engauge-12.1.ebuild 2073 BLAKE2B 4c629fd5637d820d56ed19ddc286f80e1d9fba27ad998a2ed080a1848d72c607e26014b0bd2d80760b96ee086192804c0af2fbbb4a7cf4483c5e7359d449374d SHA512 f14948879d06e56e4e584290df4b894b28cb9c80e1108643f79d263571fa215fd3123700e31ea5e576124742d595dd4d4ef560492ae96a6287d3a8cb8c3e8f25 MISC metadata.xml 344 BLAKE2B 35482a9cb0cddfadc856560af8580bf70bc38715d15fa9df1e910299d9246ae795070707afd7eb8e4694cd9b24cd5e6c0be87a23f4a6e3de47d16961ee631a21 SHA512 09b55d6c5f904a9a0c3735f2df0fccc0ef44ab55f677b7f6d4ca1892c48c866a44ac7b72f57a254bdf982d62d84aa2003723df223cc23de5f96cb4c326247595 diff --git a/media-gfx/engauge/engauge-10.6.ebuild b/media-gfx/engauge/engauge-10.6.ebuild deleted file mode 100644 index 7edd5d1d42c9..000000000000 --- a/media-gfx/engauge/engauge-10.6.ebuild +++ /dev/null @@ -1,79 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit desktop qmake-utils xdg - -DESCRIPTION="Convert an image file showing a graph or map into numbers" -HOMEPAGE="https://markummitchell.github.io/engauge-digitizer/" -SRC_URI="https://github.com/markummitchell/engauge-digitizer/archive/v${PV}.tar.gz -> engauge-digitizer-${PV}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="amd64 ~x86" -IUSE="doc examples jpeg2k pdf" - -RDEPEND="dev-qt/qtcore:5 - dev-qt/qtgui:5 - dev-qt/qthelp:5 - dev-qt/qtnetwork:5 - dev-qt/qtprintsupport:5 - dev-qt/qtwidgets:5 - dev-qt/qtxml:5 - dev-libs/log4cpp - sci-libs/fftw:3.0 - jpeg2k? ( media-libs/openjpeg:2 ) - pdf? ( app-text/poppler[qt5] )" -DEPEND="${RDEPEND}" - -S=${WORKDIR}/engauge-digitizer-${PV} - -PATCHES=( "${FILESDIR}/${P}-qt-5.11.patch" ) - -src_prepare() { - default - - # Make sure the documentation is looked for in the proper directory - sed -e "s:engauge-digitizer/engauge.qhc:${PF}/engauge.qhc:" \ - -i src/Help/HelpWindow.cpp || die - - # This otherwise overrides user CFLAGS - sed -e '/QMAKE_CXXFLAGS_WARN_ON/s/-O1//' \ - -i engauge.pro || die - - # Neuter the non-pkg-config hackery - sed -e '/error.*OPENJPEG_/d' \ - -e '/LIBS.*OPENJPEG_LIB/d' \ - -e '/QMAKE_POST_LINK.*OPENJPEG_LIB/d' \ - -e '/error.*POPPLER_/d' \ - -e '/LIBS.*POPPLER_LIB/d' \ - -i engauge.pro || die -} - -src_configure() { - eqmake5 \ - CONFIG+=link_pkgconfig \ - $(usex jpeg2k "CONFIG+=jpeg2000 PKGCONFIG+=libopenjp2" "") \ - $(usex pdf "CONFIG+=pdf PKGCONFIG+=poppler-qt5" "") \ - engauge.pro - pushd help >/dev/null || die - ./build || die - popd >/dev/null || die -} - -src_install() { - dobin bin/engauge - doicon src/img/engauge-digitizer.svg - make_desktop_entry engauge "Engauge Digitizer" engauge-digitizer Graphics - - # Install qt help files - dodoc bin/documentation/engauge.{qch,qhc} - docompress -x "${EPREFIX}"/usr/share/doc/${PF}/engauge.{qch,qhc} - - use doc && dodoc -r doc/. - if use examples; then - dodoc -r samples - docompress -x "${EPREFIX}"/usr/share/doc/${PF}/samples - fi -} diff --git a/media-gfx/engauge/files/engauge-10.6-qt-5.11.patch b/media-gfx/engauge/files/engauge-10.6-qt-5.11.patch deleted file mode 100644 index 9070f5223939..000000000000 --- a/media-gfx/engauge/files/engauge-10.6-qt-5.11.patch +++ /dev/null @@ -1,26 +0,0 @@ -Bug: https://bugs.gentoo.org/662476 - -From 5eab86bf84dd1e52fc52b427a8f3508780811976 Mon Sep 17 00:00:00 2001 -From: Michael Palimaka <kensington@gentoo.org> -Date: Thu, 11 Oct 2018 23:51:15 +1100 -Subject: [PATCH] Add missing include. - ---- - src/Load/LoadImageFromUrl.cpp | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/src/Load/LoadImageFromUrl.cpp b/src/Load/LoadImageFromUrl.cpp -index 684629bd..1150dad0 100644 ---- a/src/Load/LoadImageFromUrl.cpp -+++ b/src/Load/LoadImageFromUrl.cpp -@@ -10,6 +10,7 @@ - #include <QFileInfo> - #include <QMessageBox> - #include <QtNetwork/QNetworkReply> -+#include <QTextStream> - #include <QUrl> - #include "Version.h" - --- -2.18.1 - diff --git a/media-gfx/entangle/Manifest b/media-gfx/entangle/Manifest index 5be4f001814a..d5bdea41c8df 100644 --- a/media-gfx/entangle/Manifest +++ b/media-gfx/entangle/Manifest @@ -1,4 +1,4 @@ AUX entangle-3.0-fix-meson-0.61-build.patch 810 BLAKE2B 4b4eac6fbddba41e6f6cdd2afa4f0db1b603bc96b1c281fde415cd71826ae15cb839b267a138229dd59e280459f7cc3cd1538e32357b0bab74b1a5a9507a9caa SHA512 fb2196fc1ec125c6b8ba237c74e9495d8e0e22bd584948a385d3ee906fd32ad9887d02093b3c690e5de90fa19e7d7e538aed9e1f8ede433e15bdd6ad80639ff1 DIST entangle-3.0.tar.xz 518808 BLAKE2B fe2bf4b114bc04fdc56792f984ae7387b70d693fa82f8deaa2023de71a8bba72bc95d4bfc430cdfaf5244e9114b4f7e8bb2e17f3b86de6529037519fa3877899 SHA512 8c6d7e067f88a770c63b76fde2a6ae71894aae95477fcf66b4670697889fdf7939d3f95532626d6f4ca7ae75841d8f247f6bcf78a1ce195b540989f1bfe5ebdd -EBUILD entangle-3.0-r3.ebuild 1700 BLAKE2B 2e97f166c0de255ae010cf4ffcfe6c3cd8eef26e2b850bdce4bfb9d6215e7bcf5a7ca8a764da111b03b15ebc71e3972851eaf16bc6e87cd8488e47eb3265d105 SHA512 79395c199f0426db64ca909798db5b39049e67430d7da81a7e31a95da61dc9110caaccf3c5864836010e52cfecb4b01bcf9c9dfa6160817c2a2c34bb20d7af58 -MISC metadata.xml 529 BLAKE2B ba406d65b63eb495962182c821cb2ad6498b3b67402f92891b7aa22d89ec76915cad324a2b25d41067f3345e75a5d993529e9be2de74443e3342cd0761f9e40e SHA512 db363ca3c2def3556bfb2e01e873b544cbc9c1ecba9ce15ee2de5decd7bbdf300357a5b722ee643454036d3eaaf6e1f29c0dc0cd379943408ceb1012520c5c16 +EBUILD entangle-3.0-r3.ebuild 1742 BLAKE2B 8920e7fa0880eb38d038bec6de172fa7f4239ee7e4b062445c01755ce6fc270beb94c273bd7117b23acfa1dc1a7559da4cbc3e02d2e387a3d0b094670b8a0033 SHA512 bef5a1942d338b1e09b088834505ca10d24a85d2e13b59a17aaf228042fa1ccb497a2a6382e89ccf4edbce62260d34af3935efb15a2771053a65e4ca314d634b +MISC metadata.xml 529 BLAKE2B 044afc2ddf07e5d4b99c865e88396aab898773b83c8409e108de4ee11ff096d9ca72ce7165bd4adc8966d73bfbe67db922d4ed4fb3b88aadb5205bb1a2d81482 SHA512 b5556dcb7a0ba3a9c716b29fab18e01e9d56d5a5d43aedd97dbe4315485b8441a6f52d94bded8205b59ae1a1d2baf9e35a1fde5ee944395f4591a55b8646bc61 diff --git a/media-gfx/entangle/entangle-3.0-r3.ebuild b/media-gfx/entangle/entangle-3.0-r3.ebuild index 575c7d78c119..d604ff90b1f6 100644 --- a/media-gfx/entangle/entangle-3.0-r3.ebuild +++ b/media-gfx/entangle/entangle-3.0-r3.ebuild @@ -8,7 +8,10 @@ PYTHON_COMPAT=( python3_{10..12} ) inherit gnome2-utils meson python-single-r1 xdg-utils DESCRIPTION="Tethered Camera Control & Capture" -HOMEPAGE="https://entangle-photo.org/" +HOMEPAGE=" + https://entangle-photo.org/ + https://gitlab.com/entangle/entangle/ +" SRC_URI="https://entangle-photo.org/download/sources/${P}.tar.xz" LICENSE="GPL-3+" diff --git a/media-gfx/entangle/metadata.xml b/media-gfx/entangle/metadata.xml index 60c98605ee19..52f8c5722568 100644 --- a/media-gfx/entangle/metadata.xml +++ b/media-gfx/entangle/metadata.xml @@ -13,6 +13,6 @@ <name>Gentoo Video project</name> </maintainer> <upstream> - <remote-id type="github">entangle/entangle</remote-id> + <remote-id type="gitlab">entangle/entangle</remote-id> </upstream> </pkgmetadata> diff --git a/media-gfx/eog-plugins/Manifest b/media-gfx/eog-plugins/Manifest index 61d2f6cdb77b..23ce9fd048f4 100644 --- a/media-gfx/eog-plugins/Manifest +++ b/media-gfx/eog-plugins/Manifest @@ -1,5 +1,5 @@ DIST eog-plugins-44.0.tar.xz 134544 BLAKE2B db384d949f2a63cb0fcdf1bdfb8ed4c5c97af88d21079af5de7560b3c3bab231a6361ae459727a9b9f31b49e63f7cd227f465a1a7b8e2bc55e8d7a08f0335ed9 SHA512 2955830aa60a3518869ec1af7a9f0c455277b0a571cb14a5e5926b52b80ed0443e91f28e270feffcf26066e1e9b6080c9a457b55175051c20838c8b80e2da195 DIST eog-plugins-44.1.tar.xz 136392 BLAKE2B b46a8f283798f83b43a82c53c29b98182e7069cf4f5771ba1b5e888c285ddc10dd98fd81eeb8e4350ddf4b8fb0a0c4158673bcf920810e72dc8895ee61835014 SHA512 63fee6b9f1809a7c435ff27649805746d98b3e25c5a8fe2dd0146f7748d33b140c7f5b64598ff0bea427a55bb39d990c5ca19e975cf6bb8ec234f46937b50f29 EBUILD eog-plugins-44.0-r2.ebuild 1732 BLAKE2B f4f53e38b582786e1b34f0d7c7d8aa4c2e75faa7ac119787533ca083b318b6930e66a28134b6ddc97c3bc0ac1ad7a287768133e5e459e0f80720c4126315dcc3 SHA512 8b42bab9a43fb050b9e086800caa29676478fe39c00e9b2f9c81806937d7c886ea82ab94ff8b9ed341359579f34bc6bd437817c75307f8771ad31ac33bf710b0 -EBUILD eog-plugins-44.1.ebuild 1687 BLAKE2B e6145c71bb1ebef03303204487b672c5352cdd71a1c8af412b2ebb624a271524b2197b96084b9f748f210bcfc5cc242e90d90e20c8b42788a1bb5cf99f4427b8 SHA512 1e68dbb7fe49c72241bf6408d32030ca588f908abc841853f74774879d8b73a0e29ab9521609e913cb3cadf48af22a1b59606fee3d3282f42440d9fe438322b5 +EBUILD eog-plugins-44.1.ebuild 1685 BLAKE2B a8cc16c0f2bae6900fcd387780c0c7bf24c778441c4702564bf815f367e7c97b4c335a1101d6c642b8d026ebbf087134b497eea9fddbf5560731a3c533d1c2da SHA512 d90a4adb3fa778ac26322a4f26a0b30bda903eda407ec845054ac5322a650fb3424e68c747c2618707211f64f4e33f1f06eae4079b9b20ed0148da6552c8bf2f MISC metadata.xml 463 BLAKE2B 5ac26843df7d902ad1f64f5e9815b9d31437ed02c1a97ef9c33b6abaaa653b833977bd191d7e12d0fd6aaa1a0a95a01d39402417c241a5e7ccc8a8fbe159430b SHA512 bd40d362b9017a8546cff63bb144707a8b275337f72ea45977381aa9db81361e2eb114a66ca02b8b0dbbb82f1bd1ee2e7eafd25cd309e1c79b575e0bee500694 diff --git a/media-gfx/eog-plugins/eog-plugins-44.1.ebuild b/media-gfx/eog-plugins/eog-plugins-44.1.ebuild index ac59330849d4..534a54e42420 100644 --- a/media-gfx/eog-plugins/eog-plugins-44.1.ebuild +++ b/media-gfx/eog-plugins/eog-plugins-44.1.ebuild @@ -11,7 +11,7 @@ HOMEPAGE="https://gitlab.gnome.org/GNOME/eog-plugins" LICENSE="GPL-2" SLOT="0" -KEYWORDS="~amd64 ~x86" +KEYWORDS="amd64 x86" IUSE="+exif map +python test" RESTRICT="!test? ( test )" diff --git a/media-gfx/eog/Manifest b/media-gfx/eog/Manifest index 6cb6ac0d6183..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 1752 BLAKE2B d1e2cd597d68c4129627838e9205ebe76c04382084623bc7e923710eab51164e605cea69d2b02a800bd246292b072656fbfff42fe237f5ab574aaf5928f1f7f0 SHA512 9d5bbc1124b06ebabf8756c06c37a68660790e7a77a7ff54353a61ba722f168ccd34c83638901310c6d5ea34d02a1be28686ff7fbbcf1b09ad5309a89d610b7b -EBUILD eog-45.4.ebuild 1716 BLAKE2B 41b9e90cc0a19143cd1c99ecec988d75a5a81a3444d1f01007f2a50f1f2c57a747207f6a0729550cf0c1228746c6f680c5cb6c5f5301de2a9004a4e6a309667e SHA512 225673ab7ca23b82f1a3523943393f4758c27794ff51717482e8a65044975aa8bfba93645526e60771e5fdc39ccf301cf104976662407e3889cb5eddd9b6a2cd +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.4.ebuild b/media-gfx/eog/eog-45.4.ebuild index c36318a5952a..37c9ad56a731 100644 --- a/media-gfx/eog/eog-45.4.ebuild +++ b/media-gfx/eog/eog-45.4.ebuild @@ -11,7 +11,7 @@ HOMEPAGE="https://gitlab.gnome.org/GNOME/eog" LICENSE="GPL-2+" SLOT="1" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86" +KEYWORDS="~alpha amd64 ~arm arm64 ~loong ~ppc ~ppc64 ~riscv ~sparc x86" IUSE="+exif gtk-doc +introspection +jpeg lcms +svg xmp tiff" REQUIRED_USE=" diff --git a/media-gfx/eog/eog-45.3.ebuild b/media-gfx/eog/eog-47.0.ebuild index 486256a73ca9..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 ~ia64 ~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/eom/Manifest b/media-gfx/eom/Manifest index 027154374560..e78df3259c82 100644 --- a/media-gfx/eom/Manifest +++ b/media-gfx/eom/Manifest @@ -1,7 +1,4 @@ -AUX eom-1.26.1-libxml2-2.12.patch 1191 BLAKE2B 232908830b3fec40b694c4a4f24d69a44077346a44c68a87d98e2a1a741efb3f7e9f58a1cc1560e58ccab6306639dab0ac070f9d5e007f58a90a282b789d034b SHA512 3570a3c6ba5760c7fd926221a19794442b2d75aad3ec945d831457a3c68f7b73e7023be254d2c467c1b7b4915a2a9d7a6f4464ee0e94b969b3e0a4fb81da5d2c -DIST eom-1.26.1.tar.xz 2512024 BLAKE2B 2aa50d144a4c703d61acee8e0078a8a7ce7e41ffc8e79a0064057b78119e81cc85da0481ee55064702981683e0b34a93dd7a9fce2a6c03fa7fa65e6653d9796d SHA512 263eb6a843577f3ba399fa27b6a9087246053dffd963090933f6bb11b762e1049fdc7b0fd52a6987f40fb57be76d68f6964413a0c12437fb00b8766dc17b7648 DIST eom-1.28.0.tar.xz 2046292 BLAKE2B dec9915ddd63758f6a36eef094e13cdfddc6bb6d333369ff240cb4afa745b814a807fd69d0ed949924fff0337073a6467ec6f5b8037bb9b1e356e029ad2e06f6 SHA512 e500915f9e4b5aa8774645e0bf6735d7592fb9c33d6cca7a94011814ac414816d5ead8dae26a875f054249ca880f306f998c0150c9800df8143dd25a270c239f -EBUILD eom-1.26.1-r1.ebuild 1706 BLAKE2B 822c5c4ec67660574158bcd3c7bbb74b2ab68e60cb4a76b51dad4b4bf4bbdab5c8cdfc55c4eb6bf4527a52d7d9bfdbb23ea6d5c1d3c37bb6332dd1cd6b469b26 SHA512 32714522e31e4fb7861c9851feaa3b71e50cf99979b4f5b5726882a38949d8285fef480420abe29b4f92e638f20a0153d3ea77333cb62606b74a30aed1e1a0a5 -EBUILD eom-1.28.0-r2.ebuild 1795 BLAKE2B 4cda887de306e4a0416fbfd93983e4af5a5c107b3af30004c639e28270f0e4dd25e3aaf6282bf8530293bbeadd085553865c02096256e472bed54c00ead9c5ca SHA512 a0c1e7e66ceafc24d631565fa21cba6f181e771a1ca1ec014d7d53679ed70dd04085e3b629a50c32b6cdb9ae442ba71cc3ddc0f3377848f6d3bf5ae499fcd3ce -EBUILD eom-1.28.0.ebuild 1675 BLAKE2B 3ae045eacd65637c2d0a6386157743202e868f0bbeb7a6ba6d903525c5f4e8e1281a8a6982aece1b96b30502c9d00c715b0dc95e3ca24fb7ed7cbeb870f76683 SHA512 bbcc5b7bb3cd75d6dce98d277c8438489f652f7214e23ef1e62093dd2d58e9bd293cf5f2133018b0a0b626a75dfd7935831b8dc8f513133fcb43f6f0e7293141 +EBUILD eom-1.28.0-r2.ebuild 1801 BLAKE2B f9eb4229182944e5bce4067f7bec7431b6b040f69215d345da98b50c9f34cfe1859e57c888a5ee2cfe7a6324e47c1dba5f07e41155178c3d33ec16b1e267567e SHA512 1d748c76e3e8c7f02a31d2c3534a446e7639fb2711d83a44376eb1d8cf04b276d6429bcf8ef8cb98add12973540336a9e20861752b4d194176b53de396f5d58c +EBUILD eom-1.28.0.ebuild 1683 BLAKE2B c2bb4b17747f8310da1cd7c65d4c7f15e0797a63d14ae59e5667403202cb2f4df85236e964df6efdd1803f0ab24562b7ae6517d0e29c5421df1ec76b832a57f7 SHA512 5843240e5460387f531a3aa4099405b98e10ced6d00e30fdf5a0de7f8d5c4335893bcc853ee95181727b30104f41b67ad78e13627fea733203b18c80be960377 MISC metadata.xml 617 BLAKE2B beb6f065da7476b012d7b972d02ab4a7af91b4d105fa281bd2264c08903d6f84ee735b187fb569c37f0b0223f750e66d3a2b18e0f4e0d100f77048ec318e2aaa SHA512 9f74f1f8062baa57d1ff7253c75fcc9b157e2bbfb82e3da61364334aa258305f0d0ce5e06ba48fad4e3e2243623c97671a3f807b836445300b5cf9c3b51c391d diff --git a/media-gfx/eom/eom-1.26.1-r1.ebuild b/media-gfx/eom/eom-1.26.1-r1.ebuild deleted file mode 100644 index 20c1013dee46..000000000000 --- a/media-gfx/eom/eom-1.26.1-r1.ebuild +++ /dev/null @@ -1,75 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit mate - -if [[ ${PV} != 9999 ]]; then - KEYWORDS="amd64 ~arm ~arm64 ~loong ~riscv x86" -fi - -DESCRIPTION="The MATE image viewer" -LICENSE="FDL-1.1+ GPL-2+ IJG LGPL-2+" -SLOT="0" - -IUSE="X debug exif imagemagick +introspection nls jpeg lcms svg tiff xmp" - -COMMON_DEPEND=" - >=app-accessibility/at-spi2-core-2.46.0 - >=dev-libs/glib-2.52:2 - >=dev-libs/libpeas-1.8.0:0[gtk] - >=dev-libs/libxml2-2:2 - gnome-base/dconf - >=mate-base/mate-desktop-1.17.0 - sys-libs/zlib - x11-libs/cairo - >=x11-libs/gdk-pixbuf-2.36.5:2[introspection?,jpeg?,tiff?] - >=x11-libs/gtk+-3.22:3[introspection?] - x11-libs/libX11 - >=x11-misc/shared-mime-info-0.20 - exif? ( - >=media-libs/libexif-0.6.22 - media-libs/libjpeg-turbo:= - ) - imagemagick? ( >=media-gfx/imagemagick-6.2.6 ) - introspection? ( >=dev-libs/gobject-introspection-0.9.3:= ) - jpeg? ( media-libs/libjpeg-turbo:= ) - lcms? ( media-libs/lcms:2 ) - svg? ( >=gnome-base/librsvg-2.36.2:2 ) - xmp? ( >=media-libs/exempi-1.99.5:2= ) -" - -RDEPEND="${COMMON_DEPEND} - virtual/libintl -" - -BDEPEND="${COMMON_DEPEND} - app-text/yelp-tools - dev-util/glib-utils - dev-util/gtk-doc - dev-build/gtk-doc-am - >=sys-devel/gettext-0.19.8 - virtual/pkgconfig -" - -PATCHES=( - "${FILESDIR}"/${PN}-1.26.1-libxml2-2.12.patch -) - -src_configure() { - mate_src_configure \ - --enable-thumbnailer \ - $(use_enable debug) \ - $(use_enable introspection) \ - $(use_with X x) \ - $(use_with exif libexif) \ - $(usex imagemagick \ - --without-gdk-pixbuf-thumbnailer \ - --with-gdk-pixbuf-thumbnailer \ - ) \ - $(use_with jpeg libjpeg) \ - $(use_with lcms cms) \ - $(use_with svg librsvg) \ - $(use_with xmp) -} diff --git a/media-gfx/eom/eom-1.28.0-r2.ebuild b/media-gfx/eom/eom-1.28.0-r2.ebuild index f808aaf8de76..81c1360b9e0a 100644 --- a/media-gfx/eom/eom-1.28.0-r2.ebuild +++ b/media-gfx/eom/eom-1.28.0-r2.ebuild @@ -7,7 +7,7 @@ inherit gnome2 mate optfeature MINOR=$(($(ver_cut 2) % 2)) if [[ ${MINOR} -eq 0 ]]; then - KEYWORDS="~amd64 ~arm ~arm64 ~loong ~riscv ~x86" + KEYWORDS="amd64 ~arm ~arm64 ~loong ~riscv x86" fi DESCRIPTION="The MATE image viewer" @@ -22,7 +22,7 @@ COMMON_DEPEND=" >=dev-libs/libpeas-1.8.0:0[gtk] >=dev-libs/libxml2-2:2 gnome-base/dconf - >=mate-base/mate-desktop-1.17.0 + >=mate-base/mate-desktop-$(ver_cut 1-2) sys-libs/zlib x11-libs/cairo >=x11-libs/gdk-pixbuf-2.36.5:2[introspection?,jpeg?,tiff?] diff --git a/media-gfx/eom/eom-1.28.0.ebuild b/media-gfx/eom/eom-1.28.0.ebuild index 931fc3ee8522..5e369e19dfda 100644 --- a/media-gfx/eom/eom-1.28.0.ebuild +++ b/media-gfx/eom/eom-1.28.0.ebuild @@ -22,7 +22,7 @@ COMMON_DEPEND=" >=dev-libs/libpeas-1.8.0:0[gtk] >=dev-libs/libxml2-2:2 gnome-base/dconf - >=mate-base/mate-desktop-1.17.0 + >=mate-base/mate-desktop-$(ver_cut 1-2) sys-libs/zlib x11-libs/cairo >=x11-libs/gdk-pixbuf-2.36.5:2[introspection?,jpeg?,tiff?] diff --git a/media-gfx/eom/files/eom-1.26.1-libxml2-2.12.patch b/media-gfx/eom/files/eom-1.26.1-libxml2-2.12.patch deleted file mode 100644 index 7bf2c65154ca..000000000000 --- a/media-gfx/eom/files/eom-1.26.1-libxml2-2.12.patch +++ /dev/null @@ -1,38 +0,0 @@ -https://bugs.gentoo.org/917514 -https://github.com/mate-desktop/eom/commit/ace46747000807d975b58101353302f34c75ef49 -https://github.com/mate-desktop/eom/commit/d00fc0b68e9419ccdefbf2831ad2537bed8f35f4 - -From ace46747000807d975b58101353302f34c75ef49 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Tomasz=20K=C5=82oczko?= - <31284574+kloczek@users.noreply.github.com> -Date: Sat, 25 Nov 2023 20:25:29 +0000 -Subject: [PATCH] fix building with new libxml 2.12.0 -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -Added include <libxml/xmlsave.h> to allow build with libxml 2.12.0. - -Signed-off-by: Tomasz Kłoczko <kloczek@github.com> - -* fix building with libxml 2.12.0 - -Co-authored-by: Colomban Wendling <hypra@ban.netlib.re> - ---------- - -Signed-off-by: Tomasz Kłoczko <kloczek@github.com> -Co-authored-by: raveit65 <mate@raveit.de> -Co-authored-by: Colomban Wendling <hypra@ban.netlib.re> ---- a/cut-n-paste/toolbar-editor/egg-toolbars-model.c -+++ b/cut-n-paste/toolbar-editor/egg-toolbars-model.c -@@ -27,6 +27,8 @@ - - #include <unistd.h> - #include <string.h> -+#include <libxml/globals.h> -+#include <libxml/parser.h> - #include <libxml/tree.h> - #include <gdk/gdk.h> - - diff --git a/media-gfx/evoluspencil/Manifest b/media-gfx/evoluspencil/Manifest index 2c6a2aafd351..aba344aadae0 100644 --- a/media-gfx/evoluspencil/Manifest +++ b/media-gfx/evoluspencil/Manifest @@ -1,6 +1,4 @@ AUX pencil.desktop 202 BLAKE2B bb588b85ed8e8e9fbed0425f3a6a88dabe77d42a1c6efbe9cfc32017d2373015b8f64899c5ca0f8992278debeeff73ca8c0985038f21342e25198eefa059c251 SHA512 101e4f9a205b71ae3a2ee084b40108a05acf210b78d54dad2d35c6fc215468d8fad10a963aee2a7dffd0406b56a98b61a0e28cf8b9ee563a78f66b9fd20e620c DIST Pencil-3.1.1.ga.x86_64.rpm 80453349 BLAKE2B c95d1a9722cde0396833da3e06e984e5d9ddfc9febdb4b65c8defad8aef131a7ea5444f8d05acea6ddbcb13782ab457498406cfba83585685100dc25dfb5a2b1 SHA512 3d438a390e9047230f31540066eafe87ce56dae58db84e2a8dd48dbfd29e5dcb630432f6eb4933bbba4df47460d70273b8e1cf5539cf4c7c6defda18c105582e -DIST evoluspencil-3.1.0-1.rpm 88059338 BLAKE2B 905f37968815be8daf37f60197f33636094c1007553d917f4098e09de9943bbd027bb21cf216df64145206ac968b48fff7a91fcb3acbb1b5d01a897375e31e99 SHA512 3a9a451563f499d918b36b48482a13107e18de0f7fcb786b20a88ffd8f487cf07cfdc279bcf6d4db3b8bbde89a424352d7e1fa1d8eeaa4972d830ec22883a15f -EBUILD evoluspencil-3.1.0-r2.ebuild 1639 BLAKE2B cdedff38018f702916ce41fcc9cafe0a2ddc8485b07c0ea3055fdfc4a77d6e7a56d7c22e497371cd826ca3a82e727d77c8890d7b9c8d139ede50e146d948fe3d SHA512 4fb8ce531319008295cc67e18fe204d0fdc7b79e2b262902b01ed5e763192e1c2b9e19ab9810c8fe2b71fb6f717df68671ec78abae04021767d184aa0c128d08 EBUILD evoluspencil-3.1.1.ebuild 1540 BLAKE2B 9f839c5da3220b3a3d8e3375631399017e367799b5cbef501eb8ba78fa35f6b5f6b073b1381efd56df31f8b172b1a85d54603e0c96382fab8f12b6852b33dd1d SHA512 9347f75261508ab31517fc7a89e879088ff27c4b4933afeb82098dd434bf7dc6e5e8074e8ec5bfa1cba11abad339045a6cbafb989d788cfebf73ae6e11170f99 MISC metadata.xml 246 BLAKE2B 024897eef5e0c70ec011ae2eb8ad27593e7610d8ae358cb39cda715c44d26c932115f83404c54189bff783b098defeba583ea50ccdffc34b8d10c7afacccb5c4 SHA512 79f1b01a467d2fd97d8703a48c2f72ede7b3b5c4ca538401b32602352d62f7a4e2493df9c3c7c613bf08b6a811a14d62cdaa411bd2d1e2fd3965ae317e9c1f1b diff --git a/media-gfx/evoluspencil/evoluspencil-3.1.0-r2.ebuild b/media-gfx/evoluspencil/evoluspencil-3.1.0-r2.ebuild deleted file mode 100644 index 4c1c4625a566..000000000000 --- a/media-gfx/evoluspencil/evoluspencil-3.1.0-r2.ebuild +++ /dev/null @@ -1,85 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit rpm xdg-utils desktop - -MY_PN="${PN/evolus/}" -MY_PV="${PV}.ga" - -DESCRIPTION="A simple GUI prototyping tool to create mockups" -HOMEPAGE="https://pencil.evolus.vn/" -SRC_URI="https://pencil.evolus.vn/dl/V${MY_PV}/${MY_PN}-${MY_PV}-1.x86_64.rpm -> ${P}-1.rpm" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="amd64 x86" - -RDEPEND=" - || ( - >=app-accessibility/at-spi2-core-2.46.0:2 - ( app-accessibility/at-spi2-atk dev-libs/atk ) - ) - dev-libs/expat - dev-libs/glib - dev-libs/nspr - dev-libs/nss - media-libs/alsa-lib - net-print/cups - sys-apps/dbus - sys-apps/util-linux - x11-libs/cairo - x11-libs/gdk-pixbuf - x11-libs/gtk+:2 - x11-libs/libX11 - x11-libs/libxcb - x11-libs/libXcomposite - x11-libs/libXcursor - x11-libs/libXdamage - x11-libs/libXext - x11-libs/libXfixes - x11-libs/libXi - x11-libs/libXrandr - x11-libs/libXrender - x11-libs/libXScrnSaver - x11-libs/libXtst - x11-libs/pango -" - -S="${WORKDIR}" - -# bug 703602 -RESTRICT="splitdebug" - -QA_PREBUILT=" - opt/${MY_PN}/*.so - opt/${MY_PN}/chrome-sandbox - opt/${MY_PN}/pencil -" - -src_prepare() { - default - rm opt/${MY_PN}-${MY_PV}/${MY_PN}.desktop || die -} - -src_install() { - insinto /opt/${MY_PN} - doins -r opt/${MY_PN}-${MY_PV}/* - - fperms 755 /opt/${MY_PN}/${MY_PN} - dosym ../../opt/${MY_PN}/${MY_PN} /usr/bin/evoluspencil - - domenu "${FILESDIR}"/${MY_PN}.desktop - - mkdir -p "${D}"/usr/share/icons/hicolor/256x256/apps/ || die - mv "${D}"/opt/${MY_PN}/${MY_PN}.png "${D}"/usr/share/icons/hicolor/256x256/apps/ || die -} - -pkg_postinst() { - xdg_icon_cache_update -} - -pkg_postrm() { - xdg_icon_cache_update -} diff --git a/media-gfx/exact-image/Manifest b/media-gfx/exact-image/Manifest index 18b9fa070cd6..369855f3f519 100644 --- a/media-gfx/exact-image/Manifest +++ b/media-gfx/exact-image/Manifest @@ -2,8 +2,9 @@ AUX exact-image-1.0.2-dcraw.patch 496 BLAKE2B d9d86facb3b0f9721d3f5791d4744bbf71 AUX exact-image-1.0.2-g++.patch 936 BLAKE2B 6ab787c1393228bb1671c8a2d7b76969fcd11d26f0c14ca08a95cee7241422205d8cb398f2a6b711e884c476cba662718705848a818b1944428b2a207133fede SHA512 44fafd62c713bc59c1cb774924394ad32a13c33b79696a4762e3730108650ccd3033f554fc8b0d7cf9b71126367bce5b90074f2c954ca57c8389975b57eac5e1 AUX exact-image-1.0.2-gcc6.patch 2795 BLAKE2B 17282b91baa020b94654c92d87611001584f82360303a56e70cb8f081caf400394a367982e115bff094dfe11a0798503a606de106f1bf6427b57a9ede1cd6ed5 SHA512 ef42fccab6d0958df2dcf86578f9df1f84254515c2bea611f256e23227b9d6dc917467f2d8f54230f9386e9726152c6bbe4ab4f3d117e0da5a3e99b00e93e348 AUX exact-image-1.2.1-gcc6.patch 1874 BLAKE2B 46b1dbaad49a1588c1957f48fef6e9a3abd7859b715a71dfbc3ef85356c5c9ae7d6ef01c3455b6c08d4d2e07434ddf387fec80ba51ba5d11d0200e5b5f2d5e96 SHA512 14a3209ffb091ee53eb0c0f4c4a41333ddeb8953f36ccc64b5ef2c653efd4f60191b3ffce628eb20aacf2bbf9fb18f5be42298fb0d58d9813ba47d522d1dfcd1 +AUX exact-image-1.2.1-libjxl-9.patch 522 BLAKE2B 96f1967d0fb0cab93f3b55c9b185f9ba4c55ce00a51cbebaa97e082393795bc2d80a36d98f293b538eb818dcceff7caae7e2947b138c17cea54ffbc270954482 SHA512 a37916cf971bfc48038adeb347723cef230ba79c618398690a009631aea7af4ab908fce7efd9be09e803507454e5c340df204c03cd1079964e4467d19db04c77 DIST exact-image-1.0.2.tar.bz2 322174 BLAKE2B 67afefb4c5a52416459cd4ac6198012eb6d7895a73ea8363fae05286c7e7f62aa1a02166985f53b5638c7dc7b23b4dc1fb1c7b2272a9dc595ce329a7083ee1b9 SHA512 8ba5a198a236ddf5fa58f40c80f32ba9d300376c637a13a7acf3d2db7906fced373b33a7ecff9cff4d09d8b21de9ce1fb9f5bfb1f4522557bd01af0e3d6dcc65 DIST exact-image-1.2.1.tar.bz2 320849 BLAKE2B 615884f2501b3e9ff00410d3569c8aa7d0131610f990591eb77a11cf6d7249342b4a2ece0f2dd62ea7a1cdd213ae1a98bf6da0817b74d8c8e78cbca5b8e67e33 SHA512 34af0575d8564dd5942f0e3ec5b6fe7fb234a96e621a737359406a2571ed8ac2c15ef2e7655a7d260b37b68138e071342583f47ad7ef0e3b3511e5ebc1a873a8 EBUILD exact-image-1.0.2-r8.ebuild 2529 BLAKE2B ba0ee3fadcf7c780b20847064f993ce5c9fec51953488b92f3fe5677ac9f0e924ed809bf5a5d6877c9a5167ea29ccb70fdc0ee6e962387a69a31e73c926e4ff9 SHA512 b2a37c8a265078a5ee42434b467434c6347720eb95b6ac8f40c6838776ec8d7ad24ae407c64eae04a56ed04ae775e3f93e69b1cf047564d3d4b6bfa54a818a2e -EBUILD exact-image-1.2.1-r1.ebuild 2242 BLAKE2B 642f483e0582edcb94001c310b5b1631b8488cbc7b6dae234811a8ae05dd3148d10ae14b404f07e0ef42b38a95bea117d5a6dfa09c3f71b8e2320a5ada4d7bba SHA512 8cbc0bba01326f80a4dc19d7aa29c39d08d7e6425f8ea7c1f3f7350c442c5390d879f3fefb6bfc5e6238a9f7623c651a459a85dd94750de260d52d7cc809ec8e +EBUILD exact-image-1.2.1-r2.ebuild 2271 BLAKE2B 2aa90166a38c2d4caaad624855cfdf27d22d2e7bfcc46cbefd48bf1b0fa0e97081654a93d67ae01c669d2daab48d3861ea708b85ccb2652177862e34eaac6477 SHA512 90f1b701cd89af0c9fca2a1ecd363d412587a908d71d270eeeff6cff42d3c441cbafe7bc84705186b168bc7f1ded830e286795e728ec4501fc181a4571df010a MISC metadata.xml 330 BLAKE2B 468dfd9c9bc2687f285c5a7496aa989843c32929b4c410253f1d046df2e2416604f6ff8b1cb4622e85e27f13f26cede91825d04b7748cb4f74fdff13478046c1 SHA512 01bc80b3dc7ed3ff2f3402ecd3214793d18267be1e1e4c4b42718b6f6a4982404e243771917fbbae7a1bd6b12a1cd80534d9738149ec9b2a88bbc1ad62fcdf14 diff --git a/media-gfx/exact-image/exact-image-1.2.1-r1.ebuild b/media-gfx/exact-image/exact-image-1.2.1-r2.ebuild index 7480e98e5c79..5d41f6680a15 100644 --- a/media-gfx/exact-image/exact-image-1.2.1-r1.ebuild +++ b/media-gfx/exact-image/exact-image-1.2.1-r2.ebuild @@ -1,7 +1,7 @@ # Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 LUA_COMPAT=( lua5-{1..4} luajit ) @@ -13,7 +13,7 @@ SRC_URI="http://dl.exactcode.de/oss/${PN}/${P}.tar.bz2" LICENSE="GPL-2" SLOT="0" -KEYWORDS="~amd64 ~x86" +KEYWORDS="amd64 ~x86" IUSE="expat jpeg jpegxl lua openexr perl png swig tiff truetype X" REQUIRED_USE="lua? ( swig ) perl? ( swig )" # Tests are broken; 'make check' fails and referenced testsuite dir not found @@ -24,7 +24,7 @@ RDEPEND=" sys-libs/zlib expat? ( dev-libs/expat ) jpeg? ( media-libs/libjpeg-turbo:= ) - jpegxl? ( <media-libs/libjxl-0.9:= ) + jpegxl? ( media-libs/libjxl:= ) lua? ( ${LUA_DEPS} ) openexr? ( media-libs/openexr:= ) perl? ( dev-lang/perl ) @@ -47,6 +47,7 @@ BDEPEND="virtual/pkgconfig" PATCHES=( "${FILESDIR}"/${P}-gcc6.patch "${FILESDIR}"/${PN}-1.0.2-g++.patch + "${FILESDIR}"/${P}-libjxl-9.patch ) src_prepare() { diff --git a/media-gfx/exact-image/files/exact-image-1.2.1-libjxl-9.patch b/media-gfx/exact-image/files/exact-image-1.2.1-libjxl-9.patch new file mode 100644 index 000000000000..520300b85146 --- /dev/null +++ b/media-gfx/exact-image/files/exact-image-1.2.1-libjxl-9.patch @@ -0,0 +1,11 @@ +--- a/codecs/jpegxl.cc 2024-10-06 17:58:07.684805110 +0200 ++++ b/codecs/jpegxl.cc 2024-10-06 17:58:23.929604759 +0200 +@@ -186,7 +186,7 @@ + } + + if (JXL_ENC_SUCCESS != +- JxlEncoderAddImageFrame(JxlEncoderOptionsCreate(enc.get(), nullptr), ++ JxlEncoderAddImageFrame(JxlEncoderFrameSettingsCreate(enc.get(), nullptr), + &pixel_format, image.getRawData(), + image.stride() * image.h)) { + std::cerr << "JxlEncoderAddImageFrame failed" << std::endl; diff --git a/media-gfx/exif/Manifest b/media-gfx/exif/Manifest index db95ccae2491..95a579e0b5dd 100644 --- a/media-gfx/exif/Manifest +++ b/media-gfx/exif/Manifest @@ -1,4 +1,4 @@ AUX exif-0.6.22-empty-string-check.patch 1272 BLAKE2B ea6d3c4f2c3dd75ca1d9c75433a830282b252197c5b9885278823ed70dcd1ab0e319536c9f012d093da32f7af345280f7004b5b78f0e7800ede9ea4e16de46e2 SHA512 bce1a58033f7597219f2be2edbc4b8b821b1fb6f4de591d3b94010806f278d0bad20af24d7e05aff00b02057ed70ecea548f848ac8412748312eca3a6e6d6682 DIST exif-0.6.22.tar.xz 369152 BLAKE2B 11cfda3d504860c418863449ba986d64553c3ac8354f99bd2af33b3bcb324a237b3bf89110bbd08b8ef5e4f0ac293107afdaac8abc1f4607d3a0544f18686430 SHA512 f1e2c56b9e72a606c90d53733c1f2b310f7be16a3929595bbf9d5d10a128ef3f6582f547554fc106f449e94d626a137a0a5e4c99391c9253d677abd5ae7fc333 -EBUILD exif-0.6.22-r1.ebuild 719 BLAKE2B 2655c050303b8a6249bbfa88200271a3adf6b28cc93340d834e20be9546e4fb8636157a0c4866657b450deb65ad84d24e7d4032ed56e6e4fec907aed1b912404 SHA512 4d6009bf2ed7bc26ea269e22591b869de2618c360e5cd47a7a8cb16db47608b792602f6000674fb40628e567e5d484101984a7de5d0a142b22f91f053063b0c1 +EBUILD exif-0.6.22-r1.ebuild 713 BLAKE2B bc27c0c0478863dc049be2778655a1f1fc9a52b69ba34d7d3962798ad1add0bcf06c2984573760cbc5128c5b1e1eb3e96fb357d0af247a9de75337ad4c268ba1 SHA512 d5fabb10f7b1cddd35bc90abe3731be70ceb2dfbbe22c965e3263757600354018cc093a97306a4f5fb1a336e2ed7d8df894a6cfb9bcb613db76b0e947b82835b MISC metadata.xml 304 BLAKE2B 5b55e98ca12d4776b75f3f3c1be0791a297344b7cc27b127f75e645e1fff1df04a85c5de371378b25366a0af1920470aa3d182572b6202d6cd320522664f17ab SHA512 b56b08cbbf054a85288f63e75342d65cc851d628d70f6fa27a8ba30a869464554af50903a4b89fcc901e0c872d65a074a7c9c087a18228d22e1329f56189fd9c diff --git a/media-gfx/exif/exif-0.6.22-r1.ebuild b/media-gfx/exif/exif-0.6.22-r1.ebuild index 230ebd275c1a..5d2f5b841801 100644 --- a/media-gfx/exif/exif-0.6.22-r1.ebuild +++ b/media-gfx/exif/exif-0.6.22-r1.ebuild @@ -9,7 +9,7 @@ SRC_URI="https://github.com/lib${PN}/${PN}/releases/download/${PN}-${PV//./_}-re LICENSE="LGPL-2+" SLOT="0" -KEYWORDS="~alpha amd64 ~hppa ~ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos" +KEYWORDS="~alpha amd64 ~hppa ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos" IUSE="nls" BDEPEND=" diff --git a/media-gfx/exiv2/Manifest b/media-gfx/exiv2/Manifest index 4951965a741a..bd142f75681b 100644 --- a/media-gfx/exiv2/Manifest +++ b/media-gfx/exiv2/Manifest @@ -1,6 +1,3 @@ -AUX exiv2-0.28.2-errors-localisation.patch 835 BLAKE2B af7821671a1f852d3169eb1577814f390e5943165fff73ea568906e71253a381c72ebe5b3fc623668a7d37f6bfd988e7eff3b505e04f0fb8f6f95b3a8398cc20 SHA512 d228eed586b257e992566d1ebb655753a7bec6ce6ab56773dc7feeb93fa479b4f98a1db4ac64e95eed2447ed27ee434eed40d9c4a230be6fe6f8788fa9d5ed7f -DIST exiv2-0.28.2.tar.gz 45224206 BLAKE2B 9d1d05c99804032dfb9b740e543d1e3cceae011b17853c8565ccad87e726ce1d0f410c13bf4fa8839bc8e0fecdf170a3acac568f14aad4628b3b844f6c21dd7e SHA512 197cc607c0271b5731714713283756250031cef81ba7ed5d9c3e222b4c2397966cc2bbdbceaae706598329dde6f8a9729597d0ae4c36ac264c76546942e4e37b DIST exiv2-0.28.3.tar.gz 46480702 BLAKE2B 73ebdca376d69514a89261d2f78604c5d7ccbc6e73e5c5d61f8caa596fd6b60dd4d06df19cb9f93e402d9a76f1511955f77cfd74b407310a13952092ecfbf0ef SHA512 c8338a118feefa104d73932890c732247c884ab9ce1d170c43a22ab5884517a0e2a7fd1febde7705b8290fbbbc29e64738610404816e4db2b56a70fc444ca049 -EBUILD exiv2-0.28.2-r1.ebuild 3325 BLAKE2B 01f01b3ed583f8cfc25103dcb0b2707516c359d7bbbf6f0e6cc2009ea775bf8cc91ff747bbbf640337079389a2b217071fc8415f1683c9a48ac6d1e0e8a450c4 SHA512 96424c74c1e3e594f4d9dc819a21a91ec7d5428d2de52720df4d5a388fe8e4ce86ec066d3dbc9b92d9c71b3273bb2ff9cd54e3f84f1aac8f027169ad5fc8b969 -EBUILD exiv2-0.28.3.ebuild 3267 BLAKE2B 7553f71719240b4b0a6e0b9a39482473eac4d6376da61b9abdc59ade3bfea3b62d80ac5e6a8ad3655f4a699458d7be6f509a54a4a1ac6f5103a04bbf9f4f4bb7 SHA512 1c4eb6ced273bd353ac976532f0ea5cc46eb68dfb6bb92dff6b15a4aa7c3f9811f7e6d452d171945b72e184d9265ecf7ec55e7b6b4bdfacd42b69eb17c5fdc96 +EBUILD exiv2-0.28.3.ebuild 3261 BLAKE2B 6801c92f63122d21fc5c93e5a65f1c260ce458e12967e6362a51ddba454b757a7da1aeea0b229fe9ef3eca3b0a4906ca0be4bea16079e9c288ad21dbf53e12c0 SHA512 642977da6b3cb8963e350bcbb7a48be4e75042b72e333858b89ac932bf682ce0034384c5ec07977ebfc689a446f02717eb1ec5361067a94e773e082d1324ca9a MISC metadata.xml 686 BLAKE2B 2d1079660cf4268216f8835d1ae6655ebafc99d5402872bb05dac6342034a28a07dcff587fc616a5eedc8c538ea3e43e013711d39c2541295e89629e39a244ee SHA512 40f9225a42386fa6f03bf9436d675bb01bd6eb859974bfed22d1316536ceaf40752fabffdab20b439e87c57f65d193d8d249e5aa022584de3f869f4162660b4e diff --git a/media-gfx/exiv2/exiv2-0.28.2-r1.ebuild b/media-gfx/exiv2/exiv2-0.28.2-r1.ebuild deleted file mode 100644 index 2bb992bdcaab..000000000000 --- a/media-gfx/exiv2/exiv2-0.28.2-r1.ebuild +++ /dev/null @@ -1,130 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -PYTHON_COMPAT=( python3_{10..12} ) -inherit cmake-multilib python-any-r1 - -DESCRIPTION="EXIF, IPTC and XMP metadata C++ library and command line utility" -HOMEPAGE="https://exiv2.org/" - -if [[ ${PV} == *9999* ]]; then - EGIT_REPO_URI="https://github.com/Exiv2/exiv2.git" - inherit git-r3 -else - SRC_URI="https://github.com/Exiv2/exiv2/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz" - KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-solaris" -fi - -LICENSE="GPL-2" -# Upstream hope to have stable ABI in 1.0. Until then, go off ${PV}. -# We may be able to change it to $(ver_cut 1-2) once e.g. -# https://github.com/Exiv2/exiv2/pull/917 is merged. -SLOT="0/$(ver_cut 1-2)" -IUSE="+bmff doc examples jpegxl nls +png test webready +xmp" -RESTRICT="!test? ( test )" - -RDEPEND=" - dev-libs/inih[${MULTILIB_USEDEP}] - >=virtual/libiconv-0-r1[${MULTILIB_USEDEP}] - jpegxl? ( app-arch/brotli:=[${MULTILIB_USEDEP}] ) - nls? ( >=virtual/libintl-0-r1[${MULTILIB_USEDEP}] ) - png? ( sys-libs/zlib[${MULTILIB_USEDEP}] ) - webready? ( net-misc/curl[${MULTILIB_USEDEP}] ) - xmp? ( dev-libs/expat[${MULTILIB_USEDEP}] ) -" -DEPEND="${RDEPEND} - test? ( dev-cpp/gtest ) -" -BDEPEND=" - doc? ( - ${PYTHON_DEPS} - app-text/doxygen - dev-libs/libxslt - media-gfx/graphviz - virtual/pkgconfig - ) - test? ( ${PYTHON_DEPS} ) - nls? ( sys-devel/gettext ) -" - -DOCS=( README.md doc/ChangeLog doc/cmd.txt ) - -PATCHES=( "${FILESDIR}/${P}-errors-localisation.patch" ) - -pkg_setup() { - if use doc || use test ; then - python-any-r1_pkg_setup - fi -} - -src_prepare() { - # FIXME @upstream: - einfo "Converting doc/cmd.txt to UTF-8" - iconv -f LATIN1 -t UTF-8 doc/cmd.txt > doc/cmd.txt.tmp || die - mv -f doc/cmd.txt.tmp doc/cmd.txt || die - - cmake_src_prepare - - sed -e "/^include.*compilerFlags/s/^/#DONT /" -i CMakeLists.txt || die -} - -multilib_src_configure() { - local mycmakeargs=( - -DEXIV2_BUILD_SAMPLES=NO - -DEXIV2_ENABLE_BROTLI=$(usex jpegxl) - -DEXIV2_ENABLE_NLS=$(usex nls) - -DEXIV2_ENABLE_PNG=$(usex png) - -DEXIV2_ENABLE_CURL=$(usex webready) - -DEXIV2_ENABLE_INIH=ON # must be enabled (bug #921937) - -DEXIV2_ENABLE_WEBREADY=$(usex webready) - -DEXIV2_ENABLE_XMP=$(usex xmp) - -DEXIV2_ENABLE_BMFF=$(usex bmff) - - # We let users control this. - -DBUILD_WITH_CCACHE=OFF - # Our toolchain sets this by default. - -DBUILD_WITH_STACK_PROTECTOR=OFF - - $(multilib_is_native_abi || echo -DEXIV2_BUILD_EXIV2_COMMAND=NO) - $(multilib_is_native_abi && echo -DEXIV2_BUILD_DOC=$(usex doc)) - $(multilib_is_native_abi && echo -DEXIV2_BUILD_UNIT_TESTS=$(usex test)) - -DCMAKE_INSTALL_DOCDIR="${EPREFIX}"/usr/share/doc/${PF}/html - ) - - if use doc || use test ; then - mycmakeargs+=( - -DPython3_EXECUTABLE="${PYTHON}" - ) - fi - - cmake_src_configure -} - -multilib_src_compile() { - cmake_src_compile - - if multilib_is_native_abi; then - use doc && eninja doc - fi -} - -multilib_src_test() { - if multilib_is_native_abi; then - cd "${BUILD_DIR}"/bin || die - ./unit_tests || die "Failed to run tests" - fi -} - -multilib_src_install_all() { - use xmp && DOCS+=( doc/{COPYING-XMPSDK,README-XMP,cmdxmp.txt} ) - - einstalldocs - find "${D}" -name '*.la' -delete || die - - if use examples; then - docinto examples - dodoc samples/*.cpp - fi -} diff --git a/media-gfx/exiv2/exiv2-0.28.3.ebuild b/media-gfx/exiv2/exiv2-0.28.3.ebuild index 1f4b825f1386..644c3b5b5904 100644 --- a/media-gfx/exiv2/exiv2-0.28.3.ebuild +++ b/media-gfx/exiv2/exiv2-0.28.3.ebuild @@ -14,7 +14,7 @@ if [[ ${PV} == *9999* ]]; then inherit git-r3 else SRC_URI="https://github.com/Exiv2/exiv2/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz" - KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-solaris" + KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-solaris" fi LICENSE="GPL-2" diff --git a/media-gfx/exiv2/files/exiv2-0.28.2-errors-localisation.patch b/media-gfx/exiv2/files/exiv2-0.28.2-errors-localisation.patch deleted file mode 100644 index 7799232d74a8..000000000000 --- a/media-gfx/exiv2/files/exiv2-0.28.2-errors-localisation.patch +++ /dev/null @@ -1,23 +0,0 @@ -From a3985001b13132ce4841bf1170626f7ef8f9dae7 Mon Sep 17 00:00:00 2001 -From: Jim Easterbrook <jim@jim-easterbrook.me.uk> -Date: Thu, 15 Feb 2024 16:41:35 +0000 -Subject: [PATCH] Restore localisation of error messages/exceptions - -Signed-off-by: Jim Easterbrook <jim@jim-easterbrook.me.uk> ---- - src/error.cpp | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/error.cpp b/src/error.cpp -index c4ce1f2e01..135f4730d8 100644 ---- a/src/error.cpp -+++ b/src/error.cpp -@@ -163,7 +163,7 @@ const char* Error::what() const noexcept { - } - - void Error::setMsg(int count) { -- std::string msg{errList.at(static_cast<size_t>(code_))}; -+ std::string msg{_(errList.at(static_cast<size_t>(code_)))}; - auto pos = msg.find("%0"); - if (pos != std::string::npos) { - msg.replace(pos, 2, std::to_string(static_cast<int>(code_))); diff --git a/media-gfx/fbgrab/Manifest b/media-gfx/fbgrab/Manifest index 22abbe22b3b5..74f46f36f680 100644 --- a/media-gfx/fbgrab/Manifest +++ b/media-gfx/fbgrab/Manifest @@ -1,3 +1,3 @@ DIST fbgrab-1.5.tar.gz 37010 BLAKE2B aff706ef46664216ac1846d0e8fe37646fcb900cce1d451560d024edf3aab4c1817739cb26cae4d9491ae98c5e2d3fda96509f539514b701b7c7ae54ee9a8d02 SHA512 475d377480b9e67f618e19967d4bae5890a78aa00236583914b4ac81f468d8282e1767d85009101f6b03ddc091da8416dcbae451b191a79013e1632d91155c23 -EBUILD fbgrab-1.5.ebuild 690 BLAKE2B 48ba372f5f08ec1d04dc1029f4822b6bd42cb0f87b21ef2b8691ac438c6673a2402d4a3ad9886c3944867fa834e4cb7432ae587ab346c2aaaa6efb20b966ace6 SHA512 52f1ede2b33ab0c93a0dce65991f142165efb1a01a02ef14a008770c494f6dcd8cff3a662923c8bbda8605071e5a8332917414933f126bd6d18db06550126229 +EBUILD fbgrab-1.5.ebuild 684 BLAKE2B 3c994c8b43313aaa0f0d119585b3278fc0a20da763d416849c8d04c27ab6d73572d31b9d3b13fa40875595a12552f73421b4bc5f76524a3fc3b54ef1deaf54b0 SHA512 ab3507d157dc7b8c63d9e4e4531887096e224c73c5cf2b04f3957356c70a556bc60a4dd1c9e44e7f64b6c4f41a956e589275e6454d77c8b9e1c64b1b5933b578 MISC metadata.xml 252 BLAKE2B 2c016d4f49d7c3ad7898fc7f3af422425bdd657fc26c934a77624a5f960198f11df101381ed34506fc96e53d6f598dcb8eb380c57d13cff9b8b36e4493fae798 SHA512 a0c3bbc14f2863aaaff7f5c9b76a7609bc9f5412f504df01788ffd6f319d30854b298bd15d811fc42db349ca061ee5025777e27b13ef8d9507255a2f925c841c diff --git a/media-gfx/fbgrab/fbgrab-1.5.ebuild b/media-gfx/fbgrab/fbgrab-1.5.ebuild index 78374979eb1b..dde459d9e098 100644 --- a/media-gfx/fbgrab/fbgrab-1.5.ebuild +++ b/media-gfx/fbgrab/fbgrab-1.5.ebuild @@ -11,7 +11,7 @@ SRC_URI="https://github.com/GunnarMonell/fbgrab/archive/${PV}.tar.gz -> ${P}.tar LICENSE="GPL-2" SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 ~ia64 ~loong ppc ~ppc64 ~s390 ~sparc x86" +KEYWORDS="~alpha amd64 arm arm64 ~loong ppc ~ppc64 ~s390 ~sparc x86" RDEPEND="media-libs/libpng:= sys-libs/zlib" diff --git a/media-gfx/fbida/Manifest b/media-gfx/fbida/Manifest index 416efd8ad542..3dc5af75fb77 100644 --- a/media-gfx/fbida/Manifest +++ b/media-gfx/fbida/Manifest @@ -5,6 +5,6 @@ AUX fbida-2.14-fno-common.patch 1148 BLAKE2B 108c21e732afaebe6183835732341b814b1 AUX ida-desktop.patch 384 BLAKE2B 627319b163e62af11acc2c0957254cc671145b9df22f27af8988e5f0bcdf383f7cf2ad4fa7b7c97acfbba3181081ee1c025c4b3c82e99bfd7fe4efe69edd59c0 SHA512 0e14a3b848774d1538e309a9c8a8f0445a870db21723d11d0c39d86760ccb9c6f9a5f08ec75016875b2867c2d2075b59aad0fa810621f2c2afcccd14fef26737 DIST fbida-2.14.tar.gz 296826 BLAKE2B 0015b426c5deaf72737a52bddb065e7d0cb804ea97157dded522061d8fabb5c632d5e66b1ef1b4e75b355537ef4f4e603f3a877e2ef92d1581eaa4791ab5be99 SHA512 8f3596ad8a22497880ac698d3b324e038ac5ccae7481fe4a902fc6e8bf43ba1bb3a96af8c7a3347bea86c1988f35674e2647901ac256bd4e8261d467a6a343ec DIST ida.png.bz2 11928 BLAKE2B 8a1c89fc5adfb16c69f9591a299beb62c84d66960b586fbc819e53f904c90beef821ecf3539236563644c28e3ad3c7dbf861b140c820be649305a658b3613433 SHA512 cf3c1bc8d25fe75f10c0a0414b5c082348df2fa94864ec4537c36e0b357cf35b68e2eca205bbf48578a41c27317701aee621c6dd176e0bf3857c52f895d6bfd3 -EBUILD fbida-2.14-r6.ebuild 2531 BLAKE2B 0536af7e7531b37e6523cde15c9897c2a600ceb00e2db4d1a33f409c9eb45ddc0d2881537b0f44b02523aee420ea5a3a4b6a1a650cc07186272232d475524297 SHA512 61b6346aade1fff5c03d5763e87c6730c910a4a1e8085a6531df9ddbee553e94b4cc4ae891606c321b6448d28af510b38e0b85e6ed4af951d121463e61997f51 +EBUILD fbida-2.14-r6.ebuild 2525 BLAKE2B eca890df02f1531ea82beaf11ab51e2eb9aa4465ad3bbbfe5ba9549187684efeab304f6e47db14cf23e8854170aaae45156b268cdb490611df678a6ec21669f7 SHA512 96f9f02b271cf255d48b037150477492f80477992cfe74e3c1ac0791b5c0bedf397cca7164f2cdb154e4d6b4ba4869ed0d58dc29e1ad41888b7f39d81959dfa0 EBUILD fbida-9999.ebuild 1355 BLAKE2B 8f634fe0c8640b90c8bdd892fe9aa0063b70178a51fcb7958ff599b098ba434ece589a978ab27d4a913b7776c712146bc31c653edd808bc8810c3d45258e0473 SHA512 67b1feb4d1f34777a819a44e6f7884df389102f47e1e1a52b0a470a02476e5a058b5d53c2379a24b856c980ae308b30a7cac504d829f9d6a2fd408953e58d924 MISC metadata.xml 482 BLAKE2B c4b1c0587475e24e1d70cd93aa6033d8d9f8c32e009905023da27d793bf7847d8d595d3640148e3955314ee1de5ab3d353e113373b19b564fbb377a5c0e6d4f7 SHA512 7ca481f281fd758dfd9ff025bdb8242e15e68cbc7ad05884b14c89371cb91c1a3deaf451ea1665ae4fedd1904d6218f2a4f5f556145ec0e06332f857cc299b39 diff --git a/media-gfx/fbida/fbida-2.14-r6.ebuild b/media-gfx/fbida/fbida-2.14-r6.ebuild index 3620d12eb513..5023e37831a2 100644 --- a/media-gfx/fbida/fbida-2.14-r6.ebuild +++ b/media-gfx/fbida/fbida-2.14-r6.ebuild @@ -12,7 +12,7 @@ SRC_URI=" " LICENSE="GPL-2 IJG" SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv sparc x86" +KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv sparc x86" IUSE="curl fbcon ghostscript +gif lirc +png scanner +tiff X +webp" REQUIRED_USE=" ghostscript? ( tiff ) diff --git a/media-gfx/feh/Manifest b/media-gfx/feh/Manifest index b64d677e4164..0469bd2693f5 100644 --- a/media-gfx/feh/Manifest +++ b/media-gfx/feh/Manifest @@ -2,5 +2,5 @@ AUX feh-3.2-debug-cflags.patch 193 BLAKE2B 298f65a8f9142167d1cd2cfce0bc61ad9d7d4 DIST feh-3.10.2.tar.bz2 2113183 BLAKE2B 0f4662068917628be6046d3f2ebd8177b7cc1699d693de31229d2ebc6188cc7a5170202188a426ec2e3d900f2c8fb34007395aecc151f8f034e5461d287f058f SHA512 698501347224887162631397bb3b6c5da81b88993876f001407dea87fdc4f458290272d75b400aea6c0927d3c53f290483b6a89cd2cb426f56957a4fe6267797 DIST feh-3.10.3.tar.bz2 2113623 BLAKE2B 052848b222babbcb6a0d9b6c109c7a382052072c03482f47c7784e4b923fba470039d2f75db663b2d70515eb73234141c2871858825489044febea4bf1693b20 SHA512 60f29d463486eca9308037648a1b91b093051878aa2a8671166fd685ac05c217cd46ad2c7df2fde09b5f1d6cd8b3ee2b8f32fbbf6d3b2e4abc4c50b36f237977 EBUILD feh-3.10.2.ebuild 1541 BLAKE2B 6bd62dbd6bc420ac828c1da5572483f63121a277e0462e54d9c89be01b8ea1d773923b4e947b45983a794bbbc81c6cab1da3efe44d425f3b0dcaec1a3a77c398 SHA512 b6790d6c01feebc5117039c4a077f566eb1b8c59ef51869e2693ab8a8fa0072947e95e83356015d6289fe698aae052a4e8925ab77dad39051679359464745541 -EBUILD feh-3.10.3.ebuild 1546 BLAKE2B a5ee7b6e42d8906231a0af66548291423b78e99e3f06c514c30b886f7bad3d046ad7231e317ce163a4a72d8c1fc3a0b8a57d7efdd0a8ca9f1213c13d9fa82bd9 SHA512 292732c1e005744bcd6b4d7aa2ffe20a6237715db0e9fcc11da529ec8bb20c778b27aede5abfaca5bfee024474eec7843560322ede9be379ba79d6611497aa67 +EBUILD feh-3.10.3.ebuild 1541 BLAKE2B 6bd62dbd6bc420ac828c1da5572483f63121a277e0462e54d9c89be01b8ea1d773923b4e947b45983a794bbbc81c6cab1da3efe44d425f3b0dcaec1a3a77c398 SHA512 b6790d6c01feebc5117039c4a077f566eb1b8c59ef51869e2693ab8a8fa0072947e95e83356015d6289fe698aae052a4e8925ab77dad39051679359464745541 MISC metadata.xml 559 BLAKE2B 074f2a1c4a912ebf99cde3c7791ffccee8c19fe53e98794557d7807647d3c465e31fd95d855d7bfa43759d73c6deba365b24420624211355413bd13fe20bed1e SHA512 b811d6991505e777e858d88c26588d4e766a871895da586203565c7486d360d72d3514944caa483fe37c56211ea4a33a16313e1983a515aaf39b349935c73ddf diff --git a/media-gfx/feh/feh-3.10.3.ebuild b/media-gfx/feh/feh-3.10.3.ebuild index 7996c229ccea..112ee958f69c 100644 --- a/media-gfx/feh/feh-3.10.3.ebuild +++ b/media-gfx/feh/feh-3.10.3.ebuild @@ -10,7 +10,7 @@ SRC_URI="https://feh.finalrewind.org/${P}.tar.bz2" LICENSE="feh" SLOT="0" -KEYWORDS="~amd64 ~arm ~arm64 ~mips ~ppc ~ppc64 ~riscv ~x86" +KEYWORDS="amd64 ~arm arm64 ~mips ppc ppc64 ~riscv x86" IUSE="debug curl exif test xinerama inotify" RESTRICT="test" # Tests are broken. diff --git a/media-gfx/fig2dev/Manifest b/media-gfx/fig2dev/Manifest index e2c199cf0123..017ba8b2943b 100644 --- a/media-gfx/fig2dev/Manifest +++ b/media-gfx/fig2dev/Manifest @@ -1,5 +1,5 @@ DIST fig2dev-3.2.9.tar.xz 529892 BLAKE2B d6b4f84f89f85b282e2e02a3a4129ab8c9f67b3376b670fb553fc89347bf2552bfc3b3bfc4d4a4a35da7f9e5659f6f6fdf5a1fb4f82fb87d140dc09d079d9ffa SHA512 4a92539d79027c73cd9fa53d7e960db40ae5616d3197023a98346de4727cd70b28cd7d64ba33063dbe3dcacada7e97bb0e0c595547781a4244aea8c75d43f406 DIST fig2mpdf-1.1.2.tar.bz2 191438 BLAKE2B 411791fecf6e10aac92c004c7da69a10c97a6e12f811452f12d0b51b3a1eeff8fff97d831a5e64c9047855d27e6825a4e65f62be2536651e5876edd00cc822a9 SHA512 36dea40008371386b47a4451e2f311cc2540ab063e3b61e628a535775d62a8840c5cc20c37b80465184bf041c6e583aaf3e5156079e72211d0a87ff3346d2980 -EBUILD fig2dev-3.2.9-r2.ebuild 2299 BLAKE2B e52d451f49bfa3ecb700caf594e6218bc65b1398aff300baef91d49dff581a7819836d9c5c60d3760b99c3b37d050c73e39960248bab685553d09e23be880d74 SHA512 4375637aeb94840774f820512624753845252ccc0dbf93d4ac6dbdde7d05c0b07e5fe286b212bc5612ecf12c80f4cc3a1b69e1f4b041808f81dedcb04d534bbf -EBUILD fig2dev-3.2.9-r5.ebuild 2420 BLAKE2B 0ec2968f64e2ba315496d5e5f65df7675a6f76ed2520a34aef69b53c4b8bc238f0682bec68998f809317aaade31b370edfb3599b3e984ba97864b28230d6525e SHA512 14598c4fc2f3ffa50578ef051a9eecdac925d7113816848c621ed61a77d4e4f9d63977237cdf95b3878b32f64b273ac02d3e9593dae97aa031a0f42b4527439f +EBUILD fig2dev-3.2.9-r2.ebuild 2293 BLAKE2B a04ef4523e3381f84ed89030e2b3e8e4d1b9a1e881705737dcb1b202d769350126caa5a8233b07a9bc9136a12b56d4d76d7252693bb53b00a7884761f69b0ece SHA512 395af4038ec057d080e49453e54c80cbc34c720b6f691456c068390f4029be86548fde26cbe6fdbe6fd25de7c2109c52d3947d40885b69c2d381c4b4dc2ec5c0 +EBUILD fig2dev-3.2.9-r5.ebuild 2414 BLAKE2B b782b79dc1f5f1ca6a769b00959a77dbd12d2263d01231326920be167392227c045411697513fc1cfe6df0158fc68761e4841e9d55e6f1d913dd4db3b553566d SHA512 c0d7560409fb556a5ef2c919b009d7d9a4471473c9fdbe8a0284c6707fc0ed9c4d49bbb3eb81df0a83a61342b9989c6a8db38bbcf924b42689475f949f20e561 MISC metadata.xml 609 BLAKE2B f4f19f0cb2281cf5cddbdf11ac59b3c5c4881b04943e3a4c5d0ff0e5c7f66ffe7d066fc7cd9fb07f7db4f1ef727bcbe7d2033415681d619580a3bed3630474e5 SHA512 0bf3ae4eac46bd373650dfd16ba5b4abaf7f17352a1b59255352e2e9dba56cca03a3192ec99b2b0da6586d86349784de0df25628bf4b35f1e1b37bf38e0ccd6b diff --git a/media-gfx/fig2dev/fig2dev-3.2.9-r2.ebuild b/media-gfx/fig2dev/fig2dev-3.2.9-r2.ebuild index d8dda8e975c8..5ba39f14e9c8 100644 --- a/media-gfx/fig2dev/fig2dev-3.2.9-r2.ebuild +++ b/media-gfx/fig2dev/fig2dev-3.2.9-r2.ebuild @@ -15,7 +15,7 @@ SRC_URI="https://downloads.sourceforge.net/mcj/${P}.tar.xz LICENSE="BSD" SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris" +KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris" RDEPEND=" media-libs/libpng diff --git a/media-gfx/fig2dev/fig2dev-3.2.9-r5.ebuild b/media-gfx/fig2dev/fig2dev-3.2.9-r5.ebuild index 68d2d6c66ecb..8a78d35dbbac 100644 --- a/media-gfx/fig2dev/fig2dev-3.2.9-r5.ebuild +++ b/media-gfx/fig2dev/fig2dev-3.2.9-r5.ebuild @@ -15,7 +15,7 @@ SRC_URI="https://downloads.sourceforge.net/mcj/${P}.tar.xz LICENSE="BSD" SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris" +KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris" IUSE="+ghostscript" RDEPEND=" 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/fontforge/Manifest b/media-gfx/fontforge/Manifest index f8840e211c90..cbcf2f758d9e 100644 --- a/media-gfx/fontforge/Manifest +++ b/media-gfx/fontforge/Manifest @@ -3,6 +3,6 @@ AUX fontforge-20230101-python3.12-distutils-no-more.patch 988 BLAKE2B ea666805ea AUX fontforge-20230101-workaround-broken-translations.patch 5219 BLAKE2B 17ead2e7c178911b48de35c6c86ce60b486a000c05ea5d11e79094851b9e4e68e32335a33ef2b49aeaf0fb161b3823e35f1b281feae426b9b69baabb35c5e02c SHA512 250850a8345511b222faeb7cf6209d412611491a5c9d83f7ad14408b1936059c4fe52cbe834b5d26579281539156b93e692bd8873aea445f23b5d78a0e1684f8 AUX fontforge-doc-no-warn-error.patch 834 BLAKE2B c8bd1cfcf320b7831cc64d67d8de52b37e2f37bbac91d5df709d23e144ae33ec02907606348185eac7030f5151719e0023c0d9fda5395334a15c56f7174151c4 SHA512 6055f1696f1910e81ab1b84b48d336c1a097b53618a3a960e8ce2aeb57e05ad364848d48082b792cd4d5cc85fc95947cddd2e04e7a98c5ceb6f9ced14bd4e674 DIST fontforge-20230101.tar.xz 13761728 BLAKE2B 69e79e7c5d8b551a847ba8706157b0f559ae2a85f61711f50e4855eb6a177bbfb25de2650caf9bc8a7dd1d6af074ca5063519b2f3c151d8c784c4750c6ddc1d8 SHA512 7684a2824d5199e230d2e0a654c2119cef422a57b64e6dd75afde6ba623abed6581f596fd5b7509e03f3b3ad3cf69629aafd4c85aeda64fa91a9e1ab88c9b418 -EBUILD fontforge-20230101-r2.ebuild 3017 BLAKE2B faaf55afb8aceb26886fde3d1ff1b5edd06a53b281b0e2432a847d975fa6d0cd689e9f6ca9ec1ea255f25fc993eb625c48456b144f8a1c48481ae01983e89b82 SHA512 b4c2c1191ab197886bdc594bd163f9b62913f0c1d9d963628993f315e2c4135e556648dab42a6c44de94941edad17b4bdd5c42d586552c0f5421c3ec63b86834 -EBUILD fontforge-20230101.ebuild 2877 BLAKE2B 838d3272eaca260bd5728ecdb6a5f69c3ce5fdbb18432529ff2f536951265d646f7c7ca39bad7c5bb7ec57aaeb312492d7537013d466f263efcd2eedb235bdb3 SHA512 f75fd950ed8e356d09467a6b46980dfba2351239b111a8bf89d17d59167172c5ae3eb0f0254ec86831a4b90dbb9157dd4ef30a154f4b1158bb53e8ed7de2c0c9 +EBUILD fontforge-20230101-r2.ebuild 3011 BLAKE2B be0f4d007a19bb20ece36d998f7ab7d5739f985b26b9b3bf41700cdb5cad9a30aee799f99e38b9774abf98561bd80ef77ec55ee27d6a983a73fc18986fe49261 SHA512 2486be3232837798faff918101d0a1e1300856eaa403276c05ccef3ff4050b4b8dd7bdafb64d98688f25af116991e1bf1dda65b20896afc471f2a9658d000779 +EBUILD fontforge-20230101.ebuild 2871 BLAKE2B 73222de5952852ae971d0fc098b13463a8803ee7caad2c8394e797e1d694b9d2641b5b24402482237aea904daffa7e7f1b0fee05a6269dd4435c4fae2838f7b8 SHA512 ee15b4f0ed8449d106caf9d3f04319f354ed0c6de8f1587cfc2f5c929c18e5bebf5d5bdd7cc43231f087bf1613a28834f2cb347c023f958c42acaeaead024686 MISC metadata.xml 863 BLAKE2B 6a87762712128bf3d57122277839008c4ef057491ae1c1680a166194037ed00e66816f2c0c09be8a17909843ad49b807c06405b95332684dbee3b8d60d30d7ae SHA512 8f33c7d38f031fbf85c82b9743db80c2a3c85ddddeb4deb631fbb911a8e6c2e97b43560b82539ac93df0c577abe74ef743fd4ca1a3e2e2f978b7edfd94cba280 diff --git a/media-gfx/fontforge/fontforge-20230101-r2.ebuild b/media-gfx/fontforge/fontforge-20230101-r2.ebuild index 91ed53a3dcba..543f2c60b461 100644 --- a/media-gfx/fontforge/fontforge-20230101-r2.ebuild +++ b/media-gfx/fontforge/fontforge-20230101-r2.ebuild @@ -3,7 +3,7 @@ EAPI=8 -PYTHON_COMPAT=( python3_{10..12} ) +PYTHON_COMPAT=( python3_{10..13} ) inherit python-single-r1 xdg cmake DESCRIPTION="postscript font editor and converter" @@ -12,7 +12,7 @@ SRC_URI="https://github.com/fontforge/fontforge/releases/download/${PV}/${P}.tar LICENSE="BSD GPL-3+" SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos" +KEYWORDS="~alpha amd64 arm arm64 hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos" IUSE="doc truetype-debugger gif gtk jpeg png +python readline test tiff svg woff2 X" RESTRICT="!test? ( test )" REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" diff --git a/media-gfx/fontforge/fontforge-20230101.ebuild b/media-gfx/fontforge/fontforge-20230101.ebuild index f9af4d4aad6b..6f28a05358ee 100644 --- a/media-gfx/fontforge/fontforge-20230101.ebuild +++ b/media-gfx/fontforge/fontforge-20230101.ebuild @@ -12,7 +12,7 @@ SRC_URI="https://github.com/fontforge/fontforge/releases/download/${PV}/${P}.tar LICENSE="BSD GPL-3+" SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos" +KEYWORDS="~alpha amd64 arm arm64 hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos" IUSE="doc truetype-debugger gif gtk jpeg png +python readline test tiff svg woff2 X" RESTRICT="!test? ( test )" REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" diff --git a/media-gfx/fotema/Manifest b/media-gfx/fotema/Manifest index f24eb5a9d681..e26c60b773c4 100644 --- a/media-gfx/fotema/Manifest +++ b/media-gfx/fotema/Manifest @@ -1,5 +1,8 @@ -DIST fotema-1.14.0.tar.xz 78584796 BLAKE2B c7a53e07fd8ccbd6ba48d595fd280e428ce334908c7b00a4fb5021d92b69c17836ede51656d4a5ab2473fc8220a4b3cbfe25cbdf6da58bc4b7ba7bfbe6ed35dd SHA512 44ff2dd4d3d8268a3f9795f3c37651173a077a7ff831def8e968f658a75786755f7129bed565da674306194084519240b1aa4d378431c36689578f175a054df1 -DIST fotema-1.14.1.tar.xz 78613740 BLAKE2B d945e6be4ef8db99e3c380a75dd6328bcd3a94f885f75bd11db4f164a11f0d541c07d198087aed80a8df637945ca9abc9a98d4c240b0faafe4726d7a82eaef3a SHA512 f80650ccc7401b743e9f6f1b6623f99e5c78df8da44b1608ef1ebfaaf7028858d78a6ca574a712ff2ec1760d4fe0535a365925068be88858eb230ea820803eb2 -EBUILD fotema-1.14.0.ebuild 1520 BLAKE2B 70ec8ef25ae8ac0ab77537f1fcd7d01a6921da7d9d9b24ae7bfea2c6360575f94a22bbde8e7903621fe9d2797c88ad9b73c33f5dab935bb1e828ff68e65c69ea SHA512 30081de6889d689e35bd5ff544046ac7ade1fb8ff721c1a11a24d807874b32da19adcdfdb2447eb1ebaa01d7bd99aafb1d846807452f0acd71fb6d9f0bbb239e -EBUILD fotema-1.14.1.ebuild 1520 BLAKE2B 70ec8ef25ae8ac0ab77537f1fcd7d01a6921da7d9d9b24ae7bfea2c6360575f94a22bbde8e7903621fe9d2797c88ad9b73c33f5dab935bb1e828ff68e65c69ea SHA512 30081de6889d689e35bd5ff544046ac7ade1fb8ff721c1a11a24d807874b32da19adcdfdb2447eb1ebaa01d7bd99aafb1d846807452f0acd71fb6d9f0bbb239e +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-1.19.1.gh.tar.gz 8951161 BLAKE2B 77bbb21eceb2b700f4e3ff787be05a71dd819c662f26813af74ddd1645b9f7864e63cab74ca35cb33e20cddc9fd286705b43fc375247b490c0ec9c6848afb82b SHA512 aebf3a37443292ec51d5fe9a079cd1e074d82bf65e6bd2ec3729181849b71c8b57d020a5382ca8b690b1278b372b56b895b35f9c7810981462543c82a13e4aeb +DIST fotema-rust-faces-43c0d5acd6f3f4d90c6487708f2e511a73bf7c9e.gh.tar.gz 839519 BLAKE2B 7ba344d55c5d108e63556dda32aaf60cfbd2b14a05e2965ca69e54e2aab578f6ba49f7a7b89d6c32cb5ace4b80f7a84247dcbb43a98d5d709895810798966b0b SHA512 aac99659e2d82d342f52b5860d9f1e284e1658fa9e0986b1c54a81cc33f6391535a2773d79defc6a7bf1e52591dc91d91a1ef3742c38e599baed79975b42de51 +DIST fotema-v1.19.1-crates.tar.xz 63008632 BLAKE2B 62758bdd9d4cf54d3bceb187d027d8419b4ccdd2d64ab1e8c9e5679123ee729acbc16f3adeece965bac9a9a33ef093c6519581c0f75afd8327d53e159baae2f7 SHA512 0a366cc7b4bb19e0529fbc6fd5c37a9e03cdfe3ec0ff8e853f46985ffdb974f142f047376999779601abbb33385b7ed44cd6070959513fc471dec92ac76cd0cb +EBUILD fotema-1.19.0.ebuild 1742 BLAKE2B f49bd88fd84ab14995405a310c7e982b379ebea5a990cbaccd51acfbc88afa60997a959b84cab92683c6a649423d2c86ce8309416d350153277bbc3d0cfa87d5 SHA512 b25b847abb8262bf1c079f7402c28f7d94a398eea27bda78437e6c29fac3014a8bc754955d1295e01158652e85edc2c41617bf7f2f96524cef1a729ef0ef97ef +EBUILD fotema-1.19.1.ebuild 1789 BLAKE2B 6008cb95e4f0ff16e57ca99c45d8e8a07cd8467fc0093bfd6b8f461bd4c374a30aea5ad544c306b132f638872fe7c52d6cfedf9cf1e89d25fb755b892c5a435d SHA512 7039ff4e86fc1ae9d3a1a223dc6c8c036ac1dc2f73d9f79c6ffc687da90b7be759a499062663829ff75518c9a33dcd62e6bcbc964b68bb64fa73185dc8217415 MISC metadata.xml 326 BLAKE2B 4ae1a2fadba80e1886d73fb01d493fbbaabae2b97dbffaa10d46e0dbec690e3cb6f8e604675aeb9d0167e50d53cb3f1ffcc2d2ec6c6aed14c36acfe8d6bc31bb SHA512 1f8f3199af710dd344962c425a5af0936be2f52cb41123bee1aba249c356c5c0cb74f3ac6ff7f0fdf71a7e6f8552269abb20cda7d6685e3f21fd5e95436bf552 diff --git a/media-gfx/fotema/fotema-1.14.0.ebuild b/media-gfx/fotema/fotema-1.19.0.ebuild index d4bc59161fe6..33bdf6a09676 100644 --- a/media-gfx/fotema/fotema-1.14.0.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,19 +67,9 @@ BDEPEND=" dev-libs/glib:2 " -ECARGO_VENDOR=${S}/vendor - QA_FLAGS_IGNORED="/usr/bin/fotema" 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.1.ebuild b/media-gfx/fotema/fotema-1.19.1.ebuild index d4bc59161fe6..942b99bb6383 100644 --- a/media-gfx/fotema/fotema-1.14.1.ebuild +++ b/media-gfx/fotema/fotema-1.19.1.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/-/-v} 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://github.com/gentoo-crate-dist/fotema/releases/download/v${PV}/${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 UoI-NCSA 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,19 +67,9 @@ BDEPEND=" dev-libs/glib:2 " -ECARGO_VENDOR=${S}/vendor - QA_FLAGS_IGNORED="/usr/bin/fotema" 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 c60a496f9873..7233902f66fa 100644 --- a/media-gfx/fotocx/Manifest +++ b/media-gfx/fotocx/Manifest @@ -1,10 +1,10 @@ AUX fotocx-24.20-documentation.patch 1373 BLAKE2B ac442711ae3eea89f1fa7a272004a0eda1857f4b4fd2f4045d794093bcfb81c16702039b578bef9768e9af503a126cabb62ed91bda384f64a4765efa73666f26 SHA512 17090677f4f726d6b0d5f2c14b76963e9090dffcd3773b02f66e6a87a6c7f9afe6f2c7060f2e375fb37a191c1846287b37f482f8efa78a84c2d381a50fcda751 -DIST fotocx-24.21-source.tar.gz 16618357 BLAKE2B 43029d080cc843a03475b474c0807e0f2192bc6c64d20c5d41e90218f0b1f88db48aefb7622e8b521f06792a57a9d685d9c57107a309becc39d710ff5aa720a3 SHA512 2945fbaab800a115a1e0c718019ee1e66816cadf794a01db4f8238e7ba74ea033b6e9f24b4e42fe8105242f6df8861de7b00d32e81aae73577f5aa7f38c07f7f -DIST fotocx-24.30-source.tar.gz 16103870 BLAKE2B 3261b9f4fb0345b37b146e443216e21d57ab9b11a1b77be9b9d94247cc8ae74442b75219fbf3d12f67ba16cee0cf772d3ba83d9e2b5ae38ddbbfd5bd42ea9c52 SHA512 39a4c8526e8fe7e49f4c85953e843243577b9a5b34b89030c452336f51c0ca6e381c38ba60ee39e6ee58b528d824240a821487e5e95a04dd44dabfe38e43f131 -DIST fotocx-24.40-source.tar.gz 16036394 BLAKE2B 570adb3b8579650caa985417008f8eb840b2a29c5355ae3ecb3b2a8e58432ec6688da72d3d3eed98d7f5c046d1cf1fc56049684db5ccd9de6fb3f2dee789ea4f SHA512 28211fa50d48eaee4f4bcaa80a07a34113e3020e8b0e3ef2fe983b93000c2397b41fabb1824dd1921e964d03acd348ef5479e584268052ade120e23639f138ed DIST fotocx-24.50-source.tar.gz 16197289 BLAKE2B 468a3cd7ef2cee5a65d2a06283732e0994f9eeb823ed2fd02e319c68f7cb4686a33fbc61e85eaeb8bdd2c7455d1cebada49d0da6004007ad15333b1c39050768 SHA512 3f30b4efb43313980a1be8b92e66c8260484e10a3e50c5351d5462004fe6e5685ecd39be263fbd85bde495a5f1c539bd262124478516d8ddcd40420fa6de699e -EBUILD fotocx-24.21-r1.ebuild 2288 BLAKE2B ab74c6ef40f963dc17b665783e0bfb9b72db4d2d2aa3aedd3d9c11f01cbd6c9bc06edbfdb7e7b060b4a2e9967ef6cf500e568ee0b13f0e77ab4b772d550ec075 SHA512 e4908a812733f629ee52d4116e9784205517992fb18f419e5eb8013614f8ce054ba36f190117c48b0114d658d93c634556ed3b0ab98d28394bc165ee2b23ba0b -EBUILD fotocx-24.30.ebuild 2290 BLAKE2B ac644a95e6ef44d930373708544b28a9d75b00358c3e77be36bfaac5e8140f86a3815778e39efce0cb0676bda2d0bfb3d0a3edf8d58494c0f4391dee155e251a SHA512 bfa7e82236c754371ff92bdfa4db7804bb685b26bee97852d38c6be8b3f43e95ecb1f925ca30629470bebeaf0aa9e0eafee54975cefab45aadce7371621f998a -EBUILD fotocx-24.40.ebuild 2288 BLAKE2B ab74c6ef40f963dc17b665783e0bfb9b72db4d2d2aa3aedd3d9c11f01cbd6c9bc06edbfdb7e7b060b4a2e9967ef6cf500e568ee0b13f0e77ab4b772d550ec075 SHA512 e4908a812733f629ee52d4116e9784205517992fb18f419e5eb8013614f8ce054ba36f190117c48b0114d658d93c634556ed3b0ab98d28394bc165ee2b23ba0b -EBUILD fotocx-24.50.ebuild 2290 BLAKE2B ac644a95e6ef44d930373708544b28a9d75b00358c3e77be36bfaac5e8140f86a3815778e39efce0cb0676bda2d0bfb3d0a3edf8d58494c0f4391dee155e251a SHA512 bfa7e82236c754371ff92bdfa4db7804bb685b26bee97852d38c6be8b3f43e95ecb1f925ca30629470bebeaf0aa9e0eafee54975cefab45aadce7371621f998a +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-24.50.ebuild b/media-gfx/fotocx/fotocx-24.50.ebuild index 8eee122865a7..ace12ae77268 100644 --- a/media-gfx/fotocx/fotocx-24.50.ebuild +++ b/media-gfx/fotocx/fotocx-24.50.ebuild @@ -12,7 +12,7 @@ S="${WORKDIR}/${PN}" LICENSE="GPL-3+" SLOT="0" -KEYWORDS="~amd64 ~arm64 ~x86" +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 diff --git a/media-gfx/fotocx/fotocx-24.30.ebuild b/media-gfx/fotocx/fotocx-24.60.ebuild index 8eee122865a7..8eee122865a7 100644 --- a/media-gfx/fotocx/fotocx-24.30.ebuild +++ b/media-gfx/fotocx/fotocx-24.60.ebuild diff --git a/media-gfx/fotocx/fotocx-24.21-r1.ebuild b/media-gfx/fotocx/fotocx-24.70.ebuild index ace12ae77268..8eee122865a7 100644 --- a/media-gfx/fotocx/fotocx-24.21-r1.ebuild +++ b/media-gfx/fotocx/fotocx-24.70.ebuild @@ -12,7 +12,7 @@ S="${WORKDIR}/${PN}" LICENSE="GPL-3+" SLOT="0" -KEYWORDS="amd64 ~arm64 x86" +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 diff --git a/media-gfx/fotocx/fotocx-24.40.ebuild b/media-gfx/fotocx/fotocx-25.0.ebuild index ace12ae77268..8c904f825206 100644 --- a/media-gfx/fotocx/fotocx-24.40.ebuild +++ b/media-gfx/fotocx/fotocx-25.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 @@ -12,7 +12,7 @@ S="${WORKDIR}/${PN}" LICENSE="GPL-3+" SLOT="0" -KEYWORDS="amd64 ~arm64 x86" +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 diff --git a/media-gfx/freecad/Manifest b/media-gfx/freecad/Manifest index 4089309a177d..12b5aec76d6f 100644 --- a/media-gfx/freecad/Manifest +++ b/media-gfx/freecad/Manifest @@ -1,16 +1,9 @@ AUX freecad-0.21.0-0001-Gentoo-specific-disable-ccache-usage.patch 381 BLAKE2B 2fe05252a4e7846006c5f4e679eae5416ede589b9a6ad5fc30425933bedf933bf586b711c2c7d6a59c3881d454ea76ca39e0556a5a31c3769032694f0858e264 SHA512 731befc86267de4e5fa2caf619a8ae9692580d7025ebc26a80f6744a3104263622c38d87d0d8a263a1a15ef1c1d78c9ff3351aa463a9943941bd7d96d946e516 -AUX freecad-0.21.1-Gentoo-specific-don-t-check-vcs.patch 375 BLAKE2B 27fd88fe3f19ff49e1172f572e2f3f229b91295445190e2d7fd9f8c144c18195dbe853c7cbe79424897116eeedab638802afc438648d377dfcf6ac7f5d9f04bc SHA512 f0c04d302b53295dfacad5408c5de5c8203f673f9e13274b9a1a5787f5b1b649b44e10485416fe661a2ec11e51178c82dff419ab427f4317bc26ecc3d8469bd7 -AUX freecad-0.21.2-boost-175-1.patch 969 BLAKE2B 94e8efec851f0359a611bc95066b53d84a2489bcb45e7e77b1d5c167d033ce69a87853fe3fe56a3addff3305c53f556abb8f1f48727e6bc6a8bc43932ef475c2 SHA512 d012a219a6767449bd458a808dccb03d6b7332235ea7331c1c3178ef053e1c3e5898daed78e99ffc80504c7472c3fc34cfc275fab571b068f1955c3741f0eb65 -AUX freecad-0.21.2-boost-175-2.patch 973 BLAKE2B b9df6cb8d28c08a80387b9374e0eb663e747e4b07509af651c838c3b773242f3e129be07a307f5ed1fef7c4b633143636e1c40105e11d5c184cddfa08954f4f4 SHA512 2ad2137c328930ac9b786535502b16ec76d00b3af3b4c275a54cb00770d9a7ebad8e1a5c6126b6e6095fbac0e7c84c0b2436845bc16141d6f4c3164615a35a9b -AUX freecad-0.21.2-boost-175-3.patch 1015 BLAKE2B 547338ced16847270e599a2f3111309f28fe52b57a09e0afaaf353336c0b935c6bb37ea26a2402cffd219e3a06ca412cae90d16bfc8a4c8f25b5f0b752249b0f SHA512 abc03f8ae63ce03ab3bdfa9e64b71c7bebe6bc1fd9b576ad06b9b00513b261df3265ed770cca5b017eb13e3d66504eabc6e24996b804de57ddf0cd7749a6fdbd -AUX freecad-0.21.2-navcube-qt6.patch 1329 BLAKE2B 96eae9bf5af8c041876cf6afd09f2b0dbc12369469ceb6d5c4607fccee8914dfd9b3eef8291ccdc6aded0369a6bcf0fb159dbfb8172b0f7b95324c22310e21f5 SHA512 cc4559599650df261a60c61138063e60880f0cf02d0b9a320d24fc6801a5fe0bfda8db42b58840aa9d99fa86f324a796b5bc8b690f38d0b3ea9718aa9ad08128 -AUX freecad-0.21.2-py312-qt6.patch 7477 BLAKE2B de4b98c4b488045f9810dce124c271d6f4f629922e026f2d4f1efd6c9060b92309db41f8e0f6ebe5e7a27399911ac908cc8935c2501214326dbb1c4b739d46cc SHA512 a1617514ec41fac9b6694ebc81c025cefdd0e35e05be09b0f860c1b6424007116aff153eac71bc16e4c53d9d510f07dda839addc5a90197933cf82eb986e0e6f -AUX freecad-0.21.2-qtsvg-qt6.patch 7188 BLAKE2B 02284db1b17dc88d0522eb3a726076b9f1ded740fdab1a185e48534c3606c77e51a12690b02bf5e0d9d1f72d1d8389ba84a54cba274200e69b6b10a431bbfdfe SHA512 a0629eed70e042f572876f77d953cee204a226d9d8431c10ed50fcde236d546d869afc623fc1779e891d44d61663cdcb254260f5a78d99aebfb3ac5874152f6e -AUX freecad-0.21.2-shiboken-6.7.0.patch 306 BLAKE2B 03ddf2bfe249856aec0624054eb9db68c1239e153bff91cab16d04b9dad4c341714eecd338ce90b2f5b4aedf26515dee6390fad1b104189fd3a8cf15556f04fa SHA512 cb7c4d699149b839a2b841d71a7bf2983635ed4e3f93ad25ab97c8dcd616c6e48b9fd4ce0e368ec516edb79794b7a98ebda645f09aada7e41228fc5bca1d8cc1 -AUX freecad-0.21.2-vtk9.3-fix.patch 1065 BLAKE2B d0fccb7c19dc9a5efedb5691a74c6ba62b76afe12ecd4876292478459a895409e9448ad319b05fdff2952e8f031e5e2d1cd08fd279f6c6d38d6136f6a8c7c2ab SHA512 aaf4729ac1623cd73405da82980603e5e4aaacf4fb34751dabaa8cc64e69f91d325c855bc2f23aeaa1f4052848af696e7edadeb144f06ce12775bc4c2333a137 -AUX freecad-9999-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-0.21.2.tar.gz 66124278 BLAKE2B 84a4f8008192cd1a2ee1737b537b2668a8c028aa8c8645e6e412ab9ef79bf3bdd2cb73d96fcfd2dbcff613cdcc59cbab95821406acdc9cd7d4eb4636c081be78 SHA512 bd7e9029b24d49ac0955797bcdbea1fd0826bdf9ab246135366dfc35b427004f103acccfc66d008e3ab3928f99e04200e335908a03166545554e2d3e969ae0f5 -EBUILD freecad-0.21.2-r3.ebuild 12437 BLAKE2B c9c9a77f7b7b0aadee67b3fb2aa6ac13da06bcc790e4291e6413826b246a92052f535962c974654646c79a481378b99582d2499b134d57b76cbcad4056fc2fc7 SHA512 c68c9f9a7d106ac48ddf280f716cd73398693e058e8c475d912e61d43466e80041d60847efa2cd5d022d1ac59d1057c14c61943c2eb3ce68032d232b29469c08 -EBUILD freecad-9999.ebuild 11973 BLAKE2B 9befb852d6d7b8f5310c0692c5175ddb87a45260eddbe31a3376362218136a2e27b5cc5fbeff8269558c02b4448bdc553a68772ad9b565d19d3e2aa34dbb6fd8 SHA512 bf284186d32f598ab85fab40c7cdd67f185d8147e5951681ad86c030c523453049365c6cfc2a503268f82cf3ce0a5387e61541f765ca1fbffeee18cb5b875d1e -MISC metadata.xml 3190 BLAKE2B 5f8776248055147c9b2a308913e1d3476ad27b5a3b7795b4fdf15b4d7f10451d6f5ce16ab1ef691daedd74f02fa12efb6341a7ec10456786c427d7707948fdbc SHA512 2163a91c7f7ec97acf81e7c4a2481667388fb43f60ee48d40a09c9bebfebffa8a807ff275385d8dcbefefe16c51bc9de3c07c84d92344f968985693117007042 +DIST freecad-1.0.0.tar.gz 91599325 BLAKE2B 65540eb42e7d508456c9edbf2122e0f288708c33e6d00d3c8c45550e7a614f658f91ba25978a66819bc094b7138aab72a89c0172d0841be1ff798ade5a8bdc64 SHA512 afc1079ea04fd5bb8135f8ad1012d9e4e05c8839dd0a4e00253eada58fe018f445c1200d1ca7ac9f268644c946cbf55b7b313dc3d6bd010f9da3a3334103b7db +EBUILD freecad-1.0.0-r2.ebuild 8734 BLAKE2B 1822220ebf0b676ba6df4ede4d37b18213b2efd7d6c770a665d77aad32a712c57b747cb879056373c410b2d6f035889a58dcb056ce9eeed177d9b22ed41dc37a SHA512 0c2b2b3d7c54c88bed3bcadbd0e296398dc345c558aa9c3278c572509c107a660d3c75a3f9982090377dac450a8b02978167ab41a0c2484d0d596f10d42d155d +EBUILD freecad-1.0.0-r3.ebuild 8822 BLAKE2B 6024fb5a32cf76e5e9a83a9b601fae5e64961c040584c4328d1d12269e939e10292976371f6663355b146d6e4c3dcd1169eb0e5514d7efbfee48201ca6c6dbb0 SHA512 412e647b3ff33799db19cb798f14998ecb01da061f9ee3be69ce6c4a3f1e14e22c43db5ffd1b0842c2b2bc4a4d577575d3c0519217d49d3edcf17200ede7b3b6 +EBUILD freecad-9999.ebuild 8817 BLAKE2B b53234db071c6e5dcfdc6ca0e775b9d25f406b7f06742cadc6d3a2eb5e2b62930de9d4d33ce51e755806193816a22de15749bdc99247fc29c97acc14a876dd1c SHA512 a4fe9b8632a2f7db03b544bddec6facad4aaffece72661870f5cd3154fcb112813f39d4bbfdabafe5122f2ce690259bb680b7cd92bef7e640b028de7e93d558f +MISC metadata.xml 3060 BLAKE2B 7ad73261d4457110b7fbfa4a9304fe0e9fe7461bb01f49960b22c5a6c8433e8af8d416d0d28850b25c29158fd73847b2f0302cac73102c83019da00a13cc6786 SHA512 5b5e7b44f22b7fadc8ee79adb59308f1c5e398438f8304bb78829b73a65fea145a71a7d8cf1c5b0a9193455f1570fe57fdbd8aaa49bea6ee3a121faa23258515 diff --git a/media-gfx/freecad/files/freecad-0.21.2-boost-175-1.patch b/media-gfx/freecad/files/freecad-0.21.2-boost-175-1.patch deleted file mode 100644 index cbb78d5bdc94..000000000000 --- a/media-gfx/freecad/files/freecad-0.21.2-boost-175-1.patch +++ /dev/null @@ -1,22 +0,0 @@ -From f555a25f9e67e628e8075fc8599d7c11807eaddd Mon Sep 17 00:00:00 2001 -From: wmayer <wmayer@users.sourceforge.net> -Date: Sun, 21 Apr 2024 08:36:16 +0200 -Subject: [PATCH] Fixes #13549: smesh doesn't compile with boost 1.85 - ---- - src/3rdParty/salomesmesh/src/SMESH/DriverGMF.cpp | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/3rdParty/salomesmesh/src/SMESH/DriverGMF.cpp b/src/3rdParty/salomesmesh/src/SMESH/DriverGMF.cpp -index d72ff2363f39..f108cbbcb2cf 100644 ---- a/src/3rdParty/salomesmesh/src/SMESH/DriverGMF.cpp -+++ b/src/3rdParty/salomesmesh/src/SMESH/DriverGMF.cpp -@@ -55,7 +55,7 @@ namespace DriverGMF - - bool isExtensionCorrect( const std::string& fileName ) - { -- std::string ext = boost::filesystem::extension(fileName); -+ std::string ext = boost::filesystem::path(fileName).extension().string(); - switch ( ext.size() ) { - case 5: return ( ext == ".mesh" || ext == ".solb" ); - case 6: return ( ext == ".meshb" ); diff --git a/media-gfx/freecad/files/freecad-0.21.2-boost-175-2.patch b/media-gfx/freecad/files/freecad-0.21.2-boost-175-2.patch deleted file mode 100644 index 5f0807028859..000000000000 --- a/media-gfx/freecad/files/freecad-0.21.2-boost-175-2.patch +++ /dev/null @@ -1,22 +0,0 @@ -From aa54ba73df4d42878130c99688be35acf10725a0 Mon Sep 17 00:00:00 2001 -From: ppphp <kevinniub@gmail.com> -Date: Sat, 30 Mar 2024 13:52:32 +0800 -Subject: [PATCH] fix: c++20 deprecate copy_option - ---- - src/Gui/PreferencePackManager.cpp | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/Gui/PreferencePackManager.cpp b/src/Gui/PreferencePackManager.cpp -index e0e6184a3147..e1773a436852 100644 ---- a/src/Gui/PreferencePackManager.cpp -+++ b/src/Gui/PreferencePackManager.cpp -@@ -224,7 +224,7 @@ void Gui::PreferencePackManager::importConfig(const std::string& packName, - auto savedPreferencePacksDirectory = - fs::path(App::Application::getUserAppDataDir()) / "SavedPreferencePacks"; - auto cfgFilename = savedPreferencePacksDirectory / packName / (packName + ".cfg"); -- fs::copy_file(path, cfgFilename, fs::copy_option::overwrite_if_exists); -+ fs::copy_file(path, cfgFilename, fs::copy_options::overwrite_existing); - rescan(); - } - diff --git a/media-gfx/freecad/files/freecad-0.21.2-boost-175-3.patch b/media-gfx/freecad/files/freecad-0.21.2-boost-175-3.patch deleted file mode 100644 index c4c8039dab49..000000000000 --- a/media-gfx/freecad/files/freecad-0.21.2-boost-175-3.patch +++ /dev/null @@ -1,25 +0,0 @@ -From 91457bbdee2422c7f0372688cf72d021cf222073 Mon Sep 17 00:00:00 2001 -From: ppphp <kevinniub@gmail.com> -Date: Sat, 30 Mar 2024 19:17:56 +0800 -Subject: [PATCH] add version check macro for compatibility - ---- - src/Gui/PreferencePackManager.cpp | 4 ++++ - 1 file changed, 4 insertions(+) - -diff --git a/src/Gui/PreferencePackManager.cpp b/src/Gui/PreferencePackManager.cpp -index e1773a436852..dfc54240c00c 100644 ---- a/src/Gui/PreferencePackManager.cpp -+++ b/src/Gui/PreferencePackManager.cpp -@@ -224,7 +224,11 @@ void Gui::PreferencePackManager::importConfig(const std::string& packName, - auto savedPreferencePacksDirectory = - fs::path(App::Application::getUserAppDataDir()) / "SavedPreferencePacks"; - auto cfgFilename = savedPreferencePacksDirectory / packName / (packName + ".cfg"); -+#if BOOST_VERSION >= 107400 - fs::copy_file(path, cfgFilename, fs::copy_options::overwrite_existing); -+#else -+ fs::copy_file(path, cfgFilename, fs::copy_option::overwrite_if_exists); -+#endif - rescan(); - } - diff --git a/media-gfx/freecad/files/freecad-0.21.2-navcube-qt6.patch b/media-gfx/freecad/files/freecad-0.21.2-navcube-qt6.patch deleted file mode 100644 index 0ab999771068..000000000000 --- a/media-gfx/freecad/files/freecad-0.21.2-navcube-qt6.patch +++ /dev/null @@ -1,29 +0,0 @@ -From ccaee18917432fd02e4371a7847bdfaf0692edd1 Mon Sep 17 00:00:00 2001 -From: Martin Rodriguez Reboredo <yakoyoku@gmail.com> -Date: Sun, 19 May 2024 23:23:45 -0300 -Subject: [PATCH] Gui: Fix NaviCube for Qt6 - ---- - src/Gui/NaviCube.cpp | 2 ++ - 1 file changed, 2 insertions(+) - -diff --git a/src/Gui/NaviCube.cpp b/src/Gui/NaviCube.cpp -index 2d164f196b3c..9e3a62d66c81 100644 ---- a/src/Gui/NaviCube.cpp -+++ b/src/Gui/NaviCube.cpp -@@ -926,6 +926,7 @@ NaviCubeImplementation::PickId NaviCubeImplementation::pickFace(short x, short y - GLubyte pixels[4] = {0}; - if (m_PickingFramebuffer && std::abs(x) <= m_CubeWidgetSize / 2 && - std::abs(y) <= m_CubeWidgetSize / 2) { -+ static_cast<QtGLWidget*>(m_View3DInventorViewer->viewport())->makeCurrent(); - m_PickingFramebuffer->bind(); - - glViewport(0, 0, m_CubeWidgetSize * 2, m_CubeWidgetSize * 2); -@@ -936,6 +937,7 @@ NaviCubeImplementation::PickId NaviCubeImplementation::pickFace(short x, short y - glReadPixels(2 * x + m_CubeWidgetSize, 2 * y + m_CubeWidgetSize, 1, 1, - GL_RGBA, GL_UNSIGNED_BYTE, &pixels); - m_PickingFramebuffer->release(); -+ static_cast<QtGLWidget*>(m_View3DInventorViewer->viewport())->doneCurrent(); - } - return pixels[3] == 255 ? static_cast<PickId>(pixels[0]) : PickId::None; - } diff --git a/media-gfx/freecad/files/freecad-0.21.2-py312-qt6.patch b/media-gfx/freecad/files/freecad-0.21.2-py312-qt6.patch deleted file mode 100644 index c1fe31ab05ad..000000000000 --- a/media-gfx/freecad/files/freecad-0.21.2-py312-qt6.patch +++ /dev/null @@ -1,186 +0,0 @@ -From 6043c90462e85fbf15e30ea4c7da7d9a22d570f2 Mon Sep 17 00:00:00 2001 -From: wmayer <wmayer@users.sourceforge.net> -Date: Wed, 7 Feb 2024 15:25:13 +0100 -Subject: [PATCH] Py3.12: harmonize with upstream of PyCXX - ---- - src/CXX/IndirectPythonInterface.cxx | 36 +++++++++++++++------ - src/CXX/Python3/IndirectPythonInterface.hxx | 6 ++-- - src/CXX/Python3/cxx_extensions.cxx | 2 +- - src/CXX/Python3/cxxextensions.c | 10 ++++++ - src/CXX/Version.hxx | 2 +- - 5 files changed, 42 insertions(+), 14 deletions(-) - -diff --git a/src/CXX/IndirectPythonInterface.cxx b/src/CXX/IndirectPythonInterface.cxx -index 3d810cea88a5..fc9e45cbd64f 100644 ---- a/src/CXX/IndirectPythonInterface.cxx -+++ b/src/CXX/IndirectPythonInterface.cxx -@@ -122,17 +122,21 @@ static PyTypeObject *ptr__Bytes_Type = NULL; - # endif - - # if PY_MAJOR_VERSION == 2 || !defined( Py_LIMITED_API ) -+# if PY_MAJOR_VERSION == 2 || (PY_MAJOR_VERSION == 3 && PY_MINOR_VERSION <= 11) - static int *ptr_Py_DebugFlag = NULL; - static int *ptr_Py_InteractiveFlag = NULL; - static int *ptr_Py_OptimizeFlag = NULL; - static int *ptr_Py_NoSiteFlag = NULL; - static int *ptr_Py_VerboseFlag = NULL; -+# endif - --# if PY_MAJOR_VERSION == 3 && PY_MINOR_VERSION >= 7 -+# if PY_MAJOR_VERSION == 3 && PY_MINOR_VERSION <= 11 -+# if PY_MAJOR_VERSION == 3 && PY_MINOR_VERSION >= 7 - static const char **ptr__Py_PackageContext = NULL; --# else -+# else - static char **ptr__Py_PackageContext = NULL; --# endif -+# endif -+# endif - # endif - - # ifdef Py_REF_DEBUG -@@ -242,17 +246,21 @@ bool InitialisePythonIndirectInterface() - ptr_Py_RefTotal = GetInt_as_IntPointer( "_Py_RefTotal" ); - # endif - # if PY_MAJOR_VERSION == 2 || !defined( Py_LIMITED_API ) -+# if PY_MAJOR_VERSION == 2 || (PY_MAJOR_VERSION == 3 && PY_MINOR_VERSION <= 11) - ptr_Py_DebugFlag = GetInt_as_IntPointer( "Py_DebugFlag" ); - ptr_Py_InteractiveFlag = GetInt_as_IntPointer( "Py_InteractiveFlag" ); - ptr_Py_OptimizeFlag = GetInt_as_IntPointer( "Py_OptimizeFlag" ); - ptr_Py_NoSiteFlag = GetInt_as_IntPointer( "Py_NoSiteFlag" ); - ptr_Py_VerboseFlag = GetInt_as_IntPointer( "Py_VerboseFlag" ); -+# endif - --# if PY_MAJOR_VERSION == 3 && PY_MINOR_VERSION >= 7 -+# if PY_MAJOR_VERSION == 3 && PY_MINOR_VERSION <= 11 -+# if PY_MAJOR_VERSION == 3 && PY_MINOR_VERSION >= 7 - ptr__Py_PackageContext = GetConstCharPointer_as_ConstCharPointerPointer( "_Py_PackageContext" ); --# else -+# else - ptr__Py_PackageContext = GetCharPointer_as_CharPointerPointer( "_Py_PackageContext" ); --# endif -+# endif -+# endif - # endif - - # define PYCXX_STANDARD_EXCEPTION( eclass, bclass ) -@@ -397,17 +405,21 @@ PYCXX_EXPORT PyTypeObject *_Bytes_Type() { return ptr__Bytes_Type; } - // wrap the Python Flag variables - // - # if PY_MAJOR_VERSION == 2 || !defined( Py_LIMITED_API ) -+# if PY_MAJOR_VERSION == 2 || (PY_MAJOR_VERSION == 3 && PY_MINOR_VERSION <= 11) - PYCXX_EXPORT int &_Py_DebugFlag() { return *ptr_Py_DebugFlag; } - PYCXX_EXPORT int &_Py_InteractiveFlag() { return *ptr_Py_InteractiveFlag; } - PYCXX_EXPORT int &_Py_OptimizeFlag() { return *ptr_Py_OptimizeFlag; } - PYCXX_EXPORT int &_Py_NoSiteFlag() { return *ptr_Py_NoSiteFlag; } - PYCXX_EXPORT int &_Py_VerboseFlag() { return *ptr_Py_VerboseFlag; } -+# endif - # endif - --# if PY_MAJOR_VERSION == 3 && PY_MINOR_VERSION >= 7 -+# if PY_MAJOR_VERSION == 3 && PY_MINOR_VERSION <= 11 -+# if PY_MAJOR_VERSION == 3 && PY_MINOR_VERSION >= 7 - PYCXX_EXPORT const char *__Py_PackageContext() { return *ptr__Py_PackageContext; } --# else -+# else - PYCXX_EXPORT char *__Py_PackageContext() { return *ptr__Py_PackageContext; } -+# endif - # endif - - # if 0 -@@ -518,15 +530,19 @@ PYCXX_EXPORT PyTypeObject *_Bytes_Type() { return &PyBytes_Type; } - // wrap flags - // - # if PY_MAJOR_VERSION == 2 || !defined( Py_LIMITED_API ) -+# if PY_MAJOR_VERSION == 2 || (PY_MAJOR_VERSION == 3 && PY_MINOR_VERSION <= 11) - PYCXX_EXPORT int &_Py_DebugFlag() { return Py_DebugFlag; } - PYCXX_EXPORT int &_Py_InteractiveFlag() { return Py_InteractiveFlag; } - PYCXX_EXPORT int &_Py_OptimizeFlag() { return Py_OptimizeFlag; } - PYCXX_EXPORT int &_Py_NoSiteFlag() { return Py_NoSiteFlag; } - PYCXX_EXPORT int &_Py_VerboseFlag() { return Py_VerboseFlag; } --# if PY_MAJOR_VERSION == 3 && PY_MINOR_VERSION >= 7 -+# endif -+# if PY_MAJOR_VERSION == 3 && PY_MINOR_VERSION <= 11 -+# if PY_MAJOR_VERSION == 3 && PY_MINOR_VERSION >= 7 - PYCXX_EXPORT const char *__Py_PackageContext() { return _Py_PackageContext; } --# else -+# else - PYCXX_EXPORT char *__Py_PackageContext() { return _Py_PackageContext; } -+# endif - # endif - # endif - -diff --git a/src/CXX/Python3/IndirectPythonInterface.hxx b/src/CXX/Python3/IndirectPythonInterface.hxx -index bf2c15c53f9a..eb4ae4fe63b9 100644 ---- a/src/CXX/Python3/IndirectPythonInterface.hxx -+++ b/src/CXX/Python3/IndirectPythonInterface.hxx -@@ -149,10 +149,12 @@ PYCXX_EXPORT int &_Py_NoSiteFlag(); - PYCXX_EXPORT int &_Py_TabcheckFlag(); - PYCXX_EXPORT int &_Py_VerboseFlag(); - --# if PY_MAJOR_VERSION == 3 && PY_MINOR_VERSION >= 7 -+# if PY_MAJOR_VERSION == 3 && PY_MINOR_VERSION <= 11 -+# if PY_MAJOR_VERSION == 3 && PY_MINOR_VERSION >= 7 - PYCXX_EXPORT const char *__Py_PackageContext(); --# else -+# else - PYCXX_EXPORT char *__Py_PackageContext(); -+# endif - # endif - # endif - -diff --git a/src/CXX/Python3/cxx_extensions.cxx b/src/CXX/Python3/cxx_extensions.cxx -index 7371810be4a9..e6eefdafea17 100644 ---- a/src/CXX/Python3/cxx_extensions.cxx -+++ b/src/CXX/Python3/cxx_extensions.cxx -@@ -152,7 +152,7 @@ PyMethodDef *MethodTable::table() - //================================================================================ - ExtensionModuleBase::ExtensionModuleBase( const char *name ) - : m_module_name( name ) --#if defined( Py_LIMITED_API ) -+#if defined( Py_LIMITED_API ) || (PY_MAJOR_VERSION == 3 && PY_MINOR_VERSION >= 12) - , m_full_module_name( m_module_name ) - #else - , m_full_module_name( __Py_PackageContext() != NULL ? std::string( __Py_PackageContext() ) : m_module_name ) -diff --git a/src/CXX/Python3/cxxextensions.c b/src/CXX/Python3/cxxextensions.c -index 3b0f8ef7c588..afb9313ad0a8 100644 ---- a/src/CXX/Python3/cxxextensions.c -+++ b/src/CXX/Python3/cxxextensions.c -@@ -42,6 +42,14 @@ extern "C" - { - #endif - -+#if PY_MAJOR_VERSION == 3 && PY_MINOR_VERSION >= 13 -+PyObject py_object_initializer = -+ { -+ { 1 }, -+ NULL // type must be init'ed by user -+ }; -+ -+#else - PyObject py_object_initializer = - { - _PyObject_EXTRA_INIT -@@ -49,6 +57,8 @@ PyObject py_object_initializer = - NULL // type must be init'ed by user - }; - -+#endif -+ - #ifdef __cplusplus - } - #endif -diff --git a/src/CXX/Version.hxx b/src/CXX/Version.hxx -index e6069aad335e..59fe3c203b86 100644 ---- a/src/CXX/Version.hxx -+++ b/src/CXX/Version.hxx -@@ -40,7 +40,7 @@ - - #define PYCXX_VERSION_MAJOR 7 - #define PYCXX_VERSION_MINOR 1 --#define PYCXX_VERSION_PATCH 7 -+#define PYCXX_VERSION_PATCH 9 - #define PYCXX_MAKEVERSION( major, minor, patch ) ((major<<16)|(minor<<8)|(patch)) - #define PYCXX_VERSION PYCXX_MAKEVERSION( PYCXX_VERSION_MAJOR, PYCXX_VERSION_MINOR, PYCXX_VERSION_PATCH ) - #endif diff --git a/media-gfx/freecad/files/freecad-0.21.2-qtsvg-qt6.patch b/media-gfx/freecad/files/freecad-0.21.2-qtsvg-qt6.patch deleted file mode 100644 index 505862aa2bf1..000000000000 --- a/media-gfx/freecad/files/freecad-0.21.2-qtsvg-qt6.patch +++ /dev/null @@ -1,148 +0,0 @@ -From ac9a88c2c59a2d2002a7740a1597a05c819220e0 Mon Sep 17 00:00:00 2001 -From: wmayer <wmayer@users.sourceforge.net> -Date: Sat, 20 Apr 2024 14:02:38 +0200 -Subject: [PATCH] PySide6: Fixes #13533: QSvgWidget is not a child of QtSvg in - PySide6 - -* Create a compatibility module QtSvgWidgets.py to handle PySide2 & PySide6 -* In the Arch and Material modules use the QtSvgWidgets module -* Since Qt6 the method QFont.setWeight() doesn't accept an int any more but requires an enum. Since the call of QFont.setBold(True) sets - a weight of 75 the extra calls of QFont.setWeight(75) can be safely removed ---- - cMake/FreeCAD_Helpers/SetupShibokenAndPyside.cmake | 3 +++ - src/Mod/Arch/ArchPrecast.py | 8 ++++---- - src/Mod/Arch/ArchWindow.py | 4 ++-- - src/Mod/Arch/importIFClegacy.py | 1 - - src/Mod/Draft/DraftGui.py | 1 - - src/Mod/Material/MaterialEditor.py | 6 +++--- - 6 files changed, 12 insertions(+), 11 deletions(-) - -diff --git a/cMake/FreeCAD_Helpers/SetupShibokenAndPyside.cmake b/cMake/FreeCAD_Helpers/SetupShibokenAndPyside.cmake -index 0569c1fde9f2..fa872e287b59 100644 ---- a/cMake/FreeCAD_Helpers/SetupShibokenAndPyside.cmake -+++ b/cMake/FreeCAD_Helpers/SetupShibokenAndPyside.cmake -@@ -91,9 +91,12 @@ macro(SetupShibokenAndPyside) - file(WRITE ${CMAKE_BINARY_DIR}/Ext/PySide/QtWidgets.py "from PySide${PYSIDE_MAJOR_VERSION}.QtWidgets import *\n") - if(PYSIDE_MAJOR_VERSION LESS 6) - file(WRITE ${CMAKE_BINARY_DIR}/Ext/PySide/QtWebEngineWidgets.py "from PySide${PYSIDE_MAJOR_VERSION}.QtWebEngineWidgets import *\n") -+ file(WRITE ${CMAKE_BINARY_DIR}/Ext/PySide/QtSvgWidgets.py "from PySide${PYSIDE_MAJOR_VERSION}.QtSvg import QGraphicsSvgItem\n" -+ "from PySide${PYSIDE_MAJOR_VERSION}.QtSvg import QSvgWidget\n") - else() - file(WRITE ${CMAKE_BINARY_DIR}/Ext/PySide/QtWebEngineWidgets.py "from PySide${PYSIDE_MAJOR_VERSION}.QtWebEngineWidgets import *\n" - "from PySide${PYSIDE_MAJOR_VERSION}.QtWebEngineCore import QWebEnginePage\n") -+ file(WRITE ${CMAKE_BINARY_DIR}/Ext/PySide/QtSvgWidgets.py "from PySide${PYSIDE_MAJOR_VERSION}.QtSvgWidgets import *\n") - endif() - endif() - -diff --git a/src/Mod/Arch/ArchPrecast.py b/src/Mod/Arch/ArchPrecast.py -index 7bb929b10e34..2f482902c1ce 100644 ---- a/src/Mod/Arch/ArchPrecast.py -+++ b/src/Mod/Arch/ArchPrecast.py -@@ -777,14 +777,14 @@ class _PrecastTaskPanel: - def __init__(self): - - import FreeCADGui -- from PySide import QtCore,QtGui,QtSvg -+ from PySide import QtCore,QtGui,QtSvgWidgets - self.form = QtGui.QWidget() - self.grid = QtGui.QGridLayout(self.form) - self.PrecastTypes = ["Beam","I-Beam","Pillar","Panel","Slab","Stairs"] - self.SlabTypes = ["Champagne","Hat"] - - # image display -- self.preview = QtSvg.QSvgWidget(":/ui/ParametersBeam.svg") -+ self.preview = QtSvgWidgets.QSvgWidget(":/ui/ParametersBeam.svg") - self.preview.setMaximumWidth(200) - self.preview.setMinimumHeight(120) - self.grid.addWidget(self.preview,0,0,1,2) -@@ -1263,7 +1263,7 @@ class _DentsTaskPanel: - def __init__(self): - - import FreeCADGui -- from PySide import QtCore,QtGui,QtSvg -+ from PySide import QtCore,QtGui,QtSvgWidgets - self.form = QtGui.QWidget() - self.grid = QtGui.QGridLayout(self.form) - self.Rotations = ["N","S","E","O"] -@@ -1282,7 +1282,7 @@ def __init__(self): - self.grid.addWidget(self.buttonRemove,2,1,1,1) - - # image display -- self.preview = QtSvg.QSvgWidget(":/ui/ParametersDent.svg") -+ self.preview = QtSvgWidgets.QSvgWidget(":/ui/ParametersDent.svg") - self.preview.setMaximumWidth(200) - self.preview.setMinimumHeight(120) - self.grid.addWidget(self.preview,3,0,1,2) -diff --git a/src/Mod/Arch/ArchWindow.py b/src/Mod/Arch/ArchWindow.py -index f3c11c5e9c7a..dc9c84f9a8bf 100644 ---- a/src/Mod/Arch/ArchWindow.py -+++ b/src/Mod/Arch/ArchWindow.py -@@ -34,7 +34,7 @@ - - if FreeCAD.GuiUp: - import FreeCADGui -- from PySide import QtCore, QtGui, QtSvg -+ from PySide import QtCore, QtGui, QtSvgWidgets - from draftutils.translate import translate - from PySide.QtCore import QT_TRANSLATE_NOOP - import draftguitools.gui_trackers as DraftTrackers -@@ -426,7 +426,7 @@ def taskbox(self): - self.pic.hide() - - # SVG display -- self.im = QtSvg.QSvgWidget(":/ui/ParametersWindowFixed.svg") -+ self.im = QtSvgWidgets.QSvgWidget(":/ui/ParametersWindowFixed.svg") - self.im.setMaximumWidth(200) - self.im.setMinimumHeight(120) - grid.addWidget(self.im,4,0,1,2) -diff --git a/src/Mod/Arch/importIFClegacy.py b/src/Mod/Arch/importIFClegacy.py -index 037e889ce5b9..256b29056b33 100644 ---- a/src/Mod/Arch/importIFClegacy.py -+++ b/src/Mod/Arch/importIFClegacy.py -@@ -1795,7 +1795,6 @@ def explorer(filename,schema="IFC2X3_TC1.exp"): - tree.headerItem().setText(1, "") - tree.headerItem().setText(2, "Item and Properties") - bold = QtGui.QFont() -- bold.setWeight(75) - bold.setBold(True) - - #print(ifc.Entities) -diff --git a/src/Mod/Draft/DraftGui.py b/src/Mod/Draft/DraftGui.py -index c6e8584f4a71..2471bb66c61a 100644 ---- a/src/Mod/Draft/DraftGui.py -+++ b/src/Mod/Draft/DraftGui.py -@@ -312,7 +312,6 @@ def setupToolBar(self,task=False): - self.promptlabel = self._label("promptlabel", self.layout, hide=task) - self.cmdlabel = self._label("cmdlabel", self.layout, hide=task) - boldtxt = QtGui.QFont() -- boldtxt.setWeight(75) - boldtxt.setBold(True) - self.cmdlabel.setFont(boldtxt) - -diff --git a/src/Mod/Material/MaterialEditor.py b/src/Mod/Material/MaterialEditor.py -index cbcbde924609..28dbe83bc026 100644 ---- a/src/Mod/Material/MaterialEditor.py -+++ b/src/Mod/Material/MaterialEditor.py -@@ -27,7 +27,7 @@ - import os - from pathlib import PurePath - import sys --from PySide import QtCore, QtGui, QtSvg -+from PySide import QtCore, QtGui, QtSvgWidgets - - import FreeCAD - import FreeCADGui -@@ -92,11 +92,11 @@ def __init__(self, obj=None, prop=None, material=None, card_path="", category="S - treeView = widget.treeView - - # create preview svg slots -- self.widget.PreviewRender = QtSvg.QSvgWidget(self.iconPath + "preview-rendered.svg") -+ self.widget.PreviewRender = QtSvgWidgets.QSvgWidget(self.iconPath + "preview-rendered.svg") - self.widget.PreviewRender.setMaximumWidth(64) - self.widget.PreviewRender.setMinimumHeight(64) - self.widget.topLayout.addWidget(self.widget.PreviewRender) -- self.widget.PreviewVector = QtSvg.QSvgWidget(self.iconPath + "preview-vector.svg") -+ self.widget.PreviewVector = QtSvgWidgets.QSvgWidget(self.iconPath + "preview-vector.svg") - self.widget.PreviewVector.setMaximumWidth(64) - self.widget.PreviewVector.setMinimumHeight(64) - self.widget.topLayout.addWidget(self.widget.PreviewVector) diff --git a/media-gfx/freecad/files/freecad-0.21.2-shiboken-6.7.0.patch b/media-gfx/freecad/files/freecad-0.21.2-shiboken-6.7.0.patch deleted file mode 100644 index 8efd55121ee7..000000000000 --- a/media-gfx/freecad/files/freecad-0.21.2-shiboken-6.7.0.patch +++ /dev/null @@ -1,8 +0,0 @@ -https://bugs.gentoo.org/929973 ---- a/src/Gui/PythonWrapper.cpp -+++ b/src/Gui/PythonWrapper.cpp -@@ -480,3 +480,3 @@ - return false; -- types = Shiboken::Module::getTypes(requiredModule); -+ types = reinterpret_cast<PyTypeObject **>(Shiboken::Module::getTypes(requiredModule)); - } diff --git a/media-gfx/freecad/files/freecad-0.21.2-vtk9.3-fix.patch b/media-gfx/freecad/files/freecad-0.21.2-vtk9.3-fix.patch deleted file mode 100644 index b41e3618f55f..000000000000 --- a/media-gfx/freecad/files/freecad-0.21.2-vtk9.3-fix.patch +++ /dev/null @@ -1,33 +0,0 @@ -# fix for compiling with VTK 9.3 -https://github.com/FreeCAD/FreeCAD/pull/11496/commits/68d380a64e033c40fcb9a6dc322d9e0178de52ee -Bug: https://forum.freecad.org/viewtopic.php?t=82814 -patch by adrianinsaval (commited in 68d380a64e033c40fcb9a6dc322d9e0178de52ee) - ---- a/src/3rdParty/salomesmesh/inc/SMESH_SMDS.hxx -+++ b/src/3rdParty/salomesmesh/inc/SMESH_SMDS.hxx -@@ -39,10 +39,6 @@ - #define SMDS_EXPORT - #endif - --#ifdef VTK_HAS_MTIME_TYPE - #define VTK_MTIME_TYPE vtkMTimeType --#else --#define VTK_MTIME_TYPE unsigned long --#endif - - #endif ---- a/src/3rdParty/salomesmesh/src/SMDS/SMDS_UnstructuredGrid.cpp -+++ b/src/3rdParty/salomesmesh/src/SMDS/SMDS_UnstructuredGrid.cpp -@@ -1026,7 +1026,12 @@ void SMDS_UnstructuredGrid::BuildLinks() - GetLinks()->Allocate(this->GetNumberOfPoints()); - GetLinks()->Register(this); - //FIXME: vtk9 -+#if VTK_VERSION_NUMBER < VTK_VERSION_CHECK(9,3,0) - GetLinks()->BuildLinks(this); -+#else -+ GetLinks()->SetDataSet(this); -+ GetLinks()->BuildLinks(); -+#endif - GetLinks()->Delete(); - #else - this->links = smds_celllinks::new(); diff --git a/media-gfx/freecad/files/freecad-0.21.1-Gentoo-specific-don-t-check-vcs.patch b/media-gfx/freecad/files/freecad-1.0.0-r1-Gentoo-specific-don-t-check-vcs.patch index 3d851c341e2e..d901e47e2ca0 100644 --- a/media-gfx/freecad/files/freecad-0.21.1-Gentoo-specific-don-t-check-vcs.patch +++ b/media-gfx/freecad/files/freecad-1.0.0-r1-Gentoo-specific-don-t-check-vcs.patch @@ -1,16 +1,15 @@ -Signed-off-by: Jörg Habenicht <j.habenicht@gmx.de> --- a/src/Tools/SubWCRev.py +++ b/src/Tools/SubWCRev.py -@@ -509,12 +509,6 @@ - bindir = a - - vcs = [ -- GitControl(), -- DebianGitHub(), -- BazaarControl(), -- Subversion(), -- MercurialControl(), -- DebianChangelog(), - UnknownControl(), - ] - for i in vcs: +@@ -510,12 +510,6 @@ def main(): + bindir = a
+
+ vcs = [
+- GitControl(),
+- DebianGitHub(),
+- BazaarControl(),
+- Subversion(),
+- MercurialControl(),
+- DebianChangelog(),
+ UnknownControl(),
+ ]
+ for i in vcs:
diff --git a/media-gfx/freecad/files/freecad-9999-Gentoo-specific-don-t-check-vcs.patch b/media-gfx/freecad/files/freecad-9999-Gentoo-specific-don-t-check-vcs.patch index 3c8b61ab56a4..96113c23f057 100644 --- a/media-gfx/freecad/files/freecad-9999-Gentoo-specific-don-t-check-vcs.patch +++ b/media-gfx/freecad/files/freecad-9999-Gentoo-specific-don-t-check-vcs.patch @@ -1,10 +1,9 @@ ---- a/src/Tools/SubWCRev.py
-+++ b/src/Tools/SubWCRev.py
-@@ -509,12 +509,6 @@ def main():
- bindir = a
+--- a/src/Tools/SubWCRev.py ++++ b/src/Tools/SubWCRev.py +@@ -511,11 +511,6 @@ def main(): vcs = [
-- GitControl(),
+ GitControl(),
- DebianGitHub(),
- BazaarControl(),
- Subversion(),
diff --git a/media-gfx/freecad/freecad-0.21.2-r3.ebuild b/media-gfx/freecad/freecad-0.21.2-r3.ebuild deleted file mode 100644 index bf1b98990bc0..000000000000 --- a/media-gfx/freecad/freecad-0.21.2-r3.ebuild +++ /dev/null @@ -1,398 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -PYTHON_COMPAT=( python3_{10..12} ) - -inherit check-reqs cmake flag-o-matic optfeature python-single-r1 qmake-utils xdg - -DESCRIPTION="QT based Computer Aided Design application" -HOMEPAGE="https://www.freecad.org/ https://github.com/FreeCAD/FreeCAD" - -MY_PN=FreeCAD - -if [[ ${PV} = *9999 ]]; then - inherit git-r3 - EGIT_REPO_URI="https://github.com/${MY_PN}/${MY_PN}.git" - 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" - S="${WORKDIR}/FreeCAD-${PV}" -fi - -# code is licensed LGPL-2 -# 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 qt6 test" - -FREECAD_EXPERIMENTAL_MODULES="cloud netgen pcl" -FREECAD_STABLE_MODULES="addonmgr fem idf image inspection material - openscad part-design path points raytracing robot show surface - techdraw tux" - -for module in ${FREECAD_STABLE_MODULES}; do - IUSE="${IUSE} +${module}" -done -for module in ${FREECAD_EXPERIMENTAL_MODULES}; do - IUSE="${IUSE} ${module}" -done -unset module - -RESTRICT="!test? ( test )" - -RDEPEND=" - ${PYTHON_DEPS} - dev-libs/OpenNI2[opengl(+)] - dev-libs/boost:= - dev-libs/libfmt:= - dev-libs/libspnav[X] - dev-libs/xerces-c[icu] - !qt6? ( - dev-qt/qtconcurrent:5 - dev-qt/qtcore:5 - dev-qt/qtnetwork:5 - dev-qt/qtxml:5 - dev-qt/qtxmlpatterns:5 - ) - qt6? ( - dev-qt/qtbase:6[concurrent,network,xml] - ) - media-libs/freetype - media-libs/qhull:= - sci-libs/hdf5:=[fortran,zlib] - >=sci-libs/med-4.0.0-r1 - <sci-libs/opencascade-7.8.0:=[json,vtk] - sci-libs/orocos_kdl:= - sys-libs/zlib - virtual/libusb:1 - cloud? ( - dev-libs/openssl:= - net-misc/curl - ) - fem? ( - !qt6? ( sci-libs/vtk:=[qt5,rendering] ) - qt6? ( sci-libs/vtk:=[-qt5,qt6,rendering] ) - ) - gui? ( - >=media-libs/coin-4.0.0 - virtual/glu - virtual/opengl - !qt6? ( - dev-qt/designer:5 - dev-qt/qtgui:5 - dev-qt/qtopengl:5 - dev-qt/qtprintsupport:5 - dev-qt/qtsvg:5 - dev-qt/qtwebengine:5[widgets] - dev-qt/qtwidgets:5 - dev-qt/qtx11extras:5 - pcl? ( sci-libs/pcl[qt5] ) - $(python_gen_cond_dep ' - dev-python/matplotlib[${PYTHON_USEDEP}] - >=dev-python/pivy-0.6.5[${PYTHON_USEDEP}] - dev-python/pyside2:=[gui,svg,webchannel,webengine,${PYTHON_USEDEP}] - dev-python/shiboken2:=[${PYTHON_USEDEP}] - ' python3_{10..11} ) - ) - qt6? ( - sci-libs/opencascade[-inspector(-)] - designer? ( dev-qt/qttools:6[designer] ) - dev-qt/qt5compat:6 - dev-qt/qttools:6[widgets] - dev-qt/qtbase:6[gui,opengl,widgets] - dev-qt/qtsvg:6 - dev-qt/qtwebengine:6[widgets] - pcl? ( sci-libs/pcl[-qt5,qt6(-)] ) - $(python_gen_cond_dep ' - dev-python/matplotlib[${PYTHON_USEDEP}] - >=dev-python/pivy-0.6.5[${PYTHON_USEDEP}] - dev-python/pyside6:=[gui,svg,webchannel,webengine,${PYTHON_USEDEP}] - dev-python/shiboken6:=[${PYTHON_USEDEP}] - ' ) - ) - ) - netgen? ( media-gfx/netgen[opencascade] ) - openscad? ( media-gfx/openscad ) - pcl? ( sci-libs/pcl:=[opengl,openni2,vtk] ) - $(python_gen_cond_dep ' - dev-python/numpy[${PYTHON_USEDEP}] - dev-python/pybind11[${PYTHON_USEDEP}] - addonmgr? ( dev-python/GitPython[${PYTHON_USEDEP}] ) - fem? ( dev-python/ply[${PYTHON_USEDEP}] ) - ') -" -DEPEND=" - ${RDEPEND} - >=dev-cpp/eigen-3.3.1:3 - test? ( - $(python_gen_cond_dep 'dev-python/pyyaml[${PYTHON_USEDEP}]') - !qt6? ( dev-qt/qttest:5 ) - ) -" -BDEPEND=" - app-text/dos2unix - dev-lang/swig - test? ( - $(python_gen_cond_dep 'dev-python/pyyaml[${PYTHON_USEDEP}]') - !qt6? ( dev-qt/qttest:5 ) - ) -" - -# To get required dependencies: -# 'grep REQUIRES_MODS cMake/FreeCAD_Helpers/CheckInterModuleDependencies.cmake' -# We set the following requirements by default: -# arch, draft, drawing, import, mesh, part, qt5, sketcher, spreadsheet, start, web. -# -# Additionally, we auto-enable mesh_part, flat_mesh and smesh -# Fem actually needs smesh, but as long as we don't have a smesh package, we enable -# smesh through the mesh USE flag. Note however, the fem<-smesh dependency isn't -# reflected by the REQUIRES_MODS macro, but at -# cMake/FreeCAD_Helpers/InitializeFreeCADBuildOptions.cmake:187. -# -# The increase in auto-enabled workbenches is due to their need in parts of the -# test suite when compiled with a minimal set of USE flags. -REQUIRED_USE=" - ${PYTHON_REQUIRED_USE} - designer? ( gui ) - inspection? ( points ) - path? ( robot ) - python_single_target_python3_12? ( gui? ( qt6 ) ) -" -# There is no py3.12 support planned for pyside2 - -PATCHES=( - "${FILESDIR}"/${PN}-0.21.0-0001-Gentoo-specific-disable-ccache-usage.patch - "${FILESDIR}"/${PN}-0.21.1-Gentoo-specific-don-t-check-vcs.patch - "${FILESDIR}"/${PN}-0.21.2-vtk9.3-fix.patch - "${FILESDIR}"/${PN}-0.21.2-boost-175-1.patch - "${FILESDIR}"/${PN}-0.21.2-boost-175-2.patch - "${FILESDIR}"/${PN}-0.21.2-boost-175-3.patch -) - -DOCS=( CODE_OF_CONDUCT.md README.md ) - -CHECKREQS_DISK_BUILD="2G" - -pkg_setup() { - check-reqs_pkg_setup - python-single-r1_pkg_setup - [[ -z ${CASROOT} ]] && die "\${CASROOT} not set, please run eselect opencascade" -} - -src_prepare() { - # Fix desktop file - sed -e 's/Exec=FreeCAD/Exec=freecad/' -i src/XDGData/org.freecadweb.FreeCAD.desktop || die - - find "${S}" -type f -exec dos2unix -q {} \; || die "failed to convert to unix line endings" - - if has_version ">=dev-python/shiboken6-6.7.0"; then - # https://bugs.gentoo.org/929973 - eapply "${FILESDIR}/${PN}-0.21.2-shiboken-6.7.0.patch" - fi - - if use qt6; then - eapply "${FILESDIR}/${PN}-0.21.2-navcube-qt6.patch" - eapply "${FILESDIR}/${PN}-0.21.2-qtsvg-qt6.patch" - eapply "${FILESDIR}/${PN}-0.21.2-py312-qt6.patch" - fi - - cmake_src_prepare -} - -src_configure() { - # -Werror=odr, -Werror=lto-type-mismatch - # https://bugs.gentoo.org/875221 - # https://github.com/FreeCAD/FreeCAD/issues/13173 - filter-lto - - local mycmakeargs=( - -DBUILD_ADDONMGR=$(usex addonmgr) - -DBUILD_ARCH=ON - -DBUILD_ASSEMBLY=OFF # deprecated - -DBUILD_CLOUD=$(usex cloud) - -DBUILD_COMPLETE=OFF # deprecated - -DBUILD_DRAFT=ON - -DBUILD_DESIGNER_PLUGIN=$(usex designer) - -DBUILD_ENABLE_CXX_STD:STRING="C++17" # needed for >=boost-1.77.0 - -DBUILD_FEM=$(usex fem) - -DBUILD_FEM_NETGEN=$(usex netgen) - -DBUILD_FLAT_MESH=ON - -DBUILD_FORCE_DIRECTORY=ON # force building in a dedicated directory - -DBUILD_FREETYPE=ON # automagic dep - -DBUILD_GUI=$(usex gui) - -DBUILD_IDF=$(usex idf) - -DBUILD_IMAGE=$(usex image) - -DBUILD_IMPORT=ON # import module for various file formats - -DBUILD_INSPECTION=$(usex inspection) - -DBUILD_JTREADER=OFF # code has been removed upstream, but option is still there - -DBUILD_MATERIAL=$(usex material) - -DBUILD_MESH=ON - -DBUILD_MESH_PART=ON - -DBUILD_OPENSCAD=$(usex openscad) - -DBUILD_PART=ON - -DBUILD_PART_DESIGN=$(usex part-design) - -DBUILD_PATH=$(usex path) - -DBUILD_POINTS=$(usex points) - -DBUILD_RAYTRACING=$(usex raytracing) - -DBUILD_REVERSEENGINEERING=OFF # currently only an empty sandbox - -DBUILD_ROBOT=$(usex robot) - -DBUILD_SHOW=$(usex show) - -DBUILD_SKETCHER=ON # needed by draft workspace - -DBUILD_SMESH=ON - -DBUILD_SPREADSHEET=ON - -DBUILD_START=ON - -DBUILD_SURFACE=$(usex surface) - -DBUILD_TECHDRAW=$(usex techdraw) - -DBUILD_TEST=ON # always build test workbench for run-time testing - -DBUILD_TUX=$(usex tux) - -DBUILD_VR=OFF - -DBUILD_WEB=ON # needed by start workspace - -DBUILD_WITH_CONDA=OFF - - -DCMAKE_INSTALL_DATADIR=/usr/share/${PN}/data - -DCMAKE_INSTALL_DOCDIR=/usr/share/doc/${PF} - -DCMAKE_INSTALL_INCLUDEDIR=/usr/include/${PN} - -DCMAKE_INSTALL_PREFIX=/usr/$(get_libdir)/${PN} - - -DFREECAD_BUILD_DEBIAN=OFF - - -DFREECAD_USE_EXTERNAL_KDL=ON - -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 - -DFREECAD_USE_OCC_VARIANT:STRING="Official Version" - -DFREECAD_USE_PCL=$(usex pcl) - -DFREECAD_USE_PYBIND11=ON - -DFREECAD_USE_QT_FILEDIALOG=ON - -DFREECAD_USE_QTWEBMODULE:STRING="Qt WebEngine" - - # install python modules to site-packages' dir. True only for the main package, - # sub-packages will still be installed inside /usr/lib64/freecad - -DINSTALL_TO_SITEPACKAGES=ON - - # Use the version of shiboken2 that matches the selected python version - -DPYTHON_CONFIG_SUFFIX="-${EPYTHON}" - -DPython3_EXECUTABLE=${PYTHON} - ) - - if use debug; then - # BUILD_SANDBOX currently broken, see - # https://forum.freecadweb.org/viewtopic.php?f=4&t=36071&start=30#p504595 - mycmakeargs+=( - -DBUILD_SANDBOX=OFF - -DBUILD_TEMPLATE=ON - ) - else - mycmakeargs+=( - -DBUILD_SANDBOX=OFF - -DBUILD_TEMPLATE=OFF - ) - fi - - if use qt6; then - mycmakeargs+=( - -DFREECAD_QT_MAJOR_VERSION=6 - -DFREECAD_QT_VERSION=6 - -DQT_DEFAULT_MAJOR_VERSION=6 - -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 - ) - else - mycmakeargs+=( - -DFREECAD_QT_MAJOR_VERSION=5 - -DFREECAD_QT_VERSION=5 - -DQT_DEFAULT_MAJOR_VERSION=5 - -DQt5Core_MOC_EXECUTABLE="$(qt5_get_bindir)/moc" - -DQt5Core_RCC_EXECUTABLE="$(qt5_get_bindir)/rcc" - -DBUILD_QT5=ON - # Drawing module unmaintained and not ported to qt6 - -DBUILD_DRAWING=ON - ) - fi - - cmake_src_configure -} - -# We use the FreeCADCmd binary instead of the FreeCAD binary here -# for two reasons: -# 1. It works out of the box with USE=-gui as well, not needing a guard -# 2. We don't need virtualx.eclass and it's dependencies -# The exported environment variables are needed, so freecad does know -# where to save it's temporary files, and where to look and write it's -# configuration. Without those, there are sandbox violation, when it -# tries to create /var/lib/portage/home/.FreeCAD directory. -src_test() { - pushd "${BUILD_DIR}" > /dev/null || die - export FREECAD_USER_HOME="${HOME}" - export FREECAD_USER_DATA="${T}" - export FREECAD_USER_TEMP="${T}" - nonfatal ./bin/FreeCADCmd --run-test 0 - popd > /dev/null || die -} - -src_install() { - cmake_src_install - - dobin src/Tools/freecad-thumbnailer - - if use gui; then - newbin - freecad <<- _EOF_ - #!/bin/sh - # https://github.com/coin3d/coin/issues/451 - : \${QT_QPA_PLATFORM:=xcb} - export QT_QPA_PLATFORM - exec /usr/$(get_libdir)/${PN}/bin/FreeCAD \${@} - _EOF_ - mv "${ED}"/usr/$(get_libdir)/${PN}/share/* "${ED}"/usr/share || die "failed to move shared resources" - fi - dosym -r /usr/$(get_libdir)/${PN}/bin/FreeCADCmd /usr/bin/freecadcmd - - rm -r "${ED}"/usr/$(get_libdir)/${PN}/include/E57Format || die "failed to drop unneeded include directory E57Format" - use test && (rm -r "${ED}"/usr/include/${PN}/{gmock,gtest} || die) - - python_optimize "${ED}"/usr/share/${PN}/data/Mod/Start/StartPage "${ED}"/usr/$(get_libdir)/${PN}{/Ext,/Mod}/ - # compile main package in python site-packages as well - python_optimize -} - -pkg_postinst() { - xdg_pkg_postinst - - einfo "You can load a lot of additional workbenches using the integrated" - einfo "AddonManager." - - # ToDo: check opencv, pysolar (::science), elmerfem (::science) - # ifc++, ifcopenshell, z88 (no pkgs), calculix-ccx (::waebbl) - einfo "There are a lot of additional tools, for which FreeCAD has builtin" - einfo "support. Some of them are available in Gentoo. Take a look at" - einfo "https://wiki.freecadweb.org/Installing#External_software_supported_by_FreeCAD" - optfeature_header "Computational utilities" - optfeature "BLAS library" sci-libs/openblas - optfeature "Statistical computation with Python" dev-python/pandas - optfeature "Use scientific computation with Python" dev-python/scipy - optfeature "Use symbolic math with Python" dev-python/sympy - optfeature_header "Imaging, Plotting and Rendering utilities" - optfeature "Dependency graphs" media-gfx/graphviz - optfeature "PBR Rendering" media-gfx/povray - optfeature_header "Import / Export" - optfeature "Interact with git repositories" dev-python/GitPython - optfeature "Work with COLLADA documents" dev-python/pycollada - optfeature "YAML importer and emitter" dev-python/pyyaml - optfeature "Importing and exporting 2D AutoCAD DWG files" media-gfx/libredwg - optfeature "Importing and exporting geospatial data formats" sci-libs/gdal - optfeature "Working with projection data" sci-libs/proj - optfeature_header "Meshing and FEM" - optfeature "FEM mesh generator" sci-libs/gmsh - optfeature "Triangulating meshes" sci-libs/gts - optfeature "Visualization" sci-visualization/paraview -} - -pkg_postrm() { - xdg_pkg_postrm -} diff --git a/media-gfx/freecad/freecad-1.0.0-r2.ebuild b/media-gfx/freecad/freecad-1.0.0-r2.ebuild new file mode 100644 index 000000000000..e4819c63e7f7 --- /dev/null +++ b/media-gfx/freecad/freecad-1.0.0-r2.ebuild @@ -0,0 +1,302 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +PYTHON_COMPAT=( python3_{10..12} ) + +inherit check-reqs cmake flag-o-matic optfeature python-single-r1 qmake-utils xdg + +DESCRIPTION="Qt based Computer Aided Design application" +HOMEPAGE="https://www.freecad.org/ https://github.com/FreeCAD/FreeCAD" + +MY_PN=FreeCAD + +if [[ ${PV} == *9999* ]]; then + inherit git-r3 + EGIT_REPO_URI="https://github.com/${MY_PN}/${MY_PN}.git" + 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" + S="${WORKDIR}/FreeCAD-${PV}" +fi + +# code is licensed LGPL-2 +# 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" +# 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" + +REQUIRED_USE=" + ${PYTHON_REQUIRED_USE} + bim? ( mesh ) + cam? ( mesh ) + gui? ( bim ) + designer? ( gui ) + fem? ( smesh ) + inspection? ( points ) + mesh? ( smesh ) + openscad? ( mesh ) + reverse? ( mesh points ) + test? ( techdraw ) +" +# Draft Workbench needs BIM + +RESTRICT="!test? ( test )" + +RDEPEND=" + ${PYTHON_DEPS} + dev-cpp/gtest + dev-cpp/yaml-cpp + dev-libs/boost:= + dev-libs/libfmt:= + dev-libs/xerces-c[icu] + dev-qt/qtbase:6[concurrent,network,xml] + media-libs/freetype + sci-libs/opencascade:=[json] + sys-libs/zlib + $(python_gen_cond_dep ' + dev-python/numpy[${PYTHON_USEDEP}] + dev-python/pybind11[${PYTHON_USEDEP}] + dev-python/pyyaml[${PYTHON_USEDEP}] + ') + cloud? ( + dev-libs/openssl:= + net-misc/curl + ) + fem? ( + sci-libs/vtk:= + $(python_gen_cond_dep 'dev-python/ply[${PYTHON_USEDEP}]') + ) + gui? ( + >=media-libs/coin-4.0.0 + dev-qt/qtbase:6[gui,opengl,widgets] + dev-qt/qtsvg:6 + dev-qt/qttools:6[designer?,widgets] + $(python_gen_cond_dep ' + dev-python/matplotlib[${PYTHON_USEDEP}] + >=dev-python/pivy-0.6.5[${PYTHON_USEDEP}] + dev-python/pyside:6=[uitools(-),gui,svg,${PYTHON_USEDEP}] + ' ) + virtual/glu + virtual/opengl + spacenav? ( dev-libs/libspnav[X?] ) + ) + netgen? ( media-gfx/netgen[opencascade] ) + openscad? ( $(python_gen_cond_dep 'dev-python/ply[${PYTHON_USEDEP}]') ) + pcl? ( sci-libs/pcl:= ) + smesh? ( + sci-libs/hdf5:=[zlib] + >=sci-libs/med-4.0.0-r1 + sci-libs/vtk:= + ) +" +DEPEND="${RDEPEND} + >=dev-cpp/eigen-3.3.1:3 + dev-cpp/ms-gsl +" +BDEPEND=" + dev-lang/swig + test? ( dev-cpp/gtest ) +" + +PATCHES=( + "${FILESDIR}"/${PN}-1.0.0-r1-Gentoo-specific-don-t-check-vcs.patch + "${FILESDIR}"/${PN}-0.21.0-0001-Gentoo-specific-disable-ccache-usage.patch + "${FILESDIR}"/${PN}-9999-tests-src-Qt-only-build-test-for-BUILD_GUI-ON.patch +) + +DOCS=( CODE_OF_CONDUCT.md README.md ) + +CHECKREQS_DISK_BUILD="2G" + +pkg_setup() { + check-reqs_pkg_setup + python-single-r1_pkg_setup +} + +src_prepare() { + # Fix desktop file + sed -e 's/Exec=FreeCAD/Exec=freecad/' -i src/XDGData/org.freecad.FreeCAD.desktop || die + + cmake_src_prepare +} + +src_configure() { + # -Werror=odr, -Werror=lto-type-mismatch + # https://bugs.gentoo.org/875221 + # https://github.com/FreeCAD/FreeCAD/issues/13173 + filter-lto + + # Fix building tests + append-ldflags -Wl,--copy-dt-needed-entries + + local mycmakeargs=( + -DBUILD_DESIGNER_PLUGIN=$(usex designer) + -DBUILD_FORCE_DIRECTORY=ON # force building in a dedicated directory + -DBUILD_GUI=$(usex gui) + -DBUILD_SMESH=$(usex smesh) + -DBUILD_VR=OFF + -DBUILD_WITH_CONDA=OFF + + # Modules + -DBUILD_ADDONMGR=$(usex addonmgr) + -DBUILD_ASSEMBLY=OFF # Requires OndselSolver + -DBUILD_BIM=$(usex bim) + -DBUILD_CAM=$(usex cam) + -DBUILD_CLOUD=$(usex cloud) + -DBUILD_DRAFT=ON + # see below for DRAWING + -DBUILD_FEM=$(usex fem) + -DBUILD_FEM_NETGEN=$(usex fem $(usex netgen)) + -DBUILD_FLAT_MESH=$(usex mesh) # a submodule of MeshPart + -DBUILD_HELP=ON + -DBUILD_IDF=$(usex idf) + -DBUILD_IMPORT=ON # import module for various file formats + -DBUILD_INSPECTION=$(usex inspection) + -DBUILD_JTREADER=OFF # uses an old proprietary library + -DBUILD_MATERIAL=ON + -DBUILD_MEASURE=ON + -DBUILD_MESH=$(usex mesh) + -DBUILD_MESH_PART=$(usex mesh) + -DBUILD_OPENSCAD=$(usex openscad) + -DBUILD_PART=ON + -DBUILD_PART_DESIGN=ON + -DBUILD_PLOT=ON + -DBUILD_POINTS=$(usex points) + -DBUILD_REVERSEENGINEERING=$(usex reverse) + -DBUILD_ROBOT=$(usex robot) + -DBUILD_SANDBOX=OFF + -DBUILD_SHOW=$(usex gui) + -DBUILD_SKETCHER=ON # needed by draft workspace + -DBUILD_SPREADSHEET=ON + -DBUILD_START=ON + -DBUILD_SURFACE=$(usex surface) + -DBUILD_TECHDRAW=$(usex techdraw) + -DBUILD_TEST=ON # always build test workbench for run-time testing + -DBUILD_TUX=$(usex gui) + -DBUILD_WEB=ON # needed by start workspace + + -DCMAKE_INSTALL_DATADIR=/usr/share/${PN}/data + -DCMAKE_INSTALL_DOCDIR=/usr/share/doc/${PF} + -DCMAKE_INSTALL_INCLUDEDIR=/usr/include/${PN} + -DCMAKE_INSTALL_PREFIX=/usr/$(get_libdir)/${PN} + + -DFREECAD_BUILD_DEBIAN=OFF + + -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 + -DFREECAD_USE_OCC_VARIANT:STRING="Official Version" + -DFREECAD_USE_PCL=$(usex pcl) + -DFREECAD_USE_PYBIND11=ON + -DFREECAD_USE_QT_FILEDIALOG=ON + + # install python modules to site-packages' dir. True only for the main package, + # sub-packages will still be installed inside /usr/lib64/freecad + -DINSTALL_TO_SITEPACKAGES=ON + + # Use the version of shiboken2 that matches the selected python version + -DPYTHON_CONFIG_SUFFIX="-${EPYTHON}" + -DPython3_EXECUTABLE=${PYTHON} + ) + + if use debug; then + # BUILD_SANDBOX currently broken, see + # https://forum.freecadweb.org/viewtopic.php?f=4&t=36071&start=30#p504595 + mycmakeargs+=( + -DBUILD_SANDBOX=OFF + -DBUILD_TEMPLATE=ON + ) + else + mycmakeargs+=( + -DBUILD_SANDBOX=OFF + -DBUILD_TEMPLATE=OFF + ) + fi + + if use gui; then + mycmakeargs+=( + -DFREECAD_QT_MAJOR_VERSION=6 + -DFREECAD_QT_VERSION=6 + -DQT_DEFAULT_MAJOR_VERSION=6 + -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 + + cmake_src_configure +} + +# We use the FreeCADCmd binary instead of the FreeCAD binary here +# for two reasons: +# 1. It works out of the box with USE=-gui as well, not needing a guard +# 2. We don't need virtualx.eclass and its dependencies +# The environment variables are needed, so that FreeCAD knows +# where to save its temporary files, and where to look and write its +# configuration. Without those, there is a sandbox violation, when it +# tries to create /var/lib/portage/home/.FreeCAD directory. +src_test() { + cd "${BUILD_DIR}" || die + + local -x FREECAD_USER_HOME="${HOME}" + local -x FREECAD_USER_DATA="${T}" + local -x FREECAD_USER_TEMP="${T}" + ./bin/FreeCADCmd --run-test 0 --set-config AppHomePath="${BUILD_DIR}/" || die +} + +src_install() { + cmake_src_install + + dobin src/Tools/freecad-thumbnailer + + if use gui; then + newbin - freecad <<- _EOF_ + #!/bin/sh + # https://github.com/coin3d/coin/issues/451 + : "\${QT_QPA_PLATFORM:=xcb}" + export QT_QPA_PLATFORM + exec /usr/$(get_libdir)/${PN}/bin/FreeCAD "\${@}" + _EOF_ + mv "${ED}"/usr/$(get_libdir)/${PN}/share/* "${ED}"/usr/share || die "failed to move shared resources" + fi + dosym -r /usr/$(get_libdir)/${PN}/bin/FreeCADCmd /usr/bin/freecadcmd + + rm -r "${ED}"/usr/$(get_libdir)/${PN}/include/E57Format || die "failed to drop unneeded include directory E57Format" + + python_optimize "${ED}"/usr/share/${PN}/data/Mod/Start/StartPage "${ED}"/usr/$(get_libdir)/${PN}{/Ext,/Mod}/ + # compile main package in python site-packages as well + python_optimize +} + +pkg_postinst() { + xdg_pkg_postinst + + einfo "You can load a lot of additional workbenches using the integrated" + einfo "AddonManager." + + einfo "There are a lot of additional tools, for which FreeCAD has builtin" + einfo "support. Some of them are available in Gentoo. Take a look at" + einfo "https://wiki.freecad.org/Installing_additional_components" + optfeature_header "External programs used by FreeCAD" + optfeature "dependency graphs" media-gfx/graphviz + optfeature "importing and exporting 2D AutoCAD DWG files" media-gfx/libredwg + optfeature "importing OpenSCAD files, Mesh booleans" media-gfx/openscad + use bim && optfeature "working with COLLADA documents" dev-python/pycollada + if use fem || use mesh; then + optfeature "mesh generation" sci-libs/gmsh + fi +} + +pkg_postrm() { + xdg_pkg_postrm +} diff --git a/media-gfx/freecad/freecad-1.0.0-r3.ebuild b/media-gfx/freecad/freecad-1.0.0-r3.ebuild new file mode 100644 index 000000000000..3460ebcd8d63 --- /dev/null +++ b/media-gfx/freecad/freecad-1.0.0-r3.ebuild @@ -0,0 +1,305 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +PYTHON_COMPAT=( python3_{10..12} ) + +inherit check-reqs cmake flag-o-matic optfeature python-single-r1 qmake-utils xdg + +DESCRIPTION="Qt based Computer Aided Design application" +HOMEPAGE="https://www.freecad.org/ https://github.com/FreeCAD/FreeCAD" + +MY_PN=FreeCAD + +if [[ ${PV} == *9999* ]]; then + inherit git-r3 + EGIT_REPO_URI="https://github.com/${MY_PN}/${MY_PN}.git" + 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" + S="${WORKDIR}/FreeCAD-${PV}" +fi + +# code is licensed LGPL-2 +# 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" +# 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 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 ) + mesh? ( smesh ) + openscad? ( mesh ) + reverse? ( mesh points ) + test? ( techdraw ) +" +# Draft Workbench needs BIM + +RESTRICT="!test? ( test )" + +RDEPEND=" + ${PYTHON_DEPS} + dev-cpp/gtest + dev-cpp/yaml-cpp + dev-libs/boost:= + dev-libs/libfmt:= + dev-libs/xerces-c[icu] + dev-qt/qtbase:6[concurrent,network,xml] + media-libs/freetype + sci-libs/opencascade:=[json] + sys-libs/zlib + $(python_gen_cond_dep ' + dev-python/numpy[${PYTHON_USEDEP}] + dev-python/pybind11[${PYTHON_USEDEP}] + dev-python/pyyaml[${PYTHON_USEDEP}] + ') + assembly? ( sci-libs/ondselsolver ) + cloud? ( + dev-libs/openssl:= + net-misc/curl + ) + fem? ( + sci-libs/vtk:= + $(python_gen_cond_dep 'dev-python/ply[${PYTHON_USEDEP}]') + ) + gui? ( + >=media-libs/coin-4.0.0 + dev-qt/qtbase:6[gui,opengl,widgets] + dev-qt/qtsvg:6 + dev-qt/qttools:6[designer?,widgets] + $(python_gen_cond_dep ' + dev-python/matplotlib[${PYTHON_USEDEP}] + >=dev-python/pivy-0.6.5[${PYTHON_USEDEP}] + dev-python/pyside:6=[uitools(-),gui,svg,${PYTHON_USEDEP}] + + ' ) + virtual/glu + virtual/opengl + spacenav? ( dev-libs/libspnav[X?] ) + ) + netgen? ( media-gfx/netgen[opencascade] ) + openscad? ( $(python_gen_cond_dep 'dev-python/ply[${PYTHON_USEDEP}]') ) + pcl? ( sci-libs/pcl:= ) + smesh? ( + sci-libs/hdf5:=[zlib] + >=sci-libs/med-4.0.0-r1 + sci-libs/vtk:= + ) +" +DEPEND="${RDEPEND} + >=dev-cpp/eigen-3.3.1:3 + dev-cpp/ms-gsl +" +BDEPEND=" + dev-lang/swig + test? ( dev-cpp/gtest ) +" + +PATCHES=( + "${FILESDIR}"/${PN}-1.0.0-r1-Gentoo-specific-don-t-check-vcs.patch + "${FILESDIR}"/${PN}-0.21.0-0001-Gentoo-specific-disable-ccache-usage.patch + "${FILESDIR}"/${PN}-9999-tests-src-Qt-only-build-test-for-BUILD_GUI-ON.patch +) + +DOCS=( CODE_OF_CONDUCT.md README.md ) + +CHECKREQS_DISK_BUILD="2G" + +pkg_setup() { + check-reqs_pkg_setup + python-single-r1_pkg_setup +} + +src_prepare() { + # Fix desktop file + sed -e 's/Exec=FreeCAD/Exec=freecad/' -i src/XDGData/org.freecad.FreeCAD.desktop || die + + cmake_src_prepare +} + +src_configure() { + # -Werror=odr, -Werror=lto-type-mismatch + # https://bugs.gentoo.org/875221 + # https://github.com/FreeCAD/FreeCAD/issues/13173 + filter-lto + + # Fix building tests + append-ldflags -Wl,--copy-dt-needed-entries + + local mycmakeargs=( + -DBUILD_DESIGNER_PLUGIN=$(usex designer) + -DBUILD_FORCE_DIRECTORY=ON # force building in a dedicated directory + -DBUILD_GUI=$(usex gui) + -DBUILD_SMESH=$(usex smesh) + -DBUILD_VR=OFF + -DBUILD_WITH_CONDA=OFF + + # Modules + -DBUILD_ADDONMGR=$(usex addonmgr) + -DBUILD_ASSEMBLY=$(usex assembly) + -DBUILD_BIM=$(usex bim) + -DBUILD_CAM=$(usex cam) + -DBUILD_CLOUD=$(usex cloud) + -DBUILD_DRAFT=ON + # see below for DRAWING + -DBUILD_FEM=$(usex fem) + -DBUILD_FEM_NETGEN=$(usex fem $(usex netgen)) + -DBUILD_FLAT_MESH=$(usex mesh) # a submodule of MeshPart + -DBUILD_HELP=ON + -DBUILD_IDF=$(usex idf) + -DBUILD_IMPORT=ON # import module for various file formats + -DBUILD_INSPECTION=$(usex inspection) + -DBUILD_JTREADER=OFF # uses an old proprietary library + -DBUILD_MATERIAL=ON + -DBUILD_MEASURE=ON + -DBUILD_MESH=$(usex mesh) + -DBUILD_MESH_PART=$(usex mesh) + -DBUILD_OPENSCAD=$(usex openscad) + -DBUILD_PART=ON + -DBUILD_PART_DESIGN=ON + -DBUILD_PLOT=ON + -DBUILD_POINTS=$(usex points) + -DBUILD_REVERSEENGINEERING=$(usex reverse) + -DBUILD_ROBOT=$(usex robot) + -DBUILD_SANDBOX=OFF + -DBUILD_SHOW=$(usex gui) + -DBUILD_SKETCHER=ON # needed by draft workspace + -DBUILD_SPREADSHEET=ON + -DBUILD_START=ON + -DBUILD_SURFACE=$(usex surface) + -DBUILD_TECHDRAW=$(usex techdraw) + -DBUILD_TEST=ON # always build test workbench for run-time testing + -DBUILD_TUX=$(usex gui) + -DBUILD_WEB=ON # needed by start workspace + + -DCMAKE_INSTALL_DATADIR=/usr/share/${PN}/data + -DCMAKE_INSTALL_DOCDIR=/usr/share/doc/${PF} + -DCMAKE_INSTALL_INCLUDEDIR=/usr/include/${PN} + -DCMAKE_INSTALL_PREFIX=/usr/$(get_libdir)/${PN} + + -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 + -DFREECAD_USE_OCC_VARIANT:STRING="Official Version" + -DFREECAD_USE_PCL=$(usex pcl) + -DFREECAD_USE_PYBIND11=ON + -DFREECAD_USE_QT_FILEDIALOG=ON + + # install python modules to site-packages' dir. True only for the main package, + # sub-packages will still be installed inside /usr/lib64/freecad + -DINSTALL_TO_SITEPACKAGES=ON + + # Use the version of shiboken2 that matches the selected python version + -DPYTHON_CONFIG_SUFFIX="-${EPYTHON}" + -DPython3_EXECUTABLE=${PYTHON} + ) + + if use debug; then + # BUILD_SANDBOX currently broken, see + # https://forum.freecadweb.org/viewtopic.php?f=4&t=36071&start=30#p504595 + mycmakeargs+=( + -DBUILD_SANDBOX=OFF + -DBUILD_TEMPLATE=ON + ) + else + mycmakeargs+=( + -DBUILD_SANDBOX=OFF + -DBUILD_TEMPLATE=OFF + ) + fi + + if use gui; then + mycmakeargs+=( + -DFREECAD_QT_MAJOR_VERSION=6 + -DFREECAD_QT_VERSION=6 + -DQT_DEFAULT_MAJOR_VERSION=6 + -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 + + cmake_src_configure +} + +# We use the FreeCADCmd binary instead of the FreeCAD binary here +# for two reasons: +# 1. It works out of the box with USE=-gui as well, not needing a guard +# 2. We don't need virtualx.eclass and its dependencies +# The environment variables are needed, so that FreeCAD knows +# where to save its temporary files, and where to look and write its +# configuration. Without those, there is a sandbox violation, when it +# tries to create /var/lib/portage/home/.FreeCAD directory. +src_test() { + cd "${BUILD_DIR}" || die + + local -x FREECAD_USER_HOME="${HOME}" + local -x FREECAD_USER_DATA="${T}" + local -x FREECAD_USER_TEMP="${T}" + ./bin/FreeCADCmd --run-test 0 --set-config AppHomePath="${BUILD_DIR}/" || die +} + +src_install() { + cmake_src_install + + dobin src/Tools/freecad-thumbnailer + + if use gui; then + newbin - freecad <<- _EOF_ + #!/bin/sh + # https://github.com/coin3d/coin/issues/451 + : "\${QT_QPA_PLATFORM:=xcb}" + export QT_QPA_PLATFORM + exec /usr/$(get_libdir)/${PN}/bin/FreeCAD "\${@}" + _EOF_ + mv "${ED}"/usr/$(get_libdir)/${PN}/share/* "${ED}"/usr/share || die "failed to move shared resources" + fi + dosym -r /usr/$(get_libdir)/${PN}/bin/FreeCADCmd /usr/bin/freecadcmd + + rm -r "${ED}"/usr/$(get_libdir)/${PN}/include/E57Format || die "failed to drop unneeded include directory E57Format" + + python_optimize "${ED}"/usr/share/${PN}/data/Mod/Start/StartPage "${ED}"/usr/$(get_libdir)/${PN}{/Ext,/Mod}/ + # compile main package in python site-packages as well + python_optimize +} + +pkg_postinst() { + xdg_pkg_postinst + + einfo "You can load a lot of additional workbenches using the integrated" + einfo "AddonManager." + + einfo "There are a lot of additional tools, for which FreeCAD has builtin" + einfo "support. Some of them are available in Gentoo. Take a look at" + einfo "https://wiki.freecad.org/Installing_additional_components" + optfeature_header "External programs used by FreeCAD" + optfeature "dependency graphs" media-gfx/graphviz + optfeature "importing and exporting 2D AutoCAD DWG files" media-gfx/libredwg + optfeature "importing OpenSCAD files, Mesh booleans" media-gfx/openscad + use bim && optfeature "working with COLLADA documents" dev-python/pycollada + if use fem || use mesh; then + optfeature "mesh generation" sci-libs/gmsh + fi +} + +pkg_postrm() { + xdg_pkg_postrm +} diff --git a/media-gfx/freecad/freecad-9999.ebuild b/media-gfx/freecad/freecad-9999.ebuild index 250c1a1dbbf7..fce4aa961fa8 100644 --- a/media-gfx/freecad/freecad-9999.ebuild +++ b/media-gfx/freecad/freecad-9999.ebuild @@ -7,12 +7,12 @@ PYTHON_COMPAT=( python3_{10..12} ) inherit check-reqs cmake flag-o-matic optfeature python-single-r1 qmake-utils xdg -DESCRIPTION="QT based Computer Aided Design application" +DESCRIPTION="Qt based Computer Aided Design application" HOMEPAGE="https://www.freecad.org/ https://github.com/FreeCAD/FreeCAD" MY_PN=FreeCAD -if [[ ${PV} = *9999 ]]; then +if [[ ${PV} == *9999* ]]; then inherit git-r3 EGIT_REPO_URI="https://github.com/${MY_PN}/${MY_PN}.git" S="${WORKDIR}/freecad-${PV}" @@ -26,143 +26,87 @@ 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 qt6 test" - -FREECAD_EXPERIMENTAL_MODULES="cloud netgen pcl" -FREECAD_STABLE_MODULES="addonmgr fem idf image inspection material - openscad part-design path points raytracing robot show surface - techdraw tux" +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 assembly +bim cam cloud fem idf inspection +mesh openscad points reverse robot surface +techdraw" -for module in ${FREECAD_STABLE_MODULES}; do - IUSE="${IUSE} +${module}" -done -for module in ${FREECAD_EXPERIMENTAL_MODULES}; do - IUSE="${IUSE} ${module}" -done -unset module +REQUIRED_USE=" + ${PYTHON_REQUIRED_USE} + bim? ( mesh ) + cam? ( mesh ) + gui? ( bim ) + designer? ( gui ) + fem? ( smesh ) + inspection? ( points ) + mesh? ( smesh ) + openscad? ( mesh ) + reverse? ( mesh points ) + test? ( techdraw ) +" +# Draft Workbench needs BIM RESTRICT="!test? ( test )" RDEPEND=" ${PYTHON_DEPS} + dev-cpp/gtest dev-cpp/yaml-cpp - dev-libs/OpenNI2[opengl(+)] dev-libs/boost:= dev-libs/libfmt:= - dev-libs/libspnav[X] dev-libs/xerces-c[icu] - !qt6? ( - dev-qt/qtconcurrent:5 - dev-qt/qtcore:5 - dev-qt/qtnetwork:5 - dev-qt/qtxml:5 - dev-qt/qtxmlpatterns:5 - ) - qt6? ( - dev-qt/qtbase:6[concurrent,network,xml] - ) + dev-qt/qtbase:6[concurrent,network,xml] media-libs/freetype - media-libs/qhull:= - sci-libs/hdf5:=[fortran,zlib] - >=sci-libs/med-4.0.0-r1 - sci-libs/opencascade:=[json,vtk] - sci-libs/orocos_kdl:= + sci-libs/opencascade:=[json] sys-libs/zlib - virtual/libusb:1 + $(python_gen_cond_dep ' + dev-python/numpy[${PYTHON_USEDEP}] + dev-python/pybind11[${PYTHON_USEDEP}] + dev-python/pyyaml[${PYTHON_USEDEP}] + ') + assembly? ( sci-libs/ondselsolver ) cloud? ( dev-libs/openssl:= net-misc/curl ) fem? ( - !qt6? ( sci-libs/vtk:=[qt5,rendering] ) - qt6? ( sci-libs/vtk:=[-qt5,qt6,rendering] ) + sci-libs/vtk:= + $(python_gen_cond_dep 'dev-python/ply[${PYTHON_USEDEP}]') ) gui? ( >=media-libs/coin-4.0.0 + dev-qt/qtbase:6[gui,opengl,widgets] + dev-qt/qtsvg:6 + dev-qt/qttools:6[designer?,widgets] + $(python_gen_cond_dep ' + dev-python/matplotlib[${PYTHON_USEDEP}] + >=dev-python/pivy-0.6.5[${PYTHON_USEDEP}] + dev-python/pyside:6=[uitools(-),gui,svg,${PYTHON_USEDEP}] + ' ) virtual/glu virtual/opengl - !qt6? ( - dev-qt/designer:5 - dev-qt/qtgui:5 - dev-qt/qtopengl:5 - dev-qt/qtprintsupport:5 - dev-qt/qtsvg:5 - dev-qt/qtwebengine:5[widgets] - dev-qt/qtwidgets:5 - dev-qt/qtx11extras:5 - pcl? ( sci-libs/pcl[qt5] ) - $(python_gen_cond_dep ' - dev-python/matplotlib[${PYTHON_USEDEP}] - >=dev-python/pivy-0.6.5[${PYTHON_USEDEP}] - dev-python/pyside2:=[gui,svg,webchannel,webengine,${PYTHON_USEDEP}] - dev-python/shiboken2:=[${PYTHON_USEDEP}] - ' python3_{10..11} ) - ) - qt6? ( - designer? ( dev-qt/qttools:6[designer] ) - dev-qt/qt5compat:6 - dev-qt/qttools:6[widgets] - dev-qt/qtbase:6[gui,opengl,widgets] - dev-qt/qtsvg:6 - dev-qt/qtwebengine:6[widgets] - pcl? ( sci-libs/pcl[-qt5,qt6(-)] ) - $(python_gen_cond_dep ' - dev-python/matplotlib[${PYTHON_USEDEP}] - >=dev-python/pivy-0.6.5[${PYTHON_USEDEP}] - dev-python/pyside6:=[gui,svg,webchannel,webengine,${PYTHON_USEDEP}] - dev-python/shiboken6:=[${PYTHON_USEDEP}] - ' ) - ) + spacenav? ( dev-libs/libspnav[X?] ) ) netgen? ( media-gfx/netgen[opencascade] ) - openscad? ( media-gfx/openscad ) - pcl? ( sci-libs/pcl:=[opengl,openni2,vtk] ) - $(python_gen_cond_dep ' - dev-python/numpy[${PYTHON_USEDEP}] - dev-python/pybind11[${PYTHON_USEDEP}] - addonmgr? ( dev-python/GitPython[${PYTHON_USEDEP}] ) - fem? ( dev-python/ply[${PYTHON_USEDEP}] ) - ') + openscad? ( $(python_gen_cond_dep 'dev-python/ply[${PYTHON_USEDEP}]') ) + pcl? ( sci-libs/pcl:= ) + smesh? ( + sci-libs/hdf5:=[zlib] + >=sci-libs/med-4.0.0-r1 + sci-libs/vtk:= + ) " -DEPEND=" - ${RDEPEND} +DEPEND="${RDEPEND} >=dev-cpp/eigen-3.3.1:3 - test? ( - $(python_gen_cond_dep 'dev-python/pyyaml[${PYTHON_USEDEP}]') - !qt6? ( dev-qt/qttest:5 ) - ) + dev-cpp/ms-gsl " BDEPEND=" - app-text/dos2unix dev-lang/swig - test? ( - $(python_gen_cond_dep 'dev-python/pyyaml[${PYTHON_USEDEP}]') - !qt6? ( dev-qt/qttest:5 ) - ) + test? ( dev-cpp/gtest ) " -# To get required dependencies: -# 'grep REQUIRES_MODS cMake/FreeCAD_Helpers/CheckInterModuleDependencies.cmake' -# We set the following requirements by default: -# arch, draft, drawing, import, mesh, part, qt5, sketcher, spreadsheet, start, web. -# -# Additionally, we auto-enable mesh_part, flat_mesh and smesh -# Fem actually needs smesh, but as long as we don't have a smesh package, we enable -# smesh through the mesh USE flag. Note however, the fem<-smesh dependency isn't -# reflected by the REQUIRES_MODS macro, but at -# cMake/FreeCAD_Helpers/InitializeFreeCADBuildOptions.cmake:187. -# -# The increase in auto-enabled workbenches is due to their need in parts of the -# test suite when compiled with a minimal set of USE flags. -REQUIRED_USE=" - ${PYTHON_REQUIRED_USE} - designer? ( gui ) - inspection? ( points ) - path? ( robot ) - python_single_target_python3_12? ( gui? ( qt6 ) ) -" -# There is no py3.12 support planned for pyside2 - PATCHES=( "${FILESDIR}"/${PN}-9999-Gentoo-specific-don-t-check-vcs.patch "${FILESDIR}"/${PN}-0.21.0-0001-Gentoo-specific-disable-ccache-usage.patch @@ -176,15 +120,12 @@ CHECKREQS_DISK_BUILD="2G" pkg_setup() { check-reqs_pkg_setup python-single-r1_pkg_setup - [[ -z ${CASROOT} ]] && die "\${CASROOT} not set, please run eselect opencascade" } src_prepare() { # Fix desktop file sed -e 's/Exec=FreeCAD/Exec=freecad/' -i src/XDGData/org.freecad.FreeCAD.desktop || die - find "${S}" -type f -exec dos2unix -q {} \; || die "failed to convert to unix line endings" - cmake_src_prepare } @@ -194,49 +135,54 @@ src_configure() { # https://github.com/FreeCAD/FreeCAD/issues/13173 filter-lto + # Fix building tests + append-ldflags -Wl,--copy-dt-needed-entries + local mycmakeargs=( + -DBUILD_DESIGNER_PLUGIN=$(usex designer) + -DBUILD_FORCE_DIRECTORY=ON # force building in a dedicated directory + -DBUILD_GUI=$(usex gui) + -DBUILD_SMESH=$(usex smesh) + -DBUILD_VR=OFF + -DBUILD_WITH_CONDA=OFF + + # Modules -DBUILD_ADDONMGR=$(usex addonmgr) - -DBUILD_ARCH=ON - -DBUILD_ASSEMBLY=OFF # deprecated + -DBUILD_ASSEMBLY=$(usex assembly) + -DBUILD_BIM=$(usex bim) + -DBUILD_CAM=$(usex cam) -DBUILD_CLOUD=$(usex cloud) - -DBUILD_COMPLETE=OFF # deprecated -DBUILD_DRAFT=ON - -DBUILD_DESIGNER_PLUGIN=$(usex designer) - -DBUILD_ENABLE_CXX_STD:STRING="C++17" # needed for current git master + # see below for DRAWING -DBUILD_FEM=$(usex fem) - -DBUILD_FEM_NETGEN=$(usex netgen) - -DBUILD_FLAT_MESH=ON - -DBUILD_FORCE_DIRECTORY=ON # force building in a dedicated directory - -DBUILD_FREETYPE=ON # automagic dep - -DBUILD_GUI=$(usex gui) + -DBUILD_FEM_NETGEN=$(usex fem $(usex netgen)) + -DBUILD_FLAT_MESH=$(usex mesh) # a submodule of MeshPart + -DBUILD_HELP=ON -DBUILD_IDF=$(usex idf) - -DBUILD_IMAGE=$(usex image) -DBUILD_IMPORT=ON # import module for various file formats -DBUILD_INSPECTION=$(usex inspection) - -DBUILD_JTREADER=OFF # code has been removed upstream, but option is still there - -DBUILD_MATERIAL=$(usex material) - -DBUILD_MESH=ON - -DBUILD_MESH_PART=ON + -DBUILD_JTREADER=OFF # uses an old proprietary library + -DBUILD_MATERIAL=ON + -DBUILD_MEASURE=ON + -DBUILD_MESH=$(usex mesh) + -DBUILD_MESH_PART=$(usex mesh) -DBUILD_OPENSCAD=$(usex openscad) -DBUILD_PART=ON - -DBUILD_PART_DESIGN=$(usex part-design) - -DBUILD_PATH=$(usex path) + -DBUILD_PART_DESIGN=ON + -DBUILD_PLOT=ON -DBUILD_POINTS=$(usex points) - -DBUILD_RAYTRACING=$(usex raytracing) - -DBUILD_REVERSEENGINEERING=OFF # currently only an empty sandbox + -DBUILD_REVERSEENGINEERING=$(usex reverse) -DBUILD_ROBOT=$(usex robot) - -DBUILD_SHOW=$(usex show) + -DBUILD_SANDBOX=OFF + -DBUILD_SHOW=$(usex gui) -DBUILD_SKETCHER=ON # needed by draft workspace - -DBUILD_SMESH=ON -DBUILD_SPREADSHEET=ON -DBUILD_START=ON -DBUILD_SURFACE=$(usex surface) -DBUILD_TECHDRAW=$(usex techdraw) -DBUILD_TEST=ON # always build test workbench for run-time testing - -DBUILD_TUX=$(usex tux) - -DBUILD_VR=OFF + -DBUILD_TUX=$(usex gui) -DBUILD_WEB=ON # needed by start workspace - -DBUILD_WITH_CONDA=OFF -DCMAKE_INSTALL_DATADIR=/usr/share/${PN}/data -DCMAKE_INSTALL_DOCDIR=/usr/share/doc/${PF} @@ -245,7 +191,7 @@ src_configure() { -DFREECAD_BUILD_DEBIAN=OFF - -DFREECAD_USE_EXTERNAL_KDL=ON + -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 @@ -253,7 +199,6 @@ src_configure() { -DFREECAD_USE_PCL=$(usex pcl) -DFREECAD_USE_PYBIND11=ON -DFREECAD_USE_QT_FILEDIALOG=ON - -DFREECAD_USE_QTWEBMODULE:STRING="Qt WebEngine" # install python modules to site-packages' dir. True only for the main package, # sub-packages will still be installed inside /usr/lib64/freecad @@ -278,7 +223,7 @@ src_configure() { ) fi - if use qt6; then + if use gui; then mycmakeargs+=( -DFREECAD_QT_MAJOR_VERSION=6 -DFREECAD_QT_VERSION=6 @@ -289,17 +234,6 @@ src_configure() { # Drawing module unmaintained and not ported to qt6 -DBUILD_DRAWING=OFF ) - else - mycmakeargs+=( - -DFREECAD_QT_MAJOR_VERSION=5 - -DFREECAD_QT_VERSION=5 - -DQT_DEFAULT_MAJOR_VERSION=5 - -DQt5Core_MOC_EXECUTABLE="$(qt5_get_bindir)/moc" - -DQt5Core_RCC_EXECUTABLE="$(qt5_get_bindir)/rcc" - -DBUILD_QT5=ON - # Drawing module unmaintained and not ported to qt6 - -DBUILD_DRAWING=ON - ) fi cmake_src_configure @@ -308,18 +242,18 @@ src_configure() { # We use the FreeCADCmd binary instead of the FreeCAD binary here # for two reasons: # 1. It works out of the box with USE=-gui as well, not needing a guard -# 2. We don't need virtualx.eclass and it's dependencies -# The exported environment variables are needed, so freecad does know -# where to save it's temporary files, and where to look and write it's -# configuration. Without those, there are sandbox violation, when it +# 2. We don't need virtualx.eclass and its dependencies +# The environment variables are needed, so that FreeCAD knows +# where to save its temporary files, and where to look and write its +# configuration. Without those, there is a sandbox violation, when it # tries to create /var/lib/portage/home/.FreeCAD directory. src_test() { - pushd "${BUILD_DIR}" > /dev/null || die - export FREECAD_USER_HOME="${HOME}" - export FREECAD_USER_DATA="${T}" - export FREECAD_USER_TEMP="${T}" - nonfatal ./bin/FreeCADCmd --run-test 0 - popd > /dev/null || die + cd "${BUILD_DIR}" || die + + local -x FREECAD_USER_HOME="${HOME}" + local -x FREECAD_USER_DATA="${T}" + local -x FREECAD_USER_TEMP="${T}" + ./bin/FreeCADCmd --run-test 0 --set-config AppHomePath="${BUILD_DIR}/" || die } src_install() { @@ -331,16 +265,15 @@ src_install() { newbin - freecad <<- _EOF_ #!/bin/sh # https://github.com/coin3d/coin/issues/451 - : \${QT_QPA_PLATFORM:=xcb} + : "\${QT_QPA_PLATFORM:=xcb}" export QT_QPA_PLATFORM - exec /usr/$(get_libdir)/${PN}/bin/FreeCAD \${@} + exec /usr/$(get_libdir)/${PN}/bin/FreeCAD "\${@}" _EOF_ mv "${ED}"/usr/$(get_libdir)/${PN}/share/* "${ED}"/usr/share || die "failed to move shared resources" fi dosym -r /usr/$(get_libdir)/${PN}/bin/FreeCADCmd /usr/bin/freecadcmd rm -r "${ED}"/usr/$(get_libdir)/${PN}/include/E57Format || die "failed to drop unneeded include directory E57Format" - use test && (rm -r "${ED}"/usr/include/${PN}/{gmock,gtest} || die) python_optimize "${ED}"/usr/share/${PN}/data/Mod/Start/StartPage "${ED}"/usr/$(get_libdir)/${PN}{/Ext,/Mod}/ # compile main package in python site-packages as well @@ -353,30 +286,17 @@ pkg_postinst() { einfo "You can load a lot of additional workbenches using the integrated" einfo "AddonManager." - # ToDo: check opencv, pysolar (::science), elmerfem (::science) - # ifc++, ifcopenshell, z88 (no pkgs), calculix-ccx (::waebbl) einfo "There are a lot of additional tools, for which FreeCAD has builtin" einfo "support. Some of them are available in Gentoo. Take a look at" - einfo "https://wiki.freecadweb.org/Installing#External_software_supported_by_FreeCAD" - optfeature_header "Computational utilities" - optfeature "BLAS library" sci-libs/openblas - optfeature "Statistical computation with Python" dev-python/pandas - optfeature "Use scientific computation with Python" dev-python/scipy - optfeature "Use symbolic math with Python" dev-python/sympy - optfeature_header "Imaging, Plotting and Rendering utilities" - optfeature "Dependency graphs" media-gfx/graphviz - optfeature "PBR Rendering" media-gfx/povray - optfeature_header "Import / Export" - optfeature "Interact with git repositories" dev-python/GitPython - optfeature "Work with COLLADA documents" dev-python/pycollada - optfeature "YAML importer and emitter" dev-python/pyyaml - optfeature "Importing and exporting 2D AutoCAD DWG files" media-gfx/libredwg - optfeature "Importing and exporting geospatial data formats" sci-libs/gdal - optfeature "Working with projection data" sci-libs/proj - optfeature_header "Meshing and FEM" - optfeature "FEM mesh generator" sci-libs/gmsh - optfeature "Triangulating meshes" sci-libs/gts - optfeature "Visualization" sci-visualization/paraview + einfo "https://wiki.freecad.org/Installing_additional_components" + optfeature_header "External programs used by FreeCAD" + optfeature "dependency graphs" media-gfx/graphviz + optfeature "importing and exporting 2D AutoCAD DWG files" media-gfx/libredwg + optfeature "importing OpenSCAD files, Mesh booleans" media-gfx/openscad + use bim && optfeature "working with COLLADA documents" dev-python/pycollada + if use fem || use mesh; then + optfeature "mesh generation" sci-libs/gmsh + fi } pkg_postrm() { diff --git a/media-gfx/freecad/metadata.xml b/media-gfx/freecad/metadata.xml index b934f4a2b2de..7cc8bc2a327b 100644 --- a/media-gfx/freecad/metadata.xml +++ b/media-gfx/freecad/metadata.xml @@ -14,6 +14,16 @@ 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> + <flag name="cam"> + Build the CAM module and workbench + </flag> <flag name="cloud"> Build the Cloud workbench, to access cloud providers (mostly Amazon S3). @@ -37,16 +47,12 @@ Build the IDF module to provide file exchange capabilities with IDF files </flag> - <flag name="image"> - Build the image module and workbench for working with bitmap - images - </flag> <flag name="inspection"> Build the inspection workbench which gives you specific tools for examination of shapes (experimental) </flag> - <flag name="material"> - Build the material module and workbench to work with materials + <flag name="mesh"> + Build the mesh module and workbench </flag> <flag name="netgen"> Build support for the netgen mesher through <pkg>media-gfx/netgen</pkg>. @@ -55,28 +61,24 @@ Build the OpenSCAD module for interoperability with OpenSCAD and repairing Constructive Solid Geometry (CSG) history </flag> - <flag name="part-design"> - Build the part design module and workbench for build part shapes - from sketches - </flag> - <flag name="path"><!-- FIXME: auto-enable through robot? --> - Build the path module and workbench to procude G-Code instructions - for CNC - </flag> <flag name="pcl"> Use external <pkg>sci-libs/pcl</pkg> for point clouds support. </flag> <flag name="points"> Build the points module and workbench for working with point clouds </flag> - <flag name="raytracing"> - Build the raytracing module and workbench for raytracing and rendering + <flag name="reverse"> + Build the reverse engineering module and workbench </flag> <flag name="robot"> Build the robot module and workbench for studying robot movements </flag> - <flag name="show"> - Build the show module, a helper module for visibility automation + <flag name="smesh"> + Build Salome SMESH + </flag> + <flag name="spacenav"> + Add support for space navigator devices through + <pkg>dev-libs/libspnav</pkg> </flag> <flag name="surface"> Build the surface module and workbench @@ -85,9 +87,6 @@ Build the techdraw module and workbench, a more advanced and feature-rich successor of the drawing workbench </flag> - <flag name="tux"> - Build the Tux module - </flag> </use> <upstream> <bugs-to>https://github.com/FreeCAD/FreeCAD/issues</bugs-to> diff --git a/media-gfx/geeqie/Manifest b/media-gfx/geeqie/Manifest index 2a85538d271a..383d65026455 100644 --- a/media-gfx/geeqie/Manifest +++ b/media-gfx/geeqie/Manifest @@ -1,6 +1,10 @@ AUX geeqie-2.3-test-ancillary.patch 630 BLAKE2B a997e60c3fd6fe78b72019babbf2ad7d9f4fccea275cc95903925ed7ed1e0486da2d82e76e0afd43f82932c123ee03891878bf68d0ef5d714528806f206db45a SHA512 69aa64bf6945f6cd11b6ccd93052c5589f332f55d3e022e5b23b0e5eee0fada4764c54b7dffa75b8e5432f5c7d4c27384992cdd61a18c779feede4827f2be5ff +AUX geeqie-2.5-test-ancillary.patch 1167 BLAKE2B 7cb4efca931ad6ff462c849a2b45148749707334e11f9bf9d5ed16e53b87e89cc9fcf7068518b71fbdfdeda5d7267988b19015f6fb7c393eac0944de9b9421ea SHA512 2624da46d98c6e7fc4bd9b3360dca5c40a67b535952edffb1703c56e20cbc1cbbc6cca2ed1f93b0eb10ee0211b2475269dcd7e56b95fb45f62908aa56a2b9d36 DIST geeqie-2.4-docs.tar.xz 364536 BLAKE2B 688720808c8e4543455259966aef726bf56a821890a78e4757d9d1fd02ce67217461808d9697b331b2a94841bf3581b25242a7e5c9c9a3f5b02209a566b09c16 SHA512 07bca33c347f448ee853ea60daf22c9cdace458b6ce6b3f4ced9b343a965370c51d7a872d5279852b7a83a1de51c8529a668f7d62a031bcec1fdde8b9bfbf9cb DIST geeqie-2.4.tar.xz 2178572 BLAKE2B df24f0b5d443cbd2033c0b382fe0d846c9073e8966aa736f647e34930e44083b9e44252c554578548a13c12c1b1a5a48bb7795f2fda8b8688a63ef402a257334 SHA512 7e0f5dff21e38a41adf0a793bd82652c5d639e84ab49403517f4b1dae042bfc5f4d02e54b54928e04a2397300acb04b130347df0be5637ee48634f5865ad346b +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 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/files/geeqie-2.5-test-ancillary.patch b/media-gfx/geeqie/files/geeqie-2.5-test-ancillary.patch new file mode 100644 index 000000000000..ce0802d418ca --- /dev/null +++ b/media-gfx/geeqie/files/geeqie-2.5-test-ancillary.patch @@ -0,0 +1,27 @@ +diff -Naur geeqie-2.5.orig/meson.build geeqie-2.5/meson.build +--- geeqie-2.5.orig/meson.build 2024-09-21 17:11:19.000000000 +0200 ++++ geeqie-2.5/meson.build 2024-09-25 09:30:11.624093709 +0200 +@@ -844,12 +844,6 @@ + summary({'lua' : ['Test runs:', false]}, section : 'Testing', bool_yn : true) + endif + +-# Ancillary files test +-test_ancillary_files_sh = find_program('test-ancillary-files.sh', dirs : scriptsdir, required : true) +-test('Ancillary files', test_ancillary_files_sh, args: [meson.current_source_dir()], timeout: 100, suite : 'analysis') +- +-summary({'Ancillary files' : ['Test runs:', true]}, section : 'Testing', bool_yn : true) +- + # Unit tests + if conf_data.get('ENABLE_UNIT_TESTS', 0) == 1 + test('Unit tests', isolate_test_sh, args: [geeqie_exe.full_path(), '--run-unit-tests'], suite : 'unit') +diff -Naur geeqie-2.5.orig/scripts/untranslated-text.sh geeqie-2.5/scripts/untranslated-text.sh +--- geeqie-2.5.orig/scripts/untranslated-text.sh 2024-09-21 17:11:19.000000000 +0200 ++++ geeqie-2.5/scripts/untranslated-text.sh 2024-09-25 09:30:44.567101060 +0200 +@@ -68,6 +68,7 @@ + MonoSpace + N_( + NikonTag ++Néstor + Pause + PixbufRenderer + PluginsMenu diff --git a/media-gfx/geeqie/geeqie-2.5.ebuild b/media-gfx/geeqie/geeqie-2.5.ebuild new file mode 100644 index 000000000000..c5d6199a70b2 --- /dev/null +++ b/media-gfx/geeqie/geeqie-2.5.ebuild @@ -0,0 +1,112 @@ +# Copyright 1999-2025 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 +LUA_COMPAT=( lua5-{3,4} ) + +inherit lua-single meson optfeature xdg + +DESCRIPTION="A lightweight GTK image viewer forked from GQview" +HOMEPAGE="https://www.geeqie.org" +SRC_URI="https://github.com/BestImageViewer/${PN}/releases/download/v${PV}/${P}.tar.xz + https://dev.gentoo.org/~voyageur/distfiles/${P}-docs.tar.xz" +# Doc build: +# clone git at matching tag +# mkdir build; ./gen_changelog.sh . build; +# pandoc README.md -o build/README.html + +LICENSE="GPL-2" +SLOT="0" +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 + virtual/libintl + x11-libs/gtk+:3 + djvu? ( app-text/djvu ) + exif? ( >=media-gfx/exiv2-0.17:=[xmp?] ) + ffmpegthumbnailer? ( media-video/ffmpegthumbnailer ) + heif? ( >=media-libs/libheif-1.3.2 ) + jpeg2k? ( >=media-libs/openjpeg-2.3.0:2= ) + jpeg? ( media-libs/libjpeg-turbo:= ) + jpegxl? ( >=media-libs/libjxl-0.3.7:= ) + lcms? ( media-libs/lcms:2 ) + lua? ( ${LUA_DEPS} ) + map? ( media-libs/clutter-gtk + media-libs/libchamplain:0.12[gtk] ) + pdf? ( >=app-text/poppler-0.62[cairo] ) + raw? ( >=media-libs/libraw-0.20:= ) + spell? ( app-text/gspell ) + tiff? ( media-libs/tiff:= ) + webp? ( gui-libs/gdk-pixbuf-loader-webp:= ) + zip? ( >=app-arch/libarchive-3.4.0 )" +DEPEND="${RDEPEND}" +BDEPEND=" + || ( dev-util/xxdi app-editors/vim-core ) + dev-util/glib-utils + sys-devel/gettext + virtual/pkgconfig" + +REQUIRED_USE="lua? ( ${LUA_REQUIRED_USE} )" + +PATCHES=( "${FILESDIR}"/${PN}-2.5-test-ancillary.patch ) + +pkg_setup() { + # Do not require setting LUA_SINGLE_TARGET if lua is not used + use lua && lua-single_pkg_setup +} + +src_prepare() { + default + + # Disable doc build - not useful most of the time per upstream + sed -e "/subdir('doc')/d" -i meson.build || die +} + +src_configure() { + local emesonargs=( + -Dgq_helpdir="share/doc/${PF}" + -Dgq_htmldir="share/doc/${PF}/html" + $(meson_use debug) + $(meson_feature djvu) + $(meson_feature exif exiv2) + $(meson_feature ffmpegthumbnailer videothumbnailer) + $(meson_feature heif) + $(meson_feature jpeg) + $(meson_feature jpeg2k j2k) + $(meson_feature jpegxl) + $(meson_feature lcms cms) + $(meson_feature lua) + $(meson_feature map gps-map) + $(meson_feature pdf) + $(meson_feature raw libraw) + $(meson_feature spell) + $(meson_feature tiff) + $(meson_feature zip archive) + ) + + meson_src_configure +} + +src_install() { + meson_src_install + + # Manually generated ChangeLog + dodoc "${WORKDIR}"/${P}-docs/* + + # The application needs access to some uncompressed doc files. + docompress -x /usr/share/doc/${PF}/AUTHORS + docompress -x /usr/share/doc/${PF}/ChangeLog + docompress -x /usr/share/doc/${PF}/README.md +} + +pkg_postinst() { + xdg_pkg_postinst + + optfeature "Camera import and tethered photography plugins" media-gfx/gphoto2 + optfeature "Lens ID plugin" media-libs/exiftool + optfeature "Image crop plugin" "media-libs/exiftool media-gfx/imagemagick" + optfeature "Image rotate plugin (JPEG)" media-gfx/fbida + optfeature "Image rotate plugin (TIFF/PNG)" media-gfx/imagemagick + optfeature "Print preview functionality" app-text/evince +} diff --git a/media-gfx/gifsicle/Manifest b/media-gfx/gifsicle/Manifest index 9c3701d29531..9d254daf1680 100644 --- a/media-gfx/gifsicle/Manifest +++ b/media-gfx/gifsicle/Manifest @@ -4,5 +4,5 @@ DIST gifsicle-1.94.tar.gz 579194 BLAKE2B 0d6a734d6340938579633061cbff1f702c33adf DIST gifsicle-1.95.tar.gz 579636 BLAKE2B 32af2f786328b059745828ade184eea216e147abbb8023cb681c2d37a40a4abc9d0f32bb60a322b17f1af03a5e2c566b194e4c6a8d685e0697f90497294a9c81 SHA512 888bb3f4501ce3f12e810045bb432c9e56952df1def565e4a8983529856b00be8e79d9df148858fe2a327d1dd751eb71280e17c8e0426e68290b0dfe02247891 EBUILD gifsicle-1.93.ebuild 639 BLAKE2B 9c8080193dfaf712da47ac9855142d171861e9568849065e30f03fcc6be0318afc62708f3b3795ba49ef0facc375c77f269a6da2915d055d7f85fca2dec683a1 SHA512 cd058a074484f0aab0730acc8b09b79443e8db055d3f0429279fb0f519cbfb1ea4620209fffaf5a2d0d30e2f44c057be7cb36214cf63afd1274c20c616928a2e EBUILD gifsicle-1.94.ebuild 692 BLAKE2B 5fb85a58d2314fec8932e3a6a454af6f62fe6c3ebb972dc20e3dd6217c311a79ac2ff3047aebd4c5345d284d7fe53e97207d63c9dad0f8544a1536acd78dc5d2 SHA512 e450adba95543e25644809d1ac2efcc323ce341923e218e35014c060099b39f9c5fd9e138e6fb16f8727832c1ba218642bccd8c965f67db1b50e893ba633d8aa -EBUILD gifsicle-1.95.ebuild 612 BLAKE2B cd8f49e195c3998b63192ec0651d0b59777d50eb1e9724be146c40fdfba81d3f9474b9e35d4975de3553387919f34e8e1a46f9fc67fc97ab7845069a38fada3d SHA512 bd2f423fb3e868850bf386ca5130680e31afb752bbf2010c60371ed3de66fc685eeb1c65375d21d7256cdbda8c0961938591470f1684905da0aac1aa9ae020c2 +EBUILD gifsicle-1.95.ebuild 609 BLAKE2B 82e2bfc5c5b1626023b74139b896473c34acf58b04fa8bba986239fcaebae289a7ea36e9c7a3c1eeb3a7e646c95f928f8e6fbedbbe5b41e94dc189c7b53c0366 SHA512 cebce01b44e7d828095ecf139e50852ab531a48379063712581975a67985486ebd0336b251d083b8ab4b583fe75858f49475be1b9c0144871466cdbd3d4f3636 MISC metadata.xml 248 BLAKE2B da21909c8724c7dd7cf27c3ee2fc6a032610f4863f0ff1fc4ff62d317bd8293b4ce63bf4b2f929d8768dcd449aa00aa927033b26e9dca357247aa9361bc3327e SHA512 28c710eb4b97dc08e939fa72c3ee2f834df2743f0146a7a6163a51bdf1166669bbaf05c4716a208d1b393504118150172b9d744bcc41ce23dd85e90599b731e8 diff --git a/media-gfx/gifsicle/gifsicle-1.95.ebuild b/media-gfx/gifsicle/gifsicle-1.95.ebuild index 9d95e9385b78..27d12da3ef03 100644 --- a/media-gfx/gifsicle/gifsicle-1.95.ebuild +++ b/media-gfx/gifsicle/gifsicle-1.95.ebuild @@ -9,7 +9,7 @@ SRC_URI="https://www.lcdf.org/~eddietwo/${PN}/${P}.tar.gz" LICENSE="GPL-2 MIT" SLOT="0" -KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos" +KEYWORDS="~alpha amd64 ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos" IUSE="X" RDEPEND=" diff --git a/media-gfx/gimp/Manifest b/media-gfx/gimp/Manifest index f5aa9dc2871f..14aafcfd8339 100644 --- a/media-gfx/gimp/Manifest +++ b/media-gfx/gimp/Manifest @@ -1,17 +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 -DIST gimp-2.10.34.tar.bz2 31405329 BLAKE2B 0b2d3a81abf89684bb90e2101896db3479a25c5da76738543dba8d0378e64608eee9aeb24888e15f5e347f72fa1df3e9b82aa27e503ee61d1c4d45d44fa7bddc SHA512 4802ce3758daba868570f1ac97a3f1cb41e1130fcc6376f9bf4c999441f8fd25937aa71b6f726d82d7c780f4153b11d2595bb76bc2356a42266909fbcc0bd34a -DIST gimp-2.10.36.tar.bz2 31532334 BLAKE2B d033cd1407df3399b5968b7e3f7838d288143080b516476a5dd46599b6a84ac2efca591521368cef7a1c3d9935b45ed3262fb469e1ae36ccf60a1199f5cfa44d SHA512 dbe6152ea6ff99cca59bbf2c88a64fb4ff6b529d98ace7723eadf5dfb0e10d9cbaf2de1e0d5251e9ecf9abca73da9ae1a501f229997802fd4077fb9594f4ba66 +AUX gimp-2.10_libheif-1.18_unconditional_compat.patch 820 BLAKE2B 4e75ebc639bc6f985776861de119b85dd7bde2be3a2e385cb6c61bd6e44b29d80c9ff84736a7e518b76f092c72295c1bb7e2ed58eccbd52a54b7bc4c769b12e6 SHA512 4233e2d8c50222b4700e9f7c6b2e5a41e1d5b685899f4cb0db61aa96b9eba4a0538fcc74fe9fe77265932062ea4dc94e13036d381a96338a470bf00b5a53b437 DIST gimp-2.10.38.tar.bz2 31698453 BLAKE2B 58c29e3e00d873e69a5e5f4e9c3ff4d868ccfb11914570306ef12c54ca7d3ef89a62d8c71fac1f2d1f426ac615dc4caf7a7260351c00301dce2b1aa4193bab6d SHA512 343bf1c3bd14bf8e7c7af79c05920faca213da68549127c1d8af53e2e872e55aeaf39a3cfcf578183a34fdc4f98e1c859be63956b0611067186eefd1fdee2aaa -DIST gimp-2.99.18.tar.xz 25418968 BLAKE2B ccb76bb5c375925d4d71505f3e1546f05ba0e20533859b1b6250a4d9054efb6bec4927a5e0c525272fa24d5a6bdf4fb7881d60a1d34b1210ee38b90e661ef707 SHA512 151ccd0322601e76ed0198b40832ab0b6c138428f2e75806dd558e29c9b3437d9226a243142bf4a86113fa5ea4f5965b99cf7cd0ab0ecb7bdfc48036de35a9c6 -EBUILD gimp-2.10.34-r2.ebuild 5882 BLAKE2B 67a9b4c0707f3027f34ba6276b8ac6fd2709e09f7416be0b05b9cc56ec58e27bfea86d4bf726588db9d927ede4b5549c2068e8a30c8d95c34ba269aad0f665bf SHA512 f058ba4ddaeebb02a4bb8cef3e8f5ac867df776f8750e2470c8695647538520984f072e9b5f9a0f3bbce6c3695098e0028c2ead31dd188df3b8221fc6be8b51f -EBUILD gimp-2.10.36-r2.ebuild 6001 BLAKE2B e2b78361ae0d4703479e8b9c1a62e99f7099b80a9267ad6b056a15f30a0bba79da7b697af38d76e736ecc01aca6b0a331b90fc7f20060e6872c1854ac56d9ec1 SHA512 cdc970e8766da37a2103010214313a6dd54ce1acfb9bc390aad47474914801884dbff8900ae62107d1c1780a9ccae3803abea10a72827816dff9b72572aab97d -EBUILD gimp-2.10.36.ebuild 5854 BLAKE2B 811d0ea7218ec368006864732bf94c6f07c7cdb2eeffc1df5deda811bc8cecd76ffa4f17230dd91313fe59ae803a35dc20c6be7e53e2b2143db24ba7dbf57dc8 SHA512 8ad6430138b98b4d384f3657f45733a5e1bd59db25b9619a4593d51af35bcd7b5cfbbe54587cb4f72b54fa1dfeac32a31d4727d0ddb666154810261806188040 -EBUILD gimp-2.10.38.ebuild 6115 BLAKE2B 27cfe3d0f6dd2e208680d1a723741e16ee5abc863141b81f3b343769f7aac837c474af6603f58ffc7e92b1528da674694076b7b61dde0f6d06d7b5b0259eecb4 SHA512 0990d4f80238b84873f131a8a0eca76ae6fa958af5f4f7c2a5e03ed14ce8adac0698480d1836287fda73902e548a4f723f992db6dfd317c0ef9c6b7a45044a0e -EBUILD gimp-2.99.18-r1.ebuild 7253 BLAKE2B 0c95a252589be3d821a73b7651e866207928cee724d16e934f585bd9080869620d1b20546672ddf229ef59bd21f54d5906da19bf2bafab76d479b05b3adfc403 SHA512 042f9a4d904d2be0bedbb6dde123a7d12f8c43b7502990e2a0c6884c287522db8e0bfeebc0fa621a54992739482db4a8b8f3675ba7f5af33999ea4c390f6bf37 -EBUILD gimp-9999.ebuild 7261 BLAKE2B bc600ce49c014d66c1b0101df3256a75eb223654c5fd912e43d8c4560288d6b2baddf7b8595e60306621c71a3a87813a52b391364274fb9d7b13817ec642cbb7 SHA512 adfea86c9eb9b3bb82ff319289b241a20912a24b7b9e09296d27ac2a71ae78d8ea20a68e28a6e7275551a035d009bf0673c428308465f9b989f5aca7808fe626 +DIST gimp-3.0.0-RC1.tar.xz 28863948 BLAKE2B d9e1ae51809d1c8e5084a9e85b660cd0f3a763f8ee220075fe73f512940e9637d50675a06d0dca88c501571a26404cb6b53c9573348002586143c52736dfa196 SHA512 844896976b66b0498ba9149c7176f5442b2305fd3dc51fce7ff92eb05b7b0f86f16d0bd16e50a3c43ab2c6b9be4e610dbbfc50a99c84a62a4de80a6937d43985 +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-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/files/gimp-2.10_libheif-1.18_unconditional_compat.patch b/media-gfx/gimp/files/gimp-2.10_libheif-1.18_unconditional_compat.patch new file mode 100644 index 000000000000..cc1e565b6c6d --- /dev/null +++ b/media-gfx/gimp/files/gimp-2.10_libheif-1.18_unconditional_compat.patch @@ -0,0 +1,23 @@ +Gentoo issue: https://bugs.gentoo.org/940915 + +diff '--color=auto' -Naur a/configure.ac b/configure.ac +--- a/configure.ac ++++ b/configure.ac +@@ -1843,13 +1843,13 @@ + can_import_avif=no + can_export_avif=no + if test "x$have_libheif" = xyes; then +- can_import_heic=`$PKG_CONFIG --variable=builtin_h265_decoder libheif` +- can_export_heic=`$PKG_CONFIG --variable=builtin_h265_encoder libheif` ++ can_import_heic=yes ++ can_export_heic=yes + if test "x$can_import_heic" = xyes; then + MIME_TYPES="$MIME_TYPES;image/heif;image/heic" + fi +- can_import_avif=`$PKG_CONFIG --variable=builtin_avif_decoder libheif` +- can_export_avif=`$PKG_CONFIG --variable=builtin_avif_encoder libheif` ++ can_import_avif=yes ++ can_export_avif=yes + if test "x$can_import_avif" = xyes; then + MIME_TYPES="$MIME_TYPES;image/avif" + fi diff --git a/media-gfx/gimp/gimp-2.10.34-r2.ebuild b/media-gfx/gimp/gimp-2.10.34-r2.ebuild deleted file mode 100644 index 1ca3948ad794..000000000000 --- a/media-gfx/gimp/gimp-2.10.34-r2.ebuild +++ /dev/null @@ -1,215 +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 ~ia64 ~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 - - 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 "${D}" -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-r2.ebuild b/media-gfx/gimp/gimp-2.10.36-r2.ebuild deleted file mode 100644 index 84edf850eedd..000000000000 --- a/media-gfx/gimp/gimp-2.10.36-r2.ebuild +++ /dev/null @@ -1,217 +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 ~ia64 ~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 - - 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 "${D}" -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.ebuild b/media-gfx/gimp/gimp-2.10.36.ebuild deleted file mode 100644 index 21b127bca46b..000000000000 --- a/media-gfx/gimp/gimp-2.10.36.ebuild +++ /dev/null @@ -1,214 +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 ~ia64 ~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 - - 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 "${D}" -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.38.ebuild b/media-gfx/gimp/gimp-2.10.38-r1.ebuild index 3746698cb6e8..8e4df871c08f 100644 --- a/media-gfx/gimp/gimp-2.10.38.ebuild +++ b/media-gfx/gimp/gimp-2.10.38-r1.ebuild @@ -12,7 +12,7 @@ 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 ~ia64 ~loong ~ppc ~ppc64 ~riscv ~x86" +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" @@ -105,6 +105,10 @@ src_prepare() { 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 diff --git a/media-gfx/gimp/gimp-2.99.18-r1.ebuild b/media-gfx/gimp/gimp-3.0.0_rc1.ebuild index a206f158550c..00639d92cbe4 100644 --- a/media-gfx/gimp/gimp-2.99.18-r1.ebuild +++ b/media-gfx/gimp/gimp-3.0.0_rc1.ebuild @@ -4,22 +4,25 @@ 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)-RC1.tar.xz" +S="${WORKDIR}/${PN}-$(ver_cut 1-3)-RC1" 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 ) " RESTRICT="!test? ( test )" @@ -27,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 @@ -35,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.50: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 @@ -50,11 +57,10 @@ COMMON_DEPEND=" >=media-libs/tiff-4.1.0:= net-libs/glib-networking[ssl] sys-libs/zlib - >=x11-libs/cairo-1.16.0 + >=x11-libs/cairo-1.16.0[X=] >=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 + >=x11-libs/gtk+-3.24.16:3[introspection,X=] + >=x11-libs/pango-1.50.0[X=] aalib? ( media-libs/aalib ) alsa? ( >=media-libs/alsa-lib-1.0.0 ) fits? ( sci-libs/cfitsio ) @@ -71,17 +77,16 @@ 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:= ) - wmf? ( >=media-libs/libwmf-0.2.8 ) - X? ( x11-libs/libXcursor ) + wmf? ( >=media-libs/libwmf-0.2.8[X=] ) + X? ( + x11-libs/libX11 + x11-libs/libXcursor + x11-libs/libXext + >=x11-libs/libXmu-1.1.4 + ) xpm? ( x11-libs/libXpm ) " @@ -112,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() { @@ -145,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() { @@ -185,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) @@ -199,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) ) @@ -216,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 @@ -237,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 @@ -247,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/gimp/gimp-3.0.0_rc2.ebuild b/media-gfx/gimp/gimp-3.0.0_rc2.ebuild new file mode 100644 index 000000000000..1f159711d6dd --- /dev/null +++ b/media-gfx/gimp/gimp-3.0.0_rc2.ebuild @@ -0,0 +1,260 @@ +# 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..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)/${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 test udev unwind vala vector-icons webp wmf xpm" +REQUIRED_USE=" + ${PYTHON_REQUIRED_USE} + lua? ( ${LUA_REQUIRED_USE} ) + test? ( X ) + xpm? ( X ) +" + +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 + >=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.57.3:2 + >=media-gfx/mypaint-brushes-2.0.2:= + >=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.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 + 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[X=] + >=x11-libs/gdk-pixbuf-2.40.0:2[introspection] + >=x11-libs/gtk+-3.24.16:3[introspection,X=] + >=x11-libs/pango-1.50.0[X=] + 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:= ) + 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=] ) + X? ( + x11-libs/libX11 + x11-libs/libXcursor + x11-libs/libXext + >=x11-libs/libXmu-1.1.4 + ) + 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" ) + +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 +} + +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}'/" gimp-data/images/logo/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 mng) + $(meson_feature openexr) + $(meson_feature openmp) + $(meson_feature postscript ghostscript) + $(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 lua) + $(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/3.0/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 + + python_optimize + + # 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 + + # Create symlinks for Gimp exec in /usr/bin + 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-3.0 /usr/bin/gimp-test-clipboard + dosym "${ESYSROOT}"/usr/bin/gimptool-3.0 /usr/bin/gimptool + + _rename_plugins || die +} + +pkg_postinst() { + xdg_pkg_postinst +} + +pkg_postrm() { + xdg_pkg_postrm +} diff --git a/media-gfx/gimp/gimp-9999.ebuild b/media-gfx/gimp/gimp-9999.ebuild index 477c892d26a4..918db05ef232 100644 --- a/media-gfx/gimp/gimp-9999.ebuild +++ b/media-gfx/gimp/gimp-9999.ebuild @@ -4,7 +4,7 @@ EAPI=8 LUA_COMPAT=( luajit ) -PYTHON_COMPAT=( python3_{10..12} ) +PYTHON_COMPAT=( python3_{10..13} ) VALA_USE_DEPEND=vapigen inherit git-r3 lua-single meson python-single-r1 toolchain-funcs vala xdg @@ -15,10 +15,12 @@ EGIT_REPO_URI="https://gitlab.gnome.org/GNOME/gimp.git" LICENSE="GPL-3+ LGPL-3+" SLOT="0/3" -IUSE="X aalib alsa doc gnome heif javascript jpeg2k jpegxl lua mng openexr openmp postscript 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} ) + test? ( X ) + xpm? ( X ) " RESTRICT="!test? ( test )" @@ -38,7 +40,7 @@ COMMON_DEPEND=" >=dev-libs/json-glib-1.4.4 dev-libs/libxml2:2 dev-libs/libxslt - >=gnome-base/librsvg-2.40.21:2 + >=gnome-base/librsvg-2.57.3:2 >=media-gfx/mypaint-brushes-2.0.2:= >=media-libs/babl-9999[introspection,lcms,vala?] >=media-libs/fontconfig-2.12.6 @@ -53,13 +55,13 @@ COMMON_DEPEND=" >=media-libs/tiff-4.1.0:= net-libs/glib-networking[ssl] sys-libs/zlib - >=x11-libs/cairo-1.16.0 + >=x11-libs/cairo-1.16.0[X=] >=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 + >=x11-libs/gtk+-3.24.16:3[introspection,X=] + >=x11-libs/pango-1.50.0[X=] 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= ) @@ -76,8 +78,13 @@ COMMON_DEPEND=" 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 ) + wmf? ( >=media-libs/libwmf-0.2.8[X=] ) + X? ( + x11-libs/libX11 + x11-libs/libXcursor + x11-libs/libXext + >=x11-libs/libXmu-1.1.4 + ) xpm? ( x11-libs/libXpm ) " @@ -167,16 +174,17 @@ src_configure() { -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) @@ -189,6 +197,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) ) @@ -235,15 +244,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/gnofract4d/Manifest b/media-gfx/gnofract4d/Manifest index ef6379ec43c2..f1b1a15c97d6 100644 --- a/media-gfx/gnofract4d/Manifest +++ b/media-gfx/gnofract4d/Manifest @@ -1,8 +1,5 @@ -AUX gnofract4d-4.3_p20221125-clang16.patch 2070 BLAKE2B fad88eb8307a3387075f2b7c58b12103474f4a807039261a323759f5c5f9579612d6ef25ab93fab317352ee49ee2c90745c92e0ee1f776721940c95c563f1f71 SHA512 0bcb83dbd5486fbbe6ea683cdd85ce057dfef96203f5f4a6cc8b45d1da07b28da2afcff4d18bb584833c06222de15f8e4851d43949fb7090c580bd45635bd391 -DIST gnofract4d-4.3_p20221125.tar.gz 18275177 BLAKE2B 24fcd71818a98a3137b485046f295b523884d05ece694e37cf871e1fdaba7b26ac870675895a7a361e5d1fe142b0ae68c720c6e39615226951e8e1af6f57c848 SHA512 75d8d12441a0e2024f0ef125fee5cbe8dcc10c4c48ba366d5529644ae743928b998f85369aafc6e737cb994a82ebdcbe941e11c916c0d0996e785a146469e359 -DIST gnofract4d-4.3_p20230717.tar.gz 18275492 BLAKE2B 0bc8834c6f3ed3ec48bf4ee49ad563ce6842485dd32eb568c580d74528d062dcad6f8da4a67434c3784497883d0a73d4fa050a346ef970ac348db58bc6e7ea39 SHA512 c427c42e75b830dcf95012346d2db3a9b63be4e5431e7eae5ec74b915f5eedd857d8fa56d5ec37e8d245c3a77dc413c72115700d614205bdd62b916e6865f749 DIST gnofract4d-4.3_p20240324.tar.gz 18274057 BLAKE2B 183bf96e0429fa676f1c6fca4ae6466c489d0fe5ffee09ae161e01d0f22b4e77165f846416702c026f5d73a27833dfebd49f5c3131c621c9b1abd2ee9fc5529d SHA512 a174683b659347e4a7203d78d309ab41971d105131d40ea60490871477e80109624405f7012e455389ccc9325e08f224a1d3ea2d4e0c23fc9c5ca4fb83f9dfaa -EBUILD gnofract4d-4.3_p20221125-r1.ebuild 1470 BLAKE2B 9316290a45026d2aae523d8e59059fcf08cecf886757c7dd49af0d8532176b6bec30f6e3f01ade36656437be6410502f9486b5f482d7b293df7cbe735d007850 SHA512 030a61800bd923a76e929312a908bc3b45634d891bb48cdd8d605ff23c5ed363293e33e1a9050f74d8e47bc67e787861597e77ee47b6c2171dcc43b056c215ef -EBUILD gnofract4d-4.3_p20230717.ebuild 1740 BLAKE2B 1fdd4739fa03dc7c5fb50f866c68238e910f5675ab487fd9c343cae1795267ec3b38973aecc371217da762415d829ea25121b29ce3154ebab9aaee41402e2e64 SHA512 71489072990eab391408b93946168cd31dd030cff20d225210d489b703197f180d5442d8222231308230707586d1cff0328b5cbf612d8bfbb652cf640f8e54d2 +DIST gnofract4d-4.3_p20240821.tar.gz 18274253 BLAKE2B edfbd9a21b81f0fb051bbe6aef5ff97c77271985b7ecd0d3900ec70b208b1f2e5b75935d6213a761f555b2d4fe973e71b7859a56f2c2547f09321c6e75cc6981 SHA512 50abc3b5e9168308cbcff963a5aee00cd1f9a5a7a679d23023e6b21e82a1e04fc5fe8b55a10df39b1f71a85450824a75b2661abce9988746b9643acb78fa02e5 EBUILD gnofract4d-4.3_p20240324.ebuild 1807 BLAKE2B ac4416bd07fdd91545cfa2da18dbec010e0a5a4ef482bb9a414d82ad0a651b8f9a9fa59d5e5433e775e12f356ad926633ba623ba3e81cb6d58746029ae8d3aa2 SHA512 84789c4544eab3b22f281a13ca97c45cbfedf3d391ac6443c2749e5bdefb4e5a580c8bfb46d09d8e815cebb1090ea9c9fd716902f7099631f260308394bc69c7 +EBUILD gnofract4d-4.3_p20240821.ebuild 1809 BLAKE2B 031d19050dca3c592cbc00183711a081014b4b185090084e1ed3d4bb929e2d80fea647a5bc9345f999b041e0ff94b30e023d18397d3825ab6b45ef5c23dcc02f SHA512 79cfd0794dbfd7e7fa9360adbd6c87e11fdc5e85cd9f2863098f1a4e5657dc2fc177cdc608235fde864fa039983d46b88a14f0043c91179790f07fac5504a15b MISC metadata.xml 474 BLAKE2B 6dcdd891ae9b2b69a1f7a2e3de6bc867894444743825642abddac1701d75bd2ec1542a5e6d4c86b76b2e209ccdc4db53e680692a0e6c7c99c280ff96fe6a13a2 SHA512 7b815ce8a870b158e39845840082ea3a87738d1f7c63b6aee869758deb3475f7f2c1c1f1831bfdc8af911c1f7825c514cf26c76af5bb32464e9fa2a308ba8a05 diff --git a/media-gfx/gnofract4d/files/gnofract4d-4.3_p20221125-clang16.patch b/media-gfx/gnofract4d/files/gnofract4d-4.3_p20221125-clang16.patch deleted file mode 100644 index 3ca2ae35911a..000000000000 --- a/media-gfx/gnofract4d/files/gnofract4d-4.3_p20221125-clang16.patch +++ /dev/null @@ -1,44 +0,0 @@ -https://github.com/fract4d/gnofract4d/pull/254 - -From dd92a4bf2c6e68352203c511f465846e5c96407b Mon Sep 17 00:00:00 2001 -From: Florian Weimer <fweimer@redhat.com> -Date: Fri, 14 Apr 2023 09:33:28 +0200 -Subject: [PATCH] Declare image_lookup, gradient in fract_stdlib.h -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -This avoids test failures in generated code with C compilers -that do not support implicit function declartions: - -> raise fracttypes.TranslationError( - "Error reported by C compiler:%s" % output) -E fract4d_compiler.fracttypes.TranslationError: Error reported by C co -mpiler:/tmp/fract4d_4tueiy9c/gnofract4d-cache/fract4d_9ebc1853081db2ea5eb7cce846 -42cd4e.c: In function ‘pf_calc’: -E /tmp/fract4d_4tueiy9c/gnofract4d-cache/fract4d_9ebc1853081db2ea5eb7c -ce84642cd4e.c:282:1: error: implicit declaration of function ‘image_lookup’ -E 282 | image_lookup(t__a_cf1image,z_re,z_im, &t__cf10, &t__cf11, &t -__cf12); -E | ^~~~~~~~~~~~ - - -> raise fracttypes.TranslationError( - "Error reported by C compiler:%s" % output) -E fract4d_compiler.fracttypes.TranslationError: Error reported by C compiler:/tmp/fract4d_4tueiy9c/gnofract4d-cache/fract4d_2ccc81a001cdf717973d45d4cbd12778.c: In function ‘pf_calc’: -E /tmp/fract4d_4tueiy9c/gnofract4d-cache/fract4d_2ccc81a001cdf717973d45d4cbd12778.c:323:1: error: implicit declaration of function ‘gradient’ -E 323 | gradient(t__a__gradient,t__cf09, &t__cf010, &t__cf011, &t__cf012); -E | ^~~~~~~~ ---- a/fract4d/c/fract_stdlib.h -+++ b/fract4d/c/fract_stdlib.h -@@ -52,6 +52,9 @@ extern "C" - double read_float_array_2D(void *array, int x, int y); - int write_float_array_2D(void *array, int x, int y, double val); - -+ void image_lookup(void *im, double x, double y, double *pr, double *pg, double *pb); -+ void gradient(void *grad_object, double index, double *r, double *g, double *b); -+ - #ifdef __cplusplus - } - #endif - diff --git a/media-gfx/gnofract4d/gnofract4d-4.3_p20221125-r1.ebuild b/media-gfx/gnofract4d/gnofract4d-4.3_p20221125-r1.ebuild deleted file mode 100644 index 2132a58fe933..000000000000 --- a/media-gfx/gnofract4d/gnofract4d-4.3_p20221125-r1.ebuild +++ /dev/null @@ -1,63 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -PYTHON_COMPAT=( python3_{9..11} ) -DISTUTILS_SINGLE_IMPL=1 -DISTUTILS_USE_PEP517=setuptools - -inherit distutils-r1 optfeature virtualx xdg - -COMMIT="f90eb2a9c25e3f3aef65e8d4dce7d73bcb795b2d" - -DESCRIPTION="A program for drawing beautiful mathematically-based images known as fractals" -HOMEPAGE="https://fract4d.github.io/gnofract4d/" -SRC_URI="https://github.com/fract4d/gnofract4d/archive/${COMMIT}.tar.gz -> ${P}.tar.gz" - -LICENSE="BSD" -SLOT="0" -KEYWORDS="amd64 x86" - -DEPEND=" - media-libs/libjpeg-turbo:0= - media-libs/libpng:0=" -RDEPEND="${DEPEND} - $(python_gen_cond_dep ' - dev-python/pycairo[${PYTHON_USEDEP}] - dev-python/pygobject:3[cairo,${PYTHON_USEDEP}] - ') - x11-libs/gtk+:3[introspection]" -BDEPEND=" - virtual/pkgconfig - test? ( - media-video/ffmpeg[vpx,zlib] - )" - -distutils_enable_tests pytest - -S="${WORKDIR}/${PN}-${COMMIT}" - -PATCHES=( - "${FILESDIR}"/${PN}-4.3_p20221125-clang16.patch -) - -src_prepare() { - sed -i -e "s:share/doc/gnofract4d/:share/doc/${PF}/:" setup.py || die - - distutils-r1_src_prepare -} - -python_test() { - ln -s "${BUILD_DIR}"/lib/fract4d/*.so fract4d/ || die - local EPYTEST_IGNORE=( - # test_regress.py does not provide pytest with any tests and inspecting it requires dev-python/pillow - test_regress.py - ) - TMPDIR="${T}" virtx epytest -} - -pkg_postinst() { - xdg_pkg_postinst - optfeature "creating videos" media-video/ffmpeg[vpx,zlib] -} diff --git a/media-gfx/gnofract4d/gnofract4d-4.3_p20230717.ebuild b/media-gfx/gnofract4d/gnofract4d-4.3_p20240821.ebuild index e1e1aa226fc2..03e0f31ababe 100644 --- a/media-gfx/gnofract4d/gnofract4d-4.3_p20230717.ebuild +++ b/media-gfx/gnofract4d/gnofract4d-4.3_p20240821.ebuild @@ -1,26 +1,25 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 -PYTHON_COMPAT=( python3_{10..12} ) -DISTUTILS_EXT=1 -DISTUTILS_SINGLE_IMPL=1 -DISTUTILS_IN_SOURCE_BUILD=1 +PYTHON_COMPAT=( python3_{10..13} ) -inherit distutils-r1 multibuild optfeature virtualx xdg +inherit meson optfeature python-single-r1 virtualx xdg -COMMIT="47d2093e8f6399d1badfba0d1cb0f9867e90b326" +COMMIT="4202edc865d1f5f3ce3bd3c5fdd72b767f0b89e4" DESCRIPTION="A program for drawing beautiful mathematically-based images known as fractals" HOMEPAGE="https://fract4d.github.io/gnofract4d/" SRC_URI="https://github.com/fract4d/gnofract4d/archive/${COMMIT}.tar.gz -> ${P}.tar.gz" +S="${WORKDIR}/${PN}-${COMMIT}" LICENSE="BSD" SLOT="0" KEYWORDS="~amd64 ~x86" +REQUIRED_USE="${PYTHON_REQUIRED_USE}" -DEPEND=" +DEPEND="${PYTHON_DEPS} media-libs/libjpeg-turbo:0= media-libs/libpng:0=" RDEPEND="${DEPEND} @@ -32,21 +31,31 @@ BDEPEND=" virtual/pkgconfig test? ( media-video/ffmpeg[vpx,zlib] + $(python_gen_cond_dep ' + dev-python/pytest[${PYTHON_USEDEP}] + ') )" -distutils_enable_tests pytest - -S="${WORKDIR}/${PN}-${COMMIT}" - src_prepare() { - sed -i -e "s:VERSION = '4.3':VERSION = '$PV':" fract4d/options.py || die - sed -i -e "s:share/doc/gnofract4d/:share/doc/${PF}/:" setup.py || die + sed -i "s:4.3:${PV}:" meson.build || die + default +} + +src_configure() { + local emesonargs=( + -Ddocdir="${EPREFIX}/usr/share/doc/${PF}" + -Dstrip=false + ) + meson_src_configure +} - distutils-r1_src_prepare +src_install() { + meson_src_install + python_optimize + python_fix_shebang "${ED}"/usr/bin/gnofract4d } -python_test() { - ln -s "${BUILD_DIR}"/lib/fract4d/*.so fract4d/ || die +src_test() { local EPYTEST_IGNORE=( # test_regress.py does not provide pytest with any tests and inspecting it requires dev-python/pillow test_regress.py diff --git a/media-gfx/gnome-font-viewer/Manifest b/media-gfx/gnome-font-viewer/Manifest index 5e91c8a0eee2..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 -EBUILD gnome-font-viewer-46.0.ebuild 795 BLAKE2B 0f510f4c241a67801108eeb931a3fa3d00709e5ea0798b3ea6ead9a159a1f1ef732a57426909548a641d8a88f53ff5d7213200aa5bc9c862d86dd3fa07fc3cf2 SHA512 094d1b92efb4c75a14388c5b14dc176f5788d2e4f4949cb508db2dbfc17330ade32c1a53f1ce1ace0a520563df8d5c77ef6afb90ff8f6dccefdd6dd8ee2bafae +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-46.0.ebuild b/media-gfx/gnome-font-viewer/gnome-font-viewer-46.0.ebuild index 163cee416bb5..a92653f375f4 100644 --- a/media-gfx/gnome-font-viewer/gnome-font-viewer-46.0.ebuild +++ b/media-gfx/gnome-font-viewer/gnome-font-viewer-46.0.ebuild @@ -9,7 +9,7 @@ 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 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/gnome-photos/Manifest b/media-gfx/gnome-photos/Manifest index 4bf1fdf33a8c..cb2a77850430 100644 --- a/media-gfx/gnome-photos/Manifest +++ b/media-gfx/gnome-photos/Manifest @@ -1,3 +1,3 @@ DIST gnome-photos-44.0.tar.xz 2862604 BLAKE2B 0f6e2837c0beb4f4cef1ac79363c0b67b1ea1bb69e9d6fd81fb6a726067bf4c0106d16b3bfdee5b50ce786a1805bef74b2126b41046ec104a52cc476735633b8 SHA512 00ad3d431ffaaf245c3d5790b86fb3ec9d1c6ed8bc50bf4de872899a409d779bd964f6b63017182f797dd879655b2717f4b034cac029e0a3bc50c8df8fe3193b -EBUILD gnome-photos-44.0.ebuild 2161 BLAKE2B 6cc076ba50fb8605483235cca78748c73a73155fe367c8ec5148aa801287871b035c4c1489fa246359860ae183a0a055e6bb056627a445cc79c2476d5812ef26 SHA512 11839481c8f7c9d939775e98fed103879fada471708479aae102fe7a8a5a651ed983a41d86dea7c5456d53e3267be4ea2c3aca5d1501f3bdd053e9b3908f0293 +EBUILD gnome-photos-44.0.ebuild 2160 BLAKE2B 0418a6415a1150830d932c85e6f44911ed2ed120760b07fa691cc9e284e8ec41c33359c69e012db77e970fa82ef2887d4c78c37e9045125c379b86b71daa9100 SHA512 172c7515b9dedc34244c3c0dd4dc990831fe4d062e945069f898f906ab6410c5ed6795e1a8aecc496e4799e35a75f0cb1e90cff56ca66adaa63a411aaa43638f MISC metadata.xml 1068 BLAKE2B 611c61f3ba39a6f4bd41e221a574d67fdec2f340a9f5fbd544f3a96b82e0966f2646cc9d6c5dab7fbd1d5e044cda46d639f3bf38f7d9c9cb84d981e28e2d9414 SHA512 d3eee2527fa2a21dbe63a7f13f2a5bcfbd1005aec972f6ff71f74ad08b25c80a75d1195ffea28d67b0dc48147c9b8c692ed4a8baabdb9219705fe2a78b6aeefd diff --git a/media-gfx/gnome-photos/gnome-photos-44.0.ebuild b/media-gfx/gnome-photos/gnome-photos-44.0.ebuild index 189d865b1d57..11827b30925a 100644 --- a/media-gfx/gnome-photos/gnome-photos-44.0.ebuild +++ b/media-gfx/gnome-photos/gnome-photos-44.0.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 @@ -11,7 +11,7 @@ HOMEPAGE="https://wiki.gnome.org/Apps/Photos" LICENSE="GPL-3+ LGPL-2+ CC0-1.0" SLOT="0" -KEYWORDS="~amd64 ~arm64 ~loong ~ppc64 ~riscv ~x86" +KEYWORDS="amd64 ~arm64 ~loong ~ppc64 ~riscv ~x86" IUSE="test upnp-av" RESTRICT="!test? ( test )" diff --git a/media-gfx/gnome-screenshot/Manifest b/media-gfx/gnome-screenshot/Manifest index 77f00587b74e..13b71fc3265c 100644 --- a/media-gfx/gnome-screenshot/Manifest +++ b/media-gfx/gnome-screenshot/Manifest @@ -2,5 +2,5 @@ AUX gnome-screenshot-40.0-fix-hidpi.patch 1351 BLAKE2B a94ce580d6f4af9e7945bdb13 AUX gnome-screenshot-41.0-build-Use-GNOME-module-post_install.patch 2265 BLAKE2B 5c35e79ed0e4172cb8cefc288c84fe168b3ccd107ea09918270d5b3dcc7be67cdd06dc891296fe86ca36d7c2dd3b8ebcc90ce9a80a630e49ff928f9544b3a0ce SHA512 79a9728a33c20a683183050196509e6cfdef72b3ee4cbc8f2c6ac7485006922033d0d8e78e4227382cef0d8a80278963101fcb60e701c7c4a359978facbd6687 AUX gnome-screenshot-41.0-fix-meson-0.61-build.patch 898 BLAKE2B 9fc2ea6df76ca7db103a747df18e939e53f5ad78431e0c58fadb0826b2ef9686d4f14131fc06a4df3e98cd9b8833659d34a4c4a78c5e2db0f80d7941a40e1b90 SHA512 02020e4588b5bdcc15afce12c92ba261d0dae6d45c01b3b1a6c332f5eada34fa7c82df82aca8e0dd91e7bd66a5615266b581d76ca12bbf09fc8e06bf31132440 DIST gnome-screenshot-41.0.tar.xz 359500 BLAKE2B d3e44ab565815998327ddcbe80979acff3d690cfb0b7ae8f21910bafd21c9c7d3cd7af11e14b0522bb4d64ad2e27d5b6209c80208ea8fb03c465eb453ef8d47f SHA512 ab6c7e22cbca2739844707e59329ecd67901e04f968bd0b20a07dffff825e9772697ebf20a1ab2a920fa839ea40d0bd872d17db2b4cb7856a6f8ee4ec1426d19 -EBUILD gnome-screenshot-41.0.ebuild 1523 BLAKE2B a465793c34024a2a9a77681b16deb013c287a1af83360a67da12240f5ac3f9004cf02b1c1f87d50d79393dc068150a334ab02c1cc517fe7b02b4e9b76e88f090 SHA512 4cb0543d645e0219bb1b7441307ac036fed92eba2a0fe5098c0dfcc9be14c0b456955cc1a85aa44fb0c715e35c8b039a2b68370f093dcd03411a7a8ed9016b63 +EBUILD gnome-screenshot-41.0.ebuild 1517 BLAKE2B 8a3b5a29867be4e0d9dc75047937124a645ee23284b7a785921b6aa4650d075d6f49bd6270237509cec20a1a6c02483f5d48071ad174943fe79fa1b963cf2df3 SHA512 9233fd076873e129fd107d521424ddcf5347107015eead805fb269cab22b1a948957fc2e1191734c505f11a07cfc8f57a7d752b9a59aa0cecb5c38b51fac7d06 MISC metadata.xml 357 BLAKE2B 655de20d0e5fd6c41754e9b971523415d0ac9d0c6a3987215ecb9c075d19f719e21856c38ca52577f389f0dd3643b5f0d799a590b01a4199ba730c205aeef40b SHA512 45dadcc226d093ceaa4d8d5ceac0fd0325c48811977c9b3e74afdd7712d4653bd29d50c88edaedd0e8ebd4df530f89bc75559e7fe99e7e9514582d2fd3b66960 diff --git a/media-gfx/gnome-screenshot/gnome-screenshot-41.0.ebuild b/media-gfx/gnome-screenshot/gnome-screenshot-41.0.ebuild index 068590d540d3..fe48cc3f3ce2 100644 --- a/media-gfx/gnome-screenshot/gnome-screenshot-41.0.ebuild +++ b/media-gfx/gnome-screenshot/gnome-screenshot-41.0.ebuild @@ -10,7 +10,7 @@ HOMEPAGE="https://gitlab.gnome.org/GNOME/gnome-screenshot" LICENSE="GPL-2+" SLOT="0" IUSE="X" -KEYWORDS="~alpha amd64 ~arm arm64 ~ia64 ~loong ~ppc ~ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux" +KEYWORDS="~alpha amd64 ~arm arm64 ~loong ~ppc ~ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux" DEPEND=" X? ( diff --git a/media-gfx/gphoto2/Manifest b/media-gfx/gphoto2/Manifest index 5bfb79fb321c..4f67c3b02d52 100644 --- a/media-gfx/gphoto2/Manifest +++ b/media-gfx/gphoto2/Manifest @@ -1,4 +1,4 @@ AUX gphoto2-2.5.28-clang-16.patch 2438 BLAKE2B 6bb4bee0c5d0b0aa60ecb3ab5f33aef115173eae61a7933fb7c98ee77bf474ebf63b87e4e5c843b8737f26dc065c126a0ade25a3718960db8b6c37181ed189b7 SHA512 2c4c3fb4861b745e8fc106a2e98ba8737caacfab2ffd999e6ba8c22bebedc795cce47ed8069de9c109267daef9096b7904d5f1d9966fe3844664a3f9f34d4065 DIST gphoto2-2.5.28.tar.xz 575816 BLAKE2B 4f919349d435cdb8e2cc4602ef57cee5e9ba5c7117e9d9e0dc0cec48f8820e8fb56204e7b4eb96105015c603fe83eaccd1ce8a240780a258fe7e56eef06f0665 SHA512 f5e23fd559b3a272441556323b9eadbce11e73bdcfe94ee027d58e51d5396ee6e2c12f0b7675d5017c140db329354de775ad619fcd6f19e3252659e0cbc4baa8 -EBUILD gphoto2-2.5.28-r1.ebuild 1114 BLAKE2B 2905ef27cd927d84a2ccdb98f6bafe4bf9dab90a302d501b9ee54100f9f5819dd2249a3497b753544bfe44833302062580000bc2ea4c781ad67f616f6a33bd69 SHA512 8a42a0f8bb3d5ab4ad7baefe3636770184872bae521f7b032a63d547ca8a7cedc4ae227227c87966083334cd6dfab00d38ade9f97f5be1de830f6543fbee3e49 +EBUILD gphoto2-2.5.28-r2.ebuild 1129 BLAKE2B 53d63196357727fcf48b838d5dbe432a27bcc6f747df042e87fff1b97056c8dc276d47b7ccb1e6277aa96610879b72b5a5ff469981b6f17cd9641ba4a9c818a9 SHA512 0b635b0bae5f5b6ffb6baabf877a1202d12e80eff9aa6ea4e78a513954e4c5c4c7b3b8fce447288dfb51783dbf1fbf8542228fefd75b5711f6ba5b05107ba012 MISC metadata.xml 384 BLAKE2B 1577d799609489e1e29078aaa779e019b01622aed8322d23aea0b3203f620d123c3bb0b2e5a3696ba89422c52695882253524c2104b47456e2b2a66f782ea9c4 SHA512 96f5267ca8b7ca6a0b22a82c3b386a1094db45056ade223cc3c24e52ef6a37117e283c0bcf6eb89e6a2a47347916ffdcfd5bdffd9049fda1717f2fd044fff9b5 diff --git a/media-gfx/gphoto2/gphoto2-2.5.28-r1.ebuild b/media-gfx/gphoto2/gphoto2-2.5.28-r2.ebuild index 634fbfe666c8..aa47c54d4afb 100644 --- a/media-gfx/gphoto2/gphoto2-2.5.28-r1.ebuild +++ b/media-gfx/gphoto2/gphoto2-2.5.28-r2.ebuild @@ -23,7 +23,7 @@ RDEPEND=" media-libs/aalib media-libs/libjpeg-turbo ) - ncurses? ( dev-libs/cdk:= ) + ncurses? ( >=dev-libs/cdk-5.0.20240331:= ) readline? ( sys-libs/readline:= ) " DEPEND="${RDEPEND}" diff --git a/media-gfx/gphotofs/Manifest b/media-gfx/gphotofs/Manifest index 1877247b4f1c..9966a9ce2b6f 100644 --- a/media-gfx/gphotofs/Manifest +++ b/media-gfx/gphotofs/Manifest @@ -1,5 +1,5 @@ AUX gphotofs-0.5-fix-build-clang16.patch 230 BLAKE2B 74ea06adfa1401785c2300f5d4049f87cada907a410f6e4db10560c3ff130ad3d135e2e57eecf000c093020f19fe454c5a8b72dba26783693c577201294d87bd SHA512 f8daf672216abf4f5791681f9928066815f247aff0a055ffa255ba87a59fb8626b0fb21eb3d428fec7549b23937246ed307b7df6e7bdc30df69ea8c54b171315 DIST gphotofs-0.5.tar.bz2 261357 BLAKE2B 6c8194308b461fe8b88aba3e6d16a15715cbb9f247aed2f57147e7192f342e3dbb26d0ce112b0203f73c078333706f717eb1822b86b1e0b5da4e632174907b55 SHA512 6f5bcaf8ca820c0590ec95af55ec9438c864a298660ad15c6d6e8f59201a7f873d29f16cf77d13538111f6cec3f958ea0ac88c6c51836ab2d8c9d6cca156ed3a EBUILD gphotofs-0.5-r1.ebuild 479 BLAKE2B 8632a441d9283c1751add326f93bdbbfad2081d4bad734391bf688d3ca6ea871c27d4f5222b99b45657689ab047ff395ff2e07f2cbd6c7d24c661d5d179532b4 SHA512 59c1c64d23beca6a556cc6061ffd215d8f11d390c0e81202477f84926f4fe4754ea54c1f047d42ba7332858fa729a71b92ec2caa15ad03688e531abe460ba45c -EBUILD gphotofs-0.5-r2.ebuild 543 BLAKE2B 336a5490597abb28484062f361d8f0100f720ba37eabc5b0f5467098f5353e6fbcf11751eafb84ffeafdd920bbad3804acb84b7fc3877bc9bec208513ca73238 SHA512 7843ed71726b011e06c21ea209e6230e00fe2f00351dfb0d59ee29b0709c828049ba2f767c77258de7489711d09cc0a09870bcb8c3cf74520745de1fe7a3ee72 +EBUILD gphotofs-0.5-r2.ebuild 541 BLAKE2B eed417b3fbab5deee637c6a463b326e546b22bdd48d0dcf182437b3fa372a34617ad7d33986578760a4d39735b7d4285fccd9650b4acfa2b0d8bcd1de129a3d6 SHA512 0f9dea6e7fd911df47a2f5eba035f81f05eaa82d21978d03bbbedfe0e87efa68b254c2402eb7d920658eb935915553fc87f0a5ee266e2fd6a7e8939d13c59a67 MISC metadata.xml 382 BLAKE2B 2b6e2ea780fe54c4f513d9469ff0396fa59e28df05b4903ae4058ffe437e5bc4a2c2384640ead1353f4f70fac35945d476d369f45779fc4150a08d90cc1e3a89 SHA512 017736ddba4c9e47475c7f79468ae99deeab8812c7013c0b07017c19481e2fc03364ac69b58545f186e69140e5680e4b5178f5dec2b61687bd74ca334f8951a5 diff --git a/media-gfx/gphotofs/gphotofs-0.5-r2.ebuild b/media-gfx/gphotofs/gphotofs-0.5-r2.ebuild index fc65ac960d60..fd78eadeecc4 100644 --- a/media-gfx/gphotofs/gphotofs-0.5-r2.ebuild +++ b/media-gfx/gphotofs/gphotofs-0.5-r2.ebuild @@ -9,7 +9,7 @@ SRC_URI="https://downloads.sourceforge.net/gphoto/${P}.tar.bz2" LICENSE="GPL-2" SLOT="0" -KEYWORDS="~amd64 ~x86" +KEYWORDS="amd64 x86" RDEPEND=" dev-libs/glib:2 diff --git a/media-gfx/gpicview/Manifest b/media-gfx/gpicview/Manifest index 7983a9932ff9..1f0721434838 100644 --- a/media-gfx/gpicview/Manifest +++ b/media-gfx/gpicview/Manifest @@ -2,6 +2,5 @@ AUX Fix-displaying-images-with-GTK3.patch 6119 BLAKE2B 84733027ba1740eb78e4d62e6 AUX gpicview-fix-animated-gifs.patch 356 BLAKE2B 8c60c06ded2f076e2edb47222f8041a2e8d7ef06f7d8a94bf4163a7ebb060b320fec577544042707e556dd4cbce4c52719056eada4aed360224f3b28e6c1af4e SHA512 d37ccd82d520b31e71bea95a877832b1511d77e36c293dbd71b3bf86c695dc367325f74f46ab5a408bc0f672ce56414820ef2cad1437188beac74e9c22b60276 AUX gpicview-main_win_open-dummy-return.patch 466 BLAKE2B 37bc66552c2b9f723a51a4d1d44125bd2dcc9121867be71e5c35ab05dc54574a0fb95cbb808f91099e6adf478bb3b108cf0360a8d492badc98a7396fdee4bafc SHA512 8a03de05bd6bf002ff416398a5df77ea67a1487a42021c645f938398d25ca8e6032e118915ba344a55fe7c021a2570047fd256782f3f7f57d03d074251af1cd2 DIST gpicview-0.2.5.tar.xz 349536 BLAKE2B c215e812693a30d55d3e606b9958d308b5d7f564ba0c3fc60e7606c492ec3ddd9997ae63f0865a6bebdf79c0a18e6a8b26a1e2c8d5dd7e2174d211130dbbe817 SHA512 afc7e67c7ae1252f9c1816ee46fe69e96ea7be9a60e03406a539f17b2e4f0e4b93a028c6f3f1c455f5433d6d7d78a58dcee2cb0ac91ea53093a21935bf454afd -EBUILD gpicview-0.2.5-r2.ebuild 595 BLAKE2B d47521663c88fec06cb88a55fa766fb6622015c986cba83134088d21c85b8f879a46b55d0d230cdc466c091102b99f4c38968ee496bb693407e742b57f1124c2 SHA512 a88126596432da7e2bbe684d4621cd479c79e13329903d210c5a8cef4486aa665a016b1a400e61c74eeb7fc6507b1da725c64ce1bfd084e57cee71b8fd589ff2 -EBUILD gpicview-0.2.5-r3.ebuild 708 BLAKE2B 3f8863250182bf6cadec13b3cb9abb9868e72f1fa5a9ebcb68cdf88ac07468f6a67c040705e191feaa4ec8667210595ffd5ef03207f5675c316ea31ba044850d SHA512 09795e0e305a95646ed7a2153abdec87946d459859b4628208faf41806ec60aa8a7820a387723cf7a22337aa2edfcb0b0a86af65f97eff39fa20c6890fb84b6e +EBUILD gpicview-0.2.5-r3.ebuild 710 BLAKE2B b3d6d43467efffba31230508229708b8fc07a76cc1c083571c5a0767615ff577727e3c9a07dfb11e9aba7570b685d2f9caa8cfcb9925e9745abb8e3dd8ecf497 SHA512 bf84c875e2ba05560357799d0f6ccbde92f882d7f24253b23448f548a58397e5fc2884390c0854cc35ef5c12329aee9488c020c605895c99dcb4aa70633133f6 MISC metadata.xml 242 BLAKE2B e8e2ce150c3abafafbde001036eb01bc36a0bd9c1466c8af433f5d0d938c7accc06d7ab9c241dea760c7e814fd553e5e1b90a15f4bfd9c6f5b6507e19b1a7be8 SHA512 7bd44c3af27abca3e957697d1050d823bf1586d010302899d15fb9b099628922f055d07bf267d2bf3e874fb4e6b19d480dc7ab495ce794e96b6524214c061ee7 diff --git a/media-gfx/gpicview/gpicview-0.2.5-r2.ebuild b/media-gfx/gpicview/gpicview-0.2.5-r2.ebuild deleted file mode 100644 index baef4b43f9b8..000000000000 --- a/media-gfx/gpicview/gpicview-0.2.5-r2.ebuild +++ /dev/null @@ -1,27 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit xdg - -DESCRIPTION="A Simple and Fast Image Viewer for X" -HOMEPAGE="http://lxde.sourceforge.net/gpicview" -SRC_URI="https://downloads.sourceforge.net/lxde/${P}.tar.xz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 ppc ~riscv x86" - -RDEPEND="virtual/jpeg:0 - x11-libs/gtk+:3" -DEPEND="${RDEPEND} - >=dev-util/intltool-0.40 - sys-devel/gettext - virtual/pkgconfig" - -PATCHES=( "${FILESDIR}/Fix-displaying-images-with-GTK3.patch" ) - -src_configure() { - econf --enable-gtk3 -} diff --git a/media-gfx/gpicview/gpicview-0.2.5-r3.ebuild b/media-gfx/gpicview/gpicview-0.2.5-r3.ebuild index 09ecbb0b6501..7cc62978f08a 100644 --- a/media-gfx/gpicview/gpicview-0.2.5-r3.ebuild +++ b/media-gfx/gpicview/gpicview-0.2.5-r3.ebuild @@ -6,7 +6,7 @@ EAPI=8 inherit xdg DESCRIPTION="A Simple and Fast Image Viewer for X" -HOMEPAGE="http://lxde.sourceforge.net/gpicview" +HOMEPAGE="https://lxde.sourceforge.net/gpicview/" SRC_URI="https://downloads.sourceforge.net/lxde/${P}.tar.xz" LICENSE="GPL-2" diff --git a/media-gfx/graphicsmagick/Manifest b/media-gfx/graphicsmagick/Manifest index 487238bdf015..c6acb7dab84a 100644 --- a/media-gfx/graphicsmagick/Manifest +++ b/media-gfx/graphicsmagick/Manifest @@ -8,9 +8,9 @@ DIST GraphicsMagick-1.3.43.tar.xz 5657460 BLAKE2B caa4fa6546acb4cdaaa421030ccc5c DIST GraphicsMagick-1.3.43.tar.xz.asc 228 BLAKE2B cb1290af98ea92de948df0421b7de101a713f0b8ce4a07959269d5edd10eb26f088585e1a8272482a9b219ee388ae8f040fc047ca76d5f752f04a7b57987c89c SHA512 3bd62bc64dd1b6f2d7a17f1281d8dc4c67c474860b4d95bfaf5fb4be93d0ee156b54c2a6ef4166687854e5458a6e43e61816a5fd508e4702f693a9d1e43984bf DIST GraphicsMagick-1.3.45.tar.xz 5936968 BLAKE2B 55c87c518267dc3330d09c39474acf4b89f06b2deddf8e5d36d3c235f39bb1ec5bd04d90e2dd6e50563430b58ea3b78ccb526bf8cf79efa32685ae8e04a1aee5 SHA512 2c12a24198a8ee1f86b4c43bf8903d129c891ec2c27ba22287dfc8a5f65c9223b2caa67a37b9a91b10b049ba8425e757738f5d92a9ae70abee76d323af9bd1a0 DIST GraphicsMagick-1.3.45.tar.xz.asc 228 BLAKE2B 72c7554de7d45499f90fa6534ed819e4d40b5f878f8bf0b14b026e100390ee9cabddd9df0d3945664e559350f1621239fcb9aafa9987a26e346f52b2c2ad8215 SHA512 5f49c8d1cdd20cb5bd7b76660800d22ef8ab3b13c3954dc4feb7522cb1f4d343a8e98faa91094f616ecbb01ff770bc3f4dd252c62b6b70c780318d425730c5c1 -EBUILD graphicsmagick-1.3.42.ebuild 3955 BLAKE2B 7fb1f992576d85e80f859d8ae386c0ae6c1a8bce256dc4eac99f7891944d5ece5ff0bf23a1a382fd2ce9d7d8987f78c8ff58bea16fdbef49c2fdc12ff1405b50 SHA512 66784a829ca6496bb386d21507738830839c1c52998fb0520392d833b0eb35f13834bd5c9c936e40b36f9f414e773452e9b9c7ff4ebc2d557954330097d1a619 -EBUILD graphicsmagick-1.3.43-r1.ebuild 3988 BLAKE2B c290515cb17a081afee5f9462e527173ed908c64cb59c8645de84fb97486fe7cc0f1e6e54c93e30148ed559f23e635a1b5b6e81d79e050892b42ed0aeeb54a96 SHA512 1949b646fcec108b2aec05ae9ca7eed4f60a754a7e860d519f9d9833b163852c302b1dbcec102e59f9e3cbf5e2a1d99926da34f921a61e747174e900875ed5ba -EBUILD graphicsmagick-1.3.43.ebuild 3948 BLAKE2B bdb1074abfe42fd18e2ba126294b14a08c6651b52bae4463a19464e7076f554cce7d76ac58c5acf2d34aa6ab5a130d5f467af9ab88cbfc4d3227d700557899ee SHA512 055a5ffd475c5c5e8d723b8083f852c8497fb80e36dd380dcd7a1154be952f8f0fc507b5ecf9ff56dc5ba343f64d5d2ed89a346d65fe362cd10a4c947a43fecf -EBUILD graphicsmagick-1.3.45-r1.ebuild 4011 BLAKE2B 6f68e12d74f003b867f005f10fabf4f1b1bfaa932c9a7e6cf6647dcf11d70b45f20dd6562808cb5e8d379f9d1dc9b4196828715ecb2d41f54e4d13173b4dc8d3 SHA512 7a09cf77f729317fbb3096ce296f1d2a349edfcdf64baf35d6e02335211119779d05235cdd15c6435d352c529e2aad962b5cb9546a0c59ecc31bf6da6652d807 -EBUILD graphicsmagick-9999.ebuild 4011 BLAKE2B 6f68e12d74f003b867f005f10fabf4f1b1bfaa932c9a7e6cf6647dcf11d70b45f20dd6562808cb5e8d379f9d1dc9b4196828715ecb2d41f54e4d13173b4dc8d3 SHA512 7a09cf77f729317fbb3096ce296f1d2a349edfcdf64baf35d6e02335211119779d05235cdd15c6435d352c529e2aad962b5cb9546a0c59ecc31bf6da6652d807 +EBUILD graphicsmagick-1.3.42.ebuild 3949 BLAKE2B 2b18247bc9cb7faa686e002dccf283b71828be75c389446fa523b691b3522fe4e95f17d9eceb0e0310b908b9f6a79023c6186bfbb62d95fbd3ab0162b4349dc5 SHA512 1cdefc13da40653d52be2133d94e466e03e1b1d37483cd5c8c8d713a49e0fc58824b19605f8a09868fa3807e129cbb9f4c90d4dd9160366a32376ba832875b92 +EBUILD graphicsmagick-1.3.43-r1.ebuild 3982 BLAKE2B 0112660a9fab648f3c988fcca6651e5e24ea6a94321ce21e0327afa3068065e977c9acce6e098665b2749d6b85b1a15b422eb1267a0d67889cdcb27236a79b4f SHA512 ed13351e5bcfd26ac095219d40dc97c5677dce5b3c9a4798e77e5255cdc74876fc5c66f1535073506066de55d571702a53a328306b25b03b4201b5d96a532ada +EBUILD graphicsmagick-1.3.43.ebuild 3942 BLAKE2B a0f6ec72235c55e0a22b81a7821df8a7eeaae9e0021f6de6974e72a4690205575771b599b7590e3e2dfa1def487615551655ad5d6b53010e08b64e6791cd1b1a SHA512 449c9787f258620040e9771ff847705e653d738d2d442867f2bdff76a7a07b430266342bc3cea28021a8045163ff584ef621a2c6599c81568270eca3154f3627 +EBUILD graphicsmagick-1.3.45-r1.ebuild 3998 BLAKE2B 01ea03505516d9aaeb4cdb8fe45b1eadde595032d894ff266c25587621fc833681eda9a85733319be9694bb40e6f9bfcd7f23eb23592bf053f68736164ee830c SHA512 b6306a3117d8e2d8360994c9273755ed47c2c0ea606a57fee1c7d8ec77bba7cc8deee85da3dbacfc290d410d0facd2ec6f583d34c48a0d85a2be9751abecf474 +EBUILD graphicsmagick-9999.ebuild 4005 BLAKE2B 84fa9aadd87c8ee5b767e1e51c196249a60db112f2933942ca00f6f1e569460bc477b0280cfaaa9bca604dc05960c59d283a38e01fe9d19892ac8dd98a9459d8 SHA512 2a6951ec2a08d10ceec04c7366ef6edfb303511f4d2e0c78da69bb56e6fcf881f54f96faad47ae28c3afd64cf849891d6b569509e23f0423bc63a01a38e790c5 MISC metadata.xml 1405 BLAKE2B 90d9ab1c58f90a756a89b30569fab4b9fee82116f33ba21d6b5192ab6a1f0160b607477a523334b3af859daca4206b25271fe5852c8ed6772a4dcbcc8ef07551 SHA512 1a3aac139eeb22b6d1aae5c3038220c37d494fb41df591227db462d42b331f6d4ab1bdd94f7697d24e463f417a56ff4da4100c8389c815881d3bf931708ae8ae diff --git a/media-gfx/graphicsmagick/graphicsmagick-1.3.42.ebuild b/media-gfx/graphicsmagick/graphicsmagick-1.3.42.ebuild index 2164e7fb17c6..c799d6fd19dc 100644 --- a/media-gfx/graphicsmagick/graphicsmagick-1.3.42.ebuild +++ b/media-gfx/graphicsmagick/graphicsmagick-1.3.42.ebuild @@ -20,7 +20,7 @@ else SRC_URI+=" verify-sig? ( https://downloads.sourceforge.net/${PN}/${MY_P}.tar.xz.asc )" S="${WORKDIR}/${MY_P}" - KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos" + KEYWORDS="~alpha amd64 arm arm64 hppa ~loong ~m68k ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos" BDEPEND="verify-sig? ( sec-keys/openpgp-keys-bobfriesenhahn )" fi diff --git a/media-gfx/graphicsmagick/graphicsmagick-1.3.43-r1.ebuild b/media-gfx/graphicsmagick/graphicsmagick-1.3.43-r1.ebuild index 1100b2cca2fb..073e50eeaf65 100644 --- a/media-gfx/graphicsmagick/graphicsmagick-1.3.43-r1.ebuild +++ b/media-gfx/graphicsmagick/graphicsmagick-1.3.43-r1.ebuild @@ -20,7 +20,7 @@ else SRC_URI+=" verify-sig? ( https://downloads.sourceforge.net/project/${PN}/${PN}-history/$(ver_cut 1-2)/${MY_P}.tar.xz.asc )" S="${WORKDIR}/${MY_P}" - KEYWORDS="~alpha amd64 ~arm arm64 hppa ~ia64 ~loong ~m68k ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos" + KEYWORDS="~alpha amd64 ~arm arm64 hppa ~loong ~m68k ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos" BDEPEND="verify-sig? ( sec-keys/openpgp-keys-bobfriesenhahn )" fi diff --git a/media-gfx/graphicsmagick/graphicsmagick-1.3.43.ebuild b/media-gfx/graphicsmagick/graphicsmagick-1.3.43.ebuild index 0c2ec447af58..42c6dc8039b2 100644 --- a/media-gfx/graphicsmagick/graphicsmagick-1.3.43.ebuild +++ b/media-gfx/graphicsmagick/graphicsmagick-1.3.43.ebuild @@ -20,7 +20,7 @@ else SRC_URI+=" verify-sig? ( https://downloads.sourceforge.net/${PN}/${MY_P}.tar.xz.asc )" S="${WORKDIR}/${MY_P}" - KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos" + KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos" BDEPEND="verify-sig? ( sec-keys/openpgp-keys-bobfriesenhahn )" fi diff --git a/media-gfx/graphicsmagick/graphicsmagick-1.3.45-r1.ebuild b/media-gfx/graphicsmagick/graphicsmagick-1.3.45-r1.ebuild index 7540cb69f787..c66edd304e19 100644 --- a/media-gfx/graphicsmagick/graphicsmagick-1.3.45-r1.ebuild +++ b/media-gfx/graphicsmagick/graphicsmagick-1.3.45-r1.ebuild @@ -20,7 +20,7 @@ else SRC_URI+=" verify-sig? ( https://downloads.sourceforge.net/project/${PN}/${PN}-history/$(ver_cut 1-2)/${MY_P}.tar.xz.asc )" S="${WORKDIR}/${MY_P}" - KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos" + KEYWORDS="~alpha amd64 ~arm arm64 hppa ~loong ~m68k ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos" BDEPEND="verify-sig? ( sec-keys/openpgp-keys-bobfriesenhahn )" fi diff --git a/media-gfx/graphicsmagick/graphicsmagick-9999.ebuild b/media-gfx/graphicsmagick/graphicsmagick-9999.ebuild index 7540cb69f787..015af99350f1 100644 --- a/media-gfx/graphicsmagick/graphicsmagick-9999.ebuild +++ b/media-gfx/graphicsmagick/graphicsmagick-9999.ebuild @@ -20,7 +20,7 @@ else SRC_URI+=" verify-sig? ( https://downloads.sourceforge.net/project/${PN}/${PN}-history/$(ver_cut 1-2)/${MY_P}.tar.xz.asc )" S="${WORKDIR}/${MY_P}" - KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos" + KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos" BDEPEND="verify-sig? ( sec-keys/openpgp-keys-bobfriesenhahn )" fi diff --git a/media-gfx/graphite2/Manifest b/media-gfx/graphite2/Manifest index 89fa34a71645..76cf4441b1f2 100644 --- a/media-gfx/graphite2/Manifest +++ b/media-gfx/graphite2/Manifest @@ -6,5 +6,5 @@ AUX graphite2-1.3.14-no-libtool-file.patch 2336 BLAKE2B a349e721264de1477aee5aa3 AUX graphite2-1.3.5-fix-gcc-linking.patch 580 BLAKE2B 7ab4d1848e0b0fdbd682fc81747a426c9bee7e2d0f72991dc963c955ba910035c6246d88f7eaded9c4a742a10470fd304ab2dd3fb1750795b8b9791ccfc0cfb8 SHA512 1e01c764f72204f30c916dcdc4f5bc7a4757d73275bb2007bf0c1f2e9898f138aa6c0581addc587e125cf6cbf9d5db725cb3d8a69875978a14ab316d2d561467 AUX graphite2-1.3.5-includes-libs-perl.patch 836 BLAKE2B 0429d214ff7fd9b903e1d3bcaf0af3e6b29a0269581390f64950e42e41280e482fc9cfda9bfe24ef166eb6c24d21377a15fca4264fec69d902d8ba18810bdb01 SHA512 26ab6dda13d758a5e4237c8b5d207d3c5111afbb11b2c3984cd742913c3c7932559b23b5ea9f774f1c6373eb0f761a9400dccc95876740b3cd06c44084a10965 DIST graphite2-1.3.14_p20210810.tar.gz 6656693 BLAKE2B 63a7d96b58f2779d8a4a353e1a986212b884fdf780fedcb83b22dcef2f7678d44c88c14ece2d09dc745df505a4a3825ce61d7c84bd05fd4e98c23d6e86e9326d SHA512 be54c1386578970cf65c1860336a113268181753c1e2a139e37ceeafcfa76e3162086879c54094d70cd0d36ad5852a95390aaa69572d875921e9481f1ae508ff -EBUILD graphite2-1.3.14_p20210810-r3.ebuild 3185 BLAKE2B 58c1d2d0161ffd0c6559f81c7d38a4312e2be1a71ec907edad58c4630b8ec0ead5f28d730bd813a048bdcc23d6eec61a55100c4c0fd6023326ce4306a668ceb4 SHA512 a6ecd37d05cef87a1dc57effdc024874f209dc5bfc21e27ec953407526fec068e20fd34f813fb0dffe12adebca95bd2ef730672729e53f4aa5c77d6f1e0f8ab3 +EBUILD graphite2-1.3.14_p20210810-r3.ebuild 3179 BLAKE2B 92af9cc8cf303957550bc17cac802863850e0fcd06cf2ce5e152cc00b856510fe81b03aa571c17ffa3586adc15a8bec14325982028306751bc3a079ae6d04b23 SHA512 8d50928ee83306f7b6d9e3ce6fe68ed6feb58998d9ea7f98853ddc72fc94077b09abc8638c5441553dcc70735de25081052657dd0cf0bd0e59faa297a1a1b2d3 MISC metadata.xml 393 BLAKE2B 27dcc3bcbc5a0ec32bb751ec3bb8788c2c85d5d7743f0243749a88ace9b5a3faaa10adc84731dbec3e37208efef41e3d4124de57005345927e848a7cbca6b098 SHA512 1086491557aff2d6f3552829550db85332c809d20ec1e3517bfa311fdfb2a5386cc4b624481b4fd7db7e48ab39bb5d76e048461352b74cdecf89d904ef52590b diff --git a/media-gfx/graphite2/graphite2-1.3.14_p20210810-r3.ebuild b/media-gfx/graphite2/graphite2-1.3.14_p20210810-r3.ebuild index de205065cc19..2bcb0888cd67 100644 --- a/media-gfx/graphite2/graphite2-1.3.14_p20210810-r3.ebuild +++ b/media-gfx/graphite2/graphite2-1.3.14_p20210810-r3.ebuild @@ -5,7 +5,7 @@ EAPI=8 COMMIT=80c52493ef42e6fe605a69dcddd2a691cd8a1380 GENTOO_DEPEND_ON_PERL="no" -PYTHON_COMPAT=( python3_{10..12} ) +PYTHON_COMPAT=( python3_{10..13} ) inherit flag-o-matic perl-module python-any-r1 cmake-multilib DESCRIPTION="Library providing rendering capabilities for complex non-Roman writing systems" @@ -15,7 +15,7 @@ S="${WORKDIR}/graphite-${COMMIT}" LICENSE="LGPL-2.1" SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris" +KEYWORDS="~alpha amd64 arm arm64 hppa ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris" IUSE="perl test" RESTRICT="!test? ( test )" diff --git a/media-gfx/graphviz/Manifest b/media-gfx/graphviz/Manifest index cd23ad259012..941d247cb956 100644 --- a/media-gfx/graphviz/Manifest +++ b/media-gfx/graphviz/Manifest @@ -1,7 +1,9 @@ -DIST graphviz-11.0.0.tar.xz 21306368 BLAKE2B c424b2d81180513f2a03210b5a5febfbf80e5c9912ad020d7015be69fdae6579d44108d22f99450ae3384560b610dbaac49a50fe8cac9dbd4e80b8761a8b65a8 SHA512 e95c9ed491c5f09190ca0f085aba2b9a3f6703371d62f6a275f41ddfceef7d79956e1fb0ccfda6c21f2e57afc3a88e37d7091af724911fe3e900ee90a7a811cf DIST graphviz-12.0.0.tar.xz 21279920 BLAKE2B 67d4444dcc31417fd01268b0fdc81538d86e26f961227d106ae57eb3d6d0e4a2e0ba684413a2d1b66f17340e0ad3a244ce5554c180873683e3ad4775f661739d SHA512 b5d4c8e9b565d4268fff28f169e3bfdb9ebf8b809996f7e35887430e5745aeac92c092fe2a9e15b23c9ba3364aa89fe2eeed85ab3fba61acce21634bc9632813 -DIST graphviz-9.0.0.tar.xz 21412796 BLAKE2B a1fd4e0d8d25ade263fdc0d357078cd8bb7847e88746561a0cfe07d129d193c309c7f4cb25f41cebca9549c8486aae2b1e3ebca0eaca57a41cbe2304a418dbd3 SHA512 912f31a4a90e21de9601ffcf8a85d2650d46f07e61aeb0e5124e5a91c67f444d08d40d49f15f2e4078d53d01fb9ca6f54dc9d18c1c08406da91b8ba9ad61416c -EBUILD graphviz-11.0.0.ebuild 6299 BLAKE2B f77ad2fe877badd5b45cb147c76ecedbc0329b5aaa5834b1dba175df7f96f161300b08085ffcb02c325f20ee8005a2de35052a49d32c61e05c179db9cb1c1b46 SHA512 7f9a211a7110d2f5deb0f9f1b97def604ea0ddacb1cbfcd9abd96770a504b8fd1a85611fc90b6f4cecd933a4c7ff224f7a5377ebbc5fb72734019b7e552cd363 -EBUILD graphviz-12.0.0.ebuild 6306 BLAKE2B b830a529edede32d6497a12edcf85624efc852a47ee1eaef58c992494084d7bba773865a29c06bcb8f38a789d9d62efba5e5b609048c692a1815154730e76bce SHA512 e3c0b533029af28633222d14eeeddde790f20648ecdcb3df084aa9f94833f09cae832abe3ef25da781696192e4193c0219360d5db2003b7d6c6488654997782e -EBUILD graphviz-9.0.0.ebuild 6113 BLAKE2B ce308cea23bbb5cd0cb2a619dded139726af456079f20c99e4a19a33876aafda99ecc10c83936bb0a28b4e5a4fca458e765dfbd0b5aade3ce154d9ed91938ad9 SHA512 adf8ebeea0c5e7871012d211134dad619e0b63706b787e7d2a688897cc150a3900b7091c6d331aa4c26742d1e58c271632804b8dc384f479e2dbb008d8cf1822 +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-r1.ebuild 6437 BLAKE2B bdb22accb626b17329c7a71f71b602833e8949631bc8efdc9c928439eec35fc7412ab35ff9d7429c787b8186cda69b713121959e92e014ee022c19c2e812c36a SHA512 f2cae1f8c8a385ba81faf5fd8db1a0b49ecb3b40b737e4eb39f5ecd71820ff094f17d5dac1d8f76b5d166c860a5976c7c204b874a27b22c10047fb7cef9d5ac5 MISC metadata.xml 2309 BLAKE2B 261f100c9c78cf3bb50ffd84260594d34fa5af75f0b3789ce5640e0d633494405e64b3e9f7524e35ef87d11164c501e21fcef2cc483f60ad6ad2e350f500e3b2 SHA512 1a29d11154b72af3deeb0202136926f0871797086ce1a5a4d1fc71822e86d0e76ff789c684fabad85fac1abd5f29913a555be0916f42b90f5ce62fa395e1cbba diff --git a/media-gfx/graphviz/graphviz-12.0.0.ebuild b/media-gfx/graphviz/graphviz-12.0.0-r100.ebuild index 3b42788dde34..b1ccbf88700e 100644 --- a/media-gfx/graphviz/graphviz-12.0.0.ebuild +++ b/media-gfx/graphviz/graphviz-12.0.0-r100.ebuild @@ -3,8 +3,9 @@ EAPI=8 +GUILE_COMPAT=( 2-2 3-0 ) PYTHON_COMPAT=( python3_{10..13} ) -inherit libtool python-single-r1 +inherit guile-single libtool python-single-r1 DESCRIPTION="Open Source Graph Visualization Software" HOMEPAGE="https://www.graphviz.org/ https://gitlab.com/graphviz/graphviz/" @@ -14,11 +15,12 @@ SRC_URI="https://gitlab.com/api/v4/projects/4207231/packages/generic/graphviz-re LICENSE="CPL-1.0" SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris" +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} )" @@ -45,7 +47,7 @@ RDEPEND=" x11-libs/gtk+:2 ) gts? ( sci-libs/gts ) - guile? ( dev-scheme/guile ) + guile? ( ${GUILE_DEPS} ) lasi? ( media-libs/lasi ) pdf? ( app-text/poppler ) perl? ( dev-lang/perl:= ) @@ -74,7 +76,7 @@ BDEPEND=" ) guile? ( dev-lang/swig - dev-scheme/guile + ${GUILE_DEPS} ) nls? ( >=sys-devel/gettext-0.14.5 ) perl? ( dev-lang/swig ) @@ -138,11 +140,16 @@ BDEPEND=" # with flags enabled at configure time pkg_setup() { + use guile && guile-single_pkg_setup use python && python-single-r1_pkg_setup } src_prepare() { - default + if use guile; then + guile-single_src_prepare + else + default + fi elibtoolize } @@ -205,6 +212,8 @@ src_install() { 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 diff --git a/media-gfx/graphviz/graphviz-11.0.0.ebuild b/media-gfx/graphviz/graphviz-12.1.2.ebuild index 40f75c59e1ce..d66128a9fbcf 100644 --- a/media-gfx/graphviz/graphviz-11.0.0.ebuild +++ b/media-gfx/graphviz/graphviz-12.1.2.ebuild @@ -3,8 +3,9 @@ EAPI=8 -PYTHON_COMPAT=( python3_{10..12} ) -inherit libtool python-single-r1 +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/" @@ -14,11 +15,12 @@ SRC_URI="https://gitlab.com/api/v4/projects/4207231/packages/generic/graphviz-re LICENSE="CPL-1.0" SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris" +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} )" @@ -45,7 +47,7 @@ RDEPEND=" x11-libs/gtk+:2 ) gts? ( sci-libs/gts ) - guile? ( dev-scheme/guile ) + guile? ( ${GUILE_DEPS} ) lasi? ( media-libs/lasi ) pdf? ( app-text/poppler ) perl? ( dev-lang/perl:= ) @@ -74,7 +76,7 @@ BDEPEND=" ) guile? ( dev-lang/swig - dev-scheme/guile + ${GUILE_DEPS} ) nls? ( >=sys-devel/gettext-0.14.5 ) perl? ( dev-lang/swig ) @@ -138,11 +140,16 @@ BDEPEND=" # with flags enabled at configure time pkg_setup() { + use guile && guile-single_pkg_setup use python && python-single-r1_pkg_setup } src_prepare() { - default + if use guile; then + guile-single_src_prepare + else + default + fi elibtoolize } @@ -205,6 +212,8 @@ src_install() { 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 diff --git a/media-gfx/graphviz/graphviz-9.0.0.ebuild b/media-gfx/graphviz/graphviz-12.2.0.ebuild index 7dc66d7742f7..d66128a9fbcf 100644 --- a/media-gfx/graphviz/graphviz-9.0.0.ebuild +++ b/media-gfx/graphviz/graphviz-12.2.0.ebuild @@ -3,8 +3,9 @@ EAPI=8 -PYTHON_COMPAT=( python3_{10..12} ) -inherit libtool python-single-r1 +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/" @@ -14,11 +15,12 @@ SRC_URI="https://gitlab.com/api/v4/projects/4207231/packages/generic/graphviz-re LICENSE="CPL-1.0" SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris" +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} )" @@ -45,7 +47,7 @@ RDEPEND=" x11-libs/gtk+:2 ) gts? ( sci-libs/gts ) - guile? ( dev-scheme/guile ) + guile? ( ${GUILE_DEPS} ) lasi? ( media-libs/lasi ) pdf? ( app-text/poppler ) perl? ( dev-lang/perl:= ) @@ -74,7 +76,7 @@ BDEPEND=" ) guile? ( dev-lang/swig - dev-scheme/guile + ${GUILE_DEPS} ) nls? ( >=sys-devel/gettext-0.14.5 ) perl? ( dev-lang/swig ) @@ -138,11 +140,16 @@ BDEPEND=" # with flags enabled at configure time pkg_setup() { + use guile && guile-single_pkg_setup use python && python-single-r1_pkg_setup } src_prepare() { - default + if use guile; then + guile-single_src_prepare + else + default + fi elibtoolize } @@ -194,7 +201,10 @@ src_configure() { --disable-ltdl-install QMAKE=$(usev qt5 qmake5) ) - econf "${myconf[@]}" + # 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() { @@ -202,6 +212,8 @@ src_install() { 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 diff --git a/media-gfx/graphviz/graphviz-12.2.1-r1.ebuild b/media-gfx/graphviz/graphviz-12.2.1-r1.ebuild new file mode 100644 index 000000000000..4df539855daa --- /dev/null +++ b/media-gfx/graphviz/graphviz-12.2.1-r1.ebuild @@ -0,0 +1,225 @@ +# Copyright 1999-2025 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 qt6 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} ) + qt6? ( dev-qt/qtbase:6[gui,widgets] ) + 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 'qt6'): +# 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 qt6 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 qt6 qmake6) + ) + # 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/gscan2pdf/Manifest b/media-gfx/gscan2pdf/Manifest index bde85c73d158..291e084c6e81 100644 --- a/media-gfx/gscan2pdf/Manifest +++ b/media-gfx/gscan2pdf/Manifest @@ -2,7 +2,9 @@ AUX gscan2pdf-2.13.2-min_max.patch 919 BLAKE2B f74350243325ec05dc290afd45e45d591 AUX gscan2pdf-2.13.2-t1161.patch 512 BLAKE2B b74f51a2cc70c19ef9b242b02540fff63098a783f9a0102622844a49fd5cf60c3701255af5317450c92bec3b3a7dc784fd9a5f37e136cd4db9f16de800323602 SHA512 cc8a8c65e9cf9b1425f69ae15687cdf0983fefd1415e30510e6f6bf0d4ffe71375839e2a4355c9d2f69b7b690d1a39d8520181dadbb055576cf2cde156b72c6e AUX gscan2pdf-2.13.2-t131.patch 473 BLAKE2B 23ec073509f9b252494e677a7f90f1eb41077a7e63641b1f6a6cb06d9a1329a3b5c96189c92a78b11b515c091b8df16173a40ced65d8f563e87b7d83410c31dd SHA512 ceffdfd0e478047d5da7044e160b8feadda9a0fa09ac99c609a118b84ac45ed10cd386f04c499c832566d8626e5abee4ce5d819a9e51733eb7dc822fa162f32d AUX gscan2pdf-2.13.2-tiff2ps.patch 1490 BLAKE2B c8b85f7a21e3e03cc1621d0f65af9f6ab03e89e72ef3839dc6f585cd8d0e6cc2d10c49ff119b671bc9f6fc99cf03c6a0117402acc38e624d46fd89cd02a75058 SHA512 b6357c1ea6d6dc958b7044be062bdb9445667da3d2ff9017bbdd3b041daafa89e742d8c1c9c919d3b8b5c4ab35840db1d24ec27a573a1e75b544c0dfce40bd9b +AUX gscan2pdf-2.13.4-t3722.patch 385 BLAKE2B 7bb1b2f703e23972170be497829cb2b52d02cb3754a64e7922acb4cb50b9e7c797bfbb82b04aaa881ab8601e88a60bd34e0796abec83413dce789e17a910856a SHA512 d5770a48f70ce2337ea4332bf9eca8d21da732192cbdf449488646d968ad0a99bd871fd1eab8670b269b33c1e8f35c61dc6b5d61a3486bcdf09bd94aaa16d210 DIST gscan2pdf-2.13.2.tar.xz 507244 BLAKE2B 66ac15ddcf74ed2b04f231e24a663afa7494bd5df04ecb190b68b9822382e01953d97949174f3d6280fabc9d0a2ea1cc270c0aa333cf9992cfa2f58f645df156 SHA512 882b707b11df26310136ed72428eab6ec8e2c6cf34686675eee3b14181622f85d21be0e05cab411961f2a2441ad948e7b56c7fe24eecb558eae7a7ac6b4db9d1 +DIST gscan2pdf-2.13.4.tar.xz 510300 BLAKE2B 1a6721df5bc037abeed877a55ba5e4e1d3a6c559786a79f1196842819fa48ecf06715e29a7662db9a19e40b22d62fc69c5786213ae46b456e3252920dc2549af SHA512 19bd71b08c3be0a239e4018a50e1327b74b07cc64b03546e573ccbcbf89f3de3443ca9735740b070162c6c9f0adc7655fc81319fc082bd15a47f5e90baee6537 EBUILD gscan2pdf-2.13.2-r1.ebuild 3537 BLAKE2B 83a366fcdd9c4a8b4e40476f1fcd86df21e6e81f98f7af7a27eb49d0035e5454c404cc3207a75fce3a00f982e8c6451db9b9692deb7a8a5179dd1a5b446d2360 SHA512 455e2f6b8b2b7836571ae16a34b42e95d4df0da3345dc74f04afb0ee0d1664a0bade1d06a4001769ebbb3be24792cdff5cdd4213ae67f474a898b0596ba330c5 -EBUILD gscan2pdf-2.13.2.ebuild 3024 BLAKE2B ea848a2d53e265954eecd3df6e878c2669e65a8cbda53cd0526f84885c46bd1dcbb37fc0a99585293e6ebb75a4bfe6b37c62883131560ef2a5d446c390548fc8 SHA512 82d9fef80776516ac278b4636d16af52629f6904999370defe3dea7e23e8383ef04740218d0b4505d41e1e977caf9bf55741cb4320c9732e13ee927c7f38a59f +EBUILD gscan2pdf-2.13.4.ebuild 3123 BLAKE2B 1525e2c4131a2184a68ffe217ee4d55dda3ae171d35ba05a592c032449018c1dbd6e4d642c4d0904b2e77962aa4c0a32fc5f79d7a0fa426846cbcacb0a940b83 SHA512 8bab1e3b8e6f53bc0fa4da84f0cb6c7b021affdbd0c9a52cc0e4cda4d58abe9fe2406a54d60eb01f7e32b59622af31f390e05a3dfc251cbe649dcb3a76dd8725 MISC metadata.xml 470 BLAKE2B d9a9ad2f443b0bca02e6b8e91c96f22430543ee82fe8a1174739d4ad59225f73b975d31316fecd4dde6f26002ef6ba9fd39bf5d4adfd2bc82540d14e90d623a6 SHA512 ecd2fe9215c3a65760b8c101989772a73a7e9975dc38a1b11b0334cf6e1d001ccebfca1bc6d7631eb3b3e3e03d1736205563b0c836a2aea026fdfe552d72cbe0 diff --git a/media-gfx/gscan2pdf/files/gscan2pdf-2.13.4-t3722.patch b/media-gfx/gscan2pdf/files/gscan2pdf-2.13.4-t3722.patch new file mode 100644 index 000000000000..715dbdedf213 --- /dev/null +++ b/media-gfx/gscan2pdf/files/gscan2pdf-2.13.4-t3722.patch @@ -0,0 +1,11 @@ +--- a/t/3722_user_defined.t ++++ b/t/3722_user_defined.t +@@ -38,7 +38,7 @@ $slist->import_files( + }, + error_callback => sub { + my ( $uuid, $process, $msg ) = @_; +- is( $msg, 'error', ++ is( substr($msg, 0, 5), 'error', + 'user_defined caught error injected in queue' ); + }, + ); diff --git a/media-gfx/gscan2pdf/gscan2pdf-2.13.2.ebuild b/media-gfx/gscan2pdf/gscan2pdf-2.13.4.ebuild index 8b113cf10656..70b55f49a590 100644 --- a/media-gfx/gscan2pdf/gscan2pdf-2.13.2.ebuild +++ b/media-gfx/gscan2pdf/gscan2pdf-2.13.4.ebuild @@ -13,7 +13,7 @@ SRC_URI="https://downloads.sourceforge.net/${PN}/${P}.tar.xz" LICENSE="GPL-3" SLOT="0" -KEYWORDS="amd64 ~arm64 x86" +KEYWORDS="~amd64 ~arm64 ~x86" IUSE="test" RESTRICT="!test? ( test )" @@ -47,7 +47,7 @@ RDEPEND=" virtual/perl-threads-shared media-gfx/imagemagick[png,tiff,perl] media-gfx/sane-backends - media-libs/tiff" + >=media-libs/tiff-4.7.0" BDEPEND=" test? ( @@ -58,13 +58,18 @@ BDEPEND=" app-text/djvu[jpeg,tiff] app-text/poppler[utils] - app-text/tesseract[-opencl,osd(+),png,tiff] + app-text/tesseract[-opencl(-),png,tiff] app-text/unpaper media-gfx/imagemagick[djvu,jpeg,png,tiff,perl,postscript,truetype] media-gfx/sane-backends[sane_backends_test] media-gfx/sane-frontends )" +PATCHES=( + "${FILESDIR}/${PN}-2.13.2-t1161.patch" + "${FILESDIR}/${PN}-2.13.4-t3722.patch" +) + PERL_RM_FILES=( t/{90_MANIFEST,91_critic,99_pod,169_import_scan}.t ) mydoc="History" diff --git a/media-gfx/gtkimageview/Manifest b/media-gfx/gtkimageview/Manifest index 2924049dc4eb..2ddb3b5d4b35 100644 --- a/media-gfx/gtkimageview/Manifest +++ b/media-gfx/gtkimageview/Manifest @@ -1,4 +1,4 @@ AUX gtkimageview-1.6.4-slibtool-undefined-references.patch 1038 BLAKE2B 6026cf188eb0d230f139667eadd8926eedc14bddacdcc338798ccf59422e06b48727c0a5faf172acefe03a710965a56dbf515a9ec4ffb48ceff99d9dcce33059 SHA512 0d4b3baa96c4cf7ac79623a963c2d95226858a5e06ba5eab6658f7737d9e3501fe9dd44f2716691b2a67176907010de5faf5363a6aa1d9e0981eca83412c03f4 DIST gtkimageview-1.6.4.tar.gz 1158138 BLAKE2B b59abcbac71d4bd039bf9f3fc2f25f6590f91c4cc320cea90243a4889e020f1a54a3ca5d8a843f7482551ce8da6fafe6e3ce4fbc5a5e32fd6ceb4367b5abb9db SHA512 6378c640006e73aa1ffbf92eb9d4e42570707bc159f0a657b11f027d328088f5e89fc334de170de5ab1a39bed588b0b76f4633688a894cb7def16f1dea9f8e39 -EBUILD gtkimageview-1.6.4.ebuild 1303 BLAKE2B 6019b98b10fbc5ecfe3276adb9385776facc90bd09681eef0b47742a7383563d1cf051cc67c1c3c5474f0ba1080df7c287324d4ff5d41272b86dfd7c672f8ea0 SHA512 20f8719d3fccbda73e0fcb31e120e2866d5125bf9af2de002c473621f14a0cd447fb1d0e4d3c841c39f9dd08f7586d567f8c872fabc15f29c21c18ec0877f5f1 +EBUILD gtkimageview-1.6.4.ebuild 1297 BLAKE2B 6c3dc65021b9e105a6112e1a6d9d75a74f1d54c7cb36dbc0f9ec10b3f181e4c3e57b7a4d6d7391dc6f3ea3b9e47f0cca78475cc556a78567710bb62f3937f241 SHA512 187c94193157481721e8cf2934a2a5bd0f2f3ee3f09192cc2f5bafbb054c2599f7da9efac87a8bc0d466e5164bba0b1a740c7e8a680db879f70fdad8fbf932dd MISC metadata.xml 168 BLAKE2B 2e0e000b4c3b6ca04c12903fdbe278415c05a822623c52e9aa95cbbf3d50bcb1246b7edbda7d2f6b559af8950c6374e6e0a69b76319964cfe686bf50b0604a57 SHA512 4dcf45d1809e8390a2d8155c8ebfe0dd610203e392aeab0ccd8a10f42cc8532a4925eff32b35e7a6c35598a4efd288229034ec0732299dbd8cfa0acff705fed3 diff --git a/media-gfx/gtkimageview/gtkimageview-1.6.4.ebuild b/media-gfx/gtkimageview/gtkimageview-1.6.4.ebuild index 1499634d4318..920a0c51adbc 100644 --- a/media-gfx/gtkimageview/gtkimageview-1.6.4.ebuild +++ b/media-gfx/gtkimageview/gtkimageview-1.6.4.ebuild @@ -12,7 +12,7 @@ SRC_URI="mirror://gentoo/${P}.tar.gz" LICENSE="LGPL-2.1" SLOT="0" -KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~x64-solaris" +KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~x64-solaris" IUSE="examples static-libs" # tests are severely broken, bug #483952 diff --git a/media-gfx/hugin/Manifest b/media-gfx/hugin/Manifest index fa85394de34a..0e764af0c43c 100644 --- a/media-gfx/hugin/Manifest +++ b/media-gfx/hugin/Manifest @@ -1,5 +1,4 @@ -AUX boost-1.85-932315.patch 1078 BLAKE2B 3a721b7350c843d3ff3757dd0f9e3d2e384ba11f053a7e6f4238b4db50046241781921593886b809240d38f3d5e0e913d39601b6ffaa53f29a56422c9ff3e3b9 SHA512 d8f2b17318f5223929e19f40e1a834a8ccb6b5e7f792b5762c81d2084ea62f06ef1b1bf2d38dbf5b5ad613db5ef195229a3b8401ea8e66773925070c1cd6b085 -DIST hugin-2023.0.0.tar.bz2 10336322 BLAKE2B 5c35f67160d76f961e812a309a0c50bb012beac74dc888ce716e8d0e3da35dbb053ab4e5d5d043b3d3fee9885f2fc1afa962a73e794cd4df920527456d477e89 SHA512 f950afec9020972baa20931d5001cd479a9169a4eec0d459d830612f40177eea6a25e059047054b8e9679017687e4c2db9fb27f755a3d0b749e5055e2ff0adc8 -EBUILD hugin-2023.0.0-r1.ebuild 2193 BLAKE2B acc220e65485eba96191ed6459acda962b66eadb8010d543664fb151a0f56ada5fb8aab96584ab517405f8105b307813c60e0d82f7344a5b3d43b5de7acae201 SHA512 fd18cbc43f50dca29b9574ffa7d4d8dd5c513327269602810acafac34c4b1c48630d308c28538e6cfe73bbaff019c056cd2fc7ece1030e51a8f70ad1b46d9eaf -EBUILD hugin-9999.ebuild 2210 BLAKE2B 9961fb69cdbb3e4fd63e567ad6cc96dc8a81e608b3742733ad3cc0c19be059e591ae41f2f64751dfbb4482863b97546696ac7088f5b3d74c88ec434ee50bdc7e SHA512 900b2d13e4e756b57830af1c0c6f39b7cf9dd26afeaf5d8f3ceb06be567843f8ba30ae15af032a3a7486eb6be03b6838d96d2a90f0c70e2dfe4e52044dbfbb4f +DIST hugin-2024.0.1.tar.bz2 10352250 BLAKE2B 07b6ec632ad8525f58750a1894223102f354879e95c33cb4251d7aa237328a5180ffe6c7de0f3e23fc07dd8dd4f254cda7a9f452dc02b786bc867f15ca20b8f4 SHA512 4109f3be0b03d8b4205a79e0d76e18186278601d3e56f46271df1804db6f11f2e93fe1e1b68f2d7966c6d50ce58d4bf47e555e9cf8c34674315b2e89da36a722 +EBUILD hugin-2024.0.1.ebuild 2095 BLAKE2B 4c8a0dc3da7c05f6146d7768537a1fc8a244f7617ebd34a3a2f14adc6bd3c60dbc1915d3cc1166b72ea58d86710669dd35942b40393a7578cd0ac5038e2ce2d8 SHA512 c70381f1614ce40457176c6ac1bce79a6ff8b711d069f51ec60d7282e4f373a6c0ef9ebe8cb766b9fccf6c5dd7165e48d53da138bd811db32f499e9281f70a18 +EBUILD hugin-9999.ebuild 2041 BLAKE2B 68e51179017623a59c1c6dbbace836c6558c8f33fce09488b999965b2d02df3703767089a5c2fd2e7979135173982fb7af30e8570f8814219832a5e848d177c4 SHA512 40e3c43bafb40fcee31092197569a51ce5fa87b48e40a2ab676acc347ffdfec9bd818d3743fc7ee1c9bf2ee481018753f56659dce7c84527b9c71d86831b9a9d MISC metadata.xml 547 BLAKE2B ea55ca44dac1ccf74d4af96d42af1d4efac2f9823304b529b96aea364ec4a6f8430fd130f54c064766f0c34f9060ca076aa43de664e37177b41cc2deed0207bc SHA512 5012cb4a58bdc374f89d1a2e81e8321ff25f2de2f5682a2f8859137aa3339ce059e7823e26642f58b939e6c1d7f428356a4df5311fca1105320ebcb417129cba diff --git a/media-gfx/hugin/files/boost-1.85-932315.patch b/media-gfx/hugin/files/boost-1.85-932315.patch deleted file mode 100644 index e8fc5c2daa1f..000000000000 --- a/media-gfx/hugin/files/boost-1.85-932315.patch +++ /dev/null @@ -1,25 +0,0 @@ -# HG changeset patch -# User tmodes -# Date 1710260877 -3600 -# Tue Mar 12 17:27:57 2024 +0100 -# Node ID 4d081490b48aaff820cee7601b8624b37b652c06 -# Parent 4b55f17c4e72d6c2f8b4930e3367ff52e1741b45 -Fixed deprecated boost::filesystem::copy_option enum - -diff -r 4b55f17c4e72 -r 4d081490b48a src/hugin_base/hugin_utils/filesystem.h ---- a/src/hugin_base/hugin_utils/filesystem.h Tue Mar 12 17:27:29 2024 +0100 -+++ b/src/hugin_base/hugin_utils/filesystem.h Tue Mar 12 17:27:57 2024 +0100 -@@ -64,6 +64,12 @@ - #endif
- #include <boost/filesystem.hpp>
- namespace fs = boost::filesystem;
-- #define OVERWRITE_EXISTING boost::filesystem::copy_option::overwrite_if_exists
-+ #if BOOST_VERSION>=107400
-+ // in Boost 1.74 and later filesystem::copy_option is deprecated
-+ // use filesystem::copy_options instead
-+ #define OVERWRITE_EXISTING boost::filesystem::copy_options::overwrite_existing
-+ #else
-+ #define OVERWRITE_EXISTING boost::filesystem::copy_option::overwrite_if_exists
-+ #endif
- #endif
- #endif // _HUGIN_UTILS_FILESYSTEM_H
diff --git a/media-gfx/hugin/hugin-2023.0.0-r1.ebuild b/media-gfx/hugin/hugin-2024.0.1.ebuild index 40c4d46a93f6..a9919d40d6b9 100644 --- a/media-gfx/hugin/hugin-2023.0.0-r1.ebuild +++ b/media-gfx/hugin/hugin-2024.0.1.ebuild @@ -1,10 +1,10 @@ # Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 WX_GTK_VER="3.2-gtk3" -PYTHON_COMPAT=( python3_{10..12} ) +PYTHON_COMPAT=( python3_{10..13} python3_13t ) inherit python-single-r1 wxwidgets cmake xdg @@ -31,7 +31,7 @@ CDEPEND=" media-libs/libpng:= media-libs/openexr:= media-libs/tiff:= - >=media-libs/vigra-1.11.1-r5[openexr] + >=media-libs/vigra-1.11.1-r5[openexr,tiff] sci-libs/fftw:3.0= sci-libs/flann sys-libs/zlib @@ -54,17 +54,12 @@ REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" DOCS=( authors.txt README TODO ) -S=${WORKDIR}/${PN}-$(ver_cut 1-2).0 - pkg_setup() { use python && python-single-r1_pkg_setup setup-wxwidgets } src_prepare() { - # Fix build with boost >=1.85 - eapply "${FILESDIR}/boost-1.85-932315.patch" - sed -i \ -e "/COMMAND.*GZIP/d" \ -e "s/\.gz//g" \ diff --git a/media-gfx/hugin/hugin-9999.ebuild b/media-gfx/hugin/hugin-9999.ebuild index aec868af9672..db8dffa1c308 100644 --- a/media-gfx/hugin/hugin-9999.ebuild +++ b/media-gfx/hugin/hugin-9999.ebuild @@ -1,10 +1,10 @@ # Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 WX_GTK_VER="3.2-gtk3" -PYTHON_COMPAT=( python3_{9..12} ) +PYTHON_COMPAT=( python3_{10..13} ) inherit mercurial python-single-r1 wxwidgets cmake xdg @@ -14,6 +14,8 @@ SRC_URI="" EHG_REPO_URI="http://hg.code.sf.net/p/hugin/hugin" EHG_PROJECT="${PN}-${PN}" +S=${WORKDIR}/${PN}-$(ver_cut 1-2).0 + LICENSE="GPL-2+ BSD BSD-2 MIT wxWinLL-3 ZLIB FDL-1.2" SLOT="0" KEYWORDS="" @@ -56,8 +58,6 @@ REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" DOCS=( authors.txt README TODO ) -S=${WORKDIR}/${PN}-$(ver_cut 1-2).0 - pkg_setup() { use python && python-single-r1_pkg_setup setup-wxwidgets @@ -71,10 +71,6 @@ src_configure() { local mycmakeargs=( -DBUILD_HSI=$(usex python) -DENABLE_LAPACK=$(usex lapack) - # Temporary workaround for bug #833443. Can be dropped when - # we switch to wxgtk-3.2, but complications for that remain - # w/ egl+wayland. - -DUSE_GDKBACKEND_X11=on ) cmake_src_configure } diff --git a/media-gfx/hydrus/Manifest b/media-gfx/hydrus/Manifest index 202605d76f32..3b5565a3b56a 100644 --- a/media-gfx/hydrus/Manifest +++ b/media-gfx/hydrus/Manifest @@ -5,7 +5,7 @@ DIST hydrus-3500-mpeg-error.patch 1632 BLAKE2B 9cc969a3a2d476ea606f3f280ecd6e4cc DIST hydrus-565.tar.gz 46360280 BLAKE2B 7a9492db917b7f7d10fd92c668dff2206111b5734a707ea86e8d3f5c95359126da31e3bd6fdcea64c621527f5a30e608fdf8cd36b7b7b70185a37c3cc7483180 SHA512 442dde4c9e557c162b8a5cc23f22472d8c48d7717513a192875b413a59000897c05b2b050c16ad480cdbb18548485f51b5e8651e44cb2057fc8e6eb1b99e8f26 DIST hydrus-571.tar.gz 46371027 BLAKE2B b0ca6a4d7fddb79808340c03d6ba6291021af752be95144b8475a12450394f21e76c5fd80a2f6094f21d6f4af25db22f5f8d2eb79fd3494be609d6bdcdb455cb SHA512 3d6b6dec777332128858fcd62f52026fd7a4ab831f7cc0b3a3af76d52b6c6d1ff7b9687554aa5569988386e1eb0b33111172029e25f0acb9f36bb1cd70fcccbc DIST hydrus-test-fixes.patch 820 BLAKE2B 9d912868142cd3e7763241652e81172236094de6d0cf4df888d7203d34ed37b469c4829401a6e3bda945e3683db9f8e577ef21040cb5d57b0e6c01c2c619655b SHA512 a6a322a77638122fdd1f74ca57c23360aa8d58d97877e9517db9d185c11a8187e807b9478533a97a4654d58342b0541cc7eb89b83075bc4c38ceda0effe06ce0 -EBUILD hydrus-565-r1.ebuild 5014 BLAKE2B a11c28e40bc5d50d81c3540b5b9837b734d3b9c51a7b267b49c89ca8f6933f0dc0949478cdad4446748d06c37d9401d35b88b8815ef4149c9a1f76bbf9e5eb63 SHA512 ef1d178be78e508ec0ed7b8fabdf7d11d21973711b5335fa790f65e39a04c3242c59bf6f9b31fe4909583967171f3bd89e76d8a72b8926323f2c7ff52926e1bc -EBUILD hydrus-571.ebuild 5014 BLAKE2B a11c28e40bc5d50d81c3540b5b9837b734d3b9c51a7b267b49c89ca8f6933f0dc0949478cdad4446748d06c37d9401d35b88b8815ef4149c9a1f76bbf9e5eb63 SHA512 ef1d178be78e508ec0ed7b8fabdf7d11d21973711b5335fa790f65e39a04c3242c59bf6f9b31fe4909583967171f3bd89e76d8a72b8926323f2c7ff52926e1bc -EBUILD hydrus-9999.ebuild 4694 BLAKE2B 991178a1b0492857c85fecc15e840887a63c33f1b9ed6cd8f5b7c3bdf27dbf1b6a5b8e09af0a4f9541dda9ee9dadb26d5f1b8ec4e7d77d0b8a2a5c3c24354e0a SHA512 37d888d5423c395fb77652275e44a952bd22f6b36e44aea612a2ed7d373eb925e0a3d8a9376ba2978e0468def104b6c8465cdbcc2f8ba6acf758b40e449bfaae +EBUILD hydrus-565-r1.ebuild 4928 BLAKE2B 4bf5f72d5ff8fbf79ba7249846ec8d7e365b168d8b7dc30fcb54e8a5b24c82928706b90e98fefb089df29998f68071d5a1b4a3d6978dead5d1c4c1dbf657e057 SHA512 3a12f8b4a74e27c0c9953de4c30831b65f6563a769510e458c4d0aea33bdb9721cf235434eeaf4f4e4a1bed77056fea0d125ac45268425b29259a085375bf394 +EBUILD hydrus-571.ebuild 4928 BLAKE2B 4bf5f72d5ff8fbf79ba7249846ec8d7e365b168d8b7dc30fcb54e8a5b24c82928706b90e98fefb089df29998f68071d5a1b4a3d6978dead5d1c4c1dbf657e057 SHA512 3a12f8b4a74e27c0c9953de4c30831b65f6563a769510e458c4d0aea33bdb9721cf235434eeaf4f4e4a1bed77056fea0d125ac45268425b29259a085375bf394 +EBUILD hydrus-9999.ebuild 4606 BLAKE2B af36900f734554b9c11f153308439a6b28df87d920f4b88c04156b5b34e2197c0e69b1ac4673ec8dd8553f4de8d516b44cf4edad0ca7c05bea61448427ad36fb SHA512 ce2dc067582eaa4c43e0f0abed65c867b70f68350d86acb6b71deb1d6111484fe010eed0d96d9fa43d80da8ba2e90f1c343278a2686d071c821eac2ef307017a MISC metadata.xml 836 BLAKE2B 049faa70763ba176b6e4930abcdb5f4b4b87bd243759aba42dec32b9f2a199b3f2c33f0415ffdd1a392af3b461d939e633ec1f9333b0ff538f74d24306790fbe SHA512 0404c79e85e51eaba13fef930e695f168074e69734d3d8a604515f77196706bae9d36a2df9b3db0530c9f17b32881602509c7e22e7383c957a67e13c2a46e7bb diff --git a/media-gfx/hydrus/hydrus-565-r1.ebuild b/media-gfx/hydrus/hydrus-565-r1.ebuild index 07124a7dd9f9..dd1049f2921a 100644 --- a/media-gfx/hydrus/hydrus-565-r1.ebuild +++ b/media-gfx/hydrus/hydrus-565-r1.ebuild @@ -3,7 +3,7 @@ EAPI=8 -PYTHON_COMPAT=( python3_{9..11} ) +PYTHON_COMPAT=( python3_{10..11} ) PYTHON_REQ_USE="sqlite" DOCS_BUILDER=mkdocs @@ -61,8 +61,7 @@ RDEPEND=" dev-python/service-identity[${PYTHON_USEDEP}] dev-python/twisted[${PYTHON_USEDEP}] - dev-python/QtPy[widgets,gui,svg,multimedia,${PYTHON_USEDEP}] - || ( dev-python/QtPy[pyside2] dev-python/QtPy[pyqt6] ) + dev-python/qtpy[widgets,gui,svg,multimedia,${PYTHON_USEDEP}] media-libs/opencv[python,png,jpeg,${PYTHON_USEDEP}] media-video/ffmpeg @@ -150,6 +149,6 @@ src_install() { pkg_postinst() { optfeature "automatic port forwarding support" "net-libs/miniupnpc" optfeature "memory compression in the client" "dev-python/lz4" - optfeature "SOCKS proxy support" "dev-python/requests[socks5]" "dev-python/PySocks" - optfeature "bandwidth charts support" "dev-python/pyside2[charts]" "dev-python/pyside6[charts]" + optfeature "SOCKS proxy support" "dev-python/requests[socks5]" "dev-python/pysocks" + optfeature "bandwidth charts support" "dev-python/pyside[charts]" } diff --git a/media-gfx/hydrus/hydrus-571.ebuild b/media-gfx/hydrus/hydrus-571.ebuild index 07124a7dd9f9..dd1049f2921a 100644 --- a/media-gfx/hydrus/hydrus-571.ebuild +++ b/media-gfx/hydrus/hydrus-571.ebuild @@ -3,7 +3,7 @@ EAPI=8 -PYTHON_COMPAT=( python3_{9..11} ) +PYTHON_COMPAT=( python3_{10..11} ) PYTHON_REQ_USE="sqlite" DOCS_BUILDER=mkdocs @@ -61,8 +61,7 @@ RDEPEND=" dev-python/service-identity[${PYTHON_USEDEP}] dev-python/twisted[${PYTHON_USEDEP}] - dev-python/QtPy[widgets,gui,svg,multimedia,${PYTHON_USEDEP}] - || ( dev-python/QtPy[pyside2] dev-python/QtPy[pyqt6] ) + dev-python/qtpy[widgets,gui,svg,multimedia,${PYTHON_USEDEP}] media-libs/opencv[python,png,jpeg,${PYTHON_USEDEP}] media-video/ffmpeg @@ -150,6 +149,6 @@ src_install() { pkg_postinst() { optfeature "automatic port forwarding support" "net-libs/miniupnpc" optfeature "memory compression in the client" "dev-python/lz4" - optfeature "SOCKS proxy support" "dev-python/requests[socks5]" "dev-python/PySocks" - optfeature "bandwidth charts support" "dev-python/pyside2[charts]" "dev-python/pyside6[charts]" + optfeature "SOCKS proxy support" "dev-python/requests[socks5]" "dev-python/pysocks" + optfeature "bandwidth charts support" "dev-python/pyside[charts]" } diff --git a/media-gfx/hydrus/hydrus-9999.ebuild b/media-gfx/hydrus/hydrus-9999.ebuild index 6c1cb6719c2e..0a2743c1a8cf 100644 --- a/media-gfx/hydrus/hydrus-9999.ebuild +++ b/media-gfx/hydrus/hydrus-9999.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 -PYTHON_COMPAT=( python3_{9..11} ) +PYTHON_COMPAT=( python3_{10..11} ) PYTHON_REQ_USE="sqlite" DOCS_BUILDER=mkdocs @@ -57,8 +57,7 @@ RDEPEND=" dev-python/service-identity[${PYTHON_USEDEP}] dev-python/twisted[${PYTHON_USEDEP}] - dev-python/QtPy[widgets,gui,svg,multimedia,${PYTHON_USEDEP}] - || ( dev-python/QtPy[pyside2] dev-python/QtPy[pyside6] ) + dev-python/qtpy[widgets,gui,svg,multimedia,${PYTHON_USEDEP}] media-libs/opencv[python,png,jpeg,${PYTHON_USEDEP}] media-video/ffmpeg @@ -144,6 +143,6 @@ src_install() { pkg_postinst() { optfeature "automatic port forwarding support" "net-libs/miniupnpc" optfeature "memory compression in the client" "dev-python/lz4" - optfeature "SOCKS proxy support" "dev-python/requests[socks5]" "dev-python/PySocks" - optfeature "bandwidth charts support" "dev-python/pyside2[charts]" "dev-python/pyside6[charts]" + optfeature "SOCKS proxy support" "dev-python/requests[socks5]" "dev-python/pysocks" + optfeature "bandwidth charts support" "dev-python/pyside[charts]" } diff --git a/media-gfx/icon-slicer/Manifest b/media-gfx/icon-slicer/Manifest index 7100c95e063d..b4fe89a5946f 100644 --- a/media-gfx/icon-slicer/Manifest +++ b/media-gfx/icon-slicer/Manifest @@ -1,3 +1,3 @@ DIST icon-slicer-0.3.tar.gz 112429 BLAKE2B 4900e7d702bb45a209c165476aab5604f1623ea48081f742ce36115bde0a6a153aa5540c952013841a4853b827d1b718892006827105dd06c04e7fa892e9ee58 SHA512 09e46dca933a7c647b232d2ae8f589526e5f1cb43e07fe7056f0449cfbe812becc3a171c4f7c716bc65c0f95dc4de989a99b4f1b3566ac52e7ad67965f5be4ab -EBUILD icon-slicer-0.3-r1.ebuild 517 BLAKE2B 4045deaea03f00d32f36b0ef206e140a6a94b15abf1db8e4043d31f37675678a071d70f9eb4c5449ed2571b57ab1703036c48211b247ca6844c2fa634f8f6ea7 SHA512 fcb46942e409beb7b3f0ce2dc38a219db56223d4ba5c17fbf6b5ab3d286c5ed4424e839f5ffd938014505836fd1add691fee18ce5faa95a31db6705279e0dac2 +EBUILD icon-slicer-0.3-r1.ebuild 511 BLAKE2B 5ab6c06a441af77f22f028a5507d99f45b44d88b5b6d547a66d45edf78bcb50cb53610e5ec344acc3e629ba6f89105bf09683c417301c370e7087d1e6c3e2258 SHA512 cd2f637a1d9d5d1fdc8b5a07f7f973ec5d1c18a0c4c32a5c7eeca7a9c91f1c3849048beb385cc70a9642d30857155693533be1081d496392ab9d4c2b0973a52f MISC metadata.xml 167 BLAKE2B 868e3b584722eaacf68273db062bb773d8c7e5d7ab2b81ca7e8397643bf7cc106c3a1033594401c99c54f667bb45d6b73f9048fc335580bbd44b4589ad26a832 SHA512 30caadd1496c3b9969136038239a1d8e01f236726b4022c2d7e19ca7575f25f735e556835e581afbf44fbd3e4104c40f2b5ef5fa70118d75c881fdf871962d0a diff --git a/media-gfx/icon-slicer/icon-slicer-0.3-r1.ebuild b/media-gfx/icon-slicer/icon-slicer-0.3-r1.ebuild index 6d6308d93987..39d7ee7f434a 100644 --- a/media-gfx/icon-slicer/icon-slicer-0.3-r1.ebuild +++ b/media-gfx/icon-slicer/icon-slicer-0.3-r1.ebuild @@ -7,7 +7,7 @@ DESCRIPTION="Utility for generating icon themes and libXcursor cursor themes" HOMEPAGE="https://www.freedesktop.org/software/icon-slicer/" SRC_URI="https://www.freedesktop.org/software/icon-slicer/releases/${P}.tar.gz" -KEYWORDS="~alpha amd64 ~hppa ~ia64 ppc sparc x86" +KEYWORDS="~alpha amd64 ~hppa ppc sparc x86" LICENSE="MIT" SLOT="0" diff --git a/media-gfx/igal/Manifest b/media-gfx/igal/Manifest index 47fa0df433ed..e2fa7c711047 100644 --- a/media-gfx/igal/Manifest +++ b/media-gfx/igal/Manifest @@ -1,5 +1,5 @@ DIST igal-3.1.tar.gz 29372 BLAKE2B bb83a13b082d4d94b0ff186ef34e9c670b5a49ba74ccd40675db6820931132697b886e58db9da7e620322fdb29a59437acd817d6ef69ea4cebdaa408d1fbe567 SHA512 28f036a5450d05c2d795355f52e0e3f5720d94e5e9d82d4b6bd53ff8ce5ea08352e3ec85ddbcca754e986a06fd205b1667b102981484c783add4496c50c102fe DIST igal-3.2.tar.gz 29420 BLAKE2B bc0b3836d1a69f19d3f1896e80ed7b45f5737c21ff1f1a1728e9194fff44750adc2410de16bb50aab00ad52bbca4908f2361d1e9976216aa05b204208f588f99 SHA512 ba9cb6197f83f6af6724258ca9ba706b92c8593fd838e2bcc32c3b7498c8d8f5488abacd8198e07bac2d191f4a4a5ccd3110efb5070d56a3361b07d2a0f99621 EBUILD igal-3.1.ebuild 943 BLAKE2B 3c54eb77a65145f013af10a26a94664aa9561763fa1d47e0df97cf7b8e28003c9a4b1d29e6c676d5fb8df1e09bfae9ebf6cb507e2be4b94a5e5049829da306e7 SHA512 9fa947d7e95c8814576642e3d74c145cf2356a64caa6e73aa1a39a59a35781bd0213251bab207b8a1fe0af54f1a68c13147fe23448d7a8bfc0db0df42e848e48 -EBUILD igal-3.2.ebuild 1068 BLAKE2B c0d5955dcb9489a590badcd864a3f7040c667fc493a2b4f8e7117b60d4f841c722cd1ba8c3d8863c5267a02088e6fa4a0c26cd3c3e7bf50de0b5f8528e0ea740 SHA512 0afb03fb89c2f857337a462a554501c239d87b95c8d50c8afe8be3c8fd0e1a6454e4d3788460adb658daceea761d21b720c9102a5f812abeee3882ab334b07d4 +EBUILD igal-3.2.ebuild 1063 BLAKE2B b4f5e7533fbd6d333d0450bdc4bdfb0acb8be2fae8258120f1c760d1cad56b9a7e7c39e74d7765c9a696be6c87bd852b2439e858b26befc644ec0fa475b98b73 SHA512 6b680394af42258805dd37ce80dab2acc816ce743de7db69af086853d93159b5926a6d043f6f2d7c55e827e509df23fa4858a3fa82d0299152793887c14fcfdf MISC metadata.xml 500 BLAKE2B 50fa9ff754f053fa91db809979df2795378981c629800d1251c6dbb87df4fc8349bed04528a22e8002a611beb12133950901fdc7cd90dc3c7e784695e57aec6b SHA512 2960a7bf9f00a0da16ad7ee6ba5b049c7386c7c6abd44dc902944ca41d2e55e2022cdb95a694dd9015f67fc7315224f4b2ce14c75b4c802d99870933515ac2ff diff --git a/media-gfx/igal/igal-3.2.ebuild b/media-gfx/igal/igal-3.2.ebuild index f5a14a2df2cf..51a66ce9c503 100644 --- a/media-gfx/igal/igal-3.2.ebuild +++ b/media-gfx/igal/igal-3.2.ebuild @@ -10,7 +10,7 @@ S="${WORKDIR}/${PN}2-${PV}" LICENSE="GPL-2+" SLOT="0" -KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos" +KEYWORDS="~alpha amd64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos" RDEPEND=" dev-lang/perl diff --git a/media-gfx/imagemagick/Manifest b/media-gfx/imagemagick/Manifest index 3a1e3c173954..c41a670708b3 100644 --- a/media-gfx/imagemagick/Manifest +++ b/media-gfx/imagemagick/Manifest @@ -6,10 +6,12 @@ DIST ImageMagick-6.9.13-16.tar.xz 9613864 BLAKE2B ba6aa3cfd283e234c91e4e79a5410b DIST ImageMagick-6.9.13-3.tar.xz 9616088 BLAKE2B 9682bc15c42199c266cc8d9152099a96a4e66154b9c74cd7c72993c3d9edd8aa6123d64ae6852d520c9a346a27ee27120a4d2b4f7973c279006d7570666c4080 SHA512 3e061c8a7bec0c49db9e990858257ff092500430d382bcad0c76aaa8d531bd2c13b727a52f060fc6051a0217f41f254570d23a4301c15a7af547e13f148a4ca9 DIST ImageMagick-7.1.1-25.tar.xz 10557080 BLAKE2B 833c450c87e4a1650b6d71e2d8abeea74ad6f0afa7ec6f0cba9c5bb39044cf17c6b94959d65f121a18faa8ae6ad8b8921b48700f5b6269df9d9b0e7049b22e04 SHA512 0c4a34f6ada5310af248c2e569900604c50295ecdcbc1dd7e5c4375cc68277ec9cac6786db8fa42d3783c2c68468cf88e0413fa60e4ac40d06818bfd34dcf09e DIST ImageMagick-7.1.1-38.tar.xz 10778140 BLAKE2B f8abf53fefbebb9f6d6a28396aae1898ca52be22f56e60273ca68c1f40d5bbd1ac026542422f37ba489a9e46734fe36c5dd11fc0d819ed518b2371328f1bcf0b SHA512 636e2061c11c012e2607a53a893eb227569f3a4e04e331499722f2c84dc0db3eedae63525bd530972a639e3a262ab4f61383a21ca8603f8f81e5629a29f54b89 -EBUILD imagemagick-6.9.13.16.ebuild 6790 BLAKE2B 1dbe960e8a098b25a1d9639774c70ecf5c6ea5167f8517316a21063002318292fc006399d49e7df227ade3b2bab39e3abb1a9d746f68cb7aff422f9232dedba6 SHA512 700b93161b05dea379b18789e93bee5366e11e29413c6fbdf051e79d87af71e1d78c7de88a63004a200d7a613e082d37f8c2426d02328fd97a18d4088cc3069f -EBUILD imagemagick-6.9.13.3.ebuild 6782 BLAKE2B f2d6d70bd15dacf3607bf76d3525027641242918bd9f6881bb966aa43eab8f1ecd2cf504779da27a6130575c657000559c56c94bed570214ae7dbe85f2f59147 SHA512 0f2ae92200b8f81f118c7be15aa8d5c15e01b826d898bf5f45807f79c6bb871ae8b912d571a1836356fdcda1d8e27c8af487f52f040b587d64de7a0eb3d72b92 -EBUILD imagemagick-7.1.1.25.ebuild 7145 BLAKE2B c81405460970d982c4ce5e983ee806daf8a80813d8a32b57f7f5ad0474a1b0af35a2f4140c827a112ed024703cc910deedcf416e1dab1f5e5e69f9016b8f0e9e SHA512 07c6fea19d3e5eb6fa2195dc7cc570a7106c0be8600f3deb27546f8b0b2c112f8a6cda3cf7d96682a4719a8cf65a589c7d23b4be6216cb24e1d026818196af95 -EBUILD imagemagick-7.1.1.38-r1.ebuild 7170 BLAKE2B 97038ed984f29911877d1da30d4a9e2af4b8a3c2dcb7588b55cd1aa7131d6e8ba82af1e1be70afe8c7593ee1a1567908760c312e1feb82dde8d66a22a48f444a SHA512 f293d51e0eed0bedbcc28cdcbb89e7a46cbf34543e6c9a437dac0d7a1fab54f9eea630f6940b12fb5bb4e4a50932e03b7b424af7eb5a5e478f3c3a7a23b352f5 -EBUILD imagemagick-7.1.1.38.ebuild 7084 BLAKE2B 0c6f58b4677f35059c0415a249e4f609b1098177eae7e8737a607e2d8db3ef23fc6e3481523be8ed2202ba09278e573b25154a0af9108bbf32dcb745ab567b94 SHA512 34b3774f7ffd040d1deece573e088b378a62894483d4e7dfc3e219719d4a8feddc163e1aa71c83a49d7c4eaf1e85201a7b2fef3375a6996b891dab28608d99e0 -EBUILD imagemagick-9999.ebuild 7084 BLAKE2B 0c6f58b4677f35059c0415a249e4f609b1098177eae7e8737a607e2d8db3ef23fc6e3481523be8ed2202ba09278e573b25154a0af9108bbf32dcb745ab567b94 SHA512 34b3774f7ffd040d1deece573e088b378a62894483d4e7dfc3e219719d4a8feddc163e1aa71c83a49d7c4eaf1e85201a7b2fef3375a6996b891dab28608d99e0 +EBUILD imagemagick-6.9.13.16-r1.ebuild 6854 BLAKE2B 68c86acc94afe20ada44563c3856a235097b49e8c5b827319e9a3f784b79b7bd2713c68d1923fb621e652f8d962a0d478b6be189dc546f954266236ecbcd7ecb SHA512 85fee9ab8b687d8514f771f32a1615df8b035cc64abfaf32c1af95e506ffa0fadc85d2c2d298752b63eff47574c7e9b96906dc7ec650a24496bda8bc6b0d55b6 +EBUILD imagemagick-6.9.13.16.ebuild 6718 BLAKE2B ecc1e7d2bded003a329fe1daae5322f827925676f391ec71272af5f2dd00ff0ebaab71fb2789fc203d38cf26d0c2e519b3d0431e96944c73654ea89543e3fb1e SHA512 621e918cd576a605f1a8c717d5dcf30e8461fac70a5812e62e01079a643f441fd24e07c177e2b236a3698575b7f6f632192cd71521a07b07e621f10e2b2e08cb +EBUILD imagemagick-6.9.13.3.ebuild 6710 BLAKE2B 2ceb81bed8f3b292bf4e5a101193dd990fdeb93ff0ae5e825567c910de4b9db13211fbdc861b97e5e9cc399adf47ee6fc3bb776c2132d5c4b2de9e2be47dab08 SHA512 66a774c5598dca00ef91713274dabbb1d78a96ed222f76f1bbce5069ad65b456e4bb24d0092aa643fa22e8871aa473bcd8bdc222de6d358eda595c6b9bb8c6ef +EBUILD imagemagick-7.1.1.25-r1.ebuild 7167 BLAKE2B 1bf20f4f7d8d47a03e22373418cacbc1e8525c03b34c1c49c33726ff089fac5d3c35c73cfd0873896488f922b1ad727413fd5fc7eec537275a74ebba2656f196 SHA512 d2447c90986196ccdc113893498f747baeb7f5ad26ba643900a95f4e135f9caf2c6abdb46cda0d10ba0aaefbdb3bb9fffa3393a70b73e7f59833d90fc44a8ca6 +EBUILD imagemagick-7.1.1.38-r1.ebuild 7063 BLAKE2B 3a662cc120cdbff5078933dbc6556cead0225793c024848133020cec573af2c7a0735d5ea1cbbe41f03e6e6f14f098ab936013ab7b82a048d745a89264e2512d SHA512 2e4ff62cc25ed913d5e83d17c1f1decd2c084111c91fd5a200db5a2d51d5080e25fac210f00acb73fef051a5b1b2dbc00a119c535141d5e6a4fcb0942c6fb568 +EBUILD imagemagick-7.1.1.38-r2.ebuild 7185 BLAKE2B 90e272174124311aad08ea51906ac753c8fb7c5ed8bff581a79045e4f7bc9b48b0482a240c9e10b68b39edc735cdc9ff78ddbfbc9e0dbefed0938a900e23ae51 SHA512 e11e7a850bc40ac16708b31226c3f364e55520cf46383851071bbd052198169f9ab8206855f23fad57a451ca5d9ac63b932caec92fb72fe7e9e97f0cd2d38651 +EBUILD imagemagick-7.1.1.38.ebuild 6977 BLAKE2B ce90a986e660fb91f08a6c2ea6fe9d02c241dfbdb9c58803f08a45d09e8d4bc4a384482be28863b702c4e3539cabc60cf7c9308abc2db0545ec158b84cbbd8fe SHA512 fa17aa18d87a84eb1812ef6dc64f81b84c1b469261912e26cd781076301ea626306081dbab1210053a7a7472772d38667985f6719b56e630dcc649b72e86e514 +EBUILD imagemagick-9999.ebuild 7106 BLAKE2B 80846bc37b471d850299ee040374be8d481ee387abbad6b5c81728691e423fed1b06b6500d7b78e52c446fed5c1055c4980365f476acf63faa0ae5046cfe7f1c SHA512 d89b18209c05a6e2ab1f5708eb3bead90efedacaff50ddc80c7f4b7bbfb53052613419297cc809bb4f5393412aedf10e264b57f9bf7b404dd91504e913711641 MISC metadata.xml 1140 BLAKE2B c1eee3f7686c72c0603f94e19953e81f3467bdc6192d06c61c9c7da67a39e64d81603efa0dce5fe647a47a9c8bd1568609944b7fa1c6c2547ca3badcdde7a0d4 SHA512 d89de96e346c6d46921b5b39a785ce7e584a043f7e8bc73dd8a727c5cc102b717b4226cef04a0cd8c41a97bdbe43d0eda3cacbf5e0db65b741b0c6dd577eb235 diff --git a/media-gfx/imagemagick/imagemagick-6.9.13.16-r1.ebuild b/media-gfx/imagemagick/imagemagick-6.9.13.16-r1.ebuild new file mode 100644 index 000000000000..080fc19e0b33 --- /dev/null +++ b/media-gfx/imagemagick/imagemagick-6.9.13.16-r1.ebuild @@ -0,0 +1,245 @@ +# Copyright 1999-2025 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +QA_PKGCONFIG_VERSION=$(ver_cut 1-3) +inherit flag-o-matic libtool perl-functions toolchain-funcs + +if [[ ${PV} == 9999 ]] ; then + EGIT_REPO_URI="https://github.com/ImageMagick/ImageMagick6.git" + inherit git-r3 + MY_P="imagemagick-9999" +else + MY_PV="$(ver_rs 3 '-')" + MY_P="ImageMagick-${MY_PV}" + SRC_URI="mirror://imagemagick/${MY_P}.tar.xz" + KEYWORDS="~alpha amd64 arm arm64 ~hppa ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris" +fi + +S="${WORKDIR}/${MY_P}" + +DESCRIPTION="A collection of tools and libraries for many image formats" +HOMEPAGE="https://imagemagick.org/index.php" + +LICENSE="imagemagick" +# Please check this on bumps, SONAME is often not updated! Use abidiff on old/new. +# If ABI is broken, change the bit after the '-'. +SLOT="0/$(ver_cut 1-3)-0" +IUSE="bzip2 corefonts +cxx djvu fftw fontconfig fpx graphviz hardened hdri heif jbig jpeg jpeg2k lcms lqr lzma opencl openexr openmp pango perl +png postscript q32 q8 raw static-libs svg test tiff truetype webp wmf X xml zlib" + +REQUIRED_USE=" + corefonts? ( truetype ) + svg? ( xml ) + test? ( corefonts ) +" + +RESTRICT="!test? ( test )" + +RDEPEND=" + !media-gfx/graphicsmagick[imagemagick] + dev-libs/libltdl + bzip2? ( app-arch/bzip2 ) + corefonts? ( media-fonts/corefonts ) + djvu? ( app-text/djvu ) + fftw? ( sci-libs/fftw:3.0 ) + fontconfig? ( media-libs/fontconfig ) + fpx? ( >=media-libs/libfpx-1.3.0-r1 ) + graphviz? ( media-gfx/graphviz ) + heif? ( media-libs/libheif:=[x265] ) + jbig? ( >=media-libs/jbigkit-2:= ) + jpeg? ( media-libs/libjpeg-turbo:= ) + jpeg2k? ( >=media-libs/openjpeg-2.1.0:2 ) + lcms? ( media-libs/lcms:2= ) + lqr? ( media-libs/liblqr ) + opencl? ( virtual/opencl ) + openexr? ( media-libs/openexr:0= ) + pango? ( x11-libs/pango ) + perl? ( >=dev-lang/perl-5.8.8:= ) + png? ( media-libs/libpng:= ) + postscript? ( app-text/ghostscript-gpl:= ) + raw? ( media-libs/libraw:= ) + svg? ( + gnome-base/librsvg + media-gfx/potrace + ) + tiff? ( media-libs/tiff:= ) + truetype? ( + media-fonts/urw-fonts + >=media-libs/freetype-2 + ) + webp? ( media-libs/libwebp:= ) + wmf? ( media-libs/libwmf ) + X? ( + x11-libs/libICE + x11-libs/libSM + x11-libs/libXext + x11-libs/libXt + ) + xml? ( dev-libs/libxml2 ) + lzma? ( app-arch/xz-utils ) + zlib? ( sys-libs/zlib:= ) +" +DEPEND=" + ${RDEPEND} + X? ( x11-base/xorg-proto ) +" +BDEPEND="virtual/pkgconfig" + +pkg_pretend() { + [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp +} + +pkg_setup() { + [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp +} + +src_prepare() { + default + + # for Darwin modules + elibtoolize + + # For testsuite, see bug #500580#c3 + local ati_cards mesa_cards nvidia_cards render_cards + shopt -s nullglob + ati_cards=$(echo -n /dev/ati/card*) + for card in "${ati_cards[@]}" ; do + addpredict "${card}" + done + mesa_cards=$(echo -n /dev/dri/card*) + for card in "${mesa_cards[@]}" ; do + addpredict "${card}" + done + nvidia_cards=$(echo -n /dev/nvidia*) + for card in "${nvidia_cards[@]}" ; do + addpredict "${card}" + done + render_cards=$(echo -n /dev/dri/renderD128*) + for card in "${render_cards[@]}" ; do + addpredict "${card}" + done + shopt -u nullglob + addpredict /dev/nvidiactl +} + +src_configure() { + local depth=16 + use q8 && depth=8 + use q32 && depth=32 + + use perl && perl_check_env + + [[ ${CHOST} == *-solaris* ]] && append-ldflags -lnsl -lsocket + + # Workaround for bug #941208 (gcc PR117100) + tc-is-gcc && [[ $(gcc-major-version) == 13 ]] && append-flags -fno-unswitch-loops + + local myeconfargs=( + $(use_enable static-libs static) + $(use_enable hdri) + $(use_enable opencl) + $(use_enable openmp) + --with-threads + --with-modules + --with-quantum-depth=${depth} + $(use_with cxx magick-plus-plus) + $(use_with perl) + --with-perl-options='INSTALLDIRS=vendor' + --with-gs-font-dir="${EPREFIX}"/usr/share/fonts/urw-fonts + $(use_with bzip2 bzlib) + $(use_with X x) + $(use_with zlib) + --without-autotrace + $(use_with postscript dps) + $(use_with djvu) + --with-dejavu-font-dir="${EPREFIX}"/usr/share/fonts/dejavu + $(use_with fftw) + $(use_with fpx) + $(use_with fontconfig) + $(use_with truetype freetype) + $(use_with postscript gslib) + $(use_with graphviz gvc) + $(use_with heif heic) + $(use_with jbig) + $(use_with jpeg) + $(use_with jpeg2k openjp2) + $(use_with lcms) + $(use_with lqr) + $(use_with lzma) + $(use_with openexr) + $(use_with pango) + $(use_with png) + $(use_with raw) + $(use_with svg rsvg) + $(use_with tiff) + $(use_with webp) + $(use_with corefonts windows-font-dir "${EPREFIX}"/usr/share/fonts/corefonts) + $(use_with wmf) + $(use_with xml) + --with-gcc-arch=no-automagic + + # Default upstream (as of 6.9.12.96/7.1.1.18 anyway) is open + # For now, let's make USE=hardened do 'limited', and have USE=-hardened + # reflect the upstream default of 'open'. + # + # We might change it to 'secure' and 'limited' at some point. + # See also bug #716674. + --with-security-policy=$(usex hardened limited open) + ) + + CONFIG_SHELL="${BROOT}"/bin/bash econf "${myeconfargs[@]}" +} + +src_test() { + # Install default (unrestricted) policy in ${HOME} for test suite, bug #664238 + local _im_local_config_home="${HOME}/.config/ImageMagick" + mkdir -p "${_im_local_config_home}" || \ + die "Failed to create IM config dir in '${_im_local_config_home}'" + cp "${FILESDIR}"/policy.test.xml "${_im_local_config_home}/policy.xml" || \ + die "Failed to install default blank policy.xml in '${_im_local_config_home}'" + + local im_command= IM_COMMANDS=() + IM_COMMANDS+=( "identify -version | grep -q -- \"${MY_PV}\"" ) # Verify that we are using version we just built + IM_COMMANDS+=( "identify -list policy" ) # Verify that policy.xml is used + IM_COMMANDS+=( "emake check" ) # Run tests + + for im_command in "${IM_COMMANDS[@]}"; do + eval "${S}"/magick.sh \ + ${im_command} || \ + die "Failed to run \"${im_command}\"" + done +} + +src_install() { + # Ensure documentation installation files and paths with each release! + emake \ + DESTDIR="${D}" \ + DOCUMENTATION_PATH="${EPREFIX}"/usr/share/doc/${PF}/html \ + install + + rm -f "${ED}"/usr/share/doc/${PF}/html/{ChangeLog,LICENSE,NEWS.txt} + dodoc {AUTHORS,README}.txt + + if use perl; then + find "${ED}" -type f -name perllocal.pod -exec rm -f {} + + find "${ED}" -depth -mindepth 1 -type d -empty -exec rm -rf {} + + fi + + find "${ED}" -name '*.la' -exec sed -i -e "/^dependency_libs/s:=.*:='':" {} + + # .la files in parent are not needed, keep plugin .la files + find "${ED}"/usr/$(get_libdir)/ -maxdepth 1 -name "*.la" -delete || die + + if use opencl; then + cat <<-EOF > "${T}"/99${PN} + SANDBOX_PREDICT="/dev/nvidiactl:/dev/nvidia-uvm:/dev/ati/card:/dev/dri/card:/dev/dri/card0:/dev/dri/renderD128" + EOF + + insinto /etc/sandbox.d + # bug #472766 + doins "${T}"/99${PN} + fi + + insinto /usr/share/${PN} + doins config/*icm +} diff --git a/media-gfx/imagemagick/imagemagick-6.9.13.16.ebuild b/media-gfx/imagemagick/imagemagick-6.9.13.16.ebuild index 1954fe32d565..8e26cfb2d9a6 100644 --- a/media-gfx/imagemagick/imagemagick-6.9.13.16.ebuild +++ b/media-gfx/imagemagick/imagemagick-6.9.13.16.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,13 +14,13 @@ else MY_PV="$(ver_rs 3 '-')" MY_P="ImageMagick-${MY_PV}" SRC_URI="mirror://imagemagick/${MY_P}.tar.xz" - KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris" + KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris" fi S="${WORKDIR}/${MY_P}" DESCRIPTION="A collection of tools and libraries for many image formats" -HOMEPAGE="https://www.imagemagick.org/" +HOMEPAGE="https://imagemagick.org/index.php" LICENSE="imagemagick" # Please check this on bumps, SONAME is often not updated! Use abidiff on old/new. @@ -103,22 +103,22 @@ src_prepare() { # For testsuite, see bug #500580#c3 local ati_cards mesa_cards nvidia_cards render_cards shopt -s nullglob - ati_cards=$(echo -n /dev/ati/card* | sed 's/ /:/g') - if test -n "${ati_cards}"; then - addpredict "${ati_cards}" - fi - mesa_cards=$(echo -n /dev/dri/card* | sed 's/ /:/g') - if test -n "${mesa_cards}"; then - addpredict "${mesa_cards}" - fi - nvidia_cards=$(echo -n /dev/nvidia* | sed 's/ /:/g') - if test -n "${nvidia_cards}"; then - addpredict "${nvidia_cards}" - fi - render_cards=$(echo -n /dev/dri/renderD128* | sed 's/ /:/g') - if test -n "${render_cards}"; then - addpredict "${render_cards}" - fi + ati_cards=$(echo -n /dev/ati/card*) + for card in "${ati_cards[@]}" ; do + addpredict "${card}" + done + mesa_cards=$(echo -n /dev/dri/card*) + for card in "${mesa_cards[@]}" ; do + addpredict "${card}" + done + nvidia_cards=$(echo -n /dev/nvidia*) + for card in "${nvidia_cards[@]}" ; do + addpredict "${card}" + done + render_cards=$(echo -n /dev/dri/renderD128*) + for card in "${render_cards[@]}" ; do + addpredict "${card}" + done shopt -u nullglob addpredict /dev/nvidiactl } diff --git a/media-gfx/imagemagick/imagemagick-6.9.13.3.ebuild b/media-gfx/imagemagick/imagemagick-6.9.13.3.ebuild index 3ee01ea4f7df..81adc8b3bf07 100644 --- a/media-gfx/imagemagick/imagemagick-6.9.13.3.ebuild +++ b/media-gfx/imagemagick/imagemagick-6.9.13.3.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,13 +14,13 @@ else MY_PV="$(ver_rs 3 '-')" MY_P="ImageMagick-${MY_PV}" SRC_URI="mirror://imagemagick/${MY_P}.tar.xz" - KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris" + KEYWORDS="~alpha amd64 arm arm64 hppa ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris" fi S="${WORKDIR}/${MY_P}" DESCRIPTION="A collection of tools and libraries for many image formats" -HOMEPAGE="https://www.imagemagick.org/" +HOMEPAGE="https://imagemagick.org/index.php" LICENSE="imagemagick" # Please check this on bumps, SONAME is often not updated! Use abidiff on old/new. @@ -103,22 +103,22 @@ src_prepare() { # For testsuite, see bug #500580#c3 local ati_cards mesa_cards nvidia_cards render_cards shopt -s nullglob - ati_cards=$(echo -n /dev/ati/card* | sed 's/ /:/g') - if test -n "${ati_cards}"; then - addpredict "${ati_cards}" - fi - mesa_cards=$(echo -n /dev/dri/card* | sed 's/ /:/g') - if test -n "${mesa_cards}"; then - addpredict "${mesa_cards}" - fi - nvidia_cards=$(echo -n /dev/nvidia* | sed 's/ /:/g') - if test -n "${nvidia_cards}"; then - addpredict "${nvidia_cards}" - fi - render_cards=$(echo -n /dev/dri/renderD128* | sed 's/ /:/g') - if test -n "${render_cards}"; then - addpredict "${render_cards}" - fi + ati_cards=$(echo -n /dev/ati/card*) + for card in "${ati_cards[@]}" ; do + addpredict "${card}" + done + mesa_cards=$(echo -n /dev/dri/card*) + for card in "${mesa_cards[@]}" ; do + addpredict "${card}" + done + nvidia_cards=$(echo -n /dev/nvidia*) + for card in "${nvidia_cards[@]}" ; do + addpredict "${card}" + done + render_cards=$(echo -n /dev/dri/renderD128*) + for card in "${render_cards[@]}" ; do + addpredict "${card}" + done shopt -u nullglob addpredict /dev/nvidiactl } diff --git a/media-gfx/imagemagick/imagemagick-7.1.1.25.ebuild b/media-gfx/imagemagick/imagemagick-7.1.1.25-r1.ebuild index 328808618479..a9b0dde7fb7c 100644 --- a/media-gfx/imagemagick/imagemagick-7.1.1.25.ebuild +++ b/media-gfx/imagemagick/imagemagick-7.1.1.25-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 @@ -14,13 +14,13 @@ else MY_PV="$(ver_rs 3 '-')" MY_P="ImageMagick-${MY_PV}" SRC_URI="mirror://imagemagick/${MY_P}.tar.xz" - KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris" + KEYWORDS="~alpha amd64 arm arm64 hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris" fi S="${WORKDIR}/${MY_P}" DESCRIPTION="A collection of tools and libraries for many image formats" -HOMEPAGE="https://www.imagemagick.org/" +HOMEPAGE="https://imagemagick.org/index.php" LICENSE="imagemagick" # Please check this on bumps, SONAME is often not updated! Use abidiff on old/new. @@ -106,25 +106,25 @@ src_prepare() { #elibtoolize # for Darwin modules eautoreconf - # For testsuite, see https://bugs.gentoo.org/show_bug.cgi?id=500580#c3 + # For testsuite, see bug #500580#c3 local ati_cards mesa_cards nvidia_cards render_cards shopt -s nullglob - ati_cards=$(echo -n /dev/ati/card* | sed 's/ /:/g') - if test -n "${ati_cards}"; then - addpredict "${ati_cards}" - fi - mesa_cards=$(echo -n /dev/dri/card* | sed 's/ /:/g') - if test -n "${mesa_cards}"; then - addpredict "${mesa_cards}" - fi - nvidia_cards=$(echo -n /dev/nvidia* | sed 's/ /:/g') - if test -n "${nvidia_cards}"; then - addpredict "${nvidia_cards}" - fi - render_cards=$(echo -n /dev/dri/renderD128* | sed 's/ /:/g') - if test -n "${render_cards}"; then - addpredict "${render_cards}" - fi + ati_cards=$(echo -n /dev/ati/card*) + for card in "${ati_cards[@]}" ; do + addpredict "${card}" + done + mesa_cards=$(echo -n /dev/dri/card*) + for card in "${mesa_cards[@]}" ; do + addpredict "${card}" + done + nvidia_cards=$(echo -n /dev/nvidia*) + for card in "${nvidia_cards[@]}" ; do + addpredict "${card}" + done + render_cards=$(echo -n /dev/dri/renderD128*) + for card in "${render_cards[@]}" ; do + addpredict "${card}" + done shopt -u nullglob addpredict /dev/nvidiactl } @@ -138,6 +138,9 @@ src_configure() { [[ ${CHOST} == *-solaris* ]] && append-ldflags -lnsl -lsocket + # Workaround for bug #941208 (gcc PR117100) + tc-is-gcc && [[ $(gcc-major-version) == 13 ]] && append-flags -fno-unswitch-loops + local myeconfargs=( $(use_enable static-libs static) $(use_enable hdri) diff --git a/media-gfx/imagemagick/imagemagick-7.1.1.38-r1.ebuild b/media-gfx/imagemagick/imagemagick-7.1.1.38-r1.ebuild index 16ef267001e2..4cb8cbb1251a 100644 --- a/media-gfx/imagemagick/imagemagick-7.1.1.38-r1.ebuild +++ b/media-gfx/imagemagick/imagemagick-7.1.1.38-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 @@ -14,13 +14,13 @@ else MY_PV="$(ver_rs 3 '-')" MY_P="ImageMagick-${MY_PV}" SRC_URI="mirror://imagemagick/${MY_P}.tar.xz" - KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris" + KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris" fi S="${WORKDIR}/${MY_P}" DESCRIPTION="A collection of tools and libraries for many image formats" -HOMEPAGE="https://www.imagemagick.org/" +HOMEPAGE="https://imagemagick.org/index.php" LICENSE="imagemagick" # Please check this on bumps, SONAME is often not updated! Use abidiff on old/new. @@ -108,25 +108,25 @@ src_prepare() { #elibtoolize # for Darwin modules eautoreconf - # For testsuite, see https://bugs.gentoo.org/show_bug.cgi?id=500580#c3 + # For testsuite, see bug #500580#c3 local ati_cards mesa_cards nvidia_cards render_cards shopt -s nullglob - ati_cards=$(echo -n /dev/ati/card* | sed 's/ /:/g') - if test -n "${ati_cards}"; then - addpredict "${ati_cards}" - fi - mesa_cards=$(echo -n /dev/dri/card* | sed 's/ /:/g') - if test -n "${mesa_cards}"; then - addpredict "${mesa_cards}" - fi - nvidia_cards=$(echo -n /dev/nvidia* | sed 's/ /:/g') - if test -n "${nvidia_cards}"; then - addpredict "${nvidia_cards}" - fi - render_cards=$(echo -n /dev/dri/renderD128* | sed 's/ /:/g') - if test -n "${render_cards}"; then - addpredict "${render_cards}" - fi + ati_cards=$(echo -n /dev/ati/card*) + for card in "${ati_cards[@]}" ; do + addpredict "${card}" + done + mesa_cards=$(echo -n /dev/dri/card*) + for card in "${mesa_cards[@]}" ; do + addpredict "${card}" + done + nvidia_cards=$(echo -n /dev/nvidia*) + for card in "${nvidia_cards[@]}" ; do + addpredict "${card}" + done + render_cards=$(echo -n /dev/dri/renderD128*) + for card in "${render_cards[@]}" ; do + addpredict "${card}" + done shopt -u nullglob addpredict /dev/nvidiactl } diff --git a/media-gfx/imagemagick/imagemagick-7.1.1.38-r2.ebuild b/media-gfx/imagemagick/imagemagick-7.1.1.38-r2.ebuild new file mode 100644 index 000000000000..16d4e4c94e35 --- /dev/null +++ b/media-gfx/imagemagick/imagemagick-7.1.1.38-r2.ebuild @@ -0,0 +1,257 @@ +# Copyright 1999-2025 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +QA_PKGCONFIG_VERSION=$(ver_cut 1-3) +inherit autotools flag-o-matic perl-functions toolchain-funcs + +if [[ ${PV} == 9999 ]] ; then + EGIT_REPO_URI="https://github.com/ImageMagick/ImageMagick.git" + inherit git-r3 + MY_P="imagemagick-9999" +else + MY_PV="$(ver_rs 3 '-')" + MY_P="ImageMagick-${MY_PV}" + SRC_URI="mirror://imagemagick/${MY_P}.tar.xz" + KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris" +fi + +S="${WORKDIR}/${MY_P}" + +DESCRIPTION="A collection of tools and libraries for many image formats" +HOMEPAGE="https://imagemagick.org/index.php" + +LICENSE="imagemagick" +# Please check this on bumps, SONAME is often not updated! Use abidiff on old/new. +# If ABI is broken, change the bit after the '-'. +SLOT="0/$(ver_cut 1-3)-18" +IUSE="bzip2 corefonts +cxx djvu fftw fontconfig fpx graphviz hardened hdri heif jbig jpeg jpeg2k jpegxl lcms lqr lzma opencl openexr openmp pango perl +png postscript q32 q8 raw static-libs svg test tiff truetype webp wmf X xml zip zlib" + +REQUIRED_USE=" + corefonts? ( truetype ) + svg? ( xml ) + test? ( corefonts ) +" + +RESTRICT="!test? ( test )" + +RDEPEND=" + !media-gfx/graphicsmagick[imagemagick] + dev-libs/libltdl + bzip2? ( app-arch/bzip2 ) + corefonts? ( media-fonts/corefonts ) + djvu? ( app-text/djvu ) + fftw? ( sci-libs/fftw:3.0 ) + fontconfig? ( media-libs/fontconfig ) + fpx? ( >=media-libs/libfpx-1.3.0-r1 ) + graphviz? ( media-gfx/graphviz ) + heif? ( media-libs/libheif:=[x265] ) + jbig? ( >=media-libs/jbigkit-2:= ) + jpeg? ( media-libs/libjpeg-turbo:= ) + jpeg2k? ( >=media-libs/openjpeg-2.1.0:2 ) + jpegxl? ( >=media-libs/libjxl-0.6:= ) + lcms? ( media-libs/lcms:2= ) + lqr? ( media-libs/liblqr ) + opencl? ( virtual/opencl ) + openexr? ( media-libs/openexr:0= ) + pango? ( x11-libs/pango ) + perl? ( >=dev-lang/perl-5.8.8:= ) + png? ( media-libs/libpng:= ) + postscript? ( app-text/ghostscript-gpl:= ) + raw? ( media-libs/libraw:= ) + svg? ( + gnome-base/librsvg + media-gfx/potrace + ) + tiff? ( media-libs/tiff:= ) + truetype? ( + media-fonts/urw-fonts + >=media-libs/freetype-2 + ) + webp? ( media-libs/libwebp:= ) + wmf? ( media-libs/libwmf ) + X? ( + x11-libs/libICE + x11-libs/libSM + x11-libs/libXext + x11-libs/libXt + ) + xml? ( dev-libs/libxml2 ) + lzma? ( app-arch/xz-utils ) + zip? ( dev-libs/libzip:= ) + zlib? ( sys-libs/zlib:= ) +" +DEPEND=" + ${RDEPEND} + X? ( x11-base/xorg-proto ) +" +BDEPEND="virtual/pkgconfig" + +PATCHES=( + "${FILESDIR}/${PN}-7.1.1.38-perl-1.patch" + "${FILESDIR}/${PN}-7.1.1.38-perl-2.patch" + "${FILESDIR}/${PN}-9999-nocputuning.patch" +) + +pkg_pretend() { + [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp +} + +pkg_setup() { + [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp +} + +src_prepare() { + default + + #elibtoolize # for Darwin modules + eautoreconf + + # For testsuite, see bug #500580#c3 + local ati_cards mesa_cards nvidia_cards render_cards + shopt -s nullglob + ati_cards=$(echo -n /dev/ati/card*) + for card in "${ati_cards[@]}" ; do + addpredict "${card}" + done + mesa_cards=$(echo -n /dev/dri/card*) + for card in "${mesa_cards[@]}" ; do + addpredict "${card}" + done + nvidia_cards=$(echo -n /dev/nvidia*) + for card in "${nvidia_cards[@]}" ; do + addpredict "${card}" + done + render_cards=$(echo -n /dev/dri/renderD128*) + for card in "${render_cards[@]}" ; do + addpredict "${card}" + done + shopt -u nullglob + addpredict /dev/nvidiactl +} + +src_configure() { + local depth=16 + use q8 && depth=8 + use q32 && depth=32 + + use perl && perl_check_env + + [[ ${CHOST} == *-solaris* ]] && append-ldflags -lnsl -lsocket + + # Workaround for bug #941208 (gcc PR117100) + tc-is-gcc && [[ $(gcc-major-version) == 13 ]] && append-flags -fno-unswitch-loops + + local myeconfargs=( + $(use_enable static-libs static) + $(use_enable hdri) + $(use_enable opencl) + $(use_enable openmp) + --with-threads + --with-modules + --with-quantum-depth=${depth} + $(use_with cxx magick-plus-plus) + $(use_with perl) + --with-perl-options='INSTALLDIRS=vendor' + --with-gs-font-dir="${EPREFIX}"/usr/share/fonts/urw-fonts + $(use_with bzip2 bzlib) + $(use_with X x) + $(use_with zip) + $(use_with zlib) + --without-autotrace + --with-uhdr + $(use_with postscript dps) + $(use_with djvu) + --with-dejavu-font-dir="${EPREFIX}"/usr/share/fonts/dejavu + $(use_with fftw) + $(use_with fpx) + $(use_with fontconfig) + $(use_with truetype freetype) + $(use_with postscript gslib) + $(use_with graphviz gvc) + $(use_with heif heic) + $(use_with jbig) + $(use_with jpeg) + $(use_with jpeg2k openjp2) + $(use_with jpegxl jxl) + $(use_with lcms) + $(use_with lqr) + $(use_with lzma) + $(use_with openexr) + $(use_with pango) + $(use_with png) + $(use_with raw) + $(use_with svg rsvg) + $(use_with tiff) + $(use_with webp) + $(use_with corefonts windows-font-dir "${EPREFIX}"/usr/share/fonts/corefonts) + $(use_with wmf) + $(use_with xml) + + # Default upstream (as of 6.9.12.96/7.1.1.18 anyway) is open + # For now, let's make USE=hardened do 'limited', and have USE=-hardened + # reflect the upstream default of 'open'. + # + # We might change it to 'secure' and 'limited' at some point. + # See also bug #716674. + --with-security-policy=$(usex hardened limited open) + ) + + CONFIG_SHELL="${BROOT}"/bin/bash econf "${myeconfargs[@]}" +} + +src_test() { + # Install default (unrestricted) policy in $HOME for test suite, bug #664238 + local _im_local_config_home="${HOME}/.config/ImageMagick" + mkdir -p "${_im_local_config_home}" || \ + die "Failed to create IM config dir in '${_im_local_config_home}'" + cp "${FILESDIR}"/policy.test.xml "${_im_local_config_home}/policy.xml" || \ + die "Failed to install default blank policy.xml in '${_im_local_config_home}'" + + local im_command= IM_COMMANDS=() + if [[ ${PV} == 9999 ]] ; then + IM_COMMANDS+=( "magick -version" ) # Show version we are using -- cannot verify because of live ebuild + else + IM_COMMANDS+=( "magick -version | grep -q -- \"${MY_PV}\"" ) # Verify that we are using version we just built + fi + IM_COMMANDS+=( "magick -list policy" ) # Verify that policy.xml is used + IM_COMMANDS+=( "emake check" ) # Run tests + + for im_command in "${IM_COMMANDS[@]}"; do + eval "${S}"/magick.sh \ + ${im_command} || \ + die "Failed to run \"${im_command}\"" + done +} + +src_install() { + # Ensure documentation installation files and paths with each release! + emake \ + DESTDIR="${D}" \ + DOCUMENTATION_PATH="${EPREFIX}"/usr/share/doc/${PF}/html \ + install + + einstalldocs + + if use perl; then + find "${ED}" -type f -name perllocal.pod -exec rm -f {} + + find "${ED}" -depth -mindepth 1 -type d -empty -exec rm -rf {} + + fi + + find "${ED}" -name '*.la' -exec sed -i -e "/^dependency_libs/s:=.*:='':" {} + + # .la files in parent are not needed, keep plugin .la files + find "${ED}"/usr/$(get_libdir)/ -maxdepth 1 -name "*.la" -delete || die + + if use opencl; then + cat <<-EOF > "${T}"/99${PN} + SANDBOX_PREDICT="/dev/nvidiactl:/dev/nvidia-uvm:/dev/ati/card:/dev/dri/card:/dev/dri/card0:/dev/dri/renderD128" + EOF + + insinto /etc/sandbox.d + doins "${T}"/99${PN} #472766 + fi + + insinto /usr/share/${PN} + doins config/*icm +} diff --git a/media-gfx/imagemagick/imagemagick-7.1.1.38.ebuild b/media-gfx/imagemagick/imagemagick-7.1.1.38.ebuild index 31879f9cdc1a..c3af2faa2229 100644 --- a/media-gfx/imagemagick/imagemagick-7.1.1.38.ebuild +++ b/media-gfx/imagemagick/imagemagick-7.1.1.38.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,13 +14,13 @@ else MY_PV="$(ver_rs 3 '-')" MY_P="ImageMagick-${MY_PV}" SRC_URI="mirror://imagemagick/${MY_P}.tar.xz" - KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris" + KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris" fi S="${WORKDIR}/${MY_P}" DESCRIPTION="A collection of tools and libraries for many image formats" -HOMEPAGE="https://www.imagemagick.org/" +HOMEPAGE="https://imagemagick.org/index.php" LICENSE="imagemagick" # Please check this on bumps, SONAME is often not updated! Use abidiff on old/new. @@ -106,25 +106,25 @@ src_prepare() { #elibtoolize # for Darwin modules eautoreconf - # For testsuite, see https://bugs.gentoo.org/show_bug.cgi?id=500580#c3 + # For testsuite, see bug #500580#c3 local ati_cards mesa_cards nvidia_cards render_cards shopt -s nullglob - ati_cards=$(echo -n /dev/ati/card* | sed 's/ /:/g') - if test -n "${ati_cards}"; then - addpredict "${ati_cards}" - fi - mesa_cards=$(echo -n /dev/dri/card* | sed 's/ /:/g') - if test -n "${mesa_cards}"; then - addpredict "${mesa_cards}" - fi - nvidia_cards=$(echo -n /dev/nvidia* | sed 's/ /:/g') - if test -n "${nvidia_cards}"; then - addpredict "${nvidia_cards}" - fi - render_cards=$(echo -n /dev/dri/renderD128* | sed 's/ /:/g') - if test -n "${render_cards}"; then - addpredict "${render_cards}" - fi + ati_cards=$(echo -n /dev/ati/card*) + for card in "${ati_cards[@]}" ; do + addpredict "${card}" + done + mesa_cards=$(echo -n /dev/dri/card*) + for card in "${mesa_cards[@]}" ; do + addpredict "${card}" + done + nvidia_cards=$(echo -n /dev/nvidia*) + for card in "${nvidia_cards[@]}" ; do + addpredict "${card}" + done + render_cards=$(echo -n /dev/dri/renderD128*) + for card in "${render_cards[@]}" ; do + addpredict "${card}" + done shopt -u nullglob addpredict /dev/nvidiactl } diff --git a/media-gfx/imagemagick/imagemagick-9999.ebuild b/media-gfx/imagemagick/imagemagick-9999.ebuild index 31879f9cdc1a..dae61feb43e4 100644 --- a/media-gfx/imagemagick/imagemagick-9999.ebuild +++ b/media-gfx/imagemagick/imagemagick-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 @@ -14,13 +14,13 @@ else MY_PV="$(ver_rs 3 '-')" MY_P="ImageMagick-${MY_PV}" SRC_URI="mirror://imagemagick/${MY_P}.tar.xz" - KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris" + KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris" fi S="${WORKDIR}/${MY_P}" DESCRIPTION="A collection of tools and libraries for many image formats" -HOMEPAGE="https://www.imagemagick.org/" +HOMEPAGE="https://imagemagick.org/index.php" LICENSE="imagemagick" # Please check this on bumps, SONAME is often not updated! Use abidiff on old/new. @@ -106,25 +106,25 @@ src_prepare() { #elibtoolize # for Darwin modules eautoreconf - # For testsuite, see https://bugs.gentoo.org/show_bug.cgi?id=500580#c3 + # For testsuite, see bug #500580#c3 local ati_cards mesa_cards nvidia_cards render_cards shopt -s nullglob - ati_cards=$(echo -n /dev/ati/card* | sed 's/ /:/g') - if test -n "${ati_cards}"; then - addpredict "${ati_cards}" - fi - mesa_cards=$(echo -n /dev/dri/card* | sed 's/ /:/g') - if test -n "${mesa_cards}"; then - addpredict "${mesa_cards}" - fi - nvidia_cards=$(echo -n /dev/nvidia* | sed 's/ /:/g') - if test -n "${nvidia_cards}"; then - addpredict "${nvidia_cards}" - fi - render_cards=$(echo -n /dev/dri/renderD128* | sed 's/ /:/g') - if test -n "${render_cards}"; then - addpredict "${render_cards}" - fi + ati_cards=$(echo -n /dev/ati/card*) + for card in "${ati_cards[@]}" ; do + addpredict "${card}" + done + mesa_cards=$(echo -n /dev/dri/card*) + for card in "${mesa_cards[@]}" ; do + addpredict "${card}" + done + nvidia_cards=$(echo -n /dev/nvidia*) + for card in "${nvidia_cards[@]}" ; do + addpredict "${card}" + done + render_cards=$(echo -n /dev/dri/renderD128*) + for card in "${render_cards[@]}" ; do + addpredict "${card}" + done shopt -u nullglob addpredict /dev/nvidiactl } @@ -138,6 +138,9 @@ src_configure() { [[ ${CHOST} == *-solaris* ]] && append-ldflags -lnsl -lsocket + # Workaround for bug #941208 (gcc PR117100) + tc-is-gcc && [[ $(gcc-major-version) == 13 ]] && append-flags -fno-unswitch-loops + local myeconfargs=( $(use_enable static-libs static) $(use_enable hdri) diff --git a/media-gfx/img2pdf/Manifest b/media-gfx/img2pdf/Manifest index 3490f1d850b4..505dd4100d93 100644 --- a/media-gfx/img2pdf/Manifest +++ b/media-gfx/img2pdf/Manifest @@ -2,5 +2,5 @@ AUX img2pdf-0.4.4-Support-imagemagick-7.1.0-48.patch 4995 BLAKE2B 401e3b144f14e6 DIST img2pdf-0.4.4.tar.gz 97796 BLAKE2B d04eae8c02490e4e73339dade92b2521ad410ed741ccc2987961543790589b14a5c8939cb9bbadcc795f5edcbb59a1a43bd522c75948f42dde1acffafb6266e0 SHA512 56943cd965b3e6b0680b7696ca4b5a2ba779474f945dd0d2648fb6f18ab18aab6d74640f9bd8e9c8683e3e641b0657cb84c691054910d84f0c9e8ad733f179e9 DIST img2pdf-0.5.1.tar.gz 104241 BLAKE2B 1ea89107654c91cea8b5f074c05c7376452dd2ebd40dafaadedb39ac3ee383c3c02c1375b130da73339e1f87eb1a6ffbe0553cdedf6ec997bc0731d1d100327f SHA512 e17a920929f6ab08f501b205c38f9cf2fd5a6bd8d41ac4819a5d7463a3cfbeb5376cd5bbee36ab303248610f1d5c8a71a38ff85b14be564e2f39c6eb537ffcaf EBUILD img2pdf-0.4.4-r1.ebuild 1366 BLAKE2B 55a6766982ecd0465ced305811b7c81f90a2907ea97eaaaa5840f2c7fc364c381c87a8de3dd95ea31a0821c7936f34801f66841ac014fc29655ba2341a27cf6a SHA512 fb52707981b5bac760b08e170d6a0188a447f6a790281d6f0885cf1bd2b5fe366275167d85b05f704d0971b3c54e4d4bc9b3919ac0e84ca1fdbd359d803b1d7d -EBUILD img2pdf-0.5.1.ebuild 1589 BLAKE2B f8d33bdce4413fec1d68978a95a2d536760b35dc55ed6de70c34e07e4bcecc4d8069b6458659eebc8fc5b3abbb9de8632b83c58a0a58f0d0133d6aea396468f0 SHA512 5579fb13cf2b1e8a5f9999cbad37fae70bab0dab543e6bec82029814c093303501ae08b97aa96b71ebfc316050432ca234df1372e311eada702aa98580c93b15 +EBUILD img2pdf-0.5.1.ebuild 1587 BLAKE2B e3e6f45df3de96d6d647cd2a0ccc6ca58730fda7ec29616d9d2bddd6f92a00596ae191fdabb1faf3c09d2bd6aa3d6eeecc68f3e79b2cc5c2487db6e3863e0450 SHA512 2504a4c7ce9bcb14d352ec172044c8d1676ec0635730f7222b7021eafb3828b28c90223dfa62a56df80f5a49cf02a4a2d477495347d78523209b503cabb33cff MISC metadata.xml 923 BLAKE2B fe0074db9549519b522f9d749388c5626b702dadba5a722444f652b203a60aea8e8ea5739c3c634076b42dddf24d17b4f449220de617224e59e5491893339901 SHA512 98fc799711e027afa40d2b9bf4558c38873d385920713f58d62782a986e72d1c9b04eb5591d4ec384bbf32376e2b03bf822bf5573015d003ff53ae0d4c7e6421 diff --git a/media-gfx/img2pdf/img2pdf-0.5.1.ebuild b/media-gfx/img2pdf/img2pdf-0.5.1.ebuild index a6489af9714d..881c283cd7f9 100644 --- a/media-gfx/img2pdf/img2pdf-0.5.1.ebuild +++ b/media-gfx/img2pdf/img2pdf-0.5.1.ebuild @@ -16,7 +16,7 @@ HOMEPAGE=" LICENSE="LGPL-3+" SLOT="0" -KEYWORDS="~amd64 ~ppc64 ~x86" +KEYWORDS="amd64 ~ppc64 x86" IUSE="gui" BDEPEND=" diff --git a/media-gfx/imv/Manifest b/media-gfx/imv/Manifest index beab9d3e967c..2656fc5ec13b 100644 --- a/media-gfx/imv/Manifest +++ b/media-gfx/imv/Manifest @@ -1,4 +1,4 @@ AUX imv-4.3.1_p20211221-animated-gif.patch 504 BLAKE2B 8d2dd70e5b73efa82bc18976b1b51494d87402e7722393f8b53482ab0bfb775daec259b56e2250687228c7c5591925dbab66378c598008a1c6ca6dc977334f4d SHA512 df0f2ab81b1d2f41f9b03a89af6c3bb5688017e74874203b5109554a66e647b11c26798f1112cd4068702bcdf238a68ceef75ce1f90cd12496de4588d6227a83 DIST imv-4.5.0.tar.gz 82559 BLAKE2B 100174071049ee711a868832ea297cc7fd43450145db9e71a631afb97d7d77574f37501b749734f47b3f2699d159ed05e5159fd9060c6f0a5de18b92708d9e9c SHA512 5a192e1721b4752ba98de23e4a709904f43cce6954d1bc4a8feb5fb4921b46d497915fb7b2885cf87a65983fe2727c856d6c0c8b0cca2906e4b069e4a4f9c417 -EBUILD imv-4.5.0.ebuild 2163 BLAKE2B 4c52b75ff468f08e129f354955f1daf09dcd0d36b327942a7c196c05cbabca976d30e0e6aeb869601212b2939deda343d5056f1274da29c352b3663bd59b23d9 SHA512 fa2bad5b704b7732410e0425ca7806298ad99a766d711107dc4c71252ea6d81cfe388e1787324885adc54858f260e0fb523b79733b4ee69088194468964d8c93 +EBUILD imv-4.5.0.ebuild 2170 BLAKE2B 76f766ef686b6c5bfb39d91ded81921a91560d79e441096453c6c68edaa67d31163f6ecdfd7d237e93865c0ae0c1a4eb0cd4d0e9d9b2cbc7295d85e3766e541a SHA512 5086040627d34a01d21aa5467625d731d1958324bf68f804753207277e8a0022ba66a83343334dceaa1acd8fcfe5e4608fb0df579960639ca1e0e187c54c1d63 MISC metadata.xml 437 BLAKE2B 2be70afe81e59e1113948f9acc60788bae48ae2977865728299b6af28f0937d8dd80abc037e93438e6381790be02fcb2c6fa4bb8c14380b91e42656136d2f766 SHA512 3fd6b8fa1306250bd5bd55a8e90c9d6acd92278aa8aee5703e3df0c0c425c5e118446ed898d0aaa60e55423f4d94b9411c1a63ee9d637b79ecec63f5ab09f575 diff --git a/media-gfx/imv/imv-4.5.0.ebuild b/media-gfx/imv/imv-4.5.0.ebuild index 9eb40420723d..f9e9d37f7d2b 100644 --- a/media-gfx/imv/imv-4.5.0.ebuild +++ b/media-gfx/imv/imv-4.5.0.ebuild @@ -12,7 +12,7 @@ S=${WORKDIR}/${PN}-v${PV} LICENSE="MIT" SLOT="0" -KEYWORDS="amd64 arm64 x86" +KEYWORDS="amd64 arm64 ~riscv x86" IUSE="+X +freeimage gif heif icu jpeg jpegxl png svg test tiff wayland" REQUIRED_USE="|| ( X wayland )" RESTRICT="!test? ( test )" diff --git a/media-gfx/inkscape/Manifest b/media-gfx/inkscape/Manifest index 01f8c60e8900..c6017b9a63ec 100644 --- a/media-gfx/inkscape/Manifest +++ b/media-gfx/inkscape/Manifest @@ -1,9 +1,8 @@ -AUX inkscape-1.3.2-cxx20-2.patch 541 BLAKE2B f235b801beef5b869ec3720986336c4e0aaafda87556b12a0aa57e011839298562358dedd05e91e0347b79915af6edbb21e4dc41ed9e2a6f4aa562f91cc3967a SHA512 c3c3443669ac0b78c97ae144206c312bbab970d3e9c781dfeddacbe41a6181919b262316a6d2be7fe42b7f9205da4bdd0a5f2640958be06a63063d6feee0b194 -AUX inkscape-1.3.2-cxx20.patch 3811 BLAKE2B 308f70c1fa07894af3b223f800dd514c2affa1db38827f5d8da51a803bde473a51c9e813ea94e4cabb2c98b9209071e57898c3fe61a1342458c54bbb49b7526a SHA512 825f483844b907d6d022fd07d60865e940b23bbcdffc662c61133814a2927597878309471c27096c1608b9a56364442535b2ec68db398371f372fc04b7f497d8 -AUX inkscape-1.3.2-libxml2-2.12.patch 916 BLAKE2B 06ff8b562f6eb703ae2b88a8f0c4ce68257066a8482c1e9b05144bf2fa188512fd6521bfaed700f5fae90dd7b9d927e3382220ebc2a67fdf01614fc9db08b30c SHA512 afdd6c92b16ecc7078cc15b13c40cb19ca2b326367729341003894004ba1fd36c6df8d04f954c65fbbe213201cee14bd5dc38766d87801a4b78934a9927957a4 -AUX inkscape-1.3.2-poppler-24.03.patch 2982 BLAKE2B b8ed08ef09afbab15196ae6d0f198acc01a4000bc2688d0209d53108dac0c801f9d3d1d3be78893e6268f0e82ca7f61b6975252d29aa657487fe792d42c79532 SHA512 9bd8062599fe183de837804106aa2501cb77710f76214663dfd504d9a7cb4a4bc838311c87ed2bbacca4bbcab29a2f81e0831cbd4f8c2017816a0e6fbbfe306b -AUX inkscape-1.3.2-poppler-24.05.patch 2620 BLAKE2B 0fc615690c365cf1630b680f1b6c43d28667263e26c2dad7697e9f7ae56a91b05bf6457f99578ec2a8b771155349b5dbe125f00fcc28f148ba7d58c2887230a5 SHA512 8da5c3db83968a42e1e43b1dc7148724fe2b18299b8c6cf58ab8315566daaa8d2d5cc9030cdb9bc31b55cbd868410a314b7b097ae0f4bd5ccba99c073839e0dc -DIST inkscape-1.3.2.tar.xz 44720944 BLAKE2B 24120f8c671e1fb54bb6626cab95e7086e3c60fbc117bbe8017d081c799bc26812b1286e670771e7ffe88720ba25f237146c452afaf65c1ee2ee554fb07f79a2 SHA512 a6da4b676ba3e7f954f95e3916ce78ce358b49c8052795a52d478064ef02eeae0337b0a94e89b9752ea6824a5758d28072c2bbf83f1e9ee28daebd3b0ef87343 -EBUILD inkscape-1.3.2-r2.ebuild 5880 BLAKE2B f07c32e0321cd91a20ec4462297b1147a99a94a55ba90280b2e207731c3c7268a6e3de652a2826be11e876357ae86351cb578dd1b7f6409670b30de7d5e98c71 SHA512 edba7f70cc6200af742a68e1677bb53c88885aefe3c6d91fe2e6f03c728ed000cfc6053130e5a7769eb61bb57f0cf94dc7c5dbf3da2fce7cd790f49d5f4d58d0 -EBUILD inkscape-9999.ebuild 5619 BLAKE2B 1df847047fbf31f8957455a4783dbf50662c838832c36a979057dd6fe1fbc7a27663562b98acb972784255df578b30be9acfe4452c4c8d0337db7f8f72555b90 SHA512 37bc139d98e7c727210dff9845e61fd085c34facbc204e87d12eb6f19f978d9675469309cf93da4813bdb7ea88ea0c355b389b63348447375ec93524ed6ffaaa +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 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.3.2-cxx20-2.patch b/media-gfx/inkscape/files/inkscape-1.3.2-cxx20-2.patch deleted file mode 100644 index 6364c3f88a9e..000000000000 --- a/media-gfx/inkscape/files/inkscape-1.3.2-cxx20-2.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- a/src/ui/dialog/filter-effects-dialog.cpp -+++ b/src/ui/dialog/filter-effects-dialog.cpp -@@ -202,7 +202,7 @@ - template< typename T> class ComboWithTooltip : public Gtk::EventBox - { - public: -- ComboWithTooltip<T>(T default_value, const Util::EnumDataConverter<T>& c, const SPAttr a = SPAttr::INVALID, char* tip_text = nullptr) -+ ComboWithTooltip(T default_value, const Util::EnumDataConverter<T>& c, const SPAttr a = SPAttr::INVALID, char* tip_text = nullptr) - { - if (tip_text) { - set_tooltip_text(tip_text); diff --git a/media-gfx/inkscape/files/inkscape-1.3.2-cxx20.patch b/media-gfx/inkscape/files/inkscape-1.3.2-cxx20.patch deleted file mode 100644 index 3c61b1919278..000000000000 --- a/media-gfx/inkscape/files/inkscape-1.3.2-cxx20.patch +++ /dev/null @@ -1,91 +0,0 @@ -From 1798e9c13b786f3d077ba0132592c4d5c1d1fb9b Mon Sep 17 00:00:00 2001 -From: Tavmjong Bah <tavmjong@free.fr> -Date: Tue, 26 Sep 2023 19:23:27 +0000 -Subject: [PATCH] Up C++ version to C++20. - ---- - CMakeLists.txt | 4 ++-- - _clang-format | 2 +- - src/ui/knot/knot-holder-entity.cpp | 2 +- - src/ui/tools/pencil-tool.cpp | 9 ++++++--- - 4 files changed, 10 insertions(+), 7 deletions(-) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index fe6b10cda24..de2680bd651 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -18,9 +18,9 @@ message("Binary Dir: ${CMAKE_CURRENT_BINARY_DIR}") - # ----------------------------------------------------------------------------- - # CMake Configuration - # ----------------------------------------------------------------------------- --set(CMAKE_CXX_STANDARD 17) -+set(CMAKE_CXX_STANDARD 20) - set(CMAKE_CXX_STANDARD_REQUIRED ON) --# set(CMAKE_CXX_EXTENSIONS OFF) # enforces -std=c++17 instead of -std=gnu++17 -+# set(CMAKE_CXX_EXTENSIONS OFF) # enforces -std=c++20 instead of -std=gnu++20 - # TODO: build currently fails with it as we actually depend on GNU compiler extensions... - # mostly use of the non-Standard M_PI et al. TODO: C++20: Use the <numbers> header. - -diff --git a/_clang-format b/_clang-format -index 39396fad65a..48de4d2bd88 100644 ---- a/_clang-format -+++ b/_clang-format -@@ -103,7 +103,7 @@ SpacesInContainerLiterals: false - SpacesInCStyleCastParentheses: false - SpacesInParentheses: false - SpacesInSquareBrackets: false --Standard: c++17 -+Standard: c++20 - StatementMacros: [] - TypenameMacros: [] - TabWidth: 4 -diff --git a/src/ui/knot/knot-holder-entity.cpp b/src/ui/knot/knot-holder-entity.cpp -index 8703f5975f7..add66d2fa29 100644 ---- a/src/ui/knot/knot-holder-entity.cpp -+++ b/src/ui/knot/knot-holder-entity.cpp -@@ -315,7 +315,7 @@ void PatternKnotHolderEntityScale::knot_set(Geom::Point const &p, Geom::Point co - double scale_x = std::clamp(new_extent[X] / _cached_diagonal[X], _cached_min_scale, 1e9); - double scale_y = std::clamp(new_extent[Y] / _cached_diagonal[Y], _cached_min_scale, 1e9); - -- Affine new_transform = (state & GDK_CONTROL_MASK) ? Scale(lerp(0.5, scale_x, scale_y)) -+ Affine new_transform = (state & GDK_CONTROL_MASK) ? Scale((scale_x + scale_y) * 0.5) - : Scale(scale_x, scale_y); - - // 2. Calculate offset to keep pattern origin aligned -diff --git a/src/ui/tools/pencil-tool.cpp b/src/ui/tools/pencil-tool.cpp -index fd2d08cad0c..7324f7c8515 100644 ---- a/src/ui/tools/pencil-tool.cpp -+++ b/src/ui/tools/pencil-tool.cpp -@@ -17,7 +17,11 @@ - * Released under GNU GPL v2+, read the file 'COPYING' for more information. - */ - --#include <numeric> // For std::accumulate -+#include "pencil-tool.h" -+ -+#include <cmath> // std::lerp -+#include <numeric> // std::accumulate -+ - #include <gdk/gdkkeysyms.h> - #include <glibmm/i18n.h> - -@@ -26,7 +30,6 @@ - #include <2geom/sbasis-to-bezier.h> - #include <2geom/svg-path-parser.h> - --#include "pencil-tool.h" - - #include "context-fns.h" - #include "desktop.h" -@@ -806,7 +809,7 @@ void PencilTool::_addFreehandPoint(Geom::Point const &p, guint /*state*/, bool l - min = max; - } - double dezoomify_factor = 0.05 * 1000 / _desktop->current_zoom(); -- double const pressure_shrunk = pressure * (max - min) + min; // C++20 -> use std::lerp() -+ double const pressure_shrunk = std::lerp(min, max, pressure); - double pressure_computed = std::abs(pressure_shrunk * dezoomify_factor); - double pressure_computed_scaled = std::abs(pressure_computed * _desktop->getDocument()->getDocumentScale().inverse()[Geom::X]); - if (p != p_array[_npoints - 1]) { --- -GitLab - diff --git a/media-gfx/inkscape/files/inkscape-1.3.2-libxml2-2.12.patch b/media-gfx/inkscape/files/inkscape-1.3.2-libxml2-2.12.patch deleted file mode 100644 index 7e981e36fc1e..000000000000 --- a/media-gfx/inkscape/files/inkscape-1.3.2-libxml2-2.12.patch +++ /dev/null @@ -1,29 +0,0 @@ -https://bugs.gentoo.org/923247 -https://gitlab.com/inkscape/inkscape/-/merge_requests/6089 - -From 694d8ae43d06efff21adebf377ce614d660b24cd Mon Sep 17 00:00:00 2001 -From: Christian Hesse <mail@eworm.de> -Date: Fri, 17 Nov 2023 22:30:42 +0100 -Subject: [PATCH] include missing header file -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -This fixes build error: -``` -/build/inkscape/src/inkscape/src/object/uri.cpp: In constructor ‘Inkscape::URI::URI(const gchar*, const char*)’: -/build/inkscape/src/inkscape/src/object/uri.cpp:86:9: error: ‘xmlFree’ was not declared in this scope; did you mean ‘xmlFreeURI’? - 86 | xmlFree(full); -``` ---- a/src/object/uri.h -+++ b/src/object/uri.h -@@ -13,6 +13,7 @@ - #define INKSCAPE_URI_H - - #include <libxml/uri.h> -+#include <libxml/xmlmemory.h> - #include <memory> - #include <string> - --- -GitLab diff --git a/media-gfx/inkscape/files/inkscape-1.3.2-poppler-24.03.patch b/media-gfx/inkscape/files/inkscape-1.3.2-poppler-24.03.patch deleted file mode 100644 index 53cf3fd2b6cd..000000000000 --- a/media-gfx/inkscape/files/inkscape-1.3.2-poppler-24.03.patch +++ /dev/null @@ -1,61 +0,0 @@ -From 3dd9846ab99260134e11938f0e575be822507037 Mon Sep 17 00:00:00 2001 -From: Andreas Sturmlechner <asturm@gentoo.org> -Date: Mon, 4 Mar 2024 22:59:40 +0100 -Subject: [PATCH] Fix build with >=poppler-24.03.0 - -Fixes build errors caused by: - -"Use an enum for Function getType" -Upstream commit 6e3824d45d42cb806a28a2df84e4ab6bb3587083 - -Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org> ---- - src/extension/internal/pdfinput/svg-builder.cpp | 14 +++++++++++++- - 1 file changed, 13 insertions(+), 1 deletion(-) - -diff --git a/src/extension/internal/pdfinput/svg-builder.cpp b/src/extension/internal/pdfinput/svg-builder.cpp -index 525fbfec0..bcd7b1f61 100644 ---- a/src/extension/internal/pdfinput/svg-builder.cpp -+++ b/src/extension/internal/pdfinput/svg-builder.cpp -@@ -1175,9 +1175,13 @@ static bool svgGetShadingColor(GfxShading *shading, double offset, GfxColor *res - #define INT_EPSILON 8 - bool SvgBuilder::_addGradientStops(Inkscape::XML::Node *gradient, GfxShading *shading, - _POPPLER_CONST Function *func) { -- int type = func->getType(); -+ auto type = func->getType(); - auto space = shading->getColorSpace(); -+#if POPPLER_CHECK_VERSION(24, 3, 0) -+ if ( type == Function::Type::Sampled || type == Function::Type::Exponential ) { // Sampled or exponential function -+#else - if ( type == 0 || type == 2 ) { // Sampled or exponential function -+#endif - GfxColor stop1, stop2; - if (!svgGetShadingColor(shading, 0.0, &stop1) || !svgGetShadingColor(shading, 1.0, &stop2)) { - return false; -@@ -1185,7 +1189,11 @@ bool SvgBuilder::_addGradientStops(Inkscape::XML::Node *gradient, GfxShading *sh - _addStopToGradient(gradient, 0.0, &stop1, space, 1.0); - _addStopToGradient(gradient, 1.0, &stop2, space, 1.0); - } -+#if POPPLER_CHECK_VERSION(24, 3, 0) -+ } else if ( type == Function::Type::Stitching ) { // Stitching -+#else - } else if ( type == 3 ) { // Stitching -+#endif - auto stitchingFunc = static_cast<_POPPLER_CONST StitchingFunction*>(func); - const double *bounds = stitchingFunc->getBounds(); - const double *encode = stitchingFunc->getEncode(); -@@ -1200,7 +1208,11 @@ bool SvgBuilder::_addGradientStops(Inkscape::XML::Node *gradient, GfxShading *sh - for ( int i = 0 ; i < num_funcs ; i++ ) { - svgGetShadingColor(shading, bounds[i + 1], &color); - // Add stops -+#if POPPLER_CHECK_VERSION(24, 3, 0) -+ if (stitchingFunc->getFunc(i)->getType() == Function::Type::Exponential) { // process exponential fxn -+#else - if (stitchingFunc->getFunc(i)->getType() == 2) { // process exponential fxn -+#endif - double expE = (static_cast<_POPPLER_CONST ExponentialFunction*>(stitchingFunc->getFunc(i)))->getE(); - if (expE > 1.0) { - expE = (bounds[i + 1] - bounds[i])/expE; // approximate exponential as a single straight line at x=1 --- -2.44.0 - diff --git a/media-gfx/inkscape/files/inkscape-1.3.2-poppler-24.05.patch b/media-gfx/inkscape/files/inkscape-1.3.2-poppler-24.05.patch deleted file mode 100644 index bb2764032c44..000000000000 --- a/media-gfx/inkscape/files/inkscape-1.3.2-poppler-24.05.patch +++ /dev/null @@ -1,64 +0,0 @@ -From 96ca7a6c215aa14336b52753f56244dc8796ec43 Mon Sep 17 00:00:00 2001 -From: Heiko Becker <mail@heiko-becker.de> -Date: Fri, 3 May 2024 14:52:00 +0200 -Subject: [PATCH] Fix build with poppler >= 24.05.0 - -GooString::hasUnicodeMarkerLE and GooString::hasUnicodeMarker were -rename and moved to UTF.h [1][2] - -[1] https://gitlab.freedesktop.org/poppler/poppler/-/commit/98fabb298b0e8eaef9193bbce68c99c85473a314 -[2] https://gitlab.freedesktop.org/poppler/poppler/-/commit/1f06dca08c32ed18c3030530d98a0e30d41dd7a2 ---- - src/extension/internal/pdfinput/poppler-transition-api.h | 9 +++++++++ - src/extension/internal/pdfinput/poppler-utils.cpp | 6 ++++-- - 2 files changed, 13 insertions(+), 2 deletions(-) - -diff --git a/src/extension/internal/pdfinput/poppler-transition-api.h b/src/extension/internal/pdfinput/poppler-transition-api.h -index 58aa1ec921d..481aefadf46 100644 ---- a/src/extension/internal/pdfinput/poppler-transition-api.h -+++ b/src/extension/internal/pdfinput/poppler-transition-api.h -@@ -13,6 +13,15 @@ - #define SEEN_POPPLER_TRANSITION_API_H - - #include <glib/poppler-features.h> -+#include <poppler/UTF.h> -+ -+#if POPPLER_CHECK_VERSION(24, 5, 0) -+#define _POPPLER_HAS_UNICODE_BOM(value) (hasUnicodeByteOrderMark(value->toStr())) -+#define _POPPLER_HAS_UNICODE_BOMLE(value) (hasUnicodeByteOrderMarkLE(value->toStr())) -+#else -+#define _POPPLER_HAS_UNICODE_BOM(value) (value->hasUnicodeMarker()) -+#define _POPPLER_HAS_UNICODE_BOMLE(value) (value->hasUnicodeMarkerLE()) -+#endif - - #if POPPLER_CHECK_VERSION(24, 3, 0) - #define _POPPLER_FUNCTION_TYPE_SAMPLED Function::Type::Sampled -diff --git a/src/extension/internal/pdfinput/poppler-utils.cpp b/src/extension/internal/pdfinput/poppler-utils.cpp -index 78d90c66c9d..c02815f64b9 100644 ---- a/src/extension/internal/pdfinput/poppler-utils.cpp -+++ b/src/extension/internal/pdfinput/poppler-utils.cpp -@@ -12,6 +12,8 @@ - - #include "poppler-utils.h" - -+#include <poppler/UTF.h> -+ - #include "2geom/affine.h" - #include "GfxFont.h" - #include "GfxState.h" -@@ -563,10 +565,10 @@ std::string getDictString(Dict *dict, const char *key) - */ - std::string getString(const GooString *value) - { -- if (value->hasUnicodeMarker()) { -+ if (_POPPLER_HAS_UNICODE_BOM(value)) { - return g_convert(value->getCString () + 2, value->getLength () - 2, - "UTF-8", "UTF-16BE", NULL, NULL, NULL); -- } else if (value->hasUnicodeMarkerLE()) { -+ } else if (_POPPLER_HAS_UNICODE_BOMLE(value)) { - return g_convert(value->getCString () + 2, value->getLength () - 2, - "UTF-8", "UTF-16LE", NULL, NULL, NULL); - } --- -GitLab - diff --git a/media-gfx/inkscape/files/inkscape-1.4-gcc15.patch b/media-gfx/inkscape/files/inkscape-1.4-gcc15.patch new file mode 100644 index 000000000000..e27db0be34ef --- /dev/null +++ b/media-gfx/inkscape/files/inkscape-1.4-gcc15.patch @@ -0,0 +1,21 @@ +https://bugs.gentoo.org/941674 +https://gitlab.com/inkscape/inkscape/-/commit/eb6dadcf1a5c660167ba43f3606c8e7cc6529787 + +From eb6dadcf1a5c660167ba43f3606c8e7cc6529787 Mon Sep 17 00:00:00 2001 +From: Liam <byteslice@airmail.cc> +Date: Sat, 12 Oct 2024 05:22:29 -0400 +Subject: [PATCH] gobjectptr: fix member name + +--- a/src/util/gobjectptr.h ++++ b/src/util/gobjectptr.h +@@ -20,7 +20,7 @@ public: + GObjectPtr() = default; + explicit GObjectPtr(T *p, bool add_ref = false) : _p(p) { if (add_ref) _ref(); } + GObjectPtr(GObjectPtr const &other) : _p(other._p) { _ref(); } +- GObjectPtr &operator=(GObjectPtr const &other) { if (&other != this) { _unref(); _p = other.p; _ref(); } return *this; } ++ GObjectPtr &operator=(GObjectPtr const &other) { if (&other != this) { _unref(); _p = other._p; _ref(); } return *this; } + GObjectPtr(GObjectPtr &&other) noexcept : _p(other._p) { other._p = nullptr; } + GObjectPtr &operator=(GObjectPtr &&other) { if (&other != this) { _unref(); _p = other._p; other._p = nullptr; } return *this; } + ~GObjectPtr() { _unref(); } +-- +GitLab diff --git a/media-gfx/inkscape/files/inkscape-1.4-poppler-24.10-fix-backport.patch b/media-gfx/inkscape/files/inkscape-1.4-poppler-24.10-fix-backport.patch new file mode 100644 index 000000000000..c20ab13e4f52 --- /dev/null +++ b/media-gfx/inkscape/files/inkscape-1.4-poppler-24.10-fix-backport.patch @@ -0,0 +1,432 @@ +https://bugs.gentoo.org/941933 + +From 22304ae8034d067670a9f95022083a75fac92b4c Mon Sep 17 00:00:00 2001 +From: PBS <pbs3141@gmail.com> +Date: Tue, 22 Oct 2024 14:48:31 +0100 +Subject: [PATCH] Future-proof against poppler 24.10 changes + +--- + .../internal/pdfinput/pdf-parser.cpp | 120 ++++++++---------- + src/extension/internal/pdfinput/pdf-parser.h | 4 +- + .../pdfinput/poppler-transition-api.h | 6 + + 3 files changed, 61 insertions(+), 69 deletions(-) + +diff --git a/src/extension/internal/pdfinput/pdf-parser.cpp b/src/extension/internal/pdfinput/pdf-parser.cpp +index 97b2909218a..28000a87b0c 100644 +--- a/src/extension/internal/pdfinput/pdf-parser.cpp ++++ b/src/extension/internal/pdfinput/pdf-parser.cpp +@@ -817,11 +817,11 @@ void PdfParser::opSetExtGState(Object args[], int /*numArgs*/) + _POPPLER_FREE(obj3); + if (_POPPLER_CALL_ARGS_DEREF(obj3, obj2.dictLookup, "G").isStream()) { + if (_POPPLER_CALL_ARGS_DEREF(obj4, obj3.streamGetDict()->lookup, "Group").isDict()) { +- GfxColorSpace *blendingColorSpace = nullptr; ++ std::unique_ptr<GfxColorSpace> blendingColorSpace; + GBool isolated = gFalse; + GBool knockout = gFalse; + if (!_POPPLER_CALL_ARGS_DEREF(obj5, obj4.dictLookup, "CS").isNull()) { +- blendingColorSpace = GfxColorSpace::parse(nullptr, &obj5, nullptr, state); ++ blendingColorSpace = std::unique_ptr<GfxColorSpace>(GfxColorSpace::parse(nullptr, &obj5, nullptr, state)); + } + _POPPLER_FREE(obj5); + if (_POPPLER_CALL_ARGS_DEREF(obj5, obj4.dictLookup, "I").isBool()) { +@@ -842,7 +842,7 @@ void PdfParser::opSetExtGState(Object args[], int /*numArgs*/) + } + } + } +- doSoftMask(&obj3, alpha, blendingColorSpace, isolated, knockout, funcs[0], &backdropColor); ++ doSoftMask(&obj3, alpha, blendingColorSpace.get(), isolated, knockout, funcs[0], &backdropColor); + if (funcs[0]) { + delete funcs[0]; + } +@@ -927,9 +927,6 @@ void PdfParser::doSoftMask(Object *str, GBool alpha, + alpha, transferFunc, backdropColor); + --formDepth; + +- if (blendingColorSpace) { +- delete blendingColorSpace; +- } + _POPPLER_FREE(obj1); + } + +@@ -946,42 +943,43 @@ void PdfParser::opSetRenderingIntent(Object /*args*/[], int /*numArgs*/) + * + * Maintains a cache for named color spaces to avoid expensive re-parsing. + */ +-GfxColorSpace *PdfParser::lookupColorSpaceCopy(Object &arg) ++std::unique_ptr<GfxColorSpace> PdfParser::lookupColorSpaceCopy(Object &arg) + { + assert(!arg.isNull()); +- GfxColorSpace *colorSpace = nullptr; + + if (char const *name = arg.isName() ? arg.getName() : nullptr) { + auto const cache_name = std::to_string(formDepth) + "-" + name; +- if ((colorSpace = colorSpacesCache[cache_name].get())) { +- return colorSpace->copy(); ++ if (auto cached = colorSpacesCache[cache_name].get()) { ++ return std::unique_ptr<GfxColorSpace>(cached->copy()); + } + +- Object obj = res->lookupColorSpace(name); +- if (obj.isNull()) { +- colorSpace = GfxColorSpace::parse(res, &arg, nullptr, state); ++ std::unique_ptr<GfxColorSpace> colorSpace; ++ if (auto obj = res->lookupColorSpace(name); !obj.isNull()) { ++ colorSpace = std::unique_ptr<GfxColorSpace>(GfxColorSpace::parse(res, &obj, nullptr, state)); + } else { +- colorSpace = GfxColorSpace::parse(res, &obj, nullptr, state); ++ colorSpace = std::unique_ptr<GfxColorSpace>(GfxColorSpace::parse(res, &arg, nullptr, state)); + } + + if (colorSpace && colorSpace->getMode() != csPattern) { +- colorSpacesCache[cache_name].reset(colorSpace->copy()); ++ colorSpacesCache[cache_name] = std::unique_ptr<GfxColorSpace>(colorSpace->copy()); + } ++ ++ return colorSpace; + } else { + // We were passed in an object directly. +- colorSpace = GfxColorSpace::parse(res, &arg, nullptr, state); ++ return std::unique_ptr<GfxColorSpace>(GfxColorSpace::parse(res, &arg, nullptr, state)); + } +- return colorSpace; + } + + /** + * Look up pattern/gradients from the GfxResource dictionary + */ +-GfxPattern *PdfParser::lookupPattern(Object *obj, GfxState *state) ++std::unique_ptr<GfxPattern> PdfParser::lookupPattern(Object *obj, GfxState *state) + { +- if (!obj->isName()) +- return nullptr; +- return res->lookupPattern(obj->getName(), nullptr, state); ++ if (!obj->isName()) { ++ return {}; ++ } ++ return std::unique_ptr<GfxPattern>(res->lookupPattern(obj->getName(), nullptr, state)); + } + + // TODO not good that numArgs is ignored but args[] is used: +@@ -990,7 +988,7 @@ void PdfParser::opSetFillGray(Object args[], int /*numArgs*/) + GfxColor color; + builder->beforeStateChange(state); + state->setFillPattern(nullptr); +- state->setFillColorSpace(new GfxDeviceGrayColorSpace()); ++ state->setFillColorSpace(_POPPLER_CONSUME_UNIQPTR_ARG(std::make_unique<GfxDeviceGrayColorSpace>())); + color.c[0] = dblToCol(args[0].getNum()); + state->setFillColor(&color); + builder->updateStyle(state); +@@ -1002,7 +1000,7 @@ void PdfParser::opSetStrokeGray(Object args[], int /*numArgs*/) + GfxColor color; + builder->beforeStateChange(state); + state->setStrokePattern(nullptr); +- state->setStrokeColorSpace(new GfxDeviceGrayColorSpace()); ++ state->setStrokeColorSpace(_POPPLER_CONSUME_UNIQPTR_ARG(std::make_unique<GfxDeviceGrayColorSpace>())); + color.c[0] = dblToCol(args[0].getNum()); + state->setStrokeColor(&color); + builder->updateStyle(state); +@@ -1015,7 +1013,7 @@ void PdfParser::opSetFillCMYKColor(Object args[], int /*numArgs*/) + int i; + builder->beforeStateChange(state); + state->setFillPattern(nullptr); +- state->setFillColorSpace(new GfxDeviceCMYKColorSpace()); ++ state->setFillColorSpace(_POPPLER_CONSUME_UNIQPTR_ARG(std::make_unique<GfxDeviceCMYKColorSpace>())); + for (i = 0; i < 4; ++i) { + color.c[i] = dblToCol(args[i].getNum()); + } +@@ -1029,7 +1027,7 @@ void PdfParser::opSetStrokeCMYKColor(Object args[], int /*numArgs*/) + GfxColor color; + builder->beforeStateChange(state); + state->setStrokePattern(nullptr); +- state->setStrokeColorSpace(new GfxDeviceCMYKColorSpace()); ++ state->setStrokeColorSpace(_POPPLER_CONSUME_UNIQPTR_ARG(std::make_unique<GfxDeviceCMYKColorSpace>())); + for (int i = 0; i < 4; ++i) { + color.c[i] = dblToCol(args[i].getNum()); + } +@@ -1043,7 +1041,7 @@ void PdfParser::opSetFillRGBColor(Object args[], int /*numArgs*/) + GfxColor color; + builder->beforeStateChange(state); + state->setFillPattern(nullptr); +- state->setFillColorSpace(new GfxDeviceRGBColorSpace()); ++ state->setFillColorSpace(_POPPLER_CONSUME_UNIQPTR_ARG(std::make_unique<GfxDeviceRGBColorSpace>())); + for (int i = 0; i < 3; ++i) { + color.c[i] = dblToCol(args[i].getNum()); + } +@@ -1056,7 +1054,7 @@ void PdfParser::opSetStrokeRGBColor(Object args[], int /*numArgs*/) { + GfxColor color; + builder->beforeStateChange(state); + state->setStrokePattern(nullptr); +- state->setStrokeColorSpace(new GfxDeviceRGBColorSpace()); ++ state->setStrokeColorSpace(_POPPLER_CONSUME_UNIQPTR_ARG(std::make_unique<GfxDeviceRGBColorSpace>())); + for (int i = 0; i < 3; ++i) { + color.c[i] = dblToCol(args[i].getNum()); + } +@@ -1068,14 +1066,14 @@ void PdfParser::opSetStrokeRGBColor(Object args[], int /*numArgs*/) { + void PdfParser::opSetFillColorSpace(Object args[], int numArgs) + { + assert(numArgs >= 1); +- GfxColorSpace *colorSpace = lookupColorSpaceCopy(args[0]); ++ auto colorSpace = lookupColorSpaceCopy(args[0]); + builder->beforeStateChange(state); + state->setFillPattern(nullptr); + + if (colorSpace) { + GfxColor color; +- state->setFillColorSpace(colorSpace); + colorSpace->getDefaultColor(&color); ++ state->setFillColorSpace(_POPPLER_CONSUME_UNIQPTR_ARG(colorSpace)); + state->setFillColor(&color); + builder->updateStyle(state); + } else { +@@ -1089,14 +1087,14 @@ void PdfParser::opSetStrokeColorSpace(Object args[], int numArgs) + assert(numArgs >= 1); + builder->beforeStateChange(state); + +- GfxColorSpace *colorSpace = lookupColorSpaceCopy(args[0]); ++ auto colorSpace = lookupColorSpaceCopy(args[0]); + + state->setStrokePattern(nullptr); + + if (colorSpace) { + GfxColor color; +- state->setStrokeColorSpace(colorSpace); + colorSpace->getDefaultColor(&color); ++ state->setStrokeColorSpace(_POPPLER_CONSUME_UNIQPTR_ARG(colorSpace)); + state->setStrokeColor(&color); + builder->updateStyle(state); + } else { +@@ -1159,7 +1157,7 @@ void PdfParser::opSetFillColorN(Object args[], int numArgs) { + builder->updateStyle(state); + } + if (auto pattern = lookupPattern(&(args[numArgs - 1]), state)) { +- state->setFillPattern(pattern); ++ state->setFillPattern(_POPPLER_CONSUME_UNIQPTR_ARG(pattern)); + builder->updateStyle(state); + } + +@@ -1202,7 +1200,7 @@ void PdfParser::opSetStrokeColorN(Object args[], int numArgs) { + builder->updateStyle(state); + } + if (auto pattern = lookupPattern(&(args[numArgs - 1]), state)) { +- state->setStrokePattern(pattern); ++ state->setStrokePattern(_POPPLER_CONSUME_UNIQPTR_ARG(pattern)); + builder->updateStyle(state); + } + +@@ -1579,11 +1577,11 @@ void PdfParser::doShadingPatternFillFallback(GfxShadingPattern *sPat, + // TODO not good that numArgs is ignored but args[] is used: + void PdfParser::opShFill(Object args[], int /*numArgs*/) + { +- GfxShading *shading = nullptr; + GfxPath *savedPath = nullptr; + bool savedState = false; + +- if (!(shading = res->lookupShading(args[0].getName(), nullptr, state))) { ++ auto shading = std::unique_ptr<GfxShading>(res->lookupShading(args[0].getName(), nullptr, state)); ++ if (!shading) { + return; + } + +@@ -1615,19 +1613,19 @@ void PdfParser::opShFill(Object args[], int /*numArgs*/) + // do shading type-specific operations + switch (shading->getType()) { + case 1: // Function-based shading +- doFunctionShFill(static_cast<GfxFunctionShading *>(shading)); ++ doFunctionShFill(static_cast<GfxFunctionShading *>(shading.get())); + break; + case 2: // Axial shading + case 3: // Radial shading +- builder->addClippedFill(shading, stateToAffine(state)); ++ builder->addClippedFill(shading.get(), stateToAffine(state)); + break; + case 4: // Free-form Gouraud-shaded triangle mesh + case 5: // Lattice-form Gouraud-shaded triangle mesh +- doGouraudTriangleShFill(static_cast<GfxGouraudTriangleShading *>(shading)); ++ doGouraudTriangleShFill(static_cast<GfxGouraudTriangleShading *>(shading.get())); + break; + case 6: // Coons patch mesh + case 7: // Tensor-product patch mesh +- doPatchMeshShFill(static_cast<GfxPatchMeshShading *>(shading)); ++ doPatchMeshShFill(static_cast<GfxPatchMeshShading *>(shading.get())); + break; + } + +@@ -1636,8 +1634,6 @@ void PdfParser::opShFill(Object args[], int /*numArgs*/) + restoreState(); + state->setPath(savedPath); + } +- +- delete shading; + } + + void PdfParser::doFunctionShFill(GfxFunctionShading *shading) { +@@ -2528,7 +2524,7 @@ void PdfParser::doImage(Object * /*ref*/, Stream *str, GBool inlineImg) + + } else { + // get color space and color map +- GfxColorSpace *colorSpace; ++ std::unique_ptr<GfxColorSpace> colorSpace; + _POPPLER_CALL_ARGS(obj1, dict->lookup, "ColorSpace"); + if (obj1.isNull()) { + _POPPLER_FREE(obj1); +@@ -2537,13 +2533,11 @@ void PdfParser::doImage(Object * /*ref*/, Stream *str, GBool inlineImg) + if (!obj1.isNull()) { + colorSpace = lookupColorSpaceCopy(obj1); + } else if (csMode == streamCSDeviceGray) { +- colorSpace = new GfxDeviceGrayColorSpace(); ++ colorSpace = std::make_unique<GfxDeviceGrayColorSpace>(); + } else if (csMode == streamCSDeviceRGB) { +- colorSpace = new GfxDeviceRGBColorSpace(); ++ colorSpace = std::make_unique<GfxDeviceRGBColorSpace>(); + } else if (csMode == streamCSDeviceCMYK) { +- colorSpace = new GfxDeviceCMYKColorSpace(); +- } else { +- colorSpace = nullptr; ++ colorSpace = std::make_unique<GfxDeviceCMYKColorSpace>(); + } + _POPPLER_FREE(obj1); + if (!colorSpace) { +@@ -2554,10 +2548,9 @@ void PdfParser::doImage(Object * /*ref*/, Stream *str, GBool inlineImg) + _POPPLER_FREE(obj1); + _POPPLER_CALL_ARGS(obj1, dict->lookup, "D"); + } +- GfxImageColorMap *colorMap = new GfxImageColorMap(bits, &obj1, colorSpace); ++ auto colorMap = std::make_unique<GfxImageColorMap>(bits, &obj1, _POPPLER_CONSUME_UNIQPTR_ARG(colorSpace)); + _POPPLER_FREE(obj1); + if (!colorMap->isOk()) { +- delete colorMap; + goto err1; + } + +@@ -2568,7 +2561,7 @@ void PdfParser::doImage(Object * /*ref*/, Stream *str, GBool inlineImg) + int maskWidth = 0; + int maskHeight = 0; + maskInvert = gFalse; +- GfxImageColorMap *maskColorMap = nullptr; ++ std::unique_ptr<GfxImageColorMap> maskColorMap; + _POPPLER_CALL_ARGS(maskObj, dict->lookup, "Mask"); + _POPPLER_CALL_ARGS(smaskObj, dict->lookup, "SMask"); + Dict* maskDict; +@@ -2624,7 +2617,7 @@ void PdfParser::doImage(Object * /*ref*/, Stream *str, GBool inlineImg) + _POPPLER_FREE(obj1); + _POPPLER_CALL_ARGS(obj1, maskDict->lookup, "CS"); + } +- GfxColorSpace *maskColorSpace = lookupColorSpaceCopy(obj1); ++ auto maskColorSpace = lookupColorSpaceCopy(obj1); + _POPPLER_FREE(obj1); + if (!maskColorSpace || maskColorSpace->getMode() != csDeviceGray) { + goto err1; +@@ -2634,10 +2627,9 @@ void PdfParser::doImage(Object * /*ref*/, Stream *str, GBool inlineImg) + _POPPLER_FREE(obj1); + _POPPLER_CALL_ARGS(obj1, maskDict->lookup, "D"); + } +- maskColorMap = new GfxImageColorMap(maskBits, &obj1, maskColorSpace); ++ maskColorMap = std::make_unique<GfxImageColorMap>(maskBits, &obj1, _POPPLER_CONSUME_UNIQPTR_ARG(maskColorSpace)); + _POPPLER_FREE(obj1); + if (!maskColorMap->isOk()) { +- delete maskColorMap; + goto err1; + } + //~ handle the Matte entry +@@ -2718,17 +2710,15 @@ void PdfParser::doImage(Object * /*ref*/, Stream *str, GBool inlineImg) + + // draw it + if (haveSoftMask) { +- builder->addSoftMaskedImage(state, str, width, height, colorMap, interpolate, +- maskStr, maskWidth, maskHeight, maskColorMap, maskInterpolate); +- delete maskColorMap; ++ builder->addSoftMaskedImage(state, str, width, height, colorMap.get(), interpolate, ++ maskStr, maskWidth, maskHeight, maskColorMap.get(), maskInterpolate); + } else if (haveExplicitMask) { +- builder->addMaskedImage(state, str, width, height, colorMap, interpolate, ++ builder->addMaskedImage(state, str, width, height, colorMap.get(), interpolate, + maskStr, maskWidth, maskHeight, maskInvert, maskInterpolate); + } else { +- builder->addImage(state, str, width, height, colorMap, interpolate, +- haveColorKeyMask ? maskColors : static_cast<int *>(nullptr)); ++ builder->addImage(state, str, width, height, colorMap.get(), interpolate, ++ haveColorKeyMask ? maskColors : nullptr); + } +- delete colorMap; + + _POPPLER_FREE(maskObj); + _POPPLER_FREE(smaskObj); +@@ -2746,7 +2736,6 @@ void PdfParser::doForm(Object *str, double *offset) + { + Dict *dict; + GBool transpGroup, isolated, knockout; +- GfxColorSpace *blendingColorSpace; + Object matrixObj, bboxObj; + double m[6], bbox[4]; + Object resObj; +@@ -2812,12 +2801,12 @@ void PdfParser::doForm(Object *str, double *offset) + + // check for a transparency group + transpGroup = isolated = knockout = gFalse; +- blendingColorSpace = nullptr; ++ std::unique_ptr<GfxColorSpace> blendingColorSpace; + if (_POPPLER_CALL_ARGS_DEREF(obj1, dict->lookup, "Group").isDict()) { + if (_POPPLER_CALL_ARGS_DEREF(obj2, obj1.dictLookup, "S").isName("Transparency")) { + transpGroup = gTrue; + if (!_POPPLER_CALL_ARGS_DEREF(obj3, obj1.dictLookup, "CS").isNull()) { +- blendingColorSpace = GfxColorSpace::parse(nullptr, &obj3, nullptr, state); ++ blendingColorSpace = std::unique_ptr<GfxColorSpace>(GfxColorSpace::parse(nullptr, &obj3, nullptr, state)); + } + _POPPLER_FREE(obj3); + if (_POPPLER_CALL_ARGS_DEREF(obj3, obj1.dictLookup, "I").isBool()) { +@@ -2835,12 +2824,9 @@ void PdfParser::doForm(Object *str, double *offset) + + // draw it + ++formDepth; +- doForm1(str, resDict, m, bbox, transpGroup, gFalse, blendingColorSpace, isolated, knockout); ++ doForm1(str, resDict, m, bbox, transpGroup, gFalse, blendingColorSpace.get(), isolated, knockout); + --formDepth; + +- if (blendingColorSpace) { +- delete blendingColorSpace; +- } + _POPPLER_FREE(resObj); + } + +diff --git a/src/extension/internal/pdfinput/pdf-parser.h b/src/extension/internal/pdfinput/pdf-parser.h +index c7c10caefed..8325ea24364 100644 +--- a/src/extension/internal/pdfinput/pdf-parser.h ++++ b/src/extension/internal/pdfinput/pdf-parser.h +@@ -137,7 +137,7 @@ public: + void loadPatternColorProfiles(Dict *resources); + void loadColorProfile(); + void loadColorSpaceProfile(GfxColorSpace *space, Object *obj); +- GfxPattern *lookupPattern(Object *obj, GfxState *state); ++ std::unique_ptr<GfxPattern> lookupPattern(Object *obj, GfxState *state); + + std::shared_ptr<CairoFontEngine> getFontEngine(); + +@@ -176,7 +176,7 @@ private: + //! Caches color spaces by name + std::map<std::string, std::unique_ptr<GfxColorSpace>> colorSpacesCache; + +- GfxColorSpace *lookupColorSpaceCopy(Object &); ++ std::unique_ptr<GfxColorSpace> lookupColorSpaceCopy(Object &); + + void setDefaultApproximationPrecision(); // init color deltas + void pushOperator(const char *name); +diff --git a/src/extension/internal/pdfinput/poppler-transition-api.h b/src/extension/internal/pdfinput/poppler-transition-api.h +index 481aefadf46..8f03aa17779 100644 +--- a/src/extension/internal/pdfinput/poppler-transition-api.h ++++ b/src/extension/internal/pdfinput/poppler-transition-api.h +@@ -15,6 +15,12 @@ + #include <glib/poppler-features.h> + #include <poppler/UTF.h> + ++#if POPPLER_CHECK_VERSION(24, 10, 0) ++#define _POPPLER_CONSUME_UNIQPTR_ARG(value) std::move(value) ++#else ++#define _POPPLER_CONSUME_UNIQPTR_ARG(value) value.release() ++#endif ++ + #if POPPLER_CHECK_VERSION(24, 5, 0) + #define _POPPLER_HAS_UNICODE_BOM(value) (hasUnicodeByteOrderMark(value->toStr())) + #define _POPPLER_HAS_UNICODE_BOMLE(value) (hasUnicodeByteOrderMarkLE(value->toStr())) +-- +GitLab + diff --git a/media-gfx/inkscape/files/inkscape-1.4-poppler-24.11.0.patch b/media-gfx/inkscape/files/inkscape-1.4-poppler-24.11.0.patch new file mode 100644 index 000000000000..fdfe0efa1a7d --- /dev/null +++ b/media-gfx/inkscape/files/inkscape-1.4-poppler-24.11.0.patch @@ -0,0 +1,59 @@ +From 0399372ec240d23e0e70548237a541f2b5bf0f34 Mon Sep 17 00:00:00 2001 +From: KrIr17 <elendil.krir17@gmail.com> +Date: Tue, 5 Nov 2024 00:40:15 +0100 +Subject: [PATCH] Fix building with Poppler 24.11 + +Poppler 24.11 no longer sets the default value for faceIndex to 0 in +`FoFiTrueType::make()` and `FoFiTrueType::load()` [1], so we do it +on our end instead. + +Fixes https://gitlab.com/inkscape/inkscape/-/issues/5370 + +[1] https://gitlab.freedesktop.org/poppler/poppler/-/commit/94467509a013dd5cf46c942baa598f2b296571f4 +--- + .../internal/pdfinput/poppler-cairo-font-engine.cpp | 12 ++++++------ + 1 file changed, 6 insertions(+), 6 deletions(-) + +diff --git a/src/extension/internal/pdfinput/poppler-cairo-font-engine.cpp b/src/extension/internal/pdfinput/poppler-cairo-font-engine.cpp +index 34a8eed682d..728b1d1aac4 100644 +--- a/src/extension/internal/pdfinput/poppler-cairo-font-engine.cpp ++++ b/src/extension/internal/pdfinput/poppler-cairo-font-engine.cpp +@@ -419,9 +419,9 @@ CairoFreeTypeFont *CairoFreeTypeFont::create(GfxFont *gfxFont, XRef *xref, FT_Li + FoFiTrueType *ff; + #endif + if (!font_data.empty()) { +- ff = FoFiTrueType::make((fontchar)font_data.data(), font_data.size()); ++ ff = FoFiTrueType::make((fontchar)font_data.data(), font_data.size(), 0); + } else { +- ff = FoFiTrueType::load(fileName.c_str()); ++ ff = FoFiTrueType::load(fileName.c_str(), 0); + } + if (!ff) { + goto err2; +@@ -444,9 +444,9 @@ CairoFreeTypeFont *CairoFreeTypeFont::create(GfxFont *gfxFont, XRef *xref, FT_Li + FoFiTrueType *ff; + #endif + if (!font_data.empty()) { +- ff = FoFiTrueType::make((fontchar)font_data.data(), font_data.size()); ++ ff = FoFiTrueType::make((fontchar)font_data.data(), font_data.size(), 0); + } else { +- ff = FoFiTrueType::load(fileName.c_str()); ++ ff = FoFiTrueType::load(fileName.c_str(), 0); + } + if (!ff) { + error(errSyntaxError, -1, "failed to load truetype font\n"); +@@ -512,9 +512,9 @@ CairoFreeTypeFont *CairoFreeTypeFont::create(GfxFont *gfxFont, XRef *xref, FT_Li + FoFiTrueType *ff; + #endif + if (!font_data.empty()) { +- ff = FoFiTrueType::make((fontchar)font_data.data(), font_data.size()); ++ ff = FoFiTrueType::make((fontchar)font_data.data(), font_data.size(), 0); + } else { +- ff = FoFiTrueType::load(fileName.c_str()); ++ ff = FoFiTrueType::load(fileName.c_str(), 0); + } + if (ff) { + if (ff->isOpenTypeCFF()) { +-- +GitLab + 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.3.2-r2.ebuild b/media-gfx/inkscape/inkscape-1.4-r1.ebuild index a47b5b9d4390..574250c2b239 100644 --- a/media-gfx/inkscape/inkscape-1.3.2-r2.ebuild +++ b/media-gfx/inkscape/inkscape-1.4-r1.ebuild @@ -1,9 +1,12 @@ -# 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} ) +# Remember to check the release notes for a 'Important Changes for Packagers' +# section, e.g. https://inkscape.org/doc/release_notes/1.4/Inkscape_1.4.html#Important_Changes_for_Packagers. + +PYTHON_COMPAT=( python3_{10..13} ) PYTHON_REQ_USE="xml(+)" inherit cmake flag-o-matic xdg toolchain-funcs python-single-r1 @@ -16,8 +19,8 @@ if [[ ${PV} = 9999* ]]; then inherit git-r3 EGIT_REPO_URI="https://gitlab.com/inkscape/inkscape.git" else - SRC_URI="https://media.inkscape.org/dl/resources/file/${P}.tar.xz" - KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ppc ppc64 ~riscv ~sparc x86" + SRC_URI="https://media.inkscape.org/dl/resources/file/${MY_P}.tar.xz" + KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~loong ppc ppc64 ~riscv ~sparc x86" fi S="${WORKDIR}/${MY_P}" @@ -38,7 +41,7 @@ BDEPEND=" COMMON_DEPEND="${PYTHON_DEPS} >=app-text/poppler-0.57.0:=[cairo] >=dev-cpp/cairomm-1.12:0 - >=dev-cpp/glibmm-2.54.1:2 + >=dev-cpp/glibmm-2.58:2 dev-cpp/gtkmm:3.0 >=dev-cpp/pangomm-2.40:1.4 >=dev-libs/boehm-gc-7.1:= @@ -55,7 +58,6 @@ COMMON_DEPEND="${PYTHON_DEPS} media-libs/freetype:2 media-libs/lcms:2 media-libs/libpng:0= - net-libs/libsoup:2.4 sci-libs/gsl:= >=x11-libs/pango-1.44 x11-libs/gtk+:3[X?] @@ -68,6 +70,7 @@ COMMON_DEPEND="${PYTHON_DEPS} dev-python/lockfile[${PYTHON_USEDEP}] dev-python/lxml[${PYTHON_USEDEP}] dev-python/pillow[jpeg?,tiff,webp,${PYTHON_USEDEP}] + dev-python/tinycss2[${PYTHON_USEDEP}] media-gfx/scour[${PYTHON_USEDEP}] ') cdr? ( @@ -110,11 +113,10 @@ DEPEND="${COMMON_DEPEND} " PATCHES=( - "${FILESDIR}"/${P}-libxml2-2.12.patch - "${FILESDIR}"/${P}-poppler-24.03.patch - "${FILESDIR}"/${P}-poppler-24.05.patch # bug 931917 - "${FILESDIR}"/${P}-cxx20.patch # bug 931917 - "${FILESDIR}"/${P}-cxx20-2.patch # bug 933216 + "${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() { @@ -132,7 +134,7 @@ src_unpack() { else default fi - [[ -d "${S}" ]] || mv -v "${WORKDIR}/${P}_202"?-??-* "${S}" || die + [[ -d "${S}" ]] || mv -v "${WORKDIR}/${P/_/-}_202"?-??-* "${S}" || die } src_prepare() { @@ -152,7 +154,6 @@ src_configure() { -DENABLE_POPPLER=ON -DENABLE_POPPLER_CAIRO=ON -DWITH_PROFILING=OFF - -DWITH_INTERNAL_CAIRO=OFF -DWITH_INTERNAL_2GEOM=ON -DBUILD_TESTING=$(usex test) -DWITH_LIBCDR=$(usex cdr) @@ -207,7 +208,4 @@ src_install() { python_fix_shebang "${ED}"/usr/share/${PN}/extensions python_optimize "${ED}"/usr/share/${PN}/extensions fi - - # Empty directory causes sandbox issues, see bug #761915 - rm -r "${ED}/usr/share/inkscape/fonts" || die "Failed to remove fonts directory." } diff --git a/media-gfx/inkscape/inkscape-9999.ebuild b/media-gfx/inkscape/inkscape-9999.ebuild index b91ba44ceda8..5e601916d853 100644 --- a/media-gfx/inkscape/inkscape-9999.ebuild +++ b/media-gfx/inkscape/inkscape-9999.ebuild @@ -3,7 +3,10 @@ EAPI=8 -PYTHON_COMPAT=( python3_{10..12} ) +# Remember to check the release notes for a 'Important Changes for Packagers' +# section, e.g. https://inkscape.org/doc/release_notes/1.4/Inkscape_1.4.html#Important_Changes_for_Packagers. + +PYTHON_COMPAT=( python3_{10..13} ) PYTHON_REQ_USE="xml(+)" inherit cmake flag-o-matic xdg toolchain-funcs python-single-r1 @@ -16,8 +19,8 @@ if [[ ${PV} = 9999* ]]; then inherit git-r3 EGIT_REPO_URI="https://gitlab.com/inkscape/inkscape.git" else - SRC_URI="https://media.inkscape.org/dl/resources/file/${P}.tar.xz" - KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86" + SRC_URI="https://media.inkscape.org/dl/resources/file/${MY_P}.tar.xz" + KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86" fi S="${WORKDIR}/${MY_P}" @@ -38,7 +41,7 @@ BDEPEND=" COMMON_DEPEND="${PYTHON_DEPS} >=app-text/poppler-0.57.0:=[cairo] >=dev-cpp/cairomm-1.12:0 - >=dev-cpp/glibmm-2.54.1:2 + >=dev-cpp/glibmm-2.58:2 dev-cpp/gtkmm:3.0 >=dev-cpp/pangomm-2.40:1.4 >=dev-libs/boehm-gc-7.1:= @@ -55,7 +58,6 @@ COMMON_DEPEND="${PYTHON_DEPS} media-libs/freetype:2 media-libs/lcms:2 media-libs/libpng:0= - net-libs/libsoup:2.4 sci-libs/gsl:= >=x11-libs/pango-1.44 x11-libs/gtk+:3[X?] @@ -68,6 +70,7 @@ COMMON_DEPEND="${PYTHON_DEPS} dev-python/lockfile[${PYTHON_USEDEP}] dev-python/lxml[${PYTHON_USEDEP}] dev-python/pillow[jpeg?,tiff,webp,${PYTHON_USEDEP}] + dev-python/tinycss2[${PYTHON_USEDEP}] media-gfx/scour[${PYTHON_USEDEP}] ') cdr? ( @@ -124,7 +127,7 @@ src_unpack() { else default fi - [[ -d "${S}" ]] || mv -v "${WORKDIR}/${P}_202"?-??-* "${S}" || die + [[ -d "${S}" ]] || mv -v "${WORKDIR}/${P/_/-}_202"?-??-* "${S}" || die } src_prepare() { @@ -198,7 +201,4 @@ src_install() { python_fix_shebang "${ED}"/usr/share/${PN}/extensions python_optimize "${ED}"/usr/share/${PN}/extensions fi - - # Empty directory causes sandbox issues, see bug #761915 - rm -r "${ED}/usr/share/inkscape/fonts" || die "Failed to remove fonts directory." } diff --git a/media-gfx/jhead/Manifest b/media-gfx/jhead/Manifest index dd9966b1bf65..ff970124a488 100644 --- a/media-gfx/jhead/Manifest +++ b/media-gfx/jhead/Manifest @@ -1,4 +1,4 @@ AUX jhead-3.08-fix-makefile.patch 1249 BLAKE2B ef1cab0d7141d71e374b7d1481431f8bd29fa115a45eae31556cf096b26739c1929e694532f61f0f7f739ec53744781c25af24d453eb8bc9b41c79c4bc71f1c7 SHA512 c4a04aaf34d14e758f96283dea2d347cd61d443fd99b2702e3ae80150e512ee944198e3432d2dc8c2674aee16f32cd71f7c2781f8de66442793640e256b2f8f6 DIST jhead-3.08.tgz 1146535 BLAKE2B 8e53fed1988c12be40b804fd3c8aa51d71ddaa11d97ed11479ec100f26585cc4a19b3b29249642e1cdb5afbf612b6b4281c4f0ec3ad10ad1a6e6fdffc6729740 SHA512 eb50e487eaacf2b489ce5e76f09730c8bb0c50a0e2d7c854ebe8bd204ead8f6256e052c49c72af179dc46dd5372c1eff32ff549b947637b242dc7bbe8c7b20d5 -EBUILD jhead-3.08-r1.ebuild 930 BLAKE2B 72ad80fd632f6d043be3a8a581769192b884ca26fae58112689d3343e0c8f4b43ac8d3e2a575f0b849c4103cfe8686dd79cb38269b5600cdd826868202431e24 SHA512 a4c6c4742909c094e94dee38efd330551caa212615c5949da8668f78227736f5c3157e3e76eaeec43ea18733dec489e15a4f756be78da60b5b066f79ec894a07 +EBUILD jhead-3.08-r1.ebuild 924 BLAKE2B 4870c2840eef6f60bf93fcaaef122f6db278761d56f5df551fc6872194944de1132f5d0af0c8ed5ac056a702725a7ebfe30a9c68c956e0c949d1ccb29d5a9ddc SHA512 1a8cad9e138627b8da780085732551b36689889c14f541c47cd91f31e8f324ec0c8575681fe291a547f5479493a443885308455df6457288b836135ec3272670 MISC metadata.xml 351 BLAKE2B 2fa507a18a19bd866b01af6618c21a3f3b37bd250fb9cbf3a253ae9e94cb6dae961a5f337c083511d7e939380175c613864e087cb22c75b6e5662900168ebabe SHA512 9e77e681d0453ec4ee2ffb3888b3867f0445fb4617a68e36902e1ee37ac56e0d04576c3a20447ee1a8fece62896c119b24ab5073f37c8e62f1c2ec00cf82a8da diff --git a/media-gfx/jhead/jhead-3.08-r1.ebuild b/media-gfx/jhead/jhead-3.08-r1.ebuild index 3522816be291..0d1ac8c04aa9 100644 --- a/media-gfx/jhead/jhead-3.08-r1.ebuild +++ b/media-gfx/jhead/jhead-3.08-r1.ebuild @@ -11,7 +11,7 @@ SRC_URI="https://github.com/Matthias-Wandel/jhead/archive/refs/tags/${PV}.tar.gz LICENSE="public-domain" SLOT="0" -KEYWORDS="~alpha amd64 ~ia64 ppc ppc64 sparc x86" +KEYWORDS="~alpha amd64 ppc ppc64 sparc x86" PATCHES=( "${FILESDIR}"/${PN}-3.08-fix-makefile.patch diff --git a/media-gfx/jp2a/Manifest b/media-gfx/jp2a/Manifest index 2392c91f7b1c..333e8030a5d0 100644 --- a/media-gfx/jp2a/Manifest +++ b/media-gfx/jp2a/Manifest @@ -1,5 +1,5 @@ DIST jp2a-1.1.1.tar.bz2 525678 BLAKE2B 82e4717acb27596ca789681d288767cd602207b56e4f4afbffe5a1a107d67e0bc2b61dadd3769963eff34d3d8a1546741a069cfa7dfe40c9d3486cac6ccb29d6 SHA512 92234100e43c542f468ce586fb1c3f975c2492b80062ea5871f0eb02351b26b7f56bd5567d4d2e3bcec1ea66ebae22623d7d973c3bc794dd99c819efcae983cd DIST jp2a-1.2.0.tar.bz2 444270 BLAKE2B 819101f7df242b869de0e91b6b6fd6c7d6f7d4bfb1f69a5b0477c9d34a08a46d9f05ad79926b66c2b0fe2ad785a340250bf1493ea8832bf7e40a621cb6b6afa2 SHA512 3f523e0c369b77323d512ff14944c70011280bf75b99e9b1abc0dcfefa706bf56bf0b6bed46c78194bd22c2b98dded65c551777dc75f5f217ebb6513d0a56d60 -EBUILD jp2a-1.1.1.ebuild 648 BLAKE2B f2b77407b991500d07da2bc64e8eb02a4e4964a22f1f89c935eb5a9977bf83cffd8c78356987e8f83d68feb3613a4725126530fd9d2361e51669c4ea94fa957a SHA512 c4c106af1ca5088d87f94008fec68d2923d6189e0a383384caa60d9fc926c96c5da148047d399498dcfc0522367204dc8577e3676c2b5d52d4b7b330ed0d97f6 -EBUILD jp2a-1.2.0.ebuild 666 BLAKE2B 3a87d0833a7abdbb84ff1d6a74dfddb3e8a6c91484e323b19c17aa2b5f232ea98693aaae2f943473d57b8608b3b5a694e2c4db6d2086cf44147651a580a525d1 SHA512 bdc218948d7ac948a79fc6691287905ff506ad3c8a29f79176fdb69605fb96ce2dfee7aed8a76dfa80da3333b8db5e27d57c6910408d43d38ab01b41d1d1dcf9 +EBUILD jp2a-1.1.1.ebuild 642 BLAKE2B ddab1461fbe631e7d8eaf7057c9a959745195c8ce77fdc1bd5699ae93669bc1cc6c40085572551eed69462c8079ad382f323d8c953f6d46efa129f825ed234f2 SHA512 cd1a1530a1a5af1132cef1c8c8bbc4faefecc399382a035df540a03e56fade520e1e7d93445dd296d4c64463d1928bc30bd6944f93cc34f3d97f03fb6a096299 +EBUILD jp2a-1.2.0.ebuild 656 BLAKE2B 682484301b9aa2d15536b316f716ccb45e1d62596e01084b709ed5f33a308626898c91d059f6d65e4d32533f192b3e969fae4ee5cf50f5318d0b30fef48665e4 SHA512 cc6d625a608f50eb9d645cf4f591c8519850df17d643b39db8668f6923373e7e94dc99e0d2aaab24567bf0baf4b90ae3b298c219c5d1bf6c28dbe16930255041 MISC metadata.xml 249 BLAKE2B 2572acca810424ee1967a908498b907de468a9fb1765d7bc11a5d1c6aa81294d962a224d7777fecc997fb3220613350618fb7edc9e65b66e9e8dc4a8d31e6313 SHA512 b13e4520e6f7e18c5b925bff00c9711a98d8e773aba54fbe527d95ba97ccd0bd6b58f91f6b01ad92f106bb56f671261de55aacf796db0086e700d9fd40a0d842 diff --git a/media-gfx/jp2a/jp2a-1.1.1.ebuild b/media-gfx/jp2a/jp2a-1.1.1.ebuild index 2696e5ec3b0f..88d5f83c05a6 100644 --- a/media-gfx/jp2a/jp2a-1.1.1.ebuild +++ b/media-gfx/jp2a/jp2a-1.1.1.ebuild @@ -9,7 +9,7 @@ SRC_URI="https://github.com/Talinx/jp2a/releases/download/v${PV}/${P}.tar.bz2" LICENSE="GPL-2" SLOT="0" -KEYWORDS="amd64 ~ia64 ppc ppc64 ~sparc x86 ~arm64-macos ~x64-macos ~x64-solaris" +KEYWORDS="amd64 ppc ppc64 ~sparc x86 ~arm64-macos ~x64-macos ~x64-solaris" IUSE="curl" # TODO: restore ncurses support? diff --git a/media-gfx/jp2a/jp2a-1.2.0.ebuild b/media-gfx/jp2a/jp2a-1.2.0.ebuild index e3915d86ca7b..d2ba1d187923 100644 --- a/media-gfx/jp2a/jp2a-1.2.0.ebuild +++ b/media-gfx/jp2a/jp2a-1.2.0.ebuild @@ -9,7 +9,7 @@ SRC_URI="https://github.com/Talinx/jp2a/releases/download/v${PV}/${P}.tar.bz2" LICENSE="GPL-2" SLOT="0" -KEYWORDS="~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~arm64-macos ~x64-macos ~x64-solaris" +KEYWORDS="amd64 ppc ppc64 ~sparc x86 ~arm64-macos ~x64-macos ~x64-solaris" IUSE="curl" # TODO: restore ncurses support? diff --git a/media-gfx/jpeginfo/Manifest b/media-gfx/jpeginfo/Manifest index 7f16c72bd12b..6cb4cc8de6a5 100644 --- a/media-gfx/jpeginfo/Manifest +++ b/media-gfx/jpeginfo/Manifest @@ -2,5 +2,5 @@ AUX jpeginfo-1.6.0-parallel_install.patch 334 BLAKE2B 01d3e16d44789c5c1d1346f6c3 DIST jpeginfo-1.6.1.tar.gz 64856 BLAKE2B 5d9748a4af26087e45f2ae3fa709bb2099547f22aaeaf1fde529d92d633b1bc665dfde301a9ecaf4a8e4fa190ef637126d6f4ee43118bb31f5782a402d4a08d1 SHA512 9cc9367b8b3e38ba46bff9477b8f61e63b55bd41a67ea2895cca9c097abba2a7a3ae068c235ecfea72c99af52bba91cbb1eb92feb019ba4eb08e826a7083c68b DIST jpeginfo-1.7.1.tar.gz 448213 BLAKE2B 4fa8a875a14b85b6b04bb8cd436dd5b6f68867ad10324ca56da24d247c46b6051fa566ac5f13c469cf90ffcdbc3f16bf6296cdda3f3c794e0986468971b5f31b SHA512 16c670b4f7eb2355fa2e1a665225d45bc135021565b4a950f8193bd0dbc1f55eed7af4e37ca71ea7df325aeb0c13ee52b0cc71e71b06ed39b013cc3377eca63b EBUILD jpeginfo-1.6.1-r1.ebuild 720 BLAKE2B 21b6dae8ec61dda419e92c21646b97eb3fdbf1b86e82ec6afe35507dbc85bd706605fd48f91f50e98678045ebe4ddd8beb8a810b1f24c710e360ec9be640434d SHA512 f44fb0bf829bdccf72034fa4d60ec615c9f4251327d22c979643c714a18216bf835de2cfd164c6b22159078c4ecb767952e7627beb4f5fd8da6f09cc0b22cf88 -EBUILD jpeginfo-1.7.1.ebuild 664 BLAKE2B ab2837119ffab647fb86a2d20bd0d89394b2c95e3e494002818c11c5d44a9a93d1acae2809a051dbe582604fe95db415fe8d1dde8a1b975d51d9a8b84bb7906a SHA512 d9aee6a0b94d5f383d2ce5dc907b24359689f81acd5ee5da4114290440641333098eea9d1aa67860d8012cf87c781338994441ef0bf70e1878cdf70996c6f8fc +EBUILD jpeginfo-1.7.1.ebuild 659 BLAKE2B ae021f15a9b24d77a3d17a65fdd9fade03901a14ce2aab13f96ff789c57ec089c7f99eff1baab0359281d35e6ac1ebef5fe9b4b3027674b28431585036a32618 SHA512 7cbc917a3746ffb1664536097d3e64b1a751090a4ef556d4e03730be2c7781f9a7f65b6a239964718b89c70eff9c1d5660003faa467a0320ef5d58e28de595b1 MISC metadata.xml 167 BLAKE2B 868e3b584722eaacf68273db062bb773d8c7e5d7ab2b81ca7e8397643bf7cc106c3a1033594401c99c54f667bb45d6b73f9048fc335580bbd44b4589ad26a832 SHA512 30caadd1496c3b9969136038239a1d8e01f236726b4022c2d7e19ca7575f25f735e556835e581afbf44fbd3e4104c40f2b5ef5fa70118d75c881fdf871962d0a diff --git a/media-gfx/jpeginfo/jpeginfo-1.7.1.ebuild b/media-gfx/jpeginfo/jpeginfo-1.7.1.ebuild index 8ff1d8261abe..0cf153a0979d 100644 --- a/media-gfx/jpeginfo/jpeginfo-1.7.1.ebuild +++ b/media-gfx/jpeginfo/jpeginfo-1.7.1.ebuild @@ -11,7 +11,7 @@ SRC_URI="https://www.kokkonen.net/tjko/src/${P}.tar.gz" LICENSE="GPL-3+" SLOT="0" -KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos" +KEYWORDS="~alpha amd64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos" RDEPEND="media-libs/libjpeg-turbo:=" DEPEND="${RDEPEND}" diff --git a/media-gfx/jpegoptim/Manifest b/media-gfx/jpegoptim/Manifest index f01f079756ba..ab9e69577a64 100644 --- a/media-gfx/jpegoptim/Manifest +++ b/media-gfx/jpegoptim/Manifest @@ -1,4 +1,4 @@ AUX jpegoptim-1.5.3-system-libjpeg-libm.patch 390 BLAKE2B f23acc7cf017fc8dc5402b7e940b26fef5870cc4ca03ad3a1d2776820126420acd9c03d5a4eeb2c76c7979af223fa00a4ad5eba8c76347c01d2935677348a7f2 SHA512 c76e4a44455374f15f1021876860014dc1bc256e4c474abbc01a35692a569b679194d341b0ceb8751a91c62d54125f21fa7090de7ce3feb4dd1125810b60acca DIST jpegoptim-1.5.5.tar.gz 124361 BLAKE2B eb4cd150435c07df5116fbed653b378512ada96f4ebae65f08a4ccd9418ba71bcd6e369abb5713427c1ea8983432d4f94763252b580e657960154327f9f14d8f SHA512 81009e7079713aaa65fb8ef6d92b59eb6db16a460e8394cb3ce883228157f51ec0df0798d1a62d2e16c64678fd2a51a7156a9aa20b93e51343e3187657aefb4f -EBUILD jpegoptim-1.5.5.ebuild 865 BLAKE2B bad7e05f66f96ab28dbab5b5caef0221bf734f0a398ea14256a6a84bfbdeaa68d8f2bf6c6e8d3520837a8efd053dd3d97b44939bd100106aff0bc952e9237627 SHA512 675a2cebca06fcda61401c5ddc3b3e01ca45f535c668eabb08fbd49b0335608741ca40a761f1e06185bcb882bf7dee167b93d71535af7eaa359cba72d0d99f1c +EBUILD jpegoptim-1.5.5.ebuild 940 BLAKE2B 31ec6e3c8c18864312c5f4ccde9d2b14d7bb36fc45f1636779a0dd1568e45eb912cfeaee3114e631fe8c179a0c8633017346dfef1d371294ce4aa75fe6d945f5 SHA512 96aafad2ad4ad4efb9df396ba3a08945b45b7c605b7d9f43297b71d31d9c158327833e1b6306d4039b7ad3eb9f3148091bde994ab0965add01380f51188d7816 MISC metadata.xml 325 BLAKE2B f70f1cdb1d6d60bf87058a388fec1b87e26e6277a04c0b8334f1d05d64de12706b7402260f6fa425bbb6835ab06351cc2289f7060f6fd33f637a0e26c71fea3e SHA512 e85426100408710a2441322b71113131e63127cea6f42d47d583656b93e851e3611b0305de731c3548144289eb475bce2dfc58df1fa61839e682d97498e678a3 diff --git a/media-gfx/jpegoptim/jpegoptim-1.5.5.ebuild b/media-gfx/jpegoptim/jpegoptim-1.5.5.ebuild index 46f1697664d6..76927fefe6ac 100644 --- a/media-gfx/jpegoptim/jpegoptim-1.5.5.ebuild +++ b/media-gfx/jpegoptim/jpegoptim-1.5.5.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 -inherit cmake +inherit cmake flag-o-matic DESCRIPTION="Utility to optimize JPEG files" HOMEPAGE="https://www.kokkonen.net/tjko/projects.html" @@ -23,6 +23,8 @@ PATCHES=( ) src_configure() { + use elibc_musl && append-cppflags -D__GNU_LIBRARY__ #944902 + local mycmakeargs=( -DUSE_MOZJPEG=no ) diff --git a/media-gfx/kcoloredit/Manifest b/media-gfx/kcoloredit/Manifest deleted file mode 100644 index 7408d1f0d94d..000000000000 --- a/media-gfx/kcoloredit/Manifest +++ /dev/null @@ -1,3 +0,0 @@ -DIST kcoloredit-2.0.0_p20171121-50ac0509.tar.gz 67173 BLAKE2B 2114da34e47768113bf643380efd29e59980f5bcfd544b183db7201b6d4707b81bbdc908476c6c5d36acf8b04e68c6ba1f85aab6f2e7594124f9ce4cbc496e54 SHA512 82dd71e45121357a7da45247862f4f9679fbd132e09e8fb85c0cbef6b73069443f84fe51ec642d30b0ff9b5db10aebf34978000636375afff6c91b49089a9554 -EBUILD kcoloredit-2.0.0_p20171121-r1.ebuild 1056 BLAKE2B ee2c28eec35cb0719b2284827adb1c3fc043fbd90677d88265fd7c4beadfcb8140e00b76d12415dba16413ff3b0b1a9bc1b485870c0c9f051d4ebc62279cbbd5 SHA512 d85ddbba17a18daec1d755acc80aa429fe105db8ccfd8f494c3b0613498b9dc59c3ea0d84cec597707b409c390719ba5f88ef236915f76e7438d04ff643acb3e -MISC metadata.xml 318 BLAKE2B 922a5e32e706b2976c5f359a14194d268d3f499398576c80ce5fad8c0fcea0fbf048de4480a80a6a1889c88b8b6c14147654a3ab4d5ffbcc258c2290da63f6d1 SHA512 614cb8dda7ad2088e5d6ef39b449bb4be0ac72cd0231c320188d76d1816dce6490c5114bb4798112c4b11d99d30a9e82ff8fcf08ffa8c049589682a5e38208f6 diff --git a/media-gfx/kcoloredit/kcoloredit-2.0.0_p20171121-r1.ebuild b/media-gfx/kcoloredit/kcoloredit-2.0.0_p20171121-r1.ebuild deleted file mode 100644 index fc192cac2c2a..000000000000 --- a/media-gfx/kcoloredit/kcoloredit-2.0.0_p20171121-r1.ebuild +++ /dev/null @@ -1,39 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -KDE_ORG_CATEGORY=unmaintained -KDE_ORG_COMMIT=50ac0509891343bc01a0aeffda5a44a1e65d9d04 -ECM_HANDBOOK="forceoptional" -KFMIN=5.60.0 -QTMIN=5.12.3 -inherit ecm kde.org - -DESCRIPTION="Tool for editing color palettes" -HOMEPAGE="https://userbase.kde.org/KColorEdit" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~amd64 ~x86" - -DEPEND=" - >=dev-qt/qtgui-${QTMIN}:5 - >=dev-qt/qtwidgets-${QTMIN}:5 - >=kde-frameworks/kcompletion-${KFMIN}:5 - >=kde-frameworks/kconfig-${KFMIN}:5 - >=kde-frameworks/kconfigwidgets-${KFMIN}:5 - >=kde-frameworks/kcoreaddons-${KFMIN}:5 - >=kde-frameworks/kdelibs4support-${KFMIN}:5 - >=kde-frameworks/kguiaddons-${KFMIN}:5 - >=kde-frameworks/ki18n-${KFMIN}:5 - >=kde-frameworks/kiconthemes-${KFMIN}:5 - >=kde-frameworks/kio-${KFMIN}:5 - >=kde-frameworks/ktextwidgets-${KFMIN}:5 - >=kde-frameworks/kwidgetsaddons-${KFMIN}:5 - >=kde-frameworks/kxmlgui-${KFMIN}:5 - >=kde-plasma/plasma-activities-${KFMIN}:5 -" -RDEPEND="${DEPEND} - !media-gfx/kcoloredit:4 -" diff --git a/media-gfx/kcoloredit/metadata.xml b/media-gfx/kcoloredit/metadata.xml deleted file mode 100644 index d925f2439758..000000000000 --- a/media-gfx/kcoloredit/metadata.xml +++ /dev/null @@ -1,11 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> -<pkgmetadata> - <maintainer type="project"> - <email>kde@gentoo.org</email> - <name>Gentoo KDE Project</name> - </maintainer> - <upstream> - <bugs-to>https://bugs.kde.org/</bugs-to> - </upstream> -</pkgmetadata> diff --git a/media-gfx/kgeotag/Manifest b/media-gfx/kgeotag/Manifest index 58af2506e126..b879b317f44f 100644 --- a/media-gfx/kgeotag/Manifest +++ b/media-gfx/kgeotag/Manifest @@ -1,4 +1,3 @@ -AUX kgeotag-1.3.1-cmake.patch 1101 BLAKE2B 04743a3e4aa12542075bd958b558999ad17e3f88b1e275eda4ebb3ff13b96f99aa8081e9e2b3c13fcf4700450a2ad08142662ad44ff2448885cc3304dd608109 SHA512 9f6407e27ea1318f0c6cf92530eced9d0dd3b63f098018871e8f866e6dd2e5e27ed892de3270a2aca7d87b84696e48a011123515a6849c13515332bf98c2f64d -DIST kgeotag-1.5.0.tar.xz 398488 BLAKE2B 04a8139bde0295be19262ed03603b2c28ef1c828f2b8b1957be9dea4743446e9dedc1e09d81d1fcbbdce804269fed80337c3490cec0f58d33391a2aeb638e684 SHA512 d522b269ae9b57ec610f71f0e0aec30cafeec615627fb401fab4be09a2651c10ca1f9952ad790c2b9a39eb0d97f4bb190a557271f90badf9918301456f02dba6 -EBUILD kgeotag-1.5.0.ebuild 918 BLAKE2B 9575976f576a6da4d39cd48de2b3b88384c353e89022392070879734ffaf3e33bcdda1ddeeec70f8ba4a5138f34a0a20f7c272409c25a149c533e9d89cd760ae SHA512 04218b046ea0e552a7310c05d61c13bae957db51586ac8a56d6689b6cc2e32f3b1bdedfb73672be7662577a51680b011b4a2b5f02744c71f11004d78793422c9 +DIST kgeotag-1.7.0.tar.xz 422672 BLAKE2B fa3d5582c496506a869898eaed163fa488b63311fcf71651fc927b1ed54ede4840791a23a16a0d11883fe743e29e70b4aa4ec957881b4287ced4f66017840fdb SHA512 6f8813788d8257feb3a96588675c9d066220486ba3f9a216bef55d372cf0f4aebce86a1a52565b93022eb424aace2df9a13d09b1903dd03ed33495d01581489e +EBUILD kgeotag-1.7.0.ebuild 847 BLAKE2B 7b8c7ad40a4e7c9c1bf6032da5919496c99f002e0b2a9298bb9e4b3d0d9384a34228306b08dc67fe5734697e312dab31ed83312be2b05e88402d42cbb986f1d1 SHA512 b07dec77a5ecca88518dcb3fe9c8fcd5ecff3398370695cd7e3950f75752fb773ece5429114233e020f378507379919a5921b2a15d156f6734adda59610c4f68 MISC metadata.xml 318 BLAKE2B 922a5e32e706b2976c5f359a14194d268d3f499398576c80ce5fad8c0fcea0fbf048de4480a80a6a1889c88b8b6c14147654a3ab4d5ffbcc258c2290da63f6d1 SHA512 614cb8dda7ad2088e5d6ef39b449bb4be0ac72cd0231c320188d76d1816dce6490c5114bb4798112c4b11d99d30a9e82ff8fcf08ffa8c049589682a5e38208f6 diff --git a/media-gfx/kgeotag/files/kgeotag-1.3.1-cmake.patch b/media-gfx/kgeotag/files/kgeotag-1.3.1-cmake.patch deleted file mode 100644 index 77be87736126..000000000000 --- a/media-gfx/kgeotag/files/kgeotag-1.3.1-cmake.patch +++ /dev/null @@ -1,43 +0,0 @@ -From d119fbfaabb7709710243f353211bab69b5ad5b6 Mon Sep 17 00:00:00 2001 -From: Andreas Sturmlechner <asturm@gentoo.org> -Date: Sun, 11 Sep 2022 23:26:04 +0200 -Subject: [PATCH] Add doc subdirectory as usual and create docbook in subdir - -Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org> ---- - CMakeLists.txt | 6 +----- - doc/CMakeLists.txt | 5 +++++ - 2 files changed, 6 insertions(+), 5 deletions(-) - create mode 100644 doc/CMakeLists.txt - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 8ba51d5..62f0d35 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -124,11 +124,7 @@ target_link_libraries(kgeotag - ) - - # Documentation --kdoctools_create_handbook( -- doc/index.docbook -- INSTALL_DESTINATION "${KDE_INSTALL_DOCBUNDLEDIR}/en" -- SUBDIR kgeotag --) -+add_subdirectory(doc) - - # Installation - -diff --git a/doc/CMakeLists.txt b/doc/CMakeLists.txt -new file mode 100644 -index 0000000..6200463 ---- /dev/null -+++ b/doc/CMakeLists.txt -@@ -0,0 +1,5 @@ -+kdoctools_create_handbook( -+ index.docbook -+ INSTALL_DESTINATION "${KDE_INSTALL_DOCBUNDLEDIR}/en" -+ SUBDIR kgeotag -+) --- -2.37.3 - diff --git a/media-gfx/kgeotag/kgeotag-1.5.0.ebuild b/media-gfx/kgeotag/kgeotag-1.5.0.ebuild deleted file mode 100644 index ebbc9c06e6f5..000000000000 --- a/media-gfx/kgeotag/kgeotag-1.5.0.ebuild +++ /dev/null @@ -1,39 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -ECM_HANDBOOK="forceoptional" -KFMIN=5.106.0 -QTMIN=5.15.9 -inherit ecm kde.org - -DESCRIPTION="Photo geotagging program" -HOMEPAGE="https://kgeotag.kde.org/ https://apps.kde.org/kgeotag/" - -if [[ ${KDE_BUILD_TYPE} != live ]]; then - SRC_URI="mirror://kde/stable/${PN}/${PV}/${P}.tar.xz" - KEYWORDS="~amd64" -fi - -LICENSE="GPL-3+" -SLOT="5" - -DEPEND=" - >=dev-qt/qtgui-${QTMIN}:5 - >=dev-qt/qtnetwork-${QTMIN}:5 - >=dev-qt/qtwidgets-${QTMIN}:5 - kde-apps/libkexiv2:5 - kde-apps/marble:5 - >=kde-frameworks/kconfig-${KFMIN}:5 - >=kde-frameworks/kconfigwidgets-${KFMIN}:5 - >=kde-frameworks/kcoreaddons-${KFMIN}:5 - >=kde-frameworks/kcrash-${KFMIN}:5 - >=kde-frameworks/ki18n-${KFMIN}:5 - >=kde-frameworks/kxmlgui-${KFMIN}:5 -" -RDEPEND="${DEPEND}" - -DOCS=( CHANGELOG.rst README.md ) - -PATCHES=( "${FILESDIR}/${PN}-1.3.1-cmake.patch" ) diff --git a/media-gfx/kgeotag/kgeotag-1.7.0.ebuild b/media-gfx/kgeotag/kgeotag-1.7.0.ebuild new file mode 100644 index 000000000000..a8764167058c --- /dev/null +++ b/media-gfx/kgeotag/kgeotag-1.7.0.ebuild @@ -0,0 +1,37 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +ECM_HANDBOOK="forceoptional" +KFMIN=6.5.0 +QTMIN=6.7.2 +inherit ecm kde.org + +DESCRIPTION="Photo geotagging program" +HOMEPAGE="https://kgeotag.kde.org/ https://apps.kde.org/kgeotag/" + +if [[ ${KDE_BUILD_TYPE} != live ]]; then + SRC_URI="mirror://kde/stable/${PN}/${PV}/${P}.tar.xz" + KEYWORDS="~amd64" +fi + +LICENSE="GPL-3+" +SLOT="0" + +DEPEND=" + >=dev-qt/qtbase-${QTMIN}:6[gui,network,widgets] + kde-apps/libkexiv2:6 + kde-apps/marble:6 + >=kde-frameworks/kconfig-${KFMIN}:6 + >=kde-frameworks/kconfigwidgets-${KFMIN}:6 + >=kde-frameworks/kcoreaddons-${KFMIN}:6 + >=kde-frameworks/kcrash-${KFMIN}:6 + >=kde-frameworks/ki18n-${KFMIN}:6 + >=kde-frameworks/kxmlgui-${KFMIN}:6 +" +RDEPEND="${DEPEND} + !${CATEGORY}/${PN}:5 +" + +DOCS=( CHANGELOG.rst README.md ) diff --git a/media-gfx/kgraphviewer/Manifest b/media-gfx/kgraphviewer/Manifest index e9225efed34a..b0acd63db263 100644 --- a/media-gfx/kgraphviewer/Manifest +++ b/media-gfx/kgraphviewer/Manifest @@ -1,3 +1,7 @@ -DIST kgraphviewer-24.08.0.tar.xz 1582636 BLAKE2B 0043a4a77cf202d96c9e7e0f708e8d93bb71642ba220aa32655f671a8ec92b522d2c8914bdde65187bb270117e2d60f1f7b806895d337c443d7a91860a01f9c3 SHA512 c2ba1a82240fdbbd285b4815d6cc43804e7b26f856185b2d9b3a789e30c6a32c98bd8c92676db3007a58426cbc5961d0bcbf3f4d9c9aa4aed1c58ab12f68f51e -EBUILD kgraphviewer-24.08.0.ebuild 849 BLAKE2B f0c2391b502f1ebde86f9515942bed34686eb57c15057a4c115eb48371da601cb2ef60d2208a180b30371fa3a87bd7d02a1a6a92e26851b658a7b0075a761078 SHA512 59827fef87d9cbc218e84f3fe2cc93b2601ab5e108dc7e6a7fc812d60ea6264454f77ae148e667e380aedafec37b6a4ed89cee8d189107fa029de9cf07096015 +DIST kgraphviewer-24.08.3.tar.xz 1585380 BLAKE2B fc81b58297565e816ab6b7fae266d0e485b31792ae4796cb3d3ac3b9b51a5494a5209fe8f3176f003d1427cf34587376683c1700c6dc9919fe0caacddf3df4d5 SHA512 2508800733799ce554b929748129610fcc10dae6769de961b58aff4f21fed3260b100004284b472bc4e7b3be2b3bbd860f13215f643a9ff30cef255212f228e6 +DIST kgraphviewer-24.12.1.tar.xz 1590420 BLAKE2B 985b0efcc459de0139ee37cb23f8d6604da1763c00723658274650c8b5121f58a39ee337886d0b7671c85ee3819f1484faa5c62cdca0a5ce7b0c1c45169f1c76 SHA512 652682ba0da3b14a08c4515d0e1d8c32de947eeab248eda3d69bcb0c467e2721acbd0e54bc58313b0793124f943b6b452f7106e5dc23ceac475de14ed5c8918e +DIST kgraphviewer-24.12.2.tar.xz 1590408 BLAKE2B a5d999d86949c052d53cc8f2224e483bd3dff1ed850a70d7fe74618a9371e39f45ff3a7bb02a4eec731535af59f78dad5496103ae2b922606acd4c33e14f5649 SHA512 7192eaad4008c414da0ec3f4f11fc71be147b955168fb11ac86b5561c626be4a4c6db4c6afd55e540bd8581838efd01333185efb82abc016bc29df9da33d1bed +EBUILD kgraphviewer-24.08.3.ebuild 856 BLAKE2B 4582fdb52e19b6b58df61b9907cc379b8ff44d7a43c06228226c9eb825f3012da511d49903d0a0bc9c42286f991f899fd9adb50ed3d28a11a665f31e7b29e29f SHA512 daa3e65d75ff9821192c5cb0256a8697589a20aeedddd547e93e3f5f6c0716be1b154396add319bf03509f3d53ff067c104cfa50f237103e58b659cf65a731dd +EBUILD kgraphviewer-24.12.1.ebuild 865 BLAKE2B 980c66ae0f7026419e8a838d5114ddc86348e062630295ee3f4d175e832819d5e69f4657234d4c84d5fd5f2862440ed4a82be5a2f19e9baa9291f47e6493c0c5 SHA512 3e1092162a95b42d594ad4b6d9972ef54cb21bca2f0af5101fc91a5514b130e29d5495cd2b1ab8613ec47f42ec123619e2f935e21093108495d41b847a3ce96c +EBUILD kgraphviewer-24.12.2.ebuild 865 BLAKE2B 980c66ae0f7026419e8a838d5114ddc86348e062630295ee3f4d175e832819d5e69f4657234d4c84d5fd5f2862440ed4a82be5a2f19e9baa9291f47e6493c0c5 SHA512 3e1092162a95b42d594ad4b6d9972ef54cb21bca2f0af5101fc91a5514b130e29d5495cd2b1ab8613ec47f42ec123619e2f935e21093108495d41b847a3ce96c MISC metadata.xml 318 BLAKE2B 922a5e32e706b2976c5f359a14194d268d3f499398576c80ce5fad8c0fcea0fbf048de4480a80a6a1889c88b8b6c14147654a3ab4d5ffbcc258c2290da63f6d1 SHA512 614cb8dda7ad2088e5d6ef39b449bb4be0ac72cd0231c320188d76d1816dce6490c5114bb4798112c4b11d99d30a9e82ff8fcf08ffa8c049589682a5e38208f6 diff --git a/media-gfx/kgraphviewer/kgraphviewer-24.08.0.ebuild b/media-gfx/kgraphviewer/kgraphviewer-24.08.3.ebuild index 4e65fec3c592..b34f8b7fb8c1 100644 --- a/media-gfx/kgraphviewer/kgraphviewer-24.08.0.ebuild +++ b/media-gfx/kgraphviewer/kgraphviewer-24.08.3.ebuild @@ -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 ~riscv ~x86" +KEYWORDS="amd64 arm64 ~ppc64 ~riscv ~x86" IUSE="" RDEPEND=" diff --git a/media-gfx/kgraphviewer/kgraphviewer-24.12.1.ebuild b/media-gfx/kgraphviewer/kgraphviewer-24.12.1.ebuild new file mode 100644 index 000000000000..c43c182e73d8 --- /dev/null +++ b/media-gfx/kgraphviewer/kgraphviewer-24.12.1.ebuild @@ -0,0 +1,34 @@ +# Copyright 1999-2025 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +ECM_HANDBOOK="optional" +KFMIN=6.7.0 +QTMIN=6.7.2 +inherit ecm gear.kde.org + +DESCRIPTION="Graphviz dot graph file viewer" +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 ~loong ~ppc64 ~riscv ~x86" +IUSE="" + +RDEPEND=" + >=dev-qt/qt5compat-${QTMIN}:6 + >=dev-qt/qtbase-${QTMIN}:6[dbus,gui,widgets] + >=dev-qt/qtsvg-${QTMIN}:6 + >=kde-frameworks/kconfig-${KFMIN}:6 + >=kde-frameworks/kconfigwidgets-${KFMIN}:6 + >=kde-frameworks/kcoreaddons-${KFMIN}:6 + >=kde-frameworks/ki18n-${KFMIN}:6 + >=kde-frameworks/kparts-${KFMIN}:6 + >=kde-frameworks/kwidgetsaddons-${KFMIN}:6 + >=kde-frameworks/kxmlgui-${KFMIN}:6 + >=media-gfx/graphviz-2.30 +" +DEPEND="${RDEPEND} + dev-libs/boost +" diff --git a/media-gfx/kgraphviewer/kgraphviewer-24.12.2.ebuild b/media-gfx/kgraphviewer/kgraphviewer-24.12.2.ebuild new file mode 100644 index 000000000000..c43c182e73d8 --- /dev/null +++ b/media-gfx/kgraphviewer/kgraphviewer-24.12.2.ebuild @@ -0,0 +1,34 @@ +# Copyright 1999-2025 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +ECM_HANDBOOK="optional" +KFMIN=6.7.0 +QTMIN=6.7.2 +inherit ecm gear.kde.org + +DESCRIPTION="Graphviz dot graph file viewer" +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 ~loong ~ppc64 ~riscv ~x86" +IUSE="" + +RDEPEND=" + >=dev-qt/qt5compat-${QTMIN}:6 + >=dev-qt/qtbase-${QTMIN}:6[dbus,gui,widgets] + >=dev-qt/qtsvg-${QTMIN}:6 + >=kde-frameworks/kconfig-${KFMIN}:6 + >=kde-frameworks/kconfigwidgets-${KFMIN}:6 + >=kde-frameworks/kcoreaddons-${KFMIN}:6 + >=kde-frameworks/ki18n-${KFMIN}:6 + >=kde-frameworks/kparts-${KFMIN}:6 + >=kde-frameworks/kwidgetsaddons-${KFMIN}:6 + >=kde-frameworks/kxmlgui-${KFMIN}:6 + >=media-gfx/graphviz-2.30 +" +DEPEND="${RDEPEND} + dev-libs/boost +" diff --git a/media-gfx/kio-blender-thumbnailer/Manifest b/media-gfx/kio-blender-thumbnailer/Manifest index 5bb0ff3b6d77..aa6261eb3042 100644 --- a/media-gfx/kio-blender-thumbnailer/Manifest +++ b/media-gfx/kio-blender-thumbnailer/Manifest @@ -1,7 +1,7 @@ -DIST kdegraphics-thumbnailers-23.08.5.tar.xz 49436 BLAKE2B 943ad7bd93ca5e4d80854869d4d97f7121d259a82062afb7781d1845e94cbc6ea1732aff3d3476eb6db5ffe54f8f97b352ef8977ebdccc2b173594dd3cbccd6f SHA512 77c328e9532fbd12548d4d219d6da2ad369ee14825d3cf5d142ec11afb842640e1fd01e7e1f911147c93e7e93893b9ae10be66b3d568866ed8985b5e5b38663f -DIST kdegraphics-thumbnailers-24.05.2.tar.xz 48756 BLAKE2B f5c2932c89fe38933c764171c31edfc0c11b7d6a34170e283a5f7ebc221866a2005897e580f1076b4a8bd9438d2fc39ff4b5da99abe90ce41c7465f35b7f6479 SHA512 eafc1eaf48fe7fef2556b1ba39beec0032b3fbc3ad01856517c86e6d56a2d24c488db9ca6cd9669a5b70c16ce44b6006c0a9e48216af08d03fbd805973158503 -DIST kdegraphics-thumbnailers-24.08.0.tar.xz 49000 BLAKE2B 090fe8542e29e1dc4c9ec32366442a01f207557f95b8e227792c41001693cbbeb514bbced5d0aa549986c64e37c4abe8559c092281ce6d463faec47b831c9f47 SHA512 cf1310df9577cdc0a1aaa032e20c9b561253b01a05bfe363b4138012c115d1d9faf25f7340b7b702ae1c66007eb683b8e7f899c68e71ede31887c702d84fdee9 -EBUILD kio-blender-thumbnailer-23.08.5.ebuild 805 BLAKE2B 6c62037055739d24ed0754228a568269fc7f18da60316caf62744a9bd0e6fa565b134ea985646c771dfaf22ddedaf5f885caeb041f20406255bf9db85a400576 SHA512 175befa64a43a078a05f3c083030b9983a4543e7f6b39ea6d9413030aa924b497e8146415514b0aa8bd2ae1ed793bc6f81c450912a644263fac535b709dcf575 -EBUILD kio-blender-thumbnailer-24.05.2.ebuild 803 BLAKE2B d08020ec80cd8a2fcbf04e2000a82018c2d8d443b09c949fee98d3f07778a5a6ce94607fed80fb3ff5fe8f85310099dd57dce475a4a7c1b9802294edaf78f9c4 SHA512 fc6b6490aeb605d9aef809ebd68f795620469ee262638852eb124baeaaa271783dd6f0e4ba8b5e693d073dda6cb3bc591e9eb4f0f9e343375fe9c17dcbc34abf -EBUILD kio-blender-thumbnailer-24.08.0.ebuild 805 BLAKE2B 292d33b7c285bd150248dbf6edf3d2dd008d2c4342762698d292bead779f5577a9f7af847bbb9d885b7841860b170afb0738b1549b51b3593c33f15ebe791e62 SHA512 d95417a4f56559755373742130874c1a2d18c799cad411001176d2a05e5d1cc190e94c658a9d956050e3710fe60536ed3605b59a3112c005c9bb6adfd3ecce13 +DIST kdegraphics-thumbnailers-24.08.3.tar.xz 49092 BLAKE2B c42d05fb1fb3e0660bb247a98b4cf30b055ffcc41ba5a441c63173f4db68b4c357dff9cd60bfdfd1849a31e548cce84b4c0ef83db524f5f2715600e15cac9e0e SHA512 23411e41e12be1c4af78ae621ea61976a99d05bd19dbadff399cdfa51e06182d89337c240d728beda376b2ed16c9fa5ad1641629e80b5da00f3a7dadd48c602d +DIST kdegraphics-thumbnailers-24.12.1.tar.xz 49160 BLAKE2B d41573f1810545164af68af6b51804d49cb2e505fffbc24347e3c364c7629afac18c6bf254f3ee6a85e2aeedcdce9e4dea259d5ceae95236a03cb0575cfa7fee SHA512 b0da43f23b580a1b0a446bd7f96a70bbcf1e2147cb71270de054a0dfcea87a1394732fcc8e35971dd772686ad2c67e487096243ebbb8059431b58b0599d4428b +DIST kdegraphics-thumbnailers-24.12.2.tar.xz 49160 BLAKE2B 9a37e1744bbf7aea50d8e6c529c9ed9f53584c0999351ea5dec5420409de0736910d4b090883dd367906f58a10207c83c11194d96e606f246d8c20384e044b07 SHA512 639fb54e727986ce307e4dca1713fef5d66b689ae0a8ec070b210c3d02475a69f4861f678a25a91f57d0deee03473519e982594cc2bd64df00734869a4bd81bd +EBUILD kio-blender-thumbnailer-24.08.3.ebuild 803 BLAKE2B ab3a9cd9404387f0620fd3ff28028cad5e760a0d807d2db0506caf8a59226264550198a6db6a18f81a99ae9482ab5f7f49e79775e7909950d18f04d5efa798be SHA512 872129d73a2dedb5b6de704db0c8e80af49e0990f6d443fe0e3407c7d4e6a0db020d0bd545dec7dd8421ed5c88ee08629fe38ed977caef2dfae173d0cd7fd7b1 +EBUILD kio-blender-thumbnailer-24.12.1.ebuild 812 BLAKE2B d9a537eea54458b6ffbee2b1885aa1568b0c586a2f28ce931aad184ee05bfd021400988d70988eb054bce04f09efe811a913ccdc98f2ca0fdbf42e2b243a32f5 SHA512 c5c3d3267014715a735d060ef5a6ae57b37cb38a523ddddd5159b90ed6e058b9a65aa4b1485604a99ec10bc3ba71266078c0380c3681a25f9826974f107f7e36 +EBUILD kio-blender-thumbnailer-24.12.2.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.05.2.ebuild b/media-gfx/kio-blender-thumbnailer/kio-blender-thumbnailer-24.08.3.ebuild index 6ca172850f8b..d3e261b661a7 100644 --- a/media-gfx/kio-blender-thumbnailer/kio-blender-thumbnailer-24.05.2.ebuild +++ b/media-gfx/kio-blender-thumbnailer/kio-blender-thumbnailer-24.08.3.ebuild @@ -4,8 +4,8 @@ EAPI=8 KDE_ORG_NAME="kdegraphics-thumbnailers" -KFMIN=6.3.0 -QTMIN=6.6.2 +KFMIN=6.5.0 +QTMIN=6.7.2 inherit ecm gear.kde.org DESCRIPTION="KIO thumbnail generator for Blender files" diff --git a/media-gfx/kio-blender-thumbnailer/kio-blender-thumbnailer-24.08.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.08.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-blender-thumbnailer/kio-blender-thumbnailer-24.12.2.ebuild b/media-gfx/kio-blender-thumbnailer/kio-blender-thumbnailer-24.12.2.ebuild new file mode 100644 index 000000000000..e852be248b99 --- /dev/null +++ b/media-gfx/kio-blender-thumbnailer/kio-blender-thumbnailer-24.12.2.ebuild @@ -0,0 +1,36 @@ +# 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.7.0 +QTMIN=6.7.2 +inherit ecm gear.kde.org + +DESCRIPTION="KIO thumbnail generator for Blender files" +HOMEPAGE="https://apps.kde.org/kdegraphics_thumbnailers/" + +LICENSE="GPL-2+" +SLOT="6" +KEYWORDS="~amd64 ~arm64 ~loong ~ppc64 ~riscv ~x86" + +DEPEND=" + >=dev-qt/qtbase-${QTMIN}:6[gui] + >=kde-frameworks/karchive-${KFMIN}:6 + >=kde-frameworks/kio-${KFMIN}:6 +" +RDEPEND="${DEPEND} + !<kde-apps/thumbnailers-24.05.2-r1:6 +" + +src_configure() { + local mycmakeargs=( + -DBUILD_ps=OFF + -DDISABLE_MOBIPOCKET=ON + -DCMAKE_DISABLE_FIND_PACKAGE_QMobipocket6=ON + -DCMAKE_DISABLE_FIND_PACKAGE_KExiv2Qt6=ON + -DCMAKE_DISABLE_FIND_PACKAGE_KDcrawQt6=ON + ) + ecm_src_configure +} diff --git a/media-gfx/kio-mobi-thumbnailer/Manifest b/media-gfx/kio-mobi-thumbnailer/Manifest index fe8a1875cb85..aa57c0b3d761 100644 --- a/media-gfx/kio-mobi-thumbnailer/Manifest +++ b/media-gfx/kio-mobi-thumbnailer/Manifest @@ -1,7 +1,7 @@ -DIST kdegraphics-thumbnailers-23.08.5.tar.xz 49436 BLAKE2B 943ad7bd93ca5e4d80854869d4d97f7121d259a82062afb7781d1845e94cbc6ea1732aff3d3476eb6db5ffe54f8f97b352ef8977ebdccc2b173594dd3cbccd6f SHA512 77c328e9532fbd12548d4d219d6da2ad369ee14825d3cf5d142ec11afb842640e1fd01e7e1f911147c93e7e93893b9ae10be66b3d568866ed8985b5e5b38663f -DIST kdegraphics-thumbnailers-24.05.2.tar.xz 48756 BLAKE2B f5c2932c89fe38933c764171c31edfc0c11b7d6a34170e283a5f7ebc221866a2005897e580f1076b4a8bd9438d2fc39ff4b5da99abe90ce41c7465f35b7f6479 SHA512 eafc1eaf48fe7fef2556b1ba39beec0032b3fbc3ad01856517c86e6d56a2d24c488db9ca6cd9669a5b70c16ce44b6006c0a9e48216af08d03fbd805973158503 -DIST kdegraphics-thumbnailers-24.08.0.tar.xz 49000 BLAKE2B 090fe8542e29e1dc4c9ec32366442a01f207557f95b8e227792c41001693cbbeb514bbced5d0aa549986c64e37c4abe8559c092281ce6d463faec47b831c9f47 SHA512 cf1310df9577cdc0a1aaa032e20c9b561253b01a05bfe363b4138012c115d1d9faf25f7340b7b702ae1c66007eb683b8e7f899c68e71ede31887c702d84fdee9 -EBUILD kio-mobi-thumbnailer-23.08.5.ebuild 850 BLAKE2B 8c1f1669e225adcec3a770a6de72e10f83290f30f85146bb7ea14152f42359ffedaea07c3f994836ddb3ce054bb30ba9f9b39425c87ec8830c42e7bc3584c826 SHA512 365764d72aa52f97e54f7effceda8833444e2a422e45d2cb8e552ffbbda6c27061f95d456694a937612827d8df91a20535710270f6bbb12afbe6e7fc82039cad -EBUILD kio-mobi-thumbnailer-24.05.2.ebuild 847 BLAKE2B 0d202715989e42197cc075d5edc57d373aced60e6d8b70aee493d7ed1df9123c3a07a1211a6d75d7fbcb3c4994efaaa32c576fd5bd8b198bc869e85f2d40e42a SHA512 110179643192c3906a307a0651d5fb12fae42f0a4aecba2fa56e4edfa774b7b40a769934a35e6c620e4d281b9268201b7efb06ab729cce2d4c54648bd88809ff -EBUILD kio-mobi-thumbnailer-24.08.0.ebuild 849 BLAKE2B fd575c9e28a0d947c6b29d7bb6ab4c5171740356e1b344251b14431e1147a90a0447e2202367ba058d50f5306a4be9c150a78448fc7b18979df7c667bf345750 SHA512 669682a91742a8939e0e9a0a114aa8e19e332de072da4c6b7367840003f461f17807aae73dbbcbd8157a0d818531fdbbacc70dfe1229886a4a1ecc7e6d1e2b2c +DIST kdegraphics-thumbnailers-24.08.3.tar.xz 49092 BLAKE2B c42d05fb1fb3e0660bb247a98b4cf30b055ffcc41ba5a441c63173f4db68b4c357dff9cd60bfdfd1849a31e548cce84b4c0ef83db524f5f2715600e15cac9e0e SHA512 23411e41e12be1c4af78ae621ea61976a99d05bd19dbadff399cdfa51e06182d89337c240d728beda376b2ed16c9fa5ad1641629e80b5da00f3a7dadd48c602d +DIST kdegraphics-thumbnailers-24.12.1.tar.xz 49160 BLAKE2B d41573f1810545164af68af6b51804d49cb2e505fffbc24347e3c364c7629afac18c6bf254f3ee6a85e2aeedcdce9e4dea259d5ceae95236a03cb0575cfa7fee SHA512 b0da43f23b580a1b0a446bd7f96a70bbcf1e2147cb71270de054a0dfcea87a1394732fcc8e35971dd772686ad2c67e487096243ebbb8059431b58b0599d4428b +DIST kdegraphics-thumbnailers-24.12.2.tar.xz 49160 BLAKE2B 9a37e1744bbf7aea50d8e6c529c9ed9f53584c0999351ea5dec5420409de0736910d4b090883dd367906f58a10207c83c11194d96e606f246d8c20384e044b07 SHA512 639fb54e727986ce307e4dca1713fef5d66b689ae0a8ec070b210c3d02475a69f4861f678a25a91f57d0deee03473519e982594cc2bd64df00734869a4bd81bd +EBUILD kio-mobi-thumbnailer-24.08.3.ebuild 847 BLAKE2B ecf5b032070fb717134d4efdb74ee340d42422f5bce1888609ecc090dd068f84272bb6d68eb7968dc36de46aee8472c1d29eb07e398af9975a506fc4087090aa SHA512 887a15b96073ab7b2fcc9b5c3dc1733957a5b982c7f428bdd0e686ec3cd1ea2dcc2a0ffd97ee19c068813b70a808fcff3fe7563343ae8c1aa439b4409761c101 +EBUILD kio-mobi-thumbnailer-24.12.1.ebuild 856 BLAKE2B bdba4e19ca63ab22cbde1d6cff6bb53914f12ab21f423287ddd283cc88eb087bbe34508da282f2f81e184ee0571a95c42776776b6babf278da09634dc7064743 SHA512 e1b4654abf5204813a5b40d231ae7c2b0284de4567f9095e0b3c705288aa12e05d0f8183fc21446b1cd9aee3653acc1164dcc309084fa3ede527942c98fbdbe7 +EBUILD kio-mobi-thumbnailer-24.12.2.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.05.2.ebuild b/media-gfx/kio-mobi-thumbnailer/kio-mobi-thumbnailer-24.08.3.ebuild index ff9f71ee7a35..be481b735490 100644 --- a/media-gfx/kio-mobi-thumbnailer/kio-mobi-thumbnailer-24.05.2.ebuild +++ b/media-gfx/kio-mobi-thumbnailer/kio-mobi-thumbnailer-24.08.3.ebuild @@ -5,8 +5,8 @@ EAPI=8 KDE_ORG_NAME="kdegraphics-thumbnailers" PVCUT=$(ver_cut 1-3) -KFMIN=6.3.0 -QTMIN=6.6.2 +KFMIN=6.5.0 +QTMIN=6.7.2 inherit ecm gear.kde.org DESCRIPTION="KIO thumbnail generator for Mobipocket files" diff --git a/media-gfx/kio-mobi-thumbnailer/kio-mobi-thumbnailer-24.08.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.08.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-mobi-thumbnailer/kio-mobi-thumbnailer-24.12.2.ebuild b/media-gfx/kio-mobi-thumbnailer/kio-mobi-thumbnailer-24.12.2.ebuild new file mode 100644 index 000000000000..4c05aa88f6cc --- /dev/null +++ b/media-gfx/kio-mobi-thumbnailer/kio-mobi-thumbnailer-24.12.2.ebuild @@ -0,0 +1,42 @@ +# 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.7.0 +QTMIN=6.7.2 +inherit ecm gear.kde.org + +DESCRIPTION="KIO thumbnail generator for Mobipocket files" +HOMEPAGE="https://apps.kde.org/kdegraphics_thumbnailers/" + +LICENSE="GPL-2+" +SLOT="6" +KEYWORDS="~amd64 ~arm64 ~loong ~ppc64 ~riscv ~x86" + +DEPEND=" + >=dev-qt/qtbase-${QTMIN}:6[gui] + >=kde-apps/kdegraphics-mobipocket-${PVCUT}:6 + >=kde-frameworks/kio-${KFMIN}:6 +" +RDEPEND="${DEPEND} + !<kde-apps/thumbnailers-24.05.2-r1:6 +" + +src_prepare() { + ecm_src_prepare + ecm_punt_kf_module Archive +} + +src_configure() { + local mycmakeargs=( + -DBUILD_ps=OFF + -DBUILD_blend=OFF + -DCMAKE_DISABLE_FIND_PACKAGE_KExiv2Qt6=ON + -DCMAKE_DISABLE_FIND_PACKAGE_KDcrawQt6=ON + ) + + ecm_src_configure +} diff --git a/media-gfx/kio-ps-thumbnailer/Manifest b/media-gfx/kio-ps-thumbnailer/Manifest index 674b4b4e1c35..72b7eb5c4452 100644 --- a/media-gfx/kio-ps-thumbnailer/Manifest +++ b/media-gfx/kio-ps-thumbnailer/Manifest @@ -1,7 +1,7 @@ -DIST kdegraphics-thumbnailers-23.08.5.tar.xz 49436 BLAKE2B 943ad7bd93ca5e4d80854869d4d97f7121d259a82062afb7781d1845e94cbc6ea1732aff3d3476eb6db5ffe54f8f97b352ef8977ebdccc2b173594dd3cbccd6f SHA512 77c328e9532fbd12548d4d219d6da2ad369ee14825d3cf5d142ec11afb842640e1fd01e7e1f911147c93e7e93893b9ae10be66b3d568866ed8985b5e5b38663f -DIST kdegraphics-thumbnailers-24.05.2.tar.xz 48756 BLAKE2B f5c2932c89fe38933c764171c31edfc0c11b7d6a34170e283a5f7ebc221866a2005897e580f1076b4a8bd9438d2fc39ff4b5da99abe90ce41c7465f35b7f6479 SHA512 eafc1eaf48fe7fef2556b1ba39beec0032b3fbc3ad01856517c86e6d56a2d24c488db9ca6cd9669a5b70c16ce44b6006c0a9e48216af08d03fbd805973158503 -DIST kdegraphics-thumbnailers-24.08.0.tar.xz 49000 BLAKE2B 090fe8542e29e1dc4c9ec32366442a01f207557f95b8e227792c41001693cbbeb514bbced5d0aa549986c64e37c4abe8559c092281ce6d463faec47b831c9f47 SHA512 cf1310df9577cdc0a1aaa032e20c9b561253b01a05bfe363b4138012c115d1d9faf25f7340b7b702ae1c66007eb683b8e7f899c68e71ede31887c702d84fdee9 -EBUILD kio-ps-thumbnailer-23.08.5.ebuild 891 BLAKE2B 3c02646c14ee63032e2324bba9466680881a3ae03f41b8b9b0f1341227a800e3fc8313b2168526984afe6f9dbb1925cc7e4290bbf4bff3f0f6e95e4bcc8ee3c0 SHA512 000aab394868e1a260f6c7065810f727eb6da1bea3a76a56230c1194dc9dfe340982abe56e54a957290754dcaf76032e2c7dac33548cc6893cb972acc8cbe3f3 -EBUILD kio-ps-thumbnailer-24.05.2.ebuild 889 BLAKE2B 0d9aaa5c53de1d25f08d8d43ae277269970926e943debc314a4fb724ddad9719497c73ff36bc66ec932da03adbac975b32fddc65f9071a3ed1483db1603d8a65 SHA512 a56a11b3cceff9d2e8fa2774ff31a6c773d875ceed883e4989bd549a33a6c02e7878f70536c0829bfb4ef504832c074044e35f14450db6c644adc15c62180e1e -EBUILD kio-ps-thumbnailer-24.08.0.ebuild 891 BLAKE2B 4c5ac8b57474148cf88b291a6242aa71c84a309340b5e249ec0eab583424357e0e0a46d970aa08809a3759e7a26be65fa985f99469a9f9f5651b7a805861ca2b SHA512 7aab6771f812694bb9414c8fb19dfef890f00cac29419b852ae9c70ef0f3dd74d6146f16221762aa8dc4ef191e0262a70b8a5623acad125fc9246d9beaf23403 +DIST kdegraphics-thumbnailers-24.08.3.tar.xz 49092 BLAKE2B c42d05fb1fb3e0660bb247a98b4cf30b055ffcc41ba5a441c63173f4db68b4c357dff9cd60bfdfd1849a31e548cce84b4c0ef83db524f5f2715600e15cac9e0e SHA512 23411e41e12be1c4af78ae621ea61976a99d05bd19dbadff399cdfa51e06182d89337c240d728beda376b2ed16c9fa5ad1641629e80b5da00f3a7dadd48c602d +DIST kdegraphics-thumbnailers-24.12.1.tar.xz 49160 BLAKE2B d41573f1810545164af68af6b51804d49cb2e505fffbc24347e3c364c7629afac18c6bf254f3ee6a85e2aeedcdce9e4dea259d5ceae95236a03cb0575cfa7fee SHA512 b0da43f23b580a1b0a446bd7f96a70bbcf1e2147cb71270de054a0dfcea87a1394732fcc8e35971dd772686ad2c67e487096243ebbb8059431b58b0599d4428b +DIST kdegraphics-thumbnailers-24.12.2.tar.xz 49160 BLAKE2B 9a37e1744bbf7aea50d8e6c529c9ed9f53584c0999351ea5dec5420409de0736910d4b090883dd367906f58a10207c83c11194d96e606f246d8c20384e044b07 SHA512 639fb54e727986ce307e4dca1713fef5d66b689ae0a8ec070b210c3d02475a69f4861f678a25a91f57d0deee03473519e982594cc2bd64df00734869a4bd81bd +EBUILD kio-ps-thumbnailer-24.08.3.ebuild 889 BLAKE2B 05b642a21a5aad1aa3b2a9937abaeef4047ca0b616615348eafb3c32f8f4fec90f25edd24fe2769c3a67c9f4a776ddb3a920b0d089de3538518f69f6ec19d3aa SHA512 dc3c3701df8ac4dfd6d2881a8ef5a24cb90d369335aba9308e544c5e2a9dcfc965b98c8078392a79837409f1bc870d279db80758515b6a349153a84d67aae177 +EBUILD kio-ps-thumbnailer-24.12.1.ebuild 898 BLAKE2B 3231785b75cf9ea1097a5eb53f4a0f9585595e06d84a50c8d9b58f60371238c2cf18d5bab25371c2bdf998d23e26997ce6b6cf5cfcf5d921d5974cf29be46fd2 SHA512 230f3339972bd147c2e808a5a59ed2575f9217b2fdecd94d3f9e1fcebf90c37a529663d09787c412cf063686e33f96817b4022b9b5bf42f8ddd3a5b6774ec7d3 +EBUILD kio-ps-thumbnailer-24.12.2.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.05.2.ebuild b/media-gfx/kio-ps-thumbnailer/kio-ps-thumbnailer-24.08.3.ebuild index 3042e12f1b3b..d1bfa0020957 100644 --- a/media-gfx/kio-ps-thumbnailer/kio-ps-thumbnailer-24.05.2.ebuild +++ b/media-gfx/kio-ps-thumbnailer/kio-ps-thumbnailer-24.08.3.ebuild @@ -4,8 +4,8 @@ EAPI=8 KDE_ORG_NAME="kdegraphics-thumbnailers" -KFMIN=6.3.0 -QTMIN=6.6.2 +KFMIN=6.5.0 +QTMIN=6.7.2 inherit ecm gear.kde.org DESCRIPTION="KIO thumbnail generator for DVI, EPS, PDF and PS files" diff --git a/media-gfx/kio-ps-thumbnailer/kio-ps-thumbnailer-24.08.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.08.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-ps-thumbnailer/kio-ps-thumbnailer-24.12.2.ebuild b/media-gfx/kio-ps-thumbnailer/kio-ps-thumbnailer-24.12.2.ebuild new file mode 100644 index 000000000000..d002dcff1a42 --- /dev/null +++ b/media-gfx/kio-ps-thumbnailer/kio-ps-thumbnailer-24.12.2.ebuild @@ -0,0 +1,43 @@ +# 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.7.0 +QTMIN=6.7.2 +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="6" +KEYWORDS="~amd64 ~arm64 ~loong ~ppc64 ~riscv ~x86" + +DEPEND=" + >=dev-qt/qtbase-${QTMIN}:6[gui] + >=kde-frameworks/kio-${KFMIN}:6 +" +RDEPEND="${DEPEND} + !<kde-apps/thumbnailers-24.05.2-r1:6 + 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_QMobipocket6=ON + -DCMAKE_DISABLE_FIND_PACKAGE_KExiv2Qt6=ON + -DCMAKE_DISABLE_FIND_PACKAGE_KDcrawQt6=ON + ) + + ecm_src_configure +} diff --git a/media-gfx/kio-raw-thumbnailer/Manifest b/media-gfx/kio-raw-thumbnailer/Manifest index 44e92301e269..100a8682c2f0 100644 --- a/media-gfx/kio-raw-thumbnailer/Manifest +++ b/media-gfx/kio-raw-thumbnailer/Manifest @@ -1,7 +1,7 @@ -DIST kdegraphics-thumbnailers-23.08.5.tar.xz 49436 BLAKE2B 943ad7bd93ca5e4d80854869d4d97f7121d259a82062afb7781d1845e94cbc6ea1732aff3d3476eb6db5ffe54f8f97b352ef8977ebdccc2b173594dd3cbccd6f SHA512 77c328e9532fbd12548d4d219d6da2ad369ee14825d3cf5d142ec11afb842640e1fd01e7e1f911147c93e7e93893b9ae10be66b3d568866ed8985b5e5b38663f -DIST kdegraphics-thumbnailers-24.05.2.tar.xz 48756 BLAKE2B f5c2932c89fe38933c764171c31edfc0c11b7d6a34170e283a5f7ebc221866a2005897e580f1076b4a8bd9438d2fc39ff4b5da99abe90ce41c7465f35b7f6479 SHA512 eafc1eaf48fe7fef2556b1ba39beec0032b3fbc3ad01856517c86e6d56a2d24c488db9ca6cd9669a5b70c16ce44b6006c0a9e48216af08d03fbd805973158503 -DIST kdegraphics-thumbnailers-24.08.0.tar.xz 49000 BLAKE2B 090fe8542e29e1dc4c9ec32366442a01f207557f95b8e227792c41001693cbbeb514bbced5d0aa549986c64e37c4abe8559c092281ce6d463faec47b831c9f47 SHA512 cf1310df9577cdc0a1aaa032e20c9b561253b01a05bfe363b4138012c115d1d9faf25f7340b7b702ae1c66007eb683b8e7f899c68e71ede31887c702d84fdee9 -EBUILD kio-raw-thumbnailer-23.08.5.ebuild 847 BLAKE2B ad607b3ce62e690781508dd78bdbcaaaf7bba07613088d1fc45dc49d2b6ad425cc84647a69ae899ca5d9d479acca0165fdf701a4dce00c8033a747f5bc101476 SHA512 933b3ac994eccf59b1951b54443df89de5b61386ff71a101c4aff16ec022f86df45d542db95f2abda5f4d35327a2ac88afd9996598d3f83b3dd6190688ac029e -EBUILD kio-raw-thumbnailer-24.05.2.ebuild 845 BLAKE2B 8d7700de811ba4594389ebcbc90135ec50e4bada109da59d6e7ac398c2bca27d3841096500cec1ddbfc72d3403691d87537a71b75f735f56289019ca4ea0b579 SHA512 f923c11d089679f66b1be9975fd4fb3e747aeb89f65e42f8795a2fc79c67c6c00a7e30f83a21ebd810457ecddeda5d26ab6748a749c5156a38464359ab123298 -EBUILD kio-raw-thumbnailer-24.08.0.ebuild 847 BLAKE2B f17933d56e401580dd8073ad355cf4e2abf315d3d595272769c69fcab4566ff5d4a4902098660ed74adb4b911f624c9be56d3ca32b626d6fdb9b4015bc245bfe SHA512 79315aecb999965da39cd092759bfa659f06985130e2dd100ac6a4afb5e2bb2cf4dad6f2054783386b732d22e0c6176cca6c6b5aa84a711c8a9c01a2cc29db41 +DIST kdegraphics-thumbnailers-24.08.3.tar.xz 49092 BLAKE2B c42d05fb1fb3e0660bb247a98b4cf30b055ffcc41ba5a441c63173f4db68b4c357dff9cd60bfdfd1849a31e548cce84b4c0ef83db524f5f2715600e15cac9e0e SHA512 23411e41e12be1c4af78ae621ea61976a99d05bd19dbadff399cdfa51e06182d89337c240d728beda376b2ed16c9fa5ad1641629e80b5da00f3a7dadd48c602d +DIST kdegraphics-thumbnailers-24.12.1.tar.xz 49160 BLAKE2B d41573f1810545164af68af6b51804d49cb2e505fffbc24347e3c364c7629afac18c6bf254f3ee6a85e2aeedcdce9e4dea259d5ceae95236a03cb0575cfa7fee SHA512 b0da43f23b580a1b0a446bd7f96a70bbcf1e2147cb71270de054a0dfcea87a1394732fcc8e35971dd772686ad2c67e487096243ebbb8059431b58b0599d4428b +DIST kdegraphics-thumbnailers-24.12.2.tar.xz 49160 BLAKE2B 9a37e1744bbf7aea50d8e6c529c9ed9f53584c0999351ea5dec5420409de0736910d4b090883dd367906f58a10207c83c11194d96e606f246d8c20384e044b07 SHA512 639fb54e727986ce307e4dca1713fef5d66b689ae0a8ec070b210c3d02475a69f4861f678a25a91f57d0deee03473519e982594cc2bd64df00734869a4bd81bd +EBUILD kio-raw-thumbnailer-24.08.3.ebuild 845 BLAKE2B 760ce39feddec65a2080e2d4ca118082de57acc853c60671032045d7415436e7e36e90f8ad931ef36d70f6ea6a8e5f68b61888e08ab3255fb116886773ad5c0e SHA512 87d7584b7f949f93351ac11ae4249cf9d87a4e1a343008c699d992124a22bbcd66453df7d2e2d0d63c9617a7912b8de0084a61cd52f442b62be2906696b64f11 +EBUILD kio-raw-thumbnailer-24.12.1.ebuild 854 BLAKE2B a98e6870ee93cec42a469ba159d61ff6cb015c09d954137a454a4b83f03de978cceebfaf7baf94c91648145a5e6fa4e22e8e7a4403bc2d0d79e3fcb713724161 SHA512 864a282a758b7e6ed63a9130cfa7e93f460c6294d3d05136526e81d893e9e116f6d7bf973008ca216cfb0c3747a6c462dd23cd4a81b38ba9f4eb9c7923a812e2 +EBUILD kio-raw-thumbnailer-24.12.2.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.05.2.ebuild b/media-gfx/kio-raw-thumbnailer/kio-raw-thumbnailer-24.08.3.ebuild index 335ba17313cc..06bf909cf2b9 100644 --- a/media-gfx/kio-raw-thumbnailer/kio-raw-thumbnailer-24.05.2.ebuild +++ b/media-gfx/kio-raw-thumbnailer/kio-raw-thumbnailer-24.08.3.ebuild @@ -5,8 +5,8 @@ EAPI=8 KDE_ORG_NAME="kdegraphics-thumbnailers" PVCUT=$(ver_cut 1-3) -KFMIN=6.3.0 -QTMIN=6.6.2 +KFMIN=6.5.0 +QTMIN=6.7.2 inherit ecm gear.kde.org DESCRIPTION="KIO thumbnail generator for RAW files" diff --git a/media-gfx/kio-raw-thumbnailer/kio-raw-thumbnailer-24.08.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.08.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/kio-raw-thumbnailer/kio-raw-thumbnailer-24.12.2.ebuild b/media-gfx/kio-raw-thumbnailer/kio-raw-thumbnailer-24.12.2.ebuild new file mode 100644 index 000000000000..339e42401a70 --- /dev/null +++ b/media-gfx/kio-raw-thumbnailer/kio-raw-thumbnailer-24.12.2.ebuild @@ -0,0 +1,43 @@ +# 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.7.0 +QTMIN=6.7.2 +inherit ecm gear.kde.org + +DESCRIPTION="KIO thumbnail generator for RAW files" +HOMEPAGE="https://apps.kde.org/kdegraphics_thumbnailers/" + +LICENSE="GPL-2+" +SLOT="6" +KEYWORDS="~amd64 ~arm64 ~loong ~ppc64 ~riscv ~x86" + +DEPEND=" + >=dev-qt/qtbase-${QTMIN}:6[gui] + >=kde-apps/libkdcraw-${PVCUT}:6 + >=kde-apps/libkexiv2-${PVCUT}:6 + >=kde-frameworks/kio-${KFMIN}:6 +" +RDEPEND="${DEPEND} + !<kde-apps/thumbnailers-24.05.2-r1:6 +" + +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_QMobipocket6=ON + ) + + ecm_src_configure +} diff --git a/media-gfx/kphotoalbum/Manifest b/media-gfx/kphotoalbum/Manifest index 7a0e60154f5c..39fd51eb3304 100644 --- a/media-gfx/kphotoalbum/Manifest +++ b/media-gfx/kphotoalbum/Manifest @@ -1,3 +1,3 @@ -DIST kphotoalbum-5.12.0.tar.xz 11907204 BLAKE2B c4a9193d74c902788a5f68794948ca544f92eb1d2ef7a8c856b96832c7f1b8c5ba8b828744407e74a7101c3e954e83758444d31138c35c3a9045fae94f227e39 SHA512 f4d31d1c00ae2d8ec5a0475a4b3332e32f1ed980034419e6d07388544b65a6bd445c04c0640fba4fd5084c83840b6211ee64d556b6a82e4b182b5f07fbab3338 -EBUILD kphotoalbum-5.12.0.ebuild 1884 BLAKE2B 59b7c79276e293966fd901f108b28735f734f9ac5c95493b0beaf7ca4fe569ef1a55d2332b25ce6630dea694652c85f569b563739969c87af5ba49308782fb62 SHA512 6183e7bd6871df496ceda647c48a57592c7d71392e7aa12ade71d6b04eb9d7e5806709890679cfa9ff1b558b6c2309f3a7aa48438db8f3b906ef45dc0de46455 +DIST kphotoalbum-6.0.1.tar.xz 11526784 BLAKE2B 2ebeb977ed902a66116305d3774f86820efa0eb1676af1f07847fc9374d1e6f51010e8953eafd9b95efd1f5f866b7ef0d1835c7e1cec8ed777e4b045fa52dc6b SHA512 9d0a9e45f32da3f129688b575021a6fff2dd6c0cdb0f8b8c479c33d5243f251d0598e331b8029a9e95d442a9b63cae8a43f2e1232a82b6c6a86daa5d0d6e7690 +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-5.12.0.ebuild b/media-gfx/kphotoalbum/kphotoalbum-5.12.0.ebuild deleted file mode 100644 index 4c1bf98ad156..000000000000 --- a/media-gfx/kphotoalbum/kphotoalbum-5.12.0.ebuild +++ /dev/null @@ -1,70 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -ECM_HANDBOOK="forceoptional" -ECM_TEST="forceoptional" -KFMIN=5.106.0 -QTMIN=5.15.9 -inherit ecm kde.org - -DESCRIPTION="Tool for indexing, searching, and viewing images" -HOMEPAGE="https://www.kphotoalbum.org/" - -if [[ ${KDE_BUILD_TYPE} != live ]]; then - SRC_URI="mirror://kde/stable/${PN}/${PV}/${P}.tar.xz" - KEYWORDS="amd64 x86" -fi - -LICENSE="GPL-2+ FDL-1.2 CC-BY-SA-4.0" -SLOT="5" -IUSE="map phonon +raw share +vlc" - -REQUIRED_USE="|| ( phonon vlc )" - -DEPEND=" - >=dev-qt/qtdbus-${QTMIN}:5 - >=dev-qt/qtgui-${QTMIN}:5[jpeg] - >=dev-qt/qtsql-${QTMIN}:5[sqlite] - >=dev-qt/qtwidgets-${QTMIN}:5 - >=dev-qt/qtxml-${QTMIN}:5 - >=kde-frameworks/karchive-${KFMIN}:5 - >=kde-frameworks/kcompletion-${KFMIN}:5 - >=kde-frameworks/kconfig-${KFMIN}:5 - >=kde-frameworks/kconfigwidgets-${KFMIN}:5 - >=kde-frameworks/kcoreaddons-${KFMIN}:5 - >=kde-frameworks/ki18n-${KFMIN}:5 - >=kde-frameworks/kiconthemes-${KFMIN}:5 - >=kde-frameworks/kio-${KFMIN}:5 - >=kde-frameworks/kjobwidgets-${KFMIN}:5 - >=kde-frameworks/kservice-${KFMIN}:5 - >=kde-frameworks/ktextwidgets-${KFMIN}:5 - >=kde-frameworks/kwidgetsaddons-${KFMIN}:5 - >=kde-frameworks/kxmlgui-${KFMIN}:5 - media-gfx/exiv2:= - media-libs/libjpeg-turbo:= - map? ( kde-apps/marble:5 ) - phonon? ( >=media-libs/phonon-4.11.0[qt5(+)] ) - raw? ( kde-apps/libkdcraw:5 ) - share? ( >=kde-frameworks/kxmlgui-${KFMIN}:5 ) - vlc? ( media-video/vlc:= ) -" -RDEPEND="${DEPEND} - media-video/ffmpeg -" - -DOCS=( CHANGELOG.{md,old} README.md ) - -src_configure() { - local mycmakeargs=( - -DCMAKE_DISABLE_FIND_PACKAGE_QtAV=ON # bug 758641, last-rited - $(cmake_use_find_package map Marble) - $(cmake_use_find_package phonon Phonon4Qt5) - $(cmake_use_find_package raw KF5KDcraw) - $(cmake_use_find_package share KF5Purpose) - $(cmake_use_find_package vlc LIBVLC) - ) - - ecm_src_configure -} diff --git a/media-gfx/kphotoalbum/kphotoalbum-6.0.1.ebuild b/media-gfx/kphotoalbum/kphotoalbum-6.0.1.ebuild new file mode 100644 index 000000000000..5e84b2de7265 --- /dev/null +++ b/media-gfx/kphotoalbum/kphotoalbum-6.0.1.ebuild @@ -0,0 +1,66 @@ +# Copyright 1999-2025 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +ECM_HANDBOOK="forceoptional" +ECM_TEST="forceoptional" +KFMIN=6.5.0 +QTMIN=6.7.2 +inherit ecm kde.org + +DESCRIPTION="Tool for indexing, searching, and viewing images" +HOMEPAGE="https://www.kphotoalbum.org/" + +if [[ ${KDE_BUILD_TYPE} != live ]]; then + SRC_URI="mirror://kde/stable/${PN}/${PV}/${P}.tar.xz" + KEYWORDS="amd64 ~x86" +fi + +LICENSE="GPL-2+ FDL-1.2 CC-BY-SA-4.0" +SLOT="0" +IUSE="+map phonon +raw share +vlc" + +REQUIRED_USE="|| ( phonon vlc )" + +DEPEND=" + >=dev-qt/qtbase-${QTMIN}:6[dbus,gui,sql,sqlite,widgets,xml] + >=kde-frameworks/karchive-${KFMIN}:6 + >=kde-frameworks/kcompletion-${KFMIN}:6 + >=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/kjobwidgets-${KFMIN}:6 + >=kde-frameworks/kservice-${KFMIN}:6 + >=kde-frameworks/ktextwidgets-${KFMIN}:6 + >=kde-frameworks/kwidgetsaddons-${KFMIN}:6 + >=kde-frameworks/kxmlgui-${KFMIN}:6 + media-gfx/exiv2:= + media-libs/libjpeg-turbo:= + map? ( kde-apps/marble:6 ) + phonon? ( >=media-libs/phonon-4.12.0[qt6(+)] ) + raw? ( kde-apps/libkdcraw:6 ) + share? ( >=kde-frameworks/kxmlgui-${KFMIN}:6 ) + vlc? ( media-video/vlc:= ) +" +RDEPEND="${DEPEND} + !${CATEGORY}/${PN}:5 + media-video/ffmpeg +" + +DOCS=( CHANGELOG.{md,old} README.md ) + +src_configure() { + local mycmakeargs=( + $(cmake_use_find_package map Marble) + $(cmake_use_find_package phonon Phonon4Qt6) + $(cmake_use_find_package raw KDcrawQt6) + $(cmake_use_find_package share KF6Purpose) + $(cmake_use_find_package vlc LIBVLC) + ) + + ecm_src_configure +} diff --git a/media-gfx/krita/Manifest b/media-gfx/krita/Manifest index 904e49a2a187..24334408a2d0 100644 --- a/media-gfx/krita/Manifest +++ b/media-gfx/krita/Manifest @@ -1,14 +1,9 @@ -AUX krita-4.3.1-tests-optional.patch 2583 BLAKE2B 0b5e577bc17ef6b6487ce82ff4b4bc34064c659a3cf48d12a539c3029dd70f17b0b48a7398b68de6a937adff3af0c2d4a47d0f84fdc7746ec612fb05272d963f SHA512 f16885a72cd5f8f250b03903062c70190367ed409c2582d579bfb1e6ab09514df7f96214ce236e33bb8eec2f3872d887f9c3152f4e524b1719250a9064bf719c -AUX krita-5.1.5-libjxl-0.9.patch 4162 BLAKE2B 410bf2fe6ce56771a0d2ae9fcbdeae2eb34252628a2989d225c91d43b33e01ad8a77b3caa733d5e9c0ea10dc6def83407b397cfceccc431ad8b38d6f36993525 SHA512 851110f6a91dbea530105aea477d7629491ed527f5bb198032b4741b026643a34bf22681dd35944d299dff5242dc917e2f0a096914628b7337a1821795b02323 -AUX krita-5.1.5-lto.patch 1759 BLAKE2B 45fb3eb096bf61e767b2db682dad325261d17d894ec9e2e3cb0cef14c99a6c1fa4148bde7884e1e4fd5f30b036175a0da15291c961ace846e12a1e91947844b0 SHA512 81519ad76faeee65bc6f2c07585574bdbf66479adc7983f0968a09c5516e4e9da884c875c8175663c5de2cead104c2477ff3c90b9de20b0da4d80bb8fd86b090 -AUX krita-5.1.5-ocio-2.3.0.patch 1669 BLAKE2B 17ee793479946ca07788afb109ca338c3cd9ace486b2c7443ce850cc229766eb09d7b6608337c4d8ae7a7e24d633e233d36551253c3012042062a9d5c3b0fe4f SHA512 dc88f9e1b9836d8c8bc08731ac1878c3a35d4ebbd4cc361a1a4e7b59c5217709b4e207001b18a617ef4f8881a2608b548e14d383aa9db798f13acd2be02df925 AUX krita-5.1.5-sip-6.8.patch 770 BLAKE2B b63fb65ffc4ea733e8698b255b5531ff55299ec8f7cd6c153f50faaf938795618c675a7c6fbf33c1f7225c8dddaec806a9fbd6f88b621ebcff52eb13aacc0479 SHA512 5f21376508c603ca33447119ad9fa492e83992f74314cd59053f270d2020a540b4c6708b67028a7567b9db460a6fbc0aa842020b4fe5b7d4be4265d2dc78ceff AUX krita-5.2.2-fftw.patch 689 BLAKE2B a0b62a65d8de4c661a571f0f671387d0571982bbc0acdf4dc879c21711093e7a3d6ef17e6a24f04d066ecd1f861b98f8a37e626075d3fdd445f408e77484eb3f SHA512 6db10de30c0f47ea3d65490d82176685144af580a6581d0ff2fc0363e6b65166c154ad3dd05a0dadf967afc39417936275d71911e89fcf79ecfa84b1bb6b94fa AUX krita-5.2.3-tests-optional.patch 2807 BLAKE2B 7d0c0d26ce0cb1bf86f7933e8510bb5ea1e98986b811641874b4db6f622e5a31bf9b9c3b7e12267bf54f2d57d56459211df3e004dbc261e0d519f69d190e2149 SHA512 021d6d8fa1b976091088b317f54cf0be66f73b0dd9031497abc3101e4e43b69a0d4b5302e004b3ec81193bfecc0066cc4563a50b15e2c30109d3a57bafe23ca5 -AUX krita-5.2.3-znver4-xsimd.patch 1650 BLAKE2B a534c96c1fdbaf3aeb59499c88079d70574e0ac4eda170637d187fd66338b80c53e3d85fe003f75c59512eb484522403e785b0a9bdb6dca0e6a7bce8d7a0a936 SHA512 2aeb300d6230fa29c97f086aad98df16ed71d1199716739467b7c25014ba7e3a84b368cc9945042e2ce8fca0e42c03579b1e26048304498c194cff01d7d7d7cf -DIST krita-5.1.5-exiv2-0.28.patch.xz 4664 BLAKE2B e364325be3d8e40e293a7d268136be3737ce5d2b9b5607f140b30ba3e687dc8d86545f4463348587711150f1652b521f87efc859a1bf2bc3b5ed704cf3236781 SHA512 130ba9cce7d6c0138f7ef6dab1445816c2e29752aa16643c32a7d9c00d7a156ac88f01afdb782ab03fc1e0822660a070f74c02e7cde4dfbcec30baaf3c3dba7f -DIST krita-5.1.5.tar.xz 184981952 BLAKE2B 3d8d26849d8508dc040fb3ac5ab4d0ce724f670bf7d5782b37702b55afe5063543e6aa564a1c9326c90fb16f7905941e3f1ffd4296efd6f8a1c7cb34c0b41716 SHA512 b745eb9f51bb08df0948d6b97b85aee6a74b496df3e8423fb9107d79551daadb21960b4bb5c438348f662c67d0ec5b2fa6da18cfa5feb418659881cddd24d8f1 -DIST krita-5.2.3.tar.xz 186685456 BLAKE2B 42943e7ebffdb46b9da085b2069701895e37ad9c457273b9217a095f1dfdf15c715cde0b88d440abb2d73dee656730da38844f11f27022885f87bb9cc9adab26 SHA512 69a0477e3119765dd53e0502fe5a64fcdc921dfcba3ddc5dec5c1bc4342a77b172b38276f134cc56f79741e6c47b51ef51786aadf0d178ce3955e24a9fd27b74 -EBUILD krita-5.1.5.ebuild 3781 BLAKE2B ca13633df6861d9159cae079b667123280d3b4ed73e707e648b710782219999f67e8f7f806471f8eddb8c95c2e3f0a797434157a4fcc5db3cfb2a5430698ba05 SHA512 b12e60d70eb03c76c6a5dbb3df451d6666f37d07060fe90601b8c569d130ac1bb7d71ef95a6d87faa58a627b5a3823dd468eee8d0be7b370960e81957aec3316 -EBUILD krita-5.2.3.ebuild 3784 BLAKE2B d4cb1c83118cc8e363baa95fbeabffd28c761362c780b20b9936c262ff150069cd0e6fbb953536d27a553ae8a5c35f3edcbb7f9e5ed116d9efa0e7596456666e SHA512 4cbad65b9bbc625f4ce981442b52538e09928e708dcf77c5f9baceb82a827bb844433bf4a03a1dc9a5d7e90925a3a972692ce0a0a648d89004ee5cebd2e6e971 -MISC metadata.xml 832 BLAKE2B 53e632c3407b42c5d0f165bdcf67dfdd3a30bf1ec3c19ea79b90323ccbe5415e7cd34fbc79ebbb0e513359f28f381e3dac5d2534daf9ae7696f83ea77acb8130 SHA512 6cb02292d63602c80451759f6b935f65c9dfc2f01b32ac540d8cd4422ab2a70e04261fabc67b570c60e116f03e34d0165c8db6dcf9595db6cfa10849d8066336 +AUX krita-5.2.6-py3.13.patch 4520 BLAKE2B cd190b438952853207f6d5f35fadb28d0044273dc4e6d6bb8aac4c623aadd7111a6c852de302da9c72c4444ef422c64c9b2a46ee74328af8b37d77d56a645fbc SHA512 65b2cff6ddcf2e6b3be9e993be61fbcb60ea89c58ba2aa2119582d5eb80b8c230b6323072dd6fc9b56a60899459cbfe433ec4deea3a3fbdaf796111383dbf206 +DIST krita-5.2.6.tar.xz 186560016 BLAKE2B 788385983b371626214898391b08b1276a74b2ee3c9f01c1b1ae19d8791bfcf1ea1f59f6304643aeb6b16a2559fd2e45464596c721eb5d53546672d0efe17903 SHA512 8502ebef11ae066b298e999aba06df7858605cca14b889cec167b7ee3953b8ed86459b44ed90508d59bd7a9968cc9957309cefaa140a8d20293344f4dcb7fea7 +DIST krita-5.2.9.tar.xz 186574780 BLAKE2B de6be9c1de9854271fedd115902693183ed1953ad4a7dc47602bcdc5f70907bac5489ecd510fcf9507f35293e8fd8d34385374cca3ca054fb01749d96c63a22b SHA512 fc4af177371afad307a77047ceff3fb793c76e6e8b64382acd950bd89d6fc12fb2c83d76d8e8d0482860add178b8fe70ac05b1db4bc0e17520be53b9190e4bfe +EBUILD krita-5.2.6.ebuild 3909 BLAKE2B 9e152f896a1e8104efb7615fb3d147703705498341451afd389c14c1b9e8f680b6591ad71e6932214e9bdf5dbdb7b30ccdfef863a406cedbaf6870db23937daa SHA512 37f571a6f583c0c991c4502527701fe0dc9b8e8898c6196e60205c99e8fa680007ecd084f213dbe2548a6809510d7db7ecfbe97d6b7889369d34a1f1b2d00cbe +EBUILD krita-5.2.9.ebuild 3845 BLAKE2B d3be3f58942680fde7095aff84b4227316951720a084d97f8067df1bbcedebc5c8a20a893af4fb1618062eb5105a1941bfd49a4c76cab5badc0c93c17cd38970 SHA512 76dbfbeb798806af023c759ae4e0df3e28c2ccf4ddc53ce42a4e47500926fdbc2fde0afb6081ab527e18f6767dfba5048c2967ed28ac614a58ff573846cb231d +MISC metadata.xml 731 BLAKE2B 0acb0a6a6b5fe482c0fdc0a8d2eef10d41ea5f2d270b9880d87cc8159ccfe27b3d9e9ff75babdd4219ea9af8b76248cc591f621d94cac54bc0312e37493ac746 SHA512 c8627e7739acb6e8b030812fc25907cedc29a62e3a66bc7cd3087c3d7684e089a73f673235af9f5cd77ded4b4a8f438206b156fbd4ddb73fc4a1ce1640e26f70 diff --git a/media-gfx/krita/files/krita-4.3.1-tests-optional.patch b/media-gfx/krita/files/krita-4.3.1-tests-optional.patch deleted file mode 100644 index 37f2ac50ffda..000000000000 --- a/media-gfx/krita/files/krita-4.3.1-tests-optional.patch +++ /dev/null @@ -1,80 +0,0 @@ -From 2e9369281d44a2701ac7364568d381cca0d92ec5 Mon Sep 17 00:00:00 2001 -From: Andreas Sturmlechner <asturm@gentoo.org> -Date: Sun, 12 Jul 2020 18:55:31 +0200 -Subject: [PATCH] KritaAddBrokenUnitTest.cmake, MacroKritaAddBenchmark.cmake: - Skip ecm_add_test early if Qt5::Test is not available - -Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org> ---- - cmake/modules/KritaAddBrokenUnitTest.cmake | 4 ++++ - cmake/modules/MacroKritaAddBenchmark.cmake | 4 ++++ - 2 files changed, 8 insertions(+) - -diff --git a/cmake/modules/KritaAddBrokenUnitTest.cmake b/cmake/modules/KritaAddBrokenUnitTest.cmake -index b7d0e8d852..901a0a1f99 100644 ---- a/cmake/modules/KritaAddBrokenUnitTest.cmake -+++ b/cmake/modules/KritaAddBrokenUnitTest.cmake -@@ -23,6 +23,10 @@ function(KRITA_ADD_BROKEN_UNIT_TEST) - message(FATAL_ERROR "ecm_add_test() called with multiple source files but without setting \"TEST_NAME\"") - endif() - -+ if(NOT TARGET Qt5::Test) -+ return() -+ endif() -+ - set(_testname ${ARG_NAME_PREFIX}${_targetname}) - - # add test to the global list of disabled tests -diff --git a/cmake/modules/MacroKritaAddBenchmark.cmake b/cmake/modules/MacroKritaAddBenchmark.cmake -index c748d8e319..f804d9b8f4 100644 ---- a/cmake/modules/MacroKritaAddBenchmark.cmake -+++ b/cmake/modules/MacroKritaAddBenchmark.cmake -@@ -23,6 +23,10 @@ macro (KRITA_ADD_BENCHMARK _test_NAME) - set(_nogui "NOGUI") - endif() - -+ if(NOT TARGET Qt5::Test) -+ return() -+ endif() -+ - add_executable( ${_test_NAME} ${_srcList} ) - ecm_mark_as_test(${_test_NAME}) - --- -2.27.0 - -From 3c9fe10e25e94bdb1eb5e7b07ac2696635fdc5a3 Mon Sep 17 00:00:00 2001 -From: Andreas Sturmlechner <asturm@gentoo.org> -Date: Wed, 17 Jun 2020 20:18:28 +0200 -Subject: [PATCH] Don't build tests when testing not requested - -Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org> - -diff --git a/libs/flake/CMakeLists.txt b/libs/flake/CMakeLists.txt -index cbdac265d2..1a50c1620a 100644 ---- a/libs/flake/CMakeLists.txt -+++ b/libs/flake/CMakeLists.txt -@@ -9,8 +9,10 @@ include_directories( - ) - - add_subdirectory(styles) --add_subdirectory(tests) --add_subdirectory(resources/tests) -+if(BUILD_TESTING) -+ add_subdirectory(tests) -+ add_subdirectory(resources/tests) -+endif() - - set(kritaflake_SRCS - KoGradientHelper.cpp -diff --git a/libs/image/tiles3/CMakeLists.txt b/libs/image/tiles3/CMakeLists.txt -index 88c0516360..01f2383ddb 100644 ---- a/libs/image/tiles3/CMakeLists.txt -+++ b/libs/image/tiles3/CMakeLists.txt -@@ -1 +1,3 @@ --add_subdirectory(tests) -+if(BUILD_TESTING) -+ add_subdirectory(tests) -+endif() --- -2.27.0 diff --git a/media-gfx/krita/files/krita-5.1.5-libjxl-0.9.patch b/media-gfx/krita/files/krita-5.1.5-libjxl-0.9.patch deleted file mode 100644 index a578f22c67f9..000000000000 --- a/media-gfx/krita/files/krita-5.1.5-libjxl-0.9.patch +++ /dev/null @@ -1,73 +0,0 @@ -From ace7edcca6ad322581ab39620f21ccf3ffbd3b5a Mon Sep 17 00:00:00 2001 -From: Timo Gurr <timo.gurr@gmail.com> -Date: Fri, 5 Jan 2024 14:04:50 +0000 -Subject: [PATCH] Fix build with libjxl 0.9.0 - -Fix build with libjxl 0.9.0 - -BUG:478987 - -Test Plan ---------- - -* Upgrade to libjxl 0.9.0 -* Apply patch from MR and build krita (5.2.2) -* Open/Display a sample image e.g. https://jpegxl.info/test-page/red-room.jxl - -Formalities Checklist ---------------------- - -- [x] I confirmed this builds. -- [x] I confirmed Krita ran and the relevant functions work (Could successfully open/display a sample image https://jpegxl.info/test-page/red-room.jxl). -- [ ] I tested the relevant unit tests and can confirm they are not broken. (If not possible, don't hesitate to ask for help!) -- [x] I made sure my commits build individually and have good descriptions as per [KDE guidelines](https://community.kde.org/Policies/Commit_Policy). -- [x] I made sure my code conforms to the standards set in the HACKING file. -- [x] I can confirm the code is licensed and attributed appropriately, and that unattributed code is mine, as per [KDE Licensing Policy](https://community.kde.org/Policies/Licensing_Policy). - -_**Reminder: the reviewer is responsible for merging the patch, this is to ensure at the least two people can build the patch. In case a patch breaks the build, both the author and the reviewer should be contacted to fix the build.**_ -_**If this is not possible, the commits shall be reverted, and a notification with the reasoning and any relevant logs shall be sent to the mailing list, kimageshop@kde.org.**_ ---- - plugins/impex/jxl/JPEGXLImport.cpp | 15 ++++++++++++++- - 1 file changed, 14 insertions(+), 1 deletion(-) - -diff --git a/plugins/impex/jxl/JPEGXLImport.cpp b/plugins/impex/jxl/JPEGXLImport.cpp -index 573bae41247..f5b989b3b70 100644 ---- a/plugins/impex/jxl/JPEGXLImport.cpp -+++ b/plugins/impex/jxl/JPEGXLImport.cpp -@@ -511,7 +511,9 @@ JPEGXLImport::convert(KisDocument *document, QIODevice *io, KisPropertiesConfigu - JxlColorEncoding colorEncoding{}; - if (JXL_DEC_SUCCESS - == JxlDecoderGetColorAsEncodedProfile(dec.get(), -+#if JPEGXL_NUMERIC_VERSION < JPEGXL_COMPUTE_NUMERIC_VERSION(0, 9, 0) - nullptr, -+#endif - JXL_COLOR_PROFILE_TARGET_DATA, - &colorEncoding)) { - const TransferCharacteristics transferFunction = [&]() { -@@ -635,7 +637,12 @@ JPEGXLImport::convert(KisDocument *document, QIODevice *io, KisPropertiesConfigu - size_t iccSize = 0; - QByteArray iccProfile; - if (JXL_DEC_SUCCESS -- != JxlDecoderGetICCProfileSize(dec.get(), nullptr, JXL_COLOR_PROFILE_TARGET_DATA, &iccSize)) { -+ != JxlDecoderGetICCProfileSize(dec.get(), -+#if JPEGXL_NUMERIC_VERSION < JPEGXL_COMPUTE_NUMERIC_VERSION(0,9,0) -+ nullptr, -+#endif -+ JXL_COLOR_PROFILE_TARGET_DATA, -+ &iccSize)) { - errFile << "ICC profile size retrieval failed"; - document->setErrorMessage(i18nc("JPEG-XL errors", "Unable to read the image profile.")); - return ImportExportCodes::ErrorWhileReading; -@@ -643,7 +650,9 @@ JPEGXLImport::convert(KisDocument *document, QIODevice *io, KisPropertiesConfigu - iccProfile.resize(static_cast<int>(iccSize)); - if (JXL_DEC_SUCCESS - != JxlDecoderGetColorAsICCProfile(dec.get(), -+#if JPEGXL_NUMERIC_VERSION < JPEGXL_COMPUTE_NUMERIC_VERSION(0,9,0) - nullptr, -+#endif - JXL_COLOR_PROFILE_TARGET_DATA, - reinterpret_cast<uint8_t *>(iccProfile.data()), - static_cast<size_t>(iccProfile.size()))) { --- -GitLab - diff --git a/media-gfx/krita/files/krita-5.1.5-lto.patch b/media-gfx/krita/files/krita-5.1.5-lto.patch deleted file mode 100644 index 0cccee5be00e..000000000000 --- a/media-gfx/krita/files/krita-5.1.5-lto.patch +++ /dev/null @@ -1,58 +0,0 @@ -From 2c4dd042df1518d67c117ced08c5a2f3729c3193 Mon Sep 17 00:00:00 2001 -From: Dmitry Kazakov <dimula73@gmail.com> -Date: Tue, 30 Jan 2024 15:30:53 +0100 -Subject: [PATCH] Possibly fix ODR violation in the transform tool strategies - -BUG:480520 - - -(cherry picked from commit e33c7d7d533d5289c3a37007f8cf574af5bc7102) ---- - plugins/tools/tool_transform2/kis_free_transform_strategy.cpp | 2 ++ - .../tool_transform2/kis_perspective_transform_strategy.cpp | 3 ++- - 2 files changed, 4 insertions(+), 1 deletion(-) - -diff --git a/plugins/tools/tool_transform2/kis_free_transform_strategy.cpp b/plugins/tools/tool_transform2/kis_free_transform_strategy.cpp -index 49486b6bd7c..8a63bce74e3 100644 ---- a/plugins/tools/tool_transform2/kis_free_transform_strategy.cpp -+++ b/plugins/tools/tool_transform2/kis_free_transform_strategy.cpp -@@ -23,6 +23,7 @@ - #include "kis_algebra_2d.h" - - -+namespace { - enum StrokeFunction { - ROTATE = 0, - MOVE, -@@ -41,6 +42,7 @@ enum StrokeFunction { - MOVECENTER, - PERSPECTIVE - }; -+} - - struct KisFreeTransformStrategy::Private - { -diff --git a/plugins/tools/tool_transform2/kis_perspective_transform_strategy.cpp b/plugins/tools/tool_transform2/kis_perspective_transform_strategy.cpp -index ad1d9ffe4d3..bca5b51e13f 100644 ---- a/plugins/tools/tool_transform2/kis_perspective_transform_strategy.cpp -+++ b/plugins/tools/tool_transform2/kis_perspective_transform_strategy.cpp -@@ -23,7 +23,7 @@ - #include "kis_transform_utils.h" - #include "kis_free_transform_strategy_gsl_helpers.h" - -- -+namespace { - enum StrokeFunction { - DRAG_HANDLE = 0, - DRAG_X_VANISHING_POINT, -@@ -43,6 +43,7 @@ enum HandleIndexes { - HANDLE_MIDDLE_RIGHT, - HANDLE_COUNT, - }; -+} - - struct KisPerspectiveTransformStrategy::Private - { --- -GitLab - diff --git a/media-gfx/krita/files/krita-5.1.5-ocio-2.3.0.patch b/media-gfx/krita/files/krita-5.1.5-ocio-2.3.0.patch deleted file mode 100644 index 534e24469e8a..000000000000 --- a/media-gfx/krita/files/krita-5.1.5-ocio-2.3.0.patch +++ /dev/null @@ -1,37 +0,0 @@ -From 48edd05f32241c537cedf2831efc5eb91a112291 Mon Sep 17 00:00:00 2001 -From: killy |0veufOrever <80536642@qq.com> -Date: Tue, 19 Sep 2023 02:18:54 +0000 -Subject: [PATCH] Update OCIO to version 2.3.0 - ---- - 3rdparty/ext_ocio/CMakeLists.txt | 4 ++-- - plugins/dockers/lut/ocio_display_filter_vfx2021.cpp | 3 ++- - 1 files changed, 2 insertions(+), 1 deletions(-) - -From 21d384fe9fafde2f45f7339a2234f4022c53152f Mon Sep 17 00:00:00 2001 -From: killy |0veufOrever <80536642@qq.com> -Date: Tue, 19 Sep 2023 03:17:17 +0000 -Subject: [PATCH] Dimensions are not required when the OCIO version is less - than 2.3.0 - ---- - plugins/dockers/lut/ocio_display_filter_vfx2021.cpp | 7 ++++++- - 1 file changed, 6 insertions(+), 1 deletion(-) - -diff --git a/plugins/dockers/lut/ocio_display_filter_vfx2021.cpp b/plugins/dockers/lut/ocio_display_filter_vfx2021.cpp ---- a/plugins/dockers/lut/ocio_display_filter_vfx2021.cpp -+++ b/plugins/dockers/lut/ocio_display_filter_vfx2021.cpp -@@ -507,7 +507,13 @@ - unsigned height = 0; - OCIO::GpuShaderDesc::TextureType channel = OCIO::GpuShaderDesc::TEXTURE_RGB_CHANNEL; - OCIO::Interpolation interpolation = OCIO::INTERP_LINEAR; -+ -+#if OCIO_VERSION_HEX >= 0x2030000 -+ OCIO::GpuShaderCreator::TextureDimensions dimensions; -+ shaderDesc->getTexture(idx, textureName, samplerName, width, height, channel, dimensions, interpolation); -+#else - shaderDesc->getTexture(idx, textureName, samplerName, width, height, channel, interpolation); -+#endif - - if (!textureName || !*textureName || !samplerName || !*samplerName || width == 0) { - errOpenGL << "The texture data is corrupted"; diff --git a/media-gfx/krita/files/krita-5.2.3-znver4-xsimd.patch b/media-gfx/krita/files/krita-5.2.3-znver4-xsimd.patch deleted file mode 100644 index df5fffb41d47..000000000000 --- a/media-gfx/krita/files/krita-5.2.3-znver4-xsimd.patch +++ /dev/null @@ -1,38 +0,0 @@ -https://bugs.gentoo.org/936296 -https://invent.kde.org/graphics/krita/-/commit/cf2c74220b7edfae53a0715346cb4e2c7dfc38ae - -From cf2c74220b7edfae53a0715346cb4e2c7dfc38ae Mon Sep 17 00:00:00 2001 -From: Dmitry Kazakov <dimula73@gmail.com> -Date: Mon, 26 Aug 2024 14:38:03 +0200 -Subject: [PATCH] Don't use xsimd::default_arch in the pixel scaler code - -Gentoo seems to build Krita with a global -march=znver4 flag, -which causes "scalar" version of the code to be compiled with -AVX512. Even though it is not how the system is supposed to work -(and this avx512-optimization will never be used in real runtime), -we shouldn't fail compilation. - -https://bugs.gentoo.org/936296 -https://github.com/xtensor-stack/xsimd/issues/1044 ---- a/libs/pigment/KoOptimizedPixelDataScalerU8ToU16.h -+++ b/libs/pigment/KoOptimizedPixelDataScalerU8ToU16.h -@@ -28,7 +28,7 @@ public: - const int numColorChannels = m_channelsPerPixel * numColumns; - - #if defined(HAVE_XSIMD) && XSIMD_WITH_AVX2 -- using uint16_avx_v = xsimd::batch<uint16_t, xsimd::default_arch>; -+ using uint16_avx_v = xsimd::batch<uint16_t, xsimd::avx2>; - using uint16_v = xsimd::batch<uint16_t, xsimd::sse4_1>; - using uint8_v = xsimd::batch<uint8_t, xsimd::sse4_1>; - -@@ -129,7 +129,7 @@ public: - const int numColorChannels = m_channelsPerPixel * numColumns; - - #if defined(HAVE_XSIMD) && XSIMD_WITH_AVX2 -- using uint16_avx_v = xsimd::batch<uint16_t, xsimd::default_arch>; -+ using uint16_avx_v = xsimd::batch<uint16_t, xsimd::avx2>; - using uint16_v = xsimd::batch<uint16_t, xsimd::sse4_1>; - - const int channelsPerAvx2Block = 32; --- -GitLab diff --git a/media-gfx/krita/files/krita-5.2.6-py3.13.patch b/media-gfx/krita/files/krita-5.2.6-py3.13.patch new file mode 100644 index 000000000000..6714059895d0 --- /dev/null +++ b/media-gfx/krita/files/krita-5.2.6-py3.13.patch @@ -0,0 +1,120 @@ +From 0f43ec3158225092f6a02422eb90c56421326570 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Robert-Andr=C3=A9=20Mauchin?= <zebob.m@gmail.com> +Date: Tue, 18 Jun 2024 22:05:34 +0200 +Subject: [PATCH] Changes to build pykrita with Python 3.13 + +Python 3.11 deprecated Py_SetPath() in 2022 and Python 3.13 removed it. +Instead one needs to use the new PyConfig API (PEP 587) added to Python +3.8. + +Fix: #488680 +--- + .../extensions/pykrita/plugin/utilities.cpp | 61 +++++++++++++++++-- + plugins/extensions/pykrita/plugin/utilities.h | 4 +- + 2 files changed, 57 insertions(+), 8 deletions(-) + +diff --git a/plugins/extensions/pykrita/plugin/utilities.cpp b/plugins/extensions/pykrita/plugin/utilities.cpp +index 4f58183238..1e497b2681 100644 +--- a/plugins/extensions/pykrita/plugin/utilities.cpp ++++ b/plugins/extensions/pykrita/plugin/utilities.cpp +@@ -19,8 +19,10 @@ + #include <cmath> + #include <Python.h> + ++#include <QDebug> + #include <QDir> + #include <QLibrary> ++#include <QProcessEnvironment> + #include <QString> + #include <QStringList> + #include <QVector> +@@ -412,18 +414,65 @@ bool Python::setPath(const QStringList& scriptPaths) + joinedPaths = joinedPaths + pathSeparator + originalPath; + } + dbgScript << "Setting python paths:" << joinedPaths; ++ + #ifdef Q_OS_WIN +- QVector<wchar_t> joinedPathsWChars(joinedPaths.size() + 1, 0); +- joinedPaths.toWCharArray(joinedPathsWChars.data()); +- Py_SetPath(joinedPathsWChars.data()); ++ PyStatus status; ++ PyConfig config; ++ PyConfig_InitPythonConfig(&config); ++ ++ for (const QString& path : joinedPaths.split(pathSeparator)) { ++ status = PyWideStringList_Append(&config.module_search_paths, path.toStdWString().c_str()); ++ if (PyStatus_Exception(status)) { ++ qDebug() << "Error appending to PyWideStringList:" << status.err_msg; ++ dbgScript << "Error appending to PyWideStringList"; ++ return false; ++ } ++ } ++ ++ config.module_search_paths_set = true; ++ qDebug() << "Set module_search_paths"; ++ ++ status = Py_InitializeFromConfig(&config); ++ if (PyStatus_Exception(status)) { ++ qDebug() << "Cannot initialize Py_InitializeFromConfig:" << status.err_msg; ++ Py_ExitStatusException(status); ++ PyConfig_Clear(&config); ++ dbgScript << "Cannot initialize Py_InitializeFromConfig config"; ++ return false; ++ } ++ ++ PyConfig_Clear(&config); + #else + if (runningInBundle) { +- QVector<wchar_t> joinedPathsWChars(joinedPaths.size() + 1, 0); +- joinedPaths.toWCharArray(joinedPathsWChars.data()); +- Py_SetPath(joinedPathsWChars.data()); ++ PyStatus status; ++ PyConfig config; ++ PyConfig_InitPythonConfig(&config); ++ ++ for (const QString& path : joinedPaths.split(pathSeparator)) { ++ status = PyWideStringList_Append(&config.module_search_paths, path.toStdWString().c_str()); ++ if (PyStatus_Exception(status)) { ++ qDebug() << "Error appending to PyWideStringList:" << status.err_msg; ++ dbgScript << "Error appending to PyWideStringList"; ++ return false; ++ } ++ } ++ ++ config.module_search_paths_set = true; ++ ++ status = Py_InitializeFromConfig(&config); ++ if (PyStatus_Exception(status)) { ++ Py_ExitStatusException(status); ++ qDebug() << "Cannot initialize Py_InitializeFromConfig 2:" << status.err_msg; ++ PyConfig_Clear(&config); ++ dbgScript << "Cannot initialize Py_InitializeFromConfig config"; ++ return false; ++ } ++ ++ PyConfig_Clear(&config); + } + else { + qputenv("PYTHONPATH", joinedPaths.toLocal8Bit()); ++ qDebug() << "Set PYTHONPATH environment variable"; + } + #endif + isPythonPathSet = true; +diff --git a/plugins/extensions/pykrita/plugin/utilities.h b/plugins/extensions/pykrita/plugin/utilities.h +index fb309bd0b8..aec47da239 100644 +--- a/plugins/extensions/pykrita/plugin/utilities.h ++++ b/plugins/extensions/pykrita/plugin/utilities.h +@@ -81,8 +81,8 @@ public: + static bool libraryLoad(); + + /** +- * Set the Python paths by calling Py_SetPath. This should be called before +- * initialization to ensure the proper libraries get loaded. ++ * Set the Python paths by calling Py_InitializeFromConfig. This should be ++ * called before initialization to ensure the proper libraries get loaded. + */ + static bool setPath(const QStringList& scriptPaths); + +-- +2.45.2 + diff --git a/media-gfx/krita/krita-5.1.5.ebuild b/media-gfx/krita/krita-5.2.6.ebuild index 854bb12e9593..00fbf4b56f35 100644 --- a/media-gfx/krita/krita-5.1.5.ebuild +++ b/media-gfx/krita/krita-5.2.6.ebuild @@ -1,18 +1,16 @@ -# Copyright 1999-2024 Gentoo Authors +# Copyright 1999-2025 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 ECM_TEST="forceoptional" -PYTHON_COMPAT=( python3_{9..12} ) -KFMIN=5.82.0 -QTMIN=5.15.5 -VIRTUALX_REQUIRED="test" +PYTHON_COMPAT=( python3_{10..13} ) +KFMIN=5.115.0 +QTMIN=5.15.12 inherit ecm kde.org python-single-r1 if [[ ${KDE_BUILD_TYPE} = release ]]; then - SRC_URI="mirror://kde/stable/${PN}/${PV}/${P}.tar.xz - https://dev.gentoo.org/~asturm/distfiles/${P}-exiv2-0.28.patch.xz" + SRC_URI="mirror://kde/stable/${PN}/${PV}/${P}.tar.xz" KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv ~x86" fi @@ -21,7 +19,7 @@ HOMEPAGE="https://apps.kde.org/krita/ https://krita.org/en/" LICENSE="GPL-3" SLOT="5" -IUSE="color-management fftw gif +gsl heif jpegxl +mypaint-brush-engine openexr pdf qtmedia +raw webp" +IUSE="color-management fftw gif +gsl heif jpeg2k jpegxl +mypaint-brush-engine openexr pdf media +raw +xsimd webp" REQUIRED_USE="${PYTHON_REQUIRED_USE}" # bug 630508 @@ -29,9 +27,10 @@ RESTRICT="test" RDEPEND="${PYTHON_DEPS} dev-libs/boost:= + dev-libs/libunibreak:= dev-libs/quazip:0=[qt5(+)] $(python_gen_cond_dep ' - dev-python/PyQt5[declarative,gui,widgets,${PYTHON_USEDEP}] + dev-python/pyqt5[declarative,gui,widgets,${PYTHON_USEDEP}] dev-python/sip:=[${PYTHON_USEDEP}] ') >=dev-qt/qtconcurrent-${QTMIN}:5 @@ -70,16 +69,23 @@ RDEPEND="${PYTHON_DEPS} fftw? ( sci-libs/fftw:3.0= ) gif? ( media-libs/giflib ) gsl? ( sci-libs/gsl:= ) + jpeg2k? ( media-libs/openjpeg:= ) jpegxl? ( >=media-libs/libjxl-0.7.0_pre20220825:= ) heif? ( >=media-libs/libheif-1.11:=[x265] ) + media? ( media-libs/mlt:= ) mypaint-brush-engine? ( media-libs/libmypaint:= ) openexr? ( media-libs/openexr:= ) pdf? ( app-text/poppler[qt5] ) - qtmedia? ( >=dev-qt/qtmultimedia-${QTMIN}:5 ) - raw? ( media-libs/libraw:= ) + raw? ( kde-apps/libkdcraw:5 ) webp? ( >=media-libs/libwebp-1.2.0:= ) + xsimd? ( >=dev-cpp/xsimd-13.0.0 ) + +" +DEPEND="${RDEPEND} + dev-libs/immer + dev-libs/lager + dev-libs/zug " -DEPEND="${RDEPEND}" BDEPEND=" dev-cpp/eigen:3 dev-lang/perl @@ -87,12 +93,13 @@ BDEPEND=" " PATCHES=( - "${FILESDIR}/${PN}-4.3.1-tests-optional.patch" - "${WORKDIR}/${P}-exiv2-0.28.patch" # bug 906472 - "${FILESDIR}/${P}-ocio-2.3.0.patch" # bug 915107 - "${FILESDIR}/${P}-sip-6.8.patch" # bug 919139 - "${FILESDIR}/${P}-libjxl-0.9.patch" # bug 922524 - "${FILESDIR}/${P}-lto.patch" # bug 922520 + # downstream + "${FILESDIR}"/${PN}-5.2.3-tests-optional.patch + "${FILESDIR}"/${PN}-5.2.2-fftw.patch # bug 913518 + # Fedora, non-upstreamed: + "${FILESDIR}"/${P}-py3.13.patch # bug 943149 + # git master + "${FILESDIR}"/${PN}-5.1.5-sip-6.8.patch # bug 919139 ) pkg_setup() { @@ -100,6 +107,11 @@ pkg_setup() { ecm_pkg_setup } +src_prepare() { + ecm_src_prepare + cmake_comment_add_subdirectory benchmarks # bug 939842 +} + src_configure() { # Prevent sandbox violation from FindPyQt5.py module # See Gentoo-bug 655918 @@ -109,19 +121,20 @@ src_configure() { -DENABLE_UPDATERS=OFF -DKRITA_ENABLE_PCH=OFF # big mess. -DCMAKE_DISABLE_FIND_PACKAGE_KSeExpr=ON # not packaged - -DCMAKE_DISABLE_FIND_PACKAGE_xsimd=ON # not packaged $(cmake_use_find_package color-management OpenColorIO) $(cmake_use_find_package fftw FFTW3) $(cmake_use_find_package gif GIF) $(cmake_use_find_package gsl GSL) $(cmake_use_find_package heif HEIF) + $(cmake_use_find_package jpeg2k OpenJPEG) $(cmake_use_find_package jpegxl JPEGXL) + $(cmake_use_find_package media Mlt7) $(cmake_use_find_package mypaint-brush-engine LibMyPaint) $(cmake_use_find_package openexr OpenEXR) $(cmake_use_find_package pdf Poppler) - $(cmake_use_find_package qtmedia Qt5Multimedia) - $(cmake_use_find_package raw LibRaw) + $(cmake_use_find_package raw KF5KDcraw) $(cmake_use_find_package webp WebP) + $(cmake_use_find_package xsimd xsimd) ) ecm_src_configure diff --git a/media-gfx/krita/krita-5.2.3.ebuild b/media-gfx/krita/krita-5.2.9.ebuild index 6026fabe1417..78250afcc18b 100644 --- a/media-gfx/krita/krita-5.2.3.ebuild +++ b/media-gfx/krita/krita-5.2.9.ebuild @@ -1,17 +1,17 @@ -# Copyright 1999-2024 Gentoo Authors +# Copyright 1999-2025 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 ECM_TEST="forceoptional" -PYTHON_COMPAT=( python3_{10..12} ) +PYTHON_COMPAT=( python3_{10..13} ) KFMIN=5.115.0 QTMIN=5.15.12 inherit ecm kde.org python-single-r1 if [[ ${KDE_BUILD_TYPE} = release ]]; then SRC_URI="mirror://kde/stable/${PN}/${PV}/${P}.tar.xz" - KEYWORDS="amd64 ~arm64 ~riscv" + KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86" fi DESCRIPTION="Free digital painting application. Digital Painting, Creative Freedom!" @@ -28,9 +28,9 @@ RESTRICT="test" RDEPEND="${PYTHON_DEPS} dev-libs/boost:= dev-libs/libunibreak:= - dev-libs/quazip:0=[qt5(+)] + >=dev-libs/quazip-1.3-r2:=[qt5(-)] $(python_gen_cond_dep ' - dev-python/PyQt5[declarative,gui,widgets,${PYTHON_USEDEP}] + dev-python/pyqt5[declarative,gui,widgets,${PYTHON_USEDEP}] dev-python/sip:=[${PYTHON_USEDEP}] ') >=dev-qt/qtconcurrent-${QTMIN}:5 @@ -94,11 +94,10 @@ BDEPEND=" PATCHES=( # downstream - "${FILESDIR}"/${P}-tests-optional.patch + "${FILESDIR}"/${PN}-5.2.3-tests-optional.patch "${FILESDIR}"/${PN}-5.2.2-fftw.patch # bug 913518 # git master "${FILESDIR}"/${PN}-5.1.5-sip-6.8.patch # bug 919139 - "${FILESDIR}"/${PN}-5.2.3-znver4-xsimd.patch # bug 936296 ) pkg_setup() { @@ -106,6 +105,11 @@ pkg_setup() { ecm_pkg_setup } +src_prepare() { + ecm_src_prepare + cmake_comment_add_subdirectory benchmarks # bug 939842 +} + src_configure() { # Prevent sandbox violation from FindPyQt5.py module # See Gentoo-bug 655918 diff --git a/media-gfx/krita/metadata.xml b/media-gfx/krita/metadata.xml index c586507e3736..82ce837b7102 100644 --- a/media-gfx/krita/metadata.xml +++ b/media-gfx/krita/metadata.xml @@ -12,7 +12,6 @@ <flag name="color-management">Enable color management via <pkg>media-libs/opencolorio</pkg></flag> <flag name="media">Enable sound support for animations via <pkg>media-libs/mlt</pkg></flag> <flag name="mypaint-brush-engine">Enable MyPaint brush engine support <pkg>media-libs/libmypaint</pkg></flag> - <flag name="qtmedia">Enable sound support for animations via <pkg>dev-qt/qtmultimedia</pkg></flag> <flag name="xsimd">Enable usage of SIMD instructions via <pkg>dev-cpp/xsimd</pkg></flag> </use> </pkgmetadata> 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/libbgcode/Manifest b/media-gfx/libbgcode/Manifest index cfad3e9ac0cf..932dabb449bf 100644 --- a/media-gfx/libbgcode/Manifest +++ b/media-gfx/libbgcode/Manifest @@ -1,5 +1,3 @@ -DIST libbgcode-0.0.20240730.tar.gz 456671 BLAKE2B a15e903e42090eff3945f446f7d805ceabad533a2edcc9e4c82d99bac7aa42e9f10470f5ee41ed449799d9bc318c9097439a6534607a00d0bfeb2e2dea252b79 SHA512 b448d9ace946d85a4decc4a2cc05e1a41c64ba49968db1f818ba5974120f458159d5b639d5501a98daf4544a483366cd0e299c052f21577bb5ad763f7220d7e3 -DIST libbgcode-0.0.20240903.tar.gz 456751 BLAKE2B 93cd8eb83083581ba1ba735c6820dc0ead18d13ca0613387559d610f39c8011881bcc92ffec65fbcb40113b2b877050c15c7816d6db063698ce7ba5df7b35eda SHA512 86e9d85f0e52ebde853979e79639dc4424e26686fe55c45d78ca683cf32d8ec059976d43ffda9339a41892d30ebb267f8c360851889ad0a48ced874c27546f04 -EBUILD libbgcode-0.0.20240730.ebuild 769 BLAKE2B 59f6ad1854677761895653c2810d91560b0e82bd0ac423ec0f259c3dedea26d70ffb9163aa4a6bf107156716df813a4424397e49c99e5e464a430fcdfc9359de SHA512 d4e8eb634555dbd094da4b3992e10b3047e8c3d57026deb57933a9e85b2a31d43ded717d845f9a402a64c4d7b6f79efae9ebe16e70cbfce2b06a0747b3fda0ca -EBUILD libbgcode-0.0.20240903.ebuild 770 BLAKE2B 22c01f20d4350d8328ac9dc60a47c8167386ef6fe27e887124672b38b955e949f0cba1a225242dca2e8e9adea1dc96d7b2f84d7bc12ec9139d4b8c31682fa116 SHA512 aeef6a4f591f5a5490e65347ec5f8a570fc4476efced843f864f29e2127205980e2376169d1a14326f11d0d6335e213de9fd4f7510f60b4b143ea540b9fbdb90 +DIST libbgcode-0.0.20241024.tar.gz 529007 BLAKE2B 1ca0bfbf5ad6329190ba9c452678bbae0beba8121a9fd1c3e7642b365c86cccbf26ae41841a0596cf37034fda4930f771729a999ffd231000775841348db0cbd SHA512 1efc72180319f3876823a0da486f4a59c0c83e197cdd3f3a1163266e226d7026d5dc8f8f290e0507cd71a6cdea5648404fbe24a975833eba67ee98fb4b0466a3 +EBUILD libbgcode-0.0.20241024.ebuild 769 BLAKE2B 911d8250be4e3d699e6d9d4b3929de3ecf8b563a36dfc3de36af49764600a7b858b27010bb2d3c25c9c09266e0f467bc98ba27426310ada8bb10c06c759c4519 SHA512 084462532686fdbead89130257bfa68496a068b9b40b22d2df2edcd50cb0a77d8bef9205a3536b0da1b68d75d00e56820ace89483440c86e06b74c47f03f3aa1 MISC metadata.xml 517 BLAKE2B f13be19479e8ade30b867081f8014821be2c5650b407890268e6cab65330bd4b8e3ab37e6cba531f029ebb0499d0cb7269ccb17b309b15105f6bb6aa94b5c42e SHA512 0d09893294fc40e9b52bbdf7f8f31e075c1e8839fd90c2b9656b70d30ab52f088527ab2d1ffec797ecb1e309ea7d40bb48d571eafd19eb3a2592aef4e7c918c0 diff --git a/media-gfx/libbgcode/libbgcode-0.0.20240903.ebuild b/media-gfx/libbgcode/libbgcode-0.0.20240903.ebuild deleted file mode 100644 index 938eb7efa59a..000000000000 --- a/media-gfx/libbgcode/libbgcode-0.0.20240903.ebuild +++ /dev/null @@ -1,35 +0,0 @@ -# Copyright 2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit cmake - -LIBBGCODE_COMMIT=3db61e45713932b4a9cdd469aa567d65e0095d00 - -DESCRIPTION="Prusa Block & Binary G-code reader / writer / converter" -HOMEPAGE="https://github.com/prusa3d/libbgcode" -SRC_URI="https://github.com/prusa3d/libbgcode/archive/${LIBBGCODE_COMMIT}.tar.gz -> ${P}.tar.gz" - -S="${WORKDIR}/${PN}-${LIBBGCODE_COMMIT}" -LICENSE="AGPL-3" -SLOT="0" -KEYWORDS="~amd64 ~arm64 ~x86" -IUSE="test" -RESTRICT="!test? ( test )" - -RDEPEND=" - >=dev-libs/heatshrink-0.4.1 - >=sys-libs/zlib-1.0 -" -DEPEND="${RDEPEND} - dev-libs/boost - test? ( =dev-cpp/catch-2*:0 ) -" - -src_configure() { - local mycmakeargs=( - -DLibBGCode_BUILD_TESTS=$(usex test) - ) - cmake_src_configure -} diff --git a/media-gfx/libbgcode/libbgcode-0.0.20240730.ebuild b/media-gfx/libbgcode/libbgcode-0.0.20241024.ebuild index c53e99967c5c..cbc28fd7146a 100644 --- a/media-gfx/libbgcode/libbgcode-0.0.20240730.ebuild +++ b/media-gfx/libbgcode/libbgcode-0.0.20241024.ebuild @@ -5,7 +5,7 @@ EAPI=8 inherit cmake -LIBBGCODE_COMMIT=5347c3399ec933f590d1f96903a406647f287d8f +LIBBGCODE_COMMIT=d33a277a3ce2c0a7f9ba325caac6d730e0f7a412 DESCRIPTION="Prusa Block & Binary G-code reader / writer / converter" HOMEPAGE="https://github.com/prusa3d/libbgcode" diff --git a/media-gfx/libimagequant/Manifest b/media-gfx/libimagequant/Manifest index 061002b635a7..06c128bef84c 100644 --- a/media-gfx/libimagequant/Manifest +++ b/media-gfx/libimagequant/Manifest @@ -38,8 +38,8 @@ DIST unicode-ident-1.0.12.crate 42168 BLAKE2B 4cede03c08758ccd6bf53a0d0057d7542d DIST version_check-0.9.4.crate 14895 BLAKE2B fa1fa4008af165bfc1fdbe560488afd9d232cfafee94104fbcc4cbc52f234849bff9ddfa88109a1ac682f6d9c1d86b0459893d223f64e65adc08966aaf93dc89 SHA512 b172dc9a3759a4a683ffc39b9a40b03b9974b626a088217de87090466cef695226557c226cf3e469b2b25ee7297b7eb0d7719878cab42457f80146a81943c0c8 DIST zerocopy-0.7.20.crate 121557 BLAKE2B 24e63690b03c5becade47aa7ed16ef7a3d482c4cc8d0dfcf470f01f7592e3a704e4c52f0ab361b6fca4af18f977e33ff2bb4feb64d13daa1fcb62af9f9731be5 SHA512 fc3f883e4cfa38d01443841242a64575e69fb2ce0cfcdd71a28dd4ccb95e383ea1839a199fb13a58f9faf7608720a38cb0537612d7d832c3582946ee638886a0 DIST zerocopy-derive-0.7.20.crate 528379 BLAKE2B 247ab986cb720903df383429a6785c7dec230f6888246a9a7539a1bc8061601b27cea8baf4db2fab491fb32842901466ac32cc80504b3eaf35c25cd1a27ec9e8 SHA512 3c76100c3c9c1a5aae39750448f8ed37069be8e65cc74d67cc983c7e69988581f98248183955294e7c8d044c7a968b6e6534b8f84d9969693cbe4c5f679d5818 -EBUILD libimagequant-2.17.0.ebuild 1385 BLAKE2B f286c1e73acec4ec45c45da09fa4a45b70ff76f5090e490180a757c933acc998ef92064aa01cea1e8630e5cf2e216c2ec9e7577888912eaf4188fe78caff8e4e SHA512 beb4f2736ea3faa92c4f8f36eb752e31391f27e794ea1e0b92b3cefe7858bd60600df5d5d644f0bb6bbcee150c3ddaca703fb38aad65379fe70bad555f0aaf30 -EBUILD libimagequant-2.18.0.ebuild 1385 BLAKE2B cf827fc28482b2da325dd14c7b3246caa669bc362afa2f034bc8a437df692002ac8f5bb9a302167bee66144300ebe2fc7172f040bae90a3172a2cb4e553027ac SHA512 52222bbb7c4ff91d6675188544786b2c7693843ee553a0ef3566b135f0f48a376da61b8dd92f8b48edaaf3a9cbff7144a12d1fa9d013b0c87bc3c035de31ac40 -EBUILD libimagequant-4.2.2.ebuild 1728 BLAKE2B b7178b42b78cbee9ac584671191165fba6c7fc36ab23ff675b0f7ef86fd53c10ee63fece727eaec33a013b06bed6b0ee77da170b9648e637faf0308c2157ed16 SHA512 2e4ce84bced1c3e731d7a369421d286a16f6c9f20efcc58e15c285a701ac3dcf835b0a1eb25739a5c843044302ebcc445054a8349d7a202294c6aca99fe6b393 -EBUILD libimagequant-4.3.0.ebuild 1203 BLAKE2B 11f74e18f0f25b86d3d98eebd262a4343ed29fef47147e8dbc8cccee71db498465a0253708c57c3d42ed98f265fa3a0b64b22b1b57fbb8a295563526ab36a703 SHA512 9d02d36954ae760873ad5a0c336848cfbf1c0a96dbb9db96deccbaf0312900d37b5b7774c962a0b65b4216ed287cd16f27ea5a474188714bc3d4177cd4072bf2 +EBUILD libimagequant-2.17.0.ebuild 1379 BLAKE2B 6ca72ee6ec84edd8e950ed5b512561ea3eda0f527686866313c9fd8e60fda898857b69f1bc307ba53256e403c4e94f63b6686286ae30c52285c6e9bacee89d01 SHA512 991ccda370e134a476dba916b36817e11a87a14857985d2973222b872fc6e45928aff7e5fb8dbc90b41f8e5a64942d4eb2d59cd8f3466c4aa9f58f2637b1367b +EBUILD libimagequant-2.18.0.ebuild 1379 BLAKE2B 3e3d07bb4e879ee47f7aa92aab771200779a67b9f49bac88004f50038517418d832a4bf5ed7fbc1147207d74a5bdfaa6da0dd04aa84b46abf9118ee72b106d81 SHA512 24ca1bf46a5168a7a2bc45c4cc37fd3580576211e366c6bab3be6eb885e31d3c524dac4f10ac54d099505b8065de8088e3b49cf23227856470616d5437df111d +EBUILD libimagequant-4.2.2-r1.ebuild 1707 BLAKE2B fc08697734a2d80e531043ad16db163a6e96448bb3e1ae48d9ce3dcceac8b496978e5bcfa25262e33a5fc51c92b01a4dd6aeb26f8454298e58b93d8e3f6de011 SHA512 87483cd7763d48c0082d841562d118a0b285bb627e2f9b64c13061030da3f5c4c69003fdcb7fbd0a0c243d548c2e41ebc2dc333af15e5a0711bdc8b72eb05d32 +EBUILD libimagequant-4.3.0-r1.ebuild 1178 BLAKE2B cd13826cb4b107e4242027a760a6721526a1828ab6e796d8cdabf14bc38ccfd8cfe687e50201e85709875a72057351a42a4bd355fd4b482f20cce1359344a133 SHA512 f2a15ac82a7845db560bff9bab3d73911837f5d189acc7c0a0c516adddd5aeb9d5539b7a471a51b29b0dcd4d76c7a2e88e8576da84d610a29bb693ecd10d798b MISC metadata.xml 431 BLAKE2B 19ce5c802fc25f17f74073dba0473b11ea6a5820ec0726d405701c1e6b8f0a64d7019f4fe56ff0e6e43aba6cb52c34a5ac821d4bfcb8d9d6a10d0945bafc8a90 SHA512 4e22cda189c98a07cab44be95311def7b6955025d320869b55006e0e09f98c7370de40f552b556c466013b0c68b04013f36559f4970ebfd79655faf446c1e166 diff --git a/media-gfx/libimagequant/libimagequant-2.17.0.ebuild b/media-gfx/libimagequant/libimagequant-2.17.0.ebuild index 6d059018082b..58d2884303ca 100644 --- a/media-gfx/libimagequant/libimagequant-2.17.0.ebuild +++ b/media-gfx/libimagequant/libimagequant-2.17.0.ebuild @@ -11,7 +11,7 @@ SRC_URI="https://github.com/ImageOptim/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz LICENSE="GPL-3" SLOT="0/0" -KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux" +KEYWORDS="~alpha amd64 arm arm64 hppa ~loong ~m68k ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux" IUSE="cpu_flags_x86_sse2 openmp" PATCHES=( diff --git a/media-gfx/libimagequant/libimagequant-2.18.0.ebuild b/media-gfx/libimagequant/libimagequant-2.18.0.ebuild index ab7503e70f89..b029927b09fa 100644 --- a/media-gfx/libimagequant/libimagequant-2.18.0.ebuild +++ b/media-gfx/libimagequant/libimagequant-2.18.0.ebuild @@ -11,7 +11,7 @@ SRC_URI="https://github.com/ImageOptim/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz LICENSE="GPL-3" SLOT="0/0" -KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux" +KEYWORDS="~alpha amd64 arm arm64 hppa ~loong ~m68k ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux" IUSE="cpu_flags_x86_sse2 openmp" PATCHES=( diff --git a/media-gfx/libimagequant/libimagequant-4.2.2.ebuild b/media-gfx/libimagequant/libimagequant-4.2.2-r1.ebuild index 5a96622a9881..33b4d2ef906f 100644 --- a/media-gfx/libimagequant/libimagequant-4.2.2.ebuild +++ b/media-gfx/libimagequant/libimagequant-4.2.2-r1.ebuild @@ -57,7 +57,6 @@ KEYWORDS="amd64 arm arm64 ~loong ppc ppc64 ~s390 sparc" BDEPEND=" >=dev-util/cargo-c-0.9.11 - >=virtual/rust-1.60 " QA_FLAGS_IGNORED="usr/lib.*/libimagequant.so.*" diff --git a/media-gfx/libimagequant/libimagequant-4.3.0.ebuild b/media-gfx/libimagequant/libimagequant-4.3.0-r1.ebuild index 3834a58ebed1..710c7dc0634f 100644 --- a/media-gfx/libimagequant/libimagequant-4.3.0.ebuild +++ b/media-gfx/libimagequant/libimagequant-4.3.0-r1.ebuild @@ -19,11 +19,10 @@ LICENSE="GPL-3+" # Dependent crate licenses LICENSE+=" MIT Unicode-DFS-2016 ZLIB" SLOT="0/0" -KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~s390 ~sparc" +KEYWORDS="amd64 ~arm ~arm64 ~loong ppc ppc64 ~s390 sparc" BDEPEND=" >=dev-util/cargo-c-0.9.14 - >=virtual/rust-1.64 " QA_FLAGS_IGNORED="usr/lib.*/libimagequant.so.*" diff --git a/media-gfx/librecad/Manifest b/media-gfx/librecad/Manifest index 894736d7e964..c86d4c3f66fd 100644 --- a/media-gfx/librecad/Manifest +++ b/media-gfx/librecad/Manifest @@ -1,14 +1,6 @@ -AUX librecad-2.1.3-boost-1.76.patch 1032 BLAKE2B 9c8893627fd43cb831d48e9f86472c0e0029cfa155f08e3813f12f7f2750a91eac1d384ad149ee87585437d26426242e6f69364cabb33d30db74d220494b0395 SHA512 7751fc6ec2106f4b0a8f9d1fdd676ec4e2098d79e52e6365c5e857bc0e96adde30c66320f6b2625c0ecec7e4bff0352683b467a5e699b57c6ad87f494bd1bcb8 -AUX librecad-2.1.3-gcc-9.patch 8494 BLAKE2B 85f7cfd7822d27c4b76b6cc9b71f9667b912ef80229e2a70110155d4b52f0e203b186ffb6a0be160d6d2aadcaf241994d7f78d81a096d7540c46b946ed7cb892 SHA512 5adb8086244ec18e78f503b7522ea79213b629d297bb07fad0c21ae1e205731fd544aff7e979f1cc5709542a23311c771d61f13f4ba09f34baff9a24deae5eed -AUX librecad-2.1.3-qt-5.11.patch 1396 BLAKE2B 80e637b724df81dce60c17354bed56a2329dd4c3f445b40ea18a4a49614f2ee34114e1b6cc008b29e2dbd7b65c53340aaa447173f6f4d23d80e1a8809131aae7 SHA512 5e4ae43ac89fc8acf779fec9e062cac3896f0e41b0bf7fdab91ef128ab1a20a4ecda71ef332d9af7403f11a813323cc509e0682e5ffdf97786599271a2711f25 -AUX librecad-2.1.3-qt-5.15.patch 1270 BLAKE2B 0947b13ff328e4f1c3ac04d846e7ed372d76d4858cecff5fe4ff8fc8c3c1558cd0e9ac53354e1f0b5b1d137db09c8205f034df9356b9b9e3206a611608fb8166 SHA512 b1a5afe1d22b7725c7d10a10bed5e52495cda7699ff20bd0f75bbfe28f7131a3d9cd5ec0a1ae7fd329196d2f88bb4b8336301fdb6efa073d773f31340a062ba0 -AUX librecad-2.2.0-fix-missing-header.patch 872 BLAKE2B cfa4d3908b6a1edd46ed9d624b5b6e4ee84c7935d5b047d10e85e319ace6748a27b6b9b93ccfd2f8c9e27ce72449a00ac27ffeb88e478422d1fac82fd20ff8d1 SHA512 3487425bc33eb706a68998369194c8005c7a50f244806d68555c706268e6d10bcab99abab90b5c86fb3615e344aa1f690eb4d1f40d44564e67555025c3bdf26e -DIST librecad-2.1.3.tar.gz 22415288 BLAKE2B fb920113a7e4b2e9e7e3425f77364c36f6be676a3cd109798786b06d31698fd11437bc7f50cb843ca02d761730e83db7fde475d1bce6a65336a845b5b0114918 SHA512 246cffcc1ea3389997b4a738ab5e3d78e8c1096817ecb1ca28f38d601bc5d1a95f60798ac82308914a34da7b5dbc302b8363cf8b58a97221fdc8ee63010adc6c DIST librecad-2.2.0.2.tar.gz 13645528 BLAKE2B 43a9ada4d6fe8c0cb96dc1003a9e7aa3b4d21619ce9776de1e6d273dd884f2313f9e90abed9cadcd44aaac2131bb62ffb0105bc0d8a097513ac42b9886107021 SHA512 054c6e6cf35a30099e71dd022574864c42d99db8bfa73b544113573723f8e6db2c92f9b7a827b947528f8ad9c743bca73a77a81bc50a9dc66f290480bb38db05 -DIST librecad-2.2.0.tar.gz 13837301 BLAKE2B ede9181b6805455d10773b70a8262ffb5a1c48f353dbfd1b80f705ba3194be700e9a486cdf528c4e8015b327a75a29c81b832186024d48229a6cc5fd9ca2dc12 SHA512 df33eac311b5232d6fc0480be1b1c9d257a33ba22f9b7897af4c1761978c87c07a962ae3ea37e8728661a788152157fc621aae65d60d44ae37b2028919cc96a2 -DIST librecad-gentoo-CVE-patches-2.1.3.tar.gz 11687 BLAKE2B 4676fa60033e6d0ace35bbebfae569366a50ec46c2dc5b90bace9564e1f6c2020f733f63981788b6f5288fb0c57760215e7b35f294656c21787ebdefa8447fa0 SHA512 b485b41ab1d6eb61750c11a9b327fc70d28cd0cf689b3cd815b4982d3d800737f402522d9c3d416f1e43422166e7de4f97055de238cc2fe80cc45f11fa3377e6 -EBUILD librecad-2.1.3-r7.ebuild 2879 BLAKE2B 4b9da167e4db48da0c8a41bf43c3d5fcadabea9f57a82270fec85b18da2dd6823d60be0eea3bd4bad7f4324599c47fd4b020276f3a4a28f7be5a2d13004a5f8a SHA512 3ed191982b167c0cabdd28e5ab7702784e0da508f358a066507bde711cb5917c885de435985ea0636e96d1f94586f76c007607a7ec1e1f90cb14646724988546 -EBUILD librecad-2.2.0.2.ebuild 2357 BLAKE2B 303cdeee8cdd626046c61fb78b5f16eb5dab1cd056f9a5fe8dce8ea4759034f1e525b936d487da823653946908da0c3d3bc4651f121521529f8eb109d16bfba4 SHA512 41902aee53ee09c807a523ffef651a0a066c016fe286a3ca98b92a587fff91775b892f26fd413bb6f6b8509772fe3d356b9e420551415b4d24439e12128db520 -EBUILD librecad-2.2.0.ebuild 2413 BLAKE2B 96ede5e05dda79f883dd89b2cd759e56400b2474b3609e135e0faa34904121694e396f34cd121a9b4df84afe57d818a1bb7ca253f6a894d96aff41a093dd89b2 SHA512 84d0f89d8f9f35ddb21a18537bcbc02cad1f665009e5f0c251fd78bc73baeb1f0273244e4e7b353bd97f4484a21542953e45042d8c53ab210677e6a49396990b -EBUILD librecad-9999.ebuild 2357 BLAKE2B f1b84cd8486d81b2a11216448be1e7c36d8d4347bfe09297a472b31278fa9e7aeeb4d9f325ed234ac05a0ae6065280efd159b7847195bd868d0991f6101f6c04 SHA512 ca46b07e00004e93ff1fcc2be9ea55049fa92154ce26eca11d033476d66b401653106dfe0fd835e07421d67d651a9af27a9cc505a440f85b43d3ba0c76d17d40 +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/files/librecad-2.1.3-boost-1.76.patch b/media-gfx/librecad/files/librecad-2.1.3-boost-1.76.patch deleted file mode 100644 index 2500bab79b19..000000000000 --- a/media-gfx/librecad/files/librecad-2.1.3-boost-1.76.patch +++ /dev/null @@ -1,29 +0,0 @@ -From 1fd07fcd847659d518efa0897a9f603de83fe362 Mon Sep 17 00:00:00 2001 -From: Jiri Slaby <jslaby@suse.cz> -Date: Tue, 4 May 2021 09:25:03 +0200 -Subject: [PATCH] add boost tuple include to fix build - -With boost 1.76, we see: -lib/engine/rs_ellipse.cpp:70:15: error: 'tuple' in namespace 'boost::math' does not name a template type - 70 | boost::math::tuple<double, double, double> operator()(double const& z) const { - | ^~~~~ - -Fix this by including the proper boost header. ---- - librecad/src/lib/engine/rs_ellipse.cpp | 3 +++ - 1 file changed, 3 insertions(+) - -diff --git a/librecad/src/lib/engine/rs_ellipse.cpp b/librecad/src/lib/engine/rs_ellipse.cpp -index 291f734ea..d47bf6ca4 100644 ---- a/librecad/src/lib/engine/rs_ellipse.cpp -+++ b/librecad/src/lib/engine/rs_ellipse.cpp -@@ -48,6 +48,9 @@ - #include <boost/version.hpp> - #include <boost/math/tools/roots.hpp> - #include <boost/math/special_functions/ellint_2.hpp> -+#if BOOST_VERSION > 104500 -+#include <boost/math/tools/tuple.hpp> -+#endif - #endif - - namespace{ diff --git a/media-gfx/librecad/files/librecad-2.1.3-gcc-9.patch b/media-gfx/librecad/files/librecad-2.1.3-gcc-9.patch deleted file mode 100644 index f8214f29fab3..000000000000 --- a/media-gfx/librecad/files/librecad-2.1.3-gcc-9.patch +++ /dev/null @@ -1,209 +0,0 @@ -diff --git a/librecad/src/actions/rs_actiondrawcircletan1_2p.cpp b/librecad/src/actions/rs_actiondrawcircletan1_2p.cpp -index c14da00e4..f305408aa 100644 ---- a/librecad/src/actions/rs_actiondrawcircletan1_2p.cpp -+++ b/librecad/src/actions/rs_actiondrawcircletan1_2p.cpp -@@ -36,11 +36,6 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. - #include "rs_preview.h" - #include "rs_debug.h" - --namespace{ --//list of entity types supported by current action --auto enTypeList={RS2::EntityLine, RS2::EntityArc, RS2::EntityCircle}; --} -- - struct RS_ActionDrawCircleTan1_2P::Points { - std::vector<RS_Vector> points; - RS_CircleData cData; -diff --git a/librecad/src/actions/rs_actiondrawcircletan1_2p.h b/librecad/src/actions/rs_actiondrawcircletan1_2p.h -index a6f40a6ea..b5976c9f6 100644 ---- a/librecad/src/actions/rs_actiondrawcircletan1_2p.h -+++ b/librecad/src/actions/rs_actiondrawcircletan1_2p.h -@@ -79,6 +79,9 @@ class RS_ActionDrawCircleTan1_2P : public RS_PreviewActionInterface { - private: - struct Points; - std::unique_ptr<Points> pPoints; -+ -+ //list of entity types supported by current action -+ const std::initializer_list<RS2::EntityType> enTypeList {RS2::EntityLine, RS2::EntityArc, RS2::EntityCircle}; - }; - - #endif -diff --git a/librecad/src/actions/rs_actiondrawcircletan2.cpp b/librecad/src/actions/rs_actiondrawcircletan2.cpp -index d0558f05b..820e42266 100644 ---- a/librecad/src/actions/rs_actiondrawcircletan2.cpp -+++ b/librecad/src/actions/rs_actiondrawcircletan2.cpp -@@ -33,10 +33,6 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. - #include "rs_preview.h" - #include "rs_debug.h" - --namespace { --auto enTypeList={RS2::EntityLine, RS2::EntityArc, RS2::EntityCircle}; --} -- - struct RS_ActionDrawCircleTan2::Points { - RS_CircleData cData; - RS_Vector coord; -diff --git a/librecad/src/actions/rs_actiondrawcircletan2.h b/librecad/src/actions/rs_actiondrawcircletan2.h -index bed568970..5b2040e90 100644 ---- a/librecad/src/actions/rs_actiondrawcircletan2.h -+++ b/librecad/src/actions/rs_actiondrawcircletan2.h -@@ -77,6 +77,9 @@ class RS_ActionDrawCircleTan2 : public RS_PreviewActionInterface { - private: - struct Points; - std::unique_ptr<Points> pPoints; -+ -+ //list of entity types supported by current action -+ const std::initializer_list<RS2::EntityType> enTypeList {RS2::EntityLine, RS2::EntityArc, RS2::EntityCircle}; - }; - - #endif -diff --git a/librecad/src/actions/rs_actiondrawcircletan2_1p.cpp b/librecad/src/actions/rs_actiondrawcircletan2_1p.cpp -index 324c16686..51cd29a19 100644 ---- a/librecad/src/actions/rs_actiondrawcircletan2_1p.cpp -+++ b/librecad/src/actions/rs_actiondrawcircletan2_1p.cpp -@@ -35,10 +35,6 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. - #include "rs_preview.h" - #include "rs_debug.h" - --namespace { --auto enTypeList={RS2::EntityLine, RS2::EntityArc, RS2::EntityCircle}; --} -- - struct RS_ActionDrawCircleTan2_1P::Points { - RS_Vector point; - RS_CircleData cData; -diff --git a/librecad/src/actions/rs_actiondrawcircletan2_1p.h b/librecad/src/actions/rs_actiondrawcircletan2_1p.h -index 40c239037..e44a56c36 100644 ---- a/librecad/src/actions/rs_actiondrawcircletan2_1p.h -+++ b/librecad/src/actions/rs_actiondrawcircletan2_1p.h -@@ -73,6 +73,9 @@ class RS_ActionDrawCircleTan2_1P : public RS_PreviewActionInterface { - private: - struct Points; - std::unique_ptr<Points> pPoints; -+ -+ //list of entity types supported by current action -+ const std::initializer_list<RS2::EntityType> enTypeList {RS2::EntityLine, RS2::EntityArc, RS2::EntityCircle}; - }; - - #endif -diff --git a/librecad/src/actions/rs_actiondrawcircletan3.cpp b/librecad/src/actions/rs_actiondrawcircletan3.cpp -index 026ed30e5..eaca13d63 100644 ---- a/librecad/src/actions/rs_actiondrawcircletan3.cpp -+++ b/librecad/src/actions/rs_actiondrawcircletan3.cpp -@@ -35,10 +35,6 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. - #include "rs_preview.h" - #include "rs_debug.h" - --namespace { --auto enTypeList={RS2::EntityArc, RS2::EntityCircle, RS2::EntityLine, RS2::EntityPoint}; --} -- - struct RS_ActionDrawCircleTan3::Points { - std::vector<RS_AtomicEntity*> circles; - std::shared_ptr<RS_CircleData> cData{std::make_shared<RS_CircleData>()}; -diff --git a/librecad/src/actions/rs_actiondrawcircletan3.h b/librecad/src/actions/rs_actiondrawcircletan3.h -index d0cabfa2d..3201c5f88 100644 ---- a/librecad/src/actions/rs_actiondrawcircletan3.h -+++ b/librecad/src/actions/rs_actiondrawcircletan3.h -@@ -78,6 +78,8 @@ class RS_ActionDrawCircleTan3 : public RS_PreviewActionInterface { - struct Points; - std::unique_ptr<Points> pPoints; - -+ //list of entity types supported by current action -+ const std::initializer_list<RS2::EntityType> enTypeList {RS2::EntityArc, RS2::EntityCircle, RS2::EntityLine, RS2::EntityPoint}; - }; - - #endif -diff --git a/librecad/src/actions/rs_actiondrawlinerelangle.cpp b/librecad/src/actions/rs_actiondrawlinerelangle.cpp -index 8415dd604..b9ce996fe 100644 ---- a/librecad/src/actions/rs_actiondrawlinerelangle.cpp -+++ b/librecad/src/actions/rs_actiondrawlinerelangle.cpp -@@ -38,11 +38,6 @@ - #include "rs_preview.h" - #include "rs_debug.h" - --namespace { --auto enTypeList={RS2::EntityLine, RS2::EntityArc, RS2::EntityCircle, -- RS2::EntityEllipse}; --} -- - RS_ActionDrawLineRelAngle::RS_ActionDrawLineRelAngle( - RS_EntityContainer& container, - RS_GraphicView& graphicView, -diff --git a/librecad/src/actions/rs_actiondrawlinerelangle.h b/librecad/src/actions/rs_actiondrawlinerelangle.h -index 1e102792d..71e5185b7 100644 ---- a/librecad/src/actions/rs_actiondrawlinerelangle.h -+++ b/librecad/src/actions/rs_actiondrawlinerelangle.h -@@ -110,6 +110,9 @@ class RS_ActionDrawLineRelAngle : public RS_PreviewActionInterface { - * Is the angle fixed? - */ - bool fixedAngle; -+ -+ //list of entity types supported by current action -+ const std::initializer_list<RS2::EntityType> enTypeList {RS2::EntityLine, RS2::EntityArc, RS2::EntityCircle,RS2::EntityEllipse}; - }; - - #endif -diff --git a/librecad/src/actions/rs_actiondrawlinetangent1.cpp b/librecad/src/actions/rs_actiondrawlinetangent1.cpp -index 197b0cb6c..47a93c766 100644 ---- a/librecad/src/actions/rs_actiondrawlinetangent1.cpp -+++ b/librecad/src/actions/rs_actiondrawlinetangent1.cpp -@@ -36,12 +36,6 @@ - #include "rs_preview.h" - #include "rs_debug.h" - --namespace{ --auto circleType={RS2::EntityArc, RS2::EntityCircle, -- RS2::EntityEllipse, RS2::EntitySplinePoints -- }; --} -- - RS_ActionDrawLineTangent1::RS_ActionDrawLineTangent1( - RS_EntityContainer& container, - RS_GraphicView& graphicView) -diff --git a/librecad/src/actions/rs_actiondrawlinetangent1.h b/librecad/src/actions/rs_actiondrawlinetangent1.h -index 0f76b3684..d20d302dd 100644 ---- a/librecad/src/actions/rs_actiondrawlinetangent1.h -+++ b/librecad/src/actions/rs_actiondrawlinetangent1.h -@@ -66,6 +66,12 @@ class RS_ActionDrawLineTangent1 : public RS_PreviewActionInterface { - std::unique_ptr<RS_Vector> point; - /** Chosen entity */ - RS_Entity* circle; -+ -+ //list of entity types supported by current action -+ const std::initializer_list<RS2::EntityType> circleType { RS2::EntityArc, -+ RS2::EntityCircle, -+ RS2::EntityEllipse, -+ RS2::EntitySplinePoints }; - }; - - #endif -diff --git a/librecad/src/actions/rs_actiondrawlinetangent2.cpp b/librecad/src/actions/rs_actiondrawlinetangent2.cpp -index fed3545e0..0f1600e53 100644 ---- a/librecad/src/actions/rs_actiondrawlinetangent2.cpp -+++ b/librecad/src/actions/rs_actiondrawlinetangent2.cpp -@@ -35,10 +35,6 @@ - #include "rs_preview.h" - #include "rs_debug.h" - --namespace{ --auto circleType={RS2::EntityArc, RS2::EntityCircle, RS2::EntityEllipse}; --} -- - RS_ActionDrawLineTangent2::RS_ActionDrawLineTangent2( - RS_EntityContainer& container, - RS_GraphicView& graphicView) -diff --git a/librecad/src/actions/rs_actiondrawlinetangent2.h b/librecad/src/actions/rs_actiondrawlinetangent2.h -index b0d884cd7..95d82465d 100644 ---- a/librecad/src/actions/rs_actiondrawlinetangent2.h -+++ b/librecad/src/actions/rs_actiondrawlinetangent2.h -@@ -68,6 +68,9 @@ class RS_ActionDrawLineTangent2 : public RS_PreviewActionInterface { - /** 2nd chosen entity */ - RS_Entity* circle2; - bool valid; -+ -+ //list of entity types supported by current action -+ const std::initializer_list<RS2::EntityType> circleType {RS2::EntityArc, RS2::EntityCircle, RS2::EntityEllipse}; - }; - - #endif diff --git a/media-gfx/librecad/files/librecad-2.1.3-qt-5.11.patch b/media-gfx/librecad/files/librecad-2.1.3-qt-5.11.patch deleted file mode 100644 index 0c61a66d8a1a..000000000000 --- a/media-gfx/librecad/files/librecad-2.1.3-qt-5.11.patch +++ /dev/null @@ -1,40 +0,0 @@ -From 6c392e903e162b9283e88f53006e929663f2e883 Mon Sep 17 00:00:00 2001 -From: Jiri Slaby <jslaby@suse.cz> -Date: Mon, 11 Jun 2018 10:44:00 +0200 -Subject: [PATCH] fix build with Qt 5.11 - -The new Qt removed some implicit inclusions of headers. To avoid build -errors, add explicit includes of those we use in the sources. - -Signed-off-by: Jiri Slaby <jslaby@suse.cz> ---- - librecad/src/ui/forms/qg_commandwidget.cpp | 1 + - librecad/src/ui/generic/colorwizard.cpp | 1 + - librecad/src/ui/generic/widgetcreator.cpp | 2 ++ - 3 files changed, 4 insertions(+) - -diff --git a/librecad/src/ui/forms/qg_commandwidget.cpp b/librecad/src/ui/forms/qg_commandwidget.cpp -index 835e47d67..2c878e833 100644 ---- a/librecad/src/ui/forms/qg_commandwidget.cpp -+++ b/librecad/src/ui/forms/qg_commandwidget.cpp -@@ -27,6 +27,7 @@ - ** - **********************************************************************/ - #include "qg_commandwidget.h" -+#include <QAction> - #include <QKeyEvent> - #include <algorithm> - -diff --git a/librecad/src/ui/generic/widgetcreator.cpp b/librecad/src/ui/generic/widgetcreator.cpp -index 7c35144ff..d51190842 100644 ---- a/librecad/src/ui/generic/widgetcreator.cpp -+++ b/librecad/src/ui/generic/widgetcreator.cpp -@@ -27,6 +27,8 @@ - #include "widgetcreator.h" - #include "ui_widgetcreator.h" - -+#include <QAction> -+#include <QActionGroup> - #include <QSettings> - #include <QLineEdit> - #include <QPushButton> diff --git a/media-gfx/librecad/files/librecad-2.1.3-qt-5.15.patch b/media-gfx/librecad/files/librecad-2.1.3-qt-5.15.patch deleted file mode 100644 index a1cfe62408f9..000000000000 --- a/media-gfx/librecad/files/librecad-2.1.3-qt-5.15.patch +++ /dev/null @@ -1,37 +0,0 @@ -From 81741a875847c806c05f0f3a4610e69b3c3002aa Mon Sep 17 00:00:00 2001 -From: Andreas Sturmlechner <asturm@gentoo.org> -Date: Wed, 20 May 2020 14:12:15 +0200 -Subject: [PATCH] Fix build with Qt 5.15 (missing QPainterPath include) - ---- - librecad/src/lib/engine/lc_splinepoints.cpp | 1 + - librecad/src/lib/gui/rs_painterqt.h | 1 + - 2 files changed, 2 insertions(+) - -diff --git a/librecad/src/lib/engine/lc_splinepoints.cpp b/librecad/src/lib/engine/lc_splinepoints.cpp -index 5eaed81b..e6324ec1 100644 ---- a/librecad/src/lib/engine/lc_splinepoints.cpp -+++ b/librecad/src/lib/engine/lc_splinepoints.cpp -@@ -21,6 +21,7 @@ along with this program; if not, write to the Free Software - Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. - **********************************************************************/ - -+#include <QPainterPath> - #include <QPolygonF> - #include "lc_splinepoints.h" - -diff --git a/librecad/src/lib/gui/rs_painterqt.h b/librecad/src/lib/gui/rs_painterqt.h -index 878753cb..a0b432e0 100644 ---- a/librecad/src/lib/gui/rs_painterqt.h -+++ b/librecad/src/lib/gui/rs_painterqt.h -@@ -29,6 +29,7 @@ - #define RS_PAINTERQT_H - - #include <QPainter> -+#include <QPainterPath> - - #include "rs_painter.h" - #include "rs_pen.h" --- -2.26.2 - diff --git a/media-gfx/librecad/files/librecad-2.2.0-fix-missing-header.patch b/media-gfx/librecad/files/librecad-2.2.0-fix-missing-header.patch deleted file mode 100644 index 3caec03b011a..000000000000 --- a/media-gfx/librecad/files/librecad-2.2.0-fix-missing-header.patch +++ /dev/null @@ -1,29 +0,0 @@ -The patch is borrowed from upstream https://github.com/LibreCAD/LibreCAD - -https://github.com/LibreCAD/LibreCAD/commit/6e0f1556bbd554e528295f92597a80a109344607 - -https://bugs.gentoo.org/919822 - -commit 6e0f1556bbd554e528295f92597a80a109344607 -Author: Denis Pronin <dannftk@yandex.ru> -Date: Sun Jun 2 22:23:11 2024 +0300 - - fix compilation with clang and llvm's libcxx - - librecad/src/lib/debug/rs_debug.h requires cstdio to be included because of FILE - type being used - - Signed-off-by: Denis Pronin <dannftk@yandex.ru> - -diff --git a/librecad/src/lib/debug/rs_debug.h b/librecad/src/lib/debug/rs_debug.h -index 23918574..8950efcc 100644 ---- a/librecad/src/lib/debug/rs_debug.h -+++ b/librecad/src/lib/debug/rs_debug.h -@@ -28,6 +28,7 @@ - #ifndef RS_DEBUG_H - #define RS_DEBUG_H - -+#include <cstdio> - #include <iosfwd> - #ifdef __hpux - #include <sys/_size_t.h> diff --git a/media-gfx/librecad/librecad-2.1.3-r7.ebuild b/media-gfx/librecad/librecad-2.1.3-r7.ebuild deleted file mode 100644 index 3edea50eab0b..000000000000 --- a/media-gfx/librecad/librecad-2.1.3-r7.ebuild +++ /dev/null @@ -1,99 +0,0 @@ -# Copyright 1999-2023 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 hi hu id_ID it ja ko lv nl no pa pl pt_br pt_pt ro_ro ru sk sl sq_al sv ta 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 - https://github.com/Fat-Zer/librecad-gentoo-CVE-patches/archive/v${PV/_/}.tar.gz -> librecad-gentoo-CVE-patches-${PV}.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 -" - -PATCHES=( - "${FILESDIR}/${P}-qt-5.11.patch" - "${FILESDIR}/${P}-gcc-9.patch" - "${FILESDIR}/${P}-qt-5.15.patch" - "${FILESDIR}/${P}-boost-1.76.patch" # bug 788706, upstream PR#1345 -) - -src_prepare() { - default - - # Note: the CVE patches are borrowed from debian packaging; some of the - # patches are too big for the tree; move them to a separate repo/ - # see bug #825362 and bug #832210 - eapply "${WORKDIR}/librecad-gentoo-CVE-patches-${PV}" - - # 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/librecad.appdata.xml - doicon librecad/res/main/${PN}.png - make_desktop_entry ${PN} LibreCAD ${PN} Graphics -} diff --git a/media-gfx/librecad/librecad-2.2.0.2.ebuild b/media-gfx/librecad/librecad-2.2.0.2.ebuild index 6da50e9fe6f7..ff44cb2fa0b0 100644 --- a/media-gfx/librecad/librecad-2.2.0.2.ebuild +++ b/media-gfx/librecad/librecad-2.2.0.2.ebuild @@ -15,7 +15,7 @@ if [[ ${PV} == *9999* ]]; then 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" + KEYWORDS="amd64 ~ppc64 ~riscv x86 ~amd64-linux ~x86-linux" fi LICENSE="GPL-2" diff --git a/media-gfx/librecad/librecad-2.2.0.ebuild b/media-gfx/librecad/librecad-2.2.1.ebuild index f86b8253e177..c143a61d0fa3 100644 --- a/media-gfx/librecad/librecad-2.2.0.ebuild +++ b/media-gfx/librecad/librecad-2.2.1.ebuild @@ -1,8 +1,8 @@ -# Copyright 1999-2024 Gentoo Authors +# 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 hi hu id_ID it ja ko lv mk nl no pa pl pt_br pt_pt ro_ro ru sk sl sq_al sv ta tr uk zh_cn zh_tw" +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 @@ -15,7 +15,7 @@ if [[ ${PV} == *9999* ]]; then 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" + KEYWORDS="~amd64 ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux" fi LICENSE="GPL-2" @@ -40,10 +40,6 @@ BDEPEND=" dev-qt/linguist-tools:5 " -PATCHES=( - "${FILESDIR}/${P}-fix-missing-header.patch" -) - src_prepare() { default diff --git a/media-gfx/librecad/librecad-9999.ebuild b/media-gfx/librecad/librecad-9999.ebuild index dd55eaef5195..a647eb2a96ff 100644 --- a/media-gfx/librecad/librecad-9999.ebuild +++ b/media-gfx/librecad/librecad-9999.ebuild @@ -1,8 +1,8 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2024 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 hi hu id_ID it ja ko lv mk nl no pa pl pt_br pt_pt ro_ro ru sk sl sq_al sv ta tr uk zh_cn zh_tw" +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 @@ -25,19 +25,16 @@ 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 + dev-qt/qtbase:6[gui,widgets] + dev-qt/qtsvg:6 media-libs/freetype:2 " DEPEND="${RDEPEND} - dev-qt/qthelp:5 - dev-qt/qtxml:5 + dev-qt/qtbase:6[xml] + dev-qt/qttools:6[assistant] " BDEPEND=" - dev-qt/linguist-tools:5 + dev-qt/qttools:6[linguist] " src_prepare() { @@ -52,14 +49,14 @@ src_prepare() { } src_configure() { - eqmake5 -r + eqmake6 -r } src_compile() { default build_locale() { - local lrelease="$(qt5_get_bindir)/lrelease" + local lrelease="$(qt6_get_bindir)/lrelease" edo "${lrelease}" "librecad/ts/librecad_${1}.ts" \ -qm "unix/resources/qm/librecad_${1}.qm" edo "${lrelease}" "plugins/ts/plugins_${1}.ts" \ diff --git a/media-gfx/libredwg/Manifest b/media-gfx/libredwg/Manifest index d616dc3e2bf0..c2bd645563aa 100644 --- a/media-gfx/libredwg/Manifest +++ b/media-gfx/libredwg/Manifest @@ -2,7 +2,7 @@ DIST libredwg-0.13.2.tar.gz 20627421 BLAKE2B 7d11c5f390a2e9d1afbe26b07a44e3b38a2 DIST libredwg-0.13.3.tar.gz 20749296 BLAKE2B c39a98dab385a2d2a1603eff6347a9c91ba5b526085f0b36b761486be57a4ba1aaa44eb4fb70178fa6f0425797991fef89e51c2dd61b352829e2ebc39215248a SHA512 cf0baf477d053eb6ab2feaeda187f2d92211c7d28aa50318c1c8d7acf1b9c463258fa3a388dddce266bf44e0d4e4cf1bd3aa591c918f8a253515919e5c1b3f57 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 2808 BLAKE2B d297fae57d55f3ac039d791870242af3692da80314f96e2388fbbde59ac7ca678b5ee5b5429ed8194aeeeabd11c7ceb8e05b1dfcc2db453c8f5245dd573b1b80 SHA512 fee4244e5d428c979b9efca95bb3b492c35d603a2f22fa0de5f5b5ea019aa34bb1142b96008207f124b301edd5cfda521cbcffa7f4b47c81e62f4f9eaf836d11 -EBUILD libredwg-0.13.3.ebuild 2719 BLAKE2B a9b6d6c6f836c4e3677d51544886e1d5c4cfdd6a628fd943e180f6d8e3508300411b6fa3aabae3dbe7951cba58ad9af17fd7743d3912b3455a7e78cb4c874265 SHA512 5f130b61176e620362470925472d3358070379cf5c0dd132b18949d98dbc87dee8e99aa12803e0e6314bfdca30f39dca1055517b1f5420e0b41bf660da4cec5b -EBUILD libredwg-0.13.ebuild 2808 BLAKE2B d297fae57d55f3ac039d791870242af3692da80314f96e2388fbbde59ac7ca678b5ee5b5429ed8194aeeeabd11c7ceb8e05b1dfcc2db453c8f5245dd573b1b80 SHA512 fee4244e5d428c979b9efca95bb3b492c35d603a2f22fa0de5f5b5ea019aa34bb1142b96008207f124b301edd5cfda521cbcffa7f4b47c81e62f4f9eaf836d11 -MISC metadata.xml 406 BLAKE2B c39713a8733c296d7b9c8d87210f1bec2bcebf415d2dcb6e6326fd6a89e9b84b44bffd781cd953de35894220b51277d39c3fd80ad8c9fe8f22cb29fdb920467c SHA512 a474d5abfc3db689b006dad09dc5ab003526141269d30e6acb7c241054be518a21f6a034ed9939a75098386cd01012d460bf70e0c12f0f14023ac48682c44e81 +EBUILD libredwg-0.13.2.ebuild 2813 BLAKE2B 88933e9a647f6954e1e504b616c572c30b13a612ede54f86ff38f2a67e0728a41b2a151d1e5d3916280dc448ae08f8316b234da44b2abbd193c413e1c2723b62 SHA512 06a0ca942dfffd4b9a4f2df5cae242b039bbb5feb6ccc376a6cf9722f00ff052582d194f9ef4f55bf194dc52051585c14a718bb2b53406c5513ba6c1a4ace364 +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.2.ebuild b/media-gfx/libredwg/libredwg-0.13.2.ebuild index 57215dfb3169..33c41174dd0d 100644 --- a/media-gfx/libredwg/libredwg-0.13.2.ebuild +++ b/media-gfx/libredwg/libredwg-0.13.2.ebuild @@ -41,7 +41,7 @@ DEPEND="${RDEPEND} " BDEPEND="|| ( sys-devel/gcc[sanitize] - sys-libs/compiler-rt-sanitizers[asan(-)] + llvm-runtimes/compiler-rt-sanitizers[asan(-)] ) dev-vcs/git " diff --git a/media-gfx/libredwg/libredwg-0.13.3.ebuild b/media-gfx/libredwg/libredwg-0.13.3.ebuild index d29a75a7f99d..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 ) @@ -41,7 +41,7 @@ DEPEND="${RDEPEND} " BDEPEND="|| ( sys-devel/gcc[sanitize] - sys-libs/compiler-rt-sanitizers[asan(-)] + llvm-runtimes/compiler-rt-sanitizers[asan(-)] ) dev-vcs/git " diff --git a/media-gfx/libredwg/libredwg-0.13.ebuild b/media-gfx/libredwg/libredwg-0.13.ebuild index 57215dfb3169..33c41174dd0d 100644 --- a/media-gfx/libredwg/libredwg-0.13.ebuild +++ b/media-gfx/libredwg/libredwg-0.13.ebuild @@ -41,7 +41,7 @@ DEPEND="${RDEPEND} " BDEPEND="|| ( sys-devel/gcc[sanitize] - sys-libs/compiler-rt-sanitizers[asan(-)] + llvm-runtimes/compiler-rt-sanitizers[asan(-)] ) dev-vcs/git " diff --git a/media-gfx/libredwg/metadata.xml b/media-gfx/libredwg/metadata.xml index 3ee54dba5bc7..b878dd47ab8e 100644 --- a/media-gfx/libredwg/metadata.xml +++ b/media-gfx/libredwg/metadata.xml @@ -2,8 +2,8 @@ <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="person"> - <email>andrewammerlaan@gentoo.org</email> - <name>Andrew Ammerlaan</name> + <email>nowa@gentoo.org</email> + <name>Nowa Ammerlaan</name> </maintainer> <upstream> <remote-id type="github">LibreDWG/libredwg</remote-id> diff --git a/media-gfx/luminance-hdr/Manifest b/media-gfx/luminance-hdr/Manifest index dc8bd4cc900e..b1ac535ca459 100644 --- a/media-gfx/luminance-hdr/Manifest +++ b/media-gfx/luminance-hdr/Manifest @@ -1,11 +1,13 @@ -AUX luminance-hdr-2.5.1-openmp-automagic.patch 1574 BLAKE2B e8c289b8a66e258dd0ea99baa54bdf76e6345b652071a8e37b2a8ab35d98dd006973f266c8d008ccc70330fa8e9f9082261eee9d08756b1d59a4575714c5d6a8 SHA512 6ccfbf8d75bdc27beb10b3632bd07d8679f9ae8bdd78588ff0bbad59b75c43a4ad3b443a42183541cbf5b53d426b4ac19f43f54e296542d3a1b4235ba302acaa AUX luminance-hdr-2.6.0-cmake.patch 855 BLAKE2B 2656ec16d554199a8cb0dca0df77ab710b6c2b16f5ae006ab07c06d8898fe2c0048222b80714d0343f105a623acbd535119853831e2d207a50e6407e1de33aff SHA512 694106851d29a97485e7e438db206c5d08d37dc5d7a2c9a3f207f31c2b673d42b4c539429a658390d31f5f985bd8f330d9387f3eb19964aa4e5683f2031b0a33 AUX luminance-hdr-2.6.0-docs.patch 948 BLAKE2B 5ac822b10ffc61c552292806adc3f5470a7f03a9b2df7ba385435904963e52af583a892762867abb6a76a5351ffbbf0ffbd67107310e84bab9b649cc33666e09 SHA512 2b242a558c3b734a653943f3128c4cbc2440f940407faa096505ac7abe945c729bd0b4c5e9d06f53141bdb1271b097d7de15e87cd31db75ef1e30839a64f32b0 AUX luminance-hdr-2.6.0-no-git.patch 377 BLAKE2B 454a9973831aa3ba312926190a84622c8c3bd9481c67ece8ccf8916517f6b314931a09adf8a4168d8a1c7cd8a7694db27291009b9fae8a9cacc8356d32c7f5c3 SHA512 fba84a0415c8e514fb85b229adb29fbda238e8146d2dfff296d92fde33aeb22562e5ac98fed2422326354be9c0096cc2bd1b8947edfa9e7ca160d207ba0db476 AUX luminance-hdr-2.6.1.1-boost-1.85.patch 384 BLAKE2B 86b7ece7968f3501ab61fd7485a3b0ef08523c0416ae2653df719e8239b79d71efedf76fc3ebcf3402d17e6c73d755d6e55b351032e617d991656f7718bd2b7c SHA512 cb7f024220a9187ca8ff6b6b213ad50b125e65692de2b7331a912301e02b37e8273875005619eda03fb9481ab77a8f354195102567d12a0cd919786507952a06 +AUX luminance-hdr-2.6.1.1-clamp-redefinition.patch 638 BLAKE2B faedf8959ba4df8bae3f5e7b71a7d4b4d0ca7692fbc226f2f06ba24fd4bec293486fce33730813d97fd55a4c3005c209c0b38b4ced47a8c8bedaffc308083fde SHA512 f7db0507be5f9c9f83c3fa07fa017922094b5adf9d5c0d4c036f9b13f52a250d135a04191bac4cdcf82ebb31428ee9e5f551fadabf89f05226a5fa5cff2e2b9f +AUX luminance-hdr-2.6.1.1-compilersettings-and-openmp.patch 3732 BLAKE2B da8d877aae995a3af8e69194463d44c5663cb7c13c4a43397d067d830e3f0e65b61d34a4649ff4b012d3d583befa7ee3c025c1eb342dbeff0614597cd6c81396 SHA512 54aeff12928c40d12e1ac6c16827653e6c5ac924336468132ec6ea09e69aa2b06c364d2d86ede8e76b98b8134ad4c1489c2d51f34b1b023bf988d2fd02dccdb4 AUX luminance-hdr-2.6.1.1-exiv2-0.28.patch 4846 BLAKE2B 74367df72c62743f2c43cafc313b84b96f746fede437c64fa59b558c0b011a1959b90f1925637c6856f55852b2ec58bf9b8466e69ebea5d236f8d191ae9b200e SHA512 711e64209cba59b218b09715451ddcca3084b020da9bd1baa7decc71e5d3ad7375cba5703bc042e2371e9465c01436a67d0162731718dbef158e207de5266615 AUX luminance-hdr-2.6.1.1-fixheaders.patch 320 BLAKE2B 1037c958cb0eb08c186343c57bf530a2f8ed0b2cc9ef5b67f1363d9b595d267bd5f63a7fbca3d1b51ba4c3cbe3b92d6e56d6af28ee39333376d2411aae18c4d1 SHA512 6e5a51ba17648c619599b895ce9d2fd42b757652331e87799958372ad9c61f711619b0d5efac1d32fb8517732b3b3013fee1c86f0f4032531e390c1bfd229c06 +AUX luminance-hdr-2.6.1.1-no-qtwebengine.patch 7355 BLAKE2B c07305d51e1fbb2955ef4997917fa53bcab73ebc5cde7b1cd017be069d0b8feaf92e8d8e60ee996d5824b06605142e5d0e3248d720a99380ae4f53e858d822d9 SHA512 629268f125f1f005c4151f45dca6e944eaccbb9c3e464b7e143c20af29216933818107de2f202bcef9228b82c78f4e054ea2dd5ce3febeb44f08c27eb50e8cc2 AUX luminance-hdr-2.6.1.1-openexr3.patch 1028 BLAKE2B fb0502bad89beafdd9cc6cd842e542d2cd9f7d4fc7fe6a29c9c1b67e3a0fc902c451650895c63e8405de82bb5e9e02fca3d1013227fc1a97220ebae245466889 SHA512 a040ee694fff2df06f0521db8c0bb98d4d80def4c342ea5997da535ea1b5e1634a4a9b26e7300476a061b7d7f2a90fc3d2b1cc4fca1c1df260b8847fef781060 DIST luminance-hdr-2.6.1.1.tar.bz2 11569153 BLAKE2B bbeb991c05f1058fe9fde59014d4c6326283bad34d84dc0454a0b4df1b600b02835e6c3013199d2b2811d59409b892129c580e4a2a5cb00c8014e1267c16ab84 SHA512 9006339037aa3a0b7332cf71e1cf143d9e700eaae1102dfb8eccea8a9d97a5bcb6331202684adf76542116927dd9a69169882518af6ebb25c85d08057fdc552e -EBUILD luminance-hdr-2.6.1.1-r1.ebuild 2350 BLAKE2B ea877fcf3d62fc025f8166953fe591c1c39fee79b935812e827f3ddea58019831be66acbbf533cfdd4ca59f646dc17e6016dac3d149601c6563d4d96f28aa7c3 SHA512 97414bb40510f16ea9e42a5699e2cf401318c9596f7af980ffffe0c55d8691b53e3c7e239047319b457bea28559f231ded02f14b38ff2eaeba63847b7d5293ae +EBUILD luminance-hdr-2.6.1.1-r2.ebuild 2279 BLAKE2B c0ea73dc77a233d2fbbdccc5c025ec7a480db9c4473b767435853d941b26e31f8d84f851de4c30b303c4cec451eab699b56a04e726a6f3774b2258dce5380ecc SHA512 824f5fdbc1e1357998f70c04996336796de61eba988b22dba7f9ea83bce000cb8e952b8117a68a905b30258aaa274065b15bb4218c654cfabc442dcb7c2e1960 MISC metadata.xml 1272 BLAKE2B 08d1f2e217eaffcb4419532ed41ba963a971b343e2d0ff7f3718c9df23ac9ffd5299264d5a87b66451acd231965f135bdeebf3b91244e3d9e51763c818b317f9 SHA512 98f1fa351c3e0bc7e47b30263093408cbbebacf8e0eb23d780cd704f5ddfff3d6939aee4d18c06cd083d90dc8a68ea51995352ab1f15ce75b0585230a3f9cbc8 diff --git a/media-gfx/luminance-hdr/files/luminance-hdr-2.5.1-openmp-automagic.patch b/media-gfx/luminance-hdr/files/luminance-hdr-2.5.1-openmp-automagic.patch deleted file mode 100644 index f0399d271a59..000000000000 --- a/media-gfx/luminance-hdr/files/luminance-hdr-2.5.1-openmp-automagic.patch +++ /dev/null @@ -1,32 +0,0 @@ -diff --git a/build_files/Modules/CompilerSettings.cmake b/build_files/Modules/CompilerSettings.cmake -index f55c130..81e1916 100644 ---- a/build_files/Modules/CompilerSettings.cmake -+++ b/build_files/Modules/CompilerSettings.cmake -@@ -45,16 +45,19 @@ else() - message(WARNING "Your C++ compiler does not support C++11.") - endif() - #OpenMP Support under Linux, Windows with MSVC & MacOS X with GCC >= 4.3 --IF(MSVC) -- FIND_PACKAGE(OpenMP REQUIRED) -- SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${OpenMP_CXX_FLAGS}") -- SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${OpenMP_C_FLAGS}") --ELSEIF(CMAKE_COMPILER_IS_GNUCC AND UNIX) -- EXECUTE_PROCESS(COMMAND ${CMAKE_CXX_COMPILER} -dumpversion OUTPUT_VARIABLE GCC_VERSION) -- IF(GCC_VERSION VERSION_GREATER 4.3 OR GCC_VERSION VERSION_EQUAL 4.3) -- MESSAGE(STATUS "GCC >= 4.3") -+OPTION(USE_OPENMP "Use openmp threading support." ON) -+IF(USE_OPENMP) -+ IF(MSVC) - FIND_PACKAGE(OpenMP REQUIRED) - SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${OpenMP_CXX_FLAGS}") - SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${OpenMP_C_FLAGS}") -+ ELSEIF(CMAKE_COMPILER_IS_GNUCC AND UNIX) -+ EXECUTE_PROCESS(COMMAND ${CMAKE_CXX_COMPILER} -dumpversion OUTPUT_VARIABLE GCC_VERSION) -+ IF(GCC_VERSION VERSION_GREATER 4.3 OR GCC_VERSION VERSION_EQUAL 4.3) -+ MESSAGE(STATUS "GCC >= 4.3") -+ FIND_PACKAGE(OpenMP REQUIRED) -+ SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${OpenMP_CXX_FLAGS}") -+ SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${OpenMP_C_FLAGS}") -+ ENDIF() - ENDIF() - ENDIF() diff --git a/media-gfx/luminance-hdr/files/luminance-hdr-2.6.1.1-clamp-redefinition.patch b/media-gfx/luminance-hdr/files/luminance-hdr-2.6.1.1-clamp-redefinition.patch new file mode 100644 index 000000000000..121a4403b688 --- /dev/null +++ b/media-gfx/luminance-hdr/files/luminance-hdr-2.6.1.1-clamp-redefinition.patch @@ -0,0 +1,18 @@ +diff --git a/src/Libpfs/manip/gamma_levels.cpp b/src/Libpfs/manip/gamma_levels.cpp +index 67975111..c0fb1798 100644 +--- a/src/Libpfs/manip/gamma_levels.cpp ++++ b/src/Libpfs/manip/gamma_levels.cpp +@@ -31,13 +31,6 @@ + + namespace { + +-template <typename T> +-inline T clamp(const T &v, const T &lower_bound, const T &upper_bound) { +- if (v <= lower_bound) return lower_bound; +- if (v >= upper_bound) return upper_bound; +- return v; +-} +- + ////! \note I assume that *in* contains only value between [0,1] + // void gamma_levels_array(const pfs::Array2D* in, pfs::Array2D* out, + // float black_in, float white_in, diff --git a/media-gfx/luminance-hdr/files/luminance-hdr-2.6.1.1-compilersettings-and-openmp.patch b/media-gfx/luminance-hdr/files/luminance-hdr-2.6.1.1-compilersettings-and-openmp.patch new file mode 100644 index 000000000000..3d3d59bb0166 --- /dev/null +++ b/media-gfx/luminance-hdr/files/luminance-hdr-2.6.1.1-compilersettings-and-openmp.patch @@ -0,0 +1,82 @@ +From b44ecdcbfdf4ee1eca2fdb431dfb7dfd63cc8b1f Mon Sep 17 00:00:00 2001 +From: Andreas Sturmlechner <asturm@gentoo.org> +Date: Tue, 21 Jan 2025 21:37:28 +0100 +Subject: [PATCH] CMake: Cleanup CompilerSettings.cmake + +>C++11 is a given, so don't tie down to now old standard; +fixes build w/ boost-1.87 + +Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org> +--- + build_files/Modules/CompilerSettings.cmake | 49 ++++------------------ + 1 file changed, 8 insertions(+), 41 deletions(-) + +diff --git a/build_files/Modules/CompilerSettings.cmake b/build_files/Modules/CompilerSettings.cmake +index 76dbc219..5e25a718 100644 +--- a/build_files/Modules/CompilerSettings.cmake ++++ b/build_files/Modules/CompilerSettings.cmake +@@ -9,53 +9,20 @@ ADD_DEFINITIONS(-march=core2) + ENDIF() + ENDIF() + +-#Activate C++11 support, when available +-if("${CMAKE_CXX_COMPILER_ID}" MATCHES "GNU") +- add_definitions(-DBRANCH_PREDICTION) +- execute_process(COMMAND ${CMAKE_CXX_COMPILER} -dumpversion OUTPUT_VARIABLE GCC_VERSION) +- if (GCC_VERSION VERSION_GREATER 4.7 OR GCC_VERSION VERSION_EQUAL 4.7) +- message(STATUS "C++11 activated for GCC ${GCC_VERSION}") +- set(CMAKE_CXX_STANDARD 11) +- add_definitions(-DLHDR_CXX11_ENABLED) +- elseif(GCC_VERSION VERSION_GREATER 4.3 OR GCC_VERSION VERSION_EQUAL 4.3) +- message(WARNING "C++0x activated for GCC ${GCC_VERSION}. If you get any errors update to a compiler that fully supports C++11") +- set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=gnu++0x") # add_definitions("-std=gnu++0x") +- add_definitions(-DLHDR_CXX11_ENABLED) +- else() +- message(WARNING "C++11 NOT available. GCC >= 4.3 is needed.") +- endif() +-elseif("${CMAKE_CXX_COMPILER_ID}" MATCHES "Clang") +- message(STATUS "C++11 activated for Clang") +- set(CMAKE_CXX_STANDARD 11) ++set(CMAKE_CXX_STANDARD 20) ++add_definitions(-DLHDR_CXX11_ENABLED) ++add_definitions(-DBRANCH_PREDICTION) ++if("${CMAKE_CXX_COMPILER_ID}" MATCHES "Clang") + if (APPLE) + set(CMAKE_EXE_LINKER_FLAGS "-lc++abi -stdlib=libc++ -rpath @loader_path/../Frameworks/") +- set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11") + endif() +- add_definitions(-DLHDR_CXX11_ENABLED) +- add_definitions(-DBRANCH_PREDICTION) + set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wnull-dereference -Wdelete-non-virtual-dtor -Wsign-compare -Wswitch") + set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wreturn-type -Wself-assign -Wunused-argument -Wunused-function -Wtautological-compare") +- #OpenMP support under Linux with clang +- if (UNIX) +- FIND_PACKAGE(OpenMP REQUIRED) +- SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${OpenMP_CXX_FLAGS}") +- SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${OpenMP_C_FLAGS}") +- endif() +-elseif(MSVC) +- message(STATUS "C++11 is active by default on Microsoft Visual Studio") +- add_definitions(-DLHDR_CXX11_ENABLED) +-else() +- message(WARNING "Your C++ compiler does not support C++11.") + endif() +-#OpenMP Support under Linux, Windows with MSVC & MacOS X with GCC >= 4.3 +-IF(MSVC) +- FIND_PACKAGE(OpenMP REQUIRED) +- SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${OpenMP_CXX_FLAGS}") +- SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${OpenMP_C_FLAGS}") +-ELSEIF(CMAKE_COMPILER_IS_GNUCC AND UNIX) +- EXECUTE_PROCESS(COMMAND ${CMAKE_CXX_COMPILER} -dumpversion OUTPUT_VARIABLE GCC_VERSION) +- IF(GCC_VERSION VERSION_GREATER 4.3 OR GCC_VERSION VERSION_EQUAL 4.3) +- MESSAGE(STATUS "GCC >= 4.3") ++ ++OPTION(USE_OPENMP "Use openmp threading support." ON) ++IF(USE_OPENMP) ++ IF(MSVC OR UNIX) + FIND_PACKAGE(OpenMP REQUIRED) + SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${OpenMP_CXX_FLAGS}") + SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${OpenMP_C_FLAGS}") +-- +2.45.3 + diff --git a/media-gfx/luminance-hdr/files/luminance-hdr-2.6.1.1-no-qtwebengine.patch b/media-gfx/luminance-hdr/files/luminance-hdr-2.6.1.1-no-qtwebengine.patch new file mode 100644 index 000000000000..1d0865875259 --- /dev/null +++ b/media-gfx/luminance-hdr/files/luminance-hdr-2.6.1.1-no-qtwebengine.patch @@ -0,0 +1,213 @@ +From 94f7edf3712b735219eb31eda71b7e188d718bdd Mon Sep 17 00:00:00 2001 +From: Andreas Sturmlechner <asturm@gentoo.org> +Date: Tue, 21 Jan 2025 19:35:21 +0100 +Subject: [PATCH 1/2] CMake: UI: Drop bogus Qt5WebKit/Qt5WebEngineWidgets + dependency + +Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org> +--- + src/UI/CMakeLists.txt | 10 +--------- + 1 file changed, 1 insertion(+), 9 deletions(-) + +diff --git a/src/UI/CMakeLists.txt b/src/UI/CMakeLists.txt +index 96df52b4..4f6cb53e 100644 +--- a/src/UI/CMakeLists.txt ++++ b/src/UI/CMakeLists.txt +@@ -50,14 +50,6 @@ QT5_WRAP_CPP(FILES_MOC ${FILES_H}) + QT5_WRAP_UI(FILES_UI_H ${FILES_UI}) + + ADD_LIBRARY(ui STATIC ${FILES_H} ${FILES_CPP} ${FILES_MOC} ${FILES_UI_H}) +-IF(MINGW) +- TARGET_LINK_LIBRARIES(ui Qt5::Core Qt5::Concurrent Qt5::Gui Qt5::Widgets Qt5::WebKitWidgets Qt5::Sql) +-ELSE() +- IF(Qt5WebEngineCore_FOUND) +- TARGET_LINK_LIBRARIES(ui Qt5::Core Qt5::Concurrent Qt5::Gui Qt5::Widgets Qt5::WebEngineWidgets Qt5::Sql) +- ELSE() +- TARGET_LINK_LIBRARIES(ui Qt5::Core Qt5::Concurrent Qt5::Gui Qt5::Widgets Qt5::WebKitWidgets Qt5::Sql) +- ENDIF() +-ENDIF() ++TARGET_LINK_LIBRARIES(ui Qt5::Core Qt5::Concurrent Qt5::Gui Qt5::Widgets Qt5::Sql) + SET(FILES_TO_TRANSLATE ${FILES_TO_TRANSLATE} ${FILES_CPP} ${FILES_H} ${FILES_UI} PARENT_SCOPE) + SET(LUMINANCE_MODULES_GUI ${LUMINANCE_MODULES_GUI} ui PARENT_SCOPE) +-- +2.45.3 + + +From d3e354dba3e1e20d5bcf3d97222d951b857bcb23 Mon Sep 17 00:00:00 2001 +From: Andreas Sturmlechner <asturm@gentoo.org> +Date: Mon, 20 Jan 2025 18:18:16 +0100 +Subject: [PATCH 2/2] CMake: Hard-disable helpbrowser (with it Qt5WebEngine) + +Gentoo-bug: https://bugs.gentoo.org/926664 +Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org> +--- + CMakeLists.txt | 32 +++++++++++++++++++------------- + src/CMakeLists.txt | 4 +++- + src/MainWindow/MainWindow.cpp | 8 ++++++++ + src/MainWindow/MainWindow.h | 4 ++++ + src/MainWindow/MainWindow.ui | 1 + + 5 files changed, 35 insertions(+), 14 deletions(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 3c8b093f..5f0aaa6d 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -59,6 +59,8 @@ else( HAS_BRANCH_PREDICTION ) + set( BRANCH_PREDICTION 0 ) + endif( HAS_BRANCH_PREDICTION ) + ++option(WITH_HELPBROWSER "Build help browser" ON) ++ + # find and setup Qt5 for this project + + find_package(Qt5Core REQUIRED) +@@ -69,13 +71,15 @@ find_package(Qt5Gui REQUIRED) + # https://wiki.qt.io/New-Features-in-Qt-5.5#Deprecated_Functionality. Unfortunately, + # some Qt distributions still provide QtWebKit instead of QtWebEngine. So first we + # try to find QtWebEngine and if not found, we fall back to QtWebKit. +-find_package(Qt5WebEngineCore QUIET) +-if(Qt5WebEngineCore_FOUND) +- find_package(Qt5WebEngineWidgets REQUIRED) +-else() +- find_package(Qt5WebKit REQUIRED) +- find_package(Qt5WebKitWidgets REQUIRED) +- add_definitions(-DUSE_DEPRECATED_QTWEBKIT) ++if(WITH_HELPBROWSER) ++ find_package(Qt5WebEngineCore QUIET) ++ if(Qt5WebEngineCore_FOUND) ++ find_package(Qt5WebEngineWidgets REQUIRED) ++ else() ++ find_package(Qt5WebKit REQUIRED) ++ find_package(Qt5WebKitWidgets REQUIRED) ++ add_definitions(-DUSE_DEPRECATED_QTWEBKIT) ++ endif() + endif() + find_package(Qt5Xml REQUIRED) + find_package(Qt5Sql REQUIRED) +@@ -96,12 +100,14 @@ set(LIBS ${LIBS} + ${QT_QTCORE_LIBRARIES} ${QT_QTGUI_LIBRARIES} ${QT_QTNETWORK_LIBRARIES} + ${QT_QTXML_LIBRARIES} ${QT_QTSQL_LIBRARIES}) + +-if(Qt5WebEngineCore_FOUND) +- message(STATUS "Building with QtWebEngine") +- set(LIBS ${LIBS} ${QT_QTWEBENGINE_LIBRARIES}) +-else() +- message(STATUS "Building with QtWebKit") +- set(LIBS ${LIBS} ${QT_QTWEBKIT_LIBRARIES}) ++if(WITH_HELPBROWSER) ++ if(Qt5WebEngineCore_FOUND) ++ message(STATUS "Building with QtWebEngine") ++ set(LIBS ${LIBS} ${QT_QTWEBENGINE_LIBRARIES}) ++ else() ++ message(STATUS "Building with QtWebKit") ++ set(LIBS ${LIBS} ${QT_QTWEBKIT_LIBRARIES}) ++ endif() + endif() + + FIND_PACKAGE(Git) +diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt +index a5757bb9..8221c7ec 100644 +--- a/src/CMakeLists.txt ++++ b/src/CMakeLists.txt +@@ -22,7 +22,9 @@ ADD_SUBDIRECTORY(Exif) + ADD_SUBDIRECTORY(Fileformat) + ADD_SUBDIRECTORY(Alignment) + ADD_SUBDIRECTORY(HdrWizard) +-ADD_SUBDIRECTORY(HelpBrowser) ++if(WITH_HELPBROWSER) ++ ADD_SUBDIRECTORY(HelpBrowser) ++endif() + ADD_SUBDIRECTORY(Preferences) + ADD_SUBDIRECTORY(Projection) + ADD_SUBDIRECTORY(Resize) +diff --git a/src/MainWindow/MainWindow.cpp b/src/MainWindow/MainWindow.cpp +index 6459229a..b49d3d14 100644 +--- a/src/MainWindow/MainWindow.cpp ++++ b/src/MainWindow/MainWindow.cpp +@@ -98,7 +98,9 @@ + #include <HdrWizard/AutoAntighosting.h> + #include <HdrWizard/HdrWizard.h> + #include <HdrWizard/WhiteBalance.h> ++#ifdef WITH_HELPBROWSER + #include <HelpBrowser/helpbrowser.h> ++#endif + #include <LibpfsAdditions/formathelper.h> + #include <Preferences/PreferencesDialog.h> + #include <PreviewPanel/PreviewPanel.h> +@@ -208,7 +210,9 @@ int MainWindow::sm_counter = 0; + QMap<int, MainWindow *> MainWindow::sm_mainWindowMap = + QMap<int, MainWindow *>(); + QScopedPointer<UpdateChecker> MainWindow::sm_updateChecker; ++#ifdef WITH_HELPBROWSER + HelpBrowser *MainWindow::sm_helpBrowser = nullptr; ++#endif + + MainWindow::MainWindow(QWidget *parent) + : QMainWindow(parent), +@@ -1059,6 +1063,7 @@ void MainWindow::on_normalSizeAct_triggered() { + } + // Zoom = Viewers (END) + ++#ifdef WITH_HELPBROWSER + void MainWindow::on_documentationAction_triggered() { + if (sm_helpBrowser == nullptr) { + sm_helpBrowser = +@@ -1079,6 +1084,7 @@ void MainWindow::on_documentationAction_triggered() { + void MainWindow::helpBrowserClosed() { + sm_helpBrowser = nullptr; + } ++#endif + + void MainWindow::enterWhatsThis() { QWhatsThis::enterWhatsThisMode(); } + +@@ -1451,9 +1457,11 @@ void MainWindow::closeEvent(QCloseEvent *event) { + } + sm_NumMainWindows--; + if (sm_NumMainWindows == 0) { ++#ifdef WITH_HELPBROWSER + if (sm_helpBrowser) { + sm_helpBrowser->close(); + } ++#endif + } + + if (sm_NumMainWindows == 0) { +diff --git a/src/MainWindow/MainWindow.h b/src/MainWindow/MainWindow.h +index 029cf813..68aa2fd4 100644 +--- a/src/MainWindow/MainWindow.h ++++ b/src/MainWindow/MainWindow.h +@@ -146,7 +146,9 @@ class MainWindow : public QMainWindow { + void on_normalSizeAct_triggered(); + void updateMagnificationButtons(GenericViewer *); + ++#ifdef WITH_HELPBROWSER + void on_documentationAction_triggered(); ++#endif + void enterWhatsThis(); + + void on_OptionsAction_triggered(); +@@ -180,7 +182,9 @@ class MainWindow : public QMainWindow { + void enableCrop(bool); + void disableCrop(); + ++#ifdef WITH_HELPBROWSER + void helpBrowserClosed(); ++#endif + void on_actionDonate_triggered(); + + void onUpdateAvailable(); +diff --git a/src/MainWindow/MainWindow.ui b/src/MainWindow/MainWindow.ui +index 775bfb2c..e4734a43 100644 +--- a/src/MainWindow/MainWindow.ui ++++ b/src/MainWindow/MainWindow.ui +@@ -423,6 +423,7 @@ + </property> + </action> + <action name="documentationAction"> ++ <property name="enabled"><bool>false</bool></property> + <property name="icon"> + <iconset theme="help-contents"> + <normaloff>.</normaloff>.</iconset> +-- +2.45.3 + diff --git a/media-gfx/luminance-hdr/luminance-hdr-2.6.1.1-r1.ebuild b/media-gfx/luminance-hdr/luminance-hdr-2.6.1.1-r2.ebuild index 654ceee61524..a5b11fa3265c 100644 --- a/media-gfx/luminance-hdr/luminance-hdr-2.6.1.1-r1.ebuild +++ b/media-gfx/luminance-hdr/luminance-hdr-2.6.1.1-r2.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 -inherit cmake toolchain-funcs flag-o-matic xdg-utils +inherit cmake toolchain-funcs xdg-utils DESCRIPTION="Graphical user interface that provides a workflow for HDR imaging" HOMEPAGE="http://qtpfsgui.sourceforge.net https://github.com/LuminanceHDR/LuminanceHDR" @@ -11,8 +11,8 @@ SRC_URI="https://downloads.sourceforge.net/qtpfsgui/${P/_/.}.tar.bz2" LICENSE="GPL-2" SLOT="0" -KEYWORDS="amd64 ~x86" -IUSE="cpu_flags_x86_sse2 fits openmp test" +KEYWORDS="amd64" +IUSE="fits openmp test" RESTRICT="!test? ( test )" RDEPEND=" @@ -25,7 +25,6 @@ RDEPEND=" dev-qt/qtprintsupport:5 dev-qt/qtsql:5 dev-qt/qtsvg:5 - dev-qt/qtwebengine:5[widgets] dev-qt/qtwidgets:5 dev-qt/qtxml:5 media-gfx/exiv2:= @@ -51,10 +50,14 @@ PATCHES=( "${FILESDIR}"/${PN}-2.6.0-cmake.patch "${FILESDIR}"/${PN}-2.6.0-no-git.patch "${FILESDIR}"/${PN}-2.6.0-docs.patch - "${FILESDIR}"/${PN}-2.5.1-openmp-automagic.patch "${FILESDIR}"/${PN}-2.6.1.1-boost-1.85.patch + # downstream; fix build w/ boost-1.87, openmp automagic + "${FILESDIR}"/${P}-clamp-redefinition.patch + "${FILESDIR}"/${P}-compilersettings-and-openmp.patch # patch by ArchLinux "${FILESDIR}"/${P}-exiv2-0.28.patch + # inspired by FreeBSD + "${FILESDIR}"/${P}-no-qtwebengine.patch ) pkg_pretend() { @@ -66,16 +69,8 @@ pkg_setup() { } src_configure() { - if use cpu_flags_x86_sse2 ; then - append-flags -msse2 - else - eerror "This package requires a CPU supporting the SSE2 instruction set." - die "SSE2 support missing" - fi - - append-flags -std=c++17 - local mycmakeargs=( + -DWITH_HELPBROWSER=OFF $(cmake_use_find_package fits CFITSIO) -DUSE_OPENMP="$(usex openmp)" ) diff --git a/media-gfx/lximage-qt/Manifest b/media-gfx/lximage-qt/Manifest index 7da158d49bab..9aced0f75b89 100644 --- a/media-gfx/lximage-qt/Manifest +++ b/media-gfx/lximage-qt/Manifest @@ -1,5 +1,7 @@ -DIST lximage-qt-1.4.0.tar.xz 841028 BLAKE2B d5f76bfe9763807e8e836de43ff433a1553cea0858b61e76411017ee239fbec6dfd9d3776322b60da6ad8b6b9b1b30c6a02a8c494b62eef440f4d8c5ab9e7143 SHA512 c0dea9418890745de685c7df228ceb849fa21781764c2089481bea89526842e5e8f0972e032ba9c52b07c32202ed284d977f47ace598c44880dff661d76cd125 DIST lximage-qt-2.0.1.tar.xz 848348 BLAKE2B d2484baffaae220436ae157dccda86e126b416101f047133f494cb44d9c3bba007ce797c1aa88d21ba4b242abdf8cacf73706831570943e4d7a36eb02591fc7b SHA512 594e86a4bedf3f9689107d79d852ba1ef4db83f06572b8c077ed5850dc10cc05a33fe79a0c05632f7e7541a6f895919b72c264635306f7a468eac6ecde531ba4 -EBUILD lximage-qt-1.4.0.ebuild 1087 BLAKE2B 95edea7c02f664c8d60b1ea00749da95899459b9dca4ca94f8137ef9e91a0579888212c90f3a057f0aff81435261b8c872a1b38e5d764017c024715d0bd9648d SHA512 ff4e17eed33bf1be3188b38e0d26a107b55fd547a609a8465d79fc5ba91eee6e4c0587102b8448f5da04819a97705e43f15bc9bbd8335206845dc45a3f769ef1 -EBUILD lximage-qt-2.0.1.ebuild 927 BLAKE2B b3ea9132f89d16ba6ab8985d96a960a5b9bc94b9d950f0073e093f3fa2d350d0fbf55b40aa963ad00a20b54308a3a63eadd7c989ac3a65c41d08d31bf6ed1f51 SHA512 cd0127d6732127b639d114e7f562112c3873a974cec500f4d4f8b8540fdb42fa370594ea00e2e13668aa26c8de9cc69383faf87d79828606e31cd0cd9f6f4970 +DIST lximage-qt-2.1.0.tar.xz 852988 BLAKE2B 76b9e5b87ed216474c28b8f9f5ceddb012b83c5239c506ebd51e306c53ffdbe84da44f6c752c17dc26be0705ce6a23d7dcd25d93b608089dfe580b069e37c40c SHA512 f94f6ee07e83524ac37f2377d5e5fec4926e2fdd33af67213cbe91ce1e40215774c2a79b81f16ac9d88e44e8bb55750a48cc4d68266d03d9c8973e1319f393c5 +DIST lximage-qt-2.1.1.tar.xz 857380 BLAKE2B a4e78e66b569533d1259463f5e3ec60a1b281076f7270576c6bf8406cc4adb416522b7ed4c5aac073ca7e48fcee448c4610b4ecaf0259f8afaf44c721235e19c SHA512 c0f070dbee821fc86bdebb09c09a5a1cac5d23033c73bdefe8d2ff62deee4d4ecdec18319f9d9badba1808f2cf94c7e87660d6193caed85900b68d7b59ccaa6f +EBUILD lximage-qt-2.0.1.ebuild 938 BLAKE2B 2df26215a5ee92fb8706077e1db64fe9d1b49da6df78a6f925a251b65c6fccabe52818394780da86401717a0a2a72bfdb14b12a726bb343a1afd83896a3740fa SHA512 939382b058e11ad208e1377d5ba2370520a2d31f32d16f01dc5ffb41b7e9550571036ef7d80df59d19f3bca8e6d13b849e54cd1c076d11dd33dbdac8b2e3c07e +EBUILD lximage-qt-2.1.0.ebuild 784 BLAKE2B 9712d3a424bd54b0a8b6a7d20fd70cf9578a77fa6ec6c8e39d25a28f55f6f4c816586b4bc12b0194dc8181d67700e881b2cd9131b360e6cefd2c5c5cdcba9bce SHA512 7ea83b16343a7f490ac68bfac042cc3ad66ecc367e8d1ec9f8366ae3888613c2843d9ca3cc1d2977ec36b2b7e0a9044dddc94d4385b1e12f0373df71014fe0b9 +EBUILD lximage-qt-2.1.1.ebuild 786 BLAKE2B 66c3dea7fd4391266bd1a0c13fc6592ab618eb742626106d34f5dff709df78edddecdacd1a90548effc226cc4b5316f5552e03d00dbe4e8e77e5083ce4af5790 SHA512 db41d420844105d995326e6057fe80cc7310b5313748638ba05cbad83aa3703e7c67975d2130521b46a153eb18e23cfd1ee6a4cf00894f39e6daab5b1ecef242 MISC metadata.xml 317 BLAKE2B f63e3e91e5dc9fcc6113bf1ae9c9bb5680d2b7cf40359eaa058dcbc247f3b2f43f540ffa6525935220d52c3e8b94ee3629ce237c788c8e4f0946dddbf610680e SHA512 74c882b00f38c28d8546d31c59636252b2627053143a1bea3551c4bc507a63361c88bc555ea15760395f995c6d20dd6fe6adf65f11d42cc90ffd8378aae03f1f diff --git a/media-gfx/lximage-qt/lximage-qt-1.4.0.ebuild b/media-gfx/lximage-qt/lximage-qt-1.4.0.ebuild deleted file mode 100644 index c2f34e8d274b..000000000000 --- a/media-gfx/lximage-qt/lximage-qt-1.4.0.ebuild +++ /dev/null @@ -1,54 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -MY_PV="$(ver_cut 1-2)" - -inherit cmake xdg-utils - -DESCRIPTION="Qt Image Viewer" -HOMEPAGE="https://lxqt-project.org/" - -if [[ ${PV} = *9999* ]]; then - inherit git-r3 - EGIT_REPO_URI="https://github.com/lxqt/${PN}.git" -else - SRC_URI="https://github.com/lxqt/${PN}/releases/download/${PV}/${P}.tar.xz" - KEYWORDS="amd64 ~arm arm64 ~loong ~ppc64 ~riscv x86" -fi - -LICENSE="GPL-2 GPL-2+" -SLOT="0" - -BDEPEND=" - >=dev-qt/linguist-tools-5.15:5 - >=dev-util/lxqt-build-tools-0.13.0 - virtual/pkgconfig -" -DEPEND=" - dev-libs/glib:2 - >=dev-qt/qtcore-5.15:5 - >=dev-qt/qtdbus-5.15:5 - >=dev-qt/qtgui-5.15:5 - >=dev-qt/qtnetwork-5.15:5 - >=dev-qt/qtprintsupport-5.15:5 - >=dev-qt/qtsvg-5.15:5 - >=dev-qt/qtwidgets-5.15:5 - >=dev-qt/qtx11extras-5.15:5 - media-libs/libexif - =x11-libs/libfm-qt-${MY_PV}*:= - x11-libs/libX11 - x11-libs/libXfixes -" -RDEPEND="${DEPEND}" - -pkg_postinst() { - xdg_desktop_database_update - xdg_icon_cache_update -} - -pkg_postrm() { - xdg_desktop_database_update - xdg_icon_cache_update -} diff --git a/media-gfx/lximage-qt/lximage-qt-2.0.1.ebuild b/media-gfx/lximage-qt/lximage-qt-2.0.1.ebuild index cff2fc237659..920333b3a4d0 100644 --- a/media-gfx/lximage-qt/lximage-qt-2.0.1.ebuild +++ b/media-gfx/lximage-qt/lximage-qt-2.0.1.ebuild @@ -15,7 +15,7 @@ if [[ ${PV} == 9999 ]]; then EGIT_REPO_URI="https://github.com/lxqt/${PN}.git" else SRC_URI="https://github.com/lxqt/${PN}/releases/download/${PV}/${P}.tar.xz" - KEYWORDS="amd64 ~arm64 ~riscv" + KEYWORDS="amd64 arm64 ~ppc64 ~riscv ~x86" fi LICENSE="GPL-2 GPL-2+" diff --git a/media-gfx/lximage-qt/lximage-qt-2.1.0.ebuild b/media-gfx/lximage-qt/lximage-qt-2.1.0.ebuild new file mode 100644 index 000000000000..bfe9214eb11b --- /dev/null +++ b/media-gfx/lximage-qt/lximage-qt-2.1.0.ebuild @@ -0,0 +1,38 @@ +# Copyright 1999-2025 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +MY_PV="$(ver_cut 1-2)" + +inherit cmake xdg + +DESCRIPTION="Qt Image Viewer" +HOMEPAGE="https://lxqt-project.org/" + +if [[ ${PV} == 9999 ]]; then + inherit git-r3 + EGIT_REPO_URI="https://github.com/lxqt/${PN}.git" +else + SRC_URI="https://github.com/lxqt/${PN}/releases/download/${PV}/${P}.tar.xz" + KEYWORDS="amd64 arm64 ~ppc64 ~riscv ~x86" +fi + +LICENSE="GPL-2+" +SLOT="0" + +BDEPEND=" + >=dev-qt/qttools-6.6:6[linguist] + >=dev-util/lxqt-build-tools-2.1.0 + virtual/pkgconfig +" +DEPEND=" + dev-libs/glib:2 + >=dev-qt/qtbase-6.6:6[dbus,gui,network,widgets] + >=dev-qt/qtsvg-6.6:6 + media-libs/libexif + =x11-libs/libfm-qt-${MY_PV}*:= + x11-libs/libX11 + x11-libs/libXfixes +" +RDEPEND="${DEPEND}" diff --git a/media-gfx/lximage-qt/lximage-qt-2.1.1.ebuild b/media-gfx/lximage-qt/lximage-qt-2.1.1.ebuild new file mode 100644 index 000000000000..3a53ce9cb021 --- /dev/null +++ b/media-gfx/lximage-qt/lximage-qt-2.1.1.ebuild @@ -0,0 +1,38 @@ +# Copyright 1999-2025 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +MY_PV="$(ver_cut 1-2)" + +inherit cmake xdg + +DESCRIPTION="Qt Image Viewer" +HOMEPAGE="https://lxqt-project.org/" + +if [[ ${PV} == 9999 ]]; then + inherit git-r3 + EGIT_REPO_URI="https://github.com/lxqt/${PN}.git" +else + SRC_URI="https://github.com/lxqt/${PN}/releases/download/${PV}/${P}.tar.xz" + KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86" +fi + +LICENSE="GPL-2+" +SLOT="0" + +BDEPEND=" + >=dev-qt/qttools-6.6:6[linguist] + >=dev-util/lxqt-build-tools-2.1.0 + virtual/pkgconfig +" +DEPEND=" + dev-libs/glib:2 + >=dev-qt/qtbase-6.6:6[dbus,gui,network,widgets] + >=dev-qt/qtsvg-6.6:6 + media-libs/libexif + =x11-libs/libfm-qt-${MY_PV}*:= + x11-libs/libX11 + x11-libs/libXfixes +" +RDEPEND="${DEPEND}" diff --git a/media-gfx/maim/Manifest b/media-gfx/maim/Manifest index a0ff6dff816d..0b8298ce1d17 100644 --- a/media-gfx/maim/Manifest +++ b/media-gfx/maim/Manifest @@ -1,3 +1,4 @@ +AUX maim-5.8.0-icu-75.patch 405 BLAKE2B b0128531eae008bc1bb3889adb304823d0e690b01794e9617f4b3b0650fe31dcd40a86118dc10f10cacd31df9a787b59f80982edf0e990ab1b6461ac91826385 SHA512 9e5e88f26047b5aaffccbfbdaba01f960a4df96c97d188803629922ad1e6af1dabbed454a96e31d5a8fa55e9eec8a0f4fa94fb980a55f8d64e8c1c4a5e06fdad DIST maim-5.8.0.tar.gz 42224 BLAKE2B 572743db1d59d802ed7eb7e259a5cb4a4d2147d95169bbb40adf6d36b849562e8f1756b082bc076bc46d2449827ac3b02f0b539ce86760c755920b4e35b6762d SHA512 418725b1950f9374c2ff7508e1c52f6986b253ea1c155ef28604e514f1cf0753185eea43cde76a65b9de80bb8dd65ced48b49ce5dfccaf20f5caa49f41743f5b -EBUILD maim-5.8.0.ebuild 879 BLAKE2B a30e4174853fea50c71fbf404de573d462ca64e353d8f7d43f463fb90c233c6f317b366bab6eccfff06866855697efcba5f9f8aaab92c4e3359fd3a0f8f9e88a SHA512 388cb05f998e0f36e9d72ef8020278a62b3f1090956611135b9fe991ccbef991b9381aea94e3d3afc57790504c4b4952154285668376d3cf00da7f6dec4e821d +EBUILD maim-5.8.0.ebuild 1008 BLAKE2B 3257bd9643c89c8ac3079b757768f4f97b668b87f7fb8de463397b8ca2c5757293c5cb736311b506339115dabe559210d1b0049224fc1b87d81aa250ae18c9dd SHA512 043fe5c831f1f95b6da0e3e0a056e86262d123cb36907321a112d5a5560cacd515f8c1cf0de38caeeb4c21ae4edd0f9625fd03fe6145417018c6aed457dd6647 MISC metadata.xml 246 BLAKE2B 597e29a0bf49f0fb4b12fc59067fa16c5125a6b669b8b825f668db93f6fce4c77dbea6573939c2e86fea964467093a231bcdddbe73637fe579ea8c294a9fba4e SHA512 f54b081e4d9ee221734a058059778e962ef2f62de49da9e4c7084372fb853479200954c7478481be7a2a259f20afccaa52c7ddd669599dda3bae62bc9adb9d15 diff --git a/media-gfx/maim/files/maim-5.8.0-icu-75.patch b/media-gfx/maim/files/maim-5.8.0-icu-75.patch new file mode 100644 index 000000000000..8c7c4163f22e --- /dev/null +++ b/media-gfx/maim/files/maim-5.8.0-icu-75.patch @@ -0,0 +1,11 @@ +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -38,7 +38,7 @@ find_package( Threads REQUIRED ) + find_package( GLM REQUIRED ) + + set_property(TARGET ${BIN_TARGET} PROPERTY CXX_STANDARD_REQUIRED ON) +-set_property(TARGET ${BIN_TARGET} PROPERTY CXX_STANDARD 11) ++set_property(TARGET ${BIN_TARGET} PROPERTY CXX_STANDARD 17) + set_property(TARGET ${BIN_TARGET} PROPERTY CXX_EXTENSIONS OFF) + + # Includes diff --git a/media-gfx/maim/maim-5.8.0.ebuild b/media-gfx/maim/maim-5.8.0.ebuild index bee0980ae8d2..d8582940073f 100644 --- a/media-gfx/maim/maim-5.8.0.ebuild +++ b/media-gfx/maim/maim-5.8.0.ebuild @@ -36,6 +36,9 @@ DEPEND=" " RDEPEND="${DEPEND}" +# Pending issue upstream: https://github.com/naelstrof/maim/issues/292 +PATCHES=( "${FILESDIR}/${P}-icu-75.patch" ) # bug 937454 + src_configure() { local mycmakeargs=( -DMAIM_UNICODE=$(usex icu) diff --git a/media-gfx/mandelbulber/Manifest b/media-gfx/mandelbulber/Manifest index ce933ca66467..c82775ce786f 100644 --- a/media-gfx/mandelbulber/Manifest +++ b/media-gfx/mandelbulber/Manifest @@ -1,5 +1,3 @@ -DIST mandelbulber2-2.28.tar.gz 122800825 BLAKE2B a1bc8b3b743687003aeccaea7763b8100736b03dcd5044e43193f07bb519a7e78075c63cd0466373e8240a317fc2bbb6481bc07b51b137241cbb477e679093c3 SHA512 9bb2ecdcc2a2976efb6af930d49f067462713c6fd48f54631477102f3153479df6336b43b160c98c4e01f00d48188b314ccc86a84055a05cac5eb009db4e52e2 -DIST mandelbulber2-2.31.tar.gz 133379945 BLAKE2B c7b4cfa151f3bf0161b5871d0b22cd05567edc5a7145d64f38c4059b1f4b6f19f1ac3285d7a60cfb2979cd98f10041b7c7dd9100dab9ec93258e567034a03d63 SHA512 cf70c73f80c89731da6711af6ad6e1be33d43d7b014e16a6516eabf22d39b49469ee3e7b4ecc5e5adad3a1b26c8c1892c1a82d5891fe2b71fe524cdd1c3460c7 -EBUILD mandelbulber-2.28-r1.ebuild 1839 BLAKE2B 5798e1c9fe1aa064c43b2100113c880cea5825e420e18148e55649855c3a452377f6cd25b9ae0cf67d36f6595802e24e92ef475deb12e22f55a364299a0e08a5 SHA512 9eedabd79d50453d5e434caa343f04cca54aca03974cc4034afe6f2492a5905f3a60b363b3cbb0192069ca5ca9afb070a08de6343159758af5ea8fdee1ea81d5 -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.28-r1.ebuild b/media-gfx/mandelbulber/mandelbulber-2.28-r1.ebuild deleted file mode 100644 index 35bcd7fe3da4..000000000000 --- a/media-gfx/mandelbulber/mandelbulber-2.28-r1.ebuild +++ /dev/null @@ -1,82 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -MY_P="${PN}2-${PV}" -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" -S="${WORKDIR}"/${MY_P} - -LICENSE="CC-BY-4.0 GPL-3" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="joystick opencl openexr sndfile tiff" - -RDEPEND=" - dev-libs/lzo - dev-qt/qtcore:5 - dev-qt/qtgui:5 - dev-qt/qtmultimedia:5 - dev-qt/qtnetwork:5 - dev-qt/qttest:5 - dev-qt/qtwidgets:5 - media-libs/libpng:= - sci-libs/gsl:= - joystick? ( dev-qt/qtgamepad:5 ) - opencl? ( - dev-cpp/clhpp - virtual/opencl - ) - openexr? ( - dev-libs/imath:= - media-libs/openexr:= - ) - sndfile? ( media-libs/libsndfile ) - tiff? ( media-libs/tiff:= ) -" -DEPEND="${RDEPEND} - dev-qt/designer:5 -" -BDEPEND="virtual/pkgconfig" - -pkg_pretend() { - [[ ${MERGE_TYPE} != binary ]] && tc-check-openmp -} - -pkg_setup() { - [[ ${MERGE_TYPE} != binary ]] && tc-check-openmp -} - -src_prepare() { - default - - use joystick || sed -i -e "s/qtHaveModule(gamepad)/false/" makefiles/common.pri || die - 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 -} - -src_configure() { - if use opencl; then - eqmake5 makefiles/${PN}-opencl.pro - else - eqmake5 makefiles/${PN}.pro - fi -} - -src_install() { - dobin ${PN}2 - - dodoc README NEWS usr/share/doc/${PN}2/Mandelbulber_Manual.pdf - - insinto /usr/share/${PN}2 - doins -r usr/share/${PN}2/* - - domenu ${PN}2.desktop - - newicon -s 256 qt/icons/${PN}.png ${PN}2.png -} 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/mkbold-mkitalic/Manifest b/media-gfx/mkbold-mkitalic/Manifest index b83b289971a2..d60d03348bc7 100644 --- a/media-gfx/mkbold-mkitalic/Manifest +++ b/media-gfx/mkbold-mkitalic/Manifest @@ -1,3 +1,3 @@ DIST mkbold-mkitalic-0.11.tar.bz2 21922 BLAKE2B 90473ee9ce751f491a36b18b4adcfc15a64535ca11b7394a2d46b48a144394ae549133635f898b8b16d87eb3271439fc425cee3cb05e4559818ab00a7d054e3d SHA512 fe40693bc5d73aaf45daf1bbd22f8107fb61604cd4ff0ec09e8bd63029be811a2b1bb46a3ce214954841c5d074e9ec23c150006d9a2c8ffe633e93801c2d7345 -EBUILD mkbold-mkitalic-0.11.ebuild 761 BLAKE2B 8a9f9ccba3506f35a2dcdd7d4510035f19c03dd7b5ecbffb0d7504d959995b9c6c45f637d19de370a40a83a9db022d97f9495f297571fbad4cf906935c64cf33 SHA512 34cb049179b645960017a4c23f4627fd74c1f1f38916baccc0f274f9378dfbea3ece26dc744babfff2a237b4b2075b28bdf58301c9369eb2c134bfcee2180247 +EBUILD mkbold-mkitalic-0.11.ebuild 755 BLAKE2B 3d7d80412cd09532f2d3b6a4783a2ce35639d86ce83bc1778ef0f3496cd55c326f25bcdd04f051943551dcb574711c489a39aac2de37fdc9f1b0f01e9dc5962d SHA512 d5b3feb28b7b0fcdc63e8674db212d02bfd738e4ed8df3b9d855161bb0932c72ea4121cc4a571dbc103d5a0be2812742ce8fd922e145ab73cbe59a5ba3e91a9c MISC metadata.xml 249 BLAKE2B a37da98d387308dab889eab2665b67e4176707f3c115a7a69cb7f4b19f9864b96bc2fe70efa105e627c4b57a7d626f6b23dc2709a225a9debada3356f3cf32a0 SHA512 a5095fb01e05f24583a962e36131b2f02cf2d1dd7a97051200e465ad97db014721de7c1857f5eb736cb0290682e8de833cb4c735f7de8d98cdfae1aed6d3d549 diff --git a/media-gfx/mkbold-mkitalic/mkbold-mkitalic-0.11.ebuild b/media-gfx/mkbold-mkitalic/mkbold-mkitalic-0.11.ebuild index 5aa8c4ee1a47..79c05eab2b46 100644 --- a/media-gfx/mkbold-mkitalic/mkbold-mkitalic-0.11.ebuild +++ b/media-gfx/mkbold-mkitalic/mkbold-mkitalic-0.11.ebuild @@ -11,7 +11,7 @@ SRC_URI="https://hp.vector.co.jp/authors/VA013651/lib/${P}.tar.bz2" LICENSE="MIT" SLOT="0" -KEYWORDS="~alpha amd64 arm ~ia64 ~loong ppc ~riscv ~s390 sparc x86" +KEYWORDS="~alpha amd64 arm ~loong ppc ~riscv ~s390 sparc x86" DEPEND="" RDEPEND="" 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/mscgen/Manifest b/media-gfx/mscgen/Manifest index 89d658c6e18a..7f89ee647319 100644 --- a/media-gfx/mscgen/Manifest +++ b/media-gfx/mscgen/Manifest @@ -1,3 +1,3 @@ DIST mscgen-src-0.20.tar.gz 204818 BLAKE2B c4ae701ead1ec5845ea80e1fd19b88ff77e3cf2f462c843a2561cf06a5a3faacd8fcd891031256f9014b069ccae02c82221b3b6bb173a68aa747fe7051bc2225 SHA512 12fdea38633a42d6d235520550b16bea0cd3fb67d198b1f956845f4057239d7f80fa961e37f6f8bad9fb03f29ff8c6ffab4f4ae7402eea3083dfddeaf39687e3 -EBUILD mscgen-0.20.ebuild 942 BLAKE2B 0e4f0395418820e8e6d14c6dc8918b7d1136a24f08ed7a72456b07ee069aa05befa854c61bd831118c44087b28274afd154a1b67f624d3949b8f544fbd239b45 SHA512 3c09ca19b8a91b73208c690b78480e70561372e613a954632278acee105fa52c8f39f93f35512cd48883f80c94e04b85ff5f9c4efbbbd700874191a66b56a8ca +EBUILD mscgen-0.20.ebuild 941 BLAKE2B 6e07ca66a0fa03033b66f6ef0c15a78fb9e020d7fdd0afe5c37536b0494ea5d7af60dbec523e2ffb53c15c3c437eade81a02f8f4400072a66c149bfa9edf28a2 SHA512 ebe0ad158f221eb5b59826fa7bfa7cb9c13a21ba4f380470ca7760dcdba1f576eb023801a06f9ed10b778e567d7b29c30946f435ecb78049475b528c9afd6bf7 MISC metadata.xml 167 BLAKE2B 868e3b584722eaacf68273db062bb773d8c7e5d7ab2b81ca7e8397643bf7cc106c3a1033594401c99c54f667bb45d6b73f9048fc335580bbd44b4589ad26a832 SHA512 30caadd1496c3b9969136038239a1d8e01f236726b4022c2d7e19ca7575f25f735e556835e581afbf44fbd3e4104c40f2b5ef5fa70118d75c881fdf871962d0a diff --git a/media-gfx/mscgen/mscgen-0.20.ebuild b/media-gfx/mscgen/mscgen-0.20.ebuild index f39af35db010..270ea307937e 100644 --- a/media-gfx/mscgen/mscgen-0.20.ebuild +++ b/media-gfx/mscgen/mscgen-0.20.ebuild @@ -9,7 +9,7 @@ DESCRIPTION="Message sequence chart generator" HOMEPAGE="https://www.mcternan.me.uk/mscgen/" SRC_URI="https://www.mcternan.me.uk/${PN}/software/${PN}-src-${PV}.tar.gz" -KEYWORDS="amd64 arm ~arm64 ppc ppc64 ~riscv x86 ~x64-solaris" +KEYWORDS="amd64 arm arm64 ppc ppc64 ~riscv x86 ~x64-solaris" LICENSE="GPL-2+" SLOT="0" diff --git a/media-gfx/mypaint-brushes/Manifest b/media-gfx/mypaint-brushes/Manifest index 8dd24e10a201..b933e8a94970 100644 --- a/media-gfx/mypaint-brushes/Manifest +++ b/media-gfx/mypaint-brushes/Manifest @@ -1,3 +1,3 @@ DIST mypaint-brushes-2.0.2.tar.xz 1522216 BLAKE2B ba274d9abcac51bba3b8e7d4489893eef62e2b35ee8d0607d476d022150d92944693cae6d1ddb9f4f9b01f229f050f4ccf7416a0ef0fe27e9e0f5e84a4e2c56f SHA512 bae870e930381b818165e5e39d38b25782d5744c9a507a71dab37ae7ca2d4502896057f919a16eb9305d803a01db3a948a735d5c5b850893997a9afd6403144b -EBUILD mypaint-brushes-2.0.2-r1.ebuild 507 BLAKE2B 5d4fa4645221b2adeea62343cb90d4480197b60ef0599b843285f6ecfd8b30ad9d36df9909ae5d865aaa8c8db74517eabbf1801daabcdad7c3dbeccc74a3d4d1 SHA512 a0d672a106eda28524aef40e4a4278d0ab8c201415091d07c1bfe5c3738c678112dbec3e3c8d711995a543d4f7e6a7f74ce841c272e807d37be14120603f98bf +EBUILD mypaint-brushes-2.0.2-r1.ebuild 501 BLAKE2B 9e6afb113994418cff1456bb906fba4bc9740a9217151f2c2771d39f8128f6a651d44bb82cfda1f8e90ce6155e6fb7bb311cc91b7edfd8529a2a9e29daa2370d SHA512 a60f90b95c01f142d466675428f341590c0b2cd8ba04ecd785053fc78e47d3503d2e544357d925ab9164f3b8dba2bc5610595ef1a6c1fb3b045ecae61588ca2e MISC metadata.xml 352 BLAKE2B 2ab3826fec46744aceb8210d0892c4d928cb818db4bd2704c156ca74c4c85bc8778e8212ae07010a0f87876b9448bae139f988465b9b5f2e50f62061c860d31d SHA512 bf153d124d449c2b4e870b2aad73ab45708f622c09d37a42975dfa5e1c42005009bf6c0d361bc03cab7fee76ba0a811877a7518cc6b84cfe1fc941e9a41c2921 diff --git a/media-gfx/mypaint-brushes/mypaint-brushes-2.0.2-r1.ebuild b/media-gfx/mypaint-brushes/mypaint-brushes-2.0.2-r1.ebuild index 0b8ac9f4982c..5463c117e59b 100644 --- a/media-gfx/mypaint-brushes/mypaint-brushes-2.0.2-r1.ebuild +++ b/media-gfx/mypaint-brushes/mypaint-brushes-2.0.2-r1.ebuild @@ -11,7 +11,7 @@ SRC_URI="https://github.com/mypaint/mypaint-brushes/releases/download/v${PV}/${P LICENSE="CC0-1.0" SLOT="2.0" # due to pkgconfig name "mypaint-brushes-2.0" -KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~loong ~ppc ppc64 ~riscv x86" +KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~loong ~ppc ppc64 ~riscv x86" src_prepare() { default diff --git a/media-gfx/mypaint/Manifest b/media-gfx/mypaint/Manifest index f5dfdcc70665..24cb3f0b0fc0 100644 --- a/media-gfx/mypaint/Manifest +++ b/media-gfx/mypaint/Manifest @@ -3,5 +3,5 @@ AUX mypaint-2.0.1-python3.11.patch 3968 BLAKE2B 02318c3543bc66fc1ffd89af02f00c0e AUX mypaint-2.0.1-r1-build-system.patch 638 BLAKE2B 8e0209eb8fdba535cb8c0075e183681b0d8f8a11613cf7c3d2ddb5e20954d6c95da3ef3824063ac55bb11feda38cdf00eb8190cf76ca7753d2432d870926194b SHA512 8c088a089408542f57ef0fb608a63ae6fa0cce5392cb309376198813d35f5c3e54466945419984973af77e11f5bc4908961b5e81982a32fbef04c081df1b0349 AUX mypaint-2.0.1-setuptools.patch 2647 BLAKE2B e9212c40830e51ed8abe217204ce3bcad65fac99c7ad00f38ae6275eb404c3464598672431a6c857f7de42950830a63f25bcfcb5f19685a443f963251ed1a9be SHA512 4d834558ab0e5419aae98a2a8f30c285d330392d3627e21d25def869b16e2ef4100d45d6a78b3f1714bd72e1e7b8cb7de24f89893c6c98d87bcefe74aff5965a DIST mypaint-2.0.1.tar.xz 7295048 BLAKE2B 813a939f95ea6887c57d8c0868e33e9bc8b1b95746d5ecd793d4fd13a32198ee5a445cfdd2691a15e944bfb0099d6ac624dff320ae29465db5b1e0d197bedb30 SHA512 449beddcc6da5d720c9efbeac94a466ed0057bd1962d42ebb419190e8b7fd8ffd341327408467fc5da47920f9d0da1fd6d78233a0dda88de5f5d52d53d9ab562 -EBUILD mypaint-2.0.1-r3.ebuild 1904 BLAKE2B a28d89927f8fff5bc64a6090f227b999d427b7a2947e3bede049d98f61142513b76b314f80edbb14c960b130e801da23c2a1af4f4f33edb63f9f311411121126 SHA512 c6968dc9f7812da07bc78138e5b4b53f764fc432127bc1d6ded38add7f60908f9ecace973ea02effe60d7e1cb51122bf07ec0b7bcce236b88b995be743187e76 +EBUILD mypaint-2.0.1-r3.ebuild 1902 BLAKE2B e834a0d01e599393d649f77ee161a2f3396d07c55606b7cbbc7126d0f2cb1f6ddfac6e6d1f5130817cdd57cec3721629f475eee2fed16865018c278d7d33c75d SHA512 1d9adf88bc6432ec5df418bb425a6d3856810a9f54d4c4e754ef13acded24281fd8e1242364812be9f72b1760e4a1f93b5b817cbd64db4d6c7b45877f6c49d46 MISC metadata.xml 320 BLAKE2B 17a66707a8182c8eb1a0206b8ec86cdc307ce2d965beb66aa08e3e2b31700eebc05213b7e27e98aef40e566fd028561476d6f614aeb2a0450f560801f187b060 SHA512 cb54ae739d86722c2959d8ff63d8f20394b0611ef3f3a6587e517f3de6625748201659d782e6ec8ca65e55c285a6ff52408b3586088ce2546ba42872dfd07133 diff --git a/media-gfx/mypaint/mypaint-2.0.1-r3.ebuild b/media-gfx/mypaint/mypaint-2.0.1-r3.ebuild index 8f03d4e44e6c..10930b0a7498 100644 --- a/media-gfx/mypaint/mypaint-2.0.1-r3.ebuild +++ b/media-gfx/mypaint/mypaint-2.0.1-r3.ebuild @@ -24,7 +24,7 @@ RDEPEND=" dev-python/pygobject:3[${PYTHON_USEDEP}] dev-python/numpy[${PYTHON_USEDEP}] >=dev-python/pycairo-1.4[${PYTHON_USEDEP}] - dev-python/protobuf-python[${PYTHON_USEDEP}] + dev-python/protobuf[${PYTHON_USEDEP}] ') >=dev-libs/json-c-0.11:= gnome-base/librsvg @@ -33,7 +33,7 @@ RDEPEND=" >=media-libs/libmypaint-1.5.0[openmp?] media-libs/libpng:= sys-devel/gettext - sys-libs/libomp + llvm-runtimes/openmp x11-libs/gdk-pixbuf[jpeg] x11-libs/gtk+:3 " diff --git a/media-gfx/netgen/Manifest b/media-gfx/netgen/Manifest index b7f5bbb3f667..98da7e7abbf0 100644 --- a/media-gfx/netgen/Manifest +++ b/media-gfx/netgen/Manifest @@ -6,6 +6,12 @@ AUX netgen-6.2.2204-use-system-catch.patch 1521 BLAKE2B 34ee6fedced5381a1e2152fd AUX netgen-6.2.2204-use-system-spdlog.patch 1390 BLAKE2B 541725d179a0b3f9f9430f1268478adfdf378940b4503e962dd59071e8ac0dba60c5445d036d73103f6ec25017a1335f6eb7bfc38debb0ccff810229d5466890 SHA512 1519ce3628f2c5f17afea34bd4ebf102f2688c9440504f6828c611b749b0ae5b7d80b2b688c13769f6bd911faeb3d9d4f83e1ba663d8d5bdb2ef5bc2076f873c 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 -EBUILD netgen-6.2.2302.ebuild 4089 BLAKE2B 1d663d3a6d22a2b2c6196719b26a61d300735a917bb7493a76779dcd183526650f3ed2739405439988642b2c41af9eadee169e1104c7cbb0efe0747a57895d4c SHA512 3a8f4dd92088288330d4f63390d04bc867724766d12798ee35e7caa7e8691d74619c5cabead75cf24ae07c8cfc0f26bc4ad30e2683420f7f36ba4833e9b4a68f -MISC metadata.xml 648 BLAKE2B 8011d98cf84e88a045f2ace8e31e48b06f9c7555d73f1220a1a877f36c579ea4829568837b31077e84ecf2eff932d3290032479b3eabf824c0c7e4f95a42c485 SHA512 f78534e481c213ecd3091ca2b09bfd62a654c1c5a1b6129db108a94e974b9d44090ccb3d89e8750a96b29ef182978bca65939b7c1a4b117e563c7c8503ebdb4b +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.2302-opencascade-7.8.0.patch b/media-gfx/netgen/files/netgen-6.2.2302-opencascade-7.8.0.patch new file mode 100644 index 000000000000..0c5664edd6bb --- /dev/null +++ b/media-gfx/netgen/files/netgen-6.2.2302-opencascade-7.8.0.patch @@ -0,0 +1,147 @@ +https://bugs.gentoo.org/930171 +https://github.com/NGSolve/netgen/issues/170 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -372,25 +372,20 @@ if (USE_OCC) + TKGeomAlgo + TKGeomBase + TKHLR +- TKIGES + TKLCAF + TKMath + TKMesh + TKOffset + TKPrim +- TKSTEP +- TKSTEP209 +- TKSTEPAttr +- TKSTEPBase +- TKSTL ++ TKDESTL + TKService + TKShHealing + TKTopAlgo + TKV3d + TKVCAF + TKXCAF +- TKXDEIGES +- TKXDESTEP ++ TKDEIGES ++ TKDESTEP + TKXSBase + TKernel + ) +--- a/libsrc/occ/Partition_Loop3d.hxx ++++ b/libsrc/occ/Partition_Loop3d.hxx +@@ -10,27 +10,16 @@ + #ifndef _Partition_Loop3d_HeaderFile + #define _Partition_Loop3d_HeaderFile + +-#ifndef _TopTools_ListOfShape_HeaderFile +-#include <TopTools_ListOfShape.hxx> +-#endif +-#ifndef _TopTools_IndexedDataMapOfShapeListOfShape_HeaderFile +-#include <TopTools_IndexedDataMapOfShapeListOfShape.hxx> +-#endif +-#ifndef _Standard_Boolean_HeaderFile ++#include <Standard_Version.hxx> + #include <Standard_Boolean.hxx> +-#endif +-#ifndef _Standard_Real_HeaderFile + #include <Standard_Real.hxx> +-#endif +-#ifndef _Standard_Version_HeaderFile +-#include <Standard_Version.hxx> +-#endif ++#include <TopTools_ListOfShape.hxx> ++#include <TopTools_IndexedDataMapOfShapeListOfShape.hxx> + +-#if OCC_VERSION_HEX < 0x070000 ++#if OCC_VERSION_HEX < 0x070000 || OCC_VERSION_HEX > 0x070799 + #else + #include <TopTools_ShapeMapHasher.hxx> + #include <TopTools_OrientedShapeMapHasher.hxx> +- #include <TopTools_MapOfOrientedShape.hxx> + #endif + + class TopoDS_Shape; +@@ -38,6 +27,8 @@ class TopoDS_Shape; + #if OCC_VERSION_HEX < 0x070000 + class TopTools_ListOfShape; + class TopTools_MapOfOrientedShape; ++#else ++#include <TopTools_MapOfOrientedShape.hxx> + #endif + + class TopoDS_Edge; +--- a/libsrc/occ/occ_edge.cpp ++++ b/libsrc/occ/occ_edge.cpp +@@ -55,7 +55,11 @@ namespace netgen + + size_t OCCEdge::GetHash() const + { ++#if OCC_VERSION_HEX < 0x070800 + return edge.HashCode(std::numeric_limits<Standard_Integer>::max()); ++#else ++ return std::hash<TopoDS_Shape>{}(edge); ++#endif + } + + void OCCEdge::ProjectPoint(Point<3>& p, EdgePointGeomInfo* gi) const +--- a/libsrc/occ/occ_face.cpp ++++ b/libsrc/occ/occ_face.cpp +@@ -32,7 +32,11 @@ namespace netgen + + size_t OCCFace::GetHash() const + { ++#if OCC_VERSION_HEX < 0x070800 + return face.HashCode(std::numeric_limits<Standard_Integer>::max()); ++#else ++ return std::hash<TopoDS_Shape>{}(face); ++#endif + } + + Point<3> OCCFace::GetCenter() const +--- a/libsrc/occ/occ_solid.hpp ++++ b/libsrc/occ/occ_solid.hpp +@@ -16,8 +16,11 @@ namespace netgen + OCCSolid(TopoDS_Shape dshape) + : solid(TopoDS::Solid(dshape)) + { } +- ++#if OCC_VERSION_HEX < 0x070800 + size_t GetHash() const override { return solid.HashCode(std::numeric_limits<Standard_Integer>::max()); } ++#else ++ size_t GetHash() const override { return std::hash<TopoDS_Solid>{}(solid); } ++#endif + }; + } + +--- a/libsrc/occ/occ_vertex.cpp ++++ b/libsrc/occ/occ_vertex.cpp +@@ -19,6 +19,10 @@ namespace netgen + + size_t OCCVertex::GetHash() const + { ++#if OCC_VERSION_HEX < 0x070800 + return vertex.HashCode(std::numeric_limits<Standard_Integer>::max()); ++#else ++ return std::hash<TopoDS_Shape>{}(vertex); ++#endif + } + } +--- a/libsrc/occ/occgeom.cpp ++++ b/libsrc/occ/occgeom.cpp +@@ -1625,8 +1625,12 @@ +
+ // enumerate shapes and archive only integers
+ auto my_hash = [](const TopoDS_Shape & key) {
++#if OCC_VERSION_HEX < 0x070800
+ auto occ_hash = key.HashCode(1<<31UL);
+ return std::hash<decltype(occ_hash)>()(occ_hash);
++#else
++ return std::hash<TopoDS_Shape>{}(key);
++#endif
+ };
+ TopTools_IndexedMapOfShape shape_map;
+ Array<TopoDS_Shape> shape_list;
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/metadata.xml b/media-gfx/netgen/metadata.xml index 201e5f704aba..0cb4ec70802b 100644 --- a/media-gfx/netgen/metadata.xml +++ b/media-gfx/netgen/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="project" proxied="proxy"> <email>sci-mathematics@gentoo.org</email> diff --git a/media-gfx/netgen/netgen-6.2.2302.ebuild b/media-gfx/netgen/netgen-6.2.2302.ebuild index 5a86024f6f64..5b3aa9d3d837 100644 --- a/media-gfx/netgen/netgen-6.2.2302.ebuild +++ b/media-gfx/netgen/netgen-6.2.2302.ebuild @@ -74,6 +74,7 @@ PATCHES=( "${FILESDIR}/${PN}-6.2.2204-disable-python-tests.patch" "${FILESDIR}/${PN}-6.2.2301-find-libjpeg-turbo-library.patch" "${FILESDIR}/${PN}-6.2.2301-fix-nullptr-deref-in-archive.patch" + "${FILESDIR}/${PN}-6.2.2302-opencascade-7.8.0.patch" ) pkg_setup() { 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 21eb41d1d5ed..dcde255ea10e 100644 --- a/media-gfx/nomacs/Manifest +++ b/media-gfx/nomacs/Manifest @@ -1,9 +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-plugins-3.16.tar.gz 561522 BLAKE2B 2bda4f36d56709653f6696af3404e416fd2d9fe7fa11de9636643c728028018ac769df3e2e519799322c5c42006cdc114d0e6406f9f60294234b07d9fd8d8409 SHA512 cd72f6ddbe3e07d7ed97f08405bac7574f4f3285c81e835f5630e011c8a9b105f23d892fed8084cb35ce521aca5524db071d0edb8bb04850dd2209d9ed019747 -EBUILD nomacs-3.16.224-r6.ebuild 1989 BLAKE2B 00d46fb6e2501fd71f69b256490c5899753498a6a144b8976f91edd1a660aa6c0daaac79d27f36bcc5af961abce8bf39c1a37625c1fde17af0ab130b29712edb SHA512 5a34f23eeb69b567f6e8aca96479599bdbfd0f9d683af1d08f6b1b41de62fe2bee259a8f07241740c43c1cc5ad1962d182aff03915c91612d14ad4408df80ec9 -MISC metadata.xml 515 BLAKE2B 9c5f7d5c7a9bef5dc43186bc7420d1132d4af52e5cf665a8a9db4c0dcb8b374a3067bf01d9a46da8101382539ca0a7de48b4dc3b4ce8ce3696abf144c614b20f SHA512 e863fca49752588fdb5e4b407f266040a00a915a432afbc3028c1f84543112124b86dae27d12f6325b6798e366774d61aafaf882e09ca8296b5d0ecaf8b929da +DIST nomacs-3.19.1.tar.gz 1928697 BLAKE2B ee8a10ebd777a589df179b51591893fe083505b066bf409e11a54a4bc21054d6d61d8c5e397cf01fa7907fd2e4b69401729a8fab7f1a8079769bfef53692230b SHA512 7cbe80d6c336547a00761c64e591444827998aa79a52d51219ca69aacca4d3361c1e7cbccba1f9c06c7e93f09f4b732abd25757107e1c50d8a43eb45ced0ee97 +DIST nomacs-plugins-3.19.0.tar.gz 559925 BLAKE2B 4e3d8e07974d418510d2e806980bc9793567813b9418c0754dcaaa9e6f43e88d76e35264f05e05b2e21345467c8038db3c37ce3d1b003adcd3b019796a737080 SHA512 36b96b0270cb7cc34ee3f9f948eb1f2e5b4facd1f6eb273afe1fbf865c7712fb6487ef59f3d4e7723b9bca7930255f4247a8381c05ee8cfb9acf2b5cc225303c +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/metadata.xml b/media-gfx/nomacs/metadata.xml index 45360b811a6c..9be581251352 100644 --- a/media-gfx/nomacs/metadata.xml +++ b/media-gfx/nomacs/metadata.xml @@ -3,7 +3,7 @@ <pkgmetadata> <!-- maintainer-needed --> <upstream> - <bugs-to>https://nomacs.org/redmine/projects/nomacs</bugs-to> + <bugs-to>https://github.com/nomacs/nomacs/issues/</bugs-to> <remote-id type="github">nomacs/nomacs</remote-id> <remote-id type="sourceforge">nomacs</remote-id> </upstream> diff --git a/media-gfx/nomacs/nomacs-3.16.224-r6.ebuild b/media-gfx/nomacs/nomacs-3.19.1-r1.ebuild index d174453289b1..7b47804f0c79 100644 --- a/media-gfx/nomacs/nomacs-3.16.224-r6.ebuild +++ b/media-gfx/nomacs/nomacs-3.19.1-r1.ebuild @@ -1,86 +1,77 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2025 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)" +PLUGIN_PKG="${PN}-plugins-$(ver_cut 1-2).0" 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 )" +plugins? ( https://github.com/novomesk/${PN}-plugins/archive/refs/tags/$(ver_cut 1-2).0.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" - +IUSE="+opencv plugins raw +tiff test zip" REQUIRED_USE=" raw? ( opencv ) tiff? ( opencv ) " +RESTRICT="!test? ( test )" 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 + dev-qt/qt5compat:6 + dev-qt/qtbase:6[concurrent,cups,gui,network,widgets] + dev-qt/qtsvg:6 media-gfx/exiv2:= opencv? ( >=media-libs/opencv-3.4:= ) raw? ( media-libs/libraw:= ) tiff? ( - dev-qt/qtimageformats:5 + dev-qt/qtimageformats:6 media-libs/tiff:= ) - zip? ( dev-libs/quazip:0=[qt5(+)] ) + zip? ( dev-libs/quazip:0=[qt6(+)] ) +" +DEPEND="${RDEPEND} + test? ( dev-cpp/gtest ) " -DEPEND="${RDEPEND}" BDEPEND=" - dev-qt/linguist-tools:5 + dev-qt/qttools:6[linguist] 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 + -DQT_VERSION_MAJOR=6 -DENABLE_CODE_COV=OFF -DUSE_SYSTEM_QUAZIP=ON -DENABLE_TRANSLATIONS=ON -DENABLE_OPENCV=$(usex opencv) -DENABLE_PLUGINS=$(usex plugins) -DENABLE_RAW=$(usex raw) + -DENABLE_TESTING=$(usex test) -DENABLE_TIFF=$(usex tiff) -DENABLE_QUAZIP=$(usex zip) ) cmake_src_configure } + +src_test() { + cmake_build core_tests + cmake_src_test +} diff --git a/media-gfx/opencsg/Manifest b/media-gfx/opencsg/Manifest index ead371f41bde..f1ed5ed5e2d6 100644 --- a/media-gfx/opencsg/Manifest +++ b/media-gfx/opencsg/Manifest @@ -4,6 +4,6 @@ AUX opencsg-1.6.0-includepath.patch 514 BLAKE2B cf3b69d78543b1c45c6ecf0bc7d3c79c DIST OpenCSG-1.5.1.tar.gz 967182 BLAKE2B a24d7e736b58af78dfed218e7015c9a580c447b65367209fade0c90a36cf7bb638c4abe10cdf37a07c8f16d46389e92341ab72ea8d9c189e380502cbb2962d29 SHA512 aef3e785e730fd8f2ee06719d1c7a57c105e7432fb4dc6f4ad4305aabf1c7d4438ef869ae4eb840dc272b35f20c4ff296e6dd5418337230081e74ac4c91cd342 DIST OpenCSG-1.6.0.tar.gz 302547 BLAKE2B ceb99fb6558b38df0eb629cfd5e5e2b768311f026f2f42e0e35ca948761bd7c67fcfc35322d54eb6c013eded39d95ede08f634b30241ebad4231bf783f76b591 SHA512 0cbf28353aafb47738a122bd5fa8e8ab0abc616d7b3f4e5f1ee02f550a060ccfbd6569d1183fcc4e992fe9bbb49584c23aa9cc7db2a7e7c53b119544aa9589a7 EBUILD opencsg-1.5.1-r1.ebuild 1165 BLAKE2B 535c82bade697db1063d85464ea38acc104843e05288c73d89c1cc8d6a601586b5410db197ec7e1839cf40bcb7aa36b53037f44f9c6ea84193690ca0abc7b4e7 SHA512 7e3cdba506001516bfd795c9d3982d7be84cae080a12b2ca554ba5c706222dd05f18194f85993d7102f2b60af69485cae3573bb29bf2c0ea5d46abf981d379ca -EBUILD opencsg-1.6.0-r1.ebuild 686 BLAKE2B 34047a1512451af054ba3ea2d94ae27d47e38388dc74902ee718ce439f587b18e321fbd254a03005265f54376c0770649e8367dcb245f2c9fafc89edc5af6537 SHA512 6589a5bb18b8a2a223cf3433cde272492615c2029f7ea5cf17e6836bb54b32811fe7d7676cbeca4e6c75dd1575f552721d70a01ea87de1bd430bca8c8401d8db -EBUILD opencsg-1.6.0.ebuild 1037 BLAKE2B 0fb9e5764a37b39088ae51ee0447d908af72ff94edbe19df5c34ab6e1789f98aaf87dbf0c5d64af196b746ad3cb3be2c5b4a8c8e88b9b0f024d28c4697b5af8a SHA512 27f77aa726e038e6ac266dd26987e8029385937f825740a34ef557976e2acc0815bccec3a5a6dd15919f37b5f24abdb93ac8dab78a3509041109db00258ea4b2 +EBUILD opencsg-1.6.0-r1.ebuild 684 BLAKE2B fbd6c33999adb402fc7666847403a3166a0eab907363884dc9857d100d16f9dbfafdc96b524fab93fb10a66fd5861a3d64fea45f4611f7caf2442f412abb838f SHA512 770357a41921c0e4baa2cac79848f879fe296101fad3994b0a9e260a088bf4e5b9c9ef0013e8e6d642bef2b5b184442796432c6958484a6f036c52f9182acae0 +EBUILD opencsg-1.6.0.ebuild 1035 BLAKE2B 151a4e892c5e7888269bd60392d67b6ccc3f56cc8e74bfe4416f2680f7d6cf841c30c67335d0ef8ed3ab11a1b17dec7712ead49fb10af0cc02debd4e91a83cb1 SHA512 049eef1ccb758443daa84482ea61ed7767fbfc5a75341a5d1e1efb5125bf1aee9cbaf3b534927d7fc09e2575ed1fcd365dab1cc4dd2358e6b662257829059acc MISC metadata.xml 1303 BLAKE2B 39b12bf1071d488890726841c2e609023e99edc3387007408b1a332051cb7adb7faf71ea3e5afdc660ba9a62116a322addba637aa1a7dc78adcae4cf27ac6508 SHA512 5a56d0545ab79ed384f580aa97be7736ac844ed8951262d016b4eb43193c594fe889f067b1c7243346b8185c8e63d933457b9b1f1f1ae47d5e350fc93d65476c diff --git a/media-gfx/opencsg/opencsg-1.6.0-r1.ebuild b/media-gfx/opencsg/opencsg-1.6.0-r1.ebuild index 020597e9a1b0..53c92c26eee1 100644 --- a/media-gfx/opencsg/opencsg-1.6.0-r1.ebuild +++ b/media-gfx/opencsg/opencsg-1.6.0-r1.ebuild @@ -14,7 +14,7 @@ S="${WORKDIR}/${MY_P}" LICENSE="GPL-2+" SLOT="0/1.6" -KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86" +KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv x86" IUSE="doc" RESTRICT="test" diff --git a/media-gfx/opencsg/opencsg-1.6.0.ebuild b/media-gfx/opencsg/opencsg-1.6.0.ebuild index 7afafcd37947..c08bc4b44e2a 100644 --- a/media-gfx/opencsg/opencsg-1.6.0.ebuild +++ b/media-gfx/opencsg/opencsg-1.6.0.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 @@ -14,7 +14,7 @@ S="${WORKDIR}/${MY_P}" LICENSE="GPL-2+" SLOT="0/1.6" -KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86" +KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv x86" IUSE="doc" RESTRICT="test" diff --git a/media-gfx/openmesh/Manifest b/media-gfx/openmesh/Manifest index a62933a7517a..fcd86be89a4c 100644 --- a/media-gfx/openmesh/Manifest +++ b/media-gfx/openmesh/Manifest @@ -1,3 +1,3 @@ DIST OpenMesh-7.1.tar.bz2 22855582 BLAKE2B 778b3a40c2e476cdb2f50b5b4a90f8b6ae7852f166087426ff1db25c829cb4172cd7ed14db1a22229f7b4447e7ebeb0d6116647d929b7dab43d565192a8ac48e SHA512 bca0f937e08fe512efb436f5b96b83a1ff7945640e18fb1bb083956f04609560e29b1c1f7e058840791df77df6859fdd20ff6f49d80b908e8c1c5542b8615e6d -EBUILD openmesh-7.1-r1.ebuild 1457 BLAKE2B c066180e93acccefecc3dba5599d06fe20e1ff4f623a80a0e442b7be3cbbd8e2e92237c358532cb5fcbcd5c71f1af9f43b8f768ef81f5eb3e2a8a0965b4ac8a0 SHA512 8489f8a1b395b4f4f036f9cefde9370d29e041daff0906a91c106574d1ba7692738859841c1a79ae917dd8982309a3394275de07541563446273b8767642bddc +EBUILD openmesh-7.1-r1.ebuild 1451 BLAKE2B 95c4b5aec4504cc64718821f565f0ec1a5259e8eeadee9632eca28a17980ff0e10f6c4b35cfbdf704b97dc134a0145bf2344fc965bff6e5c1dc85764a7a40bc1 SHA512 a730b04f593cbed7f61ea2f15fccbe5ad4f5a0e1f27aa5235c8c442d26e87a39dfbd2ee74c383b1660bd4a070963c7be9834668418f94b554317fcb2008453b2 MISC metadata.xml 649 BLAKE2B 885190b0bcbd5eea997faf14865a5873839ce727d3a98dc36f712063f487271d2882c2d5ea08af9d019edd8e780640f2684905ac01de00163e06e832c9afdf60 SHA512 f1c2f1b486f851d8ebc796c8738d1842e12edfc5968fbeea7c150ce8bbf6be107c64a7de051326d485222210a2972868d71d9cd619aa8a3fa5eca8bdd02da68e diff --git a/media-gfx/openmesh/openmesh-7.1-r1.ebuild b/media-gfx/openmesh/openmesh-7.1-r1.ebuild index 4f02e9b682d2..41c0b43f5636 100644 --- a/media-gfx/openmesh/openmesh-7.1-r1.ebuild +++ b/media-gfx/openmesh/openmesh-7.1-r1.ebuild @@ -15,7 +15,7 @@ SRC_URI="https://openmesh.org/media/Releases/${MY_PV/-RC/RC}/${MY_PN}-${MY_PV}.t LICENSE="BSD" SLOT="4" -KEYWORDS="~amd64 ~ia64 ~x86" +KEYWORDS="~amd64 ~x86" IUSE="qt5 static-libs test" RESTRICT="!test? ( test )" diff --git a/media-gfx/openscad/Manifest b/media-gfx/openscad/Manifest index d224914ce133..c2c99989ff8a 100644 --- a/media-gfx/openscad/Manifest +++ b/media-gfx/openscad/Manifest @@ -1,14 +1,9 @@ -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 -EBUILD openscad-2021.01-r5.ebuild 2902 BLAKE2B 02406d442221462d7b31201a6a7e08628f978b332768d5bdc829ca9bd1fc533aeb3ec1e106b0870f026844052fe2c95a2b314ccf8b26459e6c26ec08d7194041 SHA512 4a3461c8c586a12fba89edd04300e4def30dba724edba51aecb0b76b6f1dbba2efb8c98028c6faf7fc627d4b99bedfe3ce86808205b4e1ae3451c3f54ac041bb -EBUILD openscad-9999.ebuild 2820 BLAKE2B 97b9433782b6e0b486681d14d3c812ba3e09357223a3d86a81243c0932a5530a88ad957b33af3e677f71743994f7f2e31bcd86ba5fef8ef4868fe4bfe1a40d74 SHA512 9d22437d0656e33ccda551f0fc7424fec6127a4e1c9b7de2495da95b64761631cbdb4bfb2b84fa9724a7ba0e2b555d6146e900c7cf7f9fcd8d7f25905a0e9a22 -MISC metadata.xml 1685 BLAKE2B 7d859b263a2ff2e466b581f8b04aa1f5830ce5676ce4996e6537f904453a3b8078094ea12b8e8ec0369592d4cbafa705283ae9a93b04dabf078f00c62d7f3375 SHA512 c31e5f1a7a44ef3f1ea8a50ce43361fc8aba9377e48586b2b98ebd624a1a8bb682aacfa720a9a239ef42f5db0755e7be05fa832165d9b1fa861ff88aea507658 +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-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/50openscad-gentoo.el b/media-gfx/openscad/files/50openscad-gentoo.el deleted file mode 100644 index 3cc7c1a7c46f..000000000000 --- a/media-gfx/openscad/files/50openscad-gentoo.el +++ /dev/null @@ -1,3 +0,0 @@ -(add-to-list 'load-path "@SITELISP@") -(autoload 'scad-mode "scad-mode" "Major mode for editing SCAD code." t) -(add-to-list 'auto-mode-alist '("\\.scad$" . scad-mode)) 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/metadata.xml b/media-gfx/openscad/metadata.xml index 654ea84529a5..65b56ea5a6ce 100644 --- a/media-gfx/openscad/metadata.xml +++ b/media-gfx/openscad/metadata.xml @@ -27,8 +27,8 @@ <flag name="experimental"> Enable experimental features </flag> - <flag name="gamepad"> - Add support for gamepads through <pkg>dev-qt/qtgamepad</pkg> + <flag name="glx"> + Enable GLX to interface OpenGL and X11 </flag> <flag name="gui"> Enable or disable building of the GUI @@ -36,6 +36,9 @@ <flag name="hidapi"> Build in support for HID-Class devices using <pkg>dev-libs/hidapi</pkg> </flag> + <flag name="manifold"> + Enable Manifold render backend via <pkg>sci-mathematics/manifold</pkg> + </flag> <flag name="mimalloc"> Build using <pkg>dev-libs/mimalloc</pkg> as memory allocator </flag> 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-2024.11.14_pre.ebuild b/media-gfx/openscad/openscad-2024.11.14_pre.ebuild new file mode 100644 index 000000000000..e1239db68909 --- /dev/null +++ b/media-gfx/openscad/openscad-2024.11.14_pre.ebuild @@ -0,0 +1,240 @@ +# 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 + +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 + COMMIT="bc0d078e0361d7dba66723ac31bdb3b650ecff37" + SANITIZERS_CMAKE_COMMIT="3f0542e4e034aab417c51b2b22c94f83355dee15" + MCAD_COMMIT="bd0a7ba3f042bfbced5ca1894b236cea08904e26" + + SRC_URI=" + https://github.com/openscad/openscad/archive/${COMMIT}.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? ( + 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}" + 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 + ) + 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 +" + +DOCS=( + README.md + RELEASE_NOTES.md + doc/TODO.txt + doc/contributor_copyright.txt + doc/hacking.md + doc/testing.txt + doc/translation.txt +) + +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_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 + ) + + 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" + -DOPENSCAD_COMMIT="${COMMIT:0:9}" + -DOPENSCAD_VERSION="${PV:0:4}.${PV:4:2}.${PV:6:2}" + ) + 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/openscad/openscad-2024.12.30_pre.ebuild b/media-gfx/openscad/openscad-2024.12.30_pre.ebuild new file mode 100644 index 000000000000..0361bac9f047 --- /dev/null +++ b/media-gfx/openscad/openscad-2024.12.30_pre.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/openscad/openscad-9999.ebuild b/media-gfx/openscad/openscad-9999.ebuild index 4cfaae64dfac..0361bac9f047 100644 --- a/media-gfx/openscad/openscad-9999.ebuild +++ b/media-gfx/openscad/openscad-9999.ebuild @@ -1,35 +1,62 @@ -# Copyright 1999-2024 Gentoo Authors +# Copyright 1999-2025 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -# TODO's -# package and unbundle manifold -# set up proper testing -# set up OFFLINE_DOCS and add doc USE flag - EAPI=8 -inherit cmake flag-o-matic git-r3 optfeature 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/" -SRC_URI="" -EGIT_REPO_URI="https://github.com/openscad/openscad.git" + +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" -KEYWORDS="" -IUSE="cairo dbus egl experimental gamepad gui hidapi mimalloc spacenav" -RESTRICT="test" # 32 out 1300+ tests fail + +IUSE="dbus +egl experimental glx +gui hidapi +manifold mimalloc pdf spacenav test" +RESTRICT="!test? ( test )" REQUIRED_USE=" dbus? ( gui ) - gamepad? ( gui ) + hidapi? ( gui ) spacenav? ( gui ) + || ( egl glx ) " RDEPEND=" - dev-cpp/eigen:3 dev-libs/boost:= dev-libs/double-conversion:= dev-libs/glib:2 @@ -38,37 +65,43 @@ RDEPEND=" media-gfx/opencsg:= media-libs/fontconfig media-libs/freetype - media-libs/glew:0= media-libs/harfbuzz:= media-libs/lib3mf:= sci-mathematics/cgal:= - virtual/opengl - cairo? ( x11-libs/cairo ) + media-libs/libglvnd[X] gui? ( - dev-qt/qtconcurrent:5 - dev-qt/qtcore:5 - dev-qt/qtgui:5[-gles2-only] - dev-qt/qtmultimedia:5 - dev-qt/qtnetwork:5 - dev-qt/qtopengl:5 - dev-qt/qtsvg:5 - dev-qt/qtwidgets:5 - x11-libs/libX11 - x11-libs/qscintilla:=[qt5(+)] - dbus? ( dev-qt/qtdbus:5 ) - gamepad? ( dev-qt/qtgamepad:5 ) + 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}" +DEPEND=" + ${RDEPEND} + dev-cpp/eigen:3 +" BDEPEND=" - dev-util/itstool 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=( @@ -81,39 +114,154 @@ 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 + 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=OFF - -DENABLE_CAIRO=$(usex cairo) - -DENABLE_EGL=$(usex egl) - -DENABLE_HIDAPI=$(usex hidapi) - # needs python deps, unbundle first before enabling - -DENABLE_MANIFOLD=OFF - -DENABLE_SPNAV=$(usex spacenav) - -DENABLE_TESTS=OFF - -DEXPERIMENTAL=$(usex experimental) - -DHEADLESS=$(usex gui OFF ON) - -DOFFLINE_DOCS=OFF - -DUSE_CCACHE=OFF - -DUSE_MIMALLOC=$(usex mimalloc) + -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_GAMEPAD=$(usex gamepad) - -DENABLE_QTDBUS=$(usex dbus) + -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" @@ -121,15 +269,7 @@ src_install() { } pkg_postinst() { - xdg_desktop_database_update - xdg_icon_cache_update - xdg_mimeinfo_database_update + xdg_pkg_postinst optfeature "support scad major mode in GNU Emacs" app-emacs/scad-mode } - -pkg_postrm() { - xdg_desktop_database_update - xdg_icon_cache_update - xdg_mimeinfo_database_update -} diff --git a/media-gfx/openvdb/Manifest b/media-gfx/openvdb/Manifest index 98fcc243e9c2..e6bb3a789ad5 100644 --- a/media-gfx/openvdb/Manifest +++ b/media-gfx/openvdb/Manifest @@ -7,6 +7,6 @@ AUX openvdb-8.1.0-glfw-libdir.patch 742 BLAKE2B 2ab1de05da49480584e373dba0f4a850 AUX openvdb-9.0.0-fix-atomic.patch 1548 BLAKE2B 718d9eb0511ea50733d7f11b6720a90fd052452f049afbeceecedb2612963f8dfa53d81030671dd426acb1b8d9280e780bfe39030660152b933c80c21c5e1fbd SHA512 316eb3253d53f7fda43f90e3e6f432aa8e5a687c535cefee04c5af682ede05e744513394f16569c50b4cb2baf142750ed19ae815141738d25babad41699e8a46 DIST openvdb-10.0.1.tar.gz 3461352 BLAKE2B 506168a4bb29bab2a3a3cb37002858517000dc1682f04d95387fd1e250b61c61d92d2ffdf9b679d83ef1ce270909693ebd46224b732ce264685004d1e47b3027 SHA512 361cef8932b69b19ee94c47fe78f665a1acabfabc3f45ff9f490e830f73ff092c42f56ce698677476a8ccf062c89e3e4dc6d4c550aa6842438cbd4d404ee83bb DIST openvdb-11.0.0.tar.gz 4620858 BLAKE2B b970167fffa10f28f89c0a3497c7a6076462702c7ede6aacc098239a81f5f09f408b56c37f84ea68e301cedff24920f02a6d08c1f00a2b9ca48925ef7cdc85c7 SHA512 f2c90ca8435ecbacefda429341000ecb555385c746a3e0233220cd78540cee2a26cc17df7b560fdfe2dc03f2b2e960a2fa226a85980189c3e018164ccc037bd4 -EBUILD openvdb-10.0.1.ebuild 5301 BLAKE2B 23512715e9b40466b8ca6ee4000b794a0bc8806cd2c9822d3ff21744fa496f55be69b53436aa920eb40084cf6c5508df156eadecd7ac28f139e1b137ccc144da SHA512 0da78e71c150b055521883cee4f46aae2b240fcf1e2d7886b171fcbcba6c583eb734dd70035d610d1beeb0c2c4f01c738fb6e6f904055bae4e3ffa779406edfb -EBUILD openvdb-11.0.0.ebuild 9845 BLAKE2B 4d99021440fa92b137b5ecafad0482c83b8afce9f36c89d7a08b1afcef258e321c4b53ad3174a52f722dc45386fdb24529940b609412e35f71712b40b8730336 SHA512 5ac047d5dc8ed3f4e62da04231e3c1b3c071276b9e6c976bf25870b6be406acda5cbe17dbb6ae4d6611f1ef1b08d3df1cae5082e85a6aca905f98ed814e6af38 +EBUILD openvdb-10.0.1.ebuild 5302 BLAKE2B 2a8b5be6cd90b7353df2110a622d2ae2bca42a0228046005710e939ce4ff69c3c7f7f4db4c6c90aad25b2716e7a48a2cc1386bc3630b50ee997c2568efd41918 SHA512 81560ea2428bf33e4863dc4c0f73405e90df4e5341e6d78cfa353343006410093e474a411d1c4dc4164abe67f71c77344235cabbec39ed24ceb7367e10d5813e +EBUILD openvdb-11.0.0.ebuild 9845 BLAKE2B 59938107aaded5d7087798bb9925fb922e55af9df68866dbe5739dd85ce26382f35977782fd338ab51f32c2130041678bd0fb2630dd64940afe0ada6c90349cc SHA512 348244e6418e141fc4a6f44ba68457021275c08ec555d000454acef78b38a8b5e75a22980f7d3f58ea011cad88f37a203b6737eeab61c34100342de7ab05149f MISC metadata.xml 1920 BLAKE2B acab685a9a9f5f4bab9179e71cac281a2faf5d5f7e4cfd5ecbcd581bb57d148c85f7effbfdb8d796152605d38b18a42c2321ed80a10adb9ba97d5baf95d5582f SHA512 e2736509047f65a51faf64b112387aa75c31d4c6a7e0996b5d30c2f555ae3d705d71b68359bb4b665a9f73d0147cdf40c95f5ba4a9daa6d873507bc9e55034ca diff --git a/media-gfx/openvdb/openvdb-10.0.1.ebuild b/media-gfx/openvdb/openvdb-10.0.1.ebuild index 5a0a42c5aed3..aca53325090e 100644 --- a/media-gfx/openvdb/openvdb-10.0.1.ebuild +++ b/media-gfx/openvdb/openvdb-10.0.1.ebuild @@ -3,7 +3,7 @@ EAPI=8 -PYTHON_COMPAT=( python3_{9..11} ) +PYTHON_COMPAT=( python3_{10..11} ) inherit cmake cuda flag-o-matic llvm python-single-r1 @@ -36,7 +36,7 @@ RDEPEND=" x11-libs/libXi x11-libs/libXinerama x11-libs/libXrandr - ax? ( <sys-devel/llvm-15:= ) + ax? ( <llvm-core/llvm-15:= ) blosc? ( dev-libs/c-blosc:= ) cuda? ( >=dev-util/nvidia-cuda-toolkit-11 ) python? ( diff --git a/media-gfx/openvdb/openvdb-11.0.0.ebuild b/media-gfx/openvdb/openvdb-11.0.0.ebuild index f8b4c535dd04..330e6c06f3da 100644 --- a/media-gfx/openvdb/openvdb-11.0.0.ebuild +++ b/media-gfx/openvdb/openvdb-11.0.0.ebuild @@ -43,7 +43,7 @@ RDEPEND=" dev-libs/jemalloc:= dev-libs/imath:= ax? ( - <sys-devel/llvm-$(( LLVM_MAX_SLOT + 1 )):= + <llvm-core/llvm-$(( LLVM_MAX_SLOT + 1 )):= ) blosc? ( dev-libs/c-blosc:= diff --git a/media-gfx/oxipng/Manifest b/media-gfx/oxipng/Manifest index 371aabd26194..2c8db34609ed 100644 --- a/media-gfx/oxipng/Manifest +++ b/media-gfx/oxipng/Manifest @@ -1,3 +1,5 @@ +AUX libdeflater-1.20.0-relax-libdeflate-sys-version.patch 354 BLAKE2B cb3befcba80d6efca1d642c2aa632ff16c8a3a8df07ebf5c7b731fafda8c0090b011fca0022a7de903310bb74f0075c49fe21ee0ebc9cc1395a81baff357d3e9 SHA512 e63cac81e7766b856c1af4322aca530ca1d76ef6267755d0d8898c1a4768d8dbd9860e89025818998a1f68c8c1484fad6d11330e795c8398596e22dbc1169e92 +AUX oxipng-9.1.2-use-system-libdeflate.patch 1080 BLAKE2B 80bb7326d51b272994537f0cca93e533ec74a9d09ff634db3dac3a6a0149bd94cbfcce4b6b4f9819b42ff6a4be28c680e1785838e60ca401302b4fd27ad62c9d SHA512 94b2abe045ad8e8706a19dd4e95cf71d5d99d6d19b7daf93123e7e43eb27d7258fc211c0f1c098953e96bcc462591e5e3da6dd025e2c4c715c697b93486d9cb1 DIST adler-1.0.2.crate 12778 BLAKE2B a1dc17786adae945ac09d3525e609ed944e6465690787bbb831a1b9d53793cba1989793d0a5606d5d23ee20d36457923d451b1b3530c9ec7072a487aa3e55bbd SHA512 7ab190d31890fc05b0b55d8e2c6527a505e06793d5496be0b3831e0513412f9ba97f8148f6f68ed0770fa9cd980a5092d885e058becf1d5506b7c74b82674aa1 DIST adler32-1.2.0.crate 6411 BLAKE2B 51d44ccfd774158687b8244e83377e40ff896364e3d41e9015665131cc2a176d4ca0ab5a84df027dec0869ee735ee36f5687a06c1d2341de666070cdbab89483 SHA512 8ed72612fb78e213fc92963fdae0508ef26988656c939e6c9cddccbe2658d4a956a8ae934d9658262a8b2687dc446b3f1ee7614128b440487c81e606526dfda3 DIST anstream-0.3.2.crate 19504 BLAKE2B 617b846c244ea4ccd6c7835a382afe85e14c245ea56b678f57ee12e9c7bcc1c0c3db9620eb4d16bf35e17eca38968bf04420b758f482ac5594670e6292c1fbb9 SHA512 b896e5208a2ee6a3c98bf3bb9ac1c52792de114dfa5709dadcac6183ea19ea63230dffd3217e571354a71d69b8eafbb0189e05f8f77f50922020de54e3aeecc8 @@ -119,6 +121,7 @@ DIST os_str_bytes-6.4.1.crate 23101 BLAKE2B 252fc826f646bbb999fa80b47f58ac9a77e4 DIST oxipng-8.0.0.tar.gz 51646362 BLAKE2B 3f2223f515d81bf7b229f3cd4cff5f26a49c8db4aef52076a0fbd5ad2bf259b3b56e83f90a9b2c2a6847e653b73910d9316cc85b00d43614c99e047dbbcfb2da SHA512 e8a45082f65c392d7c4caff10911e52958c671e86850681c281aaaadd24f50a153919cf714626326028769f3627b1664c420ba17cfc8fec86d82a8e81a7ab9ca DIST oxipng-9.0.0.tar.gz 22303586 BLAKE2B b1e5776a97ec305514393e186dba3ff4b19a6d0020182b1d1933020eb8cb6f550c0474517efbe4b9ee95ac40f867c05f5be66e7a7239eb00c2d5b7897066e980 SHA512 ac12b1e823c748b5a3d58081b86d5be69b970788fb3f2d4acc1db1f790455bd35b8b897203b1157674be83b9172bb4cb3ec1d6401538270f42a5f35f92a62f5a DIST oxipng-9.1.2.tar.gz 20940722 BLAKE2B 6067d9a222f917e9b9c7e9628461576e37cd9c51df8a0c6b1167b0c3f866dde1767804aeae48ccba5d3043fd05532754b6869ec32f9d2df919645be7d1134cbf SHA512 5e4ab6f8797bc03373c24886b105ffe79fb617342f9924f8fc416d1649bbc55cfe397889fba0a0211717f20807ef4e96c42cc3985c13009a1200ed755c5dc7eb +DIST pkg-config-0.3.31.crate 20880 BLAKE2B ab7676e810751f89639b60ae70bdebe1d57edc76319f83077c3680049a701a26e72e8cc485fe77cdc4346fe3571d32c59e7384c8c86fef17e00d7d81df5daf43 SHA512 ac3e8062ee8831a4e4fc717b5247dc7f113da7bf6d64ec95cbca7875959a2afa1497bf81d9dfc27206b5fb10027a2509d51dd9ca1c10139d7b4c78128864fdf4 DIST png-0.17.13.crate 103176 BLAKE2B 99bfd1c444f5967b715b81607e3c3266fb3b1d8110897e4c93afb5b6e0e28df262f9c9d842aefed922c38a5ff9d16e75cca065d7cc14ddadb3a7e9ea4776e787 SHA512 064a932f4c48c2243286a9b4cdec0487cc976291bc8ecf4753691afdfe43acda4b17ea8d48ec933f309d158df28f40ee93b5b32b3ab5252e2e7aa1ee1c0e4e84 DIST png-0.17.7.crate 80979 BLAKE2B 37628fa2282c7195f983a95939eda1c73745f89d772904173775d7e1906b71615e45de8f59489d6842450ed6f7c7b809b28881c84d5a3399da38013fc3062c79 SHA512 f8009925a6948d8b9c82007f31eefd18d2173274816c0329673e48ef725aec52ca3aab2b91e8fc4f776c8f7f17475a3e065835e578a632445e1bd70794b18270 DIST png-0.17.9.crate 88839 BLAKE2B b218fcaa166f142ced8ae75a47bb587015d0a449210f3cf789ef3f85eb6dec946c3744ff93a40a2e2d08de8a4973e12cc0880f8ef95c36f96c920ee47bc096fc SHA512 95c532136b7f31dc7aa3b04e721307b5a722f95cb815c885ed26a751b5c1eabd52b38aa1a1f504e610a5bc1baa6058ade1406cc833d0d2286fa7523f0c6ad5d1 @@ -199,7 +202,8 @@ DIST windows_x86_64_msvc-0.52.5.crate 827905 BLAKE2B fd5dac198bfbf29878cb461a733 DIST wyz-0.5.1.crate 18790 BLAKE2B 07ac1435a812d2f50309348ef8378ea4955c001f01edaf2ffab108f7d524ee731f06b22fd42c043349a4a2271ec47ea203e89562076e8c7c1719112b0214c89a SHA512 15d86c167145c90e3fbabcefd11754fb1cb835896e32d1bb7f4b027e5b2092f5fdbdca4062c129bc38e655cb87c6a3f4e181747ee25d89db5e01fb1fcac18fe9 DIST zopfli-0.7.1.crate 44416 BLAKE2B 14c6e7982f34de921bc3ce0048281e76f1de9715c0a108cce58d216af406eed16a06014de0af023d0090f6ae26fca0a62049179401875f6a3a878c366afed2b5 SHA512 caa7f95ab2d5c1611d84b6d73f33a0722ffb459759614cdfcb4a7fadcca679e2387486848d5ebc4f2a2f5aabaaef2cd466dee536c5d9aa3410cd9dfca9755678 DIST zopfli-0.8.0.crate 54234 BLAKE2B a5e0434a4b20840f2bd59d72121849ea23c2f21d0e87bcd6e918c8521f2989c71aedcd98853533a85bde576bbc064e56497be864065e373bba3cfe8b9b9cf94e SHA512 3b788f0ca94a106ce690764d081bf277eddb364b07287c33be3855fdc63bd583b5e8aac95b709833b4ec4a8f153e7e1ea822b09da23d5db777137bc1dd49e17c -EBUILD oxipng-8.0.0.ebuild 2248 BLAKE2B cd63860e6989f30c4a3aa60fc1a482e13737ac37acd71d19e33e3778036dc3d1326c51141c9103efb8a28f639192825a7c9814ff9ccc7f6f315ffc0a5031e3e8 SHA512 fb92eb7d550f430fc944fffcaaea00e04a03a57a3813a7972ac834c4afa6cddaec14d0ba9adbfcff89bb38efd52e4539d7fb185b349330db55d9543c48cf8904 -EBUILD oxipng-9.0.0.ebuild 2279 BLAKE2B ca45c8e5f686ac77bd453a415f696d4224f2e3548cba679e00b57448cc6a030e5f35111614079344932593d51cb33652a31b0d96a65aaf6c061c565cac6443f4 SHA512 cff8457f7b6606a7baa2e49eb43c4d81d155b0b9e21f70f700a37a85d41b64a15884b29622dd0478440ef8f7b68e86af3db8240aef765572dc20a3e9b57a4b4c -EBUILD oxipng-9.1.2.ebuild 2636 BLAKE2B 7a856e58675b6f5efcc83cc7fcdd29b82bfa3f52fc5f7d2bfec98c3db3ce729075c93490a19d99f8f4999ea354b3ef4d178ebeaa85791f76ad8f58f4f49861c5 SHA512 1cb9db23efb8529fa829448d78317c9a9713c88c24acbe38a635c5388a3cd32366d9a5288a4d6a6e1712f3caa172e905638fda611fea0c0da9e846d3e23d5b16 -MISC metadata.xml 622 BLAKE2B e1d908e3eddcbeae97cbe17f3d599980afa55073f4aec05421d77ac43c6fe73231d3a5371cabb341bbe325918315a16f356612d67ceaec93cbccead92d5b545e SHA512 db5befcc73330783a467043ddf7af90341b13838348108e49826ead55c009d3597652c01b4e378955326ff1db2c244b65418c25af3c10436a3b4fbcc566ef0bc +EBUILD oxipng-8.0.0-r1.ebuild 2196 BLAKE2B 3fa673c72e60fdadf00a8291823e0dd30e6a8b1105165af0ca32f70ffc003e84c03484802ca72e7dfa7273f552e657eb5849f2d853529831a329c3edd643a1d8 SHA512 a5fa5455878e9ec1aaf03ddf9ff59936799ff3677e1c65ac173dbe930fadb20970b98c3e6124a863946533759c6daf70e551d3b3c583718994b24fb0128c831a +EBUILD oxipng-9.0.0-r1.ebuild 2246 BLAKE2B 8a387c10ff50710d77c45561dd4994ef1c1bfecbf66224b9254a0e4dc65e040069c51eb2664a7f29ae7c97bc6df7bc4d2ab654a95fb64e4aa125da12983510b2 SHA512 261fbe5f71328d823eb5ea9ee192d3e198368b36504c33b82e5bef337709aa2d3d9d1bd03101616043642eeb81efca38d36e7f7527c161c568773c6e4c16ebbf +EBUILD oxipng-9.1.2-r1.ebuild 2625 BLAKE2B 7a738af1ddaa7df09e072b22ea073cfddc60d1b2d21d1c9eab37ff57a49c1976ded03bba4a8d6f5ef65f138af08c2fb7a0094c85926f272ef356ec62b01b3039 SHA512 85491eea2f98185272bd3c6cfab9fe1004a69b35a201ca68ebb0fb1084a26324b873e239fe1acc4ad9e3f1912e6c7d388f930c8b262f4a120af16b982952847d +EBUILD oxipng-9.1.2-r2.ebuild 3559 BLAKE2B 9f4dba6f221ce4454a96a42104030298e86a5e9962e88ec6a2cf7d63df061c1a0c9281ae9fc179267968d18379ad8ac8807d2e8d82658622e88b46679be21b61 SHA512 2e187d6b983f225e43683a41fed367031d2ae867b1654cbbd38492752a29eaeca444dd5d2aab7590a26f7a98a4e1962e9a10a26edc4d02142b9a5b70a19bc353 +MISC metadata.xml 623 BLAKE2B e494053d292bf36c65237f5cb7c8b488ac60ead764ae88d90e9ff80aefe46f11c4d2c4bfea88258d0fb70eea136f552f5b77cdb16e3de0438e1843c79f5c5c56 SHA512 3a886300372c8cd3d837cd206e4451ba156afad49400b3594e3dff7ce430c2f8612a72d986485cb848b6f9ecf852f739a184f0d8f3015defc716beccee162654 diff --git a/media-gfx/oxipng/files/libdeflater-1.20.0-relax-libdeflate-sys-version.patch b/media-gfx/oxipng/files/libdeflater-1.20.0-relax-libdeflate-sys-version.patch new file mode 100644 index 000000000000..a7435085aa4f --- /dev/null +++ b/media-gfx/oxipng/files/libdeflater-1.20.0-relax-libdeflate-sys-version.patch @@ -0,0 +1,13 @@ +diff --git a/build.rs b/build.rs +index 9c5f169589aa..14f79d18d5f7 100644 +--- a/build.rs ++++ b/build.rs +@@ -9,7 +9,7 @@ fn main() { + if pkg_config::Config::new() + .print_system_libs(false) + .cargo_metadata(true) +- .exactly_version("1.20") ++ .atleast_version("1.20") + .probe("libdeflate") + .is_ok() + { diff --git a/media-gfx/oxipng/files/oxipng-9.1.2-use-system-libdeflate.patch b/media-gfx/oxipng/files/oxipng-9.1.2-use-system-libdeflate.patch new file mode 100644 index 000000000000..704916d9e08b --- /dev/null +++ b/media-gfx/oxipng/files/oxipng-9.1.2-use-system-libdeflate.patch @@ -0,0 +1,38 @@ +diff --git a/Cargo.lock b/Cargo.lock +index 2ad4fcc0f23a..b749a4311652 100644 +--- a/Cargo.lock ++++ b/Cargo.lock +@@ -325,6 +325,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" + checksum = "669ea17f9257bcb48c09c7ee4bef3957777504acffac557263e20c11001977bc" + dependencies = [ + "cc", ++ "pkg-config", + ] + + [[package]] +@@ -389,6 +390,12 @@ dependencies = [ + "zopfli", + ] + ++[[package]] ++name = "pkg-config" ++version = "0.3.31" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "953ec861398dccce10c670dfeaf3ec4911ca479e9c02154b3a215178c5f566f2" ++ + [[package]] + name = "png" + version = "0.17.13" +diff --git a/Cargo.toml b/Cargo.toml +index 717bf26fd441..d9036c8c5255 100644 +--- a/Cargo.toml ++++ b/Cargo.toml +@@ -39,7 +39,7 @@ required-features = ["zopfli"] + zopfli = { version = "0.8.0", optional = true, default-features = false, features = ["std", "zlib"] } + rgb = "0.8.43" + indexmap = "2.2.6" +-libdeflater = "1.20.0" ++libdeflater = { version = "1.20.0", features = ["dynamic"] } + log = "0.4.21" + bitvec = "1.0.1" + rustc-hash = "1.1.0" diff --git a/media-gfx/oxipng/metadata.xml b/media-gfx/oxipng/metadata.xml index 03cc5284d087..7057283aee94 100644 --- a/media-gfx/oxipng/metadata.xml +++ b/media-gfx/oxipng/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="person" proxied="yes"> <email>unlord@xiph.org</email> diff --git a/media-gfx/oxipng/oxipng-8.0.0-r1.ebuild b/media-gfx/oxipng/oxipng-8.0.0-r1.ebuild new file mode 100644 index 000000000000..40831163d730 --- /dev/null +++ b/media-gfx/oxipng/oxipng-8.0.0-r1.ebuild @@ -0,0 +1,117 @@ +# Copyright 2022-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +# Auto-Generated by cargo-ebuild 0.5.3-dev + +EAPI=8 + +CRATES=" + adler@1.0.2 + adler32@1.2.0 + atty@0.2.14 + autocfg@1.1.0 + bitflags@1.3.2 + bitvec@1.0.1 + bytemuck@1.12.3 + byteorder@1.4.3 + cc@1.0.78 + cfg-if@1.0.0 + clap@3.2.23 + clap_lex@0.2.4 + color_quant@1.1.0 + crc@3.0.0 + crc-catalog@2.1.0 + crc32fast@1.3.2 + crossbeam-channel@0.5.6 + crossbeam-deque@0.8.2 + crossbeam-epoch@0.9.13 + crossbeam-utils@0.8.14 + either@1.8.0 + filetime@0.2.19 + flate2@1.0.25 + funty@2.0.0 + glob@0.3.0 + hashbrown@0.12.3 + hermit-abi@0.1.19 + hermit-abi@0.2.6 + image@0.24.5 + indexmap@1.9.2 + iter-read@0.3.1 + itertools@0.10.5 + libc@0.2.139 + libdeflate-sys@0.11.0 + libdeflater@0.11.0 + log@0.4.17 + memoffset@0.7.1 + miniz_oxide@0.6.2 + num-integer@0.1.45 + num-rational@0.4.1 + num-traits@0.2.15 + num_cpus@1.15.0 + once_cell@1.16.0 + os_str_bytes@6.4.1 + png@0.17.7 + radium@0.7.0 + rayon@1.6.1 + rayon-core@1.10.1 + redox_syscall@0.2.16 + rgb@0.8.34 + rustc-hash@1.1.0 + rustc_version@0.4.0 + scopeguard@1.1.0 + semver@1.0.16 + stderrlog@0.5.4 + strsim@0.10.0 + tap@1.0.1 + termcolor@1.1.3 + textwrap@0.16.0 + thread_local@1.1.4 + typed-arena@2.0.1 + wild@2.1.0 + winapi@0.3.9 + winapi-i686-pc-windows-gnu@0.4.0 + winapi-util@0.1.5 + winapi-x86_64-pc-windows-gnu@0.4.0 + windows-sys@0.42.0 + windows_aarch64_gnullvm@0.42.0 + windows_aarch64_msvc@0.42.0 + windows_i686_gnu@0.42.0 + windows_i686_msvc@0.42.0 + windows_x86_64_gnu@0.42.0 + windows_x86_64_gnullvm@0.42.0 + windows_x86_64_msvc@0.42.0 + wyz@0.5.1 + zopfli@0.7.1 +" + +inherit cargo flag-o-matic + +DESCRIPTION="Multithreaded lossless PNG compression optimizer written in Rust" +HOMEPAGE="https://github.com/shssoichiro/oxipng" +SRC_URI="https://github.com/shssoichiro/oxipng/archive/v${PV}.tar.gz -> ${P}.tar.gz + ${CARGO_CRATE_URIS} +" + +LICENSE=" + || ( 0BSD Apache-2.0 MIT ) + Apache-2.0 + || ( Apache-2.0 MIT ) + || ( Apache-2.0 MIT ZLIB ) + MIT + || ( MIT Unlicense ) + ZLIB +" +SLOT="0" +KEYWORDS="amd64 arm64 ~riscv ~x86" + +QA_FLAGS_IGNORED="usr/bin/oxipng" + +src_configure() { + filter-lto # 860063 file format not recognized with cloudflare-zlib-sys +} + +src_install() { + cargo_src_install + + dodoc CHANGELOG.md README.md +} diff --git a/media-gfx/oxipng/oxipng-8.0.0.ebuild b/media-gfx/oxipng/oxipng-8.0.0.ebuild deleted file mode 100644 index c94033fde23f..000000000000 --- a/media-gfx/oxipng/oxipng-8.0.0.ebuild +++ /dev/null @@ -1,118 +0,0 @@ -# Copyright 2022-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -# Auto-Generated by cargo-ebuild 0.5.3-dev - -EAPI=8 - -CRATES=" - adler-1.0.2 - adler32-1.2.0 - atty-0.2.14 - autocfg-1.1.0 - bitflags-1.3.2 - bitvec-1.0.1 - bytemuck-1.12.3 - byteorder-1.4.3 - cc-1.0.78 - cfg-if-1.0.0 - clap-3.2.23 - clap_lex-0.2.4 - color_quant-1.1.0 - crc-3.0.0 - crc-catalog-2.1.0 - crc32fast-1.3.2 - crossbeam-channel-0.5.6 - crossbeam-deque-0.8.2 - crossbeam-epoch-0.9.13 - crossbeam-utils-0.8.14 - either-1.8.0 - filetime-0.2.19 - flate2-1.0.25 - funty-2.0.0 - glob-0.3.0 - hashbrown-0.12.3 - hermit-abi-0.1.19 - hermit-abi-0.2.6 - image-0.24.5 - indexmap-1.9.2 - iter-read-0.3.1 - itertools-0.10.5 - libc-0.2.139 - libdeflate-sys-0.11.0 - libdeflater-0.11.0 - log-0.4.17 - memoffset-0.7.1 - miniz_oxide-0.6.2 - num-integer-0.1.45 - num-rational-0.4.1 - num-traits-0.2.15 - num_cpus-1.15.0 - once_cell-1.16.0 - os_str_bytes-6.4.1 - png-0.17.7 - radium-0.7.0 - rayon-1.6.1 - rayon-core-1.10.1 - redox_syscall-0.2.16 - rgb-0.8.34 - rustc-hash-1.1.0 - rustc_version-0.4.0 - scopeguard-1.1.0 - semver-1.0.16 - stderrlog-0.5.4 - strsim-0.10.0 - tap-1.0.1 - termcolor-1.1.3 - textwrap-0.16.0 - thread_local-1.1.4 - typed-arena-2.0.1 - wild-2.1.0 - winapi-0.3.9 - winapi-i686-pc-windows-gnu-0.4.0 - winapi-util-0.1.5 - winapi-x86_64-pc-windows-gnu-0.4.0 - windows-sys-0.42.0 - windows_aarch64_gnullvm-0.42.0 - windows_aarch64_msvc-0.42.0 - windows_i686_gnu-0.42.0 - windows_i686_msvc-0.42.0 - windows_x86_64_gnu-0.42.0 - windows_x86_64_gnullvm-0.42.0 - windows_x86_64_msvc-0.42.0 - wyz-0.5.1 - zopfli-0.7.1 -" - -inherit cargo flag-o-matic - -DESCRIPTION="Multithreaded lossless PNG compression optimizer written in Rust" -HOMEPAGE="https://github.com/shssoichiro/oxipng" -SRC_URI="https://github.com/shssoichiro/oxipng/archive/v${PV}.tar.gz -> ${P}.tar.gz" -SRC_URI+=" $(cargo_crate_uris ${CRATES})" - -LICENSE=" - || ( 0BSD Apache-2.0 MIT ) - Apache-2.0 - || ( Apache-2.0 MIT ) - || ( Apache-2.0 MIT ZLIB ) - MIT - || ( MIT Unlicense ) - ZLIB -" -SLOT="0" -KEYWORDS="amd64 arm64 ~riscv ~x86" - -BDEPEND=">=virtual/rust-1.61.0" - -QA_FLAGS_IGNORED="usr/bin/oxipng" - -src_configure() { - filter-lto # 860063 file format not recognized with cloudflare-zlib-sys -} - -src_install() { - cargo_src_install - - dodoc CHANGELOG.md README.md -} diff --git a/media-gfx/oxipng/oxipng-9.0.0.ebuild b/media-gfx/oxipng/oxipng-9.0.0-r1.ebuild index dc57177ddd22..f94d2b560cd1 100644 --- a/media-gfx/oxipng/oxipng-9.0.0.ebuild +++ b/media-gfx/oxipng/oxipng-9.0.0-r1.ebuild @@ -109,8 +109,6 @@ LICENSE=" SLOT="0" KEYWORDS="amd64 ~arm64 ~riscv ~x86" -BDEPEND=">=virtual/rust-1.66.0" - QA_FLAGS_IGNORED="usr/bin/${PN}" src_install() { diff --git a/media-gfx/oxipng/oxipng-9.1.2.ebuild b/media-gfx/oxipng/oxipng-9.1.2-r1.ebuild index 05985f225a51..3b199b4f6e39 100644 --- a/media-gfx/oxipng/oxipng-9.1.2.ebuild +++ b/media-gfx/oxipng/oxipng-9.1.2-r1.ebuild @@ -90,6 +90,8 @@ CRATES=" zopfli@0.8.0 " +RUST_MIN_VER="1.74.0" + inherit cargo DESCRIPTION="Multithreaded lossless PNG compression optimizer written in Rust" @@ -104,9 +106,7 @@ LICENSE=" MIT " SLOT="0" -KEYWORDS="~amd64 ~arm64 ~riscv ~x86" - -BDEPEND=">=virtual/rust-1.74.0" +KEYWORDS="amd64 ~arm64 ~riscv ~x86" # rust does not use *FLAGS from make.conf, silence portage warning # update with proper path to binaries this crate installs, omit leading / diff --git a/media-gfx/oxipng/oxipng-9.1.2-r2.ebuild b/media-gfx/oxipng/oxipng-9.1.2-r2.ebuild new file mode 100644 index 000000000000..d225fadafc14 --- /dev/null +++ b/media-gfx/oxipng/oxipng-9.1.2-r2.ebuild @@ -0,0 +1,154 @@ +# Copyright 2022-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +# Auto-Generated by cargo-ebuild 0.5.4-r1 + +EAPI=8 + +CRATES=" + adler@1.0.2 + anstream@0.6.13 + anstyle@1.0.6 + anstyle-parse@0.2.3 + anstyle-query@1.0.2 + anstyle-wincon@3.0.2 + autocfg@1.2.0 + bitflags@1.3.2 + bitflags@2.5.0 + bitvec@1.0.1 + bytemuck@1.16.1 + byteorder@1.5.0 + cc@1.0.92 + cfg-if@1.0.0 + clap@4.5.4 + clap_builder@4.5.2 + clap_lex@0.7.0 + clap_mangen@0.2.20 + colorchoice@1.0.0 + crc32fast@1.4.0 + crossbeam-channel@0.5.12 + crossbeam-deque@0.8.5 + crossbeam-epoch@0.9.18 + crossbeam-utils@0.8.19 + either@1.10.0 + env_filter@0.1.0 + env_logger@0.11.3 + equivalent@1.0.1 + errno@0.3.8 + fdeflate@0.3.4 + filetime@0.2.23 + flate2@1.0.28 + funty@2.0.0 + glob@0.3.1 + hashbrown@0.14.3 + image@0.25.1 + indexmap@2.2.6 + libc@0.2.153 + libdeflate-sys@1.20.0 + libdeflater@1.20.0 + linux-raw-sys@0.4.13 + log@0.4.21 + miniz_oxide@0.7.2 + num-traits@0.2.18 + pkg-config@0.3.31 + png@0.17.13 + radium@0.7.0 + rayon@1.10.0 + rayon-core@1.12.1 + redox_syscall@0.4.1 + rgb@0.8.44 + roff@0.2.1 + rustc-hash@1.1.0 + rustc_version@0.4.0 + rustix@0.38.32 + semver@1.0.22 + simd-adler32@0.3.7 + strsim@0.11.1 + tap@1.0.1 + terminal_size@0.3.0 + typed-arena@2.0.2 + utf8parse@0.2.1 + windows-sys@0.48.0 + windows-sys@0.52.0 + windows-targets@0.48.5 + windows-targets@0.52.5 + windows_aarch64_gnullvm@0.48.5 + windows_aarch64_gnullvm@0.52.5 + windows_aarch64_msvc@0.48.5 + windows_aarch64_msvc@0.52.5 + windows_i686_gnu@0.48.5 + windows_i686_gnu@0.52.5 + windows_i686_gnullvm@0.52.5 + windows_i686_msvc@0.48.5 + windows_i686_msvc@0.52.5 + windows_x86_64_gnu@0.48.5 + windows_x86_64_gnu@0.52.5 + windows_x86_64_gnullvm@0.48.5 + windows_x86_64_gnullvm@0.52.5 + windows_x86_64_msvc@0.48.5 + windows_x86_64_msvc@0.52.5 + wyz@0.5.1 + zopfli@0.8.0 +" + +RUST_MIN_VER="1.74.0" + +inherit cargo + +DESCRIPTION="Multithreaded lossless PNG compression optimizer written in Rust" +HOMEPAGE="https://github.com/shssoichiro/oxipng" +SRC_URI="https://github.com/shssoichiro/oxipng/archive/v${PV}.tar.gz -> ${P}.tar.gz" +SRC_URI+=" ${CARGO_CRATE_URIS}" + +LICENSE=" + Apache-2.0 + || ( Apache-2.0 MIT ) + || ( Apache-2.0 MIT ZLIB ) + MIT +" +SLOT="0" +KEYWORDS="~amd64 ~arm64 ~riscv ~x86" +PATCHES=( "${FILESDIR}/oxipng-9.1.2-use-system-libdeflate.patch" ) + +BDEPEND="virtual/pkgconfig" +DEPEND=">=app-arch/libdeflate-1.20:=" +RDEPEND="${DEPEND}" + +# rust does not use *FLAGS from make.conf, silence portage warning +# update with proper path to binaries this crate installs, omit leading / +QA_FLAGS_IGNORED="usr/bin/${PN}" +QA_PRESTRIPPED="usr/bin/${PN}" + +src_prepare() { + # Relax the version restriction of libdeflate. + # https://bugs.gentoo.org/944285 + # + # Any API/ABI-compatible versions would be ok for app-arch/libdeflate, but + # in such case the build script of libdeflate_sys should be patched to pick + # even if the system library is newer. + # See <https://github.com/adamkewley/libdeflater/pull/32#issuecomment-1971198374>. + # + # Also, don't forget updating `DEPNED` and `RDEPEND` in sync, or libdeflater + # crate will fail to pick system library and silently use the bundled + # version of libdeflate. + ( cd "${WORKDIR}"/cargo_home/gentoo/libdeflate-sys-1.20.0 && \ + eapply "${FILESDIR}"/libdeflater-1.20.0-relax-libdeflate-sys-version.patch ) + + # Remove the linker configs (in `.cargo/config.toml`) specific to GitHub CI. + # https://bugs.gentoo.org/924946 + rm -rv "${S}/.cargo/config.toml" || die + + default_src_prepare +} + +src_configure() { + export PKG_CONFIG_ALLOW_CROSS=1 + + cargo_src_configure +} + +src_install() { + cargo_src_install + + dodoc CHANGELOG.md README.md +} 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..818098100e29 100644 --- a/media-gfx/photoqt/Manifest +++ b/media-gfx/photoqt/Manifest @@ -1,4 +1,3 @@ -AUX photoqt-3.2-exiv2-0.28.patch 5700 BLAKE2B d7387019460ed5b0edf7a79050f0ea8be4a4320c39cc53567d68d25a5f99f87c99e7aaf4932d2b96f8c0af22c7221082ba7323f720f5ea61ec461fa457b1c6ff SHA512 eadcfe4c5583cc6b6b1ab5e4036410c347ffee577e7231570736af8b405a631ad8bb86660854d2102cc9150f4fa7e439e2a3faa583806cbd4a04ba45015e8134 -DIST photoqt-3.2.tar.gz 965895 BLAKE2B ae1e159401b24a1bede344e4d398dbd6c2ae13fd467a4eac9ef15ea2d15933dc1756325a5a4f305a5f447bfd1a9e2d636e0b9367d0201ca356393c033c4f2f0f SHA512 ab7030d0ed6edf79373b1a99b1b8469cd567f04e5c233a87496084424603d8c241f7b473c22d323f4df8480d3f74918a987d2d590ec5026f1b7ca2c92b5c6bba -EBUILD photoqt-3.2.ebuild 1871 BLAKE2B 8d34b625a17a7741bde801bc8ae5ec76872fabc7e9bf917b3bf0cc5afd45ffe0d30d5b4d90253b076d6da8161b4f08655923666779a7ba5fad3f30f5d5f3b2c1 SHA512 7615976119d9048e24d26f39b8e5736da06e6ef0a99c38a0510e535166ec771a7c9c8dbf517be24dc4583fef70eb7393b34fd9306ffc8106c70278273178d604 -MISC metadata.xml 543 BLAKE2B ee39b2a5c2b7141c3bf4f02d7c9ad6db79a61aefb33f46f552e852a1eb5d42db96b36202911fbea762109d81b33de184dbec3b0666126d526566476e0787672d SHA512 c1a0e0d3a14d998820effef5892f740064673a7c94105f3aff959873a1dd3ecb97fb0463714f5ce7cd3fea3b41d6fb907cbb302169526d46980a5ae3d7aea49a +DIST photoqt-4.7.tar.gz 3612004 BLAKE2B f4bfd07103e614e3b128668ee7b1dc4767d5c8bd6af4164315e75d537e4054ee2e13fd2f2d8f044669c80bfa31d0651a5a71f07d0947c6b8f1a3088d55123407 SHA512 41274b52ece3a905de7c274183b658b40fdc72ee291b008afdfb2c7e8bb49308ac54c66760397359838bcd9470aa0140bd769137d5a72cd1c11bc4b1a7accb66 +EBUILD photoqt-4.7-r1.ebuild 2524 BLAKE2B c949387dfc237549cbc96343b48ff77d3ff159d48d45d607e5cd0aba9444663f5fe81c50b7dcb394d87354476670c6fc7a3d451438d6276b7cb92c42bd5263a0 SHA512 1e33628ce4e8078b82c3ac1be22f519708dc30c84736377104803f1fd417c11ed052113ee3ba3bfe0cc6d2936d4cba6f9c7878842edf7ea0ab01115c14010ae8 +MISC metadata.xml 840 BLAKE2B 690fda3779ef30e477a38e6c20c05d78974c077516ebc12646395078332ae816cf7166501b067d8224c901ec38777d4cc92b565010cb53bfcaf8c9022d01d8b4 SHA512 c22e1952541f697bfa99a14daa7e4e83261eb65f2194b0aeaf6c9e68fd49e3f5e60360d84de8a2be40ffeaf07e9f6a59b5ba523adf8040a60fb824f7dfbe7697 diff --git a/media-gfx/photoqt/files/photoqt-3.2-exiv2-0.28.patch b/media-gfx/photoqt/files/photoqt-3.2-exiv2-0.28.patch deleted file mode 100644 index b1da118c1537..000000000000 --- a/media-gfx/photoqt/files/photoqt-3.2-exiv2-0.28.patch +++ /dev/null @@ -1,116 +0,0 @@ -From 376fe8c3ef6b16d63995f76a194e2c1d788b28b1 Mon Sep 17 00:00:00 2001 -From: Lukas Spies <Lukas@photoqt.org> -Date: Sun, 28 May 2023 20:23:32 -0500 -Subject: [PATCH 1/2] [exiv2] fix compilation with Exiv2 v0.28.0 - ---- - cplusplus/filefoldermodel/filefoldermodel.cpp | 4 ++++ - cplusplus/scripts/handlingfacetags.cpp | 4 ++++ - cplusplus/scripts/metadata.cpp | 4 ++++ - 3 files changed, 12 insertions(+) - -diff --git a/cplusplus/filefoldermodel/filefoldermodel.cpp b/cplusplus/filefoldermodel/filefoldermodel.cpp -index b6258735..56b120b7 100644 ---- a/cplusplus/filefoldermodel/filefoldermodel.cpp -+++ b/cplusplus/filefoldermodel/filefoldermodel.cpp -@@ -560,7 +560,11 @@ void PQFileFolderModel::advancedSortMainView() { - } catch (Exiv2::Error& e) { - // An error code of 11 means unknown file type - // Since we always try to read any file's meta data, this happens a lot -+#if EXIV2_TEST_VERSION(0, 28, 0) -+ if(e.code() != Exiv2::ErrorCode::kerUnsupportedImageType) -+#else - if(e.code() != 11) -+#endif - LOG << CURDATE << "PQMetaData::updateMetadaya(): ERROR reading exiv data (caught exception): " << e.what() << NL; - else - DBG << CURDATE << "PQMetaData::updateMetadaya(): ERROR reading exiv data (caught exception): " << e.what() << NL; -diff --git a/cplusplus/scripts/handlingfacetags.cpp b/cplusplus/scripts/handlingfacetags.cpp -index d90ece73..562cf200 100644 ---- a/cplusplus/scripts/handlingfacetags.cpp -+++ b/cplusplus/scripts/handlingfacetags.cpp -@@ -57,7 +57,11 @@ QVariantList PQHandlingFaceTags::getFaceTags(QString filename) { - image->readMetadata(); - } catch (Exiv2::Error& e) { - // An error code of 11 means image not supported. This is much more reliable than, e.g., checking a file ending -+#if EXIV2_TEST_VERSION(0, 28, 0) -+ if(e.code() != Exiv2::ErrorCode::kerUnsupportedImageType) -+#else - if(e.code() != 11) -+#endif - LOG << CURDATE << "PQHandlingFaceTags::getFaceTags() - ERROR reading metadata (caught exception): " << e << NL; - else - DBG << CURDATE << "PQHandlingFaceTags::getFaceTags() - ERROR reading metadata (caught exception): " << e << NL; -diff --git a/cplusplus/scripts/metadata.cpp b/cplusplus/scripts/metadata.cpp -index 87e23474..a7d3e076 100644 ---- a/cplusplus/scripts/metadata.cpp -+++ b/cplusplus/scripts/metadata.cpp -@@ -120,7 +120,11 @@ void PQMetaData::updateMetadata(QString path) { - } catch (Exiv2::Error& e) { - // An error code of 11 means unknown file type - // Since we always try to read any file's meta data, this happens a lot -+#if EXIV2_TEST_VERSION(0, 28, 0) -+ if(e.code() != Exiv2::ErrorCode::kerUnsupportedImageType) -+#else - if(e.code() != 11) -+#endif - LOG << CURDATE << "PQMetaData::updateMetadaya(): ERROR reading exiv data (caught exception): " << e.what() << NL; - else - DBG << CURDATE << "PQMetaData::updateMetadaya(): ERROR reading exiv data (caught exception): " << e.what() << NL; --- -2.40.1 - - -From 6190de9e47c358cf54748fa2a3593108831aa768 Mon Sep 17 00:00:00 2001 -From: Lukas Spies <Lukas@photoqt.org> -Date: Sun, 28 May 2023 20:27:08 -0500 -Subject: [PATCH 2/2] [exiv2] switch to proper exvi2 errorcode - ---- - cplusplus/filefoldermodel/filefoldermodel.cpp | 2 +- - cplusplus/scripts/handlingfacetags.cpp | 2 +- - cplusplus/scripts/metadata.cpp | 2 +- - 3 files changed, 3 insertions(+), 3 deletions(-) - -diff --git a/cplusplus/filefoldermodel/filefoldermodel.cpp b/cplusplus/filefoldermodel/filefoldermodel.cpp -index 56b120b7..c8cf199a 100644 ---- a/cplusplus/filefoldermodel/filefoldermodel.cpp -+++ b/cplusplus/filefoldermodel/filefoldermodel.cpp -@@ -561,7 +561,7 @@ void PQFileFolderModel::advancedSortMainView() { - // An error code of 11 means unknown file type - // Since we always try to read any file's meta data, this happens a lot - #if EXIV2_TEST_VERSION(0, 28, 0) -- if(e.code() != Exiv2::ErrorCode::kerUnsupportedImageType) -+ if(e.code() != Exiv2::ErrorCode::kerFileContainsUnknownImageType) - #else - if(e.code() != 11) - #endif -diff --git a/cplusplus/scripts/handlingfacetags.cpp b/cplusplus/scripts/handlingfacetags.cpp -index 562cf200..94a7bca6 100644 ---- a/cplusplus/scripts/handlingfacetags.cpp -+++ b/cplusplus/scripts/handlingfacetags.cpp -@@ -58,7 +58,7 @@ QVariantList PQHandlingFaceTags::getFaceTags(QString filename) { - } catch (Exiv2::Error& e) { - // An error code of 11 means image not supported. This is much more reliable than, e.g., checking a file ending - #if EXIV2_TEST_VERSION(0, 28, 0) -- if(e.code() != Exiv2::ErrorCode::kerUnsupportedImageType) -+ if(e.code() != Exiv2::ErrorCode::kerFileContainsUnknownImageType) - #else - if(e.code() != 11) - #endif -diff --git a/cplusplus/scripts/metadata.cpp b/cplusplus/scripts/metadata.cpp -index a7d3e076..fabc2d74 100644 ---- a/cplusplus/scripts/metadata.cpp -+++ b/cplusplus/scripts/metadata.cpp -@@ -121,7 +121,7 @@ void PQMetaData::updateMetadata(QString path) { - // An error code of 11 means unknown file type - // Since we always try to read any file's meta data, this happens a lot - #if EXIV2_TEST_VERSION(0, 28, 0) -- if(e.code() != Exiv2::ErrorCode::kerUnsupportedImageType) -+ if(e.code() != Exiv2::ErrorCode::kerFileContainsUnknownImageType) - #else - if(e.code() != 11) - #endif --- -2.40.1 - 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-3.2.ebuild b/media-gfx/photoqt/photoqt-3.2.ebuild deleted file mode 100644 index 5cdfa03f5411..000000000000 --- a/media-gfx/photoqt/photoqt-3.2.ebuild +++ /dev/null @@ -1,75 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -ECM_KDEINSTALLDIRS=false -inherit ecm optfeature - -DESCRIPTION="Simple but powerful Qt-based image viewer" -HOMEPAGE="https://photoqt.org/" -SRC_URI="https://photoqt.org/pkgs/${P}.tar.gz" - -LICENSE="GPL-2+" -SLOT="0" -KEYWORDS="amd64 x86" -IUSE="devil exif freeimage graphicsmagick imagemagick mpv pdf raw" - -COMMON_DEPEND=" - app-arch/libarchive:= - app-arch/unrar - dev-libs/pugixml - dev-qt/qtdbus:5 - dev-qt/qtdeclarative:5 - dev-qt/qtgui:5[jpeg] - dev-qt/qtimageformats:5 - dev-qt/qtmultimedia:5[qml] - dev-qt/qtnetwork:5 - dev-qt/qtprintsupport:5 - dev-qt/qtsql:5 - dev-qt/qtsvg:5 - dev-qt/qtwidgets:5 - dev-qt/qtxml:5 - devil? ( media-libs/devil ) - exif? ( media-gfx/exiv2:=[bmff] ) - freeimage? ( media-libs/freeimage ) - imagemagick? ( - !graphicsmagick? ( media-gfx/imagemagick:=[cxx] ) - graphicsmagick? ( media-gfx/graphicsmagick:=[cxx] ) - ) - mpv? ( media-video/mpv:=[libmpv] ) - pdf? ( app-text/poppler[qt5] ) - raw? ( media-libs/libraw:= ) -" -DEPEND="${COMMON_DEPEND} - dev-qt/qtconcurrent:5 -" -RDEPEND="${COMMON_DEPEND} - dev-qt/qtgraphicaleffects:5 - dev-qt/qtquickcontrols:5 - dev-qt/qtquickcontrols2:5 -" -BDEPEND="dev-qt/linguist-tools:5" - -PATCHES=( "${FILESDIR}/${P}-exiv2-0.28.patch" ) # upstream git master, bug #906491 - -src_configure() { - local mycmakeargs=( - -DCHROMECAST=OFF # TODO needs python - -DDEVIL=$(usex devil) - -DEXIV2=$(usex exif) - -DEXIV2_ENABLE_BMFF=$(usex exif) - -DFREEIMAGE=$(usex freeimage) - -DGRAPHICSMAGICK=$(usex graphicsmagick $(usex imagemagick)) - -DIMAGEMAGICK=$(usex imagemagick $(usex !graphicsmagick)) - -DVIDEO_MPV=$(usex mpv) - -DPOPPLER=$(usex pdf) - -DRAW=$(usex raw) - ) - ecm_src_configure -} - -pkg_postinst() { - optfeature "additional image formats like AVIF, EPS, HEIF/HEIC, PSD, etc." kde-frameworks/kimageformats - ecm_pkg_postinst -} 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..47cae6ad5b82 --- /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/pinta/Manifest b/media-gfx/pinta/Manifest index 08c955794a89..d457ff933f7f 100644 --- a/media-gfx/pinta/Manifest +++ b/media-gfx/pinta/Manifest @@ -40,7 +40,6 @@ DIST nunit3testadapter.4.3.1.nupkg 485350 BLAKE2B 58f9e9b279ddeadbfb475c15f5cdd1 DIST pangosharp.3.24.24.38.nupkg 142957 BLAKE2B 32bd1ae7a805d5b76da89b7b3ab02bc9b40cbd17bc15bb6bd019eea1c19e15d8de4336de19586f302040e1558a5ee53a2bd6aa130e9c1fe9041c7d4082fdbb7d SHA512 5edc84db5b815d3fe8162b39f6c6f1f44107e216dfaf63e2c5677ca4f7d2a552558a51e6dba9910820358bbc70fe6aef58321e691271095cac2c98dad29a7f3a DIST paragonclipper.6.4.2.nupkg 34425 BLAKE2B 0ec1b586bae777b0f05bee929347fafecb81b1df3ddd8243a92ff39864e791410935ced8a2783b95d1392723ea5a5a75531d7ad599d9fdab8477fbcb7b3f62a3 SHA512 c9f311b519bc419c82f8446fc8138f1b4cea9600acb1c3be07705032312b1c16cd87813d09950e6330650764f7f1b3da1356a306c071ff9bac7189edf6e9819d DIST perfolizer.0.2.1.nupkg 51987 BLAKE2B 2e01e7673ae420136e6194d89c406fca31af85b7f90b460a53ebbe0fef82c38ba3be3821d9e1a7b9b2bf5d117bb9f2f4f91767796bffb51ac14e5cb9f472d873 SHA512 9db50cdcf13a85737c275a0aa3dc4a98b97e7d23e7aca1c9b27df28e454b0d4587315bd62f7181dc03e0257a83d79c7af2e90733eafda70afe5a956c92c20a9a -DIST pinta-2.1.1.tar.gz 7569972 BLAKE2B 792d62a889ac7b37f9e491c5dc12f1f4bee2520e3e9ee605f11b95ebaeaf159a41d24476fa55f00acb5a2a77e6e2d92f0dcfd32b7201e174f4224087995919f2 SHA512 d322411d91dbb40f9775333e7930cc2d89f816fe00ad5f358bcdd439c7f17493098416c5835b82ea5ff2fd4dfb93589416f26f9e8c5137fc750edc2857529780 DIST pinta-2.1.2.tar.gz 7571286 BLAKE2B 02ba85add6e1da57826803ed318da2db854ba193169d4d8d3a1d7481337beb43e2461da9a71795dc3ab594607e25e5f7db6e06ab5b4a856441a8f572d71864fc SHA512 1c3d5591ac5d867961fc1037dad39d2a6ca1b4178bcadca3f380e7cd0e6ef6171ea2b4b0f5958fc1d893004911923fc144e0dd5774e41794c1d5db613e47b445 DIST sharpziplib.1.4.1.nupkg 732730 BLAKE2B 25d18d8dab8f91c39f65aef00c930d90c6c978d6b829039f077af9dce92a179220fab8ee005f222d792a1ac22e2ef998dc1a6fe58ccdba58eb0a8e8e9dca5758 SHA512 3f051f41f91577291da0d317d210547752251aae07f5060c1f8ff71917477f44ade9674f9862d6ce76d3c2a7a57b700165ee573286054d6dee1ea825f383f59e DIST system.codedom.6.0.0.nupkg 197501 BLAKE2B bd626f958d3c36129ec319e69b0c057736d94027e2440aa87fcef5aa5d0767d7a52bb8ace5b93fe6af263c1b09238670dc16c9f5a1c1b7e9cc0e6d343d520324 SHA512 2b911b7c9bc524c86562a26547dfc92a8c774ed5937993a4a22e8a9ca1b146151aeaeaf15e4271ff6fe6cf20af634815aa1485a5a4c48d24acf39b2a6bc3cf27 @@ -59,6 +58,5 @@ DIST system.security.principal.windows.4.7.0.nupkg 511086 BLAKE2B 11731c7ad320a4 DIST system.text.encoding.codepages.4.5.0.nupkg 4270497 BLAKE2B 651d99416e88b551ba305efacedfd5cf221f7a61bd7add2c90c4c31e04d4543194d5844b82723e4cba55548fae4f99701744f8dc82e1407d09d12614a8c43969 SHA512 6909e55204fe24affcd62bfadb313b851ec56493a029b30dbb194ae65eaedc2721b59d851b92c832779d9af5604f5a614e75f8a96094228c9f193425c6b2cda2 DIST system.threading.tasks.extensions.4.5.4.nupkg 89582 BLAKE2B 728fc5794745b706a7e3a7d05186f34e2a8c1837cafdc7fc9a1bd8fc6fd42025448cbdfa53415a05d872aa08db1deb31d104054630c9ac7ecd29a2ddd973fd5c SHA512 68052086e77d3c7198737a3da163d67740b7c44f93250c39659b3bf21b6547a9abf64cbf40481f5c78f24361af3aaf47d52d188b371554a0928a7f7665c1fc14 DIST tmds.dbus.0.11.0.nupkg 100417 BLAKE2B 390b66cf60c78194fb791d9313cba866011058635cdffb6a3ae9cb6918a8b73478d077e6af4f945a05b51a2c1d14b0d2acabb75c949dd7690042975bb159dfd2 SHA512 efa0e5d4e803964da25c23fcd678a6078da9c0ac6a1351a46b507a1209230b97aa90678e1cdae51a122f3d2b8106e0ef34d23d45fc9a680fe21f6e9740665e80 -EBUILD pinta-2.1.1-r1.ebuild 3275 BLAKE2B b3e961f0468eb6c5e7a880e4c7b338672114a963fcb26216841ca07dcc98f4541979c3c289871c1d440b5c2a3034aeb44ecb7d9fc8a438ce2562d33cbe768c02 SHA512 d9149915f4e7633780d6d39a794ce88c0c0812925e92fc6ad157f3afe3308247b102f44505400db1cf075131f73186ecc8c3fc3f3126d3262000ae85d86ccb64 EBUILD pinta-2.1.2.ebuild 3236 BLAKE2B 812de0edc3713d89553aafbace0ce675ec534170b40d296823f6ccc17e0847911c742a0b29c21473914371c1d4aa8854e2648ad48aef7522204d1a7d39748ff9 SHA512 136f4fdfaff119585f5b035bc5472fb9b315d51dce365976acc67f99056cffa8b0cd9a7d3488b9b759ce6f95927f8cd9789dd44d5a7bc5d89a7910f2f0108773 MISC metadata.xml 664 BLAKE2B ce88ef1889c6f6928493e18075b6c17696fca5e2a2df26e1a4f645082b41aa261933aebc66411c66125c07fd1104ca3e1cf9357e2a56185967669221325f1222 SHA512 87208ea2d284ac31559f9672ae16bf20a70c20293b7964927fb27d3261e352f2b63fde6434fac37a8f47aced7249a7bab16fc72080ba9a4cc698839613ce96c7 diff --git a/media-gfx/pinta/pinta-2.1.1-r1.ebuild b/media-gfx/pinta/pinta-2.1.1-r1.ebuild deleted file mode 100644 index 17049a054f72..000000000000 --- a/media-gfx/pinta/pinta-2.1.1-r1.ebuild +++ /dev/null @@ -1,136 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -DOTNET_PKG_COMPAT=7.0 -NUGETS=" -atksharp@3.24.24.38 -benchmarkdotnet.annotations@0.13.2 -benchmarkdotnet@0.13.2 -cairosharp@3.24.24.38 -commandlineparser@2.4.3 -gdksharp@3.24.24.38 -giosharp@3.24.24.38 -glibsharp@3.24.24.38 -gtksharp@3.24.24.38 -iced@1.17.0 -microsoft.bcl.asyncinterfaces@1.1.0 -microsoft.bcl.asyncinterfaces@6.0.0 -microsoft.codeanalysis.analyzers@2.6.2-beta2 -microsoft.codeanalysis.common@3.0.0 -microsoft.codeanalysis.csharp@3.0.0 -microsoft.codecoverage@17.4.1 -microsoft.diagnostics.netcore.client@0.2.251802 -microsoft.diagnostics.runtime@2.2.332302 -microsoft.diagnostics.tracing.traceevent@3.0.2 -microsoft.dotnet.platformabstractions@3.1.6 -microsoft.extensions.configuration.abstractions@2.1.1 -microsoft.extensions.configuration.binder@2.1.1 -microsoft.extensions.configuration@2.1.1 -microsoft.extensions.dependencyinjection.abstractions@2.1.1 -microsoft.extensions.logging.abstractions@2.1.1 -microsoft.extensions.logging@2.1.1 -microsoft.extensions.options@2.1.1 -microsoft.extensions.primitives@2.1.1 -microsoft.net.test.sdk@17.4.1 -microsoft.netcore.platforms@1.1.0 -microsoft.netcore.platforms@2.0.0 -microsoft.testplatform.objectmodel@17.4.1 -microsoft.testplatform.testhost@17.4.1 -netstandard.library@2.0.0 -newtonsoft.json@13.0.1 -ngettext@0.6.7 -nuget.frameworks@5.11.0 -nunit3testadapter@4.3.1 -nunit@3.13.3 -pangosharp@3.24.24.38 -paragonclipper@6.4.2 -perfolizer@0.2.1 -sharpziplib@1.4.1 -system.codedom@6.0.0 -system.collections.immutable@1.5.0 -system.collections.immutable@5.0.0 -system.management@6.0.0 -system.memory@4.5.1 -system.memory@4.5.3 -system.reflection.emit.lightweight@4.7.0 -system.reflection.emit@4.7.0 -system.reflection.metadata@1.6.0 -system.runtime.compilerservices.unsafe@4.5.0 -system.runtime.compilerservices.unsafe@4.5.3 -system.runtime.compilerservices.unsafe@5.0.0 -system.security.principal.windows@4.7.0 -system.text.encoding.codepages@4.5.0 -system.threading.tasks.extensions@4.5.4 -tmds.dbus@0.11.0 -" - -inherit autotools dotnet-pkg xdg - -DESCRIPTION="Pinta is a free, open source program for drawing and image editing" -HOMEPAGE="https://www.pinta-project.com/ - https://github.com/PintaProject/Pinta/" - -if [[ "${PV}" == *9999* ]] ; then - inherit git-r3 - - EGIT_REPO_URI="https://github.com/PintaProject/${PN^}.git" -else - SRC_URI="https://github.com/PintaProject/${PN^}/archive/${PV}.tar.gz - -> ${P}.tar.gz" - S="${WORKDIR}/${P^}" - - KEYWORDS="amd64" -fi - -SRC_URI+=" ${NUGET_URIS} " - -LICENSE="MIT" -SLOT="0" - -RDEPEND=" - x11-libs/gtk+:3[introspection] -" -BDEPEND=" - ${RDEPEND} - dev-util/intltool -" - -src_unpack() { - dotnet-pkg_src_unpack - - if [[ -n "${EGIT_REPO_URI}" ]] ; then - git-r3_src_unpack - fi -} - -src_prepare() { - default - - eautoreconf -} - -src_configure() { - econf - - dotnet-pkg_src_configure -} - -src_compile() { - emake -} - -src_install() { - emake DESTDIR="${ED}" install - - local pinta_home="/usr/$(get_libdir)/${PN}" - - mv "${ED}/usr/bin/pinta" "${ED}/${pinta_home}" || die - sed -e 's|dotnet|${DOTNET_ROOT}/dotnet|g' -i "${ED}/${pinta_home}/pinta" \ - || die # No interpolation! - dotnet-pkg-base_dolauncher "${pinta_home}/${PN}" "${PN}" - - rm "${ED}/usr/share/man/man1/${PN}.1.gz" || die - doman xdg/${PN}.1 -} diff --git a/media-gfx/plantuml/Manifest b/media-gfx/plantuml/Manifest index b917a99b6fe7..45d80c280664 100644 --- a/media-gfx/plantuml/Manifest +++ b/media-gfx/plantuml/Manifest @@ -1,5 +1,5 @@ -DIST plantuml-1.2024.5.tar.gz 12119170 BLAKE2B 97fd8f48aa04d9d8b089547871abd954b8b1c189d32b844f1de4ac33678dabe2968a3307fb573f571adf541dbbbfd5eb5c21839b14f3cb9ed2e86ac7b447bb87 SHA512 20b9502a3d6ac9ceccb667943f8ea70990102f778175001852b1fcd2b9b7fa570f5b7a7fb237b6831c0411667c3e986f2b0ea09ce2602b5c1ca98694b37c20a5 -DIST plantuml-1.2024.6.tar.gz 12591935 BLAKE2B c9b56908538e3e98d2c8d4e56c064ffa378621d14232f8d769f1b80b610fcf22c50d94974a8c21791e2780231708e594a02466f0cba5e78a60b4b4110d0f89f0 SHA512 86633b93abdbc571ff335e61992f0db8ba20ed0e0d0dc5e9c564a8b312594051f47d453fb8b9787d3d3192ccc35f8ea99e5ddab8cc1d16458203c9309087ddbd -EBUILD plantuml-1.2024.5-r1.ebuild 1379 BLAKE2B d9828453b19199934914faa621789747aea212803c63c48500bc283907359c6c04671ff62c00c0ef17e7accd9e2c948bb354c54d796bb77439a5339bef31c0fe SHA512 6ae5acbbb52f987d5d270c90a8940cad08430f7fd02d61d38cf9850ddd3807f664f78a265a8d2ea2bda054fb728ce603e164a4ecf17eaaae53b39b1b649a04b7 -EBUILD plantuml-1.2024.6.ebuild 1380 BLAKE2B cbfc68c40d4cb2f2db79154facbcd198c44ce49920ba9298eab723b951e89aba7d2a947eff781dc2a258a586db833ca534459b9b8723cc194430a3cdac88a9bd SHA512 32c34377f41bd1deedb2e1b81aec248dc2fc1f7aaa779664094f90abc4f258ec708635eadbac2206a4160ae28d6078b71a5f224dd745a4717d61d40b042e9cb0 +DIST plantuml-1.2024.8.tar.gz 12543887 BLAKE2B 719602cb8f21e5908fea32778257f0fca830746796e0130bd76f48dc7c829a528d2d0bf8b6f1a0a4ab4fc73c60e8c0b37559108f4afbaf5994597207e6497df2 SHA512 32ee9cb80171ee467b68fe98ca74a3a084bd64410de34d50c79cb40ca972d6092b9c65e0e6ee96647393fa44f152e2ecd3bdafc3f22010afbe73630573996b64 +DIST plantuml-1.2025.0.tar.gz 12278815 BLAKE2B e4ae5b7f76294f060d6a598b6e145bb97af3e37127bcea64cf812d6072e946153de564ddb4d3985f7923fd7584911f08016cee79e26fd48dbf822b385e761b52 SHA512 cdae9effb752af43df913eef21d5c575fa803786d2afeb06732870a36a8a7c71204a8a24817640d9cc99e6361d8cae34a7490bb2a8e5ae034ee31edc1d51afb2 +EBUILD plantuml-1.2024.8.ebuild 1374 BLAKE2B 0f09d29f7740d522aa6ca68781b3acf862c62365dfca7b3223f45de2bd9c57c98d1da3756b9e1d58f1ca7c8dd49e5fd4072ce346f69015cdb9658cbc9294cb33 SHA512 51d1069d2617cf7393d1db274f8891c0c25b8d71107e31bd50ca09c32bed895b0c5df71f61a01de8f6333d7b3c3919f7212a3b5f55e476a6f52ba74717e5d5a0 +EBUILD plantuml-1.2025.0.ebuild 1375 BLAKE2B 898c4e81dc5f7300ee7992de73685c58ce3633275abfb5ba13b5b54de37de9e107cb190f484681fa5bf07f453b327bb946eb8a96cb7d40899a26646ef9d702a0 SHA512 cb1269d9554b70604bed6b35dacc6e638d937cbf547555ca1b504fa4231eae6d17296ad8533a1ecea6679a873885ada1110a543c84a55a6aa39699ed5471e9a9 MISC metadata.xml 975 BLAKE2B 3a847073b2f3b5f14adb59f8dec5183533eef81f8b10e5633b356743cb45c3927dfc2f8427f26f1e2b3eef01976b0a8e5884b5f9492310e87884c26759dbfed8 SHA512 2cd56c421b1566a679afb739ca82377d5c8b47519fd2cc44307424f5cd88fa0f8b2144842943a7da6abef7ad79254101818292819fdef97631746815a892e7a5 diff --git a/media-gfx/plantuml/plantuml-1.2024.5-r1.ebuild b/media-gfx/plantuml/plantuml-1.2024.8.ebuild index 5fd769605c36..4493b5a25ef3 100644 --- a/media-gfx/plantuml/plantuml-1.2024.5-r1.ebuild +++ b/media-gfx/plantuml/plantuml-1.2024.8.ebuild @@ -13,7 +13,7 @@ S="${WORKDIR}/${P}" LICENSE="GPL-3" SLOT="0" -KEYWORDS="amd64 ~x86" +KEYWORDS="amd64" IUSE="ant-task" DEPEND=">=virtual/jdk-1.8:* diff --git a/media-gfx/plantuml/plantuml-1.2024.6.ebuild b/media-gfx/plantuml/plantuml-1.2025.0.ebuild index eafb36810423..d8529060072a 100644 --- a/media-gfx/plantuml/plantuml-1.2024.6.ebuild +++ b/media-gfx/plantuml/plantuml-1.2025.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 @@ -13,7 +13,7 @@ S="${WORKDIR}/${P}" LICENSE="GPL-3" SLOT="0" -KEYWORDS="~amd64 ~x86" +KEYWORDS="~amd64" IUSE="ant-task" DEPEND=">=virtual/jdk-1.8:* diff --git a/media-gfx/pngcheck/Manifest b/media-gfx/pngcheck/Manifest index 963b1d96ae96..1a94b842cc3f 100644 --- a/media-gfx/pngcheck/Manifest +++ b/media-gfx/pngcheck/Manifest @@ -1,5 +1,3 @@ -DIST pngcheck-3.0.2.tar.gz 63202 BLAKE2B 4cc6040e087aa2f5829e79ea1a5feb45af8bb15fa72325f9cb4822169c7d278306d6d89b936fd4c3c3819a09380e07f1f64ce0c276e776c3146c1533b1ee1363 SHA512 81bba699141c0f506ee589785eccc4b1ea882df5d211bcd91885bbcc4230bf14d23fc1298ffc10a110d6a8459522f6a01bfba1f81739f6085e4d3de964bda3d5 DIST pngcheck-3.0.3.tar.gz 63766 BLAKE2B 962f90e6a05170a14fba45372d65f8cc94d1b4f6119c30d252a67644b69eb8a925c20b0d020b917673754f491305f73ac7e294df9b2a908a93011cec420c3629 SHA512 cdb2620cb508f9df748bd3e9cb657d2c503a1f62171f497f1ff1e0f220287364829f03164869567c83b5797d8bc478495ad6c35860196812ef8262fce4cbff26 -EBUILD pngcheck-3.0.2.ebuild 703 BLAKE2B 950431772e8c99335eb9cb875dc5f864ac143d44265b52c6b13335cf298aad8f64de2e14aa28aba78121d91b1b3ec5ffe17e01ff6ac10807e3fea936c532c7ec SHA512 a5a2391005d6fc1fa61016aa551f853c5b55cc84006c157380cc0d1bf27b534d308706fd08a8d3eee15f7f5fc39a8ce590b8ba4de5c53bd64a2118bd3b0a8b2e EBUILD pngcheck-3.0.3.ebuild 696 BLAKE2B ca6243ef70a236644110b9e4dcce87a793613430465617513c2373ee5d71306ad5e6985e8d5167a3f07d6eff317ec7109d2ae5ac55ec7c3d78a652d9a30cb275 SHA512 8e69784097d1b9df1efcc91175df7836e22624f179cc06c29f7db977ca0860d4c737c38c4609b14375ef797f6f05ddad510ae2caf63286ff738c3ff382fc4733 MISC metadata.xml 245 BLAKE2B 30ec91c1f9ea95e1a599102f696a4fe4b20d1f4f75cf7e7be32c5b53716ab4944b46f2e03bfb03bc1c45779f12768a6f6c14fe34c074678a02c705aaaceda709 SHA512 ed5a8995a5bbcbc8f921f25f096f6211ba40548527e4acc752fd93a847a133857ee14a91bf9ab3c3f9aee14213a06a72c1c23e9428a1b37815b09324d0344ee8 diff --git a/media-gfx/pngcheck/pngcheck-3.0.2.ebuild b/media-gfx/pngcheck/pngcheck-3.0.2.ebuild deleted file mode 100644 index ca87c90889f4..000000000000 --- a/media-gfx/pngcheck/pngcheck-3.0.2.ebuild +++ /dev/null @@ -1,32 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit toolchain-funcs - -DESCRIPTION="Verifies the integrity of PNG, JNG and MNG files with internal checksums" -HOMEPAGE="http://www.libpng.org/pub/png/apps/pngcheck.html" -SRC_URI="https://downloads.sourceforge.net/png-mng/${P}.tar.gz" - -LICENSE="HPND GPL-2+" -SLOT="0" -KEYWORDS="amd64 x86" - -RDEPEND="sys-libs/zlib" -DEPEND="${RDEPEND}" - -src_compile() { - emake -f Makefile.unx \ - CC="$(tc-getCC)" \ - LD="$(tc-getLD)" \ - CFLAGS="${CFLAGS} ${LDFLAGS} -DUSE_ZLIB" \ - ZLIB="-lz" -} - -src_install() { - dobin png{check,split,-fix-IDAT-windowsize} - doman pngcheck.1 gpl/pngsplit.1 - - einstalldocs -} diff --git a/media-gfx/pngcrush/Manifest b/media-gfx/pngcrush/Manifest index d4fe34af71e5..2601b0b0f798 100644 --- a/media-gfx/pngcrush/Manifest +++ b/media-gfx/pngcrush/Manifest @@ -1,4 +1,4 @@ AUX pngcrush-1.8.13-adler32_check.patch 486 BLAKE2B 73bd6fc0a81ca1dddcf3aba4f8d4223aa501fa0cef59c2b1b5dde702705c12f1280884db533578ddbfb0909a5cf9288bbe6b84d49d18e5e1ae65baf44a27221d SHA512 65f5e269e076b740bfa112d232d1f220776975d5f8fe10e7d6ed924f17a5b864a738f2747992dc87f8f20d910616b2ee5afc755ba0a2b2ef82398cd306721835 DIST pngcrush-1.8.13-nolib.tar.xz 66104 BLAKE2B dad0bce2e8f2a135d085343da98ebecfb78a6b05019d43be1b0b1f940ce23ffa980bcb08e8948b6b8cc3efc04bc6ae92a0b9cf8ea8183e27eebfae4c6c48e31e SHA512 c073d573e9b13b72fa39b178271ce65d1a19fef35943ef0a9e6121a5c66d9db212aaad38ab777c5b44e20a107eb677003acbdb4a354bcb2dc40f535a97d9df0e -EBUILD pngcrush-1.8.13.ebuild 855 BLAKE2B a826f6b6e5a2365f3751d835a39852a20ef192773d65f3ff15e1ec06b043c09d68deda6ab518a856a29f87ba45574610b6d276958d6a2eb7dccbd25c37adb06e SHA512 7ea8a87d62c8384afb34029d16425642e5dd28266214e10772355ef68f2caa3dcd25687f64df0bbc83fd5113fe0cd269f1f507e3116f853ecedf36b83cb65250 +EBUILD pngcrush-1.8.13.ebuild 849 BLAKE2B 8449d6f118b06883191b5fccf93f87fe57e1a93e27fb15d437a2af96875465b125d26710af259af9c14416012caf24f8872cb2baaf466d65340abc85501065ea SHA512 c0738a574e5bf9d0055dd24c0d6e878c737759ba379814835ffc1c8360e0e02a96a8c6757095d9eff8fe452834a35b989a6c86fda21302088e9d3d161a5b4f1c MISC metadata.xml 488 BLAKE2B 94fc372620c5ac603b963cc47b594486ee1bfb929cbf9b7858adc73c168477d2267261e8becddb00ee44ebf606286d4e14e9430005bb34248286a44410cb7755 SHA512 3e42cc11c4e57853156aa2e5ad991d2dd158c733e6d8bba738f94707fca97d00b465b1b36e648d25a64816574ebb35b736a77ee12d34c87bbf0a20091f38f9ec diff --git a/media-gfx/pngcrush/pngcrush-1.8.13.ebuild b/media-gfx/pngcrush/pngcrush-1.8.13.ebuild index 27787e17634f..71051bbc3824 100644 --- a/media-gfx/pngcrush/pngcrush-1.8.13.ebuild +++ b/media-gfx/pngcrush/pngcrush-1.8.13.ebuild @@ -11,7 +11,7 @@ SRC_URI="https://downloads.sourceforge.net/pmt/${P}-nolib.tar.xz" LICENSE="pngcrush" SLOT="0" -KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ppc ~ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos" +KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~loong ppc ~ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos" RDEPEND="media-libs/libpng:0= sys-libs/zlib:=" diff --git a/media-gfx/pngnq/Manifest b/media-gfx/pngnq/Manifest index a3940e89e2f6..e3d9a311fd9b 100644 --- a/media-gfx/pngnq/Manifest +++ b/media-gfx/pngnq/Manifest @@ -5,5 +5,5 @@ AUX pngnq-1.1-autoconf-quoting.patch 299 BLAKE2B 454f2c28a31220307b0e1290030f9b2 AUX pngnq-1.1-gcc14-build-fix.patch 1426 BLAKE2B 5a9ff973fbbe26fe7542a016274022fd934fde18b4f582d1de459631c52f4ccccd37088a30546d44665652103d881dd723f7e779c78258bb345013319ee9c7b5 SHA512 b2ca1fdc359a38d9fa73cb7c583f89e9c92e3e6cacf8090d6c523d46fb46513eab74d3cb00663979f86627eac1ff29c3276802440a94b591152748a3a99f16b2 DIST pngnq-1.1.tar.gz 117372 BLAKE2B 94c670342d514c577c386b8fe207307f057e5c0c3816b35ab2b625258051269410b9c5ad45f89c047715bb1ad927909498a6faef5591eb61039fd68c94fc44a6 SHA512 3bbc4ace1375517a7a73bbc65ff39512ef316e4b67fc3941cd0b7269e584a26f915f30591f8aa1c44eea73fe4ebe9519063a7bc426841e412c648aaa188be234 EBUILD pngnq-1.1-r1.ebuild 687 BLAKE2B 17bf9d6e665e0b84ecb063c7c2e32093242186f82420411c5de14b9fbf44117b5e9cc60695261a15c3da42a7a834ea25adaf61447c7a6140ae478a044a7fee60 SHA512 b61ea24e468b9a19c0bca38823a18a3b537241984813cc022d1387bc1f11dbaf80c5efa03724c571270a3075787e7f407c43d1ae154c125485c970bfd464f4ff -EBUILD pngnq-1.1-r2.ebuild 737 BLAKE2B c903c56ce977c118203d0520e12afa07132cd9da739e1ee672aa1ecd8bb8e5f9b9ee11add6e7b627ee5e5ee6a0066bf7b9310a704af3971882960793fbfe0836 SHA512 f172fcdf9f15a984a8ff93b94b60a7a32af4f866ac53c745df10b6afbd7a97fbb77d6fb1d45bdb108ecb92b073a07e14664f87b5ed1c20e6d7bec212dd0105d4 +EBUILD pngnq-1.1-r2.ebuild 735 BLAKE2B 320965ec017797a285d8dbc02d7f2893e597ec4f47b220af240aee3c6a77cf21eadb2a5bb935d357d7556bcfa3cb40cb0ff4dee2dd7eb9ab77365c7d0aee2e1c SHA512 d052d944d3fa68161332932d9d85711f35c1e3e6415fcdf7e7a22600fe3a31da8fffa14ee0d54d96f3343423430b9d286e56f5203f0735fcba4c3a94d00fb00d MISC metadata.xml 243 BLAKE2B bc28a5bf618a465e4fe0f7eb0ce8eca6f60cdfa875d7c9d96aea4071a84f17b5a3f7ce20adace95946e312fd8db0583dc2b83a81ec47184f03d6851f05620b49 SHA512 91ef91f45537a1a41d6df99d077d886c517583c7d23c48558d04308f05d9f8c13ee57709c93c4b0852f15b339e75e2b27ff0ddf12b20dec07c4e944679e555e2 diff --git a/media-gfx/pngnq/pngnq-1.1-r2.ebuild b/media-gfx/pngnq/pngnq-1.1-r2.ebuild index cdfa4f9281af..3cb456cbf8a3 100644 --- a/media-gfx/pngnq/pngnq-1.1-r2.ebuild +++ b/media-gfx/pngnq/pngnq-1.1-r2.ebuild @@ -11,7 +11,7 @@ SRC_URI="https://downloads.sourceforge.net/${PN}/${P}.tar.gz" LICENSE="BSD pngnq rwpng" SLOT="0" -KEYWORDS="~amd64 ~x86" +KEYWORDS="amd64 x86" RDEPEND="media-libs/libpng:0=" DEPEND="${RDEPEND}" diff --git a/media-gfx/pngtools/Manifest b/media-gfx/pngtools/Manifest index 48c6e09238e1..cd8c0cdaed45 100644 --- a/media-gfx/pngtools/Manifest +++ b/media-gfx/pngtools/Manifest @@ -1,9 +1,4 @@ -AUX pngtools-0.3-implicit-declarations.patch 1428 BLAKE2B 7e6cc10c336658e039de5f37416d9b0b696b731d12364dd72d119fb58edb04bf506eef32541615f98bc2a06b8d5841a705a316e6f9fd84e09ea591291be45be4 SHA512 80ac14a46940324dcd33f0f6f215e56888cc46a24d216d120339e026fa2ef0624511c262daa195308d420ffa773e2279b73d332316f626dac4ec3c96d6a2ee6c -AUX pngtools-0.4-libpng14.patch 1265 BLAKE2B a959b83fe85a10348d815ccccaa17d2e46c03398a38cdffff52372a39419ef2ed70deb7e5751228066085c714969d755665801bf8b973d945622159af1937e03 SHA512 94940722266361f90239712875067ab0d82c18545300d9d604b76eb00ffdb8e82af0e0ab78966b645aba2dbdf59666a2da593365d5b9c9745def2b8ede0a4480 -AUX pngtools-0.4-libpng15-fixes.patch 6722 BLAKE2B 083318ef199f4c07ed1f44ddf95623fd198e10a2b939f86c1bf7a9995fac98080d0dbbe79e2e88817e8f07c5bd2f79ad80d7ee2d41cb0d03ca7aa46b8707ba64 SHA512 aafc4c746efc0ef00e9d9e59acf0dee58b56ce80a9f04ddfa9879f46f342170f4641f23081323299a143d4837367645240f823ba9900592fcfdec71961f3f330 AUX pngtools-0.4_p20220314-docbook-dtd.patch 2482 BLAKE2B b6f48ff4fa4d3f20f3d720d7e03b37b2a9b4af5c0daabf73ef2f91a874106bb7b465f024c24c79516fd8a6c10a0569cab59ccde0afd1a21cf1c337e23801ffae SHA512 ee28229423354cd99bae0e964ddb6554e5c7eb61e3d2ccd0151ae68aa138ac1f6781746cb134a6a9e9af6c62bc58804b212f35a03757c5fed51e98a172c90a02 DIST pngtools-0.4_p20220314.tar.gz 651338 BLAKE2B 9df108da4a52c6292c52a08ddc59163d386bc5de4aaaac96a166ba1e5dc38029b4261e80b8a186997d199ecd11b43fe9e46a41b6b25c65595b7baa4eab43376e SHA512 d1812051d4d1e6306805c96f686798e5af0a304ec045dbf02d77ab3f6432bc0f4e0c96c800bbb159d6ca9e83e8ef479c6d4ba742072fa897ec55808061001676 -DIST pngtools_0_4.tgz 1312178 BLAKE2B bff4be34b9a14a459cef2fb5cd1b70bb645c1fca8843bffc2a517b7f56e7a40e104b25b887f8bda227da2e12613c6c568b081b38bf70881b291bb5562eaeb6db SHA512 588b954c7c43ba48442ed4b22ad94fcfb456c7fc84a682e9126ca9d1c9b63dbb8f2d64e6e156664f327efbe11bb2ab1ac29d63ebb8a05329ac14200fb29f95a1 -EBUILD pngtools-0.4-r2.ebuild 703 BLAKE2B 2ce8afd2ce3d957fdd4bf77b3e1cc821523aadde6b2f4995928ece1cae9c633f4c3de60454589929536cc0299b257485de175e7fd73877e2f272f0a161a99086 SHA512 6c618d4ec7c027b1a621d879aa10ff27bab962ffbbe6de42031380fc1343b6a63f6f85a15385232765c9d46d5dc83ce616adcc1aebea8930259529fdb86b5788 EBUILD pngtools-0.4_p20220314.ebuild 973 BLAKE2B e5297259cfcd47706fddd44cfbac026f61c090b7da99f35b112c66748707fcf568e158ca783158b8b8f6c96a6bd47c16290632730696df6940558b9cb6bf1e97 SHA512 b9d18223dedf08252930a872bd4e88fa9126076f36d9a483158b06c225499f92f5a872893480f5c3ca6e33d7c6a6f7f3b72619a4c3833553905786451536fb14 MISC metadata.xml 303 BLAKE2B f87e0bb36559ffa7e785a019927f1f11d4d5de135c5b82331ee1a4acf21ceb94f8fd41486235be173e5e966b270b270772153ea74ec5a71036cec2f56b91ee8d SHA512 5ece8e5c353817fa3e6825116f62f610285cbb7ad4cc3b6b06d6d4136fd6969dc0662b92363bd2441d544038e438be721b00af4780420cb64547c01729db2b07 diff --git a/media-gfx/pngtools/files/pngtools-0.3-implicit-declarations.patch b/media-gfx/pngtools/files/pngtools-0.3-implicit-declarations.patch deleted file mode 100644 index 682bcc8c29d3..000000000000 --- a/media-gfx/pngtools/files/pngtools-0.3-implicit-declarations.patch +++ /dev/null @@ -1,40 +0,0 @@ -diff -ur pngtools.orig/inflateraster.c pngtools/inflateraster.c ---- pngtools.orig/inflateraster.c 2005-04-08 04:23:34.000000000 +0300 -+++ pngtools/inflateraster.c 2008-04-23 20:38:05.000000000 +0300 -@@ -1,5 +1,6 @@ - #include <stdlib.h> - #include <stdio.h> -+#include <math.h> - - // Inflate a raster to a given pixel sample size - char *inflateraster(char *input, unsigned long width, unsigned long height, -diff -ur pngtools.orig/pngchunkdesc.c pngtools/pngchunkdesc.c ---- pngtools.orig/pngchunkdesc.c 2005-04-08 04:23:34.000000000 +0300 -+++ pngtools/pngchunkdesc.c 2008-04-23 20:44:38.000000000 +0300 -@@ -20,6 +20,7 @@ - ******************************************************************************/ - - #include <stdio.h> -+#include <string.h> - - char *meanings[4][2] = { - {"Critical", "Ancillary"}, -diff -ur pngtools.orig/pngchunks.c pngtools/pngchunks.c ---- pngtools.orig/pngchunks.c 2005-04-08 04:23:35.000000000 +0300 -+++ pngtools/pngchunks.c 2008-04-23 20:38:29.000000000 +0300 -@@ -1,6 +1,7 @@ - // List the chunks which appear in a given PNG image - - #include <stdio.h> -+#include <stdlib.h> - #include <unistd.h> - #include <sys/mman.h> - #include <sys/types.h> -diff -ur pngtools.orig/pngcp.c pngtools/pngcp.c ---- pngtools.orig/pngcp.c 2005-04-08 04:23:35.000000000 +0300 -+++ pngtools/pngcp.c 2008-04-23 20:38:13.000000000 +0300 -@@ -1,3 +1,4 @@ -+#include <stdlib.h> - #include <unistd.h> - #include <stdio.h> - #include <math.h> diff --git a/media-gfx/pngtools/files/pngtools-0.4-libpng14.patch b/media-gfx/pngtools/files/pngtools-0.4-libpng14.patch deleted file mode 100644 index f849549bae13..000000000000 --- a/media-gfx/pngtools/files/pngtools-0.4-libpng14.patch +++ /dev/null @@ -1,34 +0,0 @@ -diff -ur pngtools-0.4.orig/Makefile.am pngtools-0.4/Makefile.am ---- pngtools-0.4.orig/Makefile.am 2008-11-27 01:14:17.000000000 +0200 -+++ pngtools-0.4/Makefile.am 2010-03-09 00:51:10.000000000 +0200 -@@ -4,3 +4,6 @@ - pngcp_SOURCES = pngcp.c pngread.c pngwrite.c inflateraster.c - pngchunkdesc_SOURCES = pngchunkdesc.c - pngchunks_SOURCES = pngchunks.c -+ -+pnginfo_LDADD = -lpng -+pngcp_LDADD = -lpng -diff -ur pngtools-0.4.orig/pnginfo.c pngtools-0.4/pnginfo.c ---- pngtools-0.4.orig/pnginfo.c 2008-11-27 01:14:17.000000000 +0200 -+++ pngtools-0.4/pnginfo.c 2010-03-09 00:42:58.000000000 +0200 -@@ -152,7 +152,7 @@ - - // Check that it really is a PNG file - fread (sig, 1, 8, image); -- if (!png_check_sig (sig, 8)) -+ if (!png_sig_cmp(sig, 0, 8) == 0) - { - printf (" This file is not a valid PNG file\n"); - fclose (image); -diff -ur pngtools-0.4.orig/pngread.c pngtools-0.4/pngread.c ---- pngtools-0.4.orig/pngread.c 2008-11-27 01:14:17.000000000 +0200 -+++ pngtools-0.4/pngread.c 2010-03-09 00:43:27.000000000 +0200 -@@ -26,7 +26,7 @@ - - // Check that it really is a PNG file - fread(sig, 1, 8, image); -- if(!png_check_sig(sig, 8)){ -+ if(!png_sig_cmp(sig, 0, 8) == 0){ - fprintf(stderr, "This file is not a valid PNG file\n"); - goto error; - } diff --git a/media-gfx/pngtools/files/pngtools-0.4-libpng15-fixes.patch b/media-gfx/pngtools/files/pngtools-0.4-libpng15-fixes.patch deleted file mode 100644 index 29b73233610b..000000000000 --- a/media-gfx/pngtools/files/pngtools-0.4-libpng15-fixes.patch +++ /dev/null @@ -1,190 +0,0 @@ -diff -Nuar --exclude '*.orig' --exclude '*.rej' pngtools-0.4.orig//pnginfo.c pngtools-0.4/pnginfo.c ---- pngtools-0.4.orig//pnginfo.c 2011-09-16 07:05:05.235477249 +0000 -+++ pngtools-0.4/pnginfo.c 2011-09-16 07:07:52.385872705 +0000 -@@ -185,20 +185,25 @@ - /////////////////////////////////////////////////////////////////////////// - - printf (" Image Width: %d Image Length: %d\n", width, height); -+ int pixel_depth; -+ pixel_depth = bitdepth * png_get_channels(png, info); - if(tiffnames == pnginfo_true){ - printf (" Bits/Sample: %d\n", bitdepth); -- printf (" Samples/Pixel: %d\n", info->channels); -- printf (" Pixel Depth: %d\n", info->pixel_depth); // Does this add value? -+ printf (" Samples/Pixel: %d\n", png_get_channels(png, info)); -+ printf (" Pixel Depth: %d\n", pixel_depth); // Does this add value? - } - else{ - printf (" Bitdepth (Bits/Sample): %d\n", bitdepth); -- printf (" Channels (Samples/Pixel): %d\n", info->channels); -- printf (" Pixel depth (Pixel Depth): %d\n", info->pixel_depth); // Does this add value? -+ printf (" Channels (Samples/Pixel): %d\n", png_get_channels(png, info)); -+ printf (" Pixel depth (Pixel Depth): %d\n", pixel_depth); // Does this add value? - } - - // Photometric interp packs a lot of information - printf (" Colour Type (Photometric Interpretation): "); - -+ int num_palette; -+ int num_trans; -+ - switch (colourtype) - { - case PNG_COLOR_TYPE_GRAY: -@@ -207,10 +212,10 @@ - - case PNG_COLOR_TYPE_PALETTE: - printf ("PALETTED COLOUR "); -- if (info->num_trans > 0) -+ if (num_trans > 0) - printf ("with alpha "); - printf ("(%d colours, %d transparent) ", -- info->num_palette, info->num_trans); -+ num_palette, num_trans); - break; - - case PNG_COLOR_TYPE_RGB: -@@ -232,7 +237,7 @@ - printf ("\n"); - - printf (" Image filter: "); -- switch (info->filter_type) -+ switch (png_get_filter_type(png, info)) - { - case PNG_FILTER_TYPE_BASE: - printf ("Single row per byte filter "); -@@ -249,7 +254,7 @@ - printf ("\n"); - - printf (" Interlacing: "); -- switch (info->interlace_type) -+ switch (png_get_interlace_type(png, info)) - { - case PNG_INTERLACE_NONE: - printf ("No interlacing "); -@@ -266,7 +271,7 @@ - printf ("\n"); - - printf (" Compression Scheme: "); -- switch (info->compression_type) -+ switch (png_get_compression_type(png, info)) - { - case PNG_COMPRESSION_TYPE_BASE: - printf ("Deflate method 8, 32k window"); -@@ -278,9 +283,13 @@ - } - printf ("\n"); - -+ png_uint_32 x_pixels_per_unit, y_pixels_per_unit; -+ int phys_unit_type; -+ png_get_pHYs (png, info, &x_pixels_per_unit, &y_pixels_per_unit, &phys_unit_type); -+ - printf (" Resolution: %d, %d ", -- info->x_pixels_per_unit, info->y_pixels_per_unit); -- switch (info->phys_unit_type) -+ x_pixels_per_unit, y_pixels_per_unit); -+ switch (phys_unit_type) - { - case PNG_RESOLUTION_UNKNOWN: - printf ("(unit unknown)"); -@@ -299,15 +308,18 @@ - // FillOrder is always msb-to-lsb, big endian - printf (" FillOrder: msb-to-lsb\n Byte Order: Network (Big Endian)\n"); - -+ png_textp text; -+ int num_text, max_text; -+ - // Text comments - printf (" Number of text strings: %d of %d\n", -- info->num_text, info->max_text); -+ num_text, max_text); - -- for (i = 0; i < info->num_text; i++) -+ for (i = 0; i < num_text; i++) - { -- printf (" %s ", info->text[i].key); -+ printf (" %s ", text[i].key); - -- switch (info->text[1].compression) -+ switch (text[1].compression) - { - case -1: - printf ("(tEXt uncompressed)"); -@@ -332,12 +344,12 @@ - - printf (": "); - j = 0; -- while (info->text[i].text[j] != '\0') -+ while (text[i].text[j] != '\0') - { -- if (info->text[i].text[j] == '\n') -+ if (text[i].text[j] == '\n') - printf ("\\n"); - else -- fputc (info->text[i].text[j], stdout); -+ fputc (text[i].text[j], stdout); - - j++; - } -@@ -385,14 +397,14 @@ - - printf ("Dumping the bitmap for this image:\n"); - printf ("(Expanded samples result in %d bytes per pixel, %d channels with %d bytes per channel)\n\n", -- info->channels * bytespersample, info->channels, bytespersample); -+ png_get_channels(png, info) * bytespersample, png_get_channels(png, info), bytespersample); - - // runlen is used to stop us displaying repeated byte patterns over and over -- - // I display them once, and then tell you how many times it occured in the file. - // This currently only applies to runs on zeros -- I should one day add an - // option to extend this to runs of other values as well - runlen = 0; -- for (i = 0; i < rowbytes * height / info->channels; i += info->channels * bytespersample) -+ for (i = 0; i < rowbytes * height / png_get_channels(png, info); i += png_get_channels(png, info) * bytespersample) - { - int scount, bcount, pixel; - -@@ -408,16 +420,16 @@ - - // Determine if this is a pixel whose entire value is zero - pixel = 0; -- for(scount = 0; scount < info->channels; scount++) -+ for(scount = 0; scount < png_get_channels(png, info); scount++) - for(bcount = 0; bcount < bytespersample; bcount++) - pixel += bitmap[i + scount * bytespersample + bcount]; - - if ((runlen == 0) && !pixel) - { - printf ("["); -- for(scount = 0; scount < info->channels; scount++){ -+ for(scount = 0; scount < png_get_channels(png, info); scount++){ - for(bcount = 0; bcount < bytespersample; bcount++) printf("00"); -- if(scount != info->channels - 1) printf(" "); -+ if(scount != png_get_channels(png, info) - 1) printf(" "); - } - printf ("] "); - runlen++; -@@ -425,10 +437,10 @@ - - if (runlen == 0){ - printf ("["); -- for(scount = 0; scount < info->channels; scount++){ -+ for(scount = 0; scount < png_get_channels(png, info); scount++){ - for(bcount = 0; bcount < bytespersample; bcount++) - printf("%02x", (unsigned char) bitmap[i + scount * bytespersample + bcount]); -- if(scount != info->channels - 1) printf(" "); -+ if(scount != png_get_channels(png, info) - 1) printf(" "); - } - printf("] "); - } -diff -Nuar --exclude '*.orig' --exclude '*.rej' pngtools-0.4.orig//pngread.c pngtools-0.4/pngread.c ---- pngtools-0.4.orig//pngread.c 2011-09-16 07:05:05.235477249 +0000 -+++ pngtools-0.4/pngread.c 2011-09-16 07:05:44.865570870 +0000 -@@ -68,7 +68,7 @@ - // palette is correctly reported... - //png_set_strip_alpha (png); - png_read_update_info (png, info); -- *channels = info->channels; -+ *channels = png_get_channels(png, info); - - rowbytes = png_get_rowbytes (png, info); - if((row_pointers = malloc (*height * sizeof (png_bytep))) == NULL){ diff --git a/media-gfx/pngtools/pngtools-0.4-r2.ebuild b/media-gfx/pngtools/pngtools-0.4-r2.ebuild deleted file mode 100644 index 18ba166788ad..000000000000 --- a/media-gfx/pngtools/pngtools-0.4-r2.ebuild +++ /dev/null @@ -1,37 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit autotools - -DESCRIPTION="A series of tools for the PNG image format" -HOMEPAGE="http://www.stillhq.com/pngtools/" -SRC_URI="http://www.stillhq.com/pngtools/source/pngtools_${PV/./_}.tgz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="amd64 ppc x86" - -RDEPEND="media-libs/libpng:=" -DEPEND="${RDEPEND}" - -PATCHES=( - "${FILESDIR}"/${PN}-0.3-implicit-declarations.patch - "${FILESDIR}"/${P}-libpng14.patch - "${FILESDIR}"/${P}-libpng15-fixes.patch -) - -src_prepare() { - default - mv configure.{in,ac} || die - eautoreconf -} - -src_install() { - default - dodoc ABOUT chunks.txt - - docinto examples - dodoc *.png -} diff --git a/media-gfx/potrace/Manifest b/media-gfx/potrace/Manifest index da904b3c98ae..40db85b81be4 100644 --- a/media-gfx/potrace/Manifest +++ b/media-gfx/potrace/Manifest @@ -1,5 +1,4 @@ AUX potrace-1.16-lto.patch 919 BLAKE2B e109311b319197deb0a5b6dc133c9a42f001823cfa3b387beae96289de107f54e34b2b6448bd144cba930bfe00569d4a66e9009ec5521a19c62cb5356664ef9d SHA512 3987506225bbb31badb36aa8b7cff399103e762583eb066709f5083dacfb1a48190115ba12aaec91775c4a3ab401e33ee7bf1285b4ce2d8ffb462f57910988a4 DIST potrace-1.16.tar.gz 657314 BLAKE2B ee6b04f355d593dd1ebcc4833b244e25eaaa69c91f90987d530a4e5a454668dff6ecfb7a5d8270ebbd9e7c177fd447d1b3fe2a343fc4b9413dd3f507c0c6e417 SHA512 10d85ed3fada80951223c65e923b5e6ee3e76e071575971d5b09b996b477ec5ff2403e0337c44963c6b441cc3ba6c4f7009541124a25c16b7721fdebd1f774b9 -EBUILD potrace-1.16-r1.ebuild 960 BLAKE2B 7ebaaf4ba4f9ca56bc95f6aef36686eac65d996070178f71375d0e80ea817477c1d1075bb8e8299c286913bf925fe8e042224bb89ebd959f4d6d39ece6bb5514 SHA512 7cda6cc87e80c2e739a45ca0eb15fd569700fd7a7f8bf21a89702a309efa682d49068cade04ba8c15e7656aa3c4d0e26e7357225ea95ec71006f6821d501f7ec -EBUILD potrace-1.16.ebuild 867 BLAKE2B 1698f083578aa2c2a3556241268694f847d0edbf828efacc8871fe429fbbb017285e2d843b47c4e681dc3768f3bdb34e86ea9683a2196d75d5dfcc92cfcb08fa SHA512 2e2b14f7777f40589c178e1240f93cfac6f93868197eb97244ffcf2854fbc1b505175e378facedec3b2d9f55a149a29ac37a422fb48c47e30565c99fb4a98cca +EBUILD potrace-1.16-r1.ebuild 946 BLAKE2B b9b8b32f72061c20b7380f20d4f777386565fe2c85f805b84e53a29dcf1a43754b0c9c250cae03b48bee0d7ae02cf25e7a1f2601990315531742ccd15f84e730 SHA512 817004c30f6b1114a6bfef1ca1549e5b61fa886a26ba816d0a1a2097c95e18134bdf481d48065cbb9e78622c6fdc023cfb7846b711dc01ec1f1c1910a5c6aa37 MISC metadata.xml 410 BLAKE2B 600ab550a0c7fed79d5b6dff4cb1857e410f7e350ca6717cbccc826486dcba7040a9b84b04695af64b7cff426598a58c2935cacdf958b36c78224c23d0ac6ae1 SHA512 fcb52aa25ca9d56d93412db81d6826b71c35102d1643c3576e4938111292106cabfde73143b552c2799e6f337f94e84d3318d1240bfabcdbfbd4dd48e37eb476 diff --git a/media-gfx/potrace/potrace-1.16-r1.ebuild b/media-gfx/potrace/potrace-1.16-r1.ebuild index ac9fe7c8ddb2..6485c1e640ac 100644 --- a/media-gfx/potrace/potrace-1.16-r1.ebuild +++ b/media-gfx/potrace/potrace-1.16-r1.ebuild @@ -11,7 +11,7 @@ SRC_URI="https://potrace.sourceforge.net/download/${PV}/${P}.tar.gz" LICENSE="GPL-2" SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos" +KEYWORDS="~alpha amd64 arm arm64 hppa ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos" IUSE="metric" RDEPEND="sys-libs/zlib:=" diff --git a/media-gfx/potrace/potrace-1.16.ebuild b/media-gfx/potrace/potrace-1.16.ebuild deleted file mode 100644 index 662e9bb2b546..000000000000 --- a/media-gfx/potrace/potrace-1.16.ebuild +++ /dev/null @@ -1,39 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit toolchain-funcs - -DESCRIPTION="Transforming bitmaps into vector graphics" -HOMEPAGE="https://potrace.sourceforge.net/" -SRC_URI="https://potrace.sourceforge.net/download/${PV}/${P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos" -IUSE="metric" - -RDEPEND="sys-libs/zlib:=" -DEPEND="${RDEPEND}" - -DOCS=( AUTHORS ChangeLog NEWS README ) - -src_configure() { - tc-export CC # bug 610098 - local myeconfargs=( - --disable-static - --enable-zlib - --with-libpotrace - $(use_enable metric a4) - $(use_enable metric) - ) - econf "${myeconfargs[@]}" -} - -src_install() { - default - - # no static archives - find "${ED}" -name '*.la' -delete || die -} diff --git a/media-gfx/povray/Manifest b/media-gfx/povray/Manifest index 2e085d4433f4..6e731c5f6ee3 100644 --- a/media-gfx/povray/Manifest +++ b/media-gfx/povray/Manifest @@ -5,5 +5,5 @@ AUX povray-3.7.0.0-user-conf.patch 1491 BLAKE2B ee99672c70a5d7e12048acbfc50a3ef4 AUX povray-3.7.0_rc6-darwin-defaults.patch 920 BLAKE2B 9cffcda18626cfdbea9a6b00ae99ee300d6b29a79e22229e35d116070b4a1ac1fbb4869242a043155a4fa189f701e6bc318cd3ba8fbc743d497db26c763926c8 SHA512 17ae635430f0d57157c9915ce5b25a88afcb34f6dd9552b27a42b32d638fdfbcb8b4e41ec89b52048db9d054812535b7b41f328ffe4554e719e4a3de21cbfdee DIST povray-3.7.0.0.tar.gz 38191521 BLAKE2B 5d936bdcdf9910ede2247cfa5e3881211da00762ac4bc08225dc6b53addc9e09546de9493e642b5d41228d81a50a4bcfbb5e606eb8bd9a224bb1afc5fc82db6e SHA512 82e3dbcd58b7ae921fe3b953815ca4dbbfb22eda434554baee4accabd1455b18cb511061f1cf9cf93128fab0a042df374fe2f68186d78c19853a465bd4bcbe10 DIST povray-3.7.0.0_p20160914-fix-c++14.patch.bz2 12876 BLAKE2B b1c458764f04a57420a4562e9faacae4ae955c3d9ce4343ffd49176bb575f63830fcd58d0777dea22b975df118aa14e2bdd91509758d33d659daa3fbbaba5880 SHA512 3329da12a822762559445e208a746ff208c39f7b63e27ba84a390074bb52a105c9a2f66180e58c5157795bb16346e11b5b05efaf077ee0d8246179975a692b04 -EBUILD povray-3.7.0.0-r6.ebuild 4889 BLAKE2B 7f4d154e0ff8a45ddf6e1d0a69290a1fddadc5bf3c940fa466564df93b7e45af8099d354e3225f08222c7e1f9d904f285d637f2418af9a7714f8a3da4f2bcabc SHA512 4279092dae83534c452f3132a7438ae05e57e1dd1fc30d4064fc290a8ce07356cf3b2c9e1ab0c9570a88633ac7db5499373c71f2a00ca796c3ee08b54e74def7 +EBUILD povray-3.7.0.0-r6.ebuild 4883 BLAKE2B 55f67cb40b62f82d049a7caf4640e77f7e6ec1f5852c53f8fc2fa5443ec490dbf54b75e65776de7626ad8992a362f8ad741dc06107eaab00c5d6d116374d3d7c SHA512 59ec48c2d178c6983d2d99590b07fb1ffa13b1e41e145ecef6e8c092e4f63d3263779954d574e3623a05147f15c16bbf3baba0a46e3338434260957695f0df21 MISC metadata.xml 410 BLAKE2B e2d166cc7ed5872c7e0bdcf69c7856bd8218b059e9b0444a68930216c423ef7c8922ad963cfc3dc56f0d997c1a6372a04058815eb2b36487d07dbc6752908e2d SHA512 c159e2c730bba95d7c65525d62af05bd5b9d873a519e734010a8e5bc597590147accfe02e23946f0349c0be31a10b3e578d035bc3ff8d11a11274c1957a834be diff --git a/media-gfx/povray/povray-3.7.0.0-r6.ebuild b/media-gfx/povray/povray-3.7.0.0-r6.ebuild index 2f37892249f4..cf23b11ffd6b 100644 --- a/media-gfx/povray/povray-3.7.0.0-r6.ebuild +++ b/media-gfx/povray/povray-3.7.0.0-r6.ebuild @@ -24,7 +24,7 @@ S=${WORKDIR}/${PN}-${MY_PV} # to actually be in the sources, so we don't distribute it either. LICENSE="AGPL-3+ CC-BY-SA-3.0" SLOT="0" -KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~loong ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos" +KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~loong ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos" IUSE="debug +io-restrictions tiff X" DEPEND=" diff --git a/media-gfx/prusaslicer/Manifest b/media-gfx/prusaslicer/Manifest index 3216fac004b7..0dd4db880f6d 100644 --- a/media-gfx/prusaslicer/Manifest +++ b/media-gfx/prusaslicer/Manifest @@ -1,8 +1,17 @@ AUX prusaslicer-2.6.0-dont-force-link-to-wayland-and-x11.patch 448 BLAKE2B 1d4a96762ed6da41e5f4322d6ac6019fb3894321da206ea354d1d9b57e1892155a109c329590bad4393cffd748f9e27542a7cc468803329c8f493789a2b497b1 SHA512 71a3eb2bbe3766be555e94f32219edfb908bdd5f86c74971c1c9b2586306d70724c45b06edbd4ade232017259fe4a99e504447cbbbdd5d5c91f4df03f4d52140 -AUX prusaslicer-2.7.2-opencascade-7.8.0.patch 323 BLAKE2B ee422c91800bf164098396dab448630174b2dd5444d55ff176f10b73e660a446006a0dadfcd2d3cde715b8b58023fe10dd41f6bddb6165fb405382b256eebc52 SHA512 408897cc09ad58e9828b5645553f948a0e0e1b6b07c0bca7bb3ab37789bd988a7076c6d2c79d16ee198f16fdacc59d408ea759e969c83787b2f4bc1161dd94b0 -AUX prusaslicer-2.8.0-fixed-linking.patch 751 BLAKE2B d0a5593a2559514f68df6798fb9c4e5c0b9c4021ece74281311c2a19b8233914fcb16227b7aafa5ee222d41ac82c4d5c9c363c32029d13c44c7fe2cb02e60291 SHA512 5f2fdc0da5d979b8520d302549f42103f7e9b0588165430aff734d7d50d56e98c8c208394d9bfaf82f042c9ecac7a3ae72713bfe18341f0ba184cf313cec9206 AUX prusaslicer-2.8.0-missing-includes.patch 575 BLAKE2B aef794b75d180176f6ba4b1ec05e4ddfe740ced6000225ce51e3a15bd1143209a340af28dc91660d3f07696f19ad525ef86f5e84f3ff4c96ad77c90940059352 SHA512 65c2c8a2046bf39a9d0f5c073998ec93906efbeb8b2d3b7d835f1a65b2edc00c473fb2bed7396e35e45d00b9420f3942f2e16af2e2c6a1405e90341e41b16cf2 -DIST prusaslicer-2.8.0.tar.gz 69806919 BLAKE2B b87c63ae411814dbffc8ae96c243bf06018d600db732ef32f7c766ce6bdf156b0aca6da90868482f39b9c6421c6a386bccc9f69e23218dadc07f1bcdb21b9793 SHA512 d98b43e9e1a6da9cbab46b2564da02fc0f8521d84a4df915d0ffd0878ee1a25afebe7078e38b124ec8565782379c51a7f9564462652ef1a7d9819d29297c1937 -EBUILD prusaslicer-2.8.0.ebuild 2357 BLAKE2B 8802ef58761fa6d220836b97d70b0205614cc1f13383f1a33b07ccc3f36c219c21b235e04a6c2a402494bedc25e5a5afaaaeb10da96a67958e9b260865caa244 SHA512 d1eb4f621f967675bf1b86855db2246010098820d8ba2a0474c6a388122cbff7cdda5ed10854b118f7ad069ff10564989cd0e4364ee679a6be0474b9d9f5e09f -EBUILD prusaslicer-9999.ebuild 2358 BLAKE2B 45a962647acce9d291eb1e9f45d4944dbd639b3533ff984919449218904c80d950d87df0070e7c597c2464a5603f044a0bfe4d556d02f6fef6fb68b798bd6e13 SHA512 88a8cb03f6a11239ba038579300793fe1323d023fe81195ebf810b524aad5eec17b408ab6c1c05312a6c37ada80bd4eff03c72677323361a5fd89d1bad994d66 +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-arrange-static.patch 1789 BLAKE2B 42a83e9b65985fe63631f60432b42cc7f1fb3960327307100273db5ee003e0ef660ea38f50183d0f3fd047f9d22e0ac016a26401b9e05db548c778c187b110c6 SHA512 1eaf97314118aec7bdb2e0d1ad03fb69645a23283b24ef2992146f0fd1e7ed0cb3b852a97d0eaec699c982ed968a69a2bbb078f771031b7f85ed5927f0d5f29a +AUX prusaslicer-2.9.0-missing-includes.patch 306 BLAKE2B 8b8de2ad9c7adee8cddaff29eee2f4aae6a789b150f130846235dd0e76be053e36f1ad5c7396837c59b8246be0ff04ba9e365684ce8bffb30fbd8d18f271ee27 SHA512 0ebb829ff10e5214a19c77aec5f55874df3d04ab16ac70e5fd8219e7fb25e93ef5ab5b30d49cf71bdd154f36157183e2d6a27bb47f011baaeb1b00097e5b8166 +DIST prusaslicer-2.8.1.tar.gz 69409077 BLAKE2B dd3ee810ea00d03f1790386d1fe1fd044c038429700cd33f21299abdf5def12902f7a07c23aa3d2a6cfc5e18d1e2534080889d4a33beefb493a504978a742453 SHA512 0471fa579a494d66e6b49c0bc1a9fa91f3a5f9147d8b7fa8133c6f03391f8daddddb19ed222d1be44f6f22e2de3021f3fb839331e3c3ccdf5643caa8a61d6912 +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.0-fixed-linking.patch b/media-gfx/prusaslicer/files/prusaslicer-2.8.0-fixed-linking.patch deleted file mode 100644 index 33ab6256d6b0..000000000000 --- a/media-gfx/prusaslicer/files/prusaslicer-2.8.0-fixed-linking.patch +++ /dev/null @@ -1,19 +0,0 @@ ---- a/src/slic3r/CMakeLists.txt -+++ b/src/slic3r/CMakeLists.txt -@@ -376,6 +376,7 @@ set(SLIC3R_GUI_SOURCES - ) - - find_package(NanoSVG REQUIRED) -+find_package(OpenSSL REQUIRED) - - if (APPLE) - list(APPEND SLIC3R_GUI_SOURCES -@@ -404,7 +405,7 @@ endforeach() - - encoding_check(libslic3r_gui) - --target_link_libraries(libslic3r_gui libslic3r avrdude libcereal imgui libvgcode GLEW::GLEW OpenGL::GL hidapi libcurl ${wxWidgets_LIBRARIES} NanoSVG::nanosvg NanoSVG::nanosvgrast) -+target_link_libraries(libslic3r_gui libslic3r avrdude libcereal imgui libvgcode GLEW::GLEW OpenGL::GL hidapi libcurl ${wxWidgets_LIBRARIES} NanoSVG::nanosvg NanoSVG::nanosvgrast OpenSSL::SSL OpenSSL::Crypto) - - if (MSVC) - target_link_libraries(libslic3r_gui Setupapi.lib) diff --git a/media-gfx/prusaslicer/files/prusaslicer-2.8.0-wxwidgets-3.2.4.patch b/media-gfx/prusaslicer/files/prusaslicer-2.8.0-wxwidgets-3.2.4.patch new file mode 100644 index 000000000000..d7c700662b72 --- /dev/null +++ b/media-gfx/prusaslicer/files/prusaslicer-2.8.0-wxwidgets-3.2.4.patch @@ -0,0 +1,28 @@ +From f67a877d583eba5472003f0ea4df3f7420d70734 Mon Sep 17 00:00:00 2001 +From: Gregor Riepl <onitake@gmail.com> +Date: Mon, 27 Nov 2023 13:01:55 +0100 +Subject: [PATCH] Make initializers explicit to avoid ambiguous wxArrayString + overloads + +--- a/src/slic3r/GUI/PhysicalPrinterDialog.cpp ++++ b/src/slic3r/GUI/PhysicalPrinterDialog.cpp +@@ -606,7 +606,7 @@ void PhysicalPrinterDialog::build_printhost_settings(ConfigOptionsGroup* m_optgr + // Always fill in the "printhost_port" combo box from the config and select it. + { + Choice* choice = dynamic_cast<Choice*>(m_optgroup->get_field("printhost_port")); +- choice->set_values({ m_config->opt_string("printhost_port") }); ++ choice->set_values(std::vector<std::string>({ m_config->opt_string("printhost_port") })); + choice->set_selection(); + } + +--- a/src/slic3r/GUI/Plater.cpp ++++ b/src/slic3r/GUI/Plater.cpp +@@ -4048,7 +4048,7 @@ void Plater::load_project(const wxString& filename) + + p->reset(); + +- if (! load_files({ into_path(filename) }).empty()) { ++ if (! load_files(std::vector<boost::filesystem::path>({ into_path(filename) })).empty()) { + // At least one file was loaded. + p->set_project_filename(filename); + // Save the names of active presets and project specific config into ProjectDirtyStateManager. 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.8.1-cgal-6.0.patch b/media-gfx/prusaslicer/files/prusaslicer-2.8.1-cgal-6.0.patch new file mode 100644 index 000000000000..3aac479197bb --- /dev/null +++ b/media-gfx/prusaslicer/files/prusaslicer-2.8.1-cgal-6.0.patch @@ -0,0 +1,191 @@ +From a9283c62cec2b802aa2133c92b7ff5bf320c0bb6 Mon Sep 17 00:00:00 2001 +From: Laurent Rineau <laurent.rineau@cgal.org> +Date: Sat, 13 Jul 2024 01:19:21 +0200 +Subject: [PATCH] compatibility with CGAL-6.0 (and 5.6.x) + +updated for 2.8.1 + +--- a/src/libslic3r/CutSurface.cpp ++++ b/src/libslic3r/CutSurface.cpp +@@ -4,6 +4,14 @@ + ///|/ + #include "CutSurface.hpp" + ++template <typename T> ++auto access_pmap(std::optional<T> opt) -> T { ++ return opt.value(); ++} ++ ++template <typename Pair> ++auto access_pmap(Pair pair) { return pair.first; } ++ + /// models_input.obj - Check transormation of model to each others + /// projection_center.obj - circle representing center of projection with correct distance + /// {M} .. model index +@@ -31,6 +39,7 @@ using namespace Slic3r; + #include <CGAL/Exact_integer.h> + #include <CGAL/Surface_mesh.h> + #include <CGAL/Cartesian_converter.h> ++#include <CGAL/AABB_traits.h> + #include <oneapi/tbb/blocked_range.h> + #include <oneapi/tbb/parallel_for.h> + #include <boost/property_map/property_map.hpp> +@@ -1021,8 +1030,8 @@ priv::CutMesh priv::to_cgal(const ExPolygons &shapes, + if (shapes.empty()) return {}; + + CutMesh result; +- EdgeShapeMap edge_shape_map = result.add_property_map<EI, IntersectingElement>(edge_shape_map_name).first; +- FaceShapeMap face_shape_map = result.add_property_map<FI, IntersectingElement>(face_shape_map_name).first; ++ EdgeShapeMap edge_shape_map = access_pmap((result.add_property_map<EI, IntersectingElement>(edge_shape_map_name))); ++ FaceShapeMap face_shape_map = access_pmap((result.add_property_map<FI, IntersectingElement>(face_shape_map_name))); + + std::vector<VI> indices; + auto insert_contour = [&projection, &indices, &result, +@@ -1432,17 +1441,17 @@ priv::CutAOIs priv::cut_from_model(CutMesh &cgal_model, + const ExPolygonsIndices &s2i) + { + // pointer to edge or face shape_map +- VertexShapeMap vert_shape_map = cgal_model.add_property_map<VI, const IntersectingElement*>(vert_shape_map_name, nullptr).first; ++ VertexShapeMap vert_shape_map = access_pmap((cgal_model.add_property_map<VI, const IntersectingElement*>(vert_shape_map_name, nullptr))); + + // detect anomalities in visitor. + bool is_valid = true; + // NOTE: map are created when convert shapes to cgal model +- const EdgeShapeMap& edge_shape_map = cgal_shape.property_map<EI, IntersectingElement>(edge_shape_map_name).first; +- const FaceShapeMap& face_shape_map = cgal_shape.property_map<FI, IntersectingElement>(face_shape_map_name).first; ++ const EdgeShapeMap& edge_shape_map = access_pmap((cgal_shape.property_map<EI, IntersectingElement>(edge_shape_map_name))); ++ const FaceShapeMap& face_shape_map = access_pmap((cgal_shape.property_map<FI, IntersectingElement>(face_shape_map_name))); + Visitor visitor{cgal_model, cgal_shape, edge_shape_map, face_shape_map, vert_shape_map, &is_valid}; + + // a property map containing the constrained-or-not status of each edge +- EdgeBoolMap ecm = cgal_model.add_property_map<EI, bool>(is_constrained_edge_name, false).first; ++ EdgeBoolMap ecm = access_pmap((cgal_model.add_property_map<EI, bool>(is_constrained_edge_name, false))); + const auto &p = CGAL::parameters::visitor(visitor) + .edge_is_constrained_map(ecm) + .throw_on_self_intersection(false); +@@ -1451,7 +1460,7 @@ priv::CutAOIs priv::cut_from_model(CutMesh &cgal_model, + + if (!is_valid) return {}; + +- FaceTypeMap face_type_map = cgal_model.add_property_map<FI, FaceType>(face_type_map_name, FaceType::not_constrained).first; ++ FaceTypeMap face_type_map = access_pmap((cgal_model.add_property_map<FI, FaceType>(face_type_map_name, FaceType::not_constrained))); + + // Select inside and outside face in model + set_face_type(face_type_map, cgal_model, vert_shape_map, ecm, cgal_shape, s2i); +@@ -1587,8 +1596,8 @@ void priv::collect_surface_data(std::queue<FI> &process, + + void priv::create_reduce_map(ReductionMap &reduction_map, const CutMesh &mesh) + { +- const VertexShapeMap &vert_shape_map = mesh.property_map<VI, const IntersectingElement*>(vert_shape_map_name).first; +- const EdgeBoolMap &ecm = mesh.property_map<EI, bool>(is_constrained_edge_name).first; ++ const VertexShapeMap &vert_shape_map = access_pmap((mesh.property_map<VI, const IntersectingElement*>(vert_shape_map_name))); ++ const EdgeBoolMap &ecm = access_pmap((mesh.property_map<EI, bool>(is_constrained_edge_name))); + + // check if vertex was made by edge_2 which is diagonal of quad + auto is_reducible_vertex = [&vert_shape_map](VI reduction_from) -> bool { +@@ -1773,10 +1782,10 @@ priv::VDistances priv::calc_distances(const SurfacePatches &patches, + for (const SurfacePatch &patch : patches) { + // map is created during intersection by corefine visitor + const VertexShapeMap &vert_shape_map = +- models[patch.model_id].property_map<VI, const IntersectingElement *>(vert_shape_map_name).first; ++ access_pmap((models[patch.model_id].property_map<VI, const IntersectingElement *>(vert_shape_map_name))); + uint32_t patch_index = &patch - &patches.front(); + // map is created during patch creation / dividing +- const CvtVI2VI& cvt = patch.mesh.property_map<VI, VI>(patch_source_name).first; ++ const CvtVI2VI& cvt = access_pmap((patch.mesh.property_map<VI, VI>(patch_source_name))); + // for each point on outline + for (const Loop &loop : patch.loops) + for (const VI &vi_patch : loop) { +@@ -2666,7 +2675,7 @@ priv::SurfacePatch priv::create_surface_patch(const std::vector<FI> &fis, + /* const */ CutMesh &mesh, + const ReductionMap *rmap) + { +- auto is_counted = mesh.add_property_map<VI, bool>("v:is_counted").first; ++ auto is_counted = access_pmap((mesh.add_property_map<VI, bool>("v:is_counted"))); + uint32_t count_vertices = 0; + if (rmap == nullptr) { + for (FI fi : fis) +@@ -2696,7 +2705,7 @@ priv::SurfacePatch priv::create_surface_patch(const std::vector<FI> &fis, + cm.reserve(count_vertices, count_edges, count_faces); + + // vertex conversion function from mesh VI to result VI +- CvtVI2VI mesh2result = mesh.add_property_map<VI,VI>("v:mesh2result").first; ++ CvtVI2VI mesh2result = access_pmap((mesh.add_property_map<VI,VI>("v:mesh2result"))); + + if (rmap == nullptr) { + for (FI fi : fis) { +@@ -2748,7 +2757,7 @@ priv::SurfacePatch priv::create_surface_patch(const std::vector<FI> &fis, + assert(count_edges >= cm.edges().size()); + + // convert VI from this patch to source VI, when exist +- CvtVI2VI cvt = cm.add_property_map<VI, VI>(patch_source_name).first; ++ CvtVI2VI cvt = access_pmap((cm.add_property_map<VI, VI>(patch_source_name))); + // vi_s .. VertexIndex into mesh (source) + // vi_d .. new VertexIndex in cm (destination) + for (VI vi_s : mesh.vertices()) { +@@ -2939,7 +2948,7 @@ bool priv::is_patch_inside_of_model(const SurfacePatch &patch, + uint32_t priv::get_shape_point_index(const CutAOI &cut, const CutMesh &model) + { + // map is created during intersection by corefine visitor +- const VertexShapeMap &vert_shape_map = model.property_map<VI, const IntersectingElement *>(vert_shape_map_name).first; ++ const VertexShapeMap &vert_shape_map = access_pmap((model.property_map<VI, const IntersectingElement *>(vert_shape_map_name))); + // for each half edge of outline + for (HI hi : cut.second) { + VI vi = model.source(hi); +@@ -2964,7 +2973,7 @@ priv::SurfacePatch priv::separate_patch(const std::vector<FI>& fis, + patch_new.model_id = patch.model_id; + patch_new.shape_id = patch.shape_id; + // fix cvt +- CvtVI2VI cvt = patch_new.mesh.property_map<VI, VI>(patch_source_name).first; ++ CvtVI2VI cvt = access_pmap((patch_new.mesh.property_map<VI, VI>(patch_source_name))); + for (VI &vi : cvt) { + if (!vi.is_valid()) continue; + vi = cvt_from[vi]; +@@ -2982,9 +2991,9 @@ void priv::divide_patch(size_t i, SurfacePatchesEx &patches) + CutMesh& cm = patch.mesh; + assert(!cm.faces().empty()); + std::string patch_number_name = "f:patch_number"; +- CutMesh::Property_map<FI,bool> is_processed = cm.add_property_map<FI, bool>(patch_number_name, false).first; ++ CutMesh::Property_map<FI,bool> is_processed = access_pmap((cm.add_property_map<FI, bool>(patch_number_name, false))); + +- const CvtVI2VI& cvt_from = patch.mesh.property_map<VI, VI>(patch_source_name).first; ++ const CvtVI2VI& cvt_from = access_pmap((patch.mesh.property_map<VI, VI>(patch_source_name))); + + std::vector<FI> fis; + fis.reserve(cm.faces().size()); +@@ -3085,7 +3094,7 @@ priv::SurfacePatches priv::diff_models(VCutAOIs &cuts, + CutAOIs &model_cuts = cuts[model_index]; + CutMesh &cut_model_ = cut_models[model_index]; + const CutMesh &cut_model = cut_model_; +- ReductionMap vertex_reduction_map = cut_model_.add_property_map<VI, VI>(vertex_reduction_map_name).first; ++ ReductionMap vertex_reduction_map = access_pmap((cut_model_.add_property_map<VI, VI>(vertex_reduction_map_name))); + create_reduce_map(vertex_reduction_map, cut_model); + + for (size_t cut_index = 0; cut_index < model_cuts.size(); ++cut_index, ++index) { +@@ -3171,7 +3180,7 @@ bool priv::is_over_whole_expoly(const CutAOI &cutAOI, + const CutMesh &mesh) + { + // NonInterupted contour is without other point and contain all from shape +- const VertexShapeMap &vert_shape_map = mesh.property_map<VI, const IntersectingElement*>(vert_shape_map_name).first; ++ const VertexShapeMap &vert_shape_map = access_pmap((mesh.property_map<VI, const IntersectingElement*>(vert_shape_map_name))); + for (HI hi : cutAOI.second) { + const IntersectingElement *ie_s = vert_shape_map[mesh.source(hi)]; + const IntersectingElement *ie_t = vert_shape_map[mesh.target(hi)]; +@@ -3708,7 +3717,7 @@ void priv::store(const CutMesh &mesh, const FaceTypeMap &face_type_map, const st + } + + CutMesh &mesh_ = const_cast<CutMesh &>(mesh); +- auto face_colors = mesh_.add_property_map<priv::FI, CGAL::Color>("f:color").first; ++ auto face_colors = access_pmap((mesh_.add_property_map<priv::FI, CGAL::Color>("f:color"))); + for (FI fi : mesh.faces()) { + auto &color = face_colors[fi]; + switch (face_type_map[fi]) { +@@ -3734,7 +3743,7 @@ void priv::store(const CutMesh &mesh, const ReductionMap &reduction_map, const s + std::string off_file = dir + "model" + std::to_string(reduction_order++) + ".off"; + + CutMesh &mesh_ = const_cast<CutMesh &>(mesh); +- auto vertex_colors = mesh_.add_property_map<priv::VI, CGAL::Color>("v:color").first; ++ auto vertex_colors = access_pmap((mesh_.add_property_map<priv::VI, CGAL::Color>("v:color"))); + // initialize to gray color + for (VI vi: mesh.vertices()) + vertex_colors[vi] = CGAL::Color{127, 127, 127}; diff --git a/media-gfx/prusaslicer/files/prusaslicer-2.8.1-fix-libsoup-double-linking.patch b/media-gfx/prusaslicer/files/prusaslicer-2.8.1-fix-libsoup-double-linking.patch new file mode 100644 index 000000000000..dbb0aa36727a --- /dev/null +++ b/media-gfx/prusaslicer/files/prusaslicer-2.8.1-fix-libsoup-double-linking.patch @@ -0,0 +1,11 @@ +--- a/src/slic3r/CMakeLists.txt ++++ b/src/slic3r/CMakeLists.txt +@@ -465,7 +465,7 @@ if (UNIX AND NOT APPLE) + find_package(GTK${SLIC3R_GTK} REQUIRED) + find_package(PkgConfig REQUIRED) + +- pkg_search_module(WEBKIT2GTK REQUIRED IMPORTED_TARGET webkit2gtk-4.0 webkit2gtk-4.1) ++ pkg_search_module(WEBKIT2GTK REQUIRED IMPORTED_TARGET webkit2gtk-4.1) + target_link_libraries(libslic3r_gui PUBLIC ${GTK${SLIC3R_GTK}_LIBRARIES} fontconfig PkgConfig::WEBKIT2GTK) + endif () + diff --git a/media-gfx/prusaslicer/files/prusaslicer-2.8.1-fixed-linking.patch b/media-gfx/prusaslicer/files/prusaslicer-2.8.1-fixed-linking.patch new file mode 100644 index 000000000000..9d387a07993d --- /dev/null +++ b/media-gfx/prusaslicer/files/prusaslicer-2.8.1-fixed-linking.patch @@ -0,0 +1,20 @@ +--- a/src/slic3r/CMakeLists.txt ++++ b/src/slic3r/CMakeLists.txt +@@ -383,6 +383,7 @@ set(SLIC3R_GUI_SOURCES + ) + + find_package(NanoSVG REQUIRED) ++find_package(OpenSSL REQUIRED) + + if (APPLE) + list(APPEND SLIC3R_GUI_SOURCES +@@ -438,6 +439,9 @@ target_link_libraries( + NanoSVG::nanosvgrast + stb_dxt + fastfloat ++ OpenSSL::SSL ++ OpenSSL::Crypto ++ Boost::log + ) + + if (MSVC) diff --git a/media-gfx/prusaslicer/files/prusaslicer-2.8.1-fstream.patch b/media-gfx/prusaslicer/files/prusaslicer-2.8.1-fstream.patch new file mode 100644 index 000000000000..f550c53d3f42 --- /dev/null +++ b/media-gfx/prusaslicer/files/prusaslicer-2.8.1-fstream.patch @@ -0,0 +1,42 @@ +--- a/src/slic3r/GUI/Gizmos/GLGizmoSVG.cpp ++++ b/src/slic3r/GUI/Gizmos/GLGizmoSVG.cpp +@@ -1595,7 +1595,7 @@ void GLGizmoSVG::draw_filename(){ + if (dlg.ShowModal() == wxID_OK ){ + last_used_directory = dlg.GetDirectory(); + std::string out_path_str(into_u8(dlg.GetPath())); +- boost::nowide::ofstream stream(out_path_str); ++ std::ofstream stream(out_path_str); + if (stream.is_open()){ + stream << *svg.file_data; + +--- a/src/slic3r/GUI/PresetArchiveDatabase.cpp ++++ b/src/slic3r/GUI/PresetArchiveDatabase.cpp +@@ -515,7 +515,7 @@ void PresetArchiveDatabase::load_app_manifest_json() + if (!fs::exists(path, ec) || ec) { + copy_initial_manifest(); + } +- boost::nowide::ifstream file(path.string()); ++ std::ifstream file(path.string()); + std::string data; + if (file.is_open()) { + std::string line; +@@ -682,7 +682,7 @@ void PresetArchiveDatabase::save_app_manifest_json() const + data += "]"; + + std::string path = get_stored_manifest_path().string(); +- boost::nowide::ofstream file(path); ++ std::ofstream file(path); + if (file.is_open()) { + file << data; + file.close(); +--- a/src/slic3r/Utils/Http.cpp ++++ b/src/slic3r/Utils/Http.cpp +@@ -302,7 +302,7 @@ void Http::priv::form_add_file(const char *name, const fs::path &path, const cha + //FIXME may throw! Is the caller aware of it? + void Http::priv::set_post_body(const fs::path &path) + { +- boost::nowide::ifstream file(path.string()); ++ std::ifstream file(path.string()); + std::string file_content { std::istreambuf_iterator<char>(file), std::istreambuf_iterator<char>() }; + postfields = std::move(file_content); + } diff --git a/media-gfx/prusaslicer/files/prusaslicer-2.7.2-opencascade-7.8.0.patch b/media-gfx/prusaslicer/files/prusaslicer-2.8.1-opencascade-7.8.0.patch index 296c0366e34a..1e37ce9baa19 100644 --- a/media-gfx/prusaslicer/files/prusaslicer-2.7.2-opencascade-7.8.0.patch +++ b/media-gfx/prusaslicer/files/prusaslicer-2.8.1-opencascade-7.8.0.patch @@ -1,7 +1,11 @@ --- a/src/occt_wrapper/CMakeLists.txt +++ b/src/occt_wrapper/CMakeLists.txt -@@ -22,11 +22,8 @@ generate_export_header(OCCTWrapper) - find_package(OpenCASCADE REQUIRED) +@@ -19,14 +19,11 @@ include(GenerateExportHeader) + + generate_export_header(OCCTWrapper) + +-find_package(OpenCASCADE 7.6.1 REQUIRED) ++find_package(OpenCASCADE REQUIRED) set(OCCT_LIBS - TKXDESTEP 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-missing-includes.patch b/media-gfx/prusaslicer/files/prusaslicer-2.9.0-missing-includes.patch new file mode 100644 index 000000000000..d6b1fd097a40 --- /dev/null +++ b/media-gfx/prusaslicer/files/prusaslicer-2.9.0-missing-includes.patch @@ -0,0 +1,10 @@ +--- a/src/slic3r/GUI/UserAccountCommunication.cpp ++++ b/src/slic3r/GUI/UserAccountCommunication.cpp +@@ -13,6 +13,7 @@ + #include <boost/filesystem.hpp> + #include <boost/nowide/cstdio.hpp> + #include <boost/nowide/fstream.hpp> ++#include <boost/nowide/convert.hpp> + #include <curl/curl.h> + #include <string> + diff --git a/media-gfx/prusaslicer/prusaslicer-2.8.0.ebuild b/media-gfx/prusaslicer/prusaslicer-2.8.1-r1.ebuild index ed23b287f530..1b384bbdb9a9 100644 --- a/media-gfx/prusaslicer/prusaslicer-2.8.0.ebuild +++ b/media-gfx/prusaslicer/prusaslicer-2.8.1-r1.ebuild @@ -43,6 +43,7 @@ RDEPEND=" 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:= @@ -62,18 +63,27 @@ DEPEND="${RDEPEND} PATCHES=( "${FILESDIR}/${PN}-2.6.0-dont-force-link-to-wayland-and-x11.patch" "${FILESDIR}/${PN}-2.8.0-missing-includes.patch" - "${FILESDIR}/${PN}-2.8.0-fixed-linking.patch" + "${FILESDIR}/${PN}-2.8.0-wxwidgets-3.2.4.patch" + "${FILESDIR}/${PN}-2.8.1-fixed-linking.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" ) src_prepare() { if has_version ">=sci-libs/opencascade-7.8.0"; then - eapply "${FILESDIR}/prusaslicer-2.7.2-opencascade-7.8.0.patch" + 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.2 REQUIRED)/find_package(OpenCASCADE REQUIRED)/g' \ + sed -i -e 's/find_package(OpenCASCADE 7.6.[0-9] REQUIRED)/find_package(OpenCASCADE REQUIRED)/g' \ src/occt_wrapper/CMakeLists.txt || die + + # remove broken cmake find file: https://github.com/prusa3d/PrusaSlicer/issues/13608 + rm cmake/modules/FindEigen3.cmake || die + cmake_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 2bb72a7c183f..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 @@ -43,6 +43,7 @@ RDEPEND=" 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:= @@ -61,19 +62,25 @@ DEPEND="${RDEPEND} PATCHES=( "${FILESDIR}/${PN}-2.6.0-dont-force-link-to-wayland-and-x11.patch" - "${FILESDIR}/${PN}-2.8.0-missing-includes.patch" - "${FILESDIR}/${PN}-2.8.0-fixed-linking.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.7.2-opencascade-7.8.0.patch" + 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.2 REQUIRED)/find_package(OpenCASCADE REQUIRED)/g' \ + 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 } diff --git a/media-gfx/pstoedit/Manifest b/media-gfx/pstoedit/Manifest index 2fa2933a3a4a..ff544bf7bc3c 100644 --- a/media-gfx/pstoedit/Manifest +++ b/media-gfx/pstoedit/Manifest @@ -1,5 +1,5 @@ AUX pstoedit-3.75-gcc12.patch 282 BLAKE2B b25ffea80561cc5b3a35c2f48333996195bba681c8c14464f798344b6d09f72c86cbc4546fa185e699e8da729b394027b66162fc50e96dbb7e2ef8061ae300b2 SHA512 b4c1256a8b53746d611bd41d02184fd3d532aa16fda1661dd4bfa4badae94164c66bd47041e87072678bbbf7dfdc8eb0a928fbfb4f8cb6c947e28916871b17b0 AUX pstoedit-3.75-libdl.patch 432 BLAKE2B 19d6b192c7fa1497f40baff8c039139248be34bbd7f1858e4731da4e631a46dfa8a7e5a9041a5e991a44fb049b0399fad763c65b9a27437d7bcd1d61631fd760 SHA512 010263020e07b57fdde3fa6478cf5865877d71d015a446d8111326d69ce7138467e384bb5f48baa149932a0c4a42d9a60552ff8616125cbc1dabf613cd78df79 DIST pstoedit-3.75.tar.gz 1290057 BLAKE2B 607a265ea6f058e1ba432d55c4602452cd52a48302441ecee542a113d90b090ce888cc6fa5e3a8e3a2fdbf94dce9b1ab1f7f5ba58ab81f1f509eea9052a3cd82 SHA512 54b8cf7e78e52027d45e7550821476d9a9c4df4f63af83792b6a2909bc62236450ba6b619f95eede9f61a715f4937f1fbaf2ce4ae4b486daa0294c396a882a28 -EBUILD pstoedit-3.75.ebuild 1346 BLAKE2B ed842c462a32bb22bd1b1228a60ddc0e9fa4d56e365125212ceecab6e5ec3d3ead9b9c72a20613316ed8168ce0d016b52984f38fe4db203185d751d6080b5591 SHA512 3484097f04b8d584162cb23c33f133210ba1f7d6ef6c60910594758eb39b3f2dc137ff6765634492de90bc58cca212b4684b4dc8792ce653e156e00b141d249d +EBUILD pstoedit-3.75.ebuild 1340 BLAKE2B 7bd6eb40c0dc9c2907f18f4f0834321b657fe1fa2978c472d3d9c97f6328c6d33aee47a13f0d162f5217242616c3943a9f94ed69fbf0e4ae0c307b4874668411 SHA512 517bbe98e030fb84d194a27065e1f72524bff38e960473c24f731adf850e71c2cad2a4336dffef8d4fbc71ef6fa78c3ae5f27ee3216b4330902fad1d90139243 MISC metadata.xml 634 BLAKE2B ea6bd21397a45a3591572e803513b32361761a9872800027ab779c2a9f0e214db9e70dc9fed0acbf6dafe3769cd8525e21d2875e62f4b8711bfc03f38bc47214 SHA512 d8d509f442aee8fbb9036dab15fba870e18b8d6b0b120d3c82bb50e7d86379425f5b91161e4f37137f43710fd50ac2c8481b47b0dd5ab39654729a7280258465 diff --git a/media-gfx/pstoedit/pstoedit-3.75.ebuild b/media-gfx/pstoedit/pstoedit-3.75.ebuild index 6ec8c7b5d1aa..8e98594fc96d 100644 --- a/media-gfx/pstoedit/pstoedit-3.75.ebuild +++ b/media-gfx/pstoedit/pstoedit-3.75.ebuild @@ -11,7 +11,7 @@ SRC_URI="https://downloads.sourceforge.net/${PN}/${P}.tar.gz" LICENSE="GPL-2" SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux" +KEYWORDS="~alpha amd64 arm arm64 ~hppa ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux" IUSE="emf imagemagick plotutils pptx" BDEPEND=" diff --git a/media-gfx/qiv/Manifest b/media-gfx/qiv/Manifest index 639c6a12e40d..18cb4f6884e7 100644 --- a/media-gfx/qiv/Manifest +++ b/media-gfx/qiv/Manifest @@ -1,6 +1,3 @@ -AUX qiv-2.3.2-optional-tiff.patch 519 BLAKE2B 1c2f4d4d79f3d746927f4c5af05769992460c30cdd438096d4c4d0c39a9460bcb921ddd854786ec394fc9e229ad239c541cc97f5468cd6934c15a0557275270a SHA512 c492b902bbd7771648deaffc7eafb8fccf86d294c0e2597999f2fff02ed1e02f6fc158ea95fe25c2a9b27d15dffe724c85654c99e7769254abb40e9fdcb8f358 -DIST qiv-2.3.2.tgz 133614 BLAKE2B f06f36524db8cdde1baf3e118e8ceeeb654dd49a674b55d661255734c0bedaa765fcf8bb77b03d3c2bac8d75a9088b3290f1d802d670393b6795fee85dd4f778 SHA512 c4636591f79e8e4c13807433a4101a461e614439e497a5637b958bd9d0937b04515854483d4060d9b1004d6c6060b437d634fdbe491eb0747a660ba65240472d DIST qiv-2.3.3.tgz 139301 BLAKE2B 0167e074f859ef028e3b343a8e521573f953ba43b7bd78f58e8b337a558b0d48a3c857cccafa2d55384fb48afdc0735949d873de878eff18658f09b98700c61c SHA512 95b5f3759c03648dea1ea1eacaf3d38d808a6eff4d26edf711df0e20a741fc22a0c16bcd84b8740f1455f5d35db9c2b04392dff8b4e030ec3d3c05cd01886759 -EBUILD qiv-2.3.2-r3.ebuild 1209 BLAKE2B d9f0dd4e51d27e0a81df429581bb1114c49b6d9aaff92d90b0725e5407597bfc527f2c6be93ec526e1f3c8aa70ae70c7de203d658c5a01ace96efc033206bda0 SHA512 eb0eba33bf4630d68fa02b339365aae9631c7580b1c0714cde1b0d0b47235f95c1d3e912e111f0e70d648e1865ae79957f1dcf929e0c87531ed61b50d7de4768 EBUILD qiv-2.3.3.ebuild 1157 BLAKE2B ac9b1ee17a105047481605f73baa05cd61fc13111a16c25ab0591adab0add356dd45985eec094300b1e2f20b323f29e10d5bfda14b604013c47c3a970b87f9db SHA512 a95dac67ac2c98301570074dfef14c87bc9b9942fc0588e17d988436aa213a73b6b06f324722b48113d8a32c852850dae0f688a5e5f6e916b1693f124d4729f5 MISC metadata.xml 248 BLAKE2B 374595d5e26ff95209fa2ffc9ffd10db830ed966d8c14c91fbda1c444d4a96c55a938a2be083a93218ff0e2e59cb876b3311429266efc1c07e39ed913412b669 SHA512 fe38b08d3554e7aa56699814cd72f9b64481ca4e7c7e715e01cc3ed29ac7dddc17f0b8b56bac42ff2c0550c4ddd09537853a272ec7d0ce08506b46b73e1872c9 diff --git a/media-gfx/qiv/files/qiv-2.3.2-optional-tiff.patch b/media-gfx/qiv/files/qiv-2.3.2-optional-tiff.patch deleted file mode 100644 index e00ad10f93e2..000000000000 --- a/media-gfx/qiv/files/qiv-2.3.2-optional-tiff.patch +++ /dev/null @@ -1,22 +0,0 @@ -Make tiff header usage conditional on LCMS support as intended. - ---- ciberandy-qiv-14b562fe2fc3/qiv.h -+++ ciberandy-qiv-14b562fe2fc3/qiv.h -@@ -12,6 +12,7 @@ - #ifdef SUPPORT_LCMS - #include <lcms2.h> - #include <jpeglib.h> -+#include <tiffio.h> - #endif - - /* ---- ciberandy-qiv-14b562fe2fc3/utils.c -+++ ciberandy-qiv-14b562fe2fc3/utils.c -@@ -17,7 +17,6 @@ - #include <dirent.h> - #include <fcntl.h> - #include <errno.h> --#include <tiffio.h> - #include <X11/extensions/dpms.h> - #ifdef HAVE_EXIF - #include <libexif/exif-loader.h> diff --git a/media-gfx/qiv/qiv-2.3.2-r3.ebuild b/media-gfx/qiv/qiv-2.3.2-r3.ebuild deleted file mode 100644 index 7329747aa9a0..000000000000 --- a/media-gfx/qiv/qiv-2.3.2-r3.ebuild +++ /dev/null @@ -1,63 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit desktop toolchain-funcs xdg - -DESCRIPTION="Quick Image Viewer" -HOMEPAGE="https://spiegl.de/qiv/ https://codeberg.org/ciberandy/qiv" -SRC_URI="https://spiegl.de/qiv/download/${P}.tgz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~amd64 ~arm64 ~mips ~x86" -IUSE="exif lcms magic" - -RDEPEND=" - media-libs/imlib2[X] - >=x11-libs/gtk+-2.12:2 - exif? ( media-libs/libexif ) - lcms? ( - media-libs/lcms:2 - media-libs/libjpeg-turbo:= - media-libs/tiff:= - ) - magic? ( sys-apps/file )" -DEPEND="${RDEPEND}" -BDEPEND="virtual/pkgconfig" - -PATCHES=( "${FILESDIR}"/${P}-optional-tiff.patch ) - -src_prepare() { - default - - sed -i \ - -e 's:$(CC) $(CFLAGS):$(CC) $(LDFLAGS) $(CFLAGS):' \ - Makefile || die - - if ! use exif ; then - sed -i 's/^EXIF =/#\0/' Makefile || die - fi - - if ! use lcms ; then - sed -i 's/^LCMS =/#\0/' Makefile || die - fi - - if ! use magic ; then - sed -i 's/^MAGIC =/#\0/' Makefile || die - fi -} - -src_compile() { - emake CC="$(tc-getCC)" CFLAGS="${CFLAGS}" -} - -src_install() { - dobin qiv - doman qiv.1 - dodoc Changelog contrib/qiv-command.example README README.TODO - - domenu qiv.desktop - doicon qiv.png -} diff --git a/media-gfx/qrencode/Manifest b/media-gfx/qrencode/Manifest index c01fada63600..1b9c0e631377 100644 --- a/media-gfx/qrencode/Manifest +++ b/media-gfx/qrencode/Manifest @@ -1,3 +1,3 @@ DIST qrencode-4.1.1.tar.bz2 461562 BLAKE2B ae3abb4a162518c0204d09c9df7434fb348e24c20e790a261841220b0a7165168137d5acbdbc53e40558724eac2e1e21786f11013f384b545d56a1c9caaff61d SHA512 981b3242c213e1b40ac88711912dd8c27ea11f3437d1a04b6b226499a6e991a8f0b3b10f818bcc104812192a1dac4ce05f16ecd847a50cb03d4859b84bad89b8 -EBUILD qrencode-4.1.1-r1.ebuild 1067 BLAKE2B fbdb2eb966edbad0ff1e73993cff9ec35dda18c83ba437a300616952cfc110f89d374fb5aeb02e55b811d3a7146cb63ed9da8c7fb24155f4c7b9cc675faefe26 SHA512 1aee33cd76f38a8e2438a59cf30caad557543d2eaff5feb64e430a466839db92b65aea89f248e511fff0206cee5c3969cdcad028632bbd181c1df5fcf8444746 -MISC metadata.xml 440 BLAKE2B 9f73217513f5128180c5e50f29f3e55399b728446d55332b9f80ac5dde854ca052b8f0e882fedc5a3c26f2a013f594023d708ce741fdd2660abc2233ac50c22c SHA512 46951797c3472c850d0572c644a11ba513ae8769f4c5e70f55f7af4c838d13320e16e83dc34d1cd7460f8ae295fe53eba0480d8601d0685a46ae6a19de056c67 +EBUILD qrencode-4.1.1-r1.ebuild 1061 BLAKE2B 687df58e46b684591eca57e2257dfe0f7b987312d280ed16b9cafed2046849a7cb373d173abfcfc4e99b333dbf5b3e2d1977ae15b0c9d63c152f54d0e61cac06 SHA512 f0df78920c3462519b31050dffb5cbea0afac45f352e5ad8909cec48ab5ad50176b5cab398b0198d4f312e39132b5bdee003b74cdcdbe97611a5b60ab95eb826 +MISC metadata.xml 501 BLAKE2B 5b72958901175d6d1be58a71788a588cb9ffda6eef60d187bf7dfb24172d238d15761e0f3e32e721982b98628387ac7a724255da460b87539c2732c1635e8c49 SHA512 c64f3e13755118e24afad0441be84845e5da076a1eba602c6e7026d8d781bcb11b85db0502f3665a1f6ca4338f82e1d047c6f6b7e269baefa835c653eb8a675f diff --git a/media-gfx/qrencode/metadata.xml b/media-gfx/qrencode/metadata.xml index 12c2b682079b..ddd5b9efbfc3 100644 --- a/media-gfx/qrencode/metadata.xml +++ b/media-gfx/qrencode/metadata.xml @@ -10,5 +10,6 @@ </use> <upstream> <remote-id type="cpe">cpe:/a:qrencode_project:qrencode</remote-id> + <remote-id type="github">fukuchi/libqrencode</remote-id> </upstream> </pkgmetadata> diff --git a/media-gfx/qrencode/qrencode-4.1.1-r1.ebuild b/media-gfx/qrencode/qrencode-4.1.1-r1.ebuild index 6bf83b4101c3..e1ca3a56fe38 100644 --- a/media-gfx/qrencode/qrencode-4.1.1-r1.ebuild +++ b/media-gfx/qrencode/qrencode-4.1.1-r1.ebuild @@ -11,7 +11,7 @@ SRC_URI="https://fukuchi.org/works/${PN}/${P}.tar.bz2" LICENSE="LGPL-2" SLOT="0/4" -KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~arm64-macos ~x64-macos" +KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~arm64-macos ~x64-macos" IUSE="png test" RESTRICT="!test? ( test )" diff --git a/media-gfx/quat/Manifest b/media-gfx/quat/Manifest index 267d5fcf420a..9113f2ed6046 100644 --- a/media-gfx/quat/Manifest +++ b/media-gfx/quat/Manifest @@ -1,5 +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-r2.ebuild 785 BLAKE2B da0d6ab813115a0279ae46dcd0fb1e7d1edde4fdd3ea01c83d5abcd836ee0d4e73f60ecaa0a82f5b4a36d0ffadc0c405548c681499fc0c1fb44b562ad33b4d2e SHA512 32568d76deca41238afbdf13049582467e6b09dc31535c65dcaf49bb4a427c67560ae9c7573f40436c29e69e7f78fd8e5fdad75e2eb7c2b9b582fffe4630d44c -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-r2.ebuild b/media-gfx/quat/quat-1.20-r2.ebuild deleted file mode 100644 index 17e06e1566e8..000000000000 --- a/media-gfx/quat/quat-1.20-r2.ebuild +++ /dev/null @@ -1,37 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -DESCRIPTION="A 3D quaternionic fractal generator" -HOMEPAGE="http://www.physcip.uni-stuttgart.de/phy11733/quat_e.html" -SRC_URI="http://www.physcip.uni-stuttgart.de/phy11733/download/${P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="amd64 ppc x86" -IUSE="X debug" - -DEPEND=" - >=sys-libs/zlib-1.1.4 - X? ( - =x11-libs/fltk-1* - x11-libs/libX11 - x11-libs/libXext - x11-libs/libXft - ) -" -RDEPEND="${DEPEND}" - -src_configure() { - export FLUID="/usr/bin/fluid" # needed because configure tries an invalid option - econf \ - $(use_enable X gui) \ - $(use_enable debug) \ - $(use_enable debug prof) -} - -src_install() { - emake DESTDIR="${D}" install - dodoc AUTHORS ChangeLog NEWS README -} 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/rawtherapee/Manifest b/media-gfx/rawtherapee/Manifest index ed211afdb33b..584005bb60f2 100644 --- a/media-gfx/rawtherapee/Manifest +++ b/media-gfx/rawtherapee/Manifest @@ -1,6 +1,3 @@ -AUX rawtherapee-5.10-fix-linking-with-libjpeg-turbo.patch 1956 BLAKE2B bd8153f64bba374142d1b516a21c15752fc4baf0e293f91904e63d264e5b571e98de1c88f9af8385b9f56a85c35974bf173c075be6068918bbcfc1fba3cb5b56 SHA512 ba8ae49b70efaeeec67cebbe0df82ee6027f240a59b3cdf6be5a03550b702492612a5fe9731153b9d095ab76d1fcc55425dfcb4216bf8f5d9b6360b6b809d16b -DIST rawtherapee-5.10.tar.xz 16943724 BLAKE2B 2d1250a03f2902ffcff666514f9785036c808e9883957f674bfdb9545b2feac8f2313ab819e0cb64f39196bd3db36e8084b52bda6194de9197215824e695809c SHA512 79d6d54f90fec6006d3dff53aca00ccd385c398ebede2f06a223905d69e1045c6ab772bd5aca4bde01d9086c3c03183be22c0df521166b1af63b60bd7d0e1cfc DIST rawtherapee-5.11.tar.xz 18005652 BLAKE2B d4b4cb45042faf7eadb1c5bfbd7d1db2a452397d10eb12349d1d0a2ae4b9254beb3ee943cf3ddf40380f31abc653ec2c85fb0d4c8e2b1121402bbd41e74afaf0 SHA512 a37af6d99569a6b427379b76b980be8dca5007bf4ec8fc65663e9e8d13850dd2f547e1633f69ee495df105ca6f0f9ab4daf12beec29c9fff63e2e7e5083813b2 -EBUILD rawtherapee-5.10-r1.ebuild 1956 BLAKE2B e9748bdbd86a8224b6a74211e3ba4286303e14737951f3bc1d28f541c4eacff5f9c3d951d9b13da9b8986e0fc93d7b143e82b77c81b0e3093d14b2a37e6eb440 SHA512 ee979e48524058a437e26420bb317a9b4208bc552aae88a2bfd9e504496965f31fad392fa5afcaa92012c4fc38a2376d24d2a96dd1869d5e931caabec479fbc9 -EBUILD rawtherapee-5.11.ebuild 1900 BLAKE2B 56b16081964492ffd954ecf3f6def348bfee695143edd0b4b27347c334ef71528f3d4017d89704c4902c89b91ea50975e9e79831244b37c4adec5e8ff5170b7c SHA512 9c454804e2a55f8efe3002acc74d9a30b13a120060acc554b7f3a9d4041c6e9d2b68892211b44fa803384fc66ddd59cb256db4be1b879099150976b9a1fd273c +EBUILD rawtherapee-5.11-r2.ebuild 2058 BLAKE2B b110785ceca47799eed58bcc3dd92405dac2844c113fac7447a17c550efefa90a24b29f6c7fcd9f5f6c8f892be375063cdee967aaf148f513a8d802bc3a99901 SHA512 44ab44cdc2ffa4ac862348fcb8d347a07d9a48860b7ecd44db5f3ac1a771c04a88e07f93bb96ed8532459f9c286b9cab4a67c75a3a43d3b244e699e7b3f5bacc MISC metadata.xml 398 BLAKE2B 4a0ef68f8e8c4e04158552d21df211610a6ccd9195da6365c77f78297ee4957f61d91b5b6eb6af2912d28a70462bdeb012176dc1448cfdf7221eca7225c707ec SHA512 d562b2782f388590aac143ff10c74eb24b4df447d61051875d3a6d9200f013c290ca5c7fe7c2d130484b5ba01b9c725f453b690dbbe04cd0a0f398a9a99352ed diff --git a/media-gfx/rawtherapee/files/rawtherapee-5.10-fix-linking-with-libjpeg-turbo.patch b/media-gfx/rawtherapee/files/rawtherapee-5.10-fix-linking-with-libjpeg-turbo.patch deleted file mode 100644 index f65309fc64e6..000000000000 --- a/media-gfx/rawtherapee/files/rawtherapee-5.10-fix-linking-with-libjpeg-turbo.patch +++ /dev/null @@ -1,63 +0,0 @@ -From efdc5bce3b9794847093baeb040937ab55eba86e Mon Sep 17 00:00:00 2001 -From: Richard E Barber <kd6kxr@gmail.com> -Date: Sun, 19 May 2024 04:27:10 -0700 -Subject: [PATCH] Fix linking with jpeg-turbo - -patch via Termux PR -https://github.com/termux-user-repository/tur/pull/1027 ---- - rtengine/jdatasrc.cc | 28 ++-------------------------- - 1 file changed, 2 insertions(+), 26 deletions(-) - -diff --git a/rtengine/jdatasrc.cc b/rtengine/jdatasrc.cc -index fa13b9dd13..a0d12657f2 100644 ---- a/rtengine/jdatasrc.cc -+++ b/rtengine/jdatasrc.cc -@@ -247,20 +247,6 @@ my_error_exit (j_common_ptr cinfo) - #endif - } - -- --#ifdef _WIN32 --#define JVERSION "6b 27-Mar-1998" --#define JCOPYRIGHT_SHORT "(C) 1998, Thomas G. Lane" --#define JMESSAGE(code,string) string , -- --const char * const jpeg_std_message_table[] = { --#include "jerror.h" -- NULL --}; --#else --extern const char * const jpeg_std_message_table[]; --#endif -- - /* - * Actual output of an error or trace message. - * Applications may override this method to send JPEG messages somewhere -@@ -409,24 +395,14 @@ reset_error_mgr (j_common_ptr cinfo) - GLOBAL(struct jpeg_error_mgr *) - my_jpeg_std_error (struct jpeg_error_mgr * err) - { -+ err = jpeg_std_error(err); - -+ /* override these functions */ - err->error_exit = my_error_exit; - err->emit_message = emit_message; - err->output_message = output_message; - err->format_message = format_message; - err->reset_error_mgr = reset_error_mgr; - -- err->trace_level = 0; /* default = no tracing */ -- err->num_warnings = 0; /* no warnings emitted yet */ -- err->msg_code = 0; /* may be useful as a flag for "no error" */ -- -- /* Initialize message table pointers */ -- err->jpeg_message_table = jpeg_std_message_table; -- err->last_jpeg_message = (int) JMSG_LASTMSGCODE - 1; -- -- err->addon_message_table = nullptr; -- err->first_addon_message = 0; /* for safety */ -- err->last_addon_message = 0; -- - return err; - } diff --git a/media-gfx/rawtherapee/rawtherapee-5.10-r1.ebuild b/media-gfx/rawtherapee/rawtherapee-5.10-r1.ebuild deleted file mode 100644 index bc3e9aa37d1b..000000000000 --- a/media-gfx/rawtherapee/rawtherapee-5.10-r1.ebuild +++ /dev/null @@ -1,82 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -MY_P=${P/_rc/-rc} -inherit cmake flag-o-matic toolchain-funcs xdg-utils - -DESCRIPTION="A powerful cross-platform raw image processing program" -HOMEPAGE="https://www.rawtherapee.com/" -SRC_URI="https://rawtherapee.com/shared/source/${MY_P}.tar.xz" -S="${WORKDIR}/${MY_P}" - -LICENSE="GPL-3" -SLOT="0" -KEYWORDS="amd64 ~riscv x86" -IUSE="openmp tcmalloc" - -RDEPEND=" - dev-cpp/atkmm:0 - dev-cpp/cairomm:0 - dev-cpp/glibmm:2 - dev-cpp/gtkmm:3.0 - dev-cpp/pangomm:1.4 - dev-libs/expat - dev-libs/glib:2 - dev-libs/libsigc++:2 - gnome-base/librsvg:2 - media-gfx/exiv2:= - media-libs/lcms:2 - media-libs/lensfun - media-libs/libcanberra[gtk3] - media-libs/libiptcdata - media-libs/libjpeg-turbo:= - media-libs/libpng:0= - media-libs/tiff:= - sci-libs/fftw:3.0= - sys-libs/zlib - x11-libs/gtk+:3 - tcmalloc? ( dev-util/google-perftools )" -DEPEND="${RDEPEND}" -BDEPEND="virtual/pkgconfig" - -PATCHES=( "${FILESDIR}"/rawtherapee-5.10-fix-linking-with-libjpeg-turbo.patch ) - -pkg_pretend() { - [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp -} - -pkg_setup() { - [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp -} - -src_configure() { - # upstream tested that "fast-math" give wrong results, so filter it - # https://bugs.gentoo.org/show_bug.cgi?id=606896#c2 - filter-flags -ffast-math - # -Ofast enable "fast-math" both in gcc and clang - replace-flags -Ofast -O3 - # In case we add an ebuild for klt we can (i)use that one, - # see http://cecas.clemson.edu/~stb/klt/ - local mycmakeargs=( - -DOPTION_OMP=$(usex openmp) - -DDOCDIR=/usr/share/doc/${PF} - -DCREDITSDIR=/usr/share/${PN} - -DLICENCEDIR=/usr/share/${PN} - -DCACHE_NAME_SUFFIX="" - -DWITH_SYSTEM_KLT="off" - -DENABLE_TCMALLOC=$(usex tcmalloc) - ) - cmake_src_configure -} - -pkg_postinst() { - xdg_icon_cache_update - xdg_desktop_database_update -} - -pkg_postrm() { - xdg_icon_cache_update - xdg_desktop_database_update -} diff --git a/media-gfx/rawtherapee/rawtherapee-5.11.ebuild b/media-gfx/rawtherapee/rawtherapee-5.11-r2.ebuild index c96b34c9b25b..5a12aef49a1f 100644 --- a/media-gfx/rawtherapee/rawtherapee-5.11.ebuild +++ b/media-gfx/rawtherapee/rawtherapee-5.11-r2.ebuild @@ -13,8 +13,8 @@ S="${WORKDIR}/${MY_P}" LICENSE="GPL-3" SLOT="0" -KEYWORDS="~amd64 ~riscv ~x86" -IUSE="openmp tcmalloc" +KEYWORDS="amd64 ~riscv x86" +IUSE="jpegxl openmp tcmalloc" RDEPEND=" dev-cpp/atkmm:0 @@ -29,14 +29,19 @@ RDEPEND=" media-gfx/exiv2:= media-libs/lcms:2 media-libs/lensfun - media-libs/libcanberra[gtk3] + || ( + media-libs/libcanberra-gtk3 + media-libs/libcanberra[gtk3(-)] + ) media-libs/libiptcdata media-libs/libjpeg-turbo:= media-libs/libpng:0= + media-libs/libraw:= media-libs/tiff:= sci-libs/fftw:3.0= sys-libs/zlib x11-libs/gtk+:3 + jpegxl? ( media-libs/libjxl:= ) tcmalloc? ( dev-util/google-perftools )" DEPEND="${RDEPEND}" BDEPEND="virtual/pkgconfig" @@ -64,7 +69,9 @@ src_configure() { -DLICENCEDIR=/usr/share/${PN} -DCACHE_NAME_SUFFIX="" -DWITH_SYSTEM_KLT="off" + -DWITH_SYSTEM_LIBRAW="on" -DENABLE_TCMALLOC=$(usex tcmalloc) + -DWITH_JXL=$(usex jpegxl) ) cmake_src_configure } diff --git a/media-gfx/renderdoc/Manifest b/media-gfx/renderdoc/Manifest index 3f3748d6c593..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 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/renderdoc/renderdoc-1.32.ebuild b/media-gfx/renderdoc/renderdoc-1.32.ebuild index c8d27b42b52d..d78db3dbcb7c 100644 --- a/media-gfx/renderdoc/renderdoc-1.32.ebuild +++ b/media-gfx/renderdoc/renderdoc-1.32.ebuild @@ -40,7 +40,7 @@ SRC_URI=" # 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" +KEYWORDS="amd64" IUSE="qt5" REQUIRED_USE="doc? ( qt5 ) qt5? ( ${PYTHON_REQUIRED_USE} )" diff --git a/media-gfx/ristretto/Manifest b/media-gfx/ristretto/Manifest index 20028b65e18a..3a10799186b2 100644 --- a/media-gfx/ristretto/Manifest +++ b/media-gfx/ristretto/Manifest @@ -1,5 +1,3 @@ -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 937 BLAKE2B 03b74f6d3606a21e96b614deaf0a843477df7b24bd64ed2fdf4c17837c0323dcd911f1d79fbc34fc48cbfedf9b832cc7c2e17fccbfafbf79a7f6b1e1538d25d2 SHA512 c01de33522150cccf0625401987bac0e7672bd7d4b16bd6b54528595fdac578ac32ba129b07b406f78aa7f56adc0b7daebadbe4d691368e1a62434d67c90f18d -EBUILD ristretto-0.13.2.ebuild 970 BLAKE2B 692ec5dea73b7fe47d948bb772ab48765e170ea4bc664b19e63eec89c44d5662b2a3b0a570e3b7de1279fe4edfda330d15c76cd0689e678b9642d517af1e9d65 SHA512 166353c962515e8da82583c60d729939f8d2b93f71d1ee1525c377f229826ae8f692bcabe0bfcd67efaa20e9612973b19183ad827fc3255f5857e85f88c97b57 +DIST ristretto-0.13.3.tar.bz2 854176 BLAKE2B 5c10505c40418cb7ff31e29091dfa23ab168d4fb9ce449003357af1b67db84b3c2e469947637aa9c93b453b9ecc4d7d8eae4285aecfde6ef30e3b5cd365604d3 SHA512 92eb0993cbe64a83c80cd78972a64762a03766a055ac66ad16f86c2ee4360a2cc9114723a60d60257f56052ccd579c618df8110a909e45a5cab10ee7c4a3d0f3 +EBUILD ristretto-0.13.3.ebuild 954 BLAKE2B 54bfdf51243564a7fe46872b4b28459a836d69740c7bdd1bb8f8cc8ea0f8891a3c6c06cf5a4c91a02191573977002c8909758c99dd279c8cc1a42f1190286387 SHA512 5db444d6c7d911d3370d2a93828847d72d2e4c03acc0f650a0ab7e404eda16f086afd85e2f184c5d2e9b870eb55eb22a54fdc5e6acd82504ed28b5b79db93646 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.0.ebuild deleted file mode 100644 index f62b7644ca14..000000000000 --- a/media-gfx/ristretto/ristretto-0.13.0.ebuild +++ /dev/null @@ -1,47 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit xdg-utils - -DESCRIPTION="A fast and lightweight picture viewer for Xfce" -HOMEPAGE=" - https://docs.xfce.org/apps/ristretto/start - https://gitlab.xfce.org/apps/ristretto/ -" -SRC_URI="https://archive.xfce.org/src/apps/${PN}/${PV%.*}/${P}.tar.bz2" - -LICENSE="GPL-2+" -SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ppc ppc64 ~riscv ~sparc x86" - -DEPEND=" - >=dev-libs/glib-2.56:2 - media-libs/libexif: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= - >=xfce-base/xfconf-4.12.1:0= -" -RDEPEND=" - ${DEPEND} -" -BDEPEND=" - dev-util/intltool - virtual/pkgconfig - sys-devel/gettext -" - -pkg_postinst() { - xdg_desktop_database_update - xdg_icon_cache_update -} - -pkg_postrm() { - xdg_desktop_database_update - xdg_icon_cache_update -} diff --git a/media-gfx/ristretto/ristretto-0.13.2.ebuild b/media-gfx/ristretto/ristretto-0.13.3.ebuild index 8f3e6b1aaad5..71729a6688d0 100644 --- a/media-gfx/ristretto/ristretto-0.13.2.ebuild +++ b/media-gfx/ristretto/ristretto-0.13.3.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 @@ SRC_URI="https://archive.xfce.org/src/apps/${PN}/${PV%.*}/${P}.tar.bz2" LICENSE="GPL-2+" SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ppc ppc64 ~riscv ~sparc x86" +KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ppc ppc64 ~riscv ~sparc x86" DEPEND=" >=dev-libs/glib-2.56.0:2 @@ -31,8 +31,7 @@ RDEPEND=" ${DEPEND} " BDEPEND=" - dev-util/intltool - sys-devel/gettext + >=sys-devel/gettext-0.19.8 virtual/pkgconfig " diff --git a/media-gfx/sam2p/Manifest b/media-gfx/sam2p/Manifest index cfaa30b939c3..67c941d2e4b6 100644 --- a/media-gfx/sam2p/Manifest +++ b/media-gfx/sam2p/Manifest @@ -1,5 +1,5 @@ AUX sam2p-0.49.4_p20190718-fix-configure-clang.patch 353 BLAKE2B dcb39280fc99bc1d21e9ec9627d976844ed6ec9d14dda61c471766687ae3816c5672dd2b980665252bb22da4a345322e69accec719c86fdd5bfcbbec6d7b8284 SHA512 c351987915fc1b2051f55b9a80478b0ad400aa140e986b3a1dd0d8ae6b55252036f1038236d25456b9fcd604e863169ea5dfa329f5a180eeaccfcf4a58622a0d AUX sam2p-build-fixes.patch 1803 BLAKE2B d9c805da6c46f5457cc6006941a1331f0e46ed8fcadf7c73b9a11debfaa7e2f040beeae42aa9cf316a2df71ffe9d136808a1e9ebeea5c146851057a8addb7bf6 SHA512 fa32011db37a74f746542df82f29e7869412cf8ad93d0b4c3c6e100dda06c254f204671199db0d1abd6134975325cb939f65f0a22457a84a78b6b277411ea2f5 DIST sam2p-0.49.4_p20190718.tar.gz 1816309 BLAKE2B 3d97e00c2bd6b6c292c051d4eb6b73549d1c82a5bd7be3d6b718d8e9d2e96b47657c184af43fa57c0ca4b2b8c26904fb42508d17f7dda715def7d2082affa8b6 SHA512 1c6074fabca6146e51fe0d5a10c912ec679cf122e10aab7bead9e35e3d007e79773aedb1f627572b1b88cacefe0e7edf72efd71d32c47731723b910667220c51 -EBUILD sam2p-0.49.4_p20190718-r1.ebuild 1414 BLAKE2B 0b4e912edfae61de02e6c7371c965a22e6a9e1173ea2ddc597cf5366fb6db04028d752b301f542492f8bf67756fc61272448b23149f481df94158ff68d89f1dd SHA512 80b37c141f1fabb419ec045a5434a249bd6efd6a7c7a5343e508df0b240c53b82787aa8465fc40cc9e97d1e3a8db577b4479764a5b1dc3ee1f9e0240236b012b +EBUILD sam2p-0.49.4_p20190718-r1.ebuild 1408 BLAKE2B a9062998463cf63a9857ed06f0bed8eac5790e916dfb8e11c65abaf7d69c83a7dc6f961d2b48b7bac6a44cedf500266a9f3e91a0b5f97ceff4363ff6014c8248 SHA512 fed24d109d4ee30fa6be683151e981ddcc8d109e1e981297de5f9bfbdd78a3f19c74e10a8d3f6bc10659f61e45c1f9c59a3746c0d0ff26ced68569ad22666c3f MISC metadata.xml 374 BLAKE2B d19b7ae3a43094549eb9f02ddbab8077ebdb9b18fd2a608e038de18e1ade6824857899b1f7a19bb835ea2bfa3ae4e2d10c1cd67b38fe0d6d5927150f5b8644dd SHA512 900c1194a51963456c5f22c9eecf95645eda39e189cf72c89b63767c73027ebc152b5e67007047ada223f5b67671490cf75f3caa2989ec645b48bf4c81fdfcba diff --git a/media-gfx/sam2p/sam2p-0.49.4_p20190718-r1.ebuild b/media-gfx/sam2p/sam2p-0.49.4_p20190718-r1.ebuild index fd8877e311de..9475eece6dc7 100644 --- a/media-gfx/sam2p/sam2p-0.49.4_p20190718-r1.ebuild +++ b/media-gfx/sam2p/sam2p-0.49.4_p20190718-r1.ebuild @@ -13,7 +13,7 @@ SRC_URI="https://github.com/pts/sam2p/archive/${COMMIT}.tar.gz -> ${P}.tar.gz" LICENSE="GPL-2" SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos" +KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos" IUSE="examples gif" RESTRICT="test" diff --git a/media-gfx/sane-airscan/Manifest b/media-gfx/sane-airscan/Manifest index 84bb76454404..961aed80c62f 100644 --- a/media-gfx/sane-airscan/Manifest +++ b/media-gfx/sane-airscan/Manifest @@ -2,7 +2,7 @@ AUX sane-airscan-0.99.27-c99-fixes.patch 1834 BLAKE2B d0012e462e0fb04158e0705fd3 AUX sane-airscan-0.99.27-makefile-fixes.patch 1913 BLAKE2B 1fe9fc148e3ac4f9928cb46a9ef35d2b94104dca39ffec09617d6143ce619c8739afad2811d7c5455ce4c0f190a88c68069a800607926009d2121c90aa8bca8b SHA512 8ed38a9debaf0520d7576f1874dd05b634a43825fb258fa3a0df0f3a93ebac6391d5a7e30ba460221d4174b7865f0372e91ff88f430baeca567dd4f633c0099a DIST sane-airscan-0.99.27.tar.gz 198418 BLAKE2B bcf2aff08feb90a65c10a4abaca67939874ad7c9376745b572f18ebfdaf7bff3e344d1379b00c73904a6892731a75f4632a90ea7c20f7cb4e30eab43413b829d SHA512 a35a92e26a4e3831f127e59bc520248abde8a7b304eb63ecf1d68092f51a8bc49bbc7503bead47ac84d0333d59ae0045d6d7a9f7b89d95f3ddfa2458f3781256 DIST sane-airscan-0.99.29.tar.gz 211753 BLAKE2B 35f0df4d5df57d2651e6d0195046e703a5f4a49b8d50345d749b570892b0c865cf7b1ed7313fba27ce9586cededffd5d85ce211ca767b50f59fe752c2f869d4c SHA512 a75a3db66aa1c77508a946dc7647f322d0be9c8defc6b4b6fdf1015f5a81ea02209efb7aa2c5284813e257bc2b8727a430804385368c8c7b97df24d61adda483 -EBUILD sane-airscan-0.99.27-r1.ebuild 867 BLAKE2B 566b78aa7268725f71aed1ac8a6de2186dfd2870273ed1494c547410368060f63fd6c677ec948d8fb37dafa31bb9577d83d8c270afc3fbbdcda09b926d6ede64 SHA512 e722adf97b989f50a2b1034e4d6689a04b240a616d69a602f5bf96f6e42171a19addea91ff00e591593aaa26d50cafa3ad70c6400f362bc0217c1d8bbfe2b834 +EBUILD sane-airscan-0.99.27-r1.ebuild 866 BLAKE2B aff98728662858f1a6ad14861b76da93aaa3be73cf72cc02371b74048ee550b423859140e081eb224c685964bd2ea2e45c6fa1d7f88b99384e39500fbf9fb941 SHA512 11ae9ba8e30cc6b55205274097b6af1b079334566c0e5274839e9028bf479889af3ace6851fbf3b3b568f7190137306224b6734b0bad914e79338ddc7a6b31cb EBUILD sane-airscan-0.99.27.ebuild 808 BLAKE2B a079180be74226fe5f3b535943b29f249552931a0a48bec2061ebc750997382988d79d43317095fe4bc2ae0f7c9556cfe08d909d601237be8989049e0abf37d0 SHA512 53cfcc46cbc2d9eef3a5f2161df7e0cd9b8aa5b3c22dd08664df3bf9dc1949eaa9ea6d760f0c298331fd6b84ff01393dbc479c86b2addb7430c19e111cbad721 EBUILD sane-airscan-0.99.29.ebuild 847 BLAKE2B ecf9040131b72dfcca370c0c3003ee5a51aeed29704ac08f4effb8482432e867e38fb0edd850ccbd42b1207da3b607f67851a291ac8cb81d9af7a7e55031f298 SHA512 cf26e16d3e3b3c42fd8a963f8b76ba5c4bccab4bce95c81739aff06440b14e07be6a5fcdfec1dfb0b941cd68edd0118ce1cf01a667710348fb965dff078acb96 MISC metadata.xml 340 BLAKE2B c9c2c847ab7adb2109f7fee5346019acfbdbac25394c052ecef5dd263de2991388c272b37c46bd405078f93a0fdaa4a47ddbd976f468d1acb37fc6b8c9014e99 SHA512 92ba711173b57be840567bf539ad1c6a99698a267994dfbedb8067e25edeed38a87bb142e1a34dc16752afb65a134ce6af338cbbc5a69cdd652d5dc96fd234c7 diff --git a/media-gfx/sane-airscan/sane-airscan-0.99.27-r1.ebuild b/media-gfx/sane-airscan/sane-airscan-0.99.27-r1.ebuild index 1b8168dae0cd..0de44191942b 100644 --- a/media-gfx/sane-airscan/sane-airscan-0.99.27-r1.ebuild +++ b/media-gfx/sane-airscan/sane-airscan-0.99.27-r1.ebuild @@ -11,7 +11,7 @@ SRC_URI="https://github.com/alexpevzner/${PN}/archive/${PV}.tar.gz -> ${P}.tar.g LICENSE="GPL-2" SLOT="0" -KEYWORDS="~amd64 ~x86" +KEYWORDS="amd64 ~x86" DEPEND=" net-dns/avahi diff --git a/media-gfx/sane-backends/Manifest b/media-gfx/sane-backends/Manifest index 6dee214e9049..65f015d9c4ec 100644 --- a/media-gfx/sane-backends/Manifest +++ b/media-gfx/sane-backends/Manifest @@ -10,6 +10,8 @@ AUX saned.initd 294 BLAKE2B 571bd4032b2330c627a31459a18baf2044852ec1b40f0216bd5b AUX saned.socket 132 BLAKE2B 5e9f0350a1553fc75aea88ce355fb68b881e3b2194ac0e3c6f3cecdae79111fb1db1cfe3b4933eca15af5f985fc6b89e4d9af3844b6e9cfd542828b6b9e57ed9 SHA512 a23ceeeb02bd9e214702003a3165886858ecbdd93df89cd37ad5f00581745454548ccda0ab656f2dc0acbf2896a8781568c786797e64a07014be003d6140a093 AUX saned_at.service 434 BLAKE2B 6dad3c809e01c17c0064a52c4103486b19294ed3cf8fc71faad18edaf71b920584366ac988d354f45bc07607ea64a97ea480fe152ac9a1cd896df99ff457cbf7 SHA512 891c751261107676f8159f403e0f4d4254099b709b9ba0ac9f2af97a9ed30f677411ad6bc316c2e6e673c616ba988253479d5e30c9617e3ae279beb79f70e965 AUX saned_at.service-r1 432 BLAKE2B e6dab788c0bf705087974642ed714b5f41b3e676b80b5197a753227934b977ce6d1175872163e831e916b6aa36d6c5dd86effa44801494cff6fc669e6c24acaf SHA512 2c8725f9981216129f94a7c4cd75efab37bb75c891fdf7dbd4297161d8d4cd3b1c5fa0eebcaabe1f038aab8500f8b5579d776935f180fb2553bd2cb77506c29d +DIST backends-1.3.1.tar.bz2 4409356 BLAKE2B 8cedc3adb21c481f346c20de5363439aecabbf81606e3fb81accf4a7af4433eb83cecb3f25be9f4944990651fc66a97ce5f2796cc80846c8e066e4f611c6f8ff SHA512 20774d7b81bbb6a5905f36a312be519e0f664a3fb90ff521f2196c341d80c1ef12164262f063ae0a7b449690213c1e3b8065ebfd6b1e1804cc1581d863f4b720 DIST sane-backends-1.2.1.tar.gz 7308040 BLAKE2B 8448a66e70548f159cfac63501e52417fb1d0599008ce7bf26bf2e7a25a946e688968f01ae64b72c3d5efce67cfbdc0e8e04d8ab3bc92dae0a7e01bc81bf0140 SHA512 3ffce67e409caa5d32684290a56a46a68fef6991a14858d89cbab5aeb364fbbfd6d7c85bcbc4932c9167073a3a6ba682b4730f11fb320f0c4de53a7e7d3edba1 -EBUILD sane-backends-1.2.1.ebuild 8843 BLAKE2B d4aafdb85f6c56429151bc7e281670197a000177383935aabdf54854e05fa1f90695d485b1623987eef152ec0cc347588e1f89f1c6fa1934c12dce3555b2ef77 SHA512 ec080b23ac102b6405f9ab0a71e4df931402ea71edde6823176d964ad66aea8a0373a7f9bc932719a9114fc0aba98f808cecb8f5a8508246a883311beba25e4e +EBUILD sane-backends-1.2.1.ebuild 8837 BLAKE2B 942f956dd6f7b23c3e43e1b40517120cabd9ba087a42ea90dbb47d9009022b02ee42e3a60c80897363027bf1df3c757d6e2b2f57ad7c37d088510b255ee32a61 SHA512 d5c62ec336711d97c730338546c3fea7123dd27a21ba27504698cd50fe56963a75620e9d22505d0ebbafdf12fd954cb5141f1e41099bff32928772c6c435682c +EBUILD sane-backends-1.3.1-r1.ebuild 8955 BLAKE2B 495a6fdd08581573b9dee531c67713b9fef7733fd8188908bb469aa0c892f3d85d5bf6cf09d887529ae24aa39c277fbf5eab6c207db9c4e502eb96603215ab5e SHA512 f89e4ca1a188fd1a54d651bd0e88136d405c95ae8f3f4db511cbd2861a578d28b22ec87618d7acb679d2ab36a97087ff8f3533368bfc3c673f35ea5c6faf72d4 MISC metadata.xml 333 BLAKE2B 7d543cb4daa6542f7facef3e1f57c09144baed3198010d7c39df40398ab82791f56271375bce36e829a1364350d05f81c332a2359e7038b047df31407543d331 SHA512 52ac311d50fcfe020b4ec891bcbc1df2834d5d1e3ade7ab6926c6f85a31712dd5886b834739f6155873e1e09967c8f565b913c807acd7ea47a4d3b94160fff37 diff --git a/media-gfx/sane-backends/sane-backends-1.2.1.ebuild b/media-gfx/sane-backends/sane-backends-1.2.1.ebuild index cec6801c00ca..7f364f68bc1e 100644 --- a/media-gfx/sane-backends/sane-backends-1.2.1.ebuild +++ b/media-gfx/sane-backends/sane-backends-1.2.1.ebuild @@ -14,7 +14,7 @@ SRC_URI="https://gitlab.com/sane-project/backends/uploads/110fc43336d0fb5e514f1f LICENSE="GPL-2 public-domain" SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux" +KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux" # gphoto and v4l are handled by their usual USE flags. # The pint backend was disabled because I could not get it to compile. diff --git a/media-gfx/sane-backends/sane-backends-1.3.1-r1.ebuild b/media-gfx/sane-backends/sane-backends-1.3.1-r1.ebuild new file mode 100644 index 000000000000..8378fff6a24a --- /dev/null +++ b/media-gfx/sane-backends/sane-backends-1.3.1-r1.ebuild @@ -0,0 +1,361 @@ +# Copyright 1999-2025 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +PYTHON_COMPAT=( python3_{10..13} ) + +# python-any-r1 required for a script in backends/pixma/scripts/ +inherit autotools flag-o-matic multilib-minimal optfeature python-any-r1 systemd toolchain-funcs udev + +DESCRIPTION="Scanner Access Now Easy - Backends" +HOMEPAGE="http://www.sane-project.org/" +SRC_URI="https://gitlab.com/sane-project/backends/-/archive/${PV}/backends-${PV}.tar.bz2" +S="${WORKDIR}/backends-${PV}" + +LICENSE="GPL-2 public-domain" +SLOT="0" +KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux" + +# gphoto and v4l are handled by their usual USE flags. +# The pint backend was disabled because I could not get it to compile. +IUSE_SANE_BACKENDS=( + abaton + agfafocus + apple + artec + artec_eplus48u + as6e + avision + bh + canon + canon630u + canon_dr + canon_lide70 + canon_pp + cardscan + coolscan + coolscan2 + coolscan3 + dc210 + dc240 + dc25 + dell1600n_net + dmc + epjitsu + epson + epson2 + epsonds + escl + fujitsu + genesys + gt68xx + hp + hp3500 + hp3900 + hp4200 + hp5400 + hp5590 + hpljm1005 + hpsj5s + hs2p + ibm + kodak + kodakaio + kvs1025 + kvs20xx + kvs40xx + leo + lexmark + ma1509 + magicolor + matsushita + microtek + microtek2 + mustek + mustek_pp + mustek_usb + mustek_usb2 + nec + net + niash + p5 + pie + pieusb + pixma + plustek + plustek_pp + pnm + qcam + ricoh + ricoh2 + rts8891 + s9036 + sceptre + sharp + sm3600 + sm3840 + snapscan + sp15c + st400 + stv680 + tamarack + teco1 + teco2 + teco3 + test + u12 + umax + umax1220u + umax_pp + xerox_mfp +) + +IUSE="gphoto2 snmp systemd threads +usb v4l xinetd +zeroconf" + +for GBACKEND in ${IUSE_SANE_BACKENDS[@]}; do + case ${GBACKEND} in + # Disable backends that require parallel ports as no one has those anymore. + canon_pp|hpsj5s|mustek_pp|\ + pnm|mustek_usb2|kvs40xx) + IUSE+=" sane_backends_${GBACKEND}" + ;; + *) + IUSE+=" +sane_backends_${GBACKEND}" + esac +done + +REQUIRED_USE=" + sane_backends_escl? ( zeroconf ) + sane_backends_kvs40xx? ( threads ) + sane_backends_mustek_usb2? ( threads ) +" + +# For pixma: see https://gitlab.com/sane-project/backends/-/releases/1.0.28#build +RDEPEND=" + acct-user/saned + acct-group/scanner + gphoto2? ( + >=media-libs/libgphoto2-2.5.3.1:=[${MULTILIB_USEDEP}] + media-libs/libjpeg-turbo:=[${MULTILIB_USEDEP}] + ) + sane_backends_canon_pp? ( >=sys-libs/libieee1284-0.2.11-r3[${MULTILIB_USEDEP}] ) + sane_backends_dc210? ( media-libs/libjpeg-turbo:=[${MULTILIB_USEDEP}] ) + sane_backends_dc240? ( media-libs/libjpeg-turbo:=[${MULTILIB_USEDEP}] ) + sane_backends_dell1600n_net? ( + >=media-libs/tiff-3.9.7-r1:=[${MULTILIB_USEDEP}] + media-libs/libjpeg-turbo:=[${MULTILIB_USEDEP}] + ) + sane_backends_escl? ( + app-text/poppler[cairo] + || ( + net-dns/avahi[dbus] + net-dns/avahi[gtk] + ) + net-dns/avahi[${MULTILIB_USEDEP}] + net-misc/curl[${MULTILIB_USEDEP}] + ) + sane_backends_hpsj5s? ( >=sys-libs/libieee1284-0.2.11-r3[${MULTILIB_USEDEP}] ) + sane_backends_mustek_pp? ( >=sys-libs/libieee1284-0.2.11-r3[${MULTILIB_USEDEP}] ) + sane_backends_pixma? ( media-libs/libjpeg-turbo:=[${MULTILIB_USEDEP}] ) + snmp? ( net-analyzer/net-snmp:= ) + systemd? ( sys-apps/systemd:= ) + usb? ( >=virtual/libusb-1-r1:1=[${MULTILIB_USEDEP}] ) + v4l? ( >=media-libs/libv4l-0.9.5[${MULTILIB_USEDEP}] ) + xinetd? ( sys-apps/xinetd ) + zeroconf? ( >=net-dns/avahi-0.6.31-r2[${MULTILIB_USEDEP}] ) +" +DEPEND="${RDEPEND} + dev-libs/libxml2 + v4l? ( sys-kernel/linux-headers ) +" +BDEPEND="${PYTHON_DEPS} + dev-build/autoconf-archive + sys-devel/gettext + virtual/pkgconfig +" + +PATCHES=( + "${FILESDIR}"/${PN}-1.0.24-saned_pidfile_location.patch + "${FILESDIR}"/${PN}-1.0.27-disable-usb-tests.patch + "${FILESDIR}"/${PN}-1.0.30-add_hpaio_epkowa_dll.conf.patch +) + +# ./configure checks to see if these are defined in sys/io.h, +# so if they're undefined... that's the point. +QA_CONFIG_IMPL_DECL_SKIP=( inb outb ) + +MULTILIB_CHOST_TOOLS=( + /usr/bin/sane-config +) + +src_prepare() { + default + + echo "${PV}" > .tarball-version || die + eautoreconf + + # Needed for udev rules generation/installation + multilib_copy_sources +} + +src_configure() { + # From Fedora + append-flags -fno-strict-aliasing + # bug #944286 + append-cflags -std=gnu17 + + multilib-minimal_src_configure +} + +multilib_src_configure() { + # the blank is intended - an empty string would result in building ALL backends. + local lbackends=" " + + use gphoto2 && lbackends="gphoto2" + use v4l && lbackends+=" v4l" + use sane_backends_escl && multilib_is_native_abi && lbackends+=" escl" + local backend + for backend in ${IUSE_SANE_BACKENDS[@]} ; do + if use "sane_backends_${backend}" && [[ "${backend}" != pnm ]] && [[ "${backend}" != escl ]] ; then + lbackends+=" ${backend}" + fi + done + + local myconf=( + $(use_with usb) + $(multilib_native_use_with snmp) + + $(multilib_native_use_with sane_backends_escl poppler-glib) + # you can only enable this backend, not disable it... + $(usex sane_backends_pnm --enable-pnm-backend '') + $(usex sane_backends_mustek_pp --enable-parport-directio '') + ) + + if ! { use sane_backends_canon_pp || use sane_backends_hpsj5s || use sane_backends_mustek_pp ; } ; then + myconf+=( sane_cv_use_libieee1284=no ) + fi + + # relative path must be used for tests to work properly + # All distributions pass --disable-locking because /var/lock/sane/ would be a world-writable directory + # that break in many ways, bug #636202, #668232, #668350 + # People can refer to the "Programmer's Documentation" at http://www.sane-project.org/docs.html + myconf+=( + --enable-ipv6 + --disable-locking + $(use_with gphoto2) + $(multilib_native_use_with systemd) + $(use_with v4l) + $(use_enable threads pthread) + $(use_with zeroconf avahi) + ) + + BACKENDS="${lbackends}" econf "${myconf[@]}" +} + +multilib_src_compile() { + emake VARTEXFONTS="${T}/fonts" + + if tc-is-cross-compiler ; then + pushd "${BUILD_DIR}"/tools >/dev/null || die + + # The build system sucks and doesn't handle this properly. + # https://alioth.debian.org/tracker/index.php?func=detail&aid=314236&group_id=30186&atid=410366 + tc-export_build_env BUILD_CC + ${BUILD_CC} ${BUILD_CPPFLAGS} ${BUILD_CFLAGS} ${BUILD_LDFLAGS} \ + -I. -I../include -I"${S}"/include \ + "${S}"/sanei/sanei_config.c "${S}"/sanei/sanei_constrain_value.c \ + "${S}"/sanei/sanei_init_debug.c "${S}"/tools/sane-desc.c -o sane-desc || die + local dirs=( hal hotplug hotplug-ng udev ) + local targets=( + hal/libsane.fdi + hotplug/libsane.usermap + hotplug-ng/libsane.db + udev/libsane.rules + ) + mkdir -p "${dirs[@]}" || die + emake "${targets[@]}" + + popd >/dev/null || die + fi + + if use usb ; then + sed -i -e '/^$/d' \ + tools/hotplug/libsane.usermap || die + fi +} + +multilib_src_install() { + emake INSTALL_LOCKPATH="" DESTDIR="${D}" install \ + docdir="${EPREFIX}"/usr/share/doc/${PF} + + if multilib_is_native_abi ; then + if use usb ; then + insinto /etc/hotplug/usb + doins tools/hotplug/libsane.usermap + fi + + insinto "/usr/share/pkgconfig" + doins tools/sane-backends.pc + + # From Fedora and Arch, prevent permission conflicts + # https://github.com/OpenPrinting/cups/issues/314 + # https://gitlab.com/sane-project/backends/-/issues/546 + # + # Generate udev udev+hwdb, not needing scanner group + install -vdm 755 "${ED}/$(get_udevdir)/rules.d/" || die + tools/sane-desc -m udev+hwdb -s doc/descriptions/ > "${ED}/$(get_udevdir)/rules.d/65-${PN}.rules" || die + tools/sane-desc -m udev+hwdb -s doc/descriptions-external/ >> "${ED}/$(get_udevdir)/rules.d/65-${PN}.rules" || die + # generate udev hwdb + install -vdm 755 "${ED}/$(get_udevdir)/hwdb.d/" || die + tools/sane-desc -m hwdb -s doc/descriptions/ > "${ED}/$(get_udevdir)/hwdb.d/20-${PN}.hwdb" + # NOTE: an empty new line is required between the two .desc collections + printf "\n" >> "${ED}/$(get_udevdir)/hwdb.d/20-${PN}.hwdb" || die + tools/sane-desc -m hwdb -s doc/descriptions-external/ >> "${ED}/$(get_udevdir)/hwdb.d/20-${PN}.hwdb" || die + # udev rule for saned (SANE scanning daemon) to be able to write on usb port + udev_newrules "${FILESDIR}/66-saned.rules-r1" 66-saned.rules + fi +} + +multilib_src_install_all() { + dodir /etc/env.d + + if use systemd ; then + systemd_newunit "${FILESDIR}"/saned_at.service-r1 "saned@.service" + systemd_newunit "${FILESDIR}"/saned.socket saned.socket + fi + + if use usb ; then + exeinto /etc/hotplug/usb + doexe tools/hotplug/libusbscanner + newdoc tools/hotplug/README README.hotplug + fi + + dodoc NEWS AUTHORS PROBLEMS README README.linux + find "${ED}" -name '*.la' -delete || die + + if use xinetd ; then + insinto /etc/xinetd.d + doins "${FILESDIR}"/saned + fi + + newinitd "${FILESDIR}"/saned.initd saned + newconfd "${FILESDIR}"/saned.confd saned +} + +pkg_postrm() { + udev_reload +} + +pkg_postinst() { + udev_reload + + optfeature "Network scanner backend" media-gfx/sane-airscan + optfeature "Epson-specific backend" media-gfx/iscan + optfeature "HP-specific backend" net-print/hplip + + if use xinetd ; then + elog "If you want remote clients to connect, edit" + elog "/etc/sane.d/saned.conf and /etc/hosts.allow" + fi +} diff --git a/media-gfx/scour/Manifest b/media-gfx/scour/Manifest index e26d636f9639..989722b6f348 100644 --- a/media-gfx/scour/Manifest +++ b/media-gfx/scour/Manifest @@ -1,3 +1,3 @@ DIST scour-0.38.2.gh.tar.gz 99910 BLAKE2B 4273287b201ecea64cb2be666bb7de4fbadc3483935515de92ec8dfb39f3b856584e35ac877958efd798bb5840baba4fc4d40a376d2c9f3b0c52a679d7ded6df SHA512 a2c418e25283af399be032322b3af0c336c2392ba361681d4b133b64ebc441ac5beeed2b920f42316cef376c971b230681e306687786a875162d33b659d3fdeb -EBUILD scour-0.38.2-r1.ebuild 717 BLAKE2B 8bf31a0c39f2a5868540bec1daa56c2a999ae5dc5b3f31c4a8df3edc3dae6d38e1e7a2a466a162a96bdce02496060c428eb750b51b10bb78293ae09031d24d75 SHA512 fb9ac6ba0593358d909b755d29b760978a875bb69cb3264873069c5da9bd822e469b064c8aa0e8acd9ea1c21248dd40f258b30910d33a107fbd177594c9962cc +EBUILD scour-0.38.2-r1.ebuild 711 BLAKE2B 4592c2998500d4e900b4e06ce7b6b80a277d77a6b0a17bca1e2f7b8efa1c11fd071ac741d0255c0c8ff7d769c130ae020d87f9c8234943a175ff642f5cabfd1f SHA512 c8a52b2abb47fa6332da67ef46574ebf746cf11eeb47a8e176cbe5b815075db88f4b144fd3114972523a750bc3cc0283cd7d31a167cfd1f769dbdb5312b94f28 MISC metadata.xml 327 BLAKE2B b501c3f768a9e5e1af3cbb060c6ccdf4703d1cd6baacdc255997a563cfd9b6777b64d97d3540a532490e4ccf98724d82cf1e3a0f0366b85c47cf8660c7a7057e SHA512 322aefdbb22f52edbc453223ccc9e828f373b9d28b2a02c87429c7a16d8ced41567898a73a4e9ff50667bd8424fdb6e4a9bab836290de0d82df7969db6eb0cce diff --git a/media-gfx/scour/scour-0.38.2-r1.ebuild b/media-gfx/scour/scour-0.38.2-r1.ebuild index 8809aac2f3c1..41100b2c9900 100644 --- a/media-gfx/scour/scour-0.38.2-r1.ebuild +++ b/media-gfx/scour/scour-0.38.2-r1.ebuild @@ -4,7 +4,7 @@ EAPI=8 DISTUTILS_USE_PEP517=setuptools -PYTHON_COMPAT=( python3_{10..12} ) +PYTHON_COMPAT=( python3_{10..13} ) inherit distutils-r1 @@ -20,7 +20,7 @@ SRC_URI=" LICENSE="Apache-2.0" SLOT="0" -KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86" +KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86" RDEPEND=" dev-python/six[${PYTHON_USEDEP}] diff --git a/media-gfx/shotwell/Manifest b/media-gfx/shotwell/Manifest index 34c7499ad4c4..b21dd12dce45 100644 --- a/media-gfx/shotwell/Manifest +++ b/media-gfx/shotwell/Manifest @@ -1,5 +1,7 @@ +DIST shotwell-0.32.10.tar.xz 35339616 BLAKE2B b68c755605df75ce5edd82d042690fc09236996e030973331a2fc8ecbf078e6c2ffd48d46bfd0a74783cd7fc7ced035a7ba685c2fdf488394ead850b717a2ff5 SHA512 adb670417a698d53f5fd865b70cd394be2779d9ada4a1bbcc3c1af67cd7e39ca79a303beec447156bd902dc415ceaa14205544505489abc0027464ab01029304 DIST shotwell-0.32.4.tar.xz 35335296 BLAKE2B 32be135643f165f32f315c332a4f0b34cd724285e7239eadbb250253b27ce97fb15d314f68a5392d88224a0b97f7f6ef8789c1f6c40051c26a25b9012e860b90 SHA512 516ab26d6620429175097886a1874d2eaf0513f6ef732bef5ee07ef8cd200028b34d98f4eb09b47a621f5313de42a5f415185d76853de478e0b5e0c4e89eea69 -DIST shotwell-0.32.7.tar.xz 35339216 BLAKE2B db87ee9c161f57dad638b47c37fb2737c95645e987e2bab81697895d9a28f14ab22b4669f218ea0baadfc0e1115f45fb9b094f546299083d83d2486fa1c15f98 SHA512 3cb9c9f2981ead8410f42680f6b4976d3b2efcfe7ded4d5217d28ebb8e5c968062a004ad3353affa13e94d996208ebf26c01f4beaf03a2ef6a1bc43960488d14 +DIST shotwell-0.32.9.tar.xz 35341312 BLAKE2B 81229b088c18b73e7039d8c1e644d0280988d888af798a8f8560a83ef24138772561609cbf9d502b07dfc1bb7f0acafe1b829af7a6213bbca623dd67f0893229 SHA512 9fc4027271c0d31660aa0579a3369ad25d87454efa5fb95a17a85e962232e0e35f28ab9e2fa63aef5aa9b89d895c7a97d3edffdd862bbaa5af29d1325a19a2d0 +EBUILD shotwell-0.32.10.ebuild 2207 BLAKE2B 6d6b7d6b0eb01c4d16c38add90a1106d8c7ce916d25271f339f35d380f14189f333461c0856542d6322895618adff123941e91fb4f04b2e54ce2b15613912ace SHA512 7de4dd0c4bf22fac299cf34406bc266eebcea04d73dc77dbec7c187afda96cdca6f64030421cedf08c0d29c2e7e614bf8a20a57fe907b3ae6345328f52925708 EBUILD shotwell-0.32.4.ebuild 2199 BLAKE2B 50ac5f6cd764cb515945ceb700230845bb200be64a7e7bb94f88847ae351238b1b0352b64b0886e92140471636987add46d3aeb81363ff541a0502884b7a2547 SHA512 86cff4865ca7f7305b58799049e085ea7a03ff93f0738fe33c98680d863c15e48df2425e550717905908659ec6a8e9d604d97c51bc58414def714dd9726a3fc2 -EBUILD shotwell-0.32.7.ebuild 2205 BLAKE2B b8fccde94ab5fc0b40d3cecf6bb889a505ce2f485864fbc9201a7242270369401b83f51228e9c91fe6750346813d2d16aaab1654a7c07705abae86580cc08c8e SHA512 ba4842cc36e539c84bfcd76c79dd7291cc573318fa579c83c797f55d43c28e954caa0be5840208fbf0dd3235d754a8001393f1f3dcf2434668163ee6b2742790 +EBUILD shotwell-0.32.9.ebuild 2210 BLAKE2B eac31a001b30ea632664b2c2ca4e772e44b772606bf482f9369e0debc7113a0d0ecfa4656338848aec6cb7be85884d849430f3fe96a5e492b7cac10128e029d2 SHA512 be63f94f8f3473812af5d47a5726737e850f2025ff7137f6539c36d5136717f9305debe0c926c1e2d5b36d761ed6d512fe442e671ceeeca7b6d309a7692f4ed1 MISC metadata.xml 794 BLAKE2B c1eb4a08828db11ba473fe21036201d3b57c2fa36a2bd39b18e7671cf5e4c42b2b9e82956456a0376a60bfc982d9af106577075d936dba3c0cb73947da46f427 SHA512 2c65cdf3c6d5a953b52ad81e0a85d1c1465f5c38c3475e5c1408baea0b14a053255e97c0efc560059c77c51dbe98b72a90c6164fe575e68cba3eb04d4774f490 diff --git a/media-gfx/shotwell/shotwell-0.32.10.ebuild b/media-gfx/shotwell/shotwell-0.32.10.ebuild new file mode 100644 index 000000000000..15bd03bcd4cb --- /dev/null +++ b/media-gfx/shotwell/shotwell-0.32.10.ebuild @@ -0,0 +1,92 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit gnome.org gnome2-utils meson optfeature vala xdg + +DESCRIPTION="Open source photo manager for GNOME" +HOMEPAGE="https://gitlab.gnome.org/GNOME/shotwell" + +LICENSE="LGPL-2.1" +SLOT="0" +KEYWORDS="amd64 ~arm arm64 ~loong ~ppc64 ~riscv ~sparc x86" +IUSE="opencv udev" + +DEPEND=" + >=x11-libs/gtk+-3.22.0:3 + >=dev-libs/glib-2.40.0:2 + >=dev-libs/libgee-0.8.5:0.8= + >=net-libs/webkit-gtk-2.26:4.1 + net-libs/libsoup:3.0 + >=dev-libs/json-glib-0.7.6 + >=dev-libs/libxml2-2.6.32:2 + x11-libs/gdk-pixbuf:2 + >=dev-db/sqlite-3.5.9:3 + >=media-libs/gstreamer-1.20:1.0 + >=media-libs/gst-plugins-base-1.20:1.0 + >=media-libs/libgphoto2-2.5:= + udev? ( >=dev-libs/libgudev-145:= ) + >=media-libs/gexiv2-0.12.3 + >=media-libs/libraw-0.13.2:= + >=media-libs/libexif-0.6.16 + app-crypt/libsecret + >=dev-libs/libportal-0.5:=[gtk,vala] + media-libs/libwebp:= + + >=app-crypt/gcr-3:0=[gtk] + x11-libs/cairo + opencv? ( >=media-libs/opencv-4.0.0:= ) +" +RDEPEND="${DEPEND} + media-plugins/gst-plugins-gdkpixbuf:1.0 + media-plugins/gst-plugins-meta:1.0 +" +BDEPEND=" + $(vala_depend) + dev-libs/appstream-glib + dev-libs/glib + dev-util/gdbus-codegen + dev-util/itstool + >=sys-devel/gettext-0.19.8 + virtual/pkgconfig + net-libs/libsoup:3.0[vala] + media-libs/gexiv2[vala] + app-crypt/gcr:0[vala] +" + +src_prepare() { + default + vala_setup + xdg_environment_reset +} + +src_configure() { + local emesonargs=( + -Dunity_support=false + # -Dpublishers # In 0.30.2 all get compiled in anyways, even if restricted list, affects only runtime support + #trace + #measure + -Ddupe_detection=true + $(meson_use udev) + -Dinstall_apport_hook=false + $(meson_use opencv face_detection) + -Dfatal_warnings=false + ) + meson_src_configure +} + +pkg_postinst() { + xdg_pkg_postinst + gnome2_schemas_update + + optfeature "Enable support for the AVIF format" media-libs/libavif[gdk-pixbuf] + optfeature "Enable support for the HEIF format" media-libs/libheif[gdk-pixbuf] + optfeature "Enable support for the JPEG format" x11-libs/gdk-pixbuf[jpeg] + optfeature "Enable support for the TIFF format" x11-libs/gdk-pixbuf[tiff] +} + +pkg_postrm() { + xdg_pkg_postrm + gnome2_schemas_update +} diff --git a/media-gfx/shotwell/shotwell-0.32.7.ebuild b/media-gfx/shotwell/shotwell-0.32.9.ebuild index 3f297331f776..1cbc27d4c8ad 100644 --- a/media-gfx/shotwell/shotwell-0.32.7.ebuild +++ b/media-gfx/shotwell/shotwell-0.32.9.ebuild @@ -31,7 +31,7 @@ DEPEND=" >=media-libs/libraw-0.13.2:= >=media-libs/libexif-0.6.16 app-crypt/libsecret - >=dev-libs/libportal-0.5:=[gtk] + >=dev-libs/libportal-0.5:=[gtk,vala] media-libs/libwebp:= >=app-crypt/gcr-3:0=[gtk] diff --git a/media-gfx/skanpage/Manifest b/media-gfx/skanpage/Manifest index e1203e2e7d6b..fe478b772b92 100644 --- a/media-gfx/skanpage/Manifest +++ b/media-gfx/skanpage/Manifest @@ -1,7 +1,7 @@ -DIST skanpage-23.08.5.tar.xz 1317292 BLAKE2B 2ee8e7db4e08c9f6ecac93789b20fcb862f56da8d44d5540268dd71f5e1e79c93c7d67455c534f2b0a50f4f2f99bcfdc1989dfd6ecafb7bd3c5a7bc15ab8880d SHA512 d5ddd8a52ad42421d79a6817eb3430996a9d968b2f824ca3c5adaf9bef69c60f6270b72a9d87308834b79f3038b6347b242c8fa635fd8c28953533061e21d158 -DIST skanpage-24.05.2.tar.xz 1332884 BLAKE2B 11d66fec7f13a658d652ca2c70d7f46e50d6c965903573ecfd9ffb4d259c7dd4fc9d2155297c9ffff928ae3c22d67b5642f8c4a31852b1b3f582675bcbb8459b SHA512 aa5dcde24a72332986ca68fbb457097ba08fae04c186654094dbff2ebd0f9b22688370f8a87eed54f0e16265a42adb297d189856a276d8cf56227b90dd7c6ab8 -DIST skanpage-24.08.0.tar.xz 1333828 BLAKE2B 2dae5beecf23940c128504c733bd2f5bb1f9aa6dcaa4bfd9882cfa0f68af246bb6b4a662fa242a46f138adf9ef151265de3008a69b0f354241e7970c945d4098 SHA512 a8a22ef563b5c3793ada8465acf42b2fd9c26fecb5afbc7d45540b4f12fb209d289cda4e768a46bf449122ea306028170df8ca41b2a9a68b602b10c1341c0b90 -EBUILD skanpage-23.08.5.ebuild 1383 BLAKE2B 2b2d5cf4582e9d1e4897b1aeb8c8c3b4fa91b753293eb8886c881bb150186a83df2946e8e278f102baf03005b7ae3c8edf9dd8cd7363545fbad33d3f80e04abc SHA512 c0fab6531ac492693bead97c2b231b2379490bb4de55bb05d4df4650599d15a9602521fe03f0afc1dd64b72ac2bdd362a492838bfb690e6adc57fe2a9321701b -EBUILD skanpage-24.05.2.ebuild 1238 BLAKE2B 8606f527b934653bacfe697ce5ac498c587a07a8fa3911c870a88112fb66d75be5f3ac88d21026142b95f6b974756848e4e2584cc1da36dc467c00fc8c02c3ee SHA512 a217155d141343a2a14a52eeae3a11acd96112e98bb19ab3451cf164388f149b6602da32cbc8ae5507a8e24bce478a19995315e066388d73f509661c969f0d44 -EBUILD skanpage-24.08.0.ebuild 1240 BLAKE2B 9f3818d5d7a5fe493fc9846f21a524f876805bb14b4b97286795cd5c7c487acc22dc7a0a51b1b913126c5208fc9420029a929a395ecd95c0c4c216a84133f336 SHA512 52e1a0269cd9b483e1a02015793065d06a1ad5e9259f5d15d8ff770de71e256f8a0dbc90426d72c337c1860c44f3008e90ff0641ee451131b64092d1389e24bd +DIST skanpage-24.08.3.tar.xz 1334020 BLAKE2B b2642c74dce6a3d8afdf25eebfcdcdf4059aea3b29ededb069993c0f7f089dc40716cc2567296fa9c815fecb95ab5689a571ab89b8bedd5c0aae5d06431fed31 SHA512 0bdd8d8f94aaabee32d2cd4975e8320d69c25afa1135de3fa672f154f447122ce8747d1a4960b0629bcc6118e078617641a7d0cbbb0c1344fa19733bff18f8ee +DIST skanpage-24.12.1.tar.xz 1337776 BLAKE2B 3806a71a9051c7bb7cb1ecfe4d35a17d027d77b9db14b39b3d5c2803a1ece6b670ede907f0286f4a198b906762ce287e7e376be128c07890556c1021ef2050c5 SHA512 b6f0eded7692b02fb134438e50fb8d07014a7eaf81fb8ec6bc96d800a497ce8ab7458e699804ed02df77c1f1ee20a62d9da92db48d96c9bc64b72991a3360c08 +DIST skanpage-24.12.2.tar.xz 1337844 BLAKE2B 0fee1e68f4b0a88f4ca5e657cb8d8436c672eadacaceedf4b87c6981222b1652d99e5d2e93c4d969b352d977d282f3fd2fe4e78763c56fdf9db0a69809b16eea SHA512 e7296a12fde65b853eb5efae2104d54f62bea65145cf047625216226ef0874785b4a76471fcb40451448942b148848ad94224162d3422ba3dbf87a35277f4003 +EBUILD skanpage-24.08.3.ebuild 1238 BLAKE2B 934b1cdb3a5be00ca0ef2ef826f9dde6c37cbdc1eebb0bd3848036ef63965aab05ea77b8c9450673b7358fd3145fde50c2e2936918a9a3d28126a29e42b7d433 SHA512 b2b4410e82e9f73b00be6e014adc0b4444bd6fb276ca1a985eb52f70787dff646724b4d56ec4e80dbc3d26be7292306aa32b7f0e5ab9420a8da2bcea4bd699d1 +EBUILD skanpage-24.12.1.ebuild 1240 BLAKE2B 88e8bd406aa6e7b12048fe20983d6d1f6ad7e3cbd6414126f7927d6510d7537249e4663175e5033f5c393671541e4fb71a1d88f5a85f2385958839b61272cace SHA512 f779925a12de7440a213ea64a0407a33c4e38777a86b7b5df9c5a3d56dbb9cd04598918a88d6f6a162ad340e2e9f059facb258dfbae7a8556531b9c9a373687d +EBUILD skanpage-24.12.2.ebuild 1240 BLAKE2B 88e8bd406aa6e7b12048fe20983d6d1f6ad7e3cbd6414126f7927d6510d7537249e4663175e5033f5c393671541e4fb71a1d88f5a85f2385958839b61272cace SHA512 f779925a12de7440a213ea64a0407a33c4e38777a86b7b5df9c5a3d56dbb9cd04598918a88d6f6a162ad340e2e9f059facb258dfbae7a8556531b9c9a373687d MISC metadata.xml 374 BLAKE2B 3666d82bcae95e5b38d777c81491cc25488aff6b55e112f6eebbaf80ef603d40e8287fe33d649e647c2f97b9caca237f2b9785ee49ff9c2f5c81576a2cf33379 SHA512 fcc360165d6fa100c9d92c2528f4f2ba291a0bf6b05a7b252b5bb215514144e9b699915f98d7aecda6869bf50bfbb51b42b3186679e5db2c3901cb4d6151e6e8 diff --git a/media-gfx/skanpage/skanpage-23.08.5.ebuild b/media-gfx/skanpage/skanpage-23.08.5.ebuild deleted file mode 100644 index e03bdc71cba1..000000000000 --- a/media-gfx/skanpage/skanpage-23.08.5.ebuild +++ /dev/null @@ -1,54 +0,0 @@ -# Copyright 1999-2024 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=5.106.0 -QTMIN=5.15.9 -inherit ecm gear.kde.org - -DESCRIPTION="Multi-page scanning application supporting image and pdf files" -HOMEPAGE="https://apps.kde.org/skanpage/" - -LICENSE="|| ( GPL-2 GPL-3 ) CC0-1.0" -SLOT="5" -KEYWORDS="amd64 arm64 ~ppc64 ~riscv x86" -IUSE="ocr" - -DEPEND=" - >=dev-qt/qtconcurrent-${QTMIN}:5 - >=dev-qt/qtdeclarative-${QTMIN}:5 - >=dev-qt/qtgui-${QTMIN}:5 - >=dev-qt/qtnetwork-${QTMIN}:5 - >=dev-qt/qtprintsupport-${QTMIN}:5 - >=dev-qt/qtquickcontrols2-${QTMIN}:5 - >=dev-qt/qtwidgets-${QTMIN}:5 - >=kde-apps/libksane-${PVCUT}:5 - >=kde-frameworks/kconfig-${KFMIN}:5 - >=kde-frameworks/kcoreaddons-${KFMIN}:5 - >=kde-frameworks/kcrash-${KFMIN}:5 - >=kde-frameworks/ki18n-${KFMIN}:5 - >=kde-frameworks/kio-${KFMIN}:5 - >=kde-frameworks/kirigami-${KFMIN}:5 - >=kde-frameworks/kjobwidgets-${KFMIN}:5 - >=kde-frameworks/kwidgetsaddons-${KFMIN}:5 - >=kde-frameworks/kxmlgui-${KFMIN}:5 - >=kde-frameworks/purpose-${KFMIN}:5 - media-libs/kquickimageeditor:5 - >=media-libs/ksanecore-${PVCUT}:5 - ocr? ( - app-text/tesseract:= - media-libs/leptonica:= - ) -" -RDEPEND="${DEPEND}" - -src_configure() { - local mycmakeargs=( - $(cmake_use_find_package ocr Tesseract) - $(cmake_use_find_package ocr Leptonica) - ) - ecm_src_configure -} diff --git a/media-gfx/skanpage/skanpage-24.05.2.ebuild b/media-gfx/skanpage/skanpage-24.08.3.ebuild index d19cdc047d27..5b62a242083a 100644 --- a/media-gfx/skanpage/skanpage-24.05.2.ebuild +++ b/media-gfx/skanpage/skanpage-24.08.3.ebuild @@ -5,8 +5,8 @@ EAPI=8 KDE_ORG_CATEGORY="utilities" PVCUT=$(ver_cut 1-3) -KFMIN=6.3.0 -QTMIN=6.6.2 +KFMIN=6.5.0 +QTMIN=6.7.2 inherit ecm gear.kde.org DESCRIPTION="Multi-page scanning application supporting image and pdf files" diff --git a/media-gfx/skanpage/skanpage-24.08.0.ebuild b/media-gfx/skanpage/skanpage-24.12.1.ebuild index 73a1e52e8c7c..77a6baa9ab6a 100644 --- a/media-gfx/skanpage/skanpage-24.08.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/skanpage/skanpage-24.12.2.ebuild b/media-gfx/skanpage/skanpage-24.12.2.ebuild new file mode 100644 index 000000000000..77a6baa9ab6a --- /dev/null +++ b/media-gfx/skanpage/skanpage-24.12.2.ebuild @@ -0,0 +1,49 @@ +# 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.7.0 +QTMIN=6.7.2 +inherit ecm gear.kde.org + +DESCRIPTION="Multi-page scanning application supporting image and pdf files" +HOMEPAGE="https://apps.kde.org/skanpage/" + +LICENSE="|| ( GPL-2 GPL-3 ) CC0-1.0" +SLOT="6" +KEYWORDS="~amd64 ~arm64" +IUSE="ocr" + +DEPEND=" + >=dev-qt/qtbase-${QTMIN}:6[concurrent,gui,network,widgets] + >=dev-qt/qtdeclarative-${QTMIN}:6 + >=dev-qt/qtwebengine-${QTMIN}:6[pdfium] + >=kde-frameworks/kconfig-${KFMIN}:6 + >=kde-frameworks/kcoreaddons-${KFMIN}:6 + >=kde-frameworks/kcrash-${KFMIN}:6 + >=kde-frameworks/ki18n-${KFMIN}:6 + >=kde-frameworks/kio-${KFMIN}:6 + >=kde-frameworks/kirigami-${KFMIN}:6 + >=kde-frameworks/kjobwidgets-${KFMIN}:6 + >=kde-frameworks/kwidgetsaddons-${KFMIN}:6 + >=kde-frameworks/kxmlgui-${KFMIN}:6 + >=kde-frameworks/purpose-${KFMIN}:6 + media-libs/kquickimageeditor:6 + >=media-libs/ksanecore-${PVCUT}:6 + ocr? ( + >=app-text/tesseract-5:= + media-libs/leptonica:= + ) +" +RDEPEND="${DEPEND}" + +src_configure() { + local mycmakeargs=( + $(cmake_use_find_package ocr Tesseract) + $(cmake_use_find_package ocr Leptonica) + ) + ecm_src_configure +} diff --git a/media-gfx/solvespace/Manifest b/media-gfx/solvespace/Manifest index 5f162ed9dbba..1bba43d6f828 100644 --- a/media-gfx/solvespace/Manifest +++ b/media-gfx/solvespace/Manifest @@ -2,5 +2,5 @@ AUX solvespace-3.1-use-system-mimalloc.patch 1330 BLAKE2B c7e1c4d58f8739a7d15fe5 DIST libdxfrw-0.6.3-0b7b7b709d9299565db603f878214656ef5e9ddf.tar.gz 691804 BLAKE2B 84c90a591fac71144e9e13aace7c1a00dfc1bd6f27b0bcde6b60541f5b5d3ccc04ae1c759f60cb467445cc884840d04bf4613b5cc553fbbf6951cac33a084d50 SHA512 9ab498aa7f369be79d800e8ca5ec55fa54be79d0778937b81d4c8da776b3419cb8a75400b54b205efc338da32e2e781afd0bed1bd8efed1a0b212dc8682a2615 DIST mimalloc-2.0.6-f819dbb4e4813fab464aee16770f39f11476bfea.tar.gz 1129745 BLAKE2B 95ea6e64afaa6931e18a22db45ba39d554917e109028adb624120442329bb458d24d7f22a233931c5e15b8b0ce4cc5130b0d4cba0db270a9c84453afd70c33e9 SHA512 b02a76d8a7668a4d3dc8c761473f609060b834761918b58d2143d54dbeb4c342e213010f9402d1c55035b04860936c2f8df73b84e111f5e90b3d58db62c5f85f DIST solvespace-3.1.tar.gz 2764243 BLAKE2B 764637f84a187c6a86cf65cd672466f48e1e5abd9d335945fc47f2ea48f7d22a94f6840a6019f2380e8416e903bb55f97d9adb18fa6f2e7a94933c2a5b51ef6c SHA512 76794c4b103036f423471c72209521c273b40edcf9a725d2407e757b8dded033863f58640f1bcdf19d7dd1b296334f8745a632875e06604fa4d5b261dd23ba98 -EBUILD solvespace-3.1-r1.ebuild 2746 BLAKE2B 7eb5e28d8cc0a9cc778ea38bd87cfc769f33de55fa0ab4b78f8a654b3c54b228665adcdb65918d9c50a27987a0b2a6a75148e8d48237e9807d0a35dd12788301 SHA512 a316385d9b04b3940ba2c321942fdd10df473b4139efd6d2bb2c0150c44ab2128ff2478a53a6218ddc5858a172bd8b333c4108334adeb6380f442c5bcc702f55 -MISC metadata.xml 1161 BLAKE2B a31bf29efca503f51e0fb30b38b7249d172b0b0f478b48faa1b6887b354df073b7b88dc6d5840435cdba2a4f1611289ab66f590c7386ea419c8d579cf7e8cd37 SHA512 2aa8e3ef5f579f2e43a11f6a268670f75cb30c4c9f9274c6d0aab53b9105a1795d11977bfeedfefa547ab641fe36bcbca935f6fb9066398dcc900d630d6197bc +EBUILD solvespace-3.1-r1.ebuild 2747 BLAKE2B 51cb9fbc67e211dd1ddd17dc4dc8ea0deefd35ef444afb174f6edfe10e0f99abeb1757fd2dd736c5b005f138ad4d19e7f03eaa7149cac98bf5020bd40e225319 SHA512 89a5f1b5004f61683d231e7080027372c3e2d4a9ed16e437633b1c26bd32304d6ae877fe926f7e9ad6bec940965c39b21094fc4317b470af35320b578b4da85e +MISC metadata.xml 1259 BLAKE2B d904987d0bff38372661e3439d686d71128c68a9b3de1b89f2cda43bf8281f5427c24bf1e43d4a6404d9a1326cf18bd5cf3891ad07a3158ddb682c36f089022d SHA512 c7ee1326953ee8e07d66642fe4078b5494f4ba7315f6e1d89e2088c95964f895ceb21a4b8ba42617f1b7b4559fcd1de34ebe20824f0cee87c93bd6bb88bbf68d diff --git a/media-gfx/solvespace/metadata.xml b/media-gfx/solvespace/metadata.xml index 2cfadb10cbd2..ec5d500532b3 100644 --- a/media-gfx/solvespace/metadata.xml +++ b/media-gfx/solvespace/metadata.xml @@ -15,4 +15,7 @@ <use> <flag name="system-mimalloc">Use system <pkg>dev-libs/mimalloc</pkg> instead of vendored library</flag> </use> + <upstream> + <remote-id type="github">solvespace/solvespace</remote-id> + </upstream> </pkgmetadata> diff --git a/media-gfx/solvespace/solvespace-3.1-r1.ebuild b/media-gfx/solvespace/solvespace-3.1-r1.ebuild index c7343757219f..be8fe1c14c0c 100644 --- a/media-gfx/solvespace/solvespace-3.1-r1.ebuild +++ b/media-gfx/solvespace/solvespace-3.1-r1.ebuild @@ -18,7 +18,7 @@ MIMALLOC_P="mimalloc-${MIMALLOC_PV}-${MIMALLOC_COMMIT}" inherit cmake toolchain-funcs xdg DESCRIPTION="Parametric 2d/3d CAD" -HOMEPAGE="http://solvespace.com" +HOMEPAGE="https://solvespace.com" SRC_URI="https://github.com/solvespace/solvespace/archive/v${PV}.tar.gz -> ${P}.tar.gz https://github.com/solvespace/libdxfrw/archive/${DXFRW_COMMIT}.tar.gz -> ${DXFRW_P}.tar.gz !system-mimalloc? ( https://github.com/microsoft/mimalloc/archive/${MIMALLOC_COMMIT}.tar.gz -> ${MIMALLOC_P}.tar.gz )" @@ -29,10 +29,10 @@ SRC_URI="https://github.com/solvespace/solvespace/archive/v${PV}.tar.gz -> ${P}. # + libdxfrw (GPL-2+) # + mimalloc (MIT) -IUSE="openmp +system-mimalloc" -KEYWORDS="amd64 ~arm64 ~x86" LICENSE="BitstreamVera GPL-2+ GPL-3+ !system-mimalloc? ( MIT )" SLOT="0" +KEYWORDS="amd64 ~arm64 ~x86" +IUSE="openmp +system-mimalloc" RDEPEND=" dev-cpp/atkmm:0 diff --git a/media-gfx/springgraph/Manifest b/media-gfx/springgraph/Manifest index 1833d7de48c2..9d9d68cb1317 100644 --- a/media-gfx/springgraph/Manifest +++ b/media-gfx/springgraph/Manifest @@ -1,4 +1,4 @@ DIST springgraph.pl.88 29818 BLAKE2B d203bce543b0d6d8bd8519a24c3592a852971fb18219b0b34dd207724ed1db2859befcd6f69d7b00e2c6492fdabd5a8edf75bee634682f0a56a5361c9e832651 SHA512 51d7a840778478498c23d61af7e0ef0bd795953110850d0a1ec403146ce843c6eb5efa5c0c55d84a9995aecadf7657bc253dbf5a72354207d38a6e269b2f1325 DIST springgraph_0.82-5.diff.gz 3110 BLAKE2B 8459ffffe80cba463e95677ed264030ff150375bf2a163c081e719274b0f92cba27e5d8e5bc80923e433f332ee58773a7cbd053fc9680676193e7b852b4803bb SHA512 dcfc214c116cc8040b7eedf9a4864e84bc7c0b1f036fafb6322d9433564762135d1e845bb75891a380907059f7ebba7ed72efafb733a83a517f14af327d32e9b -EBUILD springgraph-88.ebuild 779 BLAKE2B 1814bec470e2038af556776c8b8a57c9e813b683297e79d7de87e2856f476860e792fb44796615f7747a4fa0ed68faccfd682a7bc259738c592daa6922c652fc SHA512 8b9a238b766743d59002e059ef859a80a9270547c9f2b893b5615c2f151a4ea14c25758bd0112b0b17adcd7c52d8a939d671786a20686b0500f8470b4628d6fc +EBUILD springgraph-88.ebuild 773 BLAKE2B 1c2ecd132b183ff8079b41aa00e53facd5cfa1108f01b9adc3b1c1a467e647c54f94da7104c9c86c26ad01d3da062fb82ba04b281bf7bd9b674ec1611fb94dd0 SHA512 3b9e0dc599d1d1bf0c9af10086ccea9acabdc6bba2247917c9428f0fd9e8bfcae377eaa921394d87f115ad55ec5ecc1221836af8456c9353f7298764f0c6389c MISC metadata.xml 710 BLAKE2B fa3b8384f430ae86afa1ca8b33907b5214a530364e49620ee80effc6c9b174db71b3d5617c37246982e8d20ef96f3885a75dfae65b4f8ec7bab8889197460d5e SHA512 1a6b997e402c4b39377fa903f67256770f11ef07c1c8948b08576f0f8774d5b9684cfd9a4f99318f6a1309b4f6d9a39953587f6e222aa78fc10e9b9584a5ebb4 diff --git a/media-gfx/springgraph/springgraph-88.ebuild b/media-gfx/springgraph/springgraph-88.ebuild index eb82210357fa..0247f2081e93 100644 --- a/media-gfx/springgraph/springgraph-88.ebuild +++ b/media-gfx/springgraph/springgraph-88.ebuild @@ -15,7 +15,7 @@ SRC_URI="http://www.chaosreigns.com/code/springgraph/dl/${PN}.pl.${PV} LICENSE="GPL-2" SLOT="0" -KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86" +KEYWORDS="~alpha ~amd64 ~hppa ~mips ~ppc ~ppc64 ~sparc ~x86" IUSE="" RDEPEND="dev-perl/GD" diff --git a/media-gfx/superslicer/Manifest b/media-gfx/superslicer/Manifest index 4684099b27a4..d12265639493 100644 --- a/media-gfx/superslicer/Manifest +++ b/media-gfx/superslicer/Manifest @@ -1,4 +1,5 @@ AUX superslicer-2.5.59.10-boost-1.85.patch 2693 BLAKE2B eb434eedc4b1188c1e8df875d8f57ba9f3c9a6ea88521f5707c47e16b23e7939b9382dc416d023293642a3e5af6317e51058adf691cd2201b92ea8f390b60ca8 SHA512 c94ef6475a3dd81bfbfe80f44b571094476b21725b496fe5b26d81d55aa987953f9c642c0275260f9f149d1a6b85addf5b750ff4a306d555c324304055a4375b +AUX superslicer-2.5.59.10-boost-headers.patch 1561 BLAKE2B 9e8fd0003bf95786dfffc5a7d9da4fba997ebe8cffe204dd7ebc6b2c4a887f80d909f76c6686b4c0ae73278e17df45db53725dffa6f44cfcff3f7a15029ec722 SHA512 2df7c4f05847b3b5422fff517dfbbfb17f58da4c03c6224d7c23e07ff1939bc75819d3cf03e237f221a1f83322f73779cea03ffd8b25dad2a274be7c32e48508 AUX superslicer-2.5.59.2-boost.patch 12899 BLAKE2B 53cfab69e12af506c276fcc34851c62deba2c4ef5682176977ed1b07a60c1967264f56752f0c286aeb059fa7924272fa5d837c8c2add768590dd9604444705fe SHA512 798a275a6b310e6fa16e630a841fc3198fc287fa1ac9de0fc70a41effadd30b10887fed969ab59e73993c9ca1830ac1a8e633bbeaf0560a9225d0c5f1b00eab3 AUX superslicer-2.5.59.2-cereal.patch 1807 BLAKE2B 0ab8eb8e7f283e09e19c55d95bd6fe874797cc3d67f153a7c3920e1ff02e3b974c64f0dfc510b0cf3dde2484eeb00f550eab636e304bb6ba3c76b066bf537caf SHA512 503d3e8483315affb77f9bf9299e529455b73484cb278eda413a7e17f27f687b24158210b2fbf50581a970821930511934c994fa70c2ef8b68702f7614528d38 AUX superslicer-2.5.59.2-dont-install-angelscript.patch 427 BLAKE2B 8f853d1c8c861bcb18e3272467c5a4ca745b67790d88be9943d4cf92f1f5dfdd3b4e022ba697c90997ead2c8ad77debf7ea96fc262a21caa2087cd7b62901bdb SHA512 c4a718ead714b9d2a22cff7e9a48846954f9606290ad533c0e491429b3455f43dee7a10a93a34f564e03e9e3b2eeef87d8276f6062d770f57afef27a7fbdb868 @@ -20,6 +21,7 @@ DIST superslicer-2.5.59.2-profiles.tar.gz 16253775 BLAKE2B 20c99b14ba8ee26ea2a21 DIST superslicer-2.5.59.2.tar.gz 45622782 BLAKE2B ff2fecf233d2710d706b64eb2191bfac39df3f631634de5f9eb1bca6ca712e94b0283beb7c6e9f3b293dc308b50240871ef8651a5355a4d7c5ea6092ac1a836b SHA512 af8878bd8e0c3e0dd5247ce01bdbd2b42b6766d81efbde11b71c6642787a12dfeaea91e653ac928066b9610cd911ea1f4dc77cf4823639030b3c104d955b8cbd DIST superslicer-2.5.59.8-profiles.tar.gz 17931886 BLAKE2B 953a777dd12971c355a5f48148d4c3831b9435cf08f1baecb32ff0ef6245678f81c53bf5078cc4d6d04642e9ee18e1023d5d1578ebdf1384c7c1ce44a1153c50 SHA512 2e4561de7c57308a91c8964c8a957bc10c5e4cedc47c5fc37633bbcf78e3576ed1eaa6d7126485e94eb0aa593940c73a460f3d5ad65f33001d32953caa2fb4e1 DIST superslicer-2.5.59.8.tar.gz 46021260 BLAKE2B 04abffd1a9cdf417d544539d5cde9b3559f2da7c1cb24cfa0e4a5d11359bca53cb25a90a3a14b26ee10e33e283ba4774d404265e6740b5457f82110be2a44af9 SHA512 57ef6c129c24378d6f4f78d34a60ed15668a8c5c266fa706937edebbd7b52d145657aae1e46a7b1d19dabaf403465bc5af50a94fa70205456bfc87a1458bac6e +EBUILD superslicer-2.5.59.10-r1.ebuild 2799 BLAKE2B 568bbab777f09dc266e9c6ecf9d40d908d1346c41520d58c5133e315bd1b282875645af2a73172a0cf9e376ae903e7d66597005a486b451a21a9e44a2adb254d SHA512 11e0a7f449fe51e3bae7108c3773e2acf31ae67827934e87126cf2355262ee5fec307d4ef842c640a381311c60449d83bba97b5ecad0752b2d9698d617d2b58b EBUILD superslicer-2.5.59.10.ebuild 2748 BLAKE2B b6865b9c9d61b0a5afd49b1632488cc9983c169af5b7ded19bcf3c146bd1870fbc940c699005e9777793d3c759ad517f7e103eded6f4b6350768929d298356ac SHA512 dd31e1a229973bc91fabf18a415a111859c230888477223a3d6df19c79fed1b06fbca9245e0eac549beffbcc6a27123f7e2b0e1831c1a23e737f0aedbc4d9f1e EBUILD superslicer-2.5.59.2-r2.ebuild 2490 BLAKE2B 5f1775a715b74a581daec55361e3c0b813d09e6e46fb47c27e680f0f739a822c9669fe7dc0e49b35365f78bde93ae5f112446580c058f56f17297d4e010f1f2b SHA512 febd71376f386a2c6b6cbd2f39b7f58e86f607475d33c9792bf099f195a1c6a0971b24b76dff8615e1bce2713c334ba702b78bff0e810dce5db85fbf5a464704 EBUILD superslicer-2.5.59.8.ebuild 2743 BLAKE2B 6a7842738221df57aa1ea8e0682c50252e044e74bf90d69dc894d3bc92586c7e9520bc429cac3d1e53907cef3a3f56311f0f454f41fed4c915463a412ad8878f SHA512 d5ef833bd7a87d177df2cf99ec6ad5b5eb31e61e4babc315020d602b8eac5aabfa0c5d70f22de86f186cf1c3efd935629166695533939c8d33861b9faf22463f diff --git a/media-gfx/superslicer/files/superslicer-2.5.59.10-boost-headers.patch b/media-gfx/superslicer/files/superslicer-2.5.59.10-boost-headers.patch new file mode 100644 index 000000000000..b6689d9a298e --- /dev/null +++ b/media-gfx/superslicer/files/superslicer-2.5.59.10-boost-headers.patch @@ -0,0 +1,45 @@ +https://bugs.gentoo.org/936146 +--- a/src/slic3r/GUI/GLTexture.cpp 2024-08-10 11:05:17.663411745 +0100 ++++ b/src/slic3r/GUI/GLTexture.cpp 2024-08-10 11:05:34.463543701 +0100 +@@ -10,6 +10,8 @@ + + #include <boost/filesystem.hpp> + #include <boost/algorithm/string/predicate.hpp> ++#include <boost/log/trivial.hpp> ++#include <boost/log/core.hpp> + + #include <vector> + #include <algorithm> +--- a/src/slic3r/GUI/RemovableDriveManager.cpp 2024-08-10 11:24:53.572234573 +0100 ++++ b/src/slic3r/GUI/RemovableDriveManager.cpp 2024-08-10 11:28:24.393792051 +0100 +@@ -22,7 +22,7 @@ + #include <pwd.h> + #include <boost/filesystem.hpp> + #include <boost/system/error_code.hpp> +-#include <boost/filesystem/convenience.hpp> ++//#include <boost/filesystem/convenience.hpp> + #include <boost/process.hpp> + #endif + +--- a/src/slic3r/GUI/ScriptExecutor.cpp 2024-08-10 11:28:32.423851365 +0100 ++++ b/src/slic3r/GUI/ScriptExecutor.cpp 2024-08-10 11:28:41.893921315 +0100 +@@ -10,7 +10,7 @@ + #include <boost/algorithm/string/erase.hpp> + #include <boost/algorithm/string/split.hpp> + #include <boost/filesystem.hpp> +-#include <boost/filesystem/string_file.hpp> ++//#include <boost/filesystem/string_file.hpp> + + #include <fstream> + #include <string> +--- a/src/slic3r/GUI/BitmapCache.cpp.old 2024-08-10 12:00:52.538869133 +0100 ++++ b/src/slic3r/GUI/BitmapCache.cpp 2024-08-10 12:01:15.519040423 +0100 +@@ -6,6 +6,8 @@ + #include "GUI_Utils.hpp" + + #include <boost/filesystem.hpp> ++#include <boost/log/trivial.hpp> ++#include <boost/log/core.hpp> + + #ifdef __WXGTK2__ + // Broken alpha workaround diff --git a/media-gfx/superslicer/superslicer-2.5.59.10-r1.ebuild b/media-gfx/superslicer/superslicer-2.5.59.10-r1.ebuild new file mode 100644 index 000000000000..a19e63212295 --- /dev/null +++ b/media-gfx/superslicer/superslicer-2.5.59.10-r1.ebuild @@ -0,0 +1,110 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +WX_GTK_VER="3.2-gtk3" +MY_PN="SuperSlicer" +SLICER_PROFILES_COMMIT="ca25c7ec55dcc6073da61e39692c321cdb6497dc" + +inherit cmake wxwidgets xdg flag-o-matic + +DESCRIPTION="A mesh slicer to generate G-code for fused-filament-fabrication (3D printers)" +HOMEPAGE="https://github.com/supermerill/SuperSlicer/" +SRC_URI=" + https://github.com/supermerill/SuperSlicer/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz + https://github.com/slic3r/slic3r-profiles/archive/${SLICER_PROFILES_COMMIT}.tar.gz -> ${P}-profiles.tar.gz +" + +LICENSE="AGPL-3 Boost-1.0 GPL-2 LGPL-3 MIT" +SLOT="0" +KEYWORDS="~amd64 ~arm64 ~x86" +IUSE="test" + +RESTRICT="test" + +# No dep on sci-libs/libigl, in-tree version cannot build +# static library currently. Using bundled one. +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:= + dev-libs/imath:= + >=media-gfx/openvdb-8.2:= + net-misc/curl[adns] + media-libs/glew:0= + media-libs/libpng:0= + media-libs/qhull:= + sci-libs/nlopt + sci-libs/opencascade:= + >=sci-mathematics/cgal-5.0:= + sys-apps/dbus + sys-libs/zlib:= + virtual/glu + virtual/opengl + x11-libs/gtk+:3 + x11-libs/wxGTK:${WX_GTK_VER}[X,opengl] +" +DEPEND="${RDEPEND} + media-libs/qhull[static-libs] +" + +PATCHES=( + "${FILESDIR}/${PN}-2.5.59.2-boost.patch" + "${FILESDIR}/${PN}-2.5.59.2-cereal.patch" + "${FILESDIR}/${PN}-2.5.59.2-dont-install-angelscript.patch" + "${FILESDIR}/${PN}-2.5.59.2-gcodeviewer-symlink-fix.patch" + "${FILESDIR}/${PN}-2.5.59.2-missing-includes-fix.patch" + "${FILESDIR}/${PN}-2.5.59.2-openexr3.patch" + "${FILESDIR}/${PN}-2.5.59.2-wxgtk3-wayland-fix.patch" + "${FILESDIR}/${PN}-2.5.59.2-relax-OpenCASCADE-dep.patch" + "${FILESDIR}/${PN}-2.5.59.2-link-occtwrapper-statically.patch" + "${FILESDIR}/${PN}-2.5.59.8-additional-imports-fixes.patch" + "${FILESDIR}/${PN}-2.5.59.8-fix-compilation-error-gnu17.patch" + "${FILESDIR}/${PN}-2.5.59.8-libnest2d-link-xcb.patch" + "${FILESDIR}/${PN}-2.5.59.8-boost-replace-load-string-file.patch" + "${FILESDIR}/${PN}-2.5.59.10-boost-1.85.patch" + "${FILESDIR}/${PN}-2.5.59.10-boost-headers.patch" +) + +S="${WORKDIR}/${MY_PN}-${PV}" + +src_unpack() { + default + + mv slic3r-profiles-*/* "${S}"/resources/profiles/ || die +} + +src_configure() { + CMAKE_BUILD_TYPE="Release" + + append-flags -fno-strict-aliasing + + 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_install() { + cmake_src_install + + rm "${ED}/usr/lib/udev/rules.d/90-3dconnexion.rules" || die +} diff --git a/media-gfx/sxiv/Manifest b/media-gfx/sxiv/Manifest index 16ec81c3af40..36010d28390c 100644 --- a/media-gfx/sxiv/Manifest +++ b/media-gfx/sxiv/Manifest @@ -1,5 +1,4 @@ AUX sxiv-25-makefile.patch 251 BLAKE2B 05b96799c7e94c2a907158becfbd3d0844a3919f75e7c4e6e8f994ec2881f173919c34625d80357882b28157f72ea6d0bbd6331473c6b213857c3e8a5db92bad SHA512 8e7b30bb73b87981b2d2c4e9bff8f62b5e59d341410dee0d4ecb889a0f39cfb38539a8d6ef2a738517ab5034c035e6588a4d2b7220bd408a2dd040f6cb8d7088 DIST sxiv-26.tar.gz 48569 BLAKE2B a73707e2fd699b53e38ddc48710a73b945d4e102743567283d7351c92c513e4e57a32c409267593a2c5808caf811b7caeb555f8ba2762f1cc76a421aceff0e95 SHA512 c4bd56ea14e520ea9b116e275009f2089e5c434d6894281215b09d07572b2d3190c3c3eca015a2933328d704afb7d443a66e858b4e6904a3d4d45378b35d22cb EBUILD sxiv-26.ebuild 1269 BLAKE2B a0b0b8ce87c89880c1178851d35e4b91da60a881260c79e7459776c3caade214258bd03b4fb96d800b3babe8f489e4f0b93e29bae45bf59a5ab9fa32130cd355 SHA512 8545378db759030ec1d768eb1a46be81a64ec662e250386d92a58a1c08fe13fa2cb3300b1d076eb4d7bc6bd4670c0d42322cb011c731c09ec099a02824754688 -EBUILD sxiv-9999.ebuild 1266 BLAKE2B 763b6673b358d2fae495e4509042d670fb406f27acb4557e9c259a929d05c4f482e20a1b0c226e76a8caab2390acedf3b22db1ee2dc05f79d41313d251f61162 SHA512 e36dc294b6a29021881d64fa48fd0dd93fc6adfd1761c358af51371c32281228f3519fdc8cc775dc9e925e762183a39e8075b667d2e4845c325a2670c7f86a0e MISC metadata.xml 244 BLAKE2B d7b28da2563099a3ae3aeaf6611e870f638d650a8997223ceb22cd178af94887d38f3082b4c357b463b309641d08d4b64f9db86e167f57ec4f80a6655565d41b SHA512 390c1b4771442a67506cdc8dbd5ff7ca2673af0635539e4cf6f7c252d29dd91b7e667f07992b412fd70649397ee9bc11fa0f3382e04ba74d3a7102a3ef15d194 diff --git a/media-gfx/sxiv/sxiv-9999.ebuild b/media-gfx/sxiv/sxiv-9999.ebuild deleted file mode 100644 index 79d85908dc89..000000000000 --- a/media-gfx/sxiv/sxiv-9999.ebuild +++ /dev/null @@ -1,60 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit desktop xdg-utils savedconfig toolchain-funcs - -if [[ ${PV} == "9999" ]] ; then - EGIT_REPO_URI="https://github.com/xyb3rt/sxiv.git" - inherit git-r3 -else - SRC_URI="https://github.com/xyb3rt/sxiv/archive/v${PV}.tar.gz -> ${P}.tar.gz" - KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86" -fi - -DESCRIPTION="Simple (or small or suckless) X Image Viewer" -HOMEPAGE="https://github.com/xyb3rt/sxiv/" - -LICENSE="GPL-2+ public-domain" -SLOT="0" -IUSE="exif gif +jpeg +png webp" - -RDEPEND=" - exif? ( media-libs/libexif ) - gif? ( media-libs/giflib:0= ) - media-libs/imlib2[X,gif?,jpeg?,png?,webp?] - x11-libs/libX11 - x11-libs/libXft -" -DEPEND="${RDEPEND}" - -PATCHES=( "${FILESDIR}"/${PN}-25-makefile.patch ) - -src_prepare() { - restore_config config.h - default -} - -src_compile() { - emake V=1 CC="$(tc-getCC)" HAVE_LIBEXIF=$(usex exif 1 0) HAVE_GIFLIB=$(usex gif 1 0) -} - -src_install() { - emake DESTDIR="${ED}" PREFIX=/usr install - emake -C icon DESTDIR="${ED}" PREFIX=/usr install - dodoc README.md - domenu sxiv.desktop - - save_config config.h -} - -pkg_postinst() { - xdg_desktop_database_update - xdg_icon_cache_update -} - -pkg_postrm() { - xdg_desktop_database_update - xdg_icon_cache_update -} diff --git a/media-gfx/symboleditor/Manifest b/media-gfx/symboleditor/Manifest index ca46d13a3c4a..731cc762996f 100644 --- a/media-gfx/symboleditor/Manifest +++ b/media-gfx/symboleditor/Manifest @@ -1,3 +1,5 @@ DIST symboleditor-2.1.0.tar.xz 495416 BLAKE2B 5f5d5a60806ebf0dacce5dcff538ac0f2c4966b2f2bda79450f66515d8572dd61a67db5e4d0f91b548a62c14e4e14aea283b710dc2a7c84770eb35dd22e20699 SHA512 dc83f3f80b12d8217a230d8c951e90bcc6246c4460d987efb140c54c1e88a8f5d607ac7ebfe706399cd0917e22a2089df6742afadd28305d39ceeff0c55da535 +DIST symboleditor-3.0.0_pre20250127-75f3cf6d.tar.gz 763265 BLAKE2B df801afec47e6a55686e74a8e097539baee0957436fc584fdcb8a09433477bd883c34e3399f38b29f62f6c981d9762c000dc51ec78d443ac7bde1ca2033256d6 SHA512 a18553d5bb52837474e6ec6cfb5b927ec30775ae3596dda4fba21898612a86a579707e6cc703828bd2ac8e78780ec297561b3535387f281d76cbc870691b363c EBUILD symboleditor-2.1.0.ebuild 1003 BLAKE2B e6e5bc144a54629d6c6c2524bcd7ca3c035210cfec9b45f27942170dc138056ff97d07fa60f85398f388297139e4c57151749cb5a0fa4610e453d6fbff5edfe2 SHA512 32269ee0db35663cb0fc08e1b00dd552a6b0f379db5a1de3af6f9b3e081b14d8dde3f3811134b6b5a57d6c279cb7b123ef3f3de775bc8c431a601b877a1b251f +EBUILD symboleditor-3.0.0_pre20250127.ebuild 964 BLAKE2B 80b95d8b0a4d7b0d83b8fc2a0794b3dc18b806c48a6313222fb649ecdf9c0ca5b268e6397c849aec9aa81438de49739c0776c35b81aef72c6addd1e9a46db0d8 SHA512 a8daab6b9e0dd661a0c46b36dec4be6b84dacfaa6094f127f919bdd3b0ffeb292d4b91d47d656771bb2ba7a9b9c3ca796db0a61da88689a13b59407eab2bbffd MISC metadata.xml 318 BLAKE2B 922a5e32e706b2976c5f359a14194d268d3f499398576c80ce5fad8c0fcea0fbf048de4480a80a6a1889c88b8b6c14147654a3ab4d5ffbcc258c2290da63f6d1 SHA512 614cb8dda7ad2088e5d6ef39b449bb4be0ac72cd0231c320188d76d1816dce6490c5114bb4798112c4b11d99d30a9e82ff8fcf08ffa8c049589682a5e38208f6 diff --git a/media-gfx/symboleditor/symboleditor-3.0.0_pre20250127.ebuild b/media-gfx/symboleditor/symboleditor-3.0.0_pre20250127.ebuild new file mode 100644 index 000000000000..e139d8938f25 --- /dev/null +++ b/media-gfx/symboleditor/symboleditor-3.0.0_pre20250127.ebuild @@ -0,0 +1,41 @@ +# Copyright 1999-2025 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +KDE_ORG_COMMIT=75f3cf6d57ea972a561c5c42a0e464a6aef90cd4 +ECM_HANDBOOK="optional" +KFMIN=6.5.0 +QTMIN=6.7.2 +inherit ecm kde.org + +DESCRIPTION="Application to create libraries of QPainterPath objects with rendering hints" +HOMEPAGE="https://apps.kde.org/symboleditor/ +https://userbase.kde.org/SymbolEditor" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64 ~x86" + +DEPEND=" + >=dev-qt/qtbase-${QTMIN}:6[gui,widgets] + >=kde-frameworks/kconfig-${KFMIN}:6 + >=kde-frameworks/kconfigwidgets-${KFMIN}:6 + >=kde-frameworks/kcoreaddons-${KFMIN}:6 + >=kde-frameworks/ki18n-${KFMIN}:6 + >=kde-frameworks/kio-${KFMIN}:6 + >=kde-frameworks/kwidgetsaddons-${KFMIN}:6 + >=kde-frameworks/kxmlgui-${KFMIN}:6 +" +RDEPEND="${DEPEND} + !${CATEGORY}/${PN}:5 +" +BDEPEND="sys-devel/gettext" + +src_configure() { + local mycmakeargs=( + -DCMAKE_DISABLE_FIND_PACKAGE_Doxygen=ON + ) + + ecm_src_configure +} diff --git a/media-gfx/tif22pnm/Manifest b/media-gfx/tif22pnm/Manifest index a30eeef2afbe..24f6a2c967f6 100644 --- a/media-gfx/tif22pnm/Manifest +++ b/media-gfx/tif22pnm/Manifest @@ -1,5 +1,5 @@ AUX tif22pnm-0.14-gentoo.patch 990 BLAKE2B 03603a6082d3b29f6917b14b8f43890886303d5b88ff602c03fb15d98b4271594677869e5432473f91dfd55062b8d0d459d235b7581908f978d957b3b1a9c54f SHA512 583a43fec6e9152bf7452f693fcd47e611d4eec05cc4073422f895350e6c02b10b914c5ef6edc83ba12ccda8eb16063878dbb0736b14092671bdfb51889459b9 AUX tif22pnm-0.14-math.patch 760 BLAKE2B a5a9b9c30c60fd78bec411925b545c4fe5396c13a7598cd259eed376bbeee3c14ed4b4e19e82282d39a2bc45be35197c0655db897ee2914511da634f1b72eed8 SHA512 616217de0ebb1ef790096d82582508e5b0df1224e2aecd35638205aa9f088683acf7e8d51db060fabcece21976b0f048ac816b361d2240656f3edb262612d6ea DIST tif22pnm-0.14.tar.gz 108047 BLAKE2B e6252a9388710950e62c9500fa1578a9a624d4181ff6482f9333b84daf79a9f2d5b62ab6e1cc80b08d96c47b8d401f7fb53afe4523672fe9e0eec38ed2fb4f5a SHA512 0cc09cfca3dcf0de8d3ee50a3d9a061e80a5298f40e7bdc3483f0ec5dfcca419af797fb30c2d97ae7a1d16e3e58d627ae5a3596043eea7ad35a504abab4885f9 -EBUILD tif22pnm-0.14-r1.ebuild 643 BLAKE2B 2eb1a0de864646e0f30d9b5862e023fdf0f7ec1f90bfea2e6e8dae246e08d6482e3ecaf423e4a66943e0d4cf1d9a40b9e67c7d81534523ced00c62554df1cfd2 SHA512 878178569792b96053ec0c69057a38e5888f5bb0868cc586a7055c0797adb3ad35a9294a50cd511237910ae3188d7077ac6fffb84930475cc537e7668fa0fd82 +EBUILD tif22pnm-0.14-r1.ebuild 728 BLAKE2B 035f257fc3629890e73b7e11544195d0b7370ad71eb812135a62f05d1e2c03e3f945a96c6b0b87b51ac6fa8aa0257e22ef53f362aa56cd06781b5a5a5411b8a9 SHA512 64ec3f3acc68a2691ca99fabf155414203fece8dfae2fb126c096816b2d0129817e74a0ebc1051e8150b366b487a929baa570cc6459d25d1cf22ac7eebbac778 MISC metadata.xml 325 BLAKE2B 942b67f8ebd6e199e6f123791f082bb7fcb9c25005613819688ca8358c47efec6bdce5270ceb3ba87c85cddf650553041a804e5edc6378ee7aa579a7773153b0 SHA512 eb7c41bf79be0947ad3736ca1d5f3f9ac3074d4013f7921d49950011446651e55b17be2b5d6c2f10490bf63a958313685d2ef3af447a9055b866e10e98ab7f0f diff --git a/media-gfx/tif22pnm/tif22pnm-0.14-r1.ebuild b/media-gfx/tif22pnm/tif22pnm-0.14-r1.ebuild index eb2fd906a707..7e8f20c59ac1 100644 --- a/media-gfx/tif22pnm/tif22pnm-0.14-r1.ebuild +++ b/media-gfx/tif22pnm/tif22pnm-0.14-r1.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 -inherit autotools +inherit autotools flag-o-matic DESCRIPTION="tif22pnm and png22pnm command-line converters" HOMEPAGE="http://pts.szit.bme.hu/ https://code.google.com/p/sam2p/" @@ -29,6 +29,13 @@ src_prepare() { eautoreconf } +src_configure() { + # bug #944994 + append-cflags -std=gnu17 + + default +} + src_install() { dobin png22pnm tif22pnm einstalldocs diff --git a/media-gfx/tintii/Manifest b/media-gfx/tintii/Manifest index f3e1f311d523..38b52f1d5fd2 100644 --- a/media-gfx/tintii/Manifest +++ b/media-gfx/tintii/Manifest @@ -1,4 +1,4 @@ DIST tintii-2.10.0.tar.gz 620863 BLAKE2B 61127bfe1ce1eca87cea7fcd5cc6ef95c445ad0cdf32fd2d752a27818df8132ee0d7e6eab355c37ff3535be416a79b34652e8a28d8f93e0bd523a15396f6a4cd SHA512 884a9a3393080ee064069288afc13b2f72272571efaabf013ea2029627fc2ed922dcb791b8316c1d2117faf553d6bf333cf35f0486ba82aa2dc0987f9ce5f9a3 DIST tintii_128.png 22351 BLAKE2B 54f32b1a0037e4acb05fa524ddbea10a942b0441570e4bb73f4659f1b536ac72261ad2ffd03db5a0df6f5819cb58081ce2371cce981ee037023b27054a31db56 SHA512 fb5458a10b6a461dc3b9a7e15d65616c8df318fc2a439118e0d0433e5badebe18da499ff7627ac30fd0374f754ebb90ac9c7ce5b2fb521820ea134a625862052 -EBUILD tintii-2.10.0-r2.ebuild 773 BLAKE2B 24b7bd86087b371c5d3e2646b48327da64d493f4ab9462919c601537d8a9f5670c21574098dd8588a444ce7cb40f26364eb96cc525c9a9a45fa21c80deb2a7ca SHA512 5aa51a0ea3716833e067b239ba08aec990e5f35e8cd6de88d84f7deae0063fe19830b338678eda29109898916a9f12be9fc223795485b9fac2eff4d3f47abeec +EBUILD tintii-2.10.0-r2.ebuild 745 BLAKE2B 9b598db2036ee84ba347e588e7bea5b215160fd785d96d5adf0c7a9be5e5b01c1dd5561481c0c4dad8a3a619022e463c95f07281f0c69b8e087faa2dc40874b0 SHA512 26d31875f8733638043b2cee60729bc6b11dbe510667213ca80d989a7a53bc5a902e67ada96b5521af2284bb04aada68df218942b58ed985f21e7a8637551ceb MISC metadata.xml 167 BLAKE2B 868e3b584722eaacf68273db062bb773d8c7e5d7ab2b81ca7e8397643bf7cc106c3a1033594401c99c54f667bb45d6b73f9048fc335580bbd44b4589ad26a832 SHA512 30caadd1496c3b9969136038239a1d8e01f236726b4022c2d7e19ca7575f25f735e556835e581afbf44fbd3e4104c40f2b5ef5fa70118d75c881fdf871962d0a diff --git a/media-gfx/tintii/tintii-2.10.0-r2.ebuild b/media-gfx/tintii/tintii-2.10.0-r2.ebuild index e7518338c7b0..93920542bbc7 100644 --- a/media-gfx/tintii/tintii-2.10.0-r2.ebuild +++ b/media-gfx/tintii/tintii-2.10.0-r2.ebuild @@ -23,12 +23,8 @@ DEPEND="${RDEPEND} " BDEPEND="app-alternatives/bc" -src_prepare() { - default - setup-wxwidgets -} - src_configure() { + setup-wxwidgets econf --disable-assert } diff --git a/media-gfx/transfig/Manifest b/media-gfx/transfig/Manifest index c30b2e8b59f3..bdd902b4d9ff 100644 --- a/media-gfx/transfig/Manifest +++ b/media-gfx/transfig/Manifest @@ -4,5 +4,5 @@ AUX transfig-3.2.5e-gcc10-fno-common.patch 939 BLAKE2B 70af7830470b5ed524d6b5df5 DIST fig2mpdf-1.1.2.tar.bz2 191438 BLAKE2B 411791fecf6e10aac92c004c7da69a10c97a6e12f811452f12d0b51b3a1eeff8fff97d831a5e64c9047855d27e6825a4e65f62be2536651e5876edd00cc822a9 SHA512 36dea40008371386b47a4451e2f311cc2540ab063e3b61e628a535775d62a8840c5cc20c37b80465184bf041c6e583aaf3e5156079e72211d0a87ff3346d2980 DIST transfig-3.2.5e-gentoo-patchset-r1.tar.bz2 21160 BLAKE2B 093020827fc0636f7549c3b325e4f148aa52407d8e288038dd02012875737523e83e0717662d04e463a01e8cfacfabffaaa4362b5bb1276c4f2052f6653fa26f SHA512 dbef1ca464929de45f3c706e76eb9f324ea9e692cc8c924893926e07ef7d4e0dbe597bcf465a9c7fc9fca22abe0acc6784ab09658a18aeff4ba44921b52b02ff DIST transfig.3.2.5e.tar.gz 531256 BLAKE2B 830a97cb801b9cb284f7746a7f4a9645263cc34fd35d904288143d730331901302b12223ba135d8fa936f5ca0eeccacd194bbe2e74dfcfbf0cf4aede273ab507 SHA512 ed1379f1112514d90a4b3eecd3222baad311d804b5090e8e66867ec299e4f9a5f8d83ef8939aa6ecaa85a18143b8fb9b97f78e078ac5eeb934a158c55de6bb1e -EBUILD transfig-3.2.5e-r2.ebuild 3546 BLAKE2B 2ed5fd1a33b9bbcff7dd103e51ee83061f5b5517fdedfa9330f51e48eba4e771667bf27eb57c542ff397a5b2a1f7a4d9692af32306debf3c4b041ac6329ba86b SHA512 55588bc54e4b2af5860a78d3c4c7e04b1fa7a47480333de39063918ef74211c5ce457d046134080f04e9717d77b8df5348291e239af70aa898d3cbd880d70bfe +EBUILD transfig-3.2.5e-r2.ebuild 3540 BLAKE2B 4b238a7ec2a4fd8b420b8ea95a8e1eabb1e9ad9440ebbd5089376947966fd6c94e479304decabccd7d081104dabdcd401a14c28baf54dbc0aacc706fe477b5e5 SHA512 9b3b8be47db2947b4676e77daabcc8333d5c5f676947767dfdb18b53362715cd4593926e7c2d1e7d2f9b93bdbc1486edb295b30f2192733aca0ea91d4024f023 MISC metadata.xml 484 BLAKE2B 8f0c03a4eae95a088a590133f0a911b6ff795d23aba1fddcafeceb40433b5af14c530b288552e6e97d5fd981dd37fc8491a7e4cfe5b79cf872c2fb70015d7cb6 SHA512 4c8313b75726d3fe87f68b7810f9f69a0a9fa4deddd856d5e7276bb5b419400ca583a96d59f3333edba52c71bc53f4687dcfe4e72e37e85e80a9cc95c52a733e diff --git a/media-gfx/transfig/transfig-3.2.5e-r2.ebuild b/media-gfx/transfig/transfig-3.2.5e-r2.ebuild index 3aa1cb9bbdf4..252609df7e84 100644 --- a/media-gfx/transfig/transfig-3.2.5e-r2.ebuild +++ b/media-gfx/transfig/transfig-3.2.5e-r2.ebuild @@ -16,7 +16,7 @@ S="${WORKDIR}/${MY_P}" LICENSE="BSD" SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris" +KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris" RDEPEND=" media-libs/libpng 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/ueberzug/Manifest b/media-gfx/ueberzug/Manifest index 3eada40de1b0..7b306af33064 100644 --- a/media-gfx/ueberzug/Manifest +++ b/media-gfx/ueberzug/Manifest @@ -1,3 +1,3 @@ -DIST ueberzug-18.2.3.tar.gz 57640 BLAKE2B c174f39cb20a24c07f12088e595492960319a9fd5079e0a23e9632353fa7c93762621224a3fde4b2462931647239e3614ed9a1dffc635fea7a51c58d2b846b68 SHA512 6f8f342b4a593e857f70c053fc5b9e75bc2c3a063221ca64850acb8c325323bee50c9d471fe55de6bbb484d8c958d5bf3037e836b52734d617f1cea4be509a08 -EBUILD ueberzug-18.2.3.ebuild 946 BLAKE2B 5395c59b7d17d3a590d280dc833b4ab92ff11d20cc9e54e1e9e849f09c6de85fecb7e1515b791074a90c1d165e69c58db57e416b68612d0c64064b901fe73a9e SHA512 392566cd4ff83d2baada2d7582196d2b5917ad8dd9e94d9068e01185ec8b86b13ed46fad7e9f1b2bc2215018d5294538695de6af1f4a71906ea1d7c3bd24d01a +DIST ueberzug-18.3.1.tar.gz 58290 BLAKE2B 879f4dd7898a569cf70200fb683d6220bd410b7738963527030e504c59ef9095a28c4380c695ae8034ac2cd1d841df044ad4cad34f72c3ad24b8ef32c9473f7e SHA512 194f94c69d61163edde4a09b9575efa18d82119636f1b89b062fde207b18c7d0aca3ed144b08194a81417f6fe5ae9069de58b824b31ad1f34ecb80c67b4d1fc1 +EBUILD ueberzug-18.3.1.ebuild 825 BLAKE2B d7335cff47d0d76e18a675da3d3bcb0a7dbe5f956df7b6a008a5815a2e9075cdb7efd1434911a17b6e70429eca5e72f66452a91e4fadf31a66b9fff8a5f7e68c SHA512 bdc65961f8ab681fba56c4b7c0ae9b9b75c955a012e665ef803c92154c7c8f5d9c278c67047371e22b0e33bed6d3b13c3ea58928b5571e55385d4d6539721ffd MISC metadata.xml 331 BLAKE2B 44d4e01eb445cdd5ecc879970295dccd3ba4c6d171d7e9cb41042200f5dc1ca01fc12b0c44c940d3e7045f5e44ad1ad4392125a62030bfd16edc3509a6689912 SHA512 b6ccd68127b77599f1008e595258583978523ebc200266eb234ec8732f914cc16d056fd84bec6feba5e455fade8ae7f963928e830c4a645c9b9a7c8b702eb4ac diff --git a/media-gfx/ueberzug/ueberzug-18.2.3.ebuild b/media-gfx/ueberzug/ueberzug-18.3.1.ebuild index 2f812a2152f9..ce8d9a8cbe37 100644 --- a/media-gfx/ueberzug/ueberzug-18.2.3.ebuild +++ b/media-gfx/ueberzug/ueberzug-18.3.1.ebuild @@ -4,7 +4,7 @@ EAPI=8 DISTUTILS_EXT=1 -DISTUTILS_USE_PEP517=setuptools +DISTUTILS_USE_PEP517=meson-python PYTHON_COMPAT=( python3_{10..13} ) inherit distutils-r1 @@ -36,9 +36,4 @@ DEPEND=" x11-base/xorg-proto " -python_install() { - distutils-r1_python_install - - # https://github.com/ueber-devel/ueberzug/issues/9 - rm -r -- "${D}$(python_get_sitedir)"/ueberzug/X || die -} +distutils_enable_tests import-check diff --git a/media-gfx/valentina/Manifest b/media-gfx/valentina/Manifest index 2cd472c839d6..be1517d15115 100644 --- a/media-gfx/valentina/Manifest +++ b/media-gfx/valentina/Manifest @@ -1,9 +1,4 @@ -AUX 5823.patch 1870 BLAKE2B 1a4edc390abd09010fb946035dab6f4ee9223eaa286f9843404db4f95d94e60da73dbf515c99aa857acdcb7d26bca3117fcdfdf2b9514ad45c2e795ab579cc46 SHA512 0cf9d1691816b165ab691cd34807f7c82eea685b5af2d9c483a9427987ae565f44e31bffcec9c3ede6102aa800d3988b054a178ec74f1826be1a88fd9f5ec28c -AUX valentina-0.6.1-disable-vcs-version.patch 2623 BLAKE2B 30ed726eabcbf18269fb41f7cb32230b0f498364b6e2922de415cc93c4fce49dca2b5db7d28cc8fb34efbc11e7b8f136f601fc0d552b52869042c496cf627463 SHA512 906f82b0793919be6a846030b4b5891e716967e9c2bd8b01bf81671383cc5f20d50ddc0c6d174c08b5e5f31522acf7283b2cc6d11e29bca60d45a64cc7418e98 -DIST valentina-5858.patch.bz2 4507 BLAKE2B 10bf1e48b9c822b5fecd040edea05a9fa16bc84d6d8a872a50329bd6b61ae250b489fbf71b19f0453ab5caea0bd7dc821d8c6fbe0fc24a6306d57ce5b34350f9 SHA512 037d2a5305d85d7d6be90c181ee6c39110a86c5f5d77c22453a2933e7d6a43c600f6ffb393015e98f9aab55b0d11291dca482352e1fc74f485578b65b3b84720 -DIST valentina-v0.6.1.tar.bz2 25575677 BLAKE2B 56d5adc973df319b3a65f877768c2195e1af2db39118e18fb17636e5739610d55e4ade4d4516a6817347dcdb0e4468e4587cff91fc5a5ea74a35029c52bf858c SHA512 52a3a02bd08f85c6241fe29baa9c8a2b80d2e8b071877bc68f98c3ff7bcdf810d9975903f804bf4e120f1a65c06de405fd44bc822292ab7b6191b778ec703542 DIST valentina-v0.7.52.tar.bz2 30819274 BLAKE2B 3b9b2ac2c4083371420dca4911bf5162d9d772ddf0a8b4582dac7ca47e6f027279a99bd3d674a7f0ce15e962cdf1afbdb573f8a14a5f6c02baae1f7a5aae37a1 SHA512 71ff3dc4ccea2ee3df34fda0364b211a80d4f953e6d3b9bf9b40ba1f4d1531e751d077983e8d13acb1f524c9883d2f565289d1b67d5de0a152c9a4df1428d6df -EBUILD valentina-0.6.1-r1.ebuild 2172 BLAKE2B b63a3eb14070d035807174444cf7fdc8458c46bf00598ce536b2acd91ee176b46072d2ce06723b8cd4bfaac8ff05cfdb10298a2b81fcd4ec9ccb357d48e08ff4 SHA512 09c5cbb557a57bad0868e335ae465e1ffcd475070a955ab9db04ca5d0ff317c0a88dd4f5344f275edadb8df456f5602080b53c312b7d358c7722de0f4594f21b -EBUILD valentina-0.7.52.ebuild 2013 BLAKE2B 42d6f8fa863282131a95028c96fcee44607a0cdade9f64f2b2e35b745c4190f7d042f04b567b23fcbcc76855008691ff526130afd2221298e183aadca14e88fc SHA512 f9df543da310fad259ea1853f769f1a32f8d5145fc9cb3ff6418bbfdfd8771485f03ca59b9e4a07e576c8a596271cb12516715d34e327f6a9acc140e0fef3251 -EBUILD valentina-9999.ebuild 1928 BLAKE2B d3f0aad7c7d95a01274351bd9b7b18c493f210960a46bc00ecf83a4f6d3458d83b7d9909ec0c1d38296f9028576117c1c83acf342d0d32c28dc8bfb3d924e7b0 SHA512 68264e82fea642bef07c45a3a9d2ac3775aa34453d931fadabb49d6177f01f7d280e2d2dc11f6a5097e7e118b7708e3e3dd2ed8dfcd7e3ef4dbdc5943d9d3f5c +EBUILD valentina-0.7.52.ebuild 2038 BLAKE2B 0a3d6be3716c3169a73c8f3eb0e790700b3f9f153ef23b2ce9600802e80cba18d037f89367af61c4370c2fb2733327678fcbfd3b94889b1f2b911f7da12ccb17 SHA512 a16aaf205ef7d5d5a4291b25cd6166d1a2dc69f4568ba4414d82ab90251af5f5393db42ab5e37905a23ceb63978cb8bd80ea0e9d52e92c88fd12dd17f600e8b4 +EBUILD valentina-9999.ebuild 1955 BLAKE2B b9e124e830e6e1de84c8e96d9424f07a6deeb6dd31ab3977218a82a3c7217b120be6f91bb16927d25fc1b603c2524c8b61ce5ae8200a326c45482e774a25a1b6 SHA512 199e54d12fa72cabb42c07213d0d896251fc29e39a4140c445219c9b44876bc41b2561a5501ad99359a3f583e5b21ea8d7e6730a324d4784ce5ea047fc8a42ce MISC metadata.xml 338 BLAKE2B e25c965f49a8f8a62e13090a542f31a4dd8e750d22c41f53f786e63508ac714f97bccffa45b980d276674b322c87939220a6ae78710bd3a5cef43fc6220abea6 SHA512 4a08041d3ff622c268d11d6f584ceee0912bfde684519962e942798fe47597b62edc5a00125a497c796b60d29e9f8b20e423ba2ad9ef52fcd7056982236c0851 diff --git a/media-gfx/valentina/files/5823.patch b/media-gfx/valentina/files/5823.patch deleted file mode 100644 index 79df9a74c5a6..000000000000 --- a/media-gfx/valentina/files/5823.patch +++ /dev/null @@ -1,50 +0,0 @@ -# HG changeset patch -# User Roman Telezhynskyi <kroluku@gmail.com> -# Date 1551441739 -7200 -# Fri Mar 01 14:02:19 2019 +0200 -# Branch release -# Node ID 82e62ea2d785e093af68089e509b224f3f4f843f -# Parent 0108ef767e2447e5b5f39378bcf245e25947a25d -Don't use Qt OpenGL module since Q5.4. - -diff -r 0108ef767e24 -r 82e62ea2d785 src/app/valentina/valentina.pro ---- a/src/app/valentina/valentina.pro Sun Feb 24 17:29:12 2019 +0200 -+++ b/src/app/valentina/valentina.pro Fri Mar 01 14:02:19 2019 +0200 -@@ -297,7 +297,6 @@ - $$[QT_INSTALL_BINS]/icuuc*.dll \ # Different name for different Qt releases - $$[QT_INSTALL_BINS]/Qt5Core.dll \ - $$[QT_INSTALL_BINS]/Qt5Concurrent.dll \ -- $$[QT_INSTALL_BINS]/Qt5OpenGL.dll \ - $$[QT_INSTALL_BINS]/Qt5Gui.dll \ - $$[QT_INSTALL_BINS]/Qt5Network.dll \ - $$[QT_INSTALL_BINS]/Qt5PrintSupport.dll \ -@@ -309,6 +308,11 @@ - $$[QT_INSTALL_BINS]/libstdc++-6.dll \ - $$[QT_INSTALL_BINS]/libwinpthread-1.dll - -+ # Don't use Qt OpenGL module since Q5.4 -+ equals(QT_MAJOR_VERSION, 5):lessThan(QT_MINOR_VERSION, 4) { -+ package.files += $$[QT_INSTALL_BINS]/Qt5OpenGL.dll -+ } -+ - # For support Windows 7+ - greaterThan(QT_MAJOR_VERSION, 4):greaterThan(QT_MINOR_VERSION, 6) { - package.files += $$[QT_INSTALL_BINS]/Qt5WinExtras.dll -diff -r 0108ef767e24 -r 82e62ea2d785 src/libs/vwidgets/vwidgets.pro ---- a/src/libs/vwidgets/vwidgets.pro Sun Feb 24 17:29:12 2019 +0200 -+++ b/src/libs/vwidgets/vwidgets.pro Fri Mar 01 14:02:19 2019 +0200 -@@ -7,7 +7,12 @@ - # File with common stuff for whole project - include(../../../common.pri) - --QT += widgets printsupport opengl -+QT += widgets printsupport -+ -+# Don't use Qt OpenGL module since Q5.4 -+equals(QT_MAJOR_VERSION, 5):lessThan(QT_MINOR_VERSION, 4) { -+ QT += opengl -+} - - # Name of the library - TARGET = vwidgets - diff --git a/media-gfx/valentina/files/valentina-0.6.1-disable-vcs-version.patch b/media-gfx/valentina/files/valentina-0.6.1-disable-vcs-version.patch deleted file mode 100644 index 471d7a85313c..000000000000 --- a/media-gfx/valentina/files/valentina-0.6.1-disable-vcs-version.patch +++ /dev/null @@ -1,75 +0,0 @@ -diff --git a/common.pri b/common.pri -index 523aa7c..33be789 100644 ---- a/common.pri -+++ b/common.pri -@@ -212,37 +212,7 @@ defineReplace(enable_ccache){ - } - - defineReplace(FindBuildRevision){ --CONFIG(debug, debug|release){ -- # Debug mode -- return(\\\"unknown\\\") --}else{ -- # Release mode -- -- macx{ -- HG = /usr/local/bin/hg # Can't defeat PATH variable on Mac OS. -- }else { -- HG = hg # All other platforms are OK. -- } -- -- #build revision number for using in version -- unix { -- DVCS_HESH=$$system("$${HG} log -r. --template '{node|short}'") -- } else { -- # Use escape character before "|" on Windows -- DVCS_HESH=$$system($${HG} log -r. --template "{node^|short}") -- } -- isEmpty(DVCS_HESH){ -- DVCS_HESH=$$system("git rev-parse --short HEAD") -- isEmpty(DVCS_HESH){ -- DVCS_HESH = \\\"unknown\\\" # if we can't find build revision left unknown. -- } else { -- DVCS_HESH=\\\"Git:$${DVCS_HESH}\\\" -- } -- } else { -- DVCS_HESH=\\\"Hg:$${DVCS_HESH}\\\" -- } -- return($${DVCS_HESH}) --} -+return(\\\"unknown\\\") - } - - # Default prefix. Use for creation install path. -diff --git a/src/libs/vmisc/vmisc.pro b/src/libs/vmisc/vmisc.pro -index cf8db51..fff1c0e 100644 ---- a/src/libs/vmisc/vmisc.pro -+++ b/src/libs/vmisc/vmisc.pro -@@ -98,10 +98,7 @@ CONFIG(debug, debug|release){ - HG = hg # All other platforms all OK. - } - #latest tag distance number for using in version -- HG_DISTANCE=$$system($${HG} log -r. --template '{latesttagdistance}') -- isEmpty(HG_DISTANCE){ -- HG_DISTANCE = 0 # if we can't find local revision left 0. -- } -+ HG_DISTANCE = 0 # if we can't find local revision left 0. - message("Latest tag distance:" $${HG_DISTANCE}) - DEFINES += "LATEST_TAG_DISTANCE=$${HG_DISTANCE}" # Make available latest tag distance number in sources. - } -diff --git a/src/libs/vtest/vtest.pro b/src/libs/vtest/vtest.pro -index a336d48..c943fc5 100644 ---- a/src/libs/vtest/vtest.pro -+++ b/src/libs/vtest/vtest.pro -@@ -92,10 +92,7 @@ CONFIG(debug, debug|release){ - HG = hg # All other platforms all OK. - } - #latest tag distance number for using in version -- HG_DISTANCE=$$system($${HG} log -r. --template '{latesttagdistance}') -- isEmpty(HG_DISTANCE){ -- HG_DISTANCE = 0 # if we can't find local revision left 0. -- } -+ HG_DISTANCE = 0 # if we can't find local revision left 0. - message("Latest tag distance:" $${HG_DISTANCE}) - DEFINES += "LATEST_TAG_DISTANCE=$${HG_DISTANCE}" # Make available latest tag distance number in sources. - } diff --git a/media-gfx/valentina/valentina-0.6.1-r1.ebuild b/media-gfx/valentina/valentina-0.6.1-r1.ebuild deleted file mode 100644 index 573945103dcb..000000000000 --- a/media-gfx/valentina/valentina-0.6.1-r1.ebuild +++ /dev/null @@ -1,126 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit qmake-utils xdg - -DESCRIPTION="Cloth patternmaking software" -HOMEPAGE="https://smart-pattern.com.ua/" -SRC_URI="https://gitlab.com/smart-pattern/${PN}/-/archive/v${PV}/${PN}-v${PV}.tar.bz2 - https://dev.gentoo.org/~fordfrog/distfiles/valentina-5858.patch.bz2" - -LICENSE="GPL-3" -SLOT="0" -KEYWORDS="amd64 x86" - -LANGS="cs de el en en es fi fr he id it nl pt-BR ro ru uk zh-CN" - -for LANG in ${LANGS}; do - IUSE="${IUSE} l10n_${LANG}" -done - -RDEPEND=" - app-text/poppler - dev-qt/qtconcurrent:5 - dev-qt/qtcore:5 - dev-qt/qtgui:5 - dev-qt/qtnetwork:5[ssl] - dev-qt/qtopengl:5 - dev-qt/qtprintsupport:5 - dev-qt/qtsvg:5 - dev-qt/qtwidgets:5 - dev-qt/qtxml:5 - dev-qt/qtxmlpatterns:5" -DEPEND=" - ${RDEPEND} - dev-qt/qttest:5 -" -BDEPEND=" - dev-qt/linguist-tools:5 -" - -S=${WORKDIR}/${PN}-v${PV} - -PATCHES=( - "${FILESDIR}/5823.patch" - "${FILESDIR}/${P}-disable-vcs-version.patch" - "${WORKDIR}/valentina-5858.patch" -) - -src_configure() { - local locales="" - local locale - - for LANG in ${LANGS}; do - if use l10n_${LANG}; then - case ${LANG} in - "cs") - locale="cs_CZ" - ;; - "de") - locale="de_DE" - ;; - "el") - locale="el_GR" - ;; - "en") - locale="en_CA en_IN en_US" - ;; - "es") - locale="es_ES" - ;; - "fi") - locale="fi_FI" - ;; - "fr") - locale="fr_FR" - ;; - "he") - locale="he_IL" - ;; - "id") - locale="id_ID" - ;; - "it") - locale="it_IT" - ;; - "nl") - locale="nl_NL" - ;; - "pt-BR") - locale="pt_BR" - ;; - "ro") - locale="ro_RO" - ;; - "ru") - locale="ru_RU" - ;; - "uk") - locale="uk_UA" - ;; - "zh-CN") - locale="zh_CN" - ;; - esac - - locales="${locales} ${locale}" - fi - done - - eqmake5 LOCALES="${locales}" "CONFIG+=noDebugSymbols no_ccache noRunPath noTests noWindowsInstaller" Valentina.pro -r -} - -src_install() { - emake install INSTALL_ROOT="${D}" - - dodoc AUTHORS.txt ChangeLog.txt README.txt - - doman dist/debian/${PN}.1 - doman dist/debian/tape.1 - - cp dist/debian/valentina.sharedmimeinfo dist/debian/${PN}.xml || die - insinto /usr/share/mime/packages - doins dist/debian/${PN}.xml -} diff --git a/media-gfx/valentina/valentina-0.7.52.ebuild b/media-gfx/valentina/valentina-0.7.52.ebuild index c44783b0bd50..0bc1915982fa 100644 --- a/media-gfx/valentina/valentina-0.7.52.ebuild +++ b/media-gfx/valentina/valentina-0.7.52.ebuild @@ -11,7 +11,7 @@ SRC_URI="https://gitlab.com/smart-pattern/${PN}/-/archive/v${PV}/${PN}-v${PV}.ta LICENSE="GPL-3" SLOT="0" -KEYWORDS="~amd64 ~x86" +KEYWORDS="amd64 x86" LANGS="cs de el en en es fi fr he id it nl pt-BR ro ru uk zh-CN" @@ -30,7 +30,9 @@ RDEPEND=" dev-qt/qtsvg:5 dev-qt/qtwidgets:5 dev-qt/qtxml:5 - dev-qt/qtxmlpatterns:5" + dev-qt/qtxmlpatterns:5 + !sci-biology/tree-puzzle +" DEPEND=" ${RDEPEND} dev-qt/qttest:5 diff --git a/media-gfx/valentina/valentina-9999.ebuild b/media-gfx/valentina/valentina-9999.ebuild index 6b9c6fa11b44..1307c3f81ad2 100644 --- a/media-gfx/valentina/valentina-9999.ebuild +++ b/media-gfx/valentina/valentina-9999.ebuild @@ -30,7 +30,9 @@ RDEPEND=" dev-qt/qtsvg:5 dev-qt/qtwidgets:5 dev-qt/qtxml:5 - dev-qt/qtxmlpatterns:5" + dev-qt/qtxmlpatterns:5 + !sci-biology/tree-puzzle +" DEPEND=" ${RDEPEND} dev-qt/qttest:5 diff --git a/media-gfx/viewnior/Manifest b/media-gfx/viewnior/Manifest index cfcb2d3b4c1d..9520e071db04 100644 --- a/media-gfx/viewnior/Manifest +++ b/media-gfx/viewnior/Manifest @@ -2,4 +2,4 @@ AUX viewnior-1.8-add-support-for-exiv-0.28.0-errors.patch 1669 BLAKE2B db9e54bc5 AUX viewnior-1.8-change-exiv2-AutoPtr-to-unique_ptr.patch 2695 BLAKE2B 7b1f23195267443b5920b1e11cb1bc4f9177e86f32bc74f92f6afcc8b2a16bf42dc7f40e9865e37ca0d5bb76a3f9916654df34b41a66bd11f03540f10624c5b1 SHA512 b2921294703d2791f2bc8e71de758ae42031b14b422eab462cebb5f49c410736c67dce919358425f77ef17c941f7e4f363f932af605696cc745c40fc4fa5c9a7 DIST viewnior-1.8.tar.gz 169219 BLAKE2B 6f6da16aa987acce8a48d24a645e1c033f113bb6e291da9f17810a7a04e5007d27c2f1afe3c62cc2d192003633a4128fb04a031160fbd51efbd0bb7dfabd8970 SHA512 0f9698801172ef6b8f5df4132526b2e605e9aa9fd69cf41a091a3623de9b2e84ca857e625aaa9e83f29df318f70a13fb458bac0df11ae46837b78ef257a00bee EBUILD viewnior-1.8-r1.ebuild 1171 BLAKE2B 8de7ca3d51a65481206f8c3a1e0102b5a7567266042d2a2d441e3232bcad1a326f6064f729d96f4773787cf6f6cc03d11a6933269325048b790c273aea62e813 SHA512 99bd3b280ca8c385b6c7570af2426ee1214b839c86c3f140212be8a0c6367e4fcc9f79301cad7479f3683e5ebed9695eb14e75f257cd7ed9667bfbca07ca9e37 -MISC metadata.xml 553 BLAKE2B 7fa77da8d1dcd0a0b6d53f1de26b13ead4edaf6be6ea93858328ce412c7c97e40240aebbedd68ccc66469992b637b11d14763435e3451ac16dc1a1a72e9f2e2a SHA512 e3b2daa2db92f02e6e2c7e51828a60acd9b74a99949643e1cdc429e9f02dacf0e3f7b7d7c8bc86c10eb46fe1aaa06f3b07d8e7ddc491951f8e14f881d69c61d0 +MISC metadata.xml 326 BLAKE2B 90b664c16db713e898edc35f6e706b8319b3e873a67c078df47b8393ee923b486210608476ec49b9d0b5d147f10680a82797559e94fd21dfa3b32e3213316e22 SHA512 b7d4eb8592240f6b4b265542b5eea3203a3786be916e7b00405f6ecf9361e9d89be4bced172a9a8e31d4a60e6eebee092806c812e4db577adccd12dda2c87595 diff --git a/media-gfx/viewnior/metadata.xml b/media-gfx/viewnior/metadata.xml index d603d71cf45e..f752ae0c3f88 100644 --- a/media-gfx/viewnior/metadata.xml +++ b/media-gfx/viewnior/metadata.xml @@ -1,14 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> - <maintainer type="person" proxied="yes"> - <email>gentoo@tastytea.de</email> - <name>Ronny Gutbrod</name> - </maintainer> - <maintainer type="project" proxied="proxy"> - <email>proxy-maint@gentoo.org</email> - <name>Proxy Maintainers</name> - </maintainer> + <!-- maintainer-needed --> <upstream> <remote-id type="github">hellosiyan/Viewnior</remote-id> <changelog>https://siyanpanayotov.com/project/viewnior/news</changelog> diff --git a/media-gfx/wings/Manifest b/media-gfx/wings/Manifest index c5e4a6298a65..fd7709986792 100644 --- a/media-gfx/wings/Manifest +++ b/media-gfx/wings/Manifest @@ -1,4 +1,9 @@ +AUX wings-2.3-nogit.patch 410 BLAKE2B 38d8fa6fc909ba2c35b29f34a0a715c86f8539fd6646b35d221ba559ee4c1bcf5963f69bbac93a55a4af59f0747c6ff768e0ef84cd31f57cfdfcc22f203b9570 SHA512 5ad3e83553ff3930d3a5d025f59aa6b0b5f2dd7d24fecbf17e3c2a4e625d53e7ec5b5078fc9a57ec5f898382be52508a5facdc9add1850eb5b3ba3df618cf306 AUX wings.sh-r1 181 BLAKE2B d892abf053f7f0039e50057869a4a0a26438f7312dca62561fc22280b2341621e17f13c97e7031072b242db42c533f4012b21ac46645cf32e121e5aad1884774 SHA512 739b8e68a1b47a3f4adbff8a1f34b713d7b0ac2d8103d85d3fdd6020bf08e81c231d210239c140d23e1dd135ff7122bfd43327a27585a333eafab473ea1480df DIST wings-2.2.6.1.tar.bz2 3266532 BLAKE2B a3ec86925632df7d231d620a47841781f8b2e66a50d13857c57fa6389890e7a03fed8bf5e0d09b03de00d6360ee0e4129a4178aec34270367879890f9430c208 SHA512 dba4b189c80180533b7a6c10be5c236a4a9fdacaa7dc491a0d1892149f7a75e636778acc11e38ef82a06718ae705e640da2e1618ec655828d2056e6b3864aba4 -EBUILD wings-2.2.6.1.ebuild 1131 BLAKE2B 10b1c344453222b75ee28c17bf27327484b6d1572172bbe70a325e908f51b0ccbfb83d115c3dc4a1ad5c496358f7bce16ccb6ed90802246833ff440851972241 SHA512 859c6a5d99f12bd3732432abf5aa38cc381f5835402d7741e3dee1f5f4756920030fe5084fb583a246a21442b7b1446d795975f4bd11b0da598f80cd098eaea3 +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/files/wings-2.3-nogit.patch b/media-gfx/wings/files/wings-2.3-nogit.patch new file mode 100644 index 000000000000..734fbbeb717d --- /dev/null +++ b/media-gfx/wings/files/wings-2.3-nogit.patch @@ -0,0 +1,13 @@ +--- a/Makefile 2024-10-20 12:12:36.987424596 +0200 ++++ b/Makefile 2024-10-20 12:13:55.487467140 +0200 +@@ -14,10 +14,8 @@ + # Check if OpenCL package is as external dependency + CL_PATH = $(shell $(ERL) -noshell -eval 'erlang:display(code:which(cl))' -s erlang halt) + ifneq (,$(findstring non_existing, $(CL_PATH))) +-DEPS=cl + endif + +-DEPS += libigl eigen + SUBDIRS=c_src intl_tools src e3d plugins_src icons + + # diff --git a/media-gfx/wings/wings-2.2.6.1.ebuild b/media-gfx/wings/wings-2.2.6.1.ebuild index 261b738b994b..04eacee4323a 100644 --- a/media-gfx/wings/wings-2.2.6.1.ebuild +++ b/media-gfx/wings/wings-2.2.6.1.ebuild @@ -5,7 +5,7 @@ EAPI=7 inherit toolchain-funcs DESCRIPTION="Wings 3D is an advanced subdivision modeler" -HOMEPAGE="http://www.wings3d.com/" +HOMEPAGE="https://www.wings3d.com/" SRC_URI="https://downloads.sourceforge.net/wings/${P}.tar.bz2" LICENSE="BSD" diff --git a/media-gfx/wings/wings-2.3.ebuild b/media-gfx/wings/wings-2.3.ebuild new file mode 100644 index 000000000000..21082b88f949 --- /dev/null +++ b/media-gfx/wings/wings-2.3.ebuild @@ -0,0 +1,62 @@ +# Copyright 1999-2024 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}"/${P}-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/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/xdot/Manifest b/media-gfx/xdot/Manifest index a8474cfd121d..0a534265aa8a 100644 --- a/media-gfx/xdot/Manifest +++ b/media-gfx/xdot/Manifest @@ -1,4 +1,4 @@ DIST xdot-1.4.tar.gz 144405 BLAKE2B bcca54099ad88ebbf82dc168d837f7343f527d8aff63d27e315e60267b4edecca97c2f69e47a6bd5889e9da7bd801ba38950f5f01ff1f0e40389551c6ded2890 SHA512 36065ca840ea0f3ffeca3d7bb16aa3f68b79ef3c7d43f0ba80d100d198f89edee1ca9cb3baff378a63c53a527c37dcccbd7262fd1aa26b7c61bc9e2c55c6e3ed -EBUILD xdot-1.4.ebuild 1063 BLAKE2B cf3114a70cd0abcb4eba2df8a352c0c2ac7e33130e69357289824cb55e610d46a7a11f9e2d12e1f9bf1bce63eccbe5d31092e0dd0a2064272007978a251d49ff SHA512 75c304e48f64a28fa76c5244a3b19375b350fa87db634149c3bbc27a94ca07705c28d5e9ff5ef0b0eb6bedd42ed9dd0218ce922465f783b3e711965dba45b611 -EBUILD xdot-9999.ebuild 1070 BLAKE2B 13305d0d59d42e99b5a05ea269a1854159b05eeac7da9b306886735b6099ac2b609ae378321aabbfc27e84cb197472f75c0c8467e81460018c058ba704d5a13e SHA512 ddbd7668100468682142a26bcfabc03fec3107199e10fb771ede3eb4d223cb7ffe44015d3896d4578906e64c3562e77789366b8b5ff9b74490499cdd27d3584f +EBUILD xdot-1.4.ebuild 1057 BLAKE2B 42d5f677249f93356a488dde0f7e41dc8efb417765f9b1938523b2c196e24c39dbbf07464c9a3e963b613d5dd9b3b905b28995af34f2f797b790ce90db87fa9f SHA512 b43f731e51139bd96526ddd2a46a6858179b5d433d766cfe01b11cadb201bee82c19ded3c0fa5f59e5347f429a209a04b52402a0f2921ff642a45509bf5f5c86 +EBUILD xdot-9999.ebuild 1064 BLAKE2B 1933ad6213a84a89974ab0543b59282ecdd149de46f6ccbdc0641306bb60c1a7a6cfba2e9745a44f3fc13cef721a38c787febd3da3c48d693177e133821f01a0 SHA512 6a251a856dd2c3a03b0a1b21efdd6d7ef1d6470dde75b0e2e8dc12ffdab150fd905f0f02805103d205f86ff5de3aac62f696067dfa3979a4f4f7245108b67bea MISC metadata.xml 399 BLAKE2B 06318ca9aa1bb3f53733542916d19d28c03133866e868aefeba88d7e6e1b7594a628488471fe7f6853e02402a14db8501e056f5df9ae1429c4eca66ab7b6a492 SHA512 16caf359c45841ae27bfdeee51c7fdd71d6282548773e6f519cbcbfe43f9fa39c65322a610d2b3d5cb4471129cfa3738e6ee66ff6b6e94b4263d918fd44ff30c diff --git a/media-gfx/xdot/xdot-1.4.ebuild b/media-gfx/xdot/xdot-1.4.ebuild index 5592a37dd4f3..ee7b623c9b55 100644 --- a/media-gfx/xdot/xdot-1.4.ebuild +++ b/media-gfx/xdot/xdot-1.4.ebuild @@ -11,7 +11,7 @@ EGIT_REPO_URI="https://github.com/jrfonseca/${MY_PN}" if [[ ${PV} = 9999* ]]; then GIT_ECLASS="git-r3" else - KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ppc ppc64 ~riscv ~s390 sparc x86" + KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ppc ppc64 ~riscv ~s390 sparc x86" MY_P="${MY_PN}-${PV}" S="${WORKDIR}/${MY_P}" SRC_URI="https://github.com/jrfonseca/${MY_PN}/archive/${PV}.tar.gz -> ${P}.tar.gz" diff --git a/media-gfx/xdot/xdot-9999.ebuild b/media-gfx/xdot/xdot-9999.ebuild index bfd164986323..35f32bc848ff 100644 --- a/media-gfx/xdot/xdot-9999.ebuild +++ b/media-gfx/xdot/xdot-9999.ebuild @@ -11,7 +11,7 @@ EGIT_REPO_URI="https://github.com/jrfonseca/${MY_PN}" if [[ ${PV} = 9999* ]]; then GIT_ECLASS="git-r3" else - KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86" + KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86" MY_P="${MY_PN}-${PV}" S="${WORKDIR}/${MY_P}" SRC_URI="https://github.com/jrfonseca/${MY_PN}/archive/${PV}.tar.gz -> ${P}.tar.gz" diff --git a/media-gfx/xli/Manifest b/media-gfx/xli/Manifest index 68c203274efd..e132c5446291 100644 --- a/media-gfx/xli/Manifest +++ b/media-gfx/xli/Manifest @@ -4,5 +4,5 @@ AUX xli-1.17.0-fix-scale-zoom.patch 1942 BLAKE2B fefbcbec8d9dba30fc1435fc998e371 AUX xli-1.17.0-libpng14.patch 245 BLAKE2B 681fd31f8d7f812272e54dc67de31ece9a936f4608d339e9d63fe7bdc2ba257d20d7ce01fb00b120662557bdfa44b908bbeb4e136665abdadeb062c1425e7af7 SHA512 079162bfd639994ea6553b49f9370faf5becee8ec1e99a1e71f43e32968f244c5a393433fba8920a399a9eb8bc4a3ec6097903bd2eaff46bdeef55f1f90d1fcf AUX xli-security-gentoo.diff 6940 BLAKE2B 907fd85a2b248083380ae2210665dd9c251a7d528a93b1e2dffd149827f4900cab54b84b8a0be67c198a73d180cf31f4c8cdd7c4a37a3a8c5b30718babd5b1bf SHA512 b992219eb4b89bfee57429afbf67be6d6a04051b50de6e814c84c1adb209494d2faff15a228b43a992530fbeac83f15a94e9c1988982f98eabf287c26716671e DIST xli-2005-02-27.tar.gz 201011 BLAKE2B c16f40368a7c55cb7d31777662e4e9c1515232904df4f6f0e7fdc4daf44fdafaa0a3d9d8298493dac9352fa10eaf5d2984f9e66832ca0bfd07d9e6d551f4dca5 SHA512 132b28396ebf3832dc35ff5fa7c102539ef30a194512fe6577ce1432bb84ecd7b4368e75eaf59f26a806900f63e1bfb9a93487ce1ebe3cfef2199256a783ccf7 -EBUILD xli-1.17.0-r6.ebuild 2145 BLAKE2B ca8a689edcade26e9e9d362a78fd46c14eecb2b84fcfd7bbc580e43d326aa77a6b2e2262d40b586e944e842d919022bbad2afb6696b0a53a62b5a58e6c5fef38 SHA512 8d58c6f32a94984381fdd533b69246a59870f242df0f87a7e39c75596b70e6b05b172666790cbeda3a471d46867be1afe202d8f38bf78c880430e2b53a7e42a1 +EBUILD xli-1.17.0-r6.ebuild 2139 BLAKE2B 4e3407ee763f37be8113717e29d01ed5402c2c35de2ff00cc096a19b82df047fcfa6f4862475c5e5c45a947ed0e6ba617f1c418cd05765c22fe3037154aa5b50 SHA512 ff207a7cfc91c96ca136a44e4646dc88e5c0bc6d050b642b0da250f78cc2c62085cb6c70b1ea320f8297ada84ffa911a4f0d7aee72c2b4fdfb439abf3d9c3064 MISC metadata.xml 169 BLAKE2B 25149b73446be31f3ea3dd3a6394230987e7d4c601d1605fd3827b37bd99b3301c2e0edb95d0f59a4577ed27919f43c2cc02b1edf62c4012b935a82e709e0c05 SHA512 55c53f74b001bae56ba8c54581a4168335b6b3a28dac23a2102b76795d5fd41de33b8b3e1ec03f9acc6e7a3a77e93b1a6ff3e3967c3156dcbf22b5b5a6245ef5 diff --git a/media-gfx/xli/xli-1.17.0-r6.ebuild b/media-gfx/xli/xli-1.17.0-r6.ebuild index a33109d2bef3..8ce0e204bb03 100644 --- a/media-gfx/xli/xli-1.17.0-r6.ebuild +++ b/media-gfx/xli/xli-1.17.0-r6.ebuild @@ -13,7 +13,7 @@ S="${WORKDIR}/${PN}-${SNAPSHOT}" LICENSE="HPND" SLOT="0" -KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~ppc-macos" +KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~ppc-macos" RDEPEND=" app-arch/bzip2:= diff --git a/media-gfx/xloadimage/Manifest b/media-gfx/xloadimage/Manifest index f7b7003e9e9e..026e274fe34b 100644 --- a/media-gfx/xloadimage/Manifest +++ b/media-gfx/xloadimage/Manifest @@ -1,4 +1,5 @@ AUX xloadimage-4.1-bracket.patch 518 BLAKE2B fca92d66bc559f17e091d544f2b726d1db11d54e72a71e901917d19da1e0bef3538f538cee329ad84a867ba3482085367bb0fa3017b5d99d69e1ea581a8bc7bf SHA512 f73b8077c7fe03ca688646f63df24c6dcecf21b1ebccf9983c7c6fb0332b371b17f835985ffccbe39fcb7bfd553a78df70c94d734930e35310a1b8ba0e30bf34 +AUX xloadimage-4.1-c99.patch 381 BLAKE2B b4ef27066cc4dcac1260e8a73975a7d8bc00c2e5d43c8349c19b853e4f99ed5aa059597b0fc1ec92e0cb261ccc86659ca80cbd7306535f9b974a5bf2092dcbbc SHA512 150dc9b13e236f48209b6fec0599a804773e48275e807e5e6074a276ed28736fabe5a4e2819fb26e6a19c42725ac5cee92ee0dacaeb1e7946a07b1cd56a88880 AUX xloadimage-4.1-endif.patch 321 BLAKE2B dc140933e4b61e9a243f9cc2c4c78b5406a7d4defe0d7ae796c46ea8e21607d27c79481fe528f4c3e40dbfa5b27db09b47600a61454aaa3882c2ff267f18931a SHA512 503fd3672ae22a468ae6ec71a62b3113dc3df2e5bed4b90b641320d954c563118eb53b8681ad38edaff5a87a385fb063592ac422c24c2150084e0171f4f17d25 AUX xloadimage-4.1-fix-incomp-function-pointer-types.patch 582 BLAKE2B 5ac8bf2e35e58bc476bde54228620089fa90bdeb7dc25bffa344775e0d149cbad238e3526a6669f9ee0fe539d68dbad52a62be752e71ef9412d220a4a2d05a19 SHA512 16d3c30d1baa16dbaf8fb3314b2721996d2fbfca9fc73471108ada969b69b4aaf1607cbe6bda284daaeaf6168d5b485dabf68495a51f6a31a925b2fd975627fa AUX xloadimage-4.1-include-errno_h.patch 303 BLAKE2B f82f4beadf42e2b5ba0f20ed6c16ea88e829c0b224c219a257c9986d30a8568d8d59e92f686469c26238eb33c6a51f3ba90e854a3f8c9c9c386a4848f745c8f2 SHA512 208261855d1677a755e34b421bbb4f95cbbe1d9d494cb3c895e9f799a376f2162a3f8e08134b06029da5acd318c873c798bd2c64eaf0aaf1d0e2970a56f4ef2f @@ -10,7 +11,7 @@ AUX xloadimage-gentoo.patch 8956 BLAKE2B 9834cb47e16fb20f970e9d33a6e42fef09d5a3d DIST xloadimage-4.1-fix-build-for-clang16.patch.xz 23800 BLAKE2B 8417465020f06483c397dd86124297feb320530bd013d6f94b091ac2166da9dc45017b43a21e2ce7a6f03493188e2535294e9b79e7ebbe0062bf0f22166f13d7 SHA512 a8f40fe4a5e8750b2c2b98b1f7488275c1f0763d2814359ec8dce48d1201e78d87f189abf6fcb8fa4753828921fd0c593696ad1958345f954f740687502a896f DIST xloadimage-4.1-gentoo-r1.diff.bz2 41535 BLAKE2B 77cdbb2e6d5dda6084aae2831bcb8750a027f59a673f5a1f8eeb61385bd21243d640bd13a3be7fb24d2ce2cb475a05cb04c91c2b53977c61fb3aa4416e67e112 SHA512 a1a52d576eb68c44e5ff3b68a6bd87cd9b8f21f6fa8edee2d7df2329002d40f6513df6c04ecd57f66018583d0251019bd02e15756dac705b8c9cb8470cb386e3 DIST xloadimage.4.1.tar.gz 596021 BLAKE2B 3c22facf05167d1836c21243799d8f66c211e44d659b4397668ed604cdd82b3bd8f11ab7b3be5e87c59a9b3aa8569d0d3d2e474b572c3bca07b6437b293014bf SHA512 2c91699c8ef07c101ff9b458708ace01cab2979a5e88cf8a4e47ec971f7b4cb5571108afa3e53271ade4e8ccfdcf72ef9e2e09edfc0be6b8afaba50847aa0586 -EBUILD xloadimage-4.1-r14.ebuild 2504 BLAKE2B 12c9a486786e1640d4697c39f4e2fb9fdb61adf775026c2023e9643c5e4191b6a4bf10bcfb8a0345a3650e178c91de58faee153bb0dceeac2c200423b80df7f9 SHA512 c57e7d7b571fc2ad4f56fdd1e7d5de1b56107782edb2703a0887c826d8ac230ce924e0c85772df15a419b1e2550e664f6d5c3716c7430a6fc95aed615e9ccb09 -EBUILD xloadimage-4.1-r15.ebuild 2488 BLAKE2B bd34e5765b9701eeec684f5da9ee6ae88d5147796c0bd44eed60dd2d409d89a3b794d95c95e5403bee9d64edebadf9fcc805e48b02986f88b5cf16c4287fded7 SHA512 a16a74df34fe271b0d3900b7bba2a3ef75e1d55781b4d02ff60e1e6d5b9fe11569e04fea86093fa5d10409ae7008ceea3db6ecff0c96ba2af526ec496061d27f -EBUILD xloadimage-4.1-r16.ebuild 2554 BLAKE2B 5480f70de2690e720a10fd614423da2346e12d29394cb990368d753ef2b07f142db0fd9f6c39d405454f05c9ca16e2a26466dcd2da204b0e7932ed147d2c1192 SHA512 a42f4aec6fbf6e19944e8db128d2e16bb8993d976bd374b637e44d7dcc55f1a13c281dfd6280682b7e54ddd0b5a4cd462bd72a91e5efa1611f8e49ff9f7fb62e +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 2621 BLAKE2B 5f3336248857dd0d3f4a0acf13f1aad12144edac25ac591a35db61826af6c3bf2229a27e38f4ad4ebafa2347377580006a320fee5915b3e5b56c4a25d7036cf0 SHA512 9477605f5bb95995e928fadfdb98daa05078505a1d9cc4c8f49ff0a3e37bb7a9bd329c495b86c7d4da8f40769a8bfbc6c9d376671b3af437ac41daa0248d40bc MISC metadata.xml 169 BLAKE2B 25149b73446be31f3ea3dd3a6394230987e7d4c601d1605fd3827b37bd99b3301c2e0edb95d0f59a4577ed27919f43c2cc02b1edf62c4012b935a82e709e0c05 SHA512 55c53f74b001bae56ba8c54581a4168335b6b3a28dac23a2102b76795d5fd41de33b8b3e1ec03f9acc6e7a3a77e93b1a6ff3e3967c3156dcbf22b5b5a6245ef5 diff --git a/media-gfx/xloadimage/files/xloadimage-4.1-c99.patch b/media-gfx/xloadimage/files/xloadimage-4.1-c99.patch new file mode 100644 index 000000000000..6da8b008aa86 --- /dev/null +++ b/media-gfx/xloadimage/files/xloadimage-4.1-c99.patch @@ -0,0 +1,15 @@ +https://bugs.gentoo.org/920772#c11 +Signed-off-by: Stephane Bakhos <nuitari@nuitari.net> +--- a/pdsuncomp.c ++++ b/pdsuncomp.c +@@ -421,8 +421,8 @@ + static char obuf[2048]; + char ibuf[2048]; + int left; +- int in_length; +- static int out_length= 2048, out_ptr= 0; ++ long int in_length; ++ static long int out_length= 2048, out_ptr= 0; + + if (Decompressing) { + left= size; diff --git a/media-gfx/xloadimage/xloadimage-4.1-r15.ebuild b/media-gfx/xloadimage/xloadimage-4.1-r15.ebuild index b1ceb5b7a604..984fe17d6d40 100644 --- a/media-gfx/xloadimage/xloadimage-4.1-r15.ebuild +++ b/media-gfx/xloadimage/xloadimage-4.1-r15.ebuild @@ -16,7 +16,7 @@ S="${WORKDIR}"/${P/-/.} LICENSE="MIT" SLOT="0" -KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~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/xloadimage/xloadimage-4.1-r16.ebuild b/media-gfx/xloadimage/xloadimage-4.1-r16.ebuild index 461bdfe35a16..55580772932d 100644 --- a/media-gfx/xloadimage/xloadimage-4.1-r16.ebuild +++ b/media-gfx/xloadimage/xloadimage-4.1-r16.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 @@ -16,7 +16,7 @@ S="${WORKDIR}"/${P/-/.} LICENSE="MIT" SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~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/xloadimage/xloadimage-4.1-r14.ebuild b/media-gfx/xloadimage/xloadimage-4.1-r17.ebuild index ff90d31efe03..13cc65fc73aa 100644 --- a/media-gfx/xloadimage/xloadimage-4.1-r14.ebuild +++ b/media-gfx/xloadimage/xloadimage-4.1-r17.ebuild @@ -1,67 +1,68 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2025 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 + inherit autotools flag-o-matic toolchain-funcs -DESCRIPTION="utility to view many different types of images under X11" -HOMEPAGE="https://tracker.debian.org/pkg/xloadimage" -SRC_URI="ftp://ftp.x.org/R5contrib/${P/-/.}.tar.gz - mirror://gentoo/${P}-gentoo-r1.diff.bz2" +DESCRIPTION="Utility to view many different types of images under X11" +HOMEPAGE="https://sioseis.ucsd.edu/xloadimage.html https://tracker.debian.org/pkg/xloadimage" +SRC_URI=" + ftp://ftp.x.org/R5contrib/${P/-/.}.tar.gz + mirror://gentoo/${P}-gentoo-r1.diff.bz2 + https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${P}-fix-build-for-clang16.patch.xz +" +S="${WORKDIR}"/${P/-/.} LICENSE="MIT" SLOT="0" -KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~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 tiff? ( media-libs/tiff:= ) png? ( media-libs/libpng:= ) - jpeg? ( media-libs/libjpeg-turbo:= )" -DEPEND="${RDEPEND} + jpeg? ( media-libs/libjpeg-turbo:= ) !media-gfx/xli" +DEPEND="${RDEPEND} + x11-base/xorg-proto" -S=${WORKDIR}/${P/-/.} - -src_prepare() { - eapply "${WORKDIR}"/${P}-gentoo-r1.diff - eapply "${FILESDIR}"/${P}-zio-shell-meta-char.diff - eapply "${FILESDIR}"/${P}-endif.patch - +PATCHES=( + "${WORKDIR}"/${P}-gentoo-r1.diff + "${FILESDIR}"/${P}-zio-shell-meta-char.diff + "${FILESDIR}"/${P}-endif.patch # Do not define errno extern, but rather include errno.h # <azarah@gentoo.org> (1 Jan 2003) - eapply "${FILESDIR}"/${P}-include-errno_h.patch + "${FILESDIR}"/${P}-include-errno_h.patch + "${FILESDIR}"/xloadimage-gentoo.patch + "${FILESDIR}"/${P}-unaligned-access.patch + "${FILESDIR}"/${P}-ldflags_and_exit.patch + "${FILESDIR}"/${P}-libpng15.patch + "${WORKDIR}"/${P}-fix-build-for-clang16.patch + # One of the previous patches screws up a bracket... + "${FILESDIR}"/${P}-bracket.patch + "${FILESDIR}"/${P}-fix-incomp-function-pointer-types.patch + "${FILESDIR}"/${P}-c99.patch +) - eapply "${FILESDIR}"/xloadimage-gentoo.patch +src_prepare() { + default - sed -i -e "s:OPT_FLAGS=:OPT_FLAGS=$CFLAGS:" Make.conf || die + sed -i -e "s|OPT_FLAGS=|OPT_FLAGS=$CFLAGS|" Make.conf || die sed -i -e "s:^#include <varargs.h>:#include <stdarg.h>:" rlelib.c || die - - # On FreeBSD systems malloc.h is a false header asking for fixes. - # On MacOSX it would require malloc/malloc.h - # On other systems it's simply unneeded - sed -i -e 's,<malloc.h>,<stdlib.h>,' vicar.c || die - - eapply "${FILESDIR}"/${P}-unaligned-access.patch - eapply "${FILESDIR}"/${P}-ldflags_and_exit.patch - + # qa-sed sees no-op on the next sed on non-gentoo-prefix systems, + # but that is alright sed -i -e "/^DEFS = /s:/etc:${EPREFIX}/etc:" Makefile.in || die - - eapply "${FILESDIR}"/${P}-libpng15.patch sed -i \ -e 's:png_set_gray_1_2_4_to_8:png_set_expand_gray_1_2_4_to_8:' \ png.c || die - # One of the previous patches screws up a bracket... - eapply "${FILESDIR}"/${P}-bracket.patch - - default - - chmod +x configure || die eautoreconf } src_configure() { + append-cflags -std=gnu17 + # Set TIFFHeader to TIFFHeaderCommon wrt #319383 has_version '>=media-libs/tiff-4.0.0_pre' && \ append-flags -DTIFFHeader=TIFFHeaderCommon diff --git a/media-gfx/xpaint/Manifest b/media-gfx/xpaint/Manifest index b0d3c922c49e..1fbaa81fd69a 100644 --- a/media-gfx/xpaint/Manifest +++ b/media-gfx/xpaint/Manifest @@ -1,8 +1,9 @@ AUX xpaint-3.1.3-gentoo-prefix.patch 3605 BLAKE2B c513a72991ec83b99fc12d90c112c743a0fec456ae09ad77ecee887e67d2891efd200d8d08bad594472060515b56b02b9097951c5ad285ddfebd3d46acc4265a SHA512 d231237fa1512637c5448b1c8c7a1dcffa1383a0dd24f6606215643ce51932ef58e994bfbc3f24d3376acdd9cc06d713d453c643d4d00e9d00af0e011e55762d AUX xpaint-3.1.3-gentoo-qa.patch 1480 BLAKE2B 43b80854e8d0bb68566f86116444507852bf61807846ec97238a90fefc8a86f9be3978858c12af3278b787b14f805edb628327ae411b8b6fbdcd7530ee72cbd5 SHA512 cfa7057625f3086b573f9109a89f29e1cf17c15d253a0c903bd0f315e4aac3d8111df899ef98d0a3416486d81305f0a041f061985d31d435ccbd24b0fc5a57b3 AUX xpaint-3.1.3-libtool-clang.patch 1434 BLAKE2B d89978f8c925a64fa62ff2a0788ed81ca5faee6a71afda069930a7381e2bb095bbad3c1236c3594532afc5441ef789bf6ea0571b4bb25065e2cbef7fdc52ebe3 SHA512 f4027619c4eda686953fc33c62518a7ef12db09e6160f5e038179aa06f64629d2ad28b373ec332fe3266fd7e15af77577b6a60cfdffb165afe1358519201c399 +AUX xpaint-3.1.4-gentoo-gcc-15.patch 470 BLAKE2B 8fa23cc40d674ea969d2d8eb0dbe793f915910ad1512958eae9d1011de4014f69c4cdf88a0e696d9d62fa7d04fb5c191f9317bff64054ece17c2199b0dcb0f33 SHA512 8e43053f0177e66bc2b576854c9400e699824a8a363dd84ef4033955af1ed94666805b14891a557d02e6445ccd65eb7423af9087df81297180bdc095f295f976 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 1788 BLAKE2B 25037019abf4597dab32aff3d7bcbddad6b4d20fb27c375093d977c4592cce9b411eb0db35ac072ee1b7dd9a5e7b88b92df9f9d1ac5c50414793294e2283f0f8 SHA512 70d4fbf3a1a3bce1341dbc11918bae5ab86b8370397b4f6ceee29523cde7073848281ad30c9d9044e0a2634e713f648d757096ecb2a14fc12ab056f8f4c6e18b MISC metadata.xml 1286 BLAKE2B 1a10d6e7ee2270c3b014e51d0f2deabef64f926dfcd54f46c898b0cea35d769eaaeafc061bfa95f0b1621cffae48732faf824590354883a86fb0f7e1ce0be5ba SHA512 3ef1cf69a09bfd7ab4963f3f4a76203b504d106307ce37a2bef7ac1623070d8c629b7e52a1e44f5d3380b21d6b660cdb1842e582b7fc26f052ed7d353ef7129d diff --git a/media-gfx/xpaint/files/xpaint-3.1.4-gentoo-gcc-15.patch b/media-gfx/xpaint/files/xpaint-3.1.4-gentoo-gcc-15.patch new file mode 100644 index 000000000000..6724a8ac6a56 --- /dev/null +++ b/media-gfx/xpaint/files/xpaint-3.1.4-gentoo-gcc-15.patch @@ -0,0 +1,24 @@ +https://bugs.gentoo.org/944996 + +--- a/vxp2ps/vxp2ps.c ++++ b/vxp2ps/vxp2ps.c +@@ -144,7 +144,7 @@ + } + #endif + +-void ps_init() ++void ps_init(FILE* fo) + { + fprintf(fo, "%%!PS-Adobe-2.0\n"); + fprintf(fo, "%%%%Creator: vxp2ps\n"); +--- a/vxp2ps/vxp2tex.c ++++ b/vxp2ps/vxp2tex.c +@@ -29,7 +29,7 @@ + #define DRAWOP 0x3000300 + #define FILLOP 0x2492000 + +-void ps_init() ++void ps_init(FILE* fo) + { + fprintf(fo, "%%!PS-Adobe-2.0\n"); + fprintf(fo, "%%%%Creator: vxp2tex\n"); diff --git a/media-gfx/xpaint/xpaint-3.1.4-r4.ebuild b/media-gfx/xpaint/xpaint-3.1.4-r5.ebuild index 0a239d8a1b67..ab6575b0483c 100644 --- a/media-gfx/xpaint/xpaint-3.1.4-r4.ebuild +++ b/media-gfx/xpaint/xpaint-3.1.4-r5.ebuild @@ -43,6 +43,7 @@ PATCHES=( "${FILESDIR}"/${PN}-3.1.3-gentoo-prefix.patch "${FILESDIR}"/${P}-gentoo-shared-lib.patch "${FILESDIR}"/${P}-gentoo-lto.patch + "${FILESDIR}"/${P}-gentoo-gcc-15.patch ) src_prepare() { diff --git a/media-gfx/xv/Manifest b/media-gfx/xv/Manifest index 1b90737a9f69..14f41e14d1ad 100644 --- a/media-gfx/xv/Manifest +++ b/media-gfx/xv/Manifest @@ -1,19 +1,7 @@ -AUX xv-3.10a-add-ldflags-20070520.patch 757 BLAKE2B a019f954f6d469075dc05c40b99075be2ef7e945aeaecb6047e35b84aee4e9f79ee8c6dc8d1175c464c49dc5a4a3dd37749e1f307184f3ad49fdbcc7d884108b SHA512 64d2d53dd301228aed398e6ec4813e6fcc37b7033f6a7e0dad49541d8ea7394ea18eb44f74a1ee08a33964bc6fcfc8000960bd3e2df7e363edc0365a71f1e8cc -AUX xv-3.10a-disable-jp2k-20070520.patch 607 BLAKE2B 6aad38e13c225442ba12eeabf44ac32374a832f44440e071f4e9a63271c3e2bf7870637a6b04044b23840cbb8dd1bdfc65c717adcc91804a47baeaf4053095c5 SHA512 e764150b153921bbb0a9dff6399efdf4ec5bec425e10529616fa0912a1bea819c5f1638b9f1ab7676ed0c51156c0e2e738c2641ff0899456cae394c67148702b -AUX xv-3.10a-fix-wait-20070520.patch 1664 BLAKE2B 405c18fb96ca239e88986e3ac60b1b1eb22e6d308fb2dd33336a649568f2495ac7cc885453ef937ff83b5a356ae878d7335617d8896540467525de2079574319 SHA512 da9ebfe21d9a9bf466b167215faed0548bd5711125ce84a8f886e9b6d6d298f48eba5385b77430cf07199f067b9e0fe23373d1951d6fe7456a927fc2aac77cc6 -AUX xv-3.10a-libpng15-r1.patch 16530 BLAKE2B 6233c9e49f021ba3e62f9a5e9da4e3601261aa51a86951d431018a16a3fe11f05f8cf6ab0ab71fdba024d4b70793e2176ef0c59ab1baeb066e120b49772030cc SHA512 f7ad73ddf83ac241565b99ea7c375b7ffe17f60ff7aa138521b887da14ec4b236a61a67068f3baf6048011a52d46b276940a3965cf34ad9dd46678ba100b6d08 -AUX xv-3.10a-osx-bsd-20070520.patch 1497 BLAKE2B 1dcd54c8de29b9552a50069e627fd9dbbd327a22a8e18a12f260c1aaec2978b536cbdc571d47f17cca3f477dd574730dca7748532e6ed41f4697fa76774d5384 SHA512 a6f1160c0658ae4f3394cf2bb0b324392593010539ac2dd52176a587c41844cd5bca61823af31633d765f3399a9cb52e0296f894a2f08060ef4c2b4d687d8b51 -AUX xv-3.10a-vdcomp-osx-20070520.patch 455 BLAKE2B fa6cfa3657f74da7254cce5e73140c2a82614df2398a66e98c57d3056b1f574fbe80b9bce925f2f0988133596fdc4ea5c580371613a23a0283e9b09343a700a9 SHA512 8e389040ae3ac52dd086fbc1858699ea4bef417053952766a5569aab4ec70dbbd674a4e26adbc9434c0b411754d9643064d4254e72fbc79f99d3aefaf35f997b -AUX xv-3.10a-wformat-security.patch 519 BLAKE2B 7b0ba8ee6dc33af787040e72fdfd4cf1d638dd556ff30c60c5983f6e8158fa63b49a66c97c919bdac5084c766df2b9587597c4f103fff3e2718cff8a006c1c05 SHA512 7e1150fdda9359e7b105729c92b8059bf5c762d468bcdaeadbb91ed75c2517b0ad627784a7a6f2bb8f7857884dc47f2d41c7c7247824fa4af8533dc023ceea52 AUX xv-5.2.0-osx-bsd.patch 2103 BLAKE2B f12287becac8bfa5227523677c6118816f9dd43fd8b41c400dd6695ea4b6c610bc713f6ffdd9d2d75f8bd2b4de1f228c5349f71d3b8f7c77f10c01ac30b77301 SHA512 e2b6673d202b20a9d88dfd7711e63f702a67de7ca56de049ab27803a76b8833745ba1057ffbc53b246d077e870bce44746d28b1ced0eca31d4d9746c2a3fe57f -DIST xv-3.10a-jumbo-patches-20070520.tar.gz 1363802 BLAKE2B 1a9f77b950dfa817aa861d9b2b6898d6e378b4a61a57c746a8822793a8e11e54165faf859e073ef99c9fbea5aa0c4c8caa4608ef03f553003b779a4bf59c3ab6 SHA512 e2ac5a3b4d743bf142c162b00815dd9d8dcaf345d0649016b2c6441fe2329879471b19453808e677c1a0b8eeb3468295dba160b1f30eacb2a7a9d8524ce03e75 DIST xv-3.10a.png.bz2 3082 BLAKE2B 05f56053fc0a77bba155db306ae181f5404bced3b2c22a33b3a0a0750b84461ffec98934d3dbabd764fbb6ec95ce2851f4cf3959682a315fe6e6653cbaaa5ae4 SHA512 41e81c34e74a034292c2a8f525d1452614a2b42e980a1a2c93e3fcf990db528853d633496815e5fb2c897a780a2da171af590f436e2c7ef181eea00eb6922e9b -DIST xv-3.10a.tar.gz 2259124 BLAKE2B 42cea578a879c819be8f42ffb1d247643904d8b462a4d6faa208185e49566798605c89006cbc190725fa6356b87da3375cf04d2ba86b559419cf8f7471c867e5 SHA512 5b8c5890503e2796638921cabae8967e458c73e332acea8561b1025ed13c771bc44c0e309b4592852e33726eeaa9784f933d1312073b0ba2e0b8c0cedabcaa3f -DIST xv-5.2.0.tar.gz 4785784 BLAKE2B 46dc637cbbeabfe1c034c34e73040de6efebbf5f423fe429028ebfeefd2fce5af0fdaff1c52db4807b8eb88de89dae6b7f0e2c8a3522a3d9b103d5777783a52d SHA512 0af7ff6db152be849c27be9fba116513595deeca9e3eb42ec6fd74a4756d0c525b55a40de49aa37dd5d2ea4a29e6d644c8c4c709f0e1ec0a98cbc0ae7221b110 -DIST xv-6.0.0.tar.gz 5051786 BLAKE2B 42c6e06848c5cc7a3f7da1d5c5b10a7d665601f41eb79bda4b3e904c103e88592da416559adc9565c820c6402c9b03271521f515b8f7c873cc959dfd3b5652e8 SHA512 600fde882e1279b5c7147089790006bcbd4e31ba6220309a272aca43242c56062d4c85b181fb1f2d4b0497f1546347206d7827204c2ebbbabaaf3de40c50191a DIST xv-6.0.1.tar.gz 5051856 BLAKE2B 7b7a76e211175776862312b48b1f5f91d1a901fffba2225390715c9e392a380add42eaee0429e0598dce677bbb4311e9bc1a506105b9a63595ab70e6253e6ae7 SHA512 7098a2600dc21f94ef1db3e1b23e79b0cdc989b93d792f891d7a29811037636a5887df88f1ad6df27b12be4b4b348f0cca34fe2ad0a58ed9b1228683f6b0b910 -EBUILD xv-3.10a-r22.ebuild 2682 BLAKE2B 108e6f933866f1b663086d58b9418d5acd1d4f07fa332359325e8bb1e2e08009549f608f1d5f3d7ddbdff634dccbda9c78edf5e2abf7757f3ab29ccacb37b4d1 SHA512 3103387c8b54716418435c1f037138995df5761220b009b31583c9537395a53de0ff9684e2f488d7d047b449e76745989951dab662cfe892541aea56e130c100 -EBUILD xv-5.2.0.ebuild 1359 BLAKE2B ce8ef5bc29eb554de83dc43061810347af9477bc7bbe7c7789d12f344deaaa9e9658273cc0e6e6f098b22dbea2c28d6d45993ea41097f2a4d63b00e3647f9724 SHA512 16873c37bfdd2b656ac0482681016eb917a405a4cae2eeb6669ae650c233072c19f28d3f42b33f7e69849252015edd91fbcc973bd52e4716dce7411d5d906a6c -EBUILD xv-6.0.0.ebuild 1465 BLAKE2B 30fcbd9c7fbcaecdf32b543b20117039b3ace64164bcda5f447f52cc15e6fd94f1a6db3e0ebfb44d38f4380c22efb06f068940db378add096274e66eec15861e SHA512 430191195ef448e2067f1ab7781dfa5f4b877b69a773ee8deec0ea5e486ac605d49dda27e7889961aeeb2bd19830c1c07b9faf2188bf080a780f95e2093910fb -EBUILD xv-6.0.1.ebuild 1465 BLAKE2B 30fcbd9c7fbcaecdf32b543b20117039b3ace64164bcda5f447f52cc15e6fd94f1a6db3e0ebfb44d38f4380c22efb06f068940db378add096274e66eec15861e SHA512 430191195ef448e2067f1ab7781dfa5f4b877b69a773ee8deec0ea5e486ac605d49dda27e7889961aeeb2bd19830c1c07b9faf2188bf080a780f95e2093910fb +DIST xv-6.0.2.tar.gz 5052705 BLAKE2B e25a9d5881ce2b9039e4e9f561df7392faf2149730d072085486ebe930934b7c92e7c333bc930eae8b27dea9eea5b2bcc9da2bd28c84ae6483406f66e47ca5df SHA512 81de0a4811b7bb4662e8b731e148f7f172275f0380c0bc2c2569c3a041002374a3a44a1c1b8ec2a74f1e0aaf45e8217ce0cd4e4393eb0d3f29f1e494c9a75c03 +EBUILD xv-6.0.1.ebuild 1475 BLAKE2B 06a2a198bc77273a39fccbfe0bba1c2f70ec6fa158cbc9585108cb67df7b4b0596f46b38c736c9afc58393fd3f625ba1d4efdff8d838bf792bba3b14c2393de2 SHA512 b740fa215d58334e9b8e9e5ed0c74a9eaa8036164ae1f4f9998e7d92e7e5e589ba635beda9f83ced7707254bf0bdd5d9f9304bd13861d4c6f42cff4be0a6ed4a +EBUILD xv-6.0.2.ebuild 1480 BLAKE2B f0b131bdf1bb8cd94c352609ff674d5a2a0cb21955ec83a0be385d47916ab36046140479662f087515f02e45ef6c86cb1c47b4aeaf6d509667e22248efea1d34 SHA512 f4f9d93f880d6bb0383058a382ad2cea3c32d342a98bc6597e1b5f36a946328f6bc3012743316e5660fd83b7c0a7ee9a567bdb546a417da77c672abe08079a8c MISC metadata.xml 392 BLAKE2B e1e306f8f6bd480912d6e45b5af362d54900117ae05a21995023e6611c1410af6682af867150179ecebd9d319a9f9810723dffec59a26e3f9f9ecc0a56061127 SHA512 e8aad6d1b24943fc3aeb6533fb0dc048ea0d3edc04abe2efa9a27930698ff3ddb0185dc3a2da69e08c050c4545d907c8580add6732fd8e3258ed496784902364 diff --git a/media-gfx/xv/files/xv-3.10a-add-ldflags-20070520.patch b/media-gfx/xv/files/xv-3.10a-add-ldflags-20070520.patch deleted file mode 100644 index da53ccb8bd6b..000000000000 --- a/media-gfx/xv/files/xv-3.10a-add-ldflags-20070520.patch +++ /dev/null @@ -1,27 +0,0 @@ ---- xv-3.10a/Makefile.orig 2008-06-16 08:32:39.000000000 -0600 -+++ xv-3.10a/Makefile 2008-06-16 08:49:19.000000000 -0600 -@@ -369,19 +369,19 @@ - - #xv: $(OBJS) $(JPEGLIB) $(TIFFLIB) - xv: $(OBJS) -- $(CC) -o xv $(CFLAGS) $(OBJS) $(LIBS) -+ $(CC) $(CFLAGS) $(LDFLAGS) -o xv $(OBJS) $(LIBS) - - bggen: bggen.c -- $(CC) $(CFLAGS) -o bggen bggen.c $(LIBS) -+ $(CC) $(CFLAGS) $(LDFLAGS) -o bggen bggen.c $(LIBS) - - vdcomp: vdcomp.c -- $(CC) $(CFLAGS) -o vdcomp vdcomp.c -+ $(CC) $(CFLAGS) $(LDFLAGS) -o vdcomp vdcomp.c - - xcmap: xcmap.c -- $(CC) $(CFLAGS) -o xcmap xcmap.c $(LIBS) -+ $(CC) $(CFLAGS) $(LDFLAGS) -o xcmap xcmap.c $(LIBS) - - xvpictoppm: xvpictoppm.c -- $(CC) $(CFLAGS) -o xvpictoppm xvpictoppm.c -+ $(CC) $(CFLAGS) $(LDFLAGS) -o xvpictoppm xvpictoppm.c - - - diff --git a/media-gfx/xv/files/xv-3.10a-disable-jp2k-20070520.patch b/media-gfx/xv/files/xv-3.10a-disable-jp2k-20070520.patch deleted file mode 100644 index 7e42484abf48..000000000000 --- a/media-gfx/xv/files/xv-3.10a-disable-jp2k-20070520.patch +++ /dev/null @@ -1,23 +0,0 @@ ---- xv-3.10a/Makefile~ 2007-06-24 15:41:58 -0600 -+++ xv-3.10a/Makefile 2007-06-24 15:42:43 -0600 -@@ -176,16 +176,16 @@ - ### if, for whatever reason, you're unable to get the JasPer JPEG-2000 library - ### to compile on your machine, *COMMENT OUT* the following lines - ### --JP2K = -DDOJP2K -+#JP2K = -DDOJP2K - ### - #JP2KDIR = ../../jasper --JP2KDIR = /usr/local/lib -+#JP2KDIR = /usr/local/lib - ### - #JP2KINC = -I$(JP2KDIR) --JP2KINC = -I/usr/local/include -+#JP2KINC = -I/usr/local/include - ### - #JP2KLIB = -L$(JP2KDIR) -ljasper --JP2KLIB = $(JP2KDIR)/libjasper.a -+#JP2KLIB = $(JP2KDIR)/libjasper.a - - - ### diff --git a/media-gfx/xv/files/xv-3.10a-fix-wait-20070520.patch b/media-gfx/xv/files/xv-3.10a-fix-wait-20070520.patch deleted file mode 100644 index ec093ab309c9..000000000000 --- a/media-gfx/xv/files/xv-3.10a-fix-wait-20070520.patch +++ /dev/null @@ -1,40 +0,0 @@ -diff -Nur xv-3.10a_old/xvevent.c xv-3.10a/xvevent.c ---- xv-3.10a_old/xvevent.c 2008-05-06 12:44:41.000000000 -0600 -+++ xv-3.10a/xvevent.c 2008-05-06 15:55:59.000000000 -0600 -@@ -82,7 +82,7 @@ - int retval,done,waiting; - #ifdef USE_TICKS - clock_t waitsec_ticks=0L, orgtime_ticks=0L, curtime_ticks; -- clock_t elapsed_ticks=0L, remaining_interval; -+ clock_t elapsed_ticks=0L, remaining_interval, clock_ticks_per_sec; - #else - time_t orgtime=0L, curtime; - #endif -@@ -126,7 +126,8 @@ - all pending events (ie, drawing the image the first time) - have been dealt with: START WAITING */ - #ifdef USE_TICKS -- waitsec_ticks = (clock_t)(waitsec * CLK_TCK); -+ clock_ticks_per_sec = sysconf(_SC_CLK_TCK); -+ waitsec_ticks = (clock_t)(waitsec * clock_ticks_per_sec); - orgtime_ticks = times(NULL); /* unclear if NULL valid, but OK on Linux */ - #else - orgtime = time(NULL); -@@ -168,11 +169,14 @@ - } else - elapsed_ticks = curtime_ticks - orgtime_ticks; - remaining_interval = waitsec_ticks - elapsed_ticks; -- if (remaining_interval >= (clock_t)(1 * CLK_TCK)) -+ if (remaining_interval > clock_ticks_per_sec) - sleep(1); - else { -- /* less than one second remaining: do delay in msec, then return */ -- Timer((remaining_interval * 1000L) / CLK_TCK); /* can't overflow */ -+ if (remaining_interval > 0) { -+ /* less than one second remaining: do delay in msec, then return */ -+ Timer((remaining_interval * 1000L) / clock_ticks_per_sec); /* can't overflow */ -+ } -+ - return waitloop? NEXTLOOP : NEXTQUIT; - } - #else diff --git a/media-gfx/xv/files/xv-3.10a-libpng15-r1.patch b/media-gfx/xv/files/xv-3.10a-libpng15-r1.patch deleted file mode 100644 index 9905c4b8ae7e..000000000000 --- a/media-gfx/xv/files/xv-3.10a-libpng15-r1.patch +++ /dev/null @@ -1,520 +0,0 @@ ---- xv-3.10a/xvinfo.c -+++ xv-3.10a/xvinfo.c -@@ -26,7 +26,7 @@ - #define INFOHIGH 270 - - /* max length of an Info String */ --#define ISTRLEN 80 -+#define ISTRLEN 256 - - /* baseline of top line of text */ - #define TOPBASE (36 + penn_height/2 + 4 + 8 + ASCENT) ---- xv-3.10a/xvpng.c -+++ xv-3.10a/xvpng.c -@@ -31,6 +31,7 @@ - - #ifdef HAVE_PNG - -+#include "zlib.h" - #include "png.h" - - /*** Stuff for PNG Dialog box ***/ -@@ -41,7 +42,9 @@ - #define COMPRESSION 6 /* default zlib compression level, not max - (Z_BEST_COMPRESSION) */ - --#define HAVE_tRNS (info_ptr->valid & PNG_INFO_tRNS) -+/* old -+#define HAVE_tRNS (info_ptr->valid & PNG_INFO_tRNS) */ -+#define HAVE_tRNS png_get_valid(png_ptr,info_ptr,PNG_INFO_tRNS) - - #define DWIDE 86 - #define DHIGH 104 -@@ -444,6 +447,10 @@ - byte *p, *png_line; - char software[256]; - char *savecmnt; -+ /* for storing values until all are accumulated, so that the image header can be set in full */ -+ int _bit_depth,_color_type,_interlace_type,_compression_type,_filter_type; -+ png_uint_32 _width,_height; -+ png_time _mod_time; - - if ((png_ptr = png_create_write_struct(PNG_LIBPNG_VER_STRING, NULL, - png_xv_error, png_xv_warning)) == NULL) { -@@ -458,7 +465,7 @@ - FatalError(software); - } - -- if (setjmp(png_ptr->jmpbuf)) { -+ if (setjmp(png_jmpbuf(png_ptr))) { - png_destroy_write_struct(&png_ptr, &info_ptr); - return -1; - } -@@ -489,8 +496,8 @@ - png_set_filter(png_ptr, 0, filter); - } - -- info_ptr->width = w; -- info_ptr->height = h; -+ _width = w; -+ _height = h; - if (w <= 0 || h <= 0) { - SetISTR(ISTR_WARNING, "%s: image dimensions out of range (%dx%d)", - fbasename, w, h); -@@ -498,7 +505,7 @@ - return -1; - } - -- info_ptr->interlace_type = interCB.val ? 1 : 0; -+ _interlace_type = interCB.val ? PNG_INTERLACE_ADAM7 : PNG_INTERLACE_NONE; - - linesize = 0; /* quiet a compiler warning */ - -@@ -542,40 +549,44 @@ - png_destroy_write_struct(&png_ptr, &info_ptr); - return -1; - } -- info_ptr->color_type = PNG_COLOR_TYPE_RGB; -- info_ptr->bit_depth = 8; -+ _color_type = PNG_COLOR_TYPE_RGB; -+ _bit_depth = 8; - } else /* ptype == PIC8 */ { - linesize = w; -- info_ptr->color_type = PNG_COLOR_TYPE_PALETTE; -+ _color_type = PNG_COLOR_TYPE_PALETTE; - if (numuniqcols <= 2) -- info_ptr->bit_depth = 1; -+ _bit_depth = 1; - else - if (numuniqcols <= 4) -- info_ptr->bit_depth = 2; -+ _bit_depth = 2; - else - if (numuniqcols <= 16) -- info_ptr->bit_depth = 4; -+ _bit_depth = 4; - else -- info_ptr->bit_depth = 8; -+ _bit_depth = 8; - - for (i = 0; i < numuniqcols; i++) { - palette[i].red = r1[i]; - palette[i].green = g1[i]; - palette[i].blue = b1[i]; - } -- info_ptr->num_palette = numuniqcols; -- info_ptr->palette = palette; -+/* cannot find a setter for this, unsure if it is necessary anymore... - info_ptr->valid |= PNG_INFO_PLTE; -+*/ -+ /* set the header just in case it's needed */ -+ png_set_IHDR(png_ptr,info_ptr,_width,_height,_bit_depth,_color_type, -+ _interlace_type,PNG_COMPRESSION_TYPE_DEFAULT,PNG_FILTER_TYPE_DEFAULT); -+ png_set_PLTE(png_ptr,info_ptr,palette,numuniqcols); - } - } - - else if (colorType == F_GREYSCALE || colorType == F_BWDITHER) { -- info_ptr->color_type = PNG_COLOR_TYPE_GRAY; -+ _color_type = PNG_COLOR_TYPE_GRAY; - if (colorType == F_BWDITHER) { - /* shouldn't happen */ - if (ptype == PIC24) FatalError("PIC24 and B/W Stipple in WritePNG()"); - -- info_ptr->bit_depth = 1; -+ _bit_depth = 1; - if (MONO(r1[0], g1[0], b1[0]) > MONO(r1[1], g1[1], b1[1])) { - remap[0] = 1; - remap[1] = 0; -@@ -595,7 +606,7 @@ - png_destroy_write_struct(&png_ptr, &info_ptr); - return -1; - } -- info_ptr->bit_depth = 8; -+ _bit_depth = 8; - } - else /* ptype == PIC8 */ { - int low_precision; -@@ -617,7 +628,7 @@ - for (; i < 256; i++) - remap[i]=0; /* shouldn't be necessary, but... */ - -- info_ptr->bit_depth = 8; -+ _bit_depth = 8; - - /* Note that this fails most of the time because of gamma */ - /* (and that would be a bug: GRR FIXME) */ -@@ -636,7 +647,7 @@ - for (i = 0; i < numuniqcols; i++) { - remap[i] &= 0xf; - } -- info_ptr->bit_depth = 4; -+ _bit_depth = 4; - - /* try to adjust to 2-bit precision grayscale */ - -@@ -652,7 +663,7 @@ - for (i = 0; i < numuniqcols; i++) { - remap[i] &= 3; - } -- info_ptr->bit_depth = 2; -+ _bit_depth = 2; - - /* try to adjust to 1-bit precision grayscale */ - -@@ -668,7 +679,7 @@ - for (i = 0; i < numuniqcols; i++) { - remap[i] &= 1; - } -- info_ptr->bit_depth = 1; -+ _bit_depth = 1; - } - } - } -@@ -677,6 +688,9 @@ - else - png_error(png_ptr, "Unknown colorstyle in WritePNG"); - -+ png_set_IHDR(png_ptr,info_ptr,_width,_height,_bit_depth,_color_type, -+ _interlace_type,PNG_COMPRESSION_TYPE_DEFAULT,PNG_FILTER_TYPE_DEFAULT); -+ - if ((text = (png_textp)malloc(sizeof(png_text)))) { - sprintf(software, "XV %s", REVDATE); - -@@ -685,20 +699,22 @@ - text->text = software; - text->text_length = strlen(text->text); - -- info_ptr->max_text = 1; -- info_ptr->num_text = 1; -- info_ptr->text = text; -+/* max_text seems to be internal only now, do not set -+ info_ptr->max_text = 1; */ -+ png_set_text(png_ptr,info_ptr,text,1); - } - - Display_Gamma = gDial.val; /* Save the current gamma for loading */ - - // GRR FIXME: add .Xdefaults option to omit writing gamma (size, cumulative errors when editing)--alternatively, modify save box to include "omit" checkbox -- info_ptr->gamma = 1.0/gDial.val; -- info_ptr->valid |= PNG_INFO_gAMA; -+ png_set_gAMA(png_ptr,info_ptr,1.0/gDial.val); -+/* doesn't seem to be a way to set valid directly anymore, unnecessary maybe.. -+ info_ptr->valid |= PNG_INFO_gAMA; */ - -+/* might need to be png_write_info_before_PLTE() ... */ - png_write_info(png_ptr, info_ptr); - -- if (info_ptr->bit_depth < 8) -+ if (_bit_depth < 8) - png_set_packing(png_ptr); - - pass=png_set_interlace_handling(png_ptr); -@@ -711,13 +727,13 @@ - int j; - p = pic; - for (j = 0; j < h; ++j) { -- if (info_ptr->color_type == PNG_COLOR_TYPE_GRAY) { -+ if (_color_type == PNG_COLOR_TYPE_GRAY) { - int k; - for (k = 0; k < w; ++k) - png_line[k] = ptype==PIC24 ? MONO(p[k*3], p[k*3+1], p[k*3+2]) : - remap[pc2nc[p[k]]]; - png_write_row(png_ptr, png_line); -- } else if (info_ptr->color_type == PNG_COLOR_TYPE_PALETTE) { -+ } else if (_color_type == PNG_COLOR_TYPE_PALETTE) { - int k; - for (k = 0; k < w; ++k) - png_line[k] = pc2nc[p[k]]; -@@ -739,28 +755,31 @@ - (savecmnt = (char *)malloc((strlen(picComments) + 1)*sizeof(char)))) { - png_textp tp; - char *comment, *key; -+ int nt; -+ int mt; - - strcpy(savecmnt, picComments); - key = savecmnt; -+ png_get_text(png_ptr,info_ptr,&tp,&mt); /* to get 'max_text' */ - tp = text; -- info_ptr->num_text = 0; -+ nt = 0; - - comment = strchr(key, ':'); - - do { - /* Allocate a larger structure for comments if necessary */ -- if (info_ptr->num_text >= info_ptr->max_text) -+ if (nt >= mt) - { - if ((tp = -- realloc(text, (info_ptr->num_text + 2)*sizeof(png_text))) == NULL) -+ realloc(text, (nt + 2)*sizeof(png_text))) == NULL) - { - break; - } - else - { - text = tp; -- tp = &text[info_ptr->num_text]; -- info_ptr->max_text += 2; -+ tp = &text[nt]; -+ mt += 2; - } - } - -@@ -810,7 +829,7 @@ - } - - tp->compression = tp->text_length > 640 ? 0 : -1; -- info_ptr->num_text++; -+ nt++; - tp++; - } - } -@@ -834,27 +853,29 @@ - tp->text = key; - tp->text_length = q - key; - tp->compression = tp->text_length > 750 ? 0 : -1; -- info_ptr->num_text++; -+ nt++; - key = NULL; - } - } while (key && *key); -+ png_set_text(png_ptr,info_ptr,text,nt); - } - else { -- info_ptr->num_text = 0; -+ png_set_text(png_ptr,info_ptr,text,0); - } - } -- info_ptr->text = text; - -- png_convert_from_time_t(&(info_ptr->mod_time), time(NULL)); -- info_ptr->valid |= PNG_INFO_tIME; -+ png_convert_from_time_t(&_mod_time, time(NULL)); -+ png_set_tIME(png_ptr,info_ptr,&_mod_time); -+/* dunno how to set validity -+ info_ptr->valid |= PNG_INFO_tIME; */ - - png_write_end(png_ptr, info_ptr); - fflush(fp); /* just in case we core-dump before finishing... */ - - if (text) { - free(text); -- /* must do this or png_destroy_write_struct() 0.97+ will free text again: */ -- info_ptr->text = (png_textp)NULL; -+ /* must do this or png_destroy_write_struct() 0.97+ will free text again: -+ info_ptr->text = (png_textp)NULL; */ - if (savecmnt) - { - free(savecmnt); -@@ -886,6 +907,14 @@ - int pass; - int gray_to_rgb; - size_t commentsize; -+ /* temp storage vars for libpng15 migration */ -+ int _bit_depth,_color_type,_interlace_type,_compression_type,_filter_type,_num_text,_num_palette; -+ png_uint_32 _width,_height; -+ png_timep _mod_time; -+ double _gamma; -+ png_textp _text; -+ png_colorp _palette; -+ png_color_16p _background; - - fbasename = BaseName(fname); - -@@ -921,7 +950,7 @@ - FatalError("malloc failure in LoadPNG"); - } - -- if (setjmp(png_ptr->jmpbuf)) { -+ if (setjmp(png_jmpbuf(png_ptr))) { - fclose(fp); - png_destroy_read_struct(&png_ptr, &info_ptr, (png_infopp)NULL); - if (!read_anything) { -@@ -945,8 +974,10 @@ - #endif - png_read_info(png_ptr, info_ptr); - -- pinfo->w = pinfo->normw = info_ptr->width; -- pinfo->h = pinfo->normh = info_ptr->height; -+ png_get_IHDR(png_ptr,info_ptr,&_width,&_height,&_bit_depth,&_color_type,&_interlace_type,NULL,NULL); -+ -+ pinfo->w = pinfo->normw = _width; -+ pinfo->h = pinfo->normh = _height; - if (pinfo->w <= 0 || pinfo->h <= 0) { - SetISTR(ISTR_WARNING, "%s: image dimensions out of range (%dx%d)", - fbasename, pinfo->w, pinfo->h); -@@ -957,9 +988,9 @@ - pinfo->frmType = F_PNG; - - sprintf(pinfo->fullInfo, "PNG, %d bit ", -- info_ptr->bit_depth * info_ptr->channels); -+ _bit_depth * png_get_channels(png_ptr,info_ptr)); - -- switch(info_ptr->color_type) { -+ switch(_color_type) { - case PNG_COLOR_TYPE_PALETTE: - strcat(pinfo->fullInfo, "palette color"); - break; -@@ -983,15 +1014,17 @@ - - sprintf(pinfo->fullInfo + strlen(pinfo->fullInfo), - ", %sinterlaced. (%d bytes)", -- info_ptr->interlace_type ? "" : "non-", filesize); -+ _interlace_type ? "" : "non-", filesize); - -- sprintf(pinfo->shrtInfo, "%lux%lu PNG", info_ptr->width, info_ptr->height); -+ sprintf(pinfo->shrtInfo, "%lux%lu PNG", _width, _height); - -- if (info_ptr->bit_depth < 8) -+ if (_bit_depth < 8) - png_set_packing(png_ptr); - -- if (info_ptr->valid & PNG_INFO_gAMA) -- png_set_gamma(png_ptr, Display_Gamma, info_ptr->gamma); -+ if (png_get_valid(png_ptr,info_ptr,PNG_INFO_gAMA)) { -+ png_get_gAMA(png_ptr,info_ptr,&_gamma); -+ png_set_gamma(png_ptr, Display_Gamma, _gamma); -+ } - /* - *else - * png_set_gamma(png_ptr, Display_Gamma, 0.45); -@@ -1000,7 +1033,7 @@ - gray_to_rgb = 0; /* quiet a compiler warning */ - - if (have_imagebg) { -- if (info_ptr->bit_depth == 16) { -+ if (_bit_depth == 16) { - my_background.red = imagebgR; - my_background.green = imagebgG; - my_background.blue = imagebgB; -@@ -1013,8 +1046,8 @@ - } - png_set_background(png_ptr, &my_background, PNG_BACKGROUND_GAMMA_SCREEN, - 0, Display_Gamma); -- if ((info_ptr->color_type == PNG_COLOR_TYPE_GRAY_ALPHA || -- (info_ptr->color_type == PNG_COLOR_TYPE_GRAY && HAVE_tRNS)) && -+ if ((_color_type == PNG_COLOR_TYPE_GRAY_ALPHA || -+ (_color_type == PNG_COLOR_TYPE_GRAY && HAVE_tRNS)) && - (imagebgR != imagebgG || imagebgR != imagebgB)) /* i.e., colored bg */ - { - png_set_gray_to_rgb(png_ptr); -@@ -1022,8 +1055,9 @@ - gray_to_rgb = 1; - } - } else { -- if (info_ptr->valid & PNG_INFO_bKGD) { -- png_set_background(png_ptr, &info_ptr->background, -+ if (png_get_valid(png_ptr,info_ptr,PNG_INFO_bKGD)) { -+ png_get_bKGD(png_ptr,info_ptr,&_background); -+ png_set_background(png_ptr, _background, - PNG_BACKGROUND_GAMMA_FILE, 1, 1.0); - } else { - my_background.red = my_background.green = my_background.blue = -@@ -1033,13 +1067,13 @@ - } - } - -- if (info_ptr->bit_depth == 16) -+ if (_bit_depth == 16) - png_set_strip_16(png_ptr); - -- if (info_ptr->color_type == PNG_COLOR_TYPE_GRAY || -- info_ptr->color_type == PNG_COLOR_TYPE_GRAY_ALPHA) -+ if (_color_type == PNG_COLOR_TYPE_GRAY || -+ _color_type == PNG_COLOR_TYPE_GRAY_ALPHA) - { -- if (info_ptr->bit_depth == 1) -+ if (_bit_depth == 1) - pinfo->colType = F_BWDITHER; - else - pinfo->colType = F_GREYSCALE; -@@ -1049,9 +1083,11 @@ - pass=png_set_interlace_handling(png_ptr); - - png_read_update_info(png_ptr, info_ptr); -+ /* get HIDR again just in case the info_ptr changed */ -+ png_get_IHDR(png_ptr,info_ptr,&_width,&_height,&_bit_depth,&_color_type,&_interlace_type,NULL,NULL); - -- if (info_ptr->color_type == PNG_COLOR_TYPE_RGB || -- info_ptr->color_type == PNG_COLOR_TYPE_RGB_ALPHA || gray_to_rgb) -+ if (_color_type == PNG_COLOR_TYPE_RGB || -+ _color_type == PNG_COLOR_TYPE_RGB_ALPHA || gray_to_rgb) - { - linesize = 3 * pinfo->w; - if (linesize/3 < pinfo->w) { /* know pinfo->w > 0 (see above) */ -@@ -1065,16 +1101,17 @@ - } else { - linesize = pinfo->w; - pinfo->type = PIC8; -- if (info_ptr->color_type == PNG_COLOR_TYPE_GRAY || -- info_ptr->color_type == PNG_COLOR_TYPE_GRAY_ALPHA) { -+ if (_color_type == PNG_COLOR_TYPE_GRAY || -+ _color_type == PNG_COLOR_TYPE_GRAY_ALPHA) { - for (i = 0; i < 256; i++) - pinfo->r[i] = pinfo->g[i] = pinfo->b[i] = i; - } else { - pinfo->colType = F_FULLCOLOR; -- for (i = 0; i < info_ptr->num_palette; i++) { -- pinfo->r[i] = info_ptr->palette[i].red; -- pinfo->g[i] = info_ptr->palette[i].green; -- pinfo->b[i] = info_ptr->palette[i].blue; -+ png_get_PLTE(png_ptr,info_ptr,&_palette,&_num_palette); -+ for (i = 0; i < _num_palette; i++) { -+ pinfo->r[i] = _palette[i].red; -+ pinfo->g[i] = _palette[i].green; -+ pinfo->b[i] = _palette[i].blue; - } - } - } -@@ -1092,7 +1129,7 @@ - png_error(png_ptr, "can't allocate space for PNG image"); - } - -- png_start_read_image(png_ptr); -+ /*png_start_read_image(png_ptr); -- causes a warning and seems to be unnecessary */ - - for (i = 0; i < pass; i++) { - byte *p = pinfo->pic; -@@ -1106,22 +1143,23 @@ - - png_read_end(png_ptr, info_ptr); - -- if (info_ptr->num_text > 0) { -+ png_get_text(png_ptr,info_ptr,&_text,&_num_text); -+ if (_num_text > 0) { - commentsize = 1; - -- for (i = 0; i < info_ptr->num_text; i++) -- commentsize += strlen(info_ptr->text[i].key) + 1 + -- info_ptr->text[i].text_length + 2; -+ for (i = 0; i < _num_text; i++) -+ commentsize += strlen(_text[i].key) + 1 + -+ _text[i].text_length + 2; - - if ((pinfo->comment = malloc(commentsize)) == NULL) { - png_warning(png_ptr,"can't allocate comment string"); - } - else { - pinfo->comment[0] = '\0'; -- for (i = 0; i < info_ptr->num_text; i++) { -- strcat(pinfo->comment, info_ptr->text[i].key); -+ for (i = 0; i < _num_text; i++) { -+ strcat(pinfo->comment, _text[i].key); - strcat(pinfo->comment, "::"); -- strcat(pinfo->comment, info_ptr->text[i].text); -+ strncat(pinfo->comment, _text[i].text, _text[i].text_length); - strcat(pinfo->comment, "\n"); - } - } -@@ -1143,7 +1181,7 @@ - { - SetISTR(ISTR_WARNING,"%s: libpng error: %s", fbasename, message); - -- longjmp(png_ptr->jmpbuf, 1); -+ longjmp(png_jmpbuf(png_ptr), 1); - } - - diff --git a/media-gfx/xv/files/xv-3.10a-osx-bsd-20070520.patch b/media-gfx/xv/files/xv-3.10a-osx-bsd-20070520.patch deleted file mode 100644 index ecafd1ddf56e..000000000000 --- a/media-gfx/xv/files/xv-3.10a-osx-bsd-20070520.patch +++ /dev/null @@ -1,38 +0,0 @@ ---- xv-3.10a/xv.h~ 2007-06-24 14:30:42 -0600 -+++ xv-3.10a/xv.h 2007-06-24 14:42:04 -0600 -@@ -158,7 +158,7 @@ - - #ifndef VMS - # include <errno.h> --# ifndef __NetBSD__ -+# if !defined(__NetBSD__) && !defined(__FreeBSD__) && !defined(__APPLE__) - # if !(defined __GLIBC__ && __GLIBC__ >= 2) - extern int errno; /* SHOULD be in errno.h, but often isn't */ - extern char *sys_errlist[]; /* this too... */ -@@ -171,7 +171,7 @@ - #ifdef VMS - # define ERRSTR(x) strerror(x, vaxc$errno) - #else --# if defined(__BEOS__) || defined(__linux__) /* or all modern/glibc systems? */ -+# if defined(__BEOS__) || defined(__linux__) || defined(__APPLE__) /* or all modern/glibc systems? */ - # define ERRSTR(x) strerror(x) - # else - # define ERRSTR(x) sys_errlist[x] -@@ -206,6 +206,8 @@ - #ifdef NEED_MALLOC_H - # if defined(hp300) || defined(hp800) || defined(NeXT) - # include <sys/malloc.h> /* it's in "sys" on HPs and NeXT */ -+# elif defined(__APPLE__) -+# include <malloc/malloc.h> - # else - # include <malloc.h> - # endif -@@ -369,7 +371,7 @@ - * them later. */ - #ifndef VMS /* VMS hates multi-line definitions */ - # if defined(__linux__) || defined(__OpenBSD__) || defined(__NetBSD__) || \ -- defined(__bsdi__) -+ defined(__FreeBSD__) || defined(__bsdi__) || defined(__APPLE__) - # ifndef USE_MKSTEMP - # define USE_MKSTEMP /* use 'mkstemp()' instead of 'mktemp()' */ - # endif /* >> SECURITY ISSUE << */ diff --git a/media-gfx/xv/files/xv-3.10a-vdcomp-osx-20070520.patch b/media-gfx/xv/files/xv-3.10a-vdcomp-osx-20070520.patch deleted file mode 100644 index 2c82b1ae43e6..000000000000 --- a/media-gfx/xv/files/xv-3.10a-vdcomp-osx-20070520.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- xv-3.10a/vdcomp.c~ 2007-06-24 14:30:42 -0600 -+++ xv-3.10a/vdcomp.c 2007-06-24 14:48:12 -0600 -@@ -123,6 +123,8 @@ - - # if defined(hp300) || defined(hp800) || defined(NeXT) - # include <sys/malloc.h> /* it's in "sys" on HPs and NeXT */ -+# elif defined(__APPLE__) -+# include <malloc/malloc.h> - # else - # include <malloc.h> /* FIXME: should explicitly list systems that NEED this, not everyone that doesn't */ - # endif diff --git a/media-gfx/xv/files/xv-3.10a-wformat-security.patch b/media-gfx/xv/files/xv-3.10a-wformat-security.patch deleted file mode 100644 index 34d2c19ebae3..000000000000 --- a/media-gfx/xv/files/xv-3.10a-wformat-security.patch +++ /dev/null @@ -1,19 +0,0 @@ -Fix errors caused by -Wformat -Werror=format-security -https://bugs.gentoo.org/show_bug.cgi?id=542134 - -* xvpbm.c:888:4: error: format not a string literal and no format arguments [-Werror=format-security] -* if (*pix) fprintf(fp,str1); - ---- xv-3.10a/xvpbm.c -+++ xv-3.10a/xvpbm.c -@@ -885,8 +885,8 @@ - } - } - else { -- if (*pix) fprintf(fp,str1); -- else fprintf(fp,str0); -+ if (*pix) fprintf(fp,"%s",str1); -+ else fprintf(fp,"%s",str0); - len+=2; - if (len>68) { fprintf(fp,"\n"); len=0; } - } diff --git a/media-gfx/xv/xv-3.10a-r22.ebuild b/media-gfx/xv/xv-3.10a-r22.ebuild deleted file mode 100644 index 9141002ec745..000000000000 --- a/media-gfx/xv/xv-3.10a-r22.ebuild +++ /dev/null @@ -1,98 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit desktop flag-o-matic toolchain-funcs - -JUMBOV=20070520 -DESCRIPTION="Interactive image manipulation program supporting a wide variety of formats" -HOMEPAGE="http://www.trilon.com/xv/index.html http://www.sonic.net/~roelofs/greg_xv.html" -SRC_URI="https://downloads.sourceforge.net/png-mng/${P}-jumbo-patches-${JUMBOV}.tar.gz - ftp://ftp.cis.upenn.edu/pub/xv/${P}.tar.gz - mirror://gentoo/${P}.png.bz2" - -LICENSE="xv" -SLOT="0" -KEYWORDS="~alpha amd64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos" -IUSE="jpeg tiff png" - -DEPEND=" - x11-libs/libXt - jpeg? ( media-libs/libjpeg-turbo:= ) - tiff? ( media-libs/tiff:= ) - png? ( - >=media-libs/libpng-1.2:= - sys-libs/zlib - ) -" -RDEPEND="${DEPEND}" - -PATCHES=( - "${WORKDIR}/${P}-jumbo-fix-enh-patch-${JUMBOV}.txt" - "${FILESDIR}/${P}-osx-bsd-${JUMBOV}.patch" - "${FILESDIR}/${P}-vdcomp-osx-${JUMBOV}.patch" - "${FILESDIR}/${P}-disable-jp2k-${JUMBOV}.patch" - "${FILESDIR}/${P}-fix-wait-${JUMBOV}.patch" - "${FILESDIR}/${P}-add-ldflags-${JUMBOV}.patch" - "${FILESDIR}/${P}-libpng15-r1.patch" - "${FILESDIR}/${P}-wformat-security.patch" -) - -src_prepare() { - default - - append-cppflags -DUSE_GETCWD -DLINUX -DUSLEEP - use jpeg && append-cppflags -DDOJPEG - use png && append-cppflags -DDOPNG - use tiff && append-cppflags -DDOTIFF -DUSE_TILED_TIFF_BOTLEFT_FIX - - # Link with various image libraries depending on use flags - IMAGE_LIBS="" - use jpeg && IMAGE_LIBS="${IMAGE_LIBS} -ljpeg" - use png && IMAGE_LIBS="${IMAGE_LIBS} -lz -lpng" - use tiff && IMAGE_LIBS="${IMAGE_LIBS} -ltiff" - - sed -i \ - -e 's/\(^JPEG.*\)/#\1/g' \ - -e 's/\(^PNG.*\)/#\1/g' \ - -e 's/\(^TIFF.*\)/#\1/g' \ - -e "s/\(^LIBS = .*\)/\1${IMAGE_LIBS}/g" Makefile || die - - # 731022 - sed -i -e "s#lib -lz#$(get_libdir) -lz#" Makefile || die - - # /usr/bin/gzip => /bin/gzip - sed -i -e 's#/usr\(/bin/gzip\)#'"${EPREFIX}"'\1#g' config.h || die - - # Fix installation of ps docs - sed -i -e 's#$(DESTDIR)$(LIBDIR)#$(LIBDIR)#g' Makefile || die -} - -src_compile() { - # -Werror=lto-type-mismatch - # https://bugs.gentoo.org/859823 - # https://github.com/jasper-software/xv/issues/25 - filter-lto - - emake \ - CC="$(tc-getCC)" CCOPTS="${CPPFLAGS} ${CFLAGS}" LDFLAGS="${LDFLAGS}" \ - PREFIX="${EPREFIX}"/usr \ - DOCDIR="${EPREFIX}/usr/share/doc/${PF}" \ - LIBDIR="${T}" -} - -src_install() { - dodir /usr/bin - dodir /usr/share/man/man1 - - emake \ - DESTDIR="${D}" \ - PREFIX="${EPREFIX}"/usr \ - DOCDIR="${EPREFIX}/usr/share/doc/${PF}" \ - LIBDIR="${T}" install - - dodoc CHANGELOG BUGS IDEAS - newicon "${WORKDIR}"/${P}.png ${PN}.png - make_desktop_entry xv "" "" "Graphics;Viewer" -} diff --git a/media-gfx/xv/xv-5.2.0.ebuild b/media-gfx/xv/xv-5.2.0.ebuild deleted file mode 100644 index a1e2d3e14fb9..000000000000 --- a/media-gfx/xv/xv-5.2.0.ebuild +++ /dev/null @@ -1,58 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit cmake desktop flag-o-matic - -JUMBOV=20070520 -DESCRIPTION="Interactive image manipulation program supporting a wide variety of formats" -HOMEPAGE="https://github.com/jasper-software/xv/" -SRC_URI="https://github.com/jasper-software/xv/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz - mirror://gentoo/xv-3.10a.png.bz2" - -LICENSE="xv" -SLOT="0" -KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos" -IUSE="jpeg tiff png webp" - -DEPEND=" - x11-libs/libXt - jpeg? ( media-libs/libjpeg-turbo:= ) - tiff? ( media-libs/tiff:= ) - png? ( - >=media-libs/libpng-1.2:= - sys-libs/zlib - ) - webp? ( media-libs/libwebp:= ) -" -RDEPEND="${DEPEND}" - -PATCHES=( - "${FILESDIR}/xv-5.2.0-osx-bsd.patch" -) - -src_configure() { - # -Werror=lto-type-mismatch - # https://bugs.gentoo.org/859823 - # https://github.com/jasper-software/xv/issues/25 - filter-lto - - local mycmakeargs=( - -DCMAKE_INSTALL_SYSCONFDIR="${EPREFIX}/etc" - -DXV_ENABLE_JPEG=$(usex jpeg) - -DXV_ENABLE_JP2K=OFF - -DXV_ENABLE_PNG=$(usex png) - -DXV_ENABLE_TIFF=$(usex tiff) - -DXV_ENABLE_WEBP=$(usex webp) - ) - - cmake_src_configure -} - -src_install() { - cmake_src_install - - newicon "${WORKDIR}"/xv-3.10a.png ${PN}.png - make_desktop_entry xv "" "" "Graphics;Viewer" -} diff --git a/media-gfx/xv/xv-6.0.1.ebuild b/media-gfx/xv/xv-6.0.1.ebuild index 2983ac332da6..765763141e26 100644 --- a/media-gfx/xv/xv-6.0.1.ebuild +++ b/media-gfx/xv/xv-6.0.1.ebuild @@ -9,11 +9,11 @@ JUMBOV=20070520 DESCRIPTION="Interactive image manipulation program supporting a wide variety of formats" HOMEPAGE="https://github.com/jasper-software/xv/" SRC_URI="https://github.com/jasper-software/xv/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz - mirror://gentoo/xv-3.10a.png.bz2" + https://dev.gentoo.org/~bkohler/dist/xv-3.10a.png.bz2" LICENSE="xv" SLOT="0" -KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos" +KEYWORDS="~alpha amd64 ~hppa ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos" IUSE="jpeg tiff png webp" DEPEND=" diff --git a/media-gfx/xv/xv-6.0.0.ebuild b/media-gfx/xv/xv-6.0.2.ebuild index 2983ac332da6..c738fa3ebbbd 100644 --- a/media-gfx/xv/xv-6.0.0.ebuild +++ b/media-gfx/xv/xv-6.0.2.ebuild @@ -9,11 +9,11 @@ JUMBOV=20070520 DESCRIPTION="Interactive image manipulation program supporting a wide variety of formats" HOMEPAGE="https://github.com/jasper-software/xv/" SRC_URI="https://github.com/jasper-software/xv/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz - mirror://gentoo/xv-3.10a.png.bz2" + https://dev.gentoo.org/~bkohler/dist/xv-3.10a.png.bz2" LICENSE="xv" SLOT="0" -KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos" +KEYWORDS="~alpha ~amd64 ~hppa ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos" IUSE="jpeg tiff png webp" DEPEND=" diff --git a/media-gfx/zbar/Manifest b/media-gfx/zbar/Manifest index aa51d5fa6576..ac84dfa9f858 100644 --- a/media-gfx/zbar/Manifest +++ b/media-gfx/zbar/Manifest @@ -1,12 +1,7 @@ -AUX zbar-0.23.90-fix-gtk-default.patch 1222 BLAKE2B 5d7bb46e1d1eafa34c75818bce154dc54528f88140d7959c0e1849c01189dd7e2019d0b1c9b254662c408eee05acc3ccc2f1d26387096745005a34bddae2a2fa SHA512 a7c2f51bde791fbf906a6226af067065dce71efe942d1c26e62ac1005577d05574fb96c4e15ed394b12acec0ca2b225aa4a97c29d59ddb305c2ff076c61fdc48 -AUX zbar-0.23.90-fix-qt5x11extras-detect.patch 641 BLAKE2B ec0b86a83a149ef2a62585ea8a4db088e5fdc63ed28ff57f358b30372dff86b898364e6c0983a689efbbd6a4df82bc9764dc2dedf1f6beb68dcc1852336bce1b SHA512 5ca82734a32d12ac2aa451cba87081f44df46a4a9afc5ff8a60adf59cce30dbdca06866313b1a511c778e690f6e40994f22e868a7a9d098d69e4c62a9b26a004 AUX zbar-0.23.90-fix-unittest.patch 2711 BLAKE2B 58d1bbebf60bb9533a7c2b40a29afa7e8229b79a925ebcd05e26c3a67c2144173baedc31f0d92d0341c51ccfb3763e95840ce2073012e7b61a0f252287d5d6b4 SHA512 cc5aaef37155ad72d6b72e05c2f53523268e15b84f573117e780e3f39cc4df3981d080558db83d0fb52d2daa47beeaab4f194e4f912e732648ac4c5bc683e11d -AUX zbar-0.23.92-py311-set-size.patch 1100 BLAKE2B be9b804d7ba1c5c1bae2a20853154da852a6ca1922f9a65f0583ea8d68f76d04e0e009c940417d24539cfb6577e47d8a6ee1d342de1a32b797afd4ebde284560 SHA512 9980027fdda6f995577c15c5c6337a45557802ed534da07208edb20cd99b8575f0c9864f1e48b2f300d973e682e73a0bac105a9eee7429db48224ddbcd15e8d1 AUX zbar-0.23.93-configure-ac-do-not-use-hardcoded-pkg-config-command.patch 2201 BLAKE2B 618def2024b4b6b3dbfdf298b0c30556a456bfc9e8f0e5bb6515a863e2b33c7603d861602be324b02af68df962f67370ecee7dd76f9a92bb129e1735e0f5b0b1 SHA512 ae3b1123d558d12690651da4ff7e77d5e805f3b2fb5372756cbb50ef18f73c87feee71aada35a2ca889e8f893d60969ed2d7a86c5e54c230902645d458e767e6 AUX zbar-0.23.93-configure-ac-use-old-way-to-detect-qt5.patch 1177 BLAKE2B 7283d87ad174c746f79a9d0531e10d5285d25d3e22c6dcc375a62377a12a22656483a69e19288e90367eeb7d31e31397c75fc7f75f3a0aede0cdec2e3bc3d317 SHA512 8a69dd84731b95ab4d5d0dc37bd83ecf7fa368e197226f0fb63dcce6dce01ef96682b0e12d06489c602d964eedc2ea69ada04b83fba2ef6c4452ca466a25b037 AUX zbar-0.23_fix_python_detect.patch 351 BLAKE2B d5261e9adb3c9b43f1208a41a655718b952d06ce0ec003bb08bf30979d6c467b2b50e6fb9a6cd06f95230ed4ae55e14599c276f9f41f03677b4d18167c6665c4 SHA512 d24d75f840d84488986cede3378e067ac68d218acac34a8c34888c88611df8f4b1b397cfd5ecfcda82480fd56ea2bada29d8373cc6e93ae8050b84e801c36ca7 -DIST zbar-0.23.92.tar.gz 1005358 BLAKE2B 97af3c399333abfcd64e45e6c4f38e5da6ed1540447f35f0efe9bc0fb8d296d80c964452afa29d26d22bddd8de31bc3ca6582db38afe8416e9480f11b939e040 SHA512 cae47fb199173fc1c052984865ca0e6aeab330bd6d77506a0937994d459deb4419a3e54e2dcd2e9830ffb8acf14f29e22e0a6becc9e4cfe19b07dad1babe9513 DIST zbar-0.23.93.tar.gz 1009320 BLAKE2B 7476776fbb2b2dca4fb94e4eb8c6c5ca7795e32881e93c45002679bdc048cb0bf8d880d2b31f1469a95d718c6d027b7ee0da195951645478493d6f638ae186b5 SHA512 2dd607afbb1e52346bfb740f916c8616112d14153f071f82458b7c653f647b332290a5089543abebfe1c7679eae98b349a84777185d61cfb9ff275bfecc6e08f -EBUILD zbar-0.23.92.ebuild 5477 BLAKE2B 4ad9610614f94c7bfd456ac625fb2685f9f39a6d77929fd02f19b67338f0eb46de3a88eb69c741174f0f9e46cec1aa951ec34fc57ca886a5f830cd844ef3fabf SHA512 bc55e7e43f35260f5ad30034b7859292f5518bdccb53892ae20c3b8e012d9ae6808c5ffd780273611e44a7a69a4e33b57256f3701ac08000e85904dfccc0b32c -EBUILD zbar-0.23.93.ebuild 5462 BLAKE2B d50dd9bf0aaee63310be3d6688961aea89beb524ee4319581c047ecfb7ec3fa065e7e83a270f2fa30b7b124ee29eae2c742887758ee4c40a189c12b4dc10df52 SHA512 551e4f59c81edb28b5760af67ad3164eea5b26166124e1348904caf5be22e7712536ec2eeb124b3fdd2c3491c9ee8e08624f081461ff37fa635da3c105c8957c +EBUILD zbar-0.23.93.ebuild 5460 BLAKE2B d0b4219cc9c23d5892391ddf3cf2e607f381b4b1a92e0372cde84e564743342896f3fc403e9e5d41e56e429cb37ffbc071179d4cd30495b35df844a05ddf9f09 SHA512 724d8129a8011fbce530eeffc2ec3570ad2b60a7479c991682ac02c704590ecb424ef48dd5a1957e2794a81438c8714457e2d59a35283a6f5ec5dd8fa0eb8886 MISC metadata.xml 799 BLAKE2B 8ab0acd59bd0d2a661b75724a6c5406782ec6d993dcd6ccc386ee4e6fc9f105a221d5e8c8f0a398f67c6bc9b3de23e53f41b7024220a561d405e632b979e932f SHA512 2672939457e8efcc1fb3cc94047cbb37cf8b69830144b69514c26d9bb29b23e8877d9a98f1b5b60b62c620ddc89c402e2a3c8b82ef05a07e4f08a2c2b3ca5bb4 diff --git a/media-gfx/zbar/files/zbar-0.23.90-fix-gtk-default.patch b/media-gfx/zbar/files/zbar-0.23.90-fix-gtk-default.patch deleted file mode 100644 index b1316243dd24..000000000000 --- a/media-gfx/zbar/files/zbar-0.23.90-fix-gtk-default.patch +++ /dev/null @@ -1,35 +0,0 @@ -From 468f6bda627d683b3f40dbaf242c158409666f7e Mon Sep 17 00:00:00 2001 -From: Mauro Carvalho Chehab <mchehab+huawei@kernel.org> -Date: Sat, 13 Mar 2021 18:04:57 +0100 -Subject: [PATCH] configure.ac: fix some issues with gtk parameter - -By default, it uses Gtk3. Also, the with_gtk set to "no" -is wrong. - -Signed-off-by: Mauro Carvalho Chehab <mchehab+huawei@kernel.org> ---- - configure.ac | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/configure.ac b/configure.ac -index b6f87531..30a59f72 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -492,7 +492,7 @@ AS_IF([test "x$with_npapi" != "xno"], - AM_CONDITIONAL([HAVE_NPAPI], [test "x$with_npapi" = "xyes"]) - - dnl GTK --dnl For now, defaults to GTK version 2 -+dnl For now, defaults to GTK version 3 - - AC_ARG_WITH([gtk], - [AS_HELP_STRING([--with-gtk], -@@ -500,7 +500,7 @@ AC_ARG_WITH([gtk], - [AS_IF([test "x$with_gtk" != "xno" && test "x$with_gtk" != "xauto" && - test "x$with_gtk" != "xgtk2" && test "x$with_gtk" != "xgtk3"], - [echo "Invalid value for --with-gtk. Falling back to 'no'" -- with_gtk="xno"])], -+ with_gtk="no"])], - [with_gtk="auto"]) - - AC_ARG_VAR([GLIB_GENMARSHAL], [full path to glib-genmarshal]) diff --git a/media-gfx/zbar/files/zbar-0.23.90-fix-qt5x11extras-detect.patch b/media-gfx/zbar/files/zbar-0.23.90-fix-qt5x11extras-detect.patch deleted file mode 100644 index e8f6357eb486..000000000000 --- a/media-gfx/zbar/files/zbar-0.23.90-fix-qt5x11extras-detect.patch +++ /dev/null @@ -1,18 +0,0 @@ -diff -ur a/configure.ac b/configure.ac ---- a/configure.ac 2019-05-23 23:37:12.000000000 +0300 -+++ b/configure.ac 2020-01-22 12:27:14.190755156 +0300 -@@ -638,13 +638,9 @@ - - AC_ARG_VAR([MOC], [full path to Qt moc program]) - --AS_IF([test "x$have_x" = "xyes"], -- [qt_extra="Qt5X11Extras >= 5.0"], -- [qt_extra=""]) -- - AS_IF([test "x$with_qt" != "xno"], - [PKG_CHECK_MODULES([QT], -- [Qt5Core >= 5 Qt5Gui >= 5 Qt5Widgets >= 5.0 $qt_extra],, -+ [Qt5Core >= 5 Qt5Gui >= 5 Qt5Widgets >= 5.0 Qt5X11Extras >= 5.0],, - [with_qt5="no" - PKG_CHECK_MODULES([QT], - [QtCore >= 4 QtGui >= 4],, diff --git a/media-gfx/zbar/files/zbar-0.23.92-py311-set-size.patch b/media-gfx/zbar/files/zbar-0.23.92-py311-set-size.patch deleted file mode 100644 index a51193af7777..000000000000 --- a/media-gfx/zbar/files/zbar-0.23.92-py311-set-size.patch +++ /dev/null @@ -1,30 +0,0 @@ -Upstream-PR: https://github.com/mchehab/zbar/pull/231 - -diff --git a/python/enum.c b/python/enum.c -index ba22ba63..4644509e 100644 ---- a/python/enum.c -+++ b/python/enum.c -@@ -50,7 +50,11 @@ static zbarEnumItem *enumitem_new(PyTypeObject *type, PyObject *args, - - /* we assume the "fast path" for a single-digit ints (see longobject.c) */ - /* this also holds if we get a small_int preallocated long */ -+#if PY_VERSION_HEX >= 0x030900A4 -+ Py_SET_SIZE(&self->val, Py_SIZE(longval)); -+#else - Py_SIZE(&self->val) = Py_SIZE(longval); -+#endif - self->val.ob_digit[0] = longval->ob_digit[0]; - Py_DECREF(longval); - #else -@@ -129,7 +133,11 @@ zbarEnumItem *zbarEnumItem_New(PyObject *byname, PyObject *byvalue, int val, - - /* we assume the "fast path" for a single-digit ints (see longobject.c) */ - /* this also holds if we get a small_int preallocated long */ -+#if PY_VERSION_HEX >= 0x030900A4 -+ Py_SET_SIZE(&self->val, Py_SIZE(longval)); -+#else - Py_SIZE(&self->val) = Py_SIZE(longval); -+#endif - self->val.ob_digit[0] = longval->ob_digit[0]; - Py_DECREF(longval); - diff --git a/media-gfx/zbar/zbar-0.23.92.ebuild b/media-gfx/zbar/zbar-0.23.92.ebuild deleted file mode 100644 index 5b8d7360950c..000000000000 --- a/media-gfx/zbar/zbar-0.23.92.ebuild +++ /dev/null @@ -1,235 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -PYTHON_COMPAT=( python3_{9..11} ) -inherit autotools flag-o-matic java-pkg-opt-2 multilib-minimal python-single-r1 qmake-utils virtualx - -DESCRIPTION="Library and tools for reading barcodes from images or video" -HOMEPAGE="https://github.com/mchehab/zbar" -SRC_URI="https://github.com/mchehab/zbar/archive/${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="LGPL-2.1" -SLOT="0" -KEYWORDS="amd64 ~arm ~arm64 x86" -IUSE="dbus graphicsmagick gtk +imagemagick introspection java jpeg nls python qt5 static-libs test +threads v4l X xv" - -REQUIRED_USE=" - introspection? ( gtk ) - python? ( ${PYTHON_REQUIRED_USE} ) - test? ( - ${PYTHON_REQUIRED_USE} - X? ( imagemagick ) - ) - xv? ( X )" - -RESTRICT="!test? ( test )" - -COMMON_DEPEND=" - dbus? ( sys-apps/dbus[${MULTILIB_USEDEP}] ) - gtk? ( - dev-libs/glib:2[${MULTILIB_USEDEP}] - x11-libs/gtk+:3[${MULTILIB_USEDEP}] - introspection? ( dev-libs/gobject-introspection ) - ) - imagemagick? ( - !graphicsmagick? ( media-gfx/imagemagick:=[png,jpeg?] ) - graphicsmagick? ( media-gfx/graphicsmagick:=[png,jpeg?] ) - ) - jpeg? ( media-libs/libjpeg-turbo:0[${MULTILIB_USEDEP}] ) - python? ( ${PYTHON_DEPS} ) - qt5? ( - dev-qt/qtcore:5 - dev-qt/qtgui:5 - dev-qt/qtwidgets:5 - dev-qt/qtx11extras:5 - ) - v4l? ( media-libs/libv4l:0=[${MULTILIB_USEDEP}] ) - X? ( - x11-libs/libX11[${MULTILIB_USEDEP}] - x11-libs/libXext[${MULTILIB_USEDEP}] - xv? ( x11-libs/libXv[${MULTILIB_USEDEP}] ) - )" - -RDEPEND="${COMMON_DEPEND} - java? ( >=virtual/jre-1.8 )" - -DEPEND="${COMMON_DEPEND} - java? ( - >=virtual/jdk-1.8 - test? ( - dev-java/hamcrest-core:1.3 - dev-java/junit:4 - ) - ) - test? ( - ${PYTHON_DEPS} - $(python_gen_cond_dep ' - dev-python/pillow[${PYTHON_USEDEP}] - ') - elibc_musl? ( sys-libs/argp-standalone ) - )" - -BDEPEND=" - app-text/xmlto - sys-devel/gettext - virtual/pkgconfig - gtk? ( dev-util/glib-utils ) - nls? ( - sys-devel/gettext - virtual/libiconv - )" - -DOCS=( README.md NEWS.md TODO.md HACKING.md TODO.md ChangeLog ) - -PATCHES=( - # git master - "${FILESDIR}/${PN}-0.23.90-fix-gtk-default.patch" - # TODO: upstream? - "${FILESDIR}/${PN}-0.23_fix_python_detect.patch" - "${FILESDIR}/${PN}-0.23.90-fix-unittest.patch" - "${FILESDIR}/${PN}-0.23.90-fix-qt5x11extras-detect.patch" - "${FILESDIR}/${P}-py311-set-size.patch" -) - -pkg_setup() { - if use python || use test; then - python-single-r1_pkg_setup - fi - use java && java-pkg-opt-2_pkg_setup -} - -src_prepare() { - default - - if use python || use test; then - if use test; then - # make tests happy - # because one of the test requires loadable py module from the current ${BUILD_DIR} - sed -e "s|PYTHONPATH=@abs_top_srcdir@|PYTHONPATH=@builddir@|g" \ - -i test/Makefile.am.inc || die - fi - - python_fix_shebang \ - examples/*.py \ - test/{test_python,barcodetest}.py # test_pygtk.py — py2 only - fi - - if use java; then - java-pkg-opt-2_src_prepare - sed -e "s|javadir = \$(pkgdatadir)|javadir = /usr/$(get_libdir)/zbar|" \ - -i java/Makefile.am || die - fi - - # do not install {LICENSE,INSTALL,etc} doc files with 'make install' (use DOCS=() instead) - sed -e "s|^dist_doc_DATA =\(.*\)|dist_doc_DATA =|" -i Makefile.am || die - - eautoreconf -} - -multilib_src_configure() { - append-cppflags -DNDEBUG - - local myeconfargs=( - $(use_with dbus) - $(use_with gtk gtk gtk3) # avoid 'auto' - $(use_with jpeg) - $(multilib_native_use_with introspection gir) - $(multilib_native_use_with java) - $(multilib_native_use_with python python auto) - $(use_enable nls) - $(use_enable static-libs static) - $(use_enable threads pthread) - $(use_enable v4l video) - $(use_with X x) - $(use_with X xshm) - $(use_with xv xv) - ) - - if multilib_is_native_abi; then - # both must be enabled to use GraphicsMagick - if use imagemagick && use graphicsmagick; then - myeconfargs+=( - --with-graphicsmagick - --without-imagemagick - ) - elif ! use graphicsmagick && use imagemagick; then - myeconfargs+=( - --with-imagemagick - --without-graphicsmagick - ) - else - myeconfargs+=( - --without-imagemagick - --without-graphicsmagick - ) - fi - - if use java; then - export JAVACFLAGS="$(java-pkg_javac-args)" - append-cflags "$(java-pkg_get-jni-cflags)" - if use test; then # bug 629078 - myeconfargs+=( --with-java-unit ) - CLASSPATH+=":$(java-pkg_getjar --build-only junit-4 junit.jar)" - CLASSPATH+=":$(java-pkg_getjar --build-only hamcrest-core-1.3 hamcrest-core.jar)" - fi - fi - - if use qt5; then - myeconfargs+=( - --with-qt - --with-qt5 - ) - else - myeconfargs+=( --without-qt ) - fi - - if use test && use elibc_musl; then - append-ldflags -largp - fi - - else - myeconfargs+=( - --without-graphicsmagick - --without-imagemagick - --without-qt - ) - - # zbarimg tests with native abi only - # (this option from the patch above, stay up to date) - use test && myeconfargs+=( --without-zbarimg-tests ) - fi - - # use bash (bug 721370) - CONFIG_SHELL='/bin/bash' \ - ECONF_SOURCE="${S}" \ - MOC="$(qt5_get_bindir)"/moc \ - econf "${myeconfargs[@]}" - - # work around out-of-source build issues for multilib systems (bug 672184) - mkdir qt zbarcam || die -} - -src_test() { - virtx multilib-minimal_src_test -} - -src_install() { - if use qt5; then - local MULTILIB_WRAPPED_HEADERS=( - /usr/include/zbar/QZBar.h - /usr/include/zbar/QZBarImage.h - ) - fi - multilib-minimal_src_install -} - -multilib_src_install_all() { - einstalldocs - find "${D}" -name '*.la' -delete || die -} - -pkg_preinst() { - use java && java-pkg-opt-2_pkg_preinst -} diff --git a/media-gfx/zbar/zbar-0.23.93.ebuild b/media-gfx/zbar/zbar-0.23.93.ebuild index 2de79e7129ae..1bb7c4cc2030 100644 --- a/media-gfx/zbar/zbar-0.23.93.ebuild +++ b/media-gfx/zbar/zbar-0.23.93.ebuild @@ -12,7 +12,7 @@ SRC_URI="https://github.com/mchehab/zbar/archive/${PV}.tar.gz -> ${P}.tar.gz" LICENSE="LGPL-2.1" SLOT="0" -KEYWORDS="~amd64 ~arm ~arm64 ~x86" +KEYWORDS="amd64 ~arm ~arm64 x86" IUSE="dbus graphicsmagick gtk +imagemagick introspection java jpeg nls python qt5 static-libs test +threads v4l X xv" REQUIRED_USE=" |