Rebase onto gjs-1.82.1 (from debian 13/trixie) - mozjs 128 support.

Author: mtwebster

.clangd

@@ -0,0 +1,6 @@
+# SPDX-License-Identifier: MIT OR LGPL-2.0-or-later
+# SPDX-FileCopyrightText: 2024 Philip Chimento <philip.chimento@gmail.com>
+
+Diagnostics:
+  ClangTidy:
+    Remove: bugprone-sizeof-expression  # Interferes with g_clear_pointer()

.eslintrc.yml

@@ -30,6 +30,7 @@ rules:
     - error
     - arrays: always-multiline
       objects: always-multiline
+      imports: always-multiline
       functions: never
   comma-spacing:
     - error
@@ -68,12 +69,16 @@ rules:
   jsdoc/check-tag-names: error
   jsdoc/check-types: error
   jsdoc/implements-on-classes: error
-  jsdoc/newline-after-description: error
   jsdoc/require-jsdoc: error
   jsdoc/require-param: error
   jsdoc/require-param-description: error
   jsdoc/require-param-name: error
   jsdoc/require-param-type: error
+  jsdoc/tag-lines:
+    - error
+    - always
+    - count: 0
+      startLines: 1
   key-spacing:
     - error
     - beforeColon: false

.gitignore

@@ -3,3 +3,13 @@
 /tools/node_modules
 # artifact from ci-templates:
 /container-build-report.xml
+debian/tmp
+debian/libcjs0
+debian/libcjs-dbg
+debian/libcjs-dev
+debian/cjs
+debian/.debhelper
+debian/*.substvars
+debian/*.debhelper.log
+debian/debhelper-build-stamp
+debian/files

.gitlab-ci.yml

@@ -14,7 +14,7 @@ stages:
 
 .gjs-alpine:
   variables:
-    FDO_DISTRIBUTION_TAG: '2022-11-02.0'
+    FDO_DISTRIBUTION_TAG: '2024-07-28.0'
     FDO_UPSTREAM_REPO: GNOME/gjs
 
 build-alpine-image:
@@ -23,16 +23,17 @@ build-alpine-image:
     - .gjs-alpine
   stage: prepare
   variables:
-    FDO_DISTRIBUTION_PACKAGES: cppcheck git python3 npm bash grep
+    FDO_DISTRIBUTION_PACKAGES: |
+      bash cppcheck git grep npm py3-codespell python3 reuse
     FDO_DISTRIBUTION_EXEC: |
-      python3 -m ensurepip &&
-      rm -r /usr/lib/python*/ensurepip &&
-      pip3 install --no-cache --upgrade cpplint reuse codespell &&
-      mkdir -p /cwd
+      mkdir -p /cwd &&
+      apk add cpplint \
+        --repository=http://dl-cdn.alpinelinux.org/alpine/edge/testing/
 
 .coverage: &coverage
-  image: registry.gitlab.gnome.org/gnome/gjs:fedora.mozjs115-debug
+  image: registry.gitlab.gnome.org/gnome/gjs:fedora.mozjs128-debug
   variables:
+    GIT_SUBMODULE_STRATEGY: normal
     coverage: '/^  lines.*(\d+\.\d+\%)/'
   script:
     - export PKG_CONFIG_PATH=/usr/local/lib/pkgconfig
@@ -61,7 +62,13 @@ build-alpine-image:
     when: always
     paths:
       - _build/compile_commands.json
