Update to 1.3.1

3 files changed, 12 insertions, 54 deletions

diff --git a/.SRCINFO b/.SRCINFO
index d4e7880c050d..4811b34ea756 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = fuse-3ds
 	pkgdesc = FUSE Filesystem Python scripts for Nintendo 3DS files
-	pkgver = 1.3
-	pkgrel = 2
+	pkgver = 1.3.1
+	pkgrel = 1
 	url = https://github.com/ihaveamac/fuse-3ds
 	arch = x86_64
 	license = MIT
@@ -9,20 +9,8 @@ pkgbase = fuse-3ds
 	makedepends = python-pycryptodomex
 	noextract = fuse-3ds-${pkgver}-src.zip
 	options = !strip
-	source = fuse-3ds-1.3-src.zip::https://github.com/ihaveamac/fuse-3ds/releases/download/v1.3/fuse-3ds-1.3-src.zip
-	source = fuse3ds.desktop
-	source = https://raw.githubusercontent.com/ihaveamac/fuse-3ds/cbbd3fbd1a5524ebdc9264bdb24c72f70bc9a85c/fuse3ds/data/16x16.png
-	source = https://raw.githubusercontent.com/ihaveamac/fuse-3ds/cbbd3fbd1a5524ebdc9264bdb24c72f70bc9a85c/fuse3ds/data/32x32.png
-	source = https://raw.githubusercontent.com/ihaveamac/fuse-3ds/cbbd3fbd1a5524ebdc9264bdb24c72f70bc9a85c/fuse3ds/data/64x64.png
-	source = https://raw.githubusercontent.com/ihaveamac/fuse-3ds/cbbd3fbd1a5524ebdc9264bdb24c72f70bc9a85c/fuse3ds/data/128x128.png
-	source = https://raw.githubusercontent.com/ihaveamac/fuse-3ds/cbbd3fbd1a5524ebdc9264bdb24c72f70bc9a85c/fuse3ds/data/1024x1024.png
-	sha256sums = 796bd5581a17985d48b5afc8f5074200b3eff1ba28218b403d36bc3a94a80111
-	sha256sums = 0019bc6ee6bb74a3b6a19db56973dea86abeb17612c515ea83d7f143f3885f90
-	sha256sums = a5e4a01dbcd71c4430beb078918595c0715125effb98293bb67d32377389b01a
-	sha256sums = 7e108b969a0b143fc378bdee5dfe24a401f4e0962426e25ed0d30a8afd0eb0fd
-	sha256sums = 28f72bc37cae618d1ae249cd5db2d0c2cbdc88a67b61d19bfddb01944898f13d
-	sha256sums = 23443b4f76c6a8cab7ba1f9f9d7281ddb4c1059cf646d2c4f274a965fe86357a
-	sha256sums = dc22a4a371ddc5282ce65f07bba76e571b14ce82b28874aa848d398ab9dce263
+	source = fuse-3ds-1.3.1-src.zip::https://github.com/ihaveamac/fuse-3ds/releases/download/v1.3.1/fuse-3ds-1.3.1-src.zip
+	sha256sums = 8243f64fdabb536b07e9a4fbf152a35e9350f58ae8c49938c115d607a46911d0
 
 pkgname = fuse-3ds
 	depends = python>=3.6.1
@@ -31,6 +19,7 @@ pkgname = fuse-3ds
 
 pkgname = fuse-3ds-gui
 	install = Fuse3DSGUI.install
-	depends = fuse-3ds=1.3-2
+	depends = fuse-3ds=1.3.1-1
 	depends = python-appjar
+	depends = tk
 
diff --git a/PKGBUILD b/PKGBUILD
index c7dfc7f9a538..443945e17ac0 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,27 +1,15 @@
 pkgbase=fuse-3ds
 pkgname=(fuse-3ds fuse-3ds-gui)
-pkgver=1.3
-pkgrel=2
+pkgver=1.3.1
+pkgrel=1
 pkgdesc="FUSE Filesystem Python scripts for Nintendo 3DS files"
 arch=($CARCH)
 license=(MIT)
 url='https://github.com/ihaveamac/fuse-3ds'
 makedepends=('python-setuptools' 'python-pycryptodomex')
 options=(!strip)
