commit:     0b15a5d54e8aacdc57ba851e75d4e90b00b45e72
Author:     Sergey Torokhov <torokhov-s-a <AT> yandex <DOT> ru>
AuthorDate: Sun May  5 13:59:56 2024 +0000
Commit:     Viorel Munteanu <ceamac <AT> gentoo <DOT> org>
CommitDate: Sun Jun 23 07:15:06 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0b15a5d5

media-gfx/gimp: 2.10.38 version bump

Signed-off-by: Sergey Torokhov <torokhov-s-a <AT> yandex.ru>
Closes: https://github.com/gentoo/gentoo/pull/36570
Signed-off-by: Viorel Munteanu <ceamac <AT> gentoo.org>

 media-gfx/gimp/Manifest            |   1 +
 media-gfx/gimp/gimp-2.10.38.ebuild | 226 +++++++++++++++++++++++++++++++++++++
 2 files changed, 227 insertions(+)

diff --git a/media-gfx/gimp/Manifest b/media-gfx/gimp/Manifest
index b5ca0b16e48e..579449a517b7 100644
--- a/media-gfx/gimp/Manifest
+++ b/media-gfx/gimp/Manifest
@@ -1,3 +1,4 @@
 DIST gimp-2.10.34.tar.bz2 31405329 BLAKE2B 
0b2d3a81abf89684bb90e2101896db3479a25c5da76738543dba8d0378e64608eee9aeb24888e15f5e347f72fa1df3e9b82aa27e503ee61d1c4d45d44fa7bddc
 SHA512 
4802ce3758daba868570f1ac97a3f1cb41e1130fcc6376f9bf4c999441f8fd25937aa71b6f726d82d7c780f4153b11d2595bb76bc2356a42266909fbcc0bd34a
 DIST gimp-2.10.36.tar.bz2 31532334 BLAKE2B 
d033cd1407df3399b5968b7e3f7838d288143080b516476a5dd46599b6a84ac2efca591521368cef7a1c3d9935b45ed3262fb469e1ae36ccf60a1199f5cfa44d
 SHA512 
dbe6152ea6ff99cca59bbf2c88a64fb4ff6b529d98ace7723eadf5dfb0e10d9cbaf2de1e0d5251e9ecf9abca73da9ae1a501f229997802fd4077fb9594f4ba66
+DIST gimp-2.10.38.tar.bz2 31698453 BLAKE2B 
58c29e3e00d873e69a5e5f4e9c3ff4d868ccfb11914570306ef12c54ca7d3ef89a62d8c71fac1f2d1f426ac615dc4caf7a7260351c00301dce2b1aa4193bab6d
 SHA512 
343bf1c3bd14bf8e7c7af79c05920faca213da68549127c1d8af53e2e872e55aeaf39a3cfcf578183a34fdc4f98e1c859be63956b0611067186eefd1fdee2aaa
 DIST gimp-2.99.18.tar.xz 25418968 BLAKE2B 
ccb76bb5c375925d4d71505f3e1546f05ba0e20533859b1b6250a4d9054efb6bec4927a5e0c525272fa24d5a6bdf4fb7881d60a1d34b1210ee38b90e661ef707
 SHA512 
151ccd0322601e76ed0198b40832ab0b6c138428f2e75806dd558e29c9b3437d9226a243142bf4a86113fa5ea4f5965b99cf7cd0ab0ecb7bdfc48036de35a9c6

