Author: eelco
Date: Thu Jul 7 15:43:48 2011
New Revision: 27625
URL: https://svn.nixos.org/websvn/nix/?rev=27625&sc=1
Log:
* GTK+ updated to 2.24.5.
Modified:
nixpkgs/branches/kde-4.7/pkgs/development/libraries/gtk+/2.24.x.nix
nixpkgs/branches/kde-4.7/pkgs/development/libraries/gtk+/old-icons.patch
Modified: nixpkgs/branches/kde-4.7/pkgs/development/libraries/gtk+/2.24.x.nix
==============================================================================
--- nixpkgs/branches/kde-4.7/pkgs/development/libraries/gtk+/2.24.x.nix Thu Jul
7 15:43:26 2011 (r27624)
+++ nixpkgs/branches/kde-4.7/pkgs/development/libraries/gtk+/2.24.x.nix Thu Jul
7 15:43:48 2011 (r27625)
@@ -8,11 +8,11 @@
assert cupsSupport -> cups != null;
stdenv.mkDerivation rec {
- name = "gtk+-2.24.3";
+ name = "gtk+-2.24.5";
src = fetchurl {
url = "mirror://gnome/sources/gtk+/2.24/${name}.tar.bz2";
- sha256 =
"336ddf3dd342cc36bee80dd4f86ef036044a2deb10cda67c8eecf5315b279ef7";
+ sha256 =
"f355f26003b1b42b97e584bdc475189a423fdd052088ee4bbd7aa0f989815cc8";
};
patches =
Modified:
nixpkgs/branches/kde-4.7/pkgs/development/libraries/gtk+/old-icons.patch
==============================================================================
--- nixpkgs/branches/kde-4.7/pkgs/development/libraries/gtk+/old-icons.patch
Thu Jul 7 15:43:26 2011 (r27624)
+++ nixpkgs/branches/kde-4.7/pkgs/development/libraries/gtk+/old-icons.patch
Thu Jul 7 15:43:48 2011 (r27625)
@@ -1,7 +1,7 @@
-diff -ru -x '*~' gtk+-2.24.0-orig//gtk/Makefile.in gtk+-2.24.0//gtk/Makefile.in
---- gtk+-2.24.0-orig//gtk/Makefile.in 2011-01-30 05:39:20.000000000 +0100
-+++ gtk+-2.24.0//gtk/Makefile.in 2011-02-14 00:06:56.000000000 +0100
-@@ -1601,7 +1601,173 @@
+diff -ru gtk+-2.24.5-orig/gtk/Makefile.in gtk+-2.24.5/gtk/Makefile.in
+--- gtk+-2.24.5-orig/gtk/Makefile.in 2011-06-16 01:56:37.000000000 +0200
++++ gtk+-2.24.5/gtk/Makefile.in 2011-07-07 15:38:06.000000000 +0200
+@@ -1616,7 +1616,173 @@
stock-icons/24/folder-remote.png \
stock-icons/24/user-home.png \
stock-icons/24/user-desktop.png \
@@ -176,10 +176,10 @@
@CROSS_COMPILING_FALSE@gtk_update_icon_cache_program = \
@CROSS_COMPILING_FALSE@ ./gtk-update-icon-cache
-@@ -2873,7 +3039,91 @@
+@@ -2887,7 +3053,91 @@
&& $(LN_S) folder.png user-desktop.png \
- && $(RM) text-x-generic.png \
- && $(LN_S) document-x-generic.png text-x-generic.png \
+ && $(RM) user-home.png \
+ && $(LN_S) folder.png user-home.png \
+ && $(LN_S) application-exit.png gtk-quit.png \
+ && $(LN_S) dialog-information.png gtk-info.png
\
+ && $(LN_S) document-new.png gtk-file.png \
_______________________________________________
nix-commits mailing list
[email protected]
http://mail.cs.uu.nl/mailman/listinfo/nix-commits
