aboutsummaryrefslogtreecommitdiff
path: root/linux
diff options
context:
space:
mode:
authorAqua-sama <aqua@iserlohn-fortress.net>2019-11-03 00:18:10 +0200
committerAqua-sama <aqua@iserlohn-fortress.net>2019-11-03 00:20:41 +0200
commitf3a4607d6a722a862af0eb9747a15dcdf624b6fb (patch)
tree9885709cdff55a865be6c03c591a9757680b0396 /linux
parentChange spdlog from makedepends to depends (diff)
downloadsmolbote-f3a4607d6a722a862af0eb9747a15dcdf624b6fb.tar.xz
Drop boost dependency
- wrote not-invented-here config file parser and conf class - spent obscene amount of time plugging in said conf class
Diffstat (limited to 'linux')
-rw-r--r--linux/.config101
-rw-r--r--linux/makepkg/PKGBUILD4
2 files changed, 61 insertions, 44 deletions
diff --git a/linux/.config b/linux/.config
index 3e8d40c..eea58d5 100644
--- a/linux/.config
+++ b/linux/.config
@@ -5,17 +5,8 @@
#
CONFIG_POI_NAME="smolbote"
CONFIG_POI_ICON=":/icon.svg"
-
-#
-# Configuration defaults
-#
-CONFIG_PATH_CONFIG="~/.config/smolbote/smolbote.cfg"
-CONFIG_PATH_FILTER="~/.config/smolbote/hosts.d"
-CONFIG_PATH_PLUGINS="~/.config/smolbote/plugins.d"
-CONFIG_PATH_PROFILES="~/.config/smolbote/profiles.d"
-CONFIG_PATH_BOOKMARKS="~/.config/smolbote/bookmarks.xbel"
-CONFIG_PATH_DOWNLOADS="~/Downloads"
-CONFIG_PATH_SESSION="~/.config/smolbote/session.d"
+CONFIG_POI_CFG_PATH="~/.config/smolbote/smolbote.cfg"
+# end of Application
#
# Keyboard shortcuts
@@ -24,61 +15,86 @@ CONFIG_PATH_SESSION="~/.config/smolbote/session.d"
#
# Main Window shortcuts
#
-CONFIG_SHORTCUT_WINDOW_NEWGROUP="Ctrl+G"
-CONFIG_SHORTCUT_WINDOW_NEWWINDOW="Ctrl+N"
-CONFIG_SHORTCUT_WINDOW_ABOUT="F1"
-CONFIG_SHORTCUT_WINDOW_QUIT="Ctrl+Q"
-CONFIG_SHORTCUT_WINDOW_SEARCH="F3"
-CONFIG_SHORTCUT_WINDOW_BOOKMARKS="Ctrl+B"
-CONFIG_SHORTCUT_WINDOW_DOWNLOADS="Ctrl+D"
+CONFIG_shortcuts.session.save="Ctrl+S,S"
+CONFIG_shortcuts.session.open="Ctrl+S,O"
+CONFIG_shortcuts.window.newgroup="Ctrl+G"
+CONFIG_shortcuts.window.newwindow="Ctrl+N"
+CONFIG_shortcuts.window.about="Ctrl+H"
+CONFIG_shortcuts.window.quit="Ctrl+Q"
+CONFIG_shortcuts.window.search="F3"
+CONFIG_shortcuts.window.bookmarks.show="Ctrl+B"
+CONFIG_shortcuts.window.downloads.show="Ctrl+D"
#
# Navigation Bar shortcuts
#
-CONFIG_SHORTCUT_NAVIGATION_BACK="Ctrl+Left"
-CONFIG_SHORTCUT_NAVIGATION_BACKMENU="Ctrl+Down"
-CONFIG_SHORTCUT_NAVIGATION_FORWARD="Ctrl+Right"
-CONFIG_SHORTCUT_NAVIGATION_FORWARDMENU="Ctrl+Up"
-CONFIG_SHORTCUT_NAVIGATION_REFRESH="F5"
-CONFIG_SHORTCUT_NAVIGATION_RELOAD="Ctrl+F5"
-CONFIG_SHORTCUT_NAVIGATION_HOME="Ctrl+Home"
+CONFIG_shortcuts.navigation.back="Ctrl+Left"
+CONFIG_shortcuts.navigation.backmenu="Ctrl+Down"
+CONFIG_shortcuts.navigation.forward="Ctrl+Right"
+CONFIG_shortcuts.navigation.forwardmenu="Ctrl+Up"
+CONFIG_shortcuts.navigation.refresh="F5"
+CONFIG_shortcuts.navigation.reload="Ctrl+F5"
+CONFIG_shortcuts.navigation.home="Ctrl+Home"
#
# Address Bar shortcuts
#
-CONFIG_SHORTCUT_ADDRESS_FOCUS="F4"
-CONFIG_SHORTCUT_ADDRESS_MENU="F2"
+CONFIG_shortcuts.address.focus="F4"
+CONFIG_shortcuts.address.menu="F2"
#
# Subwindow shortcuts
#
-CONFIG_SHORTCUT_SUBWINDOW_MENU="Ctrl+M"
-CONFIG_SHORTCUT_SUBWINDOW_TILE="F9"
-CONFIG_SHORTCUT_SUBWINDOW_CASCADE="F10"
-CONFIG_SHORTCUT_SUBWINDOW_FULLSCREEN="F11"
-CONFIG_SHORTCUT_SUBWINDOW_NEWTAB="Ctrl+T"
-CONFIG_SHORTCUT_SUBWINDOW_CLOSETAB="Ctrl+X"
-CONFIG_SHORTCUT_SUBWINDOW_TABLEFT="Ctrl+O"
-CONFIG_SHORTCUT_SUBWINDOW_MOVETABLEFT="Ctrl+Shift+O"
-CONFIG_SHORTCUT_SUBWINDOW_TABRIGHT="Ctrl+P"
-CONFIG_SHORTCUT_SUBWINDOW_MOVETABRIGHT="Ctrl+Shift+P"
+CONFIG_shortcuts.subwindow.menu="F1"
+CONFIG_shortcuts.subwindow.tile="F9"
+CONFIG_shortcuts.subwindow.cascade="F10"
+CONFIG_shortcuts.subwindow.fullscreen="F11"
+CONFIG_shortcuts.subwindow.newtab="Ctrl+T"
+CONFIG_shortcuts.subwindow.closetab="Ctrl+X"
+CONFIG_shortcuts.subwindow.restoretab="Ctrl+Shift+T"
+CONFIG_shortcuts.subwindow.tableft="Ctrl+O"
+CONFIG_shortcuts.subwindow.movetableft="Ctrl+Shift+O"
+CONFIG_shortcuts.subwindow.tabright="Ctrl+P"
+CONFIG_shortcuts.subwindow.movetabright="Ctrl+Shift+P"
+# end of Keyboard shortcuts
+
+#
+# Main Window
+#
+CONFIG_mainwindow.title="smolbote"
+CONFIG_mainwindow.width=1280
+CONFIG_mainwindow.height=720
+# end of Main Window
#
-# Profile defaults
+# Profile Settings
#
-CONFIG_PROFILE_DEFAULT=""
-CONFIG_PROFILE_DEFAULT_SEARCH="https://duckduckgo.com/?q=%1&ia=web"
-CONFIG_PROFILE_DEFAULT_HOMEPAGE="about:blank"
-CONFIG_PROFILE_DEFAULT_NEWTAB="about:blank"
+CONFIG_profile.path="~/.config/smolbote/profiles.d"
+CONFIG_profile.default=""
+CONFIG_profile.search="https://duckduckgo.com/?q=%1&ia=web"
+CONFIG_profile.homepage="about:blank"
+CONFIG_profile.newtab="about:blank"
+# end of Profile Settings
+
CONFIG_USEPLUGINS=y
#
# Plugin Settings
#
+CONFIG_plugins.path="~/.config/smolbote/plugins.d"
# CONFIG_PLUGIN_SIGNATURE_IGNORED is not set
CONFIG_PLUGIN_SIGNATURE_CHECKED=y
# CONFIG_PLUGIN_SIGNATURE_ENFORCED is not set
CONFIG_PLUGIN_SIGNATURE_HASH="SHA256"
+# end of Plugin Settings
+
+#
+# Default paths
+#
+CONFIG_filter.path="~/.config/smolbote/hosts.d"
+CONFIG_bookmarks.path="~/.config/smolbote/bookmarks.xbel"
+CONFIG_downloads.path="~/Downloads"
+CONFIG_session.path="~/.config/smolbote/session.d"
# CONFIG_USEPLASMA is not set
# CONFIG_USEBREAKPAD is not set
@@ -86,3 +102,4 @@ CONFIG_PLUGIN_SIGNATURE_HASH="SHA256"
# Workarounds
#
CONFIG_QTBUG_65223=y
+# end of Workarounds
diff --git a/linux/makepkg/PKGBUILD b/linux/makepkg/PKGBUILD
index 59f454d..9243405 100644
--- a/linux/makepkg/PKGBUILD
+++ b/linux/makepkg/PKGBUILD
@@ -12,9 +12,9 @@ install="smolbote.install"
arch=('x86_64')
license=('GPL3')
-depends=('qt5-webengine>=5.11.0' 'boost-libs>=1.66.0' 'spdlog')
+depends=('qt5-webengine>=5.11.0' 'spdlog')
optdepends=('firejail: launch a sandboxed instance')
-makedepends=('git' 'meson' 'boost' 'python-kconfiglib' 'openssl' 'qt5-tools' 'scdoc')
+makedepends=('git' 'meson' 'python-kconfiglib' 'openssl' 'qt5-tools' 'scdoc')
# this is the central repository
source=("git+https://neueland.iserlohn-fortress.net/gitea/aqua/smolbote.git"