Updated to version 6.0.2. Now using AppImage as source.

4 files changed, 25 insertions, 49 deletions

diff --git a/.SRCINFO b/.SRCINFO
index a061fc4f61d5..02e27793a4ae 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,22 +1,18 @@
 pkgbase = jubler
 	pkgdesc = Subtitle editor running on Java
-	pkgver = 6.0
+	pkgver = 6.0.2
 	pkgrel = 1
 	url = http://www.jubler.org
 	arch = any
 	license = GPL2
-	makedepends = libicns
-	makedepends = p7zip
 	depends = java-runtime>=8
 	optdepends = mplayer: live video preview for subtitles
 	provides = jubler
-	noextract = Jubler-6.0.dmg
-	source = https://github.com/teras/Jubler/releases/download/6.0/Jubler-6.0.dmg
+	noextract = Jubler-6.0.2.appimage
+	source = https://github.com/teras/Jubler/releases/download/6.0.2/Jubler-6.0.2.appimage
 	source = jubler.desktop
-	source = jubler-subtitles.desktop
-	sha256sums = ed330203ce9a16ee5fa8708fa89b66907e62475f089f463adc6fb51db2f6a4a0
-	sha256sums = cb6da5ec3ac11f1a6c4d8becf9105ff88b4966fea9d6796b4dded6019392edfc
-	sha256sums = 62d2a8d048b65bc0a0afe28b14ba006dc82ba91100bfee14185d76c88e18cbc5
+	sha256sums = 822dfe7cd171cbee15b88608ee76d6121f1ebe3fc1a9743a3a47eed326e5d45d
+	sha256sums = 56f6d1af4d5086231c2f3935d46aaa0293dbba11ecfeaa5f95609a58a9e59056
 
 pkgname = jubler
 
diff --git a/PKGBUILD b/PKGBUILD
index d4188005ce1b..11c209cc6d5b 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,7 +1,8 @@
 # Maintainer: Kisuke <kisuke at kisuke dot cz>
 
 pkgname=jubler
-pkgver=6.0
+_AppName=Jubler
+pkgver=6.0.2
 pkgrel=1
 pkgdesc='Subtitle editor running on Java'
 arch=('any')
@@ -10,38 +11,23 @@ license=('GPL2')
 provides=('jubler')
 depends=('java-runtime>=8')
 optdepends=('mplayer: live video preview for subtitles')
