[gentoo-commits] repo/gentoo:master commit in: dev-util/codeblocks/files/, dev-util/codeblocks/
commit: 1942cc9d811e65d8488108b1ef0948058c53f213
Author: Sergey Torokhov yandex ru>
AuthorDate: Sat Mar 9 18:46:09 2024 +
Commit: Sam James gentoo org>
CommitDate: Sat Mar 9 20:53:24 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1942cc9d
dev-util/codeblocks: 20.03-r7, fix DoxyBlocks plugin startup segfault
Closes: https://bugs.gentoo.org/925955
Signed-off-by: Sergey Torokhov yandex.ru>
Signed-off-by: Sam James gentoo.org>
dev-util/codeblocks/codeblocks-20.03-r7.ebuild | 97 ++
...cks-20.03_fix_DoxyBlocks_startup_segfault.patch | 61 ++
2 files changed, 158 insertions(+)
diff --git a/dev-util/codeblocks/codeblocks-20.03-r7.ebuild
b/dev-util/codeblocks/codeblocks-20.03-r7.ebuild
new file mode 100644
index ..a3c08cf9ffa1
--- /dev/null
+++ b/dev-util/codeblocks/codeblocks-20.03-r7.ebuild
@@ -0,0 +1,97 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+WX_GTK_VER="3.0-gtk3"
+
+inherit autotools flag-o-matic 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"
+
+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}"/${P}-env.patch
+ "${WORKDIR}"/patches/
+ "${FILESDIR}"/${P}_fix_DoxyBlocks_startup_segfault.patch
+ )
+
+src_prepare() {
+ default
+ # Force to use bundled Squirrel-3.1 (patched version is used by
upstream) due to it's API was changed
+ sed -i '/PKG_CHECK_MODULES(\[SQUIRREL\]/c\HAVE_SQUIRREL=no'
configure.ac || die # Bug 884601
+ 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
+ $(use_with contrib boost-libdir "${ESYSROOT}/usr/$(get_libdir)")
+ $(use_enable debug)
+ ${CONF_WITH_LST}
+ )
+
+ econf "${myeconfargs[@]}"
+}
+
+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_fix_DoxyBlocks_startup_segfault.patch
b/dev-util/codeblocks/files/codeblocks-20.03_fix_DoxyBlocks_startup_segfault.patch
new file mode 100644
index ..d641dcb75f83
--- /dev/null
+++
b/dev-util/codeblocks/files/codeblocks-20.03_fix_DoxyBlocks_startup_segfault.patch
@@ -0,0 +1,61 @@
+Upstream patch: https://sourceforge.net/p/codeblocks/code/12074/
+Upstream issue: https://sourceforge.net/p/codeblocks/tickets/839/
+Gentoo issue: https://bugs.gentoo.org/925955
+
+--- a/src/plugins/contrib/DoxyBlocks/DoxyBlocks.cpp
b/src/plugins/contrib/DoxyBlocks/DoxyBlocks.cpp
+@@ -101,8 +101,8 @@
+
+ // constructor
+ DoxyBlocks::DoxyBlocks() :
+-m_pToolbar(0l),
+-m_DoxyBlocksLog(0l),
++m_pToolbar(nullptr),
++m_DoxyBlocksLog(nullptr),
+ m_LogPageIndex(0),
+ m_bAutoVersioning(false)
+ {
+@@ -234,8 +234,10 @@
+ */
+ void DoxyBlocks::OnUpdateUI(wxUpdateUIEvent& WXUNUSED(event))
+ {
+-if(Manager::Get()->GetProjectManager()->GetProjects()->GetCount() == 0){
+-m_pToolbar->Enable(false);
++if (Manager::Get()->GetProjectManager()->GetProjects()->GetCount() == 0)
++{
++
[gentoo-commits] repo/gentoo:master commit in: dev-util/codeblocks/files/, dev-util/codeblocks/
commit: 174a1c6156dc5d6502bd944900b745f7f80959d1
Author: Sergey Torokhov yandex ru>
AuthorDate: Sun May 8 22:38:59 2022 +
Commit: Sam James gentoo org>
CommitDate: Fri May 13 20:03:56 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=174a1c61
dev-util/codeblocks: update .ebuild
The USE-flag "pch" isn't droped this time due to
https://sourceforge.net/p/codeblocks/tickets/1266/
Signed-off-by: Sergey Torokhov yandex.ru>
Closes: https://github.com/gentoo/gentoo/pull/25393
Signed-off-by: Sam James gentoo.org>
dev-util/codeblocks/codeblocks-.ebuild| 11 +--
...blocks-17.12-nodebug.diff => codeblocks--nodebug.diff} | 4 ++--
2 files changed, 7 insertions(+), 8 deletions(-)
diff --git a/dev-util/codeblocks/codeblocks-.ebuild
b/dev-util/codeblocks/codeblocks-.ebuild
index 580a1b03b545..3ce6e1a69d71 100644
--- a/dev-util/codeblocks/codeblocks-.ebuild
+++ b/dev-util/codeblocks/codeblocks-.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=7
+EAPI=8
WX_GTK_VER="3.0-gtk3"
@@ -15,6 +15,7 @@ KEYWORDS=""
SRC_URI=""
ESVN_REPO_URI="svn://svn.code.sf.net/p/${PN}/code/trunk"
ESVN_FETCH_CMD="svn checkout --ignore-externals"
+ESVN_UPDATE_CMD="svn update --ignore-externals"
IUSE="contrib debug pch"
@@ -32,7 +33,7 @@ RDEPEND="app-arch/zip
DEPEND="${RDEPEND}"
-PATCHES=( "${FILESDIR}"/codeblocks-17.12-nodebug.diff )
+PATCHES=( "${FILESDIR}/${P}-nodebug.diff" )
src_prepare() {
default
@@ -49,15 +50,13 @@ src_configure() {
econf \
--disable-static \
+ $(use_with contrib boost-libdir
"${ESYSROOT}/usr/$(get_libdir)") \
$(use_enable debug) \
$(use_enable pch) \
$(use_with contrib contrib-plugins all)
}
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
}
diff --git a/dev-util/codeblocks/files/codeblocks-17.12-nodebug.diff
b/dev-util/codeblocks/files/codeblocks--nodebug.diff
similarity index 80%
rename from dev-util/codeblocks/files/codeblocks-17.12-nodebug.diff
rename to dev-util/codeblocks/files/codeblocks--nodebug.diff
index 7cbb678dda6a..1187f53539fc 100644
--- a/dev-util/codeblocks/files/codeblocks-17.12-nodebug.diff
+++ b/dev-util/codeblocks/files/codeblocks--nodebug.diff
@@ -1,7 +1,7 @@
# 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.m42017-11-01 02:32:37.0 +0300
-+++ new/m4/acinclude.m42018-05-04 11:08:33.0 +0300
+--- 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)
[gentoo-commits] repo/gentoo:master commit in: dev-util/codeblocks/files/, dev-util/codeblocks/
commit: 56d8bafba4d7c3431ebcbd05492f0b16b5ce8001
Author: band-a-prend yandex ru>
AuthorDate: Wed Oct 14 15:29:49 2020 +
Commit: Sergei Trofimovich gentoo org>
CommitDate: Wed Oct 14 18:35:08 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=56d8bafb
dev-util/codeblocks: fix gcc-11 compatibility
The GCC 11 now enforces that comparison objects be invocable as const.
Current patch to fix gcc-11 compatibility is proposed by
Sergei Trofimovich gentoo.org>
and fix codeblocks "openfileslist" pligin compilation error.
Patch was sent to upstream :
https://sourceforge.net/p/codeblocks/tickets/1022/
so live-ebuild currently doesn't apply it.
Closes: https://bugs.gentoo.org/732818
Signed-off-by: Sergey Torokhov yandex.ru>
Closes: https://github.com/gentoo/gentoo/pull/17928
Signed-off-by: Sergei Trofimovich gentoo.org>
dev-util/codeblocks/codeblocks-17.12-r304.ebuild | 83 ++
dev-util/codeblocks/codeblocks-20.03-r2.ebuild | 77
.../codeblocks-20.03_gcc11_compatibility.patch | 12
3 files changed, 172 insertions(+)
diff --git a/dev-util/codeblocks/codeblocks-17.12-r304.ebuild
b/dev-util/codeblocks/codeblocks-17.12-r304.ebuild
new file mode 100644
index 000..88841742c92
--- /dev/null
+++ b/dev-util/codeblocks/codeblocks-17.12-r304.ebuild
@@ -0,0 +1,83 @@
+# 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-r2.ebuild
b/dev-util/codeblocks/codeblocks-20.03-r2.ebuild
new file mode 100644
index 000..16fbd94b772
--- /dev/null
+++ b/dev-util/codeblocks/codeblocks-20.03-r2.ebuild
@@ -0,0 +1,77 @@
+# 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.
+#
[gentoo-commits] repo/gentoo:master commit in: dev-util/codeblocks/files/, dev-util/codeblocks/
commit: 98cd643eb9453b7d80588428d97311d8caf2659a
Author: Sergey Torokhov yandex ru>
AuthorDate: Sun Mar 15 17:58:44 2020 +
Commit: Mart Raudsepp gentoo org>
CommitDate: Sun Mar 22 19:19:00 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=98cd643e
dev-util/codeblocks-17.12-r303: fix crash on paste; fix appdata-deprecated
- Fix crash on copy-paste from another applcation using upstream patch
https://sourceforge.net/p/codeblocks/code/11320/
from ticket
https://sourceforge.net/p/codeblocks/tickets/629/.
- Fix HOMEPAGE: from http://www to https://
- Fix installation into /usr/share/appdata that is deprecated
Signed-off-by: Sergey Torokhov yandex.ru>
Closes: https://github.com/gentoo/gentoo/pull/14969
Signed-off-by: Mart Raudsepp gentoo.org>
dev-util/codeblocks/codeblocks-17.12-r303.ebuild | 86 ++
.../codeblocks-17.12-fix-crash-on-copypaste.patch | 20 +
2 files changed, 106 insertions(+)
diff --git a/dev-util/codeblocks/codeblocks-17.12-r303.ebuild
b/dev-util/codeblocks/codeblocks-17.12-r303.ebuild
new file mode 100644
index 000..3a4c4727590
--- /dev/null
+++ b/dev-util/codeblocks/codeblocks-17.12-r303.ebuild
@@ -0,0 +1,86 @@
+# 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/files/codeblocks-17.12-fix-crash-on-copypaste.patch
b/dev-util/codeblocks/files/codeblocks-17.12-fix-crash-on-copypaste.patch
new file mode 100644
index 000..9918c58d8e8
--- /dev/null
+++ b/dev-util/codeblocks/files/codeblocks-17.12-fix-crash-on-copypaste.patch
@@ -0,0 +1,20 @@
+# 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.0 +0300
b/src/src/main.cpp 2020-03-13 21:59:25.0 +0300
+@@ -4321,7 +4321,13 @@
+ }
+
+ if (Manager::Get()->GetEditorManager() && event.GetEditor() ==
Manager::Get()->GetEditorManager()->GetActiveEditor())
+-DoUpdateStatusBar();
++{
++#if wxCHECK_VERSION(3, 0, 0)
++CallAfter(::DoUpdateStatusBar);
++#else
++DoUpdateStatusBar();
++#endif // wxCHECK_VERSION(3, 0, 0)
++}
+
+ event.Skip();
[gentoo-commits] repo/gentoo:master commit in: dev-util/codeblocks/files/, dev-util/codeblocks/
commit: 27c7e3e956953056c4da2cac4521c40062687445
Author: band-a-prend yandex ru>
AuthorDate: Sat May 26 21:08:45 2018 +
Commit: Mart Raudsepp gentoo org>
CommitDate: Sat Jul 14 19:32:12 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=27c7e3e9
dev-util/codeblocks: unbundle dev-util/astyle lib
Unbundle the dev-util/astyle library in favor of system installed
by adding it as build dependency ( >=dev-util/astyle-3.0.1-r1:0= ):
1. patching (update) the Codeblocks Astyle plugin to be compatible with
dev-util/astyle-3.1:
"codeblocks-17.12_update_astyle_plugin_to_v3.1.patch" that is taken from
upstream:
https://sourceforge.net/p/codeblocks/code/11266/
* updated astyle plugin to v3.1
* removed obsolete astyle options
* added new astyle options
Authored by: jenslody 2018-01-15
(using conditional patching depends on if '>=dev-util/astyle-3.1' is installed
in system);
2. use sub-sloting of dev-util/astyle to force rebuild Codeblocks on system
update
if sub-slot of dev-util/astyle is changed;
3. remove KEYWORD "arm" to avoid repoman QA warning about "dependency.bad" and
"dependency.badindev" due to dev-util/astyle dependency doesn't have this
KEYWORD.
Closes: https://bugs.gentoo.org/383037
Closes: https://bugs.gentoo.org/656758
dev-util/codeblocks/codeblocks-17.12-r1.ebuild | 8 +-
dev-util/codeblocks/codeblocks-17.12-r301.ebuild | 8 +-
...blocks-17.12_update_astyle_plugin_to_v3.1.patch | 414 +
3 files changed, 426 insertions(+), 4 deletions(-)
diff --git a/dev-util/codeblocks/codeblocks-17.12-r1.ebuild
b/dev-util/codeblocks/codeblocks-17.12-r1.ebuild
index daeb448b5c2..0c02036d954 100644
--- a/dev-util/codeblocks/codeblocks-17.12-r1.ebuild
+++ b/dev-util/codeblocks/codeblocks-17.12-r1.ebuild
@@ -11,7 +11,7 @@ DESCRIPTION="The open source, cross platform, free C, C++ and
Fortran IDE"
HOMEPAGE="http://www.codeblocks.org/;
LICENSE="GPL-3"
SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc ~x86 ~x86-fbsd"
+KEYWORDS="~amd64 ~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)
@@ -31,15 +31,19 @@ RDEPEND="app-arch/zip
DEPEND="${RDEPEND}
>=dev-libs/tinyxml-2.6.2-r3
+ >=dev-util/astyle-3.0.1-r1:0=
virtual/pkgconfig"
PATCHES=(
"${FILESDIR}"/codeblocks-17.12-nodebug.diff
"${WORKDIR}"/patches/
-)
+ )
src_prepare() {
default
+ if has_version ">=dev-util/astyle-3.1" ; then
+ epatch
"${FILESDIR}"/codeblocks-17.12_update_astyle_plugin_to_v3.1.patch
+ fi
eautoreconf
}
diff --git a/dev-util/codeblocks/codeblocks-17.12-r301.ebuild
b/dev-util/codeblocks/codeblocks-17.12-r301.ebuild
index 164c9d11fd4..82d63b0809f 100644
--- a/dev-util/codeblocks/codeblocks-17.12-r301.ebuild
+++ b/dev-util/codeblocks/codeblocks-17.12-r301.ebuild
@@ -11,7 +11,7 @@ DESCRIPTION="The open source, cross platform, free C, C++ and
Fortran IDE"
HOMEPAGE="http://www.codeblocks.org/;
LICENSE="GPL-3"
SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc ~x86 ~x86-fbsd"
+KEYWORDS="~amd64 ~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)
@@ -31,15 +31,19 @@ RDEPEND="app-arch/zip
DEPEND="${RDEPEND}
>=dev-libs/tinyxml-2.6.2-r3
+ >=dev-util/astyle-3.0.1-r1:0=
virtual/pkgconfig"
PATCHES=(
"${FILESDIR}"/codeblocks-17.12-nodebug.diff
"${WORKDIR}"/patches/
-)
+ )
src_prepare() {
default
+ if has_version ">=dev-util/astyle-3.1" ; then
+ epatch
"${FILESDIR}"/codeblocks-17.12_update_astyle_plugin_to_v3.1.patch
+ fi
eautoreconf
}
diff --git
a/dev-util/codeblocks/files/codeblocks-17.12_update_astyle_plugin_to_v3.1.patch
b/dev-util/codeblocks/files/codeblocks-17.12_update_astyle_plugin_to_v3.1.patch
new file mode 100644
index 000..c70cf083a44
--- /dev/null
+++
b/dev-util/codeblocks/files/codeblocks-17.12_update_astyle_plugin_to_v3.1.patch
@@ -0,0 +1,414 @@
+# Patch from: https://sourceforge.net/p/codeblocks/code/11266/
+# * updated astyle plugin to v3.1
+# * removed obsolete astyle options
+# * added new astyle options
+# Authored by: jenslody 2018-01-15
+diff -Naur codeblocks-17.12/src/plugins/astyle/asstreamiterator.cpp
codeblocks-code-11266-trunk/src/plugins/astyle/asstreamiterator.cpp
+--- codeblocks-17.12/src/plugins/astyle/asstreamiterator.cpp 2017-11-01
02:32:42.0 +0300
codeblocks-code-11266-trunk/src/plugins/astyle/asstreamiterator.cpp
2018-01-15 20:54:23.0 +0300
+@@ -2,9 +2,9 @@
+ * This file is part of the Code::Blocks IDE and licensed under the GNU
General Public License, version 3
+ * http://www.gnu.org/licenses/gpl-3.0.html
+ *
+- * $Revision: 9995 $
+- * $Id:
[gentoo-commits] repo/gentoo:master commit in: dev-util/codeblocks/files/, dev-util/codeblocks/
commit: 7cb12e41fb9ad7c68edacfe5d3f7509c912ca2c8
Author: Mart Raudsepp gentoo org>
AuthorDate: Sat Jul 14 18:40:40 2018 +
Commit: Mart Raudsepp gentoo org>
CommitDate: Sat Jul 14 19:32:12 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7cb12e41
dev-util/codeblocks: move large astyle patch to distfiles
Package-Manager: Portage-2.3.40, Repoman-2.3.9
dev-util/codeblocks/Manifest | 1 +
dev-util/codeblocks/codeblocks-17.12-r1.ebuild | 6 +-
dev-util/codeblocks/codeblocks-17.12-r301.ebuild | 6 +-
...blocks-17.12_update_astyle_plugin_to_v3.1.patch | 414 -
4 files changed, 9 insertions(+), 418 deletions(-)
diff --git a/dev-util/codeblocks/Manifest b/dev-util/codeblocks/Manifest
index 7bfced6413f..c685be7d1e5 100644
--- a/dev-util/codeblocks/Manifest
+++ b/dev-util/codeblocks/Manifest
@@ -1,2 +1,3 @@
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
diff --git a/dev-util/codeblocks/codeblocks-17.12-r1.ebuild
b/dev-util/codeblocks/codeblocks-17.12-r1.ebuild
index d6592a32274..33bc6b02fc6 100644
--- a/dev-util/codeblocks/codeblocks-17.12-r1.ebuild
+++ b/dev-util/codeblocks/codeblocks-17.12-r1.ebuild
@@ -12,7 +12,9 @@ HOMEPAGE="http://www.codeblocks.org/;
LICENSE="GPL-3"
SLOT="0"
KEYWORDS="~amd64 ~ppc ~x86 ~x86-fbsd"
-SRC_URI="mirror://sourceforge/${PN}/${P/-/_}.tar.xz
https://dev.gentoo.org/~leio/distfiles/${P}-fortran.tar.xz;
+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.
@@ -42,7 +44,7 @@ PATCHES=(
src_prepare() {
default
if has_version ">=dev-util/astyle-3.1" ; then
- epatch
"${FILESDIR}"/codeblocks-17.12_update_astyle_plugin_to_v3.1.patch
+ epatch
"${WORKDIR}"/codeblocks-17.12_update_astyle_plugin_to_v3.1.patch
fi
eautoreconf
}
diff --git a/dev-util/codeblocks/codeblocks-17.12-r301.ebuild
b/dev-util/codeblocks/codeblocks-17.12-r301.ebuild
index ccc5d2c786a..faf2dc26b2c 100644
--- a/dev-util/codeblocks/codeblocks-17.12-r301.ebuild
+++ b/dev-util/codeblocks/codeblocks-17.12-r301.ebuild
@@ -12,7 +12,9 @@ HOMEPAGE="http://www.codeblocks.org/;
LICENSE="GPL-3"
SLOT="0"
KEYWORDS="~amd64 ~ppc ~x86 ~x86-fbsd"
-SRC_URI="mirror://sourceforge/${PN}/${P/-/_}.tar.xz
https://dev.gentoo.org/~leio/distfiles/${P}-fortran.tar.xz;
+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.
@@ -42,7 +44,7 @@ PATCHES=(
src_prepare() {
default
if has_version ">=dev-util/astyle-3.1" ; then
- epatch
"${FILESDIR}"/codeblocks-17.12_update_astyle_plugin_to_v3.1.patch
+ epatch
"${WORKDIR}"/codeblocks-17.12_update_astyle_plugin_to_v3.1.patch
fi
eautoreconf
}
diff --git
a/dev-util/codeblocks/files/codeblocks-17.12_update_astyle_plugin_to_v3.1.patch
b/dev-util/codeblocks/files/codeblocks-17.12_update_astyle_plugin_to_v3.1.patch
deleted file mode 100644
index c70cf083a44..000
---
a/dev-util/codeblocks/files/codeblocks-17.12_update_astyle_plugin_to_v3.1.patch
+++ /dev/null
@@ -1,414 +0,0 @@
-# Patch from: https://sourceforge.net/p/codeblocks/code/11266/
-# * updated astyle plugin to v3.1
-# * removed obsolete astyle options
-# * added new astyle options
-# Authored by: jenslody 2018-01-15
-diff -Naur codeblocks-17.12/src/plugins/astyle/asstreamiterator.cpp
codeblocks-code-11266-trunk/src/plugins/astyle/asstreamiterator.cpp
codeblocks-17.12/src/plugins/astyle/asstreamiterator.cpp 2017-11-01
02:32:42.0 +0300
-+++
[gentoo-commits] repo/gentoo:master commit in: dev-util/codeblocks/files/, dev-util/codeblocks/
commit: 34f9194950f67c0863fed71c61990f811cd3b395
Author: Mart Raudsepp gentoo org>
AuthorDate: Mon May 28 22:04:50 2018 +
Commit: Mart Raudsepp gentoo org>
CommitDate: Mon May 28 22:04:50 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=34f91949
dev-util/codeblocks: remove old
Package-Manager: Portage-2.3.28, Repoman-2.3.9
dev-util/codeblocks/Manifest | 1 -
dev-util/codeblocks/codeblocks-16.01.ebuild| 45 --
.../codeblocks/files/codeblocks-16.01-gcc7.patch | 30 ---
3 files changed, 76 deletions(-)
diff --git a/dev-util/codeblocks/Manifest b/dev-util/codeblocks/Manifest
index 4c4d964fdb7..7bfced6413f 100644
--- a/dev-util/codeblocks/Manifest
+++ b/dev-util/codeblocks/Manifest
@@ -1,3 +1,2 @@
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-16.01.ebuild
b/dev-util/codeblocks/codeblocks-16.01.ebuild
deleted file mode 100644
index 07a042e6263..000
--- a/dev-util/codeblocks/codeblocks-16.01.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-WX_GTK_VER="2.8"
-
-inherit eutils flag-o-matic wxwidgets
-
-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/codeblocks/${P/-/_}.tar.gz"
-
-IUSE="contrib debug pch static-libs"
-
-S="${WORKDIR}/${P}.release"
-
-RDEPEND="app-arch/zip
- x11-libs/wxGTK:${WX_GTK_VER}[X]
- contrib? (
- app-text/hunspell
- dev-libs/boost:=
- dev-libs/libgamin
- )"
-DEPEND="${RDEPEND}
- virtual/pkgconfig"
-
-PATCHES=( "${FILESDIR}"/${P}-gcc7.patch )
-
-src_configure() {
- touch "${S}"/revision.m4 -r "${S}"/acinclude.m4
- setup-wxwidgets
-
- append-cxxflags $(test-flags-CXX -fno-delete-null-pointer-checks)
-
- econf \
- --with-wx-config="${WX_CONFIG}" \
- $(use_enable debug) \
- $(use_enable pch) \
- $(use_enable static-libs static) \
- $(use_with contrib contrib-plugins all)
-}
diff --git a/dev-util/codeblocks/files/codeblocks-16.01-gcc7.patch
b/dev-util/codeblocks/files/codeblocks-16.01-gcc7.patch
deleted file mode 100644
index 84cbc88696c..000
--- a/dev-util/codeblocks/files/codeblocks-16.01-gcc7.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-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;
- }
- };
-