+      - _build/installed-tests/js/jsunit-resources.c
+      - _build/installed-tests/js/jsunit-resources.h
+      - _build/js-resources.c
+      - _build/js-resources.h
       - _build/meson-logs/*log*.txt
+      - _build/test/mock-js-resources.c
+      - _build/test/mock-js-resources.h
   script:
     - test/test-ci.sh SETUP
     - test/test-ci.sh BUILD
@@ -74,8 +81,9 @@ build-alpine-image:
 build_recommended:
   <<: *build
   stage: source_check
-  image: registry.gitlab.gnome.org/gnome/gjs:job-3012153_fedora.mozjs115-debug  # pinned on purpose
+  image: registry.gitlab.gnome.org/gnome/gjs:job-4161430_fedora.mozjs128-debug  # pinned on purpose
   variables:
+    GIT_SUBMODULE_STRATEGY: normal
     TEST_OPTS: --verbose --no-stdsplit --print-errorlogs --setup=verbose
   except:
     - schedules
@@ -85,13 +93,13 @@ sanitizer_gcc:
   stage: test
   tags:
     - asan # LSAN needs CAP_SYS_PTRACE
-  image: registry.gitlab.gnome.org/gnome/gjs:fedora.mozjs115-debug
+  image: registry.gitlab.gnome.org/gnome/gjs:fedora.mozjs128-debug
   variables:
+    GIT_SUBMODULE_STRATEGY: normal
     CONFIG_OPTS: -Db_sanitize=address,undefined
     TEST_OPTS: --timeout-multiplier=3
     # Override these during build, but they are overridden by meson anyways
     ASAN_OPTIONS: start_deactivated=true,detect_leaks=0
-    USE_UNSTABLE_GNOME_PREFIX: 'true'
   except:
     - schedules
 
@@ -102,11 +110,11 @@ sanitizer_thread_gcc:
   allow_failure: true
   tags:
     - asan # TSAN needs CAP_SYS_PTRACE
-  image: registry.gitlab.gnome.org/gnome/gjs:fedora.mozjs115-debug
+  image: registry.gitlab.gnome.org/gnome/gjs:fedora.mozjs128-debug
   variables:
+    GIT_SUBMODULE_STRATEGY: normal
     CONFIG_OPTS: -Db_sanitize=thread
     TEST_OPTS: --timeout-multiplier=3 --setup=verbose
-    USE_UNSTABLE_GNOME_PREFIX: 'true'
   except:
     - schedules
 
@@ -116,11 +124,11 @@ sanitizer_thread_gcc:
 build_maximal:
   when: on_success
   stage: test
-  image: registry.gitlab.gnome.org/gnome/gjs:fedora.mozjs115-debug
+  image: registry.gitlab.gnome.org/gnome/gjs:fedora.mozjs128-debug
   variables:
+    GIT_SUBMODULE_STRATEGY: normal
     CC: clang
     CXX: clang++
-    USE_UNSTABLE_GNOME_PREFIX: 'true'
     CONFIG_OPTS: >-
       -Ddtrace=true -Dsystemtap=true -Dverbose_logs=true -Db_pch=false
     ENABLE_GTK: "yes"
@@ -143,20 +151,20 @@ build_maximal:
 build_minimal:
   <<: *build
   stage: test
-  image: registry.gitlab.gnome.org/gnome/gjs:fedora.mozjs115
+  image: registry.gitlab.gnome.org/gnome/gjs:fedora.mozjs128
   variables:
-    CONFIG_OPTS: >-
-      -Dbuildtype=release
-      -Dcairo=disabled -Dreadline=disabled -Dprofiler=disabled
+    GIT_SUBMODULE_STRATEGY: normal
+    CONFIG_OPTS: -Dbuildtype=release -Dreadline=disabled -Dprofiler=disabled
     TEST_OPTS: --setup=verbose
   except:
     - schedules
 
 build_unity:
   <<: *build
   stage: test
-  image: registry.gitlab.gnome.org/gnome/gjs:fedora.mozjs115
+  image: registry.gitlab.gnome.org/gnome/gjs:fedora.mozjs128
   variables:
+    GIT_SUBMODULE_STRATEGY: normal
     # unity-size here is forced to use an high number to check whether we can
     # join all the sources together, but should not be used in real world to
     # not to break multi-jobs compilation
@@ -205,10 +213,22 @@ cppcheck:
   extends:
     - .fdo.distribution-image@alpine
     - .gjs-alpine
-  stage: source_check
+  stage: test  # so that we have compile_commands.json and generated C files
   script:
     - cppcheck --version
-    - cppcheck . -v -f -q -UHAVE_PRINTF_ALTERNATIVE_INT --error-exitcode=1 --inline-suppr --library=gtk,tools/cppcheck.cfg --enable=warning,performance,portability
+    # Create fake g-i test files, we are not analyzing them anyway
+    - mkdir -p subprojects/gobject-introspection-tests
+    - |
+      touch \
+        subprojects/gobject-introspection-tests/annotation.{c,h} \
+        subprojects/gobject-introspection-tests/drawable.{c,h} \
+        subprojects/gobject-introspection-tests/foo.{c,h} \
+        subprojects/gobject-introspection-tests/gimarshallingtests.{c,h} \
+        subprojects/gobject-introspection-tests/regress.{c,h} \
+        subprojects/gobject-introspection-tests/regress-unix.{c,h} \
+        subprojects/gobject-introspection-tests/warnlib.{c,h} \
+        subprojects/gobject-introspection-tests/utility.{c,h}
+    - ./tools/run_cppcheck.sh -q
   except:
     refs:
       - schedules
@@ -265,33 +285,38 @@ eslint:
       - .eslintrc.yml
       - '**/.eslintrc.yml'
 
