Imported Upstream version 3.30.1

diff --git a/NEWS b/NEWS
index 2b62f00..00a08bb 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,12 @@
+3.30.1 - 2018-09-14
+-------------------
+
+* Fix various crashes on big endian systems.
+  :issue:`247` (:user:`Dan Horák <sharkcz>`)
+* meson: Don't link against libpython on non-Windows systems.
+  :issue:`253` :mr:`84`
+
+
 3.30.0 - 2018-08-31
 -------------------
 

diff --git a/PKG-INFO b/PKG-INFO
index 6f76658..8c50c5e 100644 (file)
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,6 +1,6 @@
 Metadata-Version: 1.2
 Name: PyGObject
-Version: 3.30.0
+Version: 3.30.1
 Summary: Python bindings for GObject Introspection
 Home-page: https://pygobject.readthedocs.io
 Author: James Henstridge

diff --git a/PyGObject.egg-info/PKG-INFO b/PyGObject.egg-info/PKG-INFO
index 6f76658..8c50c5e 100644 (file)
--- a/PyGObject.egg-info/PKG-INFO
+++ b/PyGObject.egg-info/PKG-INFO
@@ -1,6 +1,6 @@
 Metadata-Version: 1.2
 Name: PyGObject
-Version: 3.30.0
+Version: 3.30.1
 Summary: Python bindings for GObject Introspection
 Home-page: https://pygobject.readthedocs.io
 Author: James Henstridge

diff --git a/gi/meson.build b/gi/meson.build
index ded10ac..c1afd68 100644 (file)
--- a/gi/meson.build
+++ b/gi/meson.build
@@ -65,8 +65,15 @@ python.install_sources(python_sources,
   subdir : 'gi'
 )
 
