cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update to codeblocks-10.05.

Browse Source
This commit is contained in:
ajacoutot 2010-06-03 16:09:03 +00:00
parent 68597a84fa
commit 8f2a089a25
7 changed files with 748 additions and 143 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
devel/codeblocks/Makefile
View File

@ -1,18 +1,22 @@
# $OpenBSD: Makefile,v 1.2 2009/12/22 15:31:26 ajacoutot Exp $
# $OpenBSD: Makefile,v 1.3 2010/06/03 16:09:03 ajacoutot Exp $
SHARED_ONLY= Yes
COMMENT= Code::Blocks C/C++ IDE
BASENAME= codeblocks-8.02
DISTNAME= ${BASENAME}-src
PKGNAME= ${BASENAME}p0
V= 10.05
P= 1
DISTNAME= codeblocks-${V}-${P}debian-src
PKGNAME= codeblocks-${V}
EXTRACT_SUFX= .tar.bz2
WRKDIST= ${WRKDIR}/${BASENAME}
WRKDIST= ${WRKDIR}/codeblocks-${V}
SHARED_LIBS += codeblocks 0.0 # .0.1
SHARED_LIBS += wxsmithlib 0.0 # .0.1
SHARED_LIBS += codeblocks 0.0 # .0.1
SHARED_LIBS += wxsmithlib 0.0 # .0.1
SHARED_LIBS += wxchartctrl 0.0 # .0.1
SHARED_LIBS += wxflatnotebook 0.0 # .0.1
SHARED_LIBS += wxcustombutton 0.0 # .0.1
CATEGORIES= devel x11
@ -31,9 +35,10 @@ WANTLIB += Xi Xinerama Xrandr Xrender atk-1.0 c cairo expat fontconfig
WANTLIB += freetype gdk-x11-2.0 gdk_pixbuf-2.0 gio-2.0 glib-2.0
WANTLIB += glitz gmodule-2.0 gobject-2.0 gtk-x11-2.0 m pango-1.0
WANTLIB += pangocairo-1.0 pangoft2-1.0 pcre pixman-1 png pthread
WANTLIB += pthread-stubs stdc++ xcb z
WANTLIB += gthread-2.0 xcb-render xcb-render-util pthread-stubs
WANTLIB += stdc++ xcb z
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=codeblocks/}
MASTER_SITES= ${MASTER_SITE_BERLIOS:=codeblocks/}
BUILD_DEPENDS= ::archivers/zip
@ -50,10 +55,15 @@ LIBTOOL_FLAGS= --tag=disable-static
CONFIGURE_STYLE=gnu
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib"
LDFLAGS="-L${LOCALBASE}/lib \
-Wl,-rpath,${TRUEPREFIX}/lib/wxSmithContribItems"
# XXX lib_finder.cpp:302: error: syntax error before `->' token
CONFIGURE_ARGS= ${CONFIGURE_SHARED} \
--disable-static \
--with-contrib-plugins=all
--with-contrib-plugins=all,-libfinder
post-extract:
tar xzf ${WRKDIR}/src/codeblocks_${V}-${P}.tar.gz -C ${WRKDIR}
pre-configure:
ln -s /usr/bin/true ${WRKDIR}/bin/svn

10
devel/codeblocks/distinfo
View File

@ -1,5 +1,5 @@
MD5 (codeblocks-8.02-src.tar.bz2) = rBW0s95Q12UML3qNvLMPiA==
RMD160 (codeblocks-8.02-src.tar.bz2) = iEUfQqxN4rmNV0FqPOoaBkc0SzA=
SHA1 (codeblocks-8.02-src.tar.bz2) = B4kyz9T+4gZuyTHLbfqAeSNcEjc=
SHA256 (codeblocks-8.02-src.tar.bz2) = Wm6RhLXtyZG1na2/h79FhO1sMOcJfFchScwbIIWzCA8=
SIZE (codeblocks-8.02-src.tar.bz2) = 6839711
MD5 (codeblocks-10.05-1debian-src.tar.bz2) = V+QbM6N/JnfkMrR+iek54w==
RMD160 (codeblocks-10.05-1debian-src.tar.bz2) = Za8rVpZLVO2zLf79XRMOZ5dPASo=
SHA1 (codeblocks-10.05-1debian-src.tar.bz2) = fFiD+nigUWXC0nVj5EjDEQEhV64=
SHA256 (codeblocks-10.05-1debian-src.tar.bz2) = dE9VZdCK/7i9FW08LILJcENwr8KwY5C8ACHQxzDj3+g=
SIZE (codeblocks-10.05-1debian-src.tar.bz2) = 14470771

