Tue Dec 19 20:05:37 2017 UTC ()
codeblocks: fixes for linux, gcc7 and recent opencv


(markd)
diff -r1.6 -r1.7 pkgsrc/editors/codeblocks/Makefile
diff -r1.2 -r1.3 pkgsrc/editors/codeblocks/distinfo
diff -r0 -r1.1 pkgsrc/editors/codeblocks/patches/patch-src_include_scripting_sqplus_sqplus.h
diff -r0 -r1.1 pkgsrc/editors/codeblocks/patches/patch-src_plugins_scriptedwizard_resources_opencv_wizard.script
cvs diff -r1.6 -r1.7 pkgsrc/editors/codeblocks/Makefile (expand / switch to unified diff)

--- pkgsrc/editors/codeblocks/Makefile 2017/05/03 08:38:41 1.6
+++ pkgsrc/editors/codeblocks/Makefile 2017/12/19 20:05:37 1.7
@@ -1,32 +1,34 @@ @@ -1,32 +1,34 @@
1# $NetBSD: Makefile,v 1.6 2017/05/03 08:38:41 jperkin Exp $ 1# $NetBSD: Makefile,v 1.7 2017/12/19 20:05:37 markd Exp $
2# 2#
3 3
4DISTNAME= codeblocks_16.01 4DISTNAME= codeblocks_16.01
5PKGNAME= ${DISTNAME:S/_/-/} 5PKGNAME= ${DISTNAME:S/_/-/}
6PKGREVISION= 3 6PKGREVISION= 4
7CATEGORIES= editors x11 7CATEGORIES= editors x11
8MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=codeblocks/} 8MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=codeblocks/}
9 9
10MAINTAINER= pkgsrc-users@NetBSD.org 10MAINTAINER= pkgsrc-users@NetBSD.org
11HOMEPAGE= http://www.codeblocks.org/ 11HOMEPAGE= http://www.codeblocks.org/
12COMMENT= Open source, cross platform, free C++ IDE 12COMMENT= Open source, cross platform, free C++ IDE
13LICENSE= gnu-gpl-v3 13LICENSE= gnu-gpl-v3
14 14
15WRKSRC= ${WRKDIR}/${PKGNAME_NOREV}.release 15WRKSRC= ${WRKDIR}/${PKGNAME_NOREV}.release
16GNU_CONFIGURE= yes 16GNU_CONFIGURE= yes
17USE_LIBTOOL= yes 17USE_LIBTOOL= yes
18USE_TOOLS+= pkg-config gmake 18USE_TOOLS+= pkg-config gmake
19USE_LANGUAGES= c c++11 19USE_LANGUAGES= c c++11
20 20
21CONFIGURE_ARGS+= --with-contrib-plugins=AutoVersioning,BrowseTracker,byogames,cbkoders,codesnippets,codestat,dragscroll,envvars,help,keybinder,libfinder,profiler,regex,exporter,symtab 21CONFIGURE_ARGS+= --with-contrib-plugins=AutoVersioning,BrowseTracker,byogames,cbkoders,codesnippets,codestat,dragscroll,envvars,help,keybinder,libfinder,profiler,regex,exporter,symtab
22# wxsmith makes error in build process 22# wxsmith makes error in build process
23 23
 24CXXFLAGS.Linux+= -std=c++11
 25
24BUILD_DEPENDS+= zip-[0-9]*:../../archivers/zip 26BUILD_DEPENDS+= zip-[0-9]*:../../archivers/zip
25 27
26PKGCONFIG_OVERRIDE+= codeblocks.pc.in 28PKGCONFIG_OVERRIDE+= codeblocks.pc.in
27 29
28.include "../../databases/shared-mime-info/mimedb.mk" 30.include "../../databases/shared-mime-info/mimedb.mk"
29.include "../../graphics/hicolor-icon-theme/buildlink3.mk" 31.include "../../graphics/hicolor-icon-theme/buildlink3.mk"
30.include "../../sysutils/desktop-file-utils/desktopdb.mk" 32.include "../../sysutils/desktop-file-utils/desktopdb.mk"
31.include "../../x11/wxGTK30/buildlink3.mk" 33.include "../../x11/wxGTK30/buildlink3.mk"
32.include "../../mk/bsd.pkg.mk" 34.include "../../mk/bsd.pkg.mk"
cvs diff -r1.2 -r1.3 pkgsrc/editors/codeblocks/distinfo (expand / switch to unified diff)

