summaryrefslogtreecommitdiff
path: root/development
diff options
context:
space:
mode:
authorantonioleal <antonioleal@yahoo.com>2013-06-05 12:03:07 -0400
committerdsomero <xgizzmo@slackbuilds.org>2013-06-05 12:03:07 -0400
commit4051ad3647df5a9178817c614de6f014c8736dd7 (patch)
treec0a6315855c856268b972d7ef871766478810c9f /development
parent07bec150c6f06e391b913db838a50d2777909355 (diff)
downloadslackbuilds-4051ad3647df5a9178817c614de6f014c8736dd7.tar.gz
development/codeblocks: Updated for version 12.11.
Signed-off-by: dsomero <xgizzmo@slackbuilds.org>
Diffstat (limited to 'development')
-rw-r--r--development/codeblocks/01-codeblocks_plugin_path.patch19
-rw-r--r--development/codeblocks/codeblocks.SlackBuild23
-rw-r--r--development/codeblocks/codeblocks.info10
-rw-r--r--development/codeblocks/ftbfs-gcc-4.7.diff34
-rw-r--r--development/codeblocks/slack-desc10
5 files changed, 19 insertions, 77 deletions
diff --git a/development/codeblocks/01-codeblocks_plugin_path.patch b/development/codeblocks/01-codeblocks_plugin_path.patch
deleted file mode 100644
index a5e5c0fc3d..0000000000
--- a/development/codeblocks/01-codeblocks_plugin_path.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-From: Michael Casadevall <sonicmctails@gmail.com>
-Subject: hardcode the proper plugins folder to /usr/lib/codeblocks/plugins
-Forwarded: no
-
----
- src/sdk/configmanager.cpp | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
---- codeblocks.orig/src/sdk/configmanager.cpp
-+++ codeblocks/src/sdk/configmanager.cpp
-@@ -514,7 +514,7 @@ wxString ConfigManager::GetFolder(Search
-
- case sdPluginsGlobal:
- #ifndef CB_AUTOCONF
-- return ConfigManager::data_path_global + _T("/plugins");
-+ return _T("/usr/lib/codeblocks/plugins");
- #else
- return ConfigManager::plugin_path_global;
- #endif
diff --git a/development/codeblocks/codeblocks.SlackBuild b/development/codeblocks/codeblocks.SlackBuild
index ff9aeb506b..26b0af2b2c 100644
--- a/development/codeblocks/codeblocks.SlackBuild
+++ b/development/codeblocks/codeblocks.SlackBuild
@@ -1,11 +1,12 @@
#!/bin/sh
# Slackware build script for codeblocks
-# Written by Mehdi Esmaeelpour | ariarat@gmail.com | www.slack-world.com/ariarat
+# Written by Mehdi Esmaeelpour | ariarat@gmail.com | www.slack-world.com/ariarat
+# Adapted by Antonio Leal | antonioleal@yahoo.com
PRGNAM=codeblocks
-VERSION=${VERSION:-10.05}
-BUILD=${BUILD:-2}
+VERSION=${VERSION:-12.11}
+BUILD=${BUILD:-1}
TAG=${TAG:-_SBo}
if [ -z "$ARCH" ]; then
@@ -40,9 +41,9 @@ set -e
rm -rf $PKG
mkdir -p $TMP $PKG $OUTPUT
cd $TMP
-rm -rf $PRGNAM-$VERSION-release
-tar xvf $CWD/$PRGNAM-$VERSION-src.tar.bz2
-cd $PRGNAM-$VERSION-release
+rm -rf $PRGNAM-$VERSION\release8629
+tar xvfz $CWD/$PRGNAM\_$VERSION-1.tar.gz
+cd $PRGNAM-$VERSION\release8629
chown -R root:root .
find . \
\( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \
@@ -50,13 +51,7 @@ find . \
\( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
-exec chmod 644 {} \;
-# Add a patch for gcc-4.7.x, (thans Debian)
-patch -p1 < $CWD/ftbfs-gcc-4.7.diff
-
-# This move the codeblocks plugins to /usr/lib$LIBDIRSUFFIX/codeblock/plugins
-# Take care to move the additional ones you have installed if upgrading
-sed -e "s|usr/lib|usr/lib$LIBDIRSUFFIX|" $CWD/01-codeblocks_plugin_path.patch \
- | patch -p1
+./bootstrap
LDFLAGS="-lX11" \
CFLAGS="$SLKCFLAGS" \
@@ -69,8 +64,8 @@ CXXFLAGS="$SLKCFLAGS -fpermissive" \
--mandir=/usr/man \
--docdir=/usr/doc/$PKGNAME-$VERSION \
--disable-static \
- --with-contrib-plugins=all \
--build=$ARCH-slackware-linux
+# --with-contrib-plugins=all \
make
make install-strip DESTDIR=$PKG
diff --git a/development/codeblocks/codeblocks.info b/development/codeblocks/codeblocks.info
index 1e69e5c4db..416e6c6a8d 100644
--- a/development/codeblocks/codeblocks.info
+++ b/development/codeblocks/codeblocks.info
@@ -1,10 +1,10 @@
PRGNAM="codeblocks"
-VERSION="10.05"
+VERSION="12.11"
HOMEPAGE="http://www.codeblocks.org/"
-DOWNLOAD="http://sourceforge.net/projects/codeblocks.berlios/files/codeblocks-10.05-src.tar.bz2"
-MD5SUM="ab077d562e98b0586f2f86c14cb773ba"
+DOWNLOAD="http://sourceforge.net/projects/codeblocks/files/Sources/12.11/codeblocks_12.11-1.tar.gz"
+MD5SUM="4fa8980a8c578b8b5589fceb9b0890d6"
DOWNLOAD_x86_64=""
MD5SUM_x86_64=""
REQUIRES="wxPython"
-MAINTAINER="ariarat"
-EMAIL="ariarat@gmail.com"
+MAINTAINER="antonioleal"
+EMAIL="antonioleal@yahoo.com"
diff --git a/development/codeblocks/ftbfs-gcc-4.7.diff b/development/codeblocks/ftbfs-gcc-4.7.diff
deleted file mode 100644
index e6a4b99ce0..0000000000
--- a/development/codeblocks/ftbfs-gcc-4.7.diff
+++ /dev/null
@@ -1,34 +0,0 @@
-Index: codeblocks-10.05/src/plugins/contrib/help_plugin/defs.h
-===================================================================
---- codeblocks-10.05.orig/src/plugins/contrib/help_plugin/defs.h 2010-05-22 10:29:35.000000000 +0000
-+++ codeblocks-10.05/src/plugins/contrib/help_plugin/defs.h 2012-05-29 05:18:08.674124530 +0000
-@@ -289,7 +289,7 @@
-
- if (i.second == false && overwrite)
- {
-- find(k)->second = t;
-+ this->find(k)->second = t;
- }
-
- return i.first;
-@@ -297,7 +297,7 @@
-
- int remove(const Key &k)
- {
-- return erase(k);
-+ return this->erase(k);
- }
- };
-
-Index: codeblocks-10.05/src/plugins/contrib/help_plugin/man2html.cpp
-===================================================================
---- codeblocks-10.05.orig/src/plugins/contrib/help_plugin/man2html.cpp 2010-05-22 10:29:35.000000000 +0000
-+++ codeblocks-10.05/src/plugins/contrib/help_plugin/man2html.cpp 2012-05-29 05:15:59.186120279 +0000
-@@ -150,6 +150,7 @@
- # include <kdeversion.h>
- # define BYTEARRAY(x) x
- #endif
-+#include <unistd.h>
-
- #ifdef __MINGW32__
- #include <io.h>
diff --git a/development/codeblocks/slack-desc b/development/codeblocks/slack-desc
index cc06e3ca6e..92a23622c8 100644
--- a/development/codeblocks/slack-desc
+++ b/development/codeblocks/slack-desc
@@ -1,9 +1,9 @@
# HOW TO EDIT THIS FILE:
-# The "handy ruler" below makes it easier to edit a package description. Line
-# up the first '|' above the ':' following the base package name, and the '|' on
-# the right side marks the last column you can put a character in. You must make
-# exactly 11 lines for the formatting to be correct. It's also customary to
-# leave one space after the ':'.
+# The "handy ruler" below makes it easier to edit a package description.
+# Line up the first '|' above the ':' following the base package name, and
+# the '|' on the right side marks the last column you can put a character in.
+# You must make exactly 11 lines for the formatting to be correct. It's also
+# customary to leave one space after the ':' except on otherwise blank lines.
|-----handy-ruler------------------------------------------------------|
codeblocks: Code::Blocks (a free C++ IDE)