diff options
Diffstat (limited to 'media-gfx/gimp')
| -rw-r--r-- | media-gfx/gimp/Manifest | 6 | ||||
| -rw-r--r-- | media-gfx/gimp/gimp-2.99.14.ebuild (renamed from media-gfx/gimp/gimp-2.99.10-r2.ebuild) | 181 | ||||
| -rw-r--r-- | media-gfx/gimp/gimp-9999.ebuild | 10 |
3 files changed, 97 insertions, 100 deletions
diff --git a/media-gfx/gimp/Manifest b/media-gfx/gimp/Manifest index 48e6123e89f0..284685aae110 100644 --- a/media-gfx/gimp/Manifest +++ b/media-gfx/gimp/Manifest @@ -1,10 +1,10 @@ AUX gimp-2.10_fix_test-appdata.patch 902 BLAKE2B 2b1a131d874d65422d8bdd44732b9843d89a570a1ea3c058cdb2a424a7791c686aa0e2ae2a0b472f333f2465f6e1a26750a532e9003933c5dffa1af32343c1dc SHA512 2983e8572f5e8113c9e2f564d31c1a5fe7e11ef273c50d2be739089124c6ec1a457da28222020bbd6015b2cbbcbf403b88d8660b9b35241800deb4fb3ad79067 AUX gimp-2.99.12_fix_libheif-1.13_build.patch 2309 BLAKE2B 32d4edf87f20f9fc0b7839352adbae6006dc021b3e3e6541fc48f1f44496780e39870da41642e0abe2551302d942a8a1382a539180437be4b37e78c1c0b55c48 SHA512 1f7b8a0479603376dd356bb156354d31b113513213f39e11e65fa75b99eac52375d6c32043a7bb56a21e7e1e6bdf9371099bfe3f1eb41f3528fdd1f81bec4b2a DIST gimp-2.10.32.tar.bz2 31397425 BLAKE2B 3887e2e29ebfd5dcfa671a9d1549180d11bd5e3656c6854ff4130c6c6e6ca9479df075981e09b9b6b97e47dd1fcd939fea726ca09c08c040ebd1998d80e61771 SHA512 aa999c1ec388154965f84d995a9b5517e9c38608d03a0d0bb6ec9fa55de946f9da106e7d6f7c02052b61d2b6806e7a378e786539f0de5b5ffaa2fcd1bbd9c7f1 -DIST gimp-2.99.10.tar.bz2 26782056 BLAKE2B 103e7fa2d04b1989e59fb03964a122891831d122cdc6dd3b7637f06cff28310e12d9a79678ac477b56728f4ceb53292001c53f026e94be417db76dd7e14740ab SHA512 898c1e1ffd2270ccc965db9a8263e04d95455535361b47f92256b4028808e1e91eb1924cf6cef7ff9e988194ebbc67535bd9cfbf0243159824e58551a2b91ba3 DIST gimp-2.99.12.tar.xz 24282140 BLAKE2B 2174e1d50941071ea6e96f0e3f315484867aa90ae06cbcdc7b30914f959c1a15a7e7ea34ba22ce09a973b29acf1277e3a4519d744140c3fcabc59f31dc3ebf43 SHA512 4b87dd40eccc39c560e69a90b4042b1b19506e9ae52e5079ace442325b54bf7c47477662197da8f7655c12aad16e08bae60d11cf269684b8aa291e978d246917 +DIST gimp-2.99.14.tar.xz 24346236 BLAKE2B 087e28621c736a6ad8241c0f36334c6c5af53cb945711b089d15b54292ffcb7713be229591b8ccf79d06f7c7ede0919ceecad4deb511b20822a4f68ccfa1df49 SHA512 6ea3ca27cb0c830042ad42789d3017989dda195ebbdff38793afbee720f2986d489bec39c077b84889c847c0afc1bc7a2fec2e916574ae08aec42019715cb204 EBUILD gimp-2.10.32-r1.ebuild 5663 BLAKE2B af3ad36266514ec26c3a54e5cee8a9c21e2787155e07c9b0dcdcdba934d80b37f0fa46ad93d40a48a881583a87ce1db2b2dac28314322bae958b39e78257e17f SHA512 7ec1e0135aca81c43e9ccc34fec1f09a620652ca7aff942768c53238124e9e79727392b0ad61a146da253ff33b1aba31695a6222c7596f6aabb0d21becda2773 -EBUILD gimp-2.99.10-r2.ebuild 6622 BLAKE2B 009a17b291a8e0ba430c342931cfa7338c0c54671ccfdf299ab08eb5d40f0335627581c4a54caedcffe9d2abf6928af1a5936b73ef30ba40da6f6e3c4d290ad9 SHA512 d88503ada39e5c676616d019a029d9e1d6884207923f05c348f35014791fbcb4a29528086566bd007d2cb1501fd0569a54f9c65ede90a23b35403e7f61d4f845 EBUILD gimp-2.99.12-r1.ebuild 6876 BLAKE2B ee13b540db02b9da3e252d43899f56f2ada50391afcc2cf2c2b59ffca63cfd075e5c3ee28659d826612c02df3f4d46cdaee233df11d7c994b8ac8f61610bf3b4 SHA512 40f3862738b6eaa5df9a2d201493f4041a3f333f9f10c12562321319a2c4593501080d37c9c86e24716bb84fcbd51a928fc0e014afcb06a9cac4af1bdc968d99 -EBUILD gimp-9999.ebuild 6689 BLAKE2B b3f5729e320677d7e4d85e8cfbfa6cb36bd92f836861b1ccea958a5bd414a7836b35d306825610a9cb462c22d47f18805766fd9242cf7bf376d2a39269c05ce1 SHA512 51fad83de1e08a05d2b3eda864fcff8b1a728eb91e4914d70c6cb803cdf6f4f1e9e5195f0b77f75e3746fcabd8a5757bce826087edca3a3bcc95ad57b689b0c8 +EBUILD gimp-2.99.14.ebuild 6891 BLAKE2B 4dc6c9ad91829b9236da517dc1ef9ff2954caceb938525b4808bfa82e867b73364e78ebadb7db7cf3f58d1ac8976b5b81e6b90e3bacf610623e172f4a00701c8 SHA512 de43df894c60c50fe91e7812076ead65673b9323cefaed277d6c284dfe2efabb0797c04e83b7f888507a63c62d654c5d2f56a3aa98893333156690014181f468 +EBUILD gimp-9999.ebuild 6711 BLAKE2B 198f6ad24569900a028965c64c503d413ee1a7e971491b81280b619b4e53d96648bd8958aa991c35c703f36c5b5ced17eb45adf492fee7d8cd621a3f9171c396 SHA512 4d06204a670ff5348abda91e6ec82857505feed5c740ea606893355ecefb65509dfda8355b079ab1e48d7091bd270ac55714b1ea4edfb3261aa6097f476f73a9 MISC metadata.xml 646 BLAKE2B 167cb95fb064b2470cdbb6b625f7d6e24aacac57081a1177fdc9e878b4cf1a20c6b86a7e621530b45bc7db5f07e173a47829fd5be9dde6f9b9fcf54a39f24236 SHA512 9f6501b6a14f860be69e29baaace61fe4c964413b8c43882bf06144406333f4d69d6adaa315503dc83fbdb467cd47e3d752ed6abe4b78bd5cb32fb9f3be1ac1d diff --git a/media-gfx/gimp/gimp-2.99.10-r2.ebuild b/media-gfx/gimp/gimp-2.99.14.ebuild index c83351d463e4..3b46b2c60b3c 100644 --- a/media-gfx/gimp/gimp-2.99.10-r2.ebuild +++ b/media-gfx/gimp/gimp-2.99.14.ebuild @@ -4,20 +4,20 @@ EAPI=8 LUA_COMPAT=( luajit ) -PYTHON_COMPAT=( python3_{8..10} ) -GNOME2_EAUTORECONF=yes -VALA_MIN_API_VERSION="0.44" +PYTHON_COMPAT=( python3_{8..11} ) +VALA_MIN_API_VERSION="0.50" VALA_USE_DEPEND=vapigen -inherit gnome2 lua-single python-single-r1 toolchain-funcs vala virtualx +inherit lua-single meson python-single-r1 vala xdg DESCRIPTION="GNU Image Manipulation Program" HOMEPAGE="https://www.gimp.org/" -SRC_URI="mirror://gimp/v$(ver_cut 1-2)/${P}.tar.bz2" +SRC_URI="mirror://gimp/v$(ver_cut 1-2)/${P}.tar.xz" + LICENSE="GPL-3+ LGPL-3+" SLOT="0/3" -IUSE="aalib alsa aqua doc gnome heif javascript jpeg2k jpegxl lua mng openexr postscript python udev unwind vala vector-icons webp wmf xpm cpu_flags_ppc_altivec cpu_flags_x86_mmx cpu_flags_x86_sse" +IUSE="X aalib alsa doc gnome heif javascript jpeg2k jpegxl lua mng openexr postscript python test udev unwind vala vector-icons webp wmf xpm" REQUIRED_USE=" lua? ( ${LUA_REQUIRED_USE} ) python? ( ${PYTHON_REQUIRED_USE} ) @@ -28,38 +28,36 @@ RESTRICT="!test? ( test )" # media-libs/{babl,gegl} are required to be built with USE="introspection" # to fix the compilation checking of /usr/share/gir-1.0/{Babl-0.1gir,Gegl-0.4.gir} COMMON_DEPEND=" + >=app-accessibility/at-spi2-core-2.46.0 >=app-text/poppler-0.90.1[cairo] >=app-text/poppler-data-0.4.9 >=dev-libs/appstream-glib-0.7.16 - >=dev-libs/atk-2.34.1 >=dev-libs/glib-2.68.0:2 >=dev-libs/json-glib-1.4.4 dev-libs/libxml2:2 dev-libs/libxslt >=gnome-base/librsvg-2.40.21:2 >=media-gfx/mypaint-brushes-2.0.2:= - >=media-libs/babl-0.1.90[introspection,lcms,vala?] + >=media-libs/babl-0.1.98[introspection,lcms,vala?] >=media-libs/fontconfig-2.12.6 >=media-libs/freetype-2.10.2 - >=media-libs/gegl-0.4.36:0.4[cairo,introspection,lcms,vala?] - >=media-libs/gexiv2-0.12.2 + >=media-libs/gegl-0.4.40:0.4[cairo,introspection,lcms,vala?] + >=media-libs/gexiv2-0.14.0 >=media-libs/harfbuzz-2.6.5:= - >=media-libs/lcms-2.9:2 + >=media-libs/lcms-2.13.1:2 + media-libs/libjpeg-turbo >=media-libs/libmypaint-1.6.1:= >=media-libs/libpng-1.6.37:0= >=media-libs/tiff-4.1.0:0 net-libs/glib-networking[ssl] sys-libs/zlib - virtual/jpeg >=x11-libs/cairo-1.16.0 >=x11-libs/gdk-pixbuf-2.40.0:2[introspection] >=x11-libs/gtk+-3.24.16:3[introspection] - x11-libs/libXcursor >=x11-libs/pango-1.44.7 aalib? ( media-libs/aalib ) alsa? ( >=media-libs/alsa-lib-1.0.0 ) - aqua? ( >=x11-libs/gtk-mac-integration-2.0.0 ) - heif? ( >=media-libs/libheif-1.9.1:= ) + heif? ( >=media-libs/libheif-1.13.0:= ) javascript? ( dev-libs/gjs ) jpeg2k? ( >=media-libs/openjpeg-2.3.1:2= ) jpegxl? ( >=media-libs/libjxl-0.6.1:= ) @@ -82,6 +80,7 @@ COMMON_DEPEND=" unwind? ( >=sys-libs/libunwind-1.1.0:= ) webp? ( >=media-libs/libwebp-0.6.0:= ) wmf? ( >=media-libs/libwmf-0.2.8 ) + X? ( x11-libs/libXcursor ) xpm? ( x11-libs/libXpm ) " @@ -93,27 +92,24 @@ RDEPEND=" DEPEND=" ${COMMON_DEPEND} - >=dev-lang/perl-5.30.3 - dev-util/gdbus-codegen - dev-util/gtk-update-icon-cache - >=dev-util/intltool-0.51.0 - >=sys-devel/autoconf-2.54 - >=sys-devel/automake-1.11 - >=sys-devel/gettext-0.21 - >=sys-devel/libtool-2.4.6 - doc? ( dev-util/gi-docgen ) + test? ( x11-misc/xvfb-run ) vala? ( $(vala_depend) ) " # TODO: there are probably more atoms in DEPEND which should be in BDEPEND now -BDEPEND="virtual/pkgconfig" - -DOCS=( "AUTHORS" "devel-docs/CODING_STYLE.md" "devel-docs/HACKING.md" "NEWS" "README" "README.i18n" ) +BDEPEND=" + >=dev-lang/perl-5.30.3 + dev-util/gdbus-codegen + >=sys-devel/gettext-0.21 + doc? ( + app-text/yelp-tools + dev-libs/gobject-introspection[doctool] + dev-util/gi-docgen + ) + virtual/pkgconfig +" -# Bugs 685210 (and duplicate 691070) -PATCHES=( - "${FILESDIR}/${PN}-2.10_fix_test-appdata.patch" -) +DOCS=( "AUTHORS" "devel-docs/HACKING.md" "NEWS" "README" "README.i18n" ) pkg_setup() { use lua && lua-single_pkg_setup @@ -124,17 +120,21 @@ pkg_setup() { } src_prepare() { - sed -i -e 's/mypaint-brushes-1.0/mypaint-brushes-2.0/' configure.ac || die #737794 + default - sed -i -e 's/== "xquartz"/= "xquartz"/' configure.ac || die #494864 - sed 's:-DGIMP_DISABLE_DEPRECATED:-DGIMP_protect_DISABLE_DEPRECATED:g' -i configure.ac || die #615144 + sed -i -e 's/mypaint-brushes-1.0/mypaint-brushes-2.0/' meson.build || die #737794 - gnome2_src_prepare # calls eautoreconf + # Fix Gimp and GimpUI devel doc installation paths + sed -i -e "s/'doc'/'gtk-doc'/" devel-docs/reference/gimp/meson.build || die + sed -i -e "s/'doc'/'gtk-doc'/" devel-docs/reference/gimp-ui/meson.build || die - sed 's:-DGIMP_protect_DISABLE_DEPRECATED:-DGIMP_DISABLE_DEPRECATED:g' -i configure || die #615144 - grep -F -q GIMP_DISABLE_DEPRECATED configure || die #615144, self-test + # Fix pygimp.interp python implementation path. + # Meson @PYTHON_PATH@ use sandbox path e.g.: + # '/var/tmp/portage/media-gfx/gimp-2.99.12/temp/python3.10/bin/python3' + sed -i -e 's/@PYTHON_PATH@/'${EPYTHON}'/' plug-ins/python/pygimp.interp.in || die - export CC_FOR_BUILD="$(tc-getBUILD_CC)" + # Set proper intallation path of documentation logo + sed -i -e "s/'gimp-@0@'.format(gimp_app_version)/'gimp-@0@.@1@'.format(gimp_app_version, gimp_app_version_micro)/" data/images/meson.build || die } _adjust_sandbox() { @@ -156,77 +156,67 @@ src_configure() { use vala && vala_setup - local myconf=( - GEGL="${EPREFIX}"/usr/bin/gegl-0.4 - GDBUS_CODEGEN="${EPREFIX}"/usr/bin/gdbus-codegen - - --enable-default-binary - - --disable-check-update - --enable-mp - --with-appdata-test - --with-bug-report-url=https://bugs.gentoo.org/ - --with-xmc - --without-libbacktrace - --without-webkit - --without-xvfb-run - $(use_enable cpu_flags_ppc_altivec altivec) - $(use_enable cpu_flags_x86_mmx mmx) - $(use_enable cpu_flags_x86_sse sse) - $(use_enable doc gi-docgen) - $(use_enable vector-icons) - $(use_with aalib aa) - $(use_with alsa) - $(use_with !aqua x) - $(use_with heif libheif) - $(use_with javascript) - $(use_with jpeg2k jpeg2000) - $(use_with jpegxl) - $(use_with lua) - $(use_with mng libmng) - $(use_with openexr) - $(use_with postscript gs) - $(use_with python) - $(use_with udev gudev) - $(use_with unwind libunwind) - $(use_with vala) - $(use_with webp) - $(use_with wmf) - $(use_with xpm libxpm) + local emesonargs=( + -Denable-default-bin=true + + -Dcheck-update=no + -Denable-multiproc=true + -Dappdata-test=disabled + -Dbug-report-url=https://bugs.gentoo.org/ + -Dlibbacktrace=false + -Dwebkit-unmaintained=false + $(meson_feature aalib aa) + $(meson_feature alsa) + $(meson_feature doc gi-docgen) + $(meson_feature heif) + $(meson_feature jpeg2k jpeg2000) + $(meson_feature jpegxl jpeg-xl) + $(meson_feature mng) + $(meson_feature openexr) + $(meson_feature postscript ghostscript) + $(meson_feature test headless-tests) + $(meson_feature udev gudev) + $(meson_feature vala vala-plugins) + $(meson_feature webp) + $(meson_feature wmf) + $(meson_feature X xcursor) + $(meson_feature xpm) + $(meson_use doc g-ir-doc) + $(meson_use javascript) + $(meson_use lua) + $(meson_use python) + $(meson_use unwind libunwind) + $(meson_use vector-icons) ) - gnome2_src_configure "${myconf[@]}" + meson_src_configure } src_compile() { export XDG_DATA_DIRS="${EPREFIX}"/usr/share # bug 587004 - gnome2_src_compile + meson_src_compile } # for https://bugs.gentoo.org/664938 _rename_plugins() { einfo 'Renaming plug-ins to not collide with pre-2.10.6 file layout (bug #664938)...' - local prefix=gimp-org- + local prename=gimp-org- ( cd "${ED}"/usr/$(get_libdir)/gimp/2.99/plug-ins || exit 1 for plugin_slash in $(ls -d1 */); do - plugin=${plugin_slash%/} - if [[ -f ${plugin}/${plugin} ]]; then - # NOTE: Folder and file name need to match for Gimp to load that plug-in - # so "file-svg/file-svg" becomes "${prefix}file-svg/${prefix}file-svg" - mv ${plugin}/{,${prefix}}${plugin} || exit 1 - mv {,${prefix}}${plugin} || exit 1 - fi + plugin=${plugin_slash%/} + if [[ -f ${plugin}/${plugin} ]]; then + # NOTE: Folder and file name need to match for Gimp to load that plug-in + # so "file-svg/file-svg" becomes "${prename}file-svg/${prename}file-svg" + mv ${plugin}/{,${prename}}${plugin} || exit 1 + mv {,${prename}}${plugin} || exit 1 + fi done ) } -src_test() { - virtx emake check -} - src_install() { - gnome2_src_install + meson_src_install if use python; then python_optimize @@ -241,13 +231,20 @@ src_install() { # Prevent dead symlink gimp-console.1 from downstream man page compression (bug #433527) mv "${ED}"/usr/share/man/man1/gimp-console{-*,}.1 || die + # Create symlinks for Gimp exec in /usr/bin + dosym "${ESYSROOT}"/usr/bin/gimp-2.99 /usr/bin/gimp + dosym "${ESYSROOT}"/usr/bin/gimp-console-2.99 /usr/bin/gimp-console + dosym "${ESYSROOT}"/usr/bin/gimp-script-fu-interpreter-3.0 /usr/bin/gimp-script-fu-interpreter + dosym "${ESYSROOT}"/usr/bin/gimp-test-clipboard-2.99 /usr/bin/gimp-test-clipboard + dosym "${ESYSROOT}"/usr/bin/gimptool-2.99 /usr/bin/gimptool + _rename_plugins || die } pkg_postinst() { - gnome2_pkg_postinst + xdg_desktop_database_update } pkg_postrm() { - gnome2_pkg_postrm + xdg_desktop_database_update } diff --git a/media-gfx/gimp/gimp-9999.ebuild b/media-gfx/gimp/gimp-9999.ebuild index ab1bc5eb943f..20c37382e07c 100644 --- a/media-gfx/gimp/gimp-9999.ebuild +++ b/media-gfx/gimp/gimp-9999.ebuild @@ -28,23 +28,23 @@ RESTRICT="!test? ( test )" # media-libs/{babl,gegl} are required to be built with USE="introspection" # to fix the compilation checking of /usr/share/gir-1.0/{Babl-0.1gir,Gegl-0.4.gir} COMMON_DEPEND=" + >=app-accessibility/at-spi2-core-2.46.0 >=app-text/poppler-0.90.1[cairo] >=app-text/poppler-data-0.4.9 >=dev-libs/appstream-glib-0.7.16 - >=dev-libs/atk-2.34.1 >=dev-libs/glib-2.68.0:2 >=dev-libs/json-glib-1.4.4 dev-libs/libxml2:2 dev-libs/libxslt >=gnome-base/librsvg-2.40.21:2 >=media-gfx/mypaint-brushes-2.0.2:= - >=media-libs/babl-0.1.96[introspection,lcms,vala?] + >=media-libs/babl-0.1.98[introspection,lcms,vala?] >=media-libs/fontconfig-2.12.6 >=media-libs/freetype-2.10.2 - >=media-libs/gegl-0.4.38:0.4[cairo,introspection,lcms,vala?] + >=media-libs/gegl-0.4.40:0.4[cairo,introspection,lcms,vala?] >=media-libs/gexiv2-0.14.0 >=media-libs/harfbuzz-2.6.5:= - >=media-libs/lcms-2.9:2 + >=media-libs/lcms-2.13.1:2 media-libs/libjpeg-turbo >=media-libs/libmypaint-1.6.1:= >=media-libs/libpng-1.6.37:0= @@ -57,7 +57,7 @@ COMMON_DEPEND=" >=x11-libs/pango-1.44.7 aalib? ( media-libs/aalib ) alsa? ( >=media-libs/alsa-lib-1.0.0 ) - heif? ( >=media-libs/libheif-1.9.1:= ) + heif? ( >=media-libs/libheif-1.13.0:= ) javascript? ( dev-libs/gjs ) jpeg2k? ( >=media-libs/openjpeg-2.3.1:2= ) jpegxl? ( >=media-libs/libjxl-0.6.1:= ) |