[slic3r] Add back the patch that sets the English locale by environment variable

Miro Hrončok churchyard at fedoraproject.org
Mon Jun 30 11:04:40 UTC 2014


commit 51e3e002fd1860a0d9d4fa65281e84570b6eeabb
Author: Miro Hrončok <miro at hroncok.cz>
Date:   Mon Jun 30 13:04:04 2014 +0200

    Add back the patch that sets the English locale by environment variable

 slic3r-english-locale.patch |   12 ++++++++++++
 slic3r.spec                 |    8 +++++---
 2 files changed, 17 insertions(+), 3 deletions(-)
---
diff --git a/slic3r-english-locale.patch b/slic3r-english-locale.patch
new file mode 100644
index 0000000..d01a79a
--- /dev/null
+++ b/slic3r-english-locale.patch
@@ -0,0 +1,12 @@
+diff --git a/slic3r.pl b/slic3r.pl
+index a533250..814d8b7 100755
+--- a/slic3r.pl
++++ b/slic3r.pl
+@@ -11,6 +11,7 @@ BEGIN {
+ use Getopt::Long qw(:config no_auto_abbrev);
+ use List::Util qw(first);
+ use POSIX qw(setlocale LC_NUMERIC);
++$ENV{LC_NUMERIC} = 'en_US.UTF-8';
+ use Slic3r;
+ use Time::HiRes qw(gettimeofday tv_interval);
+ $|++;
diff --git a/slic3r.spec b/slic3r.spec
index 51bbb63..de0d639 100644
--- a/slic3r.spec
+++ b/slic3r.spec
@@ -18,11 +18,12 @@ Patch0:         %{name}-buildpl.patch
 # Use /usr/share/slic3r as datadir
 # Those two are located at the same place at the code, so the patch is merged
 Patch1:         %{name}-nowarn-datadir.patch
-Patch2:         %{name}-linker.patch
+Patch2:         %{name}-english-locale.patch
+Patch3:         %{name}-linker.patch
 
 %if %with_clipper
 # Unbundle clipper
-Patch3:         %{name}-clipper.patch
+Patch4:         %{name}-clipper.patch
 %endif
 
 Source1:        %{name}.desktop
@@ -83,9 +84,10 @@ for more information.
 %patch0 -p1
 %patch1 -p1
 %patch2 -p1
+%patch3 -p1
 
 %if %with_clipper
-%patch3 -p1
+%patch4 -p1
 # Remove bundled clipper
 rm xs/src/clipper.*pp
 %endif


More information about the scm-commits mailing list