* [gentoo-commits] repo/gentoo:master commit in: dev-util/codeblocks/, dev-util/codeblocks/files/
@ 2018-04-14 16:11 Pacho Ramos
0 siblings, 0 replies; 6+ messages in thread
From: Pacho Ramos @ 2018-04-14 16:11 UTC (permalink / raw
To: gentoo-commits
commit: 1ffb32396837505f577b5b18e0cb9e6d74bbc4b1
Author: Peter Levine <plevine457 <AT> gmail <DOT> com>
AuthorDate: Sat Mar 24 22:04:04 2018 +0000
Commit: Pacho Ramos <pacho <AT> gentoo <DOT> org>
CommitDate: Sat Apr 14 16:08:03 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1ffb3239
dev-util/codeblocks: Fix building with GCC-7
Bug: https://bugs.gentoo.org/649248
Package-Manager: Portage-2.3.16, Repoman-2.3.6
Closes: https://bugs.gentoo.org/649248
Closes: https://bugs.gentoo.org/637126
Closes: https://github.com/gentoo/gentoo/pull/7600
dev-util/codeblocks/codeblocks-16.01.ebuild | 4 ++-
.../codeblocks/files/codeblocks-16.01-gcc7.patch | 30 ++++++++++++++++++++++
2 files changed, 33 insertions(+), 1 deletion(-)
diff --git a/dev-util/codeblocks/codeblocks-16.01.ebuild b/dev-util/codeblocks/codeblocks-16.01.ebuild
index 047fa097585..07a042e6263 100644
--- a/dev-util/codeblocks/codeblocks-16.01.ebuild
+++ b/dev-util/codeblocks/codeblocks-16.01.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -28,6 +28,8 @@ RDEPEND="app-arch/zip
DEPEND="${RDEPEND}
virtual/pkgconfig"
+PATCHES=( "${FILESDIR}"/${P}-gcc7.patch )
+
src_configure() {
touch "${S}"/revision.m4 -r "${S}"/acinclude.m4
setup-wxwidgets
diff --git a/dev-util/codeblocks/files/codeblocks-16.01-gcc7.patch b/dev-util/codeblocks/files/codeblocks-16.01-gcc7.patch
new file mode 100644
index 00000000000..84cbc88696c
--- /dev/null
+++ b/dev-util/codeblocks/files/codeblocks-16.01-gcc7.patch
@@ -0,0 +1,30 @@
+Bug: https://bugs.gentoo.org/649248
+SVN Revision: https://sourceforge.net/p/codeblocks/code/11006
+GIT Commit: https://github.com/jenslody/codeblocks/commit/1fd6799ded8475fafaca17de9c23db767177d31b
+
+From 1fd6799ded8475fafaca17de9c23db767177d31b Mon Sep 17 00:00:00 2001
+From: jenslody <jenslody@2a5c6006-c6dd-42ca-98ab-0921f2732cef>
+Date: Fri, 10 Feb 2017 20:56:25 +0000
+Subject: [PATCH] gcc7 build-fix: avoid template-related error
+
+---
+ src/include/scripting/sqplus/sqplus.h | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/src/include/scripting/sqplus/sqplus.h b/src/include/scripting/sqplus/sqplus.h
+index 73f37b24f..ae7d3c75f 100644
+--- a/src/include/scripting/sqplus/sqplus.h
++++ b/src/include/scripting/sqplus/sqplus.h
+@@ -154,10 +154,10 @@ struct ScriptStringVar : ScriptStringVarBase {
+ return safeStringCopy(s,_s.s,MaxLength);
+ }
+ bool operator == (const ScriptStringVar & _s) {
+- return _strcmp(s,_s.s) == 0;
++ return strcmp(s,_s.s) == 0;
+ }
+ bool compareCaseInsensitive(const ScriptStringVar & _s) {
+- return _stricmp(s,_s.s) == 0;
++ return strcasecmp(s,_s.s) == 0;
+ }
+ };
+
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-util/codeblocks/, dev-util/codeblocks/files/
@ 2018-05-05 20:10 Mart Raudsepp
0 siblings, 0 replies; 6+ messages in thread
From: Mart Raudsepp @ 2018-05-05 20:10 UTC (permalink / raw
To: gentoo-commits
commit: be84553eb924219ec51e6fefb62f937a3f4eb697
Author: band-a-prend <torokhov-s-a <AT> yandex <DOT> ru>
AuthorDate: Fri Apr 27 00:45:56 2018 +0000
Commit: Mart Raudsepp <leio <AT> gentoo <DOT> org>
CommitDate: Sat May 5 20:09:09 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=be84553e
dev-util/codeblocks: version bump to 17.12
Code::Blocks IDE package version bump to 17.12 with
switching 'WX_GTK_VER' from x11-libs/wxGTK:2.8 to x11-libs/wxGTK:3.0
This also adds a new USE flag 'fortran' which controls the
building of 'FortranProject plugin' for Code::Blocks IDE
( https://sourceforge.net/projects/fortranproject/ )
after applying of 'FortranProject_autotools_build.diff' patch.
Add patch 'FortranProject_fix_build_gcc7_failed.patch'
from upstream that fix gcc7 compilation error
"call of overloaded ‘abs(unsigned int)’ is ambiguous"
for FortranProject plugin, i.e. when USE="fortran".
Remove USE=flag "static" with passing "--disable-static"
to econf within src_configure() section.
Remove directly passing "-g" compiler option to CFLAGS
and CXXFLAGS when USE="debug" by applying the patch
'codeblocks-17.12-nodebug.diff'.
Updating 'metadata.xml' file:
Adding 'fortran' USE-flag description for 'dev-util/codeblocks-17.12'.
Updating 'Manifest' file:
Adding size, blake2 and sha512 checksums for 'codeblocks_17.12.tar.xz' tarball
Bug: https://bugs.gentoo.org/643494
Closes: https://bugs.gentoo.org/643494
dev-util/codeblocks/Manifest | 2 +
dev-util/codeblocks/codeblocks-17.12.ebuild | 85 ++++++++++++++++++++++
.../codeblocks/files/codeblocks-17.12-nodebug.diff | 13 ++++
dev-util/codeblocks/metadata.xml | 1 +
4 files changed, 101 insertions(+)
diff --git a/dev-util/codeblocks/Manifest b/dev-util/codeblocks/Manifest
index 51d11daf5cd..4c4d964fdb7 100644
--- a/dev-util/codeblocks/Manifest
+++ b/dev-util/codeblocks/Manifest
@@ -1 +1,3 @@
+DIST codeblocks-17.12-fortran.tar.xz 3048 BLAKE2B 58fd3b95cea3303a41da31f5cffe08698fa51ff896c456224edd63d17ddfe8dd54b0c058bd2a68920cf15789bfe5e412054e4e603b1d644034d8cb43d3de3224 SHA512 78534706b6433ae93b680740b2e6c0b747119f6ac62477b901ceeb1900692465615e29f2837ceca48d127181fc6b653d6d49a85fdb8d2fb873ad5a915527936c
DIST codeblocks_16.01.tar.gz 20250097 BLAKE2B 7d3ede49b38ee3c58be30435d39ece38fd4f043a9b1cf0a3f53685ad93789ce650b5d8837f6f29f7bd73e150b527784321f7dcd3d94a767d80a8a3d4350e5905 SHA512 496ff2dbcf9a8248fa9f1060d50567d1fc6480cc9d8fc9f7d2cd532c82f4344deafe9b43f2b17d2510c74851e21acf2ca90d5cc7b61237d69a17e78e9907a63a
+DIST codeblocks_17.12.tar.xz 15725976 BLAKE2B 871427b5d8a2296e04d640c35d9129deebf1bb35cd1573652099c02ad4495c4c1369ed382ba714848d6bd75304195a25f6a91bece398bedaffbee8ae3547c46b SHA512 f90e756ca6f532656eeed34c6259c6a96ae85d172fc11e39f696ded9189cab7171d0cead18524fbab50dd782f21adbc7d52e2ea90535a3ed0aef5946b8a476e1
diff --git a/dev-util/codeblocks/codeblocks-17.12.ebuild b/dev-util/codeblocks/codeblocks-17.12.ebuild
new file mode 100644
index 00000000000..030721ae5bf
--- /dev/null
+++ b/dev-util/codeblocks/codeblocks-17.12.ebuild
@@ -0,0 +1,85 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+WX_GTK_VER="3.0"
+
+inherit autotools flag-o-matic gnome2-utils wxwidgets xdg-utils
+
+DESCRIPTION="The open source, cross platform, free C++ IDE"
+HOMEPAGE="http://www.codeblocks.org/"
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~ppc ~x86 ~x86-fbsd"
+SRC_URI="mirror://sourceforge/${PN}/${P/-/_}.tar.xz https://dev.gentoo.org/~leio/distfiles/${P}-fortran.tar.xz"
+
+# USE="fortran" enables FortranProject plugin (v1.5)
+# that is delivered with Code::Blocks 17.12 source code.
+# https://sourceforge.net/projects/fortranproject
+# http://cbfortran.sourceforge.net
+
+IUSE="contrib debug fortran pch"
+
+RDEPEND="app-arch/zip
+ x11-libs/wxGTK:${WX_GTK_VER}[X]
+ contrib? (
+ app-text/hunspell
+ dev-libs/boost:=
+ dev-libs/libgamin
+ )"
+
+DEPEND="${RDEPEND}
+ sys-devel/autoconf:2.69
+ sys-devel/automake
+ virtual/pkgconfig"
+
+PATCHES=(
+ "${FILESDIR}"/codeblocks-17.12-nodebug.diff
+ "${WORKDIR}"/patches/
+)
+
+src_prepare() {
+ default
+ eautoreconf
+}
+
+src_configure() {
+ setup-wxwidgets
+
+ append-cxxflags $(test-flags-CXX -fno-delete-null-pointer-checks)
+
+ # 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)
+
+ econf \
+ --with-wx-config="${WX_CONFIG}" \
+ --disable-static \
+ $(use_enable debug) \
+ $(use_enable pch) \
+ ${CONF_WITH_LST}
+}
+
+pkg_postinst() {
+ if [[ ${WX_GTK_VER} == "3.0" || ${WX_GTK_VER} == "3.0-gtk3" ]]; then
+ elog "KNOWN ISSUE:"
+ elog "The symbols browser is disabled in wx3.x builds due to it causes crashes."
+ elog "For more information see ticket https://sourceforge.net/p/codeblocks/tickets/225/"
+ elog "with related commits https://sourceforge.net/p/codeblocks/code/11027/"
+ elog "and https://sourceforge.net/p/codeblocks/code/11141/"
+ fi
+
+ xdg_desktop_database_update
+ xdg_mimeinfo_database_update
+ gnome2_icon_cache_update
+}
+
+pkg_postrm() {
+ xdg_desktop_database_update
+ xdg_mimeinfo_database_update
+ gnome2_icon_cache_update
+}
diff --git a/dev-util/codeblocks/files/codeblocks-17.12-nodebug.diff b/dev-util/codeblocks/files/codeblocks-17.12-nodebug.diff
new file mode 100644
index 00000000000..7cbb678dda6
--- /dev/null
+++ b/dev-util/codeblocks/files/codeblocks-17.12-nodebug.diff
@@ -0,0 +1,13 @@
+# 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 2017-11-01 02:32:37.000000000 +0300
++++ new/m4/acinclude.m4 2018-05-04 11:08:33.000000000 +0300
+@@ -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 --git a/dev-util/codeblocks/metadata.xml b/dev-util/codeblocks/metadata.xml
index 0dcc7440843..4d0690ce374 100644
--- a/dev-util/codeblocks/metadata.xml
+++ b/dev-util/codeblocks/metadata.xml
@@ -11,6 +11,7 @@
</maintainer>
<use>
<flag name="contrib">Build additional contrib components</flag>
+ <flag name="fortran">Build FortranProject plugin which enables to use Code::Blocks IDE for Fortran language</flag>
</use>
<upstream>
<remote-id type="sourceforge">codeblocks</remote-id>
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-util/codeblocks/, dev-util/codeblocks/files/
@ 2020-04-08 6:35 Mart Raudsepp
0 siblings, 0 replies; 6+ messages in thread
From: Mart Raudsepp @ 2020-04-08 6:35 UTC (permalink / raw
To: gentoo-commits
commit: 8db46d60049775745930ef445cebe801d802932d
Author: Sergey Torokhov <torokhov-s-a <AT> yandex <DOT> ru>
AuthorDate: Tue Mar 31 01:59:27 2020 +0000
Commit: Mart Raudsepp <leio <AT> gentoo <DOT> org>
CommitDate: Wed Apr 8 06:34:59 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8db46d60
dev-util/codeblocks: 20.03 version bump
- Update CodeBLocks to 20.03 with new patch to build Fortranroject plugin;
- Now xdg eclass is used instead of xdg-utils eclass;
- FortranProject plugin update from [r270] to [r277] with some additional
features before FortranProject v1.7 release. Patch from [r273] fixes
the build issue for compiling with USE=pch.
Closes: https://github.com/gentoo/gentoo/pull/15182
Signed-off-by: Sergey Torokhov <torokhov-s-a <AT> yandex.ru>
Signed-off-by: Mart Raudsepp <leio <AT> gentoo.org>
dev-util/codeblocks/Manifest | 2 +
dev-util/codeblocks/codeblocks-20.03.ebuild | 75 ++++++++++++++++++++++
.../codeblocks/files/codeblocks-20.03-env.patch | 29 +++++++++
3 files changed, 106 insertions(+)
diff --git a/dev-util/codeblocks/Manifest b/dev-util/codeblocks/Manifest
index c685be7d1e5..94ac45d31f8 100644
--- a/dev-util/codeblocks/Manifest
+++ b/dev-util/codeblocks/Manifest
@@ -1,3 +1,5 @@
DIST codeblocks-17.12-fortran.tar.xz 3048 BLAKE2B 58fd3b95cea3303a41da31f5cffe08698fa51ff896c456224edd63d17ddfe8dd54b0c058bd2a68920cf15789bfe5e412054e4e603b1d644034d8cb43d3de3224 SHA512 78534706b6433ae93b680740b2e6c0b747119f6ac62477b901ceeb1900692465615e29f2837ceca48d127181fc6b653d6d49a85fdb8d2fb873ad5a915527936c
DIST codeblocks-17.12_update_astyle_plugin_to_v3.1.patch.xz 3712 BLAKE2B 4a5f75c18b365030a08196dcb2808d8f42d8adf9442552d372cb3923629d9d5b74c98c77557f0af46965bb875543cc6f221a5197fa2b4dba12409225c6cc61d9 SHA512 b216f2659b8ce2a22fd2f9af456af71328b40428510b75f0bb36cec4695d28bbd3133b7385614a84862c2ab5c560d314cc8153ddab09019410e179f5d337669b
DIST codeblocks_17.12.tar.xz 15725976 BLAKE2B 871427b5d8a2296e04d640c35d9129deebf1bb35cd1573652099c02ad4495c4c1369ed382ba714848d6bd75304195a25f6a91bece398bedaffbee8ae3547c46b SHA512 f90e756ca6f532656eeed34c6259c6a96ae85d172fc11e39f696ded9189cab7171d0cead18524fbab50dd782f21adbc7d52e2ea90535a3ed0aef5946b8a476e1
+DIST codeblocks-20.03-fortran.tar.xz 15828 BLAKE2B 3ad1be0ecdc61759edcbb12065a0d8065e5c4571bfdd99bcf6ad8cbda82f64def8ad7121770fe780c1837d06d58edb0209d2ab3b966ecd133c5d46f79c0cbb4e SHA512 06a9a87e560914ae49895843321c26581409e9213265d20476c9c4a8ad2dd9ff63cffdb416e7494bd74ce4a11578f11ef387dd851b1394a50baade8491caaa17
+DIST codeblocks-20.03.tar.xz 11799264 BLAKE2B cdaca38e26e0f1bf12e774cf737e0b6647f070d07f0ca5bec97926528a3511ecb8b3306fb6af473729384a5fe22d4870db8ca988895d619a1e7e2a1d9de2a41f SHA512 f97c1a02d31f0be4dc08b1f19b57bd0d3cba375ab5f33ab91b2a2df7817018f5b3e3063ed07199a3970644f1caa7c7e511db2034c73264f5f4963046d65b0097
diff --git a/dev-util/codeblocks/codeblocks-20.03.ebuild b/dev-util/codeblocks/codeblocks-20.03.ebuild
new file mode 100644
index 00000000000..c8915abb8e2
--- /dev/null
+++ b/dev-util/codeblocks/codeblocks-20.03.ebuild
@@ -0,0 +1,75 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+WX_GTK_VER="3.0-gtk3"
+
+inherit autotools wxwidgets xdg
+
+DESCRIPTION="The open source, cross platform, free C, C++ and Fortran IDE"
+HOMEPAGE="https://codeblocks.org/"
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.xz
+https://dev.gentoo.org/~leio/distfiles/${P}-fortran.tar.xz"
+
+# USE="fortran" enables FortranProject plugin (v1.6 updated to 2020-04-06 [r277])
+# that is delivered with Code::Blocks 20.03 source code.
+# https://sourceforge.net/projects/fortranproject
+# http://cbfortran.sourceforge.net
+
+IUSE="contrib debug fortran pch"
+
+BDEPEND="virtual/pkgconfig"
+
+RDEPEND="app-arch/zip
+ >=dev-libs/tinyxml-2.6.2-r3
+ >=dev-util/astyle-3.1-r2:0/3.1
+ x11-libs/wxGTK:${WX_GTK_VER}[X]
+ contrib? (
+ app-admin/gamin
+ app-text/hunspell
+ dev-libs/boost:=
+ )"
+
+DEPEND="${RDEPEND}"
+
+PATCHES=(
+ "${FILESDIR}"/${P}-env.patch
+ "${WORKDIR}"/patches/
+ )
+
+src_prepare() {
+ default
+ eautoreconf
+}
+
+src_configure() {
+ 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)
+
+ econf \
+ --disable-static \
+ $(use_enable debug) \
+ $(use_enable pch) \
+ ${CONF_WITH_LST}
+}
+
+pkg_postinst() {
+ elog "The Symbols Browser is disabled due to it causing crashes."
+ elog "For more information see https://sourceforge.net/p/codeblocks/tickets/225/"
+
+ xdg_pkg_postinst
+}
+
+pkg_postrm() {
+ xdg_pkg_postrm
+}
diff --git a/dev-util/codeblocks/files/codeblocks-20.03-env.patch b/dev-util/codeblocks/files/codeblocks-20.03-env.patch
new file mode 100644
index 00000000000..2a973abe2b7
--- /dev/null
+++ b/dev-util/codeblocks/files/codeblocks-20.03-env.patch
@@ -0,0 +1,29 @@
+diff -Nuar a_init/Makefile.am b_env/Makefile.am
+--- a_init/Makefile.am 2020-03-28 15:36:06.000000000 +0300
++++ b_env/Makefile.am 2020-03-30 18:14:12.000000000 +0300
+@@ -46,5 +46,5 @@
+ clean-local:
+ rm -f $(top_srcdir)/debian/codeblocks-headers.install
+
+-appdatadir = $(datarootdir)/appdata
++appdatadir = $(datarootdir)/metainfo
+ dist_appdata_DATA = $(top_srcdir)/codeblocks.appdata.xml
+diff -Nuar a_init/m4/acinclude.m4 b_env/m4/acinclude.m4
+--- a_init/m4/acinclude.m4 2020-03-28 15:36:06.000000000 +0300
++++ b_env/m4/acinclude.m4 2020-03-30 18:08:13.000000000 +0300
+@@ -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 -Nuar a_init/src/plugins/contrib/appdata/Makefile.am b_env/src/plugins/contrib/appdata/Makefile.am
+--- a_init/src/plugins/contrib/appdata/Makefile.am 2020-03-28 15:35:54.000000000 +0300
++++ b_env/src/plugins/contrib/appdata/Makefile.am 2020-03-30 18:14:22.000000000 +0300
+@@ -1,2 +1,2 @@
+-appdatadir = $(datarootdir)/appdata
++appdatadir = $(datarootdir)/metainfo
+ dist_appdata_DATA = $(top_srcdir)/codeblocks-contrib.metainfo.xml
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-util/codeblocks/, dev-util/codeblocks/files/
@ 2022-05-13 20:04 Sam James
0 siblings, 0 replies; 6+ messages in thread
From: Sam James @ 2022-05-13 20:04 UTC (permalink / raw
To: gentoo-commits
commit: a9e3756de249e709bc29ef602f2c099b88163c22
Author: Sergey Torokhov <torokhov-s-a <AT> yandex <DOT> ru>
AuthorDate: Sun May 8 22:34:58 2022 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Fri May 13 20:03:55 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a9e3756d
dev-util/codeblocks: cleanup old 17.12-r*, <=20.03-r3
Signed-off-by: Sergey Torokhov <torokhov-s-a <AT> yandex.ru>
Signed-off-by: Sam James <sam <AT> gentoo.org>
dev-util/codeblocks/Manifest | 3 -
dev-util/codeblocks/codeblocks-17.12-r303.ebuild | 86 ----------------------
dev-util/codeblocks/codeblocks-17.12-r304.ebuild | 83 ---------------------
dev-util/codeblocks/codeblocks-20.03-r1.ebuild | 76 -------------------
dev-util/codeblocks/codeblocks-20.03-r2.ebuild | 77 -------------------
dev-util/codeblocks/codeblocks-20.03-r3.ebuild | 76 -------------------
.../codeblocks-17.12-fix-crash-on-copypaste.patch | 20 -----
.../codeblocks-20.03_gcc11_compatibility.patch | 12 ---
8 files changed, 433 deletions(-)
diff --git a/dev-util/codeblocks/Manifest b/dev-util/codeblocks/Manifest
index 2c6b6a8da73e..86c03b3b4a25 100644
--- a/dev-util/codeblocks/Manifest
+++ b/dev-util/codeblocks/Manifest
@@ -1,8 +1,5 @@
-DIST codeblocks-17.12-fortran.tar.xz 3048 BLAKE2B 58fd3b95cea3303a41da31f5cffe08698fa51ff896c456224edd63d17ddfe8dd54b0c058bd2a68920cf15789bfe5e412054e4e603b1d644034d8cb43d3de3224 SHA512 78534706b6433ae93b680740b2e6c0b747119f6ac62477b901ceeb1900692465615e29f2837ceca48d127181fc6b653d6d49a85fdb8d2fb873ad5a915527936c
-DIST codeblocks-17.12_update_astyle_plugin_to_v3.1.patch.xz 3712 BLAKE2B 4a5f75c18b365030a08196dcb2808d8f42d8adf9442552d372cb3923629d9d5b74c98c77557f0af46965bb875543cc6f221a5197fa2b4dba12409225c6cc61d9 SHA512 b216f2659b8ce2a22fd2f9af456af71328b40428510b75f0bb36cec4695d28bbd3133b7385614a84862c2ab5c560d314cc8153ddab09019410e179f5d337669b
DIST codeblocks-20.03-codecompletion-symbolbrowser-update.tar.xz 52572 BLAKE2B 4752a84f5471f68f2c1044df6c6c3c25dd61f03e916bfcff1d091fe66aec8911cd02c7d824431dd307267d00af209cfd0b614528fe091a2d3c4bccbc688e83ef SHA512 acd79ffeed03023ac5e33fd685942f5593d0f7bc488b1d53e6c502618b980d565b1f2bc479da4de869ad2e839e263ddbff2a8847ef39b822aab69b87d5cd01a8
DIST codeblocks-20.03-fortran-update-v1.7.tar.xz 12092 BLAKE2B df59ca9e00765f39f64d889ed22af61db8c2bb5f217dbda64d325327be8ef1ce318bc0b2538dd19ee911d84fccb6693f6e287f4d084e8243b34777f464ba5e61 SHA512 aec8062bbf0cd524b683ba9f2f6befec0bfb9f9b1f8ea61ffb679cf449f4ece20502f4fda101ab559151616fc7d7826e308a6468634502930f09ea3a8590c359
DIST codeblocks-20.03-fortran-update-v1.8.tar.xz 43672 BLAKE2B c30f64a7211debd72ee0274067f7443c71ce25e348bfb1474a6dbd1cb86b330537ceb56e96eebdd02f88a93dc0526fb7bced678be799bc8d2437c00f5effd1e8 SHA512 0651d1abb08bfd9eb42f9eca0b9b4c702180b31fac2c08240d2447940c9b21601c3baadc3933ac4080e49c834aaacad716375aa4a40c06d336f000e0d59f962a
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_17.12.tar.xz 15725976 BLAKE2B 871427b5d8a2296e04d640c35d9129deebf1bb35cd1573652099c02ad4495c4c1369ed382ba714848d6bd75304195a25f6a91bece398bedaffbee8ae3547c46b SHA512 f90e756ca6f532656eeed34c6259c6a96ae85d172fc11e39f696ded9189cab7171d0cead18524fbab50dd782f21adbc7d52e2ea90535a3ed0aef5946b8a476e1
diff --git a/dev-util/codeblocks/codeblocks-17.12-r303.ebuild b/dev-util/codeblocks/codeblocks-17.12-r303.ebuild
deleted file mode 100644
index 6c32f926facd..000000000000
--- a/dev-util/codeblocks/codeblocks-17.12-r303.ebuild
+++ /dev/null
@@ -1,86 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-WX_GTK_VER="3.0-gtk3"
-
-inherit autotools wxwidgets xdg-utils
-
-DESCRIPTION="The open source, cross platform, free C, C++ and Fortran IDE"
-HOMEPAGE="https://codeblocks.org/"
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="amd64 ~ppc x86"
-SRC_URI="mirror://sourceforge/${PN}/${P/-/_}.tar.xz
-https://dev.gentoo.org/~leio/distfiles/${P}-fortran.tar.xz
-https://dev.gentoo.org/~leio/distfiles/${P}_update_astyle_plugin_to_v3.1.patch.xz"
-
-# USE="fortran" enables FortranProject plugin (v1.5)
-# that is delivered with Code::Blocks 17.12 source code.
-# https://sourceforge.net/projects/fortranproject
-# http://cbfortran.sourceforge.net
-
-IUSE="contrib debug fortran pch"
-
-BDEPEND="virtual/pkgconfig"
-
-RDEPEND="app-arch/zip
- >=dev-libs/tinyxml-2.6.2-r3
- >=dev-util/astyle-3.0.1-r1:0=
- x11-libs/wxGTK:${WX_GTK_VER}[X]
- contrib? (
- app-admin/gamin
- app-text/hunspell
- dev-libs/boost:=
- )"
-
-DEPEND="${RDEPEND}"
-
-PATCHES=(
- "${FILESDIR}"/${P}-fix-crash-on-copypaste.patch
- "${FILESDIR}"/${P}-nodebug.diff
- "${WORKDIR}"/patches/
- )
-
-src_prepare() {
- default
- if has_version ">=dev-util/astyle-3.1" ; then
- eapply "${WORKDIR}"/codeblocks-17.12_update_astyle_plugin_to_v3.1.patch
- fi
- sed -i "s:appdatadir = \$(datarootdir)/appdata:appdatadir = \$(datarootdir)/metainfo:" Makefile.am || die # bug 709450
- sed -i "s:appdatadir = \$(datarootdir)/appdata:appdatadir = \$(datarootdir)/metainfo:" src/plugins/contrib/appdata/Makefile.am || die # bug 709450
- eautoreconf
-}
-
-src_configure() {
- 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)
-
- econf \
- --disable-static \
- $(use_enable debug) \
- $(use_enable pch) \
- ${CONF_WITH_LST}
-}
-
-pkg_postinst() {
- elog "The Symbols Browser is disabled due to it causing crashes."
- elog "For more information see https://sourceforge.net/p/codeblocks/tickets/225/"
-
- xdg_desktop_database_update
- xdg_icon_cache_update
- xdg_mimeinfo_database_update
-}
-
-pkg_postrm() {
- xdg_desktop_database_update
- xdg_icon_cache_update
- xdg_mimeinfo_database_update
-}
diff --git a/dev-util/codeblocks/codeblocks-17.12-r304.ebuild b/dev-util/codeblocks/codeblocks-17.12-r304.ebuild
deleted file mode 100644
index 88841742c92f..000000000000
--- a/dev-util/codeblocks/codeblocks-17.12-r304.ebuild
+++ /dev/null
@@ -1,83 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-WX_GTK_VER="3.0-gtk3"
-
-inherit autotools wxwidgets xdg
-
-DESCRIPTION="The open source, cross platform, free C, C++ and Fortran IDE"
-HOMEPAGE="https://codeblocks.org/"
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-SRC_URI="mirror://sourceforge/${PN}/${P/-/_}.tar.xz
-https://dev.gentoo.org/~leio/distfiles/${P}-fortran.tar.xz
-https://dev.gentoo.org/~leio/distfiles/${P}_update_astyle_plugin_to_v3.1.patch.xz"
-
-# USE="fortran" enables FortranProject plugin (v1.5)
-# that is delivered with Code::Blocks 17.12 source code.
-# https://sourceforge.net/projects/fortranproject
-# https://cbfortran.sourceforge.io
-
-IUSE="contrib debug fortran pch"
-
-BDEPEND="virtual/pkgconfig"
-
-RDEPEND="app-arch/zip
- >=dev-libs/tinyxml-2.6.2-r3
- >=dev-util/astyle-3.0.1-r1:0=
- x11-libs/wxGTK:${WX_GTK_VER}[X]
- contrib? (
- app-admin/gamin
- app-text/hunspell
- dev-libs/boost:=
- )"
-
-DEPEND="${RDEPEND}"
-
-PATCHES=(
- "${FILESDIR}"/${P}-fix-crash-on-copypaste.patch
- "${FILESDIR}"/${P}-nodebug.diff
- "${FILESDIR}"/${PN}-20.03_gcc11_compatibility.patch
- "${WORKDIR}"/patches/
- )
-
-src_prepare() {
- default
- if has_version ">=dev-util/astyle-3.1" ; then
- eapply "${WORKDIR}"/codeblocks-17.12_update_astyle_plugin_to_v3.1.patch
- fi
- sed -i "s:appdatadir = \$(datarootdir)/appdata:appdatadir = \$(datarootdir)/metainfo:" Makefile.am || die # bug 709450
- sed -i "s:appdatadir = \$(datarootdir)/appdata:appdatadir = \$(datarootdir)/metainfo:" src/plugins/contrib/appdata/Makefile.am || die # bug 709450
- eautoreconf
-}
-
-src_configure() {
- 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)
-
- econf \
- --disable-static \
- $(use_enable debug) \
- $(use_enable pch) \
- ${CONF_WITH_LST}
-}
-
-pkg_postinst() {
- elog "The Symbols Browser is disabled due to it causing crashes."
- elog "For more information see https://sourceforge.net/p/codeblocks/tickets/225/"
-
- xdg_pkg_postinst
-}
-
-pkg_postrm() {
- xdg_pkg_postrm
-}
diff --git a/dev-util/codeblocks/codeblocks-20.03-r1.ebuild b/dev-util/codeblocks/codeblocks-20.03-r1.ebuild
deleted file mode 100644
index 37605d50b649..000000000000
--- a/dev-util/codeblocks/codeblocks-20.03-r1.ebuild
+++ /dev/null
@@ -1,76 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-WX_GTK_VER="3.0-gtk3"
-
-inherit autotools wxwidgets xdg
-
-DESCRIPTION="The open source, cross platform, free C, C++ and Fortran IDE"
-HOMEPAGE="https://codeblocks.org/"
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.xz
-https://dev.gentoo.org/~leio/distfiles/${P}-fortran.tar.xz
-https://dev.gentoo.org/~leio/distfiles/${P}-fortran-update-v1.7.tar.xz"
-
-# USE="fortran" enables FortranProject plugin (updated to v1.7 2020-06-07 [r298])
-# that is delivered with Code::Blocks 20.03 source code.
-# https://sourceforge.net/projects/fortranproject
-# http://cbfortran.sourceforge.net
-
-IUSE="contrib debug fortran pch"
-
-BDEPEND="virtual/pkgconfig"
-
-RDEPEND="app-arch/zip
- >=dev-libs/tinyxml-2.6.2-r3
- >=dev-util/astyle-3.1-r2:0/3.1
- x11-libs/wxGTK:${WX_GTK_VER}[X]
- contrib? (
- app-admin/gamin
- app-text/hunspell
- dev-libs/boost:=
- )"
-
-DEPEND="${RDEPEND}"
-
-PATCHES=(
- "${FILESDIR}"/${P}-env.patch
- "${WORKDIR}"/patches/
- )
-
-src_prepare() {
- default
- eautoreconf
-}
-
-src_configure() {
- 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)
-
- econf \
- --disable-static \
- $(use_enable debug) \
- $(use_enable pch) \
- ${CONF_WITH_LST}
-}
-
-pkg_postinst() {
- elog "The Symbols Browser is disabled due to it causing crashes."
- elog "For more information see https://sourceforge.net/p/codeblocks/tickets/225/"
-
- xdg_pkg_postinst
-}
-
-pkg_postrm() {
- xdg_pkg_postrm
-}
diff --git a/dev-util/codeblocks/codeblocks-20.03-r2.ebuild b/dev-util/codeblocks/codeblocks-20.03-r2.ebuild
deleted file mode 100644
index 9e4061b5925f..000000000000
--- a/dev-util/codeblocks/codeblocks-20.03-r2.ebuild
+++ /dev/null
@@ -1,77 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-WX_GTK_VER="3.0-gtk3"
-
-inherit autotools wxwidgets xdg
-
-DESCRIPTION="The open source, cross platform, free C, C++ and Fortran IDE"
-HOMEPAGE="https://codeblocks.org/"
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="amd64 ~ppc x86"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.xz
-https://dev.gentoo.org/~leio/distfiles/${P}-fortran.tar.xz
-https://dev.gentoo.org/~leio/distfiles/${P}-fortran-update-v1.7.tar.xz"
-
-# USE="fortran" enables FortranProject plugin (updated to v1.7 2020-06-07 [r298])
-# that is delivered with Code::Blocks 20.03 source code.
-# https://sourceforge.net/projects/fortranproject
-# https://cbfortran.sourceforge.io
-
-IUSE="contrib debug fortran pch"
-
-BDEPEND="virtual/pkgconfig"
-
-RDEPEND="app-arch/zip
- >=dev-libs/tinyxml-2.6.2-r3
- >=dev-util/astyle-3.1-r2:0/3.1
- x11-libs/wxGTK:${WX_GTK_VER}[X]
- contrib? (
- app-admin/gamin
- app-text/hunspell
- dev-libs/boost:=
- )"
-
-DEPEND="${RDEPEND}"
-
-PATCHES=(
- "${FILESDIR}"/${P}-env.patch
- "${FILESDIR}"/${P}_gcc11_compatibility.patch
- "${WORKDIR}"/patches/
- )
-
-src_prepare() {
- default
- eautoreconf
-}
-
-src_configure() {
- 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)
-
- econf \
- --disable-static \
- $(use_enable debug) \
- $(use_enable pch) \
- ${CONF_WITH_LST}
-}
-
-pkg_postinst() {
- elog "The Symbols Browser is disabled due to it causing crashes."
- elog "For more information see https://sourceforge.net/p/codeblocks/tickets/225/"
-
- xdg_pkg_postinst
-}
-
-pkg_postrm() {
- xdg_pkg_postrm
-}
diff --git a/dev-util/codeblocks/codeblocks-20.03-r3.ebuild b/dev-util/codeblocks/codeblocks-20.03-r3.ebuild
deleted file mode 100644
index cfdd776089d2..000000000000
--- a/dev-util/codeblocks/codeblocks-20.03-r3.ebuild
+++ /dev/null
@@ -1,76 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-WX_GTK_VER="3.0-gtk3"
-
-inherit autotools wxwidgets xdg
-
-DESCRIPTION="The open source, cross platform, free C, C++ and Fortran IDE"
-HOMEPAGE="https://codeblocks.org/"
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.xz
-https://dev.gentoo.org/~leio/distfiles/${P}-fortran.tar.xz
-https://dev.gentoo.org/~leio/distfiles/${P}-fortran-update-v1.7.tar.xz
-https://dev.gentoo.org/~leio/distfiles/${P}-fortran-update-v1.8.tar.xz
-https://dev.gentoo.org/~leio/distfiles/${P}-codecompletion-symbolbrowser-update.tar.xz
-"
-
-# USE="fortran" enables FortranProject plugin (updated to v1.8 2021-05-29 [r230])
-# that is delivered with Code::Blocks 20.03 source code.
-# https://sourceforge.net/projects/fortranproject
-# https://cbfortran.sourceforge.io
-
-IUSE="contrib debug fortran pch"
-
-BDEPEND="virtual/pkgconfig"
-
-RDEPEND="app-arch/zip
- >=dev-libs/tinyxml-2.6.2-r3
- >=dev-util/astyle-3.1-r2:0/3.1
- x11-libs/wxGTK:${WX_GTK_VER}[X]
- contrib? (
- app-admin/gamin
- app-text/hunspell
- dev-libs/boost:=
- )"
-
-DEPEND="${RDEPEND}"
-
-PATCHES=(
- "${FILESDIR}"/${P}-env.patch
- "${WORKDIR}"/patches/
- )
-
-src_prepare() {
- default
- eautoreconf
-}
-
-src_configure() {
- 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)
-
- econf \
- --disable-static \
- $(use_enable debug) \
- $(use_enable pch) \
- ${CONF_WITH_LST}
-}
-
-pkg_postinst() {
- xdg_pkg_postinst
-}
-
-pkg_postrm() {
- xdg_pkg_postrm
-}
diff --git a/dev-util/codeblocks/files/codeblocks-17.12-fix-crash-on-copypaste.patch b/dev-util/codeblocks/files/codeblocks-17.12-fix-crash-on-copypaste.patch
deleted file mode 100644
index 9918c58d8e88..000000000000
--- a/dev-util/codeblocks/files/codeblocks-17.12-fix-crash-on-copypaste.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-# Fix crashing on paste of copied text from other applications
-# https://sourceforge.net/p/codeblocks/tickets/629/
-diff -Nuar a/main.cpp b/main.cpp
---- a/src/src/main.cpp 2017-11-01 02:32:38.000000000 +0300
-+++ b/src/src/main.cpp 2020-03-13 21:59:25.000000000 +0300
-@@ -4321,7 +4321,13 @@
- }
-
- if (Manager::Get()->GetEditorManager() && event.GetEditor() == Manager::Get()->GetEditorManager()->GetActiveEditor())
-- DoUpdateStatusBar();
-+ {
-+ #if wxCHECK_VERSION(3, 0, 0)
-+ CallAfter(&MainFrame::DoUpdateStatusBar);
-+ #else
-+ DoUpdateStatusBar();
-+ #endif // wxCHECK_VERSION(3, 0, 0)
-+ }
-
- event.Skip();
- }
diff --git a/dev-util/codeblocks/files/codeblocks-20.03_gcc11_compatibility.patch b/dev-util/codeblocks/files/codeblocks-20.03_gcc11_compatibility.patch
deleted file mode 100644
index 46c8643e9c94..000000000000
--- a/dev-util/codeblocks/files/codeblocks-20.03_gcc11_compatibility.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -Naur a/src/plugins/openfileslist/openfileslistplugin.h b/src/plugins/openfileslist/openfileslistplugin.h
---- a/src/plugins/openfileslist/openfileslistplugin.h 2020-10-13 20:35:57.000000000 +0300
-+++ b/src/plugins/openfileslist/openfileslistplugin.h 2020-10-13 20:37:37.000000000 +0300
-@@ -23,7 +23,7 @@
- // Functor for the std::set predicate to sort the opened editor files according to their tab order
- struct compareLess
- {
-- bool operator()(const ProjectFile* lhs, const ProjectFile* rhs) { return lhs->editorTabPos < rhs->editorTabPos; }
-+ bool operator()(const ProjectFile* lhs, const ProjectFile* rhs) const { return lhs->editorTabPos < rhs->editorTabPos; }
- };
- typedef std::set<ProjectFile*, compareLess> OpenFilesSet;
- ProjectFile* activeFile;
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-util/codeblocks/, dev-util/codeblocks/files/
@ 2024-03-09 20:54 Sam James
0 siblings, 0 replies; 6+ messages in thread
From: Sam James @ 2024-03-09 20:54 UTC (permalink / raw
To: gentoo-commits
commit: ea2b6a11aca27a11c87862518b9a536f8af94738
Author: Sergey Torokhov <torokhov-s-a <AT> yandex <DOT> ru>
AuthorDate: Sat Mar 9 18:49:17 2024 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sat Mar 9 20:53:38 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ea2b6a11
dev-util/codeblocks: 20.03-r7, fix Scintilla buffer over-read warning
Upstream patch: https://sourceforge.net/u/vic5/scintilla/ci/6d0ce3
Upstream issue: https://sourceforge.net/p/scintilla/bugs/2019/
[sam: Revbump done in previous commit.]
Bug: https://bugs.gentoo.org/925955
Signed-off-by: Sergey Torokhov <torokhov-s-a <AT> yandex.ru>
Closes: https://github.com/gentoo/gentoo/pull/35687
Signed-off-by: Sam James <sam <AT> gentoo.org>
dev-util/codeblocks/codeblocks-20.03-r7.ebuild | 1 +
..._buffer_over-read_with_absolute_reference.patch | 24 ++++++++++++++++++++++
2 files changed, 25 insertions(+)
diff --git a/dev-util/codeblocks/codeblocks-20.03-r7.ebuild b/dev-util/codeblocks/codeblocks-20.03-r7.ebuild
index a3c08cf9ffa1..96c7e10e1ae8 100644
--- a/dev-util/codeblocks/codeblocks-20.03-r7.ebuild
+++ b/dev-util/codeblocks/codeblocks-20.03-r7.ebuild
@@ -51,6 +51,7 @@ PATCHES=(
"${FILESDIR}"/${P}-env.patch
"${WORKDIR}"/patches/
"${FILESDIR}"/${P}_fix_DoxyBlocks_startup_segfault.patch
+ "${FILESDIR}"/${P}_Scintilla_fix_buffer_over-read_with_absolute_reference.patch
)
src_prepare() {
diff --git a/dev-util/codeblocks/files/codeblocks-20.03_Scintilla_fix_buffer_over-read_with_absolute_reference.patch b/dev-util/codeblocks/files/codeblocks-20.03_Scintilla_fix_buffer_over-read_with_absolute_reference.patch
new file mode 100644
index 000000000000..7ef01faf9cd2
--- /dev/null
+++ b/dev-util/codeblocks/files/codeblocks-20.03_Scintilla_fix_buffer_over-read_with_absolute_reference.patch
@@ -0,0 +1,24 @@
+Upstream patch: https://sourceforge.net/u/vic5/scintilla/ci/6d0ce3c92a1371372bd601cd572a078d5e4041a4/
+Upstream issue: https://sourceforge.net/p/scintilla/bugs/2019/
+Codeblocks forum discussion: https://forums.codeblocks.org/index.php?topic=24505.0
+
+lexers/LexMMIXAL.cxxDiffSwitch to side-by-side view
+--- a/src/sdk/wxscintilla/src/scintilla/lexers/LexMMIXAL.cxx
++++ b/src/sdk/wxscintilla/src/scintilla/lexers/LexMMIXAL.cxx
+@@ -99,12 +99,11 @@
+ }
+ } else if (sc.state == SCE_MMIXAL_REF) { // REF
+ if (!IsAWordChar(sc.ch) ) {
+- char s[100];
+- sc.GetCurrent(s, sizeof(s));
++ char s0[100];
++ sc.GetCurrent(s0, sizeof(s0));
++ const char *s = s0;
+ if (*s == ':') { // ignore base prefix for match
+- for (size_t i = 0; i != sizeof(s); ++i) {
+- *(s+i) = *(s+i+1);
+- }
++ ++s;
+ }
+ if (special_register.InList(s)) {
+ sc.ChangeState(SCE_MMIXAL_REGISTER);
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-util/codeblocks/, dev-util/codeblocks/files/
@ 2024-06-08 12:30 Joonas Niilola
0 siblings, 0 replies; 6+ messages in thread
From: Joonas Niilola @ 2024-06-08 12:30 UTC (permalink / raw
To: gentoo-commits
commit: acbf41fcc5b33c5d25524204631ee292e35a690e
Author: Sergey Torokhov <torokhov-s-a <AT> yandex <DOT> ru>
AuthorDate: Fri Apr 26 22:11:25 2024 +0000
Commit: Joonas Niilola <juippis <AT> gentoo <DOT> org>
CommitDate: Sat Jun 8 12:30:41 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=acbf41fc
dev-util/codeblocks: dev preview 20.03_p13518 (2024-05-05) bump
Add unkeyworded "Nightly build" dev preview at revision 13518 [1].
The upstream "nightly" revisions are notable for using wxGTK:3.2
and addition of new optfeatured LSP Clangd_client plugin
that could replace enabled by default Code competion plugin.
[1] https://forums.codeblocks.org/index.php/topic,25791.0.html
Closes: https://bugs.gentoo.org/929139
Signed-off-by: Sergey Torokhov <torokhov-s-a <AT> yandex.ru>
Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org>
dev-util/codeblocks/Manifest | 2 +
dev-util/codeblocks/codeblocks-20.03_p13518.ebuild | 125 ++++++++
...13518_FortranProject-r378-autotools-build.patch | 340 +++++++++++++++++++++
3 files changed, 467 insertions(+)
diff --git a/dev-util/codeblocks/Manifest b/dev-util/codeblocks/Manifest
index 86c03b3b4a25..d7981f24c296 100644
--- a/dev-util/codeblocks/Manifest
+++ b/dev-util/codeblocks/Manifest
@@ -3,3 +3,5 @@ DIST codeblocks-20.03-fortran-update-v1.7.tar.xz 12092 BLAKE2B df59ca9e00765f39f
DIST codeblocks-20.03-fortran-update-v1.8.tar.xz 43672 BLAKE2B c30f64a7211debd72ee0274067f7443c71ce25e348bfb1474a6dbd1cb86b330537ceb56e96eebdd02f88a93dc0526fb7bced678be799bc8d2437c00f5effd1e8 SHA512 0651d1abb08bfd9eb42f9eca0b9b4c702180b31fac2c08240d2447940c9b21601c3baadc3933ac4080e49c834aaacad716375aa4a40c06d336f000e0d59f962a
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 fortranproject_r378.tar.bz2 603873 BLAKE2B ed1fe94c591ec8ce1e5a844b3fa789f1bbecfade19a4ac1c3d17098da704b271be2e13d680e43050116d7117d40e117fa50d75ab5cc3ddd7223f46e1c2a162cd SHA512 fb4645f81b087d22e5735a33aded806595f96ccd1c2d32123a919c48de260ce2e1d96551fae0b65663902bc198a8f4ab158233b8755693df38315ea688cbaf92
diff --git a/dev-util/codeblocks/codeblocks-20.03_p13518.ebuild b/dev-util/codeblocks/codeblocks-20.03_p13518.ebuild
new file mode 100644
index 000000000000..7267802cf9c9
--- /dev/null
+++ b/dev-util/codeblocks/codeblocks-20.03_p13518.ebuild
@@ -0,0 +1,125 @@
+# Copyright 1999-2024 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://codeblocks.org/"
+
+# svn export --ignore-externals https://svn.code.sf.net/p/codeblocks/code/trunk@${REV} codeblocks-20.03_p${REV}
+# tar -cjf codeblocks-20.03_p${REV}.tar.bz2 codeblocks-20.03_p${REV}
+#
+# svn export https://svn.code.sf.net/p/fortranproject/code/trunk@${FP_REV} fortranproject_r${FP_REV}
+# tar -cjf fortranproject_r${FP_REV}.tar.bz2 fortranproject_r${FP_REV}
+SRC_URI="
+ https://github.com/band-a-prend/gentoo-overlay/releases/download/${PN}-20.03_p${REV}/${PN}-20.03_p${REV}.tar.bz2
+ https://github.com/band-a-prend/gentoo-overlay/releases/download/${PN}-20.03_p${REV}/${FP_NAME}_r${FP_REV}.tar.bz2
+"
+
+LICENSE="GPL-3"
+SLOT="0"
+
+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/3.1
+ x11-libs/gtk+:3
+ x11-libs/wxGTK:${WX_GTK_VER}[X]
+ contrib? (
+ app-admin/gamin
+ app-arch/bzip2
+ app-text/hunspell:=
+ dev-libs/boost:=
+ dev-libs/libgamin
+ media-libs/fontconfig
+ sys-libs/zlib
+ )
+"
+
+DEPEND="
+ ${RDEPEND}
+ x11-base/xorg-proto
+"
+
+PATCHES=(
+ "${FILESDIR}/${PN}-9999-nodebug.diff"
+ "${FILESDIR}/${P}_FortranProject-r378-autotools-build.patch"
+)
+
+src_unpack() {
+ default
+ mv -T "${WORKDIR}/${FP_NAME}_r${FP_REV}" "${S}"/src/plugins/contrib/FortranProject || die
+}
+
+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-20.03_p13518_FortranProject-r378-autotools-build.patch b/dev-util/codeblocks/files/codeblocks-20.03_p13518_FortranProject-r378-autotools-build.patch
new file mode 100644
index 000000000000..3b8dd49efd7d
--- /dev/null
+++ b/dev-util/codeblocks/files/codeblocks-20.03_p13518_FortranProject-r378-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 \
^ permalink raw reply related [flat|nested] 6+ messages in thread
end of thread, other threads:[~2024-06-08 12:30 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2018-04-14 16:11 [gentoo-commits] repo/gentoo:master commit in: dev-util/codeblocks/, dev-util/codeblocks/files/ Pacho Ramos
-- strict thread matches above, loose matches on Subject: below --
2018-05-05 20:10 Mart Raudsepp
2020-04-08 6:35 Mart Raudsepp
2022-05-13 20:04 Sam James
2024-03-09 20:54 Sam James
2024-06-08 12:30 Joonas Niilola
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox