summaryrefslogtreecommitdiff
path: root/print
diff options
context:
space:
mode:
authordholland <dholland>2012-05-08 02:41:26 +0000
committerdholland <dholland>2012-05-08 02:41:26 +0000
commit20de1df86ba0042f8181e8c0ff028e2cd02d1a21 (patch)
tree2e6c5e24a0c2d325c01d735b769e62f4a3ca045a /print
parent81af4f762eb0659d34f68d96ad191d4be6ff9af8 (diff)
downloadpkgsrc-20de1df86ba0042f8181e8c0ff028e2cd02d1a21.tar.gz
Build fixes for new glib2. Done with SUBST like inkscape due to volume.
Diffstat (limited to 'print')
-rw-r--r--print/glabels/Makefile5
-rw-r--r--print/glabels/glib2-fixes.mk72
2 files changed, 76 insertions, 1 deletions
diff --git a/print/glabels/Makefile b/print/glabels/Makefile
index 6b2faa0be8d..d9dec81a7f2 100644
--- a/print/glabels/Makefile
+++ b/print/glabels/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.54 2012/04/27 12:32:01 obache Exp $
+# $NetBSD: Makefile,v 1.55 2012/05/08 02:41:26 dholland Exp $
#
DISTNAME= glabels-2.2.8
@@ -17,6 +17,9 @@ USE_LIBTOOL= yes
GNU_CONFIGURE= yes
USE_TOOLS+= gmake intltool msgfmt pkg-config
+# This (a SUBST) is hefty enough to be in its own file.
+.include "glib2-fixes.mk"
+
PKG_OPTIONS_VAR= PKG_OPTIONS.glabels
PKG_SUPPORTED_OPTIONS= evolution
PKG_SUGGESTED_OPTIONS= evolution
diff --git a/print/glabels/glib2-fixes.mk b/print/glabels/glib2-fixes.mk
new file mode 100644
index 00000000000..5a2cfece7d5
--- /dev/null
+++ b/print/glabels/glib2-fixes.mk
@@ -0,0 +1,72 @@
+# $NetBSD: glib2-fixes.mk,v 1.1 2012/05/08 02:41:26 dholland Exp $
+
+# Fix build with the latest glib2.
+
+SUBST_CLASSES+= glib2
+SUBST_MESSAGE.glib2= Fixing glib2 includes.
+# For testing, post-patch is better. For production, pre-build decreases
+# the chances of confusion and of bad interactions with patches.
+#SUBST_STAGE.glib2= post-patch
+SUBST_STAGE.glib2= pre-build
+
+SUBST_FILES.glib2+= libglabels/category.c
+SUBST_FILES.glib2+= libglabels/category.h
+SUBST_FILES.glib2+= libglabels/db.c
+SUBST_FILES.glib2+= libglabels/db.h
+SUBST_FILES.glib2+= libglabels/libglabels-private.h
+SUBST_FILES.glib2+= libglabels/paper.c
+SUBST_FILES.glib2+= libglabels/paper.h
+SUBST_FILES.glib2+= libglabels/template.c
+SUBST_FILES.glib2+= libglabels/template.h
+SUBST_FILES.glib2+= libglabels/xml-category.c
+SUBST_FILES.glib2+= libglabels/xml-category.h
+SUBST_FILES.glib2+= libglabels/xml-paper.c
+SUBST_FILES.glib2+= libglabels/xml-paper.h
+SUBST_FILES.glib2+= libglabels/xml-template.c
+SUBST_FILES.glib2+= libglabels/xml.c
+SUBST_FILES.glib2+= libglabels/xml.h
+SUBST_FILES.glib2+= src/base64.c
+SUBST_FILES.glib2+= src/base64.h
+SUBST_FILES.glib2+= src/bc-gnubarcode.c
+SUBST_FILES.glib2+= src/bc-iec16022.c
+SUBST_FILES.glib2+= src/bc-postnet.c
+SUBST_FILES.glib2+= src/bc.c
+SUBST_FILES.glib2+= src/bc.h
+SUBST_FILES.glib2+= src/critical-error-handler.c
+SUBST_FILES.glib2+= src/critical-error-handler.h
+SUBST_FILES.glib2+= src/debug.c
+SUBST_FILES.glib2+= src/debug.h
+SUBST_FILES.glib2+= src/label-barcode.c
+SUBST_FILES.glib2+= src/label-box.c
+SUBST_FILES.glib2+= src/label-ellipse.c
+SUBST_FILES.glib2+= src/label-image.c
+SUBST_FILES.glib2+= src/label-line.c
+SUBST_FILES.glib2+= src/label-object.c
+SUBST_FILES.glib2+= src/label-text.c
+SUBST_FILES.glib2+= src/mini-preview-pixbuf-cache.c
+SUBST_FILES.glib2+= src/pixbuf-cache.h
+SUBST_FILES.glib2+= src/stock.h
+SUBST_FILES.glib2+= src/text-node.h
+SUBST_FILES.glib2+= src/util.h
+SUBST_FILES.glib2+= src/view-barcode.c
+SUBST_FILES.glib2+= src/view-box.c
+SUBST_FILES.glib2+= src/view-ellipse.c
+SUBST_FILES.glib2+= src/view-image.c
+SUBST_FILES.glib2+= src/view-line.c
+SUBST_FILES.glib2+= src/view-text.c
+SUBST_FILES.glib2+= src/warning-handler.c
+SUBST_FILES.glib2+= src/warning-handler.h
+
+SUBST_SED.glib2+= -e '/\#include/s,<glib/gdir.h>,<glib.h>,'
+SUBST_SED.glib2+= -e '/\#include/s,<glib/gfileutils.h>,<glib.h>,'
+SUBST_SED.glib2+= -e '/\#include/s,<glib/ghash.h>,<glib.h>,'
+SUBST_SED.glib2+= -e '/\#include/s,<glib/glist.h>,<glib.h>,'
+SUBST_SED.glib2+= -e '/\#include/s,<glib/gmacros.h>,<glib.h>,'
+SUBST_SED.glib2+= -e '/\#include/s,<glib/gmem.h>,<glib.h>,'
+SUBST_SED.glib2+= -e '/\#include/s,<glib/gmessages.h>,<glib.h>,'
+SUBST_SED.glib2+= -e '/\#include/s,<glib/gqsort.h>,<glib.h>,'
+SUBST_SED.glib2+= -e '/\#include/s,<glib/gstrfuncs.h>,<glib.h>,'
+SUBST_SED.glib2+= -e '/\#include/s,<glib/gstring.h>,<glib.h>,'
+SUBST_SED.glib2+= -e '/\#include/s,<glib/gtypes.h>,<glib.h>,'
+SUBST_SED.glib2+= -e '/\#include/s,<glib/gunicode.h>,<glib.h>,'
+SUBST_SED.glib2+= -e '/\#include/s,<glib/gutils.h>,<glib.h>,'