[99291] trunk/dports/gnome/glabels

31 Oct 2012

Revision: 99291
          http://trac.macports.org//changeset/99291
Author:   ryandesign@macports.org
Date:     2012-10-31 02:50:23 -0700 (Wed, 31 Oct 2012)
Log Message:
-----------
glabels: fix build with glib 2.32 (#36833)

Modified Paths:
--------------
    trunk/dports/gnome/glabels/Portfile

Added Paths:
-----------
    trunk/dports/gnome/glabels/files/patch-glib-2.32.diff

Modified: trunk/dports/gnome/glabels/Portfile
===================================================================

--- trunk/dports/gnome/glabels/Portfile	2012-10-31 09:32:40 UTC (rev 99290)
+++ trunk/dports/gnome/glabels/Portfile	2012-10-31 09:50:23 UTC (rev 99291)
@@ -31,7 +31,8 @@
                     port:libxml2 \
                     port:libglade2
 
-patchfiles          patch-iec16022-0.2.1-iec116022ecc200.c.diff
+patchfiles          patch-glib-2.32.diff \
+                    patch-iec16022-0.2.1-iec116022ecc200.c.diff
 
 configure.args      --without-libebook \
                     --disable-update-mimedb \

Added: trunk/dports/gnome/glabels/files/patch-glib-2.32.diff
===================================================================
--- trunk/dports/gnome/glabels/files/patch-glib-2.32.diff	                        (rev 0)
+++ trunk/dports/gnome/glabels/files/patch-glib-2.32.diff	2012-10-31 09:50:23 UTC (rev 99291)
@@ -0,0 +1,564 @@
+--- libglabels/category.c.orig	2009-11-30 07:18:41.000000000 -0600
++++ libglabels/category.c	2012-10-31 04:45:28.000000000 -0500
+@@ -29,9 +29,7 @@
+ #include "category.h"
+ 
+ #include <glib/gi18n.h>
+-#include <glib/gmem.h>
+-#include <glib/gstrfuncs.h>
+-#include <glib/gmessages.h>
++#include <glib.h>
+ #include <string.h>
+ 
+ #include "libglabels-private.h"
+--- libglabels/category.h.orig	2009-11-30 07:18:41.000000000 -0600
++++ libglabels/category.h	2012-10-31 04:45:28.000000000 -0500
+@@ -28,8 +28,7 @@
+ #ifndef __CATEGORY_H__
+ #define __CATEGORY_H__
+ 
+-#include <glib/gtypes.h>
+-#include <glib/glist.h>
++#include <glib.h>
+ 
+ G_BEGIN_DECLS
+ 
+--- libglabels/db.c.orig	2009-11-30 07:18:41.000000000 -0600
++++ libglabels/db.c	2012-10-31 04:45:28.000000000 -0500
+@@ -29,11 +29,7 @@
+ #include "db.h"
+ 
+ #include <glib/gi18n.h>
+-#include <glib/gmem.h>
+-#include <glib/gstrfuncs.h>
+-#include <glib/gdir.h>
+-#include <glib/gmessages.h>
+-#include <glib/ghash.h>
++#include <glib.h>
+ #include <string.h>
+ #include <sys/stat.h>
+ #include <sys/types.h>
+--- libglabels/db.h.orig	2009-11-30 07:18:41.000000000 -0600
++++ libglabels/db.h	2012-10-31 04:45:28.000000000 -0500
+@@ -28,8 +28,7 @@
+ #ifndef __DB_H__
+ #define __DB_H__
+ 
+-#include <glib/gtypes.h>
+-#include <glib/glist.h>
++#include <glib.h>
+ 
+ #include "paper.h"
+ #include "category.h"
+--- libglabels/libglabels-private.h.orig	2009-11-30 07:18:41.000000000 -0600
++++ libglabels/libglabels-private.h	2012-10-31 04:45:28.000000000 -0500
+@@ -26,9 +26,7 @@
+ #ifndef __LIBGLABELS_PRIVATE_H__
+ #define __LIBGLABELS_PRIVATE_H__
+ 
+-#include <glib/gutils.h>
+-#include <glib/gfileutils.h>
+-#include <glib/gunicode.h>
++#include <glib.h>
+ 
+ #include "str.h"
+ 
+--- libglabels/paper.c.orig	2009-11-30 07:18:41.000000000 -0600
++++ libglabels/paper.c	2012-10-31 04:45:28.000000000 -0500
+@@ -27,9 +27,7 @@
+ #include "paper.h"
+ 
+ #include <glib/gi18n.h>
+-#include <glib/gmem.h>
+-#include <glib/gstrfuncs.h>
+-#include <glib/gmessages.h>
++#include <glib.h>
+ #include <string.h>
+ 
+ #include "libglabels-private.h"
+--- libglabels/paper.h.orig	2009-11-30 07:18:41.000000000 -0600
++++ libglabels/paper.h	2012-10-31 04:45:28.000000000 -0500
+@@ -26,8 +26,7 @@
+ #ifndef __PAPER_H__
+ #define __PAPER_H__
+ 
+-#include <glib/gtypes.h>
+-#include <glib/glist.h>
++#include <glib.h>
+ 
+ G_BEGIN_DECLS
+ 
+--- libglabels/template.c.orig	2009-11-30 07:18:41.000000000 -0600
++++ libglabels/template.c	2012-10-31 04:45:28.000000000 -0500
+@@ -29,10 +29,7 @@
+ #include "template.h"
+ 
+ #include <glib/gi18n.h>
+-#include <glib/gmem.h>
+-#include <glib/gstrfuncs.h>
+-#include <glib/gqsort.h>
+-#include <glib/gmessages.h>
++#include <glib.h>
+ #include <string.h>
+ #include <sys/stat.h>
+ #include <sys/types.h>
+--- libglabels/template.h.orig	2009-11-30 07:18:41.000000000 -0600
++++ libglabels/template.h	2012-10-31 04:45:28.000000000 -0500
+@@ -28,8 +28,7 @@
+ #ifndef __TEMPLATE_H__
+ #define __TEMPLATE_H__
+ 
+-#include <glib/gtypes.h>
+-#include <glib/glist.h>
++#include <glib.h>
+ 
+ G_BEGIN_DECLS
+ 
+--- libglabels/xml-category.c.orig	2009-11-30 07:18:41.000000000 -0600
++++ libglabels/xml-category.c	2012-10-31 04:45:28.000000000 -0500
+@@ -27,7 +27,7 @@
+ #include "xml-category.h"
+ 
+ #include <glib/gi18n.h>
+-#include <glib/gmessages.h>
++#include <glib.h>
+ #include <string.h>
+ #include <libintl.h>
+ 
+--- libglabels/xml-category.h.orig	2009-11-30 07:18:41.000000000 -0600
++++ libglabels/xml-category.h	2012-10-31 04:45:28.000000000 -0500
+@@ -26,8 +26,7 @@
+ #ifndef __XML_CATEGORY_H__
+ #define __XML_CATEGORY_H__
+ 
+-#include <glib/gtypes.h>
+-#include <glib/glist.h>
++#include <glib.h>
+ #include <libxml/tree.h>
+ 
+ #include "category.h"
+--- libglabels/xml-paper.c.orig	2009-11-30 07:18:41.000000000 -0600
++++ libglabels/xml-paper.c	2012-10-31 04:45:28.000000000 -0500
+@@ -27,7 +27,7 @@
+ #include "xml-paper.h"
+ 
+ #include <glib/gi18n.h>
+-#include <glib/gmessages.h>
++#include <glib.h>
+ #include <string.h>
+ #include <libintl.h>
+ 
+--- libglabels/xml-paper.h.orig	2009-11-30 07:18:41.000000000 -0600
++++ libglabels/xml-paper.h	2012-10-31 04:45:28.000000000 -0500
+@@ -26,8 +26,7 @@
+ #ifndef __XML_PAPER_H__
+ #define __XML_PAPER_H__
+ 
+-#include <glib/gtypes.h>
+-#include <glib/glist.h>
++#include <glib.h>
+ #include <libxml/tree.h>
+ 
+ #include "paper.h"
+--- libglabels/xml-template.c.orig	2010-02-15 15:49:22.000000000 -0600
++++ libglabels/xml-template.c	2012-10-31 04:45:29.000000000 -0500
+@@ -29,7 +29,7 @@
+ #include "xml-template.h"
+ 
+ #include <glib/gi18n.h>
+-#include <glib/gmessages.h>
++#include <glib.h>
+ #include <string.h>
+ #include <libintl.h>
+ 
+--- libglabels/xml.c.orig	2009-11-30 07:18:41.000000000 -0600
++++ libglabels/xml.c	2012-10-31 04:45:29.000000000 -0500
+@@ -27,8 +27,7 @@
+ #include "xml.h"
+ 
+ #include <glib/gi18n.h>
+-#include <glib/gstrfuncs.h>
+-#include <glib/gmessages.h>
++#include <glib.h>
+ #include <string.h>
+ 
+ #include "libglabels-private.h"
+--- libglabels/xml.h.orig	2009-11-30 07:18:41.000000000 -0600
++++ libglabels/xml.h	2012-10-31 04:45:29.000000000 -0500
+@@ -26,7 +26,7 @@
+ #ifndef __XML_H__
+ #define __XML_H__
+ 
+-#include <glib/gtypes.h>
++#include <glib.h>
+ #include <libxml/tree.h>
+ 
+ #include "enums.h"
+--- src/base64.c.orig	2009-11-30 07:18:41.000000000 -0600
++++ src/base64.c	2012-10-31 04:45:29.000000000 -0500
+@@ -34,7 +34,7 @@
+ 
+ #include "base64.h"
+ 
+-#include <glib/gmem.h>
++#include <glib.h>
+ #include <ctype.h>
+ #include <string.h>
+ 
+--- src/base64.h.orig	2009-11-30 07:18:41.000000000 -0600
++++ src/base64.h	2012-10-31 04:45:29.000000000 -0500
+@@ -29,7 +29,7 @@
+ #ifndef __BASE64_H__
+ #define __BASE64_H__
+ 
+-#include <glib/gtypes.h>
++#include <glib.h>
+ 
+ G_BEGIN_DECLS
+ 
+--- src/bc-gnubarcode.c.orig	2009-11-30 07:18:41.000000000 -0600
++++ src/bc-gnubarcode.c	2012-10-31 04:45:29.000000000 -0500
+@@ -34,9 +34,7 @@
+ 
+ #include <ctype.h>
+ #include <string.h>
+-#include <glib/gstring.h>
+-#include <glib/gstrfuncs.h>
+-#include <glib/gmessages.h>
++#include <glib.h>
+ 
+ #include "barcode.h"
+ 
+--- src/bc-iec16022.c.orig	2009-11-30 07:18:41.000000000 -0600
++++ src/bc-iec16022.c	2012-10-31 04:45:29.000000000 -0500
+@@ -29,7 +29,7 @@
+ #include <ctype.h>
+ #include <string.h>
+ #include <stdlib.h>
+-#include <glib/gmessages.h>
++#include <glib.h>
+ 
+ #include "iec16022ecc200.h"
+ 
+--- src/bc-postnet.c.orig	2009-11-30 07:18:41.000000000 -0600
++++ src/bc-postnet.c	2012-10-31 04:45:29.000000000 -0500
+@@ -32,9 +32,7 @@
+ #include "bc-postnet.h"
+ 
+ #include <ctype.h>
+-#include <glib/gstring.h>
+-#include <glib/gstrfuncs.h>
+-#include <glib/gmessages.h>
++#include <glib.h>
+ 
+ #include "debug.h"
+ 
+--- src/bc.c.orig	2009-11-30 07:18:41.000000000 -0600
++++ src/bc.c	2012-10-31 04:45:29.000000000 -0500
+@@ -26,9 +26,7 @@
+ #include "bc.h"
+ 
+ #include <glib/gi18n.h>
+-#include <glib/gmem.h>
+-#include <glib/gstrfuncs.h>
+-#include <glib/gmessages.h>
++#include <glib.h>
+ 
+ #include "bc-postnet.h"
+ #include "bc-gnubarcode.h"
+--- src/bc.h.orig	2009-11-30 07:18:41.000000000 -0600
++++ src/bc.h	2012-10-31 04:45:29.000000000 -0500
+@@ -24,8 +24,7 @@
+ #ifndef __BC_H__
+ #define __BC_H__
+ 
+-#include <glib/gtypes.h>
+-#include <glib/glist.h>
++#include <glib.h>
+ #include <pango/pango.h>
+ 
+ G_BEGIN_DECLS
+--- src/critical-error-handler.c.orig	2009-11-30 07:18:41.000000000 -0600
++++ src/critical-error-handler.c	2012-10-31 04:45:29.000000000 -0500
+@@ -26,7 +26,7 @@
+ 
+ #include "critical-error-handler.h"
+ 
+-#include <glib/gmessages.h>
++#include <glib.h>
+ #include <glib/gi18n.h>
+ #include <gtk/gtkmessagedialog.h>
+ #include <gtk/gtkstock.h>
+--- src/critical-error-handler.h.orig	2009-11-30 07:18:41.000000000 -0600
++++ src/critical-error-handler.h	2012-10-31 04:45:29.000000000 -0500
+@@ -25,7 +25,7 @@
+ #ifndef __CRITICAL_ERROR_HANDLER_H__
+ #define __CRITICAL_ERROR_HANDLER_H__
+ 
+-#include <glib/gmacros.h>
++#include <glib.h>
+ 
+ G_BEGIN_DECLS
+ 
+--- src/debug.c.orig	2009-11-30 07:18:41.000000000 -0600
++++ src/debug.c	2012-10-31 04:45:29.000000000 -0500
+@@ -32,10 +32,7 @@
+ 
+ #include "debug.h"
+ 
+-#include <glib/gutils.h>
+-#include <glib/gmessages.h>
+-#include <glib/gstrfuncs.h>
+-#include <glib/gmem.h>
++#include <glib.h>
+ 
+ glDebugSection debug_flags = GLABELS_DEBUG_NONE;
+ 
+--- src/debug.h.orig	2009-11-30 07:18:41.000000000 -0600
++++ src/debug.h	2012-10-31 04:45:29.000000000 -0500
+@@ -32,7 +32,7 @@
+ #ifndef __DEBUG_H__
+ #define __DEBUG_H__
+ 
+-#include <glib/gtypes.h>
++#include <glib.h>
+ 
+ G_BEGIN_DECLS
+ 
+--- src/label-barcode.c.orig	2009-11-30 07:18:41.000000000 -0600
++++ src/label-barcode.c	2012-10-31 04:45:29.000000000 -0500
+@@ -25,9 +25,7 @@
+ #include "label-barcode.h"
+ 
+ #include <glib/gi18n.h>
+-#include <glib/gmem.h>
+-#include <glib/gstrfuncs.h>
+-#include <glib/gmessages.h>
++#include <glib.h>
+ #include <cairo.h>
+ #include <pango/pangocairo.h>
+ 
+--- src/label-box.c.orig	2009-11-30 07:18:41.000000000 -0600
++++ src/label-box.c	2012-10-31 04:45:30.000000000 -0500
+@@ -24,9 +24,7 @@
+ 
+ #include "label-box.h"
+ 
+-#include <glib/gmem.h>
+-#include <glib/gstrfuncs.h>
+-#include <glib/gmessages.h>
++#include <glib.h>
+ 
+ #include "debug.h"
+ 
+--- src/label-ellipse.c.orig	2009-11-30 07:18:41.000000000 -0600
++++ src/label-ellipse.c	2012-10-31 04:45:30.000000000 -0500
+@@ -24,9 +24,7 @@
+ 
+ #include "label-ellipse.h"
+ 
+-#include <glib/gmem.h>
+-#include <glib/gstrfuncs.h>
+-#include <glib/gmessages.h>
++#include <glib.h>
+ #include <math.h>
+ 
+ #include "cairo-ellipse-path.h"
+--- src/label-image.c.orig	2009-11-30 07:18:41.000000000 -0600
++++ src/label-image.c	2012-10-31 04:45:30.000000000 -0500
+@@ -24,9 +24,7 @@
+ 
+ #include "label-image.h"
+ 
+-#include <glib/gmem.h>
+-#include <glib/gstrfuncs.h>
+-#include <glib/gmessages.h>
++#include <glib.h>
+ #include <gdk/gdkcairo.h>
+ 
+ #include "pixmaps/checkerboard.xpm"
+--- src/label-line.c.orig	2009-11-30 07:18:41.000000000 -0600
++++ src/label-line.c	2012-10-31 04:45:30.000000000 -0500
+@@ -24,9 +24,7 @@
+ 
+ #include "label-line.h"
+ 
+-#include <glib/gmem.h>
+-#include <glib/gstrfuncs.h>
+-#include <glib/gmessages.h>
++#include <glib.h>
+ 
+ #include "debug.h"
+ 
+--- src/label-object.c.orig	2009-11-30 07:18:41.000000000 -0600
++++ src/label-object.c	2012-10-31 04:45:30.000000000 -0500
+@@ -25,9 +25,7 @@
+ 
+ #include "label-object.h"
+ 
+-#include <glib/gmem.h>
+-#include <glib/gstrfuncs.h>
+-#include <glib/gmessages.h>
++#include <glib.h>
+ #include <math.h>
+ 
+ #include "marshal.h"
+--- src/label-text.c.orig	2009-11-30 07:18:41.000000000 -0600
++++ src/label-text.c	2012-10-31 04:45:30.000000000 -0500
+@@ -24,9 +24,7 @@
+ 
+ #include "label-text.h"
+ 
+-#include <glib/gmem.h>
+-#include <glib/gstrfuncs.h>
+-#include <glib/gmessages.h>
++#include <glib.h>
+ #include <pango/pango.h>
+ #include <math.h>
+ 
+--- src/mini-preview-pixbuf-cache.c.orig	2009-11-30 07:18:41.000000000 -0600
++++ src/mini-preview-pixbuf-cache.c	2012-10-31 04:45:30.000000000 -0500
+@@ -28,8 +28,7 @@
+ 
+ #include "libglabels/db.h"
+ 
+-#include <glib/gmem.h>
+-#include <glib/ghash.h>
++#include <glib.h>
+ 
+ #include "debug.h"
+ 
+--- src/pixbuf-cache.h.orig	2009-11-30 07:18:41.000000000 -0600
++++ src/pixbuf-cache.h	2012-10-31 04:45:31.000000000 -0500
+@@ -24,8 +24,7 @@
+ #ifndef __PIXBUF_CACHE_H__
+ #define __PIXBUF_CACHE_H__
+ 
+-#include <glib/gmem.h>
+-#include <glib/ghash.h>
++#include <glib.h>
+ #include <gdk-pixbuf/gdk-pixbuf.h>
+ 
+ G_BEGIN_DECLS
+--- src/stock.h.orig	2009-11-30 07:18:41.000000000 -0600
++++ src/stock.h	2012-10-31 04:45:31.000000000 -0500
+@@ -25,7 +25,7 @@
+ #ifndef __STOCK_H__
+ #define __STOCK_H__
+ 
+-#include <glib/gmacros.h>
++#include <glib.h>
+ 
+ G_BEGIN_DECLS
+ 
+--- src/text-node.h.orig	2009-11-30 07:18:41.000000000 -0600
++++ src/text-node.h	2012-10-31 04:45:31.000000000 -0500
+@@ -24,8 +24,7 @@
+ #ifndef __TEXT_NODE_H__
+ #define __TEXT_NODE_H__
+ 
+-#include <glib/gtypes.h>
+-#include <glib/glist.h>
++#include <glib.h>
+ #include "merge.h"
+ 
+ G_BEGIN_DECLS
+--- src/util.h.orig	2009-11-30 07:18:41.000000000 -0600
++++ src/util.h	2012-10-31 04:45:31.000000000 -0500
+@@ -25,7 +25,7 @@
+ #ifndef __UTIL_H__
+ #define __UTIL_H__
+ 
+-#include <glib/glist.h>
++#include <glib.h>
+ #include <gtk/gtkcombobox.h>
+ #include <pango/pango.h>
+ 
+--- src/view-barcode.c.orig	2010-04-10 23:11:39.000000000 -0500
++++ src/view-barcode.c	2012-10-31 04:45:31.000000000 -0500
+@@ -26,7 +26,7 @@
+ #include "view-barcode.h"
+ 
+ #include <glib/gi18n.h>
+-#include <glib/gmem.h>
++#include <glib.h>
+ 
+ #include "color.h"
+ #include "object-editor.h"
+--- src/view-box.c.orig	2010-04-10 23:11:39.000000000 -0500
++++ src/view-box.c	2012-10-31 04:45:31.000000000 -0500
+@@ -26,7 +26,7 @@
+ #include "view-box.h"
+ 
+ #include <glib/gi18n.h>
+-#include <glib/gmem.h>
++#include <glib.h>
+ 
+ #include "color.h"
+ #include "object-editor.h"
+--- src/view-ellipse.c.orig	2010-04-10 23:11:39.000000000 -0500
++++ src/view-ellipse.c	2012-10-31 04:45:31.000000000 -0500
+@@ -26,7 +26,7 @@
+ #include "view-ellipse.h"
+ 
+ #include <glib/gi18n.h>
+-#include <glib/gmem.h>
++#include <glib.h>
+ #include <math.h>
+ 
+ #include "cairo-ellipse-path.h"
+--- src/view-image.c.orig	2010-04-10 23:11:39.000000000 -0500
++++ src/view-image.c	2012-10-31 04:45:32.000000000 -0500
+@@ -26,7 +26,7 @@
+ #include "view-image.h"
+ 
+ #include <glib/gi18n.h>
+-#include <glib/gmem.h>
++#include <glib.h>
+ 
+ #include "color.h"
+ #include "object-editor.h"
+--- src/view-line.c.orig	2010-04-10 23:11:39.000000000 -0500
++++ src/view-line.c	2012-10-31 04:45:32.000000000 -0500
+@@ -26,7 +26,7 @@
+ #include "view-line.h"
+ 
+ #include <glib/gi18n.h>
+-#include <glib/gmem.h>
++#include <glib.h>
+ 
+ #include "color.h"
+ #include "object-editor.h"
+--- src/view-text.c.orig	2010-04-10 23:11:39.000000000 -0500
++++ src/view-text.c	2012-10-31 04:45:32.000000000 -0500
+@@ -26,7 +26,7 @@
+ #include "view-text.h"
+ 
+ #include <glib/gi18n.h>
+-#include <glib/gmem.h>
++#include <glib.h>
+ 
+ #include "color.h"
+ #include "object-editor.h"
+--- src/warning-handler.c.orig	2009-11-30 07:18:41.000000000 -0600
++++ src/warning-handler.c	2012-10-31 04:45:32.000000000 -0500
+@@ -26,7 +26,7 @@
+ 
+ #include "warning-handler.h"
+ 
+-#include <glib/gmessages.h>
++#include <glib.h>
+ #include <glib/gi18n.h>
+ #include <gtk/gtkmessagedialog.h>
+ #include <gtk/gtkstock.h>
+--- src/warning-handler.h.orig	2009-11-30 07:18:41.000000000 -0600
++++ src/warning-handler.h	2012-10-31 04:45:32.000000000 -0500
+@@ -25,7 +25,7 @@
+ #ifndef __WARNING_HANDLER_H__
+ #define __WARNING_HANDLER_H__
+ 
+-#include <glib/gmacros.h>
++#include <glib.h>
+ 
+ G_BEGIN_DECLS
+

    

[99291] trunk/dports/gnome/glabels

ryandesign＠macports.org