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
