Get icon from .jar, no dependency on gendesk

4 files changed, 24 insertions, 16 deletions

diff --git a/.SRCINFO b/.SRCINFO
index c4ca2d461c1e..2cc6889099cc 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,21 +1,20 @@
 # Generated by makepkg 5.0.0
-# Wed Mar 16 16:00:50 UTC 2016
+# Wed Mar 16 16:59:39 UTC 2016
 pkgbase = gluon-scenebuilder
 	pkgdesc = JavaFX visual layout tool with sereral improvements by Gluon
 	pkgver = 8.1.1
-	pkgrel = 2
+	pkgrel = 3
 	url = http://gluonhq.com/open-source/scene-builder/
 	arch = any
 	license = Oracle BSD License
-	makedepends = gendesk
 	depends = bash
 	depends = java-environment
 	noextract = SceneBuilder-8.1.1.jar
 	source = http://download.gluonhq.com/scenebuilder/8.1.1/SceneBuilder-8.1.1.jar
-	source = gluon-scenebuilder.png
+	source = gluon-scenebuilder.desktop
 	source = gluon-scenebuilder
 	sha256sums = 189c2ecd20e9258a797c7e604d2ec735ca92f48036a7a5d363cad2ea20702064
-	sha256sums = 963a57d2c61b23cd4a09f2d33924a0e206174e72a8c28f13a4a68f2c643827a8
+	sha256sums = d50d10cafeb801582bd9b30500a04a1b36e4589f1ad2243722107a1eec4ce80a
 	sha256sums = 5dc69e3d4dcc395204567c54243105053c54e7f4633fdeac5de19aec7fc5fd1d
 
 pkgname = gluon-scenebuilder
diff --git a/PKGBUILD b/PKGBUILD
index a8e01b1c595b..360c3c05ff32 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,14 +2,14 @@
 
 pkgname=gluon-scenebuilder
 pkgver=8.1.1
-pkgrel=2
+pkgrel=3
 pkgdesc="JavaFX visual layout tool with sereral improvements by Gluon"
 arch=('any')
 url="http://gluonhq.com/open-source/scene-builder/"
 license=('Oracle BSD License')
 groups=()
 depends=('bash' 'java-environment')
-makedepends=('gendesk')
+makedepends=('')
 checkdepends=()
 optdepends=()
 provides=()
@@ -21,25 +21,24 @@ install=
 changelog=
 source=(
         http://download.gluonhq.com/scenebuilder/$pkgver/SceneBuilder-$pkgver.jar
-	$pkgname.png
+        $pkgname.desktop
         $pkgname
 )
 noextract=(SceneBuilder-$pkgver.jar)
 sha256sums=('189c2ecd20e9258a797c7e604d2ec735ca92f48036a7a5d363cad2ea20702064'
-            '963a57d2c61b23cd4a09f2d33924a0e206174e72a8c28f13a4a68f2c643827a8'
+            'd50d10cafeb801582bd9b30500a04a1b36e4589f1ad2243722107a1eec4ce80a'
             '5dc69e3d4dcc395204567c54243105053c54e7f4633fdeac5de19aec7fc5fd1d')
-prepare() {
-  gendesk -f -n --pkgname "$pkgname" --pkgdesc "$pkgdesc"
-  unzip SceneBuilder-$pkgver.jar LICENSE
-}
+prepare=()
 package() {
+  bsdcpio --extract --make-directories LICENSE "com/oracle/javafx/scenebuilder/app/about/scenebuilder-logo.png" < SceneBuilder-$pkgver.jar 
+
   # copy files
   cd "$srcdir"
   mkdir -p "$pkgdir/opt/$pkgname"
   mkdir -p "$pkgdir/usr/bin"
   install -m755 SceneBuilder-$pkgver.jar "$pkgdir/opt/$pkgname/$pkgname.jar"
   install -m755 $pkgname "$pkgdir/usr/bin/$pkgname"  
-  install -Dm644 "$pkgname.desktop" "$pkgdir/usr/share/applications/$pkgname.desktop" 
-  install -Dm644 "$pkgname.png" "$pkgdir/usr/share/pixmaps/$pkgname.png"
-  install -D -m644 "${srcdir}/LICENSE" "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
+  install -Dm644 $pkgname.desktop "$pkgdir/usr/share/applications/$pkgname.desktop" 
+  install -Dm644 "com/oracle/javafx/scenebuilder/app/about/scenebuilder-logo.png" "$pkgdir/usr/share/pixmaps/$pkgname.png"
+  install -Dm644 LICENSE "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
 }
diff --git a/gluon-scenebuilder.desktop b/gluon-scenebuilder.desktop
new file mode 100644
index 000000000000..ef1144f337d8
--- /dev/null
+++ b/gluon-scenebuilder.desktop
@@ -0,0 +1,10 @@
+[Desktop Entry]
+Encoding=UTF-8
+Type=Application
+Name=Gluon-scenebuilder
+Comment=JavaFX visual layout tool with sereral improvements by Gluon
+Exec=gluon-scenebuilder
+Icon=gluon-scenebuilder
+Terminal=false
+StartupNotify=false
+Categories=Application;
diff --git a/gluon-scenebuilder.png b/gluon-scenebuilder.png
deleted file mode 100644
index 0d3ac060a6f5..000000000000
--- a/gluon-scenebuilder.png
+++ /dev/null