[122254] trunk/dports/gnome/mlview
devans at macports.org
devans at macports.org
Fri Jul 18 15:11:54 PDT 2014
Revision: 122254
https://trac.macports.org/changeset/122254
Author: devans at macports.org
Date: 2014-07-18 15:11:54 -0700 (Fri, 18 Jul 2014)
Log Message:
-----------
mlview: apply upstream patches, update dependencies, configuration, depend on vte-gtk2-compat instead of vte, reconfigure using upstream autogen.sh to fix intltool configuration, increment revision to rebuild.
Modified Paths:
--------------
trunk/dports/gnome/mlview/Portfile
Added Paths:
-----------
trunk/dports/gnome/mlview/files/autogen.sh
trunk/dports/gnome/mlview/files/patch-fix-save-to-file-bz587553.diff
trunk/dports/gnome/mlview/files/patch-gcc-4.4-compat.diff
Modified: trunk/dports/gnome/mlview/Portfile
===================================================================
--- trunk/dports/gnome/mlview/Portfile 2014-07-18 21:25:15 UTC (rev 122253)
+++ trunk/dports/gnome/mlview/Portfile 2014-07-18 22:11:54 UTC (rev 122254)
@@ -5,6 +5,7 @@
name mlview
version 0.9.0
+revision 1
license GPL-2+
set branch [join [lrange [split ${version} .] 0 1] .]
description XML-editor for GNOME 2.
@@ -23,7 +24,11 @@
sha256 568ce3fefe83eb163b4fbd7d62954ec3cad3000e966cd9f7461c2c9a3edb4dca
depends_build port:intltool \
- port:pkgconfig
+ port:pkgconfig \
+ port:autoconf \
+ port:automake \
+ port:libtool \
+ port:gnome-common
depends_lib port:desktop-file-utils \
port:libxml2 \
@@ -35,18 +40,25 @@
port:libgnomeui \
port:gconf \
port:gtksourceview \
- port:vte
+ port:vte-gtk2-compat
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
+ patch-tests-firstplugin.xml.diff \
+ patch-gcc-4.4-compat.diff \
+ patch-fix-save-to-file-bz587553.diff
post-patch {
+ xinstall -m 755 ${filespath}/autogen.sh ${worksrcpath}
reinplace "s|@@MP_PREFIX@@|${prefix}|" ${worksrcpath}/tests/firstplugin.xml
}
+# use upstream autogen.sh to reconfigure with our intltool.m4
+
+configure.cmd ./autogen.sh
+
# TODO: Fix buggy C++ code that clang complains about
compiler.blacklist *clang*
@@ -62,6 +74,12 @@
}
configure.args --mandir=${prefix}/share/man \
+ --enable-dbus=no \
+ --enable-style=no \
+ --enable-debug=yes \
+ --enable-custom-cell-renderer=yes \
+ --enable-libxml-experimental-completion=no \
+ --enable-gtk-file-chooser=yes \
--disable-schemas-install
universal_variant no
Added: trunk/dports/gnome/mlview/files/autogen.sh
===================================================================
--- trunk/dports/gnome/mlview/files/autogen.sh (rev 0)
+++ trunk/dports/gnome/mlview/files/autogen.sh 2014-07-18 22:11:54 UTC (rev 122254)
@@ -0,0 +1,30 @@
+#!/bin/sh
+#Authors: Dodji Seketeli & Ga\xEBl Chamoulaud.
+
+# Run this to generate all the initial makefiles, etc. srcdir=`dirname $0`
+test -z "$srcdir" && srcdir=.
+
+PKG_NAME="mlview"
+
+(test -f $srcdir/configure.in \
+ && test -f $srcdir/ChangeLog \
+ && test -d $srcdir/src) || {
+ echo -n "**Error**: Directory "\`$srcdir\'" does not look like the"
+ echo " top-level $PKG_NAME directory"
+ exit 1
+}
+
+which gnome-autogen.sh || {
+ echo "You need to install gnome-common from the GNOME CVS"
+ exit 1
+}
+
+if test x$@ = x -a x$MLVIEW_DEVEL != x; then
+ args="--enable-verbose=yes --enable-custom-cell-renderer=yes --enable-gtk-file-chooser=yes"
+else
+ args="$@"
+fi
+
+REQUIRED_AUTOMAKE_VERSION=1.7.2
+
+USE_GNOME2_MACROS=1 . gnome-autogen.sh $args
Added: trunk/dports/gnome/mlview/files/patch-fix-save-to-file-bz587553.diff
===================================================================
--- trunk/dports/gnome/mlview/files/patch-fix-save-to-file-bz587553.diff (rev 0)
+++ trunk/dports/gnome/mlview/files/patch-fix-save-to-file-bz587553.diff 2014-07-18 22:11:54 UTC (rev 122254)
@@ -0,0 +1,25 @@
+From 31c2d7910c68d51bcbf1dd0d71c36cc593e07785 Mon Sep 17 00:00:00 2001
+From: Dodji Seketeli <dodji at redhat.com>
+Date: Wed, 1 Jul 2009 21:16:07 +0200
+Subject: Fix crash when saving to a file (#587553)
+
+ * src/mlview-old-gvc.cc (OldGVC::on_view_name_changed):
+ Do not cast IView* into Gtk::Widget*. Rather use
+ IView::get_view_widget().
+
+diff --git a/src/mlview-old-gvc.cc b/src/mlview-old-gvc.cc
+index 0feb6e1..9e6ab0c 100644
+--- src/mlview-old-gvc.cc
++++ src/mlview-old-gvc.cc
+@@ -292,7 +292,7 @@ OldGVC::on_view_name_changed (IView* a_view)
+
+ new_view_name = a_view->get_view_name () ;
+
+- view_impl = (Gtk::Widget*) a_view ;
++ view_impl = a_view->get_view_widget ();
+ THROW_IF_FAIL (view_impl) ;
+
+ view_container = view_impl->get_parent () ;
+--
+cgit v0.10.1
+
Added: trunk/dports/gnome/mlview/files/patch-gcc-4.4-compat.diff
===================================================================
--- trunk/dports/gnome/mlview/files/patch-gcc-4.4-compat.diff (rev 0)
+++ trunk/dports/gnome/mlview/files/patch-gcc-4.4-compat.diff 2014-07-18 22:11:54 UTC (rev 122254)
@@ -0,0 +1,156 @@
+From 0b113e4bf6add76fa7c23d3bad31eb7217632eb6 Mon Sep 17 00:00:00 2001
+From: Dodji Seketeli <dodji at redhat.com>
+Date: Wed, 1 Jul 2009 20:59:49 +0200
+Subject: Bring mlview back to live wrt gcc 4.4
+
+ * configure.in: Bump to 0.10
+ Cleanup to make it pass autogen.sh
+ * src/mlview-editor.cc (Editor::select_view_to_open):
+ Don't cast int into enum.
+ * src/mlview-validator.cc (ViewManager::get_views_of_document):
+ Avoid returning a non initialized variable.
+ (ViewManager::select_view_to_open): Don't cast int into enum.
+ * src/recent-files/egg-recent-util.c (egg_recent_util_get_unique_id):
+ Use the right variable.
+
+diff --git a/configure.in b/configure.in
+index 06b3620..177727c 100644
+--- configure.in
++++ configure.in
+@@ -1,7 +1,7 @@
+ dnl **************************************************************
+ dnl Process this file with autoconf to produce a configure script.
+ dnl **************************************************************
+-AC_INIT(mlview,0.9.0, http://bugzilla.gnome.org/enter_bug.cgi?product=mlview)
++AC_INIT(mlview,0.9.0)
+ AC_PREREQ(2.59)
+ AC_CONFIG_SRCDIR(src/main.cc)
+ AC_CANONICAL_TARGET
+@@ -10,7 +10,7 @@ AM_INIT_AUTOMAKE(AC_PACKAGE_NAME, AC_PACKAGE_VERSION)
+ AM_CONFIG_HEADER(config.h)
+
+ MLVIEW_MAJOR_VERSION=0
+-MLVIEW_MINOR_VERSION=9
++MLVIEW_MINOR_VERSION=10
+ MLVIEW_MICRO_VERSION=0
+
+
+@@ -77,11 +77,9 @@ MLVIEW_VERSION_NUMBER=`expr $MLVIEW_MAJOR_VERSION \
+ MLVIEW_EXE=$prefix/bin/mlv
+ AC_SUBST(MLVIEW_VERSION_NUMBER)
+ AC_SUBST(MLVIEW_VERSION)
+-AC_SUBST(AC_PACKAGE_VERSION)
+ AC_SUBST(LIBMLVIEW_VERSION_NUMBER)
+ AC_SUBST(LIBMLVIEW_VERSION_INFO)
+ AC_SUBST(LIBMLVIEW_VERSION)
+-AC_SUBST(AC_PACKAGE_VERSION)
+ AC_SUBST(MLVIEW_EXE)
+
+ dnl *********************
+diff --git a/src/mlview-editor.cc b/src/mlview-editor.cc
+index bc48206..ed9b2cf 100644
+--- src/mlview-editor.cc
++++ src/mlview-editor.cc
+@@ -352,7 +352,7 @@ Editor::select_view_to_open (void)
+ GtkWidget *button6 = NULL ;
+ GtkWidget *sel_menu_item = NULL ;
+
+- enum MLVIEW_SELECTED_BUTTON button;
++ int button;
+ ViewDescriptor const *result = NULL;
+ ViewDescriptor const *view_desc_ptr = NULL ;
+ gchar *base_name = NULL;
+@@ -421,8 +421,7 @@ Editor::select_view_to_open (void)
+ GTK_WIDGET_SET_FLAGS (button6, GTK_CAN_DEFAULT);
+
+ /* show dialog */
+- button = (enum MLVIEW_SELECTED_BUTTON)
+- gtk_dialog_run (GTK_DIALOG (dialog));
++ button = gtk_dialog_run (GTK_DIALOG (dialog));
+
+
+ switch (button) {
+diff --git a/src/mlview-validator-window.cc b/src/mlview-validator-window.cc
+index 6c863e9..ec3c726 100644
+--- src/mlview-validator-window.cc
++++ src/mlview-validator-window.cc
+@@ -23,9 +23,7 @@
+ *See COPYRIGHT file for copyright information.
+ */
+ #include <string.h>
+-
+ #include <glade/glade.h>
+-
+ #include "mlview-validator-window.h"
+ #include "mlview-validator.h"
+
+diff --git a/src/mlview-validator.cc b/src/mlview-validator.cc
+index 3712962..77ec4c3 100644
+--- src/mlview-validator.cc
++++ src/mlview-validator.cc
+@@ -23,9 +23,12 @@
+ *See COPYRIGHT file for copyright information.
+ */
+
++#include <memory>
+ #include "mlview-validator.h"
+ #include "mlview-safe-ptr-utils.h"
+
++using namespace std;
++
+ #define MESSAGE_LINE_LENGTH 55
+ namespace mlview
+ {
+diff --git a/src/mlview-view-manager.cc b/src/mlview-view-manager.cc
+index 7df4e03..e6a7cb4 100644
+--- src/mlview-view-manager.cc
++++ src/mlview-view-manager.cc
+@@ -523,13 +523,13 @@ list<IView*>
+ ViewManager::get_views_of_document (const MlViewXMLDocument *a_doc) const
+ {
+ THROW_IF_FAIL (a_doc) ;
+- list<IView*> *result ;
++ list<IView*> *result = 0;
+
+ DocToViewsMap::iterator it = m_priv->doc_to_views_map.find
+ (const_cast<MlViewXMLDocument*>(a_doc)) ;
+
+ if (it == m_priv->doc_to_views_map.end ()) {
+- return *result ;
++ return list<IView*> ();
+ }
+ result = it->second ;
+ return *result ;
+@@ -641,7 +641,7 @@ ViewManager::select_view_to_open (void)
+ GtkWidget *button6 = NULL ;
+ GtkWidget *sel_menu_item = NULL ;
+
+- enum MLVIEW_SELECTED_BUTTON button;
++ int button;
+ struct ViewDescriptor *result = NULL;
+ ViewDescriptor const *view_desc_ptr = NULL ;
+ gchar *base_name = NULL;
+@@ -714,8 +714,7 @@ ViewManager::select_view_to_open (void)
+ GTK_WIDGET_SET_FLAGS (button6, GTK_CAN_DEFAULT);
+
+ /* show dialog */
+- button = (enum MLVIEW_SELECTED_BUTTON)
+- gtk_dialog_run (GTK_DIALOG (dialog));
++ button = gtk_dialog_run (GTK_DIALOG (dialog));
+
+
+ switch (button) {
+diff --git a/src/recent-files/egg-recent-util.c b/src/recent-files/egg-recent-util.c
+index 6780cd1..8eb13ff 100644
+--- src/recent-files/egg-recent-util.c
++++ src/recent-files/egg-recent-util.c
+@@ -134,5 +134,5 @@ egg_recent_util_get_unique_id (void)
+ rand = g_random_int ();
+ pid = getpid ();
+
+- return g_strdup_printf ("%s-%d-%d-%d", hostname, (int)time, (int)rand, (int)pid);
++ return g_strdup_printf ("%s-%d-%d-%d", hostname, (int)the_time, (int)rand, (int)pid);
+ }
+--
+cgit v0.10.1
+
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20140718/d3178b44/attachment.html>
More information about the macports-changes
mailing list