Gentoo Archives: gentoo-commits

From: Mart Raudsepp <leio@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: dev-util/codeblocks/, dev-util/codeblocks/files/
Date: Sat, 05 May 2018 20:10:37
Message-Id: 1525550949.be84553eb924219ec51e6fefb62f937a3f4eb697.leio@gentoo
1 commit: be84553eb924219ec51e6fefb62f937a3f4eb697
2 Author: band-a-prend <torokhov-s-a <AT> yandex <DOT> ru>
3 AuthorDate: Fri Apr 27 00:45:56 2018 +0000
4 Commit: Mart Raudsepp <leio <AT> gentoo <DOT> org>
5 CommitDate: Sat May 5 20:09:09 2018 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=be84553e
7
8 dev-util/codeblocks: version bump to 17.12
9
10 Code::Blocks IDE package version bump to 17.12 with
11 switching 'WX_GTK_VER' from x11-libs/wxGTK:2.8 to x11-libs/wxGTK:3.0
12
13 This also adds a new USE flag 'fortran' which controls the
14 building of 'FortranProject plugin' for Code::Blocks IDE
15 ( https://sourceforge.net/projects/fortranproject/ )
16 after applying of 'FortranProject_autotools_build.diff' patch.
17
18 Add patch 'FortranProject_fix_build_gcc7_failed.patch'
19 from upstream that fix gcc7 compilation error
20 "call of overloaded ‘abs(unsigned int)’ is ambiguous"
21 for FortranProject plugin, i.e. when USE="fortran".
22
23 Remove USE=flag "static" with passing "--disable-static"
24 to econf within src_configure() section.
25
26 Remove directly passing "-g" compiler option to CFLAGS
27 and CXXFLAGS when USE="debug" by applying the patch
28 'codeblocks-17.12-nodebug.diff'.
29
30 Updating 'metadata.xml' file:
31 Adding 'fortran' USE-flag description for 'dev-util/codeblocks-17.12'.
32
33 Updating 'Manifest' file:
34 Adding size, blake2 and sha512 checksums for 'codeblocks_17.12.tar.xz' tarball
35
36 Bug: https://bugs.gentoo.org/643494
37 Closes: https://bugs.gentoo.org/643494
38
39 dev-util/codeblocks/Manifest | 2 +
40 dev-util/codeblocks/codeblocks-17.12.ebuild | 85 ++++++++++++++++++++++
41 .../codeblocks/files/codeblocks-17.12-nodebug.diff | 13 ++++
42 dev-util/codeblocks/metadata.xml | 1 +
43 4 files changed, 101 insertions(+)
44
45 diff --git a/dev-util/codeblocks/Manifest b/dev-util/codeblocks/Manifest
46 index 51d11daf5cd..4c4d964fdb7 100644
47 --- a/dev-util/codeblocks/Manifest
48 +++ b/dev-util/codeblocks/Manifest
49 @@ -1 +1,3 @@
50 +DIST codeblocks-17.12-fortran.tar.xz 3048 BLAKE2B 58fd3b95cea3303a41da31f5cffe08698fa51ff896c456224edd63d17ddfe8dd54b0c058bd2a68920cf15789bfe5e412054e4e603b1d644034d8cb43d3de3224 SHA512 78534706b6433ae93b680740b2e6c0b747119f6ac62477b901ceeb1900692465615e29f2837ceca48d127181fc6b653d6d49a85fdb8d2fb873ad5a915527936c
51 DIST codeblocks_16.01.tar.gz 20250097 BLAKE2B 7d3ede49b38ee3c58be30435d39ece38fd4f043a9b1cf0a3f53685ad93789ce650b5d8837f6f29f7bd73e150b527784321f7dcd3d94a767d80a8a3d4350e5905 SHA512 496ff2dbcf9a8248fa9f1060d50567d1fc6480cc9d8fc9f7d2cd532c82f4344deafe9b43f2b17d2510c74851e21acf2ca90d5cc7b61237d69a17e78e9907a63a
52 +DIST codeblocks_17.12.tar.xz 15725976 BLAKE2B 871427b5d8a2296e04d640c35d9129deebf1bb35cd1573652099c02ad4495c4c1369ed382ba714848d6bd75304195a25f6a91bece398bedaffbee8ae3547c46b SHA512 f90e756ca6f532656eeed34c6259c6a96ae85d172fc11e39f696ded9189cab7171d0cead18524fbab50dd782f21adbc7d52e2ea90535a3ed0aef5946b8a476e1
53
54 diff --git a/dev-util/codeblocks/codeblocks-17.12.ebuild b/dev-util/codeblocks/codeblocks-17.12.ebuild
55 new file mode 100644
56 index 00000000000..030721ae5bf
57 --- /dev/null
58 +++ b/dev-util/codeblocks/codeblocks-17.12.ebuild
59 @@ -0,0 +1,85 @@
60 +# Copyright 1999-2018 Gentoo Foundation
61 +# Distributed under the terms of the GNU General Public License v2
62 +
63 +EAPI=6
64 +
65 +WX_GTK_VER="3.0"
66 +
67 +inherit autotools flag-o-matic gnome2-utils wxwidgets xdg-utils
68 +
69 +DESCRIPTION="The open source, cross platform, free C++ IDE"
70 +HOMEPAGE="http://www.codeblocks.org/"
71 +LICENSE="GPL-3"
72 +SLOT="0"
73 +KEYWORDS="~amd64 ~arm ~ppc ~x86 ~x86-fbsd"
74 +SRC_URI="mirror://sourceforge/${PN}/${P/-/_}.tar.xz https://dev.gentoo.org/~leio/distfiles/${P}-fortran.tar.xz"
75 +
76 +# USE="fortran" enables FortranProject plugin (v1.5)
77 +# that is delivered with Code::Blocks 17.12 source code.
78 +# https://sourceforge.net/projects/fortranproject
79 +# http://cbfortran.sourceforge.net
80 +
81 +IUSE="contrib debug fortran pch"
82 +
83 +RDEPEND="app-arch/zip
84 + x11-libs/wxGTK:${WX_GTK_VER}[X]
85 + contrib? (
86 + app-text/hunspell
87 + dev-libs/boost:=
88 + dev-libs/libgamin
89 + )"
90 +
91 +DEPEND="${RDEPEND}
92 + sys-devel/autoconf:2.69
93 + sys-devel/automake
94 + virtual/pkgconfig"
95 +
96 +PATCHES=(
97 + "${FILESDIR}"/codeblocks-17.12-nodebug.diff
98 + "${WORKDIR}"/patches/
99 +)
100 +
101 +src_prepare() {
102 + default
103 + eautoreconf
104 +}
105 +
106 +src_configure() {
107 + setup-wxwidgets
108 +
109 + append-cxxflags $(test-flags-CXX -fno-delete-null-pointer-checks)
110 +
111 + # USE="contrib -fortran" setup:
112 + use fortran || CONF_WITH_LST=$(use_with contrib contrib-plugins all,-FortranProject)
113 + # USE="contrib fortran" setup:
114 + use fortran && CONF_WITH_LST=$(use_with contrib contrib-plugins all)
115 + # USE="-contrib fortran" setup:
116 + use contrib || CONF_WITH_LST=$(use_with fortran contrib-plugins FortranProject)
117 +
118 + econf \
119 + --with-wx-config="${WX_CONFIG}" \
120 + --disable-static \
121 + $(use_enable debug) \
122 + $(use_enable pch) \
123 + ${CONF_WITH_LST}
124 +}
125 +
126 +pkg_postinst() {
127 + if [[ ${WX_GTK_VER} == "3.0" || ${WX_GTK_VER} == "3.0-gtk3" ]]; then
128 + elog "KNOWN ISSUE:"
129 + elog "The symbols browser is disabled in wx3.x builds due to it causes crashes."
130 + elog "For more information see ticket https://sourceforge.net/p/codeblocks/tickets/225/"
131 + elog "with related commits https://sourceforge.net/p/codeblocks/code/11027/"
132 + elog "and https://sourceforge.net/p/codeblocks/code/11141/"
133 + fi
134 +
135 + xdg_desktop_database_update
136 + xdg_mimeinfo_database_update
137 + gnome2_icon_cache_update
138 +}
139 +
140 +pkg_postrm() {
141 + xdg_desktop_database_update
142 + xdg_mimeinfo_database_update
143 + gnome2_icon_cache_update
144 +}
145
146 diff --git a/dev-util/codeblocks/files/codeblocks-17.12-nodebug.diff b/dev-util/codeblocks/files/codeblocks-17.12-nodebug.diff
147 new file mode 100644
148 index 00000000000..7cbb678dda6
149 --- /dev/null
150 +++ b/dev-util/codeblocks/files/codeblocks-17.12-nodebug.diff
151 @@ -0,0 +1,13 @@
152 +# Remove adding of "-g" to CFLAGS and CXXFLAGS if "./configure --enable-debug"
153 +diff -Naur old/m4/acinclude.m4 new/m4/acinclude.m4
154 +--- old/m4/acinclude.m4 2017-11-01 02:32:37.000000000 +0300
155 ++++ new/m4/acinclude.m4 2018-05-04 11:08:33.000000000 +0300
156 +@@ -91,8 +91,6 @@
157 + AC_ARG_ENABLE(debug, [AC_HELP_STRING([--enable-debug], [turn on debugging (default is OFF)])],,
158 + enable_debug=$debug_default)
159 + if test "x$enable_debug" = "xyes"; then
160 +- CFLAGS="-g $CFLAGS"
161 +- CXXFLAGS="-g $CXXFLAGS"
162 + CPPFLAGS="-DDEBUG -DcbDEBUG $CPPFLAGS"
163 + AC_MSG_RESULT(yes)
164 + else
165
166 diff --git a/dev-util/codeblocks/metadata.xml b/dev-util/codeblocks/metadata.xml
167 index 0dcc7440843..4d0690ce374 100644
168 --- a/dev-util/codeblocks/metadata.xml
169 +++ b/dev-util/codeblocks/metadata.xml
170 @@ -11,6 +11,7 @@
171 </maintainer>
172 <use>
173 <flag name="contrib">Build additional contrib components</flag>
174 + <flag name="fortran">Build FortranProject plugin which enables to use Code::Blocks IDE for Fortran language</flag>
175 </use>
176 <upstream>
177 <remote-id type="sourceforge">codeblocks</remote-id>