CVS commit: pkgsrc/editors/codeblocks

["Havard Eidnes" <he%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   he
Date:           Mon Aug 15 20:40:11 UTC 2022

Modified Files:
        pkgsrc/editors/codeblocks: Makefile distinfo
Added Files:
        pkgsrc/editors/codeblocks/patches:
            patch-src_plugins_contrib_dragscroll_dragscrollcfg.h

Log Message:
editors/codeblocks: remove unprotected asm() for better portability.

Remove unprotected non-portable asm() as per upstream svn.
Ref. https://forums.codeblocks.org/index.php?topic=23761.0
Bump PKGREVISION.


To generate a diff of this commit:
cvs rdiff -u -r1.21 -r1.22 pkgsrc/editors/codeblocks/Makefile
cvs rdiff -u -r1.7 -r1.8 pkgsrc/editors/codeblocks/distinfo
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/editors/codeblocks/patches/patch-src_plugins_contrib_dragscroll_dragscrollcfg.h

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/editors/codeblocks/Makefile
diff -u pkgsrc/editors/codeblocks/Makefile:1.21 pkgsrc/editors/codeblocks/Makefile:1.22
--- pkgsrc/editors/codeblocks/Makefile:1.21     Thu Aug 11 05:08:15 2022
+++ pkgsrc/editors/codeblocks/Makefile  Mon Aug 15 20:40:11 2022
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.21 2022/08/11 05:08:15 gutteridge Exp $
+# $NetBSD: Makefile,v 1.22 2022/08/15 20:40:11 he Exp $
 #
 
 DISTNAME=      codeblocks-20.03
-PKGREVISION=   3
+PKGREVISION=   4
 CATEGORIES=    editors x11
 MASTER_SITES=  ${MASTER_SITE_SOURCEFORGE:=codeblocks/}
 EXTRACT_SUFX=  .tar.xz

Index: pkgsrc/editors/codeblocks/distinfo
diff -u pkgsrc/editors/codeblocks/distinfo:1.7 pkgsrc/editors/codeblocks/distinfo:1.8
--- pkgsrc/editors/codeblocks/distinfo:1.7      Tue Oct 26 10:21:25 2021
+++ pkgsrc/editors/codeblocks/distinfo  Mon Aug 15 20:40:11 2022
@@ -1,6 +1,7 @@
-$NetBSD: distinfo,v 1.7 2021/10/26 10:21:25 nia Exp $
+$NetBSD: distinfo,v 1.8 2022/08/15 20:40:11 he Exp $
 
 BLAKE2s (codeblocks-20.03.tar.xz) = cd3ebe8279f1b45961100a6cc609e411075af7e20198a12b76e12fdf93c0c2cc
 SHA512 (codeblocks-20.03.tar.xz) = f97c1a02d31f0be4dc08b1f19b57bd0d3cba375ab5f33ab91b2a2df7817018f5b3e3063ed07199a3970644f1caa7c7e511db2034c73264f5f4963046d65b0097
 Size (codeblocks-20.03.tar.xz) = 11799264 bytes
+SHA1 (patch-src_plugins_contrib_dragscroll_dragscrollcfg.h) = a73b712d0547254a55393ae74fdda9ca4c0c30a1
 SHA1 (patch-src_src_prefix.cpp) = 941fe61e81427990ed45b414a0bf98ceb40557cc

Added files:

Index: pkgsrc/editors/codeblocks/patches/patch-src_plugins_contrib_dragscroll_dragscrollcfg.h
diff -u /dev/null pkgsrc/editors/codeblocks/patches/patch-src_plugins_contrib_dragscroll_dragscrollcfg.h:1.1
--- /dev/null   Mon Aug 15 20:40:11 2022
+++ pkgsrc/editors/codeblocks/patches/patch-src_plugins_contrib_dragscroll_dragscrollcfg.h      Mon Aug 15 20:40:11 2022
@@ -0,0 +1,16 @@
+$NetBSD: patch-src_plugins_contrib_dragscroll_dragscrollcfg.h,v 1.1 2022/08/15 20:40:11 he Exp $
+
+Remove unprotected non-portable asm() as per upstream svn.
+Ref. https://forums.codeblocks.org/index.php?topic=23761.0
+
+--- src/plugins/contrib/dragscroll/dragscrollcfg.h.orig        2020-03-28 12:35:51.000000000 +0000
++++ src/plugins/contrib/dragscroll/dragscrollcfg.h
+@@ -35,7 +35,7 @@ class cbDragScrollCfg: public cbConfigur
+         wxString GetBitmapBaseName() const;
+         void OnApply();
+         void OnCancel(){}
+-        virtual void InitDialog(){ asm("int3");} /*trap*/
++        virtual void InitDialog(){ } /* was asm("int3"); trap*/
+ 
+         // pointer to owner of the configuration diaglog needed to
+         // complete the OnApply/OnCancel EndModal() logic