Gentoo Archives: gentoo-commits

From: "Christoph Mende (angelos)" <angelos@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in net-p2p/btg/files: btg-0.9.7-broken_bundled_plotmm_sigc.patch
Date: Fri, 20 Jun 2008 17:28:49
Message-Id: E1K9kPj-0004f2-Va@stork.gentoo.org
1 angelos 08/06/20 17:28:43
2
3 Added: btg-0.9.7-broken_bundled_plotmm_sigc.patch
4 Log:
5 Version bump, bug 214491
6 (Portage version: 2.2_rc1/cvs/Linux 2.6.25-gentoo-r4 x86_64)
7
8 Revision Changes Path
9 1.1 net-p2p/btg/files/btg-0.9.7-broken_bundled_plotmm_sigc.patch
10
11 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-p2p/btg/files/btg-0.9.7-broken_bundled_plotmm_sigc.patch?rev=1.1&view=markup
12 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-p2p/btg/files/btg-0.9.7-broken_bundled_plotmm_sigc.patch?rev=1.1&content-type=text/plain
13
14 Index: btg-0.9.7-broken_bundled_plotmm_sigc.patch
15 ===================================================================
16 diff -Naur btg-0.9.7.orig/external/plotmm/compat.h btg-0.9.7/external/plotmm/compat.h
17 --- btg-0.9.7.orig/external/plotmm/compat.h 2008-03-25 13:49:08.000000000 +0100
18 +++ btg-0.9.7/external/plotmm/compat.h 2008-03-25 14:21:18.000000000 +0100
19 @@ -59,7 +59,7 @@
20 #else
21
22 namespace PlotMM {
23 - typedef SigC::ObjectBase ObjectBase;
24 + typedef sigc::ObjectBase ObjectBase;
25 }
26
27 #endif
28 diff -Naur btg-0.9.7.orig/external/plotmm/curve.h btg-0.9.7/external/plotmm/curve.h
29 --- btg-0.9.7.orig/external/plotmm/curve.h 2008-03-25 13:49:08.000000000 +0100
30 +++ btg-0.9.7/external/plotmm/curve.h 2008-03-25 14:21:18.000000000 +0100
31 @@ -140,7 +140,7 @@
32 int from = 0, int to = -1);
33
34 //! Signals that this curve has changed in some way or the other
35 - SigC::Signal0<void> signal_curve_changed;
36 + sigc::signal0<void> signal_curve_changed;
37
38 protected:
39 virtual void init(const Glib::ustring &title);
40 diff -Naur btg-0.9.7.orig/external/plotmm/plot.cc btg-0.9.7/external/plotmm/plot.cc
41 --- btg-0.9.7.orig/external/plotmm/plot.cc 2008-03-25 13:49:08.000000000 +0100
42 +++ btg-0.9.7/external/plotmm/plot.cc 2008-03-25 14:21:18.000000000 +0100
43 @@ -322,7 +322,7 @@
44 connect(sigc::mem_fun(*this,&Plot::on_canvas_expose_event));
45 #else
46 canvas_.signal_expose_event().
47 - connect(SigC::slot(*this,&Plot::on_canvas_expose_event));
48 + connect(sigc::slot(*this,&Plot::on_canvas_expose_event));
49 #endif
50
51 show_all();
52 @@ -406,19 +406,19 @@
53 }
54
55 //! Return the signal owned by plot canvas
56 -SigC::Signal3<void,int,int,GdkEventButton*> Plot::signal_plot_mouse_press()
57 +sigc::signal3<void,int,int,GdkEventButton*> Plot::signal_plot_mouse_press()
58 {
59 return canvas_.signal_plot_mouse_press;
60 }
61
62 //! Return the signal owned by plot canvas
63 -SigC::Signal3<void,int,int,GdkEventButton*> Plot::signal_plot_mouse_release()
64 +sigc::signal3<void,int,int,GdkEventButton*> Plot::signal_plot_mouse_release()
65 {
66 return canvas_.signal_plot_mouse_release;
67 }
68
69 //! Return the signal owned by plot canvas
70 -SigC::Signal3<void,int,int,GdkEventMotion*> Plot::signal_plot_mouse_move()
71 +sigc::signal3<void,int,int,GdkEventMotion*> Plot::signal_plot_mouse_move()
72 {
73 return canvas_.signal_plot_mouse_move;
74 }
75 diff -Naur btg-0.9.7.orig/external/plotmm/plot.h btg-0.9.7/external/plotmm/plot.h
76 --- btg-0.9.7.orig/external/plotmm/plot.h 2008-03-25 13:49:08.000000000 +0100
77 +++ btg-0.9.7/external/plotmm/plot.h 2008-03-25 14:21:18.000000000 +0100
78 @@ -79,9 +79,9 @@
79 virtual void clear();
80 virtual void end_replot();
81
82 - SigC::Signal3<void,int,int,GdkEventButton*> signal_plot_mouse_press;
83 - SigC::Signal3<void,int,int,GdkEventButton*> signal_plot_mouse_release;
84 - SigC::Signal3<void,int,int,GdkEventMotion*> signal_plot_mouse_move;
85 + sigc::signal3<void,int,int,GdkEventButton*> signal_plot_mouse_press;
86 + sigc::signal3<void,int,int,GdkEventButton*> signal_plot_mouse_release;
87 + sigc::signal3<void,int,int,GdkEventMotion*> signal_plot_mouse_move;
88
89 protected:
90 virtual bool on_expose_event(GdkEventExpose* event);
91 @@ -141,9 +141,9 @@
92 Scale *scale(PlotAxisID id) { return tickMark_[id]; }
93 PlotLabel *label(PlotAxisID id) { return axisLabel_[id]; }
94
95 - SigC::Signal3<void,int,int,GdkEventButton*> signal_plot_mouse_press();
96 - SigC::Signal3<void,int,int,GdkEventButton*> signal_plot_mouse_release();
97 - SigC::Signal3<void,int,int,GdkEventMotion*> signal_plot_mouse_move();
98 + sigc::signal3<void,int,int,GdkEventButton*> signal_plot_mouse_press();
99 + sigc::signal3<void,int,int,GdkEventButton*> signal_plot_mouse_release();
100 + sigc::signal3<void,int,int,GdkEventMotion*> signal_plot_mouse_move();
101
102 void set_selection(const Rectangle &r);
103 Rectangle get_selection() { return select_; }
104 diff -Naur btg-0.9.7.orig/external/plotmm/scale.h btg-0.9.7/external/plotmm/scale.h
105 --- btg-0.9.7.orig/external/plotmm/scale.h 2008-03-25 13:49:08.000000000 +0100
106 +++ btg-0.9.7/external/plotmm/scale.h 2008-03-25 14:21:18.000000000 +0100
107 @@ -133,7 +133,7 @@
108 /*! This signal is thrown whenever the scale is enabled or disabled
109 * \sa set_enabled, enabled
110 */
111 - SigC::Signal1<void,bool> signal_enabled;
112 + sigc::signal1<void,bool> signal_enabled;
113
114 protected:
115 virtual void on_realize();
116
117
118
119 --
120 gentoo-commits@l.g.o mailing list