开源软件构建与测试

_service:tar_scm:pygobject3.spec Changed

_service Changed

_service:tar_scm:pygobject-3.42.1.tar.xz/.gitlab-ci.yml -> _service:tar_scm:pygobject-3.42.2.tar.xz/.gitlab-ci.yml Changed

_service:tar_scm:pygobject-3.42.1.tar.xz/.gitlab-ci/Dockerfile -> _service:tar_scm:pygobject-3.42.2.tar.xz/.gitlab-ci/Dockerfile Changed

_service:tar_scm:pygobject-3.42.1.tar.xz/NEWS -> _service:tar_scm:pygobject-3.42.2.tar.xz/NEWS Changed

_service:tar_scm:pygobject-3.42.1.tar.xz/PKG-INFO -> _service:tar_scm:pygobject-3.42.2.tar.xz/PKG-INFO Changed

_service:tar_scm:pygobject-3.42.1.tar.xz/PyGObject.egg-info/PKG-INFO -> _service:tar_scm:pygobject-3.42.2.tar.xz/PyGObject.egg-info/PKG-INFO Changed

_service:tar_scm:pygobject-3.42.1.tar.xz/PyGObject.egg-info/SOURCES.txt -> _service:tar_scm:pygobject-3.42.2.tar.xz/PyGObject.egg-info/SOURCES.txt Changed

_service:tar_scm:pygobject-3.42.1.tar.xz/gi/gimodule.c -> _service:tar_scm:pygobject-3.42.2.tar.xz/gi/gimodule.c Changed

