[SCM] BOINC packaging branch, master, updated. debian/7.0.33+dfsg-1-91-g8a053b6

["Steffen Möller"]

That is just fine. As long as *(int*)0 = 0 disappeared from the code base everyone is happy. Feel free to completely remove the patch.... and try clang once, it is well worth it :o)

Steffen

-------- Original-Nachricht --------
> Datum: Tue, 06 Nov 2012 14:20:44 +0000
> Von: "Gianfranco Costamagna" <costamagnagianfranco at yahoo.it>
> An: pkg-boinc-commits at lists.alioth.debian.org
> Betreff: [SCM] BOINC packaging branch, master,	updated. debian/7.0.33+dfsg-1-91-g8a053b6

> The following commit has been merged in the master branch:
> commit 8a053b6601c663303aa8d24fdbc0c1afb453c06a
> Author: Gianfranco Costamagna <costamagnagianfranco at yahoo.it>
> Date:   Tue Nov 6 15:20:17 2012 +0100
> 
>     Dropped part of clang_incompatibilities.patch fixed upstream
> 
> diff --git a/debian/patches/clang_incompatibilities.patch
> b/debian/patches/clang_incompatibilities.patch
> index 663af72..d31ba26 100644
> --- a/debian/patches/clang_incompatibilities.patch
> +++ b/debian/patches/clang_incompatibilities.patch
> @@ -20,31 +20,6 @@ Index: boinc/lib/Makefile.am
>   
>   
>   if ENABLE_FCGI
> -#FIXME, better abort() or __builtin_trap()?
> -#upstream uses abort() now
> -#void PERS_FILE_XFER::abort() {
> -#    if (fxp) {
> -#        gstate.file_xfers->remove(fxp);
> -#        delete fxp;
> -#        fxp = NULL;
> -#    }
> -#    fip->status = ERR_ABORTED_VIA_GUI;
> -#    fip->error_msg = "user requested transfer abort";
> -#    pers_xfer_done = true;
> -#}
> -
> -#Index: boinc/lib/util.cpp
> -#===================================================================
> -#--- boinc.orig/lib/util.cpp	2012-08-01 20:52:04.670985198 +0200
> -#+++ boinc/lib/util.cpp	2012-08-01 20:52:55.182302347 +0200
> -#@@ -311,7 +311,7 @@
> -# #ifdef _WIN32
> -#     DebugBreak();
> -# #else
> -#-    *(int*)0 = 0;
> -#+    __builtin_trap();
> -# #endif
> -# }
>   
>  Index: boinc/sched/make_work.cpp
>  ===================================================================
> 
> -- 
> BOINC packaging
> 
> -- 
> pkg-boinc-commits mailing list
> pkg-boinc-commits at lists.alioth.debian.org
> http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-boinc-commits