Content-Transfer-Encoding: 7bit
Content-Type: multipart/mixed; boundary="_----------=_168397895531470"
MIME-Version: 1.0
Date: Sat, 13 May 2023 11:55:55 +0000
From: "Greg Troxel" <gdt@netbsd.org>
Subject: CVS commit: pkgsrc/graphics/gimp-ufraw
To: pkgsrc-changes@NetBSD.org
Reply-To: gdt@netbsd.org
Message-Id: <20230513115555.C6140FA87@cvs.NetBSD.org>
Sender: pkgsrc-changes-owner@NetBSD.org
Precedence: bulk

This is a multi-part message in MIME format.

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

Module Name:	pkgsrc
Committed By:	gdt
Date:		Sat May 13 11:55:55 UTC 2023

Modified Files:
	pkgsrc/graphics/gimp-ufraw: Makefile distinfo
	pkgsrc/graphics/gimp-ufraw/patches: patch-dcraw.cc

Log Message:
graphics/gimp-ufraw: Work around C++/stdint interactions

ufraw includes jasper headers from a C++ file, and jasper relies in
int_limit.h defines.  But NetBSD only defines the macros in C mode, or
in C++>=C11.  Ask for the defines explicitly.

Set ufraw to C99, and gc support for gcc before 3.


To generate a diff of this commit:
cvs rdiff -u -r1.135 -r1.136 pkgsrc/graphics/gimp-ufraw/Makefile
cvs rdiff -u -r1.39 -r1.40 pkgsrc/graphics/gimp-ufraw/distinfo
cvs rdiff -u -r1.2 -r1.3 pkgsrc/graphics/gimp-ufraw/patches/patch-dcraw.cc

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


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

Modified files:

Index: pkgsrc/graphics/gimp-ufraw/Makefile
diff -u pkgsrc/graphics/gimp-ufraw/Makefile:1.135 pkgsrc/graphics/gimp-ufraw/Makefile:1.136
--- pkgsrc/graphics/gimp-ufraw/Makefile:1.135	Wed Apr 19 08:10:19 2023
+++ pkgsrc/graphics/gimp-ufraw/Makefile	Sat May 13 11:55:55 2023
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.135 2023/04/19 08:10:19 adam Exp $
+# $NetBSD: Makefile,v 1.136 2023/05/13 11:55:55 gdt Exp $
 
 # Note that upstream has replaced tarballs without changing the
 # version number (e.g., 0.19.2 had two different tarballs).
@@ -6,12 +6,12 @@
 # updating pkgsrc.
 DISTNAME=		ufraw-0.22
 PKGNAME=		gimp-${DISTNAME}
-PKGREVISION=		31
+PKGREVISION=		32
 CATEGORIES=		graphics
 MASTER_SITES=		${MASTER_SITE_SOURCEFORGE:=ufraw/}
 
 # There have been issues with unstable OPENMP APIs.  Therefore,
-# updates must be tested on NetBSD 8 with gcc.
+# updates must be tested on NetBSD 9 with gcc.
 MAINTAINER=		gdt@NetBSD.org
 HOMEPAGE=		http://ufraw.sourceforge.net/
 COMMENT=		GIMP plug-in for raw digicam import
@@ -22,7 +22,7 @@ GNU_CONFIGURE=		yes
 
 USE_TOOLS+=		gmake pkg-config msgfmt
 USE_TOOLS+=		perl:run pod2man
-USE_LANGUAGES=		c c++03
+USE_LANGUAGES=		c99 c++03
 
 CONFIGURE_ARGS+=	--enable-mime
 
@@ -30,10 +30,6 @@ GCONF_SCHEMAS=		ufraw.schemas
 
 PTHREAD_AUTO_VARS=	yes
 
-# This package uses too much C99 code to be patched.
-GCC_REQD+=		3.0
-BUILDLINK_TRANSFORM+=	rm:-std=gnu99
-
 PKG_OPTIONS_VAR=	PKG_OPTIONS.ufraw
 PKG_SUPPORTED_OPTIONS=	lensfun
 PKG_SUGGESTED_OPTIONS=	lensfun

