aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAqua-sama <aqua@iserlohn-fortress.net>2020-12-09 22:13:05 +0200
committerAqua-sama <aqua@iserlohn-fortress.net>2020-12-10 13:44:19 +0200
commitdec4c4cdb1c244a15846e1460958d7c76d65591c (patch)
tree8e592c8ee5caa22339ca850537b8000ad91c9879
parentUse custom icons in webviewcontextmenu (diff)
downloadsmolbote-dec4c4cdb1c244a15846e1460958d7c76d65591c.tar.xz
Update PKGBUILD to build with cmake
-rw-r--r--LICENSE.md8
-rw-r--r--linux/.config111
-rw-r--r--linux/makepkg/PKGBUILD94
-rw-r--r--src/CMakeLists.txt7
4 files changed, 137 insertions, 83 deletions
diff --git a/LICENSE.md b/LICENSE.md
index 96bcfc3..e5bd938 100644
--- a/LICENSE.md
+++ b/LICENSE.md
@@ -27,11 +27,3 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
- url: https://github.com/itay-grudev/SingleApplication
- license: MIT
-## args
-- url: https://github.com/Taywee/args
-- license: MIT
-
-## Breakpad (optional)
-- url: https://chromium.googlesource.com/breakpad/breakpad
-- license: BSD-3-Clause
-
diff --git a/linux/.config b/linux/.config
new file mode 100644
index 0000000..8999ecb
--- /dev/null
+++ b/linux/.config
@@ -0,0 +1,111 @@
+
+#
+# Application
+#
+CONFIG_POI_NAME="smolbote"
+CONFIG_POI_CFG_PATH="~/.config/smolbote/smolbote.cfg"
+# end of Application
+
+#
+# Keyboard shortcuts
+#
+
+#
+# Main Window shortcuts
+#
+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="F1"
+CONFIG_shortcuts.window.quit="Ctrl+Q"
+CONFIG_shortcuts.window.search="F3"
+CONFIG_shortcuts.window.downloads.show="Ctrl+D"
+
+#
+# Navigation Bar shortcuts
+#
+CONFIG_navigationbar.show="Ctrl+Shift+N"
+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_shortcuts.address.focus="F4"
+CONFIG_shortcuts.address.menu="F2"
+
+#
+# Subwindow shortcuts
+#
+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+W"
+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
+
+#
+# Bookmarks
+#
+CONFIG_bookmarks.path="~/.config/smolbote/bookmarks.xbel"
+CONFIG_shortcuts.window.bookmarks.show="Ctrl+B"
+CONFIG_bookmarks.toolbar.show="Ctrl+Shift+B"
+# CONFIG_bookmarks.toolbar.movable is not set
+# CONFIG_bookmarks.toolbar.visible is not set
+# end of Bookmarks
+
+#
+# Profile Settings
+#
+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_PLUGINS_SIGNATURE_IGNORED is not set
+CONFIG_PLUGINS_SIGNATURE_CHECKED=y
+# CONFIG_PLUGINS_SIGNATURE_ENFORCED is not set
+CONFIG_PLUGINS_SIGNATURE_HASH="SHA256"
+# end of Plugin Settings
+
+#
+# Default paths
+#
+CONFIG_filter.path="~/.config/smolbote/hosts.d"
+CONFIG_downloads.path="~/Downloads"
+CONFIG_session.path="~/.config/smolbote/session.d"
+# CONFIG_USEPLASMA is not set
+# CONFIG_USEBREAKPAD is not set
+
+#
+# Workarounds
+#
+CONFIG_QTBUG_65223=y
+# end of Workarounds
diff --git a/linux/makepkg/PKGBUILD b/linux/makepkg/PKGBUILD
index 5bcf684..f262530 100644
--- a/linux/makepkg/PKGBUILD
+++ b/linux/makepkg/PKGBUILD
@@ -3,8 +3,6 @@
## not-use flags
# Enable plugin signing:
_signPlugins=0
-# Enable breakpad integraton:
-_enableBreakpad=0
# install prefix
_prefix='/usr/local'
@@ -13,97 +11,49 @@ pkgdesc='Yet another no-frills browser'
pkgver=0
pkgrel=1
-url="https://neueland.iserlohn-fortress.net/gitea/smolbote"
-install="smolbote.install"
+url="https://neueland.iserlohn-fortress.net/cgit/smolbote"
arch=('x86_64' 'aarch64')
license=('GPL3')
depends=('qt5-svg' 'qt5-webengine>=5.11.0' 'spdlog')
-makedepends=('git' 'meson' 'python-kconfiglib' 'openssl' 'qt5-tools' 'scdoc' 'catch2')
-if [ $_enableBreakpad == "1" ]; then
- makedepends+=('breakpad-git')
-fi
+makedepends=('git' 'cmake' 'python-kconfiglib' 'openssl' 'qt5-tools' 'scdoc' 'catch2')
optdepends=('firejail: launch a sandboxed instance')
-# use git+file:///path/to/your/repo to build from a local repo
-source=("git+https://neueland.iserlohn-fortress.net/cgit/smolbote"
- "https://neueland.iserlohn-fortress.net/releases/SingleApplication-3.1.1a.tar.xz"{,.sig}
- "https://neueland.iserlohn-fortress.net/releases/args.hxx-6.2.2.tar.xz"{,.sig})
+# use git+file:///path/to/your/repo#branch=devel to build from a local repo
+source=("git+git://neueland.iserlohn-fortress.net/cgit/smolbote#branch=devel"
+ "https://github.com/itay-grudev/SingleApplication/archive/v3.1.5.tar.gz"
+ "https://neueland.iserlohn-fortress.net/cgit/rcc/snapshot/rcc-0.1.2.tar.xz"
+ "https://github.com/tabler/tabler-icons/archive/v1.34.0.tar.gz")
-b2sums=('SKIP'
- 'cec3de8dbf252bfa6dc488e5a1440695f4dd3abffdf30948b7d1a3df3d9c85911e981c802ed5a882f1407315114529f4016e55c7d05fbbd1dafe5495b0a63f4a'
- 'SKIP'
- '440e357006883fbf1b1a796051500a6b068858a35947cd1119767bed8e0a86a7db4aff16498934d7217c375fe643da03c22007e438f30899e247153f25c922b6'
- 'SKIP')
-
-validgpgkeys=(BB1C090188E3E32B375C13FD095DE26BC16D2E98) # Aqua-sama <aqua@iserlohn-fortress.net>
+sha256sums=('SKIP'
+ '09b1e088dae8cf69187262554819b77f4ca7b65576b3f39c5b6885823e8a2dbb'
+ '5ee18b94401b720e6e65d8e0e38dd6ea23cab7ae4727742be313530969a69d50'
+ 'bc74e5bd28531445f2e50df44f3688b1116397a25a0086e6944ab52260b70ffd'
+)
prepare() {
- mkdir "$srcdir/smolbote/subprojects/packagecache/"
- ln -s "$srcdir/SingleApplication-3.1.1a" "$srcdir/smolbote/subprojects/"
- ln -s "$srcdir/args.hxx-6.2.2" "$srcdir/smolbote/subprojects/"
-
- cd $srcdir/smolbote
- KCONFIG_CONFIG=linux/.config alldefconfig
+ mkdir "$srcdir/smolbote-devel/third-party"
+ ln -s "$srcdir/SingleApplication-3.1.5" "$srcdir/smolbote-devel/third-party/"
+ ln -s "$srcdir/rcc-0.1.2" "$srcdir/smolbote-devel/third-party/"
+ ln -s "$srcdir/tabler-icons-1.34.0" "$srcdir/smolbote-devel/third-party/"
+ ln -s "$srcdir/smolbote-devel/linux/.config" "$srcdir/smolbote-devel/"
}
pkgver() {
- cd smolbote
+ cd "$srcdir/smolbote-devel"
# Without version tag
echo r$(git rev-list --count HEAD)-$(git rev-parse --short HEAD) | sed 's/\([^-]*-g\)/r\1/;s/-/./g'
}
build() {
- mkdir -p $srcdir/build
-
- # For a list of configureable options, check smolbote/meson_options.txt, or run `meson configure` in $srcdir/build
-
- # --wrap-mode=nodownload - disable meson from downloading dependency wraps. This will cause it to fail if makedepends are not found by pkg-config or cmake.
- # --wrap-mode=nofallback - disable downloads as a fallback too. Implies --wrap-mode=nodownload
- # --buildtype=plain - meson won't add any flags to the command line
- # --prefix=... - install prefix
- # --auto-features=disabled - features should be explicitly enabled
- # b_pie: Build executables as position independent
- # b_lto: Use link time optimization
- meson setup \
- --buildtype=plain --prefix=$_prefix --wrap-mode=nodownload --auto-features=disabled \
- -Db_pie=true -Ddefault_library=static \
- -Dmanpage=true \
- $srcdir/smolbote $srcdir/build
+ cmake -B build -S "smolbote-devel" -DVCS_TAG=OFF -DCMAKE_BUILD_TYPE=Release \
+ -DCMAKE_INSTALL_PREFIX=$_prefix
+ make -C build
- if [ $_enableBreakpad == "1" ]; then
- msg2 "Enabling crashhandler"
- meson configure -Ddebug=true -Dcrashhandler=enabled
- KCONFIG_CONFIG=linux/.config setconfig USEBREAKPAD=y
- fi
-
- # Build
- ninja -C $srcdir/build
}
-#check() {
-# ninja -C $srcdir/build test
-#}
-
package() {
- # Install
- cd $srcdir/build
- DESTDIR="$pkgdir" ninja install
-
- if [ $_signPlugins == "1" ]; then
- msg "Signing plugins"
- for so in $pkgdir/$_prefix/lib/smolbote/plugins/*.so; do
- openssl dgst -sha256 -sign $srcdir/build/lib/pluginloader/privateKey.pem -out $so.sig $so
- msg2 "Signed $(basename $so)"
- done
- fi
-
- if [ $_enableBreakpad == "1" ]; then
- msg "Installing debug symbols"
- ninja -C $srcdir/build linux/poi.sym
- install -dm644 $pkgdir/$_prefix/lib/smolbote/symbols/poi/$(head -n1 linux/poi.sym | awk '{ print $(NF-1) }')
- install -m644 -t $pkgdir/$_prefix/lib/smolbote/symbols/poi/$(head -n1 linux/poi.sym | awk '{ print $(NF-1) }') $srcdir/build/linux/poi.sym
- fi
+ make DESTDIR="$pkgdir" -C build install
}
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 5139d7c..902fe6f 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -37,6 +37,7 @@ target_link_libraries(poi PRIVATE Qt5::Widgets Qt5::WebEngineWidgets Qt5::Svg
SingleApplication::SingleApplication fmt spdlog
autogen about_dialog about_plugin webengine
bookmarks configuration downloads pluginloader session_formats smolblok)
-target_include_directories(poi PRIVATE .
- ${CMAKE_SOURCE_DIR}/include
- ${CMAKE_CURRENT_BINARY_DIR})
+
+target_include_directories(poi PRIVATE . ${CMAKE_SOURCE_DIR}/include ${CMAKE_CURRENT_BINARY_DIR})
+install(TARGETS poi DESTINATION bin)
+