From d7acff3e5a91b5b72f170782f989897b8dc5ebf3 Mon Sep 17 00:00:00 2001 From: yopito Date: Sun, 5 Apr 2020 12:10:31 +0200 Subject: [PATCH] codeblocks: update to 20.03 --- .../patches/000.v20.03-r12008.patch | 22 +++ .../patches/001.v20.03-r12012.patch | 140 ++++++++++++++++++ srcpkgs/codeblocks/template | 10 +- srcpkgs/codeblocks/update | 1 - 4 files changed, 166 insertions(+), 7 deletions(-) create mode 100644 srcpkgs/codeblocks/patches/000.v20.03-r12008.patch create mode 100644 srcpkgs/codeblocks/patches/001.v20.03-r12012.patch delete mode 100644 srcpkgs/codeblocks/update diff --git a/srcpkgs/codeblocks/patches/000.v20.03-r12008.patch b/srcpkgs/codeblocks/patches/000.v20.03-r12008.patch new file mode 100644 index 00000000000..252f0be0a4a --- /dev/null +++ b/srcpkgs/codeblocks/patches/000.v20.03-r12008.patch @@ -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 + +------------------------------------------------------------------------ diff --git a/srcpkgs/codeblocks/patches/001.v20.03-r12012.patch b/srcpkgs/codeblocks/patches/001.v20.03-r12012.patch new file mode 100644 index 00000000000..4c56dfc7fcb --- /dev/null +++ b/srcpkgs/codeblocks/patches/001.v20.03-r12012.patch @@ -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 + + #include +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 + + #include +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 + //-#include + #include +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 + #include // 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" + +------------------------------------------------------------------------ diff --git a/srcpkgs/codeblocks/template b/srcpkgs/codeblocks/template index 087b3e6e3c3..43c9e4127a5 100644 --- a/srcpkgs/codeblocks/template +++ b/srcpkgs/codeblocks/template @@ -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 " 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" diff --git a/srcpkgs/codeblocks/update b/srcpkgs/codeblocks/update deleted file mode 100644 index 8e55fe68094..00000000000 --- a/srcpkgs/codeblocks/update +++ /dev/null @@ -1 +0,0 @@ -pattern="${pkgname}_\K[\d.]+(?=(-\d)?\.tar)"