-pch_check:
+headers_check:
   when: on_success
   stage: source_check
   extends:
     - .fdo.distribution-image@alpine
     - .gjs-alpine
   script:
     - env SELFTEST=1 test/check-pch.sh
+    - env SELFTEST=1 test/check-headers.sh
     - test/check-pch.sh
+    - test/check-headers.sh
   except:
     refs:
       - schedules
       - tags
     variables:
-      - $CI_COMMIT_MESSAGE =~ /\[skip pch_check\]/
+      - $CI_COMMIT_MESSAGE =~ /\[skip headers_check\]/
   only:
     changes:
       - "**/*.c"
       - "**/*.cpp"
       - "**/*.h"
       - "**/*.hh"
       - test/check-pch.sh
+      - test/check-headers.sh
 
 iwyu:
   when: on_success
   stage: source_check
-  image: registry.gitlab.gnome.org/gnome/gjs:fedora.mozjs115-debug
+  image: registry.gitlab.gnome.org/gnome/gjs:fedora.mozjs128-debug
+  variables:
+    GIT_SUBMODULE_STRATEGY: normal
   script:
     - test/test-ci.sh UPSTREAM_BASE
     - meson setup _build -Db_pch=false
@@ -301,8 +326,11 @@ iwyu:
     refs:
       - branches
   except:
-    - schedules
-    - /^gnome-\d+-\d+$/
+    refs:
+      - schedules
+      - /^gnome-[-\d]+$/
+    variables:
+      - $CI_COMMIT_MESSAGE =~ /\[skip iwyu\]/
 
 codespell:
   when: on_success
@@ -316,7 +344,7 @@ codespell:
       codespell -S "*.png,*.po,*.jpg,*.wrap,.git,LICENSES" -f \
         --builtin "code,usage,clear" \
         --skip="./build/maintainer-upload-release.sh,./installed-tests/js/jasmine.js,./README.md,./build/flatpak/*.json,./tools/package-lock.json" \
-        --ignore-words-list="afterall,deque,falsy,files',filetest,gir,inout,musl,nmake,stdio,uint,upto,xdescribe"
+        --ignore-words-list="aas,afterall,deque,falsy,files',filetest,gir,inout,musl,nmake,stdio,uint,upto,ws,xdescribe"
   except:
     - schedules
 
@@ -346,7 +374,9 @@ coverage:
 iwyu-full:
   when: manual
   stage: manual
-  image: registry.gitlab.gnome.org/gnome/gjs:fedora.mozjs115-debug
+  image: registry.gitlab.gnome.org/gnome/gjs:fedora.mozjs128-debug
+  variables:
+    GIT_SUBMODULE_STRATEGY: normal
   script:
     - meson setup _build
     - ./tools/run_iwyu.sh
@@ -358,11 +388,11 @@ sanitizer_clang:
   stage: manual
   tags:
     - asan # LSAN needs CAP_SYS_PTRACE
-  image: registry.gitlab.gnome.org/gnome/gjs:fedora.mozjs115-debug
+  image: registry.gitlab.gnome.org/gnome/gjs:fedora.mozjs128-debug
   variables:
+    GIT_SUBMODULE_STRATEGY: normal
     CC: clang
     CXX: clang++
-    USE_UNSTABLE_GNOME_PREFIX: 'true'
     # Override these during build, but they are overridden by meson anyways
     ASAN_OPTIONS: start_deactivated=true,detect_leaks=0
     CONFIG_OPTS: -Db_sanitize=address,undefined -Db_lundef=false
@@ -374,8 +404,9 @@ sanitizer_clang:
 installed_tests:
   <<: *build
   stage: manual
