gentoo-mirror/gentoo
1
0
Fork 0
mirror of https://github.com/gentoo-mirror/gentoo.git synced 2026-09-24 04:59:14 -07:00
Code Issues Projects Releases Wiki Activity

media-gfx/gimp: gimp-2.10.x, fix media-libs/libheif-1.18 compat

Browse Source 
Closes: https://bugs.gentoo.org/940915
Signed-off-by: Sergey Torokhov <torokhov-s-a@yandex.ru>
Closes: https://github.com/gentoo/gentoo/pull/39017
Signed-off-by: Sam James <sam@gentoo.org>
This commit is contained in:
Sergey Torokhov
2024-10-17 17:08:46 +03:00
committed by Sam James
parent a90294974e
commit b4b9f72802
5 changed files with 42 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
media-gfx/gimp/files/gimp-2.10_libheif-1.18_unconditional_compat.patch Normal file
View File

@@ -0,0 +1,23 @@
Gentoo issue: https://bugs.gentoo.org/940915
diff '--color=auto' -Naur a/configure.ac b/configure.ac
--- a/configure.ac
+++ b/configure.ac
@@ -1843,13 +1843,13 @@
can_import_avif=no
can_export_avif=no
if test "x$have_libheif" = xyes; then
- can_import_heic=`$PKG_CONFIG --variable=builtin_h265_decoder libheif`
- can_export_heic=`$PKG_CONFIG --variable=builtin_h265_encoder libheif`
+ can_import_heic=yes
+ can_export_heic=yes
if test "x$can_import_heic" = xyes; then
MIME_TYPES="$MIME_TYPES;image/heif;image/heic"
fi
- can_import_avif=`$PKG_CONFIG --variable=builtin_avif_decoder libheif`
- can_export_avif=`$PKG_CONFIG --variable=builtin_avif_encoder libheif`
+ can_import_avif=yes
+ can_export_avif=yes
if test "x$can_import_avif" = xyes; then
MIME_TYPES="$MIME_TYPES;image/avif"
fi

6
media-gfx/gimp/gimp-2.10.34-r2.ebuild → media-gfx/gimp/gimp-2.10.34-r3.ebuild
View File

@@ -94,6 +94,10 @@ src_prepare() {
sed -i -e 's/== "xquartz"/= "xquartz"/' configure.ac || die #494864
sed 's/-DGIMP_DISABLE_DEPRECATED/-DGIMP_protect_DISABLE_DEPRECATED/g' -i configure.ac || die #615144
if use heif ; then
has_version -d ">=media-libs/libheif-1.18.0" && eapply "${FILESDIR}/${PN}-2.10_libheif-1.18_unconditional_compat.patch" # 940915
fi
gnome2_src_prepare # calls eautoreconf
sed 's/-DGIMP_protect_DISABLE_DEPRECATED/-DGIMP_DISABLE_DEPRECATED/g' -i configure || die #615144
@@ -192,7 +196,7 @@ src_install() {
# precedence on PDF documents by default
mv "${ED}"/usr/share/applications/{,zzz-}gimp.desktop || die
find "${D}" -name '*.la' -type f -delete || 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)

6
media-gfx/gimp/gimp-2.10.36.ebuild → media-gfx/gimp/gimp-2.10.36-r3.ebuild
View File

@@ -93,6 +93,10 @@ src_prepare() {
sed -i -e 's/== "xquartz"/= "xquartz"/' configure.ac || die #494864
sed 's/-DGIMP_DISABLE_DEPRECATED/-DGIMP_protect_DISABLE_DEPRECATED/g' -i configure.ac || die #615144
if use heif ; then
has_version -d ">=media-libs/libheif-1.18.0" && eapply "${FILESDIR}/${PN}-2.10_libheif-1.18_unconditional_compat.patch" # 940915
fi
gnome2_src_prepare # calls eautoreconf
sed 's/-DGIMP_protect_DISABLE_DEPRECATED/-DGIMP_DISABLE_DEPRECATED/g' -i configure || die #615144
@@ -191,7 +195,7 @@ src_install() {
# precedence on PDF documents by default
mv "${ED}"/usr/share/applications/{,zzz-}gimp.desktop || die
find "${D}" -name '*.la' -type f -delete || 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)

6
media-gfx/gimp/gimp-2.10.36-r2.ebuild → media-gfx/gimp/gimp-2.10.36-r4.ebuild
View File

@@ -96,6 +96,10 @@ src_prepare() {
sed -i -e 's/== "xquartz"/= "xquartz"/' configure.ac || die #494864
sed 's/-DGIMP_DISABLE_DEPRECATED/-DGIMP_protect_DISABLE_DEPRECATED/g' -i configure.ac || die #615144
if use heif ; then
has_version -d ">=media-libs/libheif-1.18.0" && eapply "${FILESDIR}/${PN}-2.10_libheif-1.18_unconditional_compat.patch" # 940915
fi
gnome2_src_prepare # calls eautoreconf
sed 's/-DGIMP_protect_DISABLE_DEPRECATED/-DGIMP_DISABLE_DEPRECATED/g' -i configure || die #615144
@@ -194,7 +198,7 @@ src_install() {
# precedence on PDF documents by default
mv "${ED}"/usr/share/applications/{,zzz-}gimp.desktop || die
find "${D}" -name '*.la' -type f -delete || 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)

4
media-gfx/gimp/gimp-2.10.38.ebuild → media-gfx/gimp/gimp-2.10.38-r1.ebuild
View File

@@ -105,6 +105,10 @@ src_prepare() {
sed -i -e 's/== "xquartz"/= "xquartz"/' configure.ac || die #494864
sed 's/-DGIMP_DISABLE_DEPRECATED/-DGIMP_protect_DISABLE_DEPRECATED/g' -i configure.ac || die #615144
if use heif ; then
has_version -d ">=media-libs/libheif-1.18.0" && eapply "${FILESDIR}/${PN}-2.10_libheif-1.18_unconditional_compat.patch" # 940915
fi
gnome2_src_prepare # calls eautoreconf
sed 's/-DGIMP_protect_DISABLE_DEPRECATED/-DGIMP_DISABLE_DEPRECATED/g' -i configure || die #615144