diff --git a/.gitlab-ci/fedora-install.sh b/.gitlab-ci/fedora-install.sh index 3bd4698366..cafc0e552b 100755 --- a/.gitlab-ci/fedora-install.sh +++ b/.gitlab-ci/fedora-install.sh @@ -66,8 +66,6 @@ else debuginfo-install -y glib2 fi -contrib/scripts/nm-ci-patch-gtkdoc.sh || true - if [ -x /usr/bin/ninja ] && ! [ -x /usr/bin/ninja-build ]; then ln -s /usr/bin/ninja-build /usr/bin/ninja fi diff --git a/contrib/scripts/nm-ci-patch-gtkdoc.sh b/contrib/scripts/nm-ci-patch-gtkdoc.sh deleted file mode 100755 index e72a0a8f6f..0000000000 --- a/contrib/scripts/nm-ci-patch-gtkdoc.sh +++ /dev/null @@ -1,40 +0,0 @@ -#!/bin/bash - -# patch gtk-doc for https://gitlab.gnome.org/GNOME/gtk-doc/merge_requests/2 - -cd / - -patch -f -p 1 --fuzz 0 --reject-file=- < ;' - # This could be an opaque data structure, so we output an - # empty declaration. If the structure is actually found that - # will override this. - structsym = m9.group(1).upper() - logging.info('%s typedef: "%s"', structsym, m9.group(2)) - forward_decls[m9.group(2)] = '<%s>\n%s\n%s\n' % ( - structsym, m9.group(2), deprecated, structsym) - -+ bm = re.search(r'^(\S+)(Class|Iface|Interface)\b', m9.group(2)) -+ if bm: -+ objectname = bm.group(1) -+ logging.info('Found object: "%s"', objectname) -+ title = '%s' % objectname -+ - elif re.search(r'^\s*(?:struct|union)\s+_(\w+)\s*;', line): - # Skip private structs/unions. - logging.info('private struct/union') - - elif m10: - # Do a similar thing for normal structs as for typedefs above. - # But we output the declaration as well in this case, so we - # can differentiate it from a typedef. - structsym = m10.group(1).upper() - logging.info('%s:%s', structsym, m10.group(2)) -EOF -