commit: caa0d3685ae6bf9fd60bbfc3311d64499cd1d778 Author: Mart Raudsepp <leio <AT> gentoo <DOT> org> AuthorDate: Tue May 23 16:33:54 2017 +0000 Commit: Mart Raudsepp <leio <AT> gentoo <DOT> org> CommitDate: Tue May 23 16:34:44 2017 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=caa0d368
x11-themes/adwaita-icon-theme: fix corrupted send-to-symbolic.svg This icon is used at least in gnome-maps "What's here" popup, where it's displaying a missing image icon without the fix. Gentoo-bug: 616220 Package-Manager: Portage-2.3.5, Repoman-2.3.2 .../adwaita-icon-theme-3.22.0-r2.ebuild | 59 ++++++++++++++++++++++ .../files/3.22.0-send-to-symbolic.patch | 41 +++++++++++++++ 2 files changed, 100 insertions(+) diff --git a/x11-themes/adwaita-icon-theme/adwaita-icon-theme-3.22.0-r2.ebuild b/x11-themes/adwaita-icon-theme/adwaita-icon-theme-3.22.0-r2.ebuild new file mode 100644 index 00000000000..fe30a6548f6 --- /dev/null +++ b/x11-themes/adwaita-icon-theme/adwaita-icon-theme-3.22.0-r2.ebuild @@ -0,0 +1,59 @@ +# Copyright 1999-2017 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI="6" + +inherit gnome2 + +DESCRIPTION="GNOME default icon theme" +HOMEPAGE="https://git.gnome.org/browse/adwaita-icon-theme/"; + +SRC_URI="${SRC_URI} + branding? ( http://www.mail-archive.com/tango-artists@lists.freedesktop.org/msg00043/tango-gentoo-v1.1.tar.gz ) +" +LICENSE=" + || ( LGPL-3 CC-BY-SA-3.0 ) + branding? ( CC-BY-SA-4.0 ) +" +SLOT="0" +IUSE="branding" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris" + +COMMON_DEPEND=" + >=x11-themes/hicolor-icon-theme-0.10 +" +RDEPEND="${COMMON_DEPEND} + gnome-base/librsvg:2 + !<x11-themes/gnome-themes-standard-3.14 +" +DEPEND="${COMMON_DEPEND} + sys-devel/gettext + virtual/pkgconfig +" +# This ebuild does not install any binaries +RESTRICT="binchecks strip" + +PATCHES=( + "${FILESDIR}"/${PV}-send-to-symbolic.patch +) + +src_prepare() { + if use branding; then + for i in 16 22 24 32 48; do + cp "${WORKDIR}"/tango-gentoo-v1.1/${i}x${i}/gentoo.png \ + "${S}"/Adwaita/${i}x${i}/places/start-here.png \ + || die "Copying gentoo logos failed" + done + fi + + # Install cursors in the right place used in Gentoo + sed -e 's:^\(cursordir.*\)icons\(.*\):\1cursors/xorg-x11\2:' \ + -i "${S}"/Makefile.am \ + -i "${S}"/Makefile.in || die + + gnome2_src_prepare +} + +src_configure() { + gnome2_src_configure GTK_UPDATE_ICON_CACHE=$(type -P true) +} 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 new file mode 100644 index 00000000000..1db3ababa6a --- /dev/null +++ b/x11-themes/adwaita-icon-theme/files/3.22.0-send-to-symbolic.patch @@ -0,0 +1,41 @@ +From 58cd459e1fdba84f3c7e745636188750ad6d44c8 Mon Sep 17 00:00:00 2001 +From: Iain Lane <i...@orangesquash.org.uk> +Date: Tue, 13 Dec 2016 11:52:56 +0000 +Subject: symbolic: re-render send-to + +Re-render send-to to clean up merge conflict grabage. + +https://bugzilla.gnome.org/show_bug.cgi?id=772031 +--- + Adwaita/scalable/actions/send-to-symbolic.svg | 8 ++------ + 1 file changed, 2 insertions(+), 6 deletions(-) + +diff --git a/Adwaita/scalable/actions/send-to-symbolic.svg b/Adwaita/scalable/actions/send-to-symbolic.svg +index ac20050..0b661cb 100644 +--- a/Adwaita/scalable/actions/send-to-symbolic.svg ++++ b/Adwaita/scalable/actions/send-to-symbolic.svg +@@ -1,7 +1,7 @@ + <?xml version='1.0' encoding='UTF-8' standalone='no'?> + <!-- Created with Inkscape (http://www.inkscape.org/) --> + +-<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'> ++<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'> + <metadata id='metadata90'> + <rdf:RDF> + <cc:Work rdf:about=''> +@@ -11,11 +11,7 @@ + </cc:Work> + </rdf:RDF> + </metadata> +-<<<<<<< HEAD +- <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'> +-======= +- <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'> +->>>>>>> db54204... symbolic: odd recoloring issue workaround ++ <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'> + <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'/> + </sodipodi:namedview> + <title id='title9167'>Gnome Symbolic Icon Theme</title> +-- +cgit v0.12 +