-  image: registry.gitlab.gnome.org/gnome/gjs:fedora.mozjs115-debug
+  image: registry.gitlab.gnome.org/gnome/gjs:fedora.mozjs128-debug
   variables:
+    GIT_SUBMODULE_STRATEGY: normal
     CONFIG_OPTS: -Dinstalled_tests=true -Dprefix=/usr
     TEST: skip
   when: manual
@@ -390,9 +421,9 @@ installed_tests:
 valgrind:
   <<: *build
   stage: manual
-  image: registry.gitlab.gnome.org/gnome/gjs:fedora.mozjs115-debug
+  image: registry.gitlab.gnome.org/gnome/gjs:fedora.mozjs128-debug
   variables:
-    USE_UNSTABLE_GNOME_PREFIX: 'true'
+    GIT_SUBMODULE_STRATEGY: normal
     TEST_OPTS: --setup=valgrind
   allow_failure: true
   when: manual
@@ -403,8 +434,9 @@ valgrind:
 zeal_2:
   <<: *build
   stage: manual
-  image: registry.gitlab.gnome.org/gnome/gjs:fedora.mozjs115-debug
+  image: registry.gitlab.gnome.org/gnome/gjs:fedora.mozjs128-debug
   variables:
+    GIT_SUBMODULE_STRATEGY: normal
     TEST_OPTS: --setup=extra_gc
   when: manual
   except:
@@ -413,8 +445,9 @@ zeal_2:
 zeal_4:
   <<: *build
   stage: manual
-  image: registry.gitlab.gnome.org/gnome/gjs:fedora.mozjs115-debug
+  image: registry.gitlab.gnome.org/gnome/gjs:fedora.mozjs128-debug
   variables:
+    GIT_SUBMODULE_STRATEGY: normal
     TEST_OPTS: --setup=pre_verify
   when: manual
   except:
@@ -423,8 +456,9 @@ zeal_4:
 zeal_11:
   <<: *build
   stage: manual
-  image: registry.gitlab.gnome.org/gnome/gjs:fedora.mozjs115-debug
+  image: registry.gitlab.gnome.org/gnome/gjs:fedora.mozjs128-debug
   variables:
+    GIT_SUBMODULE_STRATEGY: normal
     TEST_OPTS: --setup=post_verify
   when: manual
   except:
@@ -465,28 +499,28 @@ zeal_11:
   BUILDAH_FORMAT: docker
   BUILDAH_ISOLATION: chroot
 
-fedora.mozjs102:
+fedora.mozjs115:
   <<: *create_docker_image
   variables:
     <<: *docker_variables
     DOCKERFILE: test/extra/Dockerfile
 
-fedora.mozjs102-debug:
+fedora.mozjs115-debug:
   <<: *create_docker_image
   variables:
     <<: *docker_variables
     DOCKERFILE: test/extra/Dockerfile.debug
 
-fedora.mozjs115:
+fedora.mozjs128:
   <<: *create_docker_image
   variables:
     <<: *docker_variables
     DOCKERFILE: test/extra/Dockerfile
-    ARGS: --build-arg MOZJS_BRANCH=mozjs115 --build-arg MOZJS_BUILDDEPS=mozjs102
+    ARGS: --build-arg MOZJS_BRANCH=mozjs128 --build-arg MOZJS_BUILDDEPS=mozjs115
 
-fedora.mozjs115-debug:
+fedora.mozjs128-debug:
   <<: *create_docker_image
   variables:
     <<: *docker_variables
     DOCKERFILE: test/extra/Dockerfile.debug
-    ARGS: --build-arg MOZJS_BRANCH=mozjs115 --build-arg MOZJS_BUILDDEPS=mozjs102
+    ARGS: --build-arg MOZJS_BRANCH=mozjs128 --build-arg MOZJS_BUILDDEPS=mozjs115

.gitmodules

@@ -0,0 +1,6 @@
+# SPDX-License-Identifier: CC0-1.0
+# SPDX-FileCopyrightText: 2024 Philip Chimento <philip.chimento@gmail.com>
+[submodule "subprojects/gobject-introspection-tests"]
+	path = subprojects/gobject-introspection-tests
+	url = ../gobject-introspection-tests.git
+    shallow = true