aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--devel/clanlib1/Makefile2
-rw-r--r--devel/clanlib1/files/patch-Sources_Core_IOData_Generic_datafile__inputprovider.h12
-rw-r--r--devel/clanlib1/files/patch-Sources_GUI_inputbox__generic.cpp11
3 files changed, 25 insertions, 0 deletions
diff --git a/devel/clanlib1/Makefile b/devel/clanlib1/Makefile
index e7a13e730cf1..e984e612ff59 100644
--- a/devel/clanlib1/Makefile
+++ b/devel/clanlib1/Makefile
@@ -27,6 +27,8 @@ USE_LDCONFIG= yes
USE_SDL= gfx
USE_GL= gl glu
+CXXFLAGS+= -Wno-c++11-narrowing
+
GNU_CONFIGURE= yes
CONFIGURE_ARGS= --disable-docs \
--enable-clanDisplay \
diff --git a/devel/clanlib1/files/patch-Sources_Core_IOData_Generic_datafile__inputprovider.h b/devel/clanlib1/files/patch-Sources_Core_IOData_Generic_datafile__inputprovider.h
new file mode 100644
index 000000000000..d1365fdd18b6
--- /dev/null
+++ b/devel/clanlib1/files/patch-Sources_Core_IOData_Generic_datafile__inputprovider.h
@@ -0,0 +1,12 @@
+--- Sources/Core/IOData/Generic/datafile_inputprovider.h.orig 2006-10-27 01:55:01 UTC
++++ Sources/Core/IOData/Generic/datafile_inputprovider.h
+@@ -144,7 +144,7 @@ protected:
+ cache.insert(
+- std::make_pair<std::string const, std::pair<int, int> >(
++ std::make_pair(
+ resource_id,
+- std::make_pair<int,int>(data_pos, data_size)));
++ std::make_pair(data_pos, data_size)));
+ }
+
+ private:
diff --git a/devel/clanlib1/files/patch-Sources_GUI_inputbox__generic.cpp b/devel/clanlib1/files/patch-Sources_GUI_inputbox__generic.cpp
new file mode 100644
index 000000000000..889dcddc50c4
--- /dev/null
+++ b/devel/clanlib1/files/patch-Sources_GUI_inputbox__generic.cpp
@@ -0,0 +1,11 @@
+--- Sources/GUI/inputbox_generic.cpp.orig 2008-04-18 11:16:05 UTC
++++ Sources/GUI/inputbox_generic.cpp
+@@ -84,7 +84,7 @@ int CL_InputUndo::doUndo( std::string &
+
+ int CL_InputUndo::doRedo( std::string & text )
+ {
+- if (!canRedo()) return NULL;
++ if (!canRedo()) return 0;
+
+ OneUndo const & u = undo_array[cur_pos];
+