[Libreoffice-commits] core.git: external/glm external/mysqlcppconn

[Andrea Gelmini]

 external/glm/Wshadow-unix.patch           |    4 ++--
 external/glm/Wshadow-windows.patch        |    4 ++--
 external/mysqlcppconn/patches/cmake.patch |    2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

New commits:
commit 702d14d954d5dcb88e70cfad8517118f9614c987
Author: Andrea Gelmini <andrea.gelmini at gelma.net>
Date:   Sat Nov 15 00:54:01 2014 +0100

    Partial revert of da40cac540e7d735edbe9069b3c8ec6af4530208
    
    As requested from Michael Stahl here:
    https://gerrit.libreoffice.org/#/c/12164/
    
    Change-Id: Ie00bc789c1dfa3f0049c8915e0deeac7fab6e0fd
    Reviewed-on: https://gerrit.libreoffice.org/12432
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>
    Tested-by: Caolán McNamara <caolanm at redhat.com>

diff --git a/external/glm/Wshadow-unix.patch b/external/glm/Wshadow-unix.patch
index 47a34a7..be4af10 100644
--- a/external/glm/Wshadow-unix.patch
+++ b/external/glm/Wshadow-unix.patch
@@ -52,9 +52,9 @@ diff -ur glm.org/glm/core/type_vec1.hpp glm/glm/core/type_vec1.hpp
 +		GLM_FUNC_DECL tvec1(tref1<T> const & r_);
  
  		//////////////////////////////////////
- 		// Conversion scalar constructors
+ 		// Convertion scalar constructors
  
- 		//! Explicit conversions (From section 5.4.1 Conversion and scalar constructors of GLSL 1.30.08 specification)
+ 		//! Explicit converions (From section 5.4.1 Conversion and scalar constructors of GLSL 1.30.08 specification)
  		template <typename U> 
 -		GLM_FUNC_DECL explicit tvec1(U const & s);
 +		GLM_FUNC_DECL explicit tvec1(U const & s_);
diff --git a/external/glm/Wshadow-windows.patch b/external/glm/Wshadow-windows.patch
index fa8c284..c6c9c65 100644
--- a/external/glm/Wshadow-windows.patch
+++ b/external/glm/Wshadow-windows.patch
@@ -52,7 +52,7 @@ diff -ur glm.org/glm/core/type_vec1.hpp glm/glm/core/type_vec1.hpp
 +		GLM_FUNC_DECL tvec1(tref1<T> const & r_);
  
  		//////////////////////////////////////
- 		// Conversion scalar constructors
+ 		// Convertion scalar constructors
  
  		//! Explicit converions (From section 5.4.1 Conversion and scalar constructors of GLSL 1.30.08 specification)
  		template <typename U> 
@@ -60,7 +60,7 @@ diff -ur glm.org/glm/core/type_vec1.hpp glm/glm/core/type_vec1.hpp
 +		GLM_FUNC_DECL explicit tvec1(U const & s_);
  
  		//////////////////////////////////////
- 		// Conversion vector constructors
+ 		// Convertion vector constructors
 @@ -121,19 +121,19 @@
  		GLM_FUNC_DECL tvec1<T> & operator= (tvec1<U> const & v);
  
diff --git a/external/mysqlcppconn/patches/cmake.patch b/external/mysqlcppconn/patches/cmake.patch
index a856c21..79fe064 100644
--- a/external/mysqlcppconn/patches/cmake.patch
+++ b/external/mysqlcppconn/patches/cmake.patch
@@ -127,7 +127,7 @@ diff --recursive -u UnpackedTarball/mysqlcppconn.origin/CMakeLists.txt UnpackedT
 -	ENDIF(STLPORT_INCLUDE_DIR)
 -
 -        # We want to set the inclusion of the library globally
--        ADD_DEFINITIONS(-library=stlport4) # Not a macro definition, but CMake manual says I can!! ;)
+-        ADD_DEFINITIONS(-library=stlport4) # Not a macro defintion, but CMake manual says I can!! ;)
 -        SET(CMAKE_EXE_LINKER_FLAGS        "${CMAKE_EXE_LINKER_FLAGS} -library=stlport4")
 -        SET(CMAKE_SHARED_LINKER_FLAGS     "${CMAKE_SHARED_LINKER_FLAGS} -library=stlport4")
 -        SET(CMAKE_MODULE_LINKER_FLAGS     "${CMAKE_MODULE_LINKER_FLAGS} -library=stlport4")