From 14f719ef9858e0b27eed3c7b7078e4d49f48963b Mon Sep 17 00:00:00 2001
From: dmcmahill <dmcmahill@pkgsrc.org>
Date: Mon, 6 Feb 2006 22:23:29 +0000
Subject: Move a variable declaration to the beginning of the function.  Should
 keep gcc-2.95 happy.  Fix applied upstream too.

---
 cad/gschem/distinfo         |  3 ++-
 cad/gschem/patches/patch-aa | 21 +++++++++++++++++++++
 2 files changed, 23 insertions(+), 1 deletion(-)
 create mode 100644 cad/gschem/patches/patch-aa

(limited to 'cad')

diff --git a/cad/gschem/distinfo b/cad/gschem/distinfo
index d227a629770..69937be4294 100644
--- a/cad/gschem/distinfo
+++ b/cad/gschem/distinfo
@@ -1,5 +1,6 @@
-$NetBSD: distinfo,v 1.16 2006/01/25 01:51:35 dmcmahill Exp $
+$NetBSD: distinfo,v 1.17 2006/02/06 22:23:29 dmcmahill Exp $
 
 SHA1 (geda/geda-gschem-20060123.tar.gz) = 6163477230c0403cc234f2407b11e2eecc1381ce
 RMD160 (geda/geda-gschem-20060123.tar.gz) = 9da64ea7397da9e34c296467003a6af70e90921d
 Size (geda/geda-gschem-20060123.tar.gz) = 1652829 bytes
+SHA1 (patch-aa) = 3c3743fdca61dd549c035aec030a6dc0bf4de4c6
diff --git a/cad/gschem/patches/patch-aa b/cad/gschem/patches/patch-aa
new file mode 100644
index 00000000000..9efef902cc4
--- /dev/null
+++ b/cad/gschem/patches/patch-aa
@@ -0,0 +1,21 @@
+$NetBSD: patch-aa,v 1.9 2006/02/06 22:23:29 dmcmahill Exp $
+
+--- src/x_image.c.orig	2006-01-24 03:24:02.000000000 +0000
++++ src/x_image.c
+@@ -205,6 +205,7 @@ void x_image_lowlevel(TOPLEVEL * w_curre
+   GdkPixbuf *pixbuf;
+   char *filetype;
+ #endif
++  float prop;
+ 
+   width = w_current->image_width;
+   height = w_current->image_height;
+@@ -227,7 +228,7 @@ void x_image_lowlevel(TOPLEVEL * w_curre
+   page_center_top = save_page_top + (page_height / 2);
+ 
+   /* Preserve proportions */
+-  float prop = (float) width / height;
++  prop = (float) width / height;
+   if (page_width > page_height) {
+     page_height = (page_width / prop);
+   } else {
-- 
cgit v1.2.3