feat: new ledger-live-git

2 files changed, 23 insertions, 21 deletions

diff --git a/.SRCINFO b/.SRCINFO
index dd8747ad3305..cd24957038fe 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,19 +1,20 @@
 pkgbase = ledger-live-git
 	pkgdesc = Ledger Live - Desktop (Git version)
-	pkgver = 2.41.3.r6.gc2ce96d1b
+	pkgver = 2.43.1
 	pkgrel = 1
-	url = https://github.com/LedgerHQ/ledger-live-desktop
+	url = https://github.com/LedgerHQ/ledger-live
 	arch = x86_64
 	license = MIT
 	makedepends = git
-	makedepends = yarn
+	makedepends = pnpm
+	makedepends = ruby-bundler
 	makedepends = python
 	makedepends = nodejs>=12
 	depends = ledger-udev
 	provides = ledger-live
 	conflicts = ledger-live-bin
 	conflicts = ledger-live
-	source = ledger-live-git::git+https://github.com/LedgerHQ/ledger-live-desktop#branch=master
+	source = ledger-live-git::git+https://github.com/LedgerHQ/ledger-live#branch=main
 	source = ledger-live-desktop.desktop
 	sha512sums = SKIP
 	sha512sums = 01bee3b5a90d9a87bb8b1f8edd8fa5851b39db7f9374d0e31114301876fafbc9226b120f114b66a3158a4e98eb514569f34cd0d4f1212062a55d0c8d0e698dda
diff --git a/PKGBUILD b/PKGBUILD
index 7be61fbf8527..d051abf0dff6 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -5,37 +5,33 @@
 _pkgbin=ledger-live-desktop
 pkgname=ledger-live-git
 pkgdesc="Ledger Live - Desktop (Git version)"
-pkgver=2.41.3.r6.gc2ce96d1b
+pkgver=2.43.1
 pkgrel=1
 arch=('x86_64')
-url='https://github.com/LedgerHQ/ledger-live-desktop'
+url='https://github.com/LedgerHQ/ledger-live'
 license=('MIT')
 depends=('ledger-udev')
-makedepends=('git' 'yarn' 'python' 'nodejs>=12')
+makedepends=('git' 'pnpm' 'ruby-bundler' 'python' 'nodejs>=12')
 provides=('ledger-live')
 conflicts=('ledger-live-bin' 'ledger-live')
-source=("$pkgname::git+https://github.com/LedgerHQ/ledger-live-desktop#branch=master"
-        "ledger-live-desktop.desktop")
+source=("$pkgname::git+$url#branch=main" 
+  "$_pkgbin.desktop")
 sha512sums=('SKIP'
-            '01bee3b5a90d9a87bb8b1f8edd8fa5851b39db7f9374d0e31114301876fafbc9226b120f114b66a3158a4e98eb514569f34cd0d4f1212062a55d0c8d0e698dda')
-
-prepare() {
-  cd $pkgname
-  export JOBS=max
-  yarn --ignore-scripts
-}
+  '01bee3b5a90d9a87bb8b1f8edd8fa5851b39db7f9374d0e31114301876fafbc9226b120f114b66a3158a4e98eb514569f34cd0d4f1212062a55d0c8d0e698dda')
 
 build() {
   cd $pkgname
   export GIT_REVISION=$pkgver
   export JOBS=max
-  yarn dist
+  pnpm i
+  pnpm build:lld:deps
+  pnpm desktop dist
 }
 
 package() {
   install -Dm644 "${_pkgbin}.desktop" "${pkgdir}/usr/share/applications/${_pkgbin}.desktop"
 
-  cd $pkgname
+  cd $pkgname/apps/$_pkgbin/
 
   install -dm755 "${pkgdir}/opt"
   cp -r "dist/linux-unpacked" "${pkgdir}/opt/${_pkgbin}"
@@ -44,7 +40,7 @@ package() {
 
   install -Dm644 "build/icons/icon.png" "${pkgdir}/usr/share/icons/hicolor/64x64/apps/${_pkgbin}.png"
   install -Dm644 "build/icons/icon@128x128.png" "${pkgdir}/usr/share/icons/hicolor/128x128/apps/${_pkgbin}.png"
-  install -Dm644 "build/icons/icon@256x256.png" "${pkgdir}/usr/share/icons/hicolor/256x256/apps/${_pkgbin}.png"  
+  install -Dm644 "build/icons/icon@256x256.png" "${pkgdir}/usr/share/icons/hicolor/256x256/apps/${_pkgbin}.png"
   install -Dm644 "build/icons/icon@512x512.png" "${pkgdir}/usr/share/icons/hicolor/512x512/apps/${_pkgbin}.png"
   install -Dm644 "build/icons/icon@1024x1024.png" "${pkgdir}/usr/share/icons/hicolor/1024x1024/apps/${_pkgbin}.png"
 
@@ -52,6 +48,11 @@ package() {
 }
 
 pkgver() {
-  cd "$srcdir/$pkgname"
-  git describe --long --tags | sed 's/^v//;s/\([^-]*-g\)/r\1/;s/-/./g'
+  cd $pkgname/apps/$_pkgbin/
+  cat package.json |
+    grep version |
+    head -1 |
+    awk -F: '{ print $2 }' |
+    sed 's/[",]//g' |
+    tr -d '[[:space:]]'
 }