30
devel/codeblocks/patches/patch-configure
View File

@ -1,24 +1,24 @@
$OpenBSD: patch-configure,v 1.1.1.1 2009/09/06 17:23:34 ajacoutot Exp $
--- configure.orig Wed Sep 2 14:55:33 2009
+++ configure Wed Sep 2 14:55:42 2009
@@ -22800,13 +22800,13 @@ _ACEOF
$OpenBSD: patch-configure,v 1.2 2010/06/03 16:09:03 ajacoutot Exp $
--- configure.orig Thu May 27 12:51:57 2010
+++ configure Tue Jun 1 19:34:13 2010
@@ -16562,13 +16562,13 @@ _ACEOF
fi
-{ echo "$as_me:$LINENO: checking for pthread_create in -lpthread" >&5
-echo $ECHO_N "checking for pthread_create in -lpthread... $ECHO_C" >&6; }
+{ echo "$as_me:$LINENO: checking for pthread_create in -pthread" >&5
+echo $ECHO_N "checking for pthread_create in -pthread... $ECHO_C" >&6; }
if test "${ac_cv_lib_pthread_pthread_create+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for pthread_create in -lpthread" >&5
-$as_echo_n "checking for pthread_create in -lpthread... " >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for pthread_create in -pthread" >&5
+$as_echo_n "checking for pthread_create in -pthread... " >&6; }
if test "${ac_cv_lib_pthread_pthread_create+set}" = set; then :
$as_echo_n "(cached) " >&6
else
ac_check_lib_save_LIBS=$LIBS
-LIBS="-lpthread $LIBS"
+LIBS="-pthread $LIBS"
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
@@ -22866,7 +22866,7 @@ if test $ac_cv_lib_pthread_pthread_create = yes; then
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
@@ -16603,7 +16603,7 @@ if test "x$ac_cv_lib_pthread_pthread_create" = x""yes;
#define HAVE_LIBPTHREAD 1
_ACEOF

12
devel/codeblocks/patches/patch-src_CodeBlocks-unix_cbp
View File

@ -1,11 +1,11 @@
$OpenBSD: patch-src_CodeBlocks-unix_cbp,v 1.1.1.1 2009/09/06 17:23:34 ajacoutot Exp $
--- src/CodeBlocks-unix.cbp.orig Wed Sep 2 23:33:09 2009
+++ src/CodeBlocks-unix.cbp Wed Sep 2 23:33:39 2009
@@ -166,7 +166,6 @@
$OpenBSD: patch-src_CodeBlocks-unix_cbp,v 1.2 2010/06/03 16:09:03 ajacoutot Exp $
--- src/CodeBlocks-unix.cbp.orig Sat May 22 12:39:32 2010
+++ src/CodeBlocks-unix.cbp Tue Jun 1 19:33:44 2010
@@ -143,7 +143,6 @@
<Option projectResourceIncludeDirsRelation="0" />
<Option projectLibDirsRelation="2" />
<Compiler>
- <Add option="-DENABLE_BINRELOC" />
<Add directory="include" />
<Add directory="src/wxAUI" />
<Add directory="include/wxFlatNotebook/include" />
<Add directory="include/scripting/include" />
<Add directory="include/scripting/sqplus" />

25
devel/codeblocks/patches/patch-src_plugins_compilergcc_compilergcc_cpp
View File

