aboutsummaryrefslogtreecommitdiffstats
path: root/Library/Formula
diff options
context:
space:
mode:
authorJack Nagel2013-09-30 09:58:41 -0500
committerJack Nagel2013-09-30 09:59:22 -0500
commit00575e9d2322219477e47bc068e994bb576caf61 (patch)
tree02c2e345b3c7ae121f79d9b608d7434dc80696a1 /Library/Formula
parentea948b71bd6964ae2af9ca55996a5d7bd7b2cb21 (diff)
downloadhomebrew-00575e9d2322219477e47bc068e994bb576caf61.tar.bz2
glib: apply upstream patches for various compilation issues
Diffstat (limited to 'Library/Formula')
-rw-r--r--Library/Formula/glib.rb10
1 files changed, 9 insertions, 1 deletions
diff --git a/Library/Formula/glib.rb b/Library/Formula/glib.rb
index a774e2194..40bbef897 100644
--- a/Library/Formula/glib.rb
+++ b/Library/Formula/glib.rb
@@ -23,7 +23,15 @@ class Glib < Formula
# 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"
+ p[:p1] = []
+ p[:p1] << "https://gist.github.com/jacknagel/6700436/raw/a94f21a9c5ccd10afa0a61b11455c880640f3133/glib-configurable-paths.patch"
+
+ # Upstream patches to fix various compilation issues, should be in 2.38.1
+ p[:p1] << "https://git.gnome.org/browse/glib/patch/?id=92f6cbf5286037fd6bf276370da73635c703fe69"
+ p[:p1] << "https://git.gnome.org/browse/glib/patch/?id=55e6a475b6042298f46297f680247e5ac6f89262"
+ p[:p1] << "https://git.gnome.org/browse/glib/patch/?id=7c8dcd32b91710a3c5fc089c35f228b260e86359"
+ p[:p1] << "https://git.gnome.org/browse/glib/patch/?id=8372f22b26c929e25f1868f4aeacf938b671b2cb"
+
p[:p0] = "https://trac.macports.org/export/111532/trunk/dports/devel/glib2/files/patch-configure.diff" if build.universal?
p
end