mirror of
https://github.com/Ponce/slackbuilds
synced 2024-11-04 20:29:09 +01:00
development/codeblocks: Added a patch for gcc-4.7.x.
Fixed underlinking. Moved plugins path to /usr/lib{,64}, noted in README Signed-off-by: Matteo Bernardini <ponce@slackbuilds.org>
This commit is contained in:
parent
e9e13e288d
commit
34e8580ab9
4 changed files with 68 additions and 2 deletions
19
development/codeblocks/01-codeblocks_plugin_path.patch
Normal file
19
development/codeblocks/01-codeblocks_plugin_path.patch
Normal file
|
@ -0,0 +1,19 @@
|
|||
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
|
|
@ -2,3 +2,7 @@ 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.
|
||||
Built around a plugin framework, Code::Blocks can be extended with plugins.
|
||||
Any kind of functionality can be added by installing/coding a plugin.
|
||||
|
||||
N.B. Path for codeblocks 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).
|
||||
|
|
|
@ -5,7 +5,7 @@
|
|||
|
||||
PRGNAM=codeblocks
|
||||
VERSION=${VERSION:-10.05}
|
||||
BUILD=${BUILD:-1}
|
||||
BUILD=${BUILD:-2}
|
||||
TAG=${TAG:-_SBo}
|
||||
|
||||
if [ -z "$ARCH" ]; then
|
||||
|
@ -50,8 +50,17 @@ 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
|
||||
|
||||
LDFLAGS="-lX11" \
|
||||
CFLAGS="$SLKCFLAGS" \
|
||||
CXXFLAGS="$SLKCFLAGS" \
|
||||
CXXFLAGS="$SLKCFLAGS -fpermissive" \
|
||||
./configure \
|
||||
--prefix=/usr \
|
||||
--libdir=/usr/lib$LIBDIRSUFFIX \
|
||||
|
|
34
development/codeblocks/ftbfs-gcc-4.7.diff
Normal file
34
development/codeblocks/ftbfs-gcc-4.7.diff
Normal file
|
@ -0,0 +1,34 @@
|
|||
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>
|
Loading…
Reference in a new issue