Package already includes .svg file.

3 files changed, 4 insertions, 324 deletions

diff --git a/.SRCINFO b/.SRCINFO
index ed7f551233db..f13c59db1358 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,5 +1,5 @@
 # Generated by mksrcinfo v8
-# Wed Feb 10 19:42:19 UTC 2016
+# Wed Feb 10 20:23:20 UTC 2016
 pkgbase = zynaddsubfx-git
 	pkgdesc = A powerful realtime, multi-timbral software synthesizer.
 	pkgver = 2.5.3.r4.ge52dd05
@@ -13,7 +13,6 @@ pkgbase = zynaddsubfx-git
 	makedepends = cmake
 	makedepends = dssi
 	makedepends = gendesk
-	makedepends = setconf
 	depends = fftw
 	depends = fltk
 	depends = lash
@@ -28,10 +27,8 @@ pkgbase = zynaddsubfx-git
 	options = !emptydirs
 	source = zynaddsubfx-git::git://git.code.sf.net/p/zynaddsubfx/code/
 	source = http://zynaddsubfx.sourceforge.net/doc/instruments/unsortedzynaddsubfxParameters_20140402.zip
-	source = zynaddsubfx.svg
 	sha512sums = SKIP
 	sha512sums = 13e7ed9746d0ce7959afa067211175cd007fdeb77500756dd5b0a57e6230e425934a7fe267a5197b539c3305c497745beb2fef2f5e79e4c8662a9c57cf2345f0
-	sha512sums = 2855c5a6c70b030a717aa2fa0d5e6a41b5d867164fcbf55c3574e3f17096a0c0c026b5fc5a142f70dbab15c423e48d7ddef11b24d49d1ecd6ff61f75abace44b
 
 pkgname = zynaddsubfx-git
 
diff --git a/PKGBUILD b/PKGBUILD
index 44874f3b8691..0874fb56d950 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -9,19 +9,17 @@ arch=('i686' 'x86_64')
 url="http://zynaddsubfx.sourceforge.net"
 license=('GPL')
 depends=('fftw' 'fltk' 'lash' 'liblo' 'portaudio' 'mxml' 'ntk-git')
