5 files changed, 31 insertions, 28 deletions

diff --git a/efm-langserver/.SRCINFO b/efm-langserver/.SRCINFO
index 4dad250..7b4fe6c 100644
--- a/efm-langserver/.SRCINFO
+++ b/efm-langserver/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = efm-langserver
         pkgdesc = General purpose Language Server
-        pkgver = 0.0.53
+        pkgver = 0.0.54
         pkgrel = 1
         url = https://github.com/mattn/efm-langserver
         arch = x86_64
@@ -8,7 +8,7 @@ pkgbase = efm-langserver
         makedepends = go
         depends = glibc
         optdepends = ctags: for "go to definition" requests
-        source = https://github.com/mattn/efm-langserver/archive/v0.0.53/efm-langserver-v0.0.53.tar.gz
-        sha256sums = 2e315b6c563a994d8f5b3d2d8e5be629628b1f6dc7e4a82d9ea1a5deb8c81be6
+        source = https://github.com/mattn/efm-langserver/archive/v0.0.54/efm-langserver-v0.0.54.tar.gz
+        sha256sums = 4149b2922899ce313a89f60851f6678369253ed542dd65bdc8dd22f3cf1629bb
 
 pkgname = efm-langserver
diff --git a/efm-langserver/PKGBUILD b/efm-langserver/PKGBUILD
index 8d88a33..55736d8 100644
--- a/efm-langserver/PKGBUILD
+++ b/efm-langserver/PKGBUILD
@@ -3,7 +3,7 @@
 # Contributor: dianlujitao <dianlujitao at gmail dot com>
 
 pkgname=efm-langserver
-pkgver=0.0.53
+pkgver=0.0.54
 pkgrel=1
 pkgdesc='General purpose Language Server'
 arch=('x86_64')
@@ -13,7 +13,7 @@ depends=('glibc')
 makedepends=('go')
 optdepends=('ctags: for "go to definition" requests')
 source=("$url/archive/v$pkgver/$pkgname-v$pkgver.tar.gz")
-sha256sums=('2e315b6c563a994d8f5b3d2d8e5be629628b1f6dc7e4a82d9ea1a5deb8c81be6')
+sha256sums=('4149b2922899ce313a89f60851f6678369253ed542dd65bdc8dd22f3cf1629bb')
 
 build() {
   cd $pkgname-$pkgver
diff --git a/old_ver.json b/old_ver.json
index 8821f47..137548c 100644
--- a/old_ver.json
+++ b/old_ver.json
@@ -21,7 +21,9 @@
       "version": "v1.2.1"
     },
     "efm-langserver": {
-      "version": "v0.0.53"
+      "version": "v0.0.54",
+      "gitref": "refs/tags/v0.0.54",
+      "url": "https://github.com/mattn/efm-langserver/releases/tag/v0.0.54"
     },
     "euterpe": {
       "version": "v1.5.4"
diff --git a/rlr-git/.SRCINFO b/rlr-git/.SRCINFO
index 5d8ee9e..cc77a71 100644
--- a/rlr-git/.SRCINFO
+++ b/rlr-git/.SRCINFO
@@ -1,10 +1,10 @@
 pkgbase = rlr-git
         pkgdesc = interactive pixel screen ruler and protractor
-        pkgver = r31.463c617
+        pkgver = r64.7bed0f3
         pkgrel = 1
         url = https://github.com/epilys/rlr
         arch = any
-        license = GPL
+        license = GPL-3.0-or-later
         makedepends = git
         makedepends = cargo
         provides = rlr
diff --git a/rlr-git/PKGBUILD b/rlr-git/PKGBUILD
index 4ec3d19..1c9da2d 100644
--- a/rlr-git/PKGBUILD
+++ b/rlr-git/PKGBUILD
@@ -1,12 +1,14 @@
 # Maintainer: Yigit Sever <yigit at yigitsever dot com>
+# Contributor: Paulo Fino <somepaulo@duck.com>
 
 pkgname=rlr-git
-pkgver=r31.463c617
+_pkgnamefull=com.github.epilys.rlr
+pkgver=r64.7bed0f3
 pkgrel=1
 pkgdesc="interactive pixel screen ruler and protractor"
 arch=('any')
 url="https://github.com/epilys/rlr"
-license=('GPL')
+license=('GPL-3.0-or-later')
 makedepends=('git' 'cargo')
 provides=("${pkgname%-git}")
 conflicts=("${pkgname%-git}")
@@ -14,32 +16,31 @@ source=("${pkgname%-git}::git+${url}")
 sha256sums=('SKIP')
 
 pkgver() {
-        cd "$srcdir/${pkgname%-git}"
-        # git, no tags available
-        printf "r%s.%s" "$(git rev-list --count HEAD)" "$(git rev-parse --short HEAD)"
+  cd "$srcdir/${pkgname%-git}"
+  # git, no tags available
+  printf "r%s.%s" "$(git rev-list --count HEAD)" "$(git rev-parse --short HEAD)"
 }
 
 prepare() {
-        cd "$srcdir/${pkgname%-git}"
-        cargo fetch --locked --target "$CARCH-unknown-linux-gnu"
+  cd "$srcdir/${pkgname%-git}"
+  cargo fetch --locked --target "$CARCH-unknown-linux-gnu"
 }
 
 build() {
-        cd "$srcdir/${pkgname%-git}"
-        export RUSTUP_TOOLCHAIN=stable
-        export CARGO_TARGET_DIR=target
-        cargo build --frozen --release --all-features
+  cd "$srcdir/${pkgname%-git}"
+  export RUSTUP_TOOLCHAIN=stable
+  export CARGO_TARGET_DIR=target
+  cargo build --frozen --release --all-features
 }
 
 package() {
-        # binary
-        install -Dm0755 "${srcdir}/${pkgname%-git}/target/release/${pkgname%-git}" -t "${pkgdir}/usr/bin/"
-        # desktop file
-        install -Dm644 "${srcdir}/${pkgname%-git}/${pkgname%-git}.desktop" "${pkgdir}/usr/share/applications/${pkgname%-git}.desktop"
-
-        # icon
-        install -Dm644 "${srcdir}/${pkgname%-git}/${pkgname%-git}.svg" "${pkgdir}/usr/share/icons/hicolor/scalable/apps/${pkgname%-git}.svg"
-        # symbolic icon
-        install -Dm644 "${srcdir}/${pkgname%-git}/${pkgname%-git}-symbolic.svg" "${pkgdir}/usr/share/icons/hicolor/symbolic/apps/${pkgname%-git}-symbolic.svg"
+  # binary
+  install -Dm0755 "${srcdir}/${pkgname%-git}/target/release/${pkgname%-git}" -t "${pkgdir}/usr/bin/"
+  # desktop file
+  install -Dm644 "${srcdir}/${pkgname%-git}/data/${_pkgnamefull%}.desktop" "${pkgdir}/usr/share/applications/${_pkgnamefull%}.desktop"
 
+  # icon
+  install -Dm644 "${srcdir}/${pkgname%-git}/data/${_pkgnamefull%}.svg" "${pkgdir}/usr/share/icons/hicolor/scalable/apps/${_pkgnamefull%}.svg"
+  # symbolic icon
+  install -Dm644 "${srcdir}/${pkgname%-git}/data/${_pkgnamefull%}-symbolic.svg" "${pkgdir}/usr/share/icons/hicolor/symbolic/apps/${_pkgnamefull%}-symbolic.svg"
 }