diff options
| -rw-r--r-- | README.md | 47 | ||||
| -rw-r--r-- | doc/building.md | 38 | ||||
| -rw-r--r-- | lib/downloads/widgets/downloaditemwidget.cpp | 4 | ||||
| -rw-r--r-- | meson.build | 7 |
4 files changed, 45 insertions, 51 deletions
@@ -1,14 +1,21 @@ + __ __ + ____ ___ __ _____ / /___ _____ ____/ / + / __ \/ _ \/ / / / _ \/ / __ `/ __ \/ __ / + / / / / __/ /_/ / __/ / /_/ / / / / /_/ / + /_/ /_/\___/\__,_/\___/ /\__,_/_/ /_/\__,_/ + out of foppery /_/ and whim + ## *smolbote?* _It's yet another no-frills browser, poi!_ -### What is this and why should I care? +## What is this and why should I care? smolbote is a [keep-it-simple][kiss-principle] free software web browser. This program is free software. You can use it as you see fit, study and modify the source code, and share the program with or without modification, while providing the same terms. -For more information, and a list of dependancies, see [LICENSE.md][repo-license]. +For more information and a list of dependancies, see [LICENSE.md][repo-license]. #### Simplicity This should be a simple browser that only does its browsing job with as little @@ -19,22 +26,34 @@ This browser should be usable out of the box, with minimal if any configuration necessary. All functionality should be user-customizable, and it is the user's responsibility to ensure a stable working state when changing settings. -#### Pragmatic Freedom -Free software should serve the user, not impose unbreakable barriers for -ideological reasons. +## What's up with the name?! +It's a small boat. It says poi. + +## Sounds dumb, how do I use it? -QtWebEngine allows the usage of third-party non-free codecs and non-free -plugins. This browser does not prevent you from doing so. It's up to you how -you exercise your freedom. +### Nightly builds -### What's up with the name?! -It's a small boat. It says poi. +### Building from source + +Required dependencies +- latest stable [Qt](https://www.qt.io/) +- latest stable [meson](https://mesonbuild.com/) +- A compiler with C++2a support + +``` +# clone +git clone git://neueland.iserlohn-fortress.net/smolbote + +# configure +mkdir build +meson build -### Sounds dumb, how do I use it? -You make it yourself. Detailed [build instructions](/smolbote/building.html) included. +# make +ninja -C build +``` -### It doesn't work, what now? +## It doesn't work, what now? Drop me an email at _aqua at iserlohn dash fortress dot net_. [kiss-principle]: https://en.wikipedia.org/wiki/KISS_principle -[repo-license]: https://neueland.iserlohn-fortress.net/gitea/aqua/smolbote/src/branch/master/LICENSE.md +[repo-license]: https://neueland.iserlohn-fortress.net/cgit/smolbote/tree/LICENSE.md diff --git a/doc/building.md b/doc/building.md index 9ea9344..52fac6a 100644 --- a/doc/building.md +++ b/doc/building.md @@ -1,37 +1,12 @@ -## Building from source - -### Dependencies -- [Qt](https://www.qt.io/) -- [meson](https://mesonbuild.com/) 0.52.0 or later -- [kconfiglib](https://github.com/ulfalizer/Kconfiglib/) -- A compiler with C++17 support -- spdlog: if not found can be downloaded by meson - -### Optional dependencies -- openssl or libressl: for signing plugins -- breakpad-client -- gtest +## Using meson -### Steps +### Picking compiler ``` -# clone the repository -git clone https://neueland.iserlohn-fortress.net/gitea/aqua/smolbote.git smolbote.git -cd smolbote.git - -# Get the submodules -git submodule init -git submodule update - -# configure -mkdir build -meson build - -# make -ninja +# set the environment variables as desired +export CXX='ccache clazy' +export CXX_LD='lld' ``` -## Using meson - ### Listing build options ``` build% meson configure @@ -50,7 +25,8 @@ phase: repo% meson --wrap-mode=nodownload build-path ``` -For more information on how to use meson, see the meson [quick quide](https://mesonbuild.com/Quick-guide.html). +For more information on how to use meson, see the meson +[quick quide](https://mesonbuild.com/Quick-guide.html). ## Configuring builds smolbote uses Kconfig to store and customize features and default settings such diff --git a/lib/downloads/widgets/downloaditemwidget.cpp b/lib/downloads/widgets/downloaditemwidget.cpp index e0c8a60..cb95965 100644 --- a/lib/downloads/widgets/downloaditemwidget.cpp +++ b/lib/downloads/widgets/downloaditemwidget.cpp @@ -34,8 +34,8 @@ DownloadItemWidget::DownloadItemWidget(QWebEngineDownloadItem *m_item, QWidget * : QWidget(parent) , ui(new Ui::DownloadItemForm) { - Q_CHECK_PTR(item); - m_item = item; + Q_CHECK_PTR(m_item); + item = m_item; ui->setupUi(this); { // pause/resume icons diff --git a/meson.build b/meson.build index 926fe8b..df718cc 100644 --- a/meson.build +++ b/meson.build @@ -2,7 +2,7 @@ project('smolbote', ['cpp'], version: '0.1.0', default_options: ['cpp_std=c++2a', 'warning_level=3'], license: 'GPL3', - meson_version: '>=0.53.0' + meson_version: '>=0.55.0' ) summary({ @@ -12,9 +12,8 @@ summary({ 'datadir': get_option('datadir') }, section: 'Install locations') -kconfig = import('unstable-kconfig') -kconf = kconfig.load(host_machine.system() + '/.config') -cdata = configuration_data(kconf) +kconfig = import('unstable-keyval') +cdata = configuration_data(kconfig.load(host_machine.system() + '/.config')) version_h = vcs_tag( command: [find_program('git').path(), 'describe', '--long', '--abbrev=40'], |