updated dataloader to v48.0.0

3 files changed, 119 insertions, 9 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 65f92e0073a9..40fd4f5fb5ea 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = dataloader
 	pkgdesc = An easy to use graphical tool that helps you to get your data into Salesforce objects
-	pkgver = 43.0
+	pkgver = 48.0.0
 	pkgrel = 1
 	url = https://developer.salesforce.com/page/Data_Loader
 	install = dataloader.install
@@ -9,15 +9,16 @@ pkgbase = dataloader
 	license = GPL2
 	makedepends = git
 	makedepends = maven
+	makedepends = jre11-openjdk
 	depends = java-runtime>=1.6
 	depends = gtk2
 	depends = gtk-update-icon-cache
 	source = dataloader.desktop
 	source = dataloader.install
-	source = dataloader.xpm
+	source = dataloader.svg
 	md5sums = b519f96b515793fa80cd820e25d70d68
 	md5sums = 94f2b99bb9af44899cd4d2ded981fd54
-	md5sums = 895815be928816f9ace42c3135a428b5
+	md5sums = 0b9294d4865f364681a79fbbc73dd88a
 	source_i686 = git+https://github.com/forcedotcom/dataloader.git
 	md5sums_i686 = SKIP
 	source_x86_64 = git+https://github.com/forcedotcom/dataloader.git
diff --git a/PKGBUILD b/PKGBUILD
index 0511b30012f4..4cf90d4a1b41 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,21 +1,22 @@
+# Maintainer: Benedikt Rumpf <beru@posteo.de> 
 # Maintainer: Egidio Caprino <me@egidiocaprino.it>
 
 pkgname=dataloader
-pkgver=43.0
+pkgver=48.0.0
 pkgrel=1
 pkgdesc="An easy to use graphical tool that helps you to get your data into Salesforce objects"
 arch=('i686' 'x86_64')
 url="https://developer.salesforce.com/page/Data_Loader"
 license=("GPL2")
 depends=('java-runtime>=1.6' 'gtk2' 'gtk-update-icon-cache')
-makedepends=('git' 'maven')
+makedepends=('git' 'maven' 'jre11-openjdk')
 install=dataloader.install
