- Update to 0.4.4

PR:		134622
Submitted by:	Ports Fury

13 files changed, 927 insertions, 100 deletions

diff --git a/audio/lmms/files/patch-configure.in b/audio/lmms/files/patch-configure.in
deleted file mode 100644
index c43122575d02..000000000000
--- a/audio/lmms/files/patch-configure.in
+++ /dev/null
@@ -1,12 +0,0 @@
---- configure.in.orig	Mon Dec  4 15:23:38 2006
-+++ configure.in	Mon Dec  4 15:35:43 2006
-@@ -62,9 +62,6 @@
- 	fi	
- fi
- 
--CFLAGS="$DEFAULTFLAGS $CFLAGS"
--CXXFLAGS="$DEFAULTFLAGS $CXXFLAGS"
--
- AC_PATH_XTRA
- gw_CHECK_QT
- 
diff --git a/audio/lmms/files/patch-plugins__flp_import__unrtf__attr.c b/audio/lmms/files/patch-plugins__flp_import__unrtf__attr.c
new file mode 100644
index 000000000000..3cf46d981285
--- /dev/null
+++ b/audio/lmms/files/patch-plugins__flp_import__unrtf__attr.c
@@ -0,0 +1,178 @@
+--- plugins/flp_import/unrtf/attr.c.orig	2009-02-24 07:34:26.000000000 +0900
++++ plugins/flp_import/unrtf/attr.c	2009-04-10 22:19:43.000000000 +0900
+@@ -108,10 +108,10 @@
+ 	switch(attr) 
+ 	{
+ 	case ATTR_BOLD: 
+-		outstring+=QString().sprintf(op->bold_begin); 
++		outstring+=QString().sprintf("%s", op->bold_begin); 
+ 		break;
+ 	case ATTR_ITALIC: 
+-		outstring+=QString().sprintf(op->italic_begin); 
++		outstring+=QString().sprintf("%s", op->italic_begin); 
+ 		break;
+ 
+ 	/* Various underlines, they all resolve to HTML's <u> */
+@@ -123,11 +123,11 @@
+ 	case ATTR_2DOT_DASH_UL:
+ 	case ATTR_WORD_UL: 
+ 	case ATTR_UNDERLINE: 
+-		outstring+=QString().sprintf(op->underline_begin); 
++		outstring+=QString().sprintf("%s", op->underline_begin); 
+ 		break;
+ 
+ 	case ATTR_DOUBLE_UL: 
+-		outstring+=QString().sprintf(op->dbl_underline_begin); 
++		outstring+=QString().sprintf("%s", op->dbl_underline_begin); 
+ 		break;
+ 
+ 	case ATTR_FONTSIZE: 
+@@ -148,18 +148,18 @@
+ 		break;
+ 
+ 	case ATTR_SUPER: 
+-		outstring+=QString().sprintf(op->superscript_begin); 
++		outstring+=QString().sprintf("%s", op->superscript_begin); 
+ 		break;
+ 	case ATTR_SUB: 
+-		outstring+=QString().sprintf(op->subscript_begin); 
++		outstring+=QString().sprintf("%s", op->subscript_begin); 
+ 		break;
+ 
+ 	case ATTR_STRIKE: 
+-		outstring+=QString().sprintf(op->strikethru_begin); 
++		outstring+=QString().sprintf("%s", op->strikethru_begin); 
+ 		break;
+ 
+ 	case ATTR_DBL_STRIKE: 
+-		outstring+=QString().sprintf(op->dbl_strikethru_begin); 
++		outstring+=QString().sprintf("%s", op->dbl_strikethru_begin); 
+ 		break;
+ 
+ 	case ATTR_EXPAND: 
+@@ -167,16 +167,16 @@
+ 		break;
+ 
+ 	case ATTR_OUTLINE: 
+-		outstring+=QString().sprintf(op->outline_begin); 
++		outstring+=QString().sprintf("%s", op->outline_begin); 
+ 		break;
+ 	case ATTR_SHADOW: 
+-		outstring+=QString().sprintf(op->shadow_begin); 
++		outstring+=QString().sprintf("%s", op->shadow_begin); 
+ 		break;
+ 	case ATTR_EMBOSS: 
+-		outstring+=QString().sprintf(op->emboss_begin); 
++		outstring+=QString().sprintf("%s", op->emboss_begin); 
+ 		break;
+ 	case ATTR_ENGRAVE: 
+-		outstring+=QString().sprintf(op->engrave_begin); 
++		outstring+=QString().sprintf("%s", op->engrave_begin); 
+ 		break;
+ 
+ 	case ATTR_CAPS:
+@@ -189,7 +189,7 @@
+ 			simulate_smallcaps = TRUE;
+ 		else {
+ 			if (op->small_caps_begin)
+-				outstring+=QString().sprintf(op->small_caps_begin); 
++				outstring+=QString().sprintf("%s", op->small_caps_begin); 
+ 		}
+ 		break;
+ 	}
+@@ -209,10 +209,10 @@
+ 	switch(attr) 
+ 	{
+ 	case ATTR_BOLD: 
+-		outstring+=QString().sprintf(op->bold_end); 
++		outstring+=QString().sprintf("%s", op->bold_end); 
+ 		break;
+ 	case ATTR_ITALIC: 
+-		outstring+=QString().sprintf(op->italic_end); 
++		outstring+=QString().sprintf("%s", op->italic_end); 
+ 		break;
+ 
+ 	/* Various underlines, they all resolve to HTML's </u> */
+@@ -224,11 +224,11 @@
+ 	case ATTR_2DOT_DASH_UL: 
+ 	case ATTR_WORD_UL: 
+ 	case ATTR_UNDERLINE: 
+-		outstring+=QString().sprintf(op->underline_end); 
++		outstring+=QString().sprintf("%s", op->underline_end); 
+ 		break;
+ 
+ 	case ATTR_DOUBLE_UL: 
+-		outstring+=QString().sprintf(op->dbl_underline_end); 
++		outstring+=QString().sprintf("%s", op->dbl_underline_end); 
+ 		break;
+ 
+ 	case ATTR_FONTSIZE: 
+@@ -236,47 +236,47 @@
+ 		break;
+ 
+ 	case ATTR_FONTFACE: 
+-		outstring+=QString().sprintf(op->font_end); 
++		outstring+=QString().sprintf("%s", op->font_end); 
+ 		break;
+ 
+ 	case ATTR_FOREGROUND: 
+-		outstring+=QString().sprintf(op->foreground_end); 
++		outstring+=QString().sprintf("%s", op->foreground_end); 
+ 		break;
+ 	case ATTR_BACKGROUND: 
+ 		if (!simple_mode)
+-		  outstring+=QString().sprintf(op->background_end);
++		  outstring+=QString().sprintf("%s", op->background_end);
+ 		break;
+ 
+ 	case ATTR_SUPER: 
+-		outstring+=QString().sprintf(op->superscript_end); 
++		outstring+=QString().sprintf("%s", op->superscript_end); 
+ 		break;
+ 	case ATTR_SUB: 
+-		outstring+=QString().sprintf(op->subscript_end); 
++		outstring+=QString().sprintf("%s", op->subscript_end); 
+ 		break;
+ 
+ 	case ATTR_STRIKE: 
+-		outstring+=QString().sprintf(op->strikethru_end); 
++		outstring+=QString().sprintf("%s", op->strikethru_end); 
+ 		break;
+ 
+ 	case ATTR_DBL_STRIKE: 
+-		outstring+=QString().sprintf(op->dbl_strikethru_end); 
++		outstring+=QString().sprintf("%s", op->dbl_strikethru_end); 
+ 		break;
+ 
+ 	case ATTR_OUTLINE: 
+-		outstring+=QString().sprintf(op->outline_end); 
++		outstring+=QString().sprintf("%s", op->outline_end); 
+ 		break;
+ 	case ATTR_SHADOW: 
+-		outstring+=QString().sprintf(op->shadow_end); 
++		outstring+=QString().sprintf("%s", op->shadow_end); 
+ 		break;
+ 	case ATTR_EMBOSS: 
+-		outstring+=QString().sprintf(op->emboss_end); 
++		outstring+=QString().sprintf("%s", op->emboss_end); 
+ 		break;
+ 	case ATTR_ENGRAVE: 
+-		outstring+=QString().sprintf(op->engrave_end); 
++		outstring+=QString().sprintf("%s", op->engrave_end); 
+ 		break;
+ 
+ 	case ATTR_EXPAND: 
+-		outstring+=QString().sprintf(op->expand_end); 
++		outstring+=QString().sprintf("%s", op->expand_end); 
+ 		break;
+ 
+ 	case ATTR_CAPS:
+@@ -289,7 +289,7 @@
+ 			simulate_smallcaps = FALSE;
+ 		else {
+ 			if (op->small_caps_end)
+-				outstring+=QString().sprintf(op->small_caps_end); 
++				outstring+=QString().sprintf("%s", op->small_caps_end); 
+ 		}
+ 		break;
+ 	}
diff --git a/audio/lmms/files/patch-plugins__flp_import__unrtf__convert.c b/audio/lmms/files/patch-plugins__flp_import__unrtf__convert.c
new file mode 100644
index 000000000000..4ee2556d1757
--- /dev/null
+++ b/audio/lmms/files/patch-plugins__flp_import__unrtf__convert.c
@@ -0,0 +1,462 @@
+--- plugins/flp_import/unrtf/convert.c.orig	2009-02-24 07:34:26.000000000 +0900
++++ plugins/flp_import/unrtf/convert.c	2009-04-10 22:19:43.000000000 +0900
+@@ -650,8 +650,8 @@
+ {
+ 	if (!have_printed_body) {
+ 		if (!inline_mode) {
+-			outstring+=QString().sprintf(op->header_end);
+-			outstring+=QString().sprintf(op->body_begin);
++			outstring+=QString().sprintf("%s", op->header_end);
++			outstring+=QString().sprintf("%s", op->body_begin);
+ 		}
+ 		within_header = FALSE;
+ 		have_printed_body = TRUE;
+@@ -926,7 +926,7 @@
+ 
+ 			if (!inline_mode) {
+ 				if (!strcmp("\\title", s)) {
+-					outstring+=QString().sprintf(op->document_title_begin);
++					outstring+=QString().sprintf("%s", op->document_title_begin);
+ 					w2=child->next;
+ 					while (w2) {
+ 						char *s2 = word_string(w2);
+@@ -951,18 +951,18 @@
+ 								s3 = op_translate_char (op, charset_type, charset_codepage, ch, numchar_table);
+ 								if (!s3 || !*s3)
+ 								{
+-									outstring+=QString().sprintf(op->comment_begin);
++									outstring+=QString().sprintf("%s", op->comment_begin);
+ 									outstring+=QString().sprintf("char 0x%02x",ch);
+-									outstring+=QString().sprintf(op->comment_end);
++									outstring+=QString().sprintf("%s", op->comment_end);
+ 
+ 								}
+ 								else
+ 								{
+ 									if (op->word_begin)
+-										outstring+=QString().sprintf(op->word_begin);
++										outstring+=QString().sprintf("%s", op->word_begin);
+ 									outstring+=QString().sprintf("%s", s3);
+ 									if (op->word_end)
+-										outstring+=QString().sprintf(op->word_end);
++										outstring+=QString().sprintf("%s", op->word_end);
+ 								}
+ 							}
+ 						}
+@@ -970,10 +970,10 @@
+ #endif
+ 						w2 = w2->next;
+ 					}
+-					outstring+=QString().sprintf(op->document_title_end);
++					outstring+=QString().sprintf("%s", op->document_title_end);
+ 				}
+ 				else if (!strcmp("\\keywords", s)) {
+-					outstring+=QString().sprintf(op->document_keywords_begin);
++					outstring+=QString().sprintf("%s", op->document_keywords_begin);
+ 					w2=child->next;
+ 					while (w2) {
+ 						char *s2 = word_string(w2);
+@@ -981,10 +981,10 @@
+ 							outstring+=QString().sprintf("%s,", s2);
+ 						w2 = w2->next;
+ 					}
+-					outstring+=QString().sprintf(op->document_keywords_end);
++					outstring+=QString().sprintf("%s", op->document_keywords_end);
+ 				}
+ 				else if (!strcmp("\\author", s)) {
+-					outstring+=QString().sprintf(op->document_author_begin);
++					outstring+=QString().sprintf("%s", op->document_author_begin);
+ 					w2=child->next;
+ 					while (w2) {
+ 						char *s2 = word_string(w2);
+@@ -992,7 +992,7 @@
+ 							outstring+=QString().sprintf("%s", s2);
+ 						w2 = w2->next;
+ 					}
+-					outstring+=QString().sprintf(op->document_author_end);
++					outstring+=QString().sprintf("%s", op->document_author_end);
+ 				}
+ 				else if (!strcmp("\\comment", s)) {
+ 					outstring+=QString().sprintf("%s",op->comment_begin);
+@@ -1312,9 +1312,9 @@
+ 							    w4=w4->next;
+ 						    if (w4) {
+ 							    s4=word_string(w4);
+-							    outstring+=QString().sprintf(op->hyperlink_begin);
++							    outstring+=QString().sprintf("%s", op->hyperlink_begin);
+ 							    outstring+=QString().sprintf("%s", s4);
+-							    outstring+=QString().sprintf(op->hyperlink_end);
++							    outstring+=QString().sprintf("%s", op->hyperlink_end);
+ 							    return TRUE;
+ 						    }
+ 					    	
+@@ -1423,7 +1423,7 @@
+ 	int need= 8-(total_chars_this_line%8);
+ 	total_chars_this_line += need;
+ 	while(need>0) {
+-		outstring+=QString().sprintf(op->forced_space);
++		outstring+=QString().sprintf("%s", op->forced_space);
+ 		need--;
+ 	}
+ 	outstring+=QString().sprintf("\n");
+@@ -1643,7 +1643,7 @@
+ static int 
+ cmd_bullet (Word *w, int align, char has_param, int param) {
+ 	if (op->chars.bullet) {
+-		outstring+=QString().sprintf(op->chars.bullet);
++		outstring+=QString().sprintf("%s", op->chars.bullet);
+ 		++total_chars_this_line; /* \tab */
+ 	}
+ 	return FALSE;
+@@ -1658,7 +1658,7 @@
+ static int 
+ cmd_ldblquote (Word *w, int align, char has_param, int param) {
+ 	if (op->chars.left_dbl_quote) {
+-		outstring+=QString().sprintf(op->chars.left_dbl_quote);
++		outstring+=QString().sprintf("%s", op->chars.left_dbl_quote);
+ 		++total_chars_this_line; /* \tab */
+ 	}
+ 	return FALSE;
+@@ -1675,7 +1675,7 @@
+ static int 
+ cmd_rdblquote (Word *w, int align, char has_param, int param) {
+ 	if (op->chars.right_dbl_quote) {
+-		outstring+=QString().sprintf(op->chars.right_dbl_quote);
++		outstring+=QString().sprintf("%s", op->chars.right_dbl_quote);
+ 		++total_chars_this_line; /* \tab */
+ 	}
+ 	return FALSE;
+@@ -1691,7 +1691,7 @@
+ static int 
+ cmd_lquote (Word *w, int align, char has_param, int param) {
+ 	if (op->chars.left_quote) {
+-		outstring+=QString().sprintf(op->chars.left_quote);
++		outstring+=QString().sprintf("%s", op->chars.left_quote);
+ 		++total_chars_this_line; /* \tab */
+ 	}
+ 	return FALSE;
+@@ -1708,7 +1708,7 @@
+ static int 
+ cmd_nonbreaking_space (Word *w, int align, char has_param, int param) {
+ 	if (op->chars.nonbreaking_space) {
+-		outstring+=QString().sprintf(op->chars.nonbreaking_space);
++		outstring+=QString().sprintf("%s", op->chars.nonbreaking_space);
+ 		++total_chars_this_line; /* \tab */
+ 	}
+ 	return FALSE;
+@@ -1725,7 +1725,7 @@
+ static int 
+ cmd_nonbreaking_hyphen (Word *w, int align, char has_param, int param) {
+ 	if (op->chars.nonbreaking_hyphen) {
+-		outstring+=QString().sprintf(op->chars.nonbreaking_hyphen);
++		outstring+=QString().sprintf("%s", op->chars.nonbreaking_hyphen);
+ 		++total_chars_this_line; /* \tab */
+ 	}
+ 	return FALSE;
+@@ -1742,7 +1742,7 @@
+ static int 
+ cmd_optional_hyphen (Word *w, int align, char has_param, int param) {
+ 	if (op->chars.optional_hyphen) {
+-		outstring+=QString().sprintf(op->chars.optional_hyphen);
++		outstring+=QString().sprintf("%s", op->chars.optional_hyphen);
+ 		++total_chars_this_line; /* \tab */
+ 	}
+ 	return FALSE;
+@@ -1758,7 +1758,7 @@
+ static int 
+ cmd_emdash (Word *w, int align, char has_param, int param) {
+ 	if (op->chars.emdash) {
+-		outstring+=QString().sprintf(op->chars.emdash);
++		outstring+=QString().sprintf("%s", op->chars.emdash);
+ 		++total_chars_this_line; /* \tab */
+ 	}
+ 	return FALSE;
+@@ -1775,7 +1775,7 @@
+ static int 
+ cmd_endash (Word *w, int align, char has_param, int param) {
+ 	if (op->chars.endash) {
+-		outstring+=QString().sprintf(op->chars.endash);
++		outstring+=QString().sprintf("%s", op->chars.endash);
+ 		++total_chars_this_line; /* \tab */
+ 	}
+ 	return FALSE;
+@@ -1792,7 +1792,7 @@
+ static int 
+ cmd_rquote (Word *w, int align, char has_param, int param) {
+ 	if (op->chars.right_quote) {
+-		outstring+=QString().sprintf(op->chars.right_quote);
++		outstring+=QString().sprintf("%s", op->chars.right_quote);
+ 		++total_chars_this_line; /* \tab */
+ 	}
+ 	return FALSE;
+@@ -1808,7 +1808,7 @@
+ static int 
+ cmd_par (Word *w, int align, char has_param, int param) {
+ 	if (op->line_break) {
+-		outstring+=QString().sprintf(op->line_break);
++		outstring+=QString().sprintf("%s", op->line_break);
+ 		total_chars_this_line = 0; /* \tab */
+ 	}
+ 	return FALSE;
+@@ -1825,7 +1825,7 @@
+ static int 
+ cmd_line (Word *w, int align, char has_param, int param) {
+ 	if (op->line_break) {
+-		outstring+=QString().sprintf(op->line_break);
++		outstring+=QString().sprintf("%s", op->line_break);
+ 		total_chars_this_line = 0; /* \tab */
+ 	}
+ 	return FALSE;
+@@ -1841,7 +1841,7 @@
+ 
+ static int cmd_page (Word *w, int align, char has_param, int param) {
+ 	if (op->page_break) {
+-		outstring+=QString().sprintf(op->page_break);
++		outstring+=QString().sprintf("%s", op->page_break);
+ 		total_chars_this_line = 0; /* \tab */
+ 	}
+ 	return FALSE;
+@@ -2337,7 +2337,7 @@
+ static int cmd_sect (Word *w, int align, char has_param, int param) {
+ 	/* XX kludge */
+ 	if (op->paragraph_begin) {
+-		outstring+=QString().sprintf(op->paragraph_begin);
++		outstring+=QString().sprintf("%s", op->paragraph_begin);
+ 	}
+ 	return FALSE;
+ }
+@@ -2351,9 +2351,9 @@
+ 
+ static int cmd_shp (Word *w, int align, char has_param, int param) {
+ 	if (op->comment_begin) {
+-		outstring+=QString().sprintf(op->comment_begin);
++		outstring+=QString().sprintf("%s", op->comment_begin);
+ 		outstring+=QString().sprintf("Drawn Shape (ignored--not implemented yet)");
+-		outstring+=QString().sprintf(op->comment_end);	/* daved 0.20.2 */
++		outstring+=QString().sprintf("%s", op->comment_end);	/* daved 0.20.2 */
+ 	}
+ 
+ 	return FALSE;
+@@ -2404,17 +2404,17 @@
+ 		charset_codepage = &codepages[i];
+ 		if (charset_codepage->cp == param) {
+ 			if (op->comment_begin) {
+-				outstring+=QString().sprintf(op->comment_begin);
++				outstring+=QString().sprintf("%s", op->comment_begin);
+ 				outstring+=QString().sprintf("document uses ANSI codepage %d character set", param);
+-				outstring+=QString().sprintf(op->comment_end);
++				outstring+=QString().sprintf("%s", op->comment_end);
+ 			}
+ 			break;
+ 		}
+ 	}
+ 	if ((charset_codepage == NULL || charset_codepage->cp == 0) && op->comment_begin) {
+-		outstring+=QString().sprintf(op->comment_begin);
++		outstring+=QString().sprintf("%s", op->comment_begin);
+ 		outstring+=QString().sprintf("document uses default ANSI codepage character set");
+-		outstring+=QString().sprintf(op->comment_end);
++		outstring+=QString().sprintf("%s", op->comment_end);
+ 	}
+ 	return FALSE;
+ }
+@@ -3106,7 +3106,7 @@
+ 	if (simulate_smallcaps) {
+ 		if (*s >= 'a' && *s <= 'z') {
+ 			state=SMALL;
+-			outstring+=QString().sprintf(op->smaller_begin);
++			outstring+=QString().sprintf("%s", op->smaller_begin);
+ 		}
+ 		else
+ 			state=BIG;
+@@ -3136,13 +3136,13 @@
+ 			ch = *s;
+ 			if (ch >= 'a' && ch <= 'z') {
+ 				if (state==BIG)
+-					outstring+=QString().sprintf(op->smaller_begin);
++					outstring+=QString().sprintf("%s", op->smaller_begin);
+ 				state=SMALL;
+ 			}
+ 			else
+ 			{
+ 				if (state==SMALL)
+-					outstring+=QString().sprintf(op->smaller_end);
++					outstring+=QString().sprintf("%s", op->smaller_end);
+ 				state=BIG;
+ 			}
+ 		}
+@@ -3168,7 +3168,7 @@
+ 	have_printed_cell_end = FALSE;
+ 	attrstack_push();
+ 	starting_body();
+-	outstring+=QString().sprintf(op->table_begin);
++	outstring+=QString().sprintf("%s", op->table_begin);
+ }
+ 
+ 
+@@ -3186,12 +3186,12 @@
+ 	if (within_table) {
+ 		if (!have_printed_cell_end) {
+ 			attr_pop_dump();
+-			outstring+=QString().sprintf(op->table_cell_end);
++			outstring+=QString().sprintf("%s", op->table_cell_end);
+ 		}
+ 		if (!have_printed_row_end) {
+-			outstring+=QString().sprintf(op->table_row_end);
++			outstring+=QString().sprintf("%s", op->table_row_end);
+ 		}
+-		outstring+=QString().sprintf(op->table_end);
++		outstring+=QString().sprintf("%s", op->table_end);
+ 		within_table=FALSE;
+ 		have_printed_row_begin = FALSE;
+ 		have_printed_cell_begin = FALSE;
+@@ -3213,13 +3213,13 @@
+ starting_text() {
+ 	if (within_table) {
+ 		if (!have_printed_row_begin) {
+-			outstring+=QString().sprintf(op->table_row_begin);
++			outstring+=QString().sprintf("%s", op->table_row_begin);
+ 			have_printed_row_begin=TRUE;
+ 			have_printed_row_end=FALSE;
+ 			have_printed_cell_begin=FALSE;
+ 		}
+ 		if (!have_printed_cell_begin) {
+-			outstring+=QString().sprintf(op->table_cell_begin);
++			outstring+=QString().sprintf("%s", op->table_cell_begin);
+ 			attrstack_express_all();
+ 			have_printed_cell_begin=TRUE;
+ 			have_printed_cell_end=FALSE;
+@@ -3246,15 +3246,15 @@
+ 	switch (align) 
+ 	{
+ 	case ALIGN_CENTER:
+-		outstring+=QString().sprintf(op->center_begin); 
++		outstring+=QString().sprintf("%s", op->center_begin); 
+ 		break;
+ 	case ALIGN_LEFT:
+ 		break;
+ 	case ALIGN_RIGHT:
+-		outstring+=QString().sprintf(op->align_right_begin);
++		outstring+=QString().sprintf("%s", op->align_right_begin);
+ 		break;
+ 	case ALIGN_JUSTIFY:
+-		outstring+=QString().sprintf(op->align_right_begin); /* This is WRONG! */
++		outstring+=QString().sprintf("%s", op->align_right_begin); /* This is WRONG! */
+ 		break;
+ 	}
+ }
+@@ -3273,16 +3273,16 @@
+ {
+ 	switch (align) {
+ 	case ALIGN_CENTER:
+-		outstring+=QString().sprintf(op->center_end);
++		outstring+=QString().sprintf("%s", op->center_end);
+ 		break;
+ 	case ALIGN_LEFT:
+-	  /* outstring+=QString().sprintf(op->align_left_end); */
++	  /* outstring+=QString().sprintf("%s", op->align_left_end); */
+ 		break;
+ 	case ALIGN_RIGHT:
+-		outstring+=QString().sprintf(op->align_right_end);
++		outstring+=QString().sprintf("%s", op->align_right_end);
+ 		break;
+ 	case ALIGN_JUSTIFY:
+-		outstring+=QString().sprintf(op->justify_end);
++		outstring+=QString().sprintf("%s", op->justify_end);
+ 		break;
+ 	}
+ }
+@@ -3391,12 +3391,12 @@
+ 					total_chars_this_line += strlen(s);
+ 
+ 					if (op->word_begin)
+-						outstring+=QString().sprintf(op->word_begin);
++						outstring+=QString().sprintf("%s", op->word_begin);
+ 
+ 					print_with_special_exprs (s);
+ 
+ 					if (op->word_end)
+-						outstring+=QString().sprintf(op->word_end);
++						outstring+=QString().sprintf("%s", op->word_end);
+ 				}
+ 
+ 
+@@ -3456,17 +3456,17 @@
+ 					is_cell_group=TRUE;
+ 					if (!have_printed_cell_begin) {
+ 						/* Need this with empty cells */
+-						outstring+=QString().sprintf(op->table_cell_begin);
++						outstring+=QString().sprintf("%s", op->table_cell_begin);
+ 						attrstack_express_all();
+ 					}
+ 					attr_pop_dump();
+-					outstring+=QString().sprintf(op->table_cell_end);
++					outstring+=QString().sprintf("%s", op->table_cell_end);
+ 					have_printed_cell_begin = FALSE;
+ 					have_printed_cell_end=TRUE;
+ 				}
+ 				else if (!strcmp (s, "row")) {
+ 					if (within_table) {
+-						outstring+=QString().sprintf(op->table_row_end);
++						outstring+=QString().sprintf("%s", op->table_row_end);
+ 						have_printed_row_begin = FALSE;
+ 						have_printed_row_end=TRUE;
+ 					} else {
+@@ -3496,10 +3496,10 @@
+ 						outstring+=QString().sprintf("%s",op->comment_end);
+ 					} else {
+ 						if (op->word_begin)
+-							outstring+=QString().sprintf(op->word_begin);
++							outstring+=QString().sprintf("%s", op->word_begin);
+ 						outstring+=QString().sprintf("%s", s2);
+ 						if (op->word_end)
+-							outstring+=QString().sprintf(op->word_end);
++							outstring+=QString().sprintf("%s", op->word_end);
+ 					}
+ 				}
+ 				else
+@@ -3529,9 +3529,9 @@
+ 
+ 					if (!hip) {
+ 						if (debug_mode) {
+-							outstring+=QString().sprintf(op->comment_begin);
++							outstring+=QString().sprintf("%s", op->comment_begin);
+ 							outstring+=QString().sprintf("Unfamiliar RTF command: %s (HashIndex not found)", s);
+-							outstring+=QString().sprintf(op->comment_end); /* daved 0.20.2 */
++							outstring+=QString().sprintf("%s", op->comment_end); /* daved 0.20.2 */
+ 						}
+ 					}
+ 					else {
+@@ -3610,9 +3610,9 @@
+ 	if (within_picture) {
+ 		if(pictfile) { 
+ 			fclose(pictfile);
+-			outstring+=QString().sprintf(op->imagelink_begin);
++			outstring+=QString().sprintf("%s", op->imagelink_begin);
+ 			outstring+=QString().sprintf("%s", picture_path);
+-			outstring+=QString().sprintf(op->imagelink_end);
++			outstring+=QString().sprintf("%s", op->imagelink_end);
+ 		}
+ 		within_picture=FALSE;
+ 	}
+@@ -3665,8 +3665,8 @@
+ 
+ 	outstring = "";
+ 	if (!inline_mode) {
+-		outstring+=QString().sprintf(op->document_begin);
+-		outstring+=QString().sprintf(op->header_begin);
++		outstring+=QString().sprintf("%s", op->document_begin);
++		outstring+=QString().sprintf("%s", op->header_begin);
+ 	}
+ 
+ 	within_header=TRUE;
+@@ -3677,8 +3677,8 @@
+ 	end_table();
+ 
+ 	if (!inline_mode) {
+-		outstring+=QString().sprintf(op->body_end);
+-		outstring+=QString().sprintf(op->document_end);
++		outstring+=QString().sprintf("%s", op->body_end);
++		outstring+=QString().sprintf("%s", op->document_end);
+ 	}
+ 	_s = outstring;
+ }
diff --git a/audio/lmms/files/patch-plugins__flp_import__unrtf__output.c b/audio/lmms/files/patch-plugins__flp_import__unrtf__output.c
new file mode 100644
index 000000000000..46e5e03b3ad5
--- /dev/null
+++ b/audio/lmms/files/patch-plugins__flp_import__unrtf__output.c
@@ -0,0 +1,238 @@
+--- plugins/flp_import/unrtf/output.c.orig	2009-02-24 07:34:26.000000000 +0900
++++ plugins/flp_import/unrtf/output.c	2009-04-10 22:19:43.000000000 +0900
+@@ -238,49 +238,49 @@
+ 	switch (size) {
+ 	case 8:
+ 		if (op->fontsize8_begin) {
+-			outstring+=QString().sprintf(op->fontsize8_begin);
++			outstring+=QString().sprintf("%s", op->fontsize8_begin);
+ 			found_std_expr = TRUE;
+ 		}
+ 		break;
+ 	case 10:
+ 		if (op->fontsize10_begin) {
+-			outstring+=QString().sprintf(op->fontsize10_begin);
++			outstring+=QString().sprintf("%s", op->fontsize10_begin);
+ 			found_std_expr = TRUE;
+ 		}
+ 		break;
+ 	case 12:
+ 		if (op->fontsize12_begin) {
+-			outstring+=QString().sprintf(op->fontsize12_begin);
++			outstring+=QString().sprintf("%s", op->fontsize12_begin);
+ 			found_std_expr = TRUE;
+ 		}
+ 		break;
+ 	case 14:
+ 		if (op->fontsize14_begin) {
+-			outstring+=QString().sprintf(op->fontsize14_begin);
++			outstring+=QString().sprintf("%s", op->fontsize14_begin);
+ 			found_std_expr = TRUE;
+ 		}
+ 		break;
+ 	case 18:
+ 		if (op->fontsize18_begin) {
+-			outstring+=QString().sprintf(op->fontsize18_begin);
++			outstring+=QString().sprintf("%s", op->fontsize18_begin);
+ 			found_std_expr = TRUE;
+ 		}
+ 		break;
+ 	case 24:
+ 		if (op->fontsize24_begin) {
+-			outstring+=QString().sprintf(op->fontsize24_begin);
++			outstring+=QString().sprintf("%s", op->fontsize24_begin);
+ 			found_std_expr = TRUE;
+ 		}
+ 		break;
+ 	case 36:
+ 		if (op->fontsize36_begin) {
+-			outstring+=QString().sprintf(op->fontsize36_begin);
++			outstring+=QString().sprintf("%s", op->fontsize36_begin);
+ 			found_std_expr = TRUE;
+ 		}
+ 		break;
+ 	case 48:
+ 		if (op->fontsize48_begin) {
+-			outstring+=QString().sprintf(op->fontsize48_begin);
++			outstring+=QString().sprintf("%s", op->fontsize48_begin);
+ 			found_std_expr = TRUE;
+ 		}
+ 		break;
+@@ -300,46 +300,46 @@
+ 			 * size.
+ 			 */
+ 			if (size<9 && op->fontsize8_begin) {
+-				outstring+=QString().sprintf(op->fontsize8_begin);
++				outstring+=QString().sprintf("%s", op->fontsize8_begin);
+ 			} else 
+ 			if (size<11 && op->fontsize10_begin) {
+-				outstring+=QString().sprintf(op->fontsize10_begin);
++				outstring+=QString().sprintf("%s", op->fontsize10_begin);
+ 			} else 
+ 			if (size<13 && op->fontsize12_begin) {
+-				outstring+=QString().sprintf(op->fontsize12_begin);
++				outstring+=QString().sprintf("%s", op->fontsize12_begin);
+ 			} else 
+ 			if (size<16 && op->fontsize14_begin) {
+-				outstring+=QString().sprintf(op->fontsize14_begin);
++				outstring+=QString().sprintf("%s", op->fontsize14_begin);
+ 			} else 
+ 			if (size<21 && op->fontsize18_begin) {
+-				outstring+=QString().sprintf(op->fontsize18_begin);
++				outstring+=QString().sprintf("%s", op->fontsize18_begin);
+ 			} else 
+ 			if (size<30 && op->fontsize24_begin) {
+-				outstring+=QString().sprintf(op->fontsize24_begin);
++				outstring+=QString().sprintf("%s", op->fontsize24_begin);
+ 			} else 
+ 			if (size<42 && op->fontsize36_begin) {
+-				outstring+=QString().sprintf(op->fontsize36_begin);
++				outstring+=QString().sprintf("%s", op->fontsize36_begin);
+ 			} else 
+ 			if (size>40 && op->fontsize48_begin) {
+-				outstring+=QString().sprintf(op->fontsize48_begin);
++				outstring+=QString().sprintf("%s", op->fontsize48_begin);
+ 			} else 
+ 			/* If we can't even produce a good approximation,
+ 			 * just try to get a font size near 12 point.
+ 			 */
+ 			if (op->fontsize12_begin)
+-				outstring+=QString().sprintf(op->fontsize12_begin);
++				outstring+=QString().sprintf("%s", op->fontsize12_begin);
+ 			else
+ 			if (op->fontsize14_begin)
+-				outstring+=QString().sprintf(op->fontsize14_begin);
++				outstring+=QString().sprintf("%s", op->fontsize14_begin);
+ 			else
+ 			if (op->fontsize10_begin)
+-				outstring+=QString().sprintf(op->fontsize10_begin);
++				outstring+=QString().sprintf("%s", op->fontsize10_begin);
+ 			else
+ 			if (op->fontsize18_begin)
+-				outstring+=QString().sprintf(op->fontsize18_begin);
++				outstring+=QString().sprintf("%s", op->fontsize18_begin);
+ 			else
+ 			if (op->fontsize8_begin)
+-				outstring+=QString().sprintf(op->fontsize8_begin);
++				outstring+=QString().sprintf("%s", op->fontsize8_begin);
+ 			else
+ 				error_handler ("output personality lacks sufficient font size change capability");
+ 		}
+@@ -367,49 +367,49 @@
+ 	switch (size) {
+ 	case 8:
+ 		if (op->fontsize8_end) {
+-			outstring+=QString().sprintf(op->fontsize8_end);
++			outstring+=QString().sprintf("%s", op->fontsize8_end);
+ 			found_std_expr = TRUE;
+ 		}
+ 		break;
+ 	case 10:
+ 		if (op->fontsize10_end) {
+-			outstring+=QString().sprintf(op->fontsize10_end);
++			outstring+=QString().sprintf("%s", op->fontsize10_end);
+ 			found_std_expr = TRUE;
+ 		}
+ 		break;
+ 	case 12:
+ 		if (op->fontsize12_end) {
+-			outstring+=QString().sprintf(op->fontsize12_end);
++			outstring+=QString().sprintf("%s", op->fontsize12_end);
+ 			found_std_expr = TRUE;
+ 		}
+ 		break;
+ 	case 14:
+ 		if (op->fontsize14_end) {
+-			outstring+=QString().sprintf(op->fontsize14_end);
++			outstring+=QString().sprintf("%s", op->fontsize14_end);
+ 			found_std_expr = TRUE;
+ 		}
+ 		break;
+ 	case 18:
+ 		if (op->fontsize18_end) {
+-			outstring+=QString().sprintf(op->fontsize18_end);
++			outstring+=QString().sprintf("%s", op->fontsize18_end);
+ 			found_std_expr = TRUE;
+ 		}
+ 		break;
+ 	case 24:
+ 		if (op->fontsize24_end) {
+-			outstring+=QString().sprintf(op->fontsize24_end);
++			outstring+=QString().sprintf("%s", op->fontsize24_end);
+ 			found_std_expr = TRUE;
+ 		}
+ 		break;
+ 	case 36:
+ 		if (op->fontsize36_end) {
+-			outstring+=QString().sprintf(op->fontsize36_end);
++			outstring+=QString().sprintf("%s", op->fontsize36_end);
+ 			found_std_expr = TRUE;
+ 		}
+ 		break;
+ 	case 48:
+ 		if (op->fontsize48_end) {
+-			outstring+=QString().sprintf(op->fontsize48_end);
++			outstring+=QString().sprintf("%s", op->fontsize48_end);
+ 			found_std_expr = TRUE;
+ 		}
+ 		break;
+@@ -429,46 +429,46 @@
+ 			 * size.
+ 			 */
+ 			if (size<9 && op->fontsize8_end) {
+-				outstring+=QString().sprintf(op->fontsize8_end);
++				outstring+=QString().sprintf("%s", op->fontsize8_end);
+ 			} else 
+ 			if (size<11 && op->fontsize10_end) {
+-				outstring+=QString().sprintf(op->fontsize10_end);
++				outstring+=QString().sprintf("%s", op->fontsize10_end);
+ 			} else 
+ 			if (size<13 && op->fontsize12_end) {
+-				outstring+=QString().sprintf(op->fontsize12_end);
++				outstring+=QString().sprintf("%s", op->fontsize12_end);
+ 			} else 
+ 			if (size<16 && op->fontsize14_end) {
+-				outstring+=QString().sprintf(op->fontsize14_end);
++				outstring+=QString().sprintf("%s", op->fontsize14_end);
+ 			} else 
+ 			if (size<21 && op->fontsize18_end) {
+-				outstring+=QString().sprintf(op->fontsize18_end);
++				outstring+=QString().sprintf("%s", op->fontsize18_end);
+ 			} else 
+ 			if (size<30 && op->fontsize24_end) {
+-				outstring+=QString().sprintf(op->fontsize24_end);
++				outstring+=QString().sprintf("%s", op->fontsize24_end);
+ 			} else 
+ 			if (size<42 && op->fontsize36_end) {
+-				outstring+=QString().sprintf(op->fontsize36_end);
++				outstring+=QString().sprintf("%s", op->fontsize36_end);
+ 			} else 
+ 			if (size>40 && op->fontsize48_end) {
+-				outstring+=QString().sprintf(op->fontsize48_end);
++				outstring+=QString().sprintf("%s", op->fontsize48_end);
+ 			} else 
+ 			/* If we can't even produce a good approximation,
+ 			 * just try to get a font size near 12 point.
+ 			 */
+ 			if (op->fontsize12_end)
+-				outstring+=QString().sprintf(op->fontsize12_end);
++				outstring+=QString().sprintf("%s", op->fontsize12_end);
+ 			else
+ 			if (op->fontsize14_end)
+-				outstring+=QString().sprintf(op->fontsize14_end);
++				outstring+=QString().sprintf("%s", op->fontsize14_end);
+ 			else
+ 			if (op->fontsize10_end)
+-				outstring+=QString().sprintf(op->fontsize10_end);
++				outstring+=QString().sprintf("%s", op->fontsize10_end);
+ 			else
+ 			if (op->fontsize18_end)
+-				outstring+=QString().sprintf(op->fontsize18_end);
++				outstring+=QString().sprintf("%s", op->fontsize18_end);
+ 			else
+ 			if (op->fontsize8_end)
+-				outstring+=QString().sprintf(op->fontsize8_end);
++				outstring+=QString().sprintf("%s", op->fontsize8_end);
+ 			else
+ 				error_handler ("output personality lacks sufficient font size change capability");
+ 		}
diff --git a/audio/lmms/files/patch-plugins__sf2_player__sf2_player.cpp b/audio/lmms/files/patch-plugins__sf2_player__sf2_player.cpp
new file mode 100644
index 000000000000..7968ec9e3f5d
--- /dev/null
+++ b/audio/lmms/files/patch-plugins__sf2_player__sf2_player.cpp
@@ -0,0 +1,12 @@
+--- plugins/sf2_player/sf2_player.cpp.orig	2009-02-24 07:34:26.000000000 +0900
++++ plugins/sf2_player/sf2_player.cpp	2009-04-09 05:11:15.000000000 +0900
+@@ -45,6 +45,9 @@
+ #undef SINGLE_SOURCE_COMPILE
+ #include "embed.cpp"
+ 
++#if defined(__FreeBSD__)
++#define log2(x) (log((x)) / log(2))
++#endif
+ 
+ extern "C"
+ {
diff --git a/audio/lmms/files/patch-plugins__zynaddsubfx__CMakeLists.txt b/audio/lmms/files/patch-plugins__zynaddsubfx__CMakeLists.txt
new file mode 100644
index 000000000000..d944f73c8c16
--- /dev/null
+++ b/audio/lmms/files/patch-plugins__zynaddsubfx__CMakeLists.txt
@@ -0,0 +1,16 @@
+--- plugins/zynaddsubfx/CMakeLists.txt.orig	2009-05-05 08:13:15.000000000 +0900
++++ plugins/zynaddsubfx/CMakeLists.txt	2009-05-13 04:27:03.000000000 +0900
+@@ -98,10 +98,11 @@
+ ENDIF(LMMS_HOST_X86 OR LMMS_HOST_X86_64)
+ 
+ # build ZynAddSubFX with full optimizations
+-SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -O3 -Wno-write-strings -Wno-deprecated-declarations")
++SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-write-strings -Wno-deprecated-declarations")
+ 
+ # link default libraries
+-LINK_LIBRARIES(${FFTW3F_LIBRARIES} -lz -lpthread ${CMAKE_CURRENT_BINARY_DIR}/fltk/bin/libfltk.a)
++LINK_DIRECTORIES(${FFTW3F_LIBRARY_DIRS})
++LINK_LIBRARIES(${FFTW3F_LIBRARIES} -lz ${CMAKE_CURRENT_BINARY_DIR}/fltk/bin/libfltk.a)
+ 
+ # FLTK needs X
+ IF(LMMS_BUILD_LINUX)
diff --git a/audio/lmms/files/patch-plugins_ladspa__base_ladspa__manager.cpp b/audio/lmms/files/patch-plugins_ladspa__base_ladspa__manager.cpp
deleted file mode 100644
index 10189ab360b3..000000000000
--- a/audio/lmms/files/patch-plugins_ladspa__base_ladspa__manager.cpp
+++ /dev/null
@@ -1,17 +0,0 @@
---- plugins/ladspa_base/ladspa_manager.cpp.orig	Mon Dec  4 15:22:27 2006
-+++ plugins/ladspa_base/ladspa_manager.cpp	Mon Dec  4 16:06:22 2006
-@@ -63,12 +63,11 @@
- 					configManager::inst()->ladspaDir() );
- #endif
- 	
--	ladspaDirectories.push_back( "/usr/lib/lmms/ladspa" );
-+	ladspaDirectories.push_back( "@PREFIX@/lib/lmms/ladspa" );
- /*	// set default-directory if nothing is specified...
- 	if( ladspaDirectories.isEmpty() )
- 	{*/
--		ladspaDirectories.push_back( "/usr/lib/ladspa" );
--		ladspaDirectories.push_back( "/usr/local/lib/ladspa" );
-+		ladspaDirectories.push_back( "@LOCALBASE@/lib/ladspa" );
- //	}
- 	for( QStringList::iterator it = ladspaDirectories.begin(); 
- 		    it != ladspaDirectories.end(); ++it )
diff --git a/audio/lmms/files/patch-plugins_ladspa__effect_caps_Makefile.am b/audio/lmms/files/patch-plugins_ladspa__effect_caps_Makefile.am
deleted file mode 100644
index 0aa2b8f166e8..000000000000
--- a/audio/lmms/files/patch-plugins_ladspa__effect_caps_Makefile.am
+++ /dev/null
@@ -1,20 +0,0 @@
---- plugins/ladspa_effect/caps/Makefile.am.orig	Mon Dec  4 15:22:22 2006
-+++ plugins/ladspa_effect/caps/Makefile.am	Sat Dec 16 11:37:33 2006
-@@ -1,7 +1,7 @@
- AUTOMAKE_OPTIONS = foreign 1.4
- 
- 
--AM_CXXFLAGS := $(AM_CXXFLAGS) -O6 -ffast-math -funroll-loops -ftracer
-+AM_CXXFLAGS := $(AM_CXXFLAGS) -fPIC
- 
- DEST = $(libdir)/$(PACKAGE)/ladspa
- SOURCES = $(wildcard *.cc)
-@@ -23,7 +23,7 @@
- 	-rm $(DEST)/caps.so
- 
- depend: $(SOURCES)
--	$(CXX) -MM $(AM_CXXFLAGS) $(SOURCES) > depend
-+	$(CXX) -MM $(CPPFLAGS) $(AM_CXXFLAGS) $(SOURCES) > depend
- 
- .cc.o:
- 	$(CXX) $(CXXFLAGS) $(AM_CXXFLAGS) -c $<
diff --git a/audio/lmms/files/patch-plugins_organic_organic.cpp b/audio/lmms/files/patch-plugins_organic_organic.cpp
index 92490cd0df8c..a1a4cb7542c9 100644
--- a/audio/lmms/files/patch-plugins_organic_organic.cpp
+++ b/audio/lmms/files/patch-plugins_organic_organic.cpp
@@ -1,10 +1,12 @@
---- plugins/organic/organic.cpp.orig	Mon Dec  4 15:22:23 2006
-+++ plugins/organic/organic.cpp	Mon Dec  4 16:02:07 2006
-@@ -64,6 +64,7 @@
+--- plugins/organic/organic.cpp.orig	2009-02-24 07:34:26.000000000 +0900
++++ plugins/organic/organic.cpp	2009-04-09 03:38:36.000000000 +0900
+@@ -42,6 +42,9 @@
+ #undef SINGLE_SOURCE_COMPILE
  #include "embed.cpp"
- #include "volume_knob.h"
  
++#if defined(__FreeBSD__)
 +#define log2f(x) (logf((x)) / logf(2))
++#endif
  
  extern "C"
  {
diff --git a/audio/lmms/files/patch-src-widgets_knob.cpp b/audio/lmms/files/patch-src-widgets_knob.cpp
deleted file mode 100644
index 781764a515eb..000000000000
--- a/audio/lmms/files/patch-src-widgets_knob.cpp
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/widgets/knob.cpp.orig	2009-04-11 22:43:48.000000000 +0200
-+++ src/widgets/knob.cpp	2009-04-11 22:44:54.000000000 +0200
-@@ -471,7 +471,7 @@
- 			eng()->getMainWindow()->isShiftPressed() == TRUE )
- 	{
- 		new stringPairDrag( "link_object",
--						QString::number( (uint) this ),
-+						QString::number( (intptr_t) this ),
- 						QPixmap(), this, eng() );
- 	}
- 	else if( _me->button() == Qt::MidButton )
diff --git a/audio/lmms/files/patch-src_core_config__mgr.cpp b/audio/lmms/files/patch-src_core_config__mgr.cpp
deleted file mode 100644
index 5a2efa7c41c8..000000000000
--- a/audio/lmms/files/patch-src_core_config__mgr.cpp
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/core/config_mgr.cpp.orig	Mon Dec  4 15:22:34 2006
-+++ src/core/config_mgr.cpp	Mon Dec  4 16:00:06 2006
-@@ -875,7 +875,7 @@
- #ifdef LADSPA_SUPPORT
- 	if( m_ladDir == "" )
- {
--	m_ladDir = "/usr/lib/ladspa/:/usr/local/lib/ladspa/";
-+	m_ladDir = "@LOCALBASE@/lib/ladspa/";
- }
- #endif
- 
diff --git a/audio/lmms/files/patch-src_core_main.cpp b/audio/lmms/files/patch-src_core_main.cpp
index 42964de206ef..d261bf7bcf3b 100644
--- a/audio/lmms/files/patch-src_core_main.cpp
+++ b/audio/lmms/files/patch-src_core_main.cpp
@@ -1,20 +1,21 @@
---- src/core/main.cpp.orig	Mon Dec  4 15:22:34 2006
-+++ src/core/main.cpp	Wed Dec  6 11:52:51 2006
-@@ -49,6 +49,9 @@
- #include <sched.h>
- #endif
+--- src/core/main.cpp.orig	2009-02-24 07:34:26.000000000 +0900
++++ src/core/main.cpp	2009-04-09 03:42:57.000000000 +0900
+@@ -38,6 +38,9 @@
+ #include <QtGui/QPainter>
+ #include <QtGui/QSplashScreen>
  
 +#include <sys/types.h>
 +#include <unistd.h>
 +
- 
- #include "main_window.h"
- #include "embed.h"
-@@ -89,6 +92,7 @@
- 		printf( "could not set realtime priority.\n" );
- 	}
+ #ifdef LMMS_HAVE_SCHED_H
+ #include <sched.h>
  #endif
-+	setuid(getuid());	// drop root privileges
- 
- 	QApplication app( argc, argv );
+@@ -101,6 +104,8 @@
+ 		}
+ 	}
  
++	setuid(getuid());	// drop root privileges
++
+ 	QCoreApplication * app = core_only ?
+ 			new QCoreApplication( argc, argv ) :
+ 					new QApplication( argc, argv ) ;
diff --git a/audio/lmms/files/patch-src_tracks_instrument__track.cpp b/audio/lmms/files/patch-src_tracks_instrument__track.cpp
deleted file mode 100644
index baf1d3145bcb..000000000000
--- a/audio/lmms/files/patch-src_tracks_instrument__track.cpp
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/tracks/instrument_track.cpp.orig	Mon Dec  4 15:22:32 2006
-+++ src/tracks/instrument_track.cpp	Tue Dec  5 09:49:12 2006
-@@ -919,7 +919,7 @@
- 		trackContentObject * tco = getTCO( _tco_num );
- 		tcos.push_back( tco );
- 		bb_track = bbTrack::findBBTrack( _tco_num, eng() );
--		if( !( bb_track->automationDisabled( this )
-+		if( bb_track != NULL && !( bb_track->automationDisabled( this )
- 				|| dynamic_cast<pattern *>( tco )->empty() ) )
- 		{
- 			sendMidiTime( _start );