OpenSDE Packages Database (without history before r20070)
You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.

107 lines
4.0 KiB

  1. # --- SDE-COPYRIGHT-NOTE-BEGIN ---
  2. # This copyright note is auto-generated by ./scripts/Create-CopyPatch.
  3. #
  4. # Filename: package/.../amyedit/amyedit-1.0-signal.patch
  5. # Copyright (C) 2010 The OpenSDE Project
  6. #
  7. # More information can be found in the files COPYING and README.
  8. #
  9. # This patch file is dual-licensed. It is available under the license the
  10. # patched project is licensed under, as long as it is an OpenSource license
  11. # as defined at http://www.opensource.org/ (e.g. BSD, X11) or under the terms
  12. # of the GNU General Public License as published by the Free Software
  13. # Foundation; either version 2 of the License, or (at your option) any later
  14. # version.
  15. # --- SDE-COPYRIGHT-NOTE-END ---
  16. Description: Fix build with recent libsigc++
  17. This patch was borrowed from Gentoo Linux:
  18. http://sources.gentoo.org/cgi-bin/viewvc.cgi/gentoo-x86/app-editors/amyedit/files/amyedit-1.0-signal.patch?revision=1.1&view=markup
  19. diff -Naur amyeditbroken/src/AmyEdit.cc amyedit-1.0/src/AmyEdit.cc
  20. --- amyeditbroken/src/AmyEdit.cc 2006-03-13 22:13:08.000000000 +0100
  21. +++ amyedit-1.0/src/AmyEdit.cc 2008-07-12 05:07:43.965608312 +0200
  22. @@ -65,9 +65,9 @@
  23. /* My Signals */
  24. // signals when there is a file available
  25. -SigC::Signal1<void,bool> signal_file_open;
  26. +sigc::signal1<void,bool> signal_file_open;
  27. // signals an update to preferences
  28. -SigC::Signal0<void> signal_preferences_update;
  29. +sigc::signal0<void> signal_preferences_update;
  30. /**************/
  31. AmyEdit* AmyEdit::smInstance=NULL;
  32. diff -Naur amyeditbroken/src/EditTabs.cc amyedit-1.0/src/EditTabs.cc
  33. --- amyeditbroken/src/EditTabs.cc 2006-03-13 22:25:53.000000000 +0100
  34. +++ amyedit-1.0/src/EditTabs.cc 2008-07-12 05:08:41.022094749 +0200
  35. @@ -76,7 +76,7 @@
  36. set_tab_pos(Gtk::POS_TOP);
  37. set_scrollable(true);
  38. - extern SigC::Signal0<void> signal_preferences_update;
  39. + extern sigc::signal0<void> signal_preferences_update;
  40. signal_switch_page().connect(sigc::mem_fun(*this, &EditTabs::on_switching_page));
  41. signal_preferences_update.connect(sigc::mem_fun(*this, &EditTabs::on_preferences_update));
  42. @@ -414,7 +414,7 @@
  43. bool EditTabs::CloseTab(int tab)
  44. {
  45. - extern SigC::Signal1<void,bool> signal_file_open;
  46. + extern sigc::signal1<void,bool> signal_file_open;
  47. if (tab<0)
  48. tab=get_current_page();
  49. @@ -686,8 +686,8 @@
  50. void EditTabs::on_switching_page(GtkNotebookPage *page, guint number)
  51. {
  52. - extern SigC::Signal1<void, int> signal_line_set;
  53. - extern SigC::Signal1<void, bool> signal_file_open;
  54. + extern sigc::signal1<void, int> signal_line_set;
  55. + extern sigc::signal1<void, bool> signal_file_open;
  56. Page *curtab = get_current_tab();
  57. if (curtab)
  58. @@ -735,7 +735,7 @@
  59. on_preferences_update();
  60. - extern SigC::Signal0<void> signal_preferences_update;
  61. + extern sigc::signal0<void> signal_preferences_update;
  62. get_buffer()->signal_modified_changed().connect(sigc::mem_fun(*this, &EditTabs::Page::on_modified_changed));
  63. get_buffer()->signal_changed().connect(sigc::mem_fun(*this, &EditTabs::Page::on_changed));
  64. get_buffer()->signal_mark_set().connect(sigc::mem_fun(*this, &EditTabs::Page::on_mark_changed));
  65. @@ -815,7 +815,7 @@
  66. void EditTabs::Page::on_changed()
  67. {
  68. - extern SigC::Signal1<void, int> signal_line_set;
  69. + extern sigc::signal1<void, int> signal_line_set;
  70. signal_line_set(get_buffer()->get_insert()->get_iter().get_line());
  71. }
  72. @@ -823,7 +823,7 @@
  73. void EditTabs::Page::on_mark_changed(Gtk::SourceBuffer::iterator iter, Glib::RefPtr<Gtk::SourceBuffer::Mark> mark){
  74. if (mark->get_name()=="insert")
  75. {
  76. - extern SigC::Signal1<void, int> signal_line_set;
  77. + extern sigc::signal1<void, int> signal_line_set;
  78. signal_line_set(get_buffer()->get_insert()->get_iter().get_line());
  79. diff -Naur amyeditbroken/src/StatusBar.cc amyedit-1.0/src/StatusBar.cc
  80. --- amyeditbroken/src/StatusBar.cc 2005-12-17 15:56:47.000000000 +0100
  81. +++ amyedit-1.0/src/StatusBar.cc 2008-07-12 05:09:14.020602906 +0200
  82. @@ -50,7 +50,7 @@
  83. #include "StatusBar.hh"
  84. #include "Utils.hh"
  85. -SigC::Signal1<void, int> signal_line_set;
  86. +sigc::signal1<void, int> signal_line_set;
  87. StatusBar::StatusBar()
  88. {