diff options
author | 2010-03-27 08:37:57 +0000 | |
---|---|---|
committer | 2010-03-27 08:37:57 +0000 | |
commit | 2bd35c210795badd18feb28ac25a576fc23f063e (patch) | |
tree | c8b11586062ed842dbdca127591e8ca0b84e5d10 /app-editors/mlview/files | |
parent | Update gtkmm dependency in accordance with real requirements, fixes #311421. (diff) | |
download | gentoo-2-2bd35c210795badd18feb28ac25a576fc23f063e.tar.gz gentoo-2-2bd35c210795badd18feb28ac25a576fc23f063e.tar.bz2 gentoo-2-2bd35c210795badd18feb28ac25a576fc23f063e.zip |
Version bump wrt #311573 by Michael Weber.
(Portage version: 2.2_rc67/cvs/Linux x86_64)
Diffstat (limited to 'app-editors/mlview/files')
-rw-r--r-- | app-editors/mlview/files/mlview-0.9.0-desktop.patch | 20 | ||||
-rw-r--r-- | app-editors/mlview/files/mlview-0.9.0-gcc44.patch | 82 |
2 files changed, 102 insertions, 0 deletions
diff --git a/app-editors/mlview/files/mlview-0.9.0-desktop.patch b/app-editors/mlview/files/mlview-0.9.0-desktop.patch new file mode 100644 index 000000000000..3906e6f30c4a --- /dev/null +++ b/app-editors/mlview/files/mlview-0.9.0-desktop.patch @@ -0,0 +1,20 @@ +--- mlview.desktop.in ++++ mlview.desktop.in +@@ -1,13 +1,10 @@ + [Desktop Entry] +-Version=0.9.4 +-Encoding=UTF-8 + Type=Application + Name=MlView XML Editor + GenericName=MlView Generic XML Editor +-Categories=Application;Development; ++Categories=Development; + Comment=A generic simple XML editor for GNOME +-Icon=mlview-app-icon.xpm +-TryExec=mlv +-Exec=@MLVIEW_EXE@ %F ++Icon=mlview-app-icon ++TryExec=mlview ++Exec=mlview %F + Terminal=false +- diff --git a/app-editors/mlview/files/mlview-0.9.0-gcc44.patch b/app-editors/mlview/files/mlview-0.9.0-gcc44.patch new file mode 100644 index 000000000000..b82398f726d7 --- /dev/null +++ b/app-editors/mlview/files/mlview-0.9.0-gcc44.patch @@ -0,0 +1,82 @@ +http://bugs.gentoo.org/311573 + +--- src/mlview-tree-view.h ++++ src/mlview-tree-view.h +@@ -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-source-view.h ++++ src/mlview-source-view.h +@@ -53,7 +53,7 @@ + + enum MlViewStatus set_default_options () ; + +- MlViewXMLDocument* SourceView::get_document () ; ++ MlViewXMLDocument* get_document () ; + + GtkUIManager * get_ui_manager () ; + +--- src/mlview-validator.cc ++++ src/mlview-validator.cc +@@ -25,6 +25,7 @@ + + #include "mlview-validator.h" + #include "mlview-safe-ptr-utils.h" ++#include <memory> + + #define MESSAGE_LINE_LENGTH 55 + namespace mlview +--- src/mlview-plugin.h ++++ src/mlview-plugin.h +@@ -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 ++++ src/mlview-editor.cc +@@ -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 +@@ -406,17 +406,13 @@ + gtk_dialog_run (GTK_DIALOG (dialog)); + + +- switch (button) { +- case GTK_RESPONSE_OK: ++ if (button == GTK_RESPONSE_OK) { + sel_menu_item = gtk_menu_get_active(GTK_MENU(menu)); + + result = (ViewDescriptor *)g_object_get_data + (G_OBJECT(sel_menu_item), "mlview_view_desc"); +- break; +- +- default: ++ } else { + result = NULL ; +- break; + } + gtk_widget_destroy (dialog); + return result; |