diff options
| author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2009-10-28 15:06:18 +0000 |
|---|---|---|
| committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2009-10-28 15:06:18 +0000 |
| commit | 5398eceff34b4db602e98255b3400f9a822c465b (patch) | |
| tree | 055caf2b2885e79690196839895717e1aeb03439 /pkgs/development/libraries/glib | |
| parent | f53195f29e69dbb79f44039b809bb1fa40f34ac2 (diff) | |
* Getting rid of gtk-libs by moving the packages in gtk-libs to
development/libraries/{glib,gtk+,pango,atk,...}. Done for glib/gtk+
1.2. Also deleted some obsolete, unused versions (gtkLibs 2.10,
2.12, and 2.14).
svn path=/nixpkgs/trunk/; revision=17992
Diffstat (limited to 'pkgs/development/libraries/glib')
| -rw-r--r-- | pkgs/development/libraries/glib/1.2.x.nix | 12 | ||||
| -rw-r--r-- | pkgs/development/libraries/glib/gcc34.patch | 20 |
2 files changed, 32 insertions, 0 deletions
diff --git a/pkgs/development/libraries/glib/1.2.x.nix b/pkgs/development/libraries/glib/1.2.x.nix new file mode 100644 index 0000000000000..8aa5005b61719 --- /dev/null +++ b/pkgs/development/libraries/glib/1.2.x.nix @@ -0,0 +1,12 @@ +{stdenv, fetchurl}: + +stdenv.mkDerivation { + name = "glib-1.2.10"; + src = fetchurl { + url = ftp://ftp.gtk.org/pub/gtk/v1.2/glib-1.2.10.tar.gz; + md5 = "6fe30dad87c77b91b632def29dd69ef9"; + }; + # Patch for gcc 3.4 compatibility. Based on + # http://cvs.openpkg.org/chngview?cn=16208. + patches = [./gcc34.patch]; +} diff --git a/pkgs/development/libraries/glib/gcc34.patch b/pkgs/development/libraries/glib/gcc34.patch new file mode 100644 index 0000000000000..13d35c822099c --- /dev/null +++ b/pkgs/development/libraries/glib/gcc34.patch @@ -0,0 +1,20 @@ +diff -rc glib-orig/glib.h glib-1.2.10/glib.h +*** glib-orig/glib.h 2001-02-27 04:44:38.000000000 +0100 +--- glib-1.2.10/glib.h 2004-09-22 10:22:01.000000000 +0200 +*************** +*** 272,278 **** + /* Wrap the gcc __PRETTY_FUNCTION__ and __FUNCTION__ variables with + * macros, so we can refer to them as strings unconditionally. + */ +! #ifdef __GNUC__ + #define G_GNUC_FUNCTION __FUNCTION__ + #define G_GNUC_PRETTY_FUNCTION __PRETTY_FUNCTION__ + #else /* !__GNUC__ */ +--- 272,278 ---- + /* Wrap the gcc __PRETTY_FUNCTION__ and __FUNCTION__ variables with + * macros, so we can refer to them as strings unconditionally. + */ +! #if defined(__GNUC__) && (__GNUC__ == 3 && __GNUC_MINOR__ < 4) + #define G_GNUC_FUNCTION __FUNCTION__ + #define G_GNUC_PRETTY_FUNCTION __PRETTY_FUNCTION__ + #else /* !__GNUC__ */ |