jcgruenhage/void-packages
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

codeblocks: update to 20.03

Browse source
This commit is contained in:
yopito 2020-04-07 08:09:53 +02:00 committed by Juan RP
parent 0cf9bba078
commit 02d04795e5
4 changed files with 166 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
srcpkgs/codeblocks/patches/000.v20.03-r12008.patch Normal file
View file

@ -0,0 +1,22 @@
------------------------------------------------------------------------
r12008 | fuscated | 2020-03-30 19:14:41 +0200 (Mon, 30 Mar 2020) | 3 lines
- DragScroll: Remove int3, so it might build on non-x86 machines (ticket #935)
> I guess this is useful only for debugging.
Index: src/plugins/contrib/dragscroll/dragscrollcfg.h
===================================================================
--- src/plugins/contrib/dragscroll/dragscrollcfg.h (revision 12007)
+++ src/plugins/contrib/dragscroll/dragscrollcfg.h (revision 12008)
@@ -35,7 +35,7 @@
wxString GetBitmapBaseName() const;
void OnApply();
void OnCancel(){}
- virtual void InitDialog(){ asm("int3");} /*trap*/
+ virtual void InitDialog() { } /*trap*/
// pointer to owner of the configuration diaglog needed to
// complete the OnApply/OnCancel EndModal() logic
------------------------------------------------------------------------

140
srcpkgs/codeblocks/patches/001.v20.03-r12012.patch Normal file
View file

@ -0,0 +1,140 @@
------------------------------------------------------------------------
r12012 | mortenmacfly | 2020-03-31 17:44:13 +0200 (Tue, 31 Mar 2020) | 2 lines
* keybinder: remove old-school #pragmas to fix bug #936 and https://bugzilla.redhat.com/show_bug.cgi?id=1819154
- keybinder: also, remove Borland c related pragmas. (Who will ever compile C::B using Borland C?)
Index: src/plugins/contrib/keybinder/cbKeyConfigPanel.h
===================================================================
--- src/plugins/contrib/keybinder/cbKeyConfigPanel.h (revision 12011)
+++ src/plugins/contrib/keybinder/cbKeyConfigPanel.h (revision 12012)
@@ -10,10 +10,6 @@
#ifndef CBKEYCONFIGPANEL_H
#define CBKEYCONFIGPANEL_H
-#ifdef __BORLANDC__
- #pragma hdrstop
-#endif
-
// Modified Keybinder for CodeBlocks KeyBnder v2.0
// ----------------------------------------------------------------------------
Index: src/plugins/contrib/keybinder/cbkeyConfigPanel.cpp
===================================================================
--- src/plugins/contrib/keybinder/cbkeyConfigPanel.cpp (revision 12011)
+++ src/plugins/contrib/keybinder/cbkeyConfigPanel.cpp (revision 12012)
@@ -12,10 +12,6 @@
// Modified CodeBlocks KeyBnder v2.0 2019/04/8
-#if defined(__GNUG__) && !defined(__APPLE__)
- #pragma implementation "cbkeybinder.h"
-#endif
-
#include <vector>
#include <sdk.h>
Index: src/plugins/contrib/keybinder/cbkeybinder.cpp
===================================================================
--- src/plugins/contrib/keybinder/cbkeybinder.cpp (revision 12011)
+++ src/plugins/contrib/keybinder/cbkeybinder.cpp (revision 12012)
@@ -12,10 +12,6 @@
// Modified CodeBlocks KeyBnder v2.0 2019/04/8
-#if defined(__GNUG__) && !defined(__APPLE__)
- #pragma implementation "cbkeybinder.h"
-#endif
-
#include <vector>
#include <sdk.h>
Index: src/plugins/contrib/keybinder/cbkeybinder.h
===================================================================
--- src/plugins/contrib/keybinder/cbkeybinder.h (revision 12011)
+++ src/plugins/contrib/keybinder/cbkeybinder.h (revision 12012)
@@ -10,14 +10,6 @@
#ifndef CBKEYBINDER_H
#define CBKEYBINDER_H
-#if defined(__GNUG__) && !defined(__APPLE__)
- #pragma interface "cbkeybinder.h"
-#endif
-
-#ifdef __BORLANDC__
- #pragma hdrstop
-#endif
-
#include <wx/string.h>
//-#include <wx/timer.h>
#include <wx/listbook.h>
Index: src/plugins/contrib/keybinder/keybinder.cpp
===================================================================
--- src/plugins/contrib/keybinder/keybinder.cpp (revision 12011)
+++ src/plugins/contrib/keybinder/keybinder.cpp (revision 12012)
@@ -12,11 +12,6 @@
// Modified Keybinder for CodeBlocks KeyBnder v2.0 2019/04/8
-#ifdef __GNUG__
-#pragma implementation "keybinder.h" //necessary for linux, else undefines when linking
-#endif
-
-
// includes
#include <wx/event.h>
#include <wx/frame.h> // Manager::Get()->GetAppWindow()
Index: src/plugins/contrib/keybinder/keybinder.h
===================================================================
--- src/plugins/contrib/keybinder/keybinder.h (revision 12011)
+++ src/plugins/contrib/keybinder/keybinder.h (revision 12012)
@@ -16,10 +16,6 @@
#ifndef __KEYBINDER_G__
#define __KEYBINDER_G__
-#ifdef __GNUG__
-#pragma interface "keybinder.h"
-#endif
-
// required includes
#include "wx/panel.h"
#include "wx/dialog.h"
Index: src/plugins/contrib/keybinder/menuutils.cpp
===================================================================
--- src/plugins/contrib/keybinder/menuutils.cpp (revision 12011)
+++ src/plugins/contrib/keybinder/menuutils.cpp (revision 12012)
@@ -10,17 +10,10 @@
// RCS-ID: $Id$
// menuutils for KeyBinder v2.0 2019/04/8
-#ifdef __GNUG__
-#pragma implementation "menuutils.h"
-#endif
// For compilers that support precompilation, includes "wx/wx.h".
#include "wx/wxprec.h"
-#ifdef __BORLANDC__
-#pragma hdrstop
-#endif
-
#ifndef WX_PRECOMP
#include "wx/wx.h"
#endif
Index: src/plugins/contrib/keybinder/menuutils.h
===================================================================
--- src/plugins/contrib/keybinder/menuutils.h (revision 12011)
+++ src/plugins/contrib/keybinder/menuutils.h (revision 12012)
@@ -15,10 +15,6 @@
#ifndef __WX_MENUUTILS_H__
#define __WX_MENUUTILS_H__
-#ifdef __GNUG__
-#pragma interface "menuutils.h"
-#endif
-
// includes
#include "wx/panel.h"
#include "wx/dialog.h"
------------------------------------------------------------------------

10
srcpkgs/codeblocks/template
View file

@ -1,7 +1,7 @@
# Template file for 'codeblocks'
pkgname=codeblocks
version=17.12
revision=8
version=20.03
revision=1
build_style=gnu-configure
configure_args="--with-wx-config=wx-config-gtk3 --with-contrib-plugins
--with-boost=${XBPS_CROSS_BASE}/usr --with-boost-libdir=${XBPS_CROSS_BASE}/usr/lib"
@ -12,10 +12,8 @@ short_desc="Free C, C++ and Fortran IDE"
maintainer="Jürgen Buchmüller <pullmoll@t-online.de>"
license="GPL-3.0-only"
homepage="http://www.codeblocks.org"
distfiles="${SOURCEFORGE_SITE}/${pkgname}/Sources/${version}/${pkgname}_${version}.tar.xz"
checksum=13881a0a72769694e82e531b8e7814d51fbf1fa122c73c5004e186560fbc57e0
CXXFLAGS="-std=c++11 -fpermissive"
distfiles="${SOURCEFORGE_SITE}/${pkgname}/Sources/${version}/${pkgname}-${version}.tar.xz"
checksum=15eeb3e28aea054e1f38b0c7f4671b4d4d1116fd05f63c07aa95a91db89eaac5
if [ "$CROSS_BUILD" ]; then
hostmakedepends+=" wxWidgets-devel tinyxml-devel"

1
srcpkgs/codeblocks/update
View file

@ -1 +0,0 @@
pattern="${pkgname}_\K[\d.]+(?=(-\d)?\.tar)"