diff options
Diffstat (limited to 'dev-util/codeblocks')
| -rw-r--r-- | dev-util/codeblocks/Manifest | 1 | ||||
| -rw-r--r-- | dev-util/codeblocks/codeblocks-25.03.ebuild | 111 | ||||
| -rw-r--r-- | dev-util/codeblocks/files/codeblocks-25.03_FortranProject-r386-autotools-build.patch | 340 | ||||
| -rw-r--r-- | dev-util/codeblocks/files/codeblocks-25.03_env.patch | 44 |
4 files changed, 496 insertions, 0 deletions
diff --git a/dev-util/codeblocks/Manifest b/dev-util/codeblocks/Manifest index d7981f24c296..3f0f89f21bf7 100644 --- a/dev-util/codeblocks/Manifest +++ b/dev-util/codeblocks/Manifest @@ -4,4 +4,5 @@ DIST codeblocks-20.03-fortran-update-v1.8.tar.xz 43672 BLAKE2B c30f64a7211debd72 DIST codeblocks-20.03-fortran.tar.xz 15828 BLAKE2B 3ad1be0ecdc61759edcbb12065a0d8065e5c4571bfdd99bcf6ad8cbda82f64def8ad7121770fe780c1837d06d58edb0209d2ab3b966ecd133c5d46f79c0cbb4e SHA512 06a9a87e560914ae49895843321c26581409e9213265d20476c9c4a8ad2dd9ff63cffdb416e7494bd74ce4a11578f11ef387dd851b1394a50baade8491caaa17 DIST codeblocks-20.03.tar.xz 11799264 BLAKE2B cdaca38e26e0f1bf12e774cf737e0b6647f070d07f0ca5bec97926528a3511ecb8b3306fb6af473729384a5fe22d4870db8ca988895d619a1e7e2a1d9de2a41f SHA512 f97c1a02d31f0be4dc08b1f19b57bd0d3cba375ab5f33ab91b2a2df7817018f5b3e3063ed07199a3970644f1caa7c7e511db2034c73264f5f4963046d65b0097 DIST codeblocks-20.03_p13518.tar.bz2 19779652 BLAKE2B cc445516ce92918dfac67b250e17a4d1f3aa0f86b58dfd701c723b1e4436bbcd7366754d64f75907680de65ce340d38b54c9bd48b31dc7078625186855d6b29a SHA512 2cdf52b04931f8ee788071579eed03b1737e05d890ec7bb9ed3458de770b86507cc276604740f9ea2b7928983a703eb4e4a8a97637e0dc267c9e8e49866f0430 +DIST codeblocks-25.03.tar.xz 17866880 BLAKE2B 7ce130d12a2f896252ab6747d222d9306448bf62288ee9d701d95731e1f858e067ce26237dbe0399ff1b22997a78dc41629c68abb74d2ec3e5dd4155b38ba46e SHA512 a5a7d6fd554dde781c5bd31c24f0f8a40c15d0525ecd66139e30709d72f46bee89fb75607c1ebc04d1473329add10bf7ee8c41ef2760a7e7bec221503b37efa1 DIST fortranproject_r378.tar.bz2 603873 BLAKE2B ed1fe94c591ec8ce1e5a844b3fa789f1bbecfade19a4ac1c3d17098da704b271be2e13d680e43050116d7117d40e117fa50d75ab5cc3ddd7223f46e1c2a162cd SHA512 fb4645f81b087d22e5735a33aded806595f96ccd1c2d32123a919c48de260ce2e1d96551fae0b65663902bc198a8f4ab158233b8755693df38315ea688cbaf92 diff --git a/dev-util/codeblocks/codeblocks-25.03.ebuild b/dev-util/codeblocks/codeblocks-25.03.ebuild new file mode 100644 index 000000000000..8c5f94554daa --- /dev/null +++ b/dev-util/codeblocks/codeblocks-25.03.ebuild @@ -0,0 +1,111 @@ +# Copyright 1999-2025 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +WX_GTK_VER="3.2-gtk3" + +inherit autotools flag-o-matic multiprocessing wxwidgets xdg + +REV=13518 +REV_DATE="2024-05-05 20:30:28" +FP_NAME=fortranproject +FP_REV=378 + +DESCRIPTION="The open source, cross platform, free C, C++ and Fortran IDE" +HOMEPAGE="https://www.codeblocks.org/" +SRC_URI="https://downloads.sourceforge.net/${PN}/${P/-/_}.tar.xz -> ${P}.tar.xz" +S="${WORKDIR}/${P/-/_}" + +LICENSE="GPL-3" +SLOT="0" +KEYWORDS="~amd64 ~x86" + +IUSE="fortran contrib debug" + +BDEPEND="virtual/pkgconfig" + +RDEPEND=" + app-arch/zip + dev-libs/glib:2 + >=dev-libs/tinyxml-2.6.2-r3 + >=dev-util/astyle-3.1-r2:0= + x11-libs/gtk+:3 + x11-libs/wxGTK:${WX_GTK_VER}[X] + contrib? ( + app-arch/bzip2 + app-text/hunspell:= + dev-libs/boost:= + media-libs/fontconfig + sys-libs/zlib + ) +" + +DEPEND=" + ${RDEPEND} + x11-base/xorg-proto +" + +PATCHES=( + "${FILESDIR}/${P}_env.patch" + "${FILESDIR}/${P}_FortranProject-r386-autotools-build.patch" +) + +src_prepare() { + default + + # Let's make the autorevision work. + echo "m4_define([SVN_REV], ${REV})" > revision.m4 + echo "m4_define([SVN_DATE], ${REV_DATE})" >> revision.m4 + + eautoreconf +} + +src_configure() { + # Bug 858338 + append-flags -fno-strict-aliasing + + setup-wxwidgets + + # USE="contrib -fortran" setup: + use fortran || CONF_WITH_LST=$(use_with contrib contrib-plugins all,-FortranProject) + # USE="contrib fortran" setup: + use fortran && CONF_WITH_LST=$(use_with contrib contrib-plugins all) + # USE="-contrib fortran" setup: + use contrib || CONF_WITH_LST=$(use_with fortran contrib-plugins FortranProject) + + local myeconfargs=( + --disable-pch + --disable-static + $(use_with contrib boost-libdir "${ESYSROOT}/usr/$(get_libdir)") + $(use_enable debug) + ${CONF_WITH_LST} + ) + + econf "${myeconfargs[@]}" +} + +src_compile() { + if use contrib; then + if (( $(get_makeopts_jobs) > 8 )); then + emake -j8 # Bug 930819 + else + emake + fi + else + emake + fi +} + +src_install() { + default + find "${ED}" -type f -name '*.la' -delete || die +} + +pkg_postinst() { + xdg_pkg_postinst +} + +pkg_postrm() { + xdg_pkg_postrm +} diff --git a/dev-util/codeblocks/files/codeblocks-25.03_FortranProject-r386-autotools-build.patch b/dev-util/codeblocks/files/codeblocks-25.03_FortranProject-r386-autotools-build.patch new file mode 100644 index 000000000000..3b8dd49efd7d --- /dev/null +++ b/dev-util/codeblocks/files/codeblocks-25.03_FortranProject-r386-autotools-build.patch @@ -0,0 +1,340 @@ +diff -Naur a/configure.ac b/configure.ac +--- a/configure.ac ++++ b/configure.ac +@@ -506,6 +506,29 @@ + src/plugins/contrib/EditorTweaks/Makefile + src/plugins/contrib/envvars/Makefile + src/plugins/contrib/FileManager/Makefile ++ src/plugins/contrib/FortranProject/Makefile ++ src/plugins/contrib/FortranProject/images/Makefile ++ src/plugins/contrib/FortranProject/images/16x16/Makefile ++ src/plugins/contrib/FortranProject/images/20x20/Makefile ++ src/plugins/contrib/FortranProject/images/24x24/Makefile ++ src/plugins/contrib/FortranProject/images/28x28/Makefile ++ src/plugins/contrib/FortranProject/images/32x32/Makefile ++ src/plugins/contrib/FortranProject/images/40x40/Makefile ++ src/plugins/contrib/FortranProject/images/48x48/Makefile ++ src/plugins/contrib/FortranProject/images/56x56/Makefile ++ src/plugins/contrib/FortranProject/images/64x64/Makefile ++ src/plugins/contrib/FortranProject/images/svg/Makefile ++ src/plugins/contrib/FortranProject/images/fortranproject/Makefile ++ src/plugins/contrib/FortranProject/images/fortranproject/16x16/Makefile ++ src/plugins/contrib/FortranProject/images/fortranproject/20x20/Makefile ++ src/plugins/contrib/FortranProject/images/fortranproject/24x24/Makefile ++ src/plugins/contrib/FortranProject/images/fortranproject/28x28/Makefile ++ src/plugins/contrib/FortranProject/images/fortranproject/32x32/Makefile ++ src/plugins/contrib/FortranProject/images/fortranproject/40x40/Makefile ++ src/plugins/contrib/FortranProject/images/fortranproject/48x48/Makefile ++ src/plugins/contrib/FortranProject/images/fortranproject/56x56/Makefile ++ src/plugins/contrib/FortranProject/images/fortranproject/64x64/Makefile ++ src/plugins/contrib/FortranProject/images/fortranproject/svg/Makefile + src/plugins/contrib/headerfixup/Makefile + src/plugins/contrib/help_plugin/Makefile + src/plugins/contrib/help_plugin/bzip2/Makefile +diff -Naur a/m4/acinclude.m4 b/m4/acinclude.m4 +--- a/m4/acinclude.m4 ++++ b/m4/acinclude.m4 +@@ -364,6 +364,7 @@ + AM_CONDITIONAL([BUILD_EDITORTWEAKS], [false]) + AM_CONDITIONAL([BUILD_ENVVARS], [false]) + AM_CONDITIONAL([BUILD_FILEMANAGER], [false]) ++ AM_CONDITIONAL([BUILD_FORTRANPROJECT], [false]) + AM_CONDITIONAL([BUILD_HEADERFIXUP], [false]) + AM_CONDITIONAL([BUILD_HELP], [false]) + AM_CONDITIONAL([BUILD_KEYBINDER], [false]) +@@ -408,6 +409,7 @@ + AM_CONDITIONAL([BUILD_EDITORTWEAKS], [true]) + AM_CONDITIONAL([BUILD_ENVVARS], [true]) + AM_CONDITIONAL([BUILD_FILEMANAGER], [true]) ++ AM_CONDITIONAL([BUILD_FORTRANPROJECT], [true]) + AM_CONDITIONAL([BUILD_HEADERFIXUP], [true]) + AM_CONDITIONAL([BUILD_HELP], [true]) + AM_CONDITIONAL([BUILD_KEYBINDER], [true]) +@@ -450,7 +452,7 @@ + [ compiles none of the contrib-plugins ] + [ Plugin names are: AutoVersioning, BrowseTracker, byogames, Cccc, CppCheck, cbkoders, codesnippets, ] + [ codestat, copystrings, Cscope, DoxyBlocks, dragscroll, EditorConfig, EditorTweaks, envvars, exporter, ] +- [ FileManager, headerfixup, help, hexeditor, incsearch, keybinder, libfinder, MouseSap, ] ++ [ FileManager, FortranProject, headerfixup, help, hexeditor, incsearch, keybinder, libfinder, MouseSap, ] + [ NassiShneiderman, ProjectOptionsManipulator, profiler, regex, ReopenEditor, rndgen, clangd_client, smartindent, spellchecker, ] + [ symtab, ThreadSearch, ToolsPlus, Valgrind, wxcontrib, wxsmith, wxsmithcontrib, wxsmithaui ], + plugins="$withval", plugins="none") +@@ -504,6 +506,9 @@ + FileManager) + AM_CONDITIONAL([BUILD_FILEMANAGER], [true]) + ;; ++ FortranProject) ++ AM_CONDITIONAL([BUILD_FORTRANPROJECT], [true]) ++ ;; + headerfixup) + AM_CONDITIONAL([BUILD_HEADERFIXUP], [true]) + ;; +@@ -627,6 +632,9 @@ + -FileManager) + AM_CONDITIONAL([BUILD_FILEMANAGER], [false]) + ;; ++ -FortranProject) ++ AM_CONDITIONAL([BUILD_FORTRANPROJECT], [false]) ++ ;; + -headerfixup) + AM_CONDITIONAL([BUILD_HEADERFIXUP], [false]) + ;; +@@ -735,6 +743,7 @@ + AC_SUBST(BUILD_EDITORTWEAKS) + AC_SUBST(BUILD_ENVVARS) + AC_SUBST(BUILD_FILEMANAGER) ++AC_SUBST(BUILD_FORTRANPROJECT) + AC_SUBST(BUILD_HEADERFIXUP) + AC_SUBST(BUILD_HELP) + AC_SUBST(BUILD_HEXEDITOR) +diff -Naur a/src/plugins/contrib/FortranProject/Makefile.am b/src/plugins/contrib/FortranProject/Makefile.am +--- a/src/plugins/contrib/FortranProject/Makefile.am ++++ b/src/plugins/contrib/FortranProject/Makefile.am +@@ -1,16 +1,18 @@ + SUBDIRS = images + +-ACLOCAL_AMFLAGS = --install -I m4 +- + AM_CPPFLAGS = $(WX_CXXFLAGS) \ + -I$(top_srcdir)/src/include \ + -I$(top_srcdir)/src/sdk/wxscintilla/include + +-cb_plugin_lib_LTLIBRARIES = libFortranProject.la ++pluginlibdir = $(pkglibdir)/plugins ++ ++pluginlib_LTLIBRARIES = libFortranProject.la + +-libFortranProject_la_LDFLAGS = -shared -no-undefined -avoid-version ++libFortranProject_la_LDFLAGS = @MODULE_SHARED_LDFLAGS@ -version-info 0:1:0 -no-undefined -avoid-version + +-libFortranProject_la_LIBADD = $(WX_LIBS) ++libFortranProject_la_LIBADD = ../../../sdk/libcodeblocks.la \ ++ $(WX_LIBS) \ ++ $(CB_TINYXML_LIBS) + + libFortranProject_la_SOURCES = adddirparserthread.cpp \ + autoinsert.cpp \ +@@ -139,12 +141,9 @@ + images/fortranproject/64x64/*.png \ + images/fortranproject/svg/*.svg + +-cb_plugin_data_DATA = FortranProject.zip +- +-CLEANFILES = $(cb_plugin_data_DATA) ++pkgdata_DATA = FortranProject.zip + +-uninstall-hook: +- -rmdir ${cb_plugin_datadir}images/fortranproject ++CLEANFILES = $(pkgdata_DATA) + + FortranProject.zip: manifest.xml + PWD=`pwd` cd $(srcdir) && zip -j9 $(PWD)/FortranProject.zip manifest.xml resources/*.xrc > /dev/null +diff -Naur a/src/plugins/contrib/FortranProject/images/16x16/Makefile.am b/src/plugins/contrib/FortranProject/images/16x16/Makefile.am +--- a/src/plugins/contrib/FortranProject/images/16x16/Makefile.am ++++ b/src/plugins/contrib/FortranProject/images/16x16/Makefile.am +@@ -1,3 +1,3 @@ +-pkgdatadir = $(cb_plugin_datadir)/images/16x16 ++pkgdatadir = $(datadir)/@PACKAGE@/images/16x16 + + dist_pkgdata_DATA = $(srcdir)/*.png +diff -Naur a/src/plugins/contrib/FortranProject/images/20x20/Makefile.am b/src/plugins/contrib/FortranProject/images/20x20/Makefile.am +--- a/src/plugins/contrib/FortranProject/images/20x20/Makefile.am ++++ b/src/plugins/contrib/FortranProject/images/20x20/Makefile.am +@@ -1,3 +1,3 @@ +-pkgdatadir = $(cb_plugin_datadir)/images/20x20 ++pkgdatadir = $(datadir)/@PACKAGE@/images/20x20 + + dist_pkgdata_DATA = $(srcdir)/*.png +diff -Naur a/src/plugins/contrib/FortranProject/images/24x24/Makefile.am b/src/plugins/contrib/FortranProject/images/24x24/Makefile.am +--- a/src/plugins/contrib/FortranProject/images/24x24/Makefile.am ++++ b/src/plugins/contrib/FortranProject/images/24x24/Makefile.am +@@ -1,3 +1,3 @@ +-pkgdatadir = $(cb_plugin_datadir)/images/24x24 ++pkgdatadir = $(datadir)/@PACKAGE@/images/24x24 + + dist_pkgdata_DATA = $(srcdir)/*.png +diff -Naur a/src/plugins/contrib/FortranProject/images/28x28/Makefile.am b/src/plugins/contrib/FortranProject/images/28x28/Makefile.am +--- a/src/plugins/contrib/FortranProject/images/28x28/Makefile.am ++++ b/src/plugins/contrib/FortranProject/images/28x28/Makefile.am +@@ -1,3 +1,3 @@ +-pkgdatadir = $(cb_plugin_datadir)/images/28x28 ++pkgdatadir = $(datadir)/@PACKAGE@/images/28x28 + + dist_pkgdata_DATA = $(srcdir)/*.png +diff -Naur a/src/plugins/contrib/FortranProject/images/32x32/Makefile.am b/src/plugins/contrib/FortranProject/images/32x32/Makefile.am +--- a/src/plugins/contrib/FortranProject/images/32x32/Makefile.am ++++ b/src/plugins/contrib/FortranProject/images/32x32/Makefile.am +@@ -1,3 +1,3 @@ +-pkgdatadir = $(cb_plugin_datadir)/images/32x32 ++pkgdatadir = $(datadir)/@PACKAGE@/images/32x32 + + dist_pkgdata_DATA = $(srcdir)/*.png +diff -Naur a/src/plugins/contrib/FortranProject/images/40x40/Makefile.am b/src/plugins/contrib/FortranProject/images/40x40/Makefile.am +--- a/src/plugins/contrib/FortranProject/images/40x40/Makefile.am ++++ b/src/plugins/contrib/FortranProject/images/40x40/Makefile.am +@@ -1,3 +1,3 @@ +-pkgdatadir = $(cb_plugin_datadir)/images/40x40 ++pkgdatadir = $(datadir)/@PACKAGE@/images/40x40 + + dist_pkgdata_DATA = $(srcdir)/*.png +diff -Naur a/src/plugins/contrib/FortranProject/images/48x48/Makefile.am b/src/plugins/contrib/FortranProject/images/48x48/Makefile.am +--- a/src/plugins/contrib/FortranProject/images/48x48/Makefile.am ++++ b/src/plugins/contrib/FortranProject/images/48x48/Makefile.am +@@ -1,3 +1,3 @@ +-pkgdatadir = $(cb_plugin_datadir)/images/48x48 ++pkgdatadir = $(datadir)/@PACKAGE@/images/48x48 + + dist_pkgdata_DATA = $(srcdir)/*.png +diff -Naur a/src/plugins/contrib/FortranProject/images/56x56/Makefile.am b/src/plugins/contrib/FortranProject/images/56x56/Makefile.am +--- a/src/plugins/contrib/FortranProject/images/56x56/Makefile.am ++++ b/src/plugins/contrib/FortranProject/images/56x56/Makefile.am +@@ -1,3 +1,3 @@ +-pkgdatadir = $(cb_plugin_datadir)/images/56x56 ++pkgdatadir = $(datadir)/@PACKAGE@/images/56x56 + + dist_pkgdata_DATA = $(srcdir)/*.png +diff -Naur a/src/plugins/contrib/FortranProject/images/64x64/Makefile.am b/src/plugins/contrib/FortranProject/images/64x64/Makefile.am +--- a/src/plugins/contrib/FortranProject/images/64x64/Makefile.am ++++ b/src/plugins/contrib/FortranProject/images/64x64/Makefile.am +@@ -1,3 +1,3 @@ +-pkgdatadir = $(cb_plugin_datadir)/images/64x64 ++pkgdatadir = $(datadir)/@PACKAGE@/images/64x64 + + dist_pkgdata_DATA = $(srcdir)/*.png +diff -Naur a/src/plugins/contrib/FortranProject/images/Makefile.am b/src/plugins/contrib/FortranProject/images/Makefile.am +--- a/src/plugins/contrib/FortranProject/images/Makefile.am ++++ b/src/plugins/contrib/FortranProject/images/Makefile.am +@@ -1,4 +1,3 @@ + SUBDIRS = 16x16 20x20 24x24 28x28 32x32 40x40 48x48 56x56 64x64 fortranproject svg + +-pkgdatadir = $(cb_plugin_datadir)/images +- ++pkgdatadir = $(datadir)/@PACKAGE@/images +diff -Naur a/src/plugins/contrib/FortranProject/images/fortranproject/16x16/Makefile.am b/src/plugins/contrib/FortranProject/images/fortranproject/16x16/Makefile.am +--- a/src/plugins/contrib/FortranProject/images/fortranproject/16x16/Makefile.am ++++ b/src/plugins/contrib/FortranProject/images/fortranproject/16x16/Makefile.am +@@ -1,3 +1,3 @@ +-pkgdatadir = $(cb_plugin_datadir)/images/fortranproject/16x16 ++pkgdatadir = $(datadir)/@PACKAGE@/images/fortranproject/16x16 + + dist_pkgdata_DATA = $(srcdir)/*.png +diff -Naur a/src/plugins/contrib/FortranProject/images/fortranproject/20x20/Makefile.am b/src/plugins/contrib/FortranProject/images/fortranproject/20x20/Makefile.am +--- a/src/plugins/contrib/FortranProject/images/fortranproject/20x20/Makefile.am ++++ b/src/plugins/contrib/FortranProject/images/fortranproject/20x20/Makefile.am +@@ -1,3 +1,3 @@ +-pkgdatadir = $(cb_plugin_datadir)/images/fortranproject/20x20 ++pkgdatadir = $(datadir)/@PACKAGE@/images/fortranproject/20x20 + + dist_pkgdata_DATA = $(srcdir)/*.png +diff -Naur a/src/plugins/contrib/FortranProject/images/fortranproject/24x24/Makefile.am b/src/plugins/contrib/FortranProject/images/fortranproject/24x24/Makefile.am +--- a/src/plugins/contrib/FortranProject/images/fortranproject/24x24/Makefile.am ++++ b/src/plugins/contrib/FortranProject/images/fortranproject/24x24/Makefile.am +@@ -1,3 +1,3 @@ +-pkgdatadir = $(cb_plugin_datadir)/images/fortranproject/24x24 ++pkgdatadir = $(datadir)/@PACKAGE@/images/fortranproject/24x24 + + dist_pkgdata_DATA = $(srcdir)/*.png +diff -Naur a/src/plugins/contrib/FortranProject/images/fortranproject/28x28/Makefile.am b/src/plugins/contrib/FortranProject/images/fortranproject/28x28/Makefile.am +--- a/src/plugins/contrib/FortranProject/images/fortranproject/28x28/Makefile.am ++++ b/src/plugins/contrib/FortranProject/images/fortranproject/28x28/Makefile.am +@@ -1,3 +1,3 @@ +-pkgdatadir = $(cb_plugin_datadir)/images/fortranproject/28x28 ++pkgdatadir = $(datadir)/@PACKAGE@/images/fortranproject/28x28 + + dist_pkgdata_DATA = $(srcdir)/*.png +diff -Naur a/src/plugins/contrib/FortranProject/images/fortranproject/32x32/Makefile.am b/src/plugins/contrib/FortranProject/images/fortranproject/32x32/Makefile.am +--- a/src/plugins/contrib/FortranProject/images/fortranproject/32x32/Makefile.am ++++ b/src/plugins/contrib/FortranProject/images/fortranproject/32x32/Makefile.am +@@ -1,3 +1,3 @@ +-pkgdatadir = $(cb_plugin_datadir)/images/fortranproject/32x32 ++pkgdatadir = $(datadir)/@PACKAGE@/images/fortranproject/32x32 + + dist_pkgdata_DATA = $(srcdir)/*.png +diff -Naur a/src/plugins/contrib/FortranProject/images/fortranproject/40x40/Makefile.am b/src/plugins/contrib/FortranProject/images/fortranproject/40x40/Makefile.am +--- a/src/plugins/contrib/FortranProject/images/fortranproject/40x40/Makefile.am ++++ b/src/plugins/contrib/FortranProject/images/fortranproject/40x40/Makefile.am +@@ -1,3 +1,3 @@ +-pkgdatadir = $(cb_plugin_datadir)/images/fortranproject/40x40 ++pkgdatadir = $(datadir)/@PACKAGE@/images/fortranproject/40x40 + + dist_pkgdata_DATA = $(srcdir)/*.png +diff -Naur a/src/plugins/contrib/FortranProject/images/fortranproject/48x48/Makefile.am b/src/plugins/contrib/FortranProject/images/fortranproject/48x48/Makefile.am +--- a/src/plugins/contrib/FortranProject/images/fortranproject/48x48/Makefile.am ++++ b/src/plugins/contrib/FortranProject/images/fortranproject/48x48/Makefile.am +@@ -1,3 +1,3 @@ +-pkgdatadir = $(cb_plugin_datadir)/images/fortranproject/48x48 ++pkgdatadir = $(datadir)/@PACKAGE@/images/fortranproject/48x48 + + dist_pkgdata_DATA = $(srcdir)/*.png +diff -Naur a/src/plugins/contrib/FortranProject/images/fortranproject/56x56/Makefile.am b/src/plugins/contrib/FortranProject/images/fortranproject/56x56/Makefile.am +--- a/src/plugins/contrib/FortranProject/images/fortranproject/56x56/Makefile.am ++++ b/src/plugins/contrib/FortranProject/images/fortranproject/56x56/Makefile.am +@@ -1,3 +1,3 @@ +-pkgdatadir = $(cb_plugin_datadir)/images/fortranproject/56x56 ++pkgdatadir = $(datadir)/@PACKAGE@/images/fortranproject/56x56 + + dist_pkgdata_DATA = $(srcdir)/*.png +diff -Naur a/src/plugins/contrib/FortranProject/images/fortranproject/64x64/Makefile.am b/src/plugins/contrib/FortranProject/images/fortranproject/64x64/Makefile.am +--- a/src/plugins/contrib/FortranProject/images/fortranproject/64x64/Makefile.am ++++ b/src/plugins/contrib/FortranProject/images/fortranproject/64x64/Makefile.am +@@ -1,3 +1,3 @@ +-pkgdatadir = $(cb_plugin_datadir)/images/fortranproject/64x64 ++pkgdatadir = $(datadir)/@PACKAGE@/images/fortranproject/64x64 + + dist_pkgdata_DATA = $(srcdir)/*.png +diff -Naur a/src/plugins/contrib/FortranProject/images/fortranproject/Makefile.am b/src/plugins/contrib/FortranProject/images/fortranproject/Makefile.am +--- a/src/plugins/contrib/FortranProject/images/fortranproject/Makefile.am ++++ b/src/plugins/contrib/FortranProject/images/fortranproject/Makefile.am +@@ -1,5 +1,5 @@ + SUBDIRS = 16x16 20x20 24x24 28x28 32x32 40x40 48x48 56x56 64x64 svg + +-pkgdatadir = $(cb_plugin_datadir)/images/fortranproject ++pkgdatadir = $(datadir)/@PACKAGE@/images/fortranproject + + dist_pkgdata_DATA = $(srcdir)/*.f90 $(srcdir)/*.py $(srcdir)/*.dem +diff -Naur a/src/plugins/contrib/FortranProject/images/fortranproject/svg/Makefile.am b/src/plugins/contrib/FortranProject/images/fortranproject/svg/Makefile.am +--- a/src/plugins/contrib/FortranProject/images/fortranproject/svg/Makefile.am ++++ b/src/plugins/contrib/FortranProject/images/fortranproject/svg/Makefile.am +@@ -1,3 +1,3 @@ +-pkgdatadir = $(cb_plugin_datadir)/images/fortranproject/svg ++pkgdatadir = $(datadir)/@PACKAGE@/images/fortranproject/svg + + dist_pkgdata_DATA = $(srcdir)/*.svg +diff -Naur a/src/plugins/contrib/FortranProject/images/svg/Makefile.am b/src/plugins/contrib/FortranProject/images/svg/Makefile.am +--- a/src/plugins/contrib/FortranProject/images/svg/Makefile.am ++++ b/src/plugins/contrib/FortranProject/images/svg/Makefile.am +@@ -1,3 +1,3 @@ +-pkgdatadir = $(cb_plugin_datadir)/images/svg ++pkgdatadir = $(datadir)/@PACKAGE@/images/svg + + dist_pkgdata_DATA = $(srcdir)/*.svg +diff -Naur a/src/plugins/contrib/Makefile.am b/src/plugins/contrib/Makefile.am +--- a/src/plugins/contrib/Makefile.am ++++ b/src/plugins/contrib/Makefile.am +@@ -54,6 +54,10 @@ + MAYBE_FILEMANAGER=FileManager appdata + endif + ++if BUILD_FORTRANPROJECT ++MAYBE_FORTRANPROJECT=FortranProject appdata ++endif ++ + if BUILD_HELP + MAYBE_HELP=help_plugin appdata + endif +@@ -178,6 +182,7 @@ + $(MAYBE_EDITORTWEAKS) \ + $(MAYBE_ENVVARS) \ + $(MAYBE_FILEMANAGER) \ ++ $(MAYBE_FORTRANPROJECT) \ + $(MAYBE_HEADERFIXUP) \ + $(MAYBE_HELP) \ + $(MAYBE_HEXEDITOR) \ +@@ -222,6 +227,7 @@ + EditorTweaks \ + envvars \ + FileManager \ ++ FortranProject \ + headerfixup \ + help_plugin \ + HexEditor \ diff --git a/dev-util/codeblocks/files/codeblocks-25.03_env.patch b/dev-util/codeblocks/files/codeblocks-25.03_env.patch new file mode 100644 index 000000000000..cb2ee41e9f4b --- /dev/null +++ b/dev-util/codeblocks/files/codeblocks-25.03_env.patch @@ -0,0 +1,44 @@ +# Remove adding of "-g" to CFLAGS and CXXFLAGS if "./configure --enable-debug" +diff -Naur old/m4/acinclude.m4 new/m4/acinclude.m4 +--- old/m4/acinclude.m4 ++++ new/m4/acinclude.m4 +@@ -91,8 +91,6 @@ + AC_ARG_ENABLE(debug, [AC_HELP_STRING([--enable-debug], [turn on debugging (default is OFF)])],, + enable_debug=$debug_default) + if test "x$enable_debug" = "xyes"; then +- CFLAGS="-g $CFLAGS" +- CXXFLAGS="-g $CXXFLAGS" + CPPFLAGS="-DDEBUG -DcbDEBUG $CPPFLAGS" + AC_MSG_RESULT(yes) + else +diff -Naur a/m4/acinclude.m4 b/m4/acinclude.m4 +--- a/m4/acinclude.m4 ++++ b/m4/acinclude.m4 +@@ -211,7 +211,7 @@ + fi + + AC_MSG_CHECKING(whether to build the displayevents plugin) +-dsplayevents_default="yes" ++displayevents_default="yes" + AC_ARG_ENABLE(displayevents, [AC_HELP_STRING([--enable-displayevents], [build the displayevents plugin (default YES)])],, + enable_displayevents=$displayevents_default) + AM_CONDITIONAL([BUILD_DISPLAYEVENTS], [test "x$enable_displayevents" = "xyes"]) +diff -Naur a/src/plugins/displayevents/Makefile.am b/src/plugins/displayevents/Makefile.am +--- a/src/plugins/displayevents/Makefile.am ++++ b/src/plugins/displayevents/Makefile.am +@@ -8,7 +8,7 @@ + libDisplayEvents_la_LDFLAGS = -module -version-info 0:1:0 -shared -no-undefined -avoid-version + + libDisplayEvents_la_LIBADD = $(PLUGIN_WX_LIBS) \ +- ../../../sdk/libcodeblocks.la ++ ../../sdk/libcodeblocks.la + + libDisplayEvents_la_SOURCES = DisplayEvents.cpp + +@@ -21,5 +21,5 @@ + + CLEANFILES = $(pkgdata_DATA) + +-IncrementalSearch.zip: manifest.xml ++DisplayEvents.zip: manifest.xml + PWD=`pwd` cd $(srcdir) && zip -R $(PWD)/DisplayEvents.zip manifest.xml > /dev/null |
