gimp-devel: add some dependencies, remove some patches

[Thomas Klausner <wiz%gatalith.at@localhost>]

Module Name:	pkgsrc-wip
Committed By:	Thomas Klausner <wiz%gatalith.at@localhost>
Pushed By:	wiz
Date:		Fri Jul 22 18:46:41 2022 +0200
Changeset:	0ccb893ad1787101923f9083bc4fee1f5342903d

Modified Files:
	gimp-devel/Makefile
	gimp-devel/PLIST
	gimp-devel/distinfo
Removed Files:
	gimp-devel/patches/patch-app_core_gimpbrush-transform.cc
	gimp-devel/patches/patch-configure.ac
	gimp-devel/patches/patch-plug-ins_common_file-mng.c
	gimp-devel/patches/patch-plug-ins_script-fu_script-fu-server.c

Log Message:
gimp-devel: add some dependencies, remove some patches

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=0ccb893ad1787101923f9083bc4fee1f5342903d

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

diffstat:
 gimp-devel/Makefile                                |  9 +++--
 gimp-devel/PLIST                                   |  2 +-
 gimp-devel/distinfo                                |  4 ---
 .../patches/patch-app_core_gimpbrush-transform.cc  | 42 ----------------------
 gimp-devel/patches/patch-configure.ac              | 23 ------------
 .../patches/patch-plug-ins_common_file-mng.c       | 26 --------------
 .../patch-plug-ins_script-fu_script-fu-server.c    | 18 ----------
 7 files changed, 7 insertions(+), 117 deletions(-)

diffs:
diff --git a/gimp-devel/Makefile b/gimp-devel/Makefile
index 91b6980bcd..cbc836ffbe 100644
--- a/gimp-devel/Makefile
+++ b/gimp-devel/Makefile
@@ -14,6 +14,8 @@ BUILD_DEPENDS+=	vera-ttf-[0-9]*:../../fonts/vera-ttf
 TOOL_DEPENDS+=	gettext-tools>=0.19:../../devel/gettext-tools
 TOOL_DEPENDS+=	libxslt-[0-9]*:../../textproc/libxslt
 DEPENDS+=	glib-networking>=2.36.2:../../net/glib-networking
+DEPENDS+=	xdg-utils-[0-9]*:../../misc/xdg-utils
+DEPENDS+=	${PYPKGPREFIX}-gobject3-[0-9]*:../../devel/py-gobject3
 
 USE_LANGUAGES+=		c c++14
 USE_LIBTOOL=		yes
@@ -27,10 +29,8 @@ GNU_CONFIGURE=		yes
 
 CONFIGURE_ARGS+=	--disable-alsatest
 CONFIGURE_ARGS+=	--disable-glibtest
-CONFIGURE_ARGS+=	--disable-gtktest
 CONFIGURE_ARGS+=	--sysconfdir=${PKG_SYSCONFDIR}
 CONFIGURE_ARGS+=	--without-linux-input
-CONFIGURE_ARGS+=	--without-gs
 
 PKG_SYSCONFSUBDIR=	gimp/2.99
 PKGCONFIG_OVERRIDE=	gimp.pc.in
@@ -58,7 +58,7 @@ CONF_FILES+=		${EGDIR}/${f} ${PKG_SYSCONFDIR}/${f}
 _TOOLS_USE_PKGSRC.xgettext=	yes
 
 # Ensure we export symbols in the linked shared object.
-LDFLAGS+=		${EXPORT_SYMBOLS_LDFLAGS}
+#LDFLAGS+=		${EXPORT_SYMBOLS_LDFLAGS}
 
 .if ${OPSYS} == "Darwin"
 PLIST_SUBST+=	GIMP_DEBUG_TOOL_DIR="bin"
@@ -105,9 +105,12 @@ BUILDLINK_API_DEPENDS.gegl+=		gegl>=0.4.36nb4
 .include "../../graphics/libwmf/buildlink3.mk"
 .include "../../lang/vala/buildlink3.mk"
 .include "../../lang/python/application.mk"
+.include "../../print/ghostscript/buildlink3.mk"
 .include "../../print/poppler-data/buildlink3.mk"
 .include "../../print/poppler-glib/buildlink3.mk"
 .include "../../textproc/iso-codes/buildlink3.mk"
 .include "../../x11/gtk3/buildlink3.mk"
