CVS commit: pkgsrc/editors/codeblocks

["Mark Davies" <markd%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   markd
Date:           Tue Dec 19 20:05:37 UTC 2017

Modified Files:
        pkgsrc/editors/codeblocks: Makefile distinfo
Added Files:
        pkgsrc/editors/codeblocks/patches:
            patch-src_include_scripting_sqplus_sqplus.h
            patch-src_plugins_scriptedwizard_resources_opencv_wizard.script

Log Message:
codeblocks: fixes for linux, gcc7 and recent opencv


To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 pkgsrc/editors/codeblocks/Makefile
cvs rdiff -u -r1.2 -r1.3 pkgsrc/editors/codeblocks/distinfo
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/editors/codeblocks/patches/patch-src_include_scripting_sqplus_sqplus.h \
    pkgsrc/editors/codeblocks/patches/patch-src_plugins_scriptedwizard_resources_opencv_wizard.script

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.6 pkgsrc/editors/codeblocks/Makefile:1.7
--- pkgsrc/editors/codeblocks/Makefile:1.6      Wed May  3 08:38:41 2017
+++ pkgsrc/editors/codeblocks/Makefile  Tue Dec 19 20:05:37 2017
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.6 2017/05/03 08:38:41 jperkin Exp $
+# $NetBSD: Makefile,v 1.7 2017/12/19 20:05:37 markd Exp $
 #
 
 DISTNAME=      codeblocks_16.01
 PKGNAME=       ${DISTNAME:S/_/-/}
-PKGREVISION=   3
+PKGREVISION=   4
 CATEGORIES=    editors x11
 MASTER_SITES=  ${MASTER_SITE_SOURCEFORGE:=codeblocks/}
 
@@ -21,6 +21,8 @@ USE_LANGUAGES=        c c++11
 CONFIGURE_ARGS+=       --with-contrib-plugins=AutoVersioning,BrowseTracker,byogames,cbkoders,codesnippets,codestat,dragscroll,envvars,help,keybinder,libfinder,profiler,regex,exporter,symtab
 # wxsmith makes error in build process
 
+CXXFLAGS.Linux+=       -std=c++11
+
 BUILD_DEPENDS+=        zip-[0-9]*:../../archivers/zip
 
 PKGCONFIG_OVERRIDE+=   codeblocks.pc.in

Index: pkgsrc/editors/codeblocks/distinfo
diff -u pkgsrc/editors/codeblocks/distinfo:1.2 pkgsrc/editors/codeblocks/distinfo:1.3
--- pkgsrc/editors/codeblocks/distinfo:1.2      Mon May 22 23:36:11 2017
+++ pkgsrc/editors/codeblocks/distinfo  Tue Dec 19 20:05:37 2017
@@ -1,12 +1,14 @@
-$NetBSD: distinfo,v 1.2 2017/05/22 23:36:11 joerg Exp $
+$NetBSD: distinfo,v 1.3 2017/12/19 20:05:37 markd Exp $
 
 SHA1 (codeblocks_16.01.tar.gz) = 70aabe8a948dbaa919eb4b87bc74a600e0d93516
 RMD160 (codeblocks_16.01.tar.gz) = e98b034eb8d6cf52a89312f2d5eaa10b17f1355e
 SHA512 (codeblocks_16.01.tar.gz) = 496ff2dbcf9a8248fa9f1060d50567d1fc6480cc9d8fc9f7d2cd532c82f4344deafe9b43f2b17d2510c74851e21acf2ca90d5cc7b61237d69a17e78e9907a63a
 Size (codeblocks_16.01.tar.gz) = 20250097 bytes
 SHA1 (patch-configure) = c746e3b0f4f5ca2b8d5d215e4510c1996205338b
+SHA1 (patch-src_include_scripting_sqplus_sqplus.h) = 92385bb49c86d113d635a9540bd2013294f60ee1
 SHA1 (patch-src_plugins_contrib_wxContribItems_wxchart_configure) = 57f52bac348192b1dbfa63b012a48ed259e5933d
 SHA1 (patch-src_plugins_contrib_wxContribItems_wxthings_configure) = 645d331fc86c872e522ed56fc0764e2a2a77c3c2
+SHA1 (patch-src_plugins_scriptedwizard_resources_opencv_wizard.script) = ec8514c3e816a882104221e5bfb32a6a2937030d
 SHA1 (patch-src_sdk_wxpropgrid_configure) = fc842f5964e7a213907d93b81ef35a3f1a4edf19
 SHA1 (patch-src_src_appglobals.cpp) = cb561786251fe14ed777105f207635c219f8634b
 SHA1 (patch-src_src_prefix.cpp) = 941fe61e81427990ed45b414a0bf98ceb40557cc

Added files:

Index: pkgsrc/editors/codeblocks/patches/patch-src_include_scripting_sqplus_sqplus.h
diff -u /dev/null pkgsrc/editors/codeblocks/patches/patch-src_include_scripting_sqplus_sqplus.h:1.1
--- /dev/null   Tue Dec 19 20:05:37 2017
+++ pkgsrc/editors/codeblocks/patches/patch-src_include_scripting_sqplus_sqplus.h       Tue Dec 19 20:05:37 2017
@@ -0,0 +1,20 @@
+$NetBSD: patch-src_include_scripting_sqplus_sqplus.h,v 1.1 2017/12/19 20:05:37 markd Exp $
+
+gcc7 build-fix: avoid template-related error
+https://sourceforge.net/p/codeblocks/code/11006/
+
+--- src/include/scripting/sqplus/sqplus.h.orig 2016-01-23 16:43:24.000000000 +0000
++++ src/include/scripting/sqplus/sqplus.h
+@@ -147,10 +147,10 @@ struct ScriptStringVar : ScriptStringVar
+     return safeStringCopy(s,_s.s,MaxLength);
+   }
+   bool operator == (const ScriptStringVar & _s) {
+-    return _strcmp(s,_s.s) == 0;
++    return strcmp(s,_s.s) == 0;
+   }
+   bool compareCaseInsensitive(const ScriptStringVar & _s) {
+-    return _stricmp(s,_s.s) == 0;
++    return strcasecmp(s,_s.s) == 0;
+   }
+ };
+ 
Index: pkgsrc/editors/codeblocks/patches/patch-src_plugins_scriptedwizard_resources_opencv_wizard.script
diff -u /dev/null pkgsrc/editors/codeblocks/patches/patch-src_plugins_scriptedwizard_resources_opencv_wizard.script:1.1
--- /dev/null   Tue Dec 19 20:05:37 2017
+++ pkgsrc/editors/codeblocks/patches/patch-src_plugins_scriptedwizard_resources_opencv_wizard.script   Tue Dec 19 20:05:37 2017
@@ -0,0 +1,17 @@
+$NetBSD: patch-src_plugins_scriptedwizard_resources_opencv_wizard.script,v 1.1 2017/12/19 20:05:37 markd Exp $
+
+Modern opencv uses pkg-config
+
+--- src/plugins/scriptedwizard/resources/opencv/wizard.script.orig     2016-01-23 16:43:07.000000000 +0000
++++ src/plugins/scriptedwizard/resources/opencv/wizard.script
+@@ -184,8 +184,8 @@ function SetupProject(project)
+     else // PLATFORM != PLATFORM_MSW
+     {
+         // opencv-config based: things are ultra-simple :)
+-        project.AddCompilerOption(_T("`opencv-config --cxxflags`"));
+-        project.AddLinkerOption(_T("`opencv-config --ldstaticflags`"));
++        project.AddCompilerOption(_T("`pkg-config opencv --cflags`"));
++        project.AddLinkerOption(_T("`pkg-config opencv --libs`"));
+     }
+ 
+