Fix issue mentionned in AUR comments + update laverna.dektop

3 files changed, 15 insertions, 11 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 187e63647f0c..f10ea1913945 100755
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,14 +1,14 @@
 pkgbase = laverna
 	pkgdesc = Laverna is a JavaScript note taking application with Markdown editor and encryption support. Consider it like open source alternative to Evernote.
 	pkgver = 0.7.51
-	pkgrel = 4
+	pkgrel = 5
 	url = https://laverna.cc/
 	arch = x86_64
 	arch = i686
 	license = MPL2
 	depends = gconf
 	source = laverna.desktop
-	sha512sums = 1af2b864fea43f3c86a7ac45706ba05f409e40750dd931f8fca5b0fcd0219cf8254ba8071487ed7738c285e84bcb589837098e4d516f19b70ddff44812859545
+	sha512sums = 7cea514f4b5ac3b380615c1286cb8bac2ef36e20425a738cd490b892748b70b4e07a1ba5828aaf4715a2ac55ab8e74367129814fa29d34bc69f71ad0b0c3a40b
 	source_x86_64 = https://github.com/Laverna/laverna/releases/download/0.7.51/laverna-0.7.51-linux-x64.zip
 	sha512sums_x86_64 = 9f3d680148970e980245fc401bca9329924c4ea1b3966c6d5f4f4dbcd08d7bb4416d464b9645458367f6a2edea2ac1d63572752dfb12033bb6a210c81c52e596
 	source_i686 = https://github.com/Laverna/laverna/releases/download/0.7.51/laverna-0.7.51-linux-ia32.zip
diff --git a/PKGBUILD b/PKGBUILD
index cd278034b133..2f5fb56d58f8 100755
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,7 +2,7 @@
 
 pkgname=laverna
 pkgver=0.7.51
-pkgrel=4
+pkgrel=5
 pkgdesc="Laverna is a JavaScript note taking application with Markdown editor and encryption support. Consider it like open source alternative to Evernote."
 arch=("x86_64" "i686")
 depends=('gconf')
@@ -11,21 +11,25 @@ license=('MPL2')
 source=("${pkgname}.desktop")
 source_x86_64=("https://github.com/Laverna/laverna/releases/download/${pkgver}/${pkgname}-${pkgver}-linux-x64.zip")
 source_i686=("https://github.com/Laverna/laverna/releases/download/${pkgver}/${pkgname}-${pkgver}-linux-ia32.zip")
-sha512sums=('1af2b864fea43f3c86a7ac45706ba05f409e40750dd931f8fca5b0fcd0219cf8254ba8071487ed7738c285e84bcb589837098e4d516f19b70ddff44812859545')
+sha512sums=('7cea514f4b5ac3b380615c1286cb8bac2ef36e20425a738cd490b892748b70b4e07a1ba5828aaf4715a2ac55ab8e74367129814fa29d34bc69f71ad0b0c3a40b')
 sha512sums_x86_64=('9f3d680148970e980245fc401bca9329924c4ea1b3966c6d5f4f4dbcd08d7bb4416d464b9645458367f6a2edea2ac1d63572752dfb12033bb6a210c81c52e596')
 sha512sums_i686=('717df3255f2af9bedba2bf06a62b35012d73a819793f681e348d77271d896ba0fcf3ad88b43cb477cac976e90c0f1611c532bb70b2870fd9f8e21293e8b3c66e')
 
-package() {
+
+prepare() {
 	mkdir -p ${pkgdir}/usr/bin
 	mkdir -p ${pkgdir}/usr/share/{${pkgname},applications,licenses/${pkgname}}
-
+	install -Dm644 913.patch ${pkgdir}/usr/share/${pkgname}
+	
 	cp -R ${srcdir}/* ${pkgdir}/usr/share/${pkgname}
 
-	ln -s /usr/share/${pkgname}/${pkgname} ${pkgdir}/usr/bin/${pkgname}
-
 	cd ${pkgdir}/usr/share/${pkgname}/resources/app/
-	patch -p0 < $(dirname ${srcdir})/913.patch
+	patch -p0 < ${pkgdir}/usr/share/${pkgname}/913.patch
+}
 
-	cp ${srcdir}/${pkgname}.desktop ${pkgdir}/usr/share/applications/${pkgname}.desktop
+package() {
+	isntall -Dm644 laverna.desktop ${pkgdir}/usr/share/${pkgname}
 	install -Dm644 ${srcdir}/LICENSE ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE
+
+	ln -s /usr/share/${pkgname}/${pkgname} ${pkgdir}/usr/bin/${pkgname}
 }
diff --git a/laverna.desktop b/laverna.desktop
index 07e978b0bf0b..ef5891e6c5d3 100755
--- a/laverna.desktop
+++ b/laverna.desktop
@@ -3,7 +3,7 @@ Version=0.7.51
 Name=Laverna
 Comment=Laverna is a JavaScript note taking application with Markdown editor and encryption support. Consider it like open source alternative to Evernote.
 Exec=/usr/bin/laverna
-Icon=/opt/laverna/resources/app/dist/images/icon/icon.png
+Icon=/usr/share/laverna/resources/app/dist/images/icon/icon.png
 Terminal=false
 Type=Application
 Categories=Application;Utility;