commit python-qt5-sip for openSUSE:Factory

29 Sep 2023

Script 'mail_helper' called by obssrc
Hello community,

here is the log from the commit of package python-qt5-sip for openSUSE:Factory checked in at 2023-09-29 21:13:04
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/python-qt5-sip (Old)
 and      /work/SRC/openSUSE:Factory/.python-qt5-sip.new.28202 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Package is "python-qt5-sip"

Fri Sep 29 21:13:04 2023 rev:10 rq:1114146 version:12.12.2

Changes:
--------

--- /work/SRC/openSUSE:Factory/python-qt5-sip/python-qt5-sip.changes	2023-06-12 15:25:23.830677772 +0200
+++ /work/SRC/openSUSE:Factory/.python-qt5-sip.new.28202/python-qt5-sip.changes	2023-09-29 21:13:47.622224582 +0200
@@ -1,0 +2,6 @@
+Wed Sep 27 09:04:14 UTC 2023 - Ben Greiner <code@bnavigator.de>
+
+- Update to ABI version 12.12.2
+  * Match python-sip6-devel 6.7.10+
+
+-------------------------------------------------------------------

Old:
----
  PyQt5_sip-12.12.1.tar.gz

New:
----
  PyQt5_sip-12.12.2.tar.gz

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Other differences:
------------------
++++++ python-qt5-sip.spec ++++++
--- /var/tmp/diff_new_pack.vYRyZN/_old	2023-09-29 21:13:48.754265426 +0200
+++ /var/tmp/diff_new_pack.vYRyZN/_new	2023-09-29 21:13:48.754265426 +0200
@@ -18,7 +18,7 @@
 
 %{?sle15_python_module_pythons}
 Name:           python-qt5-sip
-Version:        12.12.1
+Version:        12.12.2
 Release:        0
 License:        GPL-2.0-only OR GPL-3.0-only OR SUSE-SIP
 Summary:        The sip module support for PyQt5

