Ping. On Fri, May 02, 2025 at 01:32:33PM -0400, Josh Grosse wrote: > After six years, the Code::Blocks IDE has a new release. > The changelog is at https://www.codeblocks.org/changelogs/25.03/ > > Tested on amd64.
> diff --git devel/codeblocks/Makefile devel/codeblocks/Makefile > old mode 100755 > new mode 100644 > index 04f7cf10f03..b765345e6be > --- devel/codeblocks/Makefile > +++ devel/codeblocks/Makefile > @@ -1,16 +1,15 @@ > BROKEN-alpha= sqvm.cpp:394:1: internal compiler error: Segmentation > fault > COMMENT= Code::Blocks C/C++ IDE > > -R= 12751 > -V= 20.03 > -REVISION= 6 > +V= 25.03 > + > +DISTNAME= codeblocks_${V} > +PKGNAME= codeblocks-${V} > +WRKSRC= ${WRKDIR}/codeblocks_${V} > > -DISTNAME= codeblocks-${V}pl${R} > EXTRACT_SUFX= .tar.xz > > -# source tarball for this OpenBSD-specific patch level: > -SITES= https://jggimi.net/codeblocks/ > -#SITES= ${SITE_SOURCEFORGE:=codeblocks/Sources/${V}/} > +SITES= ${SITE_SOURCEFORGE:=codeblocks/Sources/${V}/} > > DEBUG_PACKAGES=${BUILD_PACKAGES} > > @@ -30,7 +29,7 @@ CATEGORIES= devel x11 > DPB_PROPERTIES= parallel > > MAINTAINER= Josh Grosse <j...@jggimi.net> > -HOMEPAGE= http://www.codeblocks.org/ > +HOMEPAGE= https://www.codeblocks.org/ > > # GPLv3 > PERMIT_PACKAGE= Yes > @@ -39,14 +38,15 @@ WANTLIB += ${COMPILER_LIBCXX} ICE SDL2 SM X11 Xau > Xcomposite Xcursor > WANTLIB += Xdamage Xdmcp Xext Xfixes Xi Xinerama Xrandr Xrender > WANTLIB += Xss Xtst Xxf86vm aspell atk-1.0 atk-bridge-2.0 atspi > WANTLIB += boost_system bz2 c cairo cairo-gobject crypto curl > -WANTLIB += curses dbus-1 enchant-2 epoxy execinfo expat ffi fontconfig > -WANTLIB += freetype fribidi gcrypt gdk-3 gdk_pixbuf-2.0 gio-2.0 > +WANTLIB += curses dbus-1 enchant-2 epoll-shim epoxy execinfo expat ffi > +WANTLIB += fontconfig freetype fribidi gcrypt gdk-3 gdk_pixbuf-2.0 gio-2.0 > WANTLIB += glib-2.0 gmodule-2.0 gobject-2.0 gpg-error graphite2 > WANTLIB += gspell-1 gthread-2.0 gtk-3 harfbuzz hunspell-1.7 iconv > -WANTLIB += icudata icuuc intl jpeg lzma m mspack nghttp2 nghttp3 > +WANTLIB += icudata icuuc intl jpeg lzma Lerc m mspack nghttp2 nghttp3 > WANTLIB += ngtcp2 ngtcp2_crypto_quictls notify pango-1.0 pangocairo-1.0 > WANTLIB += pangoft2-1.0 pcre2-32 pcre2-8 pixman-1 png samplerate > -WANTLIB += secret-1 sndio ssl tiff usbhid wx_baseu-3.2 wx_baseu_net-3.2 > +WANTLIB += secret-1 sndio ssl tiff usbhid util wayland-client wayland-cursor > +WANTLIB += wayland-egl wx_baseu-3.2 wx_baseu_net-3.2 > WANTLIB += wx_baseu_xml-3.2 wx_gtk3u_aui-3.2 wx_gtk3u_core-3.2 > WANTLIB += wx_gtk3u_html-3.2 wx_gtk3u_propgrid-3.2 wx_gtk3u_qa-3.2 > WANTLIB += wx_gtk3u_richtext-3.2 wx_gtk3u_xrc-3.2 xcb xcb-render > @@ -66,7 +66,7 @@ RUN_DEPENDS= devel/desktop-file-utils \ > # C++11 > COMPILER = base-clang ports-gcc > > -AUTOCONF_VERSION= 2.69 > +AUTOCONF_VERSION= 2.71 > AUTOMAKE_VERSION= 1.15 > BUILD_DEPENDS += ${MODGNU_AUTOCONF_DEPENDS} \ > ${MODGNU_AUTOMAKE_DEPENDS} \ > @@ -82,12 +82,6 @@ CONFIGURE_ARGS= --with-contrib-plugins=all,-FileManager > CONFIGURE_ARGS += --enable-debug > CONFIGURE_ARGS += --with-boost-libdir=${LOCALBASE}/lib > > -post-patch: > - echo : > ${WRKSRC}/update_revision.sh > - echo 'm4_define([SVN_REV], ${R})' > ${WRKSRC}/revision.m4 > - echo 'm4_define([SVN_REVISION], ${V}svn${R})' >> ${WRKSRC}/revision.m4 > - echo 'm4_define([SVN_DATE], )' >> ${WRKSRC}/revision.m4 > - > pre-configure: > ${SUBST_CMD} ${WRKSRC}/src/plugins/compilergcc/compilergcc.cpp > > diff --git devel/codeblocks/distinfo devel/codeblocks/distinfo > index 81f021815f9..cb8895fde7e 100644 > --- devel/codeblocks/distinfo > +++ devel/codeblocks/distinfo > @@ -1,2 +1,2 @@ > -SHA256 (codeblocks-20.03pl12751.tar.xz) = > Me8U5kehxIfth3eSLUvcn8FdQPbTl9mh7QglVijBmAk= > -SIZE (codeblocks-20.03pl12751.tar.xz) = 16711100 > +SHA256 (codeblocks_25.03.tar.xz) = > sPaqWQjTNtf0H5V2skGKx9J++8WSgqqMkXHYjOp0BJ4= > +SIZE (codeblocks_25.03.tar.xz) = 17866880 > diff --git devel/codeblocks/patches/patch-bootstrap > devel/codeblocks/patches/patch-bootstrap > deleted file mode 100644 > index 21d1fe873c6..00000000000 > --- devel/codeblocks/patches/patch-bootstrap > +++ /dev/null > @@ -1,12 +0,0 @@ > -Index: bootstrap > ---- bootstrap.orig > -+++ bootstrap > -@@ -64,7 +64,7 @@ rm -rf autom4te.cache > - > - # Make the build more robust if a Makefile.am is removed from the file > system, but it is not removed > - # from the configure.ac file. > --find . | grep -v wxSmithSTC/stc| grep Makefile.in$ | xargs rm -v > -+find . | grep -v wxSmithSTC/stc| grep Makefile.in$ | xargs -r rm -v > - > - rm -vf debian/control > - echo "Note: If you want to build debian packages you have to first run the > debian/setup_control.sh script. See the script for details how to use it." > diff --git devel/codeblocks/patches/patch-configure_ac > devel/codeblocks/patches/patch-configure_ac > index 2fecc955c27..e2af4904bbb 100644 > --- devel/codeblocks/patches/patch-configure_ac > +++ devel/codeblocks/patches/patch-configure_ac > @@ -3,9 +3,9 @@ undefined reference to `free' > Index: configure.ac > --- configure.ac.orig > +++ configure.ac > -@@ -42,8 +42,6 @@ AC_PROG_LN_S > - AC_PROG_MAKE_SET > - AC_PROG_AWK > +@@ -44,8 +44,6 @@ AC_PROG_AWK > + > + AX_CXX_COMPILE_STDCXX(11, noext) > > > -CODEBLOCKS_CHECK_LINK_FLAG([-Wl,--no-undefined],[LDFLAGS="-Wl,--no-undefined > $LDFLAGS"]) > - > diff --git devel/codeblocks/patches/patch-src_base_tinyxml_Makefile_am > devel/codeblocks/patches/patch-src_base_tinyxml_Makefile_am > index 6e3dcfab5b1..f500ab997e5 100644 > --- devel/codeblocks/patches/patch-src_base_tinyxml_Makefile_am > +++ devel/codeblocks/patches/patch-src_base_tinyxml_Makefile_am > @@ -11,5 +11,5 @@ Index: src/base/tinyxml/Makefile.am > + -I$(top_srcdir)/src/include/tinyxml \ > + $(WX_CXXFLAGS) > > - noinst_LTLIBRARIES = libtinyxml.la > - > + if CODEBLOCKS_NT > + AM_CPPFLAGS += -DEXPORT_LIB > diff --git devel/codeblocks/patches/patch-src_include_cbauibook_h > devel/codeblocks/patches/patch-src_include_cbauibook_h > deleted file mode 100644 > index eff87cf1ff7..00000000000 > --- devel/codeblocks/patches/patch-src_include_cbauibook_h > +++ /dev/null > @@ -1,236 +0,0 @@ > -r12841 | wh11204 | 2022-06-29 14:34:36 +0200 (Wed, 29 Jun 2022) | 4 lines > -* Fix compilation of wx3.1.6 and later with Clang (thanks AndrewCot). > -See > https://forums.codeblocks.org/index.php/topic,25004.msg170429.html#msg170429 > -Also fix some typos in documentation. > - > -r12842 | wh11204 | 2022-06-30 11:36:18 +0200 (Thu, 30 Jun 2022) | 3 lines > -- Complete previous commit, InsertPage() must be fixed too. > -It appeared in the diff, but I forgot about it when editing. > - > -Index: src/include/cbauibook.h > ---- src/include/cbauibook.h.orig > -+++ src/include/cbauibook.h > -@@ -57,14 +57,14 @@ class DLLIMPORT cbAuiNotebook : public wxAuiNotebook > - /** \brief Loads serialized notebook layout > - * \param layout the serialized layout > - * \param mergeLayouts try to merge the tab-layouts > -- * \return bool true if successfull > -+ * \return bool true if successful > - * > - */ > - bool LoadPerspective(const wxString& layout, bool mergeLayouts = > false); > -- /** \brief Get the tab index from tooltiptext > -+ /** \brief Get the tab index from tooltip text > - * \param text the notebooks name > - * \return int the tab's index > -- * @remarks We use the name internally to store the tooltip-text. > To use it > -+ * @remarks We use the name internally to store the tooltip text. > To use it > - * in this function, we create a unique string from the relative > filename > - * and the projects title. So it should be unique even after a > - * restart of C::B. > -@@ -78,7 +78,7 @@ class DLLIMPORT cbAuiNotebook : public wxAuiNotebook > - * \return int the visible position > - */ > - int GetTabPositionFromIndex(int index); > -- /** \brief Minmize free horizontal page > -+ /** \brief Minimize free horizontal page > - * > - * Moves the active tab of all tabCtrl's to the rightmost place, > - * to show as many tabs as possible. > -@@ -87,21 +87,21 @@ class DLLIMPORT cbAuiNotebook : public wxAuiNotebook > - /** \brief Delete Page > - * > - * Calls the base-class function and after that > -- * MinmizeFreeSpace(), needed to hook into the close-events. > -+ * MinimizeFreeSpace(), needed to hook into the close-events. > - * The system generated close event has to be veto'd, and Close() > - * has to be called manually, so we can handle it ourselves. > - * \param The index of the tab to be closed > -- * \return true if successfull > -+ * \return true if successful > - */ > - bool DeletePage(size_t page) override; > - /** \brief Remove Page > - * > - * Calls the base-class function and after that > -- * MinmizeFreeSpace(), needed to hook into the close-events. > -+ * MinimizeFreeSpace(), needed to hook into the close-events. > - * The system generated close event has to be veto'd, and Close() > - * has to be called manually, so we can handle it ourselves. > - * \param The index of the tab to be closed > -- * \return true if successfull > -+ * \return true if successful > - */ > - bool RemovePage(size_t page) override; > - /** \brief Move page > -@@ -109,44 +109,52 @@ class DLLIMPORT cbAuiNotebook : public wxAuiNotebook > - * Moves the tab containing page to new_idx > - * \param page The page to move (e.g. cbEditor*) > - * \param new_idx The index the page should be moved to > -- * \return true if successfull > -+ * \return true if successful > - */ > - bool MovePage(wxWindow* page, size_t new_idx); > - /** \brief Add Page > - * > - * Calls the base-class function and after that > -- * MinmizeFreeSpace(). > -+ * MinimizeFreeSpace(). > - * \param page The page to add > - * \param caption The caption of the page > - * \param select If true the page gets selected > -- * \param bitmap The bitmap of the tab > -- * \return true if successfull > -+ * \param bitmap The bitmap (or bitmap bundle since wx3.1.6) of the > tab > -+ * \return true if successful > - */ > - bool AddPage(wxWindow* page, > - const wxString& caption, > - bool select = false, > -+#if wxCHECK_VERSION(3, 1, 6) > -+ const wxBitmapBundle& bitmap = wxBitmapBundle()); > -+#else > - const wxBitmap& bitmap = wxNullBitmap); > -+#endif > - /** \brief Insert Page > - * > - * Calls the base-class function and after that > -- * MinmizeFreeSpace(). > -+ * MinimizeFreeSpace(). > - * \param page_idx The index where the page should be inserted > - * \param page The page to add > - * \param caption The caption of the page > - * \param select If true the page gets selected > -- * \param bitmap The bitmap of the tab > -- * \return true if successfull > -+ * \param bitmap The bitmap (or bitmap bundle since wx3.1.6) of the > tab > -+ * \return true if successful > - */ > - bool InsertPage(size_t page_idx, > - wxWindow* page, > - const wxString& caption, > - bool select = false, > -+#if wxCHECK_VERSION(3, 1, 6) > -+ const wxBitmapBundle& bitmap = wxBitmapBundle()); > -+#else > - const wxBitmap& bitmap = wxNullBitmap); > -- /** \brief Set zoomfactor for builtin editors > -+#endif > -+ /** \brief Set zoom factor for builtin editors > - * > -- * Sets the zoomfactor for all visible builtin > -+ * Sets the zoom factor for all visible builtin > - * editors. > -- * \param zoom zoomfactor to use > -+ * \param zoom zoom factor to use > - */ > - void SetZoom(int zoom); > - /** \brief Set Focus on the tabCtrl belonging to the active tab > -@@ -165,7 +173,7 @@ class DLLIMPORT cbAuiNotebook : public wxAuiNotebook > - /** \brief Create a unique id from the tooltip-text > - * > - * Tries to create a unique id from the tooltip. > -- * Find the projectfile, geet the relative filename and put it > -+ * Find the projectfile, get the relative filename and put it > - * together with the projects name. > - * We use it to save and load the pane layout. > - * By using the relative filename, it works even if the project > -@@ -173,7 +181,7 @@ class DLLIMPORT cbAuiNotebook : public wxAuiNotebook > - * \param text The tooltip text > - */ > - wxString UniqueIdFromTooltip(const wxString& text); > -- /** \brief Minmize free horizontal page of tabCtrl > -+ /** \brief Minimize free horizontal page of tabCtrl > - * > - * Moves the active tab of tabCtrl to the rightmost place, > - * to show as many tabs as possible. > -@@ -194,7 +202,7 @@ class DLLIMPORT cbAuiNotebook : public wxAuiNotebook > - void OnIdle(cb_unused wxIdleEvent& event); > - /** \brief Catch doubleclick-events from wxTabCtrl > - * > -- * Sends cbEVT_CBAUIBOOK_LEFT_DCLICK, if doubleclick was on a tab, > -+ * Sends cbEVT_CBAUIBOOK_LEFT_DCLICK, if double click was on a tab, > - * event-Id is the notebook-Id, event-object is the pointer to the > window the > - * tab belongs to. > - * \param event holds the wxTabCtrl, that sends the event > -@@ -202,7 +210,7 @@ class DLLIMPORT cbAuiNotebook : public wxAuiNotebook > - void OnTabCtrlDblClick(wxMouseEvent& event); > - /** \brief Catch mousewheel-events from wxTabCtrl > - * > -- * Sends cbEVT_CBAUIBOOK_MOUSEWHEEL, if doubleclick was on a tab, > -+ * Sends cbEVT_CBAUIBOOK_MOUSEWHEEL, if double click was on a tab, > - * event-Id is the notebook-Id, event-object is the pointer to the > window the > - * tab belongs to. > - * \param event holds the wxTabCtrl, that sends the event > -@@ -229,7 +237,7 @@ class DLLIMPORT cbAuiNotebook : public wxAuiNotebook > - * \param event holds the wxTabCtrl, that sends the event > - */ > - void OnLeaveTabCtrl(wxMouseEvent& event); > -- // hack needed on wxMSW, because only focused windows get > mousewheel-events > -+ // hack needed on wxMSW, because only focused windows get mouse > wheel-events > - /** \brief Checks the old focus > - * > - * Checks whether the old focused window or one of it's > -@@ -276,7 +284,7 @@ class DLLIMPORT cbAuiNotebook : public wxAuiNotebook > - // needed for wxMSW-hack, see above > - /** \brief Last selected tab > - * > -- * Used to determine whether the tab-selection has changed btween > mouseenter > -+ * Used to determine whether the tab-selection has changed between > mouseenter > - * and mouseleave-event. > - */ > - int m_LastSelected; > -@@ -308,7 +316,7 @@ class DLLIMPORT cbAuiNotebook : public wxAuiNotebook > - * \param use If true tooltips are allowed > - */ > - static void UseToolTips(bool use = true); > -- /** \brief Enable or disable tab-scrolling with mousewheel > -+ /** \brief Enable or disable tab-scrolling with mouse wheel > - * > - * \param allow If true scrolling is allowed > - */ > -@@ -316,15 +324,15 @@ class DLLIMPORT cbAuiNotebook : public wxAuiNotebook > - /** \brief Sets the modifier keys for scrolling > - */ > - static void SetModKeys(wxString keys = _T("Strg")); > -- /** \brief Use modkey to advance through tabs with mousewheel > -+ /** \brief Use modkey to advance through tabs with mouse wheel > - */ > - static void UseModToAdvance(bool use = false); > -- /** \brief Change direction of tab-advancing with mousewheel > -+ /** \brief Change direction of tab-advancing with mouse wheel > - * > - * \param invert If true advance direction is inverted > - */ > - static void InvertAdvanceDirection(bool invert = false); > -- /** \brief Change direction of tab-moving with mousewheel > -+ /** \brief Change direction of tab-moving with mouse wheel > - * > - * \param invert If true move direction is inverted > - */ > -@@ -333,7 +341,7 @@ class DLLIMPORT cbAuiNotebook : public wxAuiNotebook > - /** \brief Enable or disable tab tooltips > - */ > - static bool s_UseTabTooltips; > -- /** \brief Enable or disable scrolling tabs with mousewheel > -+ /** \brief Enable or disable scrolling tabs with mouse wheel > - */ > - static bool s_AllowMousewheel; > - /** \brief Holds an array of all existing cbAuiNotebooks > -@@ -342,13 +350,13 @@ class DLLIMPORT cbAuiNotebook : public wxAuiNotebook > - /** \brief Holds the modifier keys for scrolling > - */ > - static wxString s_modKeys; > -- /** \brief Use modkey to advance through tabs with mousewheel > -+ /** \brief Use modkey to advance through tabs with mouse wheel > - */ > - static bool s_modToAdvance; > -- /** \brief Mousewheel move direction: negative => invert > -+ /** \brief Mouse wheel move direction: negative => invert > - */ > - static int s_moveDirection; > -- /** \brief Mouseweheel advance direction: negative => invert > -+ /** \brief Mouse wheel advance direction: negative => invert > - */ > - static int s_advanceDirection; > - > diff --git > devel/codeblocks/patches/patch-src_plugins_compilergcc_compilergcc_cpp > devel/codeblocks/patches/patch-src_plugins_compilergcc_compilergcc_cpp > index 1b72382cdd0..13cb357a103 100644 > --- devel/codeblocks/patches/patch-src_plugins_compilergcc_compilergcc_cpp > +++ devel/codeblocks/patches/patch-src_plugins_compilergcc_compilergcc_cpp > @@ -3,7 +3,7 @@ Always use cb_console_runner from installed PREFIX. > Index: src/plugins/compilergcc/compilergcc.cpp > --- src/plugins/compilergcc/compilergcc.cpp.orig > +++ src/plugins/compilergcc/compilergcc.cpp > -@@ -166,7 +166,7 @@ namespace > +@@ -167,7 +167,7 @@ namespace > { > PluginRegistrant<CompilerGCC> reg(_T("Compiler")); > > @@ -12,7 +12,7 @@ Index: src/plugins/compilergcc/compilergcc.cpp > static const wxString strSLASH(_T("/")); > static const wxString strSPACE(_T(" ")); > static const wxString strQUOTE(platform::windows ? _T("\"") : _T("'")); > -@@ -1855,8 +1855,7 @@ int CompilerGCC::RunSingleFile(const wxString& filenam > +@@ -1879,8 +1879,7 @@ int CompilerGCC::RunSingleFile(const wxString& filenam > > wxString baseDir = ConfigManager::GetExecutableFolder(); > wxString crunnStr = strQUOTE + baseDir + strSLASH + strCONSOLE_RUNNER + > strQUOTE; > @@ -22,7 +22,7 @@ Index: src/plugins/compilergcc/compilergcc.cpp > > if (!command.Replace(_T("$SCRIPT"), exe_filename)) > command << strQUOTE << exe_filename << strQUOTE; // if they didn't > specify $SCRIPT, append: > -@@ -1973,7 +1972,7 @@ int CompilerGCC::Run(ProjectBuildTarget* target) > +@@ -2033,7 +2032,7 @@ int CompilerGCC::Run(ProjectBuildTarget* target) > : EscapeSpaces(m_CdRun); > wxString crunnStr = platform::windows > ? strQUOTE + baseDir + strSLASH + strCONSOLE_RUNNER + > strQUOTE > @@ -31,7 +31,7 @@ Index: src/plugins/compilergcc/compilergcc.cpp > wxString hostapStr = platform::windows > ? strQUOTE + target->GetHostApplication() + strQUOTE > : EscapeSpaces(target->GetHostApplication()); > -@@ -2011,8 +2010,6 @@ int CompilerGCC::Run(ProjectBuildTarget* target) > +@@ -2071,8 +2070,6 @@ int CompilerGCC::Run(ProjectBuildTarget* target) > > if (target->GetUseConsoleRunner()) > { > @@ -40,7 +40,7 @@ Index: src/plugins/compilergcc/compilergcc.cpp > command << crunnStr << strSPACE; > > if (!platform::windows) > -@@ -2024,7 +2021,6 @@ int CompilerGCC::Run(ProjectBuildTarget* target) > +@@ -2084,7 +2081,6 @@ int CompilerGCC::Run(ProjectBuildTarget* target) > QuoteStringIfNeeded(strLinkerPath); > command << strLinkerPath << strSPACE; > } > diff --git > devel/codeblocks/patches/patch-src_plugins_contrib_dragscroll_dragscrollcfg_h > devel/codeblocks/patches/patch-src_plugins_contrib_dragscroll_dragscrollcfg_h > index 270dcab6c9e..16622191446 100644 > --- > devel/codeblocks/patches/patch-src_plugins_contrib_dragscroll_dragscrollcfg_h > +++ > devel/codeblocks/patches/patch-src_plugins_contrib_dragscroll_dragscrollcfg_h > @@ -3,7 +3,7 @@ Guard the trap with LOGGING > Index: src/plugins/contrib/dragscroll/dragscrollcfg.h > --- src/plugins/contrib/dragscroll/dragscrollcfg.h.orig > +++ src/plugins/contrib/dragscroll/dragscrollcfg.h > -@@ -35,7 +35,9 @@ class cbDragScrollCfg: public cbConfigurationPanel > +@@ -32,7 +32,9 @@ class cbDragScrollCfg: public cbConfigurationPanel > wxString GetBitmapBaseName() const; > void OnApply(); > void OnCancel(){} > diff --git devel/codeblocks/patches/patch-src_sdk_cbauibook_cpp > devel/codeblocks/patches/patch-src_sdk_cbauibook_cpp > deleted file mode 100644 > index 7776e62907f..00000000000 > --- devel/codeblocks/patches/patch-src_sdk_cbauibook_cpp > +++ /dev/null > @@ -1,36 +0,0 @@ > -r12841 | wh11204 | 2022-06-29 14:34:36 +0200 (Wed, 29 Jun 2022) | 4 lines > -* Fix compilation of wx3.1.6 and later with Clang (thanks AndrewCot). > -See > https://forums.codeblocks.org/index.php/topic,25004.msg170429.html#msg170429 > -Also fix some typos in documentation. > - > -r12842 | wh11204 | 2022-06-30 11:36:18 +0200 (Thu, 30 Jun 2022) | 3 lines > -- Complete previous commit, InsertPage() must be fixed too. > -It appeared in the diff, but I forgot about it when editing. > - > -Index: src/sdk/cbauibook.cpp > ---- src/sdk/cbauibook.cpp.orig > -+++ src/sdk/cbauibook.cpp > -@@ -500,7 +500,11 @@ bool cbAuiNotebook::MovePage(wxWindow* page, size_t ne > - bool cbAuiNotebook::AddPage(wxWindow* page, > - const wxString& caption, > - bool select, > -+#if wxCHECK_VERSION(3, 1, 6) > -+ const wxBitmapBundle& bitmap) > -+#else > - const wxBitmap& bitmap) > -+#endif > - { > - bool result = wxAuiNotebook::AddPage(page, caption, select, bitmap); > - MinimizeFreeSpace(); > -@@ -511,7 +515,11 @@ bool cbAuiNotebook::InsertPage(size_t page_idx, > - wxWindow* page, > - const wxString& caption, > - bool select, > -+#if wxCHECK_VERSION(3, 1, 6) > -+ const wxBitmapBundle& bitmap) > -+#else > - const wxBitmap& bitmap) > -+#endif > - { > - bool result = wxAuiNotebook::InsertPage(page_idx, page, caption, > select, bitmap); > - MinimizeFreeSpace(); > diff --git > devel/codeblocks/patches/patch-src_sdk_mozilla_chardet_include_nsprpub_pr_include_prcpucfg_linux_h > > devel/codeblocks/patches/patch-src_sdk_mozilla_chardet_include_nsprpub_pr_include_prcpucfg_linux_h > index 86ef37f5ae9..1fdf9d8b887 100644 > --- > devel/codeblocks/patches/patch-src_sdk_mozilla_chardet_include_nsprpub_pr_include_prcpucfg_linux_h > +++ > devel/codeblocks/patches/patch-src_sdk_mozilla_chardet_include_nsprpub_pr_include_prcpucfg_linux_h > @@ -1,8 +1,8 @@ > Index: src/sdk/mozilla_chardet/include/nsprpub/pr/include/prcpucfg_linux.h > --- src/sdk/mozilla_chardet/include/nsprpub/pr/include/prcpucfg_linux.h.orig > +++ src/sdk/mozilla_chardet/include/nsprpub/pr/include/prcpucfg_linux.h > -@@ -643,6 +643,52 @@ > - #define PR_BYTES_PER_WORD_LOG2 3 > +@@ -689,6 +689,52 @@ > + #define PR_BYTES_PER_WORD_LOG2 3 > #define PR_BYTES_PER_DWORD_LOG2 3 > > +#elif defined(__riscv) && __riscv_xlen == 64 > diff --git devel/codeblocks/pkg/DESCR devel/codeblocks/pkg/DESCR > old mode 100755 > new mode 100644 > diff --git devel/codeblocks/pkg/PLIST devel/codeblocks/pkg/PLIST > index 10a5f205503..efd783dbdc0 100644 > --- devel/codeblocks/pkg/PLIST > +++ devel/codeblocks/pkg/PLIST > @@ -353,6 +353,7 @@ lib/codeblocks/plugins/ > @so lib/codeblocks/plugins/libautosave.so > @so lib/codeblocks/plugins/libbyogames.so > @so lib/codeblocks/plugins/libcb_koders.so > +@so lib/codeblocks/plugins/libclangd_client.so > @so lib/codeblocks/plugins/libclasswizard.so > @so lib/codeblocks/plugins/libcodecompletion.so > @so lib/codeblocks/plugins/libcodesnippets.so > @@ -571,6 +572,19 @@ share/codeblocks/SpellChecker/64x64/es_ES.png > share/codeblocks/SpellChecker/64x64/fr_FR.png > share/codeblocks/SpellChecker/64x64/ru_RU.png > share/codeblocks/SpellChecker/OnlineSpellChecking.xml > +share/codeblocks/SpellChecker/svg/ > +share/codeblocks/SpellChecker/svg/de_AT.svg > +share/codeblocks/SpellChecker/svg/de_CH.svg > +share/codeblocks/SpellChecker/svg/de_DE.svg > +share/codeblocks/SpellChecker/svg/disabled.svg > +share/codeblocks/SpellChecker/svg/en_AU.svg > +share/codeblocks/SpellChecker/svg/en_CA.svg > +share/codeblocks/SpellChecker/svg/en_GB.svg > +share/codeblocks/SpellChecker/svg/en_NZ.svg > +share/codeblocks/SpellChecker/svg/en_US.svg > +share/codeblocks/SpellChecker/svg/es_ES.svg > +share/codeblocks/SpellChecker/svg/fr_FR.svg > +share/codeblocks/SpellChecker/svg/ru_RU.svg > share/codeblocks/SymTab.zip > share/codeblocks/ThreadSearch.zip > share/codeblocks/ToolsPlus.zip > @@ -579,6 +593,7 @@ share/codeblocks/abbreviations.zip > share/codeblocks/autosave.zip > share/codeblocks/byogames.zip > share/codeblocks/cb_koders.zip > +share/codeblocks/clangd_client.zip > share/codeblocks/classwizard.zip > share/codeblocks/codecompletion.zip > share/codeblocks/codesnippets.zip > @@ -592,6 +607,7 @@ share/codeblocks/compilers/compiler_bfin-elf-gcc.xml > share/codeblocks/compilers/compiler_clang.xml > share/codeblocks/compilers/compiler_dmc.xml > share/codeblocks/compilers/compiler_dmd.xml > +share/codeblocks/compilers/compiler_gcc-mingw32.xml > share/codeblocks/compilers/compiler_gcc-mingw64.xml > share/codeblocks/compilers/compiler_gcc-msys2-mingw32.xml > share/codeblocks/compilers/compiler_gcc-msys2-mingw64.xml > @@ -633,6 +649,7 @@ share/codeblocks/compilers/options_cygwin.xml > share/codeblocks/compilers/options_dmc.xml > share/codeblocks/compilers/options_dmd.xml > share/codeblocks/compilers/options_g95.xml > +share/codeblocks/compilers/options_gcc-mingw32.xml > share/codeblocks/compilers/options_gcc-mingw64.xml > share/codeblocks/compilers/options_gcc-msys2-mingw32.xml > share/codeblocks/compilers/options_gcc-msys2-mingw64.xml > @@ -652,6 +669,7 @@ share/codeblocks/compilers/options_lm32-gcc.xml > share/codeblocks/compilers/options_lm8-gcc.xml > share/codeblocks/compilers/options_msp430-gcc.xml > share/codeblocks/compilers/options_msvc10.xml > +share/codeblocks/compilers/options_msvc17.xml > share/codeblocks/compilers/options_msvc8.xml > share/codeblocks/compilers/options_msvctk.xml > share/codeblocks/compilers/options_mw.xml > @@ -693,16 +711,6 @@ share/codeblocks/icons/rc64.xpm > share/codeblocks/images/ > share/codeblocks/images/closebutton.png > share/codeblocks/images/codeblocks.png > -share/codeblocks/images/codesnippets/ > -share/codeblocks/images/codesnippets/allsnippets.png > -share/codeblocks/images/codesnippets/category.png > -share/codeblocks/images/codesnippets/findf.png > -share/codeblocks/images/codesnippets/findfdisabled.png > -share/codeblocks/images/codesnippets/options.png > -share/codeblocks/images/codesnippets/optionsdisabled.png > -share/codeblocks/images/codesnippets/snippet.png > -share/codeblocks/images/codesnippets/stop.png > -share/codeblocks/images/codesnippets/stopdisabled.png > share/codeblocks/images/compile.png > share/codeblocks/images/compilerun.png > share/codeblocks/images/folder.png > @@ -787,28 +795,42 @@ share/codeblocks/images/splash_0802.png > share/codeblocks/images/splash_1005.png > share/codeblocks/images/splash_1211.png > share/codeblocks/images/splash_1312.png > +share/codeblocks/images/splash_2003.png > +share/codeblocks/images/splash_2503.png > share/codeblocks/images/stop.png > share/codeblocks/images/wxsmith/ > share/codeblocks/images/wxsmith/Custom16.png > share/codeblocks/images/wxsmith/Custom32.png > share/codeblocks/images/wxsmith/Spacer16.png > share/codeblocks/images/wxsmith/Spacer32.png > +share/codeblocks/images/wxsmith/deletewidget.svg > share/codeblocks/images/wxsmith/deletewidget16.png > share/codeblocks/images/wxsmith/deletewidget32.png > +share/codeblocks/images/wxsmith/insertafter.svg > share/codeblocks/images/wxsmith/insertafter16.png > share/codeblocks/images/wxsmith/insertafter32.png > +share/codeblocks/images/wxsmith/insertafter_selected.svg > +share/codeblocks/images/wxsmith/insertbefore.svg > share/codeblocks/images/wxsmith/insertbefore16.png > share/codeblocks/images/wxsmith/insertbefore32.png > +share/codeblocks/images/wxsmith/insertbefore_selected.svg > +share/codeblocks/images/wxsmith/insertinto.svg > share/codeblocks/images/wxsmith/insertinto16.png > share/codeblocks/images/wxsmith/insertinto32.png > +share/codeblocks/images/wxsmith/insertinto_selected.svg > +share/codeblocks/images/wxsmith/insertpoint.svg > share/codeblocks/images/wxsmith/insertpoint16.png > share/codeblocks/images/wxsmith/insertpoint32.png > +share/codeblocks/images/wxsmith/insertpoint_selected.svg > +share/codeblocks/images/wxsmith/quickpropsclose.svg > share/codeblocks/images/wxsmith/quickpropsclose16.png > share/codeblocks/images/wxsmith/quickpropsclose32.png > +share/codeblocks/images/wxsmith/quickpropsopen.svg > share/codeblocks/images/wxsmith/quickpropsopen16.png > share/codeblocks/images/wxsmith/quickpropsopen32.png > share/codeblocks/images/wxsmith/selected16.png > share/codeblocks/images/wxsmith/selected32.png > +share/codeblocks/images/wxsmith/showpreview.svg > share/codeblocks/images/wxsmith/showpreview16.png > share/codeblocks/images/wxsmith/showpreview32.png > share/codeblocks/images/wxsmith/tools16.png > @@ -856,6 +878,8 @@ share/codeblocks/images/wxsmith/wxDirDialog16.png > share/codeblocks/images/wxsmith/wxDirDialog32.png > share/codeblocks/images/wxsmith/wxDirPickerCtrl16.png > share/codeblocks/images/wxsmith/wxDirPickerCtrl32.png > +share/codeblocks/images/wxsmith/wxEditableListBox16.png > +share/codeblocks/images/wxsmith/wxEditableListBox32.png > share/codeblocks/images/wxsmith/wxFileDialog16.png > share/codeblocks/images/wxsmith/wxFileDialog32.png > share/codeblocks/images/wxsmith/wxFilePickerCtrl16.png > @@ -1087,6 +1111,8 @@ share/codeblocks/lexers/lexer_pascal.xml > share/codeblocks/lexers/lexer_perl.sample > share/codeblocks/lexers/lexer_perl.xml > share/codeblocks/lexers/lexer_plain.xml > +share/codeblocks/lexers/lexer_po.sample > +share/codeblocks/lexers/lexer_po.xml > share/codeblocks/lexers/lexer_postscript.sample > share/codeblocks/lexers/lexer_postscript.xml > share/codeblocks/lexers/lexer_powershell.sample > @@ -1149,6 +1175,7 @@ share/codeblocks/scripts/tests/sdk_test.script > share/codeblocks/scripts/tests/test_base.script > share/codeblocks/scripts/tests/user_dialog_test_plugin.script > share/codeblocks/scripts/tests/wx_test.script > +share/codeblocks/scripts/tests/xml_test.script > share/codeblocks/scripts/wx_help.script > share/codeblocks/start_here.zip > share/codeblocks/templates/