[SCM] BOINC packaging branch, SZTAKI, updated. debian/6.10.17+dfsg-3-291-g2ca3019
Steffen Moeller
moeller at debian.org
Sun Jun 12 20:01:11 UTC 2011
The following commit has been merged in the SZTAKI branch:
commit 69a5e3f827e13e6a94532f7e63529662274fde5e
Author: Steffen Moeller <moeller at debian.org>
Date: Sun Jun 12 21:05:49 2011 +0200
Edited API to add void where ()
diff --git a/SZTAKI_patches_remaining_to_move_into_debian.patch b/SZTAKI_patches_remaining_to_move_into_debian.patch
index 7bdd5b4..28b7b89 100644
--- a/SZTAKI_patches_remaining_to_move_into_debian.patch
+++ b/SZTAKI_patches_remaining_to_move_into_debian.patch
@@ -1284,81 +1284,6 @@ def builddir(*dirs):
endif ## ENABLE_LIBRARIES
.PHONY:
---- boinc-server-6.11.0+r18946.orig/api/boinc_api.h
-+++ boinc-server-6.11.0+r18946/api/boinc_api.h
-@@ -66,7 +66,7 @@
- double max_working_set_size;
- } BOINC_STATUS;
-
--typedef void (*FUNC_PTR)();
-+typedef void (*FUNC_PTR)(void);
-
- struct APP_INIT_DATA;
-
-@@ -81,13 +81,13 @@
- extern int boinc_suspend_other_activities(void);
- extern int boinc_resume_other_activities(void);
- extern int boinc_report_app_status(double, double, double);
--extern int boinc_time_to_checkpoint();
--extern void boinc_begin_critical_section();
--extern int boinc_try_critical_section();
--extern void boinc_end_critical_section();
--extern void boinc_need_network();
--extern int boinc_network_poll();
--extern void boinc_network_done();
-+extern int boinc_time_to_checkpoint(void);
-+extern void boinc_begin_critical_section(void);
-+extern int boinc_try_critical_section(void);
-+extern void boinc_end_critical_section(void);
-+extern void boinc_need_network(void);
-+extern int boinc_network_poll(void);
-+extern void boinc_network_done(void);
- extern int boinc_is_standalone(void);
- extern void boinc_ops_per_cpu_sec(double fp, double integer);
- extern void boinc_ops_cumulative(double fp, double integer);
-@@ -95,9 +95,9 @@
- extern int boinc_receive_trickle_down(char* buf, int len);
- extern int boinc_init_options(BOINC_OPTIONS*);
- extern int boinc_get_status(BOINC_STATUS*);
--extern double boinc_get_fraction_done();
-+extern double boinc_get_fraction_done(void);
- extern void boinc_register_timer_callback(FUNC_PTR);
--extern double boinc_worker_thread_cpu_time();
-+extern double boinc_worker_thread_cpu_time(void);
- extern void boinc_exit(int); // deprecated
-
- #ifdef __APPLE__
---- boinc-server-6.11.0+r18946.orig/api/graphics_api.h
-+++ boinc-server-6.11.0+r18946/api/graphics_api.h
-@@ -22,7 +22,7 @@
- extern "C" {
- #endif
-
--typedef void (*WORKER_FUNC_PTR)();
-+typedef void (*WORKER_FUNC_PTR)(void);
-
- extern int boinc_init_graphics(WORKER_FUNC_PTR);
-
-@@ -40,8 +40,8 @@
- extern void boinc_app_mouse_move(int x, int y, int left, int middle, int right);
- extern void boinc_app_key_press(int, int);
- extern void boinc_app_key_release(int, int);
--extern void boinc_suspend_graphics_thread();
--extern void boinc_resume_graphics_thread();
-+extern void boinc_suspend_graphics_thread(void);
-+extern void boinc_resume_graphics_thread(void);
-
- // C++ API follows here
- #ifdef __cplusplus
-@@ -50,7 +50,7 @@
- #include "boinc_api.h"
-
- extern int boinc_init_options_graphics(BOINC_OPTIONS&, WORKER_FUNC_PTR);
--extern bool boinc_graphics_possible();
-+extern bool boinc_graphics_possible(void);
-
- // Implementation stuff
- //
--- boinc-server-6.11.0+r18946.orig/db/Makefile.am
+++ boinc-server-6.11.0+r18946/db/Makefile.am
@@ -8,5 +8,16 @@
diff --git a/debian/patches/series b/debian/patches/series
index 9b74d48..662fd2d 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -15,3 +15,4 @@ csh2tcsh.patch
file_upload_handler_permission.patch
upstream_sztaki_usingTempfileInUpdateVersions.patch
upstream_sztaki_reduce_accessibility_of_php_inc_file.patch
+upstream_sztaki_moreVoidArgumentsMadeExplicit_Boinc_API.patch
diff --git a/debian/patches/upstream_sztaki_Help_Function_Declaration_with_void.patch b/debian/patches/upstream_sztaki_Help_Function_Declaration_with_void.patch
new file mode 100644
index 0000000..8167e6b
--- /dev/null
+++ b/debian/patches/upstream_sztaki_Help_Function_Declaration_with_void.patch
@@ -0,0 +1,73 @@
+Index: boinc/lib/diagnostics.h
+===================================================================
+--- boinc.orig/lib/diagnostics.h 2011-06-12 01:28:09.000000000 +0200
++++ boinc/lib/diagnostics.h 2011-06-12 01:30:06.000000000 +0200
+@@ -70,48 +70,48 @@
+ // These are functions common to all platforms
+ extern int boinc_init_diagnostics( int flags );
+ extern int boinc_init_graphics_diagnostics( int flags );
+-extern int boinc_install_signal_handlers();
+-extern int boinc_finish_diag();
++extern int boinc_install_signal_handlers( void );
++extern int boinc_finish_diag( void );
+
+ extern int diagnostics_init(
+ int flags, const char* stdout_prefix, const char* stderr_prefix
+ );
+-extern int diagnostics_finish();
+-extern int diagnostics_is_initialized();
++extern int diagnostics_finish( void );
++extern int diagnostics_is_initialized( void );
+ extern int diagnostics_is_flag_set(int flags);
+
+ // Properties
+-extern char* diagnostics_get_boinc_dir();
+-extern char* diagnostics_get_boinc_install_dir();
+-extern char* diagnostics_get_symstore();
++extern char* diagnostics_get_boinc_dir( void );
++extern char* diagnostics_get_boinc_install_dir( void );
++extern char* diagnostics_get_symstore( void );
+ extern int diagnostics_set_symstore(char* symstore);
+-extern int diagnostics_is_proxy_enabled();
+-extern char* diagnostics_get_proxy();
++extern int diagnostics_is_proxy_enabled( void );
++extern char* diagnostics_get_proxy( void );
+
+-extern int diagnostics_is_aborted_via_gui();
+-extern int diagnostics_set_aborted_via_gui();
++extern int diagnostics_is_aborted_via_gui( void );
++extern int diagnostics_set_aborted_via_gui( void );
+
+ // Log rotation
+-extern int diagnostics_cycle_logs();
++extern int diagnostics_cycle_logs( void );
+ extern void diagnostics_set_max_file_sizes(int stdout_size, int stderr_size);
+
+ // Thread Tracking
+-extern int diagnostics_init_thread_list();
+-extern int diagnostics_finish_thread_list();
+-extern int diagnostics_update_thread_list();
+-extern int diagnostics_set_thread_exempt_suspend();
++extern int diagnostics_init_thread_list( void );
++extern int diagnostics_finish_thread_list( void );
++extern int diagnostics_update_thread_list( void );
++extern int diagnostics_set_thread_exempt_suspend( void );
+ extern int diagnostics_is_thread_exempt_suspend(long thread_id);
+
+ // Message Monitoring
+-extern int diagnostics_init_message_monitor();
+-extern int diagnostics_finish_message_monitor();
++extern int diagnostics_init_message_monitor( void );
++extern int diagnostics_finish_message_monitor( void );
+ #ifdef _WIN32
+ extern UINT WINAPI diagnostics_message_monitor(LPVOID lpParameter);
+ #endif
+
+ // Unhandled exception monitor
+-extern int diagnostics_init_unhandled_exception_monitor();
+-extern int diagnostics_finish_unhandled_exception_monitor();
++extern int diagnostics_init_unhandled_exception_monitor( void );
++extern int diagnostics_finish_unhandled_exception_monitor( void );
+ #ifdef _WIN32
+ extern UINT WINAPI diagnostics_unhandled_exception_monitor(LPVOID lpParameter);
+ extern LONG CALLBACK boinc_catch_signal(EXCEPTION_POINTERS *ExceptionInfo);
--
BOINC packaging
More information about the pkg-boinc-commits
mailing list