public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

glib: Fix compilation on Darwin and use default gcc

Browse Source 
http://hydra.nixos.org/build/12458779
This commit is contained in:
Eelco Dolstra
2014-07-15 11:09:30 +02:00
parent 78b5dea799
commit ebd4594c2c
3 changed files with 32 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
pkgs/development/libraries/glib/darwin-compilation.patch Normal file
View File

@@ -0,0 +1,24 @@
Fix compilation on Mac OS X with gcc 4.8.
diff -ru glib-2.40.0-orig/gio/gdummyfile.c glib-2.40.0/gio/gdummyfile.c
--- glib-2.40.0-orig/gio/gdummyfile.c 2014-02-03 18:40:41.000000000 +0100
+++ glib-2.40.0/gio/gdummyfile.c 2014-07-15 10:58:31.000000000 +0200
@@ -454,7 +454,8 @@
result = g_malloc (escaped_string_end - escaped_string + 1);
out = result;
- for (in = escaped_string; in < escaped_string_end; in++)
+ in = escaped_string;
+ for (; in < escaped_string_end; in++)
{
character = *in;
if (*in == '%')
@@ -551,6 +552,7 @@
decoded->scheme = g_malloc (p - uri);
out = decoded->scheme;
- for (in = uri; in < p - 1; in++)
+ in = uri;
+ for (; in < p - 1; in++)
*out++ = g_ascii_tolower (*in);
*out = 0;