Index: devel/pygobject3-common/Makefile =================================================================== --- devel/pygobject3-common/Makefile (revision 555784) +++ devel/pygobject3-common/Makefile (working copy) @@ -2,8 +2,7 @@ # $FreeBSD$ PORTNAME= gobject -PORTVERSION= 3.28.3 -PORTREVISION= 3 +PORTVERSION= 3.38.0 CATEGORIES= devel python MASTER_SITES= GNOME/sources/pygobject/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/} PKGNAMEPREFIX?= py @@ -19,8 +18,7 @@ SLAVE_PORT?= no -USES= gmake libtool pathfix pkgconfig tar:xz -GNU_CONFIGURE= yes +USES= libtool meson pathfix pkgconfig tar:xz INSTALL_TARGET= install-strip # this port doesn't work with py-gobject < 2.28.6_2, clungle below @@ -33,6 +31,9 @@ # Override PYTHON_VERSION from DEPENDS_ARGS MAKE_ARGS= PYTHON_VERSION=${PYTHON_VER} +post-patch: + @${REINPLACE_CMD} "s|find_installation(get_option('python')|find_installation('python${PYTHON_VER}'|" ${WRKSRC}/meson.build + .if ${SLAVE_PORT} == no PORTSCOUT?= limitw:1,even @@ -45,8 +46,6 @@ @${MKDIR} ${STAGEDIR}${PREFIX}/include/pygobject-3.0/ ${INSTALL_DATA} ${WRKSRC}/gi/pygobject.h \ ${STAGEDIR}${PREFIX}/include/pygobject-3.0/pygobject.h - ${INSTALL_DATA} ${WRKSRC}/pygobject-3.0.pc \ - ${STAGEDIR}${PREFIX}/libdata/pkgconfig/pygobject-3.0.pc .else PORTSCOUT= ignore:1 @@ -63,8 +62,7 @@ .endif post-install: - @${RM} -r ${STAGEDIR}${PREFIX}/include/pygobject-3.0 \ - ${STAGEDIR}${PREFIX}/libdata/pkgconfig/pygobject-3.0.pc + @${RM} -r ${STAGEDIR}${PREFIX}/include/pygobject-3.0 .endif .include Index: devel/pygobject3-common/distinfo =================================================================== --- devel/pygobject3-common/distinfo (revision 555784) +++ devel/pygobject3-common/distinfo (working copy) @@ -1,3 +1,3 @@ -TIMESTAMP = 1527917161 -SHA256 (gnome/pygobject-3.28.3.tar.xz) = 3dd3e21015d06e00482ea665fc1733b77e754a6ab656a5db5d7f7bfaf31ad0b0 -SIZE (gnome/pygobject-3.28.3.tar.xz) = 1005368 +TIMESTAMP = 1605995433 +SHA256 (gnome/pygobject-3.38.0.tar.xz) = 0372d1bb9122fc19f500a249b1f38c2bb67485000f5887497b4b205b3e7084d5 +SIZE (gnome/pygobject-3.38.0.tar.xz) = 553892 Index: devel/pygobject3-common/files/patch-python38 =================================================================== --- devel/pygobject3-common/files/patch-python38 (revision 555784) +++ devel/pygobject3-common/files/patch-python38 (nonexistent) @@ -1,88 +0,0 @@ -https://gitlab.gnome.org/GNOME/pygobject/-/commit/bfc759c9c0bb - ---- gi/gimodule.c.orig 2018-05-31 14:39:04 UTC -+++ gi/gimodule.c -@@ -685,7 +685,10 @@ PYGLIB_MODULE_START(_gi, "_gi") - pygi_error_register_types (module); - _pygi_repository_register_types (module); - _pygi_info_register_types (module); -+ pygobject_type_register_types (module_dict); -+ pygobject_pointer_register_types (module_dict); - _pygi_struct_register_types (module); -+ pygobject_boxed_register_types (module_dict); - _pygi_boxed_register_types (module); - _pygi_ccallback_register_types (module); - pygi_resulttuple_register_types (module); -@@ -699,12 +702,9 @@ PYGLIB_MODULE_START(_gi, "_gi") - pygobject_register_features (module_dict); - pygobject_register_version_tuples (module_dict); - pygobject_register_warnings (module_dict); -- pygobject_type_register_types (module_dict); - pygobject_object_register_types (module_dict); - pygobject_interface_register_types (module_dict); - pygobject_paramspec_register_types (module_dict); -- pygobject_boxed_register_types (module_dict); -- pygobject_pointer_register_types (module_dict); - pygobject_enum_register_types (module_dict); - pygobject_flags_register_types (module_dict); - ---- gi/pygboxed.c.orig 2018-05-31 14:39:04 UTC -+++ gi/pygboxed.c -@@ -162,6 +162,7 @@ pyg_register_boxed(PyObject *dict, const gchar *class_ - if (!type->tp_dealloc) type->tp_dealloc = (destructor)pyg_boxed_dealloc; - - Py_TYPE(type) = &PyType_Type; -+ g_assert (Py_TYPE (&PyGBoxed_Type) != NULL); - type->tp_base = &PyGBoxed_Type; - - if (PyType_Ready(type) < 0) { ---- gi/pygi-boxed.c.orig 2018-05-31 14:39:04 UTC -+++ gi/pygi-boxed.c -@@ -230,6 +230,7 @@ void - _pygi_boxed_register_types (PyObject *m) - { - Py_TYPE(&PyGIBoxed_Type) = &PyType_Type; -+ g_assert (Py_TYPE (&PyGBoxed_Type) != NULL); - PyGIBoxed_Type.tp_base = &PyGBoxed_Type; - PyGIBoxed_Type.tp_new = (newfunc) _boxed_new; - PyGIBoxed_Type.tp_init = (initproc) _boxed_init; ---- gi/pygi-struct.c.orig 2018-05-31 14:39:04 UTC -+++ gi/pygi-struct.c -@@ -231,6 +231,7 @@ void - _pygi_struct_register_types (PyObject *m) - { - Py_TYPE(&PyGIStruct_Type) = &PyType_Type; -+ g_assert (Py_TYPE (&PyGPointer_Type) != NULL); - PyGIStruct_Type.tp_base = &PyGPointer_Type; - PyGIStruct_Type.tp_new = (newfunc) _struct_new; - PyGIStruct_Type.tp_init = (initproc) _struct_init; ---- gi/pyginterface.c.orig 2018-05-31 14:39:04 UTC -+++ gi/pyginterface.c -@@ -72,6 +72,7 @@ pyg_register_interface(PyObject *dict, const gchar *cl - PyObject *o; - - Py_TYPE(type) = &PyType_Type; -+ g_assert (Py_TYPE (&PyGInterface_Type) != NULL); - type->tp_base = &PyGInterface_Type; - - if (PyType_Ready(type) < 0) { ---- gi/pygpointer.c.orig 2018-05-31 14:39:04 UTC -+++ gi/pygpointer.c -@@ -117,6 +117,7 @@ pyg_register_pointer(PyObject *dict, const gchar *clas - if (!type->tp_dealloc) type->tp_dealloc = (destructor)pyg_pointer_dealloc; - - Py_TYPE(type) = &PyType_Type; -+ g_assert (Py_TYPE (&PyGPointer_Type) != NULL); - type->tp_base = &PyGPointer_Type; - - if (PyType_Ready(type) < 0) { ---- gi/pygtype.c.orig 2018-05-31 14:39:04 UTC -+++ gi/pygtype.c -@@ -345,6 +345,7 @@ pyg_type_wrapper_new(GType type) - { - PyGTypeWrapper *self; - -+ g_assert (Py_TYPE (&PyGTypeWrapper_Type) != NULL); - self = (PyGTypeWrapper *)PyObject_NEW(PyGTypeWrapper, - &PyGTypeWrapper_Type); - if (self == NULL) Property changes on: devel/pygobject3-common/files/patch-python38 ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: devel/pygobject3-common/files/patch-python39 =================================================================== --- devel/pygobject3-common/files/patch-python39 (revision 555784) +++ devel/pygobject3-common/files/patch-python39 (nonexistent) @@ -1,16 +0,0 @@ -https://gitlab.gnome.org/GNOME/pygobject/-/commit/07cb8d7dfc2f - ---- gi/pygobject-object.c.orig 2018-05-31 14:39:04 UTC -+++ gi/pygobject-object.c -@@ -846,7 +846,10 @@ pygobject_inherit_slots(PyTypeObject *type, PyObject * - offsetof(PyTypeObject, tp_iter), - offsetof(PyTypeObject, tp_repr), - offsetof(PyTypeObject, tp_str), -- offsetof(PyTypeObject, tp_print) }; -+#if PY_VERSION_HEX < 0x03000000 -+ offsetof(PyTypeObject, tp_print), -+#endif -+ }; - gsize i; - - /* Happens when registering gobject.GObject itself, at least. */ Property changes on: devel/pygobject3-common/files/patch-python39 ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: devel/pygobject3-common/pkg-plist =================================================================== --- devel/pygobject3-common/pkg-plist (revision 555784) +++ devel/pygobject3-common/pkg-plist (working copy) @@ -1,2 +1 @@ include/pygobject-3.0/pygobject.h -libdata/pkgconfig/pygobject-3.0.pc