Content-Transfer-Encoding: 7bit
Content-Type: multipart/mixed; boundary="_----------=_1689359149134740"
MIME-Version: 1.0
Date: Fri, 14 Jul 2023 18:25:49 +0000
From: "Ryo ONODERA" <ryoon@netbsd.org>
Subject: CVS commit: pkgsrc/graphics/gimp
To: pkgsrc-changes@NetBSD.org
Approved: commit_and_comment
Reply-To: ryoon@netbsd.org
Message-Id: <20230714182549.0AB7EFBDB@cvs.NetBSD.org>

This is a multi-part message in MIME format.

--_----------=_1689359149134740
Content-Disposition: inline
Content-Transfer-Encoding: 8bit
Content-Type: text/plain; charset="US-ASCII"

Module Name:	pkgsrc
Committed By:	ryoon
Date:		Fri Jul 14 18:25:48 UTC 2023

Modified Files:
	pkgsrc/graphics/gimp: distinfo
Added Files:
	pkgsrc/graphics/gimp/patches: patch-ab

Log Message:
gimp: Restore patch-ab to fix CC_VERSION variable


To generate a diff of this commit:
cvs rdiff -u -r1.114 -r1.115 pkgsrc/graphics/gimp/distinfo
cvs rdiff -u -r0 -r1.44 pkgsrc/graphics/gimp/patches/patch-ab

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


--_----------=_1689359149134740
Content-Disposition: inline
Content-Length: 2410
Content-Transfer-Encoding: binary
Content-Type: text/x-diff; charset=us-ascii

Modified files:

Index: pkgsrc/graphics/gimp/distinfo
diff -u pkgsrc/graphics/gimp/distinfo:1.114 pkgsrc/graphics/gimp/distinfo:1.115
--- pkgsrc/graphics/gimp/distinfo:1.114	Fri Jul 14 14:10:08 2023
+++ pkgsrc/graphics/gimp/distinfo	Fri Jul 14 18:25:48 2023
@@ -1,9 +1,10 @@
-$NetBSD: distinfo,v 1.114 2023/07/14 14:10:08 adam Exp $
+$NetBSD: distinfo,v 1.115 2023/07/14 18:25:48 ryoon Exp $
 
 BLAKE2s (gimp-2.10.34.tar.bz2) = 95e31c30aac3e3f8009c90832ce1373ca829b70d59f5f0d1b5a76641207a0569
 SHA512 (gimp-2.10.34.tar.bz2) = 4802ce3758daba868570f1ac97a3f1cb41e1130fcc6376f9bf4c999441f8fd25937aa71b6f726d82d7c780f4153b11d2595bb76bc2356a42266909fbcc0bd34a
 Size (gimp-2.10.34.tar.bz2) = 31405329 bytes
 SHA1 (patch-aa) = 403c46d7070de208769e99e512922ba3a5b7129b
+SHA1 (patch-ab) = 44d37daf37ec604f97bb5b3edf0908ada56ed6d6
 SHA1 (patch-app_core_gimpbrush-transform.cc) = 3bd3f69401ee7dabb53f7ebf533870ee9add856c
 SHA1 (patch-app_gui_gui.c) = 781a44f0779305b9d39deb14f4b8ef1cf06137ff
 SHA1 (patch-configure.ac) = c7e89bc9fd576eb95a9288eccea8959cbe1ee6de

Added files:

Index: pkgsrc/graphics/gimp/patches/patch-ab
diff -u /dev/null pkgsrc/graphics/gimp/patches/patch-ab:1.44
--- /dev/null	Fri Jul 14 18:25:48 2023
+++ pkgsrc/graphics/gimp/patches/patch-ab	Fri Jul 14 18:25:48 2023
@@ -0,0 +1,32 @@
+$NetBSD: patch-ab,v 1.44 2023/07/14 18:25:48 ryoon 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.orig	2021-09-14 15:56:15.000000000 +0000
++++ configure
+@@ -22344,11 +22344,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
+@@ -36084,7 +36084,7 @@ esac
+ 
+ gimpdatadir="$datadir/$PACKAGE/2.0"
+ gimpplugindir="$libdir/$PACKAGE/2.0"
+-gimpsysconfdir="$sysconfdir/$PACKAGE/2.0"
++gimpsysconfdir="$sysconfdir"
+ 
+ 
+ 


--_----------=_1689359149134740--