From 41bffb4c963900393b3c7aaa27c1ad80b3ac0487 Mon Sep 17 00:00:00 2001
From: chuck <chuck@pkgsrc.org>
Date: Sat, 15 Nov 2008 02:02:13 +0000
Subject: import compile fixes from devel branch 1.9.3... must define
 NO_IMPORT_PYGOBJECT in plugins/python-loader to avoid link errors

---
 math/gnumeric/distinfo         |  4 +++-
 math/gnumeric/patches/patch-ac | 12 ++++++++++++
 math/gnumeric/patches/patch-ad | 12 ++++++++++++
 3 files changed, 27 insertions(+), 1 deletion(-)
 create mode 100644 math/gnumeric/patches/patch-ac
 create mode 100644 math/gnumeric/patches/patch-ad

(limited to 'math')

diff --git a/math/gnumeric/distinfo b/math/gnumeric/distinfo
index 73272492e80..ccbb97e398f 100644
--- a/math/gnumeric/distinfo
+++ b/math/gnumeric/distinfo
@@ -1,7 +1,9 @@
-$NetBSD: distinfo,v 1.32 2008/05/29 17:19:14 drochner Exp $
+$NetBSD: distinfo,v 1.33 2008/11/15 02:02:13 chuck Exp $
 
 SHA1 (gnumeric-1.8.3.tar.bz2) = 5a6585549bd705bf1d0e590981c3ef38173f8c08
 RMD160 (gnumeric-1.8.3.tar.bz2) = 4cd03c3dd1bfcfc72bed1902caef4ae2cae412f9
 Size (gnumeric-1.8.3.tar.bz2) = 14087309 bytes
 SHA1 (patch-aa) = 593df8dcff9fd84715d05bd06e08b4b0670072c6
 SHA1 (patch-ab) = 42f6bfbcd4eb586bdca5b15b338f8b406c658caa
+SHA1 (patch-ac) = f94b86b1260d758469ad30a9d627dcd8c78fccbc
+SHA1 (patch-ad) = d16a4403ee8d7f005e9f2843be83f62446622aff
diff --git a/math/gnumeric/patches/patch-ac b/math/gnumeric/patches/patch-ac
new file mode 100644
index 00000000000..e12f246ff2d
--- /dev/null
+++ b/math/gnumeric/patches/patch-ac
@@ -0,0 +1,12 @@
+$NetBSD: patch-ac,v 1.10 2008/11/15 02:02:13 chuck Exp $
+
+--- plugins/python-loader/gnm-python.c.orig	2008-11-14 20:25:11.000000000 -0500
++++ plugins/python-loader/gnm-python.c	2008-11-14 20:26:21.000000000 -0500
+@@ -7,6 +7,7 @@
+ 
+ #include <gnumeric-config.h>
+ #include <Python.h>
++#define NO_IMPORT_PYGOBJECT
+ #include <pygobject.h>
+ #include <glib.h>
+ #include "gnm-py-interpreter.h"
diff --git a/math/gnumeric/patches/patch-ad b/math/gnumeric/patches/patch-ad
new file mode 100644
index 00000000000..74ab751267b
--- /dev/null
+++ b/math/gnumeric/patches/patch-ad
@@ -0,0 +1,12 @@
+$NetBSD: patch-ad,v 1.9 2008/11/15 02:02:13 chuck Exp $
+
+--- plugins/python-loader/py-gnumeric.c.orig	2008-11-14 20:25:21.000000000 -0500
++++ plugins/python-loader/py-gnumeric.c	2008-11-14 20:27:04.000000000 -0500
+@@ -9,6 +9,7 @@
+ #include <Python.h>
+ #include <gnumeric.h>
+ #include <glib.h>
++#define NO_IMPORT_PYGOBJECT
+ #include "pygobject.h"
+ #include "application.h"
+ #include "workbook.h"
-- 
cgit v1.2.3