diff options
| -rw-r--r-- | .SRCINFO | 4 | ||||
| -rw-r--r-- | PKGBUILD | 11 | ||||
| -rw-r--r-- | frmmain.cpp.patch | 21 |
3 files changed, 33 insertions, 3 deletions
@@ -1,7 +1,7 @@ pkgbase = candle-git pkgdesc = GRBL controller application with G-Code visualizer written in Qt - development version pkgver = v1.1.r97.8fd07bf - pkgrel = 2 + pkgrel = 3 url = https://github.com/Denvi/Candle arch = x86_64 arch = aarch64 @@ -15,8 +15,10 @@ pkgbase = candle-git conflicts = candle-bin source = candle::git+https://github.com/Denvi/Candle.git source = candle.desktop + source = frmmain.cpp.patch md5sums = SKIP md5sums = af12719ddf48d7fbef120adb03ab3cdb + md5sums = 54cf1510a9858074b6bf54c0c174dd00 pkgname = candle-git @@ -1,7 +1,7 @@ # Maintainer: nobodyinperson <nobodyinperson at posteo de> pkgname=candle-git pkgver=v1.1.r97.8fd07bf -pkgrel=2 +pkgrel=3 pkgdesc="GRBL controller application with G-Code visualizer written in Qt - development version" arch=(x86_64 aarch64) url="https://github.com/Denvi/Candle" @@ -18,16 +18,23 @@ install= source=( "${pkgname%-git}"::'git+https://github.com/Denvi/Candle.git' "${pkgname%-git}.desktop" + "frmmain.cpp.patch" ) noextract=() md5sums=('SKIP' - 'af12719ddf48d7fbef120adb03ab3cdb') + 'af12719ddf48d7fbef120adb03ab3cdb' + '54cf1510a9858074b6bf54c0c174dd00') pkgver() { cd "$srcdir/${pkgname%-git}" printf "%s" "$(git describe --tags --match 'v*' | sed 's/\([^-]*-\)g/r\1/;s/-/./g')" } +prepare() { + cd "$srcdir/${pkgname%-git}" + git apply < "../frmmain.cpp.patch" +} + build() { cd "$srcdir/${pkgname%-git}" cd src/ diff --git a/frmmain.cpp.patch b/frmmain.cpp.patch new file mode 100644 index 000000000000..2b932db084d8 --- /dev/null +++ b/frmmain.cpp.patch @@ -0,0 +1,21 @@ +diff --git a/src/frmmain.cpp b/src/frmmain.cpp +index cab8602..61abee3 100644 +--- a/src/frmmain.cpp ++++ b/src/frmmain.cpp +@@ -32,6 +32,7 @@ + #include <QAction> + #include <QLayout> + #include <QMimeData> ++#include <QStandardPaths> + #include "frmmain.h" + #include "ui_frmmain.h" + +@@ -85,7 +86,7 @@ frmMain::frmMain(QWidget *parent) : + << "black"; + + // Loading settings +- m_settingsFileName = qApp->applicationDirPath() + "/settings.ini"; ++ m_settingsFileName = QStandardPaths::writableLocation(QStandardPaths::AppConfigLocation) + "/settings.ini"; + preloadSettings(); + + m_settings = new frmSettings(this); |