[Libreoffice-commits] core.git: external/libgltf

[Zolnai Tamás]

 external/libgltf/UnpackedTarball_libgltf.mk |    1 +
 external/libgltf/patches/avoid_c++11.patch  |   12 ++++++++++++
 2 files changed, 13 insertions(+)

New commits:
commit 17f082fe00983c3ef1a5f71611c9278cb16dab20
Author: Zolnai Tamás <tamas.zolnai at collabora.com>
Date:   Fri Apr 18 13:53:19 2014 +0200

    Avoid C++11 solutions from libgltf code
    
    Change-Id: I097798a52157fc688ae520a7f3a0dda84000e20b

diff --git a/external/libgltf/UnpackedTarball_libgltf.mk b/external/libgltf/UnpackedTarball_libgltf.mk
index 44496d1..1fbe09d 100644
--- a/external/libgltf/UnpackedTarball_libgltf.mk
+++ b/external/libgltf/UnpackedTarball_libgltf.mk
@@ -23,6 +23,7 @@ $(eval $(call gb_UnpackedTarball_add_patches,libgltf,\
 	external/libgltf/patches/unneeded_context_handling.patch \
 	external/libgltf/patches/include_typo_texture.patch \
 	external/libgltf/patches/adress_of_temporary.patch \
+	external/libgltf/patches/avoid_c++11.patch \
 ))
 
 # vim: set noet sw=4 ts=4:
diff --git a/external/libgltf/patches/avoid_c++11.patch b/external/libgltf/patches/avoid_c++11.patch
new file mode 100644
index 0000000..827e4f5
--- /dev/null
+++ b/external/libgltf/patches/avoid_c++11.patch
@@ -0,0 +1,12 @@
+diff -ur libgltf.org/src/Shaders.cpp libgltf/src/Shaders.cpp
+--- libgltf.org/src/Shaders.cpp	2014-04-18 13:47:18.006783834 +0200
++++ libgltf/src/Shaders.cpp	2014-04-18 13:49:20.175779328 +0200
+@@ -219,7 +219,7 @@
+ 
+ bool ShaderProgram::readShaderFile(const std::string& fileName, std::string& value)
+ {
+-	std::ifstream shaderStream(fileName, std::ios::in);
++	std::ifstream shaderStream(fileName.c_str(), std::ios::in);
+ 	if (!shaderStream.is_open())
+ 	{
+ 		return false;