+.include "../../x11/libICE/buildlink3.mk"
+.include "../../x11/libXmu/buildlink3.mk"
 .include "../../mk/pthread.buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/gimp-devel/PLIST b/gimp-devel/PLIST
index 69b2773213..7f2e0037b4 100644
--- a/gimp-devel/PLIST
+++ b/gimp-devel/PLIST
@@ -302,6 +302,7 @@ lib/gimp/2.99/plug-ins/file-pdf-save/file-pdf-save
 lib/gimp/2.99/plug-ins/file-pix/file-pix
 lib/gimp/2.99/plug-ins/file-png/file-png
 lib/gimp/2.99/plug-ins/file-pnm/file-pnm
+lib/gimp/2.99/plug-ins/file-ps/file-ps
 lib/gimp/2.99/plug-ins/file-psd/file-psd
 lib/gimp/2.99/plug-ins/file-psp/file-psp
 lib/gimp/2.99/plug-ins/file-raw-data/file-raw-data
@@ -2453,4 +2454,3 @@ share/vala/vapi/gimp-3.0.deps
 share/vala/vapi/gimp-3.0.vapi
 share/vala/vapi/gimp-ui-3.0.deps
 share/vala/vapi/gimp-ui-3.0.vapi
-@pkgdir share/gimp/2.99/fonts
diff --git a/gimp-devel/distinfo b/gimp-devel/distinfo
index 2768e33aba..d77fec41f7 100644
--- a/gimp-devel/distinfo
+++ b/gimp-devel/distinfo
@@ -5,7 +5,3 @@ SHA512 (gimp-2.99.10.tar.bz2) = 898c1e1ffd2270ccc965db9a8263e04d95455535361b47f9
 Size (gimp-2.99.10.tar.bz2) = 26782056 bytes
 SHA1 (patch-aa) = e2b91db783beb4baa7d6344ac0b7d126ef3c3b19
 SHA1 (patch-ab) = 79a42760bdc9362861d9c11b363d21766b8c6412
