- Update to 0.9.0

PR:		ports/156861
Submitted by:	Kalten <kalten@gmx.at>

6 files changed, 21 insertions, 57 deletions

diff --git a/audio/denemo/files/patch-src__jackmidi.c b/audio/denemo/files/patch-src__jackmidi.c
index d4fe40e26eba..e1bd8f92d4b8 100644
--- a/audio/denemo/files/patch-src__jackmidi.c
+++ b/audio/denemo/files/patch-src__jackmidi.c
@@ -1,10 +1,10 @@
---- src/jackmidi.c.orig	2009-08-24 03:03:26.000000000 +0900
-+++ src/jackmidi.c	2009-09-28 15:42:09.000000000 +0900
-@@ -8,6 +8,7 @@
+--- src/jackmidi.c.orig	2011-04-27 19:59:45.083923000 +0200
++++ src/jackmidi.c	2011-05-07 10:44:07.000000000 +0200
+@@ -7,6 +7,7 @@
  #include <math.h>
  #include <string.h>
  #include <assert.h>
 +#include <sys/time.h>
  #include "exportmidi.h"
+ #include "jackmidi.h"
  #include "pitchentry.h"
- #include "smf.h"
diff --git a/audio/denemo/files/patch-src__lolydirectives.c b/audio/denemo/files/patch-src__lolydirectives.c
deleted file mode 100644
index 58e166854eb8..000000000000
--- a/audio/denemo/files/patch-src__lolydirectives.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/lilydirectives.c.orig	2009-08-24 03:03:26.000000000 +0900
-+++ src/lilydirectives.c	2009-09-28 17:25:00.000000000 +0900
-@@ -1966,7 +1966,7 @@
-     return ret;
-   }
-   GError *error = (GError*)execute_script_file(filename);
--  if(error) g_warning(error->message);
-+  if(error) g_warning("%s", error->message);
-   g_free(filename);
-   return ret;
- }
diff --git a/audio/denemo/files/patch-src__main.c b/audio/denemo/files/patch-src__main.c
deleted file mode 100644
index f22b63c6112d..000000000000
--- a/audio/denemo/files/patch-src__main.c
+++ /dev/null
@@ -1,27 +0,0 @@
---- src/main.c.orig	2009-08-24 03:03:26.000000000 +0900
-+++ src/main.c	2009-09-28 17:25:00.000000000 +0900
-@@ -549,7 +549,7 @@
- 	  g_print("opt %c has %s\n", opts, argv[optind]);
-       if (opts == 'h')
-         {
--          g_print (helptext);
-+          g_print ("%s", helptext);
-           exit (0);
-         }
-       else if (opts == 's')
-@@ -573,13 +573,13 @@
-         {
-           g_print (_("\nGNU Denemo version "));
-           g_print (VERSION ".\n\n");
--          g_print (copytext);
-+          g_print ("%s", copytext);
-           exit (0);
-         }
-     }
- 
-   g_print (_("\nGNU Denemo, a gtk+ frontend for GNU Lilypond\n"));
--  g_print (copytext);
-+  g_print ("%s", copytext);
- 
-   g_free (helptext);
- 
diff --git a/audio/denemo/files/patch-src__midi.c b/audio/denemo/files/patch-src__midi.c
deleted file mode 100644
index 9393c2ecc588..000000000000
--- a/audio/denemo/files/patch-src__midi.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- ./src/midi.c.orig	2010-04-06 23:54:58.000000000 -0400
-+++ ./src/midi.c	2010-04-06 23:56:14.000000000 -0400
-@@ -370,7 +370,7 @@
-     if(channel)
-       g_io_channel_shutdown(channel, FALSE, &error);
-     if(error)
--      g_warning(error->message);
-+      g_warning("%s", error->message);
-     else
-       channel = NULL;
-     return 0;
diff --git a/audio/denemo/files/patch-src__mousing.c b/audio/denemo/files/patch-src__mousing.c
index a158217b2c33..dc2800ec0323 100644
--- a/audio/denemo/files/patch-src__mousing.c
+++ b/audio/denemo/files/patch-src__mousing.c
@@ -1,7 +1,7 @@
---- src/mousing.c.orig	2009-08-24 03:03:26.000000000 +0900
-+++ src/mousing.c	2009-09-28 18:48:47.000000000 +0900
-@@ -177,8 +177,11 @@
- 		     && pi->measure_number >= si->rightmeasurenum);
+--- src/mousing.c.orig	2011-04-27 19:59:45.127257000 +0200
++++ src/mousing.c	2011-05-07 10:52:03.000000000 +0200
+@@ -202,8 +202,11 @@
+ 		     && pi->measure_number >= rightmeasurenum);
      
    pi->the_staff = g_list_nth (si->thescore, pi->staff_number - 1);
 -  pi->the_measure
diff --git a/audio/denemo/files/patch-src__pitchentry.c b/audio/denemo/files/patch-src__pitchentry.c
new file mode 100644
index 000000000000..eb7c540f57f1
--- /dev/null
+++ b/audio/denemo/files/patch-src__pitchentry.c
@@ -0,0 +1,13 @@
+--- src/pitchentry.c.orig	2011-04-27 19:59:45.153923000 +0200
++++ src/pitchentry.c	2011-05-07 11:02:38.000000000 +0200
+@@ -14,7 +14,9 @@
+ #define  DEFAULT_HIGH (4500.0)
+ #define  DEFAULT_LOW (60.0)
+ #define DEFAULT_TIMER_RATE (50)
+-
++#ifndef log2(x)
++ #define log2(x)  (log(x)/log(2))
++#endif
+ 
+ static GtkWidget *PR_window = NULL;/* a top level window for controlling pitch-recognition entry.
+ 			      We do not create one of these for each view (ie each DenemoGUI object, ie each score) because there is only one audio input source being used, so we would have to cope with resource contention issues, there is just no point. */