diff --git a/editors/amyedit/amyedit-1.0-keyfile.patch b/editors/amyedit/amyedit-1.0-keyfile.patch new file mode 100644 index 000000000..42c05d535 --- /dev/null +++ b/editors/amyedit/amyedit-1.0-keyfile.patch @@ -0,0 +1,83 @@ +# --- SDE-COPYRIGHT-NOTE-BEGIN --- +# This copyright note is auto-generated by ./scripts/Create-CopyPatch. +# +# Filename: package/.../amyedit/amyedit-1.0-keyfile.patch +# Copyright (C) 2010 The OpenSDE Project +# +# More information can be found in the files COPYING and README. +# +# This patch file is dual-licensed. It is available under the license the +# patched project is licensed under, as long as it is an OpenSource license +# as defined at http://www.opensource.org/ (e.g. BSD, X11) or under the terms +# of the GNU General Public License as published by the Free Software +# Foundation; either version 2 of the License, or (at your option) any later +# version. +# --- SDE-COPYRIGHT-NOTE-END --- + +Description: Remove private Glib::KeyFile usage as >=glibmm-2.14 provides an alternative + +This patch was borrowed from Gentoo Linux: +http://sources.gentoo.org/cgi-bin/viewvc.cgi/gentoo-x86/app-editors/amyedit/files/amyedit-1.0-keyfile.patch?revision=1.1&view=markup + +diff -ur amyedit-1.0/src/main.cc amyedit-1.0.new/src/main.cc +--- amyedit-1.0/src/main.cc 2006-03-14 06:08:32.000000000 +0700 ++++ amyedit-1.0.new/src/main.cc 2008-01-07 20:45:39.000000000 +0700 +@@ -54,7 +54,6 @@ + + #include "AmyEdit.hh" + #include "gtksourceviewmm/init.hh" +-#include "gtkmm_extra/keyfile.h" + #include "Utils.hh" + + int main(int argc, char **argv) +@@ -65,7 +64,6 @@ + + Gtk::Main m(&argc, &argv); + Gtk::SourceViewmm_init(); +- Glib::keyfile_init(); + + /* TODO This should probably be removed and created on demand */ + +Only in amyedit-1.0.new/src: main.o +Only in amyedit-1.0.new/src: Makefile +diff -ur amyedit-1.0/src/Makefile.am amyedit-1.0.new/src/Makefile.am +--- amyedit-1.0/src/Makefile.am 2006-03-08 05:44:53.000000000 +0700 ++++ amyedit-1.0.new/src/Makefile.am 2008-01-07 20:41:46.000000000 +0700 +@@ -30,8 +30,7 @@ + gtksourceviewmm/sourcelanguage.cpp \ + gtksourceviewmm/sourcelanguagesmanager.cpp \ + gtksourceviewmm/sourceview.cpp \ +- gtksourceviewmm/init.cc \ +- gtkmm_extra/keyfile.cc ++ gtksourceviewmm/init.cc + + headers = \ + AboutDialog.hh \ +@@ -54,15 +53,13 @@ + gtksourceviewmm/sourcelanguage.h \ + gtksourceviewmm/sourcelanguagesmanager.h \ + gtksourceviewmm/sourceview.h \ +- gtksourceviewmm/init.hh \ +- gtkmm_extra/keyfile.h ++ gtksourceviewmm/init.hh + + privateheaders= \ + gtksourceviewmm/private/sourcebuffer_p.h \ + gtksourceviewmm/private/sourcelanguage_p.h \ + gtksourceviewmm/private/sourcelanguagesmanager_p.h \ + gtksourceviewmm/private/sourceview_p.h \ +- gtkmm_extra/private/keyfile_p.h \ + Utils_p.hh + + if PRECOMPILE_HEADERS +diff -ur amyedit-1.0/src/PrefStruct.hh amyedit-1.0.new/src/PrefStruct.hh +--- amyedit-1.0/src/PrefStruct.hh 2006-03-09 06:54:41.000000000 +0700 ++++ amyedit-1.0.new/src/PrefStruct.hh 2008-01-07 20:46:32.000000000 +0700 +@@ -24,7 +24,6 @@ + + #include "Preferences.hh" + #include +-#include + #include + + class PrefStruct diff --git a/editors/amyedit/amyedit-1.0-signal.patch b/editors/amyedit/amyedit-1.0-signal.patch new file mode 100644 index 000000000..39a3ffe0f --- /dev/null +++ b/editors/amyedit/amyedit-1.0-signal.patch @@ -0,0 +1,107 @@ +# --- SDE-COPYRIGHT-NOTE-BEGIN --- +# This copyright note is auto-generated by ./scripts/Create-CopyPatch. +# +# Filename: package/.../amyedit/amyedit-1.0-signal.patch +# Copyright (C) 2010 The OpenSDE Project +# +# More information can be found in the files COPYING and README. +# +# This patch file is dual-licensed. It is available under the license the +# patched project is licensed under, as long as it is an OpenSource license +# as defined at http://www.opensource.org/ (e.g. BSD, X11) or under the terms +# of the GNU General Public License as published by the Free Software +# Foundation; either version 2 of the License, or (at your option) any later +# version. +# --- SDE-COPYRIGHT-NOTE-END --- + +Description: Fix build with recent libsigc++ + +This patch was borrowed from Gentoo Linux: +http://sources.gentoo.org/cgi-bin/viewvc.cgi/gentoo-x86/app-editors/amyedit/files/amyedit-1.0-signal.patch?revision=1.1&view=markup + +diff -Naur amyeditbroken/src/AmyEdit.cc amyedit-1.0/src/AmyEdit.cc +--- amyeditbroken/src/AmyEdit.cc 2006-03-13 22:13:08.000000000 +0100 ++++ amyedit-1.0/src/AmyEdit.cc 2008-07-12 05:07:43.965608312 +0200 +@@ -65,9 +65,9 @@ + + /* My Signals */ + // signals when there is a file available +-SigC::Signal1 signal_file_open; ++sigc::signal1 signal_file_open; + // signals an update to preferences +-SigC::Signal0 signal_preferences_update; ++sigc::signal0 signal_preferences_update; + /**************/ + + AmyEdit* AmyEdit::smInstance=NULL; +diff -Naur amyeditbroken/src/EditTabs.cc amyedit-1.0/src/EditTabs.cc +--- amyeditbroken/src/EditTabs.cc 2006-03-13 22:25:53.000000000 +0100 ++++ amyedit-1.0/src/EditTabs.cc 2008-07-12 05:08:41.022094749 +0200 +@@ -76,7 +76,7 @@ + set_tab_pos(Gtk::POS_TOP); + set_scrollable(true); + +- extern SigC::Signal0 signal_preferences_update; ++ extern sigc::signal0 signal_preferences_update; + + signal_switch_page().connect(sigc::mem_fun(*this, &EditTabs::on_switching_page)); + signal_preferences_update.connect(sigc::mem_fun(*this, &EditTabs::on_preferences_update)); +@@ -414,7 +414,7 @@ + + bool EditTabs::CloseTab(int tab) + { +- extern SigC::Signal1 signal_file_open; ++ extern sigc::signal1 signal_file_open; + + if (tab<0) + tab=get_current_page(); +@@ -686,8 +686,8 @@ + + void EditTabs::on_switching_page(GtkNotebookPage *page, guint number) + { +- extern SigC::Signal1 signal_line_set; +- extern SigC::Signal1 signal_file_open; ++ extern sigc::signal1 signal_line_set; ++ extern sigc::signal1 signal_file_open; + Page *curtab = get_current_tab(); + + if (curtab) +@@ -735,7 +735,7 @@ + + on_preferences_update(); + +- extern SigC::Signal0 signal_preferences_update; ++ extern sigc::signal0 signal_preferences_update; + get_buffer()->signal_modified_changed().connect(sigc::mem_fun(*this, &EditTabs::Page::on_modified_changed)); + get_buffer()->signal_changed().connect(sigc::mem_fun(*this, &EditTabs::Page::on_changed)); + get_buffer()->signal_mark_set().connect(sigc::mem_fun(*this, &EditTabs::Page::on_mark_changed)); +@@ -815,7 +815,7 @@ + + void EditTabs::Page::on_changed() + { +- extern SigC::Signal1 signal_line_set; ++ extern sigc::signal1 signal_line_set; + signal_line_set(get_buffer()->get_insert()->get_iter().get_line()); + + } +@@ -823,7 +823,7 @@ + void EditTabs::Page::on_mark_changed(Gtk::SourceBuffer::iterator iter, Glib::RefPtr mark){ + if (mark->get_name()=="insert") + { +- extern SigC::Signal1 signal_line_set; ++ extern sigc::signal1 signal_line_set; + + signal_line_set(get_buffer()->get_insert()->get_iter().get_line()); + +diff -Naur amyeditbroken/src/StatusBar.cc amyedit-1.0/src/StatusBar.cc +--- amyeditbroken/src/StatusBar.cc 2005-12-17 15:56:47.000000000 +0100 ++++ amyedit-1.0/src/StatusBar.cc 2008-07-12 05:09:14.020602906 +0200 +@@ -50,7 +50,7 @@ + #include "StatusBar.hh" + #include "Utils.hh" + +-SigC::Signal1 signal_line_set; ++sigc::signal1 signal_line_set; + + StatusBar::StatusBar() + { diff --git a/editors/amyedit/amyedit.conf b/editors/amyedit/amyedit.conf new file mode 100644 index 000000000..b8a010b2d --- /dev/null +++ b/editors/amyedit/amyedit.conf @@ -0,0 +1,16 @@ +# --- SDE-COPYRIGHT-NOTE-BEGIN --- +# This copyright note is auto-generated by ./scripts/Create-CopyPatch. +# +# Filename: package/.../amyedit/amyedit.conf +# Copyright (C) 2010 The OpenSDE Project +# +# More information can be found in the files COPYING and README. +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; version 2 of the License. A copy of the +# GNU General Public License can be found in the file COPYING. +# --- SDE-COPYRIGHT-NOTE-END --- + +# we patch Makefile.am (amyedit-1.0-keyfile.patch) +autogen=1