summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRobin H. Johnson <robbat2@gentoo.org>2015-08-08 13:49:04 -0700
committerRobin H. Johnson <robbat2@gentoo.org>2015-08-08 17:38:18 -0700
commit56bd759df1d0c750a065b8c845e93d5dfa6b549d (patch)
tree3f91093cdb475e565ae857f1c5a7fd339e2d781e /media-sound/nted
downloadgentoo-56bd759df1d0c750a065b8c845e93d5dfa6b549d.tar.gz
gentoo-56bd759df1d0c750a065b8c845e93d5dfa6b549d.tar.bz2
gentoo-56bd759df1d0c750a065b8c845e93d5dfa6b549d.zip
proj/gentoo: Initial commit
This commit represents a new era for Gentoo: Storing the gentoo-x86 tree in Git, as converted from CVS. This commit is the start of the NEW history. Any historical data is intended to be grafted onto this point. Creation process: 1. Take final CVS checkout snapshot 2. Remove ALL ChangeLog* files 3. Transform all Manifests to thin 4. Remove empty Manifests 5. Convert all stale $Header$/$Id$ CVS keywords to non-expanded Git $Id$ 5.1. Do not touch files with -kb/-ko keyword flags. Signed-off-by: Robin H. Johnson <robbat2@gentoo.org> X-Thanks: Alec Warner <antarus@gentoo.org> - did the GSoC 2006 migration tests X-Thanks: Robin H. Johnson <robbat2@gentoo.org> - infra guy, herding this project X-Thanks: Nguyen Thai Ngoc Duy <pclouds@gentoo.org> - Former Gentoo developer, wrote Git features for the migration X-Thanks: Brian Harring <ferringb@gentoo.org> - wrote much python to improve cvs2svn X-Thanks: Rich Freeman <rich0@gentoo.org> - validation scripts X-Thanks: Patrick Lauer <patrick@gentoo.org> - Gentoo dev, running new 2014 work in migration X-Thanks: Michał Górny <mgorny@gentoo.org> - scripts, QA, nagging X-Thanks: All of other Gentoo developers - many ideas and lots of paint on the bikeshed
Diffstat (limited to 'media-sound/nted')
-rw-r--r--media-sound/nted/Manifest1
-rw-r--r--media-sound/nted/files/nted-1.10.18-automake-1.12.patch11
-rw-r--r--media-sound/nted/files/nted-1.10.18-freetype.patch16
-rw-r--r--media-sound/nted/files/nted-1.10.18-gcc47.patch13
-rw-r--r--media-sound/nted/files/nted-1.10.18-lilypond-tremolo.patch45
-rw-r--r--media-sound/nted/files/nted-1.10.18-lilypond.patch58
-rw-r--r--media-sound/nted/metadata.xml7
-rw-r--r--media-sound/nted/nted-1.10.18-r3.ebuild73
8 files changed, 224 insertions, 0 deletions
diff --git a/media-sound/nted/Manifest b/media-sound/nted/Manifest
new file mode 100644
index 000000000000..ab2d7b755892
--- /dev/null
+++ b/media-sound/nted/Manifest
@@ -0,0 +1 @@
+DIST nted-1.10.18.tar.gz 4099835 SHA256 808df3c851dbc4b24efdbf96c4e6ed28152deb301c4373268831f2a243e8f1ac SHA512 adf5b53afc9017f5fc89524c5b26e16acffd142da98296c598fa53259bb88770a7a2a1f527729adcff4819177173c4ffff90096c577d42534ea9721ecd964981 WHIRLPOOL b450a8082fd95aa2e2cc40122197c528b3500e082d09ee6c9860d0b7290aa8d723ee07c019d4d034afd2e33e648bbc0c29672f1c9a98d88a9788377a8a2a7ff0
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
new file mode 100644
index 000000000000..0363e06ea6cd
--- /dev/null
+++ b/media-sound/nted/files/nted-1.10.18-automake-1.12.patch
@@ -0,0 +1,11 @@
+--- 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-freetype.patch b/media-sound/nted/files/nted-1.10.18-freetype.patch
new file mode 100644
index 000000000000..66acdf2c7ffa
--- /dev/null
+++ b/media-sound/nted/files/nted-1.10.18-freetype.patch
@@ -0,0 +1,16 @@
+Description: Fix FTBFS caused by freetype headers path change.
+Author: Gilles Filippini <pini@debian.org>
+Bug-Debian: http://bugs.debian.org/733403
+Index: nted/mainwindow.cpp
+===================================================================
+--- nted.orig/mainwindow.cpp 2013-12-30 17:45:21.000000000 +0100
++++ nted/mainwindow.cpp 2013-12-30 17:45:44.000000000 +0100
+@@ -24,7 +24,7 @@
+ #include <stdio.h>
+ #include <time.h>
+ #include <ft2build.h>
+-#include <freetype/freetype.h>
++#include <freetype.h>
+ #include <gtk/gtk.h>
+ #include <gdk/gdkkeysyms.h>
+ #include <cairo-ps.h>
diff --git a/media-sound/nted/files/nted-1.10.18-gcc47.patch b/media-sound/nted/files/nted-1.10.18-gcc47.patch
new file mode 100644
index 000000000000..8e706f62b99b
--- /dev/null
+++ b/media-sound/nted/files/nted-1.10.18-gcc47.patch
@@ -0,0 +1,13 @@
+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 <stdlib.h>
+ #include <stdio.h>
++#include <string.h>
+
+ 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
new file mode 100644
index 000000000000..a3c46c849a0e
--- /dev/null
+++ b/media-sound/nted/files/nted-1.10.18-lilypond-tremolo.patch
@@ -0,0 +1,45 @@
+From 161e7cf6d2f0f18e9b44ef9ce960efb07c210c79 Mon Sep 17 00:00:00 2001
+From: Christopher Harvey <chris@basementcode.com>
+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
new file mode 100644
index 000000000000..d1e77849e679
--- /dev/null
+++ b/media-sound/nted/files/nted-1.10.18-lilypond.patch
@@ -0,0 +1,58 @@
+From 54881f2bdfc3d18e1496b7739124311d8e7c394a Mon Sep 17 00:00:00 2001
+From: Christopher Harvey <chris@basementcode.com>
+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
new file mode 100644
index 000000000000..a40624fba8f0
--- /dev/null
+++ b/media-sound/nted/metadata.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer>
+ <email>maintainer-needed@gentoo.org</email>
+</maintainer>
+</pkgmetadata>
diff --git a/media-sound/nted/nted-1.10.18-r3.ebuild b/media-sound/nted/nted-1.10.18-r3.ebuild
new file mode 100644
index 000000000000..495a5d2254ae
--- /dev/null
+++ b/media-sound/nted/nted-1.10.18-r3.ebuild
@@ -0,0 +1,73 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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
+)
+
+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)"
+}