1 |
eva 08/11/22 14:50:49 |
2 |
|
3 |
Added: workrave-1.9.0-dbus-glib.xml |
4 |
workrave-1.9.0-service.in |
5 |
workrave-1.9.0-gcc43.patch workrave-1.9.0-gui.xml |
6 |
workrave-1.9.0-compilation-fixes.patch |
7 |
workrave-1.9.0-parallel-make.patch |
8 |
Log: |
9 |
Bump to 1.9.0. Gstreamer support is not enabled because it freezes workrave on my box. Closes bug #236270. |
10 |
(Portage version: 2.2_rc15/cvs/Linux 2.6.24-gentoo-r8-mactel x86_64) |
11 |
|
12 |
Revision Changes Path |
13 |
1.1 app-misc/workrave/files/workrave-1.9.0-dbus-glib.xml |
14 |
|
15 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-misc/workrave/files/workrave-1.9.0-dbus-glib.xml?rev=1.1&view=markup |
16 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-misc/workrave/files/workrave-1.9.0-dbus-glib.xml?rev=1.1&content-type=text/plain |
17 |
|
18 |
Index: workrave-1.9.0-dbus-glib.xml |
19 |
=================================================================== |
20 |
<?xml version="1.0" encoding="UTF-8"?> |
21 |
|
22 |
<node name="/org/workrave/Workrave"> |
23 |
|
24 |
#for interface in $model.interfaces |
25 |
<interface name="$interface.name"> |
26 |
|
27 |
#for method in $interface.methods |
28 |
<method name="$method.qname"> |
29 |
<annotation name="org.freedesktop.DBus.GLib.CSymbol" |
30 |
value="$method.csymbol"/> |
31 |
#for p in method.params |
32 |
<arg type="$p.sig()" name="$p.name" direction="$p.direction" /> |
33 |
#end for |
34 |
</method> |
35 |
#end for |
36 |
|
37 |
</interface> |
38 |
|
39 |
#end for |
40 |
|
41 |
</node> |
42 |
|
43 |
|
44 |
|
45 |
|
46 |
|
47 |
1.1 app-misc/workrave/files/workrave-1.9.0-service.in |
48 |
|
49 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-misc/workrave/files/workrave-1.9.0-service.in?rev=1.1&view=markup |
50 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-misc/workrave/files/workrave-1.9.0-service.in?rev=1.1&content-type=text/plain |
51 |
|
52 |
Index: workrave-1.9.0-service.in |
53 |
=================================================================== |
54 |
[D-BUS Service] |
55 |
Name=org.workrave.Workrave.Activator |
56 |
Exec=@workravebindir@/workrave |
57 |
|
58 |
|
59 |
|
60 |
1.1 app-misc/workrave/files/workrave-1.9.0-gcc43.patch |
61 |
|
62 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-misc/workrave/files/workrave-1.9.0-gcc43.patch?rev=1.1&view=markup |
63 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-misc/workrave/files/workrave-1.9.0-gcc43.patch?rev=1.1&content-type=text/plain |
64 |
|
65 |
Index: workrave-1.9.0-gcc43.patch |
66 |
=================================================================== |
67 |
Index: frontend/gtkmm/src/GnomeAppletWindow.cc |
68 |
=================================================================== |
69 |
--- frontend/gtkmm/src/GnomeAppletWindow.cc (révision 1650) |
70 |
+++ frontend/gtkmm/src/GnomeAppletWindow.cc (copie de travail) |
71 |
@@ -19,6 +19,8 @@ |
72 |
|
73 |
static const char rcsid[] = "$Id: workrave-1.9.0-gcc43.patch,v 1.1 2008/11/22 14:50:49 eva Exp $"; |
74 |
|
75 |
+using namespace std; |
76 |
+ |
77 |
#include "preinclude.h" |
78 |
|
79 |
#ifdef HAVE_CONFIG_H |
80 |
@@ -111,10 +113,14 @@ |
81 |
applet_orientation = (Orientation) applet_control->GetOrientation(); |
82 |
|
83 |
#ifndef HAVE_EXERCISES |
84 |
- applet_control->SetMenuActive("/commands/Exercises", false); |
85 |
+ const std::string exercices_command("/commands/Exercises"); |
86 |
+ bool exercices_command_status(false); |
87 |
+ applet_control->SetMenuActive(exercices_command, exercices_command_status); |
88 |
#endif |
89 |
#ifndef HAVE_DISTRIBUTION |
90 |
- applet_control->SetMenuActive("/commands/Network", false); |
91 |
+ const std::string network_command("/commands/Network"); |
92 |
+ bool network_command_status(false); |
93 |
+ applet_control->SetMenuActive(network_command, network_command_status); |
94 |
#endif |
95 |
} |
96 |
} |
97 |
|
98 |
|
99 |
|
100 |
1.1 app-misc/workrave/files/workrave-1.9.0-gui.xml |
101 |
|
102 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-misc/workrave/files/workrave-1.9.0-gui.xml?rev=1.1&view=markup |
103 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-misc/workrave/files/workrave-1.9.0-gui.xml?rev=1.1&content-type=text/plain |
104 |
|
105 |
Index: workrave-1.9.0-gui.xml |
106 |
=================================================================== |
107 |
<?xml version="1.0" encoding="UTF-8"?> |
108 |
|
109 |
<unit name="DBusGUI"> |
110 |
|
111 |
<interface name="org.workrave.ControlInterface" csymbol="Menus"> |
112 |
<import> |
113 |
<include name="Menus.hh"/> |
114 |
</import> |
115 |
|
116 |
<method name="OpenMain" csymbol="on_menu_open_main_window"/> |
117 |
<method name="Preferences" csymbol="on_menu_preferences"/> |
118 |
<method name="NetworkConnect" csymbol="on_menu_network_join"/> |
119 |
<method name="NetworkLog" csymbol="on_menu_network_log"> |
120 |
<arg type="bool" name="show" direction="in"/> |
121 |
</method> |
122 |
<method name="NetworkReconnect" csymbol="on_menu_network_reconnect"/> |
123 |
<method name="NetworkDisconnect" csymbol="on_menu_network_leave"/> |
124 |
<method name="Statistics" csymbol="on_menu_statistics"/> |
125 |
<method name="Exercises" csymbol="on_menu_exercises" |
126 |
condition="defined(HAVE_EXERCISES)"/> |
127 |
<method name="RestBreak" csymbol="on_menu_restbreak_now"/> |
128 |
<method name="Quit" csymbol="on_menu_quit"/> |
129 |
<method name="About" csymbol="on_menu_about"/> |
130 |
</interface> |
131 |
|
132 |
<interface name="org.workrave.GnomeAppletSupportInterface" csymbol="GnomeAppletWindow" |
133 |
condition="defined(HAVE_GNOME)"> |
134 |
<import> |
135 |
<include name="gdk/gdkcolor.h"/> |
136 |
<include name="GnomeAppletWindow.hh"/> |
137 |
<include name="Orientation.hh"/> |
138 |
</import> |
139 |
|
140 |
<struct name="Color" csymbol="GdkColor"> |
141 |
<field type="uint32" name="pixel"/> |
142 |
<field type="uint32" name="red"/> |
143 |
<field type="uint32" name="green"/> |
144 |
<field type="uint32" name="blue"/> |
145 |
</struct> |
146 |
|
147 |
<enum name="Orientation" csymbol="Orientation"> |
148 |
<value name="up" csymbol="ORIENTATION_UP"/> |
149 |
<value name="right" csymbol="ORIENTATION_RIGHT"/> |
150 |
<value name="down" csymbol="ORIENTATION_DOWN"/> |
151 |
<value name="left" csymbol="ORIENTATION_LEFT"/> |
152 |
</enum> |
153 |
|
154 |
<method name="SetOrientation" csymbol="set_applet_orientation"> |
155 |
<arg type="Orientation" name="orientation" direction="in"/> |
156 |
</method> |
157 |
|
158 |
<method name="SetSize" csymbol="set_applet_size"> |
159 |
<arg type="uint32" name="size" direction="in"/> |
160 |
</method> |
161 |
|
162 |
<method name="SetBackground" csymbol="set_applet_background"> |
163 |
<arg type="uint32" name="type" direction="in"/> |
164 |
<arg type="Color" name="color" direction="in"/> |
165 |
<arg type="uint32" name="xid" direction="in"/> |
166 |
</method> |
167 |
|
168 |
<method name="ButtonClicked" csymbol="button_clicked"> |
169 |
<arg type="uint32" name="button" direction="in"/> |
170 |
</method> |
171 |
|
172 |
<method name="EmbedRequest" csymbol="fire_gnome_applet"/> |
173 |
</interface> |
174 |
</unit> |
175 |
|
176 |
|
177 |
|
178 |
1.1 app-misc/workrave/files/workrave-1.9.0-compilation-fixes.patch |
179 |
|
180 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-misc/workrave/files/workrave-1.9.0-compilation-fixes.patch?rev=1.1&view=markup |
181 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-misc/workrave/files/workrave-1.9.0-compilation-fixes.patch?rev=1.1&content-type=text/plain |
182 |
|
183 |
Index: workrave-1.9.0-compilation-fixes.patch |
184 |
=================================================================== |
185 |
Index: frontend/gtkmm/src/Menus.cc |
186 |
=================================================================== |
187 |
--- frontend/gtkmm/src/Menus.cc (révision 1650) |
188 |
+++ frontend/gtkmm/src/Menus.cc (copie de travail) |
189 |
@@ -461,7 +461,7 @@ |
190 |
#endif |
191 |
} |
192 |
|
193 |
- |
194 |
+#ifdef HAVE_DISTRIBUTION |
195 |
void |
196 |
Menus::on_network_log_response(int response) |
197 |
{ |
198 |
@@ -476,6 +476,7 @@ |
199 |
// done by gtkmm ??? delete network_log_dialog; |
200 |
network_log_dialog = NULL; |
201 |
} |
202 |
+#endif |
203 |
|
204 |
void |
205 |
Menus::on_statistics_response(int response) |
206 |
@@ -534,7 +535,11 @@ |
207 |
on_menu_network_leave(); |
208 |
break; |
209 |
case MENU_COMMAND_NETWORK_LOG: |
210 |
+#ifdef HAVE_DISTRIBUTION |
211 |
on_menu_network_log(network_log_dialog == NULL); |
212 |
+#else |
213 |
+ on_menu_network_log(true); |
214 |
+#endif |
215 |
break; |
216 |
case MENU_COMMAND_NETWORK_RECONNECT: |
217 |
on_menu_network_reconnect(); |
218 |
@@ -565,7 +570,12 @@ |
219 |
ICore *core = CoreFactory::get_core(); |
220 |
|
221 |
menus[i]->resync(core->get_operation_mode(), |
222 |
+#ifdef HAVE_DISTRIBUTION |
223 |
network_log_dialog != NULL); |
224 |
+#else |
225 |
+ false); |
226 |
+#endif |
227 |
+ |
228 |
} |
229 |
} |
230 |
|
231 |
|
232 |
|
233 |
|
234 |
1.1 app-misc/workrave/files/workrave-1.9.0-parallel-make.patch |
235 |
|
236 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-misc/workrave/files/workrave-1.9.0-parallel-make.patch?rev=1.1&view=markup |
237 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-misc/workrave/files/workrave-1.9.0-parallel-make.patch?rev=1.1&content-type=text/plain |
238 |
|
239 |
Index: workrave-1.9.0-parallel-make.patch |
240 |
=================================================================== |
241 |
Index: frontend/gtkmm/src/Makefile.am |
242 |
=================================================================== |
243 |
--- frontend/gtkmm/src/Makefile.am (révision 1650) |
244 |
+++ frontend/gtkmm/src/Makefile.am (copie de travail) |
245 |
@@ -119,7 +119,7 @@ |
246 |
|
247 |
includesinput = -I$(top_srcdir)/common/win32/harpoon/include |
248 |
WIN32LIBS = -L$(top_builddir)/common/win32/harpoon/src/Release/ -lharpoon \ |
249 |
- ${top_srcdir}/frontend/gtkmm/src/win32/libworkrave-frontend-gtkmm-win32.la \ |
250 |
+ $(top_builddir)/frontend/gtkmm/src/win32/libworkrave-frontend-gtkmm-win32.la \ |
251 |
-lshell32 -lole32 -lwinmm -lshlwapi |
252 |
endif |
253 |
|
254 |
@@ -130,7 +130,7 @@ |
255 |
if PLATFORM_OS_OSX |
256 |
includesosx = -I$(top_srcdir)/frontend/gtkmm/src/osx |
257 |
ldflags = -L$(top_builddir)/frontend/gtkmm/src/osx |
258 |
-OSXLIBS = ${top_srcdir}/frontend/gtkmm/src/osx/libworkrave-frontend-gtkmm-osx.la |
259 |
+OSXLIBS = $(top_builddir)/frontend/gtkmm/src/osx/libworkrave-frontend-gtkmm-osx.la |
260 |
extrasources += |
261 |
endif |
262 |
|
263 |
@@ -277,9 +277,9 @@ |
264 |
|
265 |
endif |
266 |
|
267 |
-$(bin_PROGRAMS): ${top_srcdir}/backend/src/libworkrave-backend.la \ |
268 |
- ${top_srcdir}/common/src/libworkrave-common.la \ |
269 |
- ${top_srcdir}/frontend/common/src/libworkrave-frontend-common.la |
270 |
+$(bin_PROGRAMS): $(top_builddir)/backend/src/libworkrave-backend.la \ |
271 |
+ $(top_builddir)/common/src/libworkrave-common.la \ |
272 |
+ $(top_builddir)/frontend/common/src/libworkrave-frontend-common.la |
273 |
|
274 |
workrave_LDFLAGS = @WR_LDFLAGS@ ${ldflags} |