Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=70e1305c243b894cadcc23bbd5d6745ed0589696
commit 70e1305c243b894cadcc23bbd5d6745ed0589696 Author: crazy <[EMAIL PROTECTED]> Date: Sat Dec 8 14:52:21 2007 +0100 codeblocks-r4713-1-i686 * Version bump to an snapshot * fixed url bug and CXXFLAGS * fixed depends() and options() bugs * s/build()/Fconfopts/ * contrib plugins are enabled now diff --git a/source/xapps-extra/codeblocks/FrugalBuild b/source/xapps-extra/codeblocks/FrugalBuild index 9218e18..de82e42 100644 --- a/source/xapps-extra/codeblocks/FrugalBuild +++ b/source/xapps-extra/codeblocks/FrugalBuild @@ -2,39 +2,19 @@ # Maintainer: Priyank Gosalia <[EMAIL PROTECTED]> pkgname=codeblocks -pkgver=1.0rc2 +pkgver=r4713 pkgrel=1 pkgdesc="A free cross platform C++ IDE" -url="http://www.codeblocks.org/"; -depends=('wxgtk') -makedepends=('hd2u' 'autoconf' 'libtool') +depends=('libstdc++' 'wxgtk>=2.8.7' 'libxdamage' 'libxxf86vm' 'expat' 'libice' 'bzip2') groups=('xapps-extra') archs=('i686' 'x86_64') _F_sourceforge_ext=".tgz" +options=('scriptlet' 'force') Finclude sourceforge -source=([EMAIL PROTECTED] codeblocks-1.0rc2_main.patch codeblocks-1.0rc2_sdk.patch barholder.patch) -sha1sums=('f5ffae4af7caeeef51b44fee76cf7c3d892b8efa' \ - '5195dd6a070da8bf4b8df5bde2c8ff1e27f3f8d8' \ - '2afef53b1fcb163cc6e0674cdeca312e9d4dc18b' \ - '7d2d3cf212ca8374e58bea1a7fe03b36fc79bf32') - -build() { - Fcd - - # Apply patches to compile with gcc41 - patch -Np0 -i $Fsrcdir/codeblocks-1.0rc2_main.patch || return 1 - patch -Np0 -i $Fsrcdir/codeblocks-1.0rc2_sdk.patch || return 1 - patch -Np0 -i $Fsrcdir/barholder.patch || return 1 - - # Build Code::Blocks - chmod +x bootstrap - dos2unix bootstrap && ./bootstrap - dos2unix configure - dos2unix src/setup/mime/{codeblocks.desktop,codeblocks.applications} - Fconf - find . -name Makefile -exec dos2unix {} \; - Fmake - Fmakeinstall -} +url="http://www.codeblocks.org/"; +source=(http://ftp.frugalware.org/pub/other/sources/$pkgname/$pkgname-$pkgver.tar.bz2) +Fconfopts="$Fconfopts --with-contrib-plugins=all,-wxsmith" +sha1sums=('7ef647ce1d963fd64d1ff4c551a71ba4f0a20510') +export CXXFLAGS="$CXXFLAGS -fno-strict-aliasing" # optimization OK diff --git a/source/xapps-extra/codeblocks/barholder.patch b/source/xapps-extra/codeblocks/barholder.patch deleted file mode 100644 index 3474a44..0000000 --- a/source/xapps-extra/codeblocks/barholder.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- src/src/wxDockit/include/wx/barholder.h 2006-05-29 23:39:03.000000000 +0530 -+++ src/src/wxDockit/include/wx/barholder.h 2005-09-08 13:25:24.000000000 +0530 -@@ -39,7 +39,7 @@ - } - - // Normal constructor -- wxBarHolder::wxBarHolder( wxWindow *parent, wxWindowID id = -1, const wxPoint& pos = wxDefaultPosition, -+ wxBarHolder( wxWindow *parent, wxWindowID id = -1, const wxPoint& pos = wxDefaultPosition, - const wxSize& size = wxDefaultSize, long style = wxTAB_TRAVERSAL, const wxString& name = wxT("barholder") ) { - Init(); - diff --git a/source/xapps-extra/codeblocks/codeblocks-1.0rc2_main.patch b/source/xapps-extra/codeblocks/codeblocks-1.0rc2_main.patch deleted file mode 100644 index 5061219..0000000 --- a/source/xapps-extra/codeblocks/codeblocks-1.0rc2_main.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- src/src/main.cpp 2006-05-30 16:33:56.000000000 +0530 -+++ src/src/main.cpp 2006-05-30 16:34:24.000000000 +0530 -@@ -65,7 +65,7 @@ - class wxMyFileDropTarget : public wxFileDropTarget - { - public: -- wxMyFileDropTarget::wxMyFileDropTarget(MainFrame *frame):m_frame(frame){} -+ wxMyFileDropTarget(MainFrame *frame):m_frame(frame){} - virtual bool OnDropFiles(wxCoord x, wxCoord y, const wxArrayString& filenames) - { - if(!m_frame) return false; diff --git a/source/xapps-extra/codeblocks/codeblocks-1.0rc2_sdk.patch b/source/xapps-extra/codeblocks/codeblocks-1.0rc2_sdk.patch deleted file mode 100644 index fa670ca..0000000 --- a/source/xapps-extra/codeblocks/codeblocks-1.0rc2_sdk.patch +++ /dev/null @@ -1,75 +0,0 @@ -# Patch for compiling codeblocks with gcc-4.1 -# Priyank <[EMAIL PROTECTED]> - ---- src/sdk/managedthread.h 2006-05-30 15:49:01.000000000 +0530 -+++ src/sdk/managedthread.h 2006-05-30 15:49:16.000000000 +0530 -@@ -11,8 +11,8 @@ - class ManagedThread : public wxThread - { - public: -- ManagedThread::ManagedThread(bool* abortflag = 0L); -- virtual ManagedThread::~ManagedThread(); -+ ManagedThread(bool* abortflag = 0L); -+ virtual ~ManagedThread(); - static unsigned long count_running(); - static unsigned long count_threads(); - static void abort_all(); // Warning! Once set, can't be reset! - ---- src/sdk/editormanager.h 2006-05-30 15:56:16.000000000 +0530 -+++ src/sdk/editormanager.h 2006-05-30 15:57:07.000000000 +0530 -@@ -126,7 +126,7 @@ - - /** Builds Opened Files tree in the Projects tab - */ -- wxTreeCtrl *EditorManager::GetTree(); -+ wxTreeCtrl* GetTree(); - wxTreeItemId FindTreeFile(const wxString& filename); - wxString GetTreeItemFilename(wxTreeItemId item); - void BuildOpenedFilesTree(wxWindow* parent); - ---- src/sdk/xtra_classes.h 2006-05-30 15:51:27.000000000 +0530 -+++ src/sdk/xtra_classes.h 2006-05-30 15:52:24.000000000 +0530 -@@ -18,8 +18,8 @@ - class wxSplitPanel : public wxPanel - { - public: -- wxSplitPanel::wxSplitPanel() { /*nothing to init, really */ } -- wxSplitPanel::wxSplitPanel(wxWindow* parent, wxWindowID id = -1, -+ wxSplitPanel() { /*nothing to init, really */ } -+ wxSplitPanel(wxWindow* parent, wxWindowID id = -1, - const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, - long style = wxTAB_TRAVERSAL, const wxString& name = _T("splitpanel"),const wxString configname = wxEmptyString,int defaultsashposition = 150) - { -@@ -33,9 +33,9 @@ - * If only one is found, the panel is not split. - * - */ -- void wxSplitPanel::RefreshSplitter(int idtop,int idbottom); -+ void RefreshSplitter(int idtop,int idbottom); - -- virtual wxSplitPanel::~wxSplitPanel(); -+ virtual ~wxSplitPanel(); - wxSplitterWindow* GetSplitter() { return (this) ? m_splitter : 0L; } - void SetConfigEntryForSplitter(const wxString& splitterconfig){ m_SplitterConfig = splitterconfig; } - protected: - ---- src/sdk/cbthreadpool.cpp 2006-05-30 16:10:00.000000000 +0530 -+++ src/sdk/cbthreadpool.cpp 2006-05-30 16:10:57.000000000 +0530 -@@ -250,7 +250,7 @@ - #if wxCHECK_VERSION(2,6,0) - wxMilliSleep(1); - #else -- wxUSleep(1); -+ wxUsleep(1); - #endif - - wxLogNull logNo; -@@ -265,7 +265,7 @@ - #if wxCHECK_VERSION(2,6,0) - wxMilliSleep(1); - #else -- wxUSleep(1); -+ wxUsleep(1); - #endif - if(++count > 10) - break; _______________________________________________ Frugalware-git mailing list [email protected] http://frugalware.org/mailman/listinfo/frugalware-git
