From ca4801464fd04251188ffcc89263cd86c5d0de3a6ab41dcf4a8a8b610219aa6b Mon Sep 17 00:00:00 2001 From: Dominique Leuenberger Date: Sat, 27 Jul 2019 13:57:54 +0000 Subject: [PATCH] Revert to previous rev - boo#1140614 OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/gobject-introspection?expand=0&rev=207 --- gi-find-deps.sh | 8 +------- gobject-introspection.changes | 6 ------ 2 files changed, 1 insertion(+), 13 deletions(-) diff --git a/gi-find-deps.sh b/gi-find-deps.sh index 7916496..f2c00cb 100644 --- a/gi-find-deps.sh +++ b/gi-find-deps.sh @@ -78,16 +78,10 @@ function python_requires { } function javascript_requires { - # parse the new import style in 3.32 - 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 + 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 - # 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 | \ sed -e 's:imports.gi.versions.::' -e "s:['\"]::g" -e 's:=:-:' -e 's: ::g'); do split_name_version $module 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