@img/sharp-libvips-dev 1.2.0-rc.1 → 1.2.0-rc.2

package/include/glib-2.0/glib/glib-visibility.h

@@ -4,7 +4,7 @@
 #  define _GLIB_EXPORT __declspec(dllexport)
 #  define _GLIB_IMPORT __declspec(dllimport)
 #elif __GNUC__ >= 4
-#  define _GLIB_EXPORT __attribute__((visibility("default")))
+#  define _GLIB_EXPORT __attribute__((visibility("default"))) __declspec(dllexport)
 #  define _GLIB_IMPORT
 #else
 #  define _GLIB_EXPORT

package/include/glib-2.0/glib/gwin32.h

@@ -0,0 +1,192 @@
+/* GLIB - Library of useful routines for C programming
+ * Copyright (C) 1995-1997  Peter Mattis, Spencer Kimball and Josh MacDonald
+ *
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library 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
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, see <http://www.gnu.org/licenses/>.
+ */
+
+/*
+ * Modified by the GLib Team and others 1997-2000.  See the AUTHORS
+ * file for a list of people on the GLib Team.  See the ChangeLog
+ * files for a list of changes.  These files are distributed with
+ * GLib at ftp://ftp.gtk.org/pub/gtk/.
+ */
+
+#ifndef __G_WIN32_H__
+#define __G_WIN32_H__
+
+#if !defined (__GLIB_H_INSIDE__) && !defined (GLIB_COMPILATION)
+#error "Only <glib.h> can be included directly."
+#endif
+
+#include <glib/gtypes.h>
+
+#ifdef G_PLATFORM_WIN32
+
+G_BEGIN_DECLS
+
+#ifndef MAXPATHLEN
+#define MAXPATHLEN 1024
+#endif
+
+#ifdef G_OS_WIN32
+
+/*
+ * To get prototypes for the following POSIXish functions, you have to
+ * include the indicated non-POSIX headers. The functions are defined
+ * in OLDNAMES.LIB (MSVC) or -lmoldname-msvc (mingw32). But note that
+ * for POSIX functions that take or return file names in the system
+ * codepage, in many cases you would want to use the GLib wrappers in
+ * gstdio.h and UTF-8 instead.
+ *
+ * getcwd: <direct.h> (MSVC), <io.h> (mingw32)
+ * getpid: <process.h>
+ * access: <io.h>
+ * unlink: <stdio.h> or <io.h>
+ * open, read, write, lseek, close: <io.h>
+ * rmdir: <io.h>
+ * pipe: <io.h> (actually, _pipe())
+ */
+
+/* For some POSIX functions that are not provided by the MS runtime,
+ * we provide emulation functions in glib, which are prefixed with
+ * g_win32_. Or that was the idea at some time, but there is just one
+ * of those:
+ */
+GLIB_AVAILABLE_IN_ALL
+gint		g_win32_ftruncate	(gint		 f,
+					 guint		 size);
+#endif /* G_OS_WIN32 */
+
+/* The MS setlocale uses locale names of the form "English_United
+ * States.1252" etc. We want the Unixish standard form "en", "zh_TW"
+ * etc. This function gets the current thread locale from Windows and
+ * returns it as a string of the above form for use in forming file
+ * names etc. The returned string should be deallocated with g_free().
+ */
+GLIB_AVAILABLE_IN_ALL
+gchar* 		g_win32_getlocale  (void);
+
+/* Translate a Win32 error code (as returned by GetLastError()) into
+ * the corresponding message. The returned string should be deallocated
+ * with g_free().
+ */
+GLIB_AVAILABLE_IN_ALL
+gchar*          g_win32_error_message (gint error);
+
+GLIB_DEPRECATED
+gchar*          g_win32_get_package_installation_directory (const gchar *package,
+							    const gchar *dll_name);
+
+GLIB_DEPRECATED
+gchar*          g_win32_get_package_installation_subdirectory (const gchar *package,
+							       const gchar *dll_name,
+							       const gchar *subdir);
+
+GLIB_AVAILABLE_IN_ALL
+gchar*          g_win32_get_package_installation_directory_of_module (gpointer hmodule);
+
+GLIB_DEPRECATED_IN_2_44_FOR(g_win32_check_windows_version)
+guint		g_win32_get_windows_version (void);
+
+GLIB_AVAILABLE_IN_ALL
+gchar*          g_win32_locale_filename_from_utf8 (const gchar *utf8filename);
+
+GLIB_AVAILABLE_IN_2_40
+gchar **        g_win32_get_command_line (void);
+
+/* As of GLib 2.14 we only support NT-based Windows */
+#define G_WIN32_IS_NT_BASED() TRUE
+#define G_WIN32_HAVE_WIDECHAR_API() TRUE
+
+/**
+ * GWin32OSType:
+ * @G_WIN32_OS_ANY: The running system can be a workstation or a server edition of
+ *  Windows.  The type of the running system is therefore not checked.
+ * @G_WIN32_OS_WORKSTATION: The running system is a workstation edition of Windows,
+ *  such as Windows 7 Professional.
+ * @G_WIN32_OS_SERVER: The running system is a server edition of Windows, such as
+ *  Windows Server 2008 R2.
+ *
+ * Type of Windows edition to check for at run-time.
+ **/
+typedef enum
+{
+  G_WIN32_OS_ANY,
+  G_WIN32_OS_WORKSTATION,
+  G_WIN32_OS_SERVER,
+} GWin32OSType;
+
+GLIB_AVAILABLE_IN_2_44
+gboolean g_win32_check_windows_version (const gint major,
+                                        const gint minor,
+                                        const gint spver,
+                                        const GWin32OSType os_type);
+
+/**
+ * g_win32_clear_com:
+ * @com_obj: (not optional) (nullable): Pointer to COM object pointer to release and clear
+ *
+ * Releases the referenced COM object, and clears its pointer to `NULL`.
+ *
+ * The @com_obj pointer must not be `NULL`.
+ *
+ * If @com_obj references a `NULL` COM  object, this function is a no-op.
+ *
+ * This is equivalent to `g_clear_object()` for dealing with
+ * Windows COM objects.
+ *
+ * Since: 2.84
+ */
+
+#ifndef __cplusplus
+
+#define g_win32_clear_com(com_obj) \
+G_STMT_START {\
+  IUnknown **unknown_com_obj = (IUnknown **)(com_obj); \
+  \
+  if (*unknown_com_obj) \
+    { \
+      (*unknown_com_obj)->lpVtbl->Release (*unknown_com_obj); \
+      *unknown_com_obj = NULL; \
+    } \
+} G_STMT_END \
+GLIB_AVAILABLE_MACRO_IN_2_84
+
+#endif
+
+G_END_DECLS
+
+#ifdef __cplusplus
+/*
+ * There are COM objects that only have C++-style definitions, such as DirectWrite
+ * from the Windows SDK (albeit a C interface is provided for the mingw-w64 toolchain),
+ * so we need to have a C++ version for this
+ */
+template <typename com_interface>
+static inline void
+g_win32_clear_com (com_interface **com_obj)
+{
+  if (*com_obj != NULL)
+    {
+      (*com_obj)->Release ();
+      *com_obj = NULL;
+    }
+}
+#endif
+
+#endif	 /* G_PLATFORM_WIN32 */
+
+#endif /* __G_WIN32_H__ */

