Add separate firejail .desktop

8 files changed, 44 insertions, 10 deletions

diff --git a/doc/Usage/Linux.asciidoc b/doc/Usage/Linux.asciidoc
new file mode 100644
index 0000000..748ea10
--- /dev/null
+++ b/doc/Usage/Linux.asciidoc
@@ -0,0 +1,15 @@
+== Linux
+
+=== firejail
+To launch poi by default with firejail, symlink /usr/bin/firejail to the poi
+executable:
+
+[source, sh]
+----
+# poi is installed to /usr/local/bin/poi, and local/sbin is before local/bin.
+ln -s /usr/bin/firejail /usr/local/sbin/poi
+----
+
+To add the poi.profile to firejail, copy or symlink it to '/etc/firejail' or
+'~/.config/firejail'.
+
diff --git a/linux/poi-debug.profile b/linux/firejail/poi-debug.profile
index 2a65a69..2a65a69 100644
--- a/linux/poi-debug.profile
+++ b/linux/firejail/poi-debug.profile
diff --git a/linux/poi.profile b/linux/firejail/poi.profile
index 5b8073d..5b8073d 100644
--- a/linux/poi.profile
+++ b/linux/firejail/poi.profile
diff --git a/linux/makepkg/PKGBUILD b/linux/makepkg/PKGBUILD
index 67b0245..55eb000 100644
--- a/linux/makepkg/PKGBUILD
+++ b/linux/makepkg/PKGBUILD
@@ -75,13 +75,13 @@ package() {
     cd $srcdir/build
     DESTDIR="$pkgdir" ninja install
 
-    msg Creating signing key in $srcdir/build/gpg
-    mkdir $srcdir/build/gpg
-    gpg2 --homedir=$srcdir/build/gpg --batch --generate-key $srcdir/smolbote/tools/gpgkey.preset
-
-    msg Signing plugins
-    for so in $pkgdir/usr/local/lib/smolbote/plugins/*.so; do
-        gpg2 --homedir=$srcdir/build/gpg --batch --yes --local-user=smolbote@localhost --detach-sign --output=$so.sig $so
-    done
+    #msg Creating signing key in $srcdir/build/gpg
+    #mkdir $srcdir/build/gpg
+    #gpg2 --homedir=$srcdir/build/gpg --batch --generate-key $srcdir/smolbote/tools/gpgkey.preset
+
+    #msg Signing plugins
+    #for so in $pkgdir/usr/local/lib/smolbote/plugins/*.so; do
+    #    gpg2 --homedir=$srcdir/build/gpg --batch --yes --local-user=smolbote@localhost --detach-sign --output=$so.sig $so
+    #done
 }
 
diff --git a/linux/poi_firejail.desktop.in b/linux/poi_firejail.desktop.in
new file mode 100644
index 0000000..aab41b4
--- /dev/null
+++ b/linux/poi_firejail.desktop.in
@@ -0,0 +1,13 @@
+[Desktop Entry]
+Version=1.0
+Name=poi (in firejail)
+GenericName=Web Browser
+Comment=yet another no-frills browser
+Exec=/usr/bin/firejail --profile=@profile_path@ @exec_poi@ %u
+Icon=poi
+Terminal=false
+Type=Application
+MimeType=text/html;text/xml;application/xhtml+xml;text/mml;x-scheme-handler/http;x-scheme-handler/https;
+Categories=Network;WebBrowser;
+Keywords=web;browser;internet;
+
diff --git a/linux/poi_ps.desktop.in b/linux/poi_picksession.desktop.in
index 7cfb7a9..7cfb7a9 100644
--- a/linux/poi_ps.desktop.in
+++ b/linux/poi_picksession.desktop.in
diff --git a/src/meson.build b/src/meson.build
index 367a7f9..2243887 100644
--- a/src/meson.build
+++ b/src/meson.build
@@ -55,10 +55,15 @@ if ['linux'].contains(host_machine.system())
     conf.set('exec_poi', join_paths(get_option('prefix'), get_option('bindir'), get_option('poiName')))
     conf.set('profile_path', join_paths(get_option('prefix'), get_option('libdir'), 'smolbote', 'poi.profile'))
 
+    # application icon
     install_data('../data/poi.svg', install_dir: join_paths(get_option('datadir'), 'icons/hicolor/scalable/apps'))
-    install_data('../linux/poi.profile', install_dir: join_paths(get_option('libdir'), 'smolbote'))
 
+    # firejail profile
+    install_data('../linux/firejail/poi.profile', install_dir: join_paths(get_option('libdir'), 'smolbote'))
+
+    # .desktop
     configure_file(input: '../linux/poi.desktop.in', output: 'poi.desktop', configuration: conf, install_dir: join_paths(get_option('datadir'), 'applications'))
-    configure_file(input: '../linux/poi_ps.desktop.in', output: 'poi_ps.desktop', configuration: conf, install_dir: join_paths(get_option('datadir'), 'applications'))
+    configure_file(input: '../linux/poi_firejail.desktop.in', output: 'poi_firejail.desktop', configuration: conf, install_dir: join_paths(get_option('datadir'), 'applications'))
+    configure_file(input: '../linux/poi_picksession.desktop.in', output: 'poi_picksession.desktop', configuration: conf, install_dir: join_paths(get_option('datadir'), 'applications'))
 
 endif
diff --git a/src/webengine/webpage.cpp b/src/webengine/webpage.cpp
index 0e1238a..ecbb1b9 100644
--- a/src/webengine/webpage.cpp
+++ b/src/webengine/webpage.cpp
@@ -11,6 +11,7 @@
 #include <QMessageBox>
 #include <QTimer>
 #include <QWebEngineFullScreenRequest>
+#include <QWebEngineCertificateError>
 
 QString tr_terminationStatus(QWebEnginePage::RenderProcessTerminationStatus status)
 {