diff --git a/media-gfx/gimp/gimp-2.10.38.ebuild 
b/media-gfx/gimp/gimp-2.10.38.ebuild
new file mode 100644
index 000000000000..3746698cb6e8
--- /dev/null
+++ b/media-gfx/gimp/gimp-2.10.38.ebuild
@@ -0,0 +1,226 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+GNOME2_EAUTORECONF=yes
+WANT_AUTOMAKE=
+
+inherit autotools gnome2 toolchain-funcs virtualx
+
+DESCRIPTION="GNU Image Manipulation Program"
+HOMEPAGE="https://www.gimp.org/";
+SRC_URI="mirror://gimp/v$(ver_cut 1-2)/${P}.tar.bz2"
+LICENSE="GPL-3+ LGPL-3+"
+SLOT="0/2"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~x86"
+
+IUSE="aalib alsa aqua debug doc gnome heif jpeg2k jpegxl mng openexr 
postscript udev unwind vector-icons webp wmf xpm cpu_flags_ppc_altivec 
cpu_flags_x86_mmx cpu_flags_x86_sse"
+
+RESTRICT="!test? ( test )"
+
+COMMON_DEPEND="
+       >=app-accessibility/at-spi2-core-2.50.1
+       app-arch/bzip2
+       app-arch/xz-utils
+       >=app-text/poppler-0.50[cairo]
+       >=app-text/poppler-data-0.4.7
+       >=dev-libs/glib-2.56.2:2
+       >=dev-libs/json-glib-1.2.6
+       >=gnome-base/librsvg-2.40.6:2
+       >=media-gfx/mypaint-brushes-2.0.2:=
+       >=media-libs/babl-0.1.98
+       >=media-libs/fontconfig-2.12.4
+       >=media-libs/freetype-2.1.7
+       >=media-libs/gegl-0.4.40:0.4[cairo]
+       >=media-libs/gexiv2-0.10.6
+       >=media-libs/harfbuzz-0.9.19:=
+       >=media-libs/lcms-2.8:2
+       media-libs/libjpeg-turbo:=
+       >=media-libs/libmypaint-1.6.1:=
+       >=media-libs/libpng-1.6.25:0=
+       >=media-libs/tiff-3.5.7:=
+       net-libs/glib-networking[ssl]
+       sys-libs/zlib
+       >=x11-libs/cairo-1.12.2
+       >=x11-libs/gdk-pixbuf-2.31:2
+       >=x11-libs/gtk+-2.24.32:2
+       x11-libs/libX11
+       x11-libs/libXcursor
+       x11-libs/libXext
+       x11-libs/libXfixes
+       x11-libs/libXmu
+       >=x11-libs/pango-1.29.4
+       aalib? ( media-libs/aalib )
+       alsa? ( >=media-libs/alsa-lib-1.0.0 )
+       aqua? ( >=x11-libs/gtk-mac-integration-2.0.0 )
+       heif? ( >=media-libs/libheif-1.9.1:= )
+       jpeg2k? ( >=media-libs/openjpeg-2.1.0:2= )
+       jpegxl? ( >=media-libs/libjxl-0.7.0:= )
+       mng? ( media-libs/libmng:= )
+       openexr? ( >=media-libs/openexr-1.6.1:= )
+       postscript? ( app-text/ghostscript-gpl:= )
+       udev? ( dev-libs/libgudev )
+       unwind? ( >=sys-libs/libunwind-1.1.0:= )
+       webp? ( >=media-libs/libwebp-0.6.0:= )
+       wmf? ( >=media-libs/libwmf-0.2.8 )
+       xpm? ( x11-libs/libXpm )
+"
+
+RDEPEND="
+       ${COMMON_DEPEND}
+       x11-themes/hicolor-icon-theme
+       gnome? ( gnome-base/gvfs )
+"
+
+DEPEND="
+       ${COMMON_DEPEND}
+       dev-libs/libxml2:2
+       dev-libs/libxslt
+"
+
+BDEPEND="
+       >=dev-build/gtk-doc-am-1
+       >=dev-lang/perl-5.10.0
+       dev-libs/appstream-glib
+       dev-util/gtk-update-icon-cache
+       >=dev-util/intltool-0.40.1
+       >=sys-devel/gettext-0.19.8
+       >=dev-build/libtool-2.2
+       virtual/pkgconfig
+"
+
+DOCS=( "AUTHORS" "ChangeLog" "HACKING" "NEWS" "README" "README.i18n" )
+
+PATCHES=(
+       "${FILESDIR}/${PN}-2.10_fix_test-appdata.patch" # Bugs 685210 (and 
duplicate 691070)
+       "${FILESDIR}/${PN}-2.10_fix_musl_backtrace_backend_switch.patch" #900148
+       
"${FILESDIR}/${PN}-2.10_fix_configure_GCC13_implicit_function_declarations.patch"
 #899796