-SHA1 (patch-app_core_gimpbrush-transform.cc) = 3bd3f69401ee7dabb53f7ebf533870ee9add856c
-SHA1 (patch-configure.ac) = c7e89bc9fd576eb95a9288eccea8959cbe1ee6de
-SHA1 (patch-plug-ins_common_file-mng.c) = 3f64ff0542d2b5524d1ceca8b2a41bd239958e8c
-SHA1 (patch-plug-ins_script-fu_script-fu-server.c) = c424b1a8e345ec3d0763ac2cf1f8535da9e10797
diff --git a/gimp-devel/patches/patch-app_core_gimpbrush-transform.cc b/gimp-devel/patches/patch-app_core_gimpbrush-transform.cc
deleted file mode 100644
index f0f2da9e8e..0000000000
--- a/gimp-devel/patches/patch-app_core_gimpbrush-transform.cc
+++ /dev/null
@@ -1,42 +0,0 @@
-$NetBSD: patch-app_core_gimpbrush-transform.cc,v 1.2 2020/03/04 12:46:01 wiz Exp $
-
-Avoid ambiguous function call.
-
---- app/core/gimpbrush-transform.cc.orig	2020-02-16 14:57:59.000000000 +0000
-+++ app/core/gimpbrush-transform.cc
-@@ -159,7 +159,7 @@ gimp_brush_real_transform_mask (GimpBrus
-    * rectangle.
-    */
-   const gint fraction_bits = 12;
--  const gint int_multiple  = pow (2, fraction_bits);
-+  const gint int_multiple  = pow ((double)2, fraction_bits);
- 
-   /* In inner loop's bilinear calculation, two numbers that were each
-    * previously multiplied by int_multiple are multiplied together.
-@@ -181,7 +181,7 @@ gimp_brush_real_transform_mask (GimpBrus
-    * 2^9     = 0010 0000 0000
-    * 2^9 - 1 = 0001 1111 1111
-    */
--  const guint fraction_bitmask = pow(2, fraction_bits) - 1 ;
-+  const guint fraction_bitmask = pow((double)2, fraction_bits) - 1 ;
- 
-   gimp_brush_transform_get_scale (scale, aspect_ratio,
-                                   &scale_x, &scale_y);
-@@ -473,7 +473,7 @@ gimp_brush_real_transform_pixmap (GimpBr
-    * rectangle.
-    */
-   const gint fraction_bits = 12;
--  const gint int_multiple  = pow (2, fraction_bits);
-+  const gint int_multiple  = pow ((double)2, fraction_bits);
- 
-   /* In inner loop's bilinear calculation, two numbers that were each
-    * previously multiplied by int_multiple are multiplied together.
-@@ -495,7 +495,7 @@ gimp_brush_real_transform_pixmap (GimpBr
-    * 2^9     = 0010 0000 0000
-    * 2^9 - 1 = 0001 1111 1111
-    */
--  const guint fraction_bitmask = pow(2, fraction_bits) - 1 ;
-+  const guint fraction_bitmask = pow((double)2, fraction_bits) - 1 ;
- 
-   gimp_brush_transform_get_scale (scale, aspect_ratio,
-                                   &scale_x, &scale_y);
diff --git a/gimp-devel/patches/patch-configure.ac b/gimp-devel/patches/patch-configure.ac
deleted file mode 100644
index 52e94b0190..0000000000
--- a/gimp-devel/patches/patch-configure.ac
+++ /dev/null
@@ -1,23 +0,0 @@
-$NetBSD: patch-configure.ac,v 1.1 2021/11/15 22:13:56 nia 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
-@@ -576,11 +576,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.
--  CC_VERSION_OPTS="-v"
-+  CC_VERSION_OPTS="-c -v"
- else
-   # This is the list of common options used by autotools to check
-   # versions for various compilers.
--  CC_VERSION_OPTS="--version -v -V -qversion"
-+  CC_VERSION_OPTS="-c --version -v -V -qversion"
- fi
- 
- for CC_VERSION_OPT in $CC_VERSION_OPTS; do
diff --git a/gimp-devel/patches/patch-plug-ins_common_file-mng.c b/gimp-devel/patches/patch-plug-ins_common_file-mng.c
deleted file mode 100644
index edee956230..0000000000
--- a/gimp-devel/patches/patch-plug-ins_common_file-mng.c
+++ /dev/null
@@ -1,26 +0,0 @@
-$NetBSD: patch-plug-ins_common_file-mng.c,v 1.1 2013/10/09 17:39:33 wiz Exp $
-
-Fix build with mng-2.0.2:
-In file included from .../include/libmng.h:386:0,
-                 from file-mng.c:87:
-.../include/libmng_types.h:205:13: error: redefinition of typedef 'boolean'
-.../include/jmorecfg.h:262:13: note: previous declaration of 'boolean' was here
-
---- plug-ins/common/file-mng.c.orig	2022-02-22 22:13:09.000000000 +0000
-+++ plug-ins/common/file-mng.c
-@@ -56,7 +56,6 @@
- /* libpng and jpeglib are currently used in this plug-in. */
- 
- #include <png.h>
--#include <jpeglib.h>
- 
- 
- /* Grrr. The grrr is because the following have to be defined by the
-@@ -87,6 +86,7 @@
- 
- #include <libmng.h>
- 
-+#include <jpeglib.h>
- #include "libgimp/gimp.h"
- #include "libgimp/gimpui.h"
- 
diff --git a/gimp-devel/patches/patch-plug-ins_script-fu_script-fu-server.c b/gimp-devel/patches/patch-plug-ins_script-fu_script-fu-server.c
deleted file mode 100644
index 0e70a870f4..0000000000
--- a/gimp-devel/patches/patch-plug-ins_script-fu_script-fu-server.c
+++ /dev/null
@@ -1,18 +0,0 @@
-$NetBSD: patch-plug-ins_script-fu_script-fu-server.c,v 1.3 2013/02/16 19:43:03 adam Exp $
-
-AI_ADDRCONFIG is not defined on some platforms.
-
---- plug-ins/script-fu/script-fu-server.c.orig	2012-02-04 18:42:45.000000000 +0000
-+++ plug-ins/script-fu/script-fu-server.c
-@@ -460,7 +460,11 @@ server_start (gint         port,
-   const gchar     *progress;
- 
-   memset (&hints, 0, sizeof (hints));
-+#ifdef AI_ADDRCONFIG
-   hints.ai_flags = AI_PASSIVE | AI_ADDRCONFIG;
-+#else
-+  hints.ai_flags = AI_PASSIVE;
-+#endif
-   hints.ai_socktype = SOCK_STREAM;
- 
-   port_s = g_strdup_printf ("%d", port);