From c5257938e65e5ab8c8df84af3f9c2a86a8c3abc996f90e2208a86400388d213f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B8rn=20Lie?= Date: Fri, 23 Sep 2022 06:36:19 +0000 Subject: [PATCH] Accepting request 1005452 from home:coolo:branches:openSUSE:Factory - Switch to pcre2grep (pcre is dead upstream) OBS-URL: https://build.opensuse.org/request/show/1005452 OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/gobject-introspection?expand=0&rev=234 --- gi-find-deps.sh | 8 ++++---- gobject-introspection.changes | 5 +++++ gobject-introspection.spec | 2 +- 3 files changed, 10 insertions(+), 5 deletions(-) diff --git a/gi-find-deps.sh b/gi-find-deps.sh index 2916a70..891b784 100644 --- a/gi-find-deps.sh +++ b/gi-find-deps.sh @@ -113,7 +113,7 @@ function javascript_requires { print_req_prov done # Remember files which contain a pkg.require() call - if pcregrep -M "pkg.require\\(([^;])*" $1 > /dev/null; then + if pcre2grep -M "pkg.require\\(([^;])*" $1 > /dev/null; then # the file contains a pkg.require(..) list... let's remember th is file for the in-depth scanner if [ -n "$jspkg" ]; then jspkg=$1:${jspkg} @@ -122,7 +122,7 @@ function javascript_requires { fi fi # remember files which contain exlucde filters used against pkg.require() - if pcregrep -M "const RECOGNIZED_MODULE_NAMES =([^;])*" $1 > /dev/null; then + if pcre2grep -M "const RECOGNIZED_MODULE_NAMES =([^;])*" $1 > /dev/null; then # the file contains RECOGNIZED_MODULE_NAMES list. We remember the file name for the follow up filtering if [ -n "$jspkgfilt" ]; then jspkgfilt=$1:${jspkgfilt} @@ -136,7 +136,7 @@ function javascript_requires { function javascript_pkg_filter { # For now this is a dummy function based on gnome-weather information #for file in $jspkgfilt; do -# FILTER=($(pcregrep -M "const RECOGNIZED_MODULE_NAMES =([^;])*" $file | grep -o "'.*'" | sed "s:'::g")) +# FILTER=($(pcre2grep -M "const RECOGNIZED_MODULE_NAMES =([^;])*" $file | grep -o "'.*'" | sed "s:'::g")) #done FILTER=('Lang' 'Mainloop' 'Signals' 'System' 'Params') } @@ -149,7 +149,7 @@ oldIFS=$IFS IFS=: for file in "$jspkg"; do IFS=$'\n' - PKGS=$(pcregrep -M "pkg.require\\(([^;])*" $file | grep -o "'.*': '.*'") + PKGS=$(pcre2grep -M "pkg.require\\(([^;])*" $file | grep -o "'.*': '.*'") for pkg in $PKGS; do split_name_version2 $pkg found=0 diff --git a/gobject-introspection.changes b/gobject-introspection.changes index a008d20..3d108ba 100644 --- a/gobject-introspection.changes +++ b/gobject-introspection.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Thu Sep 22 17:02:33 UTC 2022 - Stephan Kulow + +- Switch to pcre2grep (pcre is dead upstream) + ------------------------------------------------------------------- Sun Sep 18 07:04:31 UTC 2022 - Bjørn Lie diff --git a/gobject-introspection.spec b/gobject-introspection.spec index 2416c8b..7ce02aa 100644 --- a/gobject-introspection.spec +++ b/gobject-introspection.spec @@ -55,7 +55,7 @@ BuildRequires: pkgconfig(libffi) >= 3.0.0 Requires: file Requires: libgirepository-1_0-1 = %{version} # gi-find-deps uses the enhanced grep variant in order to do multi-line matching (for pkg.requires(..)) -Requires: pcre-tools +Requires: pcre2-tools Requires: python3-xml Requires: python(abi) = %{python3_version}