[gentoo-commits] repo/gentoo:master commit in: dev-util/codeblocks/, dev-util/codeblocks/files/
commit: ea2b6a11aca27a11c87862518b9a536f8af94738
Author: Sergey Torokhov yandex ru>
AuthorDate: Sat Mar 9 18:49:17 2024 +
Commit: Sam James gentoo org>
CommitDate: Sat Mar 9 20:53:38 2024 +
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 yandex.ru>
Closes: https://github.com/gentoo/gentoo/pull/35687
Signed-off-by: Sam James 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 ..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);
[gentoo-commits] repo/gentoo:master commit in: dev-util/codeblocks/, dev-util/codeblocks/files/
commit: a9e3756de249e709bc29ef602f2c099b88163c22
Author: Sergey Torokhov yandex ru>
AuthorDate: Sun May 8 22:34:58 2022 +
Commit: Sam James gentoo org>
CommitDate: Fri May 13 20:03:55 2022 +
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 yandex.ru>
Signed-off-by: Sam James 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..
--- 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
-
[gentoo-commits] repo/gentoo:master commit in: dev-util/codeblocks/, dev-util/codeblocks/files/
commit: 8db46d60049775745930ef445cebe801d802932d
Author: Sergey Torokhov yandex ru>
AuthorDate: Tue Mar 31 01:59:27 2020 +
Commit: Mart Raudsepp gentoo org>
CommitDate: Wed Apr 8 06:34:59 2020 +
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 yandex.ru>
Signed-off-by: Mart Raudsepp 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 000..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
[gentoo-commits] repo/gentoo:master commit in: dev-util/codeblocks/, dev-util/codeblocks/files/
commit: be84553eb924219ec51e6fefb62f937a3f4eb697
Author: band-a-prend yandex ru>
AuthorDate: Fri Apr 27 00:45:56 2018 +
Commit: Mart Raudsepp gentoo org>
CommitDate: Sat May 5 20:09:09 2018 +
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 000..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) \
+
[gentoo-commits] repo/gentoo:master commit in: dev-util/codeblocks/, dev-util/codeblocks/files/
commit: 1ffb32396837505f577b5b18e0cb9e6d74bbc4b1
Author: Peter Levine gmail com>
AuthorDate: Sat Mar 24 22:04:04 2018 +
Commit: Pacho Ramos gentoo org>
CommitDate: Sat Apr 14 16:08:03 2018 +
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 000..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
+Date: Fri, 10 Feb 2017 20:56:25 +
+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;
+ }
+ };
+
