diff --git a/.SRCINFO b/.SRCINFO index fc2587ed739c..1080295e0736 100644 --- a/.SRCINFO +++ b/.SRCINFO @@ -1,31 +1,25 @@ pkgbase = session-desktop - pkgdesc = Private messaging from your desktop - pkgver = 1.11.5 + pkgdesc = Onion routing based messenger + pkgver = 1.12.3 pkgrel = 1 url = https://getsession.org - install = session-desktop.install arch = x86_64 - license = GPL-3.0 + license = GPL-3.0-or-later + makedepends = cmake makedepends = git - makedepends = git-lfs makedepends = nvm makedepends = yarn - makedepends = nodejs - depends = libxtst - depends = nss - depends = alsa-lib - depends = libxss - depends = libnotify - depends = xdg-utils - optdepends = libappindicator-gtk3: for tray support - provides = session-messenger-desktop - conflicts = session-desktop-bin - conflicts = session-desktop-git - conflicts = session-desktop-appimage - options = !strip - source = git+https://github.com/loki-project/session-desktop.git + depends = bash + depends = electron25 + depends = gcc-libs + depends = glibc + depends = hicolor-icon-theme + depends = python + source = git+https://github.com/oxen-io/session-desktop.git#tag=v1.12.3 source = session-desktop.desktop - sha256sums = SKIP + source = session-desktop.sh + sha256sums = ed9d3952598c8d0e940c6cf9a96ff6a52c719509d9374e1d1db10b719e36522f sha256sums = fde2e8851d93a7a8ca2dc0338535362da3240208262d08155a594500e41a199b + sha256sums = a5279447d005060aa77536dcabe0ab66226f9cffa668dc0b6e07a2f1e52ab5ce pkgname = session-desktop diff --git a/.nvchecker.toml b/.nvchecker.toml new file mode 100644 index 000000000000..ef2c788f5a52 --- /dev/null +++ b/.nvchecker.toml @@ -0,0 +1,5 @@ +[session-desktop] +source = "github" +github = "oxen-io/session-desktop" +use_max_tag = true +prefix = "v" diff --git a/PKGBUILD b/PKGBUILD index 288d0671d9b5..067a659a300c 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -1,54 +1,51 @@ -# Maintainer: Antony Ho +# Maintainer: +# Contributor: Antony Ho + pkgname=session-desktop -pkgver=1.11.5 +pkgver=1.12.3 pkgrel=1 -pkgdesc="Private messaging from your desktop" +pkgdesc="Onion routing based messenger" arch=(x86_64) url="https://getsession.org" -license=('GPL-3.0') -depends=(libxtst nss alsa-lib libxss libnotify xdg-utils) -makedepends=('git' 'git-lfs' 'nvm' 'yarn' 'nodejs') -optdepends=('libappindicator-gtk3: for tray support') -provides=(session-messenger-desktop) -conflicts=(session-desktop-bin session-desktop-git session-desktop-appimage) -options=(!strip) -install=$pkgname.install -source=('git+https://github.com/loki-project/session-desktop.git' - 'session-desktop.desktop') -sha256sums=('SKIP' - 'fde2e8851d93a7a8ca2dc0338535362da3240208262d08155a594500e41a199b') +license=('GPL-3.0-or-later') +_electron=electron25 +depends=('bash' "${_electron}" 'gcc-libs' 'glibc' 'hicolor-icon-theme' 'python') +makedepends=('cmake' 'git' 'nvm' 'yarn') +source=("git+https://github.com/oxen-io/session-desktop.git#tag=v${pkgver}" + "${pkgname}.desktop" + "${pkgname}.sh") +sha256sums=('ed9d3952598c8d0e940c6cf9a96ff6a52c719509d9374e1d1db10b719e36522f' + 'fde2e8851d93a7a8ca2dc0338535362da3240208262d08155a594500e41a199b' + 'a5279447d005060aa77536dcabe0ab66226f9cffa668dc0b6e07a2f1e52ab5ce') prepare() { - cd $srcdir/session-desktop - git checkout v$pkgver source /usr/share/nvm/init-nvm.sh - git lfs install - nvm install - nvm use + nvm install 18.15 + nvm use 18.15 + + sed "s/@ELECTRON@/${_electron}/" -i "${pkgname}.sh" + + cd "${pkgname}" + yarn install } build() { - cd $srcdir/session-desktop - source /usr/share/nvm/init-nvm.sh && nvm use --delete-prefix - yarn install + cd "${pkgname}" export SIGNAL_ENV=production yarn build-everything - $(yarn bin)/electron-builder --config.extraMetadata.environment=$SIGNAL_ENV --publish=never --config.directories.output=release --linux=tar.xz + yarn electron-builder --linux --dir \ + --config.extraMetadata.environment="${SIGNAL_ENV}" \ + --config.electronDist="/usr/lib/${_electron}" \ + --config.electronVersion="$(cat /usr/lib/${_electron}/version)" } package() { - install -d "${pkgdir}/usr/"{lib,bin} - - cp -a $srcdir/session-desktop/release/linux-unpacked $pkgdir/usr/lib/$pkgname - - install -Dm644 $srcdir/session-desktop/build/session_icon_source_1024px.png $pkgdir/usr/share/pixmaps/$pkgname.png - - for size in 16 32 48 64 128 256 512 1024; do - install -Dm644 "${srcdir}/session-desktop/build/icons/icon_${size}x${size}.png" \ - "${pkgdir}/usr/share/icons/hicolor/${size}x${size}/apps/${pkgname}.png" + cd "${pkgname}" + install -d "${pkgdir}/usr/lib" + cp -r dist/linux-unpacked/resources "${pkgdir}/usr/lib/${pkgname}" + for i in 16 32 48 64 128 256 512 1024; do + install -Dm644 "build/icons/icon_${i}x${i}.png" "${pkgdir}/usr/share/icons/hicolor/${i}x${i}/apps/${pkgname}.png" done - - install -Dm644 $srcdir/session-desktop.desktop $pkgdir/usr/share/applications/${pkgname}.desktop - - ln -s "/usr/lib/${pkgname}/session-desktop" "${pkgdir}/usr/bin/" + install -Dm755 "${srcdir}/${pkgname}.sh" "${pkgdir}/usr/bin/${pkgname}" + install -Dm644 "${srcdir}/${pkgname}.desktop" -t "${pkgdir}/usr/share/applications" } diff --git a/session-desktop.install b/session-desktop.install deleted file mode 100644 index b3c52f69d91f..000000000000 --- a/session-desktop.install +++ /dev/null @@ -1,13 +0,0 @@ -post_install() { - update-desktop-database /usr/share/applications - gtk-update-icon-cache -q -t -f usr/share/icons/hicolor -} - -post_upgrade() { - post_install -} - -post_remove() { - update-desktop-database /usr/share/applications - gtk-update-icon-cache -q -t -f usr/share/icons/hicolor -} diff --git a/session-desktop.sh b/session-desktop.sh new file mode 100644 index 000000000000..8e23c8670327 --- /dev/null +++ b/session-desktop.sh @@ -0,0 +1,3 @@ + #!/usr/bin/bash + +exec @ELECTRON@ /usr/lib/session-desktop/app.asar "$@"