summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSamuli Suominen <ssuominen@gentoo.org>2009-08-08 08:44:25 +0000
committerSamuli Suominen <ssuominen@gentoo.org>2009-08-08 08:44:25 +0000
commit3c105ad2498b11a8ea0b15fe290dc78f09f1b20c (patch)
tree9b4748e4ee7ee9c5b9d17da0ff7989c073216511 /sci-chemistry/gchemutils/files
parentVersion bump (diff)
downloadgentoo-2-3c105ad2498b11a8ea0b15fe290dc78f09f1b20c.tar.gz
gentoo-2-3c105ad2498b11a8ea0b15fe290dc78f09f1b20c.tar.bz2
gentoo-2-3c105ad2498b11a8ea0b15fe290dc78f09f1b20c.zip
Remove invalid USE debug inherited with gnome2.eclass. Disable mozilla plug-in because it needs =xulrunner-1.8* wrt #280049. Fix building with GLIBC 2.10+ wrt #276298. Port from built_with_use to EAPI=2 USE deps. Fix missing deps intltool and rarian.
(Portage version: 2.2_rc36/cvs/Linux x86_64)
Diffstat (limited to 'sci-chemistry/gchemutils/files')
-rw-r--r--sci-chemistry/gchemutils/files/gchemutils-0.10.3-glibc-2.10.patch37
1 files changed, 37 insertions, 0 deletions
diff --git a/sci-chemistry/gchemutils/files/gchemutils-0.10.3-glibc-2.10.patch b/sci-chemistry/gchemutils/files/gchemutils-0.10.3-glibc-2.10.patch
new file mode 100644
index 000000000000..45cf973810cd
--- /dev/null
+++ b/sci-chemistry/gchemutils/files/gchemutils-0.10.3-glibc-2.10.patch
@@ -0,0 +1,37 @@
+diff -ur gnome-chemistry-utils-0.10.3.orig/libs/gcu/element.cc gnome-chemistry-utils-0.10.3/libs/gcu/element.cc
+--- gnome-chemistry-utils-0.10.3.orig/libs/gcu/element.cc 2009-01-05 21:09:59.000000000 +0200
++++ gnome-chemistry-utils-0.10.3/libs/gcu/element.cc 2009-08-08 11:30:16.000000000 +0300
+@@ -44,8 +44,8 @@
+
+ static void ReadValue (char const *source, GcuValue &value)
+ {
+- char *buf, *dot;
+- value.value = strtod (source, &buf);
++ const char *buf, *dot;
++ value.value = strtod (source, const_cast <char**> (&buf));
+ dot = strchr (source, '.');
+ value.prec = (dot)? buf - dot - 1: 0;
+ value.delta = (*buf == '(')? strtol (buf + 1, NULL, 10): 0;
+@@ -53,8 +53,8 @@
+
+ static void ReadDimensionalValue (char const *source, GcuDimensionalValue &value)
+ {
+- char *buf, *dot;
+- value.value = strtod (source, &buf);
++ const char *buf, *dot;
++ value.value = strtod (source, const_cast <char**> (&buf));
+ dot = strchr (source, '.');
+ value.prec = (dot)? buf - dot - 1: 0;
+ value.delta = (*buf == '(')? strtol (buf + 1, NULL, 10): 0;
+diff -ur gnome-chemistry-utils-0.10.3.orig/libs/gcu/spectrumdoc.cc gnome-chemistry-utils-0.10.3/libs/gcu/spectrumdoc.cc
+--- gnome-chemistry-utils-0.10.3.orig/libs/gcu/spectrumdoc.cc 2009-01-05 21:09:59.000000000 +0200
++++ gnome-chemistry-utils-0.10.3/libs/gcu/spectrumdoc.cc 2009-08-08 11:29:46.000000000 +0300
+@@ -1411,7 +1411,7 @@
+ char buf[32], c = data[0];
+ double val = 0., newval = 0.;
+ bool pos, diff = false;
+- char *eq = strstr (data, "$$");
++ char *eq = strstr (const_cast <char *> (data), "$$");
+ if (eq)
+ *eq = 0;
+ pos = true;