aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAqua-sama <aqua@iserlohn-fortress.net>2018-12-11 20:27:43 +0100
committerAqua-sama <aqua@iserlohn-fortress.net>2018-12-11 22:50:09 +0100
commit1891b51b3b11d6fac807fcffa0e11121be55b362 (patch)
tree74d098af7a41114ea8d7319af989491843603bc3
parentFix navigation buttons using wrong icons (diff)
downloadsmolbote-1891b51b3b11d6fac807fcffa0e11121be55b362.tar.xz
Fix crash creating ConfigurationEditorPlugin widget
-rw-r--r--lib/configuration/commandline.h2
-rw-r--r--lib/configuration/configuration.h2
-rw-r--r--linux/makepkg/PKGBUILD3
3 files changed, 5 insertions, 2 deletions
diff --git a/lib/configuration/commandline.h b/lib/configuration/commandline.h
index 68361cb..3c4dd81 100644
--- a/lib/configuration/commandline.h
+++ b/lib/configuration/commandline.h
@@ -64,7 +64,7 @@ public:
return std::optional<T>(vm[path].as<T>());
}
- const boost::program_options::options_description description() const
+ const boost::program_options::options_description& description() const
{
return m_description;
}
diff --git a/lib/configuration/configuration.h b/lib/configuration/configuration.h
index cce00bd..4f9eafd 100644
--- a/lib/configuration/configuration.h
+++ b/lib/configuration/configuration.h
@@ -110,7 +110,7 @@ public:
}
QHash<QString, QString> section(const std::string &prefix) const;
- const boost::program_options::options_description description() const
+ const boost::program_options::options_description& description() const
{
return configuration_desc;
}
diff --git a/linux/makepkg/PKGBUILD b/linux/makepkg/PKGBUILD
index 3d75cf2..cd5e8db 100644
--- a/linux/makepkg/PKGBUILD
+++ b/linux/makepkg/PKGBUILD
@@ -54,7 +54,10 @@ build() {
# --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 --buildtype=plain --prefix=/usr/local --auto-features=disabled \
+ -Db_pie=enabled -Db_lto=enabled -Dcpp_link_args="-fuse-ld=gold" \
-DPlasma=enabled -Dmanpage=enabled \
$srcdir/build