+       "${FILESDIR}/${PN}-2.10.36_c99_tiff.patch" #919282
+       "${FILESDIR}/${PN}-2.10.36_c99_metadata.patch" #919282
+)
+
+src_prepare() {
+       sed -i -e 's/mypaint-brushes-1.0/mypaint-brushes-2.0/' configure.ac || 
die #737794
+
+       sed -i -e 's/== "xquartz"/= "xquartz"/' configure.ac || die #494864
+       sed 's/-DGIMP_DISABLE_DEPRECATED/-DGIMP_protect_DISABLE_DEPRECATED/g' 
-i configure.ac || die #615144
+
+       gnome2_src_prepare  # calls eautoreconf
+
+       sed 's/-DGIMP_protect_DISABLE_DEPRECATED/-DGIMP_DISABLE_DEPRECATED/g' 
-i configure || die #615144
+       grep -F -q GIMP_DISABLE_DEPRECATED configure || die #615144, self-test
+
+       export CC_FOR_BUILD="$(tc-getBUILD_CC)"
+}
+
+_adjust_sandbox() {
+       # Bugs #569738 and #591214
+       local nv
+       for nv in /dev/nvidia-uvm /dev/nvidiactl /dev/nvidia{0..9} ; do
+               # We do not check for existence as they may show up later
+               # https://bugs.gentoo.org/show_bug.cgi?id=569738#c21
+               addwrite "${nv}"
+       done
+
+       addwrite /dev/dri/  # bugs #574038 and #684886
+       addwrite /dev/ati/  # bug #589198
+       addwrite /proc/mtrr  # bug #589198
+}
+
+src_configure() {
+       _adjust_sandbox
+
+       local myconf=(
+               GEGL="${EPREFIX}"/usr/bin/gegl-0.4
+               GDBUS_CODEGEN="${EPREFIX}"/bin/false
+
+               --enable-default-binary
+
+               --disable-check-update
+               --disable-python
+               --enable-mp
+               --with-appdata-test
+               --with-bug-report-url=https://bugs.gentoo.org/
+               --with-xmc
+               --without-libbacktrace
+               --without-webkit
+               --without-xvfb-run
+               $(use_enable cpu_flags_ppc_altivec altivec)
+               $(use_enable cpu_flags_x86_mmx mmx)
+               $(use_enable cpu_flags_x86_sse sse)
+               $(use_enable debug)
+               $(use_enable vector-icons)
+               $(use_with aalib aa)
+               $(use_with alsa)
+               $(use_with !aqua x)
+               $(use_with heif libheif)
+               $(use_with jpeg2k jpeg2000)
+               $(use_with jpegxl)
+               $(use_with mng libmng)
+               $(use_with openexr)
+               $(use_with postscript gs)
+               $(use_with udev gudev)
+               $(use_with unwind libunwind)
+               $(use_with webp)
+               $(use_with wmf)
+               $(use_with xpm libxpm)
+       )
+
+       gnome2_src_configure "${myconf[@]}"
+}
+
+src_compile() {
+       export XDG_DATA_DIRS="${EPREFIX}"/usr/share  # bug 587004
+       gnome2_src_compile
+}
+
+# for https://bugs.gentoo.org/664938
+_rename_plugins() {
+       einfo 'Renaming plug-ins to not collide with pre-2.10.6 file layout 
(bug #664938)...'
+       local prename=gimp-org-
+       (
+               cd "${ED}"/usr/$(get_libdir)/gimp/2.0/plug-ins || die
+               for plugin_slash in $(ls -d1 */); do
+                   plugin=${plugin_slash%/}
+                   if [[ -f ${plugin}/${plugin} ]]; then
+                       # NOTE: Folder and file name need to match for Gimp to 
load that plug-in
+                       #       so "file-svg/file-svg" becomes 
"${prename}file-svg/${prename}file-svg"
+                       mv ${plugin}/{,${prename}}${plugin} || die
+                       mv {,${prename}}${plugin} || die
+                   fi
+               done
+       )
+}
+
+src_test() {
+       virtx emake check
+}
+
+src_install() {
+       gnome2_src_install
+
+       # Workaround for bug #321111 to give GIMP the least
+       # precedence on PDF documents by default
+       mv "${ED}"/usr/share/applications/{,zzz-}gimp.desktop || die
+
+       find "${ED}" -name '*.la' -type f -delete || die
+
+       # Prevent dead symlink gimp-console.1 from downstream man page 
compression (bug #433527)
+       local gimp_app_version=$(ver_cut 1-2)
+       mv "${ED}"/usr/share/man/man1/gimp-console{-${gimp_app_version},}.1 || 
die
+
+       # Remove gimp devel-docs html files if user doesn't need it
+       if ! use doc; then
+               rm -r "${ED}"/usr/share/gtk-doc || die
+       fi
+
+       _rename_plugins || die
+}
+
+pkg_postinst() {
+       gnome2_pkg_postinst
+}
+
+pkg_postrm() {
+       gnome2_pkg_postrm
+}

Reply via email to