-source=("fuse-3ds-${pkgver}-src.zip::https://github.com/ihaveamac/fuse-3ds/releases/download/v${pkgver}/fuse-3ds-${pkgver}-src.zip"
-	'fuse3ds.desktop'
-	'https://raw.githubusercontent.com/ihaveamac/fuse-3ds/cbbd3fbd1a5524ebdc9264bdb24c72f70bc9a85c/fuse3ds/data/16x16.png'
-	'https://raw.githubusercontent.com/ihaveamac/fuse-3ds/cbbd3fbd1a5524ebdc9264bdb24c72f70bc9a85c/fuse3ds/data/32x32.png'
-	'https://raw.githubusercontent.com/ihaveamac/fuse-3ds/cbbd3fbd1a5524ebdc9264bdb24c72f70bc9a85c/fuse3ds/data/64x64.png'
-	'https://raw.githubusercontent.com/ihaveamac/fuse-3ds/cbbd3fbd1a5524ebdc9264bdb24c72f70bc9a85c/fuse3ds/data/128x128.png'
-	'https://raw.githubusercontent.com/ihaveamac/fuse-3ds/cbbd3fbd1a5524ebdc9264bdb24c72f70bc9a85c/fuse3ds/data/1024x1024.png')
-sha256sums=('796bd5581a17985d48b5afc8f5074200b3eff1ba28218b403d36bc3a94a80111'
-	'0019bc6ee6bb74a3b6a19db56973dea86abeb17612c515ea83d7f143f3885f90'
-	'a5e4a01dbcd71c4430beb078918595c0715125effb98293bb67d32377389b01a'
-	'7e108b969a0b143fc378bdee5dfe24a401f4e0962426e25ed0d30a8afd0eb0fd'
-	'28f72bc37cae618d1ae249cd5db2d0c2cbdc88a67b61d19bfddb01944898f13d'
-	'23443b4f76c6a8cab7ba1f9f9d7281ddb4c1059cf646d2c4f274a965fe86357a'
-	'dc22a4a371ddc5282ce65f07bba76e571b14ce82b28874aa848d398ab9dce263')
+source=("fuse-3ds-${pkgver}-src.zip::https://github.com/ihaveamac/fuse-3ds/releases/download/v${pkgver}/fuse-3ds-${pkgver}-src.zip")
+sha256sums=('8243f64fdabb536b07e9a4fbf152a35e9350f58ae8c49938c115d607a46911d0')
 noextract=('fuse-3ds-${pkgver}-src.zip')
 
 build() {
@@ -39,22 +27,11 @@ package_fuse-3ds() {
 }
 
 package_fuse-3ds-gui() {
-	depends=("fuse-3ds=$pkgver-$pkgrel" "python-appjar")
+	depends=("fuse-3ds=$pkgver-$pkgrel" "python-appjar" "tk")
 	cd "${srcdir}/fuse-3ds"
 	install="Fuse3DSGUI.install"
 	python setup.py install --prefix=/usr --root="$pkgdir" --optimize=1
 	rm "$pkgdir/usr/bin/mount_"*
 	rm -r "$pkgdir/usr/lib"
-	mkdir -p "$pkgdir/usr/share/applications"
-	cp "$srcdir/fuse3ds.desktop" "$pkgdir/usr/share/applications"
-	mkdir -p "$pkgdir/usr/share/icons/hicolor/16x16/apps"
-	cp "$srcdir/16x16.png" "$pkgdir/usr/share/icons/hicolor/16x16/apps/fuse3ds.png"
-	mkdir -p "$pkgdir/usr/share/icons/hicolor/32x32/apps"
-	cp "$srcdir/32x32.png" "$pkgdir/usr/share/icons/hicolor/32x32/apps/fuse3ds.png"
-	mkdir -p "$pkgdir/usr/share/icons/hicolor/64x64/apps"
-	cp "$srcdir/64x64.png" "$pkgdir/usr/share/icons/hicolor/64x64/apps/fuse3ds.png"
-	mkdir -p "$pkgdir/usr/share/icons/hicolor/128x128/apps"
-	cp "$srcdir/128x128.png" "$pkgdir/usr/share/icons/hicolor/128x128/apps/fuse3ds.png"
-	mkdir -p "$pkgdir/usr/share/icons/hicolor/1024x1024/apps"
-	cp "$srcdir/1024x1024.png" "$pkgdir/usr/share/icons/hicolor/1024x1024/apps/fuse3ds.png"
+	PYTHONPATH="$pkgdir/usr:$PYTHONPATH" python -mfuse3ds --install-desktop-entry "$pkgdir/usr/share"
 }
diff --git a/fuse3ds.desktop b/fuse3ds.desktop
deleted file mode 100644
index 60959a4bb5ec..000000000000
--- a/fuse3ds.desktop
+++ /dev/null
@@ -1,8 +0,0 @@
-[Desktop Entry]
-Name=fuse-3ds
-Comment=Mount Nintendo 3DS contents
-Exec=python3 -mfuse3ds gui
-Terminal=true
-Type=Application
-Icon=fuse3ds
-Categories=Utility;
\ No newline at end of file