[108108] trunk/dports/gnome/mlview

devans at macports.org devans at macports.org
Fri Jul 12 22:53:22 PDT 2013


Revision: 108108
          https://trac.macports.org/changeset/108108
Author:   devans at macports.org
Date:     2013-07-12 22:53:22 -0700 (Fri, 12 Jul 2013)
Log Message:
-----------
mlview: fix build by upgrading to terminal version 0.9.0, some bugs remain, add license.

Modified Paths:
--------------
    trunk/dports/gnome/mlview/Portfile

Added Paths:
-----------
    trunk/dports/gnome/mlview/files/
    trunk/dports/gnome/mlview/files/patch-assert-function.diff
    trunk/dports/gnome/mlview/files/patch-extra-qualification.diff
    trunk/dports/gnome/mlview/files/patch-missing-links.diff
    trunk/dports/gnome/mlview/files/patch-src-mlview-exec-command-dialog.cc.diff
    trunk/dports/gnome/mlview/files/patch-tests-firstplugin.xml.diff

Modified: trunk/dports/gnome/mlview/Portfile
===================================================================
--- trunk/dports/gnome/mlview/Portfile	2013-07-13 05:50:58 UTC (rev 108107)
+++ trunk/dports/gnome/mlview/Portfile	2013-07-13 05:53:22 UTC (rev 108108)
@@ -4,28 +4,60 @@
 PortSystem      1.0
 
 name            mlview
-version         0.7.1
+version         0.9.0
+license         GPL-2
 set branch      [join [lrange [split ${version} .] 0 1] .]
-description     XML-editor for GNOME.
+description     XML-editor for GNOME 2.
 long_description \
                 The MlView project is an ongoing effort to develop \
-                an xml editor for GNOME environment.
+                an XML editor for the GNOME 2 environment.
 maintainers     nomaintainer
 categories      gnome
 platforms       darwin
 homepage        http://www.freespiders.org/projects/gmlview/
 master_sites    gnome:sources/${name}/${branch}/
-checksums       md5 85383331e5bb6d59293cee5b86595284
-depends_build   port:intltool port:pkgconfig
-depends_lib     port:libgnomeprintui port:libxslt port:libgnome
+
 use_bzip2       yes
+
+checksums       rmd160  6b810b478dbdb76dd4bb28fe627e455410f89ea7 \
+                sha256  568ce3fefe83eb163b4fbd7d62954ec3cad3000e966cd9f7461c2c9a3edb4dca
+
+depends_build   port:intltool \
+                port:pkgconfig
+
+depends_lib     port:desktop-file-utils \
+                port:libxml2 \
+                port:libxslt \
+                port:gtkmm \
+                port:libglademm \
+                port:libgnome \
+                port:gnome-vfs \
+                port:libgnomeui \
+                port:gconf \
+                port:gtksourceview \
+                port:vte
+
+patchfiles      patch-assert-function.diff \
+                patch-extra-qualification.diff \
+                patch-missing-links.diff \
+                patch-src-mlview-exec-command-dialog.cc.diff \
+                patch-tests-firstplugin.xml.diff
+
+post-patch {
+    reinplace "s|@@MP_PREFIX@@|${prefix}|" ${worksrcpath}/tests/firstplugin.xml
+}
+
+compiler.blacklist clang
+
 configure.args  --mandir=${prefix}/share/man \