@ -1,11 +1,11 @@
$OpenBSD: patch-src_plugins_compilergcc_compilergcc_cpp,v 1.1.1.1 2009/09/06 17:23:34 ajacoutot Exp $
$OpenBSD: patch-src_plugins_compilergcc_compilergcc_cpp,v 1.2 2010/06/03 16:09:03 ajacoutot Exp $
Don't look for cb_console_runner in WRKINST, always assume it is there and
installed under PREFIX.
--- src/plugins/compilergcc/compilergcc.cpp.orig Wed Feb 27 14:15:26 2008
+++ src/plugins/compilergcc/compilergcc.cpp Fri Sep 4 17:13:52 2009
@@ -164,7 +164,7 @@ namespace
--- src/plugins/compilergcc/compilergcc.cpp.orig Sat May 22 12:11:22 2010
+++ src/plugins/compilergcc/compilergcc.cpp Tue Jun 1 19:35:57 2010
@@ -166,7 +166,7 @@ namespace
{
PluginRegistrant<CompilerGCC> reg(_T("Compiler"));
@ -14,7 +14,7 @@ installed under PREFIX.
static const wxString strSLASH(_T("/"));
static const wxString strSPACE(_T(" "));
static const wxString strQUOTE(platform::windows ? _T("\"") : _T("'"));
@@ -1646,8 +1646,7 @@ int CompilerGCC::RunSingleFile(const wxString& filenam
@@ -1672,8 +1672,7 @@ int CompilerGCC::RunSingleFile(const wxString& filenam
}
wxString baseDir = ConfigManager::GetExecutableFolder();
@ -24,7 +24,7 @@ installed under PREFIX.
if (!cmd.Replace(_T("$SCRIPT"), exe_filename))
// if they didn't specify $SCRIPT, append:
@@ -1750,7 +1749,7 @@ int CompilerGCC::Run(ProjectBuildTarget* target)
@@ -1781,7 +1780,7 @@ int CompilerGCC::Run(ProjectBuildTarget* target)
: EscapeSpaces(m_CdRun);
wxString crunnStr = platform::windows
? strQUOTE + baseDir + strSLASH + strCONSOLE_RUNNER + strQUOTE
@ -33,13 +33,20 @@ installed under PREFIX.
wxString hostapStr = platform::windows
? strQUOTE + target->GetHostApplication() + strQUOTE
: EscapeSpaces(target->GetHostApplication());
@@ -1784,8 +1783,7 @@ int CompilerGCC::Run(ProjectBuildTarget* target)
@@ -1820,8 +1819,6 @@ int CompilerGCC::Run(ProjectBuildTarget* target)
// should console runner be used?
if (target->GetUseConsoleRunner())
{
- if (wxFileExists(baseDir + strSLASH + strCONSOLE_RUNNER))
- command << crunnStr << strSPACE;
+ command << crunnStr << strSPACE;
- {
command << crunnStr << strSPACE;
if (!platform::windows)
@@ -1833,7 +1830,6 @@ int CompilerGCC::Run(ProjectBuildTarget* target)
QuoteStringIfNeeded(strLinkerPath);
command << strLinkerPath << strSPACE;
}
- }
}
}

8
devel/codeblocks/patches/patch-src_src_prefix_cpp
View File

@ -1,7 +1,7 @@
$OpenBSD: patch-src_src_prefix_cpp,v 1.1.1.1 2009/09/06 17:23:34 ajacoutot Exp $
--- src/src/prefix.cpp.orig Wed Sep 2 15:21:14 2009
+++ src/src/prefix.cpp Wed Sep 2 15:21:30 2009
@@ -231,7 +231,7 @@ br_prepend_prefix (void *symbol, char *path)
$OpenBSD: patch-src_src_prefix_cpp,v 1.2 2010/06/03 16:09:03 ajacoutot Exp $
--- src/src/prefix.cpp.orig Sat May 22 12:37:59 2010
+++ src/src/prefix.cpp Tue Jun 1 19:33:44 2010
@@ -230,7 +230,7 @@ br_prepend_prefix (void *symbol, char *path)
#include <pthread.h>
static pthread_key_t br_thread_key;

774
devel/codeblocks/pkg/PLIST
View File

File diff suppressed because it is too large Load Diff