<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[140974] users/devans/GNOME-3/stable/dports/gnome/glabels</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="https://trac.macports.org/changeset/140974">140974</a></dd>
<dt>Author</dt> <dd>devans@macports.org</dd>
<dt>Date</dt> <dd>2015-10-06 18:06:18 -0700 (Tue, 06 Oct 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>GNOME-3/stable: glabels, update dependencies, configuration, post-activate processing, reconfigure using upstream autogen.sh for intltool 0.51 compatibility.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#usersdevansGNOME3stabledportsgnomeglabelsPortfile">users/devans/GNOME-3/stable/dports/gnome/glabels/Portfile</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#usersdevansGNOME3stabledportsgnomeglabelsfilesautogensh">users/devans/GNOME-3/stable/dports/gnome/glabels/files/autogen.sh</a></li>
</ul>
<h3>Removed Paths</h3>
<ul>
<li><a href="#usersdevansGNOME3stabledportsgnomeglabelsfilespatchglib232diff">users/devans/GNOME-3/stable/dports/gnome/glabels/files/patch-glib-2.32.diff</a></li>
<li><a href="#usersdevansGNOME3stabledportsgnomeglabelsfilespatchiec16022021iec116022ecc200cdiff">users/devans/GNOME-3/stable/dports/gnome/glabels/files/patch-iec16022-0.2.1-iec116022ecc200.c.diff</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="usersdevansGNOME3stabledportsgnomeglabelsPortfile"></a>
<div class="modfile"><h4>Modified: users/devans/GNOME-3/stable/dports/gnome/glabels/Portfile (140973 => 140974)</h4>
<pre class="diff"><span>
<span class="info">--- users/devans/GNOME-3/stable/dports/gnome/glabels/Portfile 2015-10-07 00:58:30 UTC (rev 140973)
+++ users/devans/GNOME-3/stable/dports/gnome/glabels/Portfile 2015-10-07 01:06:18 UTC (rev 140974)
</span><span class="lines">@@ -9,7 +9,7 @@
</span><span class="cx"> categories gnome
</span><span class="cx"> platforms darwin
</span><span class="cx"> maintainers gmail.com:craig.cottingham
</span><del>-description print labels and business cards
</del><ins>+description A label and business card creation program
</ins><span class="cx"> long_description gLabels is a program for creating labels and business cards \
</span><span class="cx"> for the GNOME desktop environment.
</span><span class="cx"> homepage http://glabels.sourceforge.net/
</span><span class="lines">@@ -22,23 +22,39 @@
</span><span class="cx"> sha256 db615f653b6e78ef1209814b5e6d8d3af4f8d3444a259ddbcc0dfb279c7df855
</span><span class="cx">
</span><span class="cx"> depends_build port:pkgconfig \
</span><del>- port:gnome-doc-utils \
- port:intltool
</del><ins>+ port:autoconf \
+ port:automake \
+ port:libtool \
+ port:gnome-common \
+ port:gtk-doc \
+ port:intltool \
+ port:itstool \
+ port:yelp-tools
</ins><span class="cx">
</span><del>-depends_lib port:gtk2 \
- port:libgnomeui \
</del><ins>+depends_lib port:gtk3 \
</ins><span class="cx"> port:libxml2 \
</span><del>- port:libglade2
</del><ins>+ port:librsvg \
+ port:barcode \
+ port:qrencode
</ins><span class="cx">
</span><del>-configure.args --without-libebook \
- --disable-update-mimedb \
- --disable-update-desktopdb
</del><ins>+depends_run port:gnome-themes-standard \
+ port:yelp
</ins><span class="cx">
</span><del>-post-activate {
- system "${prefix}/bin/update-desktop-database -q ${prefix}/share/applications; true"
- system "${prefix}/bin/update-mime-database ${prefix}/share/mime; true"
</del><ins>+# reconfigure using upstream autogen.sh for intltool 0.51 compatibility
+
+post-patch {
+ xinstall -m 755 ${filespath}/autogen.sh ${worksrcpath}
</ins><span class="cx"> }
</span><span class="cx">
</span><ins>+configure.cmd ./autogen.sh
+
+configure.args --without-libebook \
+ --without-libzint \
+ --without-libiec16022 \
+ --enable-compile-warnings=minimum \
+ --disable-silent-rules \
+ --disable-schemas-compile
+
</ins><span class="cx"> variant eds description {Build with Evolution Data Server support} {
</span><span class="cx"> depends_lib-append port:evolution-data-server
</span><span class="cx"> configure.args-delete --without-libebook
</span><span class="lines">@@ -48,8 +64,14 @@
</span><span class="cx"> # evolution-data-server -> nss is not universal
</span><span class="cx"> #
</span><span class="cx">
</span><del>-if { [variant_isset eds] } {
</del><ins>+if {[variant_isset eds]} {
</ins><span class="cx"> universal_variant no
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+post-activate {
+ system "${prefix}/bin/update-desktop-database -q ${prefix}/share/applications; true"
+ system "${prefix}/bin/glib-compile-schemas ${prefix}/share/glib-2.0/schemas"
+ system "${prefix}/bin/gtk-update-icon-cache-3.0 -f -t ${prefix}/share/icons/hicolor"
+}
+
</ins><span class="cx"> livecheck.type gnome
</span></span></pre></div>
<a id="usersdevansGNOME3stabledportsgnomeglabelsfilesautogensh"></a>
<div class="addfile"><h4>Added: users/devans/GNOME-3/stable/dports/gnome/glabels/files/autogen.sh (0 => 140974)</h4>
<pre class="diff"><span>
<span class="info">--- users/devans/GNOME-3/stable/dports/gnome/glabels/files/autogen.sh (rev 0)
+++ users/devans/GNOME-3/stable/dports/gnome/glabels/files/autogen.sh 2015-10-07 01:06:18 UTC (rev 140974)
</span><span class="lines">@@ -0,0 +1,25 @@
</span><ins>+#!/bin/sh
+# Run this to generate all the initial makefiles, etc.
+
+srcdir=`dirname $0`
+test -z "$srcdir" && srcdir=.
+
+PKG_NAME="glabels"
+
+(test -f $srcdir/configure.ac \
+ && test -f $srcdir/README \
+ && test -d $srcdir/src) || {
+ echo -n "**Error**: Directory "\`$srcdir\'" does not look like the"
+ echo " top-level $PKG_NAME directory"
+ exit 1
+}
+
+which gnome-autogen.sh || {
+ echo "You need to install gnome-common from the GNOME CVS"
+ exit 1
+}
+
+USE_GNOME2_MACROS=1
+USE_COMMON_DOC_BUILD=yes
+
+. gnome-autogen.sh
</ins></span></pre></div>
<a id="usersdevansGNOME3stabledportsgnomeglabelsfilespatchglib232diff"></a>
<div class="delfile"><h4>Deleted: users/devans/GNOME-3/stable/dports/gnome/glabels/files/patch-glib-2.32.diff (140973 => 140974)</h4>
<pre class="diff"><span>
<span class="info">--- users/devans/GNOME-3/stable/dports/gnome/glabels/files/patch-glib-2.32.diff 2015-10-07 00:58:30 UTC (rev 140973)
+++ users/devans/GNOME-3/stable/dports/gnome/glabels/files/patch-glib-2.32.diff 2015-10-07 01:06:18 UTC (rev 140974)
</span><span class="lines">@@ -1,564 +0,0 @@
</span><del>---- 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
-
</del></span></pre></div>
<a id="usersdevansGNOME3stabledportsgnomeglabelsfilespatchiec16022021iec116022ecc200cdiff"></a>
<div class="delfile"><h4>Deleted: users/devans/GNOME-3/stable/dports/gnome/glabels/files/patch-iec16022-0.2.1-iec116022ecc200.c.diff (140973 => 140974)</h4>
<pre class="diff"><span>
<span class="info">--- users/devans/GNOME-3/stable/dports/gnome/glabels/files/patch-iec16022-0.2.1-iec116022ecc200.c.diff 2015-10-07 00:58:30 UTC (rev 140973)
+++ users/devans/GNOME-3/stable/dports/gnome/glabels/files/patch-iec16022-0.2.1-iec116022ecc200.c.diff 2015-10-07 01:06:18 UTC (rev 140974)
</span><span class="lines">@@ -1,10 +0,0 @@
</span><del>---- iec16022-0.2.1/iec16022ecc200.c.orig 2008-03-26 18:02:31.000000000 -0500
-+++ iec16022-0.2.1/iec16022ecc200.c 2008-03-26 18:02:47.000000000 -0500
-@@ -29,7 +29,6 @@
- #include <string.h>
- #include <time.h>
- #include <popt.h>
--#include <malloc.h>
- #include "reedsol.h"
- #include "iec16022ecc200.h"
-
</del></span></pre>
</div>
</div>
</body>
</html>