+# https://github.com/mesonbuild/meson/issues/4117
+if host_machine.system() == 'windows'
+  python_ext_dep = python_dep
+else
+  python_ext_dep = python_dep.partial_dependency(compile_args: true)
+endif
+
 giext = python.extension_module('_gi', sources,
-  dependencies : [python_dep, glib_dep, gi_dep, ffi_dep],
+  dependencies : [python_ext_dep, glib_dep, gi_dep, ffi_dep],
   include_directories: include_directories('..'),
   install: true,
   subdir : 'gi',
@@ -75,7 +82,7 @@ giext = python.extension_module('_gi', sources,
 
 if with_pycairo
   gicairoext = python.extension_module('_gi_cairo', ['pygi-foreign-cairo.c'],
-    dependencies : [python_dep, glib_dep, gi_dep, ffi_dep, pycairo_dep, cairo_dep, cairo_gobject_dep],
+    dependencies : [python_ext_dep, glib_dep, gi_dep, ffi_dep, pycairo_dep, cairo_dep, cairo_gobject_dep],
     install: true,
     subdir : 'gi',
     c_args: pyext_c_args + main_c_args)

diff --git a/gi/pygi-closure.c b/gi/pygi-closure.c
index d878876..3299d1b 100644 (file)
--- a/gi/pygi-closure.c
+++ b/gi/pygi-closure.c
@@ -52,31 +52,31 @@ _pygi_closure_assign_pyobj_to_retval (gpointer retval,
 
     switch (arg_cache->type_tag) {
         case GI_TYPE_TAG_BOOLEAN:
-           *((gboolean *) retval) = arg->v_boolean;
+           *((ffi_sarg *) retval) = arg->v_boolean;
            break;
         case GI_TYPE_TAG_INT8:
-           *((gint8 *) retval) = arg->v_int8;
+           *((ffi_sarg *) retval) = arg->v_int8;
            break;
         case GI_TYPE_TAG_UINT8:
-           *((guint8 *) retval) = arg->v_uint8;
+           *((ffi_arg *) retval) = arg->v_uint8;
            break;
         case GI_TYPE_TAG_INT16:
-           *((gint16 *) retval) = arg->v_int16;
+           *((ffi_sarg *) retval) = arg->v_int16;
            break;
         case GI_TYPE_TAG_UINT16:
-           *((guint16 *) retval) = arg->v_uint16;
+           *((ffi_arg *) retval) = arg->v_uint16;
            break;
         case GI_TYPE_TAG_INT32:
-           *((gint32 *) retval) = arg->v_int32;
+           *((ffi_sarg *) retval) = arg->v_int32;
            break;
         case GI_TYPE_TAG_UINT32:
-           *((guint32 *) retval) = arg->v_uint32;
+           *((ffi_arg *) retval) = arg->v_uint32;
            break;
         case GI_TYPE_TAG_INT64:
-           *((gint64 *) retval) = arg->v_int64;
+           *((ffi_sarg *) retval) = arg->v_int64;
            break;
         case GI_TYPE_TAG_UINT64:
-           *((guint64 *) retval) = arg->v_uint64;
+           *((ffi_arg *) retval) = arg->v_uint64;
            break;
         case GI_TYPE_TAG_FLOAT:
            *((gfloat *) retval) = arg->v_float;
@@ -85,10 +85,10 @@ _pygi_closure_assign_pyobj_to_retval (gpointer retval,
            *((gdouble *) retval) = arg->v_double;
            break;
         case GI_TYPE_TAG_GTYPE:
-           *((gsize *) retval) = arg->v_size;
+           *((ffi_arg *) retval) = arg->v_size;
            break;
         case GI_TYPE_TAG_UNICHAR:
-            *((guint32 *) retval) = arg->v_uint32;
+            *((ffi_arg *) retval) = arg->v_uint32;
             break;
         case GI_TYPE_TAG_INTERFACE:
             {
@@ -98,20 +98,20 @@ _pygi_closure_assign_pyobj_to_retval (gpointer retval,
 
                 switch (g_base_info_get_type (interface_info)) {
                 case GI_INFO_TYPE_ENUM:
-                    *(gint *) retval = arg->v_int;
+                    *(ffi_sarg *) retval = arg->v_int;
                     break;
                 case GI_INFO_TYPE_FLAGS:
-                    *(guint *) retval = arg->v_uint;
+                    *(ffi_arg *) retval = arg->v_uint;
                     break;
                 default:
-                    *(gpointer *) retval = arg->v_pointer;
+                    *(ffi_arg *) retval = arg->v_pointer;
                     break;
                 }
 
                 break;
             }
         default:
-            *(gpointer *) retval = arg->v_pointer;
+            *(ffi_arg *) retval = arg->v_pointer;
             break;
       }
 }

diff --git a/meson.build b/meson.build
index ba88913..b2af788 100644 (file)
--- a/meson.build
+++ b/meson.build
@@ -1,5 +1,5 @@
 project('pygobject', 'c',
-  version : '3.30.0',
+  version : '3.30.1',
   meson_version : '>= 0.46.0',
   default_options : [ 'warning_level=1',
                       'buildtype=debugoptimized'])
@@ -90,7 +90,6 @@ main_c_args = [
   '-Wundef',
   '-Wunused-but-set-variable',
   '-Wwrite-strings',
-  '-Wconversion',
 ]
 
 main_c_args += [
@@ -100,6 +99,7 @@ main_c_args += [
   '-Wno-discarded-qualifiers',
   '-Wno-sign-conversion',
   '-Wno-cast-function-type',
+  '-Wno-int-conversion',
 ]
 
 main_c_args += [

diff --git a/setup.py b/setup.py
index 752ccc7..4640979 100755 (executable)
--- a/setup.py
+++ b/setup.py
@@ -39,7 +39,7 @@ from distutils import dir_util, log
 from distutils.spawn import find_executable
 
 
-PYGOBJECT_VERISON = "3.30.0"
+PYGOBJECT_VERISON = "3.30.1"
 GLIB_VERSION_REQUIRED = "2.38.0"
 GI_VERSION_REQUIRED = "1.46.0"
 PYCAIRO_VERSION_REQUIRED = "1.11.1"
@@ -914,7 +914,6 @@ def add_ext_compiler_flags(ext, compiler, _cache={}):
             "-Wundef",
             "-Wunused-but-set-variable",
             "-Wwrite-strings",
-            "-Wconversion",
         ]
 
         if sys.version_info[:2] != (3, 4):
@@ -929,6 +928,7 @@ def add_ext_compiler_flags(ext, compiler, _cache={}):
             "-Wno-discarded-qualifiers",
             "-Wno-sign-conversion",
             "-Wno-cast-function-type",
+            "-Wno-int-conversion",
         ]
 
         # silence clang for unused gcc CFLAGS added by Debian