diff options
author | Adriaan de Groot <adridg@FreeBSD.org> | 2018-09-03 19:10:43 +0000 |
---|---|---|
committer | Adriaan de Groot <adridg@FreeBSD.org> | 2018-09-03 19:10:43 +0000 |
commit | 0536ebab0c1e8cf30d7460610ae945a3ffab1474 (patch) | |
tree | cc0b3414bea8d948d372f0b3f29bd770c76e2dcc | |
parent | df4defb79e52c1dabf5565c7a821081f879fea38 (diff) |
Fix build of deskutils/charmtimetracker with clang7. The patches contain
an explanation of the error (but I don't know why clang7 complains like
this or why writing out what looks like a default constructor to me
gets it to be quiet).
No PORTREVISION because it doesn't make a difference on any platform
that already built successfully.
Notes
Notes:
svn path=/head/; revision=478913
-rw-r--r-- | deskutils/charmtimetracker/files/patch-Charm_Lotsofcake_Configuration.cpp | 18 | ||||
-rw-r--r-- | deskutils/charmtimetracker/files/patch-Charm_Lotsofcake_Configuration.h | 16 |
2 files changed, 34 insertions, 0 deletions
diff --git a/deskutils/charmtimetracker/files/patch-Charm_Lotsofcake_Configuration.cpp b/deskutils/charmtimetracker/files/patch-Charm_Lotsofcake_Configuration.cpp new file mode 100644 index 000000000000..90b7eee273d6 --- /dev/null +++ b/deskutils/charmtimetracker/files/patch-Charm_Lotsofcake_Configuration.cpp @@ -0,0 +1,18 @@ +Fix build with clang7: + + WeeklyTimesheet.cpp:287:37: error: default initialization of an object of const type 'const Lotsofcake::Configuration' requires a user-provided default constructor + const Lotsofcake::Configuration configuration; + +--- Charm/Lotsofcake/Configuration.cpp.orig 2018-09-03 18:53:25 UTC ++++ Charm/Lotsofcake/Configuration.cpp +@@ -43,6 +43,10 @@ static void setValueIfNotNull(QSettings + } + } + ++Lotsofcake::Configuration::Configuration() ++{ ++} ++ + bool Lotsofcake::Configuration::isConfigured() const + { + return !username().isEmpty(); diff --git a/deskutils/charmtimetracker/files/patch-Charm_Lotsofcake_Configuration.h b/deskutils/charmtimetracker/files/patch-Charm_Lotsofcake_Configuration.h new file mode 100644 index 000000000000..2c0563c76498 --- /dev/null +++ b/deskutils/charmtimetracker/files/patch-Charm_Lotsofcake_Configuration.h @@ -0,0 +1,16 @@ +Fix build with clang7: + + WeeklyTimesheet.cpp:287:37: error: default initialization of an object of const type 'const Lotsofcake::Configuration' requires a user-provided default constructor + const Lotsofcake::Configuration configuration; + +--- Charm/Lotsofcake/Configuration.h.orig 2018-09-03 18:53:17 UTC ++++ Charm/Lotsofcake/Configuration.h +@@ -36,6 +36,8 @@ namespace Lotsofcake { + class Configuration + { + public: ++ Configuration(); ++ + bool isConfigured() const; + + void importFromTaskExport(const TaskExport &exporter); |