diff options
| author | nibbles 2bits | 2012-11-19 22:57:23 -0800 |
|---|---|---|
| committer | Adam Vandenberg | 2012-11-20 09:02:25 -0800 |
| commit | 5a07271d1ea9c3d7fe4f6273ecb1de83437741d7 (patch) | |
| tree | ca6be4ce68afb143f6dce81ab917e24f97aabce0 /Library/Formula | |
| parent | ca0352f7733a0fd8a3d3ed24d3dcfac36636fde2 (diff) | |
| download | homebrew-5a07271d1ea9c3d7fe4f6273ecb1de83437741d7.tar.bz2 | |
glib: use the official patch for gsocket.c instead
- Remove the third patch added today. The bug report is resolved.
- Add the official fix for that bug in `gio/gsocket.c`.
The devs got back in contact and reported that they had reverted
the offending change to `gsocket.c` and gave us the right patch
to do that. Noted in the comments to remove at the next version.
Closes #16157.
Signed-off-by: Adam Vandenberg <flangy@gmail.com>
Diffstat (limited to 'Library/Formula')
| -rw-r--r-- | Library/Formula/glib.rb | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/Library/Formula/glib.rb b/Library/Formula/glib.rb index e5c64506a..38a37c8ad 100644 --- a/Library/Formula/glib.rb +++ b/Library/Formula/glib.rb @@ -19,13 +19,13 @@ class Glib < Formula end def patches - # https://bugzilla.gnome.org/show_bug.cgi?id=673047 Merged. Remove >= 2.34.3 + # https://bugzilla.gnome.org/show_bug.cgi?id=673047 Merged. Remove @ 2.34.3 # https://bugzilla.gnome.org/show_bug.cgi?id=673135 Resolved as wontfix. - # https://bugzilla.gnome.org/show_bug.cgi?id=688693 Unresolved at 2.34.2. + # https://bugzilla.gnome.org/show_bug.cgi?id=688693 Resolved remove @ 2.34.3 p = { :p1 => %W[ https://raw.github.com/gist/3924875/19cdaebdff7dcc94ccd9b3747d43a09318f0b846/glib-gunicollate.patch https://raw.github.com/gist/3924879/f86903e0aea1458448507305d01b06a7d878c041/glib-configurable-paths.patch - https://raw.github.com/gist/4115342/6f60fde65391e5c7508452ae29a7c15437168801/gsocket.c.diff + http://git.gnome.org/browse/glib/patch/?id=c160994 ]} p[:p0] = %W[ https://trac.macports.org/export/95596/trunk/dports/devel/glib2/files/patch-configure.diff |