[SCM] zynjacku/master: Drop patches applied upstream.
alessio at users.alioth.debian.org
alessio at users.alioth.debian.org
Mon Mar 28 14:19:15 UTC 2011
The following commit has been merged in the master branch:
commit 27406ae620bfaeee38886a21982ba24e9f2d152b
Author: Alessio Treglia <alessio at debian.org>
Date: Mon Mar 28 16:18:34 2011 +0200
Drop patches applied upstream.
- 0001-fix_scan_without_plugins_installed.patch
- 0002-handle_empty_doapmaintainer_field.patch
- 0003-syntax_error_exception.patch
- 0004-flex_parser_recognizes_datatype_uris_and_lang_suffixes.patch
- 0005-lv2_parser_ignores_datatype_uris_and_lang_suffixes.patch
- 0006-ui_gtk_threads_init.patch
- 0007-unknown_ui_types.patch
- 0008-continue_on_missing_ui_plugin_req.patch
- 0009-regex_uris_command_line.patch
- 0010-external_gui_cleanup.patch
- 0011-check_ui_is_visible.patch
- 0012-fix_parsing_lv2rack_cmdline.patch
- 0013-hangs_on_missing_license_field.patch
diff --git a/debian/patches/0001-fix_scan_without_plugins_installed.patch b/debian/patches/0001-fix_scan_without_plugins_installed.patch
deleted file mode 100644
index 2643559..0000000
--- a/debian/patches/0001-fix_scan_without_plugins_installed.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-Description: Properly handle scan when there are no lv2 plugins installed.
-Origin: upstream, commit:22f9d93196735ae5816296a7d00c76f9aac9dea6
-From: Nedko Arnaudov <nedko at arnaudov.name>
-Bug-Fedora: https://bugzilla.redhat.com/show_bug.cgi?id=551480
----
- zynworld/host.py | 5 ++++-
- 1 file changed, 4 insertions(+), 1 deletion(-)
-
---- zynjacku.orig/zynworld/host.py
-+++ zynjacku/zynworld/host.py
-@@ -2419,7 +2419,10 @@ class host:
-
- plugins = self.lv2db.getPluginList()
-
-- step = 1.0 / len(plugins)
-+ if len(plugins) > 0:
-+ step = 1.0 / len(plugins)
-+ else:
-+ step = 1.0
- progress = 0.0
-
- for uri in plugins:
diff --git a/debian/patches/0002-handle_empty_doapmaintainer_field.patch b/debian/patches/0002-handle_empty_doapmaintainer_field.patch
deleted file mode 100644
index 8d26720..0000000
--- a/debian/patches/0002-handle_empty_doapmaintainer_field.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-From: Nedko Arnaudov <nedko at arnaudov.name>
-Origin: upstream, commit:ed42d022a71c3d07fbfd4671cf384c3e08de587e
-Description: Handle empty doap:maintainer.
- EQ10Q-1.0 does not define the foaf prefix and this causes empty
- doap:maintainer.
----
- zynworld/lv2.py | 7 +++++--
- 1 file changed, 5 insertions(+), 2 deletions(-)
-
---- zynjacku.orig/zynworld/lv2.py
-+++ zynjacku/zynworld/lv2.py
-@@ -488,14 +488,17 @@ class LV2DB:
- for maintainer in info.bySubject[uri][doap + "maintainer"]:
- maintainersubj = info.bySubject[maintainer]
- maintainerdict = {}
-- maintainerdict['name'] = info.getProperty(maintainersubj, foaf + "name")[0]
-+ maintainer_names = info.getProperty(maintainersubj, foaf + "name")
-+ if maintainer_names:
-+ maintainerdict['name'] = maintainer_names[0]
- homepages = info.getProperty(maintainersubj, foaf + "homepage")
- if homepages:
- maintainerdict['homepage'] = homepages[0]
- mboxes = info.getProperty(maintainersubj, foaf + "mbox")
- if mboxes:
- maintainerdict['mbox'] = mboxes[0]
-- dest.maintainers.append(maintainerdict)
-+ if maintainerdict:
-+ dest.maintainers.append(maintainerdict)
-
- ports = []
- portDict = {}
diff --git a/debian/patches/0003-syntax_error_exception.patch b/debian/patches/0003-syntax_error_exception.patch
deleted file mode 100644
index 758501f..0000000
--- a/debian/patches/0003-syntax_error_exception.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-From: Nedko Arnaudov <nedko at arnaudov.name>
-Description: Fix syntax error exception.
-Origin: upstream, commit:2a3470d48bd658d8e5d0062de3cd6ac6bfc5e7f9
-Bug: https://gna.org/bugs/?15558
----
- zynworld/lv2.py | 12 ++++--------
- 1 file changed, 4 insertions(+), 8 deletions(-)
-
---- zynjacku.orig/zynworld/lv2.py
-+++ zynjacku/zynworld/lv2.py
-@@ -127,20 +127,16 @@ class SimpleRDFModel:
- return list(anyprops)
-
- def add_object_source(self, uri, source):
-- if o not in self.object_sources:
-- self.object_sources[o] = set((source,))
-- else:
-- self.object_sources[o].add(source)
-+ if uri not in self.object_sources:
-+ self.object_sources[uri] = set()
-+ self.object_sources[uri].add(source)
-
- def addTriple(self, s, p, o, source=None):
- self.len += 1
-
- #if p == lv2 + "binary":
- # print 'binary "%s" of %s found' % (o, s)
-- if o not in self.object_sources:
-- self.object_sources[o] = set((source,))
-- else:
-- self.object_sources[o].add(source)
-+ self.add_object_source(o, source)
- if p == rdf_type:
- p = "a"
- #if p == 'a' and o == lv2preset_preset:
diff --git a/debian/patches/0004-flex_parser_recognizes_datatype_uris_and_lang_suffixes.patch b/debian/patches/0004-flex_parser_recognizes_datatype_uris_and_lang_suffixes.patch
deleted file mode 100644
index 16b2ea9..0000000
--- a/debian/patches/0004-flex_parser_recognizes_datatype_uris_and_lang_suffixes.patch
+++ /dev/null
@@ -1,542 +0,0 @@
-From: Nedko Arnaudov <nedko at arnaudov.name>
-Origin: upstream, commit:c3e1c2bf2ace893cee2bc16797471b9a5f36b38c
-Description: In flex parser, recognize datatype URIs and language suffixes
- for string literals
- Add ttl.l flex description file.
----
-
----
- flex_ttl.c | 234 +++++++++++++++++++++++++++++++++----------------------------
- flex_ttl.h | 2
- ttl.l | 77 ++++++++++++++++++++
- 3 files changed, 207 insertions(+), 106 deletions(-)
-
---- zynjacku.orig/flex_ttl.c
-+++ zynjacku/flex_ttl.c
-@@ -346,8 +346,8 @@ static void yy_fatal_error (yyconst char
- *yy_cp = '\0'; \
- yyg->yy_c_buf_p = yy_cp;
-
--#define YY_NUM_RULES 21
--#define YY_END_OF_BUFFER 22
-+#define YY_NUM_RULES 23
-+#define YY_END_OF_BUFFER 24
- /* This struct is not used in this scanner,
- but its presence is necessary. */
- struct yy_trans_info
-@@ -355,14 +355,15 @@ struct yy_trans_info
- flex_int32_t yy_verify;
- flex_int32_t yy_nxt;
- };
--static yyconst flex_int16_t yy_accept[61] =
-+static yyconst flex_int16_t yy_accept[63] =
- { 0,
-- 0, 0, 0, 0, 0, 0, 0, 0, 22, 12,
-- 11, 11, 4, 2, 10, 12, 9, 10, 7, 8,
-- 12, 12, 9, 20, 19, 14, 15, 18, 21, 16,
-- 21, 0, 0, 7, 9, 7, 8, 6, 6, 8,
-- 0, 5, 0, 14, 0, 18, 17, 3, 0, 6,
-- 8, 0, 13, 0, 6, 0, 0, 0, 1, 0
-+ 0, 0, 0, 0, 0, 0, 0, 0, 24, 14,
-+ 11, 11, 4, 2, 10, 14, 9, 10, 7, 8,
-+ 14, 13, 9, 14, 22, 21, 16, 17, 20, 23,
-+ 18, 23, 0, 0, 7, 9, 7, 8, 6, 6,
-+ 8, 0, 5, 0, 12, 16, 0, 20, 19, 3,
-+ 0, 6, 8, 0, 15, 0, 6, 0, 0, 0,
-+ 1, 0
- } ;
-
- static yyconst flex_int32_t yy_ec[256] =
-@@ -376,10 +377,10 @@ static yyconst flex_int32_t yy_ec[256] =
- 1, 13, 1, 14, 15, 15, 15, 15, 16, 15,
- 15, 15, 15, 15, 15, 15, 15, 15, 15, 15,
- 15, 15, 15, 15, 15, 15, 15, 15, 15, 15,
-- 6, 17, 6, 1, 15, 1, 15, 15, 15, 15,
-+ 6, 17, 6, 18, 15, 1, 15, 15, 15, 15,
-
-- 18, 19, 15, 15, 20, 15, 15, 15, 15, 15,
-- 15, 21, 15, 22, 15, 15, 15, 15, 15, 23,
-+ 19, 20, 15, 15, 21, 15, 15, 15, 15, 15,
-+ 15, 22, 15, 23, 15, 15, 15, 15, 15, 24,
- 15, 15, 1, 1, 1, 1, 1, 1, 1, 1,
- 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
- 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
-@@ -397,73 +398,75 @@ static yyconst flex_int32_t yy_ec[256] =
- 1, 1, 1, 1, 1
- } ;
-
--static yyconst flex_int32_t yy_meta[24] =
-+static yyconst flex_int32_t yy_meta[25] =
- { 0,
- 1, 1, 2, 3, 1, 1, 1, 4, 5, 6,
-- 5, 1, 1, 1, 4, 4, 2, 4, 4, 4,
-- 4, 4, 4
-+ 5, 1, 1, 1, 4, 4, 2, 1, 4, 4,
-+ 4, 4, 4, 4
- } ;
-
--static yyconst flex_int16_t yy_base[70] =
-+static yyconst flex_int16_t yy_base[72] =
- { 0,
-- 0, 0, 115, 114, 112, 111, 21, 23, 114, 119,
-- 119, 119, 109, 119, 119, 19, 21, 102, 24, 0,
-- 98, 89, 26, 119, 119, 0, 105, 0, 119, 119,
-- 103, 98, 91, 32, 34, 37, 0, 34, 39, 0,
-- 83, 119, 43, 0, 59, 0, 119, 119, 46, 48,
-- 0, 44, 119, 51, 50, 40, 31, 16, 119, 119,
-- 66, 72, 78, 81, 32, 87, 93, 99, 102
-+ 0, 0, 117, 116, 114, 113, 22, 24, 116, 121,
-+ 121, 121, 111, 121, 121, 20, 22, 104, 25, 0,
-+ 100, 90, 27, 93, 121, 121, 0, 106, 0, 121,
-+ 121, 105, 103, 92, 33, 35, 38, 0, 35, 40,
-+ 0, 88, 121, 73, 121, 0, 61, 0, 121, 121,
-+ 45, 47, 0, 45, 121, 52, 51, 40, 37, 16,
-+ 121, 121, 66, 72, 78, 81, 33, 87, 93, 99,
-+ 102
- } ;
-
--static yyconst flex_int16_t yy_def[70] =
-+static yyconst flex_int16_t yy_def[72] =
- { 0,
-- 60, 1, 61, 61, 62, 62, 63, 63, 60, 60,
-- 60, 60, 60, 60, 60, 60, 64, 60, 60, 65,
-- 66, 60, 64, 60, 60, 67, 60, 68, 60, 60,
-- 60, 60, 60, 60, 64, 64, 65, 60, 60, 69,
-- 66, 60, 60, 67, 60, 68, 60, 60, 60, 60,
-- 69, 60, 60, 60, 60, 60, 60, 60, 60, 0,
-- 60, 60, 60, 60, 60, 60, 60, 60, 60
-+ 62, 1, 63, 63, 64, 64, 65, 65, 62, 62,
-+ 62, 62, 62, 62, 62, 62, 66, 62, 62, 67,
-+ 68, 62, 66, 62, 62, 62, 69, 62, 70, 62,
-+ 62, 62, 62, 62, 62, 66, 66, 67, 62, 62,
-+ 71, 68, 62, 62, 62, 69, 62, 70, 62, 62,
-+ 62, 62, 71, 62, 62, 62, 62, 62, 62, 62,
-+ 62, 0, 62, 62, 62, 62, 62, 62, 62, 62,
-+ 62
- } ;
-
--static yyconst flex_int16_t yy_nxt[143] =
-+static yyconst flex_int16_t yy_nxt[146] =
- { 0,
- 10, 11, 12, 13, 14, 15, 16, 17, 18, 19,
-- 20, 21, 10, 22, 23, 23, 10, 23, 23, 23,
-- 23, 23, 23, 29, 30, 29, 30, 33, 34, 33,
-- 36, 37, 39, 34, 60, 40, 37, 31, 59, 31,
-- 39, 34, 60, 38, 37, 39, 36, 37, 50, 49,
-- 58, 49, 54, 54, 49, 55, 49, 50, 57, 55,
-- 55, 56, 53, 49, 52, 49, 24, 24, 24, 24,
-- 24, 24, 26, 26, 26, 26, 26, 26, 28, 28,
-- 28, 28, 28, 28, 35, 35, 35, 41, 41, 41,
-- 41, 41, 41, 44, 44, 42, 44, 44, 44, 46,
--
-- 38, 48, 46, 46, 46, 51, 47, 51, 45, 43,
-- 42, 38, 32, 60, 27, 27, 25, 25, 9, 60,
-- 60, 60, 60, 60, 60, 60, 60, 60, 60, 60,
-- 60, 60, 60, 60, 60, 60, 60, 60, 60, 60,
-- 60, 60
-+ 20, 21, 10, 22, 23, 23, 10, 24, 23, 23,
-+ 23, 23, 23, 23, 30, 31, 30, 31, 34, 35,
-+ 34, 37, 38, 40, 35, 62, 41, 38, 32, 61,
-+ 32, 40, 35, 62, 39, 38, 40, 37, 38, 52,
-+ 51, 56, 56, 51, 57, 51, 52, 60, 51, 59,
-+ 57, 57, 51, 58, 55, 51, 25, 25, 25, 25,
-+ 25, 25, 27, 27, 27, 27, 27, 27, 29, 29,
-+ 29, 29, 29, 29, 36, 36, 36, 42, 42, 42,
-+ 42, 42, 42, 46, 46, 54, 46, 46, 46, 48,
-+
-+ 43, 39, 48, 48, 48, 53, 50, 53, 49, 47,
-+ 45, 44, 43, 39, 33, 62, 28, 28, 26, 26,
-+ 9, 62, 62, 62, 62, 62, 62, 62, 62, 62,
-+ 62, 62, 62, 62, 62, 62, 62, 62, 62, 62,
-+ 62, 62, 62, 62, 62
- } ;
-
--static yyconst flex_int16_t yy_chk[143] =
-+static yyconst flex_int16_t yy_chk[146] =
- { 0,
- 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
- 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
-- 1, 1, 1, 7, 7, 8, 8, 16, 16, 17,
-- 17, 17, 19, 19, 23, 65, 23, 7, 58, 8,
-- 34, 34, 35, 38, 35, 36, 36, 36, 39, 38,
-- 57, 38, 49, 49, 39, 49, 39, 50, 56, 55,
-- 54, 52, 45, 50, 43, 50, 61, 61, 61, 61,
-- 61, 61, 62, 62, 62, 62, 62, 62, 63, 63,
-- 63, 63, 63, 63, 64, 64, 64, 66, 66, 66,
-- 66, 66, 66, 67, 67, 41, 67, 67, 67, 68,
--
-- 33, 32, 68, 68, 68, 69, 31, 69, 27, 22,
-- 21, 18, 13, 9, 6, 5, 4, 3, 60, 60,
-- 60, 60, 60, 60, 60, 60, 60, 60, 60, 60,
-- 60, 60, 60, 60, 60, 60, 60, 60, 60, 60,
-- 60, 60
-+ 1, 1, 1, 1, 7, 7, 8, 8, 16, 16,
-+ 17, 17, 17, 19, 19, 23, 67, 23, 7, 60,
-+ 8, 35, 35, 36, 39, 36, 37, 37, 37, 40,
-+ 39, 51, 51, 39, 51, 40, 52, 59, 40, 58,
-+ 57, 56, 52, 54, 47, 52, 63, 63, 63, 63,
-+ 63, 63, 64, 64, 64, 64, 64, 64, 65, 65,
-+ 65, 65, 65, 65, 66, 66, 66, 68, 68, 68,
-+ 68, 68, 68, 69, 69, 44, 69, 69, 69, 70,
-+
-+ 42, 34, 70, 70, 70, 71, 33, 71, 32, 28,
-+ 24, 22, 21, 18, 13, 9, 6, 5, 4, 3,
-+ 62, 62, 62, 62, 62, 62, 62, 62, 62, 62,
-+ 62, 62, 62, 62, 62, 62, 62, 62, 62, 62,
-+ 62, 62, 62, 62, 62
- } ;
-
- /* The intent behind this definition is that it'll catch
-@@ -494,6 +497,7 @@ void add_to(const char *str)
-
- void add_token_str(const char *name, const char *value)
- {
-+ //printf("add_token_str: name='%s', value='%s'\n", name, value);
- PyList_Append(ttl_list, Py_BuildValue("(ss)", name, value));
- }
-
-@@ -503,7 +507,7 @@ void add_token(const char *name, PyObjec
- }
-
-
--#line 507 "flex_ttl.c"
-+#line 511 "flex_ttl.c"
-
- #define INITIAL 0
- #define C_COMMENT 1
-@@ -725,10 +729,10 @@ YY_DECL
- register int yy_act;
- struct yyguts_t * yyg = (struct yyguts_t*)yyscanner;
-
--#line 37 "ttl.l"
-+#line 38 "ttl.l"
-
-
--#line 732 "flex_ttl.c"
-+#line 736 "flex_ttl.c"
-
- if ( !yyg->yy_init )
- {
-@@ -781,13 +785,13 @@ yy_match:
- while ( yy_chk[yy_base[yy_current_state] + yy_c] != yy_current_state )
- {
- yy_current_state = (int) yy_def[yy_current_state];
-- if ( yy_current_state >= 61 )
-+ if ( yy_current_state >= 63 )
- yy_c = yy_meta[(unsigned int) yy_c];
- }
- yy_current_state = yy_nxt[yy_base[yy_current_state] + (unsigned int) yy_c];
- ++yy_cp;
- }
-- while ( yy_current_state != 60 );
-+ while ( yy_current_state != 62 );
- yy_cp = yyg->yy_last_accepting_cpos;
- yy_current_state = yyg->yy_last_accepting_state;
-
-@@ -809,119 +813,129 @@ do_action: /* This label is used only to
-
- case 1:
- YY_RULE_SETUP
--#line 39 "ttl.l"
-+#line 40 "ttl.l"
- { add_token_str("prefix", "@prefix"); }
- YY_BREAK
- case 2:
- YY_RULE_SETUP
--#line 40 "ttl.l"
-+#line 41 "ttl.l"
- BEGIN(C_COMMENT);
- YY_BREAK
- case 3:
- YY_RULE_SETUP
--#line 41 "ttl.l"
-+#line 42 "ttl.l"
- { tmp_string = PyString_FromString(""); BEGIN(C_LONGSTRING); }
- YY_BREAK
- case 4:
- YY_RULE_SETUP
--#line 42 "ttl.l"
-+#line 43 "ttl.l"
- { tmp_string = PyString_FromString(""); BEGIN(C_STRING); }
- YY_BREAK
- case 5:
- /* rule 5 can match eol */
- YY_RULE_SETUP
--#line 43 "ttl.l"
-+#line 44 "ttl.l"
- { add_token_str("URI_", yytext); }
- YY_BREAK
- case 6:
- YY_RULE_SETUP
--#line 44 "ttl.l"
-+#line 45 "ttl.l"
- { add_token_str("float", yytext); }
- YY_BREAK
- case 7:
- YY_RULE_SETUP
--#line 45 "ttl.l"
-+#line 46 "ttl.l"
- { add_token("number", PyInt_FromLong(atol(yytext))); }
- YY_BREAK
- case 8:
- YY_RULE_SETUP
--#line 46 "ttl.l"
-+#line 47 "ttl.l"
- { add_token_str("prnot", yytext); }
- YY_BREAK
- case 9:
- YY_RULE_SETUP
--#line 47 "ttl.l"
-+#line 48 "ttl.l"
- { add_token_str("symbol", yytext); }
- YY_BREAK
- case 10:
- YY_RULE_SETUP
--#line 48 "ttl.l"
-+#line 49 "ttl.l"
- { add_token_str(yytext, yytext); }
- YY_BREAK
- case 11:
- /* rule 11 can match eol */
- YY_RULE_SETUP
--#line 49 "ttl.l"
-+#line 50 "ttl.l"
- ;
- YY_BREAK
- case 12:
- YY_RULE_SETUP
- #line 51 "ttl.l"
--{
-- // TODO concat with yytext
-- //printf("yytext = '%u''%u'\n", yytext[0], yytext[1]);
-- PyErr_SetString(PyExc_ValueError, "Unexpected characters");
-- yyerror("Syntax error");
--}
-+{ add_token_str("datatype_URI", yytext); }
- YY_BREAK
- case 13:
- YY_RULE_SETUP
--#line 58 "ttl.l"
--{ add_token("string", tmp_string); BEGIN(INITIAL); }
-+#line 52 "ttl.l"
-+{ add_token_str("language", yytext); }
- YY_BREAK
- case 14:
--/* rule 14 can match eol */
- YY_RULE_SETUP
--#line 59 "ttl.l"
--add_to(yytext);
-+#line 54 "ttl.l"
-+{
-+ // TODO concat with yytext
-+ //printf("unrecognised char '%c' (0x%02X) at line %d\n", *yytext, *yytext, yylineno);
-+ PyErr_SetString(PyExc_ValueError, "Unexpected characters");
-+ yyerror("Syntax error");
-+}
- YY_BREAK
- case 15:
- YY_RULE_SETUP
--#line 60 "ttl.l"
--add_to("\"");
-+#line 61 "ttl.l"
-+{ add_token("string", tmp_string); BEGIN(INITIAL); }
- YY_BREAK
- case 16:
-+/* rule 16 can match eol */
- YY_RULE_SETUP
- #line 62 "ttl.l"
--{ add_token("string", tmp_string); BEGIN(INITIAL); }
-+add_to(yytext);
- YY_BREAK
- case 17:
- YY_RULE_SETUP
- #line 63 "ttl.l"
--add_to("\"");
-+add_to("\"");
- YY_BREAK
- case 18:
- YY_RULE_SETUP
--#line 64 "ttl.l"
--add_to(yytext);
-+#line 65 "ttl.l"
-+{ add_token("string", tmp_string); BEGIN(INITIAL); }
- YY_BREAK
- case 19:
--/* rule 19 can match eol */
- YY_RULE_SETUP
- #line 66 "ttl.l"
--{ BEGIN(INITIAL); }
-+add_to("\"");
- YY_BREAK
- case 20:
- YY_RULE_SETUP
- #line 67 "ttl.l"
--;
-+add_to(yytext);
- YY_BREAK
- case 21:
-+/* rule 21 can match eol */
- YY_RULE_SETUP
- #line 69 "ttl.l"
-+{ BEGIN(INITIAL); }
-+ YY_BREAK
-+case 22:
-+YY_RULE_SETUP
-+#line 70 "ttl.l"
-+;
-+ YY_BREAK
-+case 23:
-+YY_RULE_SETUP
-+#line 72 "ttl.l"
- YY_FATAL_ERROR( "flex scanner jammed" );
- YY_BREAK
--#line 925 "flex_ttl.c"
-+#line 939 "flex_ttl.c"
- case YY_STATE_EOF(INITIAL):
- case YY_STATE_EOF(C_COMMENT):
- case YY_STATE_EOF(C_LONGSTRING):
-@@ -1219,7 +1233,7 @@ static int yy_get_next_buffer (yyscan_t
- while ( yy_chk[yy_base[yy_current_state] + yy_c] != yy_current_state )
- {
- yy_current_state = (int) yy_def[yy_current_state];
-- if ( yy_current_state >= 61 )
-+ if ( yy_current_state >= 63 )
- yy_c = yy_meta[(unsigned int) yy_c];
- }
- yy_current_state = yy_nxt[yy_base[yy_current_state] + (unsigned int) yy_c];
-@@ -1248,11 +1262,11 @@ static int yy_get_next_buffer (yyscan_t
- while ( yy_chk[yy_base[yy_current_state] + yy_c] != yy_current_state )
- {
- yy_current_state = (int) yy_def[yy_current_state];
-- if ( yy_current_state >= 61 )
-+ if ( yy_current_state >= 63 )
- yy_c = yy_meta[(unsigned int) yy_c];
- }
- yy_current_state = yy_nxt[yy_base[yy_current_state] + (unsigned int) yy_c];
-- yy_is_jam = (yy_current_state == 60);
-+ yy_is_jam = (yy_current_state == 62);
-
- return yy_is_jam ? 0 : yy_current_state;
- }
-@@ -1446,9 +1460,19 @@ static void yy_load_buffer_state (yysca
- yyfree((void *) b ,yyscanner );
- }
-
--#ifndef __cplusplus
-+#ifndef _UNISTD_H /* assume unistd.h has isatty() for us */
-+#ifdef __cplusplus
-+extern "C" {
-+#endif
-+#ifdef __THROW /* this is a gnuism */
-+extern int isatty (int ) __THROW;
-+#else
- extern int isatty (int );
--#endif /* __cplusplus */
-+#endif
-+#ifdef __cplusplus
-+}
-+#endif
-+#endif
-
- /* Initializes or reinitializes a buffer.
- * This function is sometimes called more than once on the same buffer,
-@@ -2042,7 +2066,7 @@ void yyfree (void * ptr , yyscan_t yysca
-
- #define YYTABLES_NAME "yytables"
-
--#line 69 "ttl.l"
-+#line 72 "ttl.l"
-
-
-
---- zynjacku.orig/flex_ttl.h
-+++ zynjacku/flex_ttl.h
-@@ -327,7 +327,7 @@ extern int yylex (yyscan_t yyscanner);
- #undef YY_DECL
- #endif
-
--#line 69 "ttl.l"
-+#line 72 "ttl.l"
-
-
- #line 334 "flex_ttl.h"
---- /dev/null
-+++ zynjacku/ttl.l
-@@ -0,0 +1,77 @@
-+%{
-+#include <Python.h>
-+#include "ttl_lexer.h"
-+
-+
-+PyObject *ttl_list = NULL;
-+static PyObject *tmp_string = NULL;
-+
-+void yyerror(const char *str)
-+{
-+ PyErr_SetString(PyExc_SyntaxError, str);
-+}
-+
-+void add_to(const char *str)
-+{
-+ PyString_ConcatAndDel(&tmp_string, PyString_FromString(str));
-+}
-+
-+void add_token_str(const char *name, const char *value)
-+{
-+ //printf("add_token_str: name='%s', value='%s'\n", name, value);
-+ PyList_Append(ttl_list, Py_BuildValue("(ss)", name, value));
-+}
-+
-+void add_token(const char *name, PyObject *value)
-+{
-+ PyList_Append(ttl_list, Py_BuildValue("(sO)", name, value));
-+}
-+
-+%}
-+
-+%option nounput reentrant
-+%x C_COMMENT C_LONGSTRING C_STRING
-+
-+SYMBOL [A-Za-z_-][a-zA-Z0-9_-]*
-+TRIPLEQUOTE \"\"\"
-+
-+%%
-+
-+ at prefix { add_token_str("prefix", "@prefix"); }
-+# BEGIN(C_COMMENT);
-+{TRIPLEQUOTE} { tmp_string = PyString_FromString(""); BEGIN(C_LONGSTRING); }
-+\" { tmp_string = PyString_FromString(""); BEGIN(C_STRING); }
-+\<[^>]*\> { add_token_str("URI_", yytext); }
-+[+-]?([0-9]+\.[0-9]*|\.[0-9]+)([eE][-+]?[0-9]+)? { add_token_str("float", yytext); }
-+[+-]?[0-9]+ { add_token("number", PyInt_FromLong(atol(yytext))); }
-+{SYMBOL}?:{SYMBOL}? { add_token_str("prnot", yytext); }
-+{SYMBOL} { add_token_str("symbol", yytext); }
-+[.,;\[\]\(\)] { add_token_str(yytext, yytext); }
-+[ \t\n\r] ;
-+\^{2} { add_token_str("datatype_URI", yytext); }
-+@ { add_token_str("language", yytext); }
-+
-+. {
-+ // TODO concat with yytext
-+ //printf("unrecognised char '%c' (0x%02X) at line %d\n", *yytext, *yytext, yylineno);
-+ PyErr_SetString(PyExc_ValueError, "Unexpected characters");
-+ yyerror("Syntax error");
-+}
-+
-+<C_LONGSTRING>{TRIPLEQUOTE} { add_token("string", tmp_string); BEGIN(INITIAL); }
-+<C_LONGSTRING>[^"]+ add_to(yytext);
-+<C_LONGSTRING>\" add_to("\"");
-+
-+<C_STRING>\" { add_token("string", tmp_string); BEGIN(INITIAL); }
-+<C_STRING>\\\" add_to("\"");
-+<C_STRING>[^\\\"\n]+ add_to(yytext);
-+
-+<C_COMMENT>\n { BEGIN(INITIAL); }
-+<C_COMMENT>. ;
-+
-+%%
-+
-+int yywrap(yyscan_t scanner)
-+{
-+ return 1;
-+}
diff --git a/debian/patches/0005-lv2_parser_ignores_datatype_uris_and_lang_suffixes.patch b/debian/patches/0005-lv2_parser_ignores_datatype_uris_and_lang_suffixes.patch
deleted file mode 100644
index b1575f4..0000000
--- a/debian/patches/0005-lv2_parser_ignores_datatype_uris_and_lang_suffixes.patch
+++ /dev/null
@@ -1,70 +0,0 @@
-From: Nedko Arnaudov <nedko at arnaudov.name>
-Description: In LV2 parser, ignore datatype URIs and language suffixes
- for string literals.
-Origin: upstream, commit:efd1b59f93e9da99c88c46f70750c4dc8f6c7d31
----
- zynworld/lv2.py | 23 +++++++++++++++++++++--
- 1 file changed, 21 insertions(+), 2 deletions(-)
-
---- zynjacku.orig/zynworld/lv2.py
-+++ zynjacku/zynworld/lv2.py
-@@ -198,7 +198,7 @@ class SimpleRDFModel:
- for p in self.bySubject[s].keys():
- print "%s %s %s" % (s, p, self.bySubject[s][p])
-
--def parseTTL(uri, content, model, debug):
-+def parseTTL(uri, content, model = SimpleRDFModel(), debug = False):
- #print " *** Parse TTL *** ",
- # Missing stuff: translated literals, blank nodes
- if debug:
-@@ -208,15 +208,32 @@ def parseTTL(uri, content, model, debug)
- spo = ["", "", ""]
- item = 0
- anoncnt = 1
-+ last_string = None
-+ string_tail = None
- for x in zynjacku_ttl.scan_string(content):
-+ #print "item %u; %s" % (item, repr(x))
- if x[0] == '':
- continue
- if x[0] == "URI_": x = ('URI', x[1][1:-1])
- if x[0] == "float": x = ('number', float(x[1]))
-+ if last_string:
-+ if x[0] in ("datatype_URI", "language"):
-+ string_tail = [last_string, x[0]]
-+ last_string = None
-+ continue
-+ last_string = None
- if x[0] == 'prefix':
- spo[0] = "@prefix"
- item = 1
- continue
-+ if string_tail and x[0] == "symbol" and string_tail[1] == "language":
-+ #print "string '%s' with language '%s'" % (string_tail[0], x[1])
-+ string_tail = None
-+ continue
-+ if string_tail and (x[0] == "URI" or x[0] == "prnot") and string_tail[1] == "datatype_URI":
-+ #print "string '%s' with language '%s'" % (string_tail[0], x[1])
-+ string_tail = None
-+ continue
- elif (x[0] == '.' and spo_stack == []) or x[0] == ';' or x[0] == ',':
- if item == 3:
- if spo[0] == "@prefix":
-@@ -251,6 +268,8 @@ def parseTTL(uri, content, model, debug)
- x = ("URI", os.path.dirname(uri) + "/" + x[1])
- spo[item] = x[1]
- item += 1
-+ if x[0] == "string":
-+ last_string = x[1]
- elif x[0] == '[':
- if item != 2:
- raise Exception, "Incorrect use of ["
-@@ -277,7 +296,7 @@ def parseTTL(uri, content, model, debug)
- item = 2
- anoncnt += 1
- else:
-- print uri + ": Unexpected: " + repr(x)
-+ print uri + ": Unexpected(%u): %s" % (item, repr(x))
-
- class LV2Port(object):
- def __init__(self):
diff --git a/debian/patches/0006-ui_gtk_threads_init.patch b/debian/patches/0006-ui_gtk_threads_init.patch
deleted file mode 100644
index d4f7f1e..0000000
--- a/debian/patches/0006-ui_gtk_threads_init.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-From: Gabriel M. Beddingfield <gabriel at teuton.org>
-Origin: upstream, commit:3f28b4276e53af23818f8b9f002544973abfea2e
-Description: Call gtk.gdk.threads_init() before doing any GTK+ stuff.
- When using the Composite Sampler plugin[1], the UI would freeze (but
- the audio would be functional).
----
- zynjacku | 1 +
- 1 file changed, 1 insertion(+)
-
---- zynjacku.orig/zynjacku
-+++ zynjacku/zynjacku
-@@ -61,6 +61,7 @@ class ZynjackuHost(zynhost.host):
- def __init__(self, client_name, preset_extension=None, preset_name=None, lash_client=None):
- #print "ZynjackuHost constructor called."
-
-+ gtk.gdk.threads_init()
- zynhost.host.__init__(self, zynjacku_c.Engine(), client_name, preset_extension, preset_name, lash_client)
-
- class ZynjackuHostMulti(ZynjackuHost):
diff --git a/debian/patches/0007-unknown_ui_types.patch b/debian/patches/0007-unknown_ui_types.patch
deleted file mode 100644
index 4024e7c..0000000
--- a/debian/patches/0007-unknown_ui_types.patch
+++ /dev/null
@@ -1,60 +0,0 @@
-From: Krzysztof Foltman <wdev at foltman.com>
-Description: React better to unknown or unspecified UI types. Minor refactoring.
-Origin: upstream, commit:d1e2025e434b25bd8da2617b648a5668e265bc76
----
- zynworld/host.py | 11 +++++++----
- zynworld/lv2.py | 12 +++++++++++-
- 2 files changed, 18 insertions(+), 5 deletions(-)
-
---- zynjacku.orig/zynworld/host.py
-+++ zynjacku/zynworld/host.py
-@@ -2185,6 +2185,7 @@ class host:
- break
- self.lv2features_supported.append(feature)
- index += 1
-+ self.lv2guifeatures_supported = self.lv2features_supported + ["http://lv2plug.in/ns/extensions/ui#makeResident"]
-
- self.available_plugins = []
-
-@@ -2244,12 +2245,14 @@ class host:
- ui_binary_path = None
-
- for ui_uri in info.ui:
-- ui = self.lv2db.get_ui_info(plugin.uri, ui_uri)
-+ try:
-+ ui = self.lv2db.get_ui_info(plugin.uri, ui_uri)
-+ except ValueError, e:
-+ print "Skipping UI %s: %s" % (ui_uri, str(e))
-+ continue
- features_match = True
- for required_feature in ui.requiredFeatures:
-- if required_feature == "http://lv2plug.in/ns/extensions/ui#makeResident":
-- continue
-- if not required_feature in self.lv2features_supported:
-+ if not required_feature in self.lv2guifeatures_supported:
- features_match = False
-
- if not features_match:
---- zynjacku.orig/zynworld/lv2.py
-+++ zynjacku/zynworld/lv2.py
-@@ -585,9 +585,19 @@ class LV2DB:
- def get_ui_info(self, plugin_uri, uri):
- info = self.plugin_info[plugin_uri]
-
-+ classes = info.getProperty(uri, "a")
-+ if classes is None:
-+ raise ValueError, "No RDF type specified"
-+ supported_classes = set(classes).intersection(set([lv2ui + 'GtkUI', lv2ui + 'external']))
-+ if len(supported_classes) == 0:
-+ if len(classes) == 1:
-+ raise ValueError, "GUI RDF type not supported: %s" % classes[0]
-+ else:
-+ raise ValueError, "Neither of these types is supported: %s" % (", ".join(classes))
-+
- dest = LV2Plugin()
- dest.uri = uri
-- dest.type = set(info.getProperty(uri, "a")).intersection(set([lv2ui + 'GtkUI', lv2ui + 'external'])).pop()
-+ dest.type = classes.pop()
- dest.binary = info.getProperty(uri, lv2ui_binary)[0]
- dest.requiredFeatures = info.getProperty(uri, lv2ui + "requiredFeature", optional = True)
- dest.optionalFeatures = info.getProperty(uri, lv2ui + "optionalFeature", optional = True)
diff --git a/debian/patches/0008-continue_on_missing_ui_plugin_req.patch b/debian/patches/0008-continue_on_missing_ui_plugin_req.patch
deleted file mode 100644
index e1d1cb1..0000000
--- a/debian/patches/0008-continue_on_missing_ui_plugin_req.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-Description: Do not give up too easily when not being able to meet UI
- plugin's requirement. Just try another one.
-From: Krzysztof Foltman <wdev at foltman.com>
-Origin: upstream,commit:66bae83e0b9b06a58dd7a7bf8a5eaa18733a7158
----
- zynworld/host.py | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
---- zynjacku.orig/zynworld/host.py
-+++ zynjacku/zynworld/host.py
-@@ -2257,7 +2257,7 @@ class host:
-
- if not features_match:
- print "Skipping UI %s because of missing required feature %s" % (ui_uri, required_feature)
-- break
-+ continue
-
- ui_type_uri = ui.type
- ui_binary_path = ui.binary
diff --git a/debian/patches/0009-regex_uris_command_line.patch b/debian/patches/0009-regex_uris_command_line.patch
deleted file mode 100644
index c27c24e..0000000
--- a/debian/patches/0009-regex_uris_command_line.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-From: Krzysztof Foltman <wdev at foltman.com>
-Description: Add command line support for /regex/ syntax for URIs.
-Origin: upstream,commit:5ac4d3e05fd2dcd6a92f4a9ad334a810e8b4d8d4
----
- zynworld/host.py | 15 +++++++++++++++
- 1 file changed, 15 insertions(+)
-
---- zynjacku.orig/zynworld/host.py
-+++ zynjacku/zynworld/host.py
-@@ -2276,6 +2276,21 @@ class host:
- return
-
- def new_plugin(self, uri, parameters=[], maps={}):
-+ if uri.startswith("/") and uri.endswith("/"):
-+ regexp = re.compile(uri[1:-1])
-+ candidates = []
-+ for f in self.lv2db.getPluginList():
-+ if regexp.search(f):
-+ candidates.append(f)
-+ if len(candidates) == 0:
-+ print "No plugins found matching %s" % uri
-+ return False
-+ elif len(candidates) >= 2:
-+ print "More than one plugin match %s:" % uri
-+ for l in candidates:
-+ print " %s" % l
-+ return False
-+ uri = candidates[0]
- info = self.lv2db.getPluginInfo(uri)
- if not info:
- print 'Cannot get info for plugin "%s"' % uri
diff --git a/debian/patches/0010-external_gui_cleanup.patch b/debian/patches/0010-external_gui_cleanup.patch
deleted file mode 100644
index b60e364..0000000
--- a/debian/patches/0010-external_gui_cleanup.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-From: Krzysztof Foltman <wdev at foltman.com>
-Description: Call cleanup on the external GUI.
-Origin: upstream,commit:30adb679766ef6b162d12ace6899c4d6a9bc091e
----
- gtk2gui.c | 1 +
- 1 file changed, 1 insertion(+)
-
---- zynjacku.orig/gtk2gui.c
-+++ zynjacku/gtk2gui.c
-@@ -344,6 +344,7 @@ zynjacku_gtk2gui_destroy(
- ui_ptr->type == UI_TYPE_EXTERNAL)
- {
- LV2_EXTERNAL_UI_HIDE(ui_ptr->external_ui_control);
-+ ui_ptr->lv2ui->cleanup(ui_ptr->ui_handle);
- }
-
- dlclose(ui_ptr->dlhandle);
diff --git a/debian/patches/0011-check_ui_is_visible.patch b/debian/patches/0011-check_ui_is_visible.patch
deleted file mode 100644
index 1ff5392..0000000
--- a/debian/patches/0011-check_ui_is_visible.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-From: Krzysztof Foltman <wdev at foltman.com>
-Origin: upstream,commit:03a2010a487eb14fc0b9367bb701f80d98b2098c
-Description: Make sure that ui_run didn't shut down the GUI.
----
- gtk2gui.c | 5 +++++
- 1 file changed, 5 insertions(+)
-
---- zynjacku.orig/gtk2gui.c
-+++ zynjacku/gtk2gui.c
-@@ -489,6 +489,11 @@ zynjacku_gtk2gui_push_measure_ports(
- LV2_EXTERNAL_UI_RUN(ui_ptr->external_ui_control);
- }
-
-+ if (ui_ptr->ui_handle == NULL)
-+ {
-+ return;
-+ }
-+
- if (ui_ptr->lv2ui->port_event == NULL)
- {
- return;
diff --git a/debian/patches/0012-fix_parsing_lv2rack_cmdline.patch b/debian/patches/0012-fix_parsing_lv2rack_cmdline.patch
deleted file mode 100644
index d3935b9..0000000
--- a/debian/patches/0012-fix_parsing_lv2rack_cmdline.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-From: Nedko Arnaudov <nedko at arnaudov.name>
-Description: Fix parsing of lv2rack commandline.
-Origin: upstream,commit:db0f365556d6ff14ee145cc563fca21d51b244e3
----
- lv2rack | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
---- zynjacku.orig/lv2rack
-+++ zynjacku/lv2rack
-@@ -322,7 +322,7 @@ def main():
- if lash_client:
- print "Successfully connected to LASH server at " + lash.lash_get_server_name(lash_client)
-
-- if len(sys.argv) == 2 and sys.argv[1][-9:] != ".lv2rack":
-+ if len(sys.argv) == 2 and sys.argv[1][-8:] != ".lv2rack":
- host = lv2rack_single(program_data, client_name, sys.argv[1])
- else:
- host = lv2rack_multi(program_data, client_name, sys.argv[1:], lash_client)
diff --git a/debian/patches/0013-hangs_on_missing_license_field.patch b/debian/patches/0013-hangs_on_missing_license_field.patch
deleted file mode 100644
index 06f9f32..0000000
--- a/debian/patches/0013-hangs_on_missing_license_field.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-Description: Fix hang when ttl misses doap:license.
-Author: Peter Nelson <peter at fuzzle.org>
-Origin: http://repo.or.cz/w/zynjacku.git/commitdiff/1f9733b
----
- zynworld/lv2.py | 6 +++++-
- 1 file changed, 5 insertions(+), 1 deletion(-)
-
---- zynjacku.orig/zynworld/lv2.py
-+++ zynjacku/zynworld/lv2.py
-@@ -489,7 +489,11 @@ class LV2DB:
- return None
- dest.name = dest.name[0]
-
-- dest.license = info.bySubject[uri][doap + 'license'][0]
-+ dest.license = info.getProperty(uri, doap + 'license', optional = True)
-+ if len(dest.license):
-+ dest.license = dest.license[0]
-+ else:
-+ dest.license = None
- dest.classes = info.bySubject[uri]["a"]
- dest.requiredFeatures = info.getProperty(uri, lv2 + "requiredFeature", optional = True)
- dest.optionalFeatures = info.getProperty(uri, lv2 + "optionalFeature", optional = True)
diff --git a/debian/patches/series b/debian/patches/series
index b4def8b..331d858 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,15 +1,2 @@
-0001-fix_scan_without_plugins_installed.patch
-0002-handle_empty_doapmaintainer_field.patch
-0003-syntax_error_exception.patch
-0004-flex_parser_recognizes_datatype_uris_and_lang_suffixes.patch
-0005-lv2_parser_ignores_datatype_uris_and_lang_suffixes.patch
-0006-ui_gtk_threads_init.patch
-0007-unknown_ui_types.patch
-0008-continue_on_missing_ui_plugin_req.patch
-0009-regex_uris_command_line.patch
-0010-external_gui_cleanup.patch
-0011-check_ui_is_visible.patch
-0012-fix_parsing_lv2rack_cmdline.patch
-0013-hangs_on_missing_license_field.patch
1001-shebangs.patch
1002-buildsystem.patch
--
zynjacku packaging
More information about the pkg-multimedia-commits
mailing list