From 1dde4e5c4b92d849bf1abf0a48135b2a0644f7e1 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Tue, 13 Mar 2018 16:55:35 +0000 Subject: gentoo resync : 13.03.2018 --- media-sound/nted/Manifest | 9 --- .../nted/files/nted-1.10.18-automake-1.12.patch | 11 ---- media-sound/nted/files/nted-1.10.18-cpp14.patch | 11 ---- media-sound/nted/files/nted-1.10.18-freetype.patch | 11 ---- media-sound/nted/files/nted-1.10.18-gcc47.patch | 13 ---- .../nted/files/nted-1.10.18-lilypond-tremolo.patch | 45 ------------- media-sound/nted/files/nted-1.10.18-lilypond.patch | 58 ----------------- media-sound/nted/metadata.xml | 5 -- media-sound/nted/nted-1.10.18-r3.ebuild | 73 ---------------------- 9 files changed, 236 deletions(-) delete mode 100644 media-sound/nted/Manifest delete mode 100644 media-sound/nted/files/nted-1.10.18-automake-1.12.patch delete mode 100644 media-sound/nted/files/nted-1.10.18-cpp14.patch delete mode 100644 media-sound/nted/files/nted-1.10.18-freetype.patch delete mode 100644 media-sound/nted/files/nted-1.10.18-gcc47.patch delete mode 100644 media-sound/nted/files/nted-1.10.18-lilypond-tremolo.patch delete mode 100644 media-sound/nted/files/nted-1.10.18-lilypond.patch delete mode 100644 media-sound/nted/metadata.xml delete mode 100644 media-sound/nted/nted-1.10.18-r3.ebuild (limited to 'media-sound/nted') diff --git a/media-sound/nted/Manifest b/media-sound/nted/Manifest deleted file mode 100644 index 225ed8173b4c..000000000000 --- a/media-sound/nted/Manifest +++ /dev/null @@ -1,9 +0,0 @@ -AUX nted-1.10.18-automake-1.12.patch 360 BLAKE2B 02ebffef3c240ac4a004e3ec76476ea113dec448d588f958cb75526bd672b1934a4db02889da79a3927008e83fe87149916913a04a08666217aab51bcb0a8b22 SHA512 2651b2e6330b6adb7c0877ed14ed351a7c96439da7f6bb283d1de30a119242fba7bb690586d83d99363084e8f3cc285e3a78ae45b6743e81682af1afeca43201 -AUX nted-1.10.18-cpp14.patch 394 BLAKE2B 28b871f8745330dcc794a6b91cde1105b25933e07406a44a3682fd6e3f214f6573f896a2170a1d2afbd9205075f59c4acea2524184f29c9307b77667089bb6e1 SHA512 a9abbe0da5bb968ee99f4560285b54f58f98f2727289f235717c58b96ab57f7728cde950f6c7daf44d2545cd5c2eaaeb37ade4f42daeeb92565cff318a1b2a46 -AUX nted-1.10.18-freetype.patch 274 BLAKE2B 8430c99dcf006f4a9e7b76b5e41b9fe110d084d57ecda0ae4f984320b9437e3ad4a1379c05a4f0013af50dffda9859bf41333391cb9584c726972e34966d6ddf SHA512 37da4f0ab97aaa0eb0f32d836d085dc8bf0310bd7aff40b273697815b3ddf8c6ec035a29b3e556eec892a38f2d64a19a06530dc6c133c29964704fa16a208a3b -AUX nted-1.10.18-gcc47.patch 380 BLAKE2B 3d4bef45fe2a7017d560f103efca2a6df72a695f34e09938f855573daa05cec7a74489885a43db1c9b00ab148f5a1aad73f15d29ba17395f5c030c9d42e0c693 SHA512 d3e390cfc387b12d2cded614b8f40001f9c03002f7da03e1c61a5c490df4a4327263393ced492e204416e006c37278429db2a825d5498b65fd2ad450df256ce0 -AUX nted-1.10.18-lilypond-tremolo.patch 1487 BLAKE2B fb54fa3a94424581564781d741cca90841264002963bb6a972b588eba3dc0c06350acdb6a9fccc5f79c7afb7445aab1f1aa3d7138acabd677f8d2ddad5a39a71 SHA512 f30cc982ce656d45579cf8af276d71f053de4e8cf403aa21d8edbf990b6a1aa90651d3e887451a2d90f5c91a09532aacc5c5aba15c3ff6d1d25792dd4ced8cf1 -AUX nted-1.10.18-lilypond.patch 2317 BLAKE2B 8dd657f33451b10485f7ba6348932bee3dd04830a113659b2d5c17687dfa1ce763c41429c8e4dc398f42212263877ea034489c712448d3608cd137ebceda0585 SHA512 c6414281c4eee507ab1d3a5499f6b21a0f84bbc94a6c187ec31dae899342e7a3b3b50d7b667eff6f65777682e362c8f9a7885473733f93bd805f66b1f78ead66 -DIST nted-1.10.18.tar.gz 4099835 BLAKE2B b6fa88abefcc2dca26e14a1a1c52fe6efe8a3e4b0b2eb14671354b54749eadbbc4a1dbea9ebcaf52137ee996b814053a28a5dd774b365b768883ae991bac0a83 SHA512 adf5b53afc9017f5fc89524c5b26e16acffd142da98296c598fa53259bb88770a7a2a1f527729adcff4819177173c4ffff90096c577d42534ea9721ecd964981 -EBUILD nted-1.10.18-r3.ebuild 1868 BLAKE2B 259a827b6af45d0a8d25d83da08883a21e3891e51a92e931d31c136f9763b2e1166c3a906668e420d6868614b6c314d49203d47ac4908a7d9a3b84f56a3c11ad SHA512 0a260f33268a17a804c68271ca513b065097d9aca2bc3800a00c633df6abc2cb04ad12409bbfc902d8a3eef138bab5e75f430d53fdadfe0af4be85097ce70d9d -MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84 diff --git a/media-sound/nted/files/nted-1.10.18-automake-1.12.patch b/media-sound/nted/files/nted-1.10.18-automake-1.12.patch deleted file mode 100644 index 0363e06ea6cd..000000000000 --- a/media-sound/nted/files/nted-1.10.18-automake-1.12.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- configure.in.dist 2011-01-27 13:10:04.000000000 +0000 -+++ configure.in 2013-03-07 23:17:13.529353811 +0000 -@@ -12,7 +12,7 @@ - AC_INIT([nted], [1.10.18], [nted-user@tu-chemnitz.de], [nted]) - AC_CONFIG_SRCDIR([beaming.h]) - AC_CONFIG_HEADERS([config.h]) --AM_INIT_AUTOMAKE([-Wall -Werror 1.10 foreign]) -+AM_INIT_AUTOMAKE([-Wall 1.10 foreign]) - - AC_PROG_CXX - diff --git a/media-sound/nted/files/nted-1.10.18-cpp14.patch b/media-sound/nted/files/nted-1.10.18-cpp14.patch deleted file mode 100644 index 04a2a15977e0..000000000000 --- a/media-sound/nted/files/nted-1.10.18-cpp14.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- idiotseditor/idiotseditor.cpp.dist 2016-09-18 10:47:58.933319888 +0200 -+++ idiotseditor/idiotseditor.cpp 2016-09-18 10:48:28.852321336 +0200 -@@ -2538,7 +2538,7 @@ - - #define BAR_COLOR 0, 0, 0 - #define NOMINATOR_COLOR 0, 0, 204 --#define HALF_COLOR 0.0, 26, 153 -+#define HALF_COLOR 0, 26, 153 - #define QUARTER_COLOR 0, 51, 127 - #define EIGHTS_COLOR 127, 77, 102 - #define COLOR_16 0, 102, 77 diff --git a/media-sound/nted/files/nted-1.10.18-freetype.patch b/media-sound/nted/files/nted-1.10.18-freetype.patch deleted file mode 100644 index 505e756af564..000000000000 --- a/media-sound/nted/files/nted-1.10.18-freetype.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- nted-1.10.18/mainwindow.cpp -+++ nted-1.10.18/mainwindow.cpp -@@ -24,7 +24,7 @@ - #include - #include - #include --#include -+#include FT_FREETYPE_H - #include - #include - #include diff --git a/media-sound/nted/files/nted-1.10.18-gcc47.patch b/media-sound/nted/files/nted-1.10.18-gcc47.patch deleted file mode 100644 index 8e706f62b99b..000000000000 --- a/media-sound/nted/files/nted-1.10.18-gcc47.patch +++ /dev/null @@ -1,13 +0,0 @@ -https://bugs.gentoo.org/show_bug.cgi?id=424291 -Index: nted-1.10.18/dynarray.h -=================================================================== ---- nted-1.10.18.orig/dynarray.h -+++ nted-1.10.18/dynarray.h -@@ -76,6 +76,7 @@ class NedDynArray { - - #include - #include -+#include - - static void erroraus(const char *s) { - fprintf(stderr, "%s\n", s); diff --git a/media-sound/nted/files/nted-1.10.18-lilypond-tremolo.patch b/media-sound/nted/files/nted-1.10.18-lilypond-tremolo.patch deleted file mode 100644 index a3c46c849a0e..000000000000 --- a/media-sound/nted/files/nted-1.10.18-lilypond-tremolo.patch +++ /dev/null @@ -1,45 +0,0 @@ -From 161e7cf6d2f0f18e9b44ef9ce960efb07c210c79 Mon Sep 17 00:00:00 2001 -From: Christopher Harvey -Date: Sun, 7 Oct 2012 15:41:00 -0400 -Subject: [PATCH] Fix LilyPond tremolo dotted chord export - -For example, NtEd would export "< a f' >4:8.", but the correct syntax -is "< a f' >4.:8" ---- - chordorrest.cpp | 13 ++++++------- - 1 files changed, 6 insertions(+), 7 deletions(-) - -diff --git a/chordorrest.cpp b/chordorrest.cpp -index cd93dab..9367f32 100644 ---- a/chordorrest.cpp -+++ b/chordorrest.cpp -@@ -3821,6 +3821,10 @@ void NedChordOrRest::exportLilyPond(FILE *fp, int *last_line, unsigned int *midi - fprintf(fp, " >"); - } - if (duration != *midi_len || (m_status & TREMOLO_MASK)) { -+ sprintf(Str, "%d", WHOLE_NOTE / m_length); -+ for (i = 0; i < m_dot_count; i++) { -+ strcat(Str, "."); -+ } - if (m_status & TREMOLO_MASK) { - switch (m_status & TREMOLO_MASK) { - case STAT_TREMOLO1: tremolo = 8; break; -@@ -3828,13 +3832,8 @@ void NedChordOrRest::exportLilyPond(FILE *fp, int *last_line, unsigned int *midi - case STAT_TREMOLO3: tremolo = 32; break; - case STAT_TREMOLO4: tremolo = 64; break; - } -- sprintf(Str, "%d:%d", WHOLE_NOTE / m_length, tremolo); -- } -- else { -- sprintf(Str, "%d", WHOLE_NOTE / m_length); -- } -- for (i = 0; i < m_dot_count; i++) { -- strcat(Str, "."); -+ sprintf(Str2, ":%d", tremolo); -+ strcat(Str, &Str2[0]); - } - force_length = true; - } --- -1.7.8.6 - diff --git a/media-sound/nted/files/nted-1.10.18-lilypond.patch b/media-sound/nted/files/nted-1.10.18-lilypond.patch deleted file mode 100644 index d1e77849e679..000000000000 --- a/media-sound/nted/files/nted-1.10.18-lilypond.patch +++ /dev/null @@ -1,58 +0,0 @@ -From 54881f2bdfc3d18e1496b7739124311d8e7c394a Mon Sep 17 00:00:00 2001 -From: Christopher Harvey -Date: Sun, 7 Oct 2012 15:05:03 -0400 -Subject: [PATCH] Fix LilyPond clef exporting - -For example, sometimes NtEd would export "\clef \clef tenor" instead -of just "\clef tenor" ---- - mainwindow.cpp | 4 +++- - resource.cpp | 14 +++++++------- - 2 files changed, 10 insertions(+), 8 deletions(-) - -diff --git a/mainwindow.cpp b/mainwindow.cpp -index 7263565..3343526 100644 ---- a/mainwindow.cpp -+++ b/mainwindow.cpp -@@ -3902,7 +3902,9 @@ void NedMainWindow::do_lily_export(FILE *fp, bool with_break, bool *selected_sta - if (m_staff_contexts[i].m_staff_short_name != NULL && strlen(m_staff_contexts[i].m_staff_short_name->getText()) > 0) { - fprintf(fp, " \\set Staff.shortInstrumentName = \"%s \"", m_staff_contexts[i].m_staff_short_name->getText()); - } -- fprintf(fp, NedResource::getLilyPondClefName(m_staff_contexts[i].m_clef_number)); -+ if (m_staff_contexts[i].m_clef_number != NEUTRAL_CLEF3) { -+ fprintf(fp, "\\clef %s", NedResource::getLilyPondClefName(m_staff_contexts[i].m_clef_number)); -+ } - fprintf(fp, NedResource::getLilyPondKeySigName(m_staff_contexts[i].m_key_signature_number)); - fprintf(fp, " \\time %d/%d", m_numerator, m_denominator); - if (m_upbeat_inverse != 0) { -diff --git a/resource.cpp b/resource.cpp -index 11c52b4..cff080f 100644 ---- a/resource.cpp -+++ b/resource.cpp -@@ -3870,16 +3870,16 @@ int NedResource::determineLastLine(int treble_line, int clef) { - - const char *NedResource::getLilyPondClefName(int clef_number) { - switch (clef_number) { -- case TREBLE_CLEF: return "\\clef treble"; -- case BASS_CLEF: return "\\clef bass"; -- case ALTO_CLEF: return "\\clef alto"; -- case SOPRAN_CLEF: return "\\clef soprano"; -- case TENOR_CLEF: return "\\clef tenor"; -+ case TREBLE_CLEF: return "treble"; -+ case BASS_CLEF: return "bass"; -+ case ALTO_CLEF: return "alto"; -+ case SOPRAN_CLEF: return "soprano"; -+ case TENOR_CLEF: return "tenor"; - case NEUTRAL_CLEF1: -- case NEUTRAL_CLEF2: return "\\clef percussion"; -+ case NEUTRAL_CLEF2: return "percussion"; - case NEUTRAL_CLEF3: return ""; - } -- return "\\clef treble"; -+ return "treble"; - } - const char *NedResource::getLilyPondKeySigName(int keysig_number) { - switch (keysig_number) { --- -1.7.8.6 - diff --git a/media-sound/nted/metadata.xml b/media-sound/nted/metadata.xml deleted file mode 100644 index 6f49eba8f496..000000000000 --- a/media-sound/nted/metadata.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - - - diff --git a/media-sound/nted/nted-1.10.18-r3.ebuild b/media-sound/nted/nted-1.10.18-r3.ebuild deleted file mode 100644 index bdd8eaf414f2..000000000000 --- a/media-sound/nted/nted-1.10.18-r3.ebuild +++ /dev/null @@ -1,73 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 -AUTOTOOLS_IN_SOURCE_BUILD=1 -AUTOTOOLS_AUTORECONF=1 - -inherit autotools-utils eutils toolchain-funcs - -DESCRIPTION="WYSIWYG score editor for GTK+" -HOMEPAGE="http://vsr.informatik.tu-chemnitz.de/staff/jan/nted/nted.xhtml" -SRC_URI="http://vsr.informatik.tu-chemnitz.de/staff/jan/${PN}/sources/${P}.tar.gz" - -LICENSE="GPL-2 FDL-1.2 NTED_FONT" -SLOT="0" -KEYWORDS="amd64 x86" -IUSE="doc debug nls" - -RDEPEND=" - >=dev-libs/glib-2:2 - media-libs/alsa-lib - >=media-libs/freetype-2.5.1 - x11-libs/cairo - >=x11-libs/gdk-pixbuf-2 - x11-libs/gtk+:2 - x11-libs/libX11 - x11-libs/pango -" -DEPEND="${RDEPEND} - virtual/pkgconfig - doc? ( app-text/xmlto ) - nls? ( sys-devel/gettext ) -" - -DOCS=( ABOUT_THE_EXAMPLES.TXT AUTHORS FAQ README ) - -PATCHES=( - "${FILESDIR}/${P}-gcc47.patch" # bug #424291 - "${FILESDIR}/${P}-lilypond.patch" # bug #437540 - "${FILESDIR}/${P}-lilypond-tremolo.patch" # bug #437540 - "${FILESDIR}/${P}-automake-1.12.patch" # bug #459466 - "${FILESDIR}/${P}-freetype.patch" # bug #514522 - "${FILESDIR}/${P}-cpp14.patch" # bug #594056 -) - -src_prepare() { - # fix desktop file, wrt bug #458080 - sed -i \ - -e 's/nted.png/nted/' \ - -e '/^Categories/s/Application;//' \ - datafiles/applications/nted.desktop || die 'sed on desktop file failed' - # drop -g from CXXFLAGS, wrt bug #458086 - sed -i -e '/CXXFLAGS/s/ -g//' configure.in || die 'sed on configure.in failed' - - autotools-utils_src_prepare -} - -src_configure() { - # Trick ./configure to believe we have gnome-extra/yelp installed. - has_version gnome-extra/yelp || export ac_cv_path_YELP="$(type -P true)" - - local myeconfargs=( - $(use_enable debug) - $(use_enable nls) - $(use_with doc) - ) - autotools-utils_src_configure -} - -src_compile() { - # respect AR, wrt bug #458084 - autotools-utils_src_compile AR="$(tc-getAR)" -} -- cgit v1.2.3