Add gchemutils a set of C++ class and GTK+-2 widgets related to chemistry.

PR:		50538
Submitted by:	Pav Lucistnik <pav@oook.cz>

4 files changed, 82 insertions, 0 deletions

diff --git a/science/gchemutils/files/patch-chemistry_element.cc b/science/gchemutils/files/patch-chemistry_element.cc
new file mode 100644
index 000000000000..aceb4fe25c99
--- /dev/null
+++ b/science/gchemutils/files/patch-chemistry_element.cc
@@ -0,0 +1,13 @@
+diff -u -r1.3 element.cc
+--- chemistry/element.cc	1 Mar 2003 17:02:49 -0000	1.3
++++ chemistry/element.cc	2 Apr 2003 04:14:46 -0000
+@@ -97,7 +97,7 @@
+ 				if (!strcmp((const char*)child->name, "name"))
+ 				{
+ 					tmp = (char*) xmlNodeGetLang(child);
+-					if ((!tmp) && (!lang) && (!strncmp(lang, tmp, 2))) Elt->name = (char*) xmlNodeGetContent(child);
++					if (tmp && lang && (!strncmp(lang, tmp, 2))) Elt->name = (char*) xmlNodeGetContent(child);
+ 					else DefaultName = (char*) xmlNodeGetContent(child);
+ 				}
+ 				else if (!strcmp((const char*)child->name, "color"))
+
diff --git a/science/gchemutils/files/patch-configure b/science/gchemutils/files/patch-configure
new file mode 100644
index 000000000000..d7a69558f534
--- /dev/null
+++ b/science/gchemutils/files/patch-configure
@@ -0,0 +1,11 @@
+--- configure.orig	Sat Mar  1 22:09:31 2003
++++ configure	Tue Mar 18 12:30:50 2003
+@@ -8256,6 +8256,8 @@
+ # This can be used to rebuild libtool when needed
+ LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh"
+ 
++$ac_aux_dir/ltconfig $LIBTOOL_DEPS
++
+ # Always use our own libtool.
+ LIBTOOL='$(SHELL) $(top_builddir)/libtool'
+ 
diff --git a/science/gchemutils/files/patch-gtkperiodic-gtkperiodic.c b/science/gchemutils/files/patch-gtkperiodic-gtkperiodic.c
new file mode 100644
index 000000000000..d80aeb660567
--- /dev/null
+++ b/science/gchemutils/files/patch-gtkperiodic-gtkperiodic.c
@@ -0,0 +1,35 @@
+--- gtkperiodic/gtkperiodic.c.orig	Sat Mar  1 20:49:14 2003
++++ gtkperiodic/gtkperiodic.c	Wed Mar 19 01:13:51 2003
+@@ -157,6 +157,9 @@
+ {
+ 	GladeXML* xml;
+ 	GtkStyle* style;
++	char name[8] = "elt";
++	GtkToggleButton* button;
++	int i;
+ 	xml =  glade_xml_new(DATADIR"/gchemutils/glade/gtkperiodic.glade", "vbox1", NULL);
+ 	if (xml)  glade_xml_signal_autoconnect (xml);
+ 	periodic->priv = g_new0(GtkPeriodicPrivate, 1);
+@@ -164,9 +167,6 @@
+ 	periodic->priv->vbox = GTK_VBOX(glade_xml_get_widget(xml, "vbox1"));
+ 	periodic->priv->colorstyle = GTK_PERIODIC_COLOR_NONE;
+ 	memset(periodic->priv->buttons, 0, sizeof(GtkToggleButton*) * 119);
+-	char name[8] = "elt";
+-	GtkToggleButton* button;
+-	int i;
+ 	for (i = 1; i <= 118; i++)
+ 	{
+ 		sprintf(name + 3, "%d", i);
+@@ -217,10 +217,11 @@
+ 	static gboolean change = FALSE;
+ 	if (button != periodic->priv->buttons[0])
+ 	{
++		const gchar* name;
+ 		change = TRUE;
+ 		if (periodic->priv->buttons[0]) gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(periodic->priv->buttons[0]), FALSE);
+ 		periodic->priv->buttons[0] = button;
+-		const gchar* name = gtk_widget_get_name(GTK_WIDGET(periodic->priv->buttons[0]));
++		name = gtk_widget_get_name(GTK_WIDGET(periodic->priv->buttons[0]));
+ 		periodic->priv->Z = atoi(name + 3);
+ 		g_signal_emit(periodic, gtk_periodic_signals[ELEMENT_CHANGED], 0, periodic->priv->Z);
+ 		change = FALSE;
diff --git a/science/gchemutils/files/patch-tests-testgtkcrystalviewer.c b/science/gchemutils/files/patch-tests-testgtkcrystalviewer.c
new file mode 100644
index 000000000000..ce17206cfa84
--- /dev/null
+++ b/science/gchemutils/files/patch-tests-testgtkcrystalviewer.c
@@ -0,0 +1,23 @@
+--- tests/testgtkcrystalviewer.c.orig	Mon Nov 11 19:50:18 2002
++++ tests/testgtkcrystalviewer.c	Tue Mar 18 11:25:55 2003
+@@ -8,6 +8,8 @@
+ {
+ 	GtkWidget *window;
+ 	GtkWidget *viewer;
++	const char* filename;
++	xmlDocPtr xml;
+ 	gtk_init (&argc, &argv);
+ 
+ 	window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
+@@ -16,10 +18,9 @@
+ 		 GTK_SIGNAL_FUNC(gtk_main_quit),
+ 		 NULL);
+ 
+-	const char* filename;
+ 	if (argc >= 2) filename = argv[1];
+ 		else filename = "nickel.gcrystal";
+-	xmlDocPtr xml = xmlParseFile(filename);
++	xml = xmlParseFile(filename);
+ 	
+ 	viewer = gtk_crystal_viewer_new(xml->children);
+ 	gtk_container_add(GTK_CONTAINER(window), viewer);