Attachment #34607 for bug #56186

View | Details | Raw Unified | Return to bug 56186
Collapse All | Expand All

Lines 5-12 Link Here

(-)conglomerate/Makefile (-2 / +1 lines)
5	# $FreeBSD: ports/editors/conglomerate/Makefile,v 1.2 2003/06/30 17:03:38 marcus Exp $	5	# $FreeBSD: ports/editors/conglomerate/Makefile,v 1.2 2003/06/30 17:03:38 marcus Exp $
6		6
7	PORTNAME= conglomerate	7	PORTNAME= conglomerate
8	PORTVERSION= 0.5.4	8	PORTVERSION= 0.7.0
9	PORTREVISION= 1
10	CATEGORIES= editors	9	CATEGORIES= editors
11	MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}	10	MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
12	MASTER_SITE_SUBDIR= ${PORTNAME}	11	MASTER_SITE_SUBDIR= ${PORTNAME}

Line 1 Link Here

(-)conglomerate/distinfo (-1 / +1 lines)
1	MD5 (conglomerate-0.5.4.tar.gz) = 43e9a1c29fc4a096a03a0496db25a0c6	1	MD5 (conglomerate-0.7.0.tar.gz) = f76ac1451593f7e92f8713bfc83205de




--- src/cong-location.c.orig	Fri Aug 29 23:01:15 2003
+++ src/cong-location.c	Fri Aug 29 23:09:57 2003
@@ -328,7 +328,7 @@
 			else if (cong_node_type(n) == CONG_NODE_TYPE_ELEMENT)
 			{
 				if (!strcmp(cong_node_name(n), "table")) break;
-				if (cong_dispspec_element_structural(dispspec, xml_frag_name_nice(n)))
+				if (cong_dispspec_element_structural(dispspec, xml_frag_name_nice(n), NULL))
 				{
 					n = n0 = 0;
 					break;
@@ -352,7 +352,7 @@
 
 		while (n)
 		{
-			if (cong_dispspec_element_structural(dispspec, xml_frag_name_nice(n))) { n = 0; break; }
+			if (cong_dispspec_element_structural(dispspec, xml_frag_name_nice(n), NULL)) { n = 0; break; }
 			if (!cong_node_prev(n)) n = n0 = cong_node_parent(n);
 			else break;
 		}
@@ -417,7 +417,7 @@
 			else if (cong_node_type(n) == CONG_NODE_TYPE_ELEMENT)
 			{				 
 				if (!strcmp(cong_node_name(n), "table")) break;
-				if (cong_dispspec_element_structural(dispspec, xml_frag_name_nice(n)))
+				if (cong_dispspec_element_structural(dispspec, xml_frag_name_nice(n), NULL))
 				{
 					n = n0 = 0;
 					break;
@@ -441,7 +441,7 @@
 
 		while (n)
 		{
-			if (cong_dispspec_element_structural(dispspec, xml_frag_name_nice(n))) { n = 0; break; }
+			if (cong_dispspec_element_structural(dispspec, xml_frag_name_nice(n), NULL)) { n = 0; break; }
 			if (!cong_node_next(n)) n = n0 = cong_node_parent(n);
 			else break;
 		}




--- src/cong-menus.c.orig	Tue Jun 24 19:33:54 2003
+++ src/cong-menus.c	Thu Jun 26 10:37:40 2003
@@ -261,6 +261,9 @@
 	CongDialogCategory *dtd_category;
 	gchar *filename, *path;
 
+	struct _xmlDtd  *extSubset;	/* the document external subset */
+	struct _xmlDtd  *intSubset;	/* the document internal subset */
+
 	g_return_val_if_fail(doc, NULL);
 
 	xml_doc = cong_document_get_xml(doc);
@@ -327,9 +330,6 @@
 	if (xml_doc->intSubset) {
 	} else {
 	}
-
-	struct _xmlDtd  *extSubset;	/* the document external subset */
-	struct _xmlDtd  *intSubset;	/* the document internal subset */
 
 #if 1
 	notebook = GTK_NOTEBOOK(gtk_notebook_new());




--- src/plugin-website.c.orig	Sun May 25 11:59:33 2003
+++ src/plugin-website.c	Mon Jun 30 16:28:24 2003
@@ -390,12 +390,12 @@
 {
 	const CongXMLChar* dtd_public_id = cong_document_get_dtd_public_identifier(doc);
 	
-	g_message(dtd_public_id);
-
 	if (NULL==dtd_public_id) {
 		return FALSE;
 	}
 	
+	g_message(dtd_public_id);
+
 	/* Only relevant for Doctype with public ID = "" */
 	if (0==strcmp(dtd_public_id,"-//Norman Walsh//DTD Website Layout V2.4.0//EN")) {
 		return TRUE;




--- src/xmlview.c.orig	Tue Jun 10 16:07:16 2003
+++ src/xmlview.c	Fri Aug 29 23:14:46 2003
@@ -877,12 +877,12 @@
 		enum CongNodeType node_type = cong_node_type(x);
 		const char *name = xml_frag_name_nice(x);
 
-		if (node_type == CONG_NODE_TYPE_ELEMENT && cong_dispspec_element_structural(ds, name))
+		if (node_type == CONG_NODE_TYPE_ELEMENT && cong_dispspec_element_structural(ds, name, NULL))
 		{
 			return(cong_node_prev(x));
 		}
 
-		if (CONG_ELEMENT_TYPE_EMBED_EXTERNAL_FILE==cong_dispspec_type(ds, name)) {
+		if (CONG_ELEMENT_TYPE_EMBED_EXTERNAL_FILE==cong_dispspec_type(ds, name, NULL)) {
 			return(cong_node_prev(x));
 		}
 	}

Lines 2-7 Link Here

(-)conglomerate/pkg-plist (-1 / +19 lines)
2	share/gnome/applications/conglomerate.desktop	2	share/gnome/applications/conglomerate.desktop
3	share/gnome/conglomerate/dispspecs/cnxml.xds	3	share/gnome/conglomerate/dispspecs/cnxml.xds
4	share/gnome/conglomerate/dispspecs/docbook.xds	4	share/gnome/conglomerate/dispspecs/docbook.xds
		5	share/gnome/conglomerate/dispspecs/kernel-traffic-newsletter.xds
5	share/gnome/conglomerate/dispspecs/readme.xds	6	share/gnome/conglomerate/dispspecs/readme.xds
6	share/gnome/conglomerate/dispspecs/website-layout.xds	7	share/gnome/conglomerate/dispspecs/website-layout.xds
7	share/gnome/conglomerate/dispspecs/website-webpage.xds	8	share/gnome/conglomerate/dispspecs/website-webpage.xds
Lines 10-16 Link Here
10	share/gnome/conglomerate/examples/readme.xml	11	share/gnome/conglomerate/examples/readme.xml
11	share/gnome/conglomerate/examples/test-docbook.xml	12	share/gnome/conglomerate/examples/test-docbook.xml
12	share/gnome/conglomerate/glade/docbook-common-properties.glade	13	share/gnome/conglomerate/glade/docbook-common-properties.glade
13	share/gnome/pixmaps/ChangeLog	14	share/gnome/help/conglomerate/C/conglomerate.xml
		15	share/gnome/help/conglomerate/C/figures/conglomerate_logo.png
		16	share/gnome/help/conglomerate/C/figures/intro.png
		17	share/gnome/help/conglomerate/C/figures/menu-properties.png
		18	share/gnome/help/conglomerate/C/figures/new-doc-wizard.png
		19	share/gnome/help/conglomerate/C/figures/new.png
		20	share/gnome/help/conglomerate/C/figures/properties-dialog.png
		21	share/gnome/help/conglomerate/C/figures/quote.png
		22	share/gnome/omf/conglomerate/conglomerate-C.omf
14	share/gnome/pixmaps/cong-address-16.png	23	share/gnome/pixmaps/cong-address-16.png
15	share/gnome/pixmaps/cong-answer-16.png	24	share/gnome/pixmaps/cong-answer-16.png
16	share/gnome/pixmaps/cong-author-16.png	25	share/gnome/pixmaps/cong-author-16.png
Lines 39-46 Link Here
39	share/gnome/pixmaps/cong-summary-16.png	48	share/gnome/pixmaps/cong-summary-16.png
40	share/gnome/pixmaps/cong-title-16.png	49	share/gnome/pixmaps/cong-title-16.png
41	share/gnome/pixmaps/cong-wrapper-16.png	50	share/gnome/pixmaps/cong-wrapper-16.png
		51	share/gnome/pixmaps/conglomerate-icon-16.png
		52	share/locale/da/LC_MESSAGES/conglomerate.mo
42	share/locale/es/LC_MESSAGES/conglomerate.mo	53	share/locale/es/LC_MESSAGES/conglomerate.mo
		54	share/locale/nl/LC_MESSAGES/conglomerate.mo
43	share/locale/ru/LC_MESSAGES/conglomerate.mo	55	share/locale/ru/LC_MESSAGES/conglomerate.mo
		56	@exec scrollkeeper-install -q %D/share/gnome/omf/conglomerate/conglomerate-C.omf 2>/dev/null \|\| /usr/bin/true
		57	@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/conglomerate/conglomerate-C.omf 2>/dev/null \|\| /usr/bin/true
		58	@dirrm share/gnome/omf/conglomerate
		59	@dirrm share/gnome/help/conglomerate/C/figures
		60	@dirrm share/gnome/help/conglomerate/C
		61	@dirrm share/gnome/help/conglomerate
44	@dirrm share/gnome/conglomerate/dispspecs	62	@dirrm share/gnome/conglomerate/dispspecs
45	@dirrm share/gnome/conglomerate/examples	63	@dirrm share/gnome/conglomerate/examples
46	@dirrm share/gnome/conglomerate/glade	64	@dirrm share/gnome/conglomerate/glade

Return to bug 56186

Line 0 Link Here

(-)conglomerate/files/patch-src-cong-location.c (+38 lines)
	1	--- src/cong-location.c.orig Fri Aug 29 23:01:15 2003
	2	+++ src/cong-location.c Fri Aug 29 23:09:57 2003
	3	@@ -328,7 +328,7 @@
	4	else if (cong_node_type(n) == CONG_NODE_TYPE_ELEMENT)
	5	{
	6	if (!strcmp(cong_node_name(n), "table")) break;
	7	- if (cong_dispspec_element_structural(dispspec, xml_frag_name_nice(n)))
	8	+ if (cong_dispspec_element_structural(dispspec, xml_frag_name_nice(n), NULL))
	9	{
	10	n = n0 = 0;
	11	break;
	12	@@ -352,7 +352,7 @@
	13
	14	while (n)
	15	{
	16	- if (cong_dispspec_element_structural(dispspec, xml_frag_name_nice(n))) { n = 0; break; }
	17	+ if (cong_dispspec_element_structural(dispspec, xml_frag_name_nice(n), NULL)) { n = 0; break; }
	18	if (!cong_node_prev(n)) n = n0 = cong_node_parent(n);
	19	else break;
	20	}
	21	@@ -417,7 +417,7 @@
	22	else if (cong_node_type(n) == CONG_NODE_TYPE_ELEMENT)
	23	{
	24	if (!strcmp(cong_node_name(n), "table")) break;
	25	- if (cong_dispspec_element_structural(dispspec, xml_frag_name_nice(n)))
	26	+ if (cong_dispspec_element_structural(dispspec, xml_frag_name_nice(n), NULL))
	27	{
	28	n = n0 = 0;
	29	break;
	30	@@ -441,7 +441,7 @@
	31
	32	while (n)
	33	{
	34	- if (cong_dispspec_element_structural(dispspec, xml_frag_name_nice(n))) { n = 0; break; }
	35	+ if (cong_dispspec_element_structural(dispspec, xml_frag_name_nice(n), NULL)) { n = 0; break; }
	36	if (!cong_node_next(n)) n = n0 = cong_node_parent(n);
	37	else break;
	38	}

Lines 1-22 Link Here

(-)conglomerate/files/patch-src-cong-menus.c (-22 lines)
1	--- src/cong-menus.c.orig Tue Jun 24 19:33:54 2003
2	+++ src/cong-menus.c Thu Jun 26 10:37:40 2003
3	@@ -261,6 +261,9 @@
4	CongDialogCategory *dtd_category;
5	gchar filename, path;
6
7	+ struct _xmlDtd extSubset; / the document external subset */
8	+ struct _xmlDtd intSubset; / the document internal subset */
9	+
10	g_return_val_if_fail(doc, NULL);
11
12	xml_doc = cong_document_get_xml(doc);
13	@@ -327,9 +330,6 @@
14	if (xml_doc->intSubset) {
15	} else {
16	}
17	-
18	- struct _xmlDtd extSubset; / the document external subset */
19	- struct _xmlDtd intSubset; / the document internal subset */
20
21	#if 1
22	notebook = GTK_NOTEBOOK(gtk_notebook_new());

Lines 1-17 Link Here

(-)conglomerate/files/patch-src-plugin-website.c (-17 lines)
1	--- src/plugin-website.c.orig Sun May 25 11:59:33 2003
2	+++ src/plugin-website.c Mon Jun 30 16:28:24 2003
3	@@ -390,12 +390,12 @@
4	{
5	const CongXMLChar* dtd_public_id = cong_document_get_dtd_public_identifier(doc);
6
7	- g_message(dtd_public_id);
8	-
9	if (NULL==dtd_public_id) {
10	return FALSE;
11	}
12
13	+ g_message(dtd_public_id);
14	+
15	/* Only relevant for Doctype with public ID = "" */
16	if (0==strcmp(dtd_public_id,"-//Norman Walsh//DTD Website Layout V2.4.0//EN")) {
17	return TRUE;

Line 0 Link Here

(-)conglomerate/files/patch-src-xmlview.c (+17 lines)
	1	--- src/xmlview.c.orig Tue Jun 10 16:07:16 2003
	2	+++ src/xmlview.c Fri Aug 29 23:14:46 2003
	3	@@ -877,12 +877,12 @@
	4	enum CongNodeType node_type = cong_node_type(x);
	5	const char *name = xml_frag_name_nice(x);
	6
	7	- if (node_type == CONG_NODE_TYPE_ELEMENT && cong_dispspec_element_structural(ds, name))
	8	+ if (node_type == CONG_NODE_TYPE_ELEMENT && cong_dispspec_element_structural(ds, name, NULL))
	9	{
	10	return(cong_node_prev(x));
	11	}
	12
	13	- if (CONG_ELEMENT_TYPE_EMBED_EXTERNAL_FILE==cong_dispspec_type(ds, name)) {
	14	+ if (CONG_ELEMENT_TYPE_EMBED_EXTERNAL_FILE==cong_dispspec_type(ds, name, NULL)) {
	15	return(cong_node_prev(x));
	16	}
	17	}