diff options
author | dholland <dholland> | 2012-05-10 07:28:16 +0000 |
---|---|---|
committer | dholland <dholland> | 2012-05-10 07:28:16 +0000 |
commit | 197afff15c24e9aa00bd658adf0ed47ddcb541dc (patch) | |
tree | 6432bb3e0dcad6c33a5c07804d57eaad2aa84498 /misc | |
parent | d82cbe45c70485c04770f0efd119e6bd09b7b194 (diff) | |
download | pkgsrc-197afff15c24e9aa00bd658adf0ed47ddcb541dc.tar.gz |
Build fixes for new glib2.
Diffstat (limited to 'misc')
11 files changed, 162 insertions, 1 deletions
diff --git a/misc/goffice0.6/distinfo b/misc/goffice0.6/distinfo index 36ea3a806d0..77e8ad40961 100644 --- a/misc/goffice0.6/distinfo +++ b/misc/goffice0.6/distinfo @@ -1,7 +1,17 @@ -$NetBSD: distinfo,v 1.7 2012/05/10 04:43:53 dholland Exp $ +$NetBSD: distinfo,v 1.8 2012/05/10 07:28:16 dholland Exp $ SHA1 (goffice-0.6.6.tar.gz) = fdb00804de201e057628ba5b997512ab882ca9ea RMD160 (goffice-0.6.6.tar.gz) = d67f6eef8ecc4e26a4ddc807e6682b08d42d86f9 Size (goffice-0.6.6.tar.gz) = 3246559 bytes SHA1 (patch-configure) = 820c5696f0d158c83558020ca06b8b8d5e81e5a3 +SHA1 (patch-goffice_app_goffice-app_h) = 6986dc8f238fbde32184ef45e14124c8f423fbf8 +SHA1 (patch-goffice_graph_gog-child-button_c) = ed0b19a706c5674259a7a89b4469502ab92696ca +SHA1 (patch-goffice_math_go-cspline_c) = 26155e5cd9597430f40b8b96ba96da87f8a3c0d1 +SHA1 (patch-goffice_math_go-math_h) = 37b3bce845ac4425766f7456b730a6b716e17fc8 +SHA1 (patch-goffice_math_go-rangefunc_c) = f177041fe1f58686ec564f68fb7cbaa50d1d2956 +SHA1 (patch-goffice_math_go-rangefunc_h) = d61b67b879baa1db74b2e29a4cee00fcc4e4cee3 +SHA1 (patch-goffice_math_go-regression_c) = feb19375294561f24b4f87b9a496b62e03021627 +SHA1 (patch-goffice_math_go-regression_h) = 229552efa2ded799d99a409f84bfd6f554537d5a +SHA1 (patch-goffice_ms-compat_go-ms-parser_c) = 69b1cb4147322c228384bf3e0a6a6d1cc4f43f25 +SHA1 (patch-goffice_ms-compat_god-drawing-ms_c) = d3cbde39a1a68d59f858e9348418af4325b7b1bb SHA1 (patch-goffice_utils_regutf8.c) = 4e058782463cf539339c6ac2782119ae9966eb24 diff --git a/misc/goffice0.6/patches/patch-goffice_app_goffice-app_h b/misc/goffice0.6/patches/patch-goffice_app_goffice-app_h new file mode 100644 index 00000000000..a90e13d3fb2 --- /dev/null +++ b/misc/goffice0.6/patches/patch-goffice_app_goffice-app_h @@ -0,0 +1,15 @@ +$NetBSD: patch-goffice_app_goffice-app_h,v 1.1 2012/05/10 07:28:16 dholland Exp $ + +Fix build with latest glib2. + +--- goffice/app/goffice-app.h~ 2008-07-08 09:54:58.000000000 +0000 ++++ goffice/app/goffice-app.h +@@ -22,7 +22,7 @@ + #ifndef GOFFICE_APP_H + #define GOFFICE_APP_H + +-#include <glib/gmacros.h> ++#include <glib.h> + + G_BEGIN_DECLS + diff --git a/misc/goffice0.6/patches/patch-goffice_graph_gog-child-button_c b/misc/goffice0.6/patches/patch-goffice_graph_gog-child-button_c new file mode 100644 index 00000000000..9ba7df8e549 --- /dev/null +++ b/misc/goffice0.6/patches/patch-goffice_graph_gog-child-button_c @@ -0,0 +1,15 @@ +$NetBSD: patch-goffice_graph_gog-child-button_c,v 1.1 2012/05/10 07:28:16 dholland Exp $ + +Fix build with latest glib2. + +--- goffice/graph/gog-child-button.c~ 2008-07-22 01:41:18.000000000 +0000 ++++ goffice/graph/gog-child-button.c +@@ -39,7 +39,7 @@ + #include <gdk/gdkkeysyms.h> + + #include <glib/gi18n-lib.h> +-#include <glib/ghash.h> ++#include <glib.h> + + #include <string.h> + diff --git a/misc/goffice0.6/patches/patch-goffice_math_go-cspline_c b/misc/goffice0.6/patches/patch-goffice_math_go-cspline_c new file mode 100644 index 00000000000..ddad1241ee3 --- /dev/null +++ b/misc/goffice0.6/patches/patch-goffice_math_go-cspline_c @@ -0,0 +1,16 @@ +$NetBSD: patch-goffice_math_go-cspline_c,v 1.1 2012/05/10 07:28:16 dholland Exp $ + +Fix build with latest glib2. + +--- goffice/math/go-cspline.c~ 2009-01-18 16:39:34.000000000 +0000 ++++ goffice/math/go-cspline.c +@@ -26,8 +26,7 @@ + #include <goffice/goffice-config.h> + #include "go-rangefunc.h" + #include "go-cspline.h" +-#include <glib/gmem.h> +-#include <glib/gmessages.h> ++#include <glib.h> + + #ifndef DOUBLE + diff --git a/misc/goffice0.6/patches/patch-goffice_math_go-math_h b/misc/goffice0.6/patches/patch-goffice_math_go-math_h new file mode 100644 index 00000000000..8d91eb40a71 --- /dev/null +++ b/misc/goffice0.6/patches/patch-goffice_math_go-math_h @@ -0,0 +1,15 @@ +$NetBSD: patch-goffice_math_go-math_h,v 1.1 2012/05/10 07:28:16 dholland Exp $ + +Fix build with latest glib2. + +--- goffice/math/go-math.h~ 2008-07-08 09:54:59.000000000 +0000 ++++ goffice/math/go-math.h +@@ -3,7 +3,7 @@ + + #include <math.h> + #include <goffice/goffice-features.h> +-#include <glib/gmacros.h> ++#include <glib.h> + #include <goffice/goffice.h> + + G_BEGIN_DECLS diff --git a/misc/goffice0.6/patches/patch-goffice_math_go-rangefunc_c b/misc/goffice0.6/patches/patch-goffice_math_go-rangefunc_c new file mode 100644 index 00000000000..fbfc62112a1 --- /dev/null +++ b/misc/goffice0.6/patches/patch-goffice_math_go-rangefunc_c @@ -0,0 +1,15 @@ +$NetBSD: patch-goffice_math_go-rangefunc_c,v 1.1 2012/05/10 07:28:16 dholland Exp $ + +Fix build with latest glib2. + +--- goffice/math/go-rangefunc.c~ 2008-07-08 09:54:59.000000000 +0000 ++++ goffice/math/go-rangefunc.c +@@ -8,7 +8,7 @@ + + #include <goffice/goffice-config.h> + #include "go-rangefunc.h" +-#include <glib/gmem.h> ++#include <glib.h> + + #include <math.h> + #include <stdlib.h> diff --git a/misc/goffice0.6/patches/patch-goffice_math_go-rangefunc_h b/misc/goffice0.6/patches/patch-goffice_math_go-rangefunc_h new file mode 100644 index 00000000000..46dd27e008a --- /dev/null +++ b/misc/goffice0.6/patches/patch-goffice_math_go-rangefunc_h @@ -0,0 +1,14 @@ +$NetBSD: patch-goffice_math_go-rangefunc_h,v 1.1 2012/05/10 07:28:16 dholland Exp $ + +Fix build with latest glib2. + +--- goffice/math/go-rangefunc.h~ 2008-07-08 09:54:59.000000000 +0000 ++++ goffice/math/go-rangefunc.h +@@ -1,6 +1,6 @@ + #ifndef GO_RANGEFUNC_H + #define GO_RANGEFUNC_H +-#include <glib/gmacros.h> ++#include <glib.h> + + G_BEGIN_DECLS + diff --git a/misc/goffice0.6/patches/patch-goffice_math_go-regression_c b/misc/goffice0.6/patches/patch-goffice_math_go-regression_c new file mode 100644 index 00000000000..652c8d88362 --- /dev/null +++ b/misc/goffice0.6/patches/patch-goffice_math_go-regression_c @@ -0,0 +1,16 @@ +$NetBSD: patch-goffice_math_go-regression_c,v 1.1 2012/05/10 07:28:16 dholland Exp $ + +Fix build with latest glib2. + +--- goffice/math/go-regression.c~ 2008-07-08 09:54:59.000000000 +0000 ++++ goffice/math/go-regression.c +@@ -12,8 +12,7 @@ + #include "go-rangefunc.h" + #include "go-math.h" + +-#include <glib/gmem.h> +-#include <glib/gmessages.h> ++#include <glib.h> + + #include <math.h> + #include <string.h> diff --git a/misc/goffice0.6/patches/patch-goffice_math_go-regression_h b/misc/goffice0.6/patches/patch-goffice_math_go-regression_h new file mode 100644 index 00000000000..ce9576a0fce --- /dev/null +++ b/misc/goffice0.6/patches/patch-goffice_math_go-regression_h @@ -0,0 +1,15 @@ +$NetBSD: patch-goffice_math_go-regression_h,v 1.1 2012/05/10 07:28:17 dholland Exp $ + +Fix build with latest glib2. + +--- goffice/math/go-regression.h~ 2008-07-08 09:54:59.000000000 +0000 ++++ goffice/math/go-regression.h +@@ -1,7 +1,7 @@ + #ifndef GO_UTILS_REGRESSION_H + #define GO_UTILS_REGRESSION_H + +-#include <glib/gtypes.h> ++#include <glib.h> + + G_BEGIN_DECLS + diff --git a/misc/goffice0.6/patches/patch-goffice_ms-compat_go-ms-parser_c b/misc/goffice0.6/patches/patch-goffice_ms-compat_go-ms-parser_c new file mode 100644 index 00000000000..3d6d4d2a7de --- /dev/null +++ b/misc/goffice0.6/patches/patch-goffice_ms-compat_go-ms-parser_c @@ -0,0 +1,15 @@ +$NetBSD: patch-goffice_ms-compat_go-ms-parser_c,v 1.1 2012/05/10 07:28:17 dholland Exp $ + +Fix build with latest glib2. + +--- goffice/ms-compat/go-ms-parser.c~ 2008-07-08 09:54:59.000000000 +0000 ++++ goffice/ms-compat/go-ms-parser.c +@@ -23,7 +23,7 @@ + + #include <goffice/goffice-config.h> + #include <goffice/ms-compat/go-ms-parser.h> +-#include <glib/gmacros.h> ++#include <glib.h> + #include <gsf/gsf-input.h> + #include <gsf/gsf-utils.h> + diff --git a/misc/goffice0.6/patches/patch-goffice_ms-compat_god-drawing-ms_c b/misc/goffice0.6/patches/patch-goffice_ms-compat_god-drawing-ms_c new file mode 100644 index 00000000000..fe0c250e0cc --- /dev/null +++ b/misc/goffice0.6/patches/patch-goffice_ms-compat_god-drawing-ms_c @@ -0,0 +1,15 @@ +$NetBSD: patch-goffice_ms-compat_god-drawing-ms_c,v 1.1 2012/05/10 07:28:17 dholland Exp $ + +Fix build with latest glib2. + +--- goffice/ms-compat/god-drawing-ms.c~ 2008-07-08 09:54:59.000000000 +0000 ++++ goffice/ms-compat/god-drawing-ms.c +@@ -27,7 +27,7 @@ + #include <goffice/ms-compat/god-image-ms.h> + #include <goffice/drawing/god-property-table.h> + #include <goffice/drawing/god-shape.h> +-#include <glib/gmacros.h> ++#include <glib.h> + #include <gsf/gsf-input.h> + #include <gsf/gsf-utils.h> + #include <string.h> |