-source=(dataloader.desktop dataloader.install dataloader.xpm)
+source=(dataloader.desktop dataloader.install dataloader.svg)
 source_i686=(git+https://github.com/forcedotcom/dataloader.git)
 source_x86_64=(git+https://github.com/forcedotcom/dataloader.git)
 md5sums=('b519f96b515793fa80cd820e25d70d68'
          '94f2b99bb9af44899cd4d2ded981fd54'
-         '895815be928816f9ace42c3135a428b5')
+         '0b9294d4865f364681a79fbbc73dd88a')
 md5sums_i686=('SKIP')
 md5sums_x86_64=('SKIP')
 
@@ -37,12 +38,12 @@ package() {
   mkdir -p "$pkgdir/usr/share/icons/hicolor/48x48/apps"
 
   cp -r "$srcdir/$pkgname" "$pkgdir/opt/"
-  cp "$srcdir/dataloader.xpm" "$pkgdir/usr/share/icons/hicolor/48x48/apps/dataloader.xpm"
+  cp "$srcdir/dataloader.svg" "$pkgdir/usr/share/icons/hicolor/48x48/apps/dataloader.svg"
 
   touch "$pkgdir/opt/$pkgname/dataloader.sh"
   chmod +x "$pkgdir/opt/$pkgname/dataloader.sh"
   echo "#!/bin/bash" >> "$pkgdir/opt/$pkgname/dataloader.sh"
-  echo "java -jar \"/opt/$pkgname/target/dataloader-$pkgver.0-uber.jar\"" >> "$pkgdir/opt/$pkgname/dataloader.sh"
+  echo "java -jar \"/opt/$pkgname/target/dataloader-$pkgver-uber.jar\"" >> "$pkgdir/opt/$pkgname/dataloader.sh"
   ln -s "/opt/$pkgname/dataloader.sh" "$pkgdir/usr/bin/dataloader"
 
   install -m 644 "$srcdir/dataloader.desktop" "$pkgdir/usr/share/applications/"
diff --git a/dataloader.svg b/dataloader.svg
new file mode 100644
index 000000000000..d4401209b6a7
--- /dev/null
+++ b/dataloader.svg
@@ -0,0 +1,108 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Generator: Adobe Illustrator 19.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+
+<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:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   version="1.1"
+   id="Layer_1"
+   x="0px"
+   y="0px"
+   viewBox="0 0 500 500"
+   style="enable-background:new 0 0 500 500;"
+   xml:space="preserve"
+   sodipodi:docname="dataloader.svg"
+   inkscape:version="0.92.4 5da689c313, 2019-01-14"><metadata
+   id="metadata21"><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><defs
+   id="defs19" /><sodipodi:namedview
+   pagecolor="#ffffff"
+   bordercolor="#666666"
+   borderopacity="1"
+   objecttolerance="10"
+   gridtolerance="10"
+   guidetolerance="10"
+   inkscape:pageopacity="0"
+   inkscape:pageshadow="2"
+   inkscape:window-width="1920"
+   inkscape:window-height="1052"
+   id="namedview17"
+   showgrid="false"
+   inkscape:zoom="0.944"
+   inkscape:cx="260.85893"
+   inkscape:cy="225.05927"
+   inkscape:window-x="1920"
+   inkscape:window-y="0"
+   inkscape:window-maximized="1"
+   inkscape:current-layer="Layer_1" />
+<style
+   type="text/css"
+   id="style2">
+	.st0{fill:#00A1E0;}
+	.st1{fill:#FFFFFF;}
+</style>
+<g
+   id="XMLID_1_">
+	<path
+   id="XMLID_3_"
+   class="st0"
+   d="M219.4,150.1c11.8-12.3,28.2-19.9,46.3-19.9c24.1,0,45.1,13.4,56.3,33.4   c9.7-4.3,20.5-6.8,31.8-6.8c43.5,0,78.7,35.5,78.7,79.4c0,43.8-35.2,79.4-78.7,79.4c-5.3,0-10.5-0.5-15.5-1.5   c-9.9,17.6-28.6,29.5-50.2,29.5c-9,0-17.6-2.1-25.2-5.8c-10,23.5-33.3,40-60.4,40c-28.3,0-52.3-17.9-61.6-43   c-4,0.9-8.2,1.3-12.5,1.3c-33.6,0-60.9-27.6-60.9-61.6c0-22.8,12.3-42.7,30.5-53.3c-3.7-8.6-5.8-18.1-5.8-28.2   c0-39.1,31.7-70.8,70.9-70.8C186,122.3,206.4,133.2,219.4,150.1" />
+	<path
+   id="XMLID_4_"
+   class="st1"
+   d="M120.4,254.7c-0.2,0.6,0.1,0.7,0.2,0.8c0.7,0.5,1.4,0.9,2.1,1.3c3.7,2,7.2,2.6,10.9,2.6   c7.5,0,12.1-4,12.1-10.4v-0.1c0-5.9-5.2-8.1-10.2-9.6l-0.6-0.2c-3.7-1.2-6.9-2.2-6.9-4.7v-0.1c0-2.1,1.9-3.6,4.8-3.6   c3.2,0,7.1,1.1,9.5,2.4c0,0,0.7,0.5,1-0.2c0.1-0.4,1.4-3.7,1.5-4.1c0.1-0.4-0.1-0.7-0.4-0.8c-2.8-1.7-6.7-2.9-10.7-2.9l-0.7,0   c-6.9,0-11.6,4.1-11.6,10.1v0.1c0,6.3,5.3,8.3,10.2,9.7l0.8,0.2c3.6,1.1,6.7,2.1,6.7,4.6v0.1c0,2.3-2,4-5.3,4c-1.3,0-5.3,0-9.6-2.8   c-0.5-0.3-0.8-0.5-1.2-0.8c-0.2-0.1-0.7-0.4-1,0.3L120.4,254.7z" />
+	<path
+   id="XMLID_5_"
+   class="st1"
+   d="M230,254.7c-0.2,0.6,0.1,0.7,0.2,0.8c0.7,0.5,1.4,0.9,2.1,1.3c3.7,2,7.2,2.6,10.9,2.6   c7.5,0,12.1-4,12.1-10.4v-0.1c0-5.9-5.2-8.1-10.2-9.6l-0.6-0.2c-3.7-1.2-6.9-2.2-6.9-4.7v-0.1c0-2.1,1.9-3.6,4.8-3.6   c3.2,0,7.1,1.1,9.5,2.4c0,0,0.7,0.5,1-0.2c0.1-0.4,1.4-3.7,1.5-4.1c0.1-0.4-0.1-0.7-0.4-0.8c-2.8-1.7-6.7-2.9-10.7-2.9l-0.7,0   c-6.9,0-11.6,4.1-11.6,10.1v0.1c0,6.3,5.3,8.3,10.2,9.7l0.8,0.2c3.6,1.1,6.7,2.1,6.7,4.6v0.1c0,2.3-2,4-5.3,4c-1.3,0-5.3,0-9.6-2.8   c-0.5-0.3-0.8-0.5-1.2-0.8c-0.1-0.1-0.8-0.3-1,0.3L230,254.7z" />
+	<path
+   id="XMLID_8_"
+   class="st1"
+   d="M304.8,242.2c0,3.6-0.7,6.5-2,8.5c-1.3,2-3.3,3-6.1,3c-2.8,0-4.8-1-6.1-3c-1.3-2-2-4.9-2-8.5   c0-3.6,0.7-6.5,2-8.5c1.3-2,3.3-2.9,6.1-2.9c2.8,0,4.8,1,6.1,2.9C304.1,235.7,304.8,238.6,304.8,242.2 M311.1,235.5   c-0.6-2.1-1.6-3.9-2.8-5.4c-1.3-1.5-2.9-2.8-4.8-3.7c-1.9-0.9-4.2-1.3-6.7-1.3c-2.5,0-4.8,0.5-6.7,1.3c-1.9,0.9-3.5,2.1-4.8,3.7   c-1.3,1.5-2.2,3.4-2.8,5.4c-0.6,2.1-0.9,4.3-0.9,6.7c0,2.4,0.3,4.7,0.9,6.7c0.6,2.1,1.6,3.9,2.8,5.4c1.3,1.5,2.9,2.8,4.8,3.6   c1.9,0.9,4.2,1.3,6.7,1.3c2.5,0,4.8-0.4,6.7-1.3c1.9-0.9,3.5-2.1,4.8-3.6c1.3-1.5,2.2-3.4,2.8-5.4c0.6-2.1,0.9-4.3,0.9-6.7   C312,239.8,311.7,237.5,311.1,235.5" />
+	<path
+   id="XMLID_9_"
+   class="st1"
+   d="M362.4,252.7c-0.2-0.6-0.8-0.4-0.8-0.4c-0.9,0.3-1.9,0.7-2.9,0.8c-1,0.2-2.2,0.2-3.4,0.2   c-3,0-5.4-0.9-7.1-2.7c-1.7-1.8-2.7-4.7-2.7-8.5c0-3.5,0.9-6.2,2.4-8.2c1.5-2,3.8-3.1,6.9-3.1c2.6,0,4.5,0.3,6.6,0.9   c0,0,0.5,0.2,0.7-0.4c0.5-1.5,1-2.6,1.5-4.3c0.2-0.5-0.2-0.7-0.4-0.7c-0.8-0.3-2.7-0.8-4.2-1.1c-1.4-0.2-2.9-0.3-4.7-0.3   c-2.6,0-5,0.4-7,1.3c-2,0.9-3.7,2.1-5,3.6c-1.3,1.5-2.4,3.4-3,5.4c-0.7,2.1-1,4.3-1,6.7c0,5.2,1.4,9.4,4.2,12.4   c2.8,3.1,6.9,4.6,12.3,4.6c3.2,0,6.5-0.6,8.8-1.6c0,0,0.5-0.2,0.3-0.7L362.4,252.7z" />
+	<path
+   id="XMLID_12_"
+   class="st1"
+   d="M373.3,238.7c0.3-2,0.9-3.7,1.7-5c1.3-2,3.3-3.1,6-3.1c2.8,0,4.6,1.1,5.9,3.1   c0.9,1.3,1.3,3.1,1.4,5H373.3z M394.4,234.3c-0.5-2-1.8-4-2.7-4.9c-1.4-1.5-2.7-2.5-4-3.1c-1.7-0.7-3.8-1.2-6.1-1.2   c-2.6,0-5,0.4-7,1.4c-1.9,0.9-3.6,2.2-4.9,3.7c-1.3,1.5-2.3,3.4-2.9,5.5c-0.6,2.1-0.9,4.4-0.9,6.8c0,2.4,0.3,4.7,1,6.8   c0.6,2.1,1.7,3.9,3.1,5.4c1.4,1.5,3.2,2.7,5.3,3.5c2.1,0.8,4.7,1.2,7.7,1.2c6.1,0,9.3-1.4,10.7-2.1c0.2-0.1,0.5-0.4,0.2-1l-1.4-3.9   c-0.2-0.6-0.8-0.4-0.8-0.4c-1.5,0.6-3.7,1.6-8.7,1.6c-3.3,0-5.7-1-7.2-2.5c-1.6-1.5-2.3-3.8-2.5-7l21.2,0c0,0,0.6,0,0.6-0.6   C395,243.2,395.7,239.1,394.4,234.3z" />
+	<path
+   id="XMLID_15_"
+   class="st1"
+   d="M203.9,238.7c0.3-2,0.9-3.7,1.7-5c1.3-2,3.3-3.1,6-3.1c2.8,0,4.6,1.1,5.9,3.1   c0.9,1.3,1.2,3.1,1.4,5H203.9z M224.9,234.3c-0.5-2-1.8-4-2.7-4.9c-1.4-1.5-2.7-2.5-4-3.1c-1.7-0.7-3.8-1.2-6.1-1.2   c-2.6,0-5,0.4-7,1.4c-1.9,0.9-3.6,2.2-4.9,3.7c-1.3,1.5-2.3,3.4-2.9,5.5c-0.6,2.1-0.9,4.4-0.9,6.8c0,2.4,0.3,4.7,1,6.8   c0.6,2.1,1.7,3.9,3.1,5.4c1.4,1.5,3.2,2.7,5.3,3.5c2.1,0.8,4.7,1.2,7.7,1.2c6.1,0,9.3-1.4,10.7-2.1c0.2-0.1,0.5-0.4,0.2-1l-1.4-3.9   c-0.2-0.6-0.8-0.4-0.8-0.4c-1.5,0.6-3.7,1.6-8.7,1.6c-3.3,0-5.7-1-7.2-2.5c-1.6-1.5-2.3-3.8-2.5-7l21.2,0c0,0,0.6,0,0.6-0.6   C225.6,243.2,226.3,239.1,224.9,234.3z" />
+	<path
+   id="XMLID_18_"
+   class="st1"
+   d="M158.1,252.6c-0.8-0.7-0.9-0.8-1.2-1.3c-0.4-0.6-0.6-1.6-0.6-2.8c0-1.9,0.6-3.2,1.9-4.1   c0,0,1.8-1.6,6.1-1.5c3,0,5.7,0.5,5.7,0.5v9.6h0c0,0-2.7,0.6-5.7,0.8C160,254.1,158.1,252.6,158.1,252.6 M166.6,237.7   c-0.9-0.1-2-0.1-3.3-0.1c-1.8,0-3.6,0.2-5.2,0.7c-1.7,0.4-3.1,1.1-4.4,2c-1.3,0.9-2.3,2.1-3.1,3.5c-0.7,1.4-1.1,3-1.1,4.9   c0,1.9,0.3,3.5,1,4.8c0.6,1.3,1.6,2.4,2.8,3.3c1.2,0.9,2.6,1.5,4.3,1.9c1.7,0.4,3.5,0.6,5.6,0.6c2.2,0,4.3-0.2,6.4-0.5   c2.1-0.4,4.6-0.9,5.3-1c0.7-0.2,1.5-0.4,1.5-0.4c0.5-0.1,0.5-0.7,0.5-0.7l0-19.3c0-4.2-1.1-7.4-3.4-9.3c-2.2-1.9-5.5-2.9-9.7-2.9   c-1.6,0-4.1,0.2-5.7,0.5c0,0-4.6,0.9-6.5,2.4c0,0-0.4,0.3-0.2,0.8l1.5,4c0.2,0.5,0.7,0.3,0.7,0.3s0.2-0.1,0.3-0.2   c4.1-2.2,9.2-2.1,9.2-2.1c2.3,0,4,0.5,5.2,1.4c1.2,0.9,1.7,2.2,1.7,5v0.9C168.2,237.9,166.6,237.7,166.6,237.7" />
+	<path
+   id="XMLID_19_"
+   class="st1"
+   d="M337.2,226.8c0.2-0.5-0.2-0.7-0.3-0.8c-0.4-0.1-2.2-0.5-3.5-0.6c-2.7-0.2-4.1,0.3-5.5,0.9   c-1.3,0.6-2.8,1.5-3.6,2.6v-2.6c0-0.4-0.3-0.6-0.6-0.6h-5.4c-0.4,0-0.6,0.3-0.6,0.6v31.6c0,0.4,0.3,0.6,0.6,0.6h5.6   c0.4,0,0.6-0.3,0.6-0.6v-15.8c0-2.1,0.2-4.2,0.7-5.6c0.5-1.3,1.1-2.4,1.9-3.1c0.8-0.7,1.7-1.3,2.6-1.6c1-0.3,2.1-0.4,2.8-0.4   c1.1,0,2.3,0.3,2.3,0.3c0.4,0,0.6-0.2,0.8-0.6C336,230.3,337,227.4,337.2,226.8" />
+	<path
+   id="XMLID_20_"
+   class="st1"
+   d="M285,212.2c-0.7-0.2-1.3-0.3-2.1-0.5c-0.8-0.1-1.8-0.2-2.9-0.2c-3.8,0-6.8,1.1-9,3.2   c-2.1,2.1-3.5,5.4-4.3,9.6l-0.3,1.4h-4.8c0,0-0.6,0-0.7,0.6l-0.8,4.4c-0.1,0.4,0.1,0.7,0.7,0.7h4.7l-4.7,26.5   c-0.4,2.1-0.8,3.9-1.3,5.2c-0.5,1.3-0.9,2.3-1.5,3c-0.5,0.7-1.1,1.2-1.9,1.5c-0.7,0.2-1.6,0.4-2.5,0.4c-0.5,0-1.2-0.1-1.7-0.2   c-0.5-0.1-0.8-0.2-1.1-0.4c0,0-0.5-0.2-0.8,0.3c-0.2,0.5-1.4,3.9-1.6,4.3c-0.1,0.4,0.1,0.7,0.3,0.8c0.6,0.2,1.1,0.4,1.9,0.6   c1.2,0.3,2.2,0.3,3.1,0.3c1.9,0,3.7-0.3,5.2-0.8c1.5-0.5,2.8-1.5,3.9-2.7c1.2-1.4,2-2.8,2.7-4.7c0.7-1.9,1.4-4.3,1.9-7.1l4.8-27h7   c0,0,0.6,0,0.7-0.6l0.8-4.4c0.1-0.4-0.1-0.7-0.7-0.7h-6.8c0-0.2,0.3-2.5,1.1-4.8c0.3-1,1-1.7,1.5-2.3c0.5-0.5,1.1-0.9,1.8-1.1   c0.7-0.2,1.4-0.3,2.3-0.3c0.6,0,1.3,0.1,1.7,0.2c0.7,0.1,0.9,0.2,1.1,0.3c0.7,0.2,0.8,0,0.9-0.3l1.6-4.4   C285.6,212.4,285.2,212.2,285,212.2" />
+	<path
+   id="XMLID_21_"
+   class="st1"
+   d="M190.5,257.9c0,0.4-0.3,0.6-0.6,0.6h-5.6c-0.4,0-0.6-0.3-0.6-0.6v-45.2c0-0.4,0.2-0.6,0.6-0.6   h5.6c0.4,0,0.6,0.3,0.6,0.6V257.9z" />
+</g>
+<flowRoot
+   xml:space="preserve"
+   id="flowRoot3726"
+   style="font-style:normal;font-weight:normal;font-size:40px;line-height:1.25;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none"
+   transform="matrix(1.1343884,0,0,1.2395338,-13.43632,-86.746378)"><flowRegion
+     id="flowRegion3728"><rect
+       id="rect3730"
+       width="246.82204"
+       height="61.44067"
+       x="119.70339"
+       y="277.54236" /></flowRegion><flowPara
+     id="flowPara3732">DataLoader</flowPara></flowRoot></svg>
\ No newline at end of file