pygobject.diff (5048B)
1 diff -Nru pygobject-3.26.1/debian/changelog pygobject-3.26.1/debian/changelog 2 --- pygobject-3.26.1/debian/changelog 2019-01-29 21:46:03.000000000 +0900 3 +++ pygobject-3.26.1/debian/changelog 2023-12-08 09:22:32.000000000 +0900 4 @@ -1,3 +1,9 @@ 5 +pygobject (3.26.1-2ubuntu1.ub18moz1) bionic; urgency=medium 6 + 7 + * Backport fix for python 3.8 support. 8 + 9 + -- Mike Hommey <mhommey@mozilla.com> Fri, 08 Dec 2023 09:22:32 +0900 10 + 11 pygobject (3.26.1-2ubuntu1) bionic; urgency=medium 12 13 * Update Vcs fields for ubuntu/bionic branch 14 diff -Nru pygobject-3.26.1/debian/patches/python3.8.patch pygobject-3.26.1/debian/patches/python3.8.patch 15 --- pygobject-3.26.1/debian/patches/python3.8.patch 1970-01-01 09:00:00.000000000 +0900 16 +++ pygobject-3.26.1/debian/patches/python3.8.patch 2023-12-08 09:22:32.000000000 +0900 17 @@ -0,0 +1,94 @@ 18 +Description: Backport fix for python 3.8 support 19 + 20 +Original upstream patch: 21 +https://gitlab.gnome.org/GNOME/pygobject/-/commit/bfc759c9c0bb 22 + 23 +Original backport to 3.28: 24 +https://svnweb.freebsd.org/ports/head/devel/pygobject3-common/files/patch-python38?view=markup&pathrev=537996 25 + 26 +--- pygobject-3.26.1.orig/gi/gimodule.c 27 ++++ pygobject-3.26.1/gi/gimodule.c 28 +@@ -689,7 +689,10 @@ PYGLIB_MODULE_START(_gi, "_gi") 29 + pygi_error_register_types (module); 30 + _pygi_repository_register_types (module); 31 + _pygi_info_register_types (module); 32 ++ pygobject_type_register_types (module_dict); 33 ++ pygobject_pointer_register_types (module_dict); 34 + _pygi_struct_register_types (module); 35 ++ pygobject_boxed_register_types (module_dict); 36 + _pygi_boxed_register_types (module); 37 + _pygi_ccallback_register_types (module); 38 + pygi_resulttuple_register_types (module); 39 +@@ -703,12 +706,9 @@ PYGLIB_MODULE_START(_gi, "_gi") 40 + pygobject_register_features (module_dict); 41 + pygobject_register_version_tuples (module_dict); 42 + pygobject_register_warnings (module_dict); 43 +- pygobject_type_register_types (module_dict); 44 + pygobject_object_register_types (module_dict); 45 + pygobject_interface_register_types (module_dict); 46 + pygobject_paramspec_register_types (module_dict); 47 +- pygobject_boxed_register_types (module_dict); 48 +- pygobject_pointer_register_types (module_dict); 49 + pygobject_enum_register_types (module_dict); 50 + pygobject_flags_register_types (module_dict); 51 + 52 +--- pygobject-3.26.1.orig/gi/pygboxed.c 53 ++++ pygobject-3.26.1/gi/pygboxed.c 54 +@@ -162,6 +162,7 @@ pyg_register_boxed(PyObject *dict, const 55 + if (!type->tp_dealloc) type->tp_dealloc = (destructor)pyg_boxed_dealloc; 56 + 57 + Py_TYPE(type) = &PyType_Type; 58 ++ g_assert (Py_TYPE (&PyGBoxed_Type) != NULL); 59 + type->tp_base = &PyGBoxed_Type; 60 + 61 + if (PyType_Ready(type) < 0) { 62 +--- pygobject-3.26.1.orig/gi/pygi-boxed.c 63 ++++ pygobject-3.26.1/gi/pygi-boxed.c 64 +@@ -242,6 +242,7 @@ void 65 + _pygi_boxed_register_types (PyObject *m) 66 + { 67 + Py_TYPE(&PyGIBoxed_Type) = &PyType_Type; 68 ++ g_assert (Py_TYPE (&PyGBoxed_Type) != NULL); 69 + PyGIBoxed_Type.tp_base = &PyGBoxed_Type; 70 + PyGIBoxed_Type.tp_new = (newfunc) _boxed_new; 71 + PyGIBoxed_Type.tp_init = (initproc) _boxed_init; 72 +--- pygobject-3.26.1.orig/gi/pygi-struct.c 73 ++++ pygobject-3.26.1/gi/pygi-struct.c 74 +@@ -221,6 +221,7 @@ void 75 + _pygi_struct_register_types (PyObject *m) 76 + { 77 + Py_TYPE(&PyGIStruct_Type) = &PyType_Type; 78 ++ g_assert (Py_TYPE (&PyGPointer_Type) != NULL); 79 + PyGIStruct_Type.tp_base = &PyGPointer_Type; 80 + PyGIStruct_Type.tp_new = (newfunc) _struct_new; 81 + PyGIStruct_Type.tp_init = (initproc) _struct_init; 82 +--- pygobject-3.26.1.orig/gi/pyginterface.c 83 ++++ pygobject-3.26.1/gi/pyginterface.c 84 +@@ -72,6 +72,7 @@ pyg_register_interface(PyObject *dict, c 85 + PyObject *o; 86 + 87 + Py_TYPE(type) = &PyType_Type; 88 ++ g_assert (Py_TYPE (&PyGInterface_Type) != NULL); 89 + type->tp_base = &PyGInterface_Type; 90 + 91 + if (PyType_Ready(type) < 0) { 92 +--- pygobject-3.26.1.orig/gi/pygpointer.c 93 ++++ pygobject-3.26.1/gi/pygpointer.c 94 +@@ -117,6 +117,7 @@ pyg_register_pointer(PyObject *dict, con 95 + if (!type->tp_dealloc) type->tp_dealloc = (destructor)pyg_pointer_dealloc; 96 + 97 + Py_TYPE(type) = &PyType_Type; 98 ++ g_assert (Py_TYPE (&PyGPointer_Type) != NULL); 99 + type->tp_base = &PyGPointer_Type; 100 + 101 + if (PyType_Ready(type) < 0) { 102 +--- pygobject-3.26.1.orig/gi/pygtype.c 103 ++++ pygobject-3.26.1/gi/pygtype.c 104 +@@ -345,6 +345,7 @@ pyg_type_wrapper_new(GType type) 105 + { 106 + PyGTypeWrapper *self; 107 + 108 ++ g_assert (Py_TYPE (&PyGTypeWrapper_Type) != NULL); 109 + self = (PyGTypeWrapper *)PyObject_NEW(PyGTypeWrapper, 110 + &PyGTypeWrapper_Type); 111 + if (self == NULL) 112 diff -Nru pygobject-3.26.1/debian/patches/series pygobject-3.26.1/debian/patches/series 113 --- pygobject-3.26.1/debian/patches/series 2019-01-29 21:46:03.000000000 +0900 114 +++ pygobject-3.26.1/debian/patches/series 2023-12-08 09:22:20.000000000 +0900 115 @@ -1 +1,2 @@ 116 fix-tests-with-newest-glib.patch 117 +python3.8.patch