orion pushed to irrlicht (epel7). "fix issue where libIrrXML had undefined symbol for LOCALE_DECIMAL_POINTS"

[notifications at fedoraproject.org]

>From 502388b683797d539d9a4e66fe6cf7619a0f3a75 Mon Sep 17 00:00:00 2001
From: Tom Callaway <spot at fedoraproject.org>
Date: Wed, 19 Dec 2012 15:29:18 -0500
Subject: fix issue where libIrrXML had undefined symbol for
 LOCALE_DECIMAL_POINTS


diff --git a/irrlicht-1.8-fix-locale-decimal-points.patch b/irrlicht-1.8-fix-locale-decimal-points.patch
new file mode 100644
index 0000000..1085077
--- /dev/null
+++ b/irrlicht-1.8-fix-locale-decimal-points.patch
@@ -0,0 +1,27 @@
+diff -up irrlicht-1.8/include/fast_atof.h.fix-locale-decimal-points irrlicht-1.8/include/fast_atof.h
+diff -up irrlicht-1.8/source/Irrlicht/Irrlicht.cpp.fix-locale-decimal-points irrlicht-1.8/source/Irrlicht/Irrlicht.cpp
+--- irrlicht-1.8/source/Irrlicht/Irrlicht.cpp.fix-locale-decimal-points	2012-11-03 18:08:00.000000000 -0400
++++ irrlicht-1.8/source/Irrlicht/Irrlicht.cpp	2012-12-19 15:10:33.242427216 -0500
+@@ -116,7 +116,7 @@ namespace irr
+ namespace core
+ {
+ 	const matrix4 IdentityMatrix(matrix4::EM4CONST_IDENTITY);
+-	irr::core::stringc LOCALE_DECIMAL_POINTS(".");
++	// irr::core::stringc LOCALE_DECIMAL_POINTS(".");
+ }
+ 
+ namespace video
+diff -up irrlicht-1.8/source/Irrlicht/irrXML.cpp.fix-locale-decimal-points irrlicht-1.8/source/Irrlicht/irrXML.cpp
+--- irrlicht-1.8/source/Irrlicht/irrXML.cpp.fix-locale-decimal-points	2012-12-19 15:11:36.592488302 -0500
++++ irrlicht-1.8/source/Irrlicht/irrXML.cpp	2012-12-19 15:12:03.084513847 -0500
+@@ -10,6 +10,10 @@
+ 
+ namespace irr
+ {
++namespace core
++{
++	irr::core::stringc LOCALE_DECIMAL_POINTS(".");
++}
+ namespace io
+ {
+ 
diff --git a/irrlicht.spec b/irrlicht.spec
index ba54c81..f134110 100644
--- a/irrlicht.spec
+++ b/irrlicht.spec
@@ -1,6 +1,6 @@
 %global irrxml_version 1.8
 %global irrlicht_version 1.8
-%global master_release 1
+%global master_release 2
 
 Name:		irrlicht
 Summary: 	A high performance realtime 3D engine
@@ -21,6 +21,8 @@ Patch2:		irrlicht18-libaesgm.patch
 # Patch3:	irrlicht18-fastatof-improvements-typefixes.patch
 # Make libIrrXML.so
 Patch4:		irrlicht-1.8-irrXML-shared-library.patch
+# Fix issue with definition of LOCALE_DECIMAL_POINTS
+Patch5:		irrlicht-1.8-fix-locale-decimal-points.patch
 
 URL:		http://irrlicht.sourceforge.net/
 BuildRequires:	libXxf86vm-devel, mesa-libGL-devel, mesa-libGLU-devel
@@ -77,6 +79,7 @@ Development headers and libraries for irrXML.
 %patch2 -p1 -b .libaesgm
 # %patch3 -p1 -b .fastatof
 %patch4 -p1 -b .irrXML
+%patch5 -p1 -b .fix-locale-decimal-points
 
 sed -i 's/\r//' readme.txt
 iconv -o readme.txt.iso88591 -f iso88591 -t utf8 readme.txt
@@ -140,6 +143,9 @@ popd
 %{_libdir}/libIrrXML.so
 
 %changelog
+* Wed Dec 19 2012 Tom Callaway <spot at fedoraproject.org> - 1.8-2
+- fix issue with LOCALE_DECIMAL_POINTS
+
 * Tue Nov 13 2012 Tom Callaway <spot at fedoraproject.org> - 1.8-1
 - update to 1.8 final
 
-- 
cgit v0.10.2


	http://pkgs.fedoraproject.org/cgit/irrlicht.git/commit/?h=epel7&id=502388b683797d539d9a4e66fe6cf7619a0f3a75