-                --with-gconf-source="xml::${destroot}${prefix}/etc/gconf/gconf.xml.defaults"
-pre-destroot    { file mkdir ${destroot}${prefix}/etc/gconf/gconf.xml.defaults/ }
-post-destroot {
-    file delete ${destroot}${prefix}/etc/gconf/gconf.xml.defaults/schemas/apps/%gconf.xml \
-                ${destroot}${prefix}/etc/gconf/gconf.xml.defaults/schemas/%gconf.xml \
-                ${destroot}${prefix}/etc/gconf/gconf.xml.defaults/apps/%gconf.xml
+                --disable-schemas-install
+
+universal_variant no
+
+post-activate {
+    system "${prefix}/bin/update-desktop-database ${prefix}/share/applications"
+    system "export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source` && \
+        gconftool-2 --makefile-install-rule ${prefix}/etc/gconf/schemas/*.schemas"
 }
 
-livecheck.type  gnome
+livecheck.type  gnome-with-unstable

Added: trunk/dports/gnome/mlview/files/patch-assert-function.diff
===================================================================
--- trunk/dports/gnome/mlview/files/patch-assert-function.diff	                        (rev 0)
+++ trunk/dports/gnome/mlview/files/patch-assert-function.diff	2013-07-13 05:53:22 UTC (rev 108108)
@@ -0,0 +1,20 @@
+--- src/mlview-utils.h.orig	2013-07-11 12:00:23.000000000 -0700
++++ src/mlview-utils.h	2013-07-11 12:09:05.000000000 -0700
+@@ -146,7 +146,7 @@
+ 
+ #define mlview_utils_trace(message, ...) \
+ fprintf (stderr, "mlview-debug: %s: in file %s: line %d: (%s)\n",\
+-         message, __FILE__,__LINE__,__ASSERT_FUNCTION) ;
++         message, __FILE__,__LINE__,__func__) ;
+ 
+ /**
+  *Trace a debug message.
+@@ -163,7 +163,7 @@
+ #endif
+ 
+ #define ERROR_STREAM \
+-cerr << "mlview-debug: in " << __ASSERT_FUNCTION \
++cerr << "mlview-debug: in " << __func__ \
+ << " : in file " << __FILE__ << " : " \
+ << " line " << __LINE__ << " : "
+ 

Added: trunk/dports/gnome/mlview/files/patch-extra-qualification.diff
===================================================================
--- trunk/dports/gnome/mlview/files/patch-extra-qualification.diff	                        (rev 0)
+++ trunk/dports/gnome/mlview/files/patch-extra-qualification.diff	2013-07-13 05:53:22 UTC (rev 108108)
@@ -0,0 +1,52 @@
+diff -ur src.orig/mlview-source-view.h src/mlview-source-view.h
+--- src.orig/mlview-source-view.h	2013-07-11 13:11:00.000000000 -0700
++++ src/mlview-source-view.h	2013-07-11 13:12:48.000000000 -0700
+@@ -53,7 +53,7 @@
+ 
+ 	enum MlViewStatus set_default_options () ;
+ 
+-	MlViewXMLDocument* SourceView::get_document () ;
++	MlViewXMLDocument* get_document () ;
+ 
+ 	GtkUIManager * get_ui_manager () ;
+ 
+diff -ur src.orig/mlview-tree-view.h src/mlview-tree-view.h
+--- src.orig/mlview-tree-view.h	2013-07-11 13:11:00.000000000 -0700
++++ src/mlview-tree-view.h	2013-07-11 13:12:01.000000000 -0700
+@@ -178,7 +178,7 @@
+ 
+ 	enum MlViewStatus build_app_edit_menu () ;
+ 
+-	GtkDialog * TreeView::get_expand_tree_dialog ()  ;
++	GtkDialog * get_expand_tree_dialog ()  ;
+ 
+ 	void clear_completion_popup_submenus () ;
+ 
+--- src/mlview-plugin.h.orig	2013-07-11 13:20:43.000000000 -0700
++++ src/mlview-plugin.h	2013-07-11 13:21:23.000000000 -0700
+@@ -46,12 +46,12 @@
+ 		
+ 		//forbid assignation/copy
+ 		Plugin& operator= (Plugin const&) ;
+-		Plugin::Plugin (Plugin const&) ;
++		Plugin (Plugin const&) ;
+ 
+ 	public:
+ 		Plugin (const PluginDescriptor &a_descr) ;
+ 
+-		Plugin::Plugin (const UString &a_url) ;
++		Plugin (const UString &a_url) ;
+ 		
+ 		virtual ~Plugin () ;
+ 		
+--- src/mlview-editor.cc.orig	2013-07-11 13:28:57.000000000 -0700
++++ src/mlview-editor.cc	2013-07-11 13:29:35.000000000 -0700
+@@ -157,7 +157,7 @@
+ 			contextual_menu (NULL)
+ 	{}
+ 
+-	static void EditorPriv::schemas_window_destroy_cb
++	static void schemas_window_destroy_cb
+ 	(GtkWidget *a_widget, struct DocumentWindowData *a_win) ;
+ 
+ 	static void validation_window_destroy_cb

Added: trunk/dports/gnome/mlview/files/patch-missing-links.diff
===================================================================
--- trunk/dports/gnome/mlview/files/patch-missing-links.diff	                        (rev 0)
+++ trunk/dports/gnome/mlview/files/patch-missing-links.diff	2013-07-13 05:53:22 UTC (rev 108108)
@@ -0,0 +1,30 @@
+--- src/Makefile.in.orig	2013-07-11 17:45:05.000000000 -0700
++++ src/Makefile.in	2013-07-11 17:53:18.000000000 -0700
+@@ -434,7 +434,12 @@
+ CONFIG_CLEAN_FILES =
+ LTLIBRARIES = $(lib_LTLIBRARIES)
+ 
+-libmlview_la_LIBADD =
++libmlview_la_LIBADD = recent-files/libeggrecent.la \
++		      $(GTKSOURCEVIEW_LIBS) \
++		      $(GTKMM2_LIBS) \
++                      $(LIBGNOMEUI2_LIBS) \
++                      $(LIBGLADE2_LIBS)
++
+ am_libmlview_la_OBJECTS = mlview-object.lo mlview-exception.lo \
+ 	mlview-ustring.lo mlview-app-context.lo mlview-view-factory.lo \
+ 	mlview-view-manager.lo mlview-gvc-iface.lo mlview-old-gvc.lo \
+@@ -469,7 +474,12 @@
+ 	mlview-prefs-category-frame-sourceview.lo \
+ 	mlview-prefs-category-frame-treeview.lo
+ libmlview_la_OBJECTS = $(am_libmlview_la_OBJECTS)
+-libmlviewdbusclient_la_LIBADD =
++libmlviewdbusclient_la_LIBADD = recent-files/libeggrecent.la \
++                      $(GTKSOURCEVIEW_LIBS) \
++                      $(GTKMM2_LIBS) \
++                      $(LIBGNOMEUI2_LIBS) \
++                      $(LIBGLADE2_LIBS)
++
+ am_libmlviewdbusclient_la_OBJECTS = mlview-idbc.lo mlview-editor-dbc.lo \
+ 	mlview-ping-dbc.lo mlview-utils.lo
+ libmlviewdbusclient_la_OBJECTS = $(am_libmlviewdbusclient_la_OBJECTS)

Added: trunk/dports/gnome/mlview/files/patch-src-mlview-exec-command-dialog.cc.diff
===================================================================
--- trunk/dports/gnome/mlview/files/patch-src-mlview-exec-command-dialog.cc.diff	                        (rev 0)
+++ trunk/dports/gnome/mlview/files/patch-src-mlview-exec-command-dialog.cc.diff	2013-07-13 05:53:22 UTC (rev 108108)
@@ -0,0 +1,11 @@
+--- src/mlview-exec-command-dialog.cc.orig	2013-07-11 14:42:51.000000000 -0700
++++ src/mlview-exec-command-dialog.cc	2013-07-11 14:51:58.000000000 -0700
+@@ -33,6 +33,8 @@
+ #include <libglademm.h>
+ #include "mlview-exec-command-dialog.h"
+ 
++extern char **environ;
++
+ namespace mlview
+ {
+ 

Added: trunk/dports/gnome/mlview/files/patch-tests-firstplugin.xml.diff
===================================================================
--- trunk/dports/gnome/mlview/files/patch-tests-firstplugin.xml.diff	                        (rev 0)
+++ trunk/dports/gnome/mlview/files/patch-tests-firstplugin.xml.diff	2013-07-13 05:53:22 UTC (rev 108108)
@@ -0,0 +1,13 @@
+--- tests/firstplugin.xml.orig	2013-07-12 07:13:21.000000000 -0700
++++ tests/firstplugin.xml	2013-07-12 07:16:10.000000000 -0700
+@@ -1,7 +1,7 @@
+ <plugin>
+-  <file>/usr/local/lib/mlview/plugins/libfirstplugin.so</file>
++  <file>@@MP_PREFIX@@/lib/mlview/plugins/libfirstplugin.dylib</file>
+   <name>FirstPlugin</name>
+   <description>MlView's first plugin !</description>
+   <load>first_plugin_load</load>
+   <unload>first_plugin_unload</unload>
+-</plugin>
+\ No newline at end of file
++</plugin>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20130712/f2b82e61/attachment-0001.html>


More information about the macports-changes mailing list