From 988dc479c10d6d555808075bc33355a3f27da716e41d351297e635b5f13f56e9 Mon Sep 17 00:00:00 2001 From: Jan Engelhardt Date: Wed, 27 Mar 2019 11:52:29 +0000 Subject: [PATCH] rename patch back OBS-URL: https://build.opensuse.org/package/show/server:http/varnish?expand=0&rev=93 --- ...ents.patch => varnish-5.1.2-add-fallthrough-comments.patch | 4 +++- varnish.spec | 3 +-- 2 files changed, 4 insertions(+), 3 deletions(-) rename varnish-6.2.0-add-fallthrough-comments.patch => varnish-5.1.2-add-fallthrough-comments.patch (98%) diff --git a/varnish-6.2.0-add-fallthrough-comments.patch b/varnish-5.1.2-add-fallthrough-comments.patch similarity index 98% rename from varnish-6.2.0-add-fallthrough-comments.patch rename to varnish-5.1.2-add-fallthrough-comments.patch index 2be3eba..041ce3c 100644 --- a/varnish-6.2.0-add-fallthrough-comments.patch +++ b/varnish-5.1.2-add-fallthrough-comments.patch @@ -1,3 +1,6 @@ +From: antoine.belvire@opensuse.org +Date: Fri Jun 23 19:42:07 UTC 2017 + GCC 7 introduces new warnings, including implicit fallthrough in switch blocks; see https://gcc.gnu.org/gcc-7/changes.html#c-family. This warnings are turned into errors in our case (-Werror). @@ -9,7 +12,6 @@ Note that most of these warnings are located in lib/libvgz, which will be upgraded in a future release (see commit 5fae561 on master branch at https://github.com/varnishcache/varnish-cache/commit/5fae561). --- --- bin/varnishadm/varnishadm.c | 1 + lib/libvgz/inflate.c | 18 ++++++++++++++++++ diff --git a/varnish.spec b/varnish.spec index 5c3f908..a037382 100644 --- a/varnish.spec +++ b/varnish.spec @@ -39,8 +39,7 @@ Source3: varnish.sysconfig Source5: varnish.logrotate Source7: varnish.service Source8: varnishlog.service -# PATCH-FIX-UPSTREAM varnish-6.2.0-add-fallthrough-comments.patch -- Fix build with GCC 7 -Patch: varnish-6.2.0-add-fallthrough-comments.patch +Patch: varnish-add-fallthrough-comments.patch BuildRequires: python3-docutils BuildRequires: python3-Sphinx BuildRequires: libxslt