Author: eelco
Date: Sun Feb 13 23:38:28 2011
New Revision: 25944
URL: https://svn.nixos.org/websvn/nix/?rev=25944&sc=1
Log:
* Fix broken icons such as the back/forward buttons in Firefox.
Added:
nixpkgs/branches/x-updates/pkgs/development/libraries/gtk+/old-icons.patch
Modified:
nixpkgs/branches/x-updates/pkgs/applications/networking/browsers/firefox/3.6.nix
nixpkgs/branches/x-updates/pkgs/development/libraries/gtk+/2.24.x.nix
Modified:
nixpkgs/branches/x-updates/pkgs/applications/networking/browsers/firefox/3.6.nix
==============================================================================
---
nixpkgs/branches/x-updates/pkgs/applications/networking/browsers/firefox/3.6.nix
Sun Feb 13 17:27:54 2011 (r25943)
+++
nixpkgs/branches/x-updates/pkgs/applications/networking/browsers/firefox/3.6.nix
Sun Feb 13 23:38:28 2011 (r25944)
@@ -97,6 +97,8 @@
rm -f $out/bin/run-mozilla.sh
''; # */
+ enableParallelBuilding = true;
+
meta = {
description = "Mozilla Firefox XUL runner";
homepage = http://www.mozilla.com/en-US/firefox/;
Modified: nixpkgs/branches/x-updates/pkgs/development/libraries/gtk+/2.24.x.nix
==============================================================================
--- nixpkgs/branches/x-updates/pkgs/development/libraries/gtk+/2.24.x.nix
Sun Feb 13 17:27:54 2011 (r25943)
+++ nixpkgs/branches/x-updates/pkgs/development/libraries/gtk+/2.24.x.nix
Sun Feb 13 23:38:28 2011 (r25944)
@@ -15,7 +15,11 @@
sha256 =
"cbed1a7b8cd1e471388a00f22557dd061334698a0c1aece11b7ed6541d115606";
};
- configureFlags = "--with-xinput=yes";
+ patches =
+ [ # Fix broken icons such as the back/forward buttons in Firefox.
+ # http://bugs.gentoo.org/339319
+ ./old-icons.patch
+ ];
enableParallelBuilding = true;
@@ -29,6 +33,8 @@
++ stdenv.lib.optional xineramaSupport xlibs.libXinerama
++ stdenv.lib.optionals cupsSupport [ cups ];
+ configureFlags = "--with-xinput=yes";
+
postInstall = "rm -rf $out/share/gtk-doc";
passthru = { inherit libtiff libjpeg libpng; };
Added:
nixpkgs/branches/x-updates/pkgs/development/libraries/gtk+/old-icons.patch
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ nixpkgs/branches/x-updates/pkgs/development/libraries/gtk+/old-icons.patch
Sun Feb 13 23:38:28 2011 (r25944)
@@ -0,0 +1,270 @@
+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 @@
+ stock-icons/24/folder-remote.png \
+ stock-icons/24/user-home.png \
+ stock-icons/24/user-desktop.png \
+- stock-icons/24/text-x-generic.png
++ stock-icons/24/text-x-generic.png \
++ stock-icons/16/gtk-quit.png \
++ stock-icons/16/gtk-info.png \
++ stock-icons/16/gtk-file.png \
++ stock-icons/16/gtk-open.png \
++ stock-icons/16/gtk-print-preview.png \
++ stock-icons/16/gtk-print.png \
++ stock-icons/16/gtk-properties.png \
++ stock-icons/16/gtk-revert-to-saved-ltr.png \
++ stock-icons/16/gtk-revert-to-saved-rtl.png \
++ stock-icons/16/gtk-save-as.png \
++ stock-icons/16/gtk-new.png \
++ stock-icons/16/gtk-harddisk.png \
++ stock-icons/16/gtk-clear.png \
++ stock-icons/16/gtk-copy.png \
++ stock-icons/16/gtk-cut.png \
++ stock-icons/16/gtk-delete.png \
++ stock-icons/16/gtk-find-and-replace.png \
++ stock-icons/16/gtk-find.png \
++ stock-icons/16/gtk-paste.png \
++ stock-icons/16/gtk-redo-ltr.png \
++ stock-icons/16/gtk-redo-rtl.png \
++ stock-icons/16/gtk-select-all.png \
++ stock-icons/16/gtk-undo-ltr.png \
++ stock-icons/16/gtk-undo-rtl.png \
++ stock-icons/16/gtk-directory.png \
++ stock-icons/16/gtk-unindent-ltr.png \
++ stock-icons/16/gtk-unindent-rtl.png \
++ stock-icons/16/gtk-indent-ltr.png \
++ stock-icons/16/gtk-indent-rtl.png \
++ stock-icons/16/gtk-justify-center.png \
++ stock-icons/16/gtk-justify-fill.png \
++ stock-icons/16/gtk-justify-left.png \
++ stock-icons/16/gtk-justify-right.png \
++ stock-icons/16/gtk-bold.png \
++ stock-icons/16/gtk-italic.png \
++ stock-icons/16/gtk-strikethrough.png \
++ stock-icons/16/gtk-underline.png \
++ stock-icons/16/gtk-goto-bottom.png \
++ stock-icons/16/gtk-go-down.png \
++ stock-icons/16/gtk-goto-first-ltr.png \
++ stock-icons/16/gtk-home.png \
++ stock-icons/16/gtk-jump-to-ltr.png \
++ stock-icons/16/gtk-jump-to-rtl.png \
++ stock-icons/16/gtk-goto-last-ltr.png \
++ stock-icons/16/gtk-go-forward-ltr.png \
++ stock-icons/16/gtk-go-back-ltr.png \
++ stock-icons/16/gtk-goto-top.png \
++ stock-icons/16/gtk-go-up.png \
++ stock-icons/16/gtk-about.png \
++ stock-icons/16/gtk-help.png \
++ stock-icons/16/gtk-missing-image.png \
++ stock-icons/16/gtk-add.png \
++ stock-icons/16/gtk-remove.png \
++ stock-icons/16/gtk-floppy.png \
++ stock-icons/16/gtk-cdrom.png \
++ stock-icons/16/gtk-media-pause.png \
++ stock-icons/16/gtk-media-play-ltr.png \
++ stock-icons/16/gtk-media-play-rtl.png \
++ stock-icons/16/gtk-media-stop.png \
++ stock-icons/16/gtk-media-record.png \
++ stock-icons/16/gtk-media-rewind-ltr.png \
++ stock-icons/16/gtk-media-forward-ltr.png \
++ stock-icons/16/gtk-media-previous-ltr.png \
++ stock-icons/16/gtk-media-next-ltr.png \
++ stock-icons/16/gtk-network.png \
++ stock-icons/16/gtk-print-error.png \
++ stock-icons/16/gtk-print-report.png \
++ stock-icons/16/gtk-print-paused.png \
++ stock-icons/16/gtk-print-warning.png \
++ stock-icons/16/gtk-stop.png \
++ stock-icons/16/gtk-execute.png \
++ stock-icons/16/gtk-spell-check.png \
++ stock-icons/16/gtk-fullscreen.png \
++ stock-icons/16/gtk-refresh.png \
++ stock-icons/16/gtk-leave-fullscreen.png \
++ stock-icons/16/gtk-sort-ascending.png \
++ stock-icons/16/gtk-sort-descending.png \
++ stock-icons/16/gtk-close.png \
++ stock-icons/16/gtk-zoom-fit.png \
++ stock-icons/16/gtk-zoom-in.png \
++ stock-icons/16/gtk-zoom-100.png \
++ stock-icons/16/gtk-zoom-out.png \
++ stock-icons/24/gtk-quit.png \
++ stock-icons/24/gtk-info.png \
++ stock-icons/24/gtk-file.png \
++ stock-icons/24/gtk-open.png \
++ stock-icons/24/gtk-print-preview.png \
++ stock-icons/24/gtk-print.png \
++ stock-icons/24/gtk-properties.png \
++ stock-icons/24/gtk-revert-to-saved-ltr.png \
++ stock-icons/24/gtk-revert-to-saved-rtl.png \
++ stock-icons/24/gtk-save-as.png \
++ stock-icons/24/gtk-new.png \
++ stock-icons/24/gtk-harddisk.png \
++ stock-icons/24/gtk-clear.png \
++ stock-icons/24/gtk-copy.png \
++ stock-icons/24/gtk-cut.png \
++ stock-icons/24/gtk-delete.png \
++ stock-icons/24/gtk-find-and-replace.png \
++ stock-icons/24/gtk-find.png \
++ stock-icons/24/gtk-paste.png \
++ stock-icons/24/gtk-redo-ltr.png \
++ stock-icons/24/gtk-redo-rtl.png \
++ stock-icons/24/gtk-select-all.png \
++ stock-icons/24/gtk-undo-ltr.png \
++ stock-icons/24/gtk-undo-rtl.png \
++ stock-icons/24/gtk-directory.png \
++ stock-icons/24/gtk-unindent-ltr.png \
++ stock-icons/24/gtk-unindent-rtl.png \
++ stock-icons/24/gtk-indent-ltr.png \
++ stock-icons/24/gtk-indent-rtl.png \
++ stock-icons/24/gtk-justify-center.png \
++ stock-icons/24/gtk-justify-fill.png \
++ stock-icons/24/gtk-justify-left.png \
++ stock-icons/24/gtk-justify-right.png \
++ stock-icons/24/gtk-bold.png \
++ stock-icons/24/gtk-italic.png \
++ stock-icons/24/gtk-strikethrough.png \
++ stock-icons/24/gtk-underline.png \
++ stock-icons/24/gtk-goto-bottom.png \
++ stock-icons/24/gtk-go-down.png \
++ stock-icons/24/gtk-goto-first-ltr.png \
++ stock-icons/24/gtk-home.png \
++ stock-icons/24/gtk-jump-to-ltr.png \
++ stock-icons/24/gtk-jump-to-rtl.png \
++ stock-icons/24/gtk-goto-last-ltr.png \
++ stock-icons/24/gtk-go-forward-ltr.png \
++ stock-icons/24/gtk-go-back-ltr.png \
++ stock-icons/24/gtk-goto-top.png \
++ stock-icons/24/gtk-go-up.png \
++ stock-icons/24/gtk-about.png \
++ stock-icons/24/gtk-help.png \
++ stock-icons/24/gtk-missing-image.png \
++ stock-icons/24/gtk-add.png \
++ stock-icons/24/gtk-remove.png \
++ stock-icons/24/gtk-floppy.png \
++ stock-icons/24/gtk-cdrom.png \
++ stock-icons/24/gtk-media-pause.png \
++ stock-icons/24/gtk-media-play-ltr.png \
++ stock-icons/24/gtk-media-play-rtl.png \
++ stock-icons/24/gtk-media-stop.png \
++ stock-icons/24/gtk-media-record.png \
++ stock-icons/24/gtk-media-rewind-ltr.png \
++ stock-icons/24/gtk-media-forward-ltr.png \
++ stock-icons/24/gtk-media-previous-ltr.png \
++ stock-icons/24/gtk-media-next-ltr.png \
++ stock-icons/24/gtk-network.png \
++ stock-icons/24/gtk-print-error.png \
++ stock-icons/24/gtk-print-report.png \
++ stock-icons/24/gtk-print-paused.png \
++ stock-icons/24/gtk-print-warning.png \
++ stock-icons/24/gtk-stop.png \
++ stock-icons/24/gtk-execute.png \
++ stock-icons/24/gtk-spell-check.png \
++ stock-icons/24/gtk-fullscreen.png \
++ stock-icons/24/gtk-refresh.png \
++ stock-icons/24/gtk-leave-fullscreen.png \
++ stock-icons/24/gtk-sort-ascending.png \
++ stock-icons/24/gtk-sort-descending.png \
++ stock-icons/24/gtk-close.png \
++ stock-icons/24/gtk-zoom-fit.png \
++ stock-icons/24/gtk-zoom-in.png \
++ stock-icons/24/gtk-zoom-100.png \
++ stock-icons/24/gtk-zoom-out.png \
++ stock-icons/48/gtk-dialog-error.png
++
+
+ @CROSS_COMPILING_FALSE@gtk_update_icon_cache_program = \
+ @CROSS_COMPILING_FALSE@ ./gtk-update-icon-cache
+@@ -2873,7 +3039,91 @@
+ && $(LN_S) folder.png user-desktop.png \
+ && $(RM) text-x-generic.png \
+ && $(LN_S) document-x-generic.png text-x-generic.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 \
++ && $(LN_S) document-open.png gtk-open.png \
++ && $(LN_S) document-print-preview.png gtk-print-preview.png
\
++ && $(LN_S) document-print.png gtk-print.png \
++ && $(LN_S) document-properties.png gtk-properties.png
\
++ && $(LN_S) document-revert-ltr.png gtk-revert-to-saved-ltr.png
\
++ && $(LN_S) document-revert-rtl.png gtk-revert-to-saved-rtl.png
\
++ && $(LN_S) document-save-as.png gtk-save-as.png
\
++ && $(LN_S) document-x-generic.png gtk-new.png
\
++ && $(LN_S) drive-harddisk.png gtk-harddisk.png
\
++ && $(LN_S) edit-clear.png gtk-clear.png \
++ && $(LN_S) edit-copy.png gtk-copy.png \
++ && $(LN_S) edit-cut.png gtk-cut.png \
++ && $(LN_S) edit-delete.png gtk-delete.png \
++ && $(LN_S) edit-find-replace.png gtk-find-and-replace.png
\
++ && $(LN_S) edit-find.png gtk-find.png \
++ && $(LN_S) edit-paste.png gtk-paste.png \
++ && $(LN_S) edit-redo-ltr.png gtk-redo-ltr.png
\
++ && $(LN_S) edit-redo-rtl.png gtk-redo-rtl.png
\
++ && $(LN_S) edit-select-all.png gtk-select-all.png
\
++ && $(LN_S) edit-undo-ltr.png gtk-undo-ltr.png
\
++ && $(LN_S) edit-undo-rtl.png gtk-undo-rtl.png
\
++ && $(LN_S) folder.png gtk-directory.png \
++ && $(LN_S) format-indent-less-ltr.png gtk-unindent-ltr.png
\
++ && $(LN_S) format-indent-less-rtl.png gtk-unindent-rtl.png
\
++ && $(LN_S) format-indent-more-ltr.png gtk-indent-ltr.png
\
++ && $(LN_S) format-indent-more-rtl.png gtk-indent-rtl.png
\
++ && $(LN_S) format-justify-center.png gtk-justify-center.png
\
++ && $(LN_S) format-justify-fill.png gtk-justify-fill.png
\
++ && $(LN_S) format-justify-left.png gtk-justify-left.png
\
++ && $(LN_S) format-justify-right.png gtk-justify-right.png
\
++ && $(LN_S) format-text-bold.png gtk-bold.png \
++ && $(LN_S) format-text-italic.png gtk-italic.png
\
++ && $(LN_S) format-text-strikethrough.png gtk-strikethrough.png
\
++ && $(LN_S) format-text-underline.png gtk-underline.png
\
++ && $(LN_S) go-bottom.png gtk-goto-bottom.png \
++ && $(LN_S) go-down.png gtk-go-down.png \
++ && $(LN_S) go-first-ltr.png gtk-goto-first-ltr.png
\
++ && $(LN_S) go-home.png gtk-home.png \
++ && $(LN_S) go-jump-ltr.png gtk-jump-to-ltr.png
\
++ && $(LN_S) go-jump-rtl.png gtk-jump-to-rtl.png
\
++ && $(LN_S) go-last-ltr.png gtk-goto-last-ltr.png
\
++ && $(LN_S) go-next-ltr.png gtk-go-forward-ltr.png
\
++ && $(LN_S) go-previous-ltr.png gtk-go-back-ltr.png
\
++ && $(LN_S) go-top.png gtk-goto-top.png \
++ && $(LN_S) go-up.png gtk-go-up.png \
++ && $(LN_S) help-about.png gtk-about.png \
++ && $(LN_S) help-contents.png gtk-help.png \
++ && $(LN_S) image-missing.png gtk-missing-image.png
\
++ && $(LN_S) list-add.png gtk-add.png \
++ && $(LN_S) list-remove.png gtk-remove.png \
++ && $(LN_S) media-floppy.png gtk-floppy.png \
++ && $(LN_S) media-optical.png gtk-cdrom.png \
++ && $(LN_S) media-playback-pause.png gtk-media-pause.png
\
++ && $(LN_S) media-playback-start-ltr.png gtk-media-play-ltr.png
\
++ && $(LN_S) media-playback-start-rtl.png gtk-media-play-rtl.png
\
++ && $(LN_S) media-playback-stop.png gtk-media-stop.png
\
++ && $(LN_S) media-record.png gtk-media-record.png
\
++ && $(LN_S) media-seek-backward-ltr.png gtk-media-rewind-ltr.png
\
++ && $(LN_S) media-seek-forward-ltr.png gtk-media-forward-ltr.png
\
++ && $(LN_S) media-skip-backward-ltr.png gtk-media-previous-ltr.png
\
++ && $(LN_S) media-skip-forward-ltr.png gtk-media-next-ltr.png
\
++ && $(LN_S) network-idle.png gtk-network.png \
++ && $(LN_S) printer-error.png gtk-print-error.png
\
++ && $(LN_S) printer-info.png gtk-print-report.png
\
++ && $(LN_S) printer-paused.png gtk-print-paused.png
\
++ && $(LN_S) printer-warning.png gtk-print-warning.png
\
++ && $(LN_S) process-stop.png gtk-stop.png \
++ && $(LN_S) system-run.png gtk-execute.png \
++ && $(LN_S) tools-check-spelling.png gtk-spell-check.png
\
++ && $(LN_S) view-fullscreen.png gtk-fullscreen.png
\
++ && $(LN_S) view-refresh.png gtk-refresh.png \
++ && $(LN_S) view-restore.png gtk-leave-fullscreen.png
\
++ && $(LN_S) view-sort-ascending.png gtk-sort-ascending.png
\
++ && $(LN_S) view-sort-descending.png gtk-sort-descending.png
\
++ && $(LN_S) window-close.png gtk-close.png \
++ && $(LN_S) zoom-fit-best.png gtk-zoom-fit.png
\
++ && $(LN_S) zoom-in.png gtk-zoom-in.png \
++ && $(LN_S) zoom-original.png gtk-zoom-100.png
\
++ && $(LN_S) zoom-out.png gtk-zoom-out.png \
+ ) done \
++ && (cd stock-icons/48 \
++ && $(LN_S) dialog-error.png gtk-dialog-error.png) \
+ && touch stamp-icons
+
+ gtkbuiltincache.h: @REBUILD@ stamp-icons
_______________________________________________
nix-commits mailing list
[email protected]
http://mail.cs.uu.nl/mailman/listinfo/nix-commits
