[gjs: 5/5] Merge branch 'unify-compile' into 'master'
- From: Philip Chimento <pchimento src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gjs: 5/5] Merge branch 'unify-compile' into 'master'
- Date: Fri, 14 May 2021 04:11:05 +0000 (UTC)
commit 6a62d1e863540b9471fa8bbb2e0bb8e4f37cd07d
Merge: bdecfbcd efb28b8c
Author: Philip Chimento <philip chimento gmail com>
Date: Fri May 14 04:11:01 2021 +0000
Merge branch 'unify-compile' into 'master'
build: Support meson unity builds
See merge request GNOME/gjs!619
.gitlab-ci.yml | 14 +++++++++++++-
gi/arg-cache.cpp | 4 +++-
gi/arg.cpp | 6 ++++--
gi/function.cpp | 19 ++++++++++++++-----
gi/gobject.cpp | 10 +++++-----
gi/private.cpp | 8 ++++----
gjs/atoms.cpp | 8 +-------
gjs/atoms.h | 2 +-
gjs/context-private.h | 19 -------------------
gjs/context.cpp | 2 +-
gjs/coverage.cpp | 2 +-
gjs/deprecation.cpp | 8 +-------
gjs/jsapi-util-string.cpp | 7 -------
gjs/jsapi-util.h | 17 ++++++++++++++++-
gjs/objectbox.cpp | 2 +-
gjs/stack.cpp | 7 -------
installed-tests/js/libgjstesttools/gjs-test-tools.cpp | 2 +-
meson.build | 1 +
modules/cairo-context.cpp | 17 ++++-------------
modules/cairo-gradient.cpp | 7 -------
modules/cairo-image-surface.cpp | 7 -------
modules/cairo-linear-gradient.cpp | 4 ----
modules/cairo-path.cpp | 7 -------
modules/cairo-pattern.cpp | 7 ++-----
modules/cairo-pdf-surface.cpp | 4 ----
modules/cairo-private.h | 6 ++++++
modules/cairo-ps-surface.cpp | 4 ----
modules/cairo-radial-gradient.cpp | 5 +----
modules/cairo-region.cpp | 8 +++-----
modules/cairo-solid-pattern.cpp | 7 -------
modules/cairo-surface-pattern.cpp | 7 -------
modules/cairo-surface.cpp | 16 +++++-----------
modules/cairo-svg-surface.cpp | 4 ----
modules/cairo.cpp | 7 -------
modules/print.cpp | 7 -------
35 files changed, 88 insertions(+), 174 deletions(-)
---
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]