From: Dr. Tobias Quathamer Date: Sun, 28 Jan 2018 20:33:36 +0000 (+0100) Subject: Refresh patch X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=a1936b89236c17f1fa2abcb8f2f747d586073129;hp=405d1603ea646400226d189c2186c53cf93f9cf1;p=lilypond.git 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 bb103548c6..2a09dd6530 100644 --- 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 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 -