From d4bd6695641f6d2ec7ff8681913d304e995902f5 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Tue, 29 May 2018 03:22:09 +0100 Subject: gentoo resync : 29.05.2018 --- dev-util/codeblocks/Manifest | 5 +-- dev-util/codeblocks/codeblocks-16.01.ebuild | 45 ---------------------- dev-util/codeblocks/codeblocks-9999.ebuild | 4 +- .../codeblocks/files/codeblocks-16.01-gcc7.patch | 30 --------------- 4 files changed, 3 insertions(+), 81 deletions(-) delete mode 100644 dev-util/codeblocks/codeblocks-16.01.ebuild delete mode 100644 dev-util/codeblocks/files/codeblocks-16.01-gcc7.patch (limited to 'dev-util/codeblocks') diff --git a/dev-util/codeblocks/Manifest b/dev-util/codeblocks/Manifest index fe835d0c0be2..187f5c15dce4 100644 --- a/dev-util/codeblocks/Manifest +++ b/dev-util/codeblocks/Manifest @@ -1,10 +1,7 @@ -AUX codeblocks-16.01-gcc7.patch 1135 BLAKE2B ac57db38c781ecb7d8df0e05cad107c8a92ab205a52ff463959667b7dae18d2610ea222d80b68367d9772ded867e478325323e65c6b06cd748c5a7998511d265 SHA512 b9780f966ede4336bc49117a90a98c7131a4f49b48ce2c925d4b88d2c7d840ccf1aa00f5df022f6222d3da5e3aaf5ed1af391f2717f124a34c107a8c96dee4fb AUX codeblocks-17.12-nodebug.diff 611 BLAKE2B 03de6a604b0971e7b91702fd9a1f66aee6d87538177947762ce7b112bf6e81e75349c76415f1a18ac4ee0b41fa4f1257085af1031988c3346a45402b7bfebe73 SHA512 d5332803a0d9cbcbcafa5fa18d90bea07ff43d8ff93922d577b3b2dddc6349a7b01c9100f6198905d531e31edd0f5ba0b5a88db38df981c567644f8e7e11022a 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 -EBUILD codeblocks-16.01.ebuild 1003 BLAKE2B 1a5d584b2ad287cd02b6ad23260562c7f037fbd18ed8bc5fb3b733553bb79ac824f79fe344c85a1d4d4f26b6b5193c4daf7992cabd746064337b291ce9478d80 SHA512 5c5cce9c1d88989cf5ead2a51caa02e916fc08ba4085b8511ef310abb7eea8525aa13baa3feaad88f95caf279323ee0b4690f18b7b333cfc41cb3bd95844d78a EBUILD codeblocks-17.12-r300.ebuild 2014 BLAKE2B 6b99be334575d995d4537c192b90785c3628a6ee0c377957519d200ae7a931bea5e0ebd2cabed7d0fde9808bea95795d0fbd85c3417999197800db57c70be329 SHA512 a6bcd96a13095c3e31357d94cdd76fba0f7161120261750edbffd81b243b9323f089bb91a4929f317e79fde85c7579ef72fe5dcbd241a0cc7eef6dd385599b83 EBUILD codeblocks-17.12.ebuild 2009 BLAKE2B a2266b73e5b75e95173240f01929146cb81d9313c570589899142c4631660bf214384fdbb73522bca1bf33d7a40cc0217eb5beb78d1b1998bf2e483ace970bdb SHA512 43d790abbd465566cf5aa18ca86133e7835c51643a570d23b43ac8df74e74a764079077e1e40c1a7b5d30c19d28cf4f9377f6b689f5618bac4e9e8539b57d132 -EBUILD codeblocks-9999.ebuild 1249 BLAKE2B e96be4c155ca8dd71b1b768d106076c36728ab5521418cb8ba722081485efbc4ebcffa95e535ee98e138ede0968ab59584a98bceb79c990b590a3f6f9efdc8d4 SHA512 a0a9d87c06df9f1dccd43fb009c4ac4261dcfcc99138193b3836d9a0e6ebeb4ef38180a3388774ffd84c17abacde95589c35e0febc425b07cbc75dbac9f9b3e6 +EBUILD codeblocks-9999.ebuild 1249 BLAKE2B 143412cd2c6b0652612cbb89e0385803ccadfd34fda6df4a0bbf8a4628f5dfedc5480f890b57e814778768cfe7b728fddd0e8119086c61b0a1b5b6433cd5d053 SHA512 f2d31b7ef1d77d92d388c9a2c89114d14cc0c5bd7e1e29f120cf9ad12bd43d14d04adacd0f63e0bdc340c2b229477a41f43cd36f0e489a8e85a1f0601338808d MISC metadata.xml 673 BLAKE2B 2868f0b98e33bfa54b217038a440d01d7f289093a6d31873b33f9eb3570c9f83c57476d2aaeabfbbdc180ec00fbdb300ec68cbb45ee95ddf99b3ddf7e92681f6 SHA512 54996828105be8435499880af88e1bb48eb746787f4838e691ddf740c86c3ca84a09973a9925ff160308ba1a28a5e746f58d2d1b646f922a2949368dc3a016fc diff --git a/dev-util/codeblocks/codeblocks-16.01.ebuild b/dev-util/codeblocks/codeblocks-16.01.ebuild deleted file mode 100644 index 07a042e6263e..000000000000 --- 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/codeblocks-9999.ebuild b/dev-util/codeblocks/codeblocks-9999.ebuild index 4592ffeead9c..9296cc13443b 100644 --- a/dev-util/codeblocks/codeblocks-9999.ebuild +++ b/dev-util/codeblocks/codeblocks-9999.ebuild @@ -1,8 +1,8 @@ -# Copyright 1999-2016 Gentoo Foundation +# Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 EAPI="5" -WX_GTK_VER="2.8" +WX_GTK_VER="3.0" inherit autotools eutils subversion wxwidgets 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 84cbc88696c7..000000000000 --- 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 +0000 -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; - } - }; - -- cgit v1.2.3