wok rev 17189
gtk+: undo wrong symlinks.
author | Aleksej Bobylev <al.bobylev@gmail.com> |
---|---|
date | Fri Oct 03 22:51:56 2014 +0300 (2014-10-03) |
parents | c74472caabee |
children | efcdba50dcb9 |
files | gtk+/receipt gtk+/stuff/replace-icons gtk+/stuff/revert-iconview.patch gtk+/stuff/undo_gen_icons.patch |
line diff
1.1 --- a/gtk+/receipt Fri Oct 03 18:49:40 2014 +0200 1.2 +++ b/gtk+/receipt Fri Oct 03 22:51:56 2014 +0300 1.3 @@ -41,6 +41,8 @@ 1.4 compile_rules() 1.5 { 1.6 . $stuff/replace-icons; cd $src 1.7 + patch -p0 < $stuff/undo_gen_icons.patch 1.8 + 1.9 ./configure \ 1.10 --prefix=/usr \ 1.11 --sysconfdir=/etc \
2.1 --- a/gtk+/stuff/replace-icons Fri Oct 03 18:49:40 2014 +0200 2.2 +++ b/gtk+/stuff/replace-icons Fri Oct 03 22:51:56 2014 +0300 2.3 @@ -1,12 +1,9 @@ 2.4 -# GTK+ stock icons looks alienly for SliTaz based on Faenza icon theme. 2.5 -# These icons takes place, and we don't use them. 2.6 -# This script replaces GTK+ stock icons by Faenza icons. 2.7 +# Replace GTK+ stock icons by Faenza icons 2.8 +# in order to strip icon theme and save some space. 2.9 2.10 -# All "-rtl" variants of icons are just mirrored horizontally original icons. 2.11 -# "media-seek-backward" and "media-seek-forward" composed from "media-palyback" 2.12 -# icon using the GIMP. 2.13 +echo -n "Replacing icons... " 2.14 2.15 -F=$WOK/faenza-icon-theme/taz/*/fs/usr/share/icons/Faenza 2.16 +F=/usr/share/icons/Faenza 2.17 2.18 Ac16=$F/actions/16 2.19 De16=$F/devices/16 2.20 @@ -287,7 +284,11 @@ 2.21 cp -f $St48/dialog-question.png . 2.22 cp -f $St48/dialog-warning.png . 2.23 2.24 +echo "Done" 2.25 + 2.26 for folder in 16 20 24 32 48; do 2.27 + echo -n "Optimizing folder icons $folder... " 2.28 cd $src/gtk/stock-icons/$folder 2.29 optipng -quiet -o7 -zm1-9 ./* 2.30 + echo "Done" 2.31 done
3.1 --- a/gtk+/stuff/revert-iconview.patch Fri Oct 03 18:49:40 2014 +0200 3.2 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 3.3 @@ -1,30 +0,0 @@ 3.4 -From 5c3bb1839cac52828756f9ddb98f49d586853991 Mon Sep 17 00:00:00 2001 3.5 -From: Cosimo Cecchi <cosimoc@gnome.org> 3.6 -Date: Wed, 16 Nov 2011 22:38:45 +0000 3.7 -Subject: Revert "iconview: layout items immediately when setting a GtkTreeModel" 3.8 - 3.9 -It makes GtkIconView segfault on GTK 2.24. 3.10 - 3.11 -gtk_icon_view_expose() calls gtk_icon_view_layout() first thing if 3.12 -there's a layout queued anyway, so we wouldn't end up in the same 3.13 -situation causing the crash the original patch is supposed to fix. 3.14 - 3.15 -This reverts commit 5a03f4a6a50237d86959f596dda143dfc2f040d1. 3.16 - 3.17 -https://bugzilla.gnome.org/show_bug.cgi?id=663138 3.18 ---- 3.19 -diff --git a/gtk/gtkiconview.c b/gtk/gtkiconview.c 3.20 -index 62877fa..54b3f3b 100644 3.21 ---- a/gtk/gtkiconview.c 3.22 -+++ b/gtk/gtkiconview.c 3.23 -@@ -5423,7 +5423,7 @@ gtk_icon_view_set_model (GtkIconView *icon_view, 3.24 - 3.25 - gtk_icon_view_build_items (icon_view); 3.26 - 3.27 -- gtk_icon_view_layout (icon_view); 3.28 -+ gtk_icon_view_queue_layout (icon_view); 3.29 - } 3.30 - 3.31 - g_object_notify (G_OBJECT (icon_view), "model"); 3.32 --- 3.33 -cgit v0.9.0.2
4.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 4.2 +++ b/gtk+/stuff/undo_gen_icons.patch Fri Oct 03 22:51:56 2014 +0300 4.3 @@ -0,0 +1,24 @@ 4.4 +--- gtk/Makefile.am 4.5 ++++ gtk/Makefile.am 4.6 +@@ -1357,10 +1357,6 @@ 4.7 + fi && \ 4.8 + for i in 16 24; do \ 4.9 + (cd stock-icons/$$i \ 4.10 +- && $(RM) document-save.png \ 4.11 +- && $(LN_S) media-floppy.png document-save.png \ 4.12 +- && $(RM) folder-remote.png \ 4.13 +- && $(LN_S) folder.png folder-remote.png \ 4.14 + && $(RM) go-first-rtl.png \ 4.15 + && $(LN_S) go-last-ltr.png go-first-rtl.png \ 4.16 + && $(RM) go-last-rtl.png \ 4.17 +@@ -1377,10 +1373,6 @@ 4.18 + && $(LN_S) media-skip-forward-ltr.png media-skip-backward-rtl.png \ 4.19 + && $(RM) media-skip-forward-rtl.png \ 4.20 + && $(LN_S) media-skip-backward-ltr.png media-skip-forward-rtl.png \ 4.21 +- && $(RM) user-desktop.png \ 4.22 +- && $(LN_S) folder.png user-desktop.png \ 4.23 +- && $(RM) user-home.png \ 4.24 +- && $(LN_S) folder.png user-home.png \ 4.25 + ) done \ 4.26 + && touch stamp-icons 4.27 +