7 files changed, 86 insertions, 11 deletions

diff --git a/audio/denemo/files/patch-configure b/audio/denemo/files/patch-configure
deleted file mode 100644
index b25ce26b806c..000000000000
--- a/audio/denemo/files/patch-configure
+++ /dev/null
@@ -1,11 +0,0 @@
---- ./configure.orig	Thu Mar 16 17:32:54 2006
-+++ ./configure	Thu May  4 14:45:01 2006
-@@ -1708,7 +1708,7 @@
- echo "$as_me: WARNING: \`missing' script is too old or missing" >&2;}
- fi
- 
--if mkdir -p --version . >/dev/null 2>&1 && test ! -d ./--version; then
-+if mkdir -p -- --version >/dev/null 2>&1 && test -d ./--version; then
-   # We used to keeping the `.' as first argument, in order to
-   # allow $(mkdir_p) to be used without argument.  As in
-   #   $(mkdir_p) $(somedir)
diff --git a/audio/denemo/files/patch-src__jackmidi.c b/audio/denemo/files/patch-src__jackmidi.c
new file mode 100644
index 000000000000..d4fe40e26eba
--- /dev/null
+++ b/audio/denemo/files/patch-src__jackmidi.c
@@ -0,0 +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 @@
+ #include <math.h>
+ #include <string.h>
+ #include <assert.h>
++#include <sys/time.h>
+ #include "exportmidi.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
new file mode 100644
index 000000000000..58e166854eb8
--- /dev/null
+++ b/audio/denemo/files/patch-src__lolydirectives.c
@@ -0,0 +1,11 @@
+--- 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
new file mode 100644
index 000000000000..f22b63c6112d
--- /dev/null
+++ b/audio/denemo/files/patch-src__main.c
@@ -0,0 +1,27 @@
+--- 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
new file mode 100644
index 000000000000..591666dc6344
--- /dev/null
+++ b/audio/denemo/files/patch-src__midi.c
@@ -0,0 +1,11 @@
+--- src/midi.c.orig	2009-08-24 03:03:26.000000000 +0900
++++ src/midi.c	2009-09-28 17:25:00.000000000 +0900
+@@ -384,7 +384,7 @@
+   if(channel)
+     g_io_channel_shutdown(channel, FALSE, &error);
+   if(error)
+-    g_warning(error->message);
++    g_warning("%s", error->message);
+   else
+     channel = NULL;
+ #endif
diff --git a/audio/denemo/files/patch-src__mousing.c b/audio/denemo/files/patch-src__mousing.c
new file mode 100644
index 000000000000..a158217b2c33
--- /dev/null
+++ b/audio/denemo/files/patch-src__mousing.c
@@ -0,0 +1,16 @@
+--- 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);
+     
+   pi->the_staff = g_list_nth (si->thescore, pi->staff_number - 1);
+-  pi->the_measure
+-    = nth_measure_node_in_staff (pi->the_staff, pi->measure_number - 1);
++  if (pi->the_staff != NULL)
++    pi->the_measure
++      = nth_measure_node_in_staff (pi->the_staff, pi->measure_number - 1);
++  else
++    pi->the_measure = NULL;
+   if (pi->the_measure != NULL){ /*check to make sure user did not click on empty space*/
+ 	  obj_iterator = (objnode *) pi->the_measure->data;
+ 	  pi->cursor_x = 0;
diff --git a/audio/denemo/files/patch-src__view.c b/audio/denemo/files/patch-src__view.c
new file mode 100644
index 000000000000..a19383b7f97d
--- /dev/null
+++ b/audio/denemo/files/patch-src__view.c
@@ -0,0 +1,11 @@
+--- src/view.c.orig	2009-08-25 05:03:53.000000000 +0900
++++ src/view.c	2009-09-28 17:09:59.000000000 +0900
+@@ -5198,7 +5198,7 @@
+ #ifdef G_OS_WIN32
+   data_dir = g_build_filename (get_data_dir (), "icons","denemo.png", NULL);
+ #else
+-  data_dir = g_strconcat (get_data_dir (), "/../icons/denemo.png", NULL);//FIXME installed in wrong place
++  data_dir = g_strconcat (get_data_dir (), "../pixmaps/denemo.png", NULL);
+ #endif
+   gtk_window_set_default_icon_from_file (data_dir, NULL);
+   gtk_signal_connect (GTK_OBJECT (Denemo.window), "delete_event",