diff options
| author | V3n3RiX <venerix@redcorelinux.org> | 2018-04-16 16:47:37 +0100 |
|---|---|---|
| committer | V3n3RiX <venerix@redcorelinux.org> | 2018-04-16 16:47:37 +0100 |
| commit | 8aebb228036d5e2863b7eaa6e319ab41c1669269 (patch) | |
| tree | 00f4b90ce32462dc8e99ae54a31d6462ea2c3ac6 /dev-util/codeblocks | |
| parent | 76cba73c47c8694e74377004634daca18f2d9c08 (diff) | |
gentoo resync : 16.04.2018
Diffstat (limited to 'dev-util/codeblocks')
| -rw-r--r-- | dev-util/codeblocks/Manifest | 3 | ||||
| -rw-r--r-- | dev-util/codeblocks/codeblocks-16.01.ebuild | 4 | ||||
| -rw-r--r-- | dev-util/codeblocks/files/codeblocks-16.01-gcc7.patch | 30 |
3 files changed, 35 insertions, 2 deletions
diff --git a/dev-util/codeblocks/Manifest b/dev-util/codeblocks/Manifest index 65a73107f01b..1a0dfb63f6a4 100644 --- a/dev-util/codeblocks/Manifest +++ b/dev-util/codeblocks/Manifest @@ -1,4 +1,5 @@ +AUX codeblocks-16.01-gcc7.patch 1135 BLAKE2B ac57db38c781ecb7d8df0e05cad107c8a92ab205a52ff463959667b7dae18d2610ea222d80b68367d9772ded867e478325323e65c6b06cd748c5a7998511d265 SHA512 b9780f966ede4336bc49117a90a98c7131a4f49b48ce2c925d4b88d2c7d840ccf1aa00f5df022f6222d3da5e3aaf5ed1af391f2717f124a34c107a8c96dee4fb DIST codeblocks_16.01.tar.gz 20250097 BLAKE2B 7d3ede49b38ee3c58be30435d39ece38fd4f043a9b1cf0a3f53685ad93789ce650b5d8837f6f29f7bd73e150b527784321f7dcd3d94a767d80a8a3d4350e5905 SHA512 496ff2dbcf9a8248fa9f1060d50567d1fc6480cc9d8fc9f7d2cd532c82f4344deafe9b43f2b17d2510c74851e21acf2ca90d5cc7b61237d69a17e78e9907a63a -EBUILD codeblocks-16.01.ebuild 960 BLAKE2B 1da2951259b1f86e0280d17df4cd579179ac06584b241edf3099ba8a957fc280d57f73962ec346e9f927ed31adef8e4e904c2152bd631ee6e2908b99e058a159 SHA512 78c459024b8d132ffc44de86445162561a6cf2201758c1a429a9f72bf510833d6974e3964a1070ae801243934d29f9ea4006b5b8b887979032b9ea3268ed6228 +EBUILD codeblocks-16.01.ebuild 1003 BLAKE2B 1a5d584b2ad287cd02b6ad23260562c7f037fbd18ed8bc5fb3b733553bb79ac824f79fe344c85a1d4d4f26b6b5193c4daf7992cabd746064337b291ce9478d80 SHA512 5c5cce9c1d88989cf5ead2a51caa02e916fc08ba4085b8511ef310abb7eea8525aa13baa3feaad88f95caf279323ee0b4690f18b7b333cfc41cb3bd95844d78a EBUILD codeblocks-9999.ebuild 1249 BLAKE2B e96be4c155ca8dd71b1b768d106076c36728ab5521418cb8ba722081485efbc4ebcffa95e535ee98e138ede0968ab59584a98bceb79c990b590a3f6f9efdc8d4 SHA512 a0a9d87c06df9f1dccd43fb009c4ac4261dcfcc99138193b3836d9a0e6ebeb4ef38180a3388774ffd84c17abacde95589c35e0febc425b07cbc75dbac9f9b3e6 MISC metadata.xml 436 BLAKE2B 4a807f9ab3a6e9d0837f8972e286b6dea0a311e8ff32d1746bd688646441559a6fed92347024dee09f9bcf700e45362a014b7703fa270e02b2636f97dda894a6 SHA512 0ff3a17264a93d46efe1455778188ebd9f8bba8c9c0d7b5d6457d6c69d43db343d70f9b1f9ccfddb187ff3e827f4de05b1b632b3aafa4541b1f1f1bc20768aae diff --git a/dev-util/codeblocks/codeblocks-16.01.ebuild b/dev-util/codeblocks/codeblocks-16.01.ebuild index 047fa0975850..07a042e6263e 100644 --- a/dev-util/codeblocks/codeblocks-16.01.ebuild +++ b/dev-util/codeblocks/codeblocks-16.01.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -28,6 +28,8 @@ RDEPEND="app-arch/zip DEPEND="${RDEPEND} virtual/pkgconfig" +PATCHES=( "${FILESDIR}"/${P}-gcc7.patch ) + src_configure() { touch "${S}"/revision.m4 -r "${S}"/acinclude.m4 setup-wxwidgets diff --git a/dev-util/codeblocks/files/codeblocks-16.01-gcc7.patch b/dev-util/codeblocks/files/codeblocks-16.01-gcc7.patch new file mode 100644 index 000000000000..84cbc88696c7 --- /dev/null +++ b/dev-util/codeblocks/files/codeblocks-16.01-gcc7.patch @@ -0,0 +1,30 @@ +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 <jenslody@2a5c6006-c6dd-42ca-98ab-0921f2732cef> +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; + } + }; + |