Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Arwed von Merkatz (bdad7341e6f64ec1bd7c874408a46a8b7c3483d7)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Arwed von Merkatz <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Arwed von Merkatz (bdad7341e6f64ec1bd7c874408a46a8b7c3483d7)
  • Date: Tue, 6 Apr 2010 13:04:58 -0500

GIT changes to master grimoire by Arwed von Merkatz <v.merkatz AT gmx.net>:

editors/mlview/DEPENDS | 13 ++++++--
editors/mlview/HISTORY | 5 +++
editors/mlview/PRE_BUILD | 3 +
editors/mlview/mlview-gcc.patch | 65
++++++++++++++++++++++++++++++++++++++++
4 files changed, 84 insertions(+), 2 deletions(-)

New commits:
commit bdad7341e6f64ec1bd7c874408a46a8b7c3483d7
Author: Arwed von Merkatz <v.merkatz AT gmx.net>
Commit: Arwed von Merkatz <v.merkatz AT gmx.net>

mlview: dependency cleanup and fixed compile with current gcc

diff --git a/editors/mlview/DEPENDS b/editors/mlview/DEPENDS
index ecfb169..bb9b544 100755
--- a/editors/mlview/DEPENDS
+++ b/editors/mlview/DEPENDS
@@ -1,2 +1,11 @@
-depends eel2 &&
-depends libglademm
+depends glib2 &&
+depends gtk+2 &&
+depends gtkmm2 &&
+depends libglade2 &&
+depends libglademm &&
+depends libgnome &&
+depends gnome-vfs2 &&
+depends libgnomeui &&
+depends gconf2 &&
+depends gtksourceview1 &&
+depends vte
diff --git a/editors/mlview/HISTORY b/editors/mlview/HISTORY
index 0d5bcc8..f46acac 100644
--- a/editors/mlview/HISTORY
+++ b/editors/mlview/HISTORY
@@ -1,3 +1,8 @@
+2010-04-06 Arwed v. Merkatz <v.merkatz AT gmx.net>
+ * DEPENDS: removed eel2 added glib2, gtk+2, gtkmm2, libglade2,
+ libgnome, gnome-vfs2, libgnomeui, gconf2, gtksourceview1 and vte
+ * PRE_BUILD, mlview-gcc.patch: patch to fix compile with current gcc
+
2006-09-21 Juuso Alasuutari <iuso AT sourcemage.org>
* DETAILS: [automated] Removed BUILD_API=2 and MAINTAINER.

diff --git a/editors/mlview/PRE_BUILD b/editors/mlview/PRE_BUILD
new file mode 100755
index 0000000..8c53309
--- /dev/null
+++ b/editors/mlview/PRE_BUILD
@@ -0,0 +1,3 @@
+default_pre_build &&
+cd $SOURCE_DIRECTORY &&
+patch -p1 < $SCRIPT_DIRECTORY/mlview-gcc.patch
diff --git a/editors/mlview/mlview-gcc.patch b/editors/mlview/mlview-gcc.patch
new file mode 100644
index 0000000..d51dccc
--- /dev/null
+++ b/editors/mlview/mlview-gcc.patch
@@ -0,0 +1,65 @@
+diff -ur mlview-0.9.0/src/mlview-editor.cc
mlview-0.9.0-patched//src/mlview-editor.cc
+--- mlview-0.9.0/src/mlview-editor.cc 2005-08-07 09:42:28.000000000 +0200
++++ mlview-0.9.0-patched//src/mlview-editor.cc 2010-04-06 19:50:37.000000000
+0200
+@@ -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
+diff -ur mlview-0.9.0/src/mlview-plugin.h
mlview-0.9.0-patched//src/mlview-plugin.h
+--- mlview-0.9.0/src/mlview-plugin.h 2005-08-07 09:47:54.000000000 +0200
++++ mlview-0.9.0-patched//src/mlview-plugin.h 2010-04-06 19:49:49.000000000
+0200
+@@ -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 () ;
+
+diff -ur mlview-0.9.0/src/mlview-source-view.h
mlview-0.9.0-patched//src/mlview-source-view.h
+--- mlview-0.9.0/src/mlview-source-view.h 2005-08-07 09:42:28.000000000
+0200
++++ mlview-0.9.0-patched//src/mlview-source-view.h 2010-04-06
19:46:35.000000000 +0200
+@@ -53,7 +53,7 @@
+
+ enum MlViewStatus set_default_options () ;
+
+- MlViewXMLDocument* SourceView::get_document () ;
++ MlViewXMLDocument* get_document () ;
+
+ GtkUIManager * get_ui_manager () ;
+
+diff -ur mlview-0.9.0/src/mlview-tree-view.h
mlview-0.9.0-patched//src/mlview-tree-view.h
+--- mlview-0.9.0/src/mlview-tree-view.h 2005-07-22 21:14:28.000000000
+0200
++++ mlview-0.9.0-patched//src/mlview-tree-view.h 2010-04-06
19:46:17.000000000 +0200
+@@ -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 () ;
+
+diff -ur mlview-0.9.0/src/mlview-validator.cc
mlview-0.9.0-patched//src/mlview-validator.cc
+--- mlview-0.9.0/src/mlview-validator.cc 2005-07-31 21:16:16.000000000
+0200
++++ mlview-0.9.0-patched//src/mlview-validator.cc 2010-04-06
19:48:50.000000000 +0200
+@@ -26,6 +26,7 @@
+ #include "mlview-validator.h"
+ #include "mlview-safe-ptr-utils.h"
+
++#include <backward/auto_ptr.h>
+ #define MESSAGE_LINE_LENGTH 55
+ namespace mlview
+ {



  • [SM-Commit] GIT changes to master grimoire by Arwed von Merkatz (bdad7341e6f64ec1bd7c874408a46a8b7c3483d7), Arwed von Merkatz, 04/06/2010

Archive powered by MHonArc 2.6.24.

Top of Page