ports/56186: [maintainer update] editors/conglomerate to 0.7.0
Pav Lucistnik
pav at oook.cz
Sat Aug 30 12:10:22 UTC 2003
>Number: 56186
>Category: ports
>Synopsis: [maintainer update] editors/conglomerate to 0.7.0
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: maintainer-update
>Submitter-Id: current-users
>Arrival-Date: Sat Aug 30 05:10:18 PDT 2003
>Closed-Date:
>Last-Modified:
>Originator: Pav Lucistnik
>Release: FreeBSD 5.1-CURRENT i386
>Organization:
>Environment:
System: FreeBSD hood.oook.cz 5.1-CURRENT FreeBSD 5.1-CURRENT #0: Fri Aug 29 21:44:33 CEST 2003 root at hood.oook.cz:/usr/obj/usr/src/sys/PAV i386
>Description:
Update editors/conglomerate to 0.7.0. Note that this program is still
considered unstable and under heavy development. Add one new patch
that fixes sigsegv when moving cursor out of editable area with left/right
arrow keys. Remove two old patches which got merged upstream.
>How-To-Repeat:
>Fix:
diff -ruN /usr/ports/editors/conglomerate/Makefile conglomerate/Makefile
--- /usr/ports/editors/conglomerate/Makefile Tue Jul 1 10:17:28 2003
+++ conglomerate/Makefile Fri Aug 29 21:02:24 2003
@@ -5,8 +5,7 @@
# $FreeBSD: ports/editors/conglomerate/Makefile,v 1.2 2003/06/30 17:03:38 marcus Exp $
PORTNAME= conglomerate
-PORTVERSION= 0.5.4
-PORTREVISION= 1
+PORTVERSION= 0.7.0
CATEGORIES= editors
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= ${PORTNAME}
diff -ruN /usr/ports/editors/conglomerate/distinfo conglomerate/distinfo
--- /usr/ports/editors/conglomerate/distinfo Sun Jun 29 22:07:30 2003
+++ conglomerate/distinfo Fri Aug 29 21:04:48 2003
@@ -1 +1 @@
-MD5 (conglomerate-0.5.4.tar.gz) = 43e9a1c29fc4a096a03a0496db25a0c6
+MD5 (conglomerate-0.7.0.tar.gz) = f76ac1451593f7e92f8713bfc83205de
diff -ruN /usr/ports/editors/conglomerate/files/patch-src-cong-location.c conglomerate/files/patch-src-cong-location.c
--- /usr/ports/editors/conglomerate/files/patch-src-cong-location.c Thu Jan 1 01:00:00 1970
+++ conglomerate/files/patch-src-cong-location.c Fri Aug 29 23:10:00 2003
@@ -0,0 +1,38 @@
+--- 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;
+ }
diff -ruN /usr/ports/editors/conglomerate/files/patch-src-cong-menus.c conglomerate/files/patch-src-cong-menus.c
--- /usr/ports/editors/conglomerate/files/patch-src-cong-menus.c Sun Jun 29 22:07:30 2003
+++ conglomerate/files/patch-src-cong-menus.c Thu Jan 1 01:00:00 1970
@@ -1,22 +0,0 @@
---- 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());
diff -ruN /usr/ports/editors/conglomerate/files/patch-src-plugin-website.c conglomerate/files/patch-src-plugin-website.c
--- /usr/ports/editors/conglomerate/files/patch-src-plugin-website.c Mon Jun 30 19:03:38 2003
+++ conglomerate/files/patch-src-plugin-website.c Thu Jan 1 01:00:00 1970
@@ -1,17 +0,0 @@
---- 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;
diff -ruN /usr/ports/editors/conglomerate/files/patch-src-xmlview.c conglomerate/files/patch-src-xmlview.c
--- /usr/ports/editors/conglomerate/files/patch-src-xmlview.c Thu Jan 1 01:00:00 1970
+++ conglomerate/files/patch-src-xmlview.c Fri Aug 29 23:15:30 2003
@@ -0,0 +1,17 @@
+--- 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));
+ }
+ }
diff -ruN /usr/ports/editors/conglomerate/pkg-plist conglomerate/pkg-plist
--- /usr/ports/editors/conglomerate/pkg-plist Sun Jun 29 22:07:30 2003
+++ conglomerate/pkg-plist Fri Aug 29 21:42:17 2003
@@ -2,6 +2,7 @@
share/gnome/applications/conglomerate.desktop
share/gnome/conglomerate/dispspecs/cnxml.xds
share/gnome/conglomerate/dispspecs/docbook.xds
+share/gnome/conglomerate/dispspecs/kernel-traffic-newsletter.xds
share/gnome/conglomerate/dispspecs/readme.xds
share/gnome/conglomerate/dispspecs/website-layout.xds
share/gnome/conglomerate/dispspecs/website-webpage.xds
@@ -10,7 +11,15 @@
share/gnome/conglomerate/examples/readme.xml
share/gnome/conglomerate/examples/test-docbook.xml
share/gnome/conglomerate/glade/docbook-common-properties.glade
-share/gnome/pixmaps/ChangeLog
+share/gnome/help/conglomerate/C/conglomerate.xml
+share/gnome/help/conglomerate/C/figures/conglomerate_logo.png
+share/gnome/help/conglomerate/C/figures/intro.png
+share/gnome/help/conglomerate/C/figures/menu-properties.png
+share/gnome/help/conglomerate/C/figures/new-doc-wizard.png
+share/gnome/help/conglomerate/C/figures/new.png
+share/gnome/help/conglomerate/C/figures/properties-dialog.png
+share/gnome/help/conglomerate/C/figures/quote.png
+share/gnome/omf/conglomerate/conglomerate-C.omf
share/gnome/pixmaps/cong-address-16.png
share/gnome/pixmaps/cong-answer-16.png
share/gnome/pixmaps/cong-author-16.png
@@ -39,8 +48,17 @@
share/gnome/pixmaps/cong-summary-16.png
share/gnome/pixmaps/cong-title-16.png
share/gnome/pixmaps/cong-wrapper-16.png
+share/gnome/pixmaps/conglomerate-icon-16.png
+share/locale/da/LC_MESSAGES/conglomerate.mo
share/locale/es/LC_MESSAGES/conglomerate.mo
+share/locale/nl/LC_MESSAGES/conglomerate.mo
share/locale/ru/LC_MESSAGES/conglomerate.mo
+ at exec scrollkeeper-install -q %D/share/gnome/omf/conglomerate/conglomerate-C.omf 2>/dev/null || /usr/bin/true
+ at unexec scrollkeeper-uninstall -q %D/share/gnome/omf/conglomerate/conglomerate-C.omf 2>/dev/null || /usr/bin/true
+ at dirrm share/gnome/omf/conglomerate
+ at dirrm share/gnome/help/conglomerate/C/figures
+ at dirrm share/gnome/help/conglomerate/C
+ at dirrm share/gnome/help/conglomerate
@dirrm share/gnome/conglomerate/dispspecs
@dirrm share/gnome/conglomerate/examples
@dirrm share/gnome/conglomerate/glade
>Release-Note:
>Audit-Trail:
>Unformatted:
More information about the freebsd-ports-bugs
mailing list