diff options
Diffstat (limited to 'media-gfx')
100 files changed, 1821 insertions, 1523 deletions
diff --git a/media-gfx/Manifest.gz b/media-gfx/Manifest.gz Binary files differindex 09dc313539fb..6cf8859ad22d 100644 --- a/media-gfx/Manifest.gz +++ b/media-gfx/Manifest.gz diff --git a/media-gfx/asymptote/Manifest b/media-gfx/asymptote/Manifest index 30e981f41417..177dc6e4cf19 100644 --- a/media-gfx/asymptote/Manifest +++ b/media-gfx/asymptote/Manifest @@ -1,7 +1,6 @@ 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.86-without-lsp.patch 1045 BLAKE2B 9e212ea9f00f5c49171679cca577b8a37e165d73514f6ecf20c06ce2b3f2fa7f2696f8ba66f9775b7b71ebacadee39e9c398bc9a6c7a001e904f41be7a1f6e55 SHA512 3a4ceb7c356b4abe7eaceb1b0b9a805d0325a8a7d6b9d2eff8c4462abcad215783842412c4cb4f89e737d9bb0e07fc8eeaea0075f0894aa1c8c8e4e5c0312179 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 diff --git a/media-gfx/asymptote/files/asymptote-2.86-without-lsp.patch b/media-gfx/asymptote/files/asymptote-2.86-without-lsp.patch deleted file mode 100644 index 2f70cd0d9725..000000000000 --- a/media-gfx/asymptote/files/asymptote-2.86-without-lsp.patch +++ /dev/null @@ -1,50 +0,0 @@ -From 29caaed5ead5a62787475286afd22e40585b8bb8 Mon Sep 17 00:00:00 2001 -From: John Bowman <bowman@ualberta.ca> -Date: Wed, 14 Jun 2023 22:36:35 -0600 -Subject: [PATCH] Fix --without-lsp (issue #379). - ---- - common.h | 17 ++++++++--------- - 1 file changed, 8 insertions(+), 9 deletions(-) - -diff --git a/common.h b/common.h -index 13f8be106..6ee3d971f 100644 ---- a/common.h -+++ b/common.h -@@ -17,28 +17,27 @@ - #include "config.h" - #endif - --#ifdef HAVE_LSP - #if __cplusplus < 201703L -+ -+#ifdef HAVE_LSP - #include <boost/optional.hpp> - #include <boost/none.hpp> - using boost::optional; - #define nullopt boost::none - using boost::make_optional; - #else --#include <optional> --using std::optional; --using std::nullopt; --using std::make_optional; --#endif -- --#else --#if __cplusplus < 201703L - #include "optional.hpp" - #define boost nonstd - using nonstd::optional; - using nonstd::nullopt; - using nonstd::make_optional; - #endif -+ -+#else -+#include <optional> -+using std::optional; -+using std::nullopt; -+using std::make_optional; - #endif - - using std::make_pair; diff --git a/media-gfx/blender/Manifest b/media-gfx/blender/Manifest index 3e816cce87c0..986167220b26 100644 --- a/media-gfx/blender/Manifest +++ b/media-gfx/blender/Manifest @@ -17,7 +17,7 @@ EBUILD blender-3.3.15.ebuild 13723 BLAKE2B b22a4fa62e27aa0f25f2e769de636d87a80ad EBUILD blender-3.3.8.ebuild 13722 BLAKE2B 12465f59bb137aaa869216b623df34fb8758a742bc517cd467865ecfbff6856429c7fda725b6a3e14d1581964b22adb27956e0b74838c1da5e9a573560269fdf SHA512 8d985d8efd20233d111b7efe2aaa0b8fe486d3de36d676575347d66b24a7fd14904c04d9edfcfc1e03c34956419dc3ec06c4e20175749254f120ae52e79a1396 EBUILD blender-3.6.8.ebuild 14127 BLAKE2B 1de13a7ef689f16a899698c7262bf0a59a9d6ca1a9ed27c446e11b1cfc4b39b94231f08d96b17323f2049b1ec05a28319718402c083061a2b805838ca90931ad SHA512 0647e31bef93c125c407611a690437de86c710beb5b7771801e27e2e561c3d7bfbc350e67fe0275bcbe4a5f049e87c3e600b95bcef9013f156677624b1ce445c EBUILD blender-4.0.2-r1.ebuild 17318 BLAKE2B 010552261087bdb8c937a5f081d0316e11ee5cb4809a43e0eed8292be7062e070eb0643c91582b89b0aaebffef20aba3e07c30ec73203fefc7e81f7ebb9d78a5 SHA512 e15eb447924b6c1048c5cf0af8770d1f916d7dbcce0f1f9b00482f8d56b31b0e98834c160bc996a8afd3393f58443b2de0e8783075bd3ee3812bb7b9eef31e52 -EBUILD blender-4.1.1-r1.ebuild 17225 BLAKE2B a20594b9129ed502a789fba3cb0ca3f9307e6e70ac27e109ab1f7f85319379db22ce2091c2a0fb18145af34feadf21b1de7f8a413091d010c4e1733e5414528a SHA512 21647f935f9d08cbf304cdd04602dab439f84fc8232211863560e85726b1e2cf68a52539a63ced7ab63a30418a72947d7a79883b94ab735e19e3ee6ea94771ec +EBUILD blender-4.1.1-r2.ebuild 17223 BLAKE2B 9a18bd4d7fdca8959a30de975c43a121e5e8d623d5405f45c0ba0658309e30f4537cafdce7187ea373fe2e649e5a09d0bdd77efec7c028230314c51023ce0db8 SHA512 39566662e531ff1a35e895c9b7201b81b75cb6334e8802f359cc1eece944bad38a4e6d813884cc045497a09aae5bd00a9916ae13ffe8ed578ec8d861640cf8fb EBUILD blender-4.1.1.ebuild 17169 BLAKE2B 96ac5b0d84b5c45008ca67d07f55617833801220064e77e37d1f6f0b47a141f29ddc063667ebf09f482899640b02830c31b1cd8b148f3f5fbe61421f931ffd53 SHA512 ed20d53f7bcb93b0f0541145dabf903a10fe3811288c3cebf80396885a4d7aa4552687e86608d5510f8fe87adea9432956e6c21dec47f1e08adc0cc6e399b1c4 -EBUILD blender-9999.ebuild 17225 BLAKE2B a20594b9129ed502a789fba3cb0ca3f9307e6e70ac27e109ab1f7f85319379db22ce2091c2a0fb18145af34feadf21b1de7f8a413091d010c4e1733e5414528a SHA512 21647f935f9d08cbf304cdd04602dab439f84fc8232211863560e85726b1e2cf68a52539a63ced7ab63a30418a72947d7a79883b94ab735e19e3ee6ea94771ec +EBUILD blender-9999.ebuild 17224 BLAKE2B 49f70034df58751a0ec4994a7b7aa7f7b74a2eb8163c9317c61b9147e413bec90a33c88dc2d6d42bee60570b61692a5fca5ced71800d5adff7306dcab1fee0aa SHA512 8c9137ee3bfbec89b124b2c12e730081e3b2de73b43d530bc5855ddaf76d7bf2156c7c433f0eb4bf85f0a4f04b5db9e6656ead9e98711262e7721071ef3c3155 MISC metadata.xml 3679 BLAKE2B cca8c2f8568be6c83244cf5a90b2db0df11faffa4f55820692990e02ce0bfd84cf3e6c2fdb146af9e6c8e09d1c72fe297c73f126e04ad918e709dc9064908aca SHA512 ac8bdbc0e00442f56d9d077d7d8c97deba90121e7dd34aac9d51b7ae6348bbaa875d2fcd01fe20ff7e9b1c3bf332a5cde63fd0b406a1e29c3f4de323225a17a9 diff --git a/media-gfx/blender/blender-4.1.1-r1.ebuild b/media-gfx/blender/blender-4.1.1-r2.ebuild index cca4a13834b5..3de02e47f35d 100644 --- a/media-gfx/blender/blender-4.1.1-r1.ebuild +++ b/media-gfx/blender/blender-4.1.1-r2.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 @@ -87,7 +87,7 @@ RDEPEND="${PYTHON_DEPS} gnome? ( gui-libs/libdecor ) hip? ( llvm_slot_17? ( - dev-util/hip:0/5.7= + dev-util/hip:0/5.7 ) llvm_slot_18? ( >=dev-util/hip-6.1:=[llvm_slot_18(-)] diff --git a/media-gfx/blender/blender-9999.ebuild b/media-gfx/blender/blender-9999.ebuild index cca4a13834b5..77eb9876c615 100644 --- a/media-gfx/blender/blender-9999.ebuild +++ b/media-gfx/blender/blender-9999.ebuild @@ -87,7 +87,7 @@ RDEPEND="${PYTHON_DEPS} gnome? ( gui-libs/libdecor ) hip? ( llvm_slot_17? ( - dev-util/hip:0/5.7= + dev-util/hip:0/5.7 ) llvm_slot_18? ( >=dev-util/hip-6.1:=[llvm_slot_18(-)] diff --git a/media-gfx/cairosvg/Manifest b/media-gfx/cairosvg/Manifest index 8ffdfe4dfb54..ba76ab5947d3 100644 --- a/media-gfx/cairosvg/Manifest +++ b/media-gfx/cairosvg/Manifest @@ -1,3 +1,3 @@ DIST CairoSVG-2.7.1.tar.gz 8399085 BLAKE2B 8d729355e95576ef2bc1f2d046f1d8f997bfe509477db0f2bd1eec0c89ae581081f4629aa66c53604f685e3ad424b08fc8adef5f630a35bdcf64c37d21d463f9 SHA512 fd2cdf38b6ee7860ded728694de8cb413d9442939e60501f7657e2dc43a16b6c6c863faa88a15ea001b7ee7949b2d441bcf609b1d64a49f3091573e14e8b1d92 -EBUILD cairosvg-2.7.1.ebuild 907 BLAKE2B 594a84ae268684b190853e45491aa29e5a467ad3b4b49a429dfb32de4ba9db9410ac5b9ac1f46f16b41928bfc7329a13efb3971647ea5f502f4dbf89dc958ef4 SHA512 711873f4f5d22c2f7fce39c85098512062804e29ba82ef94f375bf323c0dbc1f5d4d65edf2ee15d173d285005a6085a80e978c99aa0a926c877451f2608e46c8 +EBUILD cairosvg-2.7.1.ebuild 907 BLAKE2B 5dd14fb58eef2f423ea302be3cb94b101488f23a5778e9ffc9a195c55565ee1daba9d9d9be44fe130e7a2737c72bc240cee3e29f7cc221b4736c00585ff8d039 SHA512 95be2e160b8a1961b6ca1f58c1d36333d68b42bda5dec11716242f3b8e399f30d6081441d6ebd5bad4eb73c94b72d313071109115a0d7e994cd34724028acaa6 MISC metadata.xml 410 BLAKE2B f7c96b4115d2f5493a3820b25cf493eed52a45df1c36c45bd84684424678555e141f7438903b3e1fd87ad29006533e280d085e7f8b4d314a8a1e535c719e67ed SHA512 3aadc33cf29d2605234752d0dae2110d3ea496258be5b90b6e2ca867caef5d6b93b5239c9afca2ccb8f68a59869369ffdae0c364380a0473eff0b5de53ba4ac0 diff --git a/media-gfx/cairosvg/cairosvg-2.7.1.ebuild b/media-gfx/cairosvg/cairosvg-2.7.1.ebuild index d159435bd6da..b9a4d974a3ba 100644 --- a/media-gfx/cairosvg/cairosvg-2.7.1.ebuild +++ b/media-gfx/cairosvg/cairosvg-2.7.1.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 @@ -6,7 +6,7 @@ EAPI=8 DISTUTILS_USE_PEP517=setuptools PYPI_NO_NORMALIZE=1 PYPI_PN="CairoSVG" -PYTHON_COMPAT=( python3_{10..12} ) +PYTHON_COMPAT=( python3_{10..13} ) inherit distutils-r1 pypi diff --git a/media-gfx/digikam/Manifest b/media-gfx/digikam/Manifest index b71778691624..22b152b55837 100644 --- a/media-gfx/digikam/Manifest +++ b/media-gfx/digikam/Manifest @@ -1,5 +1,8 @@ AUX digikam-8.3.0-cmake-addressbook.patch 1245 BLAKE2B 22365de2072c5ce5e2eac3bc1d7138e820166b977e5894f29addcdb00ae3329c47965b2b7930a4725b01789add63b4416083e6e358ca6ffb4a0d60f3e80ad52c SHA512 a872aed53811642407c98e20f423cf5381a117e96d4e95d309da6f116a13aa2584671ef20af3e1059c3ed7e09fec178fdb77e7afecde21077252bb2c8f116158 AUX digikam-8.3.0-cmake.patch 6775 BLAKE2B 1c93e204bd3b5f3d73ecf812ee851e0a3a9bb3e414e41afbc0a072bf05e6b615a147e545f6a16e8e218e1f910e9f1667e012bc35e06eab7d192f4c8c8d814746 SHA512 42707d0bff593114de412697a037cfaccfbfc568ba3a90b3b68a3cbdba32d79e5e61d2e8cd6f185c2543cac4c6de66f36e5f549908781243064b17aececba72b +AUX digikam-8.4.0-cmake.patch 7429 BLAKE2B 20d79867086e390c2a571bae76f2023e4ec5f26bdc137f28be6ec8eff54ba2c5e84ec15191ceed83eb8e9415a522165f5931cf6d972e1537806cbb6d7e22bbf0 SHA512 fd38773ce49a31d3fcd0d477c5e180b42d1a2ea586b41534b7dd3d08653fea4020af30bce3b20ba14c4a2710cde3fecbd13fbe8fcfd33bdca6b82989cf431214 DIST digiKam-8.3.0-1.tar.xz 55664168 BLAKE2B 46b0f26bb781d370c1046fd6de6afb0a0878175f9722a2fc9ed23aad89eb0671f8b219bb7c169ccd22d440ce493d958304a5a527a733862fe4e2c5cd07da8a21 SHA512 c2fdcecafa68641f08b31286d1b9c44828164a0a0bea607fb64a71c73ff53417cdfefa110245adab164fae8ea0980ea86cd69d693dcd43a96bb188197dc78fcd +DIST digiKam-8.4.0.tar.xz 58025616 BLAKE2B 33441e023cd9d6edba2e7c01e482a6eea7a6b1972b6bad0fc804fb3e94f97cc62e2663690137b2445fb7043789b7e942d830b71209385de77ccffe57d22d09ff SHA512 4342d18a7c04ab239821de3cf908f8e7d676598778f0174164aa336e8cfdc0a76327d31c64e6c4e47dcf0d6fbef46b01918312e4622ce3359888a9a94948a22b EBUILD digikam-8.3.0.ebuild 4193 BLAKE2B bdaf2e8e960067f18bc85513a2ed3ca17f235d86de490b8f53cc969ea25f115804a0f659dc19d6756ea1085692e917e1caf26d1e8e569295be4cb2941949d2ea SHA512 7dac2a6e459ca160c1b7cad2955b725123714cf7cc1f5a9a88666c378d7b8c5fd083e8712262de5c20ac599677b425d4ffa4810a7c5abe891eb52f51917f25d6 -MISC metadata.xml 987 BLAKE2B c06da5014c71156e7cbffc5e57d530287b881c793dffa8c6c7f563518cb7572c6de245066c7700767e27f36c4d4745277c1f6d01188f02a0e4da0ff125e8abde SHA512 9c3a8d4c11de1a12b386ef1ceeeb3dcf67c29a19a4eea20d8d442ba9997f267ef1c96a9cb38e11bf49c44dea427879683dae38f656e9654a50cfcdd849983c20 +EBUILD digikam-8.4.0.ebuild 4256 BLAKE2B f4c6dec1386dc07267182c1068558b9a3ff4784adea63e1a53b906e0a097b0c45b05bd0425eaad1e1585e39def92610eab6efbad4659f618f48dff254dfded1c SHA512 33f69e5c75f814cf70fd16321635abc1e6ebe5fb8492dab17cdc42beee4e29241c3e4a64777d9cd168a20baa58d5fafd6c772c326940d9711bdb5b680e0c5c5a +MISC metadata.xml 922 BLAKE2B 230932621f619b704122e3c1e4dbfe090bfad7f7722e41fb8d0b7bd6dd124d7d72139852ed016e34e099877c995cfdb0fb460194535824d2f0c13426dd65296c SHA512 457f3ec2b0479f8f686e3bf0b9f771f8bee205bd661a86226238ae9a3b557c52ec462663d45617872a83ce3717e74bcdbe74d5c2f9e4ab391bcb76a72082aec4 diff --git a/media-gfx/digikam/digikam-8.4.0.ebuild b/media-gfx/digikam/digikam-8.4.0.ebuild new file mode 100644 index 000000000000..a118da4e0919 --- /dev/null +++ b/media-gfx/digikam/digikam-8.4.0.ebuild @@ -0,0 +1,147 @@ +# 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" +) + +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/files/digikam-8.4.0-cmake.patch b/media-gfx/digikam/files/digikam-8.4.0-cmake.patch new file mode 100644 index 000000000000..4584d23182d1 --- /dev/null +++ b/media-gfx/digikam/files/digikam-8.4.0-cmake.patch @@ -0,0 +1,199 @@ +From c498aad87e42405ca25cb6f2f1b4068ed1862c27 Mon Sep 17 00:00:00 2001 +From: Andreas Sturmlechner <andreas.sturmlechner@gmail.com> +Date: Sun, 17 Feb 2019 23:51:03 +0100 +Subject: [PATCH] Un-break optional Qt/KF detection + +And if we enable an option, make the necessary libraries REQUIRED. +--- + core/cmake/rules/RulesKDEFramework.cmake | 60 ++++-------------------- + core/cmake/rules/RulesQtFramework.cmake | 51 +++++--------------- + core/cmake/rules/RulesX11.cmake | 7 +-- + 3 files changed, 20 insertions(+), 98 deletions(-) + +diff --git a/core/cmake/rules/RulesKDEFramework.cmake b/core/cmake/rules/RulesKDEFramework.cmake +index 775ae32fec..ec438f9673 100644 +--- a/core/cmake/rules/RulesKDEFramework.cmake ++++ b/core/cmake/rules/RulesKDEFramework.cmake +@@ -26,43 +26,18 @@ find_package(KF${QT_VERSION_MAJOR} ${KF${QT_VERSION_MAJOR}_MIN_VERSION} QUIET + ) + + if(ENABLE_KFILEMETADATASUPPORT) +- +- find_package(KF${QT_VERSION_MAJOR} ${KF${QT_VERSION_MAJOR}_MIN_VERSION} QUIET +- OPTIONAL_COMPONENTS +- FileMetaData # For Plasma desktop file indexer support. +- ) +- ++ # For Plasma desktop file indexer support. ++ find_package(KF${QT_VERSION_MAJOR}FileMetaData ${KF${QT_VERSION_MAJOR}_MIN_VERSION} REQUIRED) + endif() + + if(ENABLE_AKONADICONTACTSUPPORT) +- ++ find_package(KF${QT_VERSION_MAJOR}Contacts ${KF${QT_VERSION_MAJOR}_MIN_VERSION} REQUIRED) # API for contacts/address book data. ++ find_package(KPim${QT_VERSION_MAJOR}Akonadi ${AKONADI_MIN_VERSION} REQUIRED) + if(Qt6_FOUND) +- +- find_package(KPim${QT_VERSION_MAJOR} ${AKONADI_MIN_VERSION} QUIET +- OPTIONAL_COMPONENTS +- Akonadi +- AkonadiContactCore # For KDE Mail Contacts support. +- ) +- find_package(KF${QT_VERSION_MAJOR} ${AKONADI_MIN_VERSION} QUIET +- OPTIONAL_COMPONENTS +- Contacts # API for contacts/address book data. +- ) +- find_package(KPim${QT_VERSION_MAJOR}Akonadi ${AKONADI_MIN_VERSION} QUIET) +- find_package(KPim${QT_VERSION_MAJOR}AkonadiContactCore ${AKONADI_MIN_VERSION} QUIET) +- ++ find_package(KPim${QT_VERSION_MAJOR}AkonadiContactCore ${AKONADI_MIN_VERSION} REQUIRED) + else() +- +- find_package(KF${QT_VERSION_MAJOR} ${AKONADI_MIN_VERSION} QUIET +- OPTIONAL_COMPONENTS +- Akonadi +- AkonadiContact # For KDE Mail Contacts support. +- Contacts # API for contacts/address book data. +- ) +- find_package(KPim${QT_VERSION_MAJOR}Akonadi ${AKONADI_MIN_VERSION} QUIET) +- find_package(KPim${QT_VERSION_MAJOR}AkonadiContact ${AKONADI_MIN_VERSION} QUIET) +- ++ find_package(KPim${QT_VERSION_MAJOR}AkonadiContact ${AKONADI_MIN_VERSION} REQUIRED) # For KDE Mail Contacts support. + endif() +- + endif() + + if(Qt6_FOUND) +@@ -71,17 +46,11 @@ if(Qt6_FOUND) + + else() + +- find_package(KF${QT_VERSION_MAJOR} ${KSANE_MIN_VERSION} QUIET +- OPTIONAL_COMPONENTS +- Sane # For digital scanner support. +- ) ++ find_package(KF${QT_VERSION_MAJOR}Sane ${KSANE_MIN_VERSION} QUIET) # For digital scanner support. + + endif() + +-find_package(KF${QT_VERSION_MAJOR} ${CALENDAR_MIN_VERSION} QUIET +- OPTIONAL_COMPONENTS +- CalendarCore # For Calendar tool. +-) ++find_package(KF${QT_VERSION_MAJOR}CalendarCore ${CALENDAR_MIN_VERSION} QUIET) # For Calendar tool. + + if ("${KF${QT_VERSION_MAJOR}CalendarCore_VERSION}" VERSION_GREATER 5.6.40) + +@@ -89,19 +58,6 @@ if ("${KF${QT_VERSION_MAJOR}CalendarCore_VERSION}" VERSION_GREATER 5.6.40) + + endif() + +-if(ENABLE_AKONADICONTACTSUPPORT AND +- (NOT (KPim${QT_VERSION_MAJOR}AkonadiContact_FOUND OR KPim${QT_VERSION_MAJOR}AkonadiContactCore_FOUND) OR NOT KF${QT_VERSION_MAJOR}Contacts_FOUND)) +- +- set(ENABLE_AKONADICONTACTSUPPORT OFF) +- +-endif() +- +-if(ENABLE_KFILEMETADATASUPPORT AND NOT KF${QT_VERSION_MAJOR}FileMetaData_FOUND) +- +- set(ENABLE_KFILEMETADATASUPPORT OFF) +- +-endif() +- + # Check if KIO have been compiled with KIOWidgets. digiKam only needs this one. + + if(ENABLE_KIO) +diff --git a/core/cmake/rules/RulesQtFramework.cmake b/core/cmake/rules/RulesQtFramework.cmake +index 9fa839c414..9267c6651e 100644 +--- a/core/cmake/rules/RulesQtFramework.cmake ++++ b/core/cmake/rules/RulesQtFramework.cmake +@@ -18,38 +18,17 @@ find_package(Qt${QT_VERSION_MAJOR} REQUIRED + Svg + ) + +-find_package(Qt${QT_VERSION_MAJOR} REQUIRED +- NO_MODULE +- COMPONENTS +- WebEngineWidgets +-) ++find_package(Qt${QT_VERSION_MAJOR}WebEngineWidgets REQUIRED NO_MODULE) + +-find_package(Qt${QT_VERSION_MAJOR} +- OPTIONAL_COMPONENTS +- DBus +- OpenGL +-) ++find_package(Qt${QT_VERSION_MAJOR}DBus) ++find_package(Qt${QT_VERSION_MAJOR}OpenGL) + + if(Qt6_FOUND) +- +- find_package(Qt${QT_VERSION_MAJOR} REQUIRED +- NO_MODULE COMPONENTS +- StateMachine +- SvgWidgets +- ) +- +- find_package(Qt${QT_VERSION_MAJOR} +- OPTIONAL_COMPONENTS +- OpenGLWidgets +- ) +- ++ find_package(Qt${QT_VERSION_MAJOR}StateMachine REQUIRED NO_MODULE) ++ find_package(Qt${QT_VERSION_MAJOR}SvgWidgets REQUIRED NO_MODULE) ++ find_package(Qt${QT_VERSION_MAJOR}OpenGLWidgets) + else() +- +- find_package(Qt${QT_VERSION_MAJOR} +- OPTIONAL_COMPONENTS +- XmlPatterns # For Rajce plugin +- ) +- ++ find_package(Qt${QT_VERSION_MAJOR}XmlPatterns) # For Rajce plugin + endif() + + if(ENABLE_DBUS) +@@ -65,17 +44,9 @@ endif() + # Qt Dependencies For unit tests and CLI test tools + + if(BUILD_TESTING) ++ find_package(Qt${QT_VERSION_MAJOR}Test REQUIRED NO_MODULE) + +- find_package(Qt${QT_VERSION_MAJOR} REQUIRED +- NO_MODULE +- COMPONENTS +- Test +- ) +- +- find_package(Qt${QT_VERSION_MAJOR} +- QUIET +- OPTIONAL_COMPONENTS +- Qml WebView # Optional, for 'sialis' O2 library test tool. +- ) +- ++ # Optional, for 'sialis' O2 library test tool. ++ find_package(Qt${QT_VERSION_MAJOR}Qml QUIET NO_MODULE) ++ find_package(Qt${QT_VERSION_MAJOR}WebView QUIET NO_MODULE) + endif() +diff --git a/core/cmake/rules/RulesX11.cmake b/core/cmake/rules/RulesX11.cmake +index d7830f3923..4401a57c87 100644 +--- a/core/cmake/rules/RulesX11.cmake ++++ b/core/cmake/rules/RulesX11.cmake +@@ -11,12 +11,7 @@ find_package(X11) + if(X11_FOUND) + + if(NOT Qt6_FOUND) +- +- find_package(Qt5 ${QT_MIN_VERSION} NO_MODULE +- COMPONENTS +- X11Extras +- ) +- ++ find_package(Qt5X11Extras ${QT_MIN_VERSION} NO_MODULE) + endif() + + set(HAVE_X11 TRUE) +-- +2.45.2 + diff --git a/media-gfx/digikam/metadata.xml b/media-gfx/digikam/metadata.xml index 13d34044a893..0a9720425415 100644 --- a/media-gfx/digikam/metadata.xml +++ b/media-gfx/digikam/metadata.xml @@ -15,7 +15,6 @@ <use> <flag name="addressbook">Enable akonadi contact integration</flag> <flag name="imagemagick">Enable support for additional image formats such as XCF, FITS, HEIC etc.</flag> - <flag name="mediaplayer">Enable integrated video player</flag> <flag name="lensfun">Enable support for <pkg>media-libs/lensfun</pkg></flag> <flag name="panorama">Build the panorama plugin which requires <pkg>media-gfx/hugin</pkg></flag> <flag name="semantic-desktop">Enable <pkg>kde-frameworks/kfilemetadata</pkg> support</flag> diff --git a/media-gfx/entice/Manifest b/media-gfx/entice/Manifest index 4c783fa7f411..1beb04508575 100644 --- a/media-gfx/entice/Manifest +++ b/media-gfx/entice/Manifest @@ -1,3 +1,5 @@ +DIST entice-0.0.1.tar.xz 3994332 BLAKE2B 38f225a0464b0fcc956b32b02afd0ca9b0923bf0cf70688fe87ee29ef67ef6eda5d81eff957c68927e660f09f2d5b9592c6a5659aa5303a3b8ee88a4af523394 SHA512 2e2dbb24ed1ed97c20683bf93bf4d89afae7d18ed891025fe15a3f70f77e18cefbc5e1430c88cb06a89990def2088a414751407d60227ddbf9a2cb9dfa0609aa DIST entice-0_pre20220809.tar.gz 7940222 BLAKE2B 8fb23d904e66894f60db94e64f5d9f0f00b82d6409c3c5e3439ecb8cd7835d2aadd7e52280eed4fc81fd0ac92fc02c9ad58c32d263f3081d93986bf21037c04e SHA512 2f6d549d87ca39be3b2d2fa15b488c6ddf0a31fc5164d90e7b4c37343af2fe44c674330b3764f100b048f94da003c7807e28b95ab059e3c04632026e53e5b96b +EBUILD entice-0.0.1.ebuild 1435 BLAKE2B ca809f2fdb8b00548a04baad9cba2f8bce3177f02b244f01b001810d8281ae6bde8fb8b5631d7e91a672c544dcc2f302b972e4ac594c899357f217edc62470eb SHA512 39e04b29b4dd51acf41c80a0ccd45f427e331191279d8b138bbff8c6d0cea3244450cb7facb356397bc92bfbad7bfd1986ee42de53092e35e50e1cf5622d59e1 EBUILD entice-0_pre20220809.ebuild 1502 BLAKE2B 76c3c9e7b5b01f735b8e710293ec6db2d258cc4ec7953d57ab572210691238c2298f5557286e839b69e75ed058e4bc3e9e0e8a86de667137d2086c4145030878 SHA512 99aa4a2c65ff69f2c7da8ded57cb4b14fce5792b1fd6f43d09ba376b829cfa5bf3cad1759498e1119e92ff945ccbcd2ca25b7c3ad7dd11f99a6a015dcaa1199e MISC metadata.xml 255 BLAKE2B 6fe10a1f843a8b2494606052a69206e32fdd5edf3ca6bdfb661cf6f8e39c0e16fb652acb8697d339770f3559c56a4ba964a0e959b3e0bb456d09ee7570f0d9e9 SHA512 235170971553178916cc484a07e1c665c94cd0a7ec442d2190d3608f7a3441dd2fe08fea666ca23d151077c10c908bc1da0e57355fab43be02711be35531b362 diff --git a/media-gfx/entice/entice-0.0.1.ebuild b/media-gfx/entice/entice-0.0.1.ebuild new file mode 100644 index 000000000000..d27098a8b85b --- /dev/null +++ b/media-gfx/entice/entice-0.0.1.ebuild @@ -0,0 +1,44 @@ +# Copyright 2022-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit meson optfeature xdg + +DESCRIPTION="A simple image viewer based on EFL" +HOMEPAGE="https://git.enlightenment.org/vtorri/entice https://github.com/vtorri/entice" +SRC_URI="https://git.enlightenment.org/vtorri/entice/releases/download/v${PV}/${P}.tar.xz" + +LICENSE="BSD-2" +SLOT="0" +KEYWORDS="~amd64 ~x86" + +DEPEND="|| ( dev-libs/efl[X] dev-libs/efl[wayland] ) + media-libs/libexif" +RDEPEND="${DEPEND}" + +S="${WORKDIR}" + +pkg_postinst() { + xdg_pkg_postinst + + optfeature_header "Image format support:" + optfeature "avif support" dev-libs/efl[avif] + optfeature "bmp,wbmp support" dev-libs/efl[bmp] + optfeature "dds support" dev-libs/efl[dds] + optfeature "gif support" dev-libs/efl[gif] + optfeature "heif support" dev-libs/efl[heif] + optfeature "ico,cur support" dev-libs/efl[ico] + optfeature "jp2k support" dev-libs/efl[jpeg2k] + optfeature "pdf support" dev-libs/efl[pdf] + optfeature "pmaps support" dev-libs/efl[pmaps] + optfeature "psd support" dev-libs/efl[psd] + optfeature "raw support" dev-libs/efl[raw] + optfeature "svg,rsvg support" dev-libs/efl[svg] + optfeature "tga support" dev-libs/efl[tga] + optfeature "tgv support" dev-libs/efl[tgv] + optfeature "tiff support" dev-libs/efl[tiff] + optfeature "webp support" dev-libs/efl[webp] + optfeature "xcf support" dev-libs/efl[xcf] + optfeature "xpm support" dev-libs/efl[xpm] +} diff --git a/media-gfx/exiv2/Manifest b/media-gfx/exiv2/Manifest index 0fc0dffe10cf..d1a0512667af 100644 --- a/media-gfx/exiv2/Manifest +++ b/media-gfx/exiv2/Manifest @@ -1,4 +1,6 @@ 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 3274 BLAKE2B 1af3617b064789096dc3781d6203407ecb46d7fb214335d8bdfaec3bf21454ba676ea0def3912cd4b846046462f8adfa371a33c3b3755b0ab659bec521af36bf SHA512 291b588822ef5e8e3724e96555ab5778467d38feb1243eb6ac306596eb8f753481d26ecaab38d0eca6e5aea6776e044bf3ac702c477534d6c1bdac5ff4c4d2c0 MISC metadata.xml 686 BLAKE2B 2d1079660cf4268216f8835d1ae6655ebafc99d5402872bb05dac6342034a28a07dcff587fc616a5eedc8c538ea3e43e013711d39c2541295e89629e39a244ee SHA512 40f9225a42386fa6f03bf9436d675bb01bd6eb859974bfed22d1316536ceaf40752fabffdab20b439e87c57f65d193d8d249e5aa022584de3f869f4162660b4e diff --git a/media-gfx/exiv2/exiv2-0.28.3.ebuild b/media-gfx/exiv2/exiv2-0.28.3.ebuild new file mode 100644 index 000000000000..ee1fb3e320ce --- /dev/null +++ b/media-gfx/exiv2/exiv2-0.28.3.ebuild @@ -0,0 +1,128 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +PYTHON_COMPAT=( python3_{10..13} ) +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 ) + +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/feh/Manifest b/media-gfx/feh/Manifest index 942685a47188..b64d677e4164 100644 --- a/media-gfx/feh/Manifest +++ b/media-gfx/feh/Manifest @@ -1,4 +1,6 @@ AUX feh-3.2-debug-cflags.patch 193 BLAKE2B 298f65a8f9142167d1cd2cfce0bc61ad9d7d4a5519ab8e78d1259ea60b5566376f8d9ddba660db65ef5e229bdc0ff254d9aab2284d8929ea0ac171da44f8c44d SHA512 336d23b767c5c3da9b94a1e6759129c242caf70a611b2410816a562d90720e3abab6a3444ce06975d62b4ebbe8e54c70942800516c7575cc6d5e13ce69679884 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 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 new file mode 100644 index 000000000000..7996c229ccea --- /dev/null +++ b/media-gfx/feh/feh-3.10.3.ebuild @@ -0,0 +1,71 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 +inherit toolchain-funcs xdg-utils + +DESCRIPTION="A fast, lightweight imageviewer using imlib2" +HOMEPAGE="https://feh.finalrewind.org/" +SRC_URI="https://feh.finalrewind.org/${P}.tar.bz2" + +LICENSE="feh" +SLOT="0" +KEYWORDS="~amd64 ~arm ~arm64 ~mips ~ppc ~ppc64 ~riscv ~x86" +IUSE="debug curl exif test xinerama inotify" +RESTRICT="test" # Tests are broken. + +COMMON_DEPEND=" + media-libs/imlib2[X,text(+)] + >=media-libs/libpng-1.2:0= + x11-libs/libX11 + curl? ( net-misc/curl ) + exif? ( media-libs/libexif ) + xinerama? ( x11-libs/libXinerama )" +RDEPEND="${COMMON_DEPEND} + media-libs/libjpeg-turbo:0" +DEPEND="${COMMON_DEPEND} + x11-base/xorg-proto + x11-libs/libXt + test? ( + >=dev-lang/perl-5.10 + dev-perl/Test-Command + media-libs/imlib2[gif,jpeg,png] + )" + +PATCHES=( "${FILESDIR}"/${PN}-3.2-debug-cflags.patch ) + +pkg_setup() { + use_feh() { usex $1 1 0; } + + fehopts=( + PREFIX="${EPREFIX}"/usr + doc_dir='${main_dir}'/share/doc/${PF} + example_dir='${main_dir}'/share/doc/${PF}/examples + curl=$(use_feh curl) + debug=$(use_feh debug) + xinerama=$(use_feh xinerama) + exif=$(use_feh exif) + inotify=$(use_feh inotify) + ) +} + +src_compile() { + tc-export CC + emake "${fehopts[@]}" +} + +src_install() { + emake "${fehopts[@]}" DESTDIR="${D}" install +} + +pkg_postinst() { + 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 +} diff --git a/media-gfx/fontforge/Manifest b/media-gfx/fontforge/Manifest index a1339f49f062..f8840e211c90 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 3018 BLAKE2B 17043ee61547e3b5f16941c6bdf637c42187287978dfb37e95a537b50e90233fba463b90339bdc60e080e155aa3b2e31447489627b9f3f8bfdd5db6ac2181a54 SHA512 eebf280f625414640f07705d74298557daf04e9c7ba5a75ef79d3e735d06551a39bbdf1825f2b06f8daf690843bfcfbe8f3b939134a544ec1b50fd1ead669d73 +EBUILD fontforge-20230101-r2.ebuild 3017 BLAKE2B faaf55afb8aceb26886fde3d1ff1b5edd06a53b281b0e2432a847d975fa6d0cd689e9f6ca9ec1ea255f25fc993eb625c48456b144f8a1c48481ae01983e89b82 SHA512 b4c2c1191ab197886bdc594bd163f9b62913f0c1d9d963628993f315e2c4135e556648dab42a6c44de94941edad17b4bdd5c42d586552c0f5421c3ec63b86834 EBUILD fontforge-20230101.ebuild 2877 BLAKE2B 838d3272eaca260bd5728ecdb6a5f69c3ce5fdbb18432529ff2f536951265d646f7c7ca39bad7c5bb7ec57aaeb312492d7537013d466f263efcd2eedb235bdb3 SHA512 f75fd950ed8e356d09467a6b46980dfba2351239b111a8bf89d17d59167172c5ae3eb0f0254ec86831a4b90dbb9157dd4ef30a154f4b1158bb53e8ed7de2c0c9 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 010c4dd17a94..91ed53a3dcba 100644 --- a/media-gfx/fontforge/fontforge-20230101-r2.ebuild +++ b/media-gfx/fontforge/fontforge-20230101-r2.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 ~ia64 ~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/fotocx/Manifest b/media-gfx/fotocx/Manifest index 897aecad6fc2..c60a496f9873 100644 --- a/media-gfx/fotocx/Manifest +++ b/media-gfx/fotocx/Manifest @@ -2,7 +2,9 @@ AUX fotocx-24.20-documentation.patch 1373 BLAKE2B ac442711ae3eea89f1fa7a272004a0 DIST fotocx-24.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 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 MISC metadata.xml 851 BLAKE2B a6c60b79fb5646c3bd7d6959d4a1b974ee714bf6ed64f205d9c00d684b3da94672005658336c1c5fcb903605d11c9a5607616151b2f6262f3173e15b8fc44655 SHA512 2794ae92afa076875c7f725969efdcf9cb84435d0ea033adc28f5860a69438b754f4d22b0db27dc7392683439e51b51ae581a6da450719276e8df51a2a306ad9 diff --git a/media-gfx/fotocx/fotocx-24.40.ebuild b/media-gfx/fotocx/fotocx-24.40.ebuild index 8eee122865a7..ace12ae77268 100644 --- a/media-gfx/fotocx/fotocx-24.40.ebuild +++ b/media-gfx/fotocx/fotocx-24.40.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.50.ebuild b/media-gfx/fotocx/fotocx-24.50.ebuild new file mode 100644 index 000000000000..8eee122865a7 --- /dev/null +++ b/media-gfx/fotocx/fotocx-24.50.ebuild @@ -0,0 +1,79 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit optfeature xdg-utils + +DESCRIPTION="Program for improving image files made with a digital camera" +HOMEPAGE="https://kornelix.net/fotocx/fotocx.html" +SRC_URI="https://kornelix.net/downloads/downloads/${P}-source.tar.gz" +S="${WORKDIR}/${PN}" + +LICENSE="GPL-3+" +SLOT="0" +KEYWORDS="~amd64 ~arm64 ~x86" + +# For required dependencies read doc/README, for required tools read +# data/userguide [INSTALLATION]. xdg-open (x11-misc/xdg-utils) is an +# alternative to firefox and chromium-browser. `grep '"which ' * -R` +# is helpful to report some required tools run via the shell. + +DEPEND=" + media-libs/clutter + media-libs/clutter-gtk + media-libs/lcms:2 + media-libs/libjpeg-turbo:= + media-libs/libpng:= + media-libs/tiff:= + media-libs/libchamplain[gtk] + x11-libs/gtk+:3" +RDEPEND=" + ${DEPEND} + media-gfx/dcraw + media-libs/exiftool + x11-misc/xdg-utils +" + +PATCHES=( "${FILESDIR}/${PN}-24.20-documentation.patch" ) + +DOCS=() +HTML_DOCS=() + +src_prepare() { + sed -i -e "/^DOCDIR/ s/${PN}$/${PF}/" Makefile || die + sed -i -e "/^Icon/ s/\.png$//" ${PN}.desktop || die + default +} + +src_install() { + # For the Help menu items to work, *.html must be in /usr/share/doc/${PF}, + # and README, changelog, copyright, license, etc. must not be compressed. + emake DESTDIR="${D}" PREFIX="/usr" install + rm -f "${D}"/usr/share/doc/${PF}/*.man || die + docompress -x /usr/share/doc +} + +pkg_postinst() { + optfeature "HEIC & AVIF file support" media-libs/libheif + optfeature "additional RAW file support" media-gfx/rawtherapee + optfeature "additional RAW file support" media-gfx/darktable + optfeature "video thumbnails & playback" media-video/ffmpeg + optfeature "copying images to optical media" app-cdr/dvd+rw-tools + optfeature "WEBP file support" media-libs/libwebp + + elog + elog "Please read the Help > User Guide for details. The source location is" + elog "/usr/share/fotocx/data/userguide and after running fotocx a copy will" + elog "be placed at /home/<user>/.fotocx/userguide." + elog + elog "To play videos, in Tools > Preferences set 'Video File Play Command'." + elog + xdg_desktop_database_update + xdg_mimeinfo_database_update +} + +pkg_postrm() { + xdg_desktop_database_update + xdg_mimeinfo_database_update +} diff --git a/media-gfx/geeqie/Manifest b/media-gfx/geeqie/Manifest index 0a2d089c4e56..7b73accd088d 100644 --- a/media-gfx/geeqie/Manifest +++ b/media-gfx/geeqie/Manifest @@ -1,19 +1,6 @@ -AUX geeqie-2.1-exiv2-0.28.0.patch 5556 BLAKE2B 3af45f27984d789dc1618b348dabfa3cb7264fcce257f1f6dcf69aa7b37a11f48b5ddf9dfdd3f4f630da2583571bf228e95bf98729a13290f133c18c468651c7 SHA512 9e63688935b1f3c3bc33c238201b5cb5508a91df2c58020656a31edb88f22b2e53e6abcd61fa7b1634a772cc7cc1ce7307f57e93fbdc8a7beb2d63c1dc44df6f -AUX geeqie-2.1-locale.patch 522 BLAKE2B f676a4b2b0acb6184c66657314974f61413172bef3290d05d2764afae48b476fc40892012d1af93f02454de127a5b38cec240057ad20c3a6a63e11e354906b75 SHA512 c9d402fd9bb5d49a1f4219e33e24a16d656a6ba0a3eaddd6864debab09b3742927a89892e2fffe3c6726abe3f6b2bc6baae9af1ecf035f5a02ff3f9b5ad6ce59 -AUX geeqie-2.1-lua_hpp.patch 344 BLAKE2B 8206ef3ec5faf9b94efe57413905dedef5046b0d90056864e33b2adb876ca4bb3867417a24e4f6956d14923b3ee119ee5e8379f314cffe8ade2c1102bcb3c1de SHA512 599f9b63fad24bd292a393ead338894c6330b82fc3e02e71e16f7a85b49fa0ed564677444b5d78d68b4ac91ad04e8a6c237e3119031e1307ab089ae37e6eb838 -AUX geeqie-2.3-locale.patch 336 BLAKE2B 26d6712244e382be5981ad0c940828565e066aca961fd2fb4815bea26fe020c9ca95475b8f661f649e7a0ca54fdeea17aefcef2327e99f076646888b0fc3bf1a SHA512 00900c3740b1200db4eb515f0c5d77ac73d284e879d7c0dd36297953dc12149c65cc383ecc2837f55881dbf62e1ab0cedc0c6f58ff9e5aba1e73bd6a9314b2d8 AUX geeqie-2.3-test-ancillary.patch 630 BLAKE2B a997e60c3fd6fe78b72019babbf2ad7d9f4fccea275cc95903925ed7ed1e0486da2d82e76e0afd43f82932c123ee03891878bf68d0ef5d714528806f206db45a SHA512 69aa64bf6945f6cd11b6ccd93052c5589f332f55d3e022e5b23b0e5eee0fada4764c54b7dffa75b8e5432f5c7d4c27384992cdd61a18c779feede4827f2be5ff -DIST geeqie-2.1-docs.tar.xz 333756 BLAKE2B 2e569f4000befdaecebd6df9c94c59b8d9e05743343b1ba2ab647a228cc595b71369173cd0e7b798227a0843d493eb7d59be19b8259015239cfcdf8b5a40d339 SHA512 f1701e1f7550dc58d2d65f35da09284958b1d92f60568a8774831025525c835d2a03a48fd582052d3fca9cd2c15d935e30baf3f6599f624bf3dbccfeb606745d -DIST geeqie-2.1.tar.xz 1800612 BLAKE2B 60190532eb8830e12acf06e39046dd04ccf28ac5d3679f2063e6f6e102add0d398dfc70a57a758d0c16483d5314ec88cb56b54829103ad938b29ac1500f86fdc SHA512 1812234d349536626433bbb7670cd45ef5ce328bf58f603af8eb4a01f7d3db2557d5a812714b12a9b49559aa1fe1c186ceddf2f632c2b303d64d36ad746a2d2f -DIST geeqie-2.2-docs.tar.xz 356976 BLAKE2B 3bca2815a6f177a2f38b9a66ff6fa95dba510aa2afb36d5d6c9f6841c0c1b25c4f9aad7d45ef57d911f0caa2a8499a06aba2ccaf7e279382bf4304c88f11ea13 SHA512 0f89995573b02e82c715dcdf4d71a309691885ad785f1297d2fee01aff00f2aed43c9cff6900bddfa1a727598934ba7bb0ced32b0c86c6f1a115271a8a81592a -DIST geeqie-2.2.tar.xz 2169096 BLAKE2B fe7f21f5842ac7824ec37f0775d31e8dcd05934809f7bdd84d7dcb749d25976055050f42a8cea3cd414fb3c7e60055c9fa32b93cfef2af62de68f4d44af425c8 SHA512 7d03493b463a1949cbc5e377927abc4bc6fa62914e8cdddb30a832cb9c6caad579f5ba5bd2b8b0913b77063300c9c5ac1f7e671ddfb2ce18d8a8d0efcfb51dbe -DIST geeqie-2.3-docs.tar.xz 362412 BLAKE2B e05adbd6b277cfccae20c2ed7840e447016b32a9bf5c5ad6feb143993b4856fbb623feb6684a21c235ad846923463bed45cf887b1854189f01a46c3961f26a18 SHA512 cab4739adecd1dcb9cde3a58a2e2c2262f4014bc7594ae22af69b8bdbb14f6849b1e2267646301f31ebde76b2b2abc05e75aac3325e35cb88f9dc40703f2d943 -DIST geeqie-2.3.tar.xz 2184604 BLAKE2B dbd2d52d146d373a9694a7371a8ac44571e63895cf6cea7acb549a1135b4cf5869737cdf780ca6afdb14eda1338cb275791eaac1cd7596ed58eb07759cf75778 SHA512 9f45974d12c1f193a4a3624064b967fc06cf9c906c45160a4945a8f6a9d814b929b92c45a35006c7f1b20fa5fe360858f24fd54adbcd8863c3e7d787a3429899 DIST geeqie-2.4-docs.tar.xz 364536 BLAKE2B 688720808c8e4543455259966aef726bf56a821890a78e4757d9d1fd02ce67217461808d9697b331b2a94841bf3581b25242a7e5c9c9a3f5b02209a566b09c16 SHA512 07bca33c347f448ee853ea60daf22c9cdace458b6ce6b3f4ced9b343a965370c51d7a872d5279852b7a83a1de51c8529a668f7d62a031bcec1fdde8b9bfbf9cb DIST geeqie-2.4.tar.xz 2178572 BLAKE2B df24f0b5d443cbd2033c0b382fe0d846c9073e8966aa736f647e34930e44083b9e44252c554578548a13c12c1b1a5a48bb7795f2fda8b8688a63ef402a257334 SHA512 7e0f5dff21e38a41adf0a793bd82652c5d639e84ab49403517f4b1dae042bfc5f4d02e54b54928e04a2397300acb04b130347df0be5637ee48634f5865ad346b -EBUILD geeqie-2.1-r1.ebuild 3277 BLAKE2B e9a43ed274613dd5a98552d1d83768cffbc0be641d1661d6bd9b5d4b599e210d48dd6fe771c03d90abfc895bd582901e1ac0c4c224edbe96c6139f75e0b40e87 SHA512 f1a090d18fe0f6bb6ab3f7ecb6c42a996fcfbe05457f97ae00cff4d44da057107acd982616ffc307208bc893235ec5b1bcaeee79eefbae177a445a1f465e54da -EBUILD geeqie-2.2.ebuild 3284 BLAKE2B 3c81435058a54a3da139b128db23b2adc7a378c9fb6a7f81cc9405b427ad66696f94c42bf39fb65583d79a8ac7428c2130a4e780410643fe6511457d4b3bea67 SHA512 db41ac9bfe390f64c6352a33f9c2181d3fe27d0e15c256cabef7ab026d4398342f0de05c4f29466634ec419d07f2c13b6294551e27dcb47df66c221f55aa6641 -EBUILD geeqie-2.3.ebuild 3376 BLAKE2B 515083b0ecb99fa9c2d6f92d9df2ef9c8f1e72436c290bb02311cfe73bcb0a92f0334df33c1453a709cf94277cddb99deaf9ba9276895524ec42126ef44616f5 SHA512 4906e493fe819d29e6c94dcb452b8f2382a0e01f59b60b8fb0afd0ac8c79f27c2befd23ed6366fd4e76a6da6dafc75d24aaab552f93ca0fad7a3b38f5d6c4e7d EBUILD geeqie-2.4.ebuild 3340 BLAKE2B 62a26c71d0d3e2c71fff2c6761f69bd5b6e82a364ff5f5c391eaa688b2ff5668a36b68d104155a7b3c2dd364ef15301abe494401fca2b0cf556f2501b38085fa SHA512 ab810bd8277a102a72569909d0d925095141438d341cf3d592e4a4c3336a7e7d9a6d344dee87c2cdfd8fe13c7443e471e2aa79954b54545996a65b46a9d52905 EBUILD geeqie-9999.ebuild 3055 BLAKE2B 450d32bd793aa6436b3ab676758758e57f1bd34fa38ceafbd14a3df436611cc0f25a1c93f05f51104089e2c76a82f2605f00467e0aedf41032645d5e236f6421 SHA512 c1695fa7e9fe635f5799677c13014f4792ca2463654d1faeb967fd9fa6f89a757892316386797590632f3a233eb19daff8e724cd59d937294e2f48c79246d26c MISC metadata.xml 816 BLAKE2B ed50c576f068626d95d99899b17508b7c48567707ff020988dc611be9b482893f008f904ce460565ed0f263c76f2e274640f6e662f827d0879de5a59a93e8c3b SHA512 45458e31201d1baee61f48fe452c3577bcb74fea6569d1afdd8787aff6714d3400f501d1dc6b3de31ea1d5151326d48593f5bb219ec5cfed603cfe8835690dcd diff --git a/media-gfx/geeqie/files/geeqie-2.1-exiv2-0.28.0.patch b/media-gfx/geeqie/files/geeqie-2.1-exiv2-0.28.0.patch deleted file mode 100644 index 13b6a171257d..000000000000 --- a/media-gfx/geeqie/files/geeqie-2.1-exiv2-0.28.0.patch +++ /dev/null @@ -1,151 +0,0 @@ -From c45cca777aa3477eaf297db99f337e18d9683c61 Mon Sep 17 00:00:00 2001 -From: Kevin Backhouse <kevinbackhouse@github.com> -Date: Wed, 21 Jun 2023 12:23:33 +0100 -Subject: [PATCH] Add ExifData as extra argument to - exif_item_get_data_as_text(). - ---- - src/advanced-exif.cc | 2 +- - src/exif-common.cc | 2 +- - src/exif.cc | 8 ++++---- - src/exif.h | 2 +- - src/exiv2.cc | 4 ++-- - 5 files changed, 9 insertions(+), 9 deletions(-) - -diff --git a/src/advanced-exif.cc b/src/advanced-exif.cc -index 79a54b12..e3d3067a 100644 ---- a/src/advanced-exif.cc -+++ b/src/advanced-exif.cc -@@ -120,7 +120,7 @@ static void advanced_exif_update(ExifWin *ew) - tag = g_strdup_printf("0x%04x", exif_item_get_tag_id(item)); - tag_name = exif_item_get_tag_name(item); - format = exif_item_get_format_name(item, TRUE); -- text = exif_item_get_data_as_text(item); -+ text = exif_item_get_data_as_text(item, exif); - utf8_text = utf8_validate_or_convert(text); - g_free(text); - elements = g_strdup_printf("%d", exif_item_get_elements(item)); -diff --git a/src/exif-common.cc b/src/exif-common.cc -index 6a4c9740..b6f07ca6 100644 ---- a/src/exif-common.cc -+++ b/src/exif-common.cc -@@ -995,7 +995,7 @@ gchar *exif_get_data_as_text(ExifData *exif, const gchar *key) - if (key_valid) return text; - - item = exif_get_item(exif, key); -- if (item) return exif_item_get_data_as_text(item); -+ if (item) return exif_item_get_data_as_text(item, exif); - - return nullptr; - } -diff --git a/src/exif.cc b/src/exif.cc -index 8708ff53..cda2cb1a 100644 ---- a/src/exif.cc -+++ b/src/exif.cc -@@ -1454,7 +1454,7 @@ gchar *exif_item_get_string(ExifItem *item, gint UNUSED(idx)) - return exif_item_get_data_as_text_full(item, METADATA_PLAIN); - } - --gchar *exif_item_get_data_as_text(ExifItem *item) -+gchar *exif_item_get_data_as_text(ExifItem *item, ExifData *exif) - { - return exif_item_get_data_as_text_full(item, METADATA_FORMATTED); - } -@@ -1527,11 +1527,11 @@ gchar *exif_get_tag_description_by_key(const gchar *key) - return NULL; - } - --static void exif_write_item(FILE *f, ExifItem *item) -+static void exif_write_item(FILE *f, ExifItem *item, ExifData *exif) - { - gchar *text; - -- text = exif_item_get_data_as_text(item); -+ text = exif_item_get_data_as_text(item, exif); - if (text) - { - gchar *tag = exif_item_get_tag_name(item); -@@ -1578,7 +1578,7 @@ void exif_write_data_list(ExifData *exif, FILE *f, gint human_readable_list) - item = (ExifItem*)(work->data); - work = work->next; - -- exif_write_item(f, item); -+ exif_write_item(f, item, exif); - } - } - g_fprintf(f, "----------------------------------------------------\n"); -diff --git a/src/exif.h b/src/exif.h -index fcc7d8f5..4b03c201 100644 ---- a/src/exif.h -+++ b/src/exif.h -@@ -136,7 +136,7 @@ gchar *exif_item_get_data(ExifItem *item, guint *data_len); - gchar *exif_item_get_description(ExifItem *item); - guint exif_item_get_format_id(ExifItem *item); - const gchar *exif_item_get_format_name(ExifItem *item, gboolean brief); --gchar *exif_item_get_data_as_text(ExifItem *item); -+gchar *exif_item_get_data_as_text(ExifItem *item, ExifData *exif); - gint exif_item_get_integer(ExifItem *item, gint *value); - ExifRational *exif_item_get_rational(ExifItem *item, gint *sign, guint n); - -diff --git a/src/exiv2.cc b/src/exiv2.cc -index 33b779e7..dc62e8e0 100644 ---- a/src/exiv2.cc -+++ b/src/exiv2.cc -@@ -778,13 +778,13 @@ const char *exif_item_get_format_name(ExifItem *item, gboolean UNUSED(brief)) - } - - --gchar *exif_item_get_data_as_text(ExifItem *item) -+gchar *exif_item_get_data_as_text(ExifItem *item, ExifData *exif) - { - try { - if (!item) return nullptr; - auto metadatum = reinterpret_cast<Exiv2::Metadatum *>(item); - #if EXIV2_TEST_VERSION(0,17,0) -- return utf8_validate_or_convert(metadatum->print().c_str()); -+ return utf8_validate_or_convert(metadatum->print(&exif->exifData()).c_str()); - #else - std::stringstream str; - Exiv2::Exifdatum *exifdatum; -From b04f7cd0546976dc4f7ea440648ac0eedd8df3ce Mon Sep 17 00:00:00 2001 -From: Colin Clark <colin.clark@cclark.uk> -Date: Wed, 21 Jun 2023 14:24:41 +0100 -Subject: [PATCH] Remove exiv2 0.28.0 restriction - -https://github.com/BestImageViewer/geeqie/pull/1119 - -The bug was fixed in the above commit. ---- - meson.build | 12 ++---------- - 1 file changed, 2 insertions(+), 10 deletions(-) - -diff --git a/meson.build b/meson.build -index a4cab49c..412399fe 100644 ---- a/meson.build -+++ b/meson.build -@@ -280,15 +280,7 @@ else - endif - - exiv2_dep = [] --# See https://github.com/BestImageViewer/geeqie/issues/1090 --# for the reason for 0.28.0 exclusion --req_version = ['>=0.11', '!=0.28.0'] -- --req_version_str = '' --foreach req_version_str_ : req_version -- req_version_str += req_version_str_ --endforeach -- -+req_version = '>=0.11' - option = get_option('exiv2') - if not option.disabled() - exiv2_dep = dependency('exiv2', version : req_version, required : get_option('exiv2')) -@@ -296,7 +288,7 @@ if not option.disabled() - conf_data.set('HAVE_EXIV2', 1) - summary({'exiv2' : ['image metadata processed by exiv2:', true]}, section : 'Configuration', bool_yn : true) - else -- summary({'exiv2' : ['exiv2 ' + req_version_str + ' not found - image data not processed by exiv2:', false]}, section : 'Configuration', bool_yn : true) -+ summary({'exiv2' : ['exiv2 ' + req_version + ' not found - image data not processed by exiv2:', false]}, section : 'Configuration', bool_yn : true) - endif - else - summary({'exiv2' : ['disabled - image data processed by exiv2:', false]}, section : 'Configuration', bool_yn : true) diff --git a/media-gfx/geeqie/files/geeqie-2.1-locale.patch b/media-gfx/geeqie/files/geeqie-2.1-locale.patch deleted file mode 100644 index 10ae6b0169c5..000000000000 --- a/media-gfx/geeqie/files/geeqie-2.1-locale.patch +++ /dev/null @@ -1,22 +0,0 @@ -From 01d8762d45a2f3871cfd09176edbccdbe73a6767 Mon Sep 17 00:00:00 2001 -From: Thomas Klausner <wiz@gatalith.at> -Date: Sat, 17 Jun 2023 18:47:28 +0200 -Subject: [PATCH] Add missing header for setlocale(). - ---- - src/misc.cc | 2 ++ - 1 file changed, 2 insertions(+) - -diff --git a/src/misc.cc b/src/misc.cc -index 9942605ce..a2ad3eb69 100644 ---- a/src/misc.cc -+++ b/src/misc.cc -@@ -18,6 +18,8 @@ - * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. - */ - -+#include <locale.h> -+ - #include "main.h" - #include "misc.h" - diff --git a/media-gfx/geeqie/files/geeqie-2.1-lua_hpp.patch b/media-gfx/geeqie/files/geeqie-2.1-lua_hpp.patch deleted file mode 100644 index a0c816b5fb3c..000000000000 --- a/media-gfx/geeqie/files/geeqie-2.1-lua_hpp.patch +++ /dev/null @@ -1,19 +0,0 @@ ---- - src/lua.cc | 4 +--- - 1 file changed, 1 insertion(+), 3 deletions(-) - -diff --git a/src/lua.cc b/src/lua.cc -index 84aa549a..458b658a 100644 ---- a/src/lua.cc -+++ b/src/lua.cc -@@ -24,9 +24,7 @@ - - #define _XOPEN_SOURCE - --#include <lua.h> --#include <lauxlib.h> --#include <lualib.h> -+#include <lua.hpp> - - #include <stdio.h> - #include <glib.h> diff --git a/media-gfx/geeqie/files/geeqie-2.3-locale.patch b/media-gfx/geeqie/files/geeqie-2.3-locale.patch deleted file mode 100644 index 05f8bdcfdaea..000000000000 --- a/media-gfx/geeqie/files/geeqie-2.3-locale.patch +++ /dev/null @@ -1,11 +0,0 @@ -diff -Naur geeqie-2.3.orig/src/misc.cc geeqie-2.3/src/misc.cc ---- geeqie-2.3.orig/src/misc.cc 2024-03-06 16:56:22.000000000 +0100 -+++ geeqie-2.3/src/misc.cc 2024-03-25 21:03:18.655779225 +0100 -@@ -23,6 +23,7 @@ - #include <sys/stat.h> - #include <unistd.h> - -+#include <clocale> - #include <cstdio> - #include <cstdlib> - #include <cstring> diff --git a/media-gfx/geeqie/geeqie-2.1-r1.ebuild b/media-gfx/geeqie/geeqie-2.1-r1.ebuild deleted file mode 100644 index 2a7751b70258..000000000000 --- a/media-gfx/geeqie/geeqie-2.1-r1.ebuild +++ /dev/null @@ -1,117 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 -LUA_COMPAT=( lua5-{3,4} ) - -inherit flag-o-matic lua-single meson optfeature xdg - -DESCRIPTION="A lightweight GTK image viewer forked from GQview" -HOMEPAGE="http://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" - -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}"/${P}-locale.patch - "${FILESDIR}"/${P}-lua_hpp.patch - "${FILESDIR}"/${P}-exiv2-0.28.0.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() { - # -Werror=odr - # https://bugs.gentoo.org/585432 - # https://github.com/BestImageViewer/geeqie/issues/1270 - filter-lto - - 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/geeqie/geeqie-2.2.ebuild b/media-gfx/geeqie/geeqie-2.2.ebuild deleted file mode 100644 index db97d02cdbaa..000000000000 --- a/media-gfx/geeqie/geeqie-2.2.ebuild +++ /dev/null @@ -1,115 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 -LUA_COMPAT=( lua5-{3,4} ) - -inherit flag-o-matic lua-single meson optfeature xdg - -DESCRIPTION="A lightweight GTK image viewer forked from GQview" -HOMEPAGE="http://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} )" - -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() { - # -Werror=odr - # https://bugs.gentoo.org/585432 - # https://github.com/BestImageViewer/geeqie/issues/1270 - filter-lto - - 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/geeqie/geeqie-2.3.ebuild b/media-gfx/geeqie/geeqie-2.3.ebuild deleted file mode 100644 index dae22816e4fd..000000000000 --- a/media-gfx/geeqie/geeqie-2.3.ebuild +++ /dev/null @@ -1,119 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 -LUA_COMPAT=( lua5-{3,4} ) - -inherit flag-o-matic lua-single meson optfeature xdg - -DESCRIPTION="A lightweight GTK image viewer forked from GQview" -HOMEPAGE="http://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.3-test-ancillary.patch - "${FILESDIR}"/${P}-locale.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() { - # -Werror=odr - # https://bugs.gentoo.org/585432 - # https://github.com/BestImageViewer/geeqie/issues/1270 - filter-lto - - 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/gimp/Manifest b/media-gfx/gimp/Manifest index d3158ec46507..9744fa9ba357 100644 --- a/media-gfx/gimp/Manifest +++ b/media-gfx/gimp/Manifest @@ -12,6 +12,6 @@ EBUILD gimp-2.10.34-r2.ebuild 5882 BLAKE2B 67a9b4c0707f3027f34ba6276b8ac6fd2709e 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.ebuild 7178 BLAKE2B 513d508da711c4c2b57b1df77865a0cbf93a2090fb2669ad6f58cb550fa941445510ccf3592652b025f1ca246162ba3a2a677b8175561067a5a699cfae0b9705 SHA512 58c3695b76c50ab18ae63c35cff5b8f9f13c660b56c3359d064a247a5ea53252b0067a37e6641643c5996232e3b94071ca13772331fe528daaafe2e509c70fc4 +EBUILD gimp-2.99.18-r1.ebuild 7253 BLAKE2B 0c95a252589be3d821a73b7651e866207928cee724d16e934f585bd9080869620d1b20546672ddf229ef59bd21f54d5906da19bf2bafab76d479b05b3adfc403 SHA512 042f9a4d904d2be0bedbb6dde123a7d12f8c43b7502990e2a0c6884c287522db8e0bfeebc0fa621a54992739482db4a8b8f3675ba7f5af33999ea4c390f6bf37 EBUILD gimp-9999.ebuild 7111 BLAKE2B 726d3e15b968938fa2fcbc66775d58c46329cf679b08b36e507c3c26524aba189c8719c78f085b4ff8d574258579ae3e9bd537296f93e7cf0724cadd378230b9 SHA512 170c006ef43c1093f705cf530a21441e8afdbeb7d454c3e9ab0eddd504e2dccdcca24707829b523f0e2eb4025f808cd00d848738b2c26d51f6205ea82f76da6c -MISC metadata.xml 579 BLAKE2B 7766f3da8488794ee014731965efd289e9e95d07631cd7f08ce9469fb33ed1ada31b646f337afcbb3a540d4de83fa5764fc2aa18c4b132341520d4717c7b251d SHA512 9bf1c5c4442af756e6ce40a7399f096ed1732c095eafdb4ff580e4122154e2549d9e8c36a7cc0391f0bd49c07422c5c59123278d62645330aeefdc9130aef182 +MISC metadata.xml 655 BLAKE2B f6628a2c5edb90b16db0f59af05446a3f31316f5558ece238d30c9350632713cf2db3d315c90b31229596659ec20859c17fde6b051f9ab8f8fe34d64902dad57 SHA512 712a259ae41d9052bde0761087928685b9b66a132db3f3b49121241d87728f51bf31a00541aa385bd03b57a2e2a03a0176356045dd4752485a8dca2bd61c5886 diff --git a/media-gfx/gimp/gimp-2.99.18.ebuild b/media-gfx/gimp/gimp-2.99.18-r1.ebuild index 48f5c21117db..a206f158550c 100644 --- a/media-gfx/gimp/gimp-2.99.18.ebuild +++ b/media-gfx/gimp/gimp-2.99.18-r1.ebuild @@ -16,7 +16,7 @@ SRC_URI="mirror://gimp/v$(ver_cut 1-2)/${P}.tar.xz" LICENSE="GPL-3+ LGPL-3+" SLOT="0/3" -IUSE="X aalib alsa doc 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 python test udev unwind vala vector-icons webp wmf xpm" REQUIRED_USE=" lua? ( ${LUA_REQUIRED_USE} ) python? ( ${PYTHON_REQUIRED_USE} ) @@ -57,6 +57,7 @@ COMMON_DEPEND=" >=x11-libs/libXmu-1.1.4 aalib? ( media-libs/aalib ) alsa? ( >=media-libs/alsa-lib-1.0.0 ) + fits? ( sci-libs/cfitsio ) heif? ( >=media-libs/libheif-1.13.0:= ) javascript? ( dev-libs/gjs ) jpeg2k? ( >=media-libs/openjpeg-2.3.1:2= ) @@ -173,11 +174,13 @@ 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) diff --git a/media-gfx/gimp/metadata.xml b/media-gfx/gimp/metadata.xml index 7f947b8fb0b5..23efd9862ca5 100644 --- a/media-gfx/gimp/metadata.xml +++ b/media-gfx/gimp/metadata.xml @@ -10,6 +10,7 @@ <name>Proxy Maintainers</name> </maintainer> <use> + <flag name="fits">Enable support for loading/exporting FITS images</flag> <flag name="vector-icons">Enable support for vector icons (experimental)</flag> </use> <upstream> diff --git a/media-gfx/gnome-font-viewer/Manifest b/media-gfx/gnome-font-viewer/Manifest index 63475af835ef..5e91c8a0eee2 100644 --- a/media-gfx/gnome-font-viewer/Manifest +++ b/media-gfx/gnome-font-viewer/Manifest @@ -1,4 +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 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 new file mode 100644 index 000000000000..163cee416bb5 --- /dev/null +++ b/media-gfx/gnome-font-viewer/gnome-font-viewer-46.0.ebuild @@ -0,0 +1,34 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 +inherit gnome.org meson xdg + +DESCRIPTION="Font viewer utility for GNOME" +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" + +DEPEND=" + >=dev-libs/glib-2.56.0:2 + >=gui-libs/gtk-4.5.0:4 + >=gui-libs/libadwaita-1.4_alpha: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}" +BDEPEND=" + dev-libs/appstream-glib + dev-libs/libxml2:2 + >=sys-devel/gettext-0.19.8 + virtual/pkgconfig +" + +PATCHES=( + "${FILESDIR}"/45.0-window-Fix-function-callback-definition.patch +) diff --git a/media-gfx/graphicsmagick/Manifest b/media-gfx/graphicsmagick/Manifest index e80c7a55677c..45017a1ad4e7 100644 --- a/media-gfx/graphicsmagick/Manifest +++ b/media-gfx/graphicsmagick/Manifest @@ -7,7 +7,7 @@ DIST GraphicsMagick-1.3.42.tar.xz.asc 228 BLAKE2B 723f8d1ca13bd5b32a12d69bb46f49 DIST GraphicsMagick-1.3.43.tar.xz 5657460 BLAKE2B caa4fa6546acb4cdaaa421030ccc5cd2b628ae723e07f84700f65e26e1f3e59039cf92fda259ee44ba1e1fa90e9c469844fb5289cc73d50c42bb50fb39358ca2 SHA512 15b4d90119f25fd45f16d50218d51d543841dd3cdaf0c585bce2c18592106bc41573ed1011d7176ff5882fa0cded8f46bfd1e639c26063571109911e22098757 DIST GraphicsMagick-1.3.43.tar.xz.asc 228 BLAKE2B cb1290af98ea92de948df0421b7de101a713f0b8ce4a07959269d5edd10eb26f088585e1a8272482a9b219ee388ae8f040fc047ca76d5f752f04a7b57987c89c SHA512 3bd62bc64dd1b6f2d7a17f1281d8dc4c67c474860b4d95bfaf5fb4be93d0ee156b54c2a6ef4166687854e5458a6e43e61816a5fd508e4702f693a9d1e43984bf EBUILD graphicsmagick-1.3.42.ebuild 3955 BLAKE2B 7fb1f992576d85e80f859d8ae386c0ae6c1a8bce256dc4eac99f7891944d5ece5ff0bf23a1a382fd2ce9d7d8987f78c8ff58bea16fdbef49c2fdc12ff1405b50 SHA512 66784a829ca6496bb386d21507738830839c1c52998fb0520392d833b0eb35f13834bd5c9c936e40b36f9f414e773452e9b9c7ff4ebc2d557954330097d1a619 -EBUILD graphicsmagick-1.3.43-r1.ebuild 3989 BLAKE2B 6c65b327e3ba8565b72c0b647c927253be7edcbec017fd7c2c711b7f733cbd556154c49ee95564921f9a09a11b9ef3330bf1f39096288ff055ca7b03d3061c62 SHA512 0ca47e9ac3bd5c7160bf14f7aa32b7480d6a99cef60f4e6d3b4bfd1f67cfb468aa61217b9e928837d3b71f463f569bbb22e994491265d74341abbe4930d42b6c +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-9999.ebuild 3953 BLAKE2B 2f28cb9079e7262dfff660325136a75f7682aa6a0d6f2ea23f256dddced870eed14f5ba4f522ee90a617af5a17ec11787cbe3ed2f4188e00d2fcfa1166dd274c SHA512 19d5ce53b7bd3689a368f122958f08c696f44dc734f9f51452d95715d02d0c94e418dbe1af709413fa2d4d8326e21761e4b2c148cf7a6af18d5af6825d2cacb3 MISC metadata.xml 1301 BLAKE2B 1d98e2027f597d0b9c3ae76923adf2dbcb817a439671931076766ec6bc9cb04d053f92fba520a08cc3e629a6802f75d9c4c40058daed25c1555e21516b678997 SHA512 2b1e3cc87a6f9af93fabbc31e142cf4d7206cce3cf2a0e9d70751f93ead7abb9cad7fd58f91264b26e8ea79345973f93cfff2ecd6c9c2c4b176db58c3247b5ff diff --git a/media-gfx/graphicsmagick/graphicsmagick-1.3.43-r1.ebuild b/media-gfx/graphicsmagick/graphicsmagick-1.3.43-r1.ebuild index d2081138e3dd..1100b2cca2fb 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 ~ia64 ~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/graphviz/Manifest b/media-gfx/graphviz/Manifest index e3d265973d70..cd23ad259012 100644 --- a/media-gfx/graphviz/Manifest +++ b/media-gfx/graphviz/Manifest @@ -1,7 +1,7 @@ -DIST graphviz-10.0.1.tar.xz 21297808 BLAKE2B f420e6ca01720e6e1ecd9d4330b10659e8a4069e94b0d97fdbcda91d73e9cc679a3d351a5eeb9f86f67eb907eb5d4caf932de79318bb38712a3107ddab14bf08 SHA512 5e6a195357d38aa93fbd231c854b25e4ae4b0efd011de1e37550bc77b2137c98d72fdf7b0df0e8f3e9ba70849461e85cbd591b0064eccfc8788fcf532b7ae2c1 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-10.0.1.ebuild 6306 BLAKE2B 73b4f45edd181a08546598a2dceeaa180d2093b9b8ecb999ae31d360fad8b3aa5c097f0c01530085094d581fa92034d69644884c3f3b9f1105d9548bdfcfbeef SHA512 f30c9adf6e7159293eb3ddaef0aed8cce60cfc7c96cd1d8b53f25a5df542814a997149c91dc67cc3cfdb34e0d72d7bb63ec5e97d3b83819a1bbb1b53b443e4f8 -EBUILD graphviz-11.0.0.ebuild 6306 BLAKE2B 73b4f45edd181a08546598a2dceeaa180d2093b9b8ecb999ae31d360fad8b3aa5c097f0c01530085094d581fa92034d69644884c3f3b9f1105d9548bdfcfbeef SHA512 f30c9adf6e7159293eb3ddaef0aed8cce60cfc7c96cd1d8b53f25a5df542814a997149c91dc67cc3cfdb34e0d72d7bb63ec5e97d3b83819a1bbb1b53b443e4f8 +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 MISC metadata.xml 2309 BLAKE2B 261f100c9c78cf3bb50ffd84260594d34fa5af75f0b3789ce5640e0d633494405e64b3e9f7524e35ef87d11164c501e21fcef2cc483f60ad6ad2e350f500e3b2 SHA512 1a29d11154b72af3deeb0202136926f0871797086ce1a5a4d1fc71822e86d0e76ff789c684fabad85fac1abd5f29913a555be0916f42b90f5ce62fa395e1cbba diff --git a/media-gfx/graphviz/graphviz-11.0.0.ebuild b/media-gfx/graphviz/graphviz-11.0.0.ebuild index be0c1a91e64f..40f75c59e1ce 100644 --- a/media-gfx/graphviz/graphviz-11.0.0.ebuild +++ b/media-gfx/graphviz/graphviz-11.0.0.ebuild @@ -14,7 +14,7 @@ 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 ~ia64 ~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=" diff --git a/media-gfx/graphviz/graphviz-10.0.1.ebuild b/media-gfx/graphviz/graphviz-12.0.0.ebuild index be0c1a91e64f..3b42788dde34 100644 --- a/media-gfx/graphviz/graphviz-10.0.1.ebuild +++ b/media-gfx/graphviz/graphviz-12.0.0.ebuild @@ -3,7 +3,7 @@ EAPI=8 -PYTHON_COMPAT=( python3_{10..12} ) +PYTHON_COMPAT=( python3_{10..13} ) inherit libtool python-single-r1 DESCRIPTION="Open Source Graph Visualization Software" diff --git a/media-gfx/krita/Manifest b/media-gfx/krita/Manifest index c4158c97a6f4..3dc950850fe8 100644 --- a/media-gfx/krita/Manifest +++ b/media-gfx/krita/Manifest @@ -3,7 +3,12 @@ AUX krita-5.1.5-libjxl-0.9.patch 4162 BLAKE2B 410bf2fe6ce56771a0d2ae9fcbdeae2eb3 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.2-libjxl-0.9.patch 5557 BLAKE2B a901ad73bbc76be839fa5463662d5b99df41c101299cf12b5fd0956ba3901473adeb7da477c2f1e36fc5af5491e0f063f41bbaa9d90c7d772a37ec18e99e836e SHA512 b4932c1d9c6136203d8cff92a7ed65089cf5b6bd3f80ccf093d524d39fd3ddac408793fb7ae3287ce78d5574c34440bc849a5a90b618c39638854ea6f5fd3205 +AUX krita-5.2.3-tests-optional.patch 2807 BLAKE2B 7d0c0d26ce0cb1bf86f7933e8510bb5ea1e98986b811641874b4db6f622e5a31bf9b9c3b7e12267bf54f2d57d56459211df3e004dbc261e0d519f69d190e2149 SHA512 021d6d8fa1b976091088b317f54cf0be66f73b0dd9031497abc3101e4e43b69a0d4b5302e004b3ec81193bfecc0066cc4563a50b15e2c30109d3a57bafe23ca5 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 -MISC metadata.xml 647 BLAKE2B 38b83c96bc3e88c491faccb089e507ca5a9455a91dc9615994152d1e95ae00a0f82b8b6f3f959e20ff7af3907326996be6849abe0bcd8cfe666912b9e68d3584 SHA512 477562e4be9a68b7eb45520da3d709f39fbe7bff9ca936e61bd0aa80b157672566875d604ed926b646a7f60c7695e4915f63a526e762be79070f30728af4db40 +EBUILD krita-5.2.3.ebuild 3726 BLAKE2B ee26a096e5f01020b23159e4707c8e022ad67588e09ccb31ba358fc189ad47052c98b1ace1bbe28687bcdcebbd8e1f6edede43de3275b644d066bf9768094a1c SHA512 a2d75c8c01ca7a6f1887f0106c6a6ccebc71574bcc02d3c3f96654c57394b128d3f27c63743f3f5b5bd60faddf40263c0b1eb7f47e25e0587e7d193dc83dffcf +MISC metadata.xml 832 BLAKE2B 53e632c3407b42c5d0f165bdcf67dfdd3a30bf1ec3c19ea79b90323ccbe5415e7cd34fbc79ebbb0e513359f28f381e3dac5d2534daf9ae7696f83ea77acb8130 SHA512 6cb02292d63602c80451759f6b935f65c9dfc2f01b32ac540d8cd4422ab2a70e04261fabc67b570c60e116f03e34d0165c8db6dcf9595db6cfa10849d8066336 diff --git a/media-gfx/krita/files/krita-5.2.2-fftw.patch b/media-gfx/krita/files/krita-5.2.2-fftw.patch new file mode 100644 index 000000000000..b805be6a21c6 --- /dev/null +++ b/media-gfx/krita/files/krita-5.2.2-fftw.patch @@ -0,0 +1,18 @@ +Disable the cmake find_package method. It will instead fallback to use pkgconfig. +Without this, it will fail to find fftw3 and error out. + +--- a/cmake/modules/FindFFTW3.cmake 2023-11-24 19:59:45.904059240 +0100 ++++ b/cmake/modules/FindFFTW3.cmake 2023-11-24 20:00:17.029563107 +0100 +@@ -74,9 +74,9 @@ + endforeach() + mark_as_advanced(PKG_FFTW_CONFIG_DIR) + +-find_package(FFTW3 QUIET NO_MODULE +- HINTS ${PKG_FFTW_CONFIG_DIR} /usr/lib/cmake/fftw3 /usr/local/lib/cmake/fftw3 +-) ++#find_package(FFTW3 QUIET NO_MODULE ++# HINTS ${PKG_FFTW_CONFIG_DIR} /usr/lib/cmake/fftw3 /usr/local/lib/cmake/fftw3 ++#) + mark_as_advanced(FFTW3_DIR) + + # if we found the FFTW3 CMake package then we can start diff --git a/media-gfx/krita/files/krita-5.2.2-libjxl-0.9.patch b/media-gfx/krita/files/krita-5.2.2-libjxl-0.9.patch new file mode 100644 index 000000000000..83caf604bf70 --- /dev/null +++ b/media-gfx/krita/files/krita-5.2.2-libjxl-0.9.patch @@ -0,0 +1,93 @@ +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()))) { +@@ -657,7 +666,9 @@ JPEGXLImport::convert(KisDocument *document, QIODevice *io, KisPropertiesConfigu + if (!d.m_info.uses_original_profile) { + if (JXL_DEC_SUCCESS + != JxlDecoderGetICCProfileSize(dec.get(), ++#if JPEGXL_NUMERIC_VERSION < JPEGXL_COMPUTE_NUMERIC_VERSION(0,9,0) + nullptr, ++#endif + JXL_COLOR_PROFILE_TARGET_ORIGINAL, + &iccTargetSize)) { + errFile << "ICC profile size retrieval failed"; +@@ -667,7 +678,9 @@ JPEGXLImport::convert(KisDocument *document, QIODevice *io, KisPropertiesConfigu + iccTargetProfile.resize(static_cast<int>(iccTargetSize)); + if (JXL_DEC_SUCCESS + != JxlDecoderGetColorAsICCProfile(dec.get(), ++#if JPEGXL_NUMERIC_VERSION < JPEGXL_COMPUTE_NUMERIC_VERSION(0,9,0) + nullptr, ++#endif + JXL_COLOR_PROFILE_TARGET_ORIGINAL, + reinterpret_cast<uint8_t *>(iccTargetProfile.data()), + static_cast<size_t>(iccTargetProfile.size()))) { +-- +GitLab + diff --git a/media-gfx/krita/files/krita-5.2.3-tests-optional.patch b/media-gfx/krita/files/krita-5.2.3-tests-optional.patch new file mode 100644 index 000000000000..48d9e314a295 --- /dev/null +++ b/media-gfx/krita/files/krita-5.2.3-tests-optional.patch @@ -0,0 +1,90 @@ +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() +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -1246,7 +1246,9 @@ + ${CMAKE_CURRENT_BINARY_DIR} + ) + ++if(BUILD_TESTING) + add_subdirectory(sdk/tests) ++endif() + + add_subdirectory(libs) + add_subdirectory(plugins) diff --git a/media-gfx/krita/krita-5.2.3.ebuild b/media-gfx/krita/krita-5.2.3.ebuild new file mode 100644 index 000000000000..c95734e0ad9a --- /dev/null +++ b/media-gfx/krita/krita-5.2.3.ebuild @@ -0,0 +1,134 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +ECM_TEST="forceoptional" +PYTHON_COMPAT=( python3_{10..12} ) +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" +fi + +DESCRIPTION="Free digital painting application. Digital Painting, Creative Freedom!" +HOMEPAGE="https://apps.kde.org/krita/ https://krita.org/en/" + +LICENSE="GPL-3" +SLOT="5" +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 +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/sip:=[${PYTHON_USEDEP}] + ') + >=dev-qt/qtconcurrent-${QTMIN}:5 + >=dev-qt/qtdbus-${QTMIN}:5 + >=dev-qt/qtdeclarative-${QTMIN}:5 + >=dev-qt/qtgui-${QTMIN}:5=[-gles2-only] + >=dev-qt/qtnetwork-${QTMIN}:5 + >=dev-qt/qtprintsupport-${QTMIN}:5 + >=dev-qt/qtsql-${QTMIN}:5 + >=dev-qt/qtsvg-${QTMIN}:5 + >=dev-qt/qtwidgets-${QTMIN}:5 + >=dev-qt/qtx11extras-${QTMIN}:5 + >=dev-qt/qtxml-${QTMIN}:5 + >=kde-frameworks/kcompletion-${KFMIN}:5 + >=kde-frameworks/kconfig-${KFMIN}:5 + >=kde-frameworks/kcoreaddons-${KFMIN}:5 + >=kde-frameworks/kcrash-${KFMIN}:5 + >=kde-frameworks/kguiaddons-${KFMIN}:5 + >=kde-frameworks/ki18n-${KFMIN}:5 + >=kde-frameworks/kiconthemes-${KFMIN}:5 + >=kde-frameworks/kitemmodels-${KFMIN}:5 + >=kde-frameworks/kitemviews-${KFMIN}:5 + >=kde-frameworks/kwidgetsaddons-${KFMIN}:5 + >=kde-frameworks/kwindowsystem-${KFMIN}:5 + >=kde-frameworks/kxmlgui-${KFMIN}:5 + media-gfx/exiv2:= + media-libs/lcms + media-libs/libjpeg-turbo:= + media-libs/libpng:= + media-libs/tiff:= + sys-libs/zlib + virtual/opengl + x11-libs/libX11 + x11-libs/libXi + color-management? ( >=media-libs/opencolorio-2.0.0 ) + 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] ) + 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 +" +BDEPEND=" + dev-cpp/eigen:3 + dev-lang/perl + sys-devel/gettext +" + +PATCHES=( + # downstream + "${FILESDIR}"/${P}-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 +) + +pkg_setup() { + python-single-r1_pkg_setup + ecm_pkg_setup +} + +src_configure() { + # Prevent sandbox violation from FindPyQt5.py module + # See Gentoo-bug 655918 + addpredict /dev/dri + + local mycmakeargs=( + -DENABLE_UPDATERS=OFF + -DKRITA_ENABLE_PCH=OFF # big mess. + -DCMAKE_DISABLE_FIND_PACKAGE_KSeExpr=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 raw KF5KDcraw) + $(cmake_use_find_package webp WebP) + $(cmake_use_find_package xsimd xsimd) + ) + + ecm_src_configure +} diff --git a/media-gfx/krita/metadata.xml b/media-gfx/krita/metadata.xml index ff6c095b3acd..c586507e3736 100644 --- a/media-gfx/krita/metadata.xml +++ b/media-gfx/krita/metadata.xml @@ -10,7 +10,9 @@ </upstream> <use> <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/libbgcode/Manifest b/media-gfx/libbgcode/Manifest index 213df9933b69..a4d0530e2ff9 100644 --- a/media-gfx/libbgcode/Manifest +++ b/media-gfx/libbgcode/Manifest @@ -1,3 +1,5 @@ DIST libbgcode-0.0.20240328.tar.gz 456463 BLAKE2B 7b9995e94d8f5081723ef435ef9bfe5ca75fbd09d2a8f5e6ff786fb5c4c9d6079a7f5a0b0d537b3b8a044c7126258e31ac411ef6a5aff287bf490672257506ee SHA512 13d5fe20b1faee5068a3c385041a680de5cdcec7fc34bc3f28c52bdab4d6b9e6170ad5ce5bb78399e956fc7f3fb5409e8e4adf0ff4850be686b3caf4d76ee3aa +DIST libbgcode-0.0.20240704.tar.gz 456516 BLAKE2B 26f0a6f01a937da0fc4e4a4db715759967eb235f004daa9140841d7b0040a04dc86627c07265f5eb0cb7b34a9c6b43ec97ee1c59b53319ab95a9f3cb965fe906 SHA512 ed45cad28b15f5ac4b2cc340159f591c2cfb2560e8fa96f67bb122a2f7337a2fd67e632550fae8c07b36aad523ebe91334776f132291c4f84ff63d0f4a3b583e EBUILD libbgcode-0.0.20240328.ebuild 769 BLAKE2B 0e7a698bbfac9e3a287f95b641d914145f27d1b84493ff06221d2b3046f806b6386d4ebf9e4bd9b801feb8739415540de2aed3faef782e8a0b9a7f0344a8b271 SHA512 73f09470c2a97f46f98c7b79aecc0de7429ca6de8233a7d55843eaec03ca8faa66b111fbaab356617971153f9f25eb140d01b18bdaf1c5258e6e93c0250fd69f +EBUILD libbgcode-0.0.20240704.ebuild 770 BLAKE2B c74aaf15b8ece96e9f49224d5e4c792c877007eafaa7ab4cdf10a8513d61bf4e14dcd55d92a40e81ee41b488a38d6dcd2adb718acf2cc3da34fcd414b0b24822 SHA512 c50a463e08c9f1ddbac04c13166f0f7d72c782e588d5e8a1296cfa3140bc8f21ebda708f22ac910b8b05b38a6c2bfeaa6ab9217aba8722a6a19fa2f469cf2b22 MISC metadata.xml 517 BLAKE2B f13be19479e8ade30b867081f8014821be2c5650b407890268e6cab65330bd4b8e3ab37e6cba531f029ebb0499d0cb7269ccb17b309b15105f6bb6aa94b5c42e SHA512 0d09893294fc40e9b52bbdf7f8f31e075c1e8839fd90c2b9656b70d30ab52f088527ab2d1ffec797ecb1e309ea7d40bb48d571eafd19eb3a2592aef4e7c918c0 diff --git a/media-gfx/libbgcode/libbgcode-0.0.20240704.ebuild b/media-gfx/libbgcode/libbgcode-0.0.20240704.ebuild new file mode 100644 index 000000000000..8338365c1a3c --- /dev/null +++ b/media-gfx/libbgcode/libbgcode-0.0.20240704.ebuild @@ -0,0 +1,35 @@ +# Copyright 2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit cmake + +LIBBGCODE_COMMIT=dcb8f7b6d91f1d490022083be09a76dc2bc9c51f + +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/luminance-hdr/Manifest b/media-gfx/luminance-hdr/Manifest index 61069ad69216..dc8bd4cc900e 100644 --- a/media-gfx/luminance-hdr/Manifest +++ b/media-gfx/luminance-hdr/Manifest @@ -2,9 +2,10 @@ AUX luminance-hdr-2.5.1-openmp-automagic.patch 1574 BLAKE2B e8c289b8a66e258dd0ea 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-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-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 2304 BLAKE2B 0e1f052b2bb32f97a98db9acb7982e1a28de3ae6016d21f146b4f14e9edc8e5e6d494e131798045c0a20a356ae465d93790d2c36b5d1acee42e7a4ff7645c053 SHA512 0fcca4b2d8299300a47fd9220b4b16d79d018c7e4f9f27daffdafd13238d08bc4e439a90c641de430a2899ca8027d8c224f63fefcf3486eadce67aed5f20f6ee +EBUILD luminance-hdr-2.6.1.1-r1.ebuild 2350 BLAKE2B ea877fcf3d62fc025f8166953fe591c1c39fee79b935812e827f3ddea58019831be66acbbf533cfdd4ca59f646dc17e6016dac3d149601c6563d4d96f28aa7c3 SHA512 97414bb40510f16ea9e42a5699e2cf401318c9596f7af980ffffe0c55d8691b53e3c7e239047319b457bea28559f231ded02f14b38ff2eaeba63847b7d5293ae MISC metadata.xml 1272 BLAKE2B 08d1f2e217eaffcb4419532ed41ba963a971b343e2d0ff7f3718c9df23ac9ffd5299264d5a87b66451acd231965f135bdeebf3b91244e3d9e51763c818b317f9 SHA512 98f1fa351c3e0bc7e47b30263093408cbbebacf8e0eb23d780cd704f5ddfff3d6939aee4d18c06cd083d90dc8a68ea51995352ab1f15ce75b0585230a3f9cbc8 diff --git a/media-gfx/luminance-hdr/files/luminance-hdr-2.6.1.1-boost-1.85.patch b/media-gfx/luminance-hdr/files/luminance-hdr-2.6.1.1-boost-1.85.patch new file mode 100644 index 000000000000..7a49dc80b66b --- /dev/null +++ b/media-gfx/luminance-hdr/files/luminance-hdr-2.6.1.1-boost-1.85.patch @@ -0,0 +1,12 @@ +https://bugs.gentoo.org/932335 +https://github.com/LuminanceHDR/LuminanceHDR/issues/283#issuecomment-2132239165 +--- a/src/Libpfs/manip/resize.hxx ++++ b/src/Libpfs/manip/resize.hxx +@@ -23,6 +23,7 @@ + #define PFS_RESIZE_HXX + + #include <boost/math/constants/constants.hpp> ++#include <boost/numeric/conversion/bounds.hpp> + #include "copy.h" + #include "resize.h" + #include "../../sleef.c" 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-r1.ebuild index c3db9e692f75..654ceee61524 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-r1.ebuild @@ -52,6 +52,7 @@ PATCHES=( "${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 # patch by ArchLinux "${FILESDIR}"/${P}-exiv2-0.28.patch ) diff --git a/media-gfx/lximage-qt/Manifest b/media-gfx/lximage-qt/Manifest index e6092f7646f3..0154fd54ee51 100644 --- a/media-gfx/lximage-qt/Manifest +++ b/media-gfx/lximage-qt/Manifest @@ -1,5 +1,5 @@ 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 914 BLAKE2B 5a63c1dc748eb2a7cbb0f143d7710c07df632794f50343da73e558df0928a68a07e9bff4deaa798ed81ee741ae336911077c13ae0cd18f16fe6ad2327a6ee87d SHA512 17d2a8a62d31b6687c803f2a264bea688786ec22d143078421fda5777a234ef541cea3b88b59195b09527bc50a0d5c3d40cedccedc6954d1810cdf8585845ee6 +EBUILD lximage-qt-2.0.1.ebuild 928 BLAKE2B 22ca1180c15e25249c114f3ba5805ed51b01ee169893e8b558b04c594f6af50ecd22661a8f170b165d67efb8e02a994b6cf04dd06bfdacf78e3fcca2802fcf91 SHA512 76528689f8885efcef4321f311f0302d0a3b1d75764dd2315e363100a79291421181113c6d6942cf8044a057e3b896169fd4547724caa869032fa35dc0368009 MISC metadata.xml 317 BLAKE2B f63e3e91e5dc9fcc6113bf1ae9c9bb5680d2b7cf40359eaa058dcbc247f3b2f43f540ffa6525935220d52c3e8b94ee3629ce237c788c8e4f0946dddbf610680e SHA512 74c882b00f38c28d8546d31c59636252b2627053143a1bea3551c4bc507a63361c88bc555ea15760395f995c6d20dd6fe6adf65f11d42cc90ffd8378aae03f1f 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 5a929584236f..d369079f6c01 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" + KEYWORDS="~amd64 ~arm64 ~riscv" fi LICENSE="GPL-2 GPL-2+" diff --git a/media-gfx/mypaint/Manifest b/media-gfx/mypaint/Manifest index 99580fd41bd2..f5dfdcc70665 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 bd6e32a57a00297629e2e361c51bb2a3ce9c818bed7721dd9cdd4fb95d4293abdd920b126b9c48a7dd71f2fa94d1570f53dd1a9297982c52b3cf745dd7bab91b SHA512 5813e65c1c4b020cc6c8afbb696024c05f0d90951dbc1bd0a60fbbcddee3d9d0db1b63a3fdd8e9521a9ebd00ff4be146e7b730b2bf4ee62473e1b181587d55d0 +EBUILD mypaint-2.0.1-r3.ebuild 1904 BLAKE2B a28d89927f8fff5bc64a6090f227b999d427b7a2947e3bede049d98f61142513b76b314f80edbb14c960b130e801da23c2a1af4f4f33edb63f9f311411121126 SHA512 c6968dc9f7812da07bc78138e5b4b53f764fc432127bc1d6ded38add7f60908f9ecace973ea02effe60d7e1cb51122bf07ec0b7bcce236b88b995be743187e76 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 3ddd273019c8..8f03d4e44e6c 100644 --- a/media-gfx/mypaint/mypaint-2.0.1-r3.ebuild +++ b/media-gfx/mypaint/mypaint-2.0.1-r3.ebuild @@ -3,7 +3,7 @@ EAPI=8 -PYTHON_COMPAT=( python3_{10..12} ) +PYTHON_COMPAT=( python3_{10..13} ) DISTUTILS_SINGLE_IMPL=1 inherit desktop distutils-r1 xdg diff --git a/media-gfx/povray/Manifest b/media-gfx/povray/Manifest index 046574d62c99..fdf8d3afc913 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-r4.ebuild 4737 BLAKE2B c3104d5e8d249015df73ce095270c237d16d82281d3d10d48bfcf2bdbd6dd6555437815307b802f40dc02209620386a5d0a23402e0cb92cebbdd2d4b4d2ca9ba SHA512 80242dce3f3c10a993ebec1b32b7e2eb7f2685a960e94c4ad04a6e2e81cb225e2916b6b6eac1f26e74b88da61f569cc784b876fa825d8aa99291a9bcc850a56d +EBUILD povray-3.7.0.0-r4.ebuild 4744 BLAKE2B 2ae377fe34abc461192a1a6f3f3bffa183bbd72b23c3e675f4dc33adadce5d1a5b07a48646c250f1c8bd9eba8d6a55806bb3cce74892c08c052cfc0842ec7c47 SHA512 1da454f9e9b59aa291dc898b4591a8814aaffac55bad3e9c5383a9760dec0f487ce3833e082107d12177f472eed95f82d90c417865e4789a09266ba3d6d23f5b MISC metadata.xml 410 BLAKE2B e2d166cc7ed5872c7e0bdcf69c7856bd8218b059e9b0444a68930216c423ef7c8922ad963cfc3dc56f0d997c1a6372a04058815eb2b36487d07dbc6752908e2d SHA512 c159e2c730bba95d7c65525d62af05bd5b9d873a519e734010a8e5bc597590147accfe02e23946f0349c0be31a10b3e578d035bc3ff8d11a11274c1957a834be diff --git a/media-gfx/povray/povray-3.7.0.0-r4.ebuild b/media-gfx/povray/povray-3.7.0.0-r4.ebuild index 8fbfdb6ab113..1192304ed3d6 100644 --- a/media-gfx/povray/povray-3.7.0.0-r4.ebuild +++ b/media-gfx/povray/povray-3.7.0.0-r4.ebuild @@ -21,7 +21,7 @@ SRC_URI="https://github.com/POV-Ray/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz LICENSE="AGPL-3" SLOT="0" -KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos" +KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~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/qrencode/Manifest b/media-gfx/qrencode/Manifest index bca909326cbc..c01fada63600 100644 --- a/media-gfx/qrencode/Manifest +++ b/media-gfx/qrencode/Manifest @@ -1,4 +1,3 @@ DIST qrencode-4.1.1.tar.bz2 461562 BLAKE2B ae3abb4a162518c0204d09c9df7434fb348e24c20e790a261841220b0a7165168137d5acbdbc53e40558724eac2e1e21786f11013f384b545d56a1c9caaff61d SHA512 981b3242c213e1b40ac88711912dd8c27ea11f3437d1a04b6b226499a6e991a8f0b3b10f818bcc104812192a1dac4ce05f16ecd847a50cb03d4859b84bad89b8 -EBUILD qrencode-4.1.1-r1.ebuild 1074 BLAKE2B 4b0c0dccffabce32d095705fc4e627b9b4ab021727db3849e3461912a73783b79b311b684cdcabad50cee47ede726d4b1a05b11fc5e9e07a520484d7be94f087 SHA512 6e5c75da2c5a17dd2a5ede6b98881ed5fcf2232a7dd0f578e9d11eb1697d6eaa0cb49708ac08915d04474986f513fa9f3e6fd301204a40d425b347f9a4b044e6 -EBUILD qrencode-4.1.1.ebuild 875 BLAKE2B 26e222237d7b18426ad57d67ddfbd8b0b76116f6607a06c6f7a639f34e2d2536994de7e4387b0c8987d208caf9869cbf1c5447be02267bacedf05d86ce9ca6b7 SHA512 05ab5537833fcb2529c56cb35369f1ff6b9dbdf513a48286cb30f07fe2d9d00426d66b1637123ceeb1efefe93698924fad0a77bcd196ea0a169019f7b79cb66d +EBUILD qrencode-4.1.1-r1.ebuild 1067 BLAKE2B fbdb2eb966edbad0ff1e73993cff9ec35dda18c83ba437a300616952cfc110f89d374fb5aeb02e55b811d3a7146cb63ed9da8c7fb24155f4c7b9cc675faefe26 SHA512 1aee33cd76f38a8e2438a59cf30caad557543d2eaff5feb64e430a466839db92b65aea89f248e511fff0206cee5c3969cdcad028632bbd181c1df5fcf8444746 MISC metadata.xml 440 BLAKE2B 9f73217513f5128180c5e50f29f3e55399b728446d55332b9f80ac5dde854ca052b8f0e882fedc5a3c26f2a013f594023d708ce741fdd2660abc2233ac50c22c SHA512 46951797c3472c850d0572c644a11ba513ae8769f4c5e70f55f7af4c838d13320e16e83dc34d1cd7460f8ae295fe53eba0480d8601d0685a46ae6a19de056c67 diff --git a/media-gfx/qrencode/qrencode-4.1.1-r1.ebuild b/media-gfx/qrencode/qrencode-4.1.1-r1.ebuild index 50397719faa4..6bf83b4101c3 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 ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~arm64-macos ~x64-macos" IUSE="png test" RESTRICT="!test? ( test )" diff --git a/media-gfx/qrencode/qrencode-4.1.1.ebuild b/media-gfx/qrencode/qrencode-4.1.1.ebuild deleted file mode 100644 index da06e19dcc0f..000000000000 --- a/media-gfx/qrencode/qrencode-4.1.1.ebuild +++ /dev/null @@ -1,40 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -DESCRIPTION="C library for encoding data in a QR Code symbol" -HOMEPAGE="https://fukuchi.org/works/qrencode/" -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" -IUSE="png test" -RESTRICT="!test? ( test )" - -RDEPEND=" - png? ( media-libs/libpng:0= )" -DEPEND="${RDEPEND} - virtual/pkgconfig" - -src_configure() { - local myconf=( - $(use_with png) - $(use_with test tests) - # TODO: figure out how to make SDL check fail as the SDL test - # program is not useful - ) - - econf "${myconf[@]}" -} - -src_test() { - cd tests || die - ./test_basic.sh || die -} - -src_install() { - default - find "${D}" -name '*.la' -delete || die -} diff --git a/media-gfx/scrot/Manifest b/media-gfx/scrot/Manifest index 56de8953e997..0c511318e1db 100644 --- a/media-gfx/scrot/Manifest +++ b/media-gfx/scrot/Manifest @@ -1,7 +1,7 @@ AUX scrot-1.7.bash-completion 2622 BLAKE2B febdade3f2b5cb094d9162e66d3b0d0b8ad72659e33ca9b6c55c4888ef3122c8f16430cc5f74d32367ea7a74905e3c8c49e9570d996c1324ffd9b72f42e9f534 SHA512 c0a6ac7347164e007eef219b567a554b5aac91c4afdc585d2ed299f46880a46343e3aef83ad8fe50e090ed8521ca241b7e3661a59511064a43164fbe366e1ebb DIST scrot-1.10.tar.bz2 156519 BLAKE2B ca1441823521d14559afe49ed36853bb5448cc5c2ee345ddb617324b63e8f599678cbdc94b862938017a62d2f5ceea3cae03f80e473e86cafc76dd34144d41bb SHA512 7a72b6d7ae350b0ec27b949934ff67cb8800f731f3dfc783bfdf66c4316b318118b8b46d98aca05543144b757c659791f4a9aeae43364277501238a405eda57d -DIST scrot-1.9.tar.bz2 158710 BLAKE2B d823c0875a260ee9741e1c9038fe743e69d0afa83220448857d109dd3ebad9977f07871b25c6a4a979efdf2abd246a2facec91c5b0af01c47307dc6266c801d3 SHA512 ace3bcb26ecebc5bb139a6e011a562287be8f676f21211b540dd937ab2d4487047d3565d0aec84e099bd2c5c9b037d9044924b031f930dc45a3040df399a3312 +DIST scrot-1.11.1.tar.bz2 158007 BLAKE2B e0c8f166444bfdfbed41a5588036b861973c90d057e302f7bd35cf9630a9f0311735977632ba068c1b3542baed251a3d682da7d8f56c114880a425b3056a0692 SHA512 6a6435c6e0562a367d895f2d1c7a03b050f6588a5843376c5e33a5b8ef1b0b684390530f8c61c340b3f0928caeefb95d9df1f8fe0b145768c336685b1c8d8deb EBUILD scrot-1.10.ebuild 1388 BLAKE2B e99af4ac52022803494f6ae62b004b8a3bb0c40c72300905908e759829ec222a3ce4c24213d3707e3e52664736df01ec120b0813363cd93ac7a25bd6db382042 SHA512 bef2cc2eba090e3a3b9549c7bd464784a1dc0c1ca7fd0b1b9b38de2a15407be66e6953859014ee15b292dec8b91ea37ce0e9c21b33c8a14256e5c32c2d23fa7b -EBUILD scrot-1.9.ebuild 1388 BLAKE2B e99af4ac52022803494f6ae62b004b8a3bb0c40c72300905908e759829ec222a3ce4c24213d3707e3e52664736df01ec120b0813363cd93ac7a25bd6db382042 SHA512 bef2cc2eba090e3a3b9549c7bd464784a1dc0c1ca7fd0b1b9b38de2a15407be66e6953859014ee15b292dec8b91ea37ce0e9c21b33c8a14256e5c32c2d23fa7b -EBUILD scrot-9999.ebuild 1395 BLAKE2B 7b42b90681e7bdb83ad6a5f649a4ebdd5abbf9a0c2375ca2a3ebca58f17b9c3be315401a0ed97db0b39796b8de15db60b8f82f835f2c42bc604f013588a53677 SHA512 4f14e20b0a6d94a2fcd4d1bdbc7be578e3a8860f5442facf8225abd43f1bc420b23ed600a22a34cc982ef9084ba14b94eb0c27598e2f70c6259df3502b6e8be3 +EBUILD scrot-1.11.1.ebuild 1406 BLAKE2B 0e905c915114d19fb62db734ecd30c0e98c442bd2e11535b7ba7f210d18d439cc6b108666ceb3c895cccd24960ec9ad50d2ac17585ce3596a1af2e8ce6a581ce SHA512 cea86dab25f83a013a209be9bb16bbadcfb0b5d50bd67d9eedd13a22ec40d824ef0462a0738464a35d164d684aba8a8d7a2b72edfa091db25632eaaa94df2381 +EBUILD scrot-9999.ebuild 1406 BLAKE2B 0e905c915114d19fb62db734ecd30c0e98c442bd2e11535b7ba7f210d18d439cc6b108666ceb3c895cccd24960ec9ad50d2ac17585ce3596a1af2e8ce6a581ce SHA512 cea86dab25f83a013a209be9bb16bbadcfb0b5d50bd67d9eedd13a22ec40d824ef0462a0738464a35d164d684aba8a8d7a2b72edfa091db25632eaaa94df2381 MISC metadata.xml 486 BLAKE2B 49d843df52a3129520dc7f99058e4632bd2bef1239ae14f4ff49e315bb5d11536a2f384845c87ad69e9dcd1ccd363009f4d9b4b5d862aca69d59e5f6490573c9 SHA512 56297474babfd15627050a5d5e4ac885dcd6a9f9d861e708877c280b23251680700e006d58edf384d412df56b97ffaa5dc8d55ab1dedd34a9e4d3af1ed63980f diff --git a/media-gfx/scrot/scrot-1.9.ebuild b/media-gfx/scrot/scrot-1.11.1.ebuild index 81c77df2463a..d383d2bfa6bc 100644 --- a/media-gfx/scrot/scrot-1.9.ebuild +++ b/media-gfx/scrot/scrot-1.11.1.ebuild @@ -3,16 +3,17 @@ EAPI=8 -inherit bash-completion-r1 +inherit shell-completion DESCRIPTION="Screen capture utility using imlib2 library" HOMEPAGE="https://github.com/resurrecting-open-source-projects/scrot" if [[ ${PV} == *9999* ]] ; then EGIT_REPO_URI="https://github.com/resurrecting-open-source-projects/${PN}" inherit autotools git-r3 + LIVE_BDEPEND="dev-build/autoconf-archive" else SRC_URI="https://github.com/resurrecting-open-source-projects/${PN}/releases/download/${PV}/${P}.tar.bz2" - KEYWORDS="~alpha amd64 arm arm64 ~hppa ppc ppc64 ~riscv sparc x86" + KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86" fi LICENSE="feh" @@ -34,15 +35,14 @@ RDEPEND=" DEPEND=" ${RDEPEND} x11-base/xorg-proto - elibc_musl? ( sys-libs/queue-standalone ) " BDEPEND=" - dev-build/autoconf-archive + ${LIVE_BDEPEND} virtual/pkgconfig " DOCS=( - AUTHORS ChangeLog README.md + AUTHORS ChangeLog README.md FAQ.md ) src_prepare() { @@ -54,5 +54,6 @@ src_prepare() { src_install() { default - newbashcomp "${FILESDIR}"/${PN}-1.7.bash-completion ${PN} + dozshcomp etc/zsh-completion/_scrot + dobashcomp etc/bash-completion/scrot } diff --git a/media-gfx/scrot/scrot-9999.ebuild b/media-gfx/scrot/scrot-9999.ebuild index 092a65896df9..d383d2bfa6bc 100644 --- a/media-gfx/scrot/scrot-9999.ebuild +++ b/media-gfx/scrot/scrot-9999.ebuild @@ -3,13 +3,14 @@ EAPI=8 -inherit bash-completion-r1 +inherit shell-completion DESCRIPTION="Screen capture utility using imlib2 library" HOMEPAGE="https://github.com/resurrecting-open-source-projects/scrot" if [[ ${PV} == *9999* ]] ; then EGIT_REPO_URI="https://github.com/resurrecting-open-source-projects/${PN}" inherit autotools git-r3 + LIVE_BDEPEND="dev-build/autoconf-archive" else SRC_URI="https://github.com/resurrecting-open-source-projects/${PN}/releases/download/${PV}/${P}.tar.bz2" KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86" @@ -34,15 +35,14 @@ RDEPEND=" DEPEND=" ${RDEPEND} x11-base/xorg-proto - elibc_musl? ( sys-libs/queue-standalone ) " BDEPEND=" - dev-build/autoconf-archive + ${LIVE_BDEPEND} virtual/pkgconfig " DOCS=( - AUTHORS ChangeLog README.md + AUTHORS ChangeLog README.md FAQ.md ) src_prepare() { @@ -54,5 +54,6 @@ src_prepare() { src_install() { default - newbashcomp "${FILESDIR}"/${PN}-1.7.bash-completion ${PN} + dozshcomp etc/zsh-completion/_scrot + dobashcomp etc/bash-completion/scrot } diff --git a/media-gfx/sfftobmp/Manifest b/media-gfx/sfftobmp/Manifest index 1a047d0003db..07f9da9ff87f 100644 --- a/media-gfx/sfftobmp/Manifest +++ b/media-gfx/sfftobmp/Manifest @@ -1,6 +1,7 @@ AUX sfftobmp-3.1.1-gcc44-and-boost-1_37.patch 749 BLAKE2B 3bd8d52ed467c188f8b0545dfbce8be3d7093c25ba7c9882701751a6eef18c9e43d9b83979669457ef337d857866754be750de44ffe0482880275a7f294751b2 SHA512 ad6c0bf2a2c0c44ab9f7fe0226137061561b943d59167f9de0adc6d1998d1a938166a2120b24c6499466a310736310a5e05be8b7d4575ea1121d99604fc56cdb AUX sfftobmp-3.1.2-Wformat.patch 342 BLAKE2B 1e6db3a432fce740f34f2cb2a3f3662f59c0fedd84e6b63a1cc58dbf2f5d9e48858ad0f1e25e0a9b2ef493eec4cdc8587cb24430026ad3c51190ddaf2213e8b3 SHA512 afde9e1a0acabe7d4fa51b6a533f09afe93deb5c8015c1cb322849feb543ccd45bf0639a61928c6c8641a741b348e119528ba1a03d6c201d12b4be98d49eb85e +AUX sfftobmp-3.1.2-boost-1.85.patch 2355 BLAKE2B cb299609f09b179ce7c2eb942aadcee739ce3ae52a64447a9eca156ae0171f7eeff0ee91a33f7f24e70c6ae1e7da3e27194f72f6182737478ec63e9a6489a088 SHA512 0fa1b2e8804f5387ee9d59bcb0acbf7c50f309ec47ce5e3acf6ddd5e137a2f656f59666e536a2fdcbe86d461168fcd39b19fe2dbb5133edd87ba48d18dd24c9e AUX sfftobmp-3.1.2-boost_fs3.patch 542 BLAKE2B 032a3f526407bb7e4c94176b914b8dfc298a250b468322561e6f0fa9b37578cd8872717080469eb147bd7fab2c9239d8a06ce9e2b937b87899355aa231e3a459 SHA512 1829c9cbfef93e9a019c2b92aa60e45c9f32498fba15ceac456ccd0fa6244e92aa8dc2b5ddff3cf56ad01e7e7111f0553807b4faa94c3d1ddeb2ab7328c8c915 DIST sfftobmp3_1_2_src.zip 121478 BLAKE2B fe5e09d358cfa75a45a05e780fcf8b3409ae9791882c8c4ab3fe99b078cade57a75751343c42a5d7764702ca32565e8c97d417e3c095c10a01b6fcd0f09f03b3 SHA512 3c460dcd60486954f792ecc8e864d109dabbae30b56a6ba4b3228a42dd489fd88793e4d93e2d032e6cd1c552bf5e217bc2afb3eae85a1a4e1db340f7761905b7 -EBUILD sfftobmp-3.1.2-r3.ebuild 852 BLAKE2B ea521dc8f61e934634dab4323a378949d799c8c35563d87fc5de3100f39f146e7de9f9fa571839ead68915e1d3bf884ceaa5a85102ed8c2a505a82cd82377fd5 SHA512 64cd26fb83e49291cc181c6ebea3135116a1e996feee4383cecec8a4067264e8f79ea375eadd6a7047f81dab9a2c0c25a604beb37628b877a2fa17e2703e0320 +EBUILD sfftobmp-3.1.2-r3.ebuild 808 BLAKE2B 7968c675c3396ca1fdfceea8b4cef90663fdc8a5650698e62deee53e6773966887001e3c6423f9d098dbd109efc348c20b03e4a16c99c0388c8602cb2a0575cb SHA512 d033ef1efcc7ae2d69ad2e68779f79114b8d1ee9b66f2b6f996baab95831430805b4d95454c7cdb6ad448d61daa77c9e8d38be3e7a6d25567d435817345771bc MISC metadata.xml 246 BLAKE2B 7c25526b9240c42e9e0b41a00848ca2311c8edf487c120d4bdb03b78e15f3e773c8437e037ee3000ad437d5d12b237b2fb09e6c151f0be7e1cbe06f448f07a70 SHA512 f0ff62e58d57dded6e30f61f7734cdc744f9a727a7e2435f225b38990217690713eb50dff49920235efa94547e9a6aab32ba5c3a599fd80689e0c4d841eaa043 diff --git a/media-gfx/sfftobmp/files/sfftobmp-3.1.2-boost-1.85.patch b/media-gfx/sfftobmp/files/sfftobmp-3.1.2-boost-1.85.patch new file mode 100644 index 000000000000..9fac13880922 --- /dev/null +++ b/media-gfx/sfftobmp/files/sfftobmp-3.1.2-boost-1.85.patch @@ -0,0 +1,63 @@ +https://www.boost.org/doc/libs/1_85_0/libs/filesystem/doc/deprecated.html +--- a/src/cmdline.cpp ++++ b/src/cmdline.cpp +@@ -41,7 +41,6 @@ + #include <iostream> + + #include <boost/filesystem/operations.hpp> +-#include <boost/filesystem/convenience.hpp> + + #include <tiff.h> + +--- a/src/main.cpp ++++ b/src/main.cpp +@@ -41,7 +41,6 @@ + + #include <boost/filesystem/path.hpp> + #include <boost/filesystem/operations.hpp> +-#include <boost/filesystem/convenience.hpp> + + extern "C" + { +@@ -172,10 +171,10 @@ int main( int argc, char *argv[] ) + if (pathOutFileName.string().length()) { + // A fixed name was given, so use it as a base name + outPath = pathOutFileName; +- std::string orgExt = fs::extension(outPath); ++ std::string orgExt = outPath.extension().string(); + if (nFileCountOut > 1) { + sprintf(acNumber, "_%03d", nPage+1); +- outPath = fs::change_extension(outPath, acNumber); ++ outPath.replace_extension(acNumber); + if (orgExt.length()) { + std::string strTemp = outPath.string(); + strTemp += orgExt; +@@ -184,15 +183,15 @@ int main( int argc, char *argv[] ) + } + } else { + // Otherwise construct output filename from input filename +- outPath = pathOutDirectory / pathInFileName.leaf(); ++ outPath = pathOutDirectory / pathInFileName.filename(); + if (nFileCountOut > 1) { + sprintf(acNumber, "_%03d", nPage+1); +- outPath = fs::change_extension(outPath, acNumber); ++ outPath.replace_extension(acNumber); + std::string strTemp = outPath.string(); + strTemp += pOut->GetExtension(); + outPath = fs::path(strTemp); + } else { +- outPath = fs::change_extension(outPath, pOut->GetExtension()); ++ outPath.replace_extension(pOut->GetExtension()); + } + } + if (!proc.doOverwrite() && !((nPage > 0) && (nFileCountOut == 1)) && fs::exists(outPath)) { +--- a/src/output.cpp ++++ b/src/output.cpp +@@ -42,7 +42,6 @@ + #include <iostream> + + #include <boost/filesystem/path.hpp> +-#include <boost/filesystem/convenience.hpp> + + #ifdef WIN32 + #include <io.h> diff --git a/media-gfx/sfftobmp/sfftobmp-3.1.2-r3.ebuild b/media-gfx/sfftobmp/sfftobmp-3.1.2-r3.ebuild index 236b6a7b496a..6b9a92e6cfc2 100644 --- a/media-gfx/sfftobmp/sfftobmp-3.1.2-r3.ebuild +++ b/media-gfx/sfftobmp/sfftobmp-3.1.2-r3.ebuild @@ -3,7 +3,7 @@ EAPI=8 -inherit autotools flag-o-matic +inherit autotools MY_P=${PN}${PV//./_} @@ -19,7 +19,8 @@ KEYWORDS="amd64 ~hppa ppc x86" RDEPEND=" dev-libs/boost:= media-libs/libjpeg-turbo:= - media-libs/tiff:=" + media-libs/tiff:= +" DEPEND="${RDEPEND}" BDEPEND="app-arch/unzip" @@ -27,6 +28,7 @@ PATCHES=( "${FILESDIR}"/${PN}-3.1.1-gcc44-and-boost-1_37.patch "${FILESDIR}"/${PN}-3.1.2-boost_fs3.patch "${FILESDIR}"/${PN}-3.1.2-Wformat.patch + "${FILESDIR}"/${PN}-3.1.2-boost-1.85.patch ) src_prepare() { @@ -34,11 +36,6 @@ src_prepare() { eautoreconf } -src_configure() { - append-cppflags -DBOOST_FILESYSTEM_VERSION=3 - default -} - src_install() { default dodoc doc/{changes,credits,readme} diff --git a/media-gfx/shotwell/Manifest b/media-gfx/shotwell/Manifest index 71ba9c18b91b..34c7499ad4c4 100644 --- a/media-gfx/shotwell/Manifest +++ b/media-gfx/shotwell/Manifest @@ -1,3 +1,5 @@ DIST shotwell-0.32.4.tar.xz 35335296 BLAKE2B 32be135643f165f32f315c332a4f0b34cd724285e7239eadbb250253b27ce97fb15d314f68a5392d88224a0b97f7f6ef8789c1f6c40051c26a25b9012e860b90 SHA512 516ab26d6620429175097886a1874d2eaf0513f6ef732bef5ee07ef8cd200028b34d98f4eb09b47a621f5313de42a5f415185d76853de478e0b5e0c4e89eea69 +DIST shotwell-0.32.7.tar.xz 35339216 BLAKE2B db87ee9c161f57dad638b47c37fb2737c95645e987e2bab81697895d9a28f14ab22b4669f218ea0baadfc0e1115f45fb9b094f546299083d83d2486fa1c15f98 SHA512 3cb9c9f2981ead8410f42680f6b4976d3b2efcfe7ded4d5217d28ebb8e5c968062a004ad3353affa13e94d996208ebf26c01f4beaf03a2ef6a1bc43960488d14 EBUILD shotwell-0.32.4.ebuild 2199 BLAKE2B 50ac5f6cd764cb515945ceb700230845bb200be64a7e7bb94f88847ae351238b1b0352b64b0886e92140471636987add46d3aeb81363ff541a0502884b7a2547 SHA512 86cff4865ca7f7305b58799049e085ea7a03ff93f0738fe33c98680d863c15e48df2425e550717905908659ec6a8e9d604d97c51bc58414def714dd9726a3fc2 +EBUILD shotwell-0.32.7.ebuild 2205 BLAKE2B b8fccde94ab5fc0b40d3cecf6bb889a505ce2f485864fbc9201a7242270369401b83f51228e9c91fe6750346813d2d16aaab1654a7c07705abae86580cc08c8e SHA512 ba4842cc36e539c84bfcd76c79dd7291cc573318fa579c83c797f55d43c28e954caa0be5840208fbf0dd3235d754a8001393f1f3dcf2434668163ee6b2742790 MISC metadata.xml 794 BLAKE2B c1eb4a08828db11ba473fe21036201d3b57c2fa36a2bd39b18e7671cf5e4c42b2b9e82956456a0376a60bfc982d9af106577075d936dba3c0cb73947da46f427 SHA512 2c65cdf3c6d5a953b52ad81e0a85d1c1465f5c38c3475e5c1408baea0b14a053255e97c0efc560059c77c51dbe98b72a90c6164fe575e68cba3eb04d4774f490 diff --git a/media-gfx/shotwell/shotwell-0.32.7.ebuild b/media-gfx/shotwell/shotwell-0.32.7.ebuild new file mode 100644 index 000000000000..3f297331f776 --- /dev/null +++ b/media-gfx/shotwell/shotwell-0.32.7.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] + 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/simple-scan/Manifest b/media-gfx/simple-scan/Manifest index ac7dc01a82a0..50e1a17cce1f 100644 --- a/media-gfx/simple-scan/Manifest +++ b/media-gfx/simple-scan/Manifest @@ -1,7 +1,4 @@ -AUX 40.0-add-control-optional-deps.patch 2713 BLAKE2B 594f076b9515697322711033a206eb6aa7ab8940c6d4ef5711af4bdaaa126b82738b2d300d97843a9c889c314d16873ea05ecb07e0c566e8a273289fc799f8aa SHA512 60bdf1653292f5e2b3ef435c35c81a5eb2963142ea14e2095c5c5673d776979053c65ef0e54f80b503489dcc6e93d1a2ab8d29711059c469ecebcb83ece5e42c AUX 46.0-add-control-optional-deps.patch 2715 BLAKE2B eb9e97a8bf052b218d414b1378ea075195a5d5222dd93227b445659a5edb2e2283b6934448c0bf13127cfb01b0298d22b259d9159353d95bdcfe80952da2465f SHA512 bad7f4e2722910fa8eec59c61b6fd2302cc6bd0bb31511fed619cb797c559c01a50dbf99a4981be2eda912be027d89d422e4ebc2ed5763cedd8981ebdbb0a257 -DIST simple-scan-44.0.tar.xz 1198824 BLAKE2B 2bc9ea19a99b02d6acdb21036558bd2d42751699a89d41ec4da3336c061ecc7ad249b34ab0b30c6a6fc162fb7f6538859d1c29b2c9a843f2c2a8785dadc8a086 SHA512 8543b687eafec4f2460efa446146b4fe3a0ad469e5dcc5fcd19a02484cbfac5bce80741b488217af44c580720a01577a8e78479a4d2e96307da3de9dcfa467c6 DIST simple-scan-46.0.tar.xz 1136672 BLAKE2B 0ee2dd5392ed1a888948183e9efbd8943287baad66dd45351cbbb32a9a4c17903415676b3e6e00203d8a3572e90397b51bc23ecec2ad6cfa6597a10ffdd5bcf4 SHA512 f7c4433536f59c71f066cdae51b0de1b0dcf9b8af00f3bedb4c1be281d09f9ce122666ed849bd88de8868042429f14bb7b01409f8a006360ce4285000fd30bdc -EBUILD simple-scan-44.0.ebuild 1371 BLAKE2B 73e325ad1d13050f6cb8994a651953f621371a11fa326ec90d4df661009819c0f28e61cbe02b3c00a9ba140d374950d78b4bb94b69e462ada1fe56dab236213d SHA512 60b1ecddb04e51f99888e7bd7cc93363054ede33e18a31975545707b1dd800ef77b147e97dfae565e7c39bf982910a025ba3af623f0040b35ff7c361be81855c -EBUILD simple-scan-46.0.ebuild 1378 BLAKE2B 3d4c893974986c6a5c81c1b7d0a5f03b36b199c96fc532b1f60db5c743bcefbe5ad4eb0daa638b5d07342e740f25396bca6bfe4d1551b4d9e06de226d5b6c399 SHA512 77abab3403d2a6d4c9532c75ec9565e193ff0a56fb138038ec182c0769a25cf8714ee63d86b7fa093aef4e35b94e1a3eca91e9119b42269aad1abd43eb468ccd +EBUILD simple-scan-46.0.ebuild 1380 BLAKE2B d421fe6684a3b908795357e14e85177a89bc03ab8a492b029e420a87237f0c6a1f76a468ab4cb0abad9564a0ecae578272b0110b53a8e912a19048fc90a00e3a SHA512 e20cca21c88fb21122d30cb96764a74df6c2d136f6bc9760ab01220b83e7db049d2693d10a9c482b4c862bf9bbcfa50511da759c2a27bb90fc6ff1bff1d0d156 MISC metadata.xml 646 BLAKE2B d894b0b617db9d06a787e5d1c4b8d44dd1bb7c528f1498e9ce6044b7a4e015857eb9e227257abfbdb05e628c18da4e194f3a87750969ebc2735e1715036c596a SHA512 596b4b58bbdc0c82db3f961fb21c65b2af83949195873e37f65f383d8be562e499816a76303f24d82499e4db0f4825e17c0472153f827cfd334167c23cc46df5 diff --git a/media-gfx/simple-scan/files/40.0-add-control-optional-deps.patch b/media-gfx/simple-scan/files/40.0-add-control-optional-deps.patch deleted file mode 100644 index 5ea8f56323fa..000000000000 --- a/media-gfx/simple-scan/files/40.0-add-control-optional-deps.patch +++ /dev/null @@ -1,82 +0,0 @@ -From a5f01beb41a81f483d90eb4dd785822a8615f65f Mon Sep 17 00:00:00 2001 -From: Gilles Dartiguelongue <eva@gentoo.org> -Date: Wed, 30 May 2018 08:44:18 +0200 -Subject: [PATCH] build: Add control for optional dependencies - ---- - meson.build | 18 ++++++++++++++---- - meson_options.txt | 3 +++ - src/meson.build | 12 ++++++++---- - 3 files changed, 25 insertions(+), 8 deletions(-) - create mode 100644 meson_options.txt - -diff --git a/meson.build b/meson.build -index 1e1522c..45d7ed7 100644 ---- a/meson.build -+++ b/meson.build -@@ -34,10 +34,20 @@ zlib_dep = dependency ('zlib') - cairo_dep = dependency ('cairo') - gdk_pixbuf_dep = dependency ('gdk-pixbuf-2.0') - gusb_dep = dependency ('gusb', version: '>= 0.2.7') --colord_dep = dependency ('colord', required: false) --packagekit_dep = dependency ('packagekit-glib2', version: '>= 1.1.5', required: false) --webp_dep = dependency ('libwebp', required: false) --webpmux_dep = dependency ('libwebpmux', required: false) -+ -+if get_option('colord') -+ colord_dep = dependency ('colord') -+endif -+ -+if get_option('packagekit') -+ packagekit_dep = dependency ('packagekit-glib2', version: '>= 1.1.5') -+endif -+ -+if get_option('webp') -+ webp_dep = dependency ('libwebp') -+ webpmux_dep = dependency ('libwebpmux') -+endif -+ - sane_dep = dependency ('sane-backends') - msgfmt = find_program ('msgfmt') - itstool = find_program ('itstool') -diff --git a/meson_options.txt b/meson_options.txt -new file mode 100644 -index 0000000..570ecdd ---- /dev/null -+++ b/meson_options.txt -@@ -0,0 +1,3 @@ -+option('colord', type: 'boolean', value: false) -+option('packagekit', type: 'boolean', value: false) -+option('webp', type: 'boolean', value: false) -diff --git a/src/meson.build b/src/meson.build -index 3f699eb..0c8965e 100644 ---- a/src/meson.build -+++ b/src/meson.build -@@ -1,16 +1,20 @@ - vala_args = [ '--pkg=posix', '--vapidir=' + meson.current_source_dir () ] - dependencies = [ glib_dep, gtk_dep, libhandy_dep, zlib_dep, cairo_dep, gdk_pixbuf_dep, gusb_dep, sane_dep ] --if colord_dep.found () -+if get_option('colord') - vala_args += [ '-D', 'HAVE_COLORD' ] - dependencies += colord_dep - endif --if packagekit_dep.found () -+if get_option('packagekit') - vala_args += [ '-D', 'HAVE_PACKAGEKIT' ] - dependencies += packagekit_dep - endif --if webp_dep.found () and (not colord_dep.found () or webpmux_dep.found ()) # Webpmux only required if colord -+if get_option('webp') - vala_args += [ '-D', 'HAVE_WEBP' ] -- dependencies += [ webp_dep, webpmux_dep ] -+ dependencies += [ webp_dep ] -+ # Webpmux only required if colord -+ if get_option('colord') -+ dependencies += [ webpmux_dep ] -+ endif - endif - - simple_scan = executable ('simple-scan', --- -2.26.3 - diff --git a/media-gfx/simple-scan/simple-scan-44.0.ebuild b/media-gfx/simple-scan/simple-scan-44.0.ebuild deleted file mode 100644 index 153058476d65..000000000000 --- a/media-gfx/simple-scan/simple-scan-44.0.ebuild +++ /dev/null @@ -1,71 +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 gnome.org gnome2-utils meson python-any-r1 vala xdg - -DESCRIPTION="Simple document scanning utility" -HOMEPAGE="https://gitlab.gnome.org/GNOME/simple-scan" - -LICENSE="GPL-3+" -SLOT="0" -KEYWORDS="amd64 ~arm ~arm64 ppc ppc64 ~riscv x86" -IUSE="colord webp" - -DEPEND=" - >=dev-libs/glib-2.38:2 - >=x11-libs/gtk+-3.24:3 - >=gui-libs/libhandy-1.6.0:1 - >=sys-libs/zlib-1.2.3.1:= - x11-libs/cairo - x11-libs/gdk-pixbuf:2 - >=dev-libs/libgusb-0.2.7 - colord? ( >=x11-misc/colord-0.1.24:=[udev(+)] ) - webp? ( media-libs/libwebp:= ) - >=media-gfx/sane-backends-1.0.20 -" -RDEPEND="${DEPEND} - x11-misc/xdg-utils -" -BDEPEND=" - ${PYTHON_DEPS} - $(vala_depend) - dev-libs/libxml2:2 - dev-util/itstool - >=sys-devel/gettext-0.19.8 - virtual/pkgconfig - gui-libs/libhandy:1[vala] - dev-libs/libgusb[vala] - colord? ( x11-misc/colord[vala] ) -" - -PATCHES=( - # Add control for optional dependencies - "${FILESDIR}"/40.0-add-control-optional-deps.patch -) - -src_prepare() { - default - vala_setup - xdg_environment_reset -} - -src_configure() { - local emesonargs=( - $(meson_use colord) - -Dpackagekit=false - $(meson_use webp) - ) - meson_src_configure -} - -pkg_postinst() { - xdg_pkg_postinst - gnome2_schemas_update -} - -pkg_postrm() { - xdg_pkg_postrm - gnome2_schemas_update -} diff --git a/media-gfx/simple-scan/simple-scan-46.0.ebuild b/media-gfx/simple-scan/simple-scan-46.0.ebuild index 58f4ebe759f8..8476bab6e786 100644 --- a/media-gfx/simple-scan/simple-scan-46.0.ebuild +++ b/media-gfx/simple-scan/simple-scan-46.0.ebuild @@ -35,7 +35,7 @@ BDEPEND=" dev-util/itstool >=sys-devel/gettext-0.19.8 virtual/pkgconfig - gui-libs/libhandy:1[vala] + gui-libs/libadwaita:1[vala] dev-libs/libgusb[vala] colord? ( x11-misc/colord[vala] ) " diff --git a/media-gfx/skanpage/Manifest b/media-gfx/skanpage/Manifest index fbd2f76fc0fe..445525a3fe22 100644 --- a/media-gfx/skanpage/Manifest +++ b/media-gfx/skanpage/Manifest @@ -1,5 +1,5 @@ DIST skanpage-23.08.5.tar.xz 1317292 BLAKE2B 2ee8e7db4e08c9f6ecac93789b20fcb862f56da8d44d5540268dd71f5e1e79c93c7d67455c534f2b0a50f4f2f99bcfdc1989dfd6ecafb7bd3c5a7bc15ab8880d SHA512 d5ddd8a52ad42421d79a6817eb3430996a9d968b2f824ca3c5adaf9bef69c60f6270b72a9d87308834b79f3038b6347b242c8fa635fd8c28953533061e21d158 -DIST skanpage-24.05.1.tar.xz 1332020 BLAKE2B c32efa2a4dcdeaf0d92b39fc73a4e049a8af09912f47b30fdb37c2195691fafc3fbe87147ed3da7627502f3da93e9c93daff51866f0ee999b195d763558174e3 SHA512 873420e7358d18f5aaff72e584142b0683f846a52076c5fa3b49039d5fcb9af071fd9503952ba8c50c35da573b24aee1cf6c199173ef3789d25d553ee033e520 +DIST skanpage-24.05.2.tar.xz 1332884 BLAKE2B 11d66fec7f13a658d652ca2c70d7f46e50d6c965903573ecfd9ffb4d259c7dd4fc9d2155297c9ffff928ae3c22d67b5642f8c4a31852b1b3f582675bcbb8459b SHA512 aa5dcde24a72332986ca68fbb457097ba08fae04c186654094dbff2ebd0f9b22688370f8a87eed54f0e16265a42adb297d189856a276d8cf56227b90dd7c6ab8 EBUILD skanpage-23.08.5.ebuild 1383 BLAKE2B 2b2d5cf4582e9d1e4897b1aeb8c8c3b4fa91b753293eb8886c881bb150186a83df2946e8e278f102baf03005b7ae3c8edf9dd8cd7363545fbad33d3f80e04abc SHA512 c0fab6531ac492693bead97c2b231b2379490bb4de55bb05d4df4650599d15a9602521fe03f0afc1dd64b72ac2bdd362a492838bfb690e6adc57fe2a9321701b -EBUILD skanpage-24.05.1.ebuild 1240 BLAKE2B de3160f2919a1cca15501e081778afa8099102ae29725e1a987c2c8ee7afa30a15fb4bba40abe7597790d08e7c690e7b87ad001d2a7846c47deca77935942a07 SHA512 b82278254de3d8f0686fcc92fa07fee272300f2bf70fbc53fef6e04b55b5fcc1d905927ab1f706aedc789ee7560cbff2470a8b3b08ddbce3d44dbdfe4195fed2 +EBUILD skanpage-24.05.2.ebuild 1240 BLAKE2B de3160f2919a1cca15501e081778afa8099102ae29725e1a987c2c8ee7afa30a15fb4bba40abe7597790d08e7c690e7b87ad001d2a7846c47deca77935942a07 SHA512 b82278254de3d8f0686fcc92fa07fee272300f2bf70fbc53fef6e04b55b5fcc1d905927ab1f706aedc789ee7560cbff2470a8b3b08ddbce3d44dbdfe4195fed2 MISC metadata.xml 374 BLAKE2B 3666d82bcae95e5b38d777c81491cc25488aff6b55e112f6eebbaf80ef603d40e8287fe33d649e647c2f97b9caca237f2b9785ee49ff9c2f5c81576a2cf33379 SHA512 fcc360165d6fa100c9d92c2528f4f2ba291a0bf6b05a7b252b5bb215514144e9b699915f98d7aecda6869bf50bfbb51b42b3186679e5db2c3901cb4d6151e6e8 diff --git a/media-gfx/skanpage/skanpage-24.05.1.ebuild b/media-gfx/skanpage/skanpage-24.05.2.ebuild index 89428258adfb..89428258adfb 100644 --- a/media-gfx/skanpage/skanpage-24.05.1.ebuild +++ b/media-gfx/skanpage/skanpage-24.05.2.ebuild diff --git a/media-gfx/superslicer/Manifest b/media-gfx/superslicer/Manifest index 510268033bd0..4684099b27a4 100644 --- a/media-gfx/superslicer/Manifest +++ b/media-gfx/superslicer/Manifest @@ -1,11 +1,4 @@ -AUX superslicer-2.5.59.0-boost-1.81-std-wxString-to-std-wstring.patch 2581 BLAKE2B 8c2ec83db05e97949aa9fb43d3980748be1324cb2ac90c8caec45b772fb2bad34f56365381bb371d0094079b42065a65c00595388ec861e127b846e6859a0281 SHA512 6f454745d8f84dbcded092a1a16b2903757b36d76888a4c40e1f019f75ba6bea9b245c980347cc7feb0a9bdd22e8eb4e4b12e639594f1fe6e928eea5298081ec -AUX superslicer-2.5.59.0-boost.patch 9423 BLAKE2B 8e797ed961fe2c1c8f0b5e67b6aaee8efa17933cecd190b1623e7df4f2724edb4e1c6559a839c4dc1d3b67f8f9db080476640e48187a03ec0541114863cdffc6 SHA512 f72eb91230c0e3aa2254533e5377a6aedcd806529c0cf3795eee883d4b8aaf6c618c7f2e064e80de3f688bf9f2a97d913e72d0b1c227d64caa7585cad1c97a84 -AUX superslicer-2.5.59.0-cereal.patch 1974 BLAKE2B b28be995a1c258c1848ad78a00061c73ccb173da0f790573273123f8f1481131a75ec3fb84fd8cee26dc7cef750650c827b39b685343d9defd44edec48e698a6 SHA512 50510b349f43354da7a5712d662b94a0276081c9af28d04b8d63885ed0053b52522b686ecfffa45d0b197097ee7c08ea1c831f0995a337c44becd453c392a539 -AUX superslicer-2.5.59.0-dont-install-bundled-angelscript.patch 1671 BLAKE2B 211bbd88a3db29312bfd1b0a7fac23ade2fb1e38c99cd1c7125e2c5d5fda46adc2cb232345085783e37404c6fbc10cb831196b546ca3a76f4d59d8095f254f54 SHA512 a206103eac2969e68540d564149e843a24a16445b6157fc3409ff1c577657d35ef05493259e3fc3615d641eaad96832231aa969c53eaac87e11d1b365ffd99b1 -AUX superslicer-2.5.59.0-fix-gcodeviewer-symlink.patch 690 BLAKE2B 410f71260334643bf53c0095d59f1090d8c7619502a32e319a6beb3f23937edd7d1c07eeab0fa9d332b8151b32605c8711492bf66b43c2fd64c85e19e54edaef SHA512 122d52d1f43aaedeee8d0ce56c5daef22f904de03101669fb9a870c18d1ea73615c2ec37da3de65f1f8d2a7455517111f75aeaadd60f66c82edebf288bc4767f -AUX superslicer-2.5.59.0-missing-includes.patch 1225 BLAKE2B 0d9cfbd9dfaf6e066a4206ff7bfa88cfe92c96e102ac2105a4a4fb5288b15a878969bcd00719d89a917fd3216b42aaba3688b6ad8a6b597eeed58d4c6a26de05 SHA512 cee42f67820a0fb98f1bdbbdf160bafcfaf1d1f87dbf85dc73781e8911b4ee76697996bdc23b9acc2c502701053587ce3d9a71d301ccb2bf9ee27e010a8bd855 -AUX superslicer-2.5.59.0-openexr3.patch 2361 BLAKE2B d351d05190977e55047504d13ab4172c7eaf7fb2077a61a448dd29a8a27084ee4b13284143102b7ea3dff0edc8b20675dff0014e9f26cd5f448e50c04a1d6779 SHA512 840e51b8feb3568ff46d309ece063f7188018fcaa43d19ec50ede408fdf2c237a3b7eaa11ba24409d8c3f7d6f5fb270181508cc56e0b2b0fef68b766130ef1eb -AUX superslicer-2.5.59.0-wxgtk3-wayland.patch 489 BLAKE2B d801db8b71aff816c3703628beb2e90d06ec4d85b982cd137e005eb4542aae308140c21b3b6fb1c72c07dd3e90e38668d6c2a69df054bdd414c43b9f8fcea57f SHA512 495d8d62c8cdf4ff9a075366dbc2db5c80a1c99bcd23172db9cf64dd649d70acbca44182722a71d790feb84c9a67a81403d75ff33b77444a1251b1f45f7b4b9e +AUX superslicer-2.5.59.10-boost-1.85.patch 2693 BLAKE2B eb434eedc4b1188c1e8df875d8f57ba9f3c9a6ea88521f5707c47e16b23e7939b9382dc416d023293642a3e5af6317e51058adf691cd2201b92ea8f390b60ca8 SHA512 c94ef6475a3dd81bfbfe80f44b571094476b21725b496fe5b26d81d55aa987953f9c642c0275260f9f149d1a6b85addf5b750ff4a306d555c324304055a4375b 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 @@ -17,10 +10,17 @@ AUX superslicer-2.5.59.2-missing-includes-fix.patch 3042 BLAKE2B bc0d9e39abd204f AUX superslicer-2.5.59.2-openexr3.patch 2357 BLAKE2B 0d8c889817aaa7ddcdfd9ee434a668ce56b8c6906d61e73f118d8d37ef6a86d1315191956316e7d459629a9e60291ff86f0915bc5a877722ff99f8ce55af0351 SHA512 d3516333ce841b75c4da4f178e6e099b18fe64254484c286ad5b71d284407aa2e9cd4187b4c192b7ff3557170c0cee818d252b1c11e6b09263f9c2dc216e8aeb AUX superslicer-2.5.59.2-relax-OpenCASCADE-dep.patch 384 BLAKE2B 25be6671e091d04dca0896448786d90a36e4b6ae5c9b31c8a249aa226788f338f0e40c9a8f849e7a731ce0ba1e5e531dd314138d6c5295d64067cecd9e0be6de SHA512 57a42c6936b369ebadcefb91da32125d265a763f073d7e8d0209a87481c057066848799bac998a83ab4aacdbe4da01fa4d721794d982d52d2f5cda1df59d47b5 AUX superslicer-2.5.59.2-wxgtk3-wayland-fix.patch 485 BLAKE2B 4bd5634f39ba6132bb4216807fef254a88f07f5eb1162de12589c22b038c2876185a801ed481738d9fbbb04796952d304f17010fd61eb347213b649b13f3064d SHA512 4867192b069829ff0fd3d2bf86e2117979e505f4764223f7d0b874c15fad9cffca58d8e55a518a56cf156fee2187040115866a10e92aa903e87dc6ec909d0339 -DIST superslicer-2.5.59.0-profiles.tar.gz 15322406 BLAKE2B cfa89697e832e0601746cb21250e258617bcc0966dd111c82ae43a9720b3ffb760f57827a1f35c8ad57a23a7ffb4c78e48ec76d6e40b364f321d0f83c4d10939 SHA512 bbdc6bfa8e21a4bdbca903a367f033f9cb5a1966bd0688bcc81314ba9ee45fee37cb892c82be35e865137c4df7c1fabceb8e6de46316338df2af4a590de91c76 -DIST superslicer-2.5.59.0.tar.gz 45360646 BLAKE2B da65610270ed4c7d55b5bc495d9970812af94f424345088782b3a45b97fcf0f4b58bdc0417b89ed49e21d8c250535baa7cb74344f43438fbde8daf1b3acfacdd SHA512 1d2c0316c91bf0d65fb366806e9ea868bc93fae33deb580a324ce065fd3789ff1b600e9ace400db4988b371b1c36ef0c3ea2b52cde0d48984f312dd8d7ef3a1c +AUX superslicer-2.5.59.8-additional-imports-fixes.patch 3266 BLAKE2B 9016a6baa5c97681b0caadbffb6b2a890f9f69083ccf6201e9945ca1b3ff3aebb04b4eab1b94bc2f69b6e21d212281e0a2d0aeaa26b3fc3ecc0afbaa2db845f1 SHA512 8ae0692cd708cb14e268f10740629c9a69fad5ddce1d2c11bc73cccceb4ec91a5a9dc508deb78743828ea366ef8924e149306ce3674c55074b86800cc25c575a +AUX superslicer-2.5.59.8-boost-replace-load-string-file.patch 1753 BLAKE2B 009f44faffbe83ea15d029e4f36bfe0182c13df1bd80c4732f3f9460046c5ac38a77bf8a6294c70931aaab55f95ca554838a8f17b8983ccd7bc9e1e6553bff67 SHA512 5b61c2de780b645237e5fa9018667d94e90cde3f1d5a6c6c29db96bede7cfd023f8ca272f0172b859914b6bec0fe5b4e6013512fff1a54b7975f1b2a93a42ef6 +AUX superslicer-2.5.59.8-fix-compilation-error-gnu17.patch 812 BLAKE2B b9348bfc8ba5b9c63e269b453d39f3b56de7b1c62f5dd8ad376a6fb0abe7c520cb13c3befdd18521f4abfe4cb1eccae574f9d80ae355236733b8f0e683db5a95 SHA512 bbb36ed9572f2422c69be356b8f62531f4dabe0d9a731dff0697a0358d6bc4846dbe854c4e044ca06ba0ee6f87c2f80cb137ecf27f59d11cff829791376c9508 +AUX superslicer-2.5.59.8-libnest2d-link-xcb.patch 678 BLAKE2B 7e6328a9058206d325c77a73d7621dffe3a92c187e9d27d8173e2f0f77211fba3a87421f3827124cfe819649afbba4e5767df6636bd0b70c84f12e785e5879a9 SHA512 d6152f9465e752e0f88bd69c4cfe0b39cbd6df05f27df7b98b174bf8100b93f69feb7ba00086f67b4962a3a544bd91dcafa24679286318f9abe5609454c2eb43 +DIST superslicer-2.5.59.10-profiles.tar.gz 17933533 BLAKE2B d11e8660a9c04221ece8352695a78b302d0d934fca4cc26c17b44ba74d99271aa2f0088de4f36f718827f22073f5bdd90d1163c44d0fe0139b73e55929019ec8 SHA512 43dfe882fb52840abdcbc6c3c4441f7a02b2f21bfa986594e2c6399823508433a29d7372cdf28dab442ae831c0b89d1792e349944e797c899aaffeaf6b738ad6 +DIST superslicer-2.5.59.10.tar.gz 46034708 BLAKE2B 7d30b7e365d336725606f298b0b8ecbf56170e822c8d00a323d45bdf93ae399fb0a312e542ebde51642b7404820604338bd3606add60aad5c3e492e73ef5a28f SHA512 44f46a739f8e1769dd1883dd8ff88c6b3f0efbea2abcf9281cca22e48693ca8643a911c24325f0b8df7c66e3d32ad2e51854f09a67a4f2738ce0673c19485f1b DIST superslicer-2.5.59.2-profiles.tar.gz 16253775 BLAKE2B 20c99b14ba8ee26ea2a210962e78ea21928a5f32b1e799cbdbe60a3ef587ae1368efce885f5d253468ee9974af6a4419890e56d7df33761732bcefe8dbbc019e SHA512 c20ec66a95d5ec3e1e4fd8b1936bf1a4fc32fbad2c3d78774d5c2480be8a9dcacba5e561c57774a2c761d5189466083e7b6bd9b021a4ca7676e6a5e9676439d7 DIST superslicer-2.5.59.2.tar.gz 45622782 BLAKE2B ff2fecf233d2710d706b64eb2191bfac39df3f631634de5f9eb1bca6ca712e94b0283beb7c6e9f3b293dc308b50240871ef8651a5355a4d7c5ea6092ac1a836b SHA512 af8878bd8e0c3e0dd5247ce01bdbd2b42b6766d81efbde11b71c6642787a12dfeaea91e653ac928066b9610cd911ea1f4dc77cf4823639030b3c104d955b8cbd -EBUILD superslicer-2.5.59.0-r3.ebuild 2294 BLAKE2B f7bbe1b0cfeeaf1b95495b8cdbbc128786286a430d6d5908f8abca08c08788443ae274b2d181e63d67b5c65f9cb2e799681f5dd44ef912a63dcdb5420154941a SHA512 b8f7563a780dd62255abc62fb88df9a7fa0547fd0acbbc1c5b603f5236175027e0d6291f15d8d8dcf1a86e21a7bf26e1f54b2b04b57dc5add23c2e4c42cb8724 +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.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 MISC metadata.xml 413 BLAKE2B a43550366844e53b0ebed37197d33bf38efb555eee344f053f90e35e939263e3959301fdd072d5b6925d1e3e0d1fd629e2f459356e2f227006f8784a4364fc11 SHA512 8e1abc223f2e24cca551b08cbc37910f2a43319fce7299e52dd586dd6454c83e98e59b8d14c18613c8894fdca33d04297affa2da1f4aa001a5e200e4b5f2c331 diff --git a/media-gfx/superslicer/files/superslicer-2.5.59.0-boost-1.81-std-wxString-to-std-wstring.patch b/media-gfx/superslicer/files/superslicer-2.5.59.0-boost-1.81-std-wxString-to-std-wstring.patch deleted file mode 100644 index 1cb0d9f1afff..000000000000 --- a/media-gfx/superslicer/files/superslicer-2.5.59.0-boost-1.81-std-wxString-to-std-wstring.patch +++ /dev/null @@ -1,40 +0,0 @@ ---- a/src/slic3r/GUI/PrintHostDialogs.cpp 2022-12-21 10:21:43.583075853 +1100 -+++ b/src/slic3r/GUI/PrintHostDialogs.cpp 2022-12-21 10:23:03.902694287 +1100 -@@ -79,8 +79,8 @@ PrintHostSendDialog::PrintHostSendDialog - if (size_t extension_start = recent_path.find_last_of('.'); extension_start != std::string::npos) - m_valid_suffix = recent_path.substr(extension_start); - // .gcode suffix control -- auto validate_path = [this](const wxString &path) -> bool { -- if (! path.Lower().EndsWith(m_valid_suffix.Lower())) { -+ auto validate_path = [this](const std::wstring &path) -> bool { -+ if (! wxString(path).Lower().EndsWith(m_valid_suffix.Lower())) { - MessageDialog msg_wingow(this, wxString::Format(_L("Upload filename doesn't end with \"%s\". Do you wish to continue?"), m_valid_suffix), wxString(SLIC3R_APP_NAME), wxYES | wxNO); - if (msg_wingow.ShowModal() == wxID_NO) - return false; -@@ -90,7 +90,7 @@ PrintHostSendDialog::PrintHostSendDialog - - auto* btn_ok = add_button(wxID_OK, true, _L("Upload")); - btn_ok->Bind(wxEVT_BUTTON, [this, validate_path](wxCommandEvent&) { -- if (validate_path(txt_filename->GetValue())) { -+ if (validate_path(txt_filename->GetValue().ToStdWstring())) { - post_upload_action = PrintHostPostUploadAction::None; - EndDialog(wxID_OK); - } -@@ -100,7 +100,7 @@ PrintHostSendDialog::PrintHostSendDialog - if (post_actions.has(PrintHostPostUploadAction::StartPrint)) { - auto* btn_print = add_button(wxID_YES, false, _L("Upload and Print")); - btn_print->Bind(wxEVT_BUTTON, [this, validate_path](wxCommandEvent&) { -- if (validate_path(txt_filename->GetValue())) { -+ if (validate_path(txt_filename->GetValue().ToStdWstring())) { - post_upload_action = PrintHostPostUploadAction::StartPrint; - EndDialog(wxID_OK); - } -@@ -111,7 +111,7 @@ PrintHostSendDialog::PrintHostSendDialog - // Using wxID_MORE as a button identifier to be different from the other buttons, wxID_MORE has no other meaning here. - auto* btn_simulate = add_button(wxID_MORE, false, _L("Upload and Simulate")); - btn_simulate->Bind(wxEVT_BUTTON, [this, validate_path](wxCommandEvent&) { -- if (validate_path(txt_filename->GetValue())) { -+ if (validate_path(txt_filename->GetValue().ToStdWstring())) { - post_upload_action = PrintHostPostUploadAction::StartSimulation; - EndDialog(wxID_OK); - } diff --git a/media-gfx/superslicer/files/superslicer-2.5.59.0-boost.patch b/media-gfx/superslicer/files/superslicer-2.5.59.0-boost.patch deleted file mode 100644 index 4f847aaacb92..000000000000 --- a/media-gfx/superslicer/files/superslicer-2.5.59.0-boost.patch +++ /dev/null @@ -1,256 +0,0 @@ -diff --git a/src/hints/HintsToPot.cpp b/src/hints/HintsToPot.cpp -index 7c8029cde..4791f0612 100644 ---- a/src/hints/HintsToPot.cpp -+++ b/src/hints/HintsToPot.cpp -@@ -9,7 +9,7 @@ - - bool write_to_pot(boost::filesystem::path path, const std::vector<std::pair<std::string, std::string>>& data) - { -- boost::filesystem::ofstream file(std::move(path), std::ios_base::app); -+ boost::nowide::ofstream file(path.string(), std::ios_base::app); - for (const auto& element : data) - { - //Example of .pot element -diff --git a/src/libslic3r/AppConfig.cpp b/src/libslic3r/AppConfig.cpp -index f029b3d72..18dc7396e 100644 ---- a/src/libslic3r/AppConfig.cpp -+++ b/src/libslic3r/AppConfig.cpp -@@ -1,3 +1,4 @@ -+#include <boost/filesystem.hpp> - #include "libslic3r/libslic3r.h" - #include "libslic3r/Utils.hpp" - #include "AppConfig.hpp" -diff --git a/src/libslic3r/AppConfig.hpp b/src/libslic3r/AppConfig.hpp -index d811ddcc2..1a7023061 100644 ---- a/src/libslic3r/AppConfig.hpp -+++ b/src/libslic3r/AppConfig.hpp -@@ -5,6 +5,7 @@ - #include <map> - #include <string> - -+#include <boost/filesystem/path.hpp> - #include <boost/algorithm/string/trim_all.hpp> - - #include "libslic3r/Config.hpp" -diff --git a/src/libslic3r/LocalesUtils.cpp b/src/libslic3r/LocalesUtils.cpp -index 5bf520568..7b870520b 100644 ---- a/src/libslic3r/LocalesUtils.cpp -+++ b/src/libslic3r/LocalesUtils.cpp -@@ -1,3 +1,4 @@ -+#include <boost/lexical_cast.hpp> - #include "LocalesUtils.hpp" - - #ifdef _WIN32 -diff --git a/src/libslic3r/Preset.cpp b/src/libslic3r/Preset.cpp -index 9e9fcda4f..d889e2abf 100644 ---- a/src/libslic3r/Preset.cpp -+++ b/src/libslic3r/Preset.cpp -@@ -84,7 +84,7 @@ ConfigFileType guess_config_file_type(const ptree &tree) - VendorProfile VendorProfile::from_ini(const boost::filesystem::path &path, bool load_all) - { - ptree tree; -- boost::filesystem::ifstream ifs(path); -+ boost::nowide::ifstream ifs(path.string()); - boost::property_tree::read_ini(ifs, tree); - return VendorProfile::from_ini(tree, path, load_all); - } -diff --git a/src/libslic3r/Utils.hpp b/src/libslic3r/Utils.hpp -index f525c9837..839f0f5e9 100644 ---- a/src/libslic3r/Utils.hpp -+++ b/src/libslic3r/Utils.hpp -@@ -7,6 +7,7 @@ - #include <type_traits> - #include <system_error> - -+#include <boost/filesystem.hpp> - #include <boost/system/error_code.hpp> - - #include "libslic3r.h" -diff --git a/src/slic3r/GUI/CreateMMUTiledCanvas.cpp b/src/slic3r/GUI/CreateMMUTiledCanvas.cpp -index 89212f27f..be157eafa 100644 ---- a/src/slic3r/GUI/CreateMMUTiledCanvas.cpp -+++ b/src/slic3r/GUI/CreateMMUTiledCanvas.cpp -@@ -18,6 +18,11 @@ - #include <wx/notebook.h> - #include "Notebook.hpp" - -+#include <boost/filesystem.hpp> -+#include <boost/property_tree/ptree.hpp> -+#include <boost/property_tree/ini_parser.hpp> -+#include <boost/log/trivial.hpp> -+ - #include "MainFrame.hpp" - #include "wxExtensions.hpp" - -diff --git a/src/slic3r/GUI/DesktopIntegrationDialog.cpp b/src/slic3r/GUI/DesktopIntegrationDialog.cpp -index fcb7472e6..866ebaef5 100644 ---- a/src/slic3r/GUI/DesktopIntegrationDialog.cpp -+++ b/src/slic3r/GUI/DesktopIntegrationDialog.cpp -@@ -14,6 +14,7 @@ - #include <boost/log/trivial.hpp> - #include <boost/dll/runtime_symbol_info.hpp> - #include <boost/algorithm/string/replace.hpp> -+#include <boost/nowide/fstream.hpp> - - #include <wx/filename.h> - #include <wx/stattext.h> -@@ -503,4 +504,4 @@ DesktopIntegrationDialog::~DesktopIntegrationDialog() - - } // namespace GUI - } // namespace Slic3r --#endif // __linux__ -\ No newline at end of file -+#endif // __linux__ -diff --git a/src/slic3r/GUI/FreeCADDialog.cpp b/src/slic3r/GUI/FreeCADDialog.cpp -index 271e3ef2d..6bbdf3907 100644 ---- a/src/slic3r/GUI/FreeCADDialog.cpp -+++ b/src/slic3r/GUI/FreeCADDialog.cpp -@@ -38,6 +38,7 @@ - #include <boost/log/trivial.hpp> - #include <boost/property_tree/ptree.hpp> - #include <boost/property_tree/json_parser.hpp> -+#include <boost/nowide/fstream.hpp> - - // hack for process.hpp : it uses pid_t to set it as alias of int, but vc_x64_lib (wx thingy) as a '#define pid_t int' - // and so boost/process has a line 'typedef int int'instead of 'typedef int pid_t' that makes it crash -@@ -322,7 +323,7 @@ bool FreeCADDialog::load_text_from_file(const boost::filesystem::path &path) { - try { - std::locale loc = boost::locale::generator()("en_US.UTF-8"); - // Open the stream to 'lock' the file. -- boost::filesystem::ifstream in; -+ boost::nowide::ifstream in; - in.imbue(loc); - in.open(path); - // Obtain the size of the file. -@@ -369,7 +370,7 @@ bool FreeCADDialog::write_text_in_file(const wxString &towrite, const boost::fil - boost::filesystem::create_directories(file.parent_path()); - std::locale loc = boost::locale::generator()("en_US.UTF-8"); - // Open the stream to 'lock' the file. -- boost::filesystem::ofstream out; -+ boost::nowide::ofstream out; - out.imbue(loc); - out.open(file); - out << towrite; -diff --git a/src/slic3r/GUI/GUI_App.cpp b/src/slic3r/GUI/GUI_App.cpp -index 4cf21a36c..75b2a8e94 100644 ---- a/src/slic3r/GUI/GUI_App.cpp -+++ b/src/slic3r/GUI/GUI_App.cpp -@@ -19,6 +19,7 @@ - #include <boost/lexical_cast.hpp> - #include <boost/log/trivial.hpp> - #include <boost/nowide/convert.hpp> -+#include <boost/nowide/fstream.hpp> - - #include <wx/stdpaths.h> - #include <wx/imagpng.h> -diff --git a/src/slic3r/GUI/HintNotification.cpp b/src/slic3r/GUI/HintNotification.cpp -index 32916303f..3a984bf38 100644 ---- a/src/slic3r/GUI/HintNotification.cpp -+++ b/src/slic3r/GUI/HintNotification.cpp -@@ -14,12 +14,14 @@ - #include "libslic3r/Config.hpp" - #include "libslic3r/PrintConfig.hpp" - -+#include <map> -+ - #include <boost/algorithm/string/replace.hpp> - #include <boost/filesystem.hpp> - #include <boost/nowide/fstream.hpp> - #include <boost/log/trivial.hpp> - #include <boost/property_tree/ini_parser.hpp> --#include <map> -+ - #include <cereal/archives/binary.hpp> - #include <cereal/types/string.hpp> - #include <cereal/types/vector.hpp> -@@ -65,7 +67,7 @@ inline void push_style_color(ImGuiCol idx, const ImVec4& col, bool fading_out, f - - void write_used_binary(const std::vector<std::string>& ids) - { -- boost::filesystem::ofstream file((boost::filesystem::path(data_dir()) / "cache" / "hints.cereal"), std::ios::binary); -+ boost::nowide::ofstream file((boost::filesystem::path(data_dir()) / "cache" / "hints.cereal").string(), std::ios::binary); - cereal::BinaryOutputArchive archive(file); - HintsCerealData cd { ids }; - try -@@ -84,7 +86,7 @@ void read_used_binary(std::vector<std::string>& ids) - BOOST_LOG_TRIVIAL(warning) << "Failed to load to hints.cereal. File does not exists. " << path.string(); - return; - } -- boost::filesystem::ifstream file(path); -+ boost::nowide::ifstream file(path.string()); - cereal::BinaryInputArchive archive(file); - HintsCerealData cd; - try -diff --git a/src/slic3r/GUI/Preferences.cpp b/src/slic3r/GUI/Preferences.cpp -index ffc600b0e..c8080d112 100644 ---- a/src/slic3r/GUI/Preferences.cpp -+++ b/src/slic3r/GUI/Preferences.cpp -@@ -12,6 +12,7 @@ - #include "OG_CustomCtrl.hpp" - #include "wxExtensions.hpp" - -+#include <boost/algorithm/string/split.hpp> - #include <boost/filesystem.hpp> - #include <boost/filesystem/path.hpp> - -diff --git a/src/slic3r/GUI/ScriptExecutor.cpp b/src/slic3r/GUI/ScriptExecutor.cpp -index 4565d1aec..6738cada9 100644 ---- a/src/slic3r/GUI/ScriptExecutor.cpp -+++ b/src/slic3r/GUI/ScriptExecutor.cpp -@@ -4,6 +4,13 @@ - #include "Tab.hpp" - #include "libslic3r/PresetBundle.hpp" - #include "libslic3r/Print.hpp" -+#include <boost/log/trivial.hpp> -+#include <boost/lexical_cast.hpp> -+#include <boost/algorithm/string/trim_all.hpp> -+#include <boost/algorithm/string/erase.hpp> -+#include <boost/algorithm/string/split.hpp> -+#include <boost/filesystem.hpp> -+#include <boost/filesystem/string_file.hpp> - - #include <string> - -diff --git a/src/slic3r/GUI/Tab.cpp b/src/slic3r/GUI/Tab.cpp -index 173f0f762..a3eb553c8 100644 ---- a/src/slic3r/GUI/Tab.cpp -+++ b/src/slic3r/GUI/Tab.cpp -@@ -36,6 +36,8 @@ - #include <boost/filesystem.hpp> - #include <boost/filesystem/path.hpp> - #include <boost/lexical_cast.hpp> -+#include <boost/nowide/fstream.hpp> -+#include <boost/log/trivial.hpp> - - #include "wxExtensions.hpp" - #include "PresetComboBoxes.hpp" -@@ -1692,7 +1694,7 @@ std::vector<Slic3r::GUI::PageShp> Tab::create_pages(std::string setting_type_nam - - //read file - //std::ifstream filestream(ui_layout_file.c_str()); -- boost::filesystem::ifstream filestream(ui_layout_file); -+ boost::nowide::ifstream filestream(ui_layout_file); - std::string full_line; - while (std::getline(filestream, full_line)) { - //remove spaces -diff --git a/src/slic3r/Utils/Http.cpp b/src/slic3r/Utils/Http.cpp -index 9bab91860..47568721a 100644 ---- a/src/slic3r/Utils/Http.cpp -+++ b/src/slic3r/Utils/Http.cpp -@@ -11,6 +11,7 @@ - #include <boost/filesystem.hpp> - #include <boost/format.hpp> - #include <boost/log/trivial.hpp> -+#include <boost/nowide/fstream.hpp> - - #include <curl/curl.h> - -@@ -52,7 +53,7 @@ namespace Slic3r { - % error; - }) - .on_complete([&](std::string body, unsigned /* http_status */) { -- boost::filesystem::fstream file(tmp_path, std::ios::out | std::ios::binary | std::ios::trunc); -+ boost::nowide::fstream file(tmp_path, std::ios::out | std::ios::binary | std::ios::trunc); - file.write(body.c_str(), body.size()); - file.close(); - boost::filesystem::rename(tmp_path, target_path); diff --git a/media-gfx/superslicer/files/superslicer-2.5.59.0-cereal.patch b/media-gfx/superslicer/files/superslicer-2.5.59.0-cereal.patch deleted file mode 100644 index 6557d6653640..000000000000 --- a/media-gfx/superslicer/files/superslicer-2.5.59.0-cereal.patch +++ /dev/null @@ -1,53 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 549d06f0d..bffb63d9b 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -496,6 +496,9 @@ endif () - - # Find the Cereal serialization library - find_package(cereal REQUIRED) -+if (NOT TARGET cereal::cereal) -+ add_library(cereal::cereal ALIAS cereal) -+endif () - - # l10n - set(L10N_DIR "${SLIC3R_RESOURCES_DIR}/localization") -diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt -index ec44417fa..9aae6dc11 100644 ---- a/src/CMakeLists.txt -+++ b/src/CMakeLists.txt -@@ -141,7 +141,7 @@ if (NOT WIN32) - set_target_properties(Slic3r PROPERTIES OUTPUT_NAME "${SLIC3R_APP_CMD}") - endif () - --target_link_libraries(Slic3r libslic3r cereal) -+target_link_libraries(Slic3r libslic3r cereal::cereal) - if (APPLE) - # add_compile_options(-stdlib=libc++) - # add_definitions(-DBOOST_THREAD_DONT_USE_CHRONO -DBOOST_NO_CXX11_RVALUE_REFERENCES -DBOOST_THREAD_USES_MOVE) -diff --git a/src/libslic3r/CMakeLists.txt b/src/libslic3r/CMakeLists.txt -index c8f22a482..832149338 100644 ---- a/src/libslic3r/CMakeLists.txt -+++ b/src/libslic3r/CMakeLists.txt -@@ -399,7 +399,7 @@ target_include_directories(libslic3r PUBLIC ${EXPAT_INCLUDE_DIRS}) - target_link_libraries(libslic3r - libnest2d - admesh -- cereal -+ cereal::cereal - libigl - miniz - boost_libs -diff --git a/src/slic3r/CMakeLists.txt b/src/slic3r/CMakeLists.txt -index f71b809b3..c64a2c5a9 100644 ---- a/src/slic3r/CMakeLists.txt -+++ b/src/slic3r/CMakeLists.txt -@@ -302,7 +302,7 @@ target_compile_definitions(libslic3r_gui PRIVATE $<$<BOOL:${SLIC3R_ALPHA}>:SLIC3 - - encoding_check(libslic3r_gui) - --target_link_libraries(libslic3r_gui libslic3r avrdude cereal imgui GLEW::GLEW OpenGL::GL hidapi exif angelscript libcurl ${wxWidgets_LIBRARIES}) -+target_link_libraries(libslic3r_gui libslic3r avrdude cereal::cereal imgui GLEW::GLEW OpenGL::GL hidapi exif angelscript libcurl ${wxWidgets_LIBRARIES}) - - if (MSVC) - target_link_libraries(libslic3r_gui Setupapi.lib) diff --git a/media-gfx/superslicer/files/superslicer-2.5.59.0-dont-install-bundled-angelscript.patch b/media-gfx/superslicer/files/superslicer-2.5.59.0-dont-install-bundled-angelscript.patch deleted file mode 100644 index 603a96ac67a5..000000000000 --- a/media-gfx/superslicer/files/superslicer-2.5.59.0-dont-install-bundled-angelscript.patch +++ /dev/null @@ -1,53 +0,0 @@ -diff --git a/src/angelscript/CMakeLists.txt b/src/angelscript/CMakeLists.txt -index fed80a0ad..a65d9f8d5 100644 ---- a/src/angelscript/CMakeLists.txt -+++ b/src/angelscript/CMakeLists.txt -@@ -202,48 +202,3 @@ endif() - - # Don't override the default runtime output path to avoid conflicts when building for multiple target platforms - #set(RUNTIME_OUTPUT_DIRECTORY ${PROJECT_SOURCE_DIR}/bin) -- --#See https://cmake.org/cmake/help/latest/manual/cmake-packages.7.html#creating-packages for a detailed explanation about this part --install(TARGETS ${ANGELSCRIPT_LIBRARY_NAME} EXPORT AngelscriptTargets -- RUNTIME DESTINATION bin -- LIBRARY DESTINATION lib -- ARCHIVE DESTINATION lib -- INCLUDES DESTINATION include --) -- --install(FILES -- ${CMAKE_CURRENT_SOURCE_DIR}/include/angelscript.h -- DESTINATION include -- COMPONENT Devel --) -- --include(CMakePackageConfigHelpers) --write_basic_package_version_file( -- "${CMAKE_CURRENT_BINARY_DIR}/Angelscript/AngelscriptConfigVersion.cmake" -- VERSION ${PROJECT_VERSION} -- COMPATIBILITY AnyNewerVersion --) -- --export(EXPORT AngelscriptTargets -- FILE "${CMAKE_CURRENT_BINARY_DIR}/Angelscript/AngelscriptTargets.cmake" -- NAMESPACE Angelscript:: --) --configure_file(cmake/AngelscriptConfig.cmake -- "${CMAKE_CURRENT_BINARY_DIR}/Angelscript/AngelscriptConfig.cmake" -- COPYONLY --) -- --set(ConfigPackageLocation lib/cmake/Angelscript) --install(EXPORT AngelscriptTargets -- FILE AngelscriptTargets.cmake -- NAMESPACE Angelscript:: -- DESTINATION ${ConfigPackageLocation} --) --install( -- FILES -- cmake/AngelscriptConfig.cmake -- "${CMAKE_CURRENT_BINARY_DIR}/Angelscript/AngelscriptConfigVersion.cmake" -- DESTINATION ${ConfigPackageLocation} -- COMPONENT Devel --) -- diff --git a/media-gfx/superslicer/files/superslicer-2.5.59.0-fix-gcodeviewer-symlink.patch b/media-gfx/superslicer/files/superslicer-2.5.59.0-fix-gcodeviewer-symlink.patch deleted file mode 100644 index 5a5c9960cc00..000000000000 --- a/media-gfx/superslicer/files/superslicer-2.5.59.0-fix-gcodeviewer-symlink.patch +++ /dev/null @@ -1,11 +0,0 @@ -diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt -index 9aae6dc11..75835903e 100644 ---- a/src/CMakeLists.txt -+++ b/src/CMakeLists.txt -@@ -299,5 +299,5 @@ else () - install(TARGETS Slic3r RUNTIME DESTINATION "${CMAKE_INSTALL_BINDIR}") - - # Install the symlink for gcodeviewer -- install(CODE "execute_process(COMMAND ${CMAKE_COMMAND} -E create_symlink slic3r ${GCODEVIEWER_APP_CMD} WORKING_DIRECTORY \$ENV{DESTDIR}/${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_BINDIR})") -+ install(CODE "execute_process(COMMAND ${CMAKE_COMMAND} -E create_symlink ${SLIC3R_APP_CMD} ${GCODEVIEWER_APP_CMD} WORKING_DIRECTORY \$ENV{DESTDIR}/${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_BINDIR})") - endif () diff --git a/media-gfx/superslicer/files/superslicer-2.5.59.0-missing-includes.patch b/media-gfx/superslicer/files/superslicer-2.5.59.0-missing-includes.patch deleted file mode 100644 index 27f29fa9f6f1..000000000000 --- a/media-gfx/superslicer/files/superslicer-2.5.59.0-missing-includes.patch +++ /dev/null @@ -1,36 +0,0 @@ -diff --git a/src/libslic3r/AppConfig.cpp b/src/libslic3r/AppConfig.cpp -index 18dc7396e..95483e844 100644 ---- a/src/libslic3r/AppConfig.cpp -+++ b/src/libslic3r/AppConfig.cpp -@@ -1,6 +1,7 @@ - #include <boost/filesystem.hpp> - #include "libslic3r/libslic3r.h" - #include "libslic3r/Utils.hpp" -+#include "libslic3r/I18N.hpp" - #include "AppConfig.hpp" - #include "Exception.hpp" - #include "LocalesUtils.hpp" -diff --git a/src/libslic3r/PerimeterGenerator.hpp b/src/libslic3r/PerimeterGenerator.hpp -index d7401f3fb..a95b7749d 100644 ---- a/src/libslic3r/PerimeterGenerator.hpp -+++ b/src/libslic3r/PerimeterGenerator.hpp -@@ -1,6 +1,7 @@ - #ifndef slic3r_PerimeterGenerator_hpp_ - #define slic3r_PerimeterGenerator_hpp_ - -+#include "ClipperUtils.hpp" - #include "libslic3r.h" - #include <vector> - #include "ExPolygonCollection.hpp" -diff --git a/src/slic3r/GUI/CreateMMUTiledCanvas.cpp b/src/slic3r/GUI/CreateMMUTiledCanvas.cpp -index be157eafa..d63eb110e 100644 ---- a/src/slic3r/GUI/CreateMMUTiledCanvas.cpp -+++ b/src/slic3r/GUI/CreateMMUTiledCanvas.cpp -@@ -40,6 +40,7 @@ - #include <wx/odcombo.h> - #include <wx/textctrl.h> - #include <wx/wrapsizer.h> -+#include <wx/rawbmp.h> - #include "wxExtensions.hpp" - - #include <boost/filesystem/path.hpp> diff --git a/media-gfx/superslicer/files/superslicer-2.5.59.0-openexr3.patch b/media-gfx/superslicer/files/superslicer-2.5.59.0-openexr3.patch deleted file mode 100644 index 8ae71c13f4d3..000000000000 --- a/media-gfx/superslicer/files/superslicer-2.5.59.0-openexr3.patch +++ /dev/null @@ -1,77 +0,0 @@ -diff --git a/cmake/modules/FindOpenVDB.cmake b/cmake/modules/FindOpenVDB.cmake -index 4fde5fa4a..566e73a5e 100644 ---- a/cmake/modules/FindOpenVDB.cmake -+++ b/cmake/modules/FindOpenVDB.cmake -@@ -347,28 +347,10 @@ macro(just_fail msg) - return() - endmacro() - --find_package(IlmBase QUIET) --if(NOT IlmBase_FOUND) -- pkg_check_modules(IlmBase QUIET IlmBase) --endif() --if (IlmBase_FOUND AND NOT TARGET IlmBase::Half) -- message(STATUS "Falling back to IlmBase found by pkg-config...") -- -- find_library(IlmHalf_LIBRARY NAMES Half) -- if(IlmHalf_LIBRARY-NOTFOUND OR NOT IlmBase_INCLUDE_DIRS) -- just_fail("IlmBase::Half can not be found!") -- endif() -- -- add_library(IlmBase::Half UNKNOWN IMPORTED) -- set_target_properties(IlmBase::Half PROPERTIES -- IMPORTED_LOCATION "${IlmHalf_LIBRARY}" -- INTERFACE_INCLUDE_DIRECTORIES "${IlmBase_INCLUDE_DIRS}") --elseif(NOT IlmBase_FOUND) -- just_fail("IlmBase::Half can not be found!") --endif() - find_package(TBB ${_quiet} ${_required} COMPONENTS tbb) - find_package(ZLIB ${_quiet} ${_required}) - find_package(Boost ${_quiet} ${_required} COMPONENTS iostreams system ) -+find_package(Imath CONFIG) - - # Use GetPrerequisites to see which libraries this OpenVDB lib has linked to - # which we can query for optional deps. This basically runs ldd/otoll/objdump -@@ -419,7 +401,7 @@ foreach(PREREQUISITE ${_OPENVDB_PREREQUISITE_LIST}) - set(OpenVDB_USES_LOG4CPLUS ON) - endif() - -- string(FIND ${PREREQUISITE} "IlmImf" _HAS_DEP) -+ string(FIND ${PREREQUISITE} "OpenEXR" _HAS_DEP) - if(NOT ${_HAS_DEP} EQUAL -1) - set(OpenVDB_USES_ILM ON) - endif() -@@ -450,11 +432,7 @@ if(OpenVDB_USES_LOG4CPLUS) - find_package(Log4cplus ${_quiet} ${_required}) - endif() - --if(OpenVDB_USES_ILM) -- find_package(IlmBase ${_quiet} ${_required}) --endif() -- --if(OpenVDB_USES_EXR) -+if(OpenVDB_USES_ILM OR OpenVDB_USES_EXR) - find_package(OpenEXR ${_quiet} ${_required}) - endif() - -@@ -471,7 +449,7 @@ endif() - set(_OPENVDB_VISIBLE_DEPENDENCIES - Boost::iostreams - Boost::system -- IlmBase::Half -+ Imath::Imath - ) - - set(_OPENVDB_DEFINITIONS) -@@ -481,10 +459,7 @@ endif() - - if(OpenVDB_USES_EXR) - list(APPEND _OPENVDB_VISIBLE_DEPENDENCIES -- IlmBase::IlmThread -- IlmBase::Iex -- IlmBase::Imath -- OpenEXR::IlmImf -+ OpenEXR::OpenEXR - ) - list(APPEND _OPENVDB_DEFINITIONS "-DOPENVDB_TOOLS_RAYTRACER_USE_EXR") - endif() diff --git a/media-gfx/superslicer/files/superslicer-2.5.59.0-wxgtk3-wayland.patch b/media-gfx/superslicer/files/superslicer-2.5.59.0-wxgtk3-wayland.patch deleted file mode 100644 index abe4d7bf60cc..000000000000 --- a/media-gfx/superslicer/files/superslicer-2.5.59.0-wxgtk3-wayland.patch +++ /dev/null @@ -1,21 +0,0 @@ -diff --git a/src/slic3r/GUI/GUI.cpp b/src/slic3r/GUI/GUI.cpp -index ccd3cc083..be8bbe5cd 100644 ---- a/src/slic3r/GUI/GUI.cpp -+++ b/src/slic3r/GUI/GUI.cpp -@@ -33,6 +33,16 @@ class AppConfig; - - namespace GUI { - -+// wxgtk3 is broken on wayland: https://trac.wxwidgets.org/ticket/17702 -+#ifdef __WXGTK3__ -+struct ForceX11 { -+ ForceX11() { -+ setenv("GDK_BACKEND", "x11", 1); -+ } -+}; -+static struct ForceX11 forcex11; -+#endif -+ - #if __APPLE__ - IOPMAssertionID assertionID; - #endif diff --git a/media-gfx/superslicer/files/superslicer-2.5.59.10-boost-1.85.patch b/media-gfx/superslicer/files/superslicer-2.5.59.10-boost-1.85.patch new file mode 100644 index 000000000000..8d9f11d3897d --- /dev/null +++ b/media-gfx/superslicer/files/superslicer-2.5.59.10-boost-1.85.patch @@ -0,0 +1,54 @@ +https://bugs.gentoo.org/936144 +https://github.com/supermerill/SuperSlicer/commit/75d4bee84740a8dcc9e4e2113795fd67107d03d1 + +From 75d4bee84740a8dcc9e4e2113795fd67107d03d1 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Luk=C3=A1=C5=A1=20Hejl?= <hejl.lukas@gmail.com> +Date: Wed, 3 Jan 2024 23:55:02 +0100 +Subject: [PATCH] Replace some deprecated boost functions. + +Actually, all those deprecated functions were internally called those new functions. So there isn't any risk to use them directly. +--- + src/libslic3r/PrintBase.cpp | 2 +- + src/libslic3r/utils.cpp | 2 +- + src/slic3r/GUI/RemovableDriveManager.cpp | 2 +- + 3 files changed, 3 insertions(+), 3 deletions(-) + +diff --git a/src/libslic3r/PrintBase.cpp b/src/libslic3r/PrintBase.cpp +index 29bdc1301d0..60e40644cb8 100644 +--- a/src/libslic3r/PrintBase.cpp ++++ b/src/libslic3r/PrintBase.cpp +@@ -123,7 +123,7 @@ std::string PrintBase::output_filename(const std::string &format, const std::str + filepath = filename + extension; + } + if (filepath.extension().empty()) +- filepath = boost::filesystem::change_extension(filepath, default_ext); ++ filepath.replace_extension(default_ext); + return filepath.string(); + } catch (std::runtime_error &err) { + throw Slic3r::PlaceholderParserError(L("Failed processing of the output_filename_format template.") + "\n" + err.what()); +diff --git a/src/libslic3r/utils.cpp b/src/libslic3r/utils.cpp +index 71089ceea64..6eac962b20e 100644 +--- a/src/libslic3r/utils.cpp ++++ b/src/libslic3r/utils.cpp +@@ -836,7 +836,7 @@ CopyFileResult copy_file_inner(const boost::filesystem::path& source, const boos + // That may happen when copying on some exotic file system, for example Linux on Chrome. + copy_file_linux(source, target, ec); + #else // __linux__ +- boost::filesystem::copy_file(source, target, boost::filesystem::copy_option::overwrite_if_exists, ec); ++ boost::filesystem::copy_file(source, target, boost::filesystem::copy_options::overwrite_existing, ec); + #endif // __linux__ + if (ec) { + error_message = ec.message(); +diff --git a/src/slic3r/GUI/RemovableDriveManager.cpp b/src/slic3r/GUI/RemovableDriveManager.cpp +index 5fb8b013210..2f8ac96a1a2 100644 +--- a/src/slic3r/GUI/RemovableDriveManager.cpp ++++ b/src/slic3r/GUI/RemovableDriveManager.cpp +@@ -202,7 +202,7 @@ namespace search_for_drives_internal + stat(path.c_str(), &buf); + uid_t uid = buf.st_uid; + if (getuid() == uid) +- out.emplace_back(DriveData{ boost::filesystem::basename(boost::filesystem::path(path)), path }); ++ out.emplace_back(DriveData{ boost::filesystem::path(path).stem().string(), path }); + } + } + } diff --git a/media-gfx/superslicer/files/superslicer-2.5.59.8-additional-imports-fixes.patch b/media-gfx/superslicer/files/superslicer-2.5.59.8-additional-imports-fixes.patch new file mode 100644 index 000000000000..1ccef804d0b4 --- /dev/null +++ b/media-gfx/superslicer/files/superslicer-2.5.59.8-additional-imports-fixes.patch @@ -0,0 +1,111 @@ +diff --git a/src/libslic3r/Extruder.hpp b/src/libslic3r/Extruder.hpp +index e4e16d263..629fd6e0b 100644 +--- a/src/libslic3r/Extruder.hpp ++++ b/src/libslic3r/Extruder.hpp +@@ -3,6 +3,7 @@ + + #include "libslic3r.h" + #include "Point.hpp" ++#include <optional> + + namespace Slic3r { + +diff --git a/src/slic3r/GUI/Field.cpp b/src/slic3r/GUI/Field.cpp +index 10cae794d..c82969e20 100644 +--- a/src/slic3r/GUI/Field.cpp ++++ b/src/slic3r/GUI/Field.cpp +@@ -20,6 +20,7 @@ + #include <wx/tglbtn.h> + #endif + #include <wx/tokenzr.h> ++#include <boost/algorithm/string.hpp> + #include <boost/algorithm/string/predicate.hpp> + #include <boost/log/trivial.hpp> + #include "OG_CustomCtrl.hpp" +diff --git a/src/slic3r/GUI/Preferences.cpp b/src/slic3r/GUI/Preferences.cpp +index ab6039ff0..be01e890a 100644 +--- a/src/slic3r/GUI/Preferences.cpp ++++ b/src/slic3r/GUI/Preferences.cpp +@@ -8,6 +8,7 @@ + + #include <wx/notebook.h> + #include <wx/scrolwin.h> ++#include <wx/display.h> + #include "Notebook.hpp" + #include "ButtonsDescription.hpp" + #include "OG_CustomCtrl.hpp" +diff --git a/src/slic3r/GUI/Tab.cpp b/src/slic3r/GUI/Tab.cpp +index a6c7b580e..1e1566f37 100644 +--- a/src/slic3r/GUI/Tab.cpp ++++ b/src/slic3r/GUI/Tab.cpp +@@ -29,6 +29,7 @@ + #include <wx/settings.h> + #include <wx/filedlg.h> + ++#include <boost/algorithm/string.hpp> + #include <boost/algorithm/string/split.hpp> + #include <boost/algorithm/string/predicate.hpp> + #include <boost/algorithm/string/replace.hpp> +diff --git a/src/libslic3r/ObjectID.hpp b/src/libslic3r/ObjectID.hpp +index 782c58741..08dfba661 100644 +--- a/src/libslic3r/ObjectID.hpp ++++ b/src/libslic3r/ObjectID.hpp +@@ -2,6 +2,7 @@ + #define slic3r_ObjectID_hpp_ + + #include <cereal/access.hpp> ++#include <cereal/types/base_class.hpp> + + namespace Slic3r { + +diff --git a/src/libslic3r/Format/BBConfig.hpp b/src/libslic3r/Format/BBConfig.hpp +index a4b27675c..8d821bed5 100644 +--- a/src/libslic3r/Format/BBConfig.hpp ++++ b/src/libslic3r/Format/BBConfig.hpp +@@ -2,6 +2,13 @@ + #define slic3r_Format_BBconfig_hpp_ + + #include "miniz_extension.hpp" ++#include <fstream> ++#include <map> ++#include "libslic3r/Config.hpp" ++#include <boost/algorithm/string/replace.hpp> ++#include <boost/log/trivial.hpp> ++#include <boost/property_tree/ptree.hpp> ++#include <boost/property_tree/ini_parser.hpp> + + #ifdef __APPLE__ + #include <boost/filesystem.hpp> +diff --git a/src/libslic3r/GCode/FanMover.cpp b/src/libslic3r/GCode/FanMover.cpp +index 8a39d92c5..68e8c9254 100644 +--- a/src/libslic3r/GCode/FanMover.cpp ++++ b/src/libslic3r/GCode/FanMover.cpp +@@ -13,9 +13,8 @@ + #include "../PrintConfig.hpp" + #include "../Utils.hpp" + #include "Print.hpp" +- +-#include <boost/log/trivial.hpp> + */ ++#include <boost/log/trivial.hpp> + + + namespace Slic3r { +diff --git a/src/libslic3r/Format/bbs_3mf.cpp b/src/libslic3r/Format/bbs_3mf.cpp +index f1570b7a4..777f1d722 100644 +--- a/src/libslic3r/Format/bbs_3mf.cpp ++++ b/src/libslic3r/Format/bbs_3mf.cpp +@@ -43,11 +43,13 @@ + #include <boost/property_tree/ptree.hpp> + #include <boost/property_tree/xml_parser.hpp> + #include <boost/foreach.hpp> ++#include <boost/thread/mutex.hpp> + //#include <openssl/md5.h> + + namespace pt = boost::property_tree; + + #include <tbb/parallel_reduce.h> ++#include <tbb/parallel_for.h> + + #include <expat.h> + #include <Eigen/Dense> diff --git a/media-gfx/superslicer/files/superslicer-2.5.59.8-boost-replace-load-string-file.patch b/media-gfx/superslicer/files/superslicer-2.5.59.8-boost-replace-load-string-file.patch new file mode 100644 index 000000000000..9b948ed9c0c4 --- /dev/null +++ b/media-gfx/superslicer/files/superslicer-2.5.59.8-boost-replace-load-string-file.patch @@ -0,0 +1,43 @@ +diff --git a/src/slic3r/GUI/ScriptExecutor.cpp b/src/slic3r/GUI/ScriptExecutor.cpp +index f32e44204..272af5ec3 100644 +--- a/src/slic3r/GUI/ScriptExecutor.cpp ++++ b/src/slic3r/GUI/ScriptExecutor.cpp +@@ -5,8 +5,11 @@ + #include "libslic3r/PresetBundle.hpp" + #include "libslic3r/Print.hpp" + ++#include <fstream> + #include <string> + ++#include <boost/filesystem.hpp> ++ + #include <angelscript/source/as_config.h> + #include <angelscript/add_on/autowrapper/aswrappedcall.h> + #include <angelscript/add_on/scriptarray/scriptarray.h> +@@ -616,6 +619,17 @@ bool as_is_enabled(std::string &key) + return f->is_enabled(); + } + ++inline ++void load_string_file(const boost::filesystem::path& p, std::string& str) ++{ ++ std::ifstream file; ++ file.exceptions(std::ifstream::failbit | std::ifstream::badbit); ++ file.open(p, std::ios_base::binary); ++ std::size_t sz = static_cast<std::size_t>(boost::filesystem::file_size(p)); ++ str.resize(sz, '\0'); ++ file.read(&str[0], sz); ++} ++ + //function to reset a field + void as_back_initial_value(std::string& key) { + current_script->add_to_reset(key); +@@ -745,7 +759,7 @@ void ScriptContainer::init(const std::string& tab_key, Tab* tab) + //res = builder.AddSectionFromFile(ui_script_file.string().c_str()); //seems to be problematic on cyrillic locale + { + std::string all_file; +- boost::filesystem::load_string_file(ui_script_file, all_file); ++ load_string_file(ui_script_file, all_file); + res = builder.AddSectionFromMemory(ui_script_file.string().c_str(), all_file.c_str(), (unsigned int)(all_file.length()), 0); + } + if (res < 0) throw CompileErrorException("Error, can't build the script for tab " + tab_key); diff --git a/media-gfx/superslicer/files/superslicer-2.5.59.8-fix-compilation-error-gnu17.patch b/media-gfx/superslicer/files/superslicer-2.5.59.8-fix-compilation-error-gnu17.patch new file mode 100644 index 000000000000..5574340bce63 --- /dev/null +++ b/media-gfx/superslicer/files/superslicer-2.5.59.8-fix-compilation-error-gnu17.patch @@ -0,0 +1,20 @@ +# https://github.com/prusa3d/PrusaSlicer/commit/4aa7366fafb7a3f91cc68d4a808f5195a4aa3dcf +diff --git a/src/libslic3r/MeshBoolean.cpp b/src/libslic3r/MeshBoolean.cpp +index d76bf468c7f..22232573953 100644 +--- a/src/libslic3r/MeshBoolean.cpp ++++ b/src/libslic3r/MeshBoolean.cpp +@@ -152,12 +152,12 @@ indexed_triangle_set cgal_to_indexed_triangle_set(const _Mesh &cgalmesh) + const auto &vertices = cgalmesh.vertices(); + int vsize = int(vertices.size()); + +- for (auto &vi : vertices) { ++ for (const auto &vi : vertices) { + auto &v = cgalmesh.point(vi); // Don't ask... + its.vertices.emplace_back(to_vec3f(v)); + } + +- for (auto &face : faces) { ++ for (const auto &face : faces) { + auto vtc = cgalmesh.vertices_around_face(cgalmesh.halfedge(face)); + + int i = 0; diff --git a/media-gfx/superslicer/files/superslicer-2.5.59.8-libnest2d-link-xcb.patch b/media-gfx/superslicer/files/superslicer-2.5.59.8-libnest2d-link-xcb.patch new file mode 100644 index 000000000000..441f647b037e --- /dev/null +++ b/media-gfx/superslicer/files/superslicer-2.5.59.8-libnest2d-link-xcb.patch @@ -0,0 +1,12 @@ +diff --git a/src/libnest2d/CMakeLists.txt b/src/libnest2d/CMakeLists.txt +index c18dc31cb..852d26d5e 100644 +--- a/src/libnest2d/CMakeLists.txt ++++ b/src/libnest2d/CMakeLists.txt +@@ -24,5 +24,6 @@ set(LIBNEST2D_SRCFILES + add_library(libnest2d STATIC ${LIBNEST2D_SRCFILES}) + + target_include_directories(libnest2d PUBLIC ${CMAKE_CURRENT_LIST_DIR}/include) +-target_link_libraries(libnest2d PUBLIC NLopt::nlopt TBB::tbb Boost::boost libslic3r) ++target_link_libraries(libnest2d PUBLIC NLopt::nlopt TBB::tbb Boost::boost ++ libslic3r xcb) + target_compile_definitions(libnest2d PUBLIC LIBNEST2D_THREADING_tbb LIBNEST2D_STATIC LIBNEST2D_OPTIMIZER_nlopt LIBNEST2D_GEOMETRIES_libslic3r) diff --git a/media-gfx/superslicer/superslicer-2.5.59.10.ebuild b/media-gfx/superslicer/superslicer-2.5.59.10.ebuild new file mode 100644 index 000000000000..b1c347c004cc --- /dev/null +++ b/media-gfx/superslicer/superslicer-2.5.59.10.ebuild @@ -0,0 +1,109 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +WX_GTK_VER="3.0-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" +) + +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/superslicer/superslicer-2.5.59.0-r3.ebuild b/media-gfx/superslicer/superslicer-2.5.59.8.ebuild index 7cdeaa9cc284..b43862a3db67 100644 --- a/media-gfx/superslicer/superslicer-2.5.59.0-r3.ebuild +++ b/media-gfx/superslicer/superslicer-2.5.59.8.ebuild @@ -1,11 +1,11 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 WX_GTK_VER="3.0-gtk3" MY_PN="SuperSlicer" -SLICER_PROFILES_COMMIT="748fbdfd2ac077e4e415868e7bc963740b92aa8e" +SLICER_PROFILES_COMMIT="8f3bb94a9c60be9a3b40d88a36ff05ba5cf2d6a8" inherit cmake wxwidgets xdg flag-o-matic @@ -18,7 +18,7 @@ SRC_URI=" LICENSE="AGPL-3 Boost-1.0 GPL-2 LGPL-3 MIT" SLOT="0" -KEYWORDS="amd64 ~x86" +KEYWORDS="~amd64 ~arm64 ~x86" IUSE="test" RESTRICT="test" @@ -41,6 +41,7 @@ RDEPEND=" media-libs/libpng:0= media-libs/qhull:= sci-libs/nlopt + sci-libs/opencascade:= >=sci-mathematics/cgal-5.0:= sys-apps/dbus sys-libs/zlib:= @@ -54,14 +55,20 @@ DEPEND="${RDEPEND} " PATCHES=( - "${FILESDIR}/${P}-openexr3.patch" - "${FILESDIR}/${P}-wxgtk3-wayland.patch" - "${FILESDIR}/${P}-cereal.patch" - "${FILESDIR}/${P}-boost.patch" - "${FILESDIR}/${P}-boost-1.81-std-wxString-to-std-wstring.patch" - "${FILESDIR}/${P}-missing-includes.patch" - "${FILESDIR}/${P}-dont-install-bundled-angelscript.patch" - "${FILESDIR}/${P}-fix-gcodeviewer-symlink.patch" + "${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.2-fix-dereferencing-in-std-unique_ptr-to-nullptr.patch" + "${FILESDIR}/${P}-additional-imports-fixes.patch" + "${FILESDIR}/${P}-fix-compilation-error-gnu17.patch" + "${FILESDIR}/${P}-libnest2d-link-xcb.patch" + "${FILESDIR}/${P}-boost-replace-load-string-file.patch" ) S="${WORKDIR}/${MY_PN}-${PV}" diff --git a/media-gfx/tintii/Manifest b/media-gfx/tintii/Manifest index e4a05a87c718..f3e1f311d523 100644 --- a/media-gfx/tintii/Manifest +++ b/media-gfx/tintii/Manifest @@ -1,5 +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-r1.ebuild 562 BLAKE2B 9b37fc8d75b15eb4b92f56aec9dc0cf3e7cb9222f0336301794dc86a5adba1298ee768b6af9c529c8d3024053477691f2c5a3ab35da8ea536ba5fc11f32b8aec SHA512 29ef7dde9b6e5a7b741956d10152f2070aac3e65b04107bb0e2a83c4a576ffd240ef659a524976498a7d631302ab42d2c37433929c42ee529ec2773c7e79f58e EBUILD tintii-2.10.0-r2.ebuild 773 BLAKE2B 24b7bd86087b371c5d3e2646b48327da64d493f4ab9462919c601537d8a9f5670c21574098dd8588a444ce7cb40f26364eb96cc525c9a9a45fa21c80deb2a7ca SHA512 5aa51a0ea3716833e067b239ba08aec990e5f35e8cd6de88d84f7deae0063fe19830b338678eda29109898916a9f12be9fc223795485b9fac2eff4d3f47abeec MISC metadata.xml 167 BLAKE2B 868e3b584722eaacf68273db062bb773d8c7e5d7ab2b81ca7e8397643bf7cc106c3a1033594401c99c54f667bb45d6b73f9048fc335580bbd44b4589ad26a832 SHA512 30caadd1496c3b9969136038239a1d8e01f236726b4022c2d7e19ca7575f25f735e556835e581afbf44fbd3e4104c40f2b5ef5fa70118d75c881fdf871962d0a diff --git a/media-gfx/tintii/tintii-2.10.0-r1.ebuild b/media-gfx/tintii/tintii-2.10.0-r1.ebuild deleted file mode 100644 index ccb7a70d89da..000000000000 --- a/media-gfx/tintii/tintii-2.10.0-r1.ebuild +++ /dev/null @@ -1,28 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -WX_GTK_VER="3.0-gtk3" -inherit wxwidgets - -DESCRIPTION="Photo editor for selective color, saturation, and hue shift adjustments" -HOMEPAGE="https://www.indii.org/software/tintii/" -SRC_URI="https://www.indii.org/files/tint/releases/${P}.tar.gz" - -LICENSE="GPL-2+" -SLOT="0" -KEYWORDS="~amd64 ~x86" - -RDEPEND=" - x11-libs/wxGTK:${WX_GTK_VER}[X] -" -DEPEND="${RDEPEND} - dev-libs/boost -" -BDEPEND="app-alternatives/bc" - -src_prepare() { - default - setup-wxwidgets -} diff --git a/media-gfx/xdot/Manifest b/media-gfx/xdot/Manifest index b43551611261..a8474cfd121d 100644 --- a/media-gfx/xdot/Manifest +++ b/media-gfx/xdot/Manifest @@ -1,6 +1,4 @@ -DIST xdot-1.3.tar.gz 144187 BLAKE2B 38e89a8c47dd519a79221634ed3e451cc5ba9c0448545802561e92876c06af599b3327d2ab808d5f81842826baddc42d3921da9c6885a2b6485e39c79de80c9f SHA512 8d66a64182970b968adbb5031d17f0b2b3709d4daa0f6d32ba0e3616177be1e43bcaa62a3133a3a0d92f8468dbc12147918d04b5d543b94b5df6d39b7af31e17 DIST xdot-1.4.tar.gz 144405 BLAKE2B bcca54099ad88ebbf82dc168d837f7343f527d8aff63d27e315e60267b4edecca97c2f69e47a6bd5889e9da7bd801ba38950f5f01ff1f0e40389551c6ded2890 SHA512 36065ca840ea0f3ffeca3d7bb16aa3f68b79ef3c7d43f0ba80d100d198f89edee1ca9cb3baff378a63c53a527c37dcccbd7262fd1aa26b7c61bc9e2c55c6e3ed -EBUILD xdot-1.3.ebuild 1023 BLAKE2B 974c09e3cbf833f9be48b5d2898a2b6b9745dd16c2c58458dcdac77cb74c9843e75a741728ec8d61c906401b992c75cfd3d3cd337e392782087b92cfdabcc9fa SHA512 83b5deed98b8d8c1308a4186e844a8dfc8c0266d0b940a9ee1aea71c3e81164b2daafafb9f1f29e12a1a70b552fc8fce41f20441051174b845ecddcc9cecca64 -EBUILD xdot-1.4.ebuild 1064 BLAKE2B e43f230c4f2cce40a7cf573a5d6e232a293b834572301a2d0fd4e62492dd1db0410a544020ebbc9f2768dd964cd5b082376a9c3862ad65dede68a08bfe0bee06 SHA512 b475d68543f261d674f205da3915a34c5203063a8ed867010da54c0a90ddfc19016b9e2cb42a4ee89580d75a186205afe5a30c5b7792f3cae38e341e51d693af +EBUILD xdot-1.4.ebuild 1063 BLAKE2B cf3114a70cd0abcb4eba2df8a352c0c2ac7e33130e69357289824cb55e610d46a7a11f9e2d12e1f9bf1bce63eccbe5d31092e0dd0a2064272007978a251d49ff SHA512 75c304e48f64a28fa76c5244a3b19375b350fa87db634149c3bbc27a94ca07705c28d5e9ff5ef0b0eb6bedd42ed9dd0218ce922465f783b3e711965dba45b611 EBUILD xdot-9999.ebuild 1070 BLAKE2B 13305d0d59d42e99b5a05ea269a1854159b05eeac7da9b306886735b6099ac2b609ae378321aabbfc27e84cb197472f75c0c8467e81460018c058ba704d5a13e SHA512 ddbd7668100468682142a26bcfabc03fec3107199e10fb771ede3eb4d223cb7ffe44015d3896d4578906e64c3562e77789366b8b5ff9b74490499cdd27d3584f MISC metadata.xml 399 BLAKE2B 06318ca9aa1bb3f53733542916d19d28c03133866e868aefeba88d7e6e1b7594a628488471fe7f6853e02402a14db8501e056f5df9ae1429c4eca66ab7b6a492 SHA512 16caf359c45841ae27bfdeee51c7fdd71d6282548773e6f519cbcbfe43f9fa39c65322a610d2b3d5cb4471129cfa3738e6ee66ff6b6e94b4263d918fd44ff30c diff --git a/media-gfx/xdot/xdot-1.3.ebuild b/media-gfx/xdot/xdot-1.3.ebuild deleted file mode 100644 index 2d99d3cb2ca2..000000000000 --- a/media-gfx/xdot/xdot-1.3.ebuild +++ /dev/null @@ -1,44 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 -DISTUTILS_USE_PEP517=setuptools -PYTHON_COMPAT=( python3_{10..12} ) - -MY_PN=xdot.py -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" - MY_P="${MY_PN}-${PV}" - S="${WORKDIR}/${MY_P}" - SRC_URI="https://github.com/jrfonseca/${MY_PN}/archive/${PV}.tar.gz -> ${P}.tar.gz" -fi - -inherit ${GIT_ECLASS} distutils-r1 virtualx - -DESCRIPTION="Interactive viewer for Graphviz dot files" -HOMEPAGE="https://github.com/jrfonseca/xdot.py" - -LICENSE="LGPL-2+" -SLOT="0" - -DEPEND=" - dev-python/numpy[${PYTHON_USEDEP}] - dev-python/pycairo[${PYTHON_USEDEP}] - dev-python/pygobject:3[${PYTHON_USEDEP}] - media-gfx/graphviz - test? ( x11-libs/gtk+:3[X] ) -" -RDEPEND="${DEPEND}" - -run_test() { - cd tests && "${EPYTHON}" ../test.py *.dot graphs/*.gv - return "${?}" -} - -python_test() { - virtx run_test -} diff --git a/media-gfx/xdot/xdot-1.4.ebuild b/media-gfx/xdot/xdot-1.4.ebuild index c1a410b4076f..5592a37dd4f3 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 ~ia64 ~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/xv/Manifest b/media-gfx/xv/Manifest index a60c09120518..10e0bbb1e7a5 100644 --- a/media-gfx/xv/Manifest +++ b/media-gfx/xv/Manifest @@ -5,8 +5,11 @@ AUX xv-3.10a-libpng15-r1.patch 16530 BLAKE2B 6233c9e49f021ba3e62f9a5e9da4e360126 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 EBUILD xv-3.10a-r22.ebuild 2555 BLAKE2B 92911c150ebbbafeb7001347c864bd6579c96e92de3bff55349b10da50261fc57a48bac74ae8d3023e2c3a6318c1c774203575f784442eb8657841f18b189c20 SHA512 c8db57ebd0e1ad53ad0013e57874975176356d8d6bc1f3ce6e701a715d1703f85e9472e51716a75e76687e41bbbaa60be82958c7b0f742e061af632e70f4e406 -MISC metadata.xml 250 BLAKE2B 699d6b9629cb9e0fac6509f4eec3bd2a175002f57ddadb07c2041b583ac4fd57e8cf78506850997f3a140201cbe4bbbab49a768634a50aba337e0e72630eb4b2 SHA512 efce6490cf2258fec1a8f6c77dc22583376cc0adb5aa1f862b88beccc82a7492d12addd2276a58c0a14810a3b02d9750f8ad3f28ffa74d858a86f204e8c9ab01 +EBUILD xv-5.2.0.ebuild 1219 BLAKE2B c7940a9a3e31bb4d378fa4c6c10146f78f680369b52accfb5c9e11c8cc1677a051fa3304ed1f45f0d91e65631a3d3b63d3897ffdfbc8acd3dc3cbb3a456eaa7b SHA512 6ce89b469662565b4956c5696402c99a2202cdda3ed1da33b1359663973b27ef381a4b7f92ea9915e89b75a945b6019264ea8f4c7eab8bd8bfad9beaad157f4d +MISC metadata.xml 392 BLAKE2B e1e306f8f6bd480912d6e45b5af362d54900117ae05a21995023e6611c1410af6682af867150179ecebd9d319a9f9810723dffec59a26e3f9f9ecc0a56061127 SHA512 e8aad6d1b24943fc3aeb6533fb0dc048ea0d3edc04abe2efa9a27930698ff3ddb0185dc3a2da69e08c050c4545d907c8580add6732fd8e3258ed496784902364 diff --git a/media-gfx/xv/files/xv-5.2.0-osx-bsd.patch b/media-gfx/xv/files/xv-5.2.0-osx-bsd.patch new file mode 100644 index 000000000000..27059386446d --- /dev/null +++ b/media-gfx/xv/files/xv-5.2.0-osx-bsd.patch @@ -0,0 +1,51 @@ +diff '--color=auto' -ur a/src/vdcomp.c b/src/vdcomp.c +--- a/src/vdcomp.c 2024-07-17 09:37:04.957769272 -0500 ++++ b/src/vdcomp.c 2024-07-17 09:44:30.582594953 -0500 +@@ -130,6 +130,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 '--color=auto' -ur a/src/xv.h b/src/xv.h +--- a/src/xv.h 2024-07-17 09:37:04.957769272 -0500 ++++ b/src/xv.h 2024-07-17 09:41:42.912041683 -0500 +@@ -183,7 +183,7 @@ + + #ifndef VMS + # include <errno.h> +-# ifndef __NetBSD__ ++# if !defined(__NetBSD__) && !defined(__FreeBSD__) && !defined(__APPLE__) + # if !(defined(__GLIBC__) && __GLIBC__ >= 2) && !defined(__OpenBSD__) + extern int errno; /* SHOULD be in errno.h, but often isn't */ + # ifndef XV_HAVE_SYSERRLISTDECL +@@ -199,7 +199,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] +@@ -236,6 +236,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 +@@ -399,7 +401,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/metadata.xml b/media-gfx/xv/metadata.xml index 03458a5affcb..6f2f9f849997 100644 --- a/media-gfx/xv/metadata.xml +++ b/media-gfx/xv/metadata.xml @@ -1,8 +1,12 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> - <!-- maintainer-needed --> + <maintainer type="person"> + <email>bkohler@gentoo.org</email> + <name>Ben Kohler</name> + </maintainer> <upstream> <remote-id type="sourceforge">png-mng</remote-id> + <remote-id type="github">jasper-software/xv</remote-id> </upstream> </pkgmetadata> diff --git a/media-gfx/xv/xv-5.2.0.ebuild b/media-gfx/xv/xv-5.2.0.ebuild new file mode 100644 index 000000000000..49af68754450 --- /dev/null +++ b/media-gfx/xv/xv-5.2.0.ebuild @@ -0,0 +1,53 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit cmake desktop + +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() { + 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" +} |