[gentoo-commits] repo/gentoo:master commit in: dev-libs/libcss/

["Michael Weber" <xmw@gentoo.org>]

commit:     2f2c056f0abb7a03325c58ab1b6fa7dc5202f1e8
Author:     Michael Weber <xmw <AT> gentoo <DOT> org>
AuthorDate: Mon Dec 18 14:33:06 2017 +0000
Commit:     Michael Weber <xmw <AT> gentoo <DOT> org>
CommitDate: Mon Dec 18 14:34:06 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2f2c056f

dev-libs/libcss: Ignore some gcc diagnostics (upstream is aware of), version bump.

Closes: https://bugs.gentoo.org/626754
Closes: https://bugs.gentoo.org/626752
Bug: https://bugs.gentoo.org/636224
Package-Manager: Portage-2.3.19, Repoman-2.3.6

 dev-libs/libcss/Manifest                                     |  2 ++
 dev-libs/libcss/libcss-0.6.1.ebuild                          |  9 +++++++++
 dev-libs/libcss/{libcss-0.6.1.ebuild => libcss-0.7.0.ebuild} | 11 ++++++++++-
 3 files changed, 21 insertions(+), 1 deletion(-)

diff --git a/dev-libs/libcss/Manifest b/dev-libs/libcss/Manifest
index 53d3ac597e6..4530714975a 100644
--- a/dev-libs/libcss/Manifest
+++ b/dev-libs/libcss/Manifest
@@ -1,2 +1,4 @@
 DIST libcss-0.6.1-src.tar.gz 487329 BLAKE2B 4a751158c63aadbd21997ac4b695b9b1959097248a2eb8af452411c7eca6db49e31ef93255d62c2b049efc3ee6850412385c534d311daade218a1d0f65d40417 SHA512 9b72765a4f1e9e0a6eca0892f50d36d84b25354fd6e55fd9da5c541077e466e585093b34f3ff35591d59294b05f1485b224d5f9df41f07535a09b445795ae2b3
+DIST libcss-0.7.0-src.tar.gz 493022 BLAKE2B 12c4a940d93ecbae20c62f80ad17bb2932d2095e9eea98f35282e6e3e1bb411bf1f96ee38ab47662650437547441c8386a7da6083ee6642628d23c2e7893b6b0 SHA512 937469c87dccc77083e8c864558225ae6299fab7dcffe7670af6507e65cbfc7fcee22b74e58f4c34a89c05e917d3ed31440a92d89c26cf85e36d6ff3281d7712
 DIST netsurf-buildsystem-1.5.tar.gz 38196 BLAKE2B 298ef39d45b98ae5ef57a22aed9f22bf96dfd6ad5475964c04451eaf28aca7f451b4906002c3e110ffcc951015169f02ffcd85f24e54b46c47b25e048115db1c SHA512 02d85e8f1d2101194a678f7ccf84051390953285a46951d7b327556f8df1a0c416620bd4c7a615e25de438d5d27cfffb69ec5d94eb8379a295dab4c85a96cae4
+DIST netsurf-buildsystem-1.6.tar.gz 38204 BLAKE2B 58ac4aa2676c019a69b53f5115c82b522aa7db7b2a039a36f227b06b1d031ddc1eed463b09bfd13aeabddc421b2de396b58f2f8f131c261d5633fcd7a85272de SHA512 65ecafb54fc79107cfdb0fbea6acd4cad1fc9f338dde2ed9a48de066e245b7804a16337769c7602c7ab96b0d7544970f533d8c4615913c09b5a9ca4b9386fb28

diff --git a/dev-libs/libcss/libcss-0.6.1.ebuild b/dev-libs/libcss/libcss-0.6.1.ebuild
index b3c161ed1d2..349ae41ed4d 100644
--- a/dev-libs/libcss/libcss-0.6.1.ebuild
+++ b/dev-libs/libcss/libcss-0.6.1.ebuild
@@ -19,3 +19,12 @@ RDEPEND=">=dev-libs/libparserutils-0.2.1-r1[static-libs?,${MULTILIB_USEDEP}]
 DEPEND="${RDEPEND}
 	virtual/pkgconfig
 	test? ( dev-lang/perl )"
+
+src_prepare() {
+	sed -e '1i#pragma GCC diagnostic ignored "-Wimplicit-fallthrough"' \
+		-i src/parse/parse.c || die
+	sed -e '1i#pragma GCC diagnostic ignored "-Wmaybe-uninitialized"' \
+		-i src/parse/parse.c src/select/computed.c || die
+
+	netsurf_src_prepare
+}

diff --git a/dev-libs/libcss/libcss-0.6.1.ebuild b/dev-libs/libcss/libcss-0.7.0.ebuild
similarity index 62%
copy from dev-libs/libcss/libcss-0.6.1.ebuild
copy to dev-libs/libcss/libcss-0.7.0.ebuild
index b3c161ed1d2..67066814eb8 100644
--- a/dev-libs/libcss/libcss-0.6.1.ebuild
+++ b/dev-libs/libcss/libcss-0.7.0.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=5
 
-NETSURF_BUILDSYSTEM=buildsystem-1.5
+NETSURF_BUILDSYSTEM=buildsystem-1.6
 inherit netsurf
 
 DESCRIPTION="CSS parser and selection engine, written in C"
@@ -19,3 +19,12 @@ RDEPEND=">=dev-libs/libparserutils-0.2.1-r1[static-libs?,${MULTILIB_USEDEP}]
 DEPEND="${RDEPEND}
 	virtual/pkgconfig
 	test? ( dev-lang/perl )"
+
+src_prepare() {
+	sed -e '1i#pragma GCC diagnostic ignored "-Wimplicit-fallthrough"' \
+		-i src/parse/parse.c src/select/arena_hash.h || die
+	sed -e '1i#pragma GCC diagnostic ignored "-Wmaybe-uninitialized"' \
+		-i src/parse/parse.c src/select/computed.c || die
+
+	netsurf_src_prepare
+}