Skip site navigation (1)Skip section navigation (2)
Date:      Tue, 6 Apr 2004 03:50:22 -0700 (PDT)
From:      Simon Barner <barner@in.tum.de>
To:        freebsd-ports-bugs@FreeBSD.org
Subject:   Re: ports/65233: editors/mlview: maintainer update to 0.6.2
Message-ID:  <200404061050.i36AoMqk010919@freefall.freebsd.org>

next in thread | raw e-mail | index | archive | help
The following reply was made to PR ports/65233; it has been noted by GNATS.

From: Simon Barner <barner@in.tum.de>
To: FreeBSD-gnats-submit@FreeBSD.org
Cc:  
Subject: Re: ports/65233: editors/mlview: maintainer update to 0.6.2
Date: Tue, 6 Apr 2004 12:43:02 +0200

 > >Number:         65233
 > >Category:       ports
 > >Synopsis:       editors/mlview: maintainer update to 0.6.2
 
 I think it's better not to include the gnome wide %gconf.xml files into
 the pkg-plist, right?
 
 Here is the updated patch:
 
 diff -ruN mlview.orig/Makefile mlview/Makefile
 --- mlview.orig/Makefile	Tue Apr  6 01:40:43 2004
 +++ mlview/Makefile	Tue Apr  6 01:41:12 2004
 @@ -6,8 +6,7 @@
  #
  
  PORTNAME=	mlview
 -PORTVERSION=	0.6.1
 -PORTREVISION=	1
 +PORTVERSION=	0.6.2
  CATEGORIES=	editors gnome
  MASTER_SITES=	${MASTER_SITE_GNOME}
  MASTER_SITE_SUBDIR=	sources/${PORTNAME}/0.6
 diff -ruN mlview.orig/distinfo mlview/distinfo
 --- mlview.orig/distinfo	Tue Apr  6 01:40:43 2004
 +++ mlview/distinfo	Tue Apr  6 01:41:18 2004
 @@ -1,2 +1,2 @@
 -MD5 (gnome2/mlview-0.6.1.tar.bz2) = a2f3b78faafc9dc8644c6c7e632de716
 -SIZE (gnome2/mlview-0.6.1.tar.bz2) = 437705
 +MD5 (gnome2/mlview-0.6.2.tar.bz2) = 0cbdd1b55f8ad7aa1769ddac38ffea9d
 +SIZE (gnome2/mlview-0.6.2.tar.bz2) = 451900
 diff -ruN mlview.orig/files/patch-src-mlview-icon-tree.c mlview/files/patch-src-mlview-icon-tree.c
 --- mlview.orig/files/patch-src-mlview-icon-tree.c	Tue Apr  6 01:40:43 2004
 +++ mlview/files/patch-src-mlview-icon-tree.c	Thu Jan  1 01:00:00 1970
 @@ -1,15 +0,0 @@
 ---- src/mlview-icon-tree.c.orig	Thu Nov 20 21:07:14 2003
 -+++ src/mlview-icon-tree.c	Sat Dec  6 20:52:53 2003
 -@@ -388,9 +388,11 @@
 -         guchar *result = NULL,
 -                 *content = NULL;
 -   
 -+        const gchar *colour_str;
 -+
 -         g_return_val_if_fail (a_node != NULL, NULL);
 -   
 --        const gchar *colour_str = mlview_tree_editor2_get_colour_string (a_node->type);
 -+        colour_str = mlview_tree_editor2_get_colour_string (a_node->type);
 -   
 -         if (a_node->type == XML_ELEMENT_NODE) {
 -                 guchar *ns_prefix = NULL,
 diff -ruN mlview.orig/files/patch-src-mlview-ns-editor.c mlview/files/patch-src-mlview-ns-editor.c
 --- mlview.orig/files/patch-src-mlview-ns-editor.c	Tue Apr  6 01:40:43 2004
 +++ mlview/files/patch-src-mlview-ns-editor.c	Thu Jan  1 01:00:00 1970
 @@ -1,28 +0,0 @@
 ---- src/mlview-ns-editor.c.orig	Thu Nov 13 01:06:36 2003
 -+++ src/mlview-ns-editor.c	Sat Dec  6 20:51:10 2003
 -@@ -1063,12 +1063,6 @@
 -                             xmlNode *a_node,
 -                             xmlNs *a_ns)
 - {
 --        g_return_val_if_fail (a_this 
 --                              && MLVIEW_IS_NS_EDITOR (a_this)
 --                              && a_node
 --                              && a_ns,
 --                              MLVIEW_BAD_PARAM_ERROR) ;
 --
 -         GtkTreeRowReference *row_ref = NULL ;
 -         GtkTreePath *tree_path = NULL ;
 -         GtkTreeIter iter = {0} ;
 -@@ -1076,6 +1070,12 @@
 -         gboolean is_ok = FALSE ;
 -         xmlNs *ns = NULL ;
 -         enum MlViewStatus status = MLVIEW_OK ;
 -+
 -+        g_return_val_if_fail (a_this 
 -+                              && MLVIEW_IS_NS_EDITOR (a_this)
 -+                              && a_node
 -+                              && a_ns,
 -+                              MLVIEW_BAD_PARAM_ERROR) ;
 - 
 -         if (PRIVATE (a_this)->cur_xml_node != a_node) {
 -                 return MLVIEW_OK ;                
 diff -ruN mlview.orig/files/patch-src-mlview-tree-editor2.c mlview/files/patch-src-mlview-tree-editor2.c
 --- mlview.orig/files/patch-src-mlview-tree-editor2.c	Tue Apr  6 01:40:43 2004
 +++ mlview/files/patch-src-mlview-tree-editor2.c	Thu Jan  1 01:00:00 1970
 @@ -1,15 +0,0 @@
 ---- src/mlview-tree-editor2.c.orig	Thu Nov 20 09:11:34 2003
 -+++ src/mlview-tree-editor2.c	Sat Dec  6 20:48:30 2003
 -@@ -760,9 +760,11 @@
 -         guchar *result = NULL,
 -                 *content = NULL;
 - 
 -+        const gchar *colour_str;
 -+	
 -         g_return_val_if_fail (a_node != NULL, NULL);
 - 
 --        const gchar *colour_str = mlview_tree_editor2_get_colour_string (a_node->type);
 -+        colour_str = mlview_tree_editor2_get_colour_string (a_node->type);
 - 
 -         if (a_node->type == XML_ELEMENT_NODE) {
 -                 guchar *ns_prefix = NULL,
 diff -ruN mlview.orig/pkg-plist mlview/pkg-plist
 --- mlview.orig/pkg-plist	Tue Apr  6 01:40:43 2004
 +++ mlview/pkg-plist	Tue Apr  6 12:39:53 2004
 @@ -1,10 +1,12 @@
  bin/mlv
 +etc/gconf/gconf.xml.defaults/apps/mlview/colours/%gconf.xml
  etc/gconf/gconf.xml.defaults/apps/mlview/%gconf.xml
 +etc/gconf/gconf.xml.defaults/schemas/apps/mlview/colours/%gconf.xml
  etc/gconf/gconf.xml.defaults/schemas/apps/mlview/%gconf.xml
  etc/gconf/schemas/mlview.schemas
  lib/libmlview.a
  lib/libmlview.so
 -lib/libmlview.so.3
 +lib/libmlview.so.4
  share/gnome/applications/mlview.desktop
  share/gnome/mlview/mlview-dtd-choice.glade
  share/gnome/mlview/mlview-dtd-choice-dtd-not-resolved.glade
 @@ -22,6 +24,7 @@
  share/locale/az/LC_MESSAGES/mlview.mo
  share/locale/ca/LC_MESSAGES/mlview.mo
  share/locale/cs/LC_MESSAGES/mlview.mo
 +share/locale/de/LC_MESSAGES/mlview.mo
  share/locale/es/LC_MESSAGES/mlview.mo
  share/locale/fr/LC_MESSAGES/mlview.mo
  share/locale/ja/LC_MESSAGES/mlview.mo
 @@ -36,5 +39,7 @@
  share/locale/sr@Latn/LC_MESSAGES/mlview.mo
  share/locale/sv/LC_MESSAGES/mlview.mo
  @dirrm share/gnome/mlview
 +@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/mlview/colours
  @dirrm etc/gconf/gconf.xml.defaults/schemas/apps/mlview
 +@dirrm etc/gconf/gconf.xml.defaults/apps/mlview/colours
  @dirrm etc/gconf/gconf.xml.defaults/apps/mlview



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200404061050.i36AoMqk010919>