diff options
| author |   Matteo Bernardini | 2020-06-20 11:01:26 +0200 |
|---|---|---|
| committer | Matteo Bernardini | 2020-06-20 11:01:26 +0200 |
| commit | 4763c5f8092b9a9edb2471bd83ae5d6935056245 (patch) | |
| tree | 704bea10c1fd69bf1b603c44f81d0d1b4df89019 /misc/zinnia | |
| parent | 98dec0c0253801e4775e1c705f391e477db1a7e5 (diff) | |
| download | slackbuilds-4763c5f8092b9a9edb2471bd83ae5d6935056245.tar.gz | |
20200620.1 global branch merge.current-20200620.1
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 0000000000..848f306edb --- /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 efd04acd51..62b3c033e4 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 \ |