diff --git a/README.md b/README.md index efefc38..e356c1e 100644 --- a/README.md +++ b/README.md @@ -3,9 +3,3 @@ Code::Blocks is a free C++ IDE built to meet the most demanding needs of its users. It is designed to be very extensible and fully configurable. -An IDE with all the features you need, having a consistent look, feel and operation across platforms. - -Built around a plugin framework, Code::Blocks can be extended with plugins. -Any kind of functionality can be added by installing/coding a plugin. -For instance, compiling and debugging functionality is already provided by plugins! - diff --git a/codeblocks-20.03-gcc-11.patch b/codeblocks-20.03-gcc-11.patch new file mode 100644 index 0000000..22b15e5 --- /dev/null +++ b/codeblocks-20.03-gcc-11.patch @@ -0,0 +1,25 @@ +--- a/trunk/src/plugins/openfileslist/openfileslistplugin.h ++++ b/trunk/src/plugins/openfileslist/openfileslistplugin.h +@@ -10,6 +10,7 @@ + #include + + #include ++#include + + class wxTreeCtrl; + class wxTreeEvent; +@@ -20,12 +21,8 @@ + struct TargetFilesData + { + TargetFilesData() : activeFile(nullptr) {} // ctor +- // Functor for the std::set predicate to sort the opened editor files according to their tab order +- struct compareLess +- { +- bool operator()(const ProjectFile* lhs, const ProjectFile* rhs) { return lhs->editorTabPos < rhs->editorTabPos; } +- }; +- typedef std::set OpenFilesSet; ++ ++ typedef std::set> OpenFilesSet; + ProjectFile* activeFile; + OpenFilesSet openFiles; + }; diff --git a/codeblocks.spec b/codeblocks.spec index d8b488a..de529d5 100644 --- a/codeblocks.spec +++ b/codeblocks.spec @@ -1,51 +1,57 @@ %define libname libcodeblocks Name: codeblocks -Version: 17.12 +Version: 20.03 Release: 1mamba Summary: An open source cross platform free C++ IDE Group: Graphical Desktop/Applications/Development Vendor: openmamba Distribution: openmamba -Packager: Stefano Cotta Ramusino -URL: http://www.codeblocks.org/ -# FIXME: real url is http://download.berlios.de/codeblocks/codeblocks_12.11-1.tar.gz/from_sourceforge -Source: http://sourceforge.net/projects/codeblocks/files/Sources/%{version}/codeblocks_%{version}.tar.xz +Packager: Silvan Calarco +URL: https://www.codeblocks.org/ +Source: https://sourceforge.net/projects/codeblocks/files/Sources/%{version}/codeblocks-%{version}.tar.xz Patch1: codeblocks-10.05-konsole.patch +Patch2: codeblocks-20.03-gcc-11.patch License: GPL ## AUTOBUILDREQ-BEGIN BuildRequires: glibc-devel +BuildRequires: libX11-devel +BuildRequires: libXau-devel +BuildRequires: libXdmcp-devel BuildRequires: libatk-devel +BuildRequires: libboost-devel +BuildRequires: libbrotli-devel +BuildRequires: libbsd-devel BuildRequires: libbzip2-devel BuildRequires: libcairo-devel +BuildRequires: libexpat-devel BuildRequires: libfontconfig-devel BuildRequires: libfreetype-devel +BuildRequires: libgamin-devel BuildRequires: libgcc BuildRequires: libgdk-pixbuf-devel BuildRequires: libglib-devel -BuildRequires: libgtk-devel +BuildRequires: libgraphite2-devel +BuildRequires: libgtk3-devel +BuildRequires: libharfbuzz-devel +BuildRequires: libhunspell-devel +BuildRequires: libncurses-devel BuildRequires: libpango-devel +BuildRequires: libpcre-devel BuildRequires: libpng-devel BuildRequires: libstdc++6-devel -BuildRequires: libwxBase-unicode-devel -BuildRequires: libwxGTK-unicode-devel -BuildRequires: libX11-devel +BuildRequires: libwx_baseu30-devel +BuildRequires: libwx_gtk3u30-devel +BuildRequires: libxcb-devel BuildRequires: libz-devel ## AUTOBUILDREQ-END BuildRequires: udev-devel Requires: konsole -BuildRoot: %{_tmppath}/%{name}-%{version}-root %description Code::Blocks is a free C++ IDE built to meet the most demanding needs of its users. It is designed to be very extensible and fully configurable. -An IDE with all the features you need, having a consistent look, feel and operation across platforms. - -Built around a plugin framework, Code::Blocks can be extended with plugins. -Any kind of functionality can be added by installing/coding a plugin. -For instance, compiling and debugging functionality is already provided by plugins! - %package -n %{libname} Summary: Shared library for Code::Blocks Group: System/Libraries @@ -59,19 +65,21 @@ Group: Development/Libraries Requires: %{libname} = %{?epoch:%epoch:}%{version}-%{release} %description devel -This package contains static libraries and header files need for development. +This package contains static libraries and header files needed for development. + +%debug_package %prep -%setup -q -c -mv codeblocks-%{version}*/* . -rm -rf codeblocks-%{version}* -%patch1 -p1 +%setup -q +%patch2 -p2 %build %configure \ --with-contrib-plugins=all,-MouseSap \ - --with-wx-config=wx-config-unicode-3 \ - --with-boost-system=boost_system-mt + --with-wx-config=wx-config-unicode-30 \ + --with-boost-libdir=%{_libdir} + +#--with-boost-system=boost_system-mt %make @@ -111,7 +119,7 @@ done %{_datadir}/appdata/codeblocks-contrib.metainfo.xml %{_datadir}/appdata/codeblocks.appdata.xml %{_datadir}/applications/codeblocks.desktop -%{_datadir}/icons/hicolor/*/apps/codeblocks.png +#%{_datadir}/icons/hicolor/*/apps/codeblocks.png %{_datadir}/icons/hicolor/48x48/mimetypes/application-x-codeblocks-workspace.png %{_datadir}/icons/hicolor/48x48/mimetypes/application-x-codeblocks.png %{_datadir}/mime/packages/codeblocks.xml @@ -140,10 +148,13 @@ done %{_libdir}/libwxsmithlib.la %{_libdir}/libwxsmithlib.so %{_libdir}/pkgconfig/*.pc -%doc BUGS ChangeLog NEWS README TODO -%doc COMPILERS +#%doc BUGS ChangeLog NEWS README TODO +#%doc COMPILERS %changelog +* Wed Feb 10 2021 Silvan Calarco 20.03-1mamba +- update to 20.03 + * Sun Jul 29 2018 Silvan Calarco 17.12-1mamba - update to 17.12