diff options
| author | Matteo Bernardini <ponce@slackbuilds.org> | 2017-06-19 23:05:50 +0200 |
|---|---|---|
| committer | Robby Workman <rworkman@slackbuilds.org> | 2021-04-18 00:10:48 -0500 |
| commit | 2e53631cbfc8d37bdcab4bae548964aef81789de (patch) | |
| tree | dd309afd24c69a8421575b186f93cdc17fc27180 /misc/zinnia | |
| parent | 5f0d977fa31cb96eeee3f2ed3e917fbc9090fe29 (diff) | |
misc/zinnia: Added a patch for gcc >= 6.x.
Signed-off-by: Matteo Bernardini <ponce@slackbuilds.org>
Diffstat (limited to 'misc/zinnia')
| -rw-r--r-- | misc/zinnia/zinnia-fixes-gcc6-compile.patch | 22 | ||||
| -rw-r--r-- | misc/zinnia/zinnia.SlackBuild | 3 |
2 files changed, 25 insertions, 0 deletions
diff --git a/misc/zinnia/zinnia-fixes-gcc6-compile.patch b/misc/zinnia/zinnia-fixes-gcc6-compile.patch new file mode 100644 index 000000000000..848f306edb1c --- /dev/null +++ b/misc/zinnia/zinnia-fixes-gcc6-compile.patch @@ -0,0 +1,22 @@ +Index: zinnia-0.06/trainer.cpp +=================================================================== +--- zinnia-0.06.orig/trainer.cpp ++++ zinnia-0.06/trainer.cpp +@@ -93,7 +93,7 @@ class TrainerImpl: public Trainer { + + public: + bool add(const Character &character) { +- const std::string y = character.value(); ++ std::string y = character.value(); + CHECK_FALSE(!y.empty()) << "input character is empty"; + Features features; + CHECK_FALSE(features.read(character)) << "cannot read character: " << y; +@@ -103,7 +103,7 @@ class TrainerImpl: public Trainer { + if (!fn) { + return false; + } +- x_.push_back(std::make_pair<std::string, FeatureNode *>(y, fn)); ++ x_.push_back(std::make_pair(y, fn)); + return true; + } + diff --git a/misc/zinnia/zinnia.SlackBuild b/misc/zinnia/zinnia.SlackBuild index efd04acd512c..62b3c033e4db 100644 --- a/misc/zinnia/zinnia.SlackBuild +++ b/misc/zinnia/zinnia.SlackBuild @@ -70,6 +70,9 @@ find -L . \ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \ -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \; +# Thanks to fedora for this patch +patch -p1 < $CWD/zinnia-fixes-gcc6-compile.patch + CFLAGS="$SLKCFLAGS" \ CXXFLAGS="$SLKCFLAGS" \ ./configure \ |