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

* Getting rid of gtk-libs by moving the packages in gtk-libs to

Browse Source 
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
This commit is contained in:
Eelco Dolstra
2009-10-28 15:06:18 +00:00
parent f53195f29e
commit 5398eceff3
30 changed files with 21 additions and 481 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/development/libraries/glib/1.2.x.nix
+12
View File
@@ -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];
}
pkgs/development/libraries/glib/gcc34.patch
+20
View File
@@ -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__ */