diff options
| author | Antoine Brodin <antoine@FreeBSD.org> | 2014-07-25 09:25:40 +0000 |
|---|---|---|
| committer | Antoine Brodin <antoine@FreeBSD.org> | 2014-07-25 09:25:40 +0000 |
| commit | 9df908061893fb86f5d149cbb6216d40ffaaa62c (patch) | |
| tree | 8f8d022938746991fceb896e920656aa147f7fb8 | |
| parent | e7b79c64b175d78e4922cedd9e5eb0d2ad55a401 (diff) | |
| download | ports-9df908061893fb86f5d149cbb6216d40ffaaa62c.tar.gz ports-9df908061893fb86f5d149cbb6216d40ffaaa62c.zip | |
MFH: r362800
- Fix build with clang
Reported by: pkg-fallout
Approved by: portmgr (self)
Notes
Notes:
svn path=/branches/2014Q3/; revision=362877
| -rw-r--r-- | editors/gobby/Makefile | 5 | ||||
| -rw-r--r-- | editors/gobby/files/patch-inc__config.hpp | 38 | ||||
| -rw-r--r-- | editors/gobby/files/patch-inc__preferencesdialog.hpp | 11 |
3 files changed, 52 insertions, 2 deletions
diff --git a/editors/gobby/Makefile b/editors/gobby/Makefile index e85445f4320c..bb133607ce95 100644 --- a/editors/gobby/Makefile +++ b/editors/gobby/Makefile @@ -2,6 +2,7 @@ PORTNAME= gobby PORTVERSION= 0.4.13 +PORTREVISION= 1 CATEGORIES= editors MASTER_SITES= http://releases.0x539.de/gobby/ \ LOCAL/${MAINTAINER:C/([^@]*)@.*/\1/} @@ -19,8 +20,8 @@ LIB_DEPENDS= libobby.so:${PORTSDIR}/devel/obby \ OPTIONS_DEFINE= GTKSPELL NLS GTKSPELL_DESC= Enable GtkSpell support -USE_GNOME= gnomehack gtksourceview2 intltool -USES= gmake pkgconfig +USE_GNOME= gtksourceview2 intltool +USES= gmake pkgconfig pathfix GNU_CONFIGURE= yes INSTALLS_ICONS= yes diff --git a/editors/gobby/files/patch-inc__config.hpp b/editors/gobby/files/patch-inc__config.hpp new file mode 100644 index 000000000000..0c999edc14ac --- /dev/null +++ b/editors/gobby/files/patch-inc__config.hpp @@ -0,0 +1,38 @@ +--- ./inc/config.hpp.orig 2012-01-30 01:27:51.000000000 +0100 ++++ ./inc/config.hpp 2014-07-24 13:11:27.000000000 +0200 +@@ -31,6 +31,19 @@ + #include <libxml++/nodes/element.h> + #include <libxml++/nodes/textnode.h> + ++ ++namespace serialise ++{ ++template<> ++class default_context_to<Glib::ustring>: public context_base_to<Glib::ustring> ++{ ++public: ++ typedef Glib::ustring data_type; ++ ++ virtual std::string to_string(const data_type& from) const; ++}; ++} ++ + namespace Gobby + { + +@@ -460,15 +473,6 @@ + }; + + template<> +-class default_context_to<Glib::ustring>: public context_base_to<Glib::ustring> +-{ +-public: +- typedef Glib::ustring data_type; +- +- virtual std::string to_string(const data_type& from) const; +-}; +- +-template<> + class default_context_from<Glib::ustring>: + public context_base_from<Glib::ustring> + { diff --git a/editors/gobby/files/patch-inc__preferencesdialog.hpp b/editors/gobby/files/patch-inc__preferencesdialog.hpp new file mode 100644 index 000000000000..6cdaa6680e47 --- /dev/null +++ b/editors/gobby/files/patch-inc__preferencesdialog.hpp @@ -0,0 +1,11 @@ +--- ./inc/preferencesdialog.hpp.orig 2012-01-30 01:27:51.000000000 +0100 ++++ ./inc/preferencesdialog.hpp 2014-07-24 13:12:17.000000000 +0200 +@@ -198,7 +198,7 @@ + protected: + struct LangCompare + { +- bool operator()(GtkSourceLanguage* first, GtkSourceLanguage* second) ++ bool operator()(const GtkSourceLanguage* first, const GtkSourceLanguage* second) const + { + return first < second; + } |