package/include/glib-2.0/gobject/gobject-visibility.h

@@ -4,7 +4,7 @@
 #  define _GOBJECT_EXPORT __declspec(dllexport)
 #  define _GOBJECT_IMPORT __declspec(dllimport)
 #elif __GNUC__ >= 4
-#  define _GOBJECT_EXPORT __attribute__((visibility("default")))
+#  define _GOBJECT_EXPORT __attribute__((visibility("default"))) __declspec(dllexport)
 #  define _GOBJECT_IMPORT
 #else
 #  define _GOBJECT_EXPORT

package/include/glib-2.0/msvc_recommended_pragmas.h

@@ -0,0 +1,41 @@
+#ifndef _MSC_VER
+#pragma error "This header is for Microsoft VC or clang-cl only."
+#endif /* _MSC_VER */
+
+/* Make MSVC more pedantic, this is a recommended pragma list
+ * from _Win32_Programming_ by Rector and Newcomer.
+ */
+#ifndef __clang__
+#pragma warning(error:4002) /* too many actual parameters for macro */
+#pragma warning(error:4003) /* not enough actual parameters for macro */
+#pragma warning(1:4010)     /* single-line comment contains line-continuation character */
+#pragma warning(error:4013) /* 'function' undefined; assuming extern returning int */
+#pragma warning(1:4016)     /* no function return type; using int as default */
+#pragma warning(error:4020) /* too many actual parameters */
+#pragma warning(error:4021) /* too few actual parameters */
+#pragma warning(error:4027) /* function declared without formal parameter list */
+#pragma warning(error:4029) /* declared formal parameter list different from definition */
+#pragma warning(error:4033) /* 'function' must return a value */
+#pragma warning(error:4035) /* 'function' : no return value */
+#pragma warning(error:4045) /* array bounds overflow */
+#pragma warning(error:4047) /* different levels of indirection */
+#pragma warning(error:4049) /* terminating line number emission */
+#pragma warning(error:4053) /* An expression of type void was used as an operand */
+#pragma warning(error:4071) /* no function prototype given */
+#pragma warning(disable:4101) /* unreferenced local variable */
+#pragma warning(error:4150)
+
+/* G_NORETURN */
+#pragma warning(error:4646) /* function declared with __declspec(noreturn) has non-void return type */
+#pragma warning(error:4715) /* 'function': not all control paths return a value */
+#pragma warning(error:4098) /* 'void' function returning a value */
+
+#pragma warning(disable:4244)	/* No possible loss of data warnings */
+#pragma warning(disable:4305)   /* No truncation from int to char warnings */
+
+#pragma warning(error:4819) /* The file contains a character that cannot be represented in the current code page */
+#endif                      /* __clang__ */
+
+/* work around Microsoft's premature attempt to deprecate the C-Library */
+#define _CRT_SECURE_NO_WARNINGS
+#define _CRT_NONSTDC_NO_WARNINGS

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@img/sharp-libvips-dev",
-  "version": "1.2.0-rc.1",
+  "version": "1.2.0-rc.2",
   "description": "Header files and C++ sources for libvips and dependencies required when compiling sharp from source",
   "author": "Lovell Fuller <npm@lovell.info>",
   "homepage": "https://sharp.pixelplumbing.com",