From d7003dc734ec3d4072afa59e6fc9bad8d72eb095 Mon Sep 17 00:00:00 2001 From: Danilo Spinella Date: Wed, 24 Oct 2018 13:45:58 +0000 Subject: [PATCH 1/6] Add support for BINDIR environmental variable cross-compile environments usually puts binary in a specified directory, e.g. /usr/x86_64/bin, while installing other files in a shared directory, like /usr/share. Therefore supporting BINDIR is required. --- spectral.pro | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/spectral.pro b/spectral.pro index 0536a8f..fd17556 100644 --- a/spectral.pro +++ b/spectral.pro @@ -59,7 +59,11 @@ unix:!mac:isEmpty(PREFIX) { message("Install PREFIX not set; using /usr/local. You can change this with 'qmake PREFIX=...'") PREFIX = /usr/local } -unix:target.path = $$PREFIX/bin +unix:!mac:isEmpty(BINDIR) { + message("Install BINDIR not set; using /usr/local. You can change this with 'qmake BINDIR=...'") + BINDIR = $$PREFIX/bin +} +unix:target.path = $$BINDIR win32:target.path = $$PREFIX !isEmpty(target.path): INSTALLS += target From 7bc4b611d47bffa7f2ba89c7fa64c43a66705d1c Mon Sep 17 00:00:00 2001 From: Black Hat Date: Wed, 24 Oct 2018 22:52:47 +0000 Subject: [PATCH 2/6] Fix comments. --- spectral.pro | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/spectral.pro b/spectral.pro index fd17556..669f598 100644 --- a/spectral.pro +++ b/spectral.pro @@ -60,7 +60,7 @@ unix:!mac:isEmpty(PREFIX) { PREFIX = /usr/local } unix:!mac:isEmpty(BINDIR) { - message("Install BINDIR not set; using /usr/local. You can change this with 'qmake BINDIR=...'") + message("Install BINDIR not set; using PREFIX/bin. You can change this with 'qmake BINDIR=...'") BINDIR = $$PREFIX/bin } unix:target.path = $$BINDIR From ca5b35ab74242f186c657b1fb4c790ffc5e8c5f9 Mon Sep 17 00:00:00 2001 From: Black Hat Date: Wed, 24 Oct 2018 23:22:07 +0000 Subject: [PATCH 3/6] Update spectral.pro --- spectral.pro | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/spectral.pro b/spectral.pro index 669f598..9828ea8 100644 --- a/spectral.pro +++ b/spectral.pro @@ -63,7 +63,8 @@ unix:!mac:isEmpty(BINDIR) { message("Install BINDIR not set; using PREFIX/bin. You can change this with 'qmake BINDIR=...'") BINDIR = $$PREFIX/bin } -unix:target.path = $$BINDIR +unix:!mac:target.path = $$BINDIR +mac:target.path = $$PREFIX/bin win32:target.path = $$PREFIX !isEmpty(target.path): INSTALLS += target From a27b300b748ce0b67e7afc554733162bd2c90646 Mon Sep 17 00:00:00 2001 From: Black Hat Date: Wed, 24 Oct 2018 23:33:50 +0000 Subject: [PATCH 4/6] Update org.eu.encom.spectral.appdata.xml --- org.eu.encom.spectral.appdata.xml | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/org.eu.encom.spectral.appdata.xml b/org.eu.encom.spectral.appdata.xml index b4f367a..43bb39f 100644 --- a/org.eu.encom.spectral.appdata.xml +++ b/org.eu.encom.spectral.appdata.xml @@ -38,11 +38,7 @@ intense + - - - - - From 8c29382b3eb7a24c5abe3196c78a546329bb75d9 Mon Sep 17 00:00:00 2001 From: Black Hat Date: Thu, 25 Oct 2018 00:53:51 +0000 Subject: [PATCH 5/6] Update org.eu.encom.spectral.appdata.xml --- org.eu.encom.spectral.appdata.xml | 39 ++++++++++++++++++++----------- 1 file changed, 25 insertions(+), 14 deletions(-) diff --git a/org.eu.encom.spectral.appdata.xml b/org.eu.encom.spectral.appdata.xml index 43bb39f..e172c90 100644 --- a/org.eu.encom.spectral.appdata.xml +++ b/org.eu.encom.spectral.appdata.xml @@ -1,9 +1,11 @@ org.eu.encom.spectral - org.eu.encom.spectral.desktop - GFDL - GPL-3.0 + + + spectral + + Spectral IM client for the Matrix protocol @@ -14,6 +16,21 @@ The source code is generally available at https://gitlab.com/b0/spectral

+ + https://gitlab.com/b0/spectral + https://gitlab.com/b0/spectral/issues + https://doc.spectral.encom.eu.org + + + Matrix + Internet + Qt + + + Black Hat + GFDL + GPL-3.0 + Overview @@ -24,21 +41,15 @@ https://gitlab.com/b0/spectral/raw/master/screenshots/2.png - Black Hat - - Matrix - Internet - Qt - - https://gitlab.com/b0/spectral - https://gitlab.com/b0/spectral/issues - https://doc.spectral.encom.eu.org + intense intense + - - + + + From b3134a92e72d194eb54ef7072be709d9178ca3ad Mon Sep 17 00:00:00 2001 From: Black Hat Date: Sat, 27 Oct 2018 04:06:20 +0000 Subject: [PATCH 6/6] Limit filesystem access. --- flatpak/org.eu.encom.spectral.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/flatpak/org.eu.encom.spectral.yaml b/flatpak/org.eu.encom.spectral.yaml index e9ebfb2..574c14a 100644 --- a/flatpak/org.eu.encom.spectral.yaml +++ b/flatpak/org.eu.encom.spectral.yaml @@ -9,7 +9,7 @@ finish-args: - --socket=x11 - --socket=wayland - --device=dri -- --filesystem=home +- --filesystem=xdg-download - --talk-name=org.freedesktop.Notifications - --talk-name=org.kde.StatusNotifierWatcher modules: