[72698] trunk/dports/devel/glib2-devel

[ryandesign at macports.org]

Revision: 72698
          http://trac.macports.org/changeset/72698
Author:   ryandesign at macports.org
Date:     2010-10-24 12:17:37 -0700 (Sun, 24 Oct 2010)
Log Message:
-----------
glib2-devel: merge r72697 from glib2: fix hardcoded path to dbus machine-id file in gio/gdbusprivate.c; see #26924

Revision Links:
--------------
    http://trac.macports.org/changeset/72697

Modified Paths:
--------------
    trunk/dports/devel/glib2-devel/Portfile

Added Paths:
-----------
    trunk/dports/devel/glib2-devel/files/patch-gio_gdbusprivate.c.diff

Property Changed:
----------------
    trunk/dports/devel/glib2-devel/


Property changes on: trunk/dports/devel/glib2-devel
___________________________________________________________________
Modified: svn:mergeinfo
   - /trunk/dports/devel/glib2:52045-52046,62644,64476
   + /trunk/dports/devel/glib2:52045-52046,62644,64476,72697

Modified: trunk/dports/devel/glib2-devel/Portfile
===================================================================
--- trunk/dports/devel/glib2-devel/Portfile	2010-10-24 17:22:29 UTC (rev 72697)
+++ trunk/dports/devel/glib2-devel/Portfile	2010-10-24 19:17:37 UTC (rev 72698)
@@ -8,6 +8,7 @@
 conflicts                   glib2
 set my_name                 glib
 version                     2.27.0
+revision                    1
 set branch                  [join [lrange [split ${version} .] 0 1] .]
 categories                  devel
 maintainers                 ryandesign
@@ -38,7 +39,8 @@
                             patch-glib-2.0.pc.in.diff \
                             patch-glib_gunicollate.c.diff \
                             patch-gi18n.h.diff \
-                            patch-gio_xdgmime_xdgmime.c.diff
+                            patch-gio_xdgmime_xdgmime.c.diff \
+                            patch-gio_gdbusprivate.c.diff
 
 depends_build               port:pkgconfig \
                             port:dbus
@@ -71,6 +73,7 @@
     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
     reinplace "s|@@PREFIX@@|${prefix}|g" ${worksrcpath}/gio/xdgmime/xdgmime.c
+    reinplace "s|@@PREFIX@@|${prefix}|g" ${worksrcpath}/gio/gdbusprivate.c
 }
 
 post-configure {

Copied: trunk/dports/devel/glib2-devel/files/patch-gio_gdbusprivate.c.diff (from rev 72697, trunk/dports/devel/glib2/files/patch-gio_gdbusprivate.c.diff)
===================================================================
--- trunk/dports/devel/glib2-devel/files/patch-gio_gdbusprivate.c.diff	                        (rev 0)
+++ trunk/dports/devel/glib2-devel/files/patch-gio_gdbusprivate.c.diff	2010-10-24 19:17:37 UTC (rev 72698)
@@ -0,0 +1,17 @@
+--- gio/gdbusprivate.c.orig	2010-10-20 16:08:38.000000000 -0700
++++ gio/gdbusprivate.c	2010-10-20 16:12:16.000000000 -0700
+@@ -1750,12 +1750,12 @@
+   gchar *ret;
+   /* TODO: use PACKAGE_LOCALSTATEDIR ? */
+   ret = NULL;
+-  if (!g_file_get_contents ("/var/lib/dbus/machine-id",
++  if (!g_file_get_contents ("@@PREFIX@@/var/lib/dbus/machine-id",
+                             &ret,
+                             NULL,
+                             error))
+     {
+-      g_prefix_error (error, _("Unable to load /var/lib/dbus/machine-id: "));
++      g_prefix_error (error, _("Unable to load @@PREFIX@@/var/lib/dbus/machine-id: "));
+     }
+   else
+     {
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20101024/1bca9212/attachment.html>