-makedepends=('libicns'
-						'p7zip')
-source=("https://github.com/teras/Jubler/releases/download/${pkgver}/Jubler-${pkgver}.dmg"
-				'jubler.desktop'
-				'jubler-subtitles.desktop')
-sha256sums=('ed330203ce9a16ee5fa8708fa89b66907e62475f089f463adc6fb51db2f6a4a0'
-						'cb6da5ec3ac11f1a6c4d8becf9105ff88b4966fea9d6796b4dded6019392edfc'
-						'62d2a8d048b65bc0a0afe28b14ba006dc82ba91100bfee14185d76c88e18cbc5')
-noextract=("Jubler-${pkgver}.dmg")
+source=("https://github.com/teras/Jubler/releases/download/${pkgver}/${_AppName}-${pkgver}.appimage"
+				'jubler.desktop')
+sha256sums=('822dfe7cd171cbee15b88608ee76d6121f1ebe3fc1a9743a3a47eed326e5d45d'
+						'56f6d1af4d5086231c2f3935d46aaa0293dbba11ecfeaa5f95609a58a9e59056')
+noextract=("${_AppName}-${pkgver}.appimage")
 
 package() {
-	# Install
 	cd ${srcdir}
-	7z x Jubler-${pkgver}.dmg > /dev/null
-	mkdir -p ${pkgdir}/usr/share/java/jubler
-	cp -R ${srcdir}/Jubler/Jubler.app/Contents/Java/* ${pkgdir}/usr/share/java/jubler/
-	find ${pkgdir}/usr/share/java/jubler/* -type d -exec chmod 755 {} +
+	chmod +x ${_AppName}-${pkgver}.appimage
+	./${_AppName}-${pkgver}.appimage --appimage-extract
+	mkdir -p ${pkgdir}/usr/share/java/${pkgname}
+	cp -R ${srcdir}/squashfs-root/lib/* ${pkgdir}/usr/share/java/${pkgname}/
+	mv ${pkgdir}/usr/share/java/${pkgname}/AppRun.jar ${pkgdir}/usr/share/java/${pkgname}/${_AppName}.jar
+	find ${pkgdir}/usr/share/java/${pkgname}/* -type d -exec chmod 755 {} +
 
-	# Extract Icons
-	icns2png -x ${srcdir}/Jubler/Jubler.app/Contents/Resources/jubler.icns > /dev/null
-	install -D -m644 ${srcdir}/jubler_16x16x32.png ${pkgdir}/usr/share/icons/hicolor/16x16/apps/jubler.png
-	install -D -m644 ${srcdir}/jubler_32x32x32.png ${pkgdir}/usr/share/icons/hicolor/32x32/apps/jubler.png
-	install -D -m644 ${srcdir}/jubler_48x48x32.png ${pkgdir}/usr/share/icons/hicolor/48x48/apps/jubler.png
-	install -D -m644 ${srcdir}/jubler_128x128x32.png ${pkgdir}/usr/share/icons/hicolor/128x128/apps/jubler.png
-
-	icns2png -x ${srcdir}/Jubler/Jubler.app/Contents/Resources/subtitle.icns > /dev/null
-	install -D -m644 ${srcdir}/subtitle_16x16x32.png ${pkgdir}/usr/share/icons/hicolor/16x16/mimetypes/jubler-subtitles.png
-	install -D -m644 ${srcdir}/subtitle_32x32x32.png ${pkgdir}/usr/share/icons/hicolor/32x32/mimetypes/jubler-subtitles.png
-	install -D -m644 ${srcdir}/subtitle_48x48x32.png ${pkgdir}/usr/share/icons/hicolor/48x48/mimetypes/jubler-subtitles.png
-	install -D -m644 ${srcdir}/subtitle_128x128x32.png ${pkgdir}/usr/share/icons/hicolor/128x128/mimetypes/jubler-subtitles.png
-
-	install -D -m644 "$srcdir/jubler.desktop" "$pkgdir/usr/share/applications/jubler.desktop"
-	install -D -m644 "$srcdir/jubler-subtitles.desktop" "$pkgdir/usr/share/applications/jubler-subtitles.desktop"
+  chmod -R 755 ${srcdir}/squashfs-root/usr/
+	cp -R ${srcdir}/squashfs-root/usr ${pkgdir}/
 
+	install -D -m644 "$srcdir/${pkgname}.desktop" "$pkgdir/usr/share/applications/${pkgname}.desktop"
 }
diff --git a/jubler-subtitles.desktop b/jubler-subtitles.desktop
deleted file mode 100644
index 44832e656bc2..000000000000
--- a/jubler-subtitles.desktop
+++ /dev/null
@@ -1,8 +0,0 @@
-[Desktop Entry]
-Type=Application
-Name=Jubler
-NoDisplay=true
-Icon=jubler-subtitles
-Exec=/usr/bin/java -jar /usr/share/java/jubler/Jubler.jar %F
-Terminal=false
-MimeType=application/x-subrip;
diff --git a/jubler.desktop b/jubler.desktop
index 05833205f54b..29ce772d1aad 100644
--- a/jubler.desktop
+++ b/jubler.desktop
@@ -2,6 +2,8 @@
 Type=Application
 Name=Jubler
 Icon=jubler
-Exec=/usr/bin/java -jar /usr/share/java/jubler/Jubler.jar
+Exec=/usr/bin/java -jar /usr/share/java/jubler/Jubler.jar %F
 Terminal=false
-Categories=AudioVideo;
+Categories=AudioVideo;Java;TextTools;AudioVideoEditing;
+Comment=Jubler is a tool to edit text-based subtitles
+MimeType=application/x-subrip;