-makedepends=('git' 'cmake' 'dssi' 'gendesk' 'setconf')
+makedepends=('git' 'cmake' 'dssi' 'gendesk')
 optdepends=('dssi: dssi plugin')
 provides=("${pkgname%-*}")
 conflicts=("${pkgname%-*}")
 options=('!emptydirs')
 install="${pkgname}.install"
 source=("${pkgname}::git://git.code.sf.net/p/zynaddsubfx/code/"
-        "http://zynaddsubfx.sourceforge.net/doc/instruments/unsortedzynaddsubfxParameters_20140402.zip"
-        "${pkgname%-*}.svg")
+        "http://zynaddsubfx.sourceforge.net/doc/instruments/unsortedzynaddsubfxParameters_20140402.zip")
 noextract=("${source[1]##*/}")
 sha512sums=('SKIP'
-            '13e7ed9746d0ce7959afa067211175cd007fdeb77500756dd5b0a57e6230e425934a7fe267a5197b539c3305c497745beb2fef2f5e79e4c8662a9c57cf2345f0'
-            '2855c5a6c70b030a717aa2fa0d5e6a41b5d867164fcbf55c3574e3f17096a0c0c026b5fc5a142f70dbab15c423e48d7ddef11b24d49d1ecd6ff61f75abace44b')
+            '13e7ed9746d0ce7959afa067211175cd007fdeb77500756dd5b0a57e6230e425934a7fe267a5197b539c3305c497745beb2fef2f5e79e4c8662a9c57cf2345f0')
 _branch=master
 
 pkgver() {
@@ -51,7 +49,6 @@ build() {
   cd "${srcdir}"
   [ -f zynaddsubfx.desktop ] && rm zynaddsubfx.desktop
   gendesk $startdir/PKGBUILD
-  setconf "${pkgname%-*}.desktop" Icon "${pkgname%-*}.svg"
   # Match camel case of included .desktop files
   sed -i 's:Name=Zynaddsubfx:Name=ZynAddSubFX:' zynaddsubfx.desktop
 
@@ -86,6 +83,5 @@ package() {
                  "${pkgdir}/usr/share/zynaddsubfx/parameters"
                  
   # Desktop file sans predefied I/O and icon
-  install -Dm644 "${srcdir}/${pkgname%-*}.svg" "${pkgdir}/usr/share/pixmaps/${pkgname%-*}.svg"
   install -Dm644 "${srcdir}/${pkgname%-*}.desktop" "${pkgdir}/usr/share/applications/${pkgname%-*}.desktop"
 }
diff --git a/zynaddsubfx.svg b/zynaddsubfx.svg
deleted file mode 100644
index d81c651ad7ee..000000000000
--- a/zynaddsubfx.svg
+++ /dev/null
@@ -1,313 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:xlink="http://www.w3.org/1999/xlink"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   id="svg1"
-   sodipodi:version="0.32"
-   inkscape:version="0.48.2 r9819"
-   width="507.1875"
-   height="509.21875"
-   sodipodi:docname="zynaddsubfx_icon.svg"
-   version="1.1">
-  <defs
-     id="defs3">
-    <linearGradient
-       id="linearGradient4809">
-      <stop
-         style="stop-color:#d5d8db;stop-opacity:1.0000000;"
-         offset="0.0000000"
-         id="stop4810" />
-      <stop
-         style="stop-color:#6d8ec2;stop-opacity:1.0000000;"
-         offset="1.0000000"
-         id="stop4811" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient4179">
-      <stop
-         style="stop-color:#bec8c6;stop-opacity:1.0000000;"
-         offset="0.0000000"
-         id="stop4180" />
-      <stop
-         style="stop-color:#bbcac9;stop-opacity:1.0000000;"
-         offset="0.59527779"
-         id="stop4182" />
-      <stop
-         style="stop-color:#879797;stop-opacity:1.0000000;"
-         offset="1.0000000"
-         id="stop4181" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient4038">
-      <stop
-         style="stop-color:#4a8a61;stop-opacity:1.0000000;"
-         offset="0.0000000"
-         id="stop4039" />
-      <stop
-         style="stop-color:#557c7d;stop-opacity:1.0000000;"
-         offset="1.0000000"
-         id="stop4040" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient2162">
-      <stop
-         style="stop-color:#549c6d;stop-opacity:1.0000000;"
-         offset="0.0000000"
-         id="stop2163" />
-      <stop
-         style="stop-color:#679697;stop-opacity:1.0000000;"
-         offset="1.0000000"
-         id="stop2164" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient2158">
-      <stop
-         style="stop-color:#dbdbdb;stop-opacity:1.0000000;"
-         offset="0.0000000"
-         id="stop2159" />
-      <stop
-         style="stop-color:#a1aec2;stop-opacity:1.0000000;"
-         offset="1.0000000"
-         id="stop2160" />
-    </linearGradient>
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient2158"
-       id="radialGradient2165"
-       cx="205.28555"
-       cy="152.50184"
-       r="486.22545"
-       fx="198.52472"
-       fy="148.59325"
-       gradientTransform="matrix(0.99940285,0,0,1.0005975,-127.46875,-47)"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4038"
-       id="linearGradient4043"
-       x1="119.48864"
-       y1="387.75519"
-       x2="462.45943"
-       y2="302.28432"
-       gradientTransform="scale(1.0666754,0.9374923)"
-       gradientUnits="userSpaceOnUse" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4809"
-       id="radialGradient4184"
-       cx="-6.2401056"
-       cy="138.19312"
-       r="63.0278"
-       fx="-5.4719041"
-       fy="137.48498"
-       spreadMethod="pad"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="scale(1.0322663,0.96874227)" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4809"
-       id="radialGradient3021"
-       gradientUnits="userSpaceOnUse"
-       spreadMethod="pad"
-       cx="-6.2401056"
-       cy="138.19312"
-       fx="-5.4719041"
-       fy="137.48498"
-       r="63.0278"
-       gradientTransform="scale(1.0322663,0.96874227)" />
-  </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="0.61399264"
-     inkscape:cx="305.35982"
-     inkscape:cy="328.83153"
-     inkscape:window-width="1278"
-     inkscape:window-height="760"
-     inkscape:window-x="0"
-     inkscape:window-y="19"
-     showguides="true"
-     inkscape:guide-bbox="true"
-     showgrid="false"
-     inkscape:snap-global="true"
-     inkscape:snap-nodes="true"
-     fit-margin-top="0"
-     fit-margin-left="0"
-     fit-margin-right="0"
-     fit-margin-bottom="0"
-     inkscape:window-maximized="1"
-     inkscape:current-layer="svg1" />
-  <metadata
-     id="metadata4">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <rect
-     style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:2.13874531pt;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-     id="rect2793"
-     width="497.32657"
-     height="497.92426"
-     x="8.5265961"
-     y="9.9727058"
-     rx="10"
-     ry="10.000001" />
-  <rect
-     style="fill:url(#radialGradient2165);fill-opacity:0.75;fill-rule:evenodd;stroke:#c7ffc7;stroke-width:2.67499995;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1"
-     id="rect1532"
-     width="497.32657"
-     height="497.92426"
-     x="1.3287659"
-     y="1.3353081"
-     rx="10"
-     ry="10.000001" />
-  <g
-     id="g4871"
-     transform="matrix(1,0,0,0.72153,-123.39704,-123.99862)">
-    <rect
-       style="fill:url(#linearGradient4043);fill-opacity:0.75;fill-rule:evenodd;stroke:#000000;stroke-width:1.50865927pt;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       id="rect2794"
-       width="374.5567"
-       height="328.96643"
-       x="144.30453"
-       y="199.03429"
-       rx="10.000001"
-       ry="13.85943" />
-    <path
-       style="fill:none;stroke:#fafafa;stroke-width:20;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1"
-       d="m 153.53968,361.37008 c 70.53877,201.53936 110.35828,210.2256 177.45839,6.10757 66.67288,-202.81841 104.2451,-205.61109 176.22345,0.24698"
-       id="path4175"
-       sodipodi:nodetypes="czc"
-       inkscape:connector-curvature="0" />
-    <path
-       style="fill:none;stroke:#000000;stroke-width:7.375;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1"
-       d="m 145.99255,362.80964 c 369.96869,0 369.3724,1.43957 369.3724,1.43957"
-       id="path4176"
-       sodipodi:nodetypes="cc"
-       inkscape:connector-curvature="0" />
-  </g>
-  <g
-     id="g4852"
-     transform="matrix(-1.360555,0.352222,-0.352222,-1.360555,196.67455,583.0333)">
-    <path
-       sodipodi:type="arc"
-       style="fill:url(#radialGradient3021);fill-opacity:0.75;fill-rule:evenodd;stroke:none"
-       id="path4853"
-       sodipodi:cx="16.555019"
-       sodipodi:cy="147.59439"
-       sodipodi:rx="46.785923"
-       sodipodi:ry="43.906792"
-       d="m 63.340942,147.59439 a 46.785923,43.906792 0 1 1 -93.571846,0 46.785923,43.906792 0 1 1 93.571846,0 z"
-       transform="matrix(1.045432,0,0,1.113986,-125.3003,-37.14836)" />
-    <path
-       sodipodi:type="arc"
-       style="fill:none;stroke:#000000;stroke-width:11.85730171;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:11.857302, 23.714604;stroke-dashoffset:0"
-       id="path4854"
-       sodipodi:cx="16.555019"
-       sodipodi:cy="147.59439"
-       sodipodi:rx="46.785923"
-       sodipodi:ry="43.906792"
-       d="m 63.340942,147.59439 a 46.785923,43.906792 0 1 1 -93.571846,0 46.785923,43.906792 0 1 1 93.571846,0 z"
-       transform="matrix(1.162718,0.507361,-0.579194,1.268918,-39.94742,-66.78193)" />
-    <path
-       style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:none"
-       d="m -108.49675,123.27211 c 36.885113,-10.80173 39.904052,-12.46015 39.904052,-12.46015 l -33.461822,23.25931 -6.44223,-10.79916 z"
-       id="path4855"
-       sodipodi:nodetypes="cccc"
-       inkscape:connector-curvature="0" />
-  </g>
-  <g
-     id="g4864"
-     transform="matrix(0.687211,0,0,0.854478,499.66235,-75.81607)">
-    <rect
-       style="fill:#000000;fill-opacity:0.75;fill-rule:evenodd;stroke:none"
-       id="rect4856"
-       width="110.64801"
-       height="545.60913"
-       x="-136.40228"
-       y="109.76131" />
-    <rect
-       style="fill:#00bc1a;fill-opacity:1;fill-rule:evenodd;stroke:none"
-       id="rect4857"
-       width="39.393082"
-       height="442.41235"
-       x="-128.61479"
-       y="205.44652" />
-    <rect
-       style="fill:#00bc1a;fill-opacity:1;fill-rule:evenodd;stroke:none"
-       id="rect4858"
-       width="37.357227"
-       height="525.88245"
-       x="-74.664627"
-       y="120.64261" />
-    <rect
-       style="fill:#000000;fill-opacity:0.17543862;fill-rule:evenodd;stroke:none"
-       id="rect4860"
-       width="95.883904"
-       height="12.21513"
-       x="-128.35823"
-       y="221.73334" />
-    <rect
-       style="fill:#000000;fill-opacity:0.17543862;fill-rule:evenodd;stroke:none"
-       id="rect4862"
-       width="95.883904"
-       height="12.21513"
-       x="-129.37616"
-       y="563.75702" />
-    <rect
-       style="fill:#000000;fill-opacity:0.17543862;fill-rule:evenodd;stroke:none"
-       id="rect4863"
-       width="95.883904"
-       height="12.21513"
-       x="-127.34029"
-       y="386.6376" />
-  </g>
-  <g
-     id="g4875"
-     transform="matrix(-1.360555,0.352222,-0.352222,-1.360555,3.44525,587.1877)">
-    <path
-       sodipodi:type="arc"
-       style="fill:url(#radialGradient4184);fill-opacity:0.75;fill-rule:evenodd;stroke:none"
-       id="path4876"
-       sodipodi:cx="16.555019"
-       sodipodi:cy="147.59439"
-       sodipodi:rx="46.785923"
-       sodipodi:ry="43.906792"
-       d="m 63.340942,147.59439 c 0,24.24905 -20.946771,43.90679 -46.785923,43.90679 -25.8391514,0 -46.785923,-19.65774 -46.785923,-43.90679 0,-24.24905 20.9467716,-43.90679 46.785923,-43.90679 25.839152,0 46.785923,19.65774 46.785923,43.90679 z"
-       transform="matrix(1.045432,0,0,1.113986,-125.3003,-37.14836)" />
-    <path
-       sodipodi:type="arc"
-       style="fill:none;stroke:#000000;stroke-width:11.85730171;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:11.857302, 23.714604;stroke-dashoffset:0"
-       id="path4877"
-       sodipodi:cx="16.555019"
-       sodipodi:cy="147.59439"
-       sodipodi:rx="46.785923"
-       sodipodi:ry="43.906792"
-       d="m 63.340942,147.59439 c 0,24.24905 -20.946771,43.90679 -46.785923,43.90679 -25.8391514,0 -46.785923,-19.65774 -46.785923,-43.90679 0,-24.24905 20.9467716,-43.90679 46.785923,-43.90679 25.839152,0 46.785923,19.65774 46.785923,43.90679 z"
-       transform="matrix(1.162718,0.507361,-0.579194,1.268918,-39.94742,-66.78193)" />
-    <path
-       style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:none"
-       d="m -108.49675,123.27211 c 36.885113,-10.80173 39.904052,-12.46015 39.904052,-12.46015 l -33.461822,23.25931 -6.44223,-10.79916 z"
-       id="path4878"
-       sodipodi:nodetypes="cccc"
-       inkscape:connector-curvature="0" />
-  </g>
-</svg>