diff options
author | Anish Mangal <anish@sugarlabs.org> | 2011-01-18 14:47:25 (GMT) |
---|---|---|
committer | Anish Mangal <anish@sugarlabs.org> | 2011-01-18 14:47:25 (GMT) |
commit | be4f30f5b5d2c1938119fbc70458e61d1780bf35 (patch) | |
tree | efa7592c921dca1973dac85f97f1ef0229fc21df | |
parent | 3c2790abdd589957c36ece2e34f429a8c14823ef (diff) |
Update computer happy/normal/sad icons (garycmartin)
-rw-r--r-- | rpms/sugar-artwork/Update-computer-happy-normal-sad-icons-garycmartin.patch | 63 | ||||
-rw-r--r-- | rpms/sugar-artwork/sugar-artwork.spec | 10 |
2 files changed, 72 insertions, 1 deletions
diff --git a/rpms/sugar-artwork/Update-computer-happy-normal-sad-icons-garycmartin.patch b/rpms/sugar-artwork/Update-computer-happy-normal-sad-icons-garycmartin.patch new file mode 100644 index 0000000..85207da --- /dev/null +++ b/rpms/sugar-artwork/Update-computer-happy-normal-sad-icons-garycmartin.patch @@ -0,0 +1,63 @@ +From 1647d4343453b7c7ec4da6b8b52accf2f65502b0 Mon Sep 17 00:00:00 2001 +From: Anish Mangal <anish@sugarlabs.org> +Date: Tue, 18 Jan 2011 11:19:09 -0300 +Subject: [PATCH] Update computer happy/normal/sad icons (garycmartin) +Organization: Sugar Labs Foundation + + +Signed-off-by: Anish Mangal <anish@sugarlabs.org> +--- + icons/scalable/device/computer-happy.svg | 12 ++++++------ + icons/scalable/device/computer-normal.svg | 2 +- + icons/scalable/device/computer-sad.svg | 3 +-- + 3 files changed, 8 insertions(+), 9 deletions(-) + +diff --git a/icons/scalable/device/computer-happy.svg b/icons/scalable/device/computer-happy.svg +index 4f23ce1..99e97e2 100644 +--- a/icons/scalable/device/computer-happy.svg ++++ b/icons/scalable/device/computer-happy.svg +@@ -2,12 +2,12 @@ + <!-- Created with Inkscape (http://www.inkscape.org/) --><!DOCTYPE svg + PUBLIC '-//W3C//DTD SVG 1.1//EN' + 'http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd' [ +- <!ENTITY stroke_color "#ffffff"> +- <!ENTITY fill_color "#010101"> ++ <!ENTITY stroke_color "#010101"> ++ <!ENTITY fill_color "#ffffff"> + ]> + <svg height="55" id="Layer_1" version="1.1" viewBox="0 0 55 55" width="55" xml:space="preserve" xmlns="http://www.w3.org/2000/svg" xmlns:svg="http://www.w3.org/2000/svg"><defs id="defs9"/><g id="computer" style="display:block"> +- <path d="m 51.322,41.549 h 0.002 l -0.022,-0.018 c -0.15,-0.109 -12.64,-7.878 -12.64,-7.878 V 9.734 c 0,-1.618 -1.31,-2.932 -2.929,-2.932 h -30.9 c -1.619,0 -2.931,1.314 -2.931,2.932 v 26.313 c 0,1.096 0.608,2.037 1.498,2.541 l -0.02,0.004 14.603,9.102 c 0.691,0.436 1.528,0.688 2.428,0.688 h 28.212 c 2.352,0 4.278,-1.733 4.278,-3.85 10e-4,-1.202 -0.618,-2.275 -1.579,-2.983 z" id="module-about_x5F_my_x5F_xo" style="fill:&stroke_color;;stroke:&fill_color;;stroke-width:3.48670006;stroke-linejoin:round"/> +- <path d="m 7.604,13.446 c 0,-0.616 0.504,-1.12 1.12,-1.12 h 23.117 c 0.615,0 1.118,0.503 1.118,1.12 v 16.499 c 0,0.614 -0.503,1.122 -1.118,1.122 H 8.723 c -0.615,0 -1.12,-0.508 -1.12,-1.122 l 0.001,-16.499 0,0 z" id="path5" style="fill:&fill_color;"/> +-</g><g id="g3651"><path d="m 22,21.5 a 0.5,0.5 0 1 1 -1,0 0.5,0.5 0 1 1 1,0 z" id="path2825-3" style="fill:&stroke_color;;fill-opacity:1;stroke:&stroke_color;;stroke-width:3.5;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" transform="translate(-5.5,-5)"/><path d="m 22,21.5 a 0.5,0.5 0 1 1 -1,0 0.5,0.5 0 1 1 1,0 z" id="path2825-3-7" style="fill:&stroke_color;;fill-opacity:1;stroke:&stroke_color;;stroke-width:3.5;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" transform="translate(4.5,-5)"/><path d="m 21,20 0,1 0,0" id="path3643" style="fill:&stroke_color;;fill-opacity:1;stroke:&stroke_color;;stroke-width:3.5;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"/> +-<path d="m -15.592733,28.013593 a 7,5 0 0 1 -12.796629,0.02882" id="path3649" style="fill:&fill_color;;fill-opacity:1;stroke:&stroke_color;;stroke-width:3.5;stroke-linecap:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" transform="translate(43,-4)"/><path d="m -22,29 c -2.062101,-0.0085 -3.533664,-7.690053 -5.201954,-8.902136 -1.657496,-1.20424 -9.38992,-0.202483 -10.01495,-2.153592 -0.6291,-1.963814 6.221713,-5.737072 6.858942,-7.698263 0.633106,-1.9485034 -2.709072,-8.9929164 -1.046602,-10.19028066 1.673296,-1.20516154 7.378894,4.14434776 ++ <path d="m 51.322,41.549 h 0.002 l -0.022,-0.018 c -0.15,-0.109 -12.64,-7.878 -12.64,-7.878 V 9.734 c 0,-1.618 -1.31,-2.932 -2.929,-2.932 h -30.9 c -1.619,0 -2.931,1.314 -2.931,2.932 v 26.313 c 0,1.096 0.608,2.037 1.498,2.541 l -0.02,0.004 14.603,9.102 c 0.691,0.436 1.528,0.688 2.428,0.688 h 28.212 c 2.352,0 4.278,-1.733 4.278,-3.85 10e-4,-1.202 -0.618,-2.275 -1.579,-2.983 z" id="module-about_x5F_my_x5F_xo" style="fill:&fill_color;;stroke:&stroke_color;;stroke-width:3.48670006;stroke-linejoin:round"/> ++ <path d="m 7.604,13.446 c 0,-0.616 0.504,-1.12 1.12,-1.12 h 23.117 c 0.615,0 1.118,0.503 1.118,1.12 v 16.499 c 0,0.614 -0.503,1.122 -1.118,1.122 H 8.723 c -0.615,0 -1.12,-0.508 -1.12,-1.122 l 0.001,-16.499 0,0 z" id="path5" style="fill:&stroke_color;"/> ++</g><g id="g3651"><circle cx="16" cy="16.5" r="1" stroke="&fill_color;" fill="&fill_color;" stroke-width="2" /><circle cx="26" cy="16.5" r="1" stroke="&fill_color;" fill="&fill_color;" stroke-width="2" /><path d="m 21,20 0,1 0,0" id="path3643" style="fill:&fill_color;;fill-opacity:1;stroke:&fill_color;;stroke-width:3.5;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"/> ++<path d="m -15.592733,28.013593 a 7,5 0 0 1 -12.796629,0.02882" id="path3649" style="fill:&stroke_color;;fill-opacity:1;stroke:&fill_color;;stroke-width:3.25;stroke-linecap:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" transform="translate(43,-4)"/><path d="m -22,29 c -2.062101,-0.0085 -3.533664,-7.690053 -5.201954,-8.902136 -1.657496,-1.20424 -9.38992,-0.202483 -10.01495,-2.153592 -0.6291,-1.963814 6.221713,-5.737072 6.858942,-7.698263 0.633106,-1.9485034 -2.709072,-8.9929164 -1.046602,-10.19028066 1.673296,-1.20516154 7.378894,4.14434776 + 9.441013,4.14434696 2.048777,-8e-7 7.715622,-5.3554444 9.368115,-4.14434746 1.663253,1.21898366 -1.661305,8.29841966 -1.024075,10.25961116 0.633108,1.948502 7.4775888,5.683069 6.8364154,7.628933 -0.6453487,1.958534 -8.4056374,0.984357 -10.0739264,2.196441 C -18.514517,21.344954 -19.95124,29.008487 -22,29 z" id="path3624" style="fill:&fill_color;;fill-opacity:1;stroke:none" transform="matrix(0.42707473,0,0,-0.42707473,57.395644,21.385167)"/></g></svg> +diff --git a/icons/scalable/device/computer-normal.svg b/icons/scalable/device/computer-normal.svg +index 144e123..4362dfe 100644 +--- a/icons/scalable/device/computer-normal.svg ++++ b/icons/scalable/device/computer-normal.svg +@@ -8,4 +8,4 @@ + <svg height="55" id="Layer_1" version="1.1" viewBox="0 0 55 55" width="55" xml:space="preserve" xmlns="http://www.w3.org/2000/svg" xmlns:svg="http://www.w3.org/2000/svg"><defs id="defs9"/><g id="computer" style="display:block"> + <path d="m 51.322,41.549 h 0.002 l -0.022,-0.018 c -0.15,-0.109 -12.64,-7.878 -12.64,-7.878 V 9.734 c 0,-1.618 -1.31,-2.932 -2.929,-2.932 h -30.9 c -1.619,0 -2.931,1.314 -2.931,2.932 v 26.313 c 0,1.096 0.608,2.037 1.498,2.541 l -0.02,0.004 14.603,9.102 c 0.691,0.436 1.528,0.688 2.428,0.688 h 28.212 c 2.352,0 4.278,-1.733 4.278,-3.85 10e-4,-1.202 -0.618,-2.275 -1.579,-2.983 z" id="module-about_x5F_my_x5F_xo" style="fill:&fill_color;;stroke:&stroke_color;;stroke-width:3.48670006;stroke-linejoin:round"/> + <path d="m 7.604,13.446 c 0,-0.616 0.504,-1.12 1.12,-1.12 h 23.117 c 0.615,0 1.118,0.503 1.118,1.12 v 16.499 c 0,0.614 -0.503,1.122 -1.118,1.122 H 8.723 c -0.615,0 -1.12,-0.508 -1.12,-1.122 l 0.001,-16.499 0,0 z" id="path5" style="fill:&stroke_color;"/> +-</g><g id="g3651"><path d="m 22,21.5 a 0.5,0.5 0 1 1 -1,0 0.5,0.5 0 1 1 1,0 z" id="path2825-3" style="fill:&fill_color;;fill-opacity:1;stroke:&fill_color;;stroke-width:3.5;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" transform="translate(-5.5,-5)"/><path d="m 22,21.5 a 0.5,0.5 0 1 1 -1,0 0.5,0.5 0 1 1 1,0 z" id="path2825-3-7" style="fill:&fill_color;;fill-opacity:1;stroke:&fill_color;;stroke-width:3.5;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" transform="translate(4.5,-5)"/><path d="m 21,20 0,1 0,0" id="path3643" style="fill:&fill_color;;fill-opacity:1;stroke:&fill_color;;stroke-width:3.5;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"/><path d="m 14,26 14,0" id="path3792" style="fill:none;stroke:&fill_color;;stroke-width:3.5;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"/></g></svg> +\ No newline at end of file ++</g><g id="g3651"><circle cx="16" cy="16.5" r="1" stroke="&fill_color;" fill="&fill_color;" stroke-width="2" /><circle cx="26" cy="16.5" r="1" stroke="&fill_color;" fill="&fill_color;" stroke-width="2" /><path d="m 21,20 0,1 0,0" id="path3643" style="fill:&fill_color;;fill-opacity:1;stroke:&fill_color;;stroke-width:3.5;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"/><path d="m 14,26 14,0" id="path3792" style="fill:none;stroke:&fill_color;;stroke-width:3.25;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"/></g></svg> +\ No newline at end of file +diff --git a/icons/scalable/device/computer-sad.svg b/icons/scalable/device/computer-sad.svg +index 41ab01e..1c45281 100644 +--- a/icons/scalable/device/computer-sad.svg ++++ b/icons/scalable/device/computer-sad.svg +@@ -8,5 +8,4 @@ + <svg height="55" id="Layer_1" version="1.1" viewBox="0 0 55 55" width="55" xml:space="preserve" xmlns="http://www.w3.org/2000/svg" xmlns:svg="http://www.w3.org/2000/svg"><defs id="defs9"/><g id="computer" style="display:block"> + <path d="m 51.322,41.549 h 0.002 l -0.022,-0.018 c -0.15,-0.109 -12.64,-7.878 -12.64,-7.878 V 9.734 c 0,-1.618 -1.31,-2.932 -2.929,-2.932 h -30.9 c -1.619,0 -2.931,1.314 -2.931,2.932 v 26.313 c 0,1.096 0.608,2.037 1.498,2.541 l -0.02,0.004 14.603,9.102 c 0.691,0.436 1.528,0.688 2.428,0.688 h 28.212 c 2.352,0 4.278,-1.733 4.278,-3.85 10e-4,-1.202 -0.618,-2.275 -1.579,-2.983 z" id="module-about_x5F_my_x5F_xo" style="fill:&fill_color;;stroke:&stroke_color;;stroke-width:3.48670006;stroke-linejoin:round"/> + <path d="m 7.604,13.446 c 0,-0.616 0.504,-1.12 1.12,-1.12 h 23.117 c 0.615,0 1.118,0.503 1.118,1.12 v 16.499 c 0,0.614 -0.503,1.122 -1.118,1.122 H 8.723 c -0.615,0 -1.12,-0.508 -1.12,-1.122 l 0.001,-16.499 0,0 z" id="path5" style="fill:&stroke_color;"/> +-</g><g id="g3651"><path d="m 15.900362,16.499593 a 0.5,0.5 0 0 1 -1,0 0.5,0.5 0 1 1 1,0 z" id="path2825-3" style="fill:&fill_color;;fill-opacity:1;stroke:&fill_color;;stroke-width:3.5;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"/><path d="m 25.900362,16.499593 a 0.5,0.5 0 0 1 -1,0 0.5,0.5 0 1 1 1,0 z" id="path2825-3-7" style="fill:&fill_color;;fill-opacity:1;stroke:&fill_color;;stroke-width:3.5;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"/><path d="m 20.400362,19.999593 0,0.625 0,0" id="path3643" style="fill:&fill_color;;fill-opacity:1;stroke:&fill_color;;stroke-width:3.5;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"/><path d="m 26.807629,27.986 c -2.407267,-1.986407 +--4.407267,-2.423907 -6.407267,-2.423907 -2,0 -4,0.4375 -6.389362,2.395087" id="path3649" style="fill:none;stroke:&fill_color;;stroke-width:3.5;stroke-linecap:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"/><path d="m 48,7 c 0,0 -4,6 -4,12 0,2 2.333333,3 4,3 1.666667,0 4,-1 4,-3 C 52,13 48,7 48,7 l 0,0" id="path3746" style="fill:&stroke_color;;fill-opacity:1;stroke:none"/></g></svg> ++</g><g id="g3651"><circle cx="16" cy="16.5" r="1" stroke="&fill_color;" fill="&fill_color;" stroke-width="2" /><circle cx="26" cy="16.5" r="1" stroke="&fill_color;" fill="&fill_color;" stroke-width="2" /><path d="m 21,20 0,0.6 0,0" id="path3643" style="fill:&fill_color;;fill-opacity:1;stroke:&fill_color;;stroke-width:3.5;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"/><path d="m -15.592733,31.913593 a 7,5 0 0 0 -12.796629,0.02882" id="path3649" style="fill:&stroke_color;;fill-opacity:1;stroke:&fill_color;;stroke-width:3.25;stroke-linecap:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" transform="translate(43,-4)"/><path d="m 48,7 c 0,0 -4,6 -4,12 0,2 2.333333,3 4,3 1.666667,0 4,-1 4,-3 C 52,13 48,7 48,7 l 0,0" id="path3746" style="fill:&stroke_color;;fill-opacity:1;stroke:none"/></g></svg> +-- +1.7.3.4 + diff --git a/rpms/sugar-artwork/sugar-artwork.spec b/rpms/sugar-artwork/sugar-artwork.spec index 05f304d..9d9ab89 100644 --- a/rpms/sugar-artwork/sugar-artwork.spec +++ b/rpms/sugar-artwork/sugar-artwork.spec @@ -1,7 +1,7 @@ Summary: Artwork for Sugar look-and-feel Name: sugar-artwork Version: 0.88.1 -Release: 1.9dxo%{?dist} +Release: 1.10dxo%{?dist} URL: http://sugarlabs.org Group: User Interface/Desktops License: LGPLv2+ @@ -24,6 +24,9 @@ Patch202: accessibility_0002_virtualkeyboard_icon.patch # Ad hoc icons Patch301: ad_hoc_artwork.patch +# Update computer happy/normal/sad icons (thanks to garycmartin) +Patch401: Update-computer-happy-normal-sad-icons-garycmartin.patch + BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: gtk2-devel >= 2.9.0 @@ -53,6 +56,8 @@ look and feel. %patch301 -p1 +%patch401 -p1 + %build autoreconf --force --install -v %configure @@ -87,6 +92,9 @@ touch --no-create %{_datadir}/icons/sugar || : %{_libdir}/gtk-2.0/*/engines/*.so %changelog +* Thu Jan 18 2011 Anish Mangal <anish@sugarlabs.org> - 0.88.1-10 +- Update computer happy/normal/sad icons (garycmartin, patch401) + * Thu Jun 3 2010 Peter Robinson <pbrobinson@gmail.com> - 0.88.1-1 - New upstream stable 0.88.1 release |