diff options
Diffstat (limited to 'development/codeblocks')
| -rw-r--r-- | development/codeblocks/README | 8 | ||||
| -rw-r--r-- | development/codeblocks/codeblocks-gcc11.patch | 28 | ||||
| -rw-r--r-- | development/codeblocks/codeblocks.SlackBuild | 28 | ||||
| -rw-r--r-- | development/codeblocks/codeblocks.info | 8 |
4 files changed, 57 insertions, 15 deletions
diff --git a/development/codeblocks/README b/development/codeblocks/README index 8ccc933ab5..11da1dea51 100644 --- a/development/codeblocks/README +++ b/development/codeblocks/README @@ -4,14 +4,14 @@ fully configurable. Finally, 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 +plugins. Any kind of functionality can be added by installing/coding a +plugin. For instance, compiling and debugging functionality is already provided by plugins! N.B: -a) The path for codeblocks plugins is now /usr/lib{,64}/codeblocks/plugins. +a) The path for plugins is now /usr/lib{,64}/codeblocks/plugins. Take care if upgrading from a previous version and you have already installed additional plugins (you might need to reinstall them). -b) All contrib-plugins are disabled by default. Please invoke the script with +b) All contrib-plugins are disabled by default. Invoke the script with $ PLUGINS=yes ./codeblocks.SlackBuild in order to enable all contrib-plugins in your build. diff --git a/development/codeblocks/codeblocks-gcc11.patch b/development/codeblocks/codeblocks-gcc11.patch new file mode 100644 index 0000000000..df4a087acc --- /dev/null +++ b/development/codeblocks/codeblocks-gcc11.patch @@ -0,0 +1,28 @@ +Index: src/plugins/openfileslist/openfileslistplugin.h +=================================================================== +diff --git a/src/plugins/openfileslist/openfileslistplugin.h b/src/plugins/openfileslist/openfileslistplugin.h +--- a/src/plugins/openfileslist/openfileslistplugin.h (revision 12302) ++++ b/src/plugins/openfileslist/openfileslistplugin.h (revision 12303) +@@ -10,6 +10,7 @@ + #include <projectfile.h> + + #include <wx/dynarray.h> ++#include <functional> + + 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<ProjectFile*, compareLess> OpenFilesSet; ++ ++ typedef std::set<ProjectFile*, std::less<ProjectFile*>> OpenFilesSet; + ProjectFile* activeFile; + OpenFilesSet openFiles; + }; diff --git a/development/codeblocks/codeblocks.SlackBuild b/development/codeblocks/codeblocks.SlackBuild index fc0adcd9cf..50bc64a1bc 100644 --- a/development/codeblocks/codeblocks.SlackBuild +++ b/development/codeblocks/codeblocks.SlackBuild @@ -1,8 +1,8 @@ -#!/bin/sh +#!/bin/bash # Slackware build script for codeblocks -# Copyright 2018 Antonio Leal Lisbon, Portugal +# Copyright 2020 Antonio Leal Lisbon, Portugal # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -22,10 +22,13 @@ # OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +cd $(dirname $0) ; CWD=$(pwd) + PRGNAM=codeblocks -VERSION=${VERSION:-17.12} -BUILD=${BUILD:-1} +VERSION=${VERSION:-20.03} +BUILD=${BUILD:-2} TAG=${TAG:-_SBo} +PKGTYPE=${PKGTYPE:-tgz} if [ -z "$ARCH" ]; then case "$( uname -m )" in @@ -35,7 +38,14 @@ if [ -z "$ARCH" ]; then esac fi -CWD=$(pwd) +# If the variable PRINT_PACKAGE_NAME is set, then this script will report what +# the name of the created package would be, and then exit. This information +# could be useful to other scripts. +if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then + echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE" + exit 0 +fi + TMP=${TMP:-/tmp/SBo} PKG=$TMP/package-$PRGNAM OUTPUT=${OUTPUT:-/tmp} @@ -60,7 +70,7 @@ rm -rf $PKG mkdir -p $TMP $PKG $OUTPUT cd $TMP rm -rf $PRGNAM-$VERSION.release -tar xvf $CWD/$PRGNAM\_$VERSION.tar.xz +tar xJf $CWD/$PRGNAM\-$VERSION.tar.xz cd $PRGNAM-$VERSION chown -R root:root . find -L . \ @@ -74,6 +84,8 @@ if [ "${PLUGINS:-no}" = 'yes' ]; then WITHPLUGINS='--with-contrib-plugins=all' fi +patch -p1 < $CWD/codeblocks-gcc11.patch + ./bootstrap LDFLAGS="-lX11" \ @@ -103,9 +115,11 @@ cp -a \ $PKG/usr/doc/$PRGNAM-$VERSION cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild +rm -f $PKG/usr/lib*/*.la + mkdir -p $PKG/install cat $CWD/slack-desc > $PKG/install/slack-desc cat $CWD/doinst.sh > $PKG/install/doinst.sh cd $PKG -/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz} +/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE diff --git a/development/codeblocks/codeblocks.info b/development/codeblocks/codeblocks.info index 999830858e..9017ef212b 100644 --- a/development/codeblocks/codeblocks.info +++ b/development/codeblocks/codeblocks.info @@ -1,10 +1,10 @@ PRGNAM="codeblocks" -VERSION="17.12" +VERSION="20.03" HOMEPAGE="http://www.codeblocks.org/" -DOWNLOAD="https://downloads.sourceforge.net/project/codeblocks/Sources/17.12/codeblocks_17.12.tar.xz" -MD5SUM="e7fb4fcf099fffe944b48af113944a81" +DOWNLOAD="http://sourceforge.net/projects/codeblocks/files/Sources/20.03/codeblocks-20.03.tar.xz" +MD5SUM="1b7ad8f346a4d2bdb51e983075731947" DOWNLOAD_x86_64="" MD5SUM_x86_64="" -REQUIRES="wxPython" +REQUIRES="wxGTK3" MAINTAINER="antonioleal" EMAIL="antonioleal@yahoo.com" |