++++++ PyQt5_sip-12.12.1.tar.gz -> PyQt5_sip-12.12.2.tar.gz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/PyQt5_sip-12.12.1/PKG-INFO new/PyQt5_sip-12.12.2/PKG-INFO
--- old/PyQt5_sip-12.12.1/PKG-INFO	2023-04-13 16:58:32.572300700 +0200
+++ new/PyQt5_sip-12.12.2/PKG-INFO	2023-07-21 18:44:06.817100000 +0200
@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: PyQt5_sip
-Version: 12.12.1
+Version: 12.12.2
 Summary: The sip module support for PyQt5
 Home-page: https://www.riverbankcomputing.com/software/sip/
 Author: Riverbank Computing Limited
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/PyQt5_sip-12.12.1/PyQt5_sip.egg-info/PKG-INFO new/PyQt5_sip-12.12.2/PyQt5_sip.egg-info/PKG-INFO
--- old/PyQt5_sip-12.12.1/PyQt5_sip.egg-info/PKG-INFO	2023-04-13 16:58:32.000000000 +0200
+++ new/PyQt5_sip-12.12.2/PyQt5_sip.egg-info/PKG-INFO	2023-07-21 18:44:06.000000000 +0200
@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: PyQt5-sip
-Version: 12.12.1
+Version: 12.12.2
 Summary: The sip module support for PyQt5
 Home-page: https://www.riverbankcomputing.com/software/sip/
 Author: Riverbank Computing Limited
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/PyQt5_sip-12.12.1/setup.py new/PyQt5_sip-12.12.2/setup.py
--- old/PyQt5_sip-12.12.1/setup.py	2023-04-13 16:58:32.000000000 +0200
+++ new/PyQt5_sip-12.12.2/setup.py	2023-07-21 18:44:06.000000000 +0200
@@ -38,7 +38,7 @@
 # Do the setup.
 setup(
         name='PyQt5_sip',
-        version='12.12.1',
+        version='12.12.2',
         license='SIP',
         python_requires='>=3.7',
         ext_modules=[module]
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/PyQt5_sip-12.12.1/sip.h new/PyQt5_sip-12.12.2/sip.h
--- old/PyQt5_sip-12.12.1/sip.h	2023-04-13 16:58:32.000000000 +0200
+++ new/PyQt5_sip-12.12.2/sip.h	2023-07-21 18:44:06.000000000 +0200
@@ -46,7 +46,7 @@
 /* The version of the ABI. */
 #define SIP_ABI_MAJOR_VERSION       12
 #define SIP_ABI_MINOR_VERSION       12
-#define SIP_MODULE_PATCH_VERSION    1
+#define SIP_MODULE_PATCH_VERSION    2
 
 
 /*
@@ -73,8 +73,8 @@
 
 
 /* The version of the code generator. */
-#define SIP_VERSION                 0x60709
-#define SIP_VERSION_STR             "6.7.9"
+#define SIP_VERSION                 0x6070a
+#define SIP_VERSION_STR             "6.7.10"
 
 /* These are all dependent on the user-specified name of the sip module. */
 #define _SIP_MODULE_FQ_NAME         "PyQt5.sip"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/PyQt5_sip-12.12.1/sip_array.c new/PyQt5_sip-12.12.2/sip_array.c
--- old/PyQt5_sip-12.12.1/sip_array.c	2023-04-13 16:58:32.000000000 +0200
+++ new/PyQt5_sip-12.12.2/sip_array.c	2023-07-21 18:44:06.000000000 +0200
@@ -1,7 +1,7 @@
 /*
  * This file implements the API for the array type.
  *
- * Copyright (c) 2022 Riverbank Computing Limited <info@riverbankcomputing.com>
+ * Copyright (c) 2023 Riverbank Computing Limited <info@riverbankcomputing.com>
  *
  * This file is part of SIP.
  *
@@ -283,6 +283,8 @@
 static int sipArray_getbuffer(PyObject *self, Py_buffer *view, int flags)
 {
     sipArrayObject *array = (sipArrayObject *)self;
+    const char *format;
+    Py_ssize_t itemsize;
 
     if (view == NULL)
         return 0;
@@ -296,23 +298,28 @@
     view->obj = self;
     Py_INCREF(self);
 
+    /*
+     * If there is no format, ie. it is a wrapped type, then present it as
+     * bytes.
+     */
+    if ((format = array->format) == NULL)
+    {
+        format = "B";
+        itemsize = sizeof (unsigned char);
+    }
+    else
+    {
+        itemsize = array->stride;
+    }
+
     view->buf = array->data;
     view->len = array->len * array->stride;
     view->readonly = (array->flags & SIP_READ_ONLY);
-    view->itemsize = array->stride;
+    view->itemsize = itemsize;
 
     view->format = NULL;
     if ((flags & PyBUF_FORMAT) == PyBUF_FORMAT)
-    {
-        if (array->format == NULL)
-        {
-            PyErr_SetString(PyExc_BufferError,
-                    "format has not been specified");
-            return -1;
-        }
-
-        view->format = (char *)array->format;
-    }
+        view->format = format;
 
     view->ndim = 1;
 
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/PyQt5_sip-12.12.1/siplib.c new/PyQt5_sip-12.12.2/siplib.c
--- old/PyQt5_sip-12.12.1/siplib.c	2023-04-13 16:58:32.000000000 +0200
+++ new/PyQt5_sip-12.12.2/siplib.c	2023-07-21 18:44:06.000000000 +0200
@@ -2147,7 +2147,7 @@
 {
     void *mem;
 
-    if ((mem = PyMem_Malloc(nbytes)) == NULL)
+    if ((mem = PyMem_RawMalloc(nbytes)) == NULL)
         PyErr_NoMemory();
 
     return mem;
@@ -2159,7 +2159,7 @@
  */
 void sip_api_free(void *mem)
 {
-    PyMem_Free(mem);
+    PyMem_RawFree(mem);
 }
 
 
@@ -12597,7 +12597,11 @@
  */
 static PyObject *sip_api_py_type_dict(const PyTypeObject *py_type)
 {
+#if PY_VERSION_HEX >= 0x030c0000
+    return PyType_GetDict(py_type);
+#else
     return py_type->tp_dict;
+#endif
 }
 
 

++++++ support-python3.6.patch ++++++
--- /var/tmp/diff_new_pack.vYRyZN/_old	2023-09-29 21:13:48.910271054 +0200
+++ /var/tmp/diff_new_pack.vYRyZN/_new	2023-09-29 21:13:48.914271199 +0200
@@ -1,19 +1,19 @@
-Index: PyQt5_sip-12.12.1/setup.py
+Index: PyQt5_sip-12.12.2/setup.py
 ===================================================================
---- PyQt5_sip-12.12.1.orig/setup.py
-+++ PyQt5_sip-12.12.1/setup.py
+--- PyQt5_sip-12.12.2.orig/setup.py
++++ PyQt5_sip-12.12.2/setup.py
 @@ -40,6 +40,6 @@ setup(
          name='PyQt5_sip',
-         version='12.12.1',
+         version='12.12.2',
          license='SIP',
 -        python_requires='>=3.7',
 +        python_requires='>=3.6',
          ext_modules=[module]
       )
-Index: PyQt5_sip-12.12.1/sip.h
+Index: PyQt5_sip-12.12.2/sip.h
 ===================================================================
---- PyQt5_sip-12.12.1.orig/sip.h
-+++ PyQt5_sip-12.12.1/sip.h
+--- PyQt5_sip-12.12.2.orig/sip.h
++++ PyQt5_sip-12.12.2/sip.h
 @@ -24,8 +24,8 @@
  #include <Python.h>
  
@@ -25,10 +25,10 @@
  #endif
  
  
-Index: PyQt5_sip-12.12.1/siplib.c
+Index: PyQt5_sip-12.12.2/siplib.c
 ===================================================================
---- PyQt5_sip-12.12.1.orig/siplib.c
-+++ PyQt5_sip-12.12.1/siplib.c
+--- PyQt5_sip-12.12.2.orig/siplib.c
++++ PyQt5_sip-12.12.2/siplib.c
 @@ -1041,6 +1041,10 @@ const sipAPIDef *sip_init_library(PyObje
      PyObject *obj;
      PyMethodDef *md;
@@ -40,7 +40,7 @@
      /* Add the SIP version number. */
      obj = PyLong_FromLong(SIP_VERSION);
  
-@@ -13303,12 +13307,16 @@ int sip_api_convert_from_slice_object(Py
+@@ -13307,12 +13311,16 @@ int sip_api_convert_from_slice_object(Py
          Py_ssize_t *start, Py_ssize_t *stop, Py_ssize_t *step,
          Py_ssize_t *slicelength)
  {
@@ -57,10 +57,10 @@
  }
  
  
-Index: PyQt5_sip-12.12.1/PKG-INFO
+Index: PyQt5_sip-12.12.2/PKG-INFO
 ===================================================================
---- PyQt5_sip-12.12.1.orig/PKG-INFO
-+++ PyQt5_sip-12.12.1/PKG-INFO
+--- PyQt5_sip-12.12.2.orig/PKG-INFO
++++ PyQt5_sip-12.12.2/PKG-INFO
 @@ -9,7 +9,7 @@ License: SIP
  Platform: X11
  Platform: macOS
@@ -70,10 +70,10 @@
  License-File: LICENSE
  License-File: LICENSE-GPL3
  License-File: LICENSE-GPL2
-Index: PyQt5_sip-12.12.1/PyQt5_sip.egg-info/PKG-INFO
+Index: PyQt5_sip-12.12.2/PyQt5_sip.egg-info/PKG-INFO
 ===================================================================
---- PyQt5_sip-12.12.1.orig/PyQt5_sip.egg-info/PKG-INFO
-+++ PyQt5_sip-12.12.1/PyQt5_sip.egg-info/PKG-INFO
+--- PyQt5_sip-12.12.2.orig/PyQt5_sip.egg-info/PKG-INFO
++++ PyQt5_sip-12.12.2/PyQt5_sip.egg-info/PKG-INFO
 @@ -9,7 +9,7 @@ License: SIP
  Platform: X11
  Platform: macOS

    

commit python-qt5-sip for openSUSE:Factory

Source-Sync