CVS commit: pkgsrc/graphics/gimp

["Thomas Klausner" <wiz%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   wiz
Date:           Sun Dec 29 10:23:27 UTC 2024

Modified Files:
        pkgsrc/graphics/gimp: Makefile distinfo
        pkgsrc/graphics/gimp/patches: patch-ab patch-configure.ac

Log Message:
gimp: fix detection of SVG gdkpixbufloader

The name changed in the latest librsvg.

XXX: or remove this check completely


To generate a diff of this commit:
cvs rdiff -u -r1.406 -r1.407 pkgsrc/graphics/gimp/Makefile
cvs rdiff -u -r1.118 -r1.119 pkgsrc/graphics/gimp/distinfo
cvs rdiff -u -r1.45 -r1.46 pkgsrc/graphics/gimp/patches/patch-ab
cvs rdiff -u -r1.1 -r1.2 pkgsrc/graphics/gimp/patches/patch-configure.ac

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/graphics/gimp/Makefile
diff -u pkgsrc/graphics/gimp/Makefile:1.406 pkgsrc/graphics/gimp/Makefile:1.407
--- pkgsrc/graphics/gimp/Makefile:1.406 Fri Dec 27 08:19:55 2024
+++ pkgsrc/graphics/gimp/Makefile       Sun Dec 29 10:23:26 2024
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.406 2024/12/27 08:19:55 wiz Exp $
+# $NetBSD: Makefile,v 1.407 2024/12/29 10:23:26 wiz Exp $
 
 DISTNAME=      gimp-2.10.38
 PKGREVISION=   11
@@ -32,6 +32,7 @@ GNU_CONFIGURE=                yes
 CONFIGURE_ARGS+=       --disable-alsatest
 CONFIGURE_ARGS+=       --disable-glibtest
 CONFIGURE_ARGS+=       --disable-gtktest
+CONFIGURE_ARGS+=       --enable-vector-icons
 CONFIGURE_ARGS+=       --sysconfdir=${PKG_SYSCONFDIR}
 CONFIGURE_ARGS+=       --without-linux-input
 CONFIGURE_ARGS+=       --without-gs

Index: pkgsrc/graphics/gimp/distinfo
diff -u pkgsrc/graphics/gimp/distinfo:1.118 pkgsrc/graphics/gimp/distinfo:1.119
--- pkgsrc/graphics/gimp/distinfo:1.118 Mon Jul 15 11:39:40 2024
+++ pkgsrc/graphics/gimp/distinfo       Sun Dec 29 10:23:26 2024
@@ -1,13 +1,13 @@
-$NetBSD: distinfo,v 1.118 2024/07/15 11:39:40 ryoon Exp $
+$NetBSD: distinfo,v 1.119 2024/12/29 10:23:26 wiz Exp $
 
 BLAKE2s (gimp-2.10.38.tar.bz2) = 337d56b37f1153ed939203be9b26b12152c628b63327da1cb7510c6e06959a5c
 SHA512 (gimp-2.10.38.tar.bz2) = 343bf1c3bd14bf8e7c7af79c05920faca213da68549127c1d8af53e2e872e55aeaf39a3cfcf578183a34fdc4f98e1c859be63956b0611067186eefd1fdee2aaa
 Size (gimp-2.10.38.tar.bz2) = 31698453 bytes
 SHA1 (patch-aa) = 403c46d7070de208769e99e512922ba3a5b7129b
-SHA1 (patch-ab) = 684bc8868561ab96db0a6a56afdcc7cdcdc5f26b
+SHA1 (patch-ab) = fe1c19be8ff9d528cd12bcebdf0c34eb0f35826b
 SHA1 (patch-app_core_gimpbrush-transform.cc) = 3bd3f69401ee7dabb53f7ebf533870ee9add856c
 SHA1 (patch-app_gui_gui.c) = 781a44f0779305b9d39deb14f4b8ef1cf06137ff
-SHA1 (patch-configure.ac) = c7e89bc9fd576eb95a9288eccea8959cbe1ee6de
+SHA1 (patch-configure.ac) = b018c44183d47131e1d7d282cc41e1131ecefa1a
 SHA1 (patch-plug-ins_common_file-mng.c) = 8ed244997cdef7125e1aa5da4d0fac5068ad5159
 SHA1 (patch-plug-ins_pygimp_py-compile) = 59dcdd00073b737f8f52e6a56832722033ee5703
 SHA1 (patch-plug-ins_script-fu_script-fu-server.c) = c424b1a8e345ec3d0763ac2cf1f8535da9e10797

Index: pkgsrc/graphics/gimp/patches/patch-ab
diff -u pkgsrc/graphics/gimp/patches/patch-ab:1.45 pkgsrc/graphics/gimp/patches/patch-ab:1.46
--- pkgsrc/graphics/gimp/patches/patch-ab:1.45  Mon Jul 15 11:39:40 2024
+++ pkgsrc/graphics/gimp/patches/patch-ab       Sun Dec 29 10:23:26 2024
@@ -1,4 +1,4 @@
-$NetBSD: patch-ab,v 1.45 2024/07/15 11:39:40 ryoon Exp $
+$NetBSD: patch-ab,v 1.46 2024/12/29 10:23:26 wiz Exp $
 
 CC_VERSION_OPTS for gcc is modified to avoid going through the link
 stage. If pkgsrc appends or prepends any linker flags through
@@ -8,6 +8,8 @@ fail because GCC will try to link the no
 As of libheif-1.18.0, builtin_h265_decoder and so on are not available
 anymore.
 
+Fix gdkpixbufloader name for svg.
+
 --- configure.orig     2024-05-03 00:36:33.000000000 +0000
 +++ configure
 @@ -21054,11 +21054,11 @@ WARNING: GCC 7.2.0 has a serious bug aff
@@ -42,6 +44,15 @@ anymore.
    if test "x$can_import_avif" = xyes; then
      MIME_TYPES="$MIME_TYPES;image/avif"
    fi
+@@ -33906,7 +33906,7 @@ fi
+     # So let's test files the shell way.
+     if (test "x$platform_win32" = "xyes" &&
+         test -f "$gdk_pixbuf_moduledir/libpixbufloader-svg.dll") ||
+-       test -f "$gdk_pixbuf_moduledir/libpixbufloader-svg.so"; then
++       test -f "$gdk_pixbuf_moduledir/libpixbufloader_svg.so"; then
+       # We must not use $PKG_CONFIG nor PKG_CHECK_* macros because we need
+       # to make sure we use the native pkg-config (in case we cross-compile).
+       if pkg-config --atleast-version=2.56.2 glib-2.0 &&
 @@ -34799,7 +34799,7 @@ esac
  
  gimpdatadir="$datadir/$PACKAGE/2.0"

Index: pkgsrc/graphics/gimp/patches/patch-configure.ac
diff -u pkgsrc/graphics/gimp/patches/patch-configure.ac:1.1 pkgsrc/graphics/gimp/patches/patch-configure.ac:1.2
--- pkgsrc/graphics/gimp/patches/patch-configure.ac:1.1 Mon Nov 15 22:13:56 2021
+++ pkgsrc/graphics/gimp/patches/patch-configure.ac     Sun Dec 29 10:23:26 2024
@@ -1,13 +1,13 @@
-$NetBSD: patch-configure.ac,v 1.1 2021/11/15 22:13:56 nia Exp $
+$NetBSD: patch-configure.ac,v 1.2 2024/12/29 10:23:26 wiz Exp $
 
 CC_VERSION_OPTS for gcc is modified to avoid going through the link
 stage. If pkgsrc appends or prepends any linker flags through
 CWRAPPERS (e.g. for MKRELRO), getting the version of the compiler may
 fail because GCC will try to link the nonexistent program.
 
---- configure.ac.orig  2021-09-14 15:53:08.000000000 +0000
+--- configure.ac.orig  2024-05-03 00:33:34.000000000 +0000
 +++ configure.ac
-@@ -576,11 +576,11 @@ WARNING: GCC 7.2.0 has a serious bug aff
+@@ -589,11 +589,11 @@ WARNING: GCC 7.2.0 has a serious bug aff
           See https://bugzilla.gnome.org/show_bug.cgi?id=787222";
    fi
    # For GCC, use -v which has more information than --version.
@@ -21,3 +21,12 @@ fail because GCC will try to link the no
  fi
  
  for CC_VERSION_OPT in $CC_VERSION_OPTS; do
+@@ -2505,7 +2505,7 @@ if test "x$enable_vector_icons" != "xno"
+     # So let's test files the shell way.
+     if (test "x$platform_win32" = "xyes" &&
+         test -f "$gdk_pixbuf_moduledir/libpixbufloader-svg.dll") ||
+-       test -f "$gdk_pixbuf_moduledir/libpixbufloader-svg.so"; then
++       test -f "$gdk_pixbuf_moduledir/libpixbufloader_svg.so"; then
+       # We must not use $PKG_CONFIG nor PKG_CHECK_* macros because we need
+       # to make sure we use the native pkg-config (in case we cross-compile).
+       if pkg-config --atleast-version=glib_required_version glib-2.0 &&