- Update to 1.0.0

PR:		177923
Submitted by:	Ports Fury

9 files changed, 32 insertions, 122 deletions

diff --git a/audio/denemo/files/patch-src__alsabackend.h b/audio/denemo/files/patch-src__alsabackend.h
deleted file mode 100644
index 1e48eb4c289b..000000000000
--- a/audio/denemo/files/patch-src__alsabackend.h
+++ /dev/null
@@ -1,26 +0,0 @@
---- src/alsabackend.h
-+++ src/alsabackend.h
-@@ -0,0 +1,23 @@
-+/*
-+ * alsabackend.h
-+ * ALSA sequencer MIDI backend.
-+ *
-+ * for Denemo, a gtk+ frontend to GNU Lilypond
-+ * Copyright (C) 2011  Dominic Sacré
-+ *
-+ * This program is free software: you can redistribute it and/or modify
-+ * it under the terms of the GNU General Public License as published by
-+ * the Free Software Foundation, either version 3 of the License, or
-+ * (at your option) any later version.
-+ */
-+
-+#ifndef ALSABACKEND_H
-+#define ALSABACKEND_H
-+
-+#include "audiointerface.h"
-+
-+extern backend_t alsa_seq_midi_backend;
-+
-+
-+#endif // ALSABACKEND_H
-+
diff --git a/audio/denemo/files/patch-src__audiointerface.c b/audio/denemo/files/patch-src__audiointerface.c
deleted file mode 100644
index 8866c0d34af3..000000000000
--- a/audio/denemo/files/patch-src__audiointerface.c
+++ /dev/null
@@ -1,10 +0,0 @@
---- src/audiointerface.c.orig	2012-09-20 22:44:28.771017000 +0900
-+++ src/audiointerface.c	2012-10-05 06:05:30.000000000 +0900
-@@ -14,6 +14,7 @@
- #include "audiointerface.h"
- #include "eventqueue.h"
- #include "dummybackend.h"
-+#include "sourceaudio.h"
- 
- #ifdef _HAVE_JACK_
-   #include "jackbackend.h"
diff --git a/audio/denemo/files/patch-src__eventqueue.c b/audio/denemo/files/patch-src__eventqueue.c
deleted file mode 100644
index 4edf51e5652d..000000000000
--- a/audio/denemo/files/patch-src__eventqueue.c
+++ /dev/null
@@ -1,10 +0,0 @@
---- src/eventqueue.c.orig	2012-09-20 22:44:28.795017000 +0900
-+++ src/eventqueue.c	2012-10-05 06:05:30.000000000 +0900
-@@ -13,6 +13,7 @@
- 
- #include "eventqueue.h"
- #include "midi.h"
-+#include "moveviewport.h"
- 
- #include <glib.h>
- #include <string.h>
diff --git a/audio/denemo/files/patch-src__file.c b/audio/denemo/files/patch-src__file.c
new file mode 100644
index 000000000000..66732c931944
--- /dev/null
+++ b/audio/denemo/files/patch-src__file.c
@@ -0,0 +1,11 @@
+--- src/file.c.orig
++++ src/file.c
+@@ -556,7 +556,7 @@
+     default_template_path = local_template_path;   
+   } else if(local==EXAMPLE){
+     if(system_example_path==NULL) {
+-      system_example_path = g_build_filename (get_data_dir (), "examples", NULL);
++      system_example_path = g_build_filename (get_data_dir (), "..", "examples", "denemo", NULL);
+       GDir *denemo_path = g_dir_open(system_example_path, 0, NULL);
+       if(denemo_path == NULL) {
+ 	warningdialog ("No examples directory in installation");
diff --git a/audio/denemo/files/patch-src__help.c b/audio/denemo/files/patch-src__help.c
new file mode 100644
index 000000000000..f0057b8e49d7
--- /dev/null
+++ b/audio/denemo/files/patch-src__help.c
@@ -0,0 +1,11 @@
+--- src/help.c.orig
++++ src/help.c
+@@ -63,7 +63,7 @@
+   GError *error = NULL;
+ 
+   /* get the uri to the manual */
+-  gchar *manualpath = g_build_filename (get_data_dir (), "manual",
++  gchar *manualpath = g_build_filename (get_data_dir (), "..", "doc", "denemo", "manual",
+                                         "denemo-manual.html", NULL);
+   gchar *manualuri =  url?g_strdup(url):g_filename_to_uri (manualpath, NULL, NULL);
+ 
diff --git a/audio/denemo/files/patch-src__jackbackend.h b/audio/denemo/files/patch-src__jackbackend.h
deleted file mode 100644
index 55f2336841c8..000000000000
--- a/audio/denemo/files/patch-src__jackbackend.h
+++ /dev/null
@@ -1,26 +0,0 @@
---- src/jackbackend.h
-+++ src/jackbackend.h
-@@ -0,0 +1,23 @@
-+/*
-+ * jackbackend.h
-+ * JACK audio and MIDI backends.
-+ *
-+ * for Denemo, a gtk+ frontend to GNU Lilypond
-+ * Copyright (C) 2011  Dominic Sacré
-+ *
-+ * This program is free software: you can redistribute it and/or modify
-+ * it under the terms of the GNU General Public License as published by
-+ * the Free Software Foundation, either version 3 of the License, or
-+ * (at your option) any later version.
-+ */
-+
-+#ifndef JACKBACKEND_H
-+#define JACKBACKEND_H
-+
-+#include "audiointerface.h"
-+
-+extern backend_t jack_audio_backend;
-+extern backend_t jack_midi_backend;
-+
-+
-+#endif // JACKBACKEND_H
diff --git a/audio/denemo/files/patch-src__jackutil.h b/audio/denemo/files/patch-src__jackutil.h
deleted file mode 100644
index 75de1aaa15c1..000000000000
--- a/audio/denemo/files/patch-src__jackutil.h
+++ /dev/null
@@ -1,40 +0,0 @@
---- src/jackutil.h
-+++ src/jackutil.h
-@@ -0,0 +1,37 @@
-+/*
-+ * jackutil.h
-+ * JACK utility functions.
-+ *
-+ * for Denemo, a gtk+ frontend to GNU Lilypond
-+ * Copyright (C) 2011  Dominic Sacré
-+ *
-+ * This program is free software: you can redistribute it and/or modify
-+ * it under the terms of the GNU General Public License as published by
-+ * the Free Software Foundation, either version 3 of the License, or
-+ * (at your option) any later version.
-+ */
-+
-+#ifndef JACKUTIL_H
-+#define JACKUTIL_H
-+
-+#include <glib.h>
-+
-+/**
-+ * Returns a list of available JACK port names, that is, ports to which our
-+ * own input/output ports can be connected.
-+ *
-+ * If the JACK server is not running or there are no available ports, this
-+ * function returns NULL.
-+ *
-+ * @param midi    if TRUE returns MIDI ports, otherwise audio ports.
-+ * @param output  if TRUE returns output ports, otherwise input ports.
-+ */
-+GList *get_jack_ports(gboolean midi, gboolean output);
-+
-+/**
-+ * Frees a list returned by get_jack_ports()
-+ */
-+void free_jack_ports(GList *list);
-+
-+
-+#endif // JACKUTIL_H
diff --git a/audio/denemo/files/patch-src__playback.c b/audio/denemo/files/patch-src__playback.c
new file mode 100644
index 000000000000..9fa42502f9f0
--- /dev/null
+++ b/audio/denemo/files/patch-src__playback.c
@@ -0,0 +1,10 @@
+--- src/playback.c.orig
++++ src/playback.c
+@@ -7,6 +7,7 @@
+ 
+ 
+ #include <denemo/denemo.h>
++#include "playback.h"
+ #include "exportlilypond.h"
+ #include "exportmidi.h"
+ #include "staffops.h"
diff --git a/audio/denemo/files/patch-src__portaudiobackend.c b/audio/denemo/files/patch-src__portaudiobackend.c
deleted file mode 100644
index c30f1d6c9412..000000000000
--- a/audio/denemo/files/patch-src__portaudiobackend.c
+++ /dev/null
@@ -1,10 +0,0 @@
---- src/portaudiobackend.c.orig	2012-09-20 22:44:28.823018000 +0900
-+++ src/portaudiobackend.c	2012-10-05 06:05:30.000000000 +0900
-@@ -16,6 +16,7 @@
- #include "portaudioutil.h"
- #include "midi.h"
- #include "fluid.h"
-+#include "audiointerface.h"
- 
- #include <portaudio.h>
- #include <glib.h>