On Wed, Mar 16, 2022 at 11:31:34PM +0000, Stuart Henderson wrote:
> > diff --git
> > a/devel/codeblocks/patches/patch-src_plugins_contrib_dragscroll_dragscrollcfg_h
> >
> > b/devel/codeblocks/patches/patch-src_plugins_contrib_dragscroll_dragscrollcfg_h
> > index ccf08ff3315..c9aaaee7fc3 100644
> > ---
> > a/devel/codeblocks/patches/patch-src_plugins_contrib_dragscroll_dragscrollcfg_h
> > +++
> > b/devel/codeblocks/patches/patch-src_plugins_contrib_dragscroll_dragscrollcfg_h
> > @@ -8,7 +8,7 @@ Index: src/plugins/contrib/dragscroll/dragscrollcfg.h
> > void OnApply();
> > void OnCancel(){}
> > +#if defined(LOGGING)
> > - virtual void InitDialog(){ asm("int3");} /*trap*/
> > + virtual void InitDialog() { } /*trap*/
> > +#endif
>
> With the upstream change getting rid of the asm int3 call,
> I think it probably doesn't make sense to patch for the
> reason described in the comment any more
Thank you for catching this, and ...
>
> > --- a/devel/codeblocks/patches/patch-src_sdk_scripting_squirrel_sqvm_cpp
> > +++ b/devel/codeblocks/patches/patch-src_sdk_scripting_squirrel_sqvm_cpp
> > @@ -2,12 +2,12 @@ Index: src/sdk/scripting/squirrel/sqvm.cpp
> > --- src/sdk/scripting/squirrel/sqvm.cpp.orig
> > +++ src/sdk/scripting/squirrel/sqvm.cpp
> > @@ -1,8 +1,8 @@
> > - /*
> > - see copyright notice in squirrel.h
> > - */
> > --#include "sqpcheader.h"
> > - #include <math.h>
> > -+#include "sqpcheader.h"
> > - #include <stdlib.h>
> > - #include "sqopcodes.h"
> > - #include "sqfuncproto.h"
> > + /*
> > + see copyright notice in squirrel.h
> > + */
> > +-#include "sqpcheader.h"
> > + #include <math.h>
> > ++#include "sqpcheader.h"
> > + #include <stdlib.h>
> > + #include "sqopcodes.h"
> > + #include "sqvm.h"
>
> This patch doesn't apply (the patch against the ports tree
> applies, but the resulting patch doesn't apply to the upstream
> code) - codeblocks builds without this patch, should it just be
> rm'd instead?
Yes, thanks! I'll rebuild here and send an updated diff
after I've tested. It takes a few hours on this laptop. :)
