$ git show --format=fuller --patch-with-stat --summary ed06d6ac2d06534fe5f16321cd9ea7a14cba122b
commit ed06d6ac2d06534fe5f16321cd9ea7a14cba122b
Author: Bernhard Rosenkränzer <bero@lindev.ch>
AuthorDate: Fri Sep 11 17:46:35 2020 +0200
Commit: Bernhard Rosenkränzer <bero@lindev.ch>
CommitDate: Fri Sep 11 17:46:35 2020 +0200
1.2b, fix build
---
.abf.yml | 2 +-
candle-1.2b-compile.patch | 61 +++++++++++++++++++++++++++++++++++++++++++++++
candle.spec | 3 ++-
translation.patch | 41 +++++++++++++++----------------
4 files changed, 83 insertions(+), 24 deletions(-)
create mode 100644 candle-1.2b-compile.patch
diff --git a/.abf.yml b/.abf.yml
index 009f29f..d060e63 100644
--- a/.abf.yml
+++ b/.abf.yml
@@ -1,2 +1,2 @@
sources:
- v1.1.tar.gz: cdd4ed3af2eeedb73dd6042fad8ea9089b51a64a
+ v1.2b.tar.gz: 84448d0892da6fa97f515120ad1ec91475af950e
diff --git a/candle-1.2b-compile.patch b/candle-1.2b-compile.patch
new file mode 100644
index 0000000..1d07ce6
--- /dev/null
+++ b/candle-1.2b-compile.patch
@@ -0,0 +1,61 @@
+diff -up Candle-1.2b/src/candle.pro.omv~ Candle-1.2b/src/candle.pro
+--- Candle-1.2b/src/candle.pro.omv~ 2020-09-11 17:37:27.764780920 +0200
++++ Candle-1.2b/src/candle.pro 2020-09-11 17:37:51.947108674 +0200
+@@ -111,8 +111,8 @@ RESOURCES += \
+ shaders.qrc \
+ images.qrc
+
+-CONFIG(release, debug|release) {
++win32:CONFIG(release, debug|release) {
+ QMAKE_CXXFLAGS += -Z7 -Fdrelease\\candle.pdb
+ QMAKE_CFLAGS += -Z7 -Fdrelease\\candle.pdb
+ QMAKE_LFLAGS += /DEBUG /OPT:REF
+-}
+\ No newline at end of file
++}
+diff -up Candle-1.2b/src/frmmain.cpp.omv~ Candle-1.2b/src/frmmain.cpp
+--- Candle-1.2b/src/frmmain.cpp.omv~ 2020-09-11 17:42:03.275515045 +0200
++++ Candle-1.2b/src/frmmain.cpp 2020-09-11 17:42:11.408625277 +0200
+@@ -33,6 +33,7 @@
+ #include <QLayout>
+ #include <QMimeData>
+ #include <QStandardPaths>
++#include <qgl.h>
+
+ #include "frmmain.h"
+ #include "ui_frmmain.h"
+diff -up Candle-1.2b/src/frmmain.h.omv~ Candle-1.2b/src/frmmain.h
+--- Candle-1.2b/src/frmmain.h.omv~ 2020-09-11 17:40:04.837909805 +0200
++++ Candle-1.2b/src/frmmain.h 2020-09-11 17:41:06.044739370 +0200
+@@ -70,7 +70,7 @@ public:
+ #define _GLIBCXX_USE_NOEXCEPT _NOEXCEPT
+ #endif
+
+- const char* what() const override
++ const char* what() const override __attribute__((__nothrow__))
+ {
+ return "Operation was cancelled by user";
+ }
+diff -up Candle-1.2b/src/widgets/glwidget.cpp.omv~ Candle-1.2b/src/widgets/glwidget.cpp
+--- Candle-1.2b/src/widgets/glwidget.cpp.omv~ 2020-09-11 17:39:28.078411587 +0200
++++ Candle-1.2b/src/widgets/glwidget.cpp 2020-09-11 17:43:17.925526811 +0200
+@@ -7,6 +7,8 @@
+ #include <QtWidgets>
+ #include <QPainter>
+ #include <QEasingCurve>
++#include <GL/gl.h>
++#include <qopenglext.h>
+
+ #ifdef GLES
+ #include <GLES/gl.h>
+diff -up Candle-1.2b/src/candle.pro.omv~ Candle-1.2b/src/candle.pro
+--- Candle-1.2b/src/candle.pro.omv~ 2020-09-11 17:45:46.421663787 +0200
++++ Candle-1.2b/src/candle.pro 2020-09-11 17:45:48.476694447 +0200
+@@ -24,7 +24,6 @@ contains(QT_CONFIG, opengles.) {
+ warning("GL ES detected. VAO will be disabled.")
+ DEFINES += GLES
+ INSTALLS += target
+- target.path = /home/pi
+ }
+
+ TARGET = Candle
diff --git a/candle.spec b/candle.spec
index 67ca802..89e8391 100644
--- a/candle.spec
+++ b/candle.spec
@@ -1,12 +1,13 @@
Summary: GRBL controller application
Name: candle
-Version: 1.1
+Version: 1.2b
Release: 1
License: GPLv2+
Group: Monitoring
Url: https://github.com/Denvi/Candle
Source0: https://github.com/Denvi/Candle/archive/v%{version}.tar.gz
Patch0: translation.patch
+Patch1: candle-1.2b-compile.patch
BuildRequires: cmake(Qt5SerialPort)
BuildRequires: cmake(Qt5Core)
diff --git a/translation.patch b/translation.patch
index 6a73eff..9463735 100644
--- a/translation.patch
+++ b/translation.patch
@@ -1,10 +1,9 @@
-diff --git a/src/frmabout.cpp b/src/frmabout.cpp
-index d77774b..fbf6ab4 100644
---- a/src/frmabout.cpp
-+++ b/src/frmabout.cpp
+diff -up Candle-1.2b/src/frmabout.cpp.1~ Candle-1.2b/src/frmabout.cpp
+--- Candle-1.2b/src/frmabout.cpp.1~ 2019-10-30 16:40:25.000000000 +0100
++++ Candle-1.2b/src/frmabout.cpp 2020-09-11 15:35:23.587906180 +0200
@@ -12,8 +12,11 @@ frmAbout::frmAbout(QWidget *parent) :
ui->setupUi(this);
-
+
ui->lblAbout->setText(ui->lblAbout->text().arg(qApp->applicationVersion()));
-
+#ifdef UNIX
@@ -12,13 +11,12 @@ index d77774b..fbf6ab4 100644
+#else
QFile file(qApp->applicationDirPath() + "/LICENSE");
+#endif
-
+
if (file.open(QIODevice::ReadOnly)) {
ui->txtLicense->setPlainText(file.readAll());
-diff --git a/src/frmmain.cpp b/src/frmmain.cpp
-index 48fee72..02f306c 100644
---- a/src/frmmain.cpp
-+++ b/src/frmmain.cpp
+diff -up Candle-1.2b/src/frmmain.cpp.1~ Candle-1.2b/src/frmmain.cpp
+--- Candle-1.2b/src/frmmain.cpp.1~ 2020-09-11 15:35:23.588906195 +0200
++++ Candle-1.2b/src/frmmain.cpp 2020-09-11 17:36:15.772805181 +0200
@@ -32,6 +32,8 @@
#include <QAction>
#include <QLayout>
@@ -27,26 +25,25 @@ index 48fee72..02f306c 100644
+
#include "frmmain.h"
#include "ui_frmmain.h"
-
-@@ -85,7 +87,11 @@ frmMain::frmMain(QWidget *parent) :
- << "black";
-
+ #include "ui_frmsettings.h"
+@@ -116,7 +118,11 @@ frmMain::frmMain(QWidget *parent) :
+ m_spindleCommandSpeed = false;
+
// Loading settings
+#ifdef UNIX
-+ m_settingsFileName = QStandardPaths::writableLocation(QStandardPaths::ConfigLocation)+ "/candle/" + "/settings.ini";
++ m_settingsFileName = QStandardPaths::writableLocation(QStandardPaths::ConfigLocation) + "/candle/settings.ini";
+#else
m_settingsFileName = qApp->applicationDirPath() + "/settings.ini";
+#endif
preloadSettings();
-
+
m_settings = new frmSettings(this);
-diff --git a/src/main.cpp b/src/main.cpp
-index aeed2e0..6e1e21a 100644
---- a/src/main.cpp
-+++ b/src/main.cpp
+diff -up Candle-1.2b/src/main.cpp.1~ Candle-1.2b/src/main.cpp
+--- Candle-1.2b/src/main.cpp.1~ 2019-10-30 16:40:25.000000000 +0100
++++ Candle-1.2b/src/main.cpp 2020-09-11 15:35:23.588906195 +0200
@@ -44,7 +44,11 @@ int main(int argc, char *argv[])
// QLocale::setDefault(QLocale("es"));
-
+
QString loc = QLocale().name().left(2);
+#ifdef UNIX
+ QString translationsFolder = "/usr/share/" + qApp->applicationDisplayName() + "/translations/";
@@ -54,5 +51,5 @@ index aeed2e0..6e1e21a 100644
QString translationsFolder = qApp->applicationDirPath() + "/translations/";
+#endif
QString translationFileName = translationsFolder + qApp->applicationDisplayName() + "_" + loc + ".qm";
-
+
qDebug() << "locale:" << loc;