Hello community,
here is the log from the commit of package gjs for openSUSE:Factory checked in
at 2020-02-22 19:01:52
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/gjs (Old)
and /work/SRC/openSUSE:Factory/.gjs.new.26092 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "gjs"
Sat Feb 22 19:01:52 2020 rev:86 rq:775302 version:1.58.5
Changes:
--------
--- /work/SRC/openSUSE:Factory/gjs/gjs.changes 2020-01-13 22:18:45.282441149
+0100
+++ /work/SRC/openSUSE:Factory/.gjs.new.26092/gjs.changes 2020-02-22
19:02:08.113836481 +0100
@@ -1,0 +2,7 @@
+Tue Feb 18 09:48:14 UTC 2020 - Bjørn Lie <bjorn....@gmail.com>
+
+- Update to version 1.58.5:
+ + Can not access GObject properties of classes without
+ GI information.
+
+-------------------------------------------------------------------
Old:
----
gjs-1.58.4.tar.xz
New:
----
gjs-1.58.5.tar.xz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ gjs.spec ++++++
--- /var/tmp/diff_new_pack.t3VlEd/_old 2020-02-22 19:02:08.721837659 +0100
+++ /var/tmp/diff_new_pack.t3VlEd/_new 2020-02-22 19:02:08.721837659 +0100
@@ -17,7 +17,7 @@
Name: gjs
-Version: 1.58.4
+Version: 1.58.5
Release: 0
Summary: JavaScript bindings based on gobject-introspection and Mozilla
License: MIT AND LGPL-2.0-or-later
++++++ gjs-1.58.4.tar.xz -> gjs-1.58.5.tar.xz ++++++
++++ 4880 lines of diff (skipped)
++++ retrying with extended exclude list
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh
old/gjs-1.58.4/NEWS new/gjs-1.58.5/NEWS
--- old/gjs-1.58.4/NEWS 2020-01-08 01:52:22.000000000 +0100
+++ new/gjs-1.58.5/NEWS 2020-02-18 07:01:08.000000000 +0100
@@ -1,3 +1,11 @@
+Version 1.58.5
+--------------
+
+- Closed bugs and merge requests:
+ * Fix Visual Studio builds of gnome-3-34 (1.58.x) branch [Chun-wei Fan, !392]
+ * Can not access GObject properties of classes without GI information [Juan
+ Pablo Ugarte, !385, #299]
+
Version 1.58.4
--------------
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh
old/gjs-1.58.4/config.h.in new/gjs-1.58.5/config.h.in
--- old/gjs-1.58.4/config.h.in 2020-01-08 01:54:35.000000000 +0100
+++ new/gjs-1.58.5/config.h.in 2020-02-18 07:02:39.000000000 +0100
@@ -45,6 +45,9 @@
/* Define to 1 if you have the <string.h> header file. */
#undef HAVE_STRING_H
+/* Define to 1 if you have the <sys/signal.h> header file. */
+#undef HAVE_SYS_SIGNAL_H
+
/* Define to 1 if you have the <sys/stat.h> header file. */
#undef HAVE_SYS_STAT_H
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh
old/gjs-1.58.4/configure.ac new/gjs-1.58.5/configure.ac
--- old/gjs-1.58.4/configure.ac 2020-01-07 17:41:01.000000000 +0100
+++ new/gjs-1.58.5/configure.ac 2020-02-18 06:59:38.000000000 +0100
@@ -3,7 +3,7 @@
m4_define(pkg_major_version, 1)
m4_define(pkg_minor_version, 58)
-m4_define(pkg_micro_version, 4)
+m4_define(pkg_micro_version, 5)
m4_define(pkg_version, pkg_major_version.pkg_minor_version.pkg_micro_version)
m4_define(pkg_int_version, (pkg_major_version * 100 + pkg_minor_version) * 100
+ pkg_micro_version)
@@ -33,7 +33,7 @@
AC_USE_SYSTEM_EXTENSIONS
AC_PROG_CXX
AX_CXX_COMPILE_STDCXX_14
-AC_CHECK_HEADERS([sys/syscall.h unistd.h])
+AC_CHECK_HEADERS([sys/signal.h sys/syscall.h unistd.h])
LT_PREREQ([2.2.0])
# no stupid static libraries
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh
old/gjs-1.58.4/gi/object.cpp new/gjs-1.58.5/gi/object.cpp
--- old/gjs-1.58.4/gi/object.cpp 2020-01-07 17:41:01.000000000 +0100
+++ new/gjs-1.58.5/gi/object.cpp 2020-02-18 06:59:49.000000000 +0100
@@ -650,7 +650,28 @@
canonicalize_key(canonical_name);
}
- GType *interfaces = g_type_interfaces(m_gtype, &n_interfaces);
+ GjsAutoFree<GType> interfaces = g_type_interfaces(m_gtype, &n_interfaces);
+
+ /* Fallback to GType system for non custom GObjects with no GI information
+ */
+ if (canonical_name && G_TYPE_IS_CLASSED(m_gtype) &&
+ !g_type_get_qdata(m_gtype, ObjectInstance::custom_type_quark())) {
+ GjsAutoTypeClass<GObjectClass> oclass(m_gtype);
+
+ if (g_object_class_find_property(oclass, canonical_name))
+ return lazy_define_gobject_property(cx, obj, id, resolved, name);
+
+ for (i = 0; i < n_interfaces; i++) {
+ if (!G_TYPE_IS_CLASSED(interfaces[i]))
+ continue;
+
+ GjsAutoTypeClass<GObjectClass> iclass(interfaces[i]);
+
+ if (g_object_class_find_property(iclass, canonical_name))
+ return lazy_define_gobject_property(cx, obj, id, resolved,
name);
+ }
+ }
+
for (i = 0; i < n_interfaces; i++) {
GjsAutoInterfaceInfo iface_info =
g_irepository_find_by_gtype(nullptr, interfaces[i]);
@@ -661,13 +682,10 @@
g_interface_info_find_method(iface_info, name);
if (method_info) {
if (g_function_info_get_flags (method_info) &
GI_FUNCTION_IS_METHOD) {
- if (!gjs_define_function(cx, obj, m_gtype, method_info)) {
- g_free(interfaces);
+ if (!gjs_define_function(cx, obj, m_gtype, method_info))
return false;
- }
*resolved = true;
- g_free(interfaces);
return true;
}
}
@@ -678,14 +696,11 @@
/* If the name refers to a GObject property, lazily define the property
* in JS as we do below in the real resolve hook. We ignore fields here
* because I don't think interfaces can have fields */
- if (is_ginterface_property_name(iface_info, canonical_name)) {
- g_free(interfaces);
+ if (is_ginterface_property_name(iface_info, canonical_name))
return lazy_define_gobject_property(cx, obj, id, resolved, name);
- }
}
*resolved = false;
- g_free(interfaces);
return true;
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh
old/gjs-1.58.4/gjs/console.cpp new/gjs-1.58.5/gjs/console.cpp
--- old/gjs-1.58.4/gjs/console.cpp 2020-01-07 17:41:01.000000000 +0100
+++ new/gjs-1.58.5/gjs/console.cpp 2020-02-18 06:59:38.000000000 +0100
@@ -29,6 +29,8 @@
#ifdef HAVE_UNISTD_H
# include <unistd.h> // for close
+#elif defined (_WIN32)
+# include <io.h>
#endif
#include <gio/gio.h>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh
old/gjs-1.58.4/gjs/context.cpp new/gjs-1.58.5/gjs/context.cpp
--- old/gjs-1.58.4/gjs/context.cpp 2020-01-07 17:41:01.000000000 +0100
+++ new/gjs-1.58.5/gjs/context.cpp 2020-02-18 06:59:38.000000000 +0100
@@ -31,6 +31,8 @@
#ifdef HAVE_UNISTD_H
# include <unistd.h> // for getpid
+#elif defined (_WIN32)
+# include <process.h>
#endif
#include <new>
@@ -281,7 +283,7 @@
#ifdef G_OS_WIN32
extern HMODULE gjs_dll;
char *basedir = g_win32_get_package_installation_directory_of_module
(gjs_dll);
- char *priv_typelib_dir = g_build_filename (basedir, "lib",
"girepository-1.0", NULL);
+ char *priv_typelib_dir = g_build_filename (basedir, "lib", "gjs",
"girepository-1.0", NULL);
g_free (basedir);
#else
char *priv_typelib_dir = g_build_filename (PKGLIBDIR,
"girepository-1.0", NULL);
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh
old/gjs-1.58.4/gjs/context.h new/gjs-1.58.5/gjs/context.h
--- old/gjs-1.58.4/gjs/context.h 2020-01-07 17:41:01.000000000 +0100
+++ new/gjs-1.58.5/gjs/context.h 2020-02-18 06:59:38.000000000 +0100
@@ -29,7 +29,10 @@
#endif
#include <stdbool.h> /* IWYU pragma: keep */
-#include <sys/signal.h> /* for siginfo_t */
+
+#ifndef _WIN32
+# include <sys/signal.h> /* for siginfo_t */
+#endif
#include <glib-object.h>
#include <glib.h>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh
old/gjs-1.58.4/gjs/debugger.cpp new/gjs-1.58.5/gjs/debugger.cpp
--- old/gjs-1.58.4/gjs/debugger.cpp 2020-01-07 17:41:01.000000000 +0100
+++ new/gjs-1.58.5/gjs/debugger.cpp 2020-02-18 06:59:38.000000000 +0100
@@ -34,7 +34,7 @@
#ifdef HAVE_UNISTD_H
# include <unistd.h> // for isatty, STDIN_FILENO
-#elif defined(XP_WIN)
+#elif defined(_WIN32)
# include <io.h>
# ifndef STDIN_FILENO
# define STDIN_FILENO 0
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh
old/gjs-1.58.4/gjs/engine.cpp new/gjs-1.58.5/gjs/engine.cpp
--- old/gjs-1.58.4/gjs/engine.cpp 2020-01-07 17:41:01.000000000 +0100
+++ new/gjs-1.58.5/gjs/engine.cpp 2020-02-18 06:59:38.000000000 +0100
@@ -23,7 +23,7 @@
#include <stdint.h>
-#ifdef G_OS_WIN32
+#ifdef _WIN32
# define WIN32_LEAN_AND_MEAN
# include <windows.h>
#endif
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh
old/gjs-1.58.4/gjs/importer.cpp new/gjs-1.58.5/gjs/importer.cpp
--- old/gjs-1.58.4/gjs/importer.cpp 2020-01-07 17:41:01.000000000 +0100
+++ new/gjs-1.58.5/gjs/importer.cpp 2020-02-18 06:59:38.000000000 +0100
@@ -23,7 +23,7 @@
#include <string.h> // for size_t, strcmp, strlen
-#ifdef G_OS_WIN32
+#ifdef _WIN32
# define WIN32_LEAN_AND_MEAN
# include <windows.h>
#endif
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh
old/gjs-1.58.4/gjs/jsapi-util.cpp new/gjs-1.58.5/gjs/jsapi-util.cpp
--- old/gjs-1.58.4/gjs/jsapi-util.cpp 2020-01-07 17:41:01.000000000 +0100
+++ new/gjs-1.58.5/gjs/jsapi-util.cpp 2020-02-18 06:59:38.000000000 +0100
@@ -25,7 +25,7 @@
#include <stdio.h> // for sscanf
#include <string.h> // for strlen
-#ifdef XP_WIN
+#ifdef _WIN32
# define WIN32_LEAN_AND_MEAN
# include <windows.h>
#endif
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh
old/gjs-1.58.4/gjs/jsapi-util.h new/gjs-1.58.5/gjs/jsapi-util.h
--- old/gjs-1.58.4/gjs/jsapi-util.h 2020-01-02 21:36:33.000000000 +0100
+++ new/gjs-1.58.5/gjs/jsapi-util.h 2020-02-18 06:59:46.000000000 +0100
@@ -64,6 +64,9 @@
}
};
+template <typename T>
+using GjsAutoFree = GjsAutoPointer<T, void, g_free>;
+
struct GjsAutoCharFuncs {
static char* dup(char* str) { return g_strdup(str); }
static void free(char* str) { g_free(str); }
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh
old/gjs-1.58.4/gjs/profiler.cpp new/gjs-1.58.5/gjs/profiler.cpp
--- old/gjs-1.58.4/gjs/profiler.cpp 2020-01-07 17:41:01.000000000 +0100
+++ new/gjs-1.58.5/gjs/profiler.cpp 2020-02-18 06:59:38.000000000 +0100
@@ -21,9 +21,11 @@
* IN THE SOFTWARE.
*/
-#include <config.h> // for ENABLE_PROFILER, HAVE_SYS_SYSCALL_H, HAVE_UNISTD_H
+#include <config.h> // for ENABLE_PROFILER, HAVE_SYS_SYSCALL_H,
HAVE_UNISTD_H, HAVE_SYS_SIGNAL_H
-#include <sys/signal.h> // for siginfo_t, sigevent, ...
+#ifdef HAVE_SYS_SIGNAL_H
+# include <sys/signal.h> // for siginfo_t, sigevent, ...
+#endif
#include <glib-object.h>
#include <glib.h>
Binary files old/gjs-1.58.4/m4/._libtool.m4 and new/gjs-1.58.5/m4/._libtool.m4
differ
Binary files old/gjs-1.58.4/m4/._ltoptions.m4 and
new/gjs-1.58.5/m4/._ltoptions.m4 differ
Binary files old/gjs-1.58.4/m4/._ltsugar.m4 and new/gjs-1.58.5/m4/._ltsugar.m4
differ
Binary files old/gjs-1.58.4/m4/._lt~obsolete.m4 and
new/gjs-1.58.5/m4/._lt~obsolete.m4 differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh
old/gjs-1.58.4/m4/ax_append_compile_flags.m4
new/gjs-1.58.5/m4/ax_append_compile_flags.m4
--- old/gjs-1.58.4/m4/ax_append_compile_flags.m4 2020-01-08
01:54:16.000000000 +0100
+++ new/gjs-1.58.5/m4/ax_append_compile_flags.m4 2020-02-18
06:56:38.000000000 +0100
@@ -30,33 +30,12 @@
#
# Copyright (c) 2011 Maarten Bosmans <mkbosm...@gmail.com>
#
-# This program is free software: you can redistribute it and/or modify it
-# under the terms of the GNU General Public License as published by the
-# Free Software Foundation, either version 3 of the License, or (at your
-# option) any later version.
-#
-# This program is distributed in the hope that it will be useful, but
-# WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General
-# Public License for more details.
-#
-# You should have received a copy of the GNU General Public License along
-# with this program. If not, see <https://www.gnu.org/licenses/>.
-#
-# As a special exception, the respective Autoconf Macro's copyright owner
-# gives unlimited permission to copy, distribute and modify the configure
-# scripts that are the output of Autoconf when processing the Macro. You
-# need not follow the terms of the GNU General Public License when using
-# or distributing such scripts, even though portions of the text of the
-# Macro appear in them. The GNU General Public License (GPL) does govern
-# all other use of the material that constitutes the Autoconf Macro.
-#
-# This special exception to the GPL applies to versions of the Autoconf
-# Macro released by the Autoconf Archive. When you make and distribute a
-# modified version of the Autoconf Macro, you may extend this special
-# exception to the GPL to apply to your modified version as well.
+# Copying and distribution of this file, with or without modification, are
+# permitted in any medium without royalty provided the copyright notice
+# and this notice are preserved. This file is offered as-is, without any
+# warranty.
-#serial 6
+#serial 7
AC_DEFUN([AX_APPEND_COMPILE_FLAGS],
[AX_REQUIRE_DEFINED([AX_CHECK_COMPILE_FLAG])
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh
old/gjs-1.58.4/m4/ax_append_flag.m4 new/gjs-1.58.5/m4/ax_append_flag.m4
--- old/gjs-1.58.4/m4/ax_append_flag.m4 2020-01-08 01:54:16.000000000 +0100
+++ new/gjs-1.58.5/m4/ax_append_flag.m4 2020-02-18 06:56:38.000000000 +0100
@@ -23,33 +23,12 @@
# Copyright (c) 2008 Guido U. Draheim <gui...@gmx.de>
# Copyright (c) 2011 Maarten Bosmans <mkbosm...@gmail.com>
#
-# This program is free software: you can redistribute it and/or modify it
-# under the terms of the GNU General Public License as published by the
-# Free Software Foundation, either version 3 of the License, or (at your
-# option) any later version.
-#
-# This program is distributed in the hope that it will be useful, but
-# WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General
-# Public License for more details.
-#
-# You should have received a copy of the GNU General Public License along
-# with this program. If not, see <https://www.gnu.org/licenses/>.
-#
-# As a special exception, the respective Autoconf Macro's copyright owner
-# gives unlimited permission to copy, distribute and modify the configure
-# scripts that are the output of Autoconf when processing the Macro. You
-# need not follow the terms of the GNU General Public License when using
-# or distributing such scripts, even though portions of the text of the
-# Macro appear in them. The GNU General Public License (GPL) does govern
-# all other use of the material that constitutes the Autoconf Macro.
-#
-# This special exception to the GPL applies to versions of the Autoconf
-# Macro released by the Autoconf Archive. When you make and distribute a
-# modified version of the Autoconf Macro, you may extend this special
-# exception to the GPL to apply to your modified version as well.
+# Copying and distribution of this file, with or without modification, are
+# permitted in any medium without royalty provided the copyright notice
+# and this notice are preserved. This file is offered as-is, without any
+# warranty.
-#serial 7
+#serial 8
AC_DEFUN([AX_APPEND_FLAG],
[dnl
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh
old/gjs-1.58.4/m4/ax_append_link_flags.m4
new/gjs-1.58.5/m4/ax_append_link_flags.m4
--- old/gjs-1.58.4/m4/ax_append_link_flags.m4 2020-01-08 01:54:16.000000000
+0100
+++ new/gjs-1.58.5/m4/ax_append_link_flags.m4 2020-02-18 06:56:38.000000000
+0100
@@ -28,33 +28,12 @@
#
# Copyright (c) 2011 Maarten Bosmans <mkbosm...@gmail.com>
#
-# This program is free software: you can redistribute it and/or modify it
-# under the terms of the GNU General Public License as published by the
-# Free Software Foundation, either version 3 of the License, or (at your
-# option) any later version.
-#
-# This program is distributed in the hope that it will be useful, but
-# WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General
-# Public License for more details.
-#
-# You should have received a copy of the GNU General Public License along
-# with this program. If not, see <https://www.gnu.org/licenses/>.
-#
-# As a special exception, the respective Autoconf Macro's copyright owner
-# gives unlimited permission to copy, distribute and modify the configure
-# scripts that are the output of Autoconf when processing the Macro. You
-# need not follow the terms of the GNU General Public License when using
-# or distributing such scripts, even though portions of the text of the
-# Macro appear in them. The GNU General Public License (GPL) does govern
-# all other use of the material that constitutes the Autoconf Macro.
-#
-# This special exception to the GPL applies to versions of the Autoconf
-# Macro released by the Autoconf Archive. When you make and distribute a
-# modified version of the Autoconf Macro, you may extend this special
-# exception to the GPL to apply to your modified version as well.
+# Copying and distribution of this file, with or without modification, are
+# permitted in any medium without royalty provided the copyright notice
+# and this notice are preserved. This file is offered as-is, without any
+# warranty.
-#serial 6
+#serial 7
AC_DEFUN([AX_APPEND_LINK_FLAGS],
[AX_REQUIRE_DEFINED([AX_CHECK_LINK_FLAG])
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh
old/gjs-1.58.4/m4/ax_check_compile_flag.m4
new/gjs-1.58.5/m4/ax_check_compile_flag.m4
--- old/gjs-1.58.4/m4/ax_check_compile_flag.m4 2020-01-08 01:54:16.000000000
+0100
+++ new/gjs-1.58.5/m4/ax_check_compile_flag.m4 2020-02-18 06:56:38.000000000
+0100
@@ -29,33 +29,12 @@
# Copyright (c) 2008 Guido U. Draheim <gui...@gmx.de>
# Copyright (c) 2011 Maarten Bosmans <mkbosm...@gmail.com>
#
-# This program is free software: you can redistribute it and/or modify it
-# under the terms of the GNU General Public License as published by the
-# Free Software Foundation, either version 3 of the License, or (at your
-# option) any later version.
-#
-# This program is distributed in the hope that it will be useful, but
-# WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General
-# Public License for more details.
-#
-# You should have received a copy of the GNU General Public License along
-# with this program. If not, see <https://www.gnu.org/licenses/>.
-#
-# As a special exception, the respective Autoconf Macro's copyright owner
-# gives unlimited permission to copy, distribute and modify the configure
-# scripts that are the output of Autoconf when processing the Macro. You
-# need not follow the terms of the GNU General Public License when using
-# or distributing such scripts, even though portions of the text of the
-# Macro appear in them. The GNU General Public License (GPL) does govern
-# all other use of the material that constitutes the Autoconf Macro.
-#
-# This special exception to the GPL applies to versions of the Autoconf
-# Macro released by the Autoconf Archive. When you make and distribute a
-# modified version of the Autoconf Macro, you may extend this special
-# exception to the GPL to apply to your modified version as well.
+# Copying and distribution of this file, with or without modification, are
+# permitted in any medium without royalty provided the copyright notice
+# and this notice are preserved. This file is offered as-is, without any
+# warranty.
-#serial 5
+#serial 6
AC_DEFUN([AX_CHECK_COMPILE_FLAG],
[AC_PREREQ(2.64)dnl for _AC_LANG_PREFIX and AS_VAR_IF
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh
old/gjs-1.58.4/m4/ax_check_link_flag.m4 new/gjs-1.58.5/m4/ax_check_link_flag.m4
--- old/gjs-1.58.4/m4/ax_check_link_flag.m4 2020-01-08 01:54:16.000000000
+0100
+++ new/gjs-1.58.5/m4/ax_check_link_flag.m4 2020-02-18 06:56:38.000000000
+0100
@@ -29,33 +29,12 @@
# Copyright (c) 2008 Guido U. Draheim <gui...@gmx.de>
# Copyright (c) 2011 Maarten Bosmans <mkbosm...@gmail.com>
#
-# This program is free software: you can redistribute it and/or modify it
-# under the terms of the GNU General Public License as published by the
-# Free Software Foundation, either version 3 of the License, or (at your
-# option) any later version.
-#
-# This program is distributed in the hope that it will be useful, but
-# WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General
-# Public License for more details.
-#
-# You should have received a copy of the GNU General Public License along
-# with this program. If not, see <https://www.gnu.org/licenses/>.
-#
-# As a special exception, the respective Autoconf Macro's copyright owner
-# gives unlimited permission to copy, distribute and modify the configure
-# scripts that are the output of Autoconf when processing the Macro. You
-# need not follow the terms of the GNU General Public License when using
-# or distributing such scripts, even though portions of the text of the
-# Macro appear in them. The GNU General Public License (GPL) does govern
-# all other use of the material that constitutes the Autoconf Macro.
-#
-# This special exception to the GPL applies to versions of the Autoconf
-# Macro released by the Autoconf Archive. When you make and distribute a
-# modified version of the Autoconf Macro, you may extend this special
-# exception to the GPL to apply to your modified version as well.
+# Copying and distribution of this file, with or without modification, are
+# permitted in any medium without royalty provided the copyright notice
+# and this notice are preserved. This file is offered as-is, without any
+# warranty.
-#serial 5
+#serial 6
AC_DEFUN([AX_CHECK_LINK_FLAG],
[AC_PREREQ(2.64)dnl for _AC_LANG_PREFIX and AS_VAR_IF
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh
old/gjs-1.58.4/m4/ax_compiler_flags_cflags.m4
new/gjs-1.58.5/m4/ax_compiler_flags_cflags.m4
--- old/gjs-1.58.4/m4/ax_compiler_flags_cflags.m4 2020-01-08
01:54:16.000000000 +0100
+++ new/gjs-1.58.5/m4/ax_compiler_flags_cflags.m4 2020-02-18
06:56:38.000000000 +0100
@@ -26,7 +26,7 @@
# and this notice are preserved. This file is offered as-is, without any
# warranty.
-#serial 16
+#serial 17
AC_DEFUN([AX_COMPILER_FLAGS_CFLAGS],[
AC_REQUIRE([AC_PROG_SED])
@@ -72,6 +72,19 @@
],ax_warn_cflags_variable,[$ax_compiler_flags_test])
AS_IF([test "$ax_enable_compile_warnings" != "no"],[
+ if test "$ax_compiler_cxx" = "no" ; then
+ # C-only flags. Warn in C++
+ AX_APPEND_COMPILE_FLAGS([ dnl
+ -Wnested-externs dnl
+ -Wmissing-prototypes dnl
+ -Wstrict-prototypes dnl
+ -Wdeclaration-after-statement dnl
+ -Wimplicit-function-declaration dnl
+ -Wold-style-definition dnl
+ -Wjump-misses-init dnl
+ ],ax_warn_cflags_variable,[$ax_compiler_flags_test])
+ fi
+
# "yes" flags
AX_APPEND_COMPILE_FLAGS([ dnl
-Wall dnl
@@ -113,18 +126,6 @@
$6 dnl
$7 dnl
],ax_warn_cflags_variable,[$ax_compiler_flags_test])
- if test "$ax_compiler_cxx" = "no" ; then
- # C-only flags. Warn in C++
- AX_APPEND_COMPILE_FLAGS([ dnl
- -Wnested-externs dnl
- -Wmissing-prototypes dnl
- -Wstrict-prototypes dnl
- -Wdeclaration-after-statement dnl
- -Wimplicit-function-declaration dnl
- -Wold-style-definition dnl
- -Wjump-misses-init dnl
- ],ax_warn_cflags_variable,[$ax_compiler_flags_test])
- fi
])
AS_IF([test "$ax_enable_compile_warnings" = "error"],[
# "error" flags; -Werror has to be appended unconditionally because
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh
old/gjs-1.58.4/m4/ax_cxx_compile_stdcxx.m4
new/gjs-1.58.5/m4/ax_cxx_compile_stdcxx.m4
--- old/gjs-1.58.4/m4/ax_cxx_compile_stdcxx.m4 2020-01-08 01:54:16.000000000
+0100
+++ new/gjs-1.58.5/m4/ax_cxx_compile_stdcxx.m4 2020-02-18 06:56:38.000000000
+0100
@@ -33,19 +33,18 @@
# Copyright (c) 2014, 2015 Google Inc.; contributed by Alexey Sokolov
<soko...@google.com>
# Copyright (c) 2015 Paul Norman <penor...@mac.com>
# Copyright (c) 2015 Moritz Klammler <mor...@klammler.eu>
-# Copyright (c) 2016 Krzesimir Nowak <qdl...@gmail.com>
+# Copyright (c) 2016, 2018 Krzesimir Nowak <qdl...@gmail.com>
#
# Copying and distribution of this file, with or without modification, are
# permitted in any medium without royalty provided the copyright notice
# and this notice are preserved. This file is offered as-is, without any
# warranty.
-#serial 7
+#serial 10
dnl This macro is based on the code from the AX_CXX_COMPILE_STDCXX_11 macro
dnl (serial version number 13).
-AX_REQUIRE_DEFINED([AC_MSG_WARN])
AC_DEFUN([AX_CXX_COMPILE_STDCXX], [dnl
m4_if([$1], [11], [ax_cxx_compile_alternatives="11 0x"],
[$1], [14], [ax_cxx_compile_alternatives="14 1y"],
@@ -61,14 +60,6 @@
[m4_fatal([invalid third argument `$3' to AX_CXX_COMPILE_STDCXX])])
AC_LANG_PUSH([C++])dnl
ac_success=no
- AC_CACHE_CHECK(whether $CXX supports C++$1 features by default,
- ax_cv_cxx_compile_cxx$1,
- [AC_COMPILE_IFELSE([AC_LANG_SOURCE([_AX_CXX_COMPILE_STDCXX_testbody_$1])],
- [ax_cv_cxx_compile_cxx$1=yes],
- [ax_cv_cxx_compile_cxx$1=no])])
- if test x$ax_cv_cxx_compile_cxx$1 = xyes; then
- ac_success=yes
- fi
m4_if([$2], [noext], [], [dnl
if test x$ac_success = xno; then
@@ -139,7 +130,6 @@
[define if the compiler supports basic C++$1 syntax])
fi
AC_SUBST(HAVE_CXX$1)
- m4_if([$1], [17], [AC_MSG_WARN([C++17 is not yet standardized, so the checks
may change in incompatible ways anytime])])
])
@@ -587,20 +577,12 @@
#error "This is not a C++ compiler"
-#elif __cplusplus <= 201402L
+#elif __cplusplus < 201703L
#error "This is not a C++17 compiler"
#else
-#if defined(__clang__)
- #define REALLY_CLANG
-#else
- #if defined(__GNUC__)
- #define REALLY_GCC
- #endif
-#endif
-
#include <initializer_list>
#include <utility>
#include <type_traits>
@@ -608,16 +590,12 @@
namespace cxx17
{
-#if !defined(REALLY_CLANG)
namespace test_constexpr_lambdas
{
- // TODO: test it with clang++ from git
-
constexpr int foo = [](){return 42;}();
}
-#endif // !defined(REALLY_CLANG)
namespace test::nested_namespace::definitions
{
@@ -852,12 +830,9 @@
}
-#if !defined(REALLY_CLANG)
namespace test_template_argument_deduction_for_class_templates
{
- // TODO: test it with clang++ from git
-
template <typename T1, typename T2>
struct pair
{
@@ -876,7 +851,6 @@
}
}
-#endif // !defined(REALLY_CLANG)
namespace test_non_type_auto_template_parameters
{
@@ -890,12 +864,9 @@
}
-#if !defined(REALLY_CLANG)
namespace test_structured_bindings
{
- // TODO: test it with clang++ from git
-
int arr[2] = { 1, 2 };
std::pair<int, int> pr = { 1, 2 };
@@ -927,14 +898,10 @@
const auto [ x3, y3 ] = f3();
}
-#endif // !defined(REALLY_CLANG)
-#if !defined(REALLY_CLANG)
namespace test_exception_spec_type_system
{
- // TODO: test it with clang++ from git
-
struct Good {};
struct Bad {};
@@ -952,7 +919,6 @@
static_assert (std::is_same_v<Good, decltype(f(g1, g2))>);
}
-#endif // !defined(REALLY_CLANG)
namespace test_inline_variables
{
@@ -977,6 +943,6 @@
} // namespace cxx17
-#endif // __cplusplus <= 201402L
+#endif // __cplusplus < 201703L
]])
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh
old/gjs-1.58.4/m4/libtool.m4 new/gjs-1.58.5/m4/libtool.m4
--- old/gjs-1.58.4/m4/libtool.m4 2020-01-08 01:54:29.000000000 +0100
+++ new/gjs-1.58.5/m4/libtool.m4 2020-02-18 06:56:44.000000000 +0100
@@ -2867,6 +2867,9 @@
# before this can be enabled.
hardcode_into_libs=yes
+ # Add ABI-specific directories to the system library path.
+ sys_lib_dlsearch_path_spec="/lib64 /usr/lib64 /lib /usr/lib"
+
# Ideally, we could use ldconfig to report *all* directores which are
# searched for libraries, however this is still not possible. Aside from not
# being certain /sbin/ldconfig is available, command
@@ -2875,7 +2878,7 @@
# appending ld.so.conf contents (and includes) to the search path.
if test -f /etc/ld.so.conf; then
lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s
2>/dev/null", \[$]2)); skip = 1; } { if (!skip) print \[$]0; skip = 0; }' <
/etc/ld.so.conf | $SED -e 's/#.*//;/^[ ]*hwcap[ ]/d;s/[:, ]/
/g;s/=[^=]*$//;s/=[^= ]* / /g;s/"//g;/^$/d' | tr '\n' ' '`
- sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra"
+ sys_lib_dlsearch_path_spec="$sys_lib_dlsearch_path_spec $lt_ld_extra"
fi
# We used to test for /lib/ld.so.1 and disable shared libraries on
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh
old/gjs-1.58.4/m4/pkg.m4 new/gjs-1.58.5/m4/pkg.m4
--- old/gjs-1.58.4/m4/pkg.m4 2020-01-08 01:54:16.000000000 +0100
+++ new/gjs-1.58.5/m4/pkg.m4 2020-02-18 06:56:38.000000000 +0100
@@ -1,5 +1,5 @@
# pkg.m4 - Macros to locate and utilise pkg-config. -*- Autoconf -*-
-# serial 12 (pkg-config-0.29.2)
+# serial 11 (pkg-config-0.29.1)
dnl Copyright © 2004 Scott James Remnant <sc...@netsplit.com>.
dnl Copyright © 2012-2015 Dan Nicholson <dbn.li...@gmail.com>
@@ -41,7 +41,7 @@
dnl See the "Since" comment for each macro you use to see what version
dnl of the macros you require.
m4_defun([PKG_PREREQ],
-[m4_define([PKG_MACROS_VERSION], [0.29.2])
+[m4_define([PKG_MACROS_VERSION], [0.29.1])
m4_if(m4_version_compare(PKG_MACROS_VERSION, [$1]), -1,
[m4_fatal([pkg.m4 version $1 or higher is required but
]PKG_MACROS_VERSION[ found])])
])dnl PKG_PREREQ
@@ -142,7 +142,7 @@
AC_ARG_VAR([$1][_LIBS], [linker flags for $1, overriding pkg-config])dnl
pkg_failed=no
-AC_MSG_CHECKING([for $2])
+AC_MSG_CHECKING([for $1])
_PKG_CONFIG([$1][_CFLAGS], [cflags], [$2])
_PKG_CONFIG([$1][_LIBS], [libs], [$2])
@@ -152,11 +152,11 @@
See the pkg-config man page for more details.])
if test $pkg_failed = yes; then
- AC_MSG_RESULT([no])
+ AC_MSG_RESULT([no])
_PKG_SHORT_ERRORS_SUPPORTED
if test $_pkg_short_errors_supported = yes; then
$1[]_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors
--cflags --libs "$2" 2>&1`
- else
+ else
$1[]_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs
"$2" 2>&1`
fi
# Put the nasty error message in config.log where it belongs
@@ -173,7 +173,7 @@
_PKG_TEXT])[]dnl
])
elif test $pkg_failed = untried; then
- AC_MSG_RESULT([no])
+ AC_MSG_RESULT([no])
m4_default([$4], [AC_MSG_FAILURE(
[The pkg-config script could not be found or is too old. Make sure it
is in your PATH or set the PKG_CONFIG environment variable to the full
@@ -273,3 +273,71 @@
AS_VAR_IF([$1], [""], [$5], [$4])dnl
])dnl PKG_CHECK_VAR
+
+dnl PKG_WITH_MODULES(VARIABLE-PREFIX, MODULES,
+dnl [ACTION-IF-FOUND],[ACTION-IF-NOT-FOUND],
+dnl [DESCRIPTION], [DEFAULT])
+dnl ------------------------------------------
+dnl
+dnl Prepare a "--with-" configure option using the lowercase
+dnl [VARIABLE-PREFIX] name, merging the behaviour of AC_ARG_WITH and
+dnl PKG_CHECK_MODULES in a single macro.
+AC_DEFUN([PKG_WITH_MODULES],
+[
+m4_pushdef([with_arg], m4_tolower([$1]))
+
+m4_pushdef([description],
+ [m4_default([$5], [build with ]with_arg[ support])])
+
+m4_pushdef([def_arg], [m4_default([$6], [auto])])
+m4_pushdef([def_action_if_found], [AS_TR_SH([with_]with_arg)=yes])
+m4_pushdef([def_action_if_not_found], [AS_TR_SH([with_]with_arg)=no])
+
+m4_case(def_arg,
+ [yes],[m4_pushdef([with_without], [--without-]with_arg)],
+ [m4_pushdef([with_without],[--with-]with_arg)])
+
+AC_ARG_WITH(with_arg,
+ AS_HELP_STRING(with_without, description[ @<:@default=]def_arg[@:>@]),,
+ [AS_TR_SH([with_]with_arg)=def_arg])
+
+AS_CASE([$AS_TR_SH([with_]with_arg)],
+ [yes],[PKG_CHECK_MODULES([$1],[$2],$3,$4)],
+ [auto],[PKG_CHECK_MODULES([$1],[$2],
+ [m4_n([def_action_if_found]) $3],
+ [m4_n([def_action_if_not_found]) $4])])
+
+m4_popdef([with_arg])
+m4_popdef([description])
+m4_popdef([def_arg])
+
+])dnl PKG_WITH_MODULES
+
+dnl PKG_HAVE_WITH_MODULES(VARIABLE-PREFIX, MODULES,
+dnl [DESCRIPTION], [DEFAULT])
+dnl -----------------------------------------------
+dnl
+dnl Convenience macro to trigger AM_CONDITIONAL after PKG_WITH_MODULES
+dnl check._[VARIABLE-PREFIX] is exported as make variable.
+AC_DEFUN([PKG_HAVE_WITH_MODULES],
+[
+PKG_WITH_MODULES([$1],[$2],,,[$3],[$4])
+
+AM_CONDITIONAL([HAVE_][$1],
+ [test "$AS_TR_SH([with_]m4_tolower([$1]))" = "yes"])
+])dnl PKG_HAVE_WITH_MODULES
+
+dnl PKG_HAVE_DEFINE_WITH_MODULES(VARIABLE-PREFIX, MODULES,
+dnl [DESCRIPTION], [DEFAULT])
+dnl ------------------------------------------------------
+dnl
+dnl Convenience macro to run AM_CONDITIONAL and AC_DEFINE after
+dnl PKG_WITH_MODULES check. HAVE_[VARIABLE-PREFIX] is exported as make
+dnl and preprocessor variable.
+AC_DEFUN([PKG_HAVE_DEFINE_WITH_MODULES],
+[
+PKG_HAVE_WITH_MODULES([$1],[$2],[$3],[$4])
+
+AS_IF([test "$AS_TR_SH([with_]m4_tolower([$1]))" = "yes"],
+ [AC_DEFINE([HAVE_][$1], 1, [Enable ]m4_tolower([$1])[ support])])
+])dnl PKG_HAVE_DEFINE_WITH_MODULES
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh
old/gjs-1.58.4/util/log.cpp new/gjs-1.58.5/util/log.cpp
--- old/gjs-1.58.4/util/log.cpp 2020-01-07 17:41:01.000000000 +0100
+++ new/gjs-1.58.5/util/log.cpp 2020-02-18 06:54:29.000000000 +0100
@@ -26,7 +26,7 @@
#include <stdio.h> // for FILE, fprintf, fflush, fopen, fputs, fseek
#include <string.h> // for strchr, strcmp
-#ifdef G_OS_WIN32
+#ifdef _WIN32
# include <io.h>
# include <process.h>
# ifndef F_OK
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh
old/gjs-1.58.4/win32/config-msvc.mak new/gjs-1.58.5/win32/config-msvc.mak
--- old/gjs-1.58.4/win32/config-msvc.mak 2020-01-07 17:41:01.000000000
+0100
+++ new/gjs-1.58.5/win32/config-msvc.mak 2020-02-18 06:59:38.000000000
+0100
@@ -46,6 +46,7 @@
/Ivs$(VSVER)\$(CFG)\$(PLAT)\libgjs \
/FImsvc_recommended_pragmas.h \
/FIjs\RequiredDefines.h \
+ /DNOMINMAX \
/Dssize_t=gssize \
/wd4530 \
/wd4099 \
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh
old/gjs-1.58.4/win32/config.h.win32 new/gjs-1.58.5/win32/config.h.win32
--- old/gjs-1.58.4/win32/config.h.win32 2020-01-08 01:59:24.000000000 +0100
+++ new/gjs-1.58.5/win32/config.h.win32 2020-02-18 07:02:38.000000000 +0100
@@ -10,7 +10,7 @@
/* #undef ENABLE_GTK */
/* The gjs version as an integer */
-#define GJS_VERSION 15804
+#define GJS_VERSION 15805
/* define if the compiler supports basic C++11 syntax */
#define HAVE_CXX11 1
@@ -47,6 +47,9 @@
/* Define to 1 if you have the <string.h> header file. */
#define HAVE_STRING_H 1
+/* Define to 1 if you have the <sys/signal.h> header file. */
+/* #undef HAVE_SYS_SIGNAL_H */
+
/* Define to 1 if you have the <sys/stat.h> header file. */
#define HAVE_SYS_STAT_H 1
@@ -71,7 +74,7 @@
#define PACKAGE_NAME "gjs"
/* Define to the full name and version of this package. */
-#define PACKAGE_STRING "gjs 1.58.4"
+#define PACKAGE_STRING "gjs 1.58.5"
/* Define to the one symbol short name of this package. */
#define PACKAGE_TARNAME "gjs"
@@ -80,10 +83,10 @@
#define PACKAGE_URL ""
/* Define to the version of this package. */
-#define PACKAGE_VERSION "1.58.4"
+#define PACKAGE_VERSION "1.58.5"
/* Define to 1 if you have the ANSI C header files. */
#define STDC_HEADERS 1
/* Version number of package */
-#define VERSION "1.58.4"
+#define VERSION "1.58.5"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh
old/gjs-1.58.4/win32/config.h.win32.in new/gjs-1.58.5/win32/config.h.win32.in
--- old/gjs-1.58.4/win32/config.h.win32.in 2020-01-07 17:41:01.000000000
+0100
+++ new/gjs-1.58.5/win32/config.h.win32.in 2020-02-18 06:59:38.000000000
+0100
@@ -47,6 +47,9 @@
/* Define to 1 if you have the <string.h> header file. */
#define HAVE_STRING_H 1
+/* Define to 1 if you have the <sys/signal.h> header file. */
+/* #undef HAVE_SYS_SIGNAL_H */
+
/* Define to 1 if you have the <sys/stat.h> header file. */
#define HAVE_SYS_STAT_H 1
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh
old/gjs-1.58.4/win32/install.mak new/gjs-1.58.5/win32/install.mak
--- old/gjs-1.58.4/win32/install.mak 2020-01-07 17:41:01.000000000 +0100
+++ new/gjs-1.58.5/win32/install.mak 2020-02-18 06:59:38.000000000 +0100
@@ -14,5 +14,5 @@
@copy /b vs$(VSVER)\$(CFG)\$(PLAT)\gjs-console.pdb $(PREFIX)\bin
@for %h in ($(LIBGJS_HEADERS)) do @copy ..\%h
$(PREFIX)\include\gjs-1.0\%h
@rem Copy the generated introspection files, if built
- @if exist vs$(VSVER)\$(CFG)\$(PLAT)\GjsPrivate-1.0.gir copy
vs$(VSVER)\$(CFG)\$(PLAT)\GjsPrivate-1.0.gir $(PREFIX)\share\gir-1.0
- @if exist vs$(VSVER)\$(CFG)\$(PLAT)\GjsPrivate-1.0.typelib copy /b
vs$(VSVER)\$(CFG)\$(PLAT)\GjsPrivate-1.0.typelib $(PREFIX)\lib\girepository-1.0
+ @if exist vs$(VSVER)\$(CFG)\$(PLAT)\GjsPrivate-1.0.typelib mkdir
$(PREFIX)\lib\gjs\girepository-1.0
+ @if exist vs$(VSVER)\$(CFG)\$(PLAT)\GjsPrivate-1.0.typelib copy /b
vs$(VSVER)\$(CFG)\$(PLAT)\GjsPrivate-1.0.typelib
$(PREFIX)\lib\gjs\girepository-1.0
