From 055d38a0d22eb568fe5ff1e00970df11a2491d56 Mon Sep 17 00:00:00 2001
From: jubalh <>
Date: Jul 15 2021 22:32:37 +0000
Subject: Update abcm2ps to version 8.14.12 / rev 14 via SR 906396
https://build.opensuse.org/request/show/906396
by user jubalh + dimstar_suse
- Update to 8.14.12:
Fixes:
* crash when "%%break 1" and no measure bar in the tune
* crash when duplicated voice ending on %%staves with repeat variant
* crash when voice duplication with symbols without width
* crash or bad output when null value in %%scale
* problem when only bars in 2 voices followed %%staves of the second voice only
* crash when tuplet error in grace note sequence
* crash when grace note with empty tuplet
* crash when many broken rhythms after a single grace note
* access outside the deco array when error in U:
* crash when !xstem! with no note in the previous voice
* crash on tuplet without any note/rest
* crash when grace notes at end of line and voice overlay
* crash when !trem2! at start of a grace note sequence
* crash when wrong dura
---
diff --git a/.files b/.files
index ccb9335..ea4dbd2 100644
Binary files a/.files and b/.files differ
diff --git a/.rev b/.rev
index 9147106..646ca91 100644
--- a/.rev
+++ b/.rev
@@ -193,4 +193,39 @@
* fix: error "'staffwidth' too small" when generating sample3.abc
853528
+
+ 287fe73a062acfcd471a0140a8271b0f
+ 8.14.12
+
+ dimstar_suse
+ - Update to 8.14.12:
+ Fixes:
+ * crash when "%%break 1" and no measure bar in the tune
+ * crash when duplicated voice ending on %%staves with repeat variant
+ * crash when voice duplication with symbols without width
+ * crash or bad output when null value in %%scale
+ * problem when only bars in 2 voices followed %%staves of the second voice only
+ * crash when tuplet error in grace note sequence
+ * crash when grace note with empty tuplet
+ * crash when many broken rhythms after a single grace note
+ * access outside the deco array when error in U:
+ * crash when !xstem! with no note in the previous voice
+ * crash on tuplet without any note/rest
+ * crash when grace notes at end of line and voice overlay
+ * crash when !trem2! at start of a grace note sequence
+ * crash when wrong duration in 2 voice overlays and bad ties
+ * crash when accidental without a note at start of line after K:
+ * array overflow when wrong duration in voice overlay
+ * loss of left margin after first page since previous commit
+ * no respect of %%leftmargin with -E or -g
+ * bad placement of chord symbols when in a music line with only invisible rests
+ Syntax:
+ * Accept and remove one or two '%'s at start of all %%beginxxx lines
+ Generation:
+ * Move the CSS from XHTML to SVG
+ Build:
+ * configure: respect environment variable
+- Refresh compiler_flags.patch
+ 906396
+
diff --git a/abcm2ps-8.14.11.tar.gz b/abcm2ps-8.14.11.tar.gz
deleted file mode 120000
index 2dfcb96..0000000
--- a/abcm2ps-8.14.11.tar.gz
+++ /dev/null
@@ -1 +0,0 @@
-/ipfs/bafkreihdwu4nml5m4yrwdg7enopxw5jayej7xmnwgqdt4elc2utk3pz7hm
\ No newline at end of file
diff --git a/abcm2ps-8.14.12.tar.gz b/abcm2ps-8.14.12.tar.gz
new file mode 120000
index 0000000..a3ae116
--- /dev/null
+++ b/abcm2ps-8.14.12.tar.gz
@@ -0,0 +1 @@
+/ipfs/bafkreihzq4a3yjpvf2mkskb5btxqiwitkg3c76g4qd5fjozbiz6wbcdp5m
\ No newline at end of file
diff --git a/abcm2ps.changes b/abcm2ps.changes
index 2910c86..199f06d 100644
--- a/abcm2ps.changes
+++ b/abcm2ps.changes
@@ -1,4 +1,36 @@
-------------------------------------------------------------------
+Thu Jul 15 06:20:58 UTC 2021 - Michael Vetter
+
+- Update to 8.14.12:
+ Fixes:
+ * crash when "%%break 1" and no measure bar in the tune
+ * crash when duplicated voice ending on %%staves with repeat variant
+ * crash when voice duplication with symbols without width
+ * crash or bad output when null value in %%scale
+ * problem when only bars in 2 voices followed %%staves of the second voice only
+ * crash when tuplet error in grace note sequence
+ * crash when grace note with empty tuplet
+ * crash when many broken rhythms after a single grace note
+ * access outside the deco array when error in U:
+ * crash when !xstem! with no note in the previous voice
+ * crash on tuplet without any note/rest
+ * crash when grace notes at end of line and voice overlay
+ * crash when !trem2! at start of a grace note sequence
+ * crash when wrong duration in 2 voice overlays and bad ties
+ * crash when accidental without a note at start of line after K:
+ * array overflow when wrong duration in voice overlay
+ * loss of left margin after first page since previous commit
+ * no respect of %%leftmargin with -E or -g
+ * bad placement of chord symbols when in a music line with only invisible rests
+ Syntax:
+ * Accept and remove one or two '%'s at start of all %%beginxxx lines
+ Generation:
+ * Move the CSS from XHTML to SVG
+ Build:
+ * configure: respect environment variable
+- Refresh compiler_flags.patch
+
+-------------------------------------------------------------------
Mon Dec 7 08:57:29 UTC 2020 - Michael Vetter
- Update to 8.14.11:
diff --git a/abcm2ps.spec b/abcm2ps.spec
index 3980425..32d8e2d 100644
--- a/abcm2ps.spec
+++ b/abcm2ps.spec
@@ -1,7 +1,7 @@
#
# spec file for package abcm2ps
#
-# Copyright (c) 2020 SUSE LLC
+# Copyright (c) 2021 SUSE LLC
# Copyright (c) 2007 by Edgar Aichinger
#
# All modifications and additions to the file contributed by third parties
@@ -18,7 +18,7 @@
Name: abcm2ps
-Version: 8.14.11
+Version: 8.14.12
Release: 0
Summary: A program to typeset abc tunes into Postscript
License: LGPL-3.0-or-later
diff --git a/compiler_flags.patch b/compiler_flags.patch
index 626084a..b12eae4 100644
--- a/compiler_flags.patch
+++ b/compiler_flags.patch
@@ -1,23 +1,23 @@
-diff -urEbw abcm2ps-8.14.7/configure abcm2ps-8.14.7.new/configure
---- abcm2ps-8.14.7/configure 2020-02-19 14:00:51.000000000 +0100
-+++ abcm2ps-8.14.7.new/configure 2020-02-19 14:37:35.365351023 +0100
+diff -urEbw abcm2ps-8.14.12/configure abcm2ps-8.14.12.new/configure
+--- abcm2ps-8.14.12/configure 2021-07-14 16:15:45.000000000 +0200
++++ abcm2ps-8.14.12.new/configure 2021-07-15 08:26:38.120364301 +0200
@@ -6,7 +6,7 @@
- CC=gcc
- PKG_CONFIG=pkg-config
--CFLAGS="-g -O2 -Wall -pipe"
+ : "${CC:=gcc}"
+ : "${PKG_CONFIG:=pkg-config}"
+-CFLAGS="-g -O2 -Wall -pipe $CFLAGS"
+CFLAGS="$RPM_OPT_FLAGS -pipe"
srcdir=.
- prefix=/usr/local
-@@ -61,8 +61,8 @@
- if which $PKG_CONFIG > /dev/null ; then
- if $PKG_CONFIG --exists freetype2 ; then
- if $PKG_CONFIG --exists pangocairo ; then
-- CPPFLAGS="$CPPFLAGS -DHAVE_PANGO=1 `$PKG_CONFIG pango cairo freetype2 --cflags`"
-- LDLIBS="$LDLIBS `$PKG_CONFIG pangocairo pangoft2 freetype2 --libs`"
-+ CPPFLAGS="$CPPFLAGS -DHAVE_PANGO=1 `pkg-config pango cairo gobject-2.0 freetype2 --cflags`"
-+ LDLIBS="$LDLIBS `pkg-config pangocairo pangoft2 gobject-2.0 freetype2 --libs`"
- else
- echo "pangocairo not found - no pango support"
- fi
+ : "${prefix=/usr/local}"
+@@ -63,8 +63,8 @@
+ elif ! $PKG_CONFIG --exists pangocairo ; then
+ echo "pangocairo not found - no pango support"
+ else
+- CPPFLAGS="$CPPFLAGS -DHAVE_PANGO=1 `$PKG_CONFIG pango cairo freetype2 --cflags`"
+- LDLIBS="`$PKG_CONFIG pangocairo pangoft2 freetype2 --libs` $LDLIBS"
++ CPPFLAGS="$CPPFLAGS -DHAVE_PANGO=1 `pkg-config pango cairo gobject-2.0 freetype2 --cflags`"
++ LDLIBS="$LDLIBS `pkg-config pangocairo pangoft2 gobject-2.0 freetype2 --libs`"
+ fi
+
+ CPPFLAGS="$CPPFLAGS -I."