Index: pkgsrc/graphics/gimp-ufraw/distinfo
diff -u pkgsrc/graphics/gimp-ufraw/distinfo:1.39 pkgsrc/graphics/gimp-ufraw/distinfo:1.40
--- pkgsrc/graphics/gimp-ufraw/distinfo:1.39	Tue Oct 26 10:46:12 2021
+++ pkgsrc/graphics/gimp-ufraw/distinfo	Sat May 13 11:55:55 2023
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.39 2021/10/26 10:46:12 nia Exp $
+$NetBSD: distinfo,v 1.40 2023/05/13 11:55:55 gdt Exp $
 
 BLAKE2s (ufraw-0.22.tar.gz) = 37f6aa87db1a0ccb0497364a8bf40eaf17cf0082b617b8603b74a8e7bc791cf2
 SHA512 (ufraw-0.22.tar.gz) = a42eff5052c18afec90245cf97ceeade78e3f288186cf697ac4abf2e8290d4081db8ac4de3ae47b3774f30a6cb4cbda392099e6fd2125fe751abb40d9b065ad2
 Size (ufraw-0.22.tar.gz) = 1103554 bytes
-SHA1 (patch-dcraw.cc) = 1d379ffa2624ce24b8f7e523d0dcfe7a313ec9c7
+SHA1 (patch-dcraw.cc) = 5e9ff01930802b2f92ce28030313c60ef24e1897
 SHA1 (patch-dcraw__api.cc) = 96220c6cca793684122839310883c5d5754916f4
 SHA1 (patch-dcraw__indi.c) = 48415d0d0e00f6652cb745e4f7a86ce71ed82739
 SHA1 (patch-ufraw__exiv2.cc) = c6f3c6bd9ec8cdc3dee1801f9b1972bbe827cd8d

Index: pkgsrc/graphics/gimp-ufraw/patches/patch-dcraw.cc
diff -u pkgsrc/graphics/gimp-ufraw/patches/patch-dcraw.cc:1.2 pkgsrc/graphics/gimp-ufraw/patches/patch-dcraw.cc:1.3
--- pkgsrc/graphics/gimp-ufraw/patches/patch-dcraw.cc:1.2	Mon Jun  1 00:14:21 2020
+++ pkgsrc/graphics/gimp-ufraw/patches/patch-dcraw.cc	Sat May 13 11:55:55 2023
@@ -1,10 +1,28 @@
-$NetBSD: patch-dcraw.cc,v 1.2 2020/06/01 00:14:21 gdt Exp $
+$NetBSD: patch-dcraw.cc,v 1.3 2023/05/13 11:55:55 gdt Exp $
 
-\todo Explain this patch.
+The first hunk works around the combination of:
+  - NetBSD stdint.h/int_limit.sh not defining UINT_LEAST64_MAX in c++
+     mode before C++11
+  - ufraw including C headers in C++ mode
+  - ufraw being C++03
+by just asking for the limit macros to be defined.
 
---- dcraw.cc.orig	2020-04-19 19:55:05.713900482 +0000
+\todo Explain second hunk.  This seems to be about avoiding a SWAP macro
+and is likely not very interesting.
+
+--- dcraw.cc.orig	2015-06-16 03:58:38.000000000 +0000
 +++ dcraw.cc
-@@ -9240,11 +9240,15 @@ canon_a5:
+@@ -24,6 +24,9 @@ extern "C" {
+ 
+ #define DCRAW_VERSION "9.26"
+ 
++/* Obtain UINT32_LEAST_MAX even in C++ mode. */
++#define __STDC_LIMIT_MACROS
++
+ #ifndef _GNU_SOURCE
+ #define _GNU_SOURCE
+ #endif
+@@ -9240,11 +9243,15 @@ canon_a5:
        filters = 0x16161616;
      }
      if (make[0] == 'O') {


--_----------=_168397895531470--