On 2018/02/05 14:31, Stuart Henderson wrote:
> On 2018/02/05 09:26, Josh Grosse wrote:
> > On 2018-02-05 07:41, Amit Kulkarni wrote:
> > > > > When I ran 'make update-patches' some patches got regenerated.
> > > > > Also, when I ran 'make port-lib-depends-check' I got some complaints
> > > > > about
> > > > > boost_system.7 missing.
> > > >
> > > > I received a similar NOT_REACHABLE error, for boost_system.8 (which
> > > > is -current)
> > > > during one build, but it was not a reproduceable issue. Here on
> > > > amd64, I
> > > > was not able to reproduce the message after that first occurrance.
> > >
> > > This happens also on make lib-depends-check on amd64. I guess WANTLIB
> > > += boost_system should fix the issue.
> > >
> > > Thanks
> >
> > No, because that produces a "Bogus WANTLIB" report.
>
> Make sure you have packages and ports tree in sync. If there's a
> discrepancy it's likely to come up with errors like this, and since
> boost was updated recently including a library version number bump,
> it's fairly likely here.
>
Here's a fixed-up one. Move boost to LIB_DEPENDS, regenerated WANTLIB,
regenerated patches.
Runtime not tested, anyone fancy taking it from here?
Index: Makefile
===================================================================
RCS file: /cvs/ports/devel/codeblocks/Makefile,v
retrieving revision 1.46
diff -u -p -r1.46 Makefile
--- Makefile 20 Jan 2018 15:05:34 -0000 1.46
+++ Makefile 5 Feb 2018 21:34:10 -0000
@@ -3,12 +3,12 @@
BROKEN-alpha= sqvm.cpp:394:1: internal compiler error: Segmentation fault
COMMENT= Code::Blocks C/C++ IDE
-V= 16.01
+V= 17.12
DISTNAME= codeblocks_${V}
PKGNAME= codeblocks-${V}
-REVISION= 5
+EXTRACT_SUFX= .tar.xz
-WRKDIST= ${WRKDIR}/codeblocks-${V}.release
+WRKDIST= ${WRKDIR}/codeblocks-${V}
SHARED_LIBS += codeblocks 0.1 # 0.1
SHARED_LIBS += wxchartctrl 0.1 # 0.1
@@ -31,24 +31,24 @@ HOMEPAGE= http://www.codeblocks.org/
# GPLv3
PERMIT_PACKAGE_CDROM= Yes
-WANTLIB += ICE SDL SM X11 Xcomposite Xcursor Xdamage Xext Xfixes
-WANTLIB += Xi Xinerama Xrandr Xrender Xxf86vm atk-1.0 bz2 c cairo
-WANTLIB += expat ffi fontconfig freetype gamin-1 gdk-x11-2.0 gdk_pixbuf-2.0
-WANTLIB += gio-2.0 glib-2.0 gmodule-2.0 gobject-2.0 graphite2
-WANTLIB += gthread-2.0 gtk-x11-2.0 harfbuzz hunspell-1.6 iconv intl iodbc
+WANTLIB += ${COMPILER_LIBCXX} ICE SDL SM X11 Xcomposite Xcursor
+WANTLIB += Xdamage Xext Xfixes Xi Xinerama Xrandr Xrender Xxf86vm
+WANTLIB += atk-1.0 boost_system bz2 c cairo expat ffi fontconfig
+WANTLIB += freetype gamin-1 gdk-x11-2.0 gdk_pixbuf-2.0 gio-2.0
+WANTLIB += glib-2.0 gmodule-2.0 gobject-2.0 graphite2 gthread-2.0
+WANTLIB += gtk-x11-2.0 harfbuzz hunspell-1.6 iconv intl iodbc
WANTLIB += jpeg m mspack pango-1.0 pangocairo-1.0 pangoft2-1.0
-WANTLIB += pcre pixman-1 png pthread sndio ${LIBCXX}
-WANTLIB += tiff usbhid wx_base wx_base_net wx_base_odbc wx_base_xml
-WANTLIB += wx_gtk2_adv wx_gtk2_aui wx_gtk2_core wx_gtk2_dbgrid
-WANTLIB += wx_gtk2_html wx_gtk2_qa wx_gtk2_richtext wx_gtk2_xrc
-WANTLIB += xcb xcb-render xcb-shm z ${COMPILER_LIBCXX}
+WANTLIB += pcre pixman-1 png sndio tiff usbhid wx_base wx_base_net
+WANTLIB += wx_base_odbc wx_base_xml wx_gtk2_adv wx_gtk2_aui wx_gtk2_core
+WANTLIB += wx_gtk2_dbgrid wx_gtk2_html wx_gtk2_qa wx_gtk2_richtext
+WANTLIB += wx_gtk2_xrc xcb xcb-render xcb-shm z
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=codeblocks/Sources/${V}/}
-BUILD_DEPENDS= archivers/zip \
- devel/boost
+BUILD_DEPENDS= archivers/zip
LIB_DEPENDS= archivers/bzip2 \
+ devel/boost \
sysutils/gamin \
textproc/hunspell \
x11/wxWidgets
@@ -67,8 +67,7 @@ BUILD_DEPENDS += ${MODGNU_AUTOCONF_DEPEN
devel/libtool
CONFIGURE_STYLE=gnu
-# nullptr test must pass
-CXXFLAGS += -std=c++11 -Wno-c++11-narrowing
+CXXFLAGS += -std=c++11
CONFIGURE_ENV= CPPFLAGS="-I${X11BASE}/include -I${LOCALBASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib"
CONFIGURE_ARGS= --with-contrib-plugins=all
Index: distinfo
===================================================================
RCS file: /cvs/ports/devel/codeblocks/distinfo,v
retrieving revision 1.5
diff -u -p -r1.5 distinfo
--- distinfo 30 Jan 2016 11:20:01 -0000 1.5
+++ distinfo 5 Feb 2018 21:34:10 -0000
@@ -1,2 +1,2 @@
-SHA256 (codeblocks_16.01.tar.gz) = MPudIG30qzwuL+wkUaCnyXI7/tmmc8yb5x6IHFKdWgM=
-SIZE (codeblocks_16.01.tar.gz) = 20250097
+SHA256 (codeblocks_17.12.tar.xz) = E4gaCnJ2lpToLlMbjngU1R+/H6EixzxQBOGGVg+8V+A=
+SIZE (codeblocks_17.12.tar.xz) = 15725976
Index: patches/patch-configure
===================================================================
RCS file: /cvs/ports/devel/codeblocks/patches/patch-configure,v
retrieving revision 1.5
diff -u -p -r1.5 patch-configure
--- patches/patch-configure 30 Jan 2016 11:20:01 -0000 1.5
+++ patches/patch-configure 5 Feb 2018 21:34:10 -0000
@@ -2,9 +2,10 @@ $OpenBSD: patch-configure,v 1.5 2016/01/
undefined reference to `free'
---- configure.orig Sat Jan 23 11:48:18 2016
-+++ configure Fri Jan 29 00:21:58 2016
-@@ -16670,7 +16670,6 @@ if ${ax_cv_check_ldflags___Wl___no_undefined+:} false;
+Index: configure
+--- configure.orig
++++ configure
+@@ -16887,7 +16887,6 @@ if ${ax_cv_check_ldflags___Wl___no_undefined+:} false;
else
ax_check_save_flags=$LDFLAGS
@@ -12,7 +13,7 @@ undefined reference to `free'
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
-@@ -16694,7 +16693,6 @@ fi
+@@ -16911,7 +16910,6 @@ fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: result:
$ax_cv_check_ldflags___Wl___no_undefined" >&5
$as_echo "$ax_cv_check_ldflags___Wl___no_undefined" >&6; }
if test "x$ax_cv_check_ldflags___Wl___no_undefined" = xyes; then :
Index: patches/patch-src_base_tinyxml_Makefile_in
===================================================================
RCS file:
/cvs/ports/devel/codeblocks/patches/patch-src_base_tinyxml_Makefile_in,v
retrieving revision 1.3
diff -u -p -r1.3 patch-src_base_tinyxml_Makefile_in
--- patches/patch-src_base_tinyxml_Makefile_in 30 Jan 2016 11:20:01 -0000
1.3
+++ patches/patch-src_base_tinyxml_Makefile_in 5 Feb 2018 21:34:10 -0000
@@ -3,12 +3,13 @@ $OpenBSD: patch-src_base_tinyxml_Makefil
Fix build when tinyxml is installed.
(tinyxml is bundled within codeblocks, so prefer the bundled includes)
---- src/base/tinyxml/Makefile.in.orig Sat Jan 23 11:47:57 2016
-+++ src/base/tinyxml/Makefile.in Fri Jan 29 00:21:58 2016
-@@ -388,10 +388,10 @@ target_vendor = @target_vendor@
- top_build_prefix = @top_build_prefix@
- top_builddir = @top_builddir@
+Index: src/base/tinyxml/Makefile.in
+--- src/base/tinyxml/Makefile.in.orig
++++ src/base/tinyxml/Makefile.in
+@@ -416,10 +416,10 @@ top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
+ zlib_CFLAGS = @zlib_CFLAGS@
+ zlib_LIBS = @zlib_LIBS@
-AM_CPPFLAGS = $(WX_CXXFLAGS) \
- -I$(top_srcdir)/src/sdk/wxscintilla/include \
+AM_CPPFLAGS = -I$(top_srcdir)/src/sdk/wxscintilla/include \
@@ -18,4 +19,4 @@ Fix build when tinyxml is installed.
+ $(WX_CXXFLAGS)
noinst_LTLIBRARIES = libtinyxml.la
- libtinyxml_la_SOURCES = tinyxml.cpp tinyxmlerror.cpp tinyxmlparser.cpp
tinywxuni.cpp
+ libtinyxml_la_SOURCES = tinyxml.cpp tinyxmlerror.cpp tinyxmlparser.cpp
Index: patches/patch-src_include_scripting_sqplus_sqplus_h
===================================================================
RCS file:
/cvs/ports/devel/codeblocks/patches/patch-src_include_scripting_sqplus_sqplus_h,v
retrieving revision 1.3
diff -u -p -r1.3 patch-src_include_scripting_sqplus_sqplus_h
--- patches/patch-src_include_scripting_sqplus_sqplus_h 18 Nov 2014 10:17:18
-0000 1.3
+++ patches/patch-src_include_scripting_sqplus_sqplus_h 5 Feb 2018 21:34:10
-0000
@@ -2,9 +2,10 @@ $OpenBSD: patch-src_include_scripting_sq
Replace the malloc.h header with stdlib.h.
---- src/include/scripting/sqplus/sqplus.h.orig Mon Nov 3 23:57:42 2014
-+++ src/include/scripting/sqplus/sqplus.h Mon Nov 3 23:58:09 2014
-@@ -16,7 +16,7 @@
+Index: src/include/scripting/sqplus/sqplus.h
+--- src/include/scripting/sqplus/sqplus.h.orig
++++ src/include/scripting/sqplus/sqplus.h
+@@ -17,7 +17,7 @@
#include <malloc/malloc.h>
#else
// C::B patch: support for FreeBSD
Index: patches/patch-src_plugins_compilergcc_compilergcc_cpp
===================================================================
RCS file:
/cvs/ports/devel/codeblocks/patches/patch-src_plugins_compilergcc_compilergcc_cpp,v
retrieving revision 1.4
diff -u -p -r1.4 patch-src_plugins_compilergcc_compilergcc_cpp
--- patches/patch-src_plugins_compilergcc_compilergcc_cpp 30 Jan 2016
11:20:01 -0000 1.4
+++ patches/patch-src_plugins_compilergcc_compilergcc_cpp 5 Feb 2018
21:34:10 -0000
@@ -2,8 +2,9 @@ $OpenBSD: patch-src_plugins_compilergcc_
Always use cb_console_runner from installed PREFIX.
---- src/plugins/compilergcc/compilergcc.cpp.orig Sat Jan 23 11:43:05 2016
-+++ src/plugins/compilergcc/compilergcc.cpp Fri Jan 29 00:27:33 2016
+Index: src/plugins/compilergcc/compilergcc.cpp
+--- src/plugins/compilergcc/compilergcc.cpp.orig
++++ src/plugins/compilergcc/compilergcc.cpp
@@ -159,7 +159,7 @@ namespace
{
PluginRegistrant<CompilerGCC> reg(_T("Compiler"));
@@ -13,7 +14,7 @@ Always use cb_console_runner from instal
static const wxString strSLASH(_T("/"));
static const wxString strSPACE(_T(" "));
static const wxString strQUOTE(platform::windows ? _T("\"") : _T("'"));
-@@ -1723,8 +1723,7 @@ int CompilerGCC::RunSingleFile(const wxString& filenam
+@@ -1767,8 +1767,7 @@ int CompilerGCC::RunSingleFile(const wxString& filenam
wxString baseDir = ConfigManager::GetExecutableFolder();
wxString crunnStr = strQUOTE + baseDir + strSLASH + strCONSOLE_RUNNER +
strQUOTE;
@@ -23,7 +24,7 @@ Always use cb_console_runner from instal
if (!command.Replace(_T("$SCRIPT"), exe_filename))
command << strQUOTE << exe_filename << strQUOTE; // if they didn't
specify $SCRIPT, append:
-@@ -1838,7 +1837,7 @@ int CompilerGCC::Run(ProjectBuildTarget* target)
+@@ -1885,7 +1884,7 @@ int CompilerGCC::Run(ProjectBuildTarget* target)
: EscapeSpaces(m_CdRun);
wxString crunnStr = platform::windows
? strQUOTE + baseDir + strSLASH + strCONSOLE_RUNNER +
strQUOTE
@@ -32,7 +33,7 @@ Always use cb_console_runner from instal
wxString hostapStr = platform::windows
? strQUOTE + target->GetHostApplication() + strQUOTE
: EscapeSpaces(target->GetHostApplication());
-@@ -1876,8 +1875,6 @@ int CompilerGCC::Run(ProjectBuildTarget* target)
+@@ -1923,8 +1922,6 @@ int CompilerGCC::Run(ProjectBuildTarget* target)
if (target->GetUseConsoleRunner())
{
@@ -41,7 +42,7 @@ Always use cb_console_runner from instal
command << crunnStr << strSPACE;
if (!platform::windows)
-@@ -1889,7 +1886,6 @@ int CompilerGCC::Run(ProjectBuildTarget* target)
+@@ -1936,7 +1933,6 @@ int CompilerGCC::Run(ProjectBuildTarget* target)
QuoteStringIfNeeded(strLinkerPath);
command << strLinkerPath << strSPACE;
}
Index: patches/patch-src_sdk_wxpropgrid_include_wx_propgrid_propgrid_h
===================================================================
RCS file: patches/patch-src_sdk_wxpropgrid_include_wx_propgrid_propgrid_h
diff -N patches/patch-src_sdk_wxpropgrid_include_wx_propgrid_propgrid_h
--- patches/patch-src_sdk_wxpropgrid_include_wx_propgrid_propgrid_h 27 Nov
2017 22:13:47 -0000 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,17 +0,0 @@
-$OpenBSD: patch-src_sdk_wxpropgrid_include_wx_propgrid_propgrid_h,v 1.1
2017/11/27 22:13:47 espie Exp $
-
-Remove null references in wxPGProperty
-from https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=197888
-
-Index: src/sdk/wxpropgrid/include/wx/propgrid/propgrid.h
---- src/sdk/wxpropgrid/include/wx/propgrid/propgrid.h.orig
-+++ src/sdk/wxpropgrid/include/wx/propgrid/propgrid.h
-@@ -700,7 +700,7 @@ class WXDLLIMPEXP_PG wxPGCell (protected)
- #define wxPG_EMPTY_ARRAYSTRING wxArrayString()
-
- #if !defined(SWIG)
-- #define wxPG_LABEL (*((wxString*)NULL)) // Used to tell
wxPGProperty to use label as name as well.
-+ extern WXDLLIMPEXP_PG const wxString wxPG_LABEL; // Used to tell
wxPGProperty to use label as name as well.
- #define wxPG_NULL_BITMAP wxNullBitmap
- #define wxPG_COLOUR_BLACK (*wxBLACK)
- #else
Index: patches/patch-src_sdk_wxpropgrid_src_propgrid_cpp
===================================================================
RCS file: patches/patch-src_sdk_wxpropgrid_src_propgrid_cpp
diff -N patches/patch-src_sdk_wxpropgrid_src_propgrid_cpp
--- patches/patch-src_sdk_wxpropgrid_src_propgrid_cpp 27 Nov 2017 22:13:47
-0000 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,34 +0,0 @@
-$OpenBSD: patch-src_sdk_wxpropgrid_src_propgrid_cpp,v 1.1 2017/11/27 22:13:47
espie Exp $
-
-Remove null references in wxPGProperty
-from https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=197888
-
-Index: src/sdk/wxpropgrid/src/propgrid.cpp
---- src/sdk/wxpropgrid/src/propgrid.cpp.orig
-+++ src/sdk/wxpropgrid/src/propgrid.cpp
-@@ -333,6 +333,8 @@ const wxChar *wxPGTypeName_PyObject = wxT("PyObject");
-
- static const wxChar* gs_noCellText = wxT("@!");
-
-+const wxString wxPG_LABEL;
-+
- // -----------------------------------------------------------------------
-
- static void wxPGDrawFocusRect( wxDC& dc, const wxRect& rect )
-@@ -679,13 +681,13 @@ void wxPGProperty::Init()
-
- void wxPGProperty::Init( const wxString& label, const wxString& name )
- {
-- if ( &label != ((wxString*)NULL) )
-+ if ( label != wxPG_LABEL )
- m_label = label;
-
- #ifndef __WXPYTHON__
-- if ( &name != ((wxString*)NULL) )
-+ if ( label != wxPG_LABEL )
- #else
-- if ( (&name != ((wxString*)NULL)) && name != wxT("_LABEL_AS_NAME") )
-+ if ( name != wxPG_LABEL && name != wxT("_LABEL_AS_NAME") )
- #endif
- DoSetName( name );
- else
Index: pkg/PLIST
===================================================================
RCS file: /cvs/ports/devel/codeblocks/pkg/PLIST,v
retrieving revision 1.9
diff -u -p -r1.9 PLIST
--- pkg/PLIST 30 Jan 2016 11:20:01 -0000 1.9
+++ pkg/PLIST 5 Feb 2018 21:34:10 -0000
@@ -73,14 +73,13 @@ include/codeblocks/ibaseloader.h
include/codeblocks/ibaseworkspaceloader.h
include/codeblocks/id.h
include/codeblocks/importers_globals.h
-include/codeblocks/incrementalselectlistdlg.h
+include/codeblocks/incremental_select_helper.h
include/codeblocks/infowindow.h
include/codeblocks/licenses.h
include/codeblocks/logger.h
include/codeblocks/loggers.h
include/codeblocks/logmanager.h
include/codeblocks/macrosmanager.h
-include/codeblocks/managedthread.h
include/codeblocks/manager.h
include/codeblocks/menuitemsmanager.h
include/codeblocks/misctreeitemdata.h
@@ -162,9 +161,9 @@ include/codeblocks/searchresultslog.h
include/codeblocks/selecttargetdlg.h
include/codeblocks/settings.h
include/codeblocks/templatemanager.h
+include/codeblocks/tinywxuni.h
include/codeblocks/tinyxml/
include/codeblocks/tinyxml/tinystr.h
-include/codeblocks/tinyxml/tinywxuni.h
include/codeblocks/tinyxml/tinyxml.h
include/codeblocks/toolsmanager.h
include/codeblocks/uservarmanager.h
@@ -384,6 +383,7 @@ include/wxsmith/wxwidgets/wxwidgetsres.h
include/wxsmith/wxwidgets/wxwidgetsresfactory.h
lib/codeblocks/
lib/codeblocks/plugins/
+lib/codeblocks/plugins/libAstyle.so
lib/codeblocks/plugins/libAutoVersioning.so
lib/codeblocks/plugins/libBrowseTracker.so
lib/codeblocks/plugins/libCccc.so
@@ -414,7 +414,6 @@ lib/codeblocks/plugins/libThreadSearch.s
lib/codeblocks/plugins/libToolsPlus.so
lib/codeblocks/plugins/libValgrind.so
lib/codeblocks/plugins/libabbreviations.so
-lib/codeblocks/plugins/libastyle.so
lib/codeblocks/plugins/libautosave.so
lib/codeblocks/plugins/libbyogames.so
lib/codeblocks/plugins/libcb_koders.so
@@ -493,8 +492,12 @@ lib/pkgconfig/wxsmithaui.pc
@man man/man1/cb_share_config.1
@man man/man1/codeblocks.1
@man man/man1/codesnippets.1
+share/appdata/
+share/appdata/codeblocks-contrib.metainfo.xml
+share/appdata/codeblocks.appdata.xml
share/applications/codeblocks.desktop
share/codeblocks/
+share/codeblocks/Astyle.zip
share/codeblocks/AutoVersioning.zip
share/codeblocks/BrowseTracker.zip
share/codeblocks/Cccc.zip
@@ -538,7 +541,6 @@ share/codeblocks/ThreadSearch.zip
share/codeblocks/ToolsPlus.zip
share/codeblocks/Valgrind.zip
share/codeblocks/abbreviations.zip
-share/codeblocks/astyle.zip
share/codeblocks/autosave.zip
share/codeblocks/byogames.zip
share/codeblocks/cb_koders.zip
@@ -548,6 +550,7 @@ share/codeblocks/codesnippets.zip
share/codeblocks/codestat.zip
share/codeblocks/compiler.zip
share/codeblocks/compilers/
+share/codeblocks/compilers/compiler_android-gcc.xml
share/codeblocks/compilers/compiler_avr-gcc.xml
share/codeblocks/compilers/compiler_bcc.xml
share/codeblocks/compilers/compiler_bfin-elf-gcc.xml
@@ -558,13 +561,16 @@ share/codeblocks/compilers/compiler_ldc.
share/codeblocks/compilers/compiler_lm32-gcc.xml
share/codeblocks/compilers/compiler_lm8-gcc.xml
share/codeblocks/compilers/compiler_msp430-gcc.xml
+share/codeblocks/compilers/compiler_mw.xml
share/codeblocks/compilers/compiler_null.xml
share/codeblocks/compilers/compiler_pgifortran.xml
+share/codeblocks/compilers/compiler_powerpc-eabi.xml
share/codeblocks/compilers/compiler_ppc-gcc.xml
share/codeblocks/compilers/compiler_sdcc.xml
share/codeblocks/compilers/compiler_tcc.xml
share/codeblocks/compilers/compiler_tricore-gcc.xml
share/codeblocks/compilers/compiler_zpu-gcc.xml
+share/codeblocks/compilers/options_android-gcc.xml
share/codeblocks/compilers/options_arm-elf-gcc.xml
share/codeblocks/compilers/options_avr-gcc.xml
share/codeblocks/compilers/options_bcc.xml
@@ -603,9 +609,11 @@ share/codeblocks/compilers/options_msp43
share/codeblocks/compilers/options_msvc10.xml
share/codeblocks/compilers/options_msvc8.xml
share/codeblocks/compilers/options_msvctk.xml
+share/codeblocks/compilers/options_mw.xml
share/codeblocks/compilers/options_null.xml
share/codeblocks/compilers/options_ow.xml
share/codeblocks/compilers/options_pgifortran.xml
+share/codeblocks/compilers/options_powerpc-eabi.xml
share/codeblocks/compilers/options_ppc-gcc.xml
share/codeblocks/compilers/options_sdcc.xml
share/codeblocks/compilers/options_tcc.xml
@@ -1227,6 +1235,8 @@ share/codeblocks/lexers/lexer_ada.sample
share/codeblocks/lexers/lexer_ada.xml
share/codeblocks/lexers/lexer_angelscript.sample
share/codeblocks/lexers/lexer_angelscript.xml
+share/codeblocks/lexers/lexer_autotools.sample
+share/codeblocks/lexers/lexer_autotools.xml
share/codeblocks/lexers/lexer_bash.sample
share/codeblocks/lexers/lexer_bash.xml
share/codeblocks/lexers/lexer_batch.sample
@@ -1245,6 +1255,8 @@ share/codeblocks/lexers/lexer_cpp.sample
share/codeblocks/lexers/lexer_cpp.xml
share/codeblocks/lexers/lexer_css.sample
share/codeblocks/lexers/lexer_css.xml
+share/codeblocks/lexers/lexer_cu.sample
+share/codeblocks/lexers/lexer_cu.xml
share/codeblocks/lexers/lexer_d.sample
share/codeblocks/lexers/lexer_d.xml
share/codeblocks/lexers/lexer_diff.sample
@@ -1265,6 +1277,8 @@ share/codeblocks/lexers/lexer_html.sampl
share/codeblocks/lexers/lexer_html.xml
share/codeblocks/lexers/lexer_ihex.sample
share/codeblocks/lexers/lexer_ihex.xml
+share/codeblocks/lexers/lexer_inno.sample
+share/codeblocks/lexers/lexer_inno.xml
share/codeblocks/lexers/lexer_java.sample
share/codeblocks/lexers/lexer_java.xml
share/codeblocks/lexers/lexer_javascript.sample
@@ -1291,6 +1305,8 @@ share/codeblocks/lexers/lexer_perl.sampl
share/codeblocks/lexers/lexer_perl.xml
share/codeblocks/lexers/lexer_postscript.sample
share/codeblocks/lexers/lexer_postscript.xml
+share/codeblocks/lexers/lexer_powershell.sample
+share/codeblocks/lexers/lexer_powershell.xml
share/codeblocks/lexers/lexer_prg.sample
share/codeblocks/lexers/lexer_prg.xml
share/codeblocks/lexers/lexer_properties.sample
@@ -1340,7 +1356,6 @@ share/codeblocks/scripts/make_dist.scrip
share/codeblocks/scripts/plugin_find_broken_files.script
share/codeblocks/scripts/sample_plugin.script
share/codeblocks/scripts/startup.script
-share/codeblocks/scripts/stl-views-1.0.3.gdb
share/codeblocks/scripts/tests/
share/codeblocks/scripts/tests/menu_test_plugin.script
share/codeblocks/scripts/tests/script_test_plugin.script
@@ -1381,6 +1396,10 @@ share/codeblocks/templates/sdccapp.templ
share/codeblocks/templates/sdl-cb.bmp
share/codeblocks/templates/sdl-main.cpp
share/codeblocks/templates/sdl.png
+share/codeblocks/templates/sdl2-main.cpp
+share/codeblocks/templates/sdl2.png
+share/codeblocks/templates/sdl2app.cbp
+share/codeblocks/templates/sdl2app.template
share/codeblocks/templates/sdlapp.cbp
share/codeblocks/templates/sdlapp.template
share/codeblocks/templates/sfml-cb.bmp
@@ -1395,6 +1414,32 @@ share/codeblocks/templates/staticlib-sam
share/codeblocks/templates/staticlib.cbp
share/codeblocks/templates/staticlib.template
share/codeblocks/templates/wizard/
+share/codeblocks/templates/wizard/arduino/
+share/codeblocks/templates/wizard/arduino/files/
+share/codeblocks/templates/wizard/arduino/files/cores/
+share/codeblocks/templates/wizard/arduino/files/cores/CDC.cpp
+share/codeblocks/templates/wizard/arduino/files/cores/HID.cpp
+share/codeblocks/templates/wizard/arduino/files/cores/HardwareSerial.cpp
+share/codeblocks/templates/wizard/arduino/files/cores/IPAddress.cpp
+share/codeblocks/templates/wizard/arduino/files/cores/Print.cpp
+share/codeblocks/templates/wizard/arduino/files/cores/Stream.cpp
+share/codeblocks/templates/wizard/arduino/files/cores/Tone.cpp
+share/codeblocks/templates/wizard/arduino/files/cores/USBCore.cpp
+share/codeblocks/templates/wizard/arduino/files/cores/WInterrupts.c
+share/codeblocks/templates/wizard/arduino/files/cores/WMath.cpp
+share/codeblocks/templates/wizard/arduino/files/cores/WString.cpp
+share/codeblocks/templates/wizard/arduino/files/cores/libraries.cpp
+share/codeblocks/templates/wizard/arduino/files/cores/main.cpp
+share/codeblocks/templates/wizard/arduino/files/cores/new.cpp
+share/codeblocks/templates/wizard/arduino/files/cores/wiring.c
+share/codeblocks/templates/wizard/arduino/files/cores/wiring_analog.c
+share/codeblocks/templates/wizard/arduino/files/cores/wiring_digital.c
+share/codeblocks/templates/wizard/arduino/files/cores/wiring_pulse.c
+share/codeblocks/templates/wizard/arduino/files/cores/wiring_shift.c
+share/codeblocks/templates/wizard/arduino/files/sketch.cpp
+share/codeblocks/templates/wizard/arduino/logo.png
+share/codeblocks/templates/wizard/arduino/wizard.png
+share/codeblocks/templates/wizard/arduino/wizard.script
share/codeblocks/templates/wizard/arm/
share/codeblocks/templates/wizard/arm/files/
share/codeblocks/templates/wizard/arm/files/ARM-eval7t/
@@ -1516,6 +1561,10 @@ share/codeblocks/templates/wizard/d/cons
share/codeblocks/templates/wizard/d/logo.png
share/codeblocks/templates/wizard/d/wizard.png
share/codeblocks/templates/wizard/d/wizard.script
+share/codeblocks/templates/wizard/d_source/
+share/codeblocks/templates/wizard/d_source/logo.png
+share/codeblocks/templates/wizard/d_source/wizard.png
+share/codeblocks/templates/wizard/d_source/wizard.script
share/codeblocks/templates/wizard/directx/
share/codeblocks/templates/wizard/directx/dx8/
share/codeblocks/templates/wizard/directx/dx8/main.cpp
@@ -1600,6 +1649,16 @@ share/codeblocks/templates/wizard/irrlic
share/codeblocks/templates/wizard/irrlicht/logo.png
share/codeblocks/templates/wizard/irrlicht/wizard.png
share/codeblocks/templates/wizard/irrlicht/wizard.script
+share/codeblocks/templates/wizard/java/
+share/codeblocks/templates/wizard/java/file/
+share/codeblocks/templates/wizard/java/file/logo.png
+share/codeblocks/templates/wizard/java/file/wizard.png
+share/codeblocks/templates/wizard/java/file/wizard.script
+share/codeblocks/templates/wizard/java/files/
+share/codeblocks/templates/wizard/java/files/Main.java
+share/codeblocks/templates/wizard/java/logo.png
+share/codeblocks/templates/wizard/java/wizard.png
+share/codeblocks/templates/wizard/java/wizard.script
share/codeblocks/templates/wizard/lf/
share/codeblocks/templates/wizard/lf/files/
share/codeblocks/templates/wizard/lf/files/quick/
@@ -1614,9 +1673,10 @@ share/codeblocks/templates/wizard/lf/wiz
share/codeblocks/templates/wizard/lf/wizard.xrc
share/codeblocks/templates/wizard/matlab_csf/
share/codeblocks/templates/wizard/matlab_csf/files/
-share/codeblocks/templates/wizard/matlab_csf/files/lccstub.c
share/codeblocks/templates/wizard/matlab_csf/files/mexversion.rc
share/codeblocks/templates/wizard/matlab_csf/files/sfuntmpl.c
+share/codeblocks/templates/wizard/matlab_csf/lccstub/
+share/codeblocks/templates/wizard/matlab_csf/lccstub/lccstub.c
share/codeblocks/templates/wizard/matlab_csf/logo.png
share/codeblocks/templates/wizard/matlab_csf/wizard.png
share/codeblocks/templates/wizard/matlab_csf/wizard.script
@@ -1628,6 +1688,13 @@ share/codeblocks/templates/wizard/mcs51/
share/codeblocks/templates/wizard/mcs51/wizard.png
share/codeblocks/templates/wizard/mcs51/wizard.script
share/codeblocks/templates/wizard/mcs51/wizard.xrc
+share/codeblocks/templates/wizard/msp430/
+share/codeblocks/templates/wizard/msp430/files/
+share/codeblocks/templates/wizard/msp430/files/main.c
+share/codeblocks/templates/wizard/msp430/logo.png
+share/codeblocks/templates/wizard/msp430/wizard.png
+share/codeblocks/templates/wizard/msp430/wizard.script
+share/codeblocks/templates/wizard/msp430/wizard.xrc
share/codeblocks/templates/wizard/ogre/
share/codeblocks/templates/wizard/ogre/files/
share/codeblocks/templates/wizard/ogre/files/main.cpp
@@ -1636,7 +1703,7 @@ share/codeblocks/templates/wizard/ogre/w
share/codeblocks/templates/wizard/ogre/wizard.script
share/codeblocks/templates/wizard/opencv/
share/codeblocks/templates/wizard/opencv/files/
-share/codeblocks/templates/wizard/opencv/files/lena.jpg
+share/codeblocks/templates/wizard/opencv/files/arnold_schwarzenegger.jpg
share/codeblocks/templates/wizard/opencv/files/main.cpp
share/codeblocks/templates/wizard/opencv/logo.png
share/codeblocks/templates/wizard/opencv/wizard.png
@@ -1693,6 +1760,18 @@ share/codeblocks/templates/wizard/qt4/fi
share/codeblocks/templates/wizard/qt4/logo.png
share/codeblocks/templates/wizard/qt4/wizard.png
share/codeblocks/templates/wizard/qt4/wizard.script
+share/codeblocks/templates/wizard/qt4dll/
+share/codeblocks/templates/wizard/qt4dll/files/
+share/codeblocks/templates/wizard/qt4dll/files/main.cpp
+share/codeblocks/templates/wizard/qt4dll/logo.png
+share/codeblocks/templates/wizard/qt4dll/wizard.png
+share/codeblocks/templates/wizard/qt4dll/wizard.script
+share/codeblocks/templates/wizard/qt5/
+share/codeblocks/templates/wizard/qt5/files/
+share/codeblocks/templates/wizard/qt5/files/main.cpp
+share/codeblocks/templates/wizard/qt5/logo.png
+share/codeblocks/templates/wizard/qt5/wizard.png
+share/codeblocks/templates/wizard/qt5/wizard.script
share/codeblocks/templates/wizard/sdl/
share/codeblocks/templates/wizard/sdl/files/
share/codeblocks/templates/wizard/sdl/files/cb.bmp
@@ -1700,6 +1779,12 @@ share/codeblocks/templates/wizard/sdl/fi
share/codeblocks/templates/wizard/sdl/logo.png
share/codeblocks/templates/wizard/sdl/wizard.png
share/codeblocks/templates/wizard/sdl/wizard.script
+share/codeblocks/templates/wizard/sdl2/
+share/codeblocks/templates/wizard/sdl2/files/
+share/codeblocks/templates/wizard/sdl2/files/main.cpp
+share/codeblocks/templates/wizard/sdl2/logo.png
+share/codeblocks/templates/wizard/sdl2/wizard.png
+share/codeblocks/templates/wizard/sdl2/wizard.script
share/codeblocks/templates/wizard/sfml/
share/codeblocks/templates/wizard/sfml/logo.png
share/codeblocks/templates/wizard/sfml/sfml1/
