Revert to previous rev - boo#1140614

OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/gobject-introspection?expand=0&rev=207
This commit is contained in:
Dominique Leuenberger 2019-07-27 13:57:54 +00:00 committed by Git OBS Bridge
parent 523ddcb52c
commit ca4801464f
2 changed files with 1 additions and 13 deletions

View File

@ -78,16 +78,10 @@ function python_requires {
} }
function javascript_requires { function javascript_requires {
# parse the new import style in 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
for module in $(sed -n '/const {/,/} = imports.gi;/p;/} = imports.gi;/q' $1 | paste -s -d ' '| awk -F '[{}]' '{print $(NF>1?NF-1:"")}' | tr ',' '\n' | tr -d ' '); do
split_name_version $module split_name_version $module
print_req_prov print_req_prov
done 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
done
for module in $(grep -h -P -o "imports\.gi\.versions.([^\s'\";]+)\s*=\s*['\"].+['\"]" $1 | \ for module in $(grep -h -P -o "imports\.gi\.versions.([^\s'\";]+)\s*=\s*['\"].+['\"]" $1 | \
sed -e 's:imports.gi.versions.::' -e "s:['\"]::g" -e 's:=:-:' -e 's: ::g'); do sed -e 's:imports.gi.versions.::' -e "s:['\"]::g" -e 's:=:-:' -e 's: ::g'); do
split_name_version $module split_name_version $module

View File

@ -1,9 +1,3 @@
-------------------------------------------------------------------
Thu Jul 25 04:59:37 UTC 2019 - Chingkai <qkzhu@suse.com>
- 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 <bjorn.lie@gmail.com> Sat Jun 15 18:34:15 UTC 2019 - Bjørn Lie <bjorn.lie@gmail.com>