[SCM] BOINC packaging branch, master, updated. upstream/7.0.28+dfsg-456-g10717f3

Steffen Moeller steffen_moeller at gmx.de
Mon May 28 10:31:23 UTC 2012


The following commit has been merged in the master branch:
commit 10717f37faf8d5e43a018f9b329583915a52902b
Author: Steffen Moeller <steffen_moeller at gmx.de>
Date:   Mon May 28 12:30:27 2012 +0200

    Added patch David added for Ubuntu builds of 7.0.28
    
    Will be removed with 7.0.29 again.

diff --git a/debian/patches/series b/debian/patches/series
index ac5b723..bf2ce07 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -56,3 +56,4 @@ unlink_undefined.patch
 0001-Patch-from-Steffen-Moeller-for-recent-Xcb.patch
 0002-re-enable-X11-screensaver-build.patch
 screen_saver_boinc_extra.patch
+socklenBuildFixByDavid.patch
diff --git a/debian/patches/socklenBuildFixByDavid.patch b/debian/patches/socklenBuildFixByDavid.patch
new file mode 100644
index 0000000..ad3b735
--- /dev/null
+++ b/debian/patches/socklenBuildFixByDavid.patch
@@ -0,0 +1,15 @@
+Index: boinc/lib/network.h
+===================================================================
+--- boinc.orig/lib/network.h	2012-04-01 20:19:44.977682134 +0200
++++ boinc/lib/network.h	2012-05-28 12:29:18.855647468 +0200
+@@ -54,10 +54,7 @@
+ extern const char* socket_error_str();
+ extern void reset_dns();
+ 
+-#if defined(_WIN32) && defined(USE_WINSOCK)
+ typedef int BOINC_SOCKLEN_T;
+-#endif
+-
+ #if defined(_WIN32) && defined(USE_WINSOCK)
+ extern int WinsockInitialize();
+ extern int WinsockCleanup();

-- 
BOINC packaging



More information about the pkg-boinc-commits mailing list