pool/gobject-introspection
SHA256
2
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 1005452 from home:coolo:branches:openSUSE:Factory

Browse Source 
- 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
This commit is contained in:
Bjørn Lie 2022-09-23 06:36:19 +00:00 committed by Git OBS Bridge
parent e633427354
commit c5257938e6
3 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
gi-find-deps.sh
View File

@ -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

5
gobject-introspection.changes
View File

@ -1,3 +1,8 @@
-------------------------------------------------------------------
Thu Sep 22 17:02:33 UTC 2022 - Stephan Kulow <coolo@suse.com>
- Switch to pcre2grep (pcre is dead upstream)
-------------------------------------------------------------------
Sun Sep 18 07:04:31 UTC 2022 - Bjørn Lie <bjorn.lie@gmail.com>

2
gobject-introspection.spec
View File

@ -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}