Author: shlevy
Date: Fri Apr 22 17:08:02 2011
New Revision: 26921
URL: https://svn.nixos.org/websvn/nix/?rev=26921&sc=1
Log:
Bump gtkhtml to 3.32.2
Added:
nixpkgs/trunk/pkgs/desktops/gnome-2.28/platform/gtkhtml/01_remove-disable-deprecated.patch
Modified:
nixpkgs/trunk/pkgs/desktops/gnome-2.28/platform/gtkhtml/default.nix
Added:
nixpkgs/trunk/pkgs/desktops/gnome-2.28/platform/gtkhtml/01_remove-disable-deprecated.patch
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++
nixpkgs/trunk/pkgs/desktops/gnome-2.28/platform/gtkhtml/01_remove-disable-deprecated.patch
Fri Apr 22 17:08:02 2011 (r26921)
@@ -0,0 +1,17 @@
+diff -Naur gtkhtml-3.32.2-orig/configure gtkhtml-3.32.2/configure
+--- gtkhtml-3.32.2-orig/configure 2011-02-05 23:12:31.000000000 -0500
++++ gtkhtml-3.32.2/configure 2011-04-22 13:03:18.228874636 -0400
+@@ -5761,12 +5761,7 @@
+
+ if test "x${enable_deprecated_flags}" = "xyes"; then
+
+- list="-DG_DISABLE_DEPRECATED
+- -DPANGO_DISABLE_DEPRECATED
+- -DGDK_DISABLE_DEPRECATED
+- -DGDK_PIXBUF_DISABLE_DEPRECATED
+- -DGTK_DISABLE_DEPRECATED
+- -DGNOME_DISABLE_DEPRECATED"
++ list=""
+ flags_supported=""
+ flags_unsupported=""
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for supported compiler
flags" >&5
Modified: nixpkgs/trunk/pkgs/desktops/gnome-2.28/platform/gtkhtml/default.nix
==============================================================================
--- nixpkgs/trunk/pkgs/desktops/gnome-2.28/platform/gtkhtml/default.nix Fri Apr
22 10:26:45 2011 (r26920)
+++ nixpkgs/trunk/pkgs/desktops/gnome-2.28/platform/gtkhtml/default.nix Fri Apr
22 17:08:02 2011 (r26921)
@@ -2,12 +2,16 @@
GConf, enchant, isocodes, gnome_icon_theme }:
stdenv.mkDerivation rec {
- name = "gtkhtml-3.29.92.1";
+ name = "gtkhtml-3.32.2";
src = fetchurl {
- url = "mirror://gnome/sources/gtkhtml/3.29/${name}.tar.bz2";
- sha256 =
"a34fe24af0f591db95010475c21a461985ef4479b2e91602bc745a9accfeef77";
+ url = "mirror://gnome/sources/gtkhtml/3.32/${name}.tar.bz2";
+ sha256 = "17z3jwvpn8waz7bhwrk7a6vs9pad6sqmlxxcqwvxxq89ywy0ail7";
};
+ #From Debian, fixes build issue described here:
+ #http://www.mail-archive.com/[email protected]/msg250091.html
+ patches = [ ./01_remove-disable-deprecated.patch ];
+
buildInputs = [pkgconfig gtk intltool GConf enchant isocodes
gnome_icon_theme ];
}
_______________________________________________
nix-commits mailing list
[email protected]
http://mail.cs.uu.nl/mailman/listinfo/nix-commits
