1 |
aballier 08/08/30 17:07:55 |
2 |
|
3 |
Added: amyedit-1.0-signal.patch |
4 |
Log: |
5 |
Run eautoreconf after patching makefile.am instead of letting maintainer-mode do it, should fix bug #205984. Fix build with recent libsigc++ by Sven E. dark@×××××××××.org, bug #229801. |
6 |
(Portage version: 2.2_rc8/cvs/Linux 2.6.26.3 x86_64) |
7 |
|
8 |
Revision Changes Path |
9 |
1.1 app-editors/amyedit/files/amyedit-1.0-signal.patch |
10 |
|
11 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-editors/amyedit/files/amyedit-1.0-signal.patch?rev=1.1&view=markup |
12 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-editors/amyedit/files/amyedit-1.0-signal.patch?rev=1.1&content-type=text/plain |
13 |
|
14 |
Index: amyedit-1.0-signal.patch |
15 |
=================================================================== |
16 |
diff -Naur amyeditbroken/src/AmyEdit.cc amyedit-1.0/src/AmyEdit.cc |
17 |
--- amyeditbroken/src/AmyEdit.cc 2006-03-13 22:13:08.000000000 +0100 |
18 |
+++ amyedit-1.0/src/AmyEdit.cc 2008-07-12 05:07:43.965608312 +0200 |
19 |
@@ -65,9 +65,9 @@ |
20 |
|
21 |
/* My Signals */ |
22 |
// signals when there is a file available |
23 |
-SigC::Signal1<void,bool> signal_file_open; |
24 |
+sigc::signal1<void,bool> signal_file_open; |
25 |
// signals an update to preferences |
26 |
-SigC::Signal0<void> signal_preferences_update; |
27 |
+sigc::signal0<void> signal_preferences_update; |
28 |
/**************/ |
29 |
|
30 |
AmyEdit* AmyEdit::smInstance=NULL; |
31 |
diff -Naur amyeditbroken/src/EditTabs.cc amyedit-1.0/src/EditTabs.cc |
32 |
--- amyeditbroken/src/EditTabs.cc 2006-03-13 22:25:53.000000000 +0100 |
33 |
+++ amyedit-1.0/src/EditTabs.cc 2008-07-12 05:08:41.022094749 +0200 |
34 |
@@ -76,7 +76,7 @@ |
35 |
set_tab_pos(Gtk::POS_TOP); |
36 |
set_scrollable(true); |
37 |
|
38 |
- extern SigC::Signal0<void> signal_preferences_update; |
39 |
+ extern sigc::signal0<void> signal_preferences_update; |
40 |
|
41 |
signal_switch_page().connect(sigc::mem_fun(*this, &EditTabs::on_switching_page)); |
42 |
signal_preferences_update.connect(sigc::mem_fun(*this, &EditTabs::on_preferences_update)); |
43 |
@@ -414,7 +414,7 @@ |
44 |
|
45 |
bool EditTabs::CloseTab(int tab) |
46 |
{ |
47 |
- extern SigC::Signal1<void,bool> signal_file_open; |
48 |
+ extern sigc::signal1<void,bool> signal_file_open; |
49 |
|
50 |
if (tab<0) |
51 |
tab=get_current_page(); |
52 |
@@ -686,8 +686,8 @@ |
53 |
|
54 |
void EditTabs::on_switching_page(GtkNotebookPage *page, guint number) |
55 |
{ |
56 |
- extern SigC::Signal1<void, int> signal_line_set; |
57 |
- extern SigC::Signal1<void, bool> signal_file_open; |
58 |
+ extern sigc::signal1<void, int> signal_line_set; |
59 |
+ extern sigc::signal1<void, bool> signal_file_open; |
60 |
Page *curtab = get_current_tab(); |
61 |
|
62 |
if (curtab) |
63 |
@@ -735,7 +735,7 @@ |
64 |
|
65 |
on_preferences_update(); |
66 |
|
67 |
- extern SigC::Signal0<void> signal_preferences_update; |
68 |
+ extern sigc::signal0<void> signal_preferences_update; |
69 |
get_buffer()->signal_modified_changed().connect(sigc::mem_fun(*this, &EditTabs::Page::on_modified_changed)); |
70 |
get_buffer()->signal_changed().connect(sigc::mem_fun(*this, &EditTabs::Page::on_changed)); |
71 |
get_buffer()->signal_mark_set().connect(sigc::mem_fun(*this, &EditTabs::Page::on_mark_changed)); |
72 |
@@ -815,7 +815,7 @@ |
73 |
|
74 |
void EditTabs::Page::on_changed() |
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 |
|
80 |
} |
81 |
@@ -823,7 +823,7 @@ |
82 |
void EditTabs::Page::on_mark_changed(Gtk::SourceBuffer::iterator iter, Glib::RefPtr<Gtk::SourceBuffer::Mark> mark){ |
83 |
if (mark->get_name()=="insert") |
84 |
{ |
85 |
- extern SigC::Signal1<void, int> signal_line_set; |
86 |
+ extern sigc::signal1<void, int> signal_line_set; |
87 |
|
88 |
signal_line_set(get_buffer()->get_insert()->get_iter().get_line()); |
89 |
|
90 |
diff -Naur amyeditbroken/src/StatusBar.cc amyedit-1.0/src/StatusBar.cc |
91 |
--- amyeditbroken/src/StatusBar.cc 2005-12-17 15:56:47.000000000 +0100 |
92 |
+++ amyedit-1.0/src/StatusBar.cc 2008-07-12 05:09:14.020602906 +0200 |
93 |
@@ -50,7 +50,7 @@ |
94 |
#include "StatusBar.hh" |
95 |
#include "Utils.hh" |
96 |
|
97 |
-SigC::Signal1<void, int> signal_line_set; |
98 |
+sigc::signal1<void, int> signal_line_set; |
99 |
|
100 |
StatusBar::StatusBar() |
101 |
{ |