aboutsummaryrefslogtreecommitdiffstats
path: root/Library/Formula
diff options
context:
space:
mode:
Diffstat (limited to 'Library/Formula')
-rw-r--r--Library/Formula/glib.rb32
1 files changed, 19 insertions, 13 deletions
diff --git a/Library/Formula/glib.rb b/Library/Formula/glib.rb
index 1de7e9329..dd7b21b6b 100644
--- a/Library/Formula/glib.rb
+++ b/Library/Formula/glib.rb
@@ -30,21 +30,27 @@ class Glib < Formula
sha1 '0926f19d62769dfd3ff91a80ade5eff2c668ec54'
end if build.universal?
- def patches
- p = {}
- p[:p1] = []
- # 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/6700436/raw/a94f21a9c5ccd10afa0a61b11455c880640f3133/glib-configurable-paths.patch"
- # Fixes compilation with FSF GCC. Doesn't fix it on every platform, due
- # to unrelated issues in GCC, but improves the situation.
- # Patch submitted upstream: https://bugzilla.gnome.org/show_bug.cgi?id=672777
- p[:p1] << "https://gist.github.com/mistydemeo/8c7eaf0940b6b9159779/raw/11b3b1f09d15ccf805b0914a15eece11685ea8a5/gio.diff"
- p[:p0] = "https://trac.macports.org/export/111532/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.
+ patch do
+ url "https://gist.github.com/jacknagel/6700436/raw/a94f21a9c5ccd10afa0a61b11455c880640f3133/glib-configurable-paths.patch"
+ sha1 "911df7b09452c52ee3e0d269775d546cf7c077d1"
end
+ # Fixes compilation with FSF GCC. Doesn't fix it on every platform, due
+ # to unrelated issues in GCC, but improves the situation.
+ # Patch submitted upstream: https://bugzilla.gnome.org/show_bug.cgi?id=672777
+ patch do
+ url "https://gist.github.com/mistydemeo/8c7eaf0940b6b9159779/raw/11b3b1f09d15ccf805b0914a15eece11685ea8a5/gio.diff"
+ sha1 "5afea1a284747d31039449ca970376430951ec55"
+ end
+
+ patch :p0 do
+ url "https://trac.macports.org/export/111532/trunk/dports/devel/glib2/files/patch-configure.diff"
+ sha1 "5afea1a284747d31039449ca970376430951ec55"
+ end if build.universal?
+
def install
ENV.universal_binary if build.universal?