diff options
author | Matteo Bernardini | 2018-07-14 08:59:53 +0200 |
---|---|---|
committer | Matteo Bernardini | 2018-07-14 08:59:53 +0200 |
commit | 2194bf7de6fa57724c0f8757fa60de9c573ce71e (patch) | |
tree | 2674f18e6d9d562d590839970e47269f5c16c877 /academic/gelemental | |
parent | d1e56f2b54fe666905a90fd592495606a4ae9abe (diff) | |
download | slackbuilds-current-20180714.1.tar.gz |
20180714.1 global branch merge.current-20180714.1
Signed-off-by: Matteo Bernardini <ponce@slackbuilds.org>
Diffstat (limited to 'academic/gelemental')
-rw-r--r-- | academic/gelemental/gcc.patch | 12 | ||||
-rw-r--r-- | academic/gelemental/gelemental.SlackBuild | 3 |
2 files changed, 15 insertions, 0 deletions
diff --git a/academic/gelemental/gcc.patch b/academic/gelemental/gcc.patch new file mode 100644 index 0000000000..eeb16293d9 --- /dev/null +++ b/academic/gelemental/gcc.patch @@ -0,0 +1,12 @@ +diff -Naur gelemental-1.2.0.orig/src/dialogs.cc gelemental-1.2.0/src/dialogs.cc +--- gelemental-1.2.0.orig/src/dialogs.cc 2007-09-25 06:49:33.000000000 +0200 ++++ gelemental-1.2.0/src/dialogs.cc 2017-07-27 21:45:34.356776770 +0200 +@@ -247,7 +247,7 @@ + const Gtk::TreePath& tpath, bool) + { + Gtk::TreeIter iter = store->get_iter (tpath); +- return iter ? iter->get_value (cols.property) : false; ++ return iter ? static_cast<bool>(iter->get_value (cols.property)) : false; + } + + diff --git a/academic/gelemental/gelemental.SlackBuild b/academic/gelemental/gelemental.SlackBuild index 22beaf7d9c..f8a08e984d 100644 --- a/academic/gelemental/gelemental.SlackBuild +++ b/academic/gelemental/gelemental.SlackBuild @@ -84,6 +84,9 @@ sed -i "s:set_size_request (50, 50):set_size_request (64, 64):" src/buttons.cc # include glib.h instead of individual headers. patch -p1 -i $CWD/glib-single-include.patch +# Fix for the newer gcc +patch -p1 -i $CWD/gcc.patch + CFLAGS="$SLKCFLAGS" \ CXXFLAGS="$SLKCFLAGS -std=c++11" \ ./configure \ |