mozilla-searchplugins-1.4-1: remove jamendo support and fix yacy xml file

3 files changed, 9 insertions, 28 deletions

diff --git a/libre/mozilla-searchplugins/PKGBUILD b/libre/mozilla-searchplugins/PKGBUILD
index 047157b2b..6721ff845 100644
--- a/libre/mozilla-searchplugins/PKGBUILD
+++ b/libre/mozilla-searchplugins/PKGBUILD
@@ -9,8 +9,8 @@
 # Contributor: Muhammad 'MJ' Jassim <UnbreakableMJ@gmail.com> 
 
 pkgname=mozilla-searchplugins
-pkgver=1.3
-pkgrel=6
+pkgver=1.4
+pkgrel=1
 pkgdesc="System-wide OpenSearch plugins common for Mozilla based browsers."
 arch=('any')
 license=('MPL' 'GPL' 'LGPL')
@@ -19,8 +19,6 @@ source=(
   duckduckgo-html.xml
   duckduckgo-lite.xml
   internet-archive.xml
-  jamendo-en.xml.in
-  jamendo.ico::http://www.jamendo.com/favicon.ico
   parabola-packages.xml::https://parabolagnulinux.org/opensearch/packages/
   parabola-wiki-en.xml::
   seeks-search.xml::http://seeks.zat.im/opensearch.xml
@@ -29,11 +27,6 @@ source=(
   wikipedia-en.xml::https://en.wikipedia.org/w/opensearch_desc.php
 )
 
-build() {
-  cd "$srcdir"
-  sed "s,@icon@,$(base64 -w0 < jamendo.ico)," < jamendo-en.xml.in > jamendo-en.xml
-}
-
 package() {
   install -m755 -d                "${pkgdir}/usr/lib/mozilla/searchplugins"
   install -m644 "${srcdir}"/*.xml "${pkgdir}/usr/lib/mozilla/searchplugins"
@@ -42,10 +35,8 @@ package() {
 md5sums=('b4cc6bd8353af36ade441916217619e4'
          '766aa6def4bf63c0d65afd6ca1b1ce37'
          '462c68585461f8cdc23c93c46f6ee4cf'
-         '0c9a3f48971aab8aa0cf2f5e2ff67292'
-         'e50a847cec81357e8730e0d327515a9c'
          '92f834a3a1d85c9ae202955cdfe941eb'
          'b9a0893d7f6d41d755c478fd60c44be8'
          '76df72680069a41a476539213a569302'
-         '72fb54e996c42e9a66ef4bbe41070823'
+         '0f6cb4119f54e90d678827e2928474d4'
          'dbdd9b61e89d73cc3a70cbe20a1160e1')
diff --git a/libre/mozilla-searchplugins/jamendo-en.xml.in b/libre/mozilla-searchplugins/jamendo-en.xml.in
deleted file mode 100644
index 96b3a008d..000000000
--- a/libre/mozilla-searchplugins/jamendo-en.xml.in
+++ /dev/null
@@ -1,10 +0,0 @@
-<SearchPlugin xmlns="http://www.mozilla.org/2006/browser/search/" xmlns:os="http://a9.com/-/spec/opensearch/1.1/">
-<os:ShortName>Jamendo (en)</os:ShortName>
-<os:Description>Search Jamendo.com English site for downloadable Creative Commons music</os:Description>
-<os:InputEncoding>UTF-8</os:InputEncoding>
-<os:Image width="16" height="16">data:image/x-icon;base64,@icon@</os:Image>
-<UpdateUrl>http://mycroft.mozdev.org/updateos.php/id0/jamendo.xml</UpdateUrl>
-<SearchForm>http://www.jamendo.com/en</SearchForm>
-<os:Url type="text/html" method="GET" template="http://www.jamendo.com/en/search#qs=q={searchTerms}">
-</os:Url>
-</SearchPlugin>
diff --git a/libre/mozilla-searchplugins/yacy.xml b/libre/mozilla-searchplugins/yacy.xml
index 2ac5f4996..9c97f16cc 100644
--- a/libre/mozilla-searchplugins/yacy.xml
+++ b/libre/mozilla-searchplugins/yacy.xml
@@ -4,7 +4,7 @@
     xmlns:suggestions="http://www.opensearch.org/specifications/opensearch/extensions/suggestions/1.1">
   <ShortName>YaCy</ShortName>
   <LongName>YaCy.net - P2P Web Search</LongName>
-  <Image type="image/gif">http://search.ipredator.se:8090/env/grafics/yacy.png</Image>
+  <Image type="image/gif">http://search.ipredator.se/env/grafics/yacy.png</Image>
   <Image width="16" height="16">data:image/x-icon;base64,AAABAAEAEBAAAAAAGABoAwAAFgAAACgAAAAQAAAAIAAAAAEAGAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD////////Chiu+fBm+fRq+fRq+fRq+fRq+fRq8ehXMmk////////////////////////////++exjUqGfZsnjYsXbYsXbYsXbZsnjTp2W+fBr///////////////////////////+9exfs2r/69/L58+z58+z58+z59e/z59bChSn///////////////////////////+9fBnnz638+fX69O369e748un38Ob59O3Ll0fVrGz////////////////////////Jk0HJlUjXuYrWt4jVtYPr28T58+r59OzPn1fPnlX////////////////////////Rolu8eRXCiTPEjTvCijbNnlj169359e7Zs3vLlkf////////////////////////UqmrAgSLt3MP27eH1693169327+T59Ozo0rG/gB////////////////////////////+/gCDv4Mn48+v38Of59Oz58+v48+vr2b2+fRv///////////////////////////+9ehXr17n58+z48ejo0bDp07T48+zx49DBhCj///////////////////////////+/fhzjyJ/59Oz59OzQoVvNmU759Oz58+vKlUbXrnH////////////////////////LlkfUqmn59Oz48+vZtHzNm1D48+v59OzPoFjOnlX////////////////////////OnVPOnFL59e348+vq1rnEiC7u38j69vDXsHTIkT3////////////////////////UqWjIkD327+T58+3s2bzAgSLp07T79/Pmzqq+fBn///////////////////////////+/fx7v4Mr7+PTx5NDHkD3kyqP8+vjs2r+9exf///////////////////////////++fBjQoFnVq2zTp2bGjTjJk0LWrW7SpWC+exf////////////////////////////Nm1C6dQy7eBG8eBK9exe8ehS7dxC6dQzLlkj////////////AH///wB8x+sAf///AD/+PwA///8AP///AD///4A9PU+APoz/gB///4AdxvOAHoz/gB3368AfjU/AHT1PwB/+P
 </Image>
   <Language>en-us</Language>
@@ -13,16 +13,16 @@
   <AdultContent>true</AdultContent>
   <Description>YaCy is an open-source GPL-licensed software that can be used for stand-alone search engine installations or as a client for a multi-user P2P-based web indexing cluster. This is the access to peer '_anonufe-29422893-0'.</Description>
   
-  <Url type="text/html" method="GET" template="http://search.ipredator.se:8090/yacysearch.html?query={searchTerms}&amp;startRecord={startIndex?}&amp;maximumRecords={count?}&amp;nav=all" />
-  <Url type="application/rss+xml" method="GET" template="http://search.ipredator.se:8090/yacysearch.rss?nav=&amp;query={searchTerms}&amp;startRecord={startIndex?}&amp;maximumRecords={count?}&amp;verify=false" />
+  <Url type="text/html" method="GET" template="http://search.ipredator.se/yacysearch.html?query={searchTerms}&amp;startRecord={startIndex?}&amp;maximumRecords={count?}&amp;nav=all" />
+  <Url type="application/rss+xml" method="GET" template="http://search.ipredator.se/yacysearch.rss?nav=&amp;query={searchTerms}&amp;startRecord={startIndex?}&amp;maximumRecords={count?}&amp;verify=false" />
   
-  <Url type="application/x-suggestions+json" template="http://search.ipredator.se:8090/suggest.json?query={searchTerms}"/>
-  <Url type="application/x-suggestions+xml" template="http://search.ipredator.se:8090/suggest.xml?query={searchTerms}"/>
+  <Url type="application/x-suggestions+json" template="http://search.ipredator.se/suggest.json?query={searchTerms}"/>
+  <Url type="application/x-suggestions+xml" template="http://search.ipredator.se/suggest.xml?query={searchTerms}"/>
   <!-- syntax according to http://www.loc.gov/standards/sru/. Set verify=true to get snippets in the search results -->
   <Developer>See https://gitorious.org/+yacy-developers</Developer>
   <Query role="example" searchTerms="yacy+open+source" />
   <Tags>YaCy Open Source P2P Web Search</Tags>
-  <Contact>See http://search.ipredator.se:8090/ViewProfile.html?hash=localhash</Contact>
+  <Contact>See http://search.ipredator.se/ViewProfile.html?hash=localhash</Contact>
   <Attribution>YaCy Software &amp;copy; 2004-2012 by Michael Christen et al., YaCy.net; Content: ask peer owner</Attribution>
   <SyndicationRight>open</SyndicationRight>
 </OpenSearchDescription>