diff --git a/gi-find-deps.sh b/gi-find-deps.sh index bb48212..f2c00cb 100644 --- a/gi-find-deps.sh +++ b/gi-find-deps.sh @@ -78,12 +78,6 @@ function python_requires { } function javascript_requires { - # parse the new import style in 3.32 - for module in $(grep -r -h -A2 'const {' $1 | paste -s -d ' ' | grep '} = imports.gi;' | sed 's/imports.gi;.*/imports.gi;/' | awk -F '[{}]' '{print $(NF>1?NF-1:"")}' | tr ',' '\n' | tr -d ' '); do - split_name_version $module - print_req_prov - done - # parse the old import style before 3.32 for module in $(grep -h -P -o "imports\.gi\.([^\s'\";]+)" $1 | grep -v "imports\.gi\.version" | sed -r -e 's,\s+$,,g' -e 's,imports.gi.,,'); do split_name_version $module print_req_prov @@ -187,7 +181,6 @@ function find_requires { # . imports.gi.foo; [unversioned requirement of 'foo'] # . imports.gi.foo-1.0; [versioned requirement of 'foo'] # . imports.gi.versions.Gtk = '3.0'; -# . const { foo, bar } = imports.gi; # . The imports can be listed on one line, and we catch them. while read file; do diff --git a/gobject-introspection.changes b/gobject-introspection.changes index 71fd948..8f50a59 100644 --- a/gobject-introspection.changes +++ b/gobject-introspection.changes @@ -1,9 +1,3 @@ -------------------------------------------------------------------- -Thu Jul 25 04:59:37 UTC 2019 - Chingkai - -- Update gi-find-deps.sh: upate javascript_requires function to parse - the new JS import style (bsc#1140614). - ------------------------------------------------------------------- Sat Jun 15 18:34:15 UTC 2019 - Bjørn Lie