Skip to content

Commit

Permalink
gjs: update to 1.68.4 and fix builds with meson >= 0.60.2
Browse files Browse the repository at this point in the history
Version 1.68.4
--------------

- Build fix backported from the development branch. [#436, !667, Evan Welsh]

Version 1.68.3
--------------

- Crash and bug fixes backported from the development branch.

- Build fixes [Philip Chimento]

- Closed bugs and merge requests:

  * win32: Fix resource-based imports [!652, Evan Welsh]
  * overrides/GLib: Guard Error.new_literal against invalid domains [!654,
    Florian M��llner]

Version 1.68.2
--------------

- Crash and regression fixes backported from the development branch.

- Build fix to adjust to GLib renaming its main branch.

- Closed bugs and merge requests:

  * Fix crash in ByteArray.fromGBytes / ByteArray.fromString with 0-length input
    [!628, Philip Chimento]
  * subprojects: Use GLib main branch [!633, Philip Withnall]
  * Construct-only properties and GTK Builder. [#422, !635, Carlos Garnacho]
  * Data corruption when passing a 0-terminated array of GVariant [#269, !636,
    Evan Welsh]
  * Fix race condition in dynamic module resolution. [!641, Evan Welsh]
  * Ensure the correct realm is entered in the async executor [!644, Evan Welsh]
  * Assertion failure in toggle refs with debug mozjs [#416, !646, Evan Welsh]

Version 1.68.1
--------------

- Many stability fixes due to refactoring how disposed GObjects are handled.
  Special thanks to Marco Trevisan for the substantial effort.

- Closed bugs and merge requests:

  * Accessing GLib.ByteArray throws [#386, !590, Philip Chimento]
  * Missing hyphen and camelCase getters for CONSTRUCT_ONLY GObject properties
    defined in JavaScript [#391, !591, Philip Chimento]
  * gnome-shell crashes on deferencing a destroyed wrapper object [#395, !593,
    !617, Marco Trevisan]
  * GNOME crash "JS object wrapper for GObject 0x563bf88f5f50 (GSettings) is
    being released..." [#294, !593, !617, Marco Trevisan]
  * Finalizing wrapper for an already freed object [#399, !593, !617, Marco
    Trevisan]
  * Calling implemented methods or getters on disposed objects returns function
    pointers [#396, !594, Marco Trevisan]
  * overrides/Gio: Fix _LocalFilePrototype [!595, Florian M��llner]
  * doc: Fix documentation for dynamic imports [!596, Sonny Piers]
  * Added the meson installation command in dependencies [!597, Veena Nagar]
  * Upgrade codespell to 2.0.0 in CI [#367, !598, Kajal Sah]
  * cairo: Add missing semi-colons from dummy class declarations [!599, Matt
    Turner]
  * Fixed System.addressOfGObject and System.dumpHeap missing from System ES
    module [!600, Philip Chimento]
  * `Error: Failed to convert GValue to a fundamental instance` in
    Gtk.EventControllerLegacy [#398, !601, Marco Trevisan]
  * doc: add an example to get relative filename and dirname with
    import.meta.url [!603, Sonny Piers]
  * wrapperutils: Use native ostringstream pointer to string conversion [!604,
    Marco Trevisan]
  * testFundamental: Add more tests ensuring we properly handle subtypes [!602,
    Marco Trevisan]
  * Some simple Visual Studio fixes for main [!612, Chun-wei Fan]
  * Using GFileMonitor crashes GNOME Shell with toggling down object error
    [#297, !613, !617, Marco Trevisan]
  * Deadlock on toggle queue due to GWeakRef [#404, !613, !617, Marco Trevisan]
  * Using g_thread_join from JS is crashing [#406, !613, !617, Marco Trevisan]
  * GObject: Ensure to call setter methods for construct-only properties [!614,
    Carlos Garnacho]
  • Loading branch information
dhgutteridge committed Dec 17, 2021
1 parent 4fc1228 commit 070dd16
Show file tree
Hide file tree
Showing 3 changed files with 23 additions and 7 deletions.
5 changes: 2 additions & 3 deletions lang/gjs/Makefile
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
# $NetBSD: Makefile,v 1.11 2021/12/08 16:02:16 adam Exp $
# $NetBSD: Makefile,v 1.12 2021/12/17 00:03:51 gutteridge Exp $

DISTNAME= gjs-1.68.0
PKGREVISION= 2
DISTNAME= gjs-1.68.4
CATEGORIES= lang
MASTER_SITES= ${MASTER_SITE_GNOME:=sources/gjs/${PKGVERSION_NOREV:R}/}
EXTRACT_SUFX= .tar.xz
Expand Down
9 changes: 5 additions & 4 deletions lang/gjs/distinfo
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
$NetBSD: distinfo,v 1.8 2021/10/26 10:51:36 nia Exp $
$NetBSD: distinfo,v 1.9 2021/12/17 00:03:51 gutteridge Exp $

BLAKE2s (gjs-1.68.0.tar.xz) = 1b9eb900f88eba5f057d68b594a24631f0ca70a4127e3ecc790e9abda41019f4
SHA512 (gjs-1.68.0.tar.xz) = 65278ca345f2c786995bed7755dd86403b469eb6cceaa6db57dbd4af212025a3b1f01b7387f45dc9abc23d47ba2f39c5ab8a90ec95b1934f1471a68a06f0d82d
Size (gjs-1.68.0.tar.xz) = 553044 bytes
BLAKE2s (gjs-1.68.4.tar.xz) = 470e00cbf97a18ce78f572c44202163bc3497cbc0570cc7bd8dbf6d2f30cef31
SHA512 (gjs-1.68.4.tar.xz) = c610abfa701c0a61ffa6916ec5ebcd07b1dcb04607d74ab0b6d30583da27d60f9993e037fab73e66e1580d644d3a57f0a479f55a09e3bf56fea7f17367c787b3
Size (gjs-1.68.4.tar.xz) = 559768 bytes
SHA1 (patch-gjs_jsapi-util.cpp) = 91b267616071bde63afb835d82859bd44a364da1
SHA1 (patch-meson.build) = 19091cf43cf5ddc2e096d628dfca7deca5b76b5f
16 changes: 16 additions & 0 deletions lang/gjs/patches/patch-meson.build
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
$NetBSD: patch-meson.build,v 1.1 2021/12/17 00:03:51 gutteridge Exp $

Fix build with meson >= 0.60.2.
https://gitlab.gnome.org/GNOME/gjs/-/commit/59bbb5e4795d2b6e41ce27ae3b18257e75b71a19

--- meson.build.orig 2021-09-18 16:47:22.772439700 +0000
+++ meson.build
@@ -534,7 +534,7 @@ gjs_private_gir = gnome.generate_gir(lib
includes: ['GObject-2.0', 'Gio-2.0'], sources: libgjs_private_sources,
namespace: 'GjsPrivate', nsversion: '1.0', identifier_prefix: 'Gjs',
symbol_prefix: 'gjs_', extra_args: '--warn-error', install: true,
- install_dir_gir: false, install_dir_typelib: pkglibdir / 'girepository-1.0')
+ install_dir_gir: [false], install_dir_typelib: pkglibdir / 'girepository-1.0')
gjs_private_typelib = gjs_private_gir[1]

### Build gjs-console interpreter ##############################################

0 comments on commit 070dd16

Please sign in to comment.