<pre style='margin:0'>
Ryan Schmidt (ryandesign) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/e302b20bdd71e9e16b142c525d8d809ee56ffd05">https://github.com/macports/macports-ports/commit/e302b20bdd71e9e16b142c525d8d809ee56ffd05</a></p>
<pre style="white-space: pre; background: #F8F8F8">The following commit(s) were added to refs/heads/master by this push:
<span style='display:block; white-space:pre;color:#404040;'> new e302b20 glib2, glib2-devel: No longer add -I/opt/local/include to glib-2.0.pc
</span>e302b20 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit e302b20bdd71e9e16b142c525d8d809ee56ffd05
</span>Author: Ryan Schmidt <ryandesign@macports.org>
AuthorDate: Fri Feb 16 05:33:09 2018 -0600
<span style='display:block; white-space:pre;color:#404040;'> glib2, glib2-devel: No longer add -I/opt/local/include to glib-2.0.pc
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> This had originally been added so that other software could include
</span><span style='display:block; white-space:pre;color:#404040;'> gi18n.h without error, since gi18n.h uses #include <libintl.h> so
</span><span style='display:block; white-space:pre;color:#404040;'> the path to libintl.h needs to be among the include paths.
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> MacPorts already puts -I/opt/local/include into CPPFLAGS during the
</span><span style='display:block; white-space:pre;color:#404040;'> configure phase so I expected this change not to affect most ports, and
</span><span style='display:block; white-space:pre;color:#404040;'> to merely help the very few ports that either ignore CPPFLAGS or don't
</span><span style='display:block; white-space:pre;color:#404040;'> use a configure script but do use pkg-config.
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> See: https://trac.macports.org/ticket/9937
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> But some build systems do not put the -I flags into the correct order,
</span><span style='display:block; white-space:pre;color:#404040;'> and are so complicated that fixing that is nearly impossible (e.g. Qt).
</span><span style='display:block; white-space:pre;color:#404040;'> If -I/opt/local/include appears in the compiler flags, such ports may
</span><span style='display:block; white-space:pre;color:#404040;'> fail to upgrade to a new version if the previous version is active, as
</span><span style='display:block; white-space:pre;color:#404040;'> old include files from the old version are mistakenly used instead of
</span><span style='display:block; white-space:pre;color:#404040;'> the new versions. Such ports may clear the automatically-added CPPFLAGS
</span><span style='display:block; white-space:pre;color:#404040;'> to avoid the appearance of -I/opt/local/include, but if they depend on
</span><span style='display:block; white-space:pre;color:#404040;'> glib2, that flag would reappear.
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Therefore, don't add -I/opt/local/include to glib-2.0.pc, and instead
</span><span style='display:block; white-space:pre;color:#404040;'> patch the files that #include <libintl.h> to do so by absolute path.
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Closes: https://trac.macports.org/ticket/44395
</span>---
devel/glib2-devel/Portfile | 11 ++++-------
devel/glib2-devel/files/libintl.patch | 23 ++++++++++++++++++++++
.../files/patch-gio_gdbusprivate.c.diff | 4 ++--
.../files/patch-gio_xdgmime_xdgmime.c.diff | 2 +-
devel/glib2-devel/files/patch-glib-2.0.pc.in.diff | 8 --------
devel/glib2/Portfile | 11 ++++-------
devel/glib2/files/libintl.patch | 23 ++++++++++++++++++++++
devel/glib2/files/patch-gio_gdbusprivate.c.diff | 4 ++--
devel/glib2/files/patch-gio_xdgmime_xdgmime.c.diff | 2 +-
devel/glib2/files/patch-glib-2.0.pc.in.diff | 8 --------
10 files changed, 60 insertions(+), 36 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/glib2-devel/Portfile b/devel/glib2-devel/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 8ece3bb..7405bae 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/glib2-devel/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/devel/glib2-devel/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -9,7 +9,7 @@ name glib2-devel
</span> conflicts glib2
set my_name glib
version 2.55.1
<span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 2
</span> set branch [join [lrange [split ${version} .] 0 1] .]
categories devel
maintainers {ryandesign @ryandesign} openmaintainer
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -33,13 +33,11 @@ checksums rmd160 84c830630fc167ae4ed73413e304f570ec3d3c28 \
</span> sha256 0cbb3d31c9d181bbcc97cba3d9dbe3250f75e2da25e5f7c8bf5a993fe54baf6a \
size 7923872
<span style='display:block; white-space:pre;background:#ffe0e0;'>-# ${prefix}/include/glib-2.0/glib/gi18n.h requires -I${prefix}/include to find libintl.h
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# See https://trac.macports.org/changeset/27148
</span> # patch-configure-switch-for-gappinfo-impl-mp.diff: understand comments inline!
# => https://trac.macports.org/ticket/53911
# => https://bugzilla.gnome.org/show_bug.cgi?id=781548
<span style='display:block; white-space:pre;background:#ffe0e0;'>-patchfiles patch-configure.diff \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patch-glib-2.0.pc.in.diff \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles libintl.patch \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patch-configure.diff \
</span> patch-glib-gmain.c.diff \
patch-glib_gunicollate.c.diff \
patch-gio_xdgmime_xdgmime.c.diff \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -93,10 +91,9 @@ configure.env-append PCRE_CFLAGS="-I${prefix}/include" \
</span> ZLIB_LIBS="-L${prefix}/lib -lz"
post-patch {
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ reinplace -W ${worksrcpath} "s|@PREFIX@|${prefix}|g" gio/gdbusprivate.c gio/xdgmime/xdgmime.c glib/gi18n-lib.h glib/gi18n.h
</span> reinplace "s|data_dirs = \"/usr|data_dirs = \"${prefix}/share:/usr|g" ${worksrcpath}/glib/gutils.c
reinplace "s|path = \"/bin|path = \"${prefix}/bin:/bin|g" ${worksrcpath}/glib/gutils.c ${worksrcpath}/glib/gspawn.c
<span style='display:block; white-space:pre;background:#ffe0e0;'>- reinplace "s|@@PREFIX@@|${prefix}|g" ${worksrcpath}/gio/xdgmime/xdgmime.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- reinplace "s|@@PREFIX@@|${prefix}|g" ${worksrcpath}/gio/gdbusprivate.c
</span> reinplace "s|#! */usr/bin/env python|#!${configure.python}|g" ${worksrcpath}/glib/gtester-report
reinplace "s|-Werror=missing-prototypes||" ${worksrcpath}/configure
}
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/glib2-devel/files/libintl.patch b/devel/glib2-devel/files/libintl.patch
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 0000000..71ecbe2
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/devel/glib2-devel/files/libintl.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,23 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Ensure libintl.h can be found even if -I/opt/local/include is not in CPPFLAGS.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- glib/gi18n-lib.h.orig 2017-07-13 18:03:39.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ glib/gi18n-lib.h 2018-01-31 18:18:52.000000000 -0600
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -20,7 +20,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <glib.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#include <libintl.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#include <@PREFIX@/include/libintl.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <string.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #ifndef GETTEXT_PACKAGE
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- glib/gi18n.h.orig 2017-07-13 18:03:39.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ glib/gi18n.h 2018-01-31 18:18:56.000000000 -0600
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -20,7 +20,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <glib.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#include <libintl.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#include <@PREFIX@/include/libintl.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <string.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #define _(String) gettext (String)
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/glib2-devel/files/patch-gio_gdbusprivate.c.diff b/devel/glib2-devel/files/patch-gio_gdbusprivate.c.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index 36c8a25..d2b5b86 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/glib2-devel/files/patch-gio_gdbusprivate.c.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/devel/glib2-devel/files/patch-gio_gdbusprivate.c.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -5,7 +5,7 @@
</span> ret = NULL;
first_error = NULL;
- if (!g_file_get_contents ("/var/lib/dbus/machine-id",
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+ if (!g_file_get_contents ("@@PREFIX@@/var/lib/dbus/machine-id",
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if (!g_file_get_contents ("@PREFIX@/var/lib/dbus/machine-id",
</span> &ret,
NULL,
&first_error) &&
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -14,7 +14,7 @@
</span> {
g_propagate_prefixed_error (error, first_error,
- _("Unable to load /var/lib/dbus/machine-id or /etc/machine-id: "));
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+ _("Unable to load @@PREFIX@@/var/lib/dbus/machine-id or /etc/machine-id: "));
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ _("Unable to load @PREFIX@/var/lib/dbus/machine-id or /etc/machine-id: "));
</span> }
else
{
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/glib2-devel/files/patch-gio_xdgmime_xdgmime.c.diff b/devel/glib2-devel/files/patch-gio_xdgmime_xdgmime.c.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index 7ac251b..54d14de 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/glib2-devel/files/patch-gio_xdgmime_xdgmime.c.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/devel/glib2-devel/files/patch-gio_xdgmime_xdgmime.c.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -5,7 +5,7 @@
</span> xdg_data_dirs = getenv ("XDG_DATA_DIRS");
if (xdg_data_dirs == NULL)
- xdg_data_dirs = "/usr/local/share/:/usr/share/";
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+ xdg_data_dirs = "@@PREFIX@@/share/:/usr/share/";
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ xdg_data_dirs = "@PREFIX@/share/:/usr/share/";
</span>
ptr = xdg_data_dirs;
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/glib2-devel/files/patch-glib-2.0.pc.in.diff b/devel/glib2-devel/files/patch-glib-2.0.pc.in.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 9d9c5b1..0000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/glib2-devel/files/patch-glib-2.0.pc.in.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,8 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- glib-2.0.pc.in.orig 2014-04-07 08:01:32.000000000 -0500
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ glib-2.0.pc.in 2014-05-27 20:44:09.000000000 -0500
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -13,4 +13,4 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- Requires.private: @PCRE_REQUIRES@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- Libs: -L${libdir} -lglib-2.0 @INTLLIBS@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- Libs.private: @G_THREAD_LIBS@ @G_LIBS_EXTRA@ @PCRE_LIBS@ @INTLLIBS@ @ICONV_LIBS@ @CARBON_LIBS@ @COCOA_LIBS@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--Cflags: -I${includedir}/glib-2.0 -I${libdir}/glib-2.0/include @GLIB_EXTRA_CFLAGS@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+Cflags: -I${includedir}/glib-2.0 -I${libdir}/glib-2.0/include -I${includedir} @GLIB_EXTRA_CFLAGS@
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/glib2/Portfile b/devel/glib2/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 9b33899..0635b6b 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/glib2/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/devel/glib2/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -9,7 +9,7 @@ name glib2
</span> conflicts glib2-devel
set my_name glib
version 2.54.3
<span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 2
</span> set branch [join [lrange [split ${version} .] 0 1] .]
categories devel
maintainers {ryandesign @ryandesign} openmaintainer
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -33,13 +33,11 @@ checksums rmd160 7439dbf9d661352e7f2c1beae84b76e401798675 \
</span> sha256 963fdc6685dc3da8e5381dfb9f15ca4b5709b28be84d9d05a9bb8e446abac0a8 \
size 7836536
<span style='display:block; white-space:pre;background:#ffe0e0;'>-# ${prefix}/include/glib-2.0/glib/gi18n.h requires -I${prefix}/include to find libintl.h
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# See https://trac.macports.org/changeset/27148
</span> # patch-configure-switch-for-gappinfo-impl-mp.diff: understand comments inline!
# => https://trac.macports.org/ticket/53911
# => https://bugzilla.gnome.org/show_bug.cgi?id=781548
<span style='display:block; white-space:pre;background:#ffe0e0;'>-patchfiles patch-configure.diff \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patch-glib-2.0.pc.in.diff \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles libintl.patch \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patch-configure.diff \
</span> patch-glib-gmain.c.diff \
patch-glib_gunicollate.c.diff \
patch-gio_xdgmime_xdgmime.c.diff \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -93,10 +91,9 @@ configure.env-append PCRE_CFLAGS="-I${prefix}/include" \
</span> ZLIB_LIBS="-L${prefix}/lib -lz"
post-patch {
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ reinplace -W ${worksrcpath} "s|@PREFIX@|${prefix}|g" gio/gdbusprivate.c gio/xdgmime/xdgmime.c glib/gi18n-lib.h glib/gi18n.h
</span> reinplace "s|data_dirs = \"/usr|data_dirs = \"${prefix}/share:/usr|g" ${worksrcpath}/glib/gutils.c
reinplace "s|path = \"/bin|path = \"${prefix}/bin:/bin|g" ${worksrcpath}/glib/gutils.c ${worksrcpath}/glib/gspawn.c
<span style='display:block; white-space:pre;background:#ffe0e0;'>- reinplace "s|@@PREFIX@@|${prefix}|g" ${worksrcpath}/gio/xdgmime/xdgmime.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- reinplace "s|@@PREFIX@@|${prefix}|g" ${worksrcpath}/gio/gdbusprivate.c
</span> reinplace "s|#! */usr/bin/env python|#!${configure.python}|g" ${worksrcpath}/glib/gtester-report
reinplace "s|-Werror=missing-prototypes||" ${worksrcpath}/configure
}
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/glib2/files/libintl.patch b/devel/glib2/files/libintl.patch
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 0000000..71ecbe2
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/devel/glib2/files/libintl.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,23 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Ensure libintl.h can be found even if -I/opt/local/include is not in CPPFLAGS.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- glib/gi18n-lib.h.orig 2017-07-13 18:03:39.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ glib/gi18n-lib.h 2018-01-31 18:18:52.000000000 -0600
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -20,7 +20,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <glib.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#include <libintl.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#include <@PREFIX@/include/libintl.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <string.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #ifndef GETTEXT_PACKAGE
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- glib/gi18n.h.orig 2017-07-13 18:03:39.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ glib/gi18n.h 2018-01-31 18:18:56.000000000 -0600
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -20,7 +20,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <glib.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#include <libintl.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#include <@PREFIX@/include/libintl.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <string.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #define _(String) gettext (String)
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/glib2/files/patch-gio_gdbusprivate.c.diff b/devel/glib2/files/patch-gio_gdbusprivate.c.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index 1e2bd21..735000a 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/glib2/files/patch-gio_gdbusprivate.c.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/devel/glib2/files/patch-gio_gdbusprivate.c.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -5,7 +5,7 @@
</span> ret = NULL;
first_error = NULL;
- if (!g_file_get_contents ("/var/lib/dbus/machine-id",
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+ if (!g_file_get_contents ("@@PREFIX@@/var/lib/dbus/machine-id",
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if (!g_file_get_contents ("@PREFIX@/var/lib/dbus/machine-id",
</span> &ret,
NULL,
&first_error) &&
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -14,7 +14,7 @@
</span> {
g_propagate_prefixed_error (error, first_error,
- _("Unable to load /var/lib/dbus/machine-id or /etc/machine-id: "));
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+ _("Unable to load @@PREFIX@@/var/lib/dbus/machine-id or /etc/machine-id: "));
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ _("Unable to load @PREFIX@/var/lib/dbus/machine-id or /etc/machine-id: "));
</span> }
else
{
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/glib2/files/patch-gio_xdgmime_xdgmime.c.diff b/devel/glib2/files/patch-gio_xdgmime_xdgmime.c.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index 7ac251b..54d14de 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/glib2/files/patch-gio_xdgmime_xdgmime.c.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/devel/glib2/files/patch-gio_xdgmime_xdgmime.c.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -5,7 +5,7 @@
</span> xdg_data_dirs = getenv ("XDG_DATA_DIRS");
if (xdg_data_dirs == NULL)
- xdg_data_dirs = "/usr/local/share/:/usr/share/";
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+ xdg_data_dirs = "@@PREFIX@@/share/:/usr/share/";
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ xdg_data_dirs = "@PREFIX@/share/:/usr/share/";
</span>
ptr = xdg_data_dirs;
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/glib2/files/patch-glib-2.0.pc.in.diff b/devel/glib2/files/patch-glib-2.0.pc.in.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 9d9c5b1..0000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/glib2/files/patch-glib-2.0.pc.in.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,8 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- glib-2.0.pc.in.orig 2014-04-07 08:01:32.000000000 -0500
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ glib-2.0.pc.in 2014-05-27 20:44:09.000000000 -0500
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -13,4 +13,4 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- Requires.private: @PCRE_REQUIRES@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- Libs: -L${libdir} -lglib-2.0 @INTLLIBS@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- Libs.private: @G_THREAD_LIBS@ @G_LIBS_EXTRA@ @PCRE_LIBS@ @INTLLIBS@ @ICONV_LIBS@ @CARBON_LIBS@ @COCOA_LIBS@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--Cflags: -I${includedir}/glib-2.0 -I${libdir}/glib-2.0/include @GLIB_EXTRA_CFLAGS@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+Cflags: -I${includedir}/glib-2.0 -I${libdir}/glib-2.0/include -I${includedir} @GLIB_EXTRA_CFLAGS@
</span></pre><pre style='margin:0'>
</pre>