Gentoo Archives: gentoo-commits

From: Mart Raudsepp <leio@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: x11-themes/adwaita-icon-theme/files/
Date: Mon, 18 Feb 2019 08:05:17
Message-Id: 1550476994.693b1f8f216ac634645e12e79f6dfe8220e7881e.leio@gentoo
1 commit: 693b1f8f216ac634645e12e79f6dfe8220e7881e
2 Author: Michael Mair-Keimberger <m.mairkeimberger <AT> gmail <DOT> com>
3 AuthorDate: Thu Feb 14 08:22:11 2019 +0000
4 Commit: Mart Raudsepp <leio <AT> gentoo <DOT> org>
5 CommitDate: Mon Feb 18 08:03:14 2019 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=693b1f8f
7
8 x11-themes/adwaita-icon-theme: remove unused patch(es)
9
10 Closes: https://github.com/gentoo/gentoo/pull/11046
11 Signed-off-by: Michael Mair-Keimberger <m.mairkeimberger <AT> gmail.com>
12 Signed-off-by: Mart Raudsepp <leio <AT> gentoo.org>
13
14 .../files/3.22.0-send-to-symbolic.patch | 41 ----------------------
15 1 file changed, 41 deletions(-)
16
17 diff --git a/x11-themes/adwaita-icon-theme/files/3.22.0-send-to-symbolic.patch b/x11-themes/adwaita-icon-theme/files/3.22.0-send-to-symbolic.patch
18 deleted file mode 100644
19 index 1db3ababa6a..00000000000
20 --- a/x11-themes/adwaita-icon-theme/files/3.22.0-send-to-symbolic.patch
21 +++ /dev/null
22 @@ -1,41 +0,0 @@
23 -From 58cd459e1fdba84f3c7e745636188750ad6d44c8 Mon Sep 17 00:00:00 2001
24 -From: Iain Lane <iain@××××××××××××××××.uk>
25 -Date: Tue, 13 Dec 2016 11:52:56 +0000
26 -Subject: symbolic: re-render send-to
27 -
28 -Re-render send-to to clean up merge conflict grabage.
29 -
30 -https://bugzilla.gnome.org/show_bug.cgi?id=772031
31 ----
32 - Adwaita/scalable/actions/send-to-symbolic.svg | 8 ++------
33 - 1 file changed, 2 insertions(+), 6 deletions(-)
34 -
35 -diff --git a/Adwaita/scalable/actions/send-to-symbolic.svg b/Adwaita/scalable/actions/send-to-symbolic.svg
36 -index ac20050..0b661cb 100644
37 ---- a/Adwaita/scalable/actions/send-to-symbolic.svg
38 -+++ b/Adwaita/scalable/actions/send-to-symbolic.svg
39 -@@ -1,7 +1,7 @@
40 - <?xml version='1.0' encoding='UTF-8' standalone='no'?>
41 - <!-- Created with Inkscape (http://www.inkscape.org/) -->
42 -
43 --<svg xmlns:cc='http://creativecommons.org/ns#' xmlns:dc='http://purl.org/dc/elements/1.1/' sodipodi:docname='send-to-symbolic.svg' inkscape:export-filename='/home/sam/dev/RESOURCES/gnome-icon-theme-symbolic/src/gnome-stencils.png' inkscape:export-xdpi='90' inkscape:export-ydpi='90' height='16' id='svg7384' xmlns:inkscape='http://www.inkscape.org/namespaces/inkscape' xmlns:osb='http://www.openswatchbook.org/uri/2009/osb' xmlns:rdf='http://www.w3.org/1999/02/22-rdf-syntax-ns#' xmlns:sodipodi='http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd' xmlns:svg='http://www.w3.org/2000/svg' version='1.1' inkscape:version='0.91 r13725' width='16' xmlns='http://www.w3.org/2000/svg'>
44 -+<svg xmlns:cc='http://creativecommons.org/ns#' xmlns:dc='http://purl.org/dc/elements/1.1/' sodipodi:docname='send-to-symbolic.svg' inkscape:export-filename='/home/sam/dev/RESOURCES/gnome-icon-theme-symbolic/src/gnome-stencils.png' inkscape:export-xdpi='90' inkscape:export-ydpi='90' height='16' id='svg7384' xmlns:inkscape='http://www.inkscape.org/namespaces/inkscape' xmlns:osb='http://www.openswatchbook.org/uri/2009/osb' xmlns:rdf='http://www.w3.org/1999/02/22-rdf-syntax-ns#' xmlns:sodipodi='http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd' xmlns:svg='http://www.w3.org/2000/svg' version='1.1' inkscape:version='0.91 r13725' viewBox='0 0 16 16' width='16' xmlns='http://www.w3.org/2000/svg'>
45 - <metadata id='metadata90'>
46 - <rdf:RDF>
47 - <cc:Work rdf:about=''>
48 -@@ -11,11 +11,7 @@
49 - </cc:Work>
50 - </rdf:RDF>
51 - </metadata>
52 --<<<<<<< HEAD
53 -- <sodipodi:namedview inkscape:bbox-nodes='true' inkscape:bbox-paths='true' bordercolor='#666666' borderopacity='1' inkscape:current-layer='layer12' inkscape:cx='92.476456' inkscape:cy='581.81839' gridtolerance='10' inkscape:guide-bbox='true' guidetolerance='10' id='namedview88' inkscape:object-nodes='true' inkscape:object-paths='false' objecttolerance='10' pagecolor='#3a3b39' inkscape:pageopacity='1' inkscape:pageshadow='2' showborder='false' showgrid='false' showguides='true' inkscape:snap-bbox='true' inkscape:snap-bbox-midpoints='false' inkscape:snap-global='true' inkscape:snap-grids='true' inkscape:snap-nodes='false' inkscape:snap-others='false' inkscape:snap-to-guides='true' inkscape:window-height='1376' inkscape:window-maximized='1' inkscape:window-width='2560' inkscape:window-x='0' inkscape:window-y='27' inkscape:zoom='1'>
54 --=======
55 -- <sodipodi:namedview inkscape:bbox-nodes='true' inkscape:bbox-paths='true' bordercolor='#666666' borderopacity='1' inkscape:current-layer='layer12' inkscape:cx='10.488082' inkscape:cy='-1.0971361' gridtolerance='10' inkscape:guide-bbox='true' guidetolerance='10' id='namedview88' inkscape:object-nodes='true' inkscape:object-paths='false' objecttolerance='10' pagecolor='#3a3b39' inkscape:pageopacity='1' inkscape:pageshadow='2' showborder='false' showgrid='true' showguides='true' inkscape:snap-bbox='true' inkscape:snap-bbox-midpoints='false' inkscape:snap-global='false' inkscape:snap-grids='true' inkscape:snap-nodes='false' inkscape:snap-others='false' inkscape:snap-to-guides='true' inkscape:window-height='1376' inkscape:window-maximized='1' inkscape:window-width='2560' inkscape:window-x='0' inkscape:window-y='27' inkscape:zoom='11.313708'>
56 -->>>>>>> db54204... symbolic: odd recoloring issue workaround
57 -+ <sodipodi:namedview inkscape:bbox-nodes='true' inkscape:bbox-paths='true' bordercolor='#666666' borderopacity='1' inkscape:current-layer='layer12' inkscape:cx='140.31652' inkscape:cy='125.322' inkscape:document-units='px' gridtolerance='10' inkscape:guide-bbox='true' guidetolerance='10' id='namedview88' inkscape:object-nodes='true' inkscape:object-paths='false' objecttolerance='10' pagecolor='#3a3b39' inkscape:pageopacity='1' inkscape:pageshadow='2' showborder='false' showgrid='false' showguides='true' inkscape:snap-bbox='true' inkscape:snap-bbox-midpoints='false' inkscape:snap-global='false' inkscape:snap-grids='true' inkscape:snap-nodes='false' inkscape:snap-others='false' inkscape:snap-to-guides='true' inkscape:window-height='1056' inkscape:window-maximized='1' inkscape:window-width='1920' inkscape:window-x='0' inkscape:window-y='24' inkscape:zoom='4'>
58 - <inkscape:grid dotted='false' empspacing='2' enabled='true' id='grid4866' originx='200.0002' originy='690' snapvisiblegridlinesonly='true' spacingx='1px' spacingy='1px' type='xygrid' visible='true'/>
59 - </sodipodi:namedview>
60 - <title id='title9167'>Gnome Symbolic Icon Theme</title>
61 ---
62 -cgit v0.12
63 -