aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--linux/makepkg/PKGBUILD12
-rw-r--r--linux/poi.desktop.in8
-rw-r--r--linux/poi_firejail.desktop.in12
-rw-r--r--meson_options.txt1
-rw-r--r--src/meson.build21
5 files changed, 29 insertions, 25 deletions
diff --git a/linux/makepkg/PKGBUILD b/linux/makepkg/PKGBUILD
index 55eb000..3d75cf2 100644
--- a/linux/makepkg/PKGBUILD
+++ b/linux/makepkg/PKGBUILD
@@ -54,19 +54,15 @@ build() {
# --buildtype=plain - meson won't add any flags to the command line
# --prefix=... - install prefix
# --auto-features=disabled - features should be explicitly enabled
- meson --buildtype=plain --prefix=/usr/local --auto-features=disabled $srcdir/build
+ meson --buildtype=plain --prefix=/usr/local --auto-features=disabled \
+ -DPlasma=enabled -Dmanpage=enabled \
+ $srcdir/build
# Run menuconfig
#KCONFIG_CONFIG=linux/.config menuconfig
- cd $srcdir/build
-
- # Toggle features
- #meson configure -DBreakpad=enabled
- meson configure -DPlasma=enabled
- meson configure -Dmanpage=enabled
-
# Build
+ cd $srcdir/build
ninja
}
diff --git a/linux/poi.desktop.in b/linux/poi.desktop.in
index c6f77b2..a31a84c 100644
--- a/linux/poi.desktop.in
+++ b/linux/poi.desktop.in
@@ -1,6 +1,6 @@
[Desktop Entry]
Version=1.0
-Name=poi
+Name=smolbote
GenericName=Web Browser
Comment=yet another no-frills browser
Exec=@exec_poi@ %u
@@ -10,7 +10,7 @@ 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;
-Actions=configure;firejail
+Actions=pickSession;configure
[Desktop Action pickSession]
Name=Pick Session
@@ -19,7 +19,3 @@ Exec=@exec_poi@ --pick-session
[Desktop Action configure]
Name=Configure smolbote
Exec=@exec_poi@ configure
-
-[Desktop Action firejail]
-Name=Start instance in firejail
-Exec=/usr/bin/firejail --profile=@profile_path@ @exec_poi@
diff --git a/linux/poi_firejail.desktop.in b/linux/poi_firejail.desktop.in
index aab41b4..139ffde 100644
--- a/linux/poi_firejail.desktop.in
+++ b/linux/poi_firejail.desktop.in
@@ -1,13 +1,21 @@
[Desktop Entry]
Version=1.0
-Name=poi (in firejail)
+Name=smolbote (in firejail)
GenericName=Web Browser
Comment=yet another no-frills browser
-Exec=/usr/bin/firejail --profile=@profile_path@ @exec_poi@ %u
+Exec=@firejail@ --profile=@firejail_profile@ @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;
+Actions=pickSession;configure
+[Desktop Action pickSession]
+Name=Pick Session
+Exec=@firejail@ --profile=@firejail_profile@ @exec_poi@ --pick-session
+
+[Desktop Action configure]
+Name=Configure smolbote
+Exec=@firejail@ --profile=@firejail_profile@ @exec_poi@ configure
diff --git a/meson_options.txt b/meson_options.txt
index 288b2d7..f611a7f 100644
--- a/meson_options.txt
+++ b/meson_options.txt
@@ -1,5 +1,6 @@
# Executable options
option('poiName', description: 'Executable name', type: 'string', value: 'poi')
+option('firejail', description: 'firejail executable name', type: 'string', value: '/usr/bin/firejail')
# Install options
option('manpage', description: 'Generate and install manpage', type: 'feature', value: 'auto')
diff --git a/src/meson.build b/src/meson.build
index 2243887..0ad0166 100644
--- a/src/meson.build
+++ b/src/meson.build
@@ -51,19 +51,22 @@ poi = executable(get_option('poiName'), install: true,
# install .desktop file and firejail profile for systems in this array
if ['linux'].contains(host_machine.system())
- conf = configuration_data()
- 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'))
+ conf = configuration_data({
+ 'exec_poi': get_option('prefix') / get_option('bindir') / get_option('poiName'),
+ 'firejail': get_option('firejail'),
+ 'firejail_profile': 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('../data/poi.svg', install_dir: get_option('datadir') / 'icons/hicolor/scalable/apps')
# firejail profile
- install_data('../linux/firejail/poi.profile', install_dir: join_paths(get_option('libdir'), 'smolbote'))
+ install_data('../linux/firejail/poi.profile', install_dir: 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_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'))
+ # Install .desktop to $prefix/share/applications
+ desktop_install_dir = get_option('datadir') / 'applications'
+ configure_file(input: '../linux/poi.desktop.in', output: 'poi.desktop', configuration: conf, install_dir: desktop_install_dir )
+ configure_file(input: '../linux/poi_firejail.desktop.in', output: 'poi_firejail.desktop', configuration: conf, install_dir: desktop_install_dir )
+ configure_file(input: '../linux/poi_picksession.desktop.in', output: 'poi_picksession.desktop', configuration: conf, install_dir: desktop_install_dir )
endif