summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorgdt <gdt@pkgsrc.org>2005-10-04 12:58:13 +0000
committergdt <gdt@pkgsrc.org>2005-10-04 12:58:13 +0000
commit21a0742bbca19960d40c5bdbbec90c99130c6468 (patch)
treeca8874ac535acb5e21d953657dcf8ec36fe44c05
parentd7737659ee04272311e7e75d964dbf6fa7d23759 (diff)
downloadpkgsrc-21a0742bbca19960d40c5bdbbec90c99130c6468.tar.gz
Add patch to move variable declaration to beginning of function where
it belongs, and where gcc 2.95.3 insists on it being. Fixes build on NetBSD 1.6.2. (I have committed the patch (and the memmem decl patch) to the master ufraw repository.)
-rw-r--r--graphics/gimp-ufraw/Makefile4
-rw-r--r--graphics/gimp-ufraw/distinfo3
-rw-r--r--graphics/gimp-ufraw/patches/patch-ac21
3 files changed, 25 insertions, 3 deletions
diff --git a/graphics/gimp-ufraw/Makefile b/graphics/gimp-ufraw/Makefile
index 81ea431a4b5..e29669c977e 100644
--- a/graphics/gimp-ufraw/Makefile
+++ b/graphics/gimp-ufraw/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.10 2005/09/29 13:20:48 gdt Exp $
+# $NetBSD: Makefile,v 1.11 2005/10/04 12:58:13 gdt Exp $
DISTNAME= ufraw-0.5
PKGNAME= gimp-${DISTNAME}
-PKGREVISION= 1
+PKGREVISION= 2
CATEGORIES= graphics
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=ufraw/}
diff --git a/graphics/gimp-ufraw/distinfo b/graphics/gimp-ufraw/distinfo
index c70cf967452..96f2bf66d8e 100644
--- a/graphics/gimp-ufraw/distinfo
+++ b/graphics/gimp-ufraw/distinfo
@@ -1,7 +1,8 @@
-$NetBSD: distinfo,v 1.9 2005/09/29 13:20:48 gdt Exp $
+$NetBSD: distinfo,v 1.10 2005/10/04 12:58:13 gdt Exp $
SHA1 (ufraw-0.5.tar.gz) = dc6d89157acd25d84ee48148772d6800dfb4eb1c
RMD160 (ufraw-0.5.tar.gz) = 5cfe6be92507b81996d98fa6ddedc1de34a1ba52
Size (ufraw-0.5.tar.gz) = 284234 bytes
SHA1 (patch-aa) = 1ef87b4f0429b01338957b2e0203fd7cb95f08e1
SHA1 (patch-ab) = ece7b54ed6e2209dd4654bc9c29d07c2c5db3e0a
+SHA1 (patch-ac) = 5ff3907f1683526946f15baa0928facffd5f31d1
diff --git a/graphics/gimp-ufraw/patches/patch-ac b/graphics/gimp-ufraw/patches/patch-ac
new file mode 100644
index 00000000000..7426d8bd359
--- /dev/null
+++ b/graphics/gimp-ufraw/patches/patch-ac
@@ -0,0 +1,21 @@
+$NetBSD: patch-ac,v 1.3 2005/10/04 12:58:13 gdt Exp $
+
+--- ufraw.c.orig 2005-08-29 18:53:28.000000000 -0400
++++ ufraw.c
+@@ -30,6 +30,7 @@ int main (int argc, char **argv)
+ int status;
+ GtkWidget *dummyWindow=NULL;
+ const char *locale;
++ int optInd;
+
+ ufraw_binary = g_path_get_basename(argv[0]);
+
+@@ -65,7 +66,7 @@ int main (int argc, char **argv)
+ g_strlcpy(rc.outputFilename, "", max_path);
+
+ /* Put the command-line options in cmd */
+- int optInd = ufraw_process_args(&argc, &argv, &cmd, &rc);
++ optInd = ufraw_process_args(&argc, &argv, &cmd, &rc);
+ if (strlen(cmd.outputFilename)!=0) {
+ ufraw_message(UFRAW_ERROR,
+ "--output option is valid only in batch mode");