update to gjs-1.66.1

This commit is contained in:
jasper 2020-10-17 12:57:23 +00:00
parent e3716ae87b
commit 1463282506
5 changed files with 22 additions and 20 deletions

View File

@ -1,13 +1,13 @@
# $OpenBSD: Makefile,v 1.89 2020/07/14 12:43:56 ajacoutot Exp $
# $OpenBSD: Makefile,v 1.90 2020/10/17 12:57:23 jasper Exp $
USE_WXNEEDED= Yes
COMMENT= Javascript bindings for GNOME
GNOME_PROJECT= gjs
GNOME_VERSION= 1.64.4
GNOME_VERSION= 1.66.1
SHARED_LIBS += gjs 5.0 # 0.0.0
SHARED_LIBS += gjs 6.0 # 0.0.0
CATEGORIES= devel
@ -18,21 +18,21 @@ PERMIT_PACKAGE= Yes
WANTLIB += ${COMPILER_LIBCXX}
WANTLIB += X11 c cairo cairo-gobject ffi gio-2.0 girepository-1.0
WANTLIB += glib-2.0 gobject-2.0 intl m mozjs-68 readline
WANTLIB += glib-2.0 gobject-2.0 intl m mozjs-78 readline
MODULES= devel/meson \
x11/gnome
DEBUG_PACKAGES = ${BUILD_PACKAGES}
# sync with devel/spidermonkey68 and SHARED_LIBS consumer(s): x11/gnome/shell
# sync with devel/spidermonkey78 and SHARED_LIBS consumer(s): x11/gnome/shell
COMPILER= base-clang ports-clang
MODPY_RUNDEP= No
MODPY_BUILDDEP= No
LIB_DEPENDS= devel/gobject-introspection \
devel/spidermonkey68
devel/spidermonkey78
# --with-dbus-tests
BUILD_DEPENDS += x11/dbus

View File

@ -1,2 +1,2 @@
SHA256 (gnome/gjs-1.64.4.tar.xz) = o8w6jtqHB0ssNj/+KLKaUgLX8SkUtpc/GZrPLRgW1Ew=
SIZE (gnome/gjs-1.64.4.tar.xz) = 422496
SHA256 (gnome/gjs-1.66.1.tar.xz) = jUJARV7/ZCyL9tmAUHfjPgpgyy6hP3elX38wwpZoNEw=
SIZE (gnome/gjs-1.66.1.tar.xz) = 439992

View File

@ -1,4 +1,4 @@
$OpenBSD: patch-meson_build,v 1.2 2020/06/01 06:37:04 ajacoutot Exp $
$OpenBSD: patch-meson_build,v 1.3 2020/10/17 12:57:23 jasper Exp $
In file included from /usr/include/readline/readline.h:38:
In file included from /usr/include/readline/keymaps.h:36:
@ -16,7 +16,7 @@ XXX last chunk: should default to the value of b_lundef.
Index: meson.build
--- meson.build.orig
+++ meson.build
@@ -140,6 +140,7 @@ readline = cxx.find_library('readline', required: get_
@@ -155,6 +155,7 @@ readline = cxx.find_library('readline', required: get_
# On some systems we need to link readline to a termcap compatible library
readline_code = '''
#include <cstdio>
@ -24,7 +24,7 @@ Index: meson.build
#include <readline/readline.h>
int main(void) {
readline("foo");
@@ -283,9 +284,13 @@ header_conf.set('HAVE_DTRACE', get_option('dtrace'),
@@ -298,9 +299,13 @@ header_conf.set('HAVE_DTRACE', get_option('dtrace'),
description: 'Using dtrace probes')
header_conf.set('HAVE_PRINTF_ALTERNATIVE_INT', have_printf_alternative_int,
description: 'printf() accepts "%Id" for alternative integer output')
@ -39,7 +39,7 @@ Index: meson.build
required: readline.found()))
endif
header_conf.set('HAVE_SYS_SYSCALL_H', cxx.check_header('sys/syscall.h'))
@@ -462,13 +467,6 @@ if build_profiler
@@ -479,13 +484,6 @@ if build_profiler
endif
link_args = []

View File

@ -1,13 +1,14 @@
$OpenBSD: patch-modules_console_cpp,v 1.1 2020/05/14 14:55:56 jasper Exp $
$OpenBSD: patch-modules_console_cpp,v 1.2 2020/10/17 12:57:23 jasper Exp $
Index: modules/console.cpp
--- modules/console.cpp.orig
+++ modules/console.cpp
@@ -44,6 +44,7 @@
#include <string.h> // for strchr
@@ -42,6 +42,8 @@
#ifdef HAVE_READLINE_READLINE_H
+#include <wchar.h>
#include <readline/readline.h>
#include <readline/history.h>
#endif
# include <stdio.h> // include before readline/readline.h
+# include <string.h>
+# include <wchar.h>
# include <readline/history.h>
# include <readline/readline.h>

View File

@ -1,4 +1,4 @@
@comment $OpenBSD: PLIST,v 1.16 2020/05/14 14:55:56 jasper Exp $
@comment $OpenBSD: PLIST,v 1.17 2020/10/17 12:57:23 jasper Exp $
bin/gjs
@bin bin/gjs-console
include/gjs-1.0/
@ -23,6 +23,7 @@ share/examples/gjs/dbus-client.js
share/examples/gjs/dbus-service.js
share/examples/gjs/gettext.js
share/examples/gjs/gio-cat.js
share/examples/gjs/glistmodel.js
share/examples/gjs/gtk-application.js
share/examples/gjs/gtk.js
share/examples/gjs/http-client.js