@@ -1066,11 +1066,15 @@
 pygobject__g_instance_init(GTypeInstance   *instance,
                            gpointer         g_class)
 {
-    GObject *object = (GObject *) instance;
+    GObject *object;
     PyObject *wrapper, *result;
     PyGILState_STATE state;
     gboolean needs_init = FALSE;
 
+    g_return_if_fail(G_IS_OBJECT(instance));
+
+    object = (GObject *) instance;
+
     wrapper = g_object_get_qdata(object, pygobject_wrapper_key);
     if (wrapper == NULL) {
         wrapper = pygobject_init_wrapper_get();
@@ -1738,6 +1742,7 @@
     info->interface_init = (GInterfaceInitFunc) initialize_interface;
 
     pyg_register_interface_info (g_type, info);
+    g_free (info);
 
     Py_RETURN_NONE;
 }
@@ -2522,8 +2527,9 @@
     module = PyModule_Create(&__gimodule);
     PyObject *module_dict = PyModule_GetDict (module);
 
-#if PY_VERSION_HEX < 0x03090000
+#if PY_VERSION_HEX < 0x03090000 || defined(PYPY_VERSION)
     /* Deprecated since 3.9 */
+    /* Except in PyPy it's still not a no-op: https://foss.heptapod.net/pypy/pypy/-/issues/3691 */
 
     /* Always enable Python threads since we cannot predict which GI repositories
      * might accept Python callbacks run within non-Python threads or might trigger

_service:tar_scm:pygobject-3.42.1.tar.xz/gi/pygi-argument.c -> _service:tar_scm:pygobject-3.42.2.tar.xz/gi/pygi-argument.c Changed

_service:tar_scm:pygobject-3.42.1.tar.xz/gi/pygi-array.c -> _service:tar_scm:pygobject-3.42.2.tar.xz/gi/pygi-array.c Changed

@@ -545,10 +545,16 @@
         } else if (array_cache->is_zero_terminated) {
             if (arg->v_pointer == NULL) {
                 len = 0;
-            } else if (seq_cache->item_cache->type_tag == GI_TYPE_TAG_UINT8) {
+            } else if (array_cache->item_size == 1) {
                 len = strlen (arg->v_pointer);
-            } else {
+            } else if (array_cache->item_size == sizeof(gpointer)) {
                 len = g_strv_length ((gchar **)arg->v_pointer);
+            } else if (array_cache->item_size == sizeof(int)) {
+                for (len = 0; *(((int*)arg->v_pointer) + len); len++);
+            } else if (array_cache->item_size == sizeof(short)) {
+                for (len = 0; *(((short*)arg->v_pointer) + len); len++);
+            } else {
+                g_assert_not_reached ();
             }
         } else {
             GIArgument *len_arg = &state->argsarray_cache->len_arg_index.arg_value;
@@ -717,7 +723,16 @@
     if (array_cache->fixed_size >= 0) {
         len = array_cache->fixed_size;
     } else if (array_cache->is_zero_terminated) {
-        len = g_strv_length ((gchar **)data);
+        if (array_cache->item_size == sizeof(gpointer))
+            len = g_strv_length ((gchar **)data);
+        else if (array_cache->item_size == 1)
+            len = strlen ((gchar*)data);
+        else if (array_cache->item_size == sizeof(int))
+            for (len = 0; *(((int*)data) + len); len++);
+        else if (array_cache->item_size == sizeof(short))
+            for (len = 0; *(((short*)data) + len); len++);
+        else
+            g_assert_not_reached ();
     } else if (array_cache->len_arg_index >= 0) {
         GIArgument *len_arg = &state->argsarray_cache->len_arg_index.arg_value;
         len = len_arg->v_long;

_service:tar_scm:pygobject-3.42.1.tar.xz/gi/pygi-hashtable.c -> _service:tar_scm:pygobject-3.42.2.tar.xz/gi/pygi-hashtable.c Changed

_service:tar_scm:pygobject-3.42.1.tar.xz/gi/pygi-object.c -> _service:tar_scm:pygobject-3.42.2.tar.xz/gi/pygi-object.c Changed

_service:tar_scm:pygobject-3.42.1.tar.xz/gi/pyginterface.c -> _service:tar_scm:pygobject-3.42.2.tar.xz/gi/pyginterface.c Changed

_service:tar_scm:pygobject-3.42.1.tar.xz/meson.build -> _service:tar_scm:pygobject-3.42.2.tar.xz/meson.build Changed

_service:tar_scm:pygobject-3.42.1.tar.xz/pyproject.toml -> _service:tar_scm:pygobject-3.42.2.tar.xz/pyproject.toml Changed

_service:tar_scm:pygobject-3.42.1.tar.xz/setup.py -> _service:tar_scm:pygobject-3.42.2.tar.xz/setup.py Changed

@@ -22,7 +22,6 @@
 import errno
 import subprocess
 import tarfile
-import sysconfig
 import tempfile
 import posixpath
 
@@ -37,7 +36,7 @@
 from distutils.spawn import find_executable
 
 
-PYGOBJECT_VERSION = "3.42.1"
+PYGOBJECT_VERSION = "3.42.2"
 GLIB_VERSION_REQUIRED = "2.56.0"
 GI_VERSION_REQUIRED = "1.56.0"
 PYCAIRO_VERSION_REQUIRED = "1.16.0"
@@ -827,7 +826,9 @@
 
     pkg_config_name = "py3cairo"
     min_version = get_version_requirement(pkg_config_name)
-    min_version_info = tuple(int(p) for p in min_version.split("."))
+
+    def parse_version(string):
+        return tuple(int(p) for p in string.split("."))
 
     def check_path(include_dir):
         log.info("pycairo: trying include directory: %r" % include_dir)
@@ -843,61 +844,44 @@
             if check_path(p):
                 return p
 
-    def find_new_api():
-        log.info("pycairo: new API")
-        import cairo
-
-        if cairo.version_info < min_version_info:
-            raise DistutilsSetupError(
-                "pycairo >= %s required, %s found." % (
-                    min_version, ".".join(map(str, cairo.version_info))))
-
-        if hasattr(cairo, "get_include"):
-            return cairo.get_include()
-        log.info("pycairo: no get_include()")
-        return 
-
-    def find_old_api():
-        log.info("pycairo: old API")
-
-        import cairo
+    def find_python():
+        """This tries to find the pycairo module without importing it"""
 
-        if cairo.version_info < min_version_info:
-            raise DistutilsSetupError(
-                "pycairo >= %s required, %s found." % (
-                    min_version, ".".join(map(str, cairo.version_info))))
+        from importlib.util import find_spec
 
-        location = os.path.dirname(os.path.abspath(cairo.__path__0))
-        log.info("pycairo: found %r" % location)
+        # Find the module path
+        spec = find_spec("cairo")
+        if spec is None:
+            log.info("pycairo: cairo module not found via importlib")
+            return 
+        package_path = os.path.dirname(spec.origin)
 
-        def get_sys_path(location, name):
-            # Returns the sysconfig path for a distribution, or None
-            for scheme in sysconfig.get_scheme_names():
-                for path_type in "platlib", "purelib":
-                    path = sysconfig.get_path(path_type, scheme)
-                    try:
-                        if os.path.samefile(path, location):
-                            return sysconfig.get_path(name, scheme)
-                    except EnvironmentError:
-                        pass
+        # With Python 3.8 we can also check the package version
+        try:
+            from importlib.metadata import distribution, PackageNotFoundError
+        except ImportError:
+            # Python <3.8
+            pass
+        else:
+            try:
+                d = distribution("pycairo")
+            except PackageNotFoundError:
+                log.info("pycairo: pycairo distribution not found via importlib")
+            else:
+                if parse_version(d.version) < parse_version(min_version):
+                    raise DistutilsSetupError(
+                        "pycairo >= %s required, %s found (%s)." % (
+                            min_version, d.version, package_path))
 
-        data_path = get_sys_path(location, "data") or sys.prefix
-        return os.path.join(data_path, "include", "pycairo")
+        return os.path.join(package_path, 'include')
 
     def find_pkg_config():
         log.info("pycairo: pkg-config")
         pkg_config_version_check(pkg_config_name, min_version)
         return pkg_config_parse("--cflags-only-I", pkg_config_name)
 
-    # First the new get_include() API added in >1.15.6
-    include_dir = find_path(find_new_api())
-    if include_dir is not None:
-        return include_dir
-
-    # Then try to find it in the data prefix based on the module path.
-    # This works with many virtualenv/userdir setups, but not all apparently,
-    # see https://gitlab.gnome.org/GNOME/pygobject/issues/150
-    include_dir = find_path(find_old_api())
+    # First look in the current Python installation/venv
+    include_dir = find_path(find_python())
     if include_dir is not None:
         return include_dir
 
@@ -1034,6 +1018,11 @@
 /* Configuration header created by setup.py - do not edit */
 #ifndef _CONFIG_H
 #define _CONFIG_H 1
+#include <glib.h>
+
+#if !GLIB_CHECK_VERSION(2, 67, 4)
+#define g_memdup2(ptr,sz) (G_LIKELY(((guint64)(sz)) < G_MAXUINT)) ? g_memdup(ptr,sz) : (g_abort(),NULL)
+#endif
 
 #define PYGOBJECT_MAJOR_VERSION %(PYGOBJECT_MAJOR_VERSION)s
 #define PYGOBJECT_MINOR_VERSION %(PYGOBJECT_MINOR_VERSION)s

_service:tar_scm:pygobject-3.42.1.tar.xz/subprojects/gobject-introspection.wrap -> _service:tar_scm:pygobject-3.42.2.tar.xz/subprojects/gobject-introspection.wrap Changed

_service:tar_scm:pygobject-3.42.1.tar.xz/tests/__init__.py -> _service:tar_scm:pygobject-3.42.2.tar.xz/tests/__init__.py Changed

_service:tar_scm:pygobject-3.42.1.tar.xz/tests/test_gi.py -> _service:tar_scm:pygobject-3.42.2.tar.xz/tests/test_gi.py Changed

_service:tar_scm:pygobject-3.42.2.tar.xz/tests/test_gtype_instance.py Added

Changes of Revision 2