--- pkgsrc/editors/codeblocks/distinfo 2017/05/22 23:36:11 1.2
+++ pkgsrc/editors/codeblocks/distinfo 2017/12/19 20:05:37 1.3
@@ -1,12 +1,14 @@ @@ -1,12 +1,14 @@
1$NetBSD: distinfo,v 1.2 2017/05/22 23:36:11 joerg Exp $ 1$NetBSD: distinfo,v 1.3 2017/12/19 20:05:37 markd Exp $
2 2
3SHA1 (codeblocks_16.01.tar.gz) = 70aabe8a948dbaa919eb4b87bc74a600e0d93516 3SHA1 (codeblocks_16.01.tar.gz) = 70aabe8a948dbaa919eb4b87bc74a600e0d93516
4RMD160 (codeblocks_16.01.tar.gz) = e98b034eb8d6cf52a89312f2d5eaa10b17f1355e 4RMD160 (codeblocks_16.01.tar.gz) = e98b034eb8d6cf52a89312f2d5eaa10b17f1355e
5SHA512 (codeblocks_16.01.tar.gz) = 496ff2dbcf9a8248fa9f1060d50567d1fc6480cc9d8fc9f7d2cd532c82f4344deafe9b43f2b17d2510c74851e21acf2ca90d5cc7b61237d69a17e78e9907a63a 5SHA512 (codeblocks_16.01.tar.gz) = 496ff2dbcf9a8248fa9f1060d50567d1fc6480cc9d8fc9f7d2cd532c82f4344deafe9b43f2b17d2510c74851e21acf2ca90d5cc7b61237d69a17e78e9907a63a
6Size (codeblocks_16.01.tar.gz) = 20250097 bytes 6Size (codeblocks_16.01.tar.gz) = 20250097 bytes
7SHA1 (patch-configure) = c746e3b0f4f5ca2b8d5d215e4510c1996205338b 7SHA1 (patch-configure) = c746e3b0f4f5ca2b8d5d215e4510c1996205338b
 8SHA1 (patch-src_include_scripting_sqplus_sqplus.h) = 92385bb49c86d113d635a9540bd2013294f60ee1
8SHA1 (patch-src_plugins_contrib_wxContribItems_wxchart_configure) = 57f52bac348192b1dbfa63b012a48ed259e5933d 9SHA1 (patch-src_plugins_contrib_wxContribItems_wxchart_configure) = 57f52bac348192b1dbfa63b012a48ed259e5933d
9SHA1 (patch-src_plugins_contrib_wxContribItems_wxthings_configure) = 645d331fc86c872e522ed56fc0764e2a2a77c3c2 10SHA1 (patch-src_plugins_contrib_wxContribItems_wxthings_configure) = 645d331fc86c872e522ed56fc0764e2a2a77c3c2
 11SHA1 (patch-src_plugins_scriptedwizard_resources_opencv_wizard.script) = ec8514c3e816a882104221e5bfb32a6a2937030d
10SHA1 (patch-src_sdk_wxpropgrid_configure) = fc842f5964e7a213907d93b81ef35a3f1a4edf19 12SHA1 (patch-src_sdk_wxpropgrid_configure) = fc842f5964e7a213907d93b81ef35a3f1a4edf19
11SHA1 (patch-src_src_appglobals.cpp) = cb561786251fe14ed777105f207635c219f8634b 13SHA1 (patch-src_src_appglobals.cpp) = cb561786251fe14ed777105f207635c219f8634b
12SHA1 (patch-src_src_prefix.cpp) = 941fe61e81427990ed45b414a0bf98ceb40557cc 14SHA1 (patch-src_src_prefix.cpp) = 941fe61e81427990ed45b414a0bf98ceb40557cc
File Added: pkgsrc/editors/codeblocks/patches/Attic/patch-src_include_scripting_sqplus_sqplus.h
$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;
   }
 };
File Added: pkgsrc/editors/codeblocks/patches/Attic/patch-src_plugins_scriptedwizard_resources_opencv_wizard.script
$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`"));
     }