diff options
| author | Shea Levy <shea@shealevy.com> | 2011-04-22 17:08:02 +0000 |
|---|---|---|
| committer | Shea Levy <shea@shealevy.com> | 2011-04-22 17:08:02 +0000 |
| commit | ad67aa4549f6ea5295fbd901d3e6db47c536312c (patch) | |
| tree | feb5a6fa753bb4c661ac027ea1d1c1ddb7224c9a | |
| parent | c9421ad0b231799f492e200f436d860f69070787 (diff) | |
| download | nixlib-ad67aa4549f6ea5295fbd901d3e6db47c536312c.tar nixlib-ad67aa4549f6ea5295fbd901d3e6db47c536312c.tar.gz nixlib-ad67aa4549f6ea5295fbd901d3e6db47c536312c.tar.bz2 nixlib-ad67aa4549f6ea5295fbd901d3e6db47c536312c.tar.lz nixlib-ad67aa4549f6ea5295fbd901d3e6db47c536312c.tar.xz nixlib-ad67aa4549f6ea5295fbd901d3e6db47c536312c.tar.zst nixlib-ad67aa4549f6ea5295fbd901d3e6db47c536312c.zip | |
Bump gtkhtml to 3.32.2
svn path=/nixpkgs/trunk/; revision=26921
| -rw-r--r-- | pkgs/desktops/gnome-2.28/platform/gtkhtml/01_remove-disable-deprecated.patch | 17 | ||||
| -rw-r--r-- | pkgs/desktops/gnome-2.28/platform/gtkhtml/default.nix | 10 |
2 files changed, 24 insertions, 3 deletions
diff --git a/pkgs/desktops/gnome-2.28/platform/gtkhtml/01_remove-disable-deprecated.patch b/pkgs/desktops/gnome-2.28/platform/gtkhtml/01_remove-disable-deprecated.patch new file mode 100644 index 000000000000..1d9a179d236b --- /dev/null +++ b/pkgs/desktops/gnome-2.28/platform/gtkhtml/01_remove-disable-deprecated.patch @@ -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 diff --git a/pkgs/desktops/gnome-2.28/platform/gtkhtml/default.nix b/pkgs/desktops/gnome-2.28/platform/gtkhtml/default.nix index a6a99c35310d..49161c1a7455 100644 --- a/pkgs/desktops/gnome-2.28/platform/gtkhtml/default.nix +++ b/pkgs/desktops/gnome-2.28/platform/gtkhtml/default.nix @@ -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/debian-bugs-rc@lists.debian.org/msg250091.html + patches = [ ./01_remove-disable-deprecated.patch ]; + buildInputs = [pkgconfig gtk intltool GConf enchant isocodes gnome_icon_theme ]; } |