From 2965f95bd53e2e16ebcc93c0ef753f790f2ff1eb Mon Sep 17 00:00:00 2001
From: Jack Nagel
Date: Sun, 15 Sep 2013 15:48:00 -0500
Subject: glib: restore patch

This patch needs to stay for packaging reasons.
---
 Library/Formula/glib.rb | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

(limited to 'Library/Formula')

diff --git a/Library/Formula/glib.rb b/Library/Formula/glib.rb
index 959081af7..340a59302 100644
--- a/Library/Formula/glib.rb
+++ b/Library/Formula/glib.rb
@@ -19,11 +19,13 @@ class Glib < Formula
   end
 
   def patches
-    {
-      :p0 => [
-        "https://trac.macports.org/export/95596/trunk/dports/devel/glib2/files/patch-configure.diff"
-      ]
-    } if build.universal?
+    p = {}
+    # https://bugzilla.gnome.org/show_bug.cgi?id=673135 Resolved as wontfix,
+    # but needed to fix an assumption about the location of the d-bus machine
+    # id file.
+    p[:p1] = "https://gist.github.com/jacknagel/5393707/raw/5a9047ab7838709084b36242a44471b02d036386/glib-configurable-paths.patch"
+    p[:p0] = "https://trac.macports.org/export/95596/trunk/dports/devel/glib2/files/patch-configure.diff" if build.universal?
+    p
   end
 
   def install
-- 
cgit v1.2.3