Refresh patch

diff --git a/debian/patches/Issue-4814-grob.cc-segfaults-with-gcc6 b/debian/patches/Issue-4814-grob.cc-segfaults-with-gcc6
index bb103548c63e75abe16c427ff3a29a0cc2045c07..2a09dd6530580d2948c4abb21587f1deca86a028 100644 (file)
--- a/debian/patches/Issue-4814-grob.cc-segfaults-with-gcc6
+++ b/debian/patches/Issue-4814-grob.cc-segfaults-with-gcc6
@@ -36,11 +36,9 @@ Signed-off-by: David Kastrup <dak@gnu.org>
  lily/grob.cc | 5 +++--
  1 file changed, 3 insertions(+), 2 deletions(-)
 
-diff --git a/lily/grob.cc b/lily/grob.cc
-index 7ce89d5015..eafa66288e 100644
 --- a/lily/grob.cc
 +++ b/lily/grob.cc
-@@ -333,7 +333,7 @@ Real
+@@ -330,7 +330,7 @@
  Grob::relative_coordinate (Grob const *refp, Axis a) const
  {
    /* eaa - hmmm, should we do a programming_error() here? */
@@ -49,7 +47,7 @@ index 7ce89d5015..eafa66288e 100644
      return 0.0;
  
    /* We catch PARENT_L_ == nil case with this, but we crash if we did
-@@ -342,7 +342,8 @@ Grob::relative_coordinate (Grob const *refp, Axis a) const
+@@ -339,7 +339,8 @@
    if (refp == dim_cache_[a].parent_)
      return off;
  
@@ -59,6 +57,3 @@ index 7ce89d5015..eafa66288e 100644
  
    return off;
  }
--- 
-2.11.0
-