[gentoo-commits] repo/gentoo:master commit in: dev-util/codeblocks/, dev-util/codeblocks/files/

["Mart Raudsepp" <leio@gentoo.org>]

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>