[packages/libCSS] - updated to 0.8.0 - removed outdated Remove-extra-braces-to-fix-build-with-gcc-7 patch

qboosh qboosh at pld-linux.org
Thu Dec 27 21:10:35 CET 2018


commit d78a97e5135005f9a43ec2867d699ee41a5feb54
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date:   Thu Dec 27 21:15:17 2018 +0100

    - updated to 0.8.0
    - removed outdated Remove-extra-braces-to-fix-build-with-gcc-7 patch

 ...move-extra-braces-to-fix-build-with-gcc-7.patch | 69 ----------------------
 libCSS.spec                                        | 16 +++--
 2 files changed, 7 insertions(+), 78 deletions(-)
---
diff --git a/libCSS.spec b/libCSS.spec
index cbbbb81..52be88a 100644
--- a/libCSS.spec
+++ b/libCSS.spec
@@ -5,19 +5,18 @@
 Summary:	CSS parser and selection engine
 Summary(pl.UTF-8):	Silnik analizujący i wybierający CSS
 Name:		libCSS
-Version:	0.7.0
+Version:	0.8.0
 Release:	1
 License:	MIT
 Group:		Libraries
 Source0:	http://download.netsurf-browser.org/libs/releases/libcss-%{version}-src.tar.gz
-# Source0-md5:	5a26cc9ff9921cc29ee137b1061c5689
-Patch0:		0001-Remove-extra-braces-to-fix-build-with-gcc-7.patch
+# Source0-md5:	b7cebcc75fd78f8b9b0702b8ff5eea3f
 URL:		http://www.netsurf-browser.org/projects/libcss/
-BuildRequires:	libparserutils-devel >= 0.2.3
-BuildRequires:	libwapcaplet-devel >= 0.4.0
-BuildRequires:	netsurf-buildsystem >= 1.6
-Requires:	libparserutils >= 0.2.3
-Requires:	libwapcaplet >= 0.4.0
+BuildRequires:	libparserutils-devel >= 0.2.4
+BuildRequires:	libwapcaplet-devel >= 0.4.1
+BuildRequires:	netsurf-buildsystem >= 1.7
+Requires:	libparserutils >= 0.2.4
+Requires:	libwapcaplet >= 0.4.1
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
@@ -76,7 +75,6 @@ Statyczna biblioteka libCSS.
 
 %prep
 %setup -q -n libcss-%{version}
-%patch0 -p1
 
 # create "gen" target just to execute PRE_TARGETS
 printf '\ngen: $(PRE_TARGETS)\n' >> Makefile
diff --git a/0001-Remove-extra-braces-to-fix-build-with-gcc-7.patch b/0001-Remove-extra-braces-to-fix-build-with-gcc-7.patch
deleted file mode 100644
index 36db5f9..0000000
--- a/0001-Remove-extra-braces-to-fix-build-with-gcc-7.patch
+++ /dev/null
@@ -1,69 +0,0 @@
-From f80a0e7bc0095a4f87c59422c13904fb6f3ab14a Mon Sep 17 00:00:00 2001
-From: Alastair Hughes <hobbitalastair at gmail.com>
-Date: Mon, 8 May 2017 07:49:17 +1200
-Subject: [PATCH] Remove extra braces to fix build with gcc 7
-
-GCC 7.1 warns on "implicit fallthrough" in case statements.
-To avoid false positives it will attempt to match comments directly
-before the fall through in question, and if any match some form of "fall
-through" the fall through is ignored.
-For this particular instance extra braces prevent the comment being
-recognized, as the following line is not a label or a new case; remove
-the excess braces to let GCC recognize the comments.
-
-Signed-off-by: Alastair Hughes <hobbitalastair at gmail.com>
----
- src/parse/parse.c | 4 ----
- 1 file changed, 4 deletions(-)
-
-diff --git a/src/parse/parse.c b/src/parse/parse.c
-index b65b0f5..7084a9e 100644
---- a/src/parse/parse.c
-+++ b/src/parse/parse.c
-@@ -2091,7 +2091,6 @@ css_error parseMalformedDeclaration(css_parser *parser)
- 
- 	switch (state->substate) {
- 	case Initial:
--	{
- 		/* Clear stack of open items */
- 		while (parserutils_stack_pop(parser->open_items, NULL) == 
- 				PARSERUTILS_OK)
-@@ -2099,7 +2098,6 @@ css_error parseMalformedDeclaration(css_parser *parser)
- 
- 		state->substate = Go;
- 		/* Fall through */
--	}
- 	case Go:
- 		while (1) {
- 			char want;
-@@ -2289,7 +2287,6 @@ css_error parseMalformedAtRule(css_parser *parser)
- 
- 	switch (state->substate) {
- 	case Initial:
--	{
- 		/* Clear stack of open items */
- 		while (parserutils_stack_pop(parser->open_items, NULL) == 
- 				PARSERUTILS_OK)
-@@ -2297,7 +2294,6 @@ css_error parseMalformedAtRule(css_parser *parser)
- 
- 		state->substate = Go;
- 		/* Fall through */
--	}
- 	case Go:
- 		while (1) {
- 			char want;
--- 
-2.12.2
-
---- libcss-0.7.0/src/select/arena_hash.h.orig	2017-10-12 18:27:41.000000000 +0200
-+++ libcss-0.7.0/src/select/arena_hash.h	2017-10-30 11:01:15.043076691 +0100
-@@ -50,7 +50,9 @@ static inline uint32_t css__arena_hash(c
- 	/* Hash any left over bytes */
- 	switch (len) {
- 	case 3: h ^= data[2] << 16;
-+		/* Fall through */
- 	case 2: h ^= data[1] << 8;
-+		/* Fall through */
- 	case 1: h ^= data[0];
- 		h *= m;
- 	}
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/libCSS.git/commitdiff/d78a97e5135005f9a43ec2867d699ee41a5feb54



More information about the pld-cvs-commit mailing list