Attachment 32649 Details for Bug 53851 – file.diff

[patch] file.diff

file.diff (text/plain), 6.74 KB, created by Jan Hornyak on 2003-06-27 19:40:16 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Jan Hornyak

Created: 2003-06-27 19:40:16 UTC

Size: 6.74 KB

patch

obsolete

>diff -ruN /usr/ports/science/gchemutils/Makefile gchemutils/Makefile
>--- /usr/ports/science/gchemutils/Makefile	Tue Apr  8 02:04:57 2003
>+++ gchemutils/Makefile	Fri Jun 27 18:15:41 2003
>@@ -5,7 +5,7 @@
> # $FreeBSD: ports/science/gchemutils/Makefile,v 1.1 2003/04/08 00:04:57 marcus Exp $
> 
> PORTNAME=	gchemutils
>-PORTVERSION=	0.1.3
>+PORTVERSION=	0.1.4
> CATEGORIES=	science
> MASTER_SITES=	http://savannah.nongnu.org/download/gchemutils/unstable.pkg/${PORTVERSION}/
> DISTNAME=	gnome-chemistry-utils-${PORTVERSION}
>@@ -13,7 +13,8 @@
> MAINTAINER=	pav@oook.cz
> COMMENT=	C++ classes and Gtk2 widgets related to chemistry
> 
>-LIB_DEPENDS=	gtkglext-x11-1.0:${PORTSDIR}/x11-toolkits/gtkglext
>+LIB_DEPENDS=	gtkglext-x11-1.0:${PORTSDIR}/x11-toolkits/gtkglext \
>+		openbabel.0:${PORTSDIR}/science/openbabel
> 
> USE_BZIP2=	yes
> USE_X_PREFIX=	yes
>@@ -21,9 +22,6 @@
> USE_GMAKE=	yes
> USE_LIBTOOL=	yes
> INSTALLS_SHLIB=	yes
>-
>-post-patch:
>-	@${REINPLACE_CMD} -e 's|-lpthread|${PTHREAD_LIBS}|g ; \
>-		s|DATADIRNAME=lib|DATADIRNAME=share|g' ${WRKSRC}/configure
>+CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" LIBS="-L${LOCALBASE}/lib"
> 
> .include <bsd.port.mk>
>diff -ruN /usr/ports/science/gchemutils/distinfo gchemutils/distinfo
>--- /usr/ports/science/gchemutils/distinfo	Tue Apr  8 02:04:57 2003
>+++ gchemutils/distinfo	Fri Jun 27 14:29:19 2003
>@@ -1 +1 @@
>-MD5 (gnome-chemistry-utils-0.1.3.tar.bz2) = 0be12cb53fad3ccbb70aaa600da34cf7
>+MD5 (gnome-chemistry-utils-0.1.4.tar.bz2) = 148bcaa8fdd3cfc876f46ddd5aa4c31b
>diff -ruN /usr/ports/science/gchemutils/files/patch-chem3d-gtkchem3dviewer.cc gchemutils/files/patch-chem3d-gtkchem3dviewer.cc
>--- /usr/ports/science/gchemutils/files/patch-chem3d-gtkchem3dviewer.cc	Thu Jan  1 01:00:00 1970
>+++ gchemutils/files/patch-chem3d-gtkchem3dviewer.cc	Fri Jun 27 18:22:20 2003
>@@ -0,0 +1,10 @@
>+--- chem3d/gtkchem3dviewer.cc.orig	Thu Jun 12 23:03:04 2003
>++++ chem3d/gtkchem3dviewer.cc	Fri Jun 27 18:21:44 2003
>+@@ -30,6 +30,7 @@
>+ #include <gtk/gtk.h>
>+ #include <GL/gl.h>
>+ #include <GL/glu.h>
>++#include <locale.h>
>+ #ifdef HAVE_GTKGLAREA
>+ #	include <gtkgl/gtkglarea.h>
>+ #else
>diff -ruN /usr/ports/science/gchemutils/files/patch-chemistry_element.cc gchemutils/files/patch-chemistry_element.cc
>--- /usr/ports/science/gchemutils/files/patch-chemistry_element.cc	Tue Apr  8 02:04:57 2003
>+++ gchemutils/files/patch-chemistry_element.cc	Thu Jan  1 01:00:00 1970
>@@ -1,13 +0,0 @@
>-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 -ruN /usr/ports/science/gchemutils/files/patch-gtkperiodic-gtkperiodic.c gchemutils/files/patch-gtkperiodic-gtkperiodic.c
>--- /usr/ports/science/gchemutils/files/patch-gtkperiodic-gtkperiodic.c	Tue Apr  8 02:04:57 2003
>+++ gchemutils/files/patch-gtkperiodic-gtkperiodic.c	Thu Jan  1 01:00:00 1970
>@@ -1,35 +0,0 @@
>---- 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 -ruN /usr/ports/science/gchemutils/files/patch-tests-testgtkcrystalviewer.c gchemutils/files/patch-tests-testgtkcrystalviewer.c
>--- /usr/ports/science/gchemutils/files/patch-tests-testgtkcrystalviewer.c	Tue Apr  8 02:04:57 2003
>+++ gchemutils/files/patch-tests-testgtkcrystalviewer.c	Thu Jan  1 01:00:00 1970
>@@ -1,23 +0,0 @@
>---- 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);
>diff -ruN /usr/ports/science/gchemutils/pkg-plist gchemutils/pkg-plist
>--- /usr/ports/science/gchemutils/pkg-plist	Tue Apr  8 02:04:57 2003
>+++ gchemutils/pkg-plist	Fri Jun 27 18:30:24 2003
>@@ -1,3 +1,5 @@
>+bin/gchem3d
>+include/gcu/chem3d/gtkchem3dviewer.h
> include/gcu/chemistry/atom.h
> include/gcu/chemistry/bond.h
> include/gcu/chemistry/object.h
>@@ -15,6 +17,9 @@
> include/gcu/gtkperiodic/gtkperiodic.h
> lib/libgcu.a
> lib/libgcu.so
>+lib/libgtkchem3dviewer.a
>+lib/libgtkchem3dviewer.so
>+lib/libgtkchem3dviewer.so.1
> lib/libgcu.so.1
> lib/libgtkcrystalviewer.a
> lib/libgtkcrystalviewer.so
>@@ -22,9 +27,16 @@
> lib/libgtkperiodic.a
> lib/libgtkperiodic.so
> lib/libgtkperiodic.so.1
>+libdata/bonobo/servers/gchem3d.server
> libdata/pkgconfig/gcu.pc
> share/gnome/gchemutils/elements.xml
> share/gnome/gchemutils/glade/gtkperiodic.glade
>+share/gnome/mime-info/gchemutils.keys
>+share/gnome/mime-info/gchemutils.mime
>+share/locale/fr/LC_MESSAGES/gnome-chemistry-utils.mo
>+share/locale/it/LC_MESSAGES/gnome-chemistry-utils.mo
>+share/locale/pl/LC_MESSAGES/gnome-chemistry-utils.mo
>+@dirrm include/gcu/chem3d
> @dirrm include/gcu/chemistry
> @dirrm include/gcu/crystalviewer
> @dirrm include/gcu/gtkperiodic

Actions: View | Diff

Attachments on bug 53851: 32649