Re: [update] devel/codeblocks

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") )
-