FreeBSD Bugzilla – Attachment 99226 Details for
Bug 138273
Update port: audio/lmms to 0.4.5
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
Remember
[x]
|
Forgot Password
Login:
[x]
[patch]
file.diff
file.diff (text/plain), 35.79 KB, created by
tkato432
on 2009-08-28 19:10:01 UTC
(
hide
)
Description:
file.diff
Filename:
MIME Type:
Creator:
tkato432
Created:
2009-08-28 19:10:01 UTC
Size:
35.79 KB
patch
obsolete
>diff -urN /usr/ports/audio/lmms/Makefile audio/lmms/Makefile >--- /usr/ports/audio/lmms/Makefile 2009-07-07 21:34:55.000000000 +0900 >+++ audio/lmms/Makefile 2009-08-27 16:16:01.000000000 +0900 >@@ -6,11 +6,10 @@ > # > > PORTNAME= lmms >-PORTVERSION= 0.4.4 >-PORTREVISION= 1 >+PORTVERSION= 0.4.5 > PORTEPOCH= 1 > CATEGORIES= audio >-MASTER_SITES= SF >+MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTVERSION} > > MAINTAINER= ports@FreeBSD.org > COMMENT= An all-in-one sequencer, drum machine, sampler and more >@@ -41,6 +40,7 @@ > USE_CMAKE= yes > CMAKE_USE_PTHREAD= yes > CMAKE_ARGS= -DWANT_ALSA:BOOL=OFF \ >+ -DWANT_CALF:BOOL=OFF \ > -DWANT_CAPS:BOOL=OFF \ > -DWANT_CMT:BOOL=OFF \ > -DWANT_SWH:BOOL=OFF \ >diff -urN /usr/ports/audio/lmms/distinfo audio/lmms/distinfo >--- /usr/ports/audio/lmms/distinfo 2009-05-24 00:16:00.000000000 +0900 >+++ audio/lmms/distinfo 2009-08-26 01:56:37.000000000 +0900 >@@ -1,3 +1,3 @@ >-MD5 (lmms-0.4.4.tar.bz2) = c09f00053d1defddb1df7131715f2b74 >-SHA256 (lmms-0.4.4.tar.bz2) = b154db81b344eedf2b9e024407524729e1e200cfc65018351da2de68aeba0bac >-SIZE (lmms-0.4.4.tar.bz2) = 12445986 >+MD5 (lmms-0.4.5.tar.bz2) = 6d58d73b44baddadc4f0ac6464fbd530 >+SHA256 (lmms-0.4.5.tar.bz2) = 8604f152fbb33b97a8cb13205b768a827e5c6775f52d364129dc3bfe9c2fecda >+SIZE (lmms-0.4.5.tar.bz2) = 12972717 >diff -urN /usr/ports/audio/lmms/files/patch-plugins__flp_import__unrtf__attr.c audio/lmms/files/patch-plugins__flp_import__unrtf__attr.c >--- /usr/ports/audio/lmms/files/patch-plugins__flp_import__unrtf__attr.c 2009-05-23 23:23:47.000000000 +0900 >+++ audio/lmms/files/patch-plugins__flp_import__unrtf__attr.c 1970-01-01 09:00:00.000000000 +0900 >@@ -1,178 +0,0 @@ >---- 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 -urN /usr/ports/audio/lmms/files/patch-plugins__flp_import__unrtf__convert.c audio/lmms/files/patch-plugins__flp_import__unrtf__convert.c >--- /usr/ports/audio/lmms/files/patch-plugins__flp_import__unrtf__convert.c 2009-05-23 23:23:47.000000000 +0900 >+++ audio/lmms/files/patch-plugins__flp_import__unrtf__convert.c 1970-01-01 09:00:00.000000000 +0900 >@@ -1,462 +0,0 @@ >---- 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 -urN /usr/ports/audio/lmms/files/patch-plugins__flp_import__unrtf__output.c audio/lmms/files/patch-plugins__flp_import__unrtf__output.c >--- /usr/ports/audio/lmms/files/patch-plugins__flp_import__unrtf__output.c 2009-05-23 23:23:47.000000000 +0900 >+++ audio/lmms/files/patch-plugins__flp_import__unrtf__output.c 1970-01-01 09:00:00.000000000 +0900 >@@ -1,238 +0,0 @@ >---- 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 -urN /usr/ports/audio/lmms/files/patch-plugins__sf2_player__sf2_player.cpp audio/lmms/files/patch-plugins__sf2_player__sf2_player.cpp >--- /usr/ports/audio/lmms/files/patch-plugins__sf2_player__sf2_player.cpp 2009-05-23 23:23:47.000000000 +0900 >+++ audio/lmms/files/patch-plugins__sf2_player__sf2_player.cpp 2009-08-26 04:37:05.000000000 +0900 >@@ -1,7 +1,7 @@ >---- 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 >+--- plugins/sf2_player/sf2_player.cpp.orig 2009-08-12 01:52:18.000000000 +0900 >++++ plugins/sf2_player/sf2_player.cpp 2009-08-26 04:36:42.000000000 +0900 > @@ -45,6 +45,9 @@ >- #undef SINGLE_SOURCE_COMPILE >+ > #include "embed.cpp" > > +#if defined(__FreeBSD__) >diff -urN /usr/ports/audio/lmms/files/patch-plugins__zynaddsubfx__CMakeLists.txt audio/lmms/files/patch-plugins__zynaddsubfx__CMakeLists.txt >--- /usr/ports/audio/lmms/files/patch-plugins__zynaddsubfx__CMakeLists.txt 2009-05-23 23:23:47.000000000 +0900 >+++ audio/lmms/files/patch-plugins__zynaddsubfx__CMakeLists.txt 2009-08-26 04:40:26.000000000 +0900 >@@ -1,15 +1,15 @@ >---- 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 @@ >+--- plugins/zynaddsubfx/CMakeLists.txt.orig 2009-08-12 01:52:18.000000000 +0900 >++++ plugins/zynaddsubfx/CMakeLists.txt 2009-08-26 04:39:57.000000000 +0900 >+@@ -97,12 +97,9 @@ >+ ADD_DEFINITIONS(-DASM_F2I_YES) > ENDIF(LMMS_HOST_X86 OR LMMS_HOST_X86_64) > >- # build ZynAddSubFX with full optimizations >+-# 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_DIRECTORIES(${FFTW3F_LIBRARY_DIRS}) > -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 >diff -urN /usr/ports/audio/lmms/pkg-plist audio/lmms/pkg-plist >--- /usr/ports/audio/lmms/pkg-plist 2009-05-24 00:16:15.000000000 +0900 >+++ audio/lmms/pkg-plist 2009-08-27 16:15:45.000000000 +0900 >@@ -1,4 +1,13 @@ > bin/lmms >+include/lmms/Controller.h >+include/lmms/ControllerConnection.h >+include/lmms/ControllerConnectionDialog.h >+include/lmms/ControllerDialog.h >+include/lmms/ControllerRackView.h >+include/lmms/ControllerView.h >+include/lmms/LfoController.h >+include/lmms/MidiController.h >+include/lmms/PeakController.h > include/lmms/about_dialog.h > include/lmms/aeffectx.h > include/lmms/atomic_int.h >@@ -33,12 +42,6 @@ > include/lmms/combobox.h > include/lmms/combobox_model.h > include/lmms/config_mgr.h >-include/lmms/controller.h >-include/lmms/controller_connection.h >-include/lmms/controller_connection_dialog.h >-include/lmms/controller_dialog.h >-include/lmms/controller_rack_view.h >-include/lmms/controller_view.h > include/lmms/cpuload_widget.h > include/lmms/custom_events.h > include/lmms/debug.h >@@ -96,7 +99,6 @@ > include/lmms/ladspa_manager.h > include/lmms/lcd_spinbox.h > include/lmms/led_checkbox.h >-include/lmms/lfo_controller.h > include/lmms/lmms_basics.h > include/lmms/lmms_constants.h > include/lmms/lmms_math.h >@@ -110,7 +112,6 @@ > include/lmms/midi_alsa_raw.h > include/lmms/midi_alsa_seq.h > include/lmms/midi_client.h >-include/lmms/midi_controller.h > include/lmms/midi_dummy.h > include/lmms/midi_event_processor.h > include/lmms/midi_oss.h >@@ -129,7 +130,6 @@ > include/lmms/panning_constants.h > include/lmms/pattern.h > include/lmms/pch.h >-include/lmms/peak_controller.h > include/lmms/piano.h > include/lmms/piano_roll.h > include/lmms/pixmap_button.h >@@ -1875,8 +1875,11 @@ > %%DATADIR%%/themes/default/plugins.png > %%DATADIR%%/themes/default/ports.png > %%DATADIR%%/themes/default/pr_black_key.png >+%%DATADIR%%/themes/default/pr_black_key_pressed.png > %%DATADIR%%/themes/default/pr_white_key_big.png >+%%DATADIR%%/themes/default/pr_white_key_big_pressed.png > %%DATADIR%%/themes/default/pr_white_key_small.png >+%%DATADIR%%/themes/default/pr_white_key_small_pressed.png > %%DATADIR%%/themes/default/preset_file.png > %%DATADIR%%/themes/default/project_export.png > %%DATADIR%%/themes/default/project_file.png
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
Attachments on
bug 138273
: 99226