[packages/codeblocks] - updated to 17.12 - updated ac,pwd patches - removed obsolete gcc6 patch - added astyle-3.1 patch,
qboosh
qboosh at pld-linux.org
Sat Apr 20 09:18:39 CEST 2019
commit 0bf0e321f2e97415d7553ba90262831b12556b4e
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date: Sat Apr 20 09:18:50 2019 +0200
- updated to 17.12
- updated ac,pwd patches
- removed obsolete gcc6 patch
- added astyle-3.1 patch, use system astyle >= 3
- use system tinyxml and squirrel libraries
- use wxGTK3 by default
codeblocks-ac.patch | 23 ++-
codeblocks-astyle-3.1.patch | 367 ++++++++++++++++++++++++++++++++++++++++++++
codeblocks-pwd.patch | 11 +-
codeblocks.spec | 81 ++++++----
gcc6.patch | 240 -----------------------------
5 files changed, 438 insertions(+), 284 deletions(-)
---
diff --git a/codeblocks.spec b/codeblocks.spec
index 1d7e31b..348b605 100644
--- a/codeblocks.spec
+++ b/codeblocks.spec
@@ -1,29 +1,46 @@
+#
+# Conditional build:
+%bcond_with gtk2 # GTK+ 2.x instead of 3.x
Summary: An open source, cross platform, free C++ IDE
Summary(pl.UTF-8): Wieloplatformowe, darmowe IDE do C++ o otwartych źródłach
Name: codeblocks
-Version: 16.01
-Release: 3
+Version: 17.12
+Release: 1
License: GPL v3
Group: X11/Development/Tools
-Source0: http://download.sourceforge.net/codeblocks/%{name}_%{version}.tar.gz
-# Source0-md5: 823f6c229692367ff74f52098b887b6b
+Source0: http://download.sourceforge.net/codeblocks/%{name}_%{version}.tar.xz
+# Source0-md5: e7fb4fcf099fffe944b48af113944a81
Patch0: %{name}-FHS-plugins.patch
Patch2: %{name}-ac.patch
Patch3: %{name}-pwd.patch
-Patch4: gcc6.patch
+Patch4: %{name}-astyle-3.1.patch
URL: http://www.codeblocks.org/
+BuildRequires: astyle-devel >= 3.0
BuildRequires: autoconf >= 2.50
BuildRequires: automake
+BuildRequires: boost-devel
BuildRequires: bzip2-devel
+BuildRequires: fontconfig-devel
BuildRequires: gamin-devel
-BuildRequires: gtk+2-devel
-BuildRequires: libtool
+BuildRequires: glib2-devel >= 2.0
+%{?with_gtk2:BuildRequires: gtk+2-devel >= 1:2.0.0}
+%{!?with_gtk2:BuildRequires: gtk+3-devel >= 3.0.0}
+BuildRequires: libstdc++-devel >= 6:4.7
+BuildRequires: libtool >= 2:2
BuildRequires: pkgconfig
BuildRequires: sed >= 4.0
+# pkgconfig(squirrel)
+BuildRequires: squirrel-devel >= 2.2.5
BuildRequires: hunspell-devel
BuildRequires: unixODBC-devel
-BuildRequires: wxGTK2-unicode-devel >= 2.8.0
+BuildRequires: tar >= 1:1.22
+# pkgconfig(tinyxml)
+BuildRequires: tinyxml-devel >= 2.6.2-8
+%{?with_gtk2:BuildRequires: wxGTK2-unicode-devel >= 2.8.12}
+%{!?with_gtk2:BuildRequires: wxGTK3-unicode-devel >= 2.8.12}
+BuildRequires: xorg-lib-libX11-devel
+BuildRequires: xz
BuildRequires: zip
BuildRequires: zlib-devel
Requires(post,postun): desktop-file-utils
@@ -31,8 +48,6 @@ Requires(post,postun): gtk-update-icon-cache
Requires(post,postun): shared-mime-info
BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
-%define _pluginsdir %{_libdir}/%{name}/plugins
-
%description
Code::Blocks is a free C++ IDE built specifically to meet the most
demanding needs of its users. It was designed, right from the start,
@@ -130,28 +145,33 @@ Ten pakiet dostarcza plików nagłówkowych Code::Blocks. Należy
instalować ten pakiet tylko w celu pisania wtyczek do Code::Blocks.
%prep
-%setup -q -n %{name}-%{version}.release
+%setup -q
%patch0 -p1
%patch2 -p1
%patch3 -p1
%patch4 -p1
-#hardcode libdir, continue of patch0
+# hardcode libdir, continue of patch0
sed -i 's|@libdir@|%{_libdir}|' src/sdk/configmanager.cpp
# fix version inside the configure script
-sed -i 's/1\.0svn/%{version}/g' revision.m4
+sed -i 's/svn[0-9]\+//g' revision.m4
%build
%{__libtoolize}
-%{__aclocal}
+%{__aclocal} -I m4
%{__autoconf}
%{__autoheader}
%{__automake}
-export CXXFLAGS="%{rpmcxxflags} -std=c++11"
+CXXFLAGS="%{rpmcxxflags} -std=c++11"
%configure \
+ --with-boost-system=boost_system \
+ --with-contrib-plugins=all \
+%if %{with gtk2}
--with-wx-config=wx-gtk2-unicode-config \
- --with-contrib-plugins=all
+%else
+ --with-wx-config=wx-gtk3-unicode-config
+%endif
%{__make}
@@ -162,8 +182,12 @@ rm -rf $RPM_BUILD_ROOT
DESTDIR=$RPM_BUILD_ROOT \
mimeicondir=%{_iconsdir}/hicolor/48x48/mimetypes
-%{__rm} $RPM_BUILD_ROOT%{_pluginsdir}/*.la
-%{__rm} $RPM_BUILD_ROOT%{_libdir}/{codeblocks/wxContribItems/,}*.la
+# loadable plugins
+%{__rm} $RPM_BUILD_ROOT%{_libdir}/codeblocks/plugins/*.la
+# private libraries
+%{__rm} $RPM_BUILD_ROOT%{_libdir}/codeblocks/wxContribItems/*.la
+# obsoleted by pkg-config
+%{__rm} $RPM_BUILD_ROOT%{_libdir}/*.la
%clean
rm -rf $RPM_BUILD_ROOT
@@ -191,8 +215,10 @@ rm -rf $RPM_BUILD_ROOT
%attr(755,root,root) %{_libdir}/libcodeblocks.so.*.*.*
%attr(755,root,root) %ghost %{_libdir}/libcodeblocks.so.0
%{_desktopdir}/codeblocks.desktop
-%{_pixmapsdir}/*.png
-%{_iconsdir}/hicolor/48x48/mimetypes/*.png
+%{_pixmapsdir}/codeblocks.png
+%{_iconsdir}/hicolor/48x48/mimetypes/application-x-codeblocks*.png
+%{_datadir}/appdata/codeblocks.appdata.xml
+%{_datadir}/appdata/codeblocks-contrib.metainfo.xml
%{_datadir}/mime/packages/codeblocks.xml
%dir %{_datadir}/%{name}
%dir %{_datadir}/%{name}/scripts
@@ -207,18 +233,21 @@ rm -rf $RPM_BUILD_ROOT
%{_datadir}/%{name}/lib_finder
%{_datadir}/%{name}/templates
%dir %{_libdir}/%{name}
+%dir %{_libdir}/%{name}/plugins
+%attr(755,root,root) %{_libdir}/%{name}/plugins/*.so
%dir %{_libdir}/%{name}/wxContribItems
-%dir %{_pluginsdir}
-%attr(755,root,root) %{_pluginsdir}/*.so
-%attr(755,root,root) %{_libdir}/%{name}/wxContribItems/*.so.*
-%{_mandir}/man1/*.1*
+%attr(755,root,root) %{_libdir}/%{name}/wxContribItems/libwx*.so.*
+%{_mandir}/man1/cb_console_runner.1*
+%{_mandir}/man1/cb_share_config.1*
+%{_mandir}/man1/codeblocks.1*
+%{_mandir}/man1/codesnippets.1*
%files devel
%defattr(644,root,root,755)
%attr(755,root,root) %{_libdir}/libcodeblocks.so
%attr(755,root,root) %{_libdir}/libwxsmithlib.so
-%attr(755,root,root) %{_libdir}/%{name}/wxContribItems/*.so
-%{_pkgconfigdir}/cb_*.pc
+%attr(755,root,root) %{_libdir}/%{name}/wxContribItems/libwx*.so
+%{_pkgconfigdir}/cb_wx*.pc
%{_pkgconfigdir}/codeblocks.pc
%{_pkgconfigdir}/wxsmith*.pc
%{_includedir}/codeblocks
diff --git a/codeblocks-ac.patch b/codeblocks-ac.patch
index 0ff07e0..5484919 100644
--- a/codeblocks-ac.patch
+++ b/codeblocks-ac.patch
@@ -1,14 +1,13 @@
-diff -urN codeblocks-8.02/acinclude.m4 codeblocks-8.02.new/acinclude.m4
---- codeblocks-8.02/acinclude.m4.orig 2010-07-01 01:18:30.000000000 +0200
-+++ codeblocks-8.02/acinclude.m4 2010-07-01 01:23:01.000000000 +0200
-@@ -71,8 +71,8 @@ if test "x$enable_debug" = "xyes"; then
- CXXFLAGS="-g -DDEBUG -DCB_AUTOCONF $CXXFLAGS"
+--- codeblocks-17.12/m4/acinclude.m4.orig 2019-04-19 18:32:27.583835515 +0200
++++ codeblocks-17.12/m4/acinclude.m4 2019-04-19 18:33:27.033513448 +0200
+@@ -97,8 +97,8 @@
AC_MSG_RESULT(yes)
else
-- CFLAGS="-O2 -ffast-math -DCB_AUTOCONF $CFLAGS"
-- CXXFLAGS="-O2 -ffast-math -DCB_AUTOCONF $CXXFLAGS"
-+ CFLAGS="-Wall -ffast-math -DCB_AUTOCONF $CFLAGS"
-+ CXXFLAGS="-Wall -ffast-math -DCB_AUTOCONF $CXXFLAGS"
- AC_MSG_RESULT(no)
- fi
- ])
+ AS_IF([test "x$enable_flags_setting" = "xyes"],[
+- CFLAGS="-O2 -ffast-math $CFLAGS"
+- CXXFLAGS="-O2 -ffast-math $CXXFLAGS"
++ CFLAGS="-Wall -ffast-math $CFLAGS"
++ CXXFLAGS="-Wall -ffast-math $CXXFLAGS"
+ ], [
+ : ${CFLAGS=""}
+ : ${CXXFLAGS=""}
diff --git a/codeblocks-astyle-3.1.patch b/codeblocks-astyle-3.1.patch
new file mode 100644
index 0000000..86fc26f
--- /dev/null
+++ b/codeblocks-astyle-3.1.patch
@@ -0,0 +1,367 @@
+diff --git a/src/plugins/astyle/asstreamiterator.cpp b/src/plugins/astyle/asstreamiterator.cpp
+index a2d75f2c9..cc6244109 100644
+--- a/src/plugins/astyle/asstreamiterator.cpp
++++ b/src/plugins/astyle/asstreamiterator.cpp
+@@ -53,8 +53,10 @@ std::string ASStreamIterator::nextLine(cb_unused bool emptyLineWasDeleted)
+
+ std::string ASStreamIterator::peekNextLine()
+ {
+- if (!m_SavedCharPtr)
++ if (!m_SavedCharPtr){
+ m_SavedCharPtr = m_CharPtr;
++ m_SavedCurChar = m_CurChar;
++ }
+
+ return readLine();
+ }
+@@ -62,6 +64,7 @@ std::string ASStreamIterator::peekNextLine()
+ void ASStreamIterator::peekReset()
+ {
+ m_CharPtr = m_SavedCharPtr;
++ m_CurChar = m_SavedCurChar;
+ m_SavedCharPtr = 0;
+ }
+
+diff --git a/src/plugins/astyle/asstreamiterator.h b/src/plugins/astyle/asstreamiterator.h
+index 105ca9956..d1a6c8fcd 100644
+--- a/src/plugins/astyle/asstreamiterator.h
++++ b/src/plugins/astyle/asstreamiterator.h
+@@ -22,6 +22,7 @@ class ASStreamIterator : public astyle::ASSourceIterator
+
+ bool hasMoreLines() const;
+ int getStreamLength() const;
++ std::streamoff getPeekStart() const { return 0; }
+ std::string nextLine(bool emptyLineWasDeleted = false);
+ std::string peekNextLine();
+ void peekReset();
+@@ -39,6 +40,7 @@ class ASStreamIterator : public astyle::ASSourceIterator
+ const wxChar* m_CharPtr;
+ const wxChar* m_SavedCharPtr;
+ int m_CurChar;
++ int m_SavedCurChar;
+ int m_CurLine;
+ bool m_FoundBookmark;
+ bool m_FoundBreakpoint;
+diff --git a/src/plugins/astyle/astyleconfigdlg.cpp b/src/plugins/astyle/astyleconfigdlg.cpp
+index a6372b6fe..7464b74f8 100644
+--- a/src/plugins/astyle/astyleconfigdlg.cpp
++++ b/src/plugins/astyle/astyleconfigdlg.cpp
+@@ -34,12 +34,13 @@ BEGIN_EVENT_TABLE(AstyleConfigDlg, wxPanel)
+ EVT_RADIOBUTTON(XRCID("rbStroustrup"), AstyleConfigDlg::OnStyleChange)
+ EVT_RADIOBUTTON(XRCID("rbWhitesmith"), AstyleConfigDlg::OnStyleChange)
+ EVT_RADIOBUTTON(XRCID("rbVTK"), AstyleConfigDlg::OnStyleChange)
+- EVT_RADIOBUTTON(XRCID("rbBanner"), AstyleConfigDlg::OnStyleChange)
++ EVT_RADIOBUTTON(XRCID("rbRatliff"), AstyleConfigDlg::OnStyleChange)
+ EVT_RADIOBUTTON(XRCID("rbGNU"), AstyleConfigDlg::OnStyleChange)
+ EVT_RADIOBUTTON(XRCID("rbLinux"), AstyleConfigDlg::OnStyleChange)
+ EVT_RADIOBUTTON(XRCID("rbHorstmann"), AstyleConfigDlg::OnStyleChange)
+ EVT_RADIOBUTTON(XRCID("rb1TBS"), AstyleConfigDlg::OnStyleChange)
+ EVT_RADIOBUTTON(XRCID("rbGoogle"), AstyleConfigDlg::OnStyleChange)
++ EVT_RADIOBUTTON(XRCID("rbMozilla"), AstyleConfigDlg::OnStyleChange)
+ EVT_RADIOBUTTON(XRCID("rbPico"), AstyleConfigDlg::OnStyleChange)
+ EVT_RADIOBUTTON(XRCID("rbLisp"), AstyleConfigDlg::OnStyleChange)
+ EVT_RADIOBUTTON(XRCID("rbCustom"), AstyleConfigDlg::OnStyleChange)
+@@ -158,7 +159,7 @@ int Foo(bool isBar)\n\
+ XRCCTRL(*this, "rbVTK", wxRadioButton)->SetValue(true);
+ break;
+ #undef AS_VTK
+-#define AS_BANNER "\
++#define AS_RATLIFF "\
+ int Foo(bool isBar) {\n\
+ if (isBar) {\n\
+ bar();\n\
+@@ -167,11 +168,11 @@ int Foo(bool isBar) {\n\
+ else\n\
+ return 0;\n\
+ }"
+- case aspsBanner:
+- sample = _T(AS_BANNER);
+- XRCCTRL(*this, "rbBanner", wxRadioButton)->SetValue(true);
++ case aspsRatliff:
++ sample = _T(AS_RATLIFF);
++ XRCCTRL(*this, "rbRatliff", wxRadioButton)->SetValue(true);
+ break;
+-#undef AS_BANNER
++#undef AS_RATLIFF
+ #define AS_GNU "\
+ int Foo(bool isBar)\n\
+ {\n\
+@@ -307,8 +308,8 @@ void AstyleConfigDlg::OnStyleChange(wxCommandEvent& event)
+ SetStyle(aspsWhitesmith);
+ else if (event.GetId() == XRCID("rbVTK"))
+ SetStyle(aspsVTK);
+- else if (event.GetId() == XRCID("rbBanner"))
+- SetStyle(aspsBanner);
++ else if (event.GetId() == XRCID("rbRatliff"))
++ SetStyle(aspsRatliff);
+ else if (event.GetId() == XRCID("rbGNU"))
+ SetStyle(aspsGnu);
+ else if (event.GetId() == XRCID("rbLinux"))
+@@ -376,6 +377,7 @@ void AstyleConfigDlg::LoadSettings()
+ XRCCTRL(*this, "chkAttachExternC", wxCheckBox)->SetValue(cfg->ReadBool(_T("/attach_extern_c"), false));
+ XRCCTRL(*this, "chkAttachNamespaces", wxCheckBox)->SetValue(cfg->ReadBool(_T("/attach_namespaces"), false));
+ XRCCTRL(*this, "chkAttachInlines", wxCheckBox)->SetValue(cfg->ReadBool(_T("/attach_inlines"), false));
++ XRCCTRL(*this, "chkAttachClosingWhiles", wxCheckBox)->SetValue(cfg->ReadBool(_T("/attach_closing_whiles"), false));
+
+ XRCCTRL(*this, "spnIndentation", wxSpinCtrl)->SetValue(cfg->ReadInt(_T("/indentation"), 4));
+ XRCCTRL(*this, "spnContinuation", wxSpinCtrl)->SetValue(cfg->ReadInt(_T("/continuation"), 0));
+@@ -386,6 +388,7 @@ void AstyleConfigDlg::LoadSettings()
+ XRCCTRL(*this, "chkIndentLabels", wxCheckBox)->SetValue(cfg->ReadBool(_T("/indent_labels"), false));
+ XRCCTRL(*this, "chkIndentModifiers", wxCheckBox)->SetValue(cfg->ReadBool(_T("/indent_modifiers"), false));
+ XRCCTRL(*this, "chkIndentNamespaces", wxCheckBox)->SetValue(cfg->ReadBool(_T("/indent_namespaces"), false));
++ XRCCTRL(*this, "chkIndentAfterParens", wxCheckBox)->SetValue(cfg->ReadBool(_T("/indent_after_parens"), false));
+ XRCCTRL(*this, "chkIndentSwitches", wxCheckBox)->SetValue(cfg->ReadBool(_T("/indent_switches"), false));
+ XRCCTRL(*this, "chkIndentPreprocBlock", wxCheckBox)->SetValue(cfg->ReadBool(_T("/indent_preproc_block"), false));
+ XRCCTRL(*this, "chkIndentPreprocDefine", wxCheckBox)->SetValue(cfg->ReadBool(_T("/indent_preproc_define"), false));
+@@ -399,6 +402,10 @@ void AstyleConfigDlg::LoadSettings()
+ XRCCTRL(*this, "chkAddBrackets", wxCheckBox)->SetValue(cfg->ReadBool(_T("/add_brackets"), false));
+ XRCCTRL(*this, "chkAddOneLineBrackets", wxCheckBox)->SetValue(cfg->ReadBool(_T("/add_one_line_brackets"), false));
+ XRCCTRL(*this, "chkRemoveBrackets", wxCheckBox)->SetValue(cfg->ReadBool(_T("/remove_brackets"), false));
++ XRCCTRL(*this, "chkBreakReturnType", wxCheckBox)->SetValue(cfg->ReadBool(_T("/break_return_type"), false));
++ XRCCTRL(*this, "chkBreakReturnTypeDecl", wxCheckBox)->SetValue(cfg->ReadBool(_T("/break_return_type_decl"),false));
++ XRCCTRL(*this, "chkAttachReturnType", wxCheckBox)->SetValue(cfg->ReadBool(_T("/attach_return_type"), false));
++ XRCCTRL(*this, "chkAttachReturnTypeDecl",wxCheckBox)->SetValue(cfg->ReadBool(_T("/attach_return_type_decl"),false));
+ XRCCTRL(*this, "chkKeepBlocks", wxCheckBox)->SetValue(cfg->ReadBool(_T("/keep_blocks"), false));
+ XRCCTRL(*this, "chkKeepHeaders", wxCheckBox)->SetValue(cfg->ReadBool(_T("/keep_headers"), false));
+ XRCCTRL(*this, "chkKeepStatements", wxCheckBox)->SetValue(cfg->ReadBool(_T("/keep_statements"), false));
+@@ -455,8 +462,8 @@ void AstyleConfigDlg::SaveSettings()
+ style = aspsWhitesmith;
+ else if (XRCCTRL(*this, "rbVTK", wxRadioButton)->GetValue())
+ style = aspsVTK;
+- else if (XRCCTRL(*this, "rbBanner", wxRadioButton)->GetValue())
+- style = aspsBanner;
++ else if (XRCCTRL(*this, "rbRatliff", wxRadioButton)->GetValue())
++ style = aspsRatliff;
+ else if (XRCCTRL(*this, "rbGNU", wxRadioButton)->GetValue())
+ style = aspsGnu;
+ else if (XRCCTRL(*this, "rbLinux", wxRadioButton)->GetValue())
+@@ -467,6 +474,8 @@ void AstyleConfigDlg::SaveSettings()
+ style = asps1TBS;
+ else if (XRCCTRL(*this, "rbGoogle", wxRadioButton)->GetValue())
+ style = aspsGoogle;
++ else if (XRCCTRL(*this, "rbMozilla", wxRadioButton)->GetValue())
++ style = aspsMozilla;
+ else if (XRCCTRL(*this, "rbPico", wxRadioButton)->GetValue())
+ style = aspsPico;
+ else if (XRCCTRL(*this, "rbLisp", wxRadioButton)->GetValue())
+@@ -480,6 +489,7 @@ void AstyleConfigDlg::SaveSettings()
+ cfg->Write(_T("/attach_extern_c"), XRCCTRL(*this, "chkAttachExternC", wxCheckBox)->GetValue());
+ cfg->Write(_T("/attach_namespaces"), XRCCTRL(*this, "chkAttachNamespaces", wxCheckBox)->GetValue());
+ cfg->Write(_T("/attach_inlines"), XRCCTRL(*this, "chkAttachInlines", wxCheckBox)->GetValue());
++ cfg->Write(_T("/attach_closing_whiles"), XRCCTRL(*this, "chkAttachClosingWhiles", wxCheckBox)->GetValue());
+
+ cfg->Write(_T("/indentation"), XRCCTRL(*this, "spnIndentation", wxSpinCtrl)->GetValue());
+ cfg->Write(_T("/continuation"), XRCCTRL(*this, "spnContinuation", wxSpinCtrl)->GetValue());
+@@ -490,6 +500,7 @@ void AstyleConfigDlg::SaveSettings()
+ cfg->Write(_T("/indent_labels"), XRCCTRL(*this, "chkIndentLabels", wxCheckBox)->GetValue());
+ cfg->Write(_T("/indent_modifiers"), XRCCTRL(*this, "chkIndentModifiers", wxCheckBox)->GetValue());
+ cfg->Write(_T("/indent_namespaces"), XRCCTRL(*this, "chkIndentNamespaces", wxCheckBox)->GetValue());
++ cfg->Write(_T("/indent_after_parens"), XRCCTRL(*this, "chkIndentAfterParens", wxCheckBox)->GetValue());
+ cfg->Write(_T("/indent_switches"), XRCCTRL(*this, "chkIndentSwitches", wxCheckBox)->GetValue());
+ cfg->Write(_T("/indent_preproc_block"), XRCCTRL(*this, "chkIndentPreprocBlock", wxCheckBox)->GetValue());
+ cfg->Write(_T("/indent_preproc_define"), XRCCTRL(*this, "chkIndentPreprocDefine", wxCheckBox)->GetValue());
+@@ -503,6 +514,10 @@ void AstyleConfigDlg::SaveSettings()
+ cfg->Write(_T("/add_brackets"), XRCCTRL(*this, "chkAddBrackets", wxCheckBox)->GetValue());
+ cfg->Write(_T("/add_one_line_brackets"), XRCCTRL(*this, "chkAddOneLineBrackets", wxCheckBox)->GetValue());
+ cfg->Write(_T("/remove_brackets"), XRCCTRL(*this, "chkRemoveBrackets", wxCheckBox)->GetValue());
++ cfg->Write(_T("/break_return_type_decl"), XRCCTRL(*this, "chkBreakReturnTypeDecl", wxCheckBox)->GetValue());
++ cfg->Write(_T("/break_return_type"), XRCCTRL(*this, "chkBreakReturnType", wxCheckBox)->GetValue());
++ cfg->Write(_T("/attach_return_type"), XRCCTRL(*this, "chkAttachReturnType", wxCheckBox)->GetValue());
++ cfg->Write(_T("/attach_return_type_decl"), XRCCTRL(*this, "chkAttachReturnTypeDecl",wxCheckBox)->GetValue());
+ cfg->Write(_T("/keep_blocks"), XRCCTRL(*this, "chkKeepBlocks", wxCheckBox)->GetValue());
+ cfg->Write(_T("/keep_headers"), XRCCTRL(*this, "chkKeepHeaders", wxCheckBox)->GetValue());
+ cfg->Write(_T("/keep_statements"), XRCCTRL(*this, "chkKeepStatements", wxCheckBox)->GetValue());
+diff --git a/src/plugins/astyle/astylepredefinedstyles.h b/src/plugins/astyle/astylepredefinedstyles.h
+index e00ae4907..1bf72f0ea 100644
+--- a/src/plugins/astyle/astylepredefinedstyles.h
++++ b/src/plugins/astyle/astylepredefinedstyles.h
+@@ -14,7 +14,7 @@ enum AStylePredefinedStyle
+ aspsStroustrup,
+ aspsWhitesmith,
+ aspsVTK,
+- aspsBanner,
++ aspsRatliff,
+ aspsGnu,
+ aspsLinux,
+ aspsHorstmann,
+diff --git a/src/plugins/astyle/dlgformattersettings.cpp b/src/plugins/astyle/dlgformattersettings.cpp
+index 6e2d264ab..683693038 100644
+--- a/src/plugins/astyle/dlgformattersettings.cpp
++++ b/src/plugins/astyle/dlgformattersettings.cpp
+@@ -39,8 +39,8 @@ void DlgFormatterSettings::ApplyTo(astyle::ASFormatter& formatter)
+ formatter.setFormattingStyle(astyle::STYLE_WHITESMITH);
+ else if (XRCCTRL(*m_dlg, "rbVTK", wxRadioButton)->GetValue())
+ formatter.setFormattingStyle(astyle::STYLE_VTK);
+- else if (XRCCTRL(*m_dlg, "rbBanner", wxRadioButton)->GetValue())
+- formatter.setFormattingStyle(astyle::STYLE_BANNER);
++ else if (XRCCTRL(*m_dlg, "rbRatliff", wxRadioButton)->GetValue())
++ formatter.setFormattingStyle(astyle::STYLE_RATLIFF);
+ else if (XRCCTRL(*m_dlg, "rbGNU", wxRadioButton)->GetValue())
+ formatter.setFormattingStyle(astyle::STYLE_GNU);
+ else if (XRCCTRL(*m_dlg, "rbLinux", wxRadioButton)->GetValue())
+@@ -58,10 +58,11 @@ void DlgFormatterSettings::ApplyTo(astyle::ASFormatter& formatter)
+ else if (XRCCTRL(*m_dlg, "rbLisp", wxRadioButton)->GetValue())
+ formatter.setFormattingStyle(astyle::STYLE_LISP);
+
+- formatter.setAttachClass(XRCCTRL(*m_dlg, "chkAttachClasses", wxCheckBox)->GetValue());
+- formatter.setAttachExternC(XRCCTRL(*m_dlg, "chkAttachExternC", wxCheckBox)->GetValue());
+- formatter.setAttachNamespace(XRCCTRL(*m_dlg, "chkAttachNamespaces", wxCheckBox)->GetValue());
+- formatter.setAttachInline(XRCCTRL(*m_dlg, "chkAttachInlines", wxCheckBox)->GetValue());
++ formatter.setAttachClass(XRCCTRL(*m_dlg, "chkAttachClasses", wxCheckBox)->GetValue());
++ formatter.setAttachExternC(XRCCTRL(*m_dlg, "chkAttachExternC", wxCheckBox)->GetValue());
++ formatter.setAttachNamespace(XRCCTRL(*m_dlg, "chkAttachNamespaces", wxCheckBox)->GetValue());
++ formatter.setAttachInline(XRCCTRL(*m_dlg, "chkAttachInlines", wxCheckBox)->GetValue());
++ formatter.setAttachClosingWhile(XRCCTRL(*m_dlg, "chkAttachClosingWhiles", wxCheckBox)->GetValue());
+
+ bool value = XRCCTRL(*m_dlg, "chkForceUseTabs", wxCheckBox)->GetValue();
+ int spaceNum = XRCCTRL(*m_dlg, "spnIndentation", wxSpinCtrl)->GetValue();
+@@ -79,6 +80,7 @@ void DlgFormatterSettings::ApplyTo(astyle::ASFormatter& formatter)
+ formatter.setLabelIndent(XRCCTRL(*m_dlg, "chkIndentLabels", wxCheckBox)->GetValue());
+ formatter.setModifierIndent(XRCCTRL(*m_dlg, "chkIndentModifiers", wxCheckBox)->GetValue());
+ formatter.setNamespaceIndent(XRCCTRL(*m_dlg, "chkIndentNamespaces", wxCheckBox)->GetValue());
++ formatter.setAfterParenIndent(XRCCTRL(*m_dlg, "chkIndentAfterParens", wxCheckBox)->GetValue());
+ formatter.setSwitchIndent(XRCCTRL(*m_dlg, "chkIndentSwitches", wxCheckBox)->GetValue());
+ formatter.setPreprocBlockIndent(XRCCTRL(*m_dlg, "chkIndentPreprocBlock", wxCheckBox)->GetValue());
+ formatter.setPreprocDefineIndent(XRCCTRL(*m_dlg, "chkIndentPreprocDefine", wxCheckBox)->GetValue());
+@@ -88,11 +90,15 @@ void DlgFormatterSettings::ApplyTo(astyle::ASFormatter& formatter)
+ formatter.setMinConditionalIndentOption(minConditionalEvent);
+ formatter.setMaxInStatementIndentLength( wxAtoi(XRCCTRL(*m_dlg, "txtMaxInStatementIndent", wxTextCtrl)->GetValue()) );
+
+- formatter.setBreakClosingHeaderBracketsMode(XRCCTRL(*m_dlg, "chkBreakClosing", wxCheckBox)->GetValue());
++ formatter.setBreakClosingHeaderBracesMode(XRCCTRL(*m_dlg, "chkBreakClosing", wxCheckBox)->GetValue());
+ formatter.setBreakElseIfsMode(XRCCTRL(*m_dlg, "chkBreakElseIfs", wxCheckBox)->GetValue());
+- formatter.setAddBracketsMode(XRCCTRL(*m_dlg, "chkAddBrackets", wxCheckBox)->GetValue());
+- formatter.setAddOneLineBracketsMode(XRCCTRL(*m_dlg, "chkAddOneLineBrackets", wxCheckBox)->GetValue());
+- formatter.setRemoveBracketsMode(XRCCTRL(*m_dlg, "chkRemoveBrackets", wxCheckBox)->GetValue());
++ formatter.setAddBracesMode(XRCCTRL(*m_dlg, "chkAddBrackets", wxCheckBox)->GetValue());
++ formatter.setAddOneLineBracesMode(XRCCTRL(*m_dlg, "chkAddOneLineBrackets", wxCheckBox)->GetValue());
++ formatter.setRemoveBracesMode(XRCCTRL(*m_dlg, "chkRemoveBrackets", wxCheckBox)->GetValue());
++ formatter.setBreakReturnType(XRCCTRL(*m_dlg, "chkBreakReturnType", wxCheckBox)->GetValue());
++ formatter.setBreakReturnTypeDecl(XRCCTRL(*m_dlg, "chkBreakReturnTypeDecl", wxCheckBox)->GetValue());
++ formatter.setAttachReturnType(XRCCTRL(*m_dlg, "chkAttachReturnType", wxCheckBox)->GetValue());
++ formatter.setAttachReturnTypeDecl(XRCCTRL(*m_dlg, "chkAttachReturnTypeDecl", wxCheckBox)->GetValue());
+ formatter.setBreakOneLineBlocksMode(!XRCCTRL(*m_dlg, "chkKeepBlocks", wxCheckBox)->GetValue());
+ formatter.setBreakOneLineHeadersMode(!XRCCTRL(*m_dlg, "chkKeepHeaders", wxCheckBox)->GetValue());
+ formatter.setBreakOneLineStatementsMode(!XRCCTRL(*m_dlg, "chkKeepStatements", wxCheckBox)->GetValue());
+diff --git a/src/plugins/astyle/formattersettings.cpp b/src/plugins/astyle/formattersettings.cpp
+index 8f60ddde2..b875ddcba 100644
+--- a/src/plugins/astyle/formattersettings.cpp
++++ b/src/plugins/astyle/formattersettings.cpp
+@@ -54,8 +54,8 @@ void FormatterSettings::ApplyTo(astyle::ASFormatter& formatter)
+ formatter.setFormattingStyle(astyle::STYLE_VTK);
+ break;
+
+- case aspsBanner: // Banner
+- formatter.setFormattingStyle(astyle::STYLE_BANNER);
++ case aspsRatliff: // Ratliff
++ formatter.setFormattingStyle(astyle::STYLE_RATLIFF);
+ break;
+
+ case aspsGnu: // GNU
+@@ -123,7 +123,7 @@ void FormatterSettings::ApplyTo(astyle::ASFormatter& formatter)
+ formatter.setMinConditionalIndentOption(cfg->ReadInt(_T("/min_conditional_indent"), 2));
+ formatter.setMaxInStatementIndentLength(cfg->ReadInt(_T("/max_instatement_indent"), 40));
+
+- formatter.setBreakClosingHeaderBracketsMode(cfg->ReadBool(_T("/break_closing")));
++ formatter.setBreakClosingHeaderBracesMode(cfg->ReadBool(_T("/break_closing")));
+ formatter.setBreakElseIfsMode(cfg->ReadBool(_T("/break_elseifs")));
+ formatter.setAddBracketsMode(cfg->ReadBool(_T("/add_brackets")));
+ formatter.setAddOneLineBracketsMode(cfg->ReadBool(_T("/add_one_line_brackets")));
+diff --git a/src/plugins/astyle/resources/configuration.xrc b/src/plugins/astyle/resources/configuration.xrc
+index 86e0b0df9..50d8cfad0 100644
+--- a/src/plugins/astyle/resources/configuration.xrc
++++ b/src/plugins/astyle/resources/configuration.xrc
+@@ -61,9 +61,9 @@
+ <border>5</border>
+ </object>
+ <object class="sizeritem">
+- <object class="wxRadioButton" name="rbBanner">
+- <label>Banner</label>
+- <tooltip>Banner style uses attached, indented brackets. Switch blocks and class blocks are indented to prevent a 'hanging indent' with following case statements and C++ class modifiers (public, private, protected).</tooltip>
++ <object class="wxRadioButton" name="rbRatliff">
++ <label>Ratliff</label>
++ <tooltip>Ratliff style uses attached, indented brackets. Switch blocks and class blocks are indented to prevent a 'hanging indent' with following case statements and C++ class modifiers (public, private, protected).</tooltip>
+ </object>
+ <flag>wxTOP|wxLEFT|wxRIGHT|wxALIGN_LEFT</flag>
+ <border>5</border>
+@@ -212,6 +212,13 @@
+ <flag>wxTOP|wxALIGN_LEFT</flag>
+ <border>5</border>
+ </object>
++ <object class="sizeritem">
++ <object class="wxCheckBox" name="chkAttachClosingWhiles">
++ <label>Attach closing "while"</label>
++ </object>
++ <flag>wxTOP|wxALIGN_LEFT</flag>
++ <border>5</border>
++ </object>
+ </object>
+ <flag>wxEXPAND</flag>
+ <border>5</border>
+@@ -319,6 +326,13 @@
+ <flag>wxTOP|wxALIGN_LEFT</flag>
+ <border>5</border>
+ </object>
++ <object class="sizeritem">
++ <object class="wxCheckBox" name="chkIndentAfterParens">
++ <label>Indent after parens</label>
++ </object>
++ <flag>wxTOP|wxALIGN_LEFT</flag>
++ <border>5</border>
++ </object>
+ <object class="sizeritem">
+ <object class="wxCheckBox" name="chkIndentSwitches">
+ <label>Indent switches (keyword case:)</label>
+@@ -427,21 +441,49 @@
+ </object>
+ <object class="sizeritem">
+ <object class="wxCheckBox" name="chkAddBrackets">
+- <label>Add brackets to unbracketed one line conditional statements</label>
++ <label>Add braces to unbraced one line conditional statements</label>
+ </object>
+ <flag>wxTOP|wxALIGN_LEFT</flag>
+ <border>5</border>
+ </object>
+ <object class="sizeritem">
+ <object class="wxCheckBox" name="chkAddOneLineBrackets">
+- <label>Add one line brackets to unbracketed one line conditional statements</label>
++ <label>Add one line braces to unbraced one line conditional statements</label>
+ </object>
+ <flag>wxTOP|wxALIGN_LEFT</flag>
+ <border>5</border>
+ </object>
+ <object class="sizeritem">
+ <object class="wxCheckBox" name="chkRemoveBrackets">
+- <label>Remove brackets from conditional statements (single statement on a single line)</label>
++ <label>Remove braces from conditional statements (single statement on a single line)</label>
++ </object>
++ <flag>wxTOP|wxALIGN_LEFT</flag>
++ <border>5</border>
++ </object>
++ <object class="sizeritem">
++ <object class="wxCheckBox" name="chkBreakReturnType">
++ <label>Break the return type from the function name in function definitions</label>
++ </object>
++ <flag>wxTOP|wxALIGN_LEFT</flag>
++ <border>5</border>
++ </object>
++ <object class="sizeritem">
++ <object class="wxCheckBox" name="chkBreakReturnTypeDecl">
++ <label>Break the return type from the function name in function declarations or signatures</label>
++ </object>
++ <flag>wxTOP|wxALIGN_LEFT</flag>
++ <border>5</border>
++ </object>
++ <object class="sizeritem">
++ <object class="wxCheckBox" name="chkAttachReturnType">
++ <label>Attach the return type to the function name in function definitions</label>
++ </object>
++ <flag>wxTOP|wxALIGN_LEFT</flag>
++ <border>5</border>
++ </object>
++ <object class="sizeritem">
++ <object class="wxCheckBox" name="chkAttachReturnTypeDecl">
++ <label>Attach the return type to the function name in function declarations or signatures</label>
+ </object>
+ <flag>wxTOP|wxALIGN_LEFT</flag>
+ <border>5</border>
diff --git a/codeblocks-pwd.patch b/codeblocks-pwd.patch
index 9628999..72657e6 100644
--- a/codeblocks-pwd.patch
+++ b/codeblocks-pwd.patch
@@ -8,15 +8,14 @@ diff -ur codeblocks-13.12/src/plugins/abbreviations/resources/Makefile.am codebl
- PWD=`pwd` cd $(srcdir) && zip $(PWD)/abbreviations.zip manifest.xml *.xrc > /dev/null
+ zip $(PWD)/abbreviations.zip manifest.xml *.xrc > /dev/null
-diff -ur codeblocks-13.12/src/plugins/astyle/resources/Makefile.am codeblocks-13.12.pwd/src/plugins/astyle/resources/Makefile.am
---- codeblocks-13.12/src/plugins/astyle/resources/Makefile.am 2013-11-17 20:34:12.000000000 +0100
-+++ codeblocks-13.12.pwd/src/plugins/astyle/resources/Makefile.am 2014-01-18 19:35:30.545377868 +0100
+--- codeblocks-17.12/src/plugins/astyle/resources/Makefile.am.orig 2019-04-19 18:33:51.130049573 +0200
++++ codeblocks-17.12/src/plugins/astyle/resources/Makefile.am 2019-04-19 18:35:38.729466657 +0200
@@ -4,4 +4,4 @@
CLEANFILES = $(pkgdata_DATA)
- astyle.zip: $(EXTRA_DIST)
-- PWD=`pwd` cd $(srcdir) && zip $(PWD)/astyle.zip manifest.xml *.xrc > /dev/null
-+ zip $(PWD)/astyle.zip manifest.xml *.xrc > /dev/null
+ Astyle.zip: $(EXTRA_DIST)
+- PWD=`pwd` cd $(srcdir) && zip $(PWD)/Astyle.zip manifest.xml *.xrc > /dev/null
++ zip $(PWD)/Astyle.zip manifest.xml *.xrc > /dev/null
diff -ur codeblocks-13.12/src/plugins/autosave/Makefile.am codeblocks-13.12.pwd/src/plugins/autosave/Makefile.am
--- codeblocks-13.12/src/plugins/autosave/Makefile.am 2013-11-17 20:33:50.000000000 +0100
+++ codeblocks-13.12.pwd/src/plugins/autosave/Makefile.am 2014-01-18 19:35:30.545377868 +0100
diff --git a/gcc6.patch b/gcc6.patch
deleted file mode 100644
index 4305e0b..0000000
--- a/gcc6.patch
+++ /dev/null
@@ -1,240 +0,0 @@
-From 70289a879f7a48a47dd0219cc5d3a9a1dee076a8 Mon Sep 17 00:00:00 2001
-From: Jens Lody <jens at codeblocks.org>
-Date: Wed, 27 Jul 2016 02:09:07 +0200
-Subject: Workaround for gcc6 optimization bug.
-
-
-diff --git a/configure.ac b/configure.ac
-index 7f80a3f..f178ee2 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -276,6 +276,7 @@ esac
-
- CB_GCC_VERSION
- AM_CONDITIONAL([HAVE_GCC48], [test $GCC_MAJOR_VERSION -gt 4 -o $GCC_MAJOR_VERSION -eq 4 -a $GCC_MINOR_VERSION -ge 8])
-+AM_CONDITIONAL([HAVE_GCC6], [test $GCC_MAJOR_VERSION -ge 6])
-
- AC_MSG_CHECKING([for wxWidgets >= 2.9.0])
- AM_CONDITIONAL([HAVE_WX29], [test $wx_config_major_version -gt 2 -o $wx_config_major_version -eq 2 -a $wx_config_minor_version -ge 9])
-diff --git a/src/sdk/wxpropgrid/Makefile.am b/src/sdk/wxpropgrid/Makefile.am
-index 2b1a107..f427fb4 100644
---- a/src/sdk/wxpropgrid/Makefile.am
-+++ b/src/sdk/wxpropgrid/Makefile.am
-@@ -3,6 +3,10 @@ AM_CPPFLAGS = $(WX_CXXFLAGS) \
- -DEXPORT_LIB \
- -DwxPG_SUPPORT_TOOLTIPS
-
-+if HAVE_GCC6
-+AM_CPPFLAGS += -fno-delete-null-pointer-checks
-+endif
-+
- noinst_LTLIBRARIES = libwxpropgrid.la
-
- libwxpropgrid_la_SOURCES = ./src/advprops.cpp \
-From 6350b94c5379563ac2a861de8c2c197208782435 Mon Sep 17 00:00:00 2001
-From: jenslody <jenslody at 2a5c6006-c6dd-42ca-98ab-0921f2732cef>
-Date: Sun, 17 Apr 2016 21:31:25 +0000
-Subject: * Fix variable declarations, that conflict with internal
- compiler-defines, so C::B is compilable with gcc6 .
-
-git-svn-id: https://svn.code.sf.net/p/codeblocks/code/trunk@10833 2a5c6006-c6dd-42ca-98ab-0921f2732cef
-
-diff --git a/src/include/prep.h b/src/include/prep.h
-index 5843bb8..6397900 100644
---- a/src/include/prep.h
-+++ b/src/include/prep.h
-@@ -102,9 +102,9 @@ template<typename T>inline void DeleteArray(T*& p){delete[] p; p = nullptr;}
- platform::id
- Value of type platform::identifier describing the target platform
-
-- platform::windows, platform::macosx, platform::linux
-+ platform::windows, platform::macosx, platform::Linux
- platform::freebsd, platform::netbsd, platform::openbsd
-- platform::darwin, platform::solaris, platform::unix
-+ platform::darwin, platform::solaris, platform::Unix
- Boolean value that evaluates to true if the target platform is the same as the variable's name, false otherwise.
- Using the platform booleans is equivalent to using platform::id, but results in nicer code.
-
-@@ -185,13 +185,13 @@ namespace platform
-
- const bool windows = (id == platform_windows);
- const bool macosx = (id == platform_macosx);
-- const bool linux = (id == platform_linux);
-+ const bool Linux = (id == platform_linux);
- const bool freebsd = (id == platform_freebsd);
- const bool netbsd = (id == platform_netbsd);
- const bool openbsd = (id == platform_openbsd);
- const bool darwin = (id == platform_darwin);
- const bool solaris = (id == platform_solaris);
-- const bool unix = (linux | freebsd | netbsd | openbsd | darwin | solaris);
-+ const bool Unix = (Linux | freebsd | netbsd | openbsd | darwin | solaris);
-
- const int bits = 8*sizeof(void*);
-
-diff --git a/src/plugins/compilergcc/compilergcc.cpp b/src/plugins/compilergcc/compilergcc.cpp
-index 1c255b6..e8b8443 100644
---- a/src/plugins/compilergcc/compilergcc.cpp
-+++ b/src/plugins/compilergcc/compilergcc.cpp
-@@ -871,7 +871,7 @@ void CompilerGCC::DoRegisterCompilers()
- CompilerFactory::RegisterCompiler(new CompilerGDC);
- CompilerFactory::RegisterCompiler(new CompilerGNUFortran);
- CompilerFactory::RegisterCompiler(new CompilerG95);
-- if (platform::windows || platform::linux || nonPlatComp)
-+ if (platform::windows || platform::Linux || nonPlatComp)
- CompilerFactory::RegisterCompiler(new CompilerGNUARM);
-
- // register pure XML compilers
-@@ -925,7 +925,7 @@ void CompilerGCC::DoRegisterCompilers()
- else if (test == wxT("macosx"))
- val = platform::macosx;
- else if (test == wxT("linux"))
-- val = platform::linux;
-+ val = platform::Linux;
- else if (test == wxT("freebsd"))
- val = platform::freebsd;
- else if (test == wxT("netbsd"))
-@@ -937,7 +937,7 @@ void CompilerGCC::DoRegisterCompilers()
- else if (test == wxT("solaris"))
- val = platform::solaris;
- else if (test == wxT("unix"))
-- val = platform::unix;
-+ val = platform::Unix;
- }
- if (val)
- CompilerFactory::RegisterCompiler(
-diff --git a/src/plugins/contrib/lib_finder/processingdlg.cpp b/src/plugins/contrib/lib_finder/processingdlg.cpp
-index 77ccfd2..03c93cf 100644
---- a/src/plugins/contrib/lib_finder/processingdlg.cpp
-+++ b/src/plugins/contrib/lib_finder/processingdlg.cpp
-@@ -423,7 +423,7 @@ void ProcessingDlg::CheckFilter(
- }
- }
-
-- if ( platform::linux )
-+ if ( platform::Linux )
- {
- if ( Platform==_T("lin") || Platform==_T("linux") )
- {
-@@ -477,7 +477,7 @@ void ProcessingDlg::CheckFilter(
- }
- }
-
-- if ( platform::unix )
-+ if ( platform::Unix )
- {
- if ( Platform==_T("unix") || Platform==_T("un*x") )
- {
-diff --git a/src/plugins/projectsimporter/msvc10loader.cpp b/src/plugins/projectsimporter/msvc10loader.cpp
-index 6a88e79..19f692b 100644
---- a/src/plugins/projectsimporter/msvc10loader.cpp
-+++ b/src/plugins/projectsimporter/msvc10loader.cpp
-@@ -50,7 +50,7 @@ MSVC10Loader::MSVC10Loader(cbProject* project) :
- //ctor
- if (platform::windows)
- m_PlatformName = _T("Win32");
-- else if (platform::linux)
-+ else if (platform::Linux)
- m_PlatformName = _T("Linux");
- else if (platform::macosx)
- m_PlatformName = _T("MacOSX");
-diff --git a/src/plugins/projectsimporter/msvc7loader.cpp b/src/plugins/projectsimporter/msvc7loader.cpp
-index 568357f..a2f56f8 100644
---- a/src/plugins/projectsimporter/msvc7loader.cpp
-+++ b/src/plugins/projectsimporter/msvc7loader.cpp
-@@ -39,7 +39,7 @@ MSVC7Loader::MSVC7Loader(cbProject* project)
- //ctor
- if (platform::windows)
- m_PlatformName = _T("Win32");
-- else if (platform::linux)
-+ else if (platform::Linux)
- m_PlatformName = _T("Linux");
- else if (platform::macosx)
- m_PlatformName = _T("MacOSX");
-diff --git a/src/sdk/compileoptionsbase.cpp b/src/sdk/compileoptionsbase.cpp
-index 20b7e77..700d39c 100644
---- a/src/sdk/compileoptionsbase.cpp
-+++ b/src/sdk/compileoptionsbase.cpp
-@@ -64,7 +64,7 @@ bool CompileOptionsBase::SupportsCurrentPlatform() const
- {
- if(platform::windows)
- return m_Platform & spWindows;
-- if(platform::unix)
-+ if(platform::Unix)
- return m_Platform & spUnix;
- if(platform::macosx)
- return m_Platform & spMac;
-diff --git a/src/sdk/compiler.cpp b/src/sdk/compiler.cpp
-index 7b29618..45ed969 100644
---- a/src/sdk/compiler.cpp
-+++ b/src/sdk/compiler.cpp
-@@ -1149,7 +1149,7 @@ bool Compiler::EvalXMLCondition(const wxXmlNode* node)
- else if (test == wxT("macosx"))
- val = platform::macosx;
- else if (test == wxT("linux"))
-- val = platform::linux;
-+ val = platform::Linux;
- else if (test == wxT("freebsd"))
- val = platform::freebsd;
- else if (test == wxT("netbsd"))
-@@ -1161,7 +1161,7 @@ bool Compiler::EvalXMLCondition(const wxXmlNode* node)
- else if (test == wxT("solaris"))
- val = platform::solaris;
- else if (test == wxT("unix"))
-- val = platform::unix;
-+ val = platform::Unix;
- }
- else if (node->GetAttribute(wxT("exec"), &test))
- {
-diff --git a/src/sdk/compiletargetbase.cpp b/src/sdk/compiletargetbase.cpp
-index 85f57ed..19c5647 100644
---- a/src/sdk/compiletargetbase.cpp
-+++ b/src/sdk/compiletargetbase.cpp
-@@ -264,7 +264,7 @@ void CompileTargetBase::GenerateTargetFilename(wxString& filename) const
- {
- wxString prefix = wxEmptyString;
- // On linux, "lib" is the common prefix for this platform
-- if (platform::linux)
-+ if (platform::Linux)
- prefix = wxT("lib");
- // FIXME (Morten#5#): What about Mac (Windows is OK)?!
-
-diff --git a/src/sdk/configmanager.cpp b/src/sdk/configmanager.cpp
-index 15a931e..4b6cbfc 100644
---- a/src/sdk/configmanager.cpp
-+++ b/src/sdk/configmanager.cpp
-@@ -261,11 +261,11 @@ void CfgMgrBldr::SwitchTo(const wxString& fileName)
-
- if (platform::windows)
- info.append(_T("\n\t Windows "));
-- if (platform::linux)
-+ if (platform::Linux)
- info.append(_T("\n\t Linux "));
- if (platform::macosx)
- info.append(_T("\n\t Mac OS X "));
-- if (platform::unix)
-+ if (platform::Unix)
- info.append(_T("\n\t Unix "));
-
- info.append(platform::unicode ? _T("Unicode ") : _T("ANSI "));
-diff --git a/src/sdk/editormanager.cpp b/src/sdk/editormanager.cpp
-index 0a9ab0f..929ae82 100644
---- a/src/sdk/editormanager.cpp
-+++ b/src/sdk/editormanager.cpp
-@@ -1845,7 +1845,7 @@ void EditorManager::CollectDefines(CodeBlocksEvent& event)
- defines.Add(wxT("__WXOSX_MAC__"));
- defines.Add(wxT("__APPLE__"));
- }
-- else if (platform::linux)
-+ else if (platform::Linux)
- {
- defines.Add(wxT("LINUX"));
- defines.Add(wxT("linux"));
-@@ -1880,7 +1880,7 @@ void EditorManager::CollectDefines(CodeBlocksEvent& event)
- defines.Add(wxT("__SUNOS__"));
- defines.Add(wxT("__SOLARIS__"));
- }
-- if (platform::unix)
-+ if (platform::Unix)
- {
- defines.Add(wxT("unix"));
- defines.Add(wxT("__unix"));
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/codeblocks.git/commitdiff/0bf0e321f2e97415d7553ba90262831b12556b4e
More information about the pld-cvs-commit
mailing list