commit: 789dcd525ba685c5166d334dc3e7e813ccd7c340 Author: David Seifert <soap <AT> gentoo <DOT> org> AuthorDate: Sat Aug 8 16:54:09 2020 +0000 Commit: David Seifert <soap <AT> gentoo <DOT> org> CommitDate: Sat Aug 8 16:54:09 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=789dcd52
media-sound/abcmidi: Fix building under -fno-common Closes: https://bugs.gentoo.org/707712 Package-Manager: Portage-3.0.1, Repoman-2.3.23 Signed-off-by: David Seifert <soap <AT> gentoo.org> media-sound/abcmidi/abcmidi-2020.01.22.ebuild | 17 +++++++++------- .../files/abcmidi-2016.05.05-fno-common.patch | 23 ++++++++++++++++++++++ 2 files changed, 33 insertions(+), 7 deletions(-) diff --git a/media-sound/abcmidi/abcmidi-2020.01.22.ebuild b/media-sound/abcmidi/abcmidi-2020.01.22.ebuild index 2dfe422dfb9..a88113b0190 100644 --- a/media-sound/abcmidi/abcmidi-2020.01.22.ebuild +++ b/media-sound/abcmidi/abcmidi-2020.01.22.ebuild @@ -6,6 +6,7 @@ EAPI=7 inherit autotools MY_P="abcMIDI-${PV}" + DESCRIPTION="Programs for processing ABC music notation files" HOMEPAGE="https://ifdo.ca/~seymour/runabc/top.html"; SRC_URI="https://ifdo.ca/~seymour/runabc/${MY_P}.zip"; @@ -13,14 +14,17 @@ SRC_URI="https://ifdo.ca/~seymour/runabc/${MY_P}.zip"; LICENSE="GPL-2" SLOT="0" KEYWORDS="~amd64 ~x86" -IUSE="examples" -DEPEND="app-arch/unzip" +BDEPEND="app-arch/unzip" S=${WORKDIR}/${PN} +PATCHES=( + "${FILESDIR}"/${PN}-2016.05.05-docs.patch + "${FILESDIR}"/${PN}-2016.05.05-fno-common.patch +) + src_prepare() { - local PATCHES=( "${FILESDIR}"/${PN}-2016.05.05-docs.patch ) default rm configure Makefile || die @@ -33,8 +37,7 @@ src_install() { default dodoc doc/{AUTHORS,CHANGES,abcguide.txt,abcmatch.txt,history.txt,readme.txt,yapshelp.txt} - if use examples ; then - docinto examples - dodoc samples/*.abc - fi + docinto examples + dodoc samples/*.abc + docompress -x /usr/share/doc/${PF}/examples } diff --git a/media-sound/abcmidi/files/abcmidi-2016.05.05-fno-common.patch b/media-sound/abcmidi/files/abcmidi-2016.05.05-fno-common.patch new file mode 100644 index 00000000000..e8ed8bec37e --- /dev/null +++ b/media-sound/abcmidi/files/abcmidi-2016.05.05-fno-common.patch @@ -0,0 +1,23 @@ +--- a/drawtune.c ++++ b/drawtune.c +@@ -75,7 +75,8 @@ + int rootstem; + int fontsize, fontnum; + int donemeter; +-int ingrace, inchord; ++extern int ingrace; ++int inchord; + int chordcount; + struct feature* chordhead; + +--- a/toabc.c ++++ b/toabc.c +@@ -85,7 +85,7 @@ + int new_key_number; /* used for gchord transposition */ + int oldtable[7], newtable[7]; /* for handling transposition */ + int inchord; /* are we in a chord [ ] ? */ +-int ingrace; /* are we in a grace note set { } ? */ ++extern int ingrace; /* are we in a grace note set { } ? */ + int chordcount; /* number of notes or rests in current chord */ + int inlinefield; /* boolean - are we in [<field>: ] ? */ + int cleanup; /* boolean to indicate -u option (update notation) */
