summarylogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--.SRCINFO16
-rw-r--r--PKGBUILD62
-rw-r--r--session-desktop.desktop9
-rw-r--r--session-desktop.install12
4 files changed, 79 insertions, 20 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 000ea835fcef..92961f9b726d 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,11 +1,14 @@
pkgbase = session-desktop
pkgdesc = Private messaging from your desktop
- pkgver = 1.0.4
- pkgrel = 4
+ pkgver = 1.0.5
+ pkgrel = 1
url = https://getsession.org
install = session-desktop.install
arch = x86_64
license = GPL-3.0
+ makedepends = git
+ makedepends = nvm
+ makedepends = yarn
depends = libxtst
depends = nss
depends = alsa-lib
@@ -13,11 +16,14 @@ pkgbase = session-desktop
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
- source = https://github.com/loki-project/session-desktop/releases/download/v1.0.4/session-messenger-desktop-linux-amd64-1.0.4.deb
- sha256sums = 792352d0862ecba075c785832a6dec7b9aa99e2da8a43de848bed6754d0f64e1
+ options = !strip
+ source = git+https://github.com/loki-project/session-desktop.git
+ source = session-desktop.desktop
+ sha256sums = SKIP
+ sha256sums = 931e317b69e5c5ed3ef1f2ff0c82bf72b8706ab5ac50ad0564f3f164d7d5f7b8
pkgname = session-desktop
diff --git a/PKGBUILD b/PKGBUILD
index 4768cbb36cee..15034f15a9e3 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,19 +1,63 @@
# Maintainer: Roland Auer <xxr01i1xx@tuta.io>
-
pkgname=session-desktop
-pkgver=1.0.4
-pkgrel=4
+pkgver=1.0.5
+pkgrel=1
pkgdesc="Private messaging from your desktop"
arch=(x86_64)
-license=('GPL-3.0')
url="https://getsession.org"
-conflicts=(session-desktop-bin session-desktop-git session-desktop-appimage)
-source=("https://github.com/loki-project/session-desktop/releases/download/v${pkgver}/session-messenger-desktop-linux-amd64-${pkgver}.deb")
-sha256sums=("792352d0862ecba075c785832a6dec7b9aa99e2da8a43de848bed6754d0f64e1")
+license=('GPL-3.0')
depends=(libxtst nss alsa-lib libxss libnotify xdg-utils)
+makedepends=('git' 'nvm' 'yarn')
optdepends=('libappindicator-gtk3: for tray support')
-install=${pkgname}.install
+provides=(session-messenger-desktop)
+conflicts=(session-desktop-bin session-desktop-appimage)
+options=(!strip)
+install=$pkgname.install
+source=('git+https://github.com/loki-project/session-desktop.git'
+ 'session-desktop.desktop')
+sha256sums=('SKIP'
+ '931e317b69e5c5ed3ef1f2ff0c82bf72b8706ab5ac50ad0564f3f164d7d5f7b8')
+
+prepare() {
+ cd $srcdir/session-desktop
+ git checkout 0188252
+ source /usr/share/nvm/init-nvm.sh && nvm install 10.13.0
+}
+
+build() {
+ cd "$srcdir/session-desktop"
+ source /usr/share/nvm/init-nvm.sh && nvm use 10.13.0
+ export SIGNAL_ENV=production
+ yarn install --frozen-lockfile
+ yarn generate
+ yarn lint-full
+ $(yarn bin)/electron-builder --config.extraMetadata.environment=$SIGNAL_ENV --publish=never --config.directories.output=release --linux tar.xz
+}
package() {
- tar xf data.tar.xz -C ${pkgdir} --exclude='./control'
+ mkdir -p $pkgdir/usr/share/applications
+ mkdir -p $pkgdir/opt/
+ mkdir -p $pkgdir/usr/share/icons/hicolor/16x16/apps/
+ mkdir -p $pkgdir/usr/share/icons/hicolor/24x24/apps/
+ mkdir -p $pkgdir/usr/share/icons/hicolor/32x32/apps/
+ mkdir -p $pkgdir/usr/share/icons/hicolor/48x48/apps/
+ mkdir -p $pkgdir/usr/share/icons/hicolor/64x64/apps/
+ mkdir -p $pkgdir/usr/share/icons/hicolor/128x128/apps/
+ mkdir -p $pkgdir/usr/share/icons/hicolor/256x256/apps/
+ mkdir -p $pkgdir/usr/share/icons/hicolor/512x512/apps/
+ mkdir -p $pkgdir/usr/share/icons/hicolor/1024x1024/apps/
+
+ cp $srcdir/session-desktop/build/icons/png/16x16.png $pkgdir/usr/share/icons/hicolor/16x16/apps/session-messenger-desktop.png
+ cp $srcdir/session-desktop/build/icons/png/24x24.png $pkgdir/usr/share/icons/hicolor/24x24/apps/session-messenger-desktop.png
+ cp $srcdir/session-desktop/build/icons/png/32x32.png $pkgdir/usr/share/icons/hicolor/32x32/apps/session-messenger-desktop.png
+ cp $srcdir/session-desktop/build/icons/png/48x48.png $pkgdir/usr/share/icons/hicolor/48x48/apps/session-messenger-desktop.png
+ cp $srcdir/session-desktop/build/icons/png/64x64.png $pkgdir/usr/share/icons/hicolor/64x64/apps/session-messenger-desktop.png
+ cp $srcdir/session-desktop/build/icons/png/128x128.png $pkgdir/usr/share/icons/hicolor/128x128/apps/session-messenger-desktop.png
+ cp $srcdir/session-desktop/build/icons/png/256x256.png $pkgdir/usr/share/icons/hicolor/256x256/apps/session-messenger-desktop.png
+ cp $srcdir/session-desktop/build/icons/png/512x512.png $pkgdir/usr/share/icons/hicolor/512x512/apps/session-messenger-desktop.png
+ cp $srcdir/session-desktop/build/icons/png/1024x1024.png $pkgdir/usr/share/icons/hicolor/1024x1024/apps/session-messenger-desktop.png
+
+ tar xf $srcdir/session-desktop/release/session-messenger-desktop-linux-x64-$pkgver.tar.xz -C $pkgdir/opt/
+ mv $pkgdir/opt/session-messenger-desktop-linux-x64-$pkgver $pkgdir/opt/Session
+ cp $srcdir/session-desktop.desktop $pkgdir/usr/share/applications/
}
diff --git a/session-desktop.desktop b/session-desktop.desktop
new file mode 100644
index 000000000000..2b44f070ef9e
--- /dev/null
+++ b/session-desktop.desktop
@@ -0,0 +1,9 @@
+[Desktop Entry]
+Name=Session
+Exec=/opt/Session/session-messenger-desktop %U
+Terminal=false
+Type=Application
+Icon=session-messenger-desktop
+StartupWMClass=Session
+Comment=Private messaging from your desktop
+Categories=Network;
diff --git a/session-desktop.install b/session-desktop.install
index 119e061e79bf..080ddd42bc24 100644
--- a/session-desktop.install
+++ b/session-desktop.install
@@ -1,7 +1,7 @@
post_install() {
- sudo ln -sf /opt/Session/session-messenger-desktop /usr/bin/session-messenger-desktop
- sudo update-mime-database /usr/share/mime
- sudo update-desktop-database /usr/share/applications
+ ln -sf /opt/Session/session-messenger-desktop /usr/bin/session-messenger-desktop
+ update-desktop-database /usr/share/applications
+ gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
}
post_upgrade() {
@@ -9,7 +9,7 @@ post_upgrade() {
}
post_remove() {
- sudo rm -f '/usr/bin/session-messenger-desktop'
- sudo update-mime-database /usr/share/mime
- sudo update-desktop-database /usr/share/applications
+ rm -f '/usr/bin/session-messenger-desktop'
+ update-desktop-database /usr/share/applications
+ gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
}