diff options
Diffstat (limited to 'media-gfx')
-rw-r--r-- | media-gfx/Manifest.gz | bin | 38370 -> 38375 bytes | |||
-rw-r--r-- | media-gfx/fotema/Manifest | 3 | ||||
-rw-r--r-- | media-gfx/fotema/fotema-1.19.2.ebuild | 91 | ||||
-rw-r--r-- | media-gfx/gimp/Manifest | 2 | ||||
-rw-r--r-- | media-gfx/gimp/gimp-2.10.38-r1.ebuild | 7 | ||||
-rw-r--r-- | media-gfx/sane-frontends/Manifest | 5 | ||||
-rw-r--r-- | media-gfx/sane-frontends/files/gimp-2.0.m4 | 180 | ||||
-rw-r--r-- | media-gfx/sane-frontends/files/gtk-2.0.m4 | 189 | ||||
-rw-r--r-- | media-gfx/sane-frontends/files/sane-frontends-1.0.14-c99.patch | 51 | ||||
-rw-r--r-- | media-gfx/sane-frontends/sane-frontends-1.0.14-r7.ebuild (renamed from media-gfx/sane-frontends/sane-frontends-1.0.14-r6.ebuild) | 21 | ||||
-rw-r--r-- | media-gfx/symboleditor/Manifest | 4 | ||||
-rw-r--r-- | media-gfx/symboleditor/metadata.xml | 3 | ||||
-rw-r--r-- | media-gfx/symboleditor/symboleditor-2.1.0.ebuild | 43 |
13 files changed, 544 insertions, 55 deletions
diff --git a/media-gfx/Manifest.gz b/media-gfx/Manifest.gz Binary files differindex 2450de9a93f3..31b9fee034a6 100644 --- a/media-gfx/Manifest.gz +++ b/media-gfx/Manifest.gz diff --git a/media-gfx/fotema/Manifest b/media-gfx/fotema/Manifest index e26c60b773c4..76a01ac37b5e 100644 --- a/media-gfx/fotema/Manifest +++ b/media-gfx/fotema/Manifest @@ -1,8 +1,11 @@ DIST fotema-1.19.0-crates.tar.xz 62327412 BLAKE2B 099677191ca1634288d9f4e6055ddfaa3e6562d96fcd06dcc51aa1cb49fed648a61f60f2d47ac51c4fd97a8a238a8f064a8f9990768e2160fd9e002b4ffb978a SHA512 11b7510aae15359e0b2bb95a7e5b4b973f1438328f8fea075264bfb16da50876c4bec5bd82c0af965c8fc9bb5c2d1126c03c077ebd0d1cda704e6b89daf504c2 DIST fotema-1.19.0.gh.tar.gz 8950038 BLAKE2B 131c013515b11ac068944e9d3c7e4ae1809ed75bf6d7d1eebdf10c09498d519363ab2b0d35b07a6f11c3e221d8665adf289ce9ff3f820585dd97b2065a5c1322 SHA512 4750028bd30a46f37a6ca85ff9d005dd99c4d4a0d1c0df60baadc094d9630bafeff21e898543c9ef41c612237fdfbe642f7abbbcb1fbd4c8c6d3dbed369f420f DIST fotema-1.19.1.gh.tar.gz 8951161 BLAKE2B 77bbb21eceb2b700f4e3ff787be05a71dd819c662f26813af74ddd1645b9f7864e63cab74ca35cb33e20cddc9fd286705b43fc375247b490c0ec9c6848afb82b SHA512 aebf3a37443292ec51d5fe9a079cd1e074d82bf65e6bd2ec3729181849b71c8b57d020a5382ca8b690b1278b372b56b895b35f9c7810981462543c82a13e4aeb +DIST fotema-1.19.2.gh.tar.gz 8952377 BLAKE2B b41720af2f617c3d6f3e53be88bfdfec39d49a40b9b44b5a6c9b0c5e99d0280f8e8a79ebc7d0cee9fb083c0ed1ee54925953ca23e5a4807d0e1ca1c07170f337 SHA512 849ece52e13a1a8fc66864cad286e1c2bdcc9f3b73c0e0a45c42bf481e8b14a03f9e7d72a5461094a6fe804359d2ddcf0fbec1b7a82ce3a5c3cdc4e9b15c1311 DIST fotema-rust-faces-43c0d5acd6f3f4d90c6487708f2e511a73bf7c9e.gh.tar.gz 839519 BLAKE2B 7ba344d55c5d108e63556dda32aaf60cfbd2b14a05e2965ca69e54e2aab578f6ba49f7a7b89d6c32cb5ace4b80f7a84247dcbb43a98d5d709895810798966b0b SHA512 aac99659e2d82d342f52b5860d9f1e284e1658fa9e0986b1c54a81cc33f6391535a2773d79defc6a7bf1e52591dc91d91a1ef3742c38e599baed79975b42de51 DIST fotema-v1.19.1-crates.tar.xz 63008632 BLAKE2B 62758bdd9d4cf54d3bceb187d027d8419b4ccdd2d64ab1e8c9e5679123ee729acbc16f3adeece965bac9a9a33ef093c6519581c0f75afd8327d53e159baae2f7 SHA512 0a366cc7b4bb19e0529fbc6fd5c37a9e03cdfe3ec0ff8e853f46985ffdb974f142f047376999779601abbb33385b7ed44cd6070959513fc471dec92ac76cd0cb +DIST fotema-v1.19.2-crates.tar.xz 63106132 BLAKE2B f57f6e19bbaa2570530f8280e59c80cdc887d7808c9453ac27b6f64bbd175faec2f20f31b8decf61af21f1d38248a868412f27122b0ebe398c63ba3937ce0055 SHA512 58db1ef27c7e10e8d156af3beb6ba9941f7676e286ce51497ec3f6953586e648431fbd5cb8485d751b2fcce6cafd912037dc9c2ce9a5a1173d68e609b8c63712 EBUILD fotema-1.19.0.ebuild 1742 BLAKE2B f49bd88fd84ab14995405a310c7e982b379ebea5a990cbaccd51acfbc88afa60997a959b84cab92683c6a649423d2c86ce8309416d350153277bbc3d0cfa87d5 SHA512 b25b847abb8262bf1c079f7402c28f7d94a398eea27bda78437e6c29fac3014a8bc754955d1295e01158652e85edc2c41617bf7f2f96524cef1a729ef0ef97ef EBUILD fotema-1.19.1.ebuild 1789 BLAKE2B 6008cb95e4f0ff16e57ca99c45d8e8a07cd8467fc0093bfd6b8f461bd4c374a30aea5ad544c306b132f638872fe7c52d6cfedf9cf1e89d25fb755b892c5a435d SHA512 7039ff4e86fc1ae9d3a1a223dc6c8c036ac1dc2f73d9f79c6ffc687da90b7be759a499062663829ff75518c9a33dcd62e6bcbc964b68bb64fa73185dc8217415 +EBUILD fotema-1.19.2.ebuild 1789 BLAKE2B 6008cb95e4f0ff16e57ca99c45d8e8a07cd8467fc0093bfd6b8f461bd4c374a30aea5ad544c306b132f638872fe7c52d6cfedf9cf1e89d25fb755b892c5a435d SHA512 7039ff4e86fc1ae9d3a1a223dc6c8c036ac1dc2f73d9f79c6ffc687da90b7be759a499062663829ff75518c9a33dcd62e6bcbc964b68bb64fa73185dc8217415 MISC metadata.xml 326 BLAKE2B 4ae1a2fadba80e1886d73fb01d493fbbaabae2b97dbffaa10d46e0dbec690e3cb6f8e604675aeb9d0167e50d53cb3f1ffcc2d2ec6c6aed14c36acfe8d6bc31bb SHA512 1f8f3199af710dd344962c425a5af0936be2f52cb41123bee1aba249c356c5c0cb74f3ac6ff7f0fdf71a7e6f8552269abb20cda7d6685e3f21fd5e95436bf552 diff --git a/media-gfx/fotema/fotema-1.19.2.ebuild b/media-gfx/fotema/fotema-1.19.2.ebuild new file mode 100644 index 000000000000..942b99bb6383 --- /dev/null +++ b/media-gfx/fotema/fotema-1.19.2.ebuild @@ -0,0 +1,91 @@ +# Copyright 2024-2025 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +CRATES=" +" + +declare -A GIT_CRATES=( + [rust-faces]='https://github.com/blissd/fotema-rust-faces;43c0d5acd6f3f4d90c6487708f2e511a73bf7c9e;fotema-rust-faces-%commit%' +) + +inherit cargo gnome2-utils meson xdg-utils + +CRATE_P=${P/-/-v} +DESCRIPTION="Photo gallery for Linux" +HOMEPAGE="https://github.com/blissd/fotema" +SRC_URI=" + https://github.com/blissd/fotema/archive/v${PV}.tar.gz + -> ${P}.gh.tar.gz + ${CARGO_CRATE_URIS} +" +if [[ ${PKGBUMPING} != ${PVR} ]]; then + SRC_URI+=" + https://github.com/gentoo-crate-dist/fotema/releases/download/v${PV}/${CRATE_P}-crates.tar.xz + " +fi + +# see LICENSES/ +LICENSE=" + CC-BY-2.0 CC-BY-4.0 CC-BY-NC-SA-4.0 CC-BY-SA-4.0 CC0-1.0 + FDL-1.3+ GPL-3+ MIT +" +# Dependent crate licenses +LICENSE+=" + Apache-2.0 Apache-2.0-with-LLVM-exceptions BSD-2 BSD CC0-1.0 ISC MIT + MPL-2.0 UoI-NCSA Unicode-3.0 WTFPL-2 ZLIB +" +SLOT="0" +KEYWORDS="~amd64" + +DEPEND=" + >=dev-libs/glib-2.66:2 + >=gui-libs/gtk-4.16:4 +" +# indirect deps via crates +DEPEND+=" + dev-libs/openssl:= + gui-libs/libadwaita + media-libs/fontconfig + media-libs/graphene + media-libs/lcms:2 + media-libs/libshumate:= + media-libs/opencv:=[contribdnn] + media-video/ffmpeg:= + sci-libs/onnx + sys-libs/libseccomp + x11-libs/cairo + x11-libs/gdk-pixbuf:2 + x11-libs/pango +" +RDEPEND=" + ${DEPEND} + media-libs/glycin-loaders +" +BDEPEND=" + dev-libs/glib:2 +" + +QA_FLAGS_IGNORED="/usr/bin/fotema" + +src_configure() { + local emesonargs=( + -Dprofile=$(usex debug development default) + ) + + meson_src_configure + ln -s "${CARGO_HOME}" "${BUILD_DIR}/cargo-home" || die + + export ORT_STRATEGY=system +} + +pkg_postinst() { + gnome2_schemas_update + xdg_icon_cache_update +} + +pkg_postrm() { + gnome2_schemas_update + xdg_icon_cache_update +} diff --git a/media-gfx/gimp/Manifest b/media-gfx/gimp/Manifest index 14aafcfd8339..84d9dd5859fc 100644 --- a/media-gfx/gimp/Manifest +++ b/media-gfx/gimp/Manifest @@ -7,7 +7,7 @@ AUX gimp-2.10_libheif-1.18_unconditional_compat.patch 820 BLAKE2B 4e75ebc639bc6f DIST gimp-2.10.38.tar.bz2 31698453 BLAKE2B 58c29e3e00d873e69a5e5f4e9c3ff4d868ccfb11914570306ef12c54ca7d3ef89a62d8c71fac1f2d1f426ac615dc4caf7a7260351c00301dce2b1aa4193bab6d SHA512 343bf1c3bd14bf8e7c7af79c05920faca213da68549127c1d8af53e2e872e55aeaf39a3cfcf578183a34fdc4f98e1c859be63956b0611067186eefd1fdee2aaa DIST gimp-3.0.0-RC1.tar.xz 28863948 BLAKE2B d9e1ae51809d1c8e5084a9e85b660cd0f3a763f8ee220075fe73f512940e9637d50675a06d0dca88c501571a26404cb6b53c9573348002586143c52736dfa196 SHA512 844896976b66b0498ba9149c7176f5442b2305fd3dc51fce7ff92eb05b7b0f86f16d0bd16e50a3c43ab2c6b9be4e610dbbfc50a99c84a62a4de80a6937d43985 DIST gimp-3.0.0-RC2.tar.xz 26980968 BLAKE2B 56b98a7863df22cf81015a9da5d7535cfef5a154c47418b1b6c6212cc76423e0769a4aa8d76714d2eb22595b1f6e2c623e4444e35675db5fe7e40c8820fe71dd SHA512 c0a6e096d954f3048cb68fe4ff71dd2f49c802f800014ab8a3089a0e097e7d6f595e5716230c06e7edfddba948f0d01da14800935aa6ceb9dc2e12fb7f19d7e6 -EBUILD gimp-2.10.38-r1.ebuild 6261 BLAKE2B 4256b91c88e2d677d894ab6ba90f387713320574cf404e3e794c0ff390e4d4feb16e27534530994f0083a051e5dba5e404b1ac357e78fcdcef3cb624d195890f SHA512 a86bea4cb6d8cabbf981d42a1ca220c0befffb1e0dd8785708087b1e2c62c3bea95386be2abbb22192d65ee90bfec60910f5279f734771742e5b955c4f643655 +EBUILD gimp-2.10.38-r1.ebuild 6369 BLAKE2B e97ae7367bf369773f32fff168814b58bc3f6ffa1828d39f1b0d8a9a36b7a812a18be8db2716039e323054af9a0b853a586ef4ec4d37868615e57f72fbcf6eb9 SHA512 85bbbc80c6908e0618a7eebaeb028820fb14c0e2b41779043f6547ab9767b5af0b8019c895978a473e3ebda550126b257e96fd65494f3e5239d709b3497d1a59 EBUILD gimp-3.0.0_rc1.ebuild 7043 BLAKE2B bec2a409e288e90a58214febedf99b113bfc0c77412a823aef85a683b129ddc11876e8a3457d27380be780dc97ddd193be0b7341ecfce96aafceb77997575b2a SHA512 91396c43aa2beb6304a56cc84f9c088da4416a7b34e1d70b00f8fcb3c25eac22b96bdaac0c1523ae929014a5be17cd221cec5d56bd9dcf43e0f854222e5620a6 EBUILD gimp-3.0.0_rc2.ebuild 7043 BLAKE2B 1d0051787aae0af6ee02665af6a15a3226b62fd1b6b05215f0fd9b245edf0a3fbcaf105427538a47e76221228cc19fde010b3310d5360d0a3d45c09c86458e02 SHA512 7bc058940dfccaedaa0f9e98be2617b9eb709cac0cfc94a22a3134c0972b98ce61e0c647a770be96074a7d0f1cbbe95655e14509e24f4a92a688086f83c262cb EBUILD gimp-9999.ebuild 7259 BLAKE2B 1ccbd31727bac846d9bef5d3221a859cccc2069e98831bb8aeb03b6f9c52f6d7d13e8ce57db087a6082754acbdf4f3ae25f46d53232bcb7baa5303d8c2b17224 SHA512 149dbbb73e0116fc9694bbb5659033156f585fe9c8208939ab6d391c99332cafb5b2bdb59498df729b9024c05a14b1243aa90a07fb3192131262e7a425c10c7c diff --git a/media-gfx/gimp/gimp-2.10.38-r1.ebuild b/media-gfx/gimp/gimp-2.10.38-r1.ebuild index 8e4df871c08f..74d5c6cb1ae3 100644 --- a/media-gfx/gimp/gimp-2.10.38-r1.ebuild +++ b/media-gfx/gimp/gimp-2.10.38-r1.ebuild @@ -1,11 +1,11 @@ -# Copyright 1999-2024 Gentoo Authors +# Copyright 1999-2025 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 GNOME2_EAUTORECONF=yes WANT_AUTOMAKE= -inherit autotools gnome2 toolchain-funcs virtualx +inherit autotools flag-o-matic gnome2 toolchain-funcs virtualx DESCRIPTION="GNU Image Manipulation Program" HOMEPAGE="https://www.gimp.org/" @@ -134,6 +134,9 @@ _adjust_sandbox() { src_configure() { _adjust_sandbox + # bug #944284 (https://gitlab.gnome.org/GNOME/gimp/-/issues/12843) + append-cflags -std=gnu17 + local myconf=( GEGL="${EPREFIX}"/usr/bin/gegl-0.4 GDBUS_CODEGEN="${EPREFIX}"/bin/false diff --git a/media-gfx/sane-frontends/Manifest b/media-gfx/sane-frontends/Manifest index 292aae9838df..f231f15b3538 100644 --- a/media-gfx/sane-frontends/Manifest +++ b/media-gfx/sane-frontends/Manifest @@ -1,4 +1,7 @@ AUX MissingCapsFlag.patch 417 BLAKE2B 5382644f1c8af41fb383bf9889528f279bbac0a18ee2e38f080769b653f24fc02dec53f88f364441d8ceb6d401ad70137215627a181434f6cfcf8245a1d6c37c SHA512 39790a52414a7edcfc4dd9379bd8f35ce91e932209ba9c2ab3f1cb9e5dd140b37f3bfed1e642050a142da43ae435329ab60e201f2934be76648380615a3f37ef +AUX gimp-2.0.m4 6059 BLAKE2B fdf5aeb790215011cac22fb87bbe2e75d9694c50ff3f377e39052c45dc65461d414c764ffb69d6df1b08576f88f51e1c6b9afb7b79cd33b017d68f403b740e96 SHA512 67683d510262ccafd89caf2a5fb64ea1e7798a127947a7898f0015804ee553f2a99878c94aaee4a2eba66849f67d39692bd35455272086f582a236466640c1ee +AUX gtk-2.0.m4 7412 BLAKE2B 34a715f790444442d0fdcc6ba88c239922ac7fae14b52ae9eb4e30614c81abae16d1caf71a17cc3f31841d407173cb42f89fd3efb53a6984d772f5b2f6b45303 SHA512 f34702a0e387cb69968b3019d7f9ee7a904d5333e580ae5388664fb2d5c37cebe4b03044c1cfccf223171bae3fa4e99498d09a006d1f560cd51157e54ab91946 +AUX sane-frontends-1.0.14-c99.patch 1236 BLAKE2B 587b670cbdfacd1a83eb33d491465b696577ea467ead3049245861efec2106b164522cb311c2c25898dd3db290e0d0d2efc6b87409e9f21503551748ba7bc013 SHA512 df3b6419d145fdee9c6d683f5925bc9c4f7e1ef7e185ac57e2e6b2b113c79b180e548d645107d37c3280f1c1c2b54215976ea4ce196c0cfa427607e5e88342a6 DIST sane-frontends-upstream-1.0.14.tar.gz 233587 BLAKE2B 69e34ed783cff68879b92d478195fe8c67f29d8904e22bdc62deb7310e8ac73d1ce6fc89ee0eafe3e2460f54cec257dbfe28843aec679cfe8669be6c5fc0e2bd SHA512 ffb854f4f4fd08a98395f325c22aa81924ac1e0827e795107bf01f3c42c2cd64bc204c79bc5ec8fd570746d039eae87a2da9cdf30b7f4640442a33c6495d35f8 -EBUILD sane-frontends-1.0.14-r6.ebuild 1476 BLAKE2B afe88ac569ba67984a18b63ab3c3e3e03ee92aba67cc9edc457fe846033b87afc8cc348a5a8b1bd84eed33795fabcd59c1d732011d907a42ea976318266936ca SHA512 ae07b7620682951df6c842dde93266077b0ce9b1d02eb42426626eb03807017de68ddc97cab5f244fb172bd031ff9d2e409e05cb665ae354b1634a48ada5725c +EBUILD sane-frontends-1.0.14-r7.ebuild 1754 BLAKE2B 5053833d32850aa05f617379a869e6712290047cbd85e8b7df5b62c0d68f0c50c3ac610db4c5448dc21567c34e11cb356d88866693ea65dc381a314e19fc0e0e SHA512 594f6bbc647e8375ab122b9337bbaf13910ab7120447bd36d2af193476c8eeff2e22fd9bdc91e999c8c928486bef0e34ff9e3d2f2833c70970ef0e16942e671b MISC metadata.xml 168 BLAKE2B 2e0e000b4c3b6ca04c12903fdbe278415c05a822623c52e9aa95cbbf3d50bcb1246b7edbda7d2f6b559af8950c6374e6e0a69b76319964cfe686bf50b0604a57 SHA512 4dcf45d1809e8390a2d8155c8ebfe0dd610203e392aeab0ccd8a10f42cc8532a4925eff32b35e7a6c35598a4efd288229034ec0732299dbd8cfa0acff705fed3 diff --git a/media-gfx/sane-frontends/files/gimp-2.0.m4 b/media-gfx/sane-frontends/files/gimp-2.0.m4 new file mode 100644 index 000000000000..695b9e5a6577 --- /dev/null +++ b/media-gfx/sane-frontends/files/gimp-2.0.m4 @@ -0,0 +1,180 @@ +# Configure paths for GIMP-2.0 +# Manish Singh, Sven Neumann +# Large parts shamelessly stolen from Owen Taylor + +dnl AM_PATH_GIMP_2_0([MINIMUM-VERSION, [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND]]]) +dnl Test for GIMP, and define GIMP_CFLAGS and GIMP_LIBS +dnl +AC_DEFUN([AM_PATH_GIMP_2_0], +[dnl +dnl Get the cflags and libraries from pkg-config +dnl + +AC_ARG_ENABLE(gimptest, [ --disable-gimptest do not try to compile and run a test GIMP program],, enable_gimptest=yes) + + pkg_name=gimp-2.0 + pkg_config_args="$pkg_name gimpui-2.0" + + no_gimp="" + + AC_PATH_PROG(PKG_CONFIG, pkg-config, no) + + if test x$PKG_CONFIG != xno ; then + if pkg-config --atleast-pkgconfig-version 0.7 ; then + : + else + echo *** pkg-config too old; version 0.7 or better required. + no_gimp=yes + PKG_CONFIG=no + fi + else + no_gimp=yes + fi + + min_gimp_version=ifelse([$1], ,2.0.0,$1) + AC_MSG_CHECKING(for GIMP - version >= $min_gimp_version) + + if test x$PKG_CONFIG != xno ; then + ## don't try to run the test against uninstalled libtool libs + if $PKG_CONFIG --uninstalled $pkg_config_args; then + echo "Will use uninstalled version of GIMP found in PKG_CONFIG_PATH" + enable_gimptest=no + fi + + if $PKG_CONFIG --atleast-version $min_gimp_version $pkg_config_args; then + : + else + no_gimp=yes + fi + fi + + if test x"$no_gimp" = x ; then + GIMP_CFLAGS=`$PKG_CONFIG $pkg_config_args --cflags` + GIMP_LIBS=`$PKG_CONFIG $pkg_config_args --libs` + GIMP_CFLAGS_NOUI=`$PKG_CONFIG $pkg_name --cflags` + GIMP_LIBS_NOUI=`$PKG_CONFIG $pkg_name --libs` + GIMP_DATA_DIR=`$PKG_CONFIG $pkg_name --variable=gimpdatadir` + GIMP_PLUGIN_DIR=`$PKG_CONFIG $pkg_name --variable=gimplibdir` + + gimp_pkg_major_version=`$PKG_CONFIG --modversion $pkg_name | \ + sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\1/'` + gimp_pkg_minor_version=`$PKG_CONFIG --modversion $pkg_name | \ + sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\2/'` + gimp_pkg_micro_version=`$PKG_CONFIG --modversion $pkg_name | \ + sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\3/'` + if test "x$enable_gimptest" = "xyes" ; then + ac_save_CFLAGS="$CFLAGS" + ac_save_LIBS="$LIBS" + CFLAGS="$CFLAGS $GIMP_CFLAGS" + LIBS="$GIMP_LIBS $LIBS" + +dnl +dnl Now check if the installed GIMP is sufficiently new. (Also sanity +dnl checks the results of pkg-config to some extent +dnl + rm -f conf.gimptest + AC_TRY_RUN([ +#include <stdio.h> +#include <stdlib.h> + +#include <libgimp/gimp.h> + +GimpPlugInInfo PLUG_IN_INFO = +{ + NULL, /* init_proc */ + NULL, /* quit_proc */ + NULL, /* query_proc */ + NULL /* run_proc */ +}; + +int main () +{ + int major, minor, micro; + char *tmp_version; + + system ("touch conf.gimptest"); + + /* HP/UX 9 (%@#!) writes to sscanf strings */ + tmp_version = g_strdup("$min_gimp_version"); + if (sscanf(tmp_version, "%d.%d.%d", &major, &minor, µ) != 3) { + printf("%s, bad version string\n", "$min_gimp_version"); + exit(1); + } + + if (($gimp_pkg_major_version > major) || + (($gimp_pkg_major_version == major) && ($gimp_pkg_minor_version > minor)) || + (($gimp_pkg_major_version == major) && ($gimp_pkg_minor_version == minor) && ($gimp_pkg_micro_version >= micro))) + { + return 0; + } + else + { + printf("\n*** 'pkg-config --modversion %s' returned %d.%d.%d, but the minimum version\n", "$pkg_name", $gimp_pkg_major_version, $gimp_pkg_minor_version, $gimp_pkg_micro_version); + printf("*** of GIMP required is %d.%d.%d. If pkg-config is correct, then it is\n", major, minor, micro); + printf("*** best to upgrade to the required version.\n"); + printf("*** If pkg-config was wrong, set the environment variable PKG_CONFIG_PATH\n"); + printf("*** to point to the correct the correct configuration files\n"); + return 1; + } +} + +],, no_gimp=yes,[echo $ac_n "cross compiling; assumed OK... $ac_c"]) + CFLAGS="$ac_save_CFLAGS" + LIBS="$ac_save_LIBS" + fi + fi + if test "x$no_gimp" = x ; then + AC_MSG_RESULT(yes (version $gimp_pkg_major_version.$gimp_pkg_minor_version.$gimp_pkg_micro_version)) + ifelse([$2], , :, [$2]) + else + if test "$PKG_CONFIG" = "no" ; then + echo "*** A new enough version of pkg-config was not found." + echo "*** See http://www.freedesktop.org/software/pkgconfig/" + else + if test -f conf.gimptest ; then + : + else + echo "*** Could not run GIMP test program, checking why..." + CFLAGS="$CFLAGS $GIMP_CFLAGS" + LIBS="$LIBS $GIMP_LIBS" + AC_TRY_LINK([ +#include <stdio.h> +#include <libgimp/gimp.h> + +GimpPlugInInfo PLUG_IN_INFO = +{ + NULL, /* init_proc */ + NULL, /* quit_proc */ + NULL, /* query_proc */ + NULL /* run_proc */ +}; +], [ return 0; ], + [ echo "*** The test program compiled, but did not run. This usually means" + echo "*** that the run-time linker is not finding GIMP or finding the wrong" + echo "*** version of GIMP. If it is not finding GIMP, you'll need to set your" + echo "*** LD_LIBRARY_PATH environment variable, or edit /etc/ld.so.conf to point" + echo "*** to the installed location Also, make sure you have run ldconfig if that" + echo "*** is required on your system" + echo "***" + echo "*** If you have an old version installed, it is best to remove it, although" + echo "*** you may also be able to get things to work by modifying LD_LIBRARY_PATH"], + [ echo "*** The test program failed to compile or link. See the file config.log for the" + echo "*** exact error that occurred. This usually means GIMP is incorrectly installed."]) + CFLAGS="$ac_save_CFLAGS" + LIBS="$ac_save_LIBS" + fi + fi + GIMP_CFLAGS="" + GIMP_LIBS="" + GIMP_CFLAGS_NOUI="" + GIMP_LIBS_NOUI="" + ifelse([$3], , :, [$3]) + fi + AC_SUBST(GIMP_CFLAGS) + AC_SUBST(GIMP_LIBS) + AC_SUBST(GIMP_CFLAGS_NOUI) + AC_SUBST(GIMP_LIBS_NOUI) + AC_SUBST(GIMP_DATA_DIR) + AC_SUBST(GIMP_PLUGIN_DIR) + rm -f conf.gimptest +]) diff --git a/media-gfx/sane-frontends/files/gtk-2.0.m4 b/media-gfx/sane-frontends/files/gtk-2.0.m4 new file mode 100644 index 000000000000..a89477fabbb7 --- /dev/null +++ b/media-gfx/sane-frontends/files/gtk-2.0.m4 @@ -0,0 +1,189 @@ +# Configure paths for GTK+ +# Owen Taylor 1997-2001 + +# Version number used by aclocal, see `info automake Serials`. +# Increment on every change. +#serial 1 + +dnl AM_PATH_GTK_2_0([MINIMUM-VERSION, [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND [, MODULES]]]]) +dnl Test for GTK+, and define GTK_CFLAGS and GTK_LIBS, if gthread is specified in MODULES, +dnl pass to pkg-config +dnl +AC_DEFUN([AM_PATH_GTK_2_0], +[dnl +dnl Get the cflags and libraries from pkg-config +dnl +AC_ARG_ENABLE(gtktest, [ --disable-gtktest do not try to compile and run a test GTK+ program], + , enable_gtktest=yes) + + pkg_config_args=gtk+-2.0 + for module in . $4 + do + case "$module" in + gthread) + pkg_config_args="$pkg_config_args gthread-2.0" + ;; + esac + done + + no_gtk="" + + AC_REQUIRE([PKG_PROG_PKG_CONFIG]) + PKG_PROG_PKG_CONFIG([0.7]) + + min_gtk_version=ifelse([$1], ,2.0.0,$1) + AC_MSG_CHECKING(for GTK+ - version >= $min_gtk_version) + + if test x$PKG_CONFIG != xno ; then + ## don't try to run the test against uninstalled libtool libs + if $PKG_CONFIG --uninstalled $pkg_config_args; then + echo "Will use uninstalled version of GTK+ found in PKG_CONFIG_PATH" + enable_gtktest=no + fi + + if $PKG_CONFIG --atleast-version $min_gtk_version $pkg_config_args; then + : + else + no_gtk=yes + fi + fi + + if test x"$no_gtk" = x ; then + GTK_CFLAGS=`$PKG_CONFIG $pkg_config_args --cflags` + GTK_LIBS=`$PKG_CONFIG $pkg_config_args --libs` + gtk_config_major_version=`$PKG_CONFIG --modversion gtk+-2.0 | \ + sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\1/'` + gtk_config_minor_version=`$PKG_CONFIG --modversion gtk+-2.0 | \ + sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\2/'` + gtk_config_micro_version=`$PKG_CONFIG --modversion gtk+-2.0 | \ + sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\3/'` + if test "x$enable_gtktest" = "xyes" ; then + ac_save_CFLAGS="$CFLAGS" + ac_save_LIBS="$LIBS" + CFLAGS="$CFLAGS $GTK_CFLAGS" + LIBS="$GTK_LIBS $LIBS" +dnl +dnl Now check if the installed GTK+ is sufficiently new. (Also sanity +dnl checks the results of pkg-config to some extent) +dnl + rm -f conf.gtktest + AC_TRY_RUN([ +#include <gtk/gtk.h> +#include <stdio.h> +#include <stdlib.h> + +int +main () +{ + int major, minor, micro; + char *tmp_version; + + fclose (fopen ("conf.gtktest", "w")); + + /* HP/UX 9 (%@#!) writes to sscanf strings */ + tmp_version = g_strdup("$min_gtk_version"); + if (sscanf(tmp_version, "%d.%d.%d", &major, &minor, µ) != 3) { + printf("%s, bad version string\n", "$min_gtk_version"); + exit(1); + } + + if ((gtk_major_version != $gtk_config_major_version) || + (gtk_minor_version != $gtk_config_minor_version) || + (gtk_micro_version != $gtk_config_micro_version)) + { + printf("\n*** 'pkg-config --modversion gtk+-2.0' returned %d.%d.%d, but GTK+ (%d.%d.%d)\n", + $gtk_config_major_version, $gtk_config_minor_version, $gtk_config_micro_version, + gtk_major_version, gtk_minor_version, gtk_micro_version); + printf ("*** was found! If pkg-config was correct, then it is best\n"); + printf ("*** to remove the old version of GTK+. You may also be able to fix the error\n"); + printf("*** by modifying your LD_LIBRARY_PATH enviroment variable, or by editing\n"); + printf("*** /etc/ld.so.conf. Make sure you have run ldconfig if that is\n"); + printf("*** required on your system.\n"); + printf("*** If pkg-config was wrong, set the environment variable PKG_CONFIG_PATH\n"); + printf("*** to point to the correct configuration files\n"); + } + else if ((gtk_major_version != GTK_MAJOR_VERSION) || + (gtk_minor_version != GTK_MINOR_VERSION) || + (gtk_micro_version != GTK_MICRO_VERSION)) + { + printf("*** GTK+ header files (version %d.%d.%d) do not match\n", + GTK_MAJOR_VERSION, GTK_MINOR_VERSION, GTK_MICRO_VERSION); + printf("*** library (version %d.%d.%d)\n", + gtk_major_version, gtk_minor_version, gtk_micro_version); + } + else + { + if ((gtk_major_version > major) || + ((gtk_major_version == major) && (gtk_minor_version > minor)) || + ((gtk_major_version == major) && (gtk_minor_version == minor) && (gtk_micro_version >= micro))) + { + return 0; + } + else + { + printf("\n*** An old version of GTK+ (%d.%d.%d) was found.\n", + gtk_major_version, gtk_minor_version, gtk_micro_version); + printf("*** You need a version of GTK+ newer than %d.%d.%d. The latest version of\n", + major, minor, micro); + printf("*** GTK+ is always available from ftp://ftp.gtk.org.\n"); + printf("***\n"); + printf("*** If you have already installed a sufficiently new version, this error\n"); + printf("*** probably means that the wrong copy of the pkg-config shell script is\n"); + printf("*** being found. The easiest way to fix this is to remove the old version\n"); + printf("*** of GTK+, but you can also set the PKG_CONFIG environment to point to the\n"); + printf("*** correct copy of pkg-config. (In this case, you will have to\n"); + printf("*** modify your LD_LIBRARY_PATH enviroment variable, or edit /etc/ld.so.conf\n"); + printf("*** so that the correct libraries are found at run-time))\n"); + } + } + return 1; +} +],, no_gtk=yes,[echo $ac_n "cross compiling; assumed OK... $ac_c"]) + CFLAGS="$ac_save_CFLAGS" + LIBS="$ac_save_LIBS" + fi + fi + if test "x$no_gtk" = x ; then + AC_MSG_RESULT(yes (version $gtk_config_major_version.$gtk_config_minor_version.$gtk_config_micro_version)) + ifelse([$2], , :, [$2]) + else + AC_MSG_RESULT(no) + if test "$PKG_CONFIG" = "no" ; then + echo "*** A new enough version of pkg-config was not found." + echo "*** See http://pkgconfig.sourceforge.net" + else + if test -f conf.gtktest ; then + : + else + echo "*** Could not run GTK+ test program, checking why..." + ac_save_CFLAGS="$CFLAGS" + ac_save_LIBS="$LIBS" + CFLAGS="$CFLAGS $GTK_CFLAGS" + LIBS="$LIBS $GTK_LIBS" + AC_TRY_LINK([ +#include <gtk/gtk.h> +#include <stdio.h> +], [ return ((gtk_major_version) || (gtk_minor_version) || (gtk_micro_version)); ], + [ echo "*** The test program compiled, but did not run. This usually means" + echo "*** that the run-time linker is not finding GTK+ or finding the wrong" + echo "*** version of GTK+. If it is not finding GTK+, you'll need to set your" + echo "*** LD_LIBRARY_PATH environment variable, or edit /etc/ld.so.conf to point" + echo "*** to the installed location Also, make sure you have run ldconfig if that" + echo "*** is required on your system" + echo "***" + echo "*** If you have an old version installed, it is best to remove it, although" + echo "*** you may also be able to get things to work by modifying LD_LIBRARY_PATH" ], + [ echo "*** The test program failed to compile or link. See the file config.log for the" + echo "*** exact error that occured. This usually means GTK+ is incorrectly installed."]) + CFLAGS="$ac_save_CFLAGS" + LIBS="$ac_save_LIBS" + fi + fi + GTK_CFLAGS="" + GTK_LIBS="" + ifelse([$3], , :, [$3]) + fi + AC_SUBST(GTK_CFLAGS) + AC_SUBST(GTK_LIBS) + rm -f conf.gtktest +]) diff --git a/media-gfx/sane-frontends/files/sane-frontends-1.0.14-c99.patch b/media-gfx/sane-frontends/files/sane-frontends-1.0.14-c99.patch new file mode 100644 index 000000000000..c02528bab90a --- /dev/null +++ b/media-gfx/sane-frontends/files/sane-frontends-1.0.14-c99.patch @@ -0,0 +1,51 @@ +https://bugs.gentoo.org/933615#c7 +Signed-off-by: Stephane Bakhos <nuitari@nuitari.net> +--- a/acinclude.m4 ++++ b/acinclude.m4 +@@ -61,6 +61,7 @@ + AC_TRY_RUN([ + #include <gtk/gtk.h> + #include <stdio.h> ++#include <stdlib.h> + + int + main () +@@ -484,6 +485,7 @@ + AC_TRY_RUN([ + #include <sane/sane.h> + #include <stdio.h> ++#include <stdlib.h> + + int + main () +--- a/aclocal.m4 2024-09-17 00:41:08.100761458 -0400 ++++ b/aclocal.m4 2024-09-17 00:56:44.718894896 -0400 +@@ -494,6 +494,7 @@ + AC_TRY_RUN([ + #include <sane/sane.h> + #include <stdio.h> ++#include <stdlib.h> + + int + main () +--- a/configure 2024-09-17 01:07:22.612760156 -0400 ++++ b/configure 2024-09-17 01:07:39.628889934 -0400 +@@ -6818,6 +6818,7 @@ + + #include <sane/sane.h> + #include <stdio.h> ++#include <stdlib.h> + + int + main () +--- a/configure.in 2024-09-17 01:18:19.480771874 -0400 ++++ b/configure.in 2024-09-17 01:15:08.469314114 -0400 +@@ -75,7 +75,7 @@ + + dnl Checks for header files. + AC_HEADER_STDC +-AC_CHECK_HEADERS(os2.h fcntl.h unistd.h libc.h sys/time.h sys/types.h) ++AC_CHECK_HEADERS(os2.h fcntl.h unistd.h libc.h sys/time.h sys/types.h sys/socket.h) + + dnl Checks for typedefs, structures, and compiler characteristics. + AC_C_CONST diff --git a/media-gfx/sane-frontends/sane-frontends-1.0.14-r6.ebuild b/media-gfx/sane-frontends/sane-frontends-1.0.14-r7.ebuild index 49b45b38c9ab..90e84ef635a9 100644 --- a/media-gfx/sane-frontends/sane-frontends-1.0.14-r6.ebuild +++ b/media-gfx/sane-frontends/sane-frontends-1.0.14-r7.ebuild @@ -1,7 +1,9 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2025 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 + +inherit autotools DESCRIPTION="Scanner Access Now Easy" HOMEPAGE="http://www.sane-project.org" @@ -11,7 +13,6 @@ LICENSE="GPL-2" SLOT="0" KEYWORDS="~alpha amd64 ~arm64 ppc ppc64 sparc x86" IUSE="gimp gtk" - REQUIRED_USE="gimp? ( gtk )" DEPEND=" @@ -26,10 +27,22 @@ RDEPEND="${DEPEND}" DOCS=( AUTHORS Changelog NEWS PROBLEMS README ) -PATCHES=( "${FILESDIR}/MissingCapsFlag.patch" ) +PATCHES=( + "${FILESDIR}/MissingCapsFlag.patch" + "${FILESDIR}/${PN}-1.0.14-c99.patch" +) S="${WORKDIR}"/"${PN}"-upstream-"${PV}" +src_prepare() { + default + + # Needed for C99 patch (acinclude hack to avoid BDEPEND on gtk+, gimp) + cat "${FILESDIR}"/gtk-2.0.m4 >> acinclude.m4 || die + cat "${FILESDIR}"/gimp-2.0.m4 >> acinclude.m4 || die + eautoreconf +} + src_configure() { local myeconfargs=( --datadir=/usr/share/misc diff --git a/media-gfx/symboleditor/Manifest b/media-gfx/symboleditor/Manifest index 731cc762996f..92490e979496 100644 --- a/media-gfx/symboleditor/Manifest +++ b/media-gfx/symboleditor/Manifest @@ -1,5 +1,3 @@ -DIST symboleditor-2.1.0.tar.xz 495416 BLAKE2B 5f5d5a60806ebf0dacce5dcff538ac0f2c4966b2f2bda79450f66515d8572dd61a67db5e4d0f91b548a62c14e4e14aea283b710dc2a7c84770eb35dd22e20699 SHA512 dc83f3f80b12d8217a230d8c951e90bcc6246c4460d987efb140c54c1e88a8f5d607ac7ebfe706399cd0917e22a2089df6742afadd28305d39ceeff0c55da535 DIST symboleditor-3.0.0_pre20250127-75f3cf6d.tar.gz 763265 BLAKE2B df801afec47e6a55686e74a8e097539baee0957436fc584fdcb8a09433477bd883c34e3399f38b29f62f6c981d9762c000dc51ec78d443ac7bde1ca2033256d6 SHA512 a18553d5bb52837474e6ec6cfb5b927ec30775ae3596dda4fba21898612a86a579707e6cc703828bd2ac8e78780ec297561b3535387f281d76cbc870691b363c -EBUILD symboleditor-2.1.0.ebuild 1003 BLAKE2B e6e5bc144a54629d6c6c2524bcd7ca3c035210cfec9b45f27942170dc138056ff97d07fa60f85398f388297139e4c57151749cb5a0fa4610e453d6fbff5edfe2 SHA512 32269ee0db35663cb0fc08e1b00dd552a6b0f379db5a1de3af6f9b3e081b14d8dde3f3811134b6b5a57d6c279cb7b123ef3f3de775bc8c431a601b877a1b251f EBUILD symboleditor-3.0.0_pre20250127.ebuild 964 BLAKE2B 80b95d8b0a4d7b0d83b8fc2a0794b3dc18b806c48a6313222fb649ecdf9c0ca5b268e6397c849aec9aa81438de49739c0776c35b81aef72c6addd1e9a46db0d8 SHA512 a8daab6b9e0dd661a0c46b36dec4be6b84dacfaa6094f127f919bdd3b0ffeb292d4b91d47d656771bb2ba7a9b9c3ca796db0a61da88689a13b59407eab2bbffd -MISC metadata.xml 318 BLAKE2B 922a5e32e706b2976c5f359a14194d268d3f499398576c80ce5fad8c0fcea0fbf048de4480a80a6a1889c88b8b6c14147654a3ab4d5ffbcc258c2290da63f6d1 SHA512 614cb8dda7ad2088e5d6ef39b449bb4be0ac72cd0231c320188d76d1816dce6490c5114bb4798112c4b11d99d30a9e82ff8fcf08ffa8c049589682a5e38208f6 +MISC metadata.xml 417 BLAKE2B 9d8d0f6b86a99502caa236a69a438464921e2fe147ba1ebfb33e7a2a575d10b8b717911aad9e4f4013e786839d76184414b3f90ed027fb8dbdccd99cb2cb70b2 SHA512 5d01cf33c12ff7fced7272ac9ec61d46876d5fa02453e4fa20214a3ae86b58abd2ffaca688042975c1eb4848d67c1d1212a2b6a2600b7b9d4fec29b864633610 diff --git a/media-gfx/symboleditor/metadata.xml b/media-gfx/symboleditor/metadata.xml index d925f2439758..fbdee75807fa 100644 --- a/media-gfx/symboleditor/metadata.xml +++ b/media-gfx/symboleditor/metadata.xml @@ -6,6 +6,7 @@ <name>Gentoo KDE Project</name> </maintainer> <upstream> - <bugs-to>https://bugs.kde.org/</bugs-to> + <bugs-to>https://bugs.kde.org/enter_bug.cgi?product=SymbolEditor</bugs-to> + <remote-id type="kde-invent">graphics/symboleditor</remote-id> </upstream> </pkgmetadata> diff --git a/media-gfx/symboleditor/symboleditor-2.1.0.ebuild b/media-gfx/symboleditor/symboleditor-2.1.0.ebuild deleted file mode 100644 index 26ba51f6d775..000000000000 --- a/media-gfx/symboleditor/symboleditor-2.1.0.ebuild +++ /dev/null @@ -1,43 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -ECM_HANDBOOK="optional" -KFMIN=5.60.0 -QTMIN=5.12.3 -inherit ecm kde.org - -DESCRIPTION="Application to create libraries of QPainterPath objects with rendering hints" -HOMEPAGE="https://apps.kde.org/symboleditor/ -https://userbase.kde.org/SymbolEditor" - -if [[ ${KDE_BUILD_TYPE} != live ]]; then - SRC_URI="mirror://kde/stable/${PN}/${PV}/${P}.tar.xz" - KEYWORDS="amd64 x86" -fi - -LICENSE="GPL-2" -SLOT="5" - -DEPEND=" - >=dev-qt/qtgui-${QTMIN}:5 - >=dev-qt/qtwidgets-${QTMIN}:5 - >=kde-frameworks/kconfig-${KFMIN}:5 - >=kde-frameworks/kconfigwidgets-${KFMIN}:5 - >=kde-frameworks/kcoreaddons-${KFMIN}:5 - >=kde-frameworks/ki18n-${KFMIN}:5 - >=kde-frameworks/kio-${KFMIN}:5 - >=kde-frameworks/kwidgetsaddons-${KFMIN}:5 - >=kde-frameworks/kxmlgui-${KFMIN}:5 -" -RDEPEND="${DEPEND}" -BDEPEND="sys-devel/gettext" - -src_configure() { - local mycmakeargs=( - -DCMAKE_DISABLE_FIND_PACKAGE_Doxygen=ON - ) - - ecm_src_configure -} |