Commit d0f71375 authored by Michael Banck's avatar Michael Banck

* debian/patches/31_reset_local_for_shaders.dpatch: New patch, set locale to

    "C" before making shaders and reset it afterwards.
  * debian/patches/32_stdio_includes.dpatch: New patch, add missing includes
    for <stdio.h>.
parent 7a2f9c17
......@@ -2,6 +2,12 @@ qutemol (0.4.1~cvs20081111-1) unstable; urgency=low
* First Debian version, package now maintained in debichem.
[ Michael Banck ]
* debian/patches/31_reset_local_for_shaders.dpatch: New patch, set locale to
"C" before making shaders and reset it afterwards.
* debian/patches/32_stdio_includes.dpatch: New patch, add missing includes
for <stdio.h>.
-- Morten Kjeldgaard <mok0@ubuntu.com> Sun, 16 Nov 2008 13:29:04 +0100
qutemol (0.4.1~cvs20081111-0ubuntu1~ppa1) intrepid; urgency=low
......
......@@ -28,3 +28,5 @@
28_mol.cpp.dpatch
29_mol.h.dpatch
30_matrix33.h.dpatch
31_reset_local_for_shaders.dpatch
32_stdio_includes.dpatch
#! /bin/sh /usr/share/dpatch/dpatch-run
## 31_reset_local_for_shaders.dpatch by Michael Banck <mbanck@debian.org>
##
## All lines beginning with `## DP:' are a description of the patch.
## DP: Set locale to "C" before making shaders and reset it afterwards.
@DPATCH@
--- ./src/Common.cpp.orig 2011-09-12 17:07:36.000000000 +0200
+++ ./src/Common.cpp 2011-09-12 17:08:49.000000000 +0200
@@ -4,6 +4,8 @@
#include <GL/glew.h>
#include "CgUtil.h"
+#include <locale.h>
+
//#include <GL/gl.h>
#include <math.h>
//#include <GL/glu.h>
@@ -859,7 +861,13 @@
void drawFrame() {
+ char* locale;
+ locale = setlocale(LC_ALL,NULL);
+ setlocale(LC_ALL,"C");
+
cgSettings.MakeShaders();
+
+ setlocale(LC_ALL,locale);
if (mol.DoingAO()) {
// do at least one more step per rendering
#! /bin/sh /usr/share/dpatch/dpatch-run
## 32_stdio_includes.dpatch by Michael Banck <mbanck@debian.org>
##
## All lines beginning with `## DP:' are a description of the patch.
## DP: Add missing includes for <stdio.h>
@DPATCH@
diff --exclude debian -Naur qutemol/src/AO.cpp qutemol-0.4.1~cvs20081111//src/AO.cpp
--- qutemol/src/AO.cpp 2011-09-12 17:17:17.000000000 +0200
+++ qutemol-0.4.1~cvs20081111//src/AO.cpp 2011-09-12 15:31:42.000000000 +0200
@@ -2,6 +2,7 @@
typedef unsigned char Byte;
#include <math.h>
+#include <stdio.h>
#include <vector>
#include <vcg/space/point3.h>
diff --exclude debian -Naur qutemol/src/AtomColor.cpp qutemol-0.4.1~cvs20081111//src/AtomColor.cpp
--- qutemol/src/AtomColor.cpp 2011-09-12 17:17:17.000000000 +0200
+++ qutemol-0.4.1~cvs20081111//src/AtomColor.cpp 2011-09-12 15:32:27.000000000 +0200
@@ -1,3 +1,5 @@
+#include <stdio.h>
+
#include <map>
#include <string>
using namespace std;
diff --exclude debian -Naur qutemol/src/Mol.cpp qutemol-0.4.1~cvs20081111//src/Mol.cpp
--- qutemol/src/Mol.cpp 2011-09-12 17:17:17.000000000 +0200
+++ qutemol-0.4.1~cvs20081111//src/Mol.cpp 2011-09-12 15:32:57.000000000 +0200
@@ -3,6 +3,7 @@
typedef unsigned char Byte;
#include <string.h>
+#include <stdio.h>
#include <vector>
#include <string>
#include <algorithm>
diff --exclude debian -Naur qutemol/src/ShadowMap.cpp qutemol-0.4.1~cvs20081111//src/ShadowMap.cpp
--- qutemol/src/ShadowMap.cpp 2011-09-12 17:17:17.000000000 +0200
+++ qutemol-0.4.1~cvs20081111//src/ShadowMap.cpp 2011-09-12 15:33:44.000000000 +0200
@@ -3,6 +3,8 @@
typedef unsigned char Byte;
typedef unsigned int uint;
+#include <stdio.h>
+
#include <GL/glew.h>
#include "CgUtil.h"
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment