View | Details | Raw Unified | Return to bug 251300 | Differences between
and this patch

Collapse All | Expand All

(-)devel/pygobject3-common/Makefile (-8 / +6 lines)
Lines 2-9 Link Here
2
# $FreeBSD$
2
# $FreeBSD$
3
3
4
PORTNAME=	gobject
4
PORTNAME=	gobject
5
PORTVERSION=	3.28.3
5
PORTVERSION=	3.38.0
6
PORTREVISION=	3
7
CATEGORIES=	devel python
6
CATEGORIES=	devel python
8
MASTER_SITES=	GNOME/sources/pygobject/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
7
MASTER_SITES=	GNOME/sources/pygobject/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
9
PKGNAMEPREFIX?=	py
8
PKGNAMEPREFIX?=	py
Lines 19-26 Link Here
19
18
20
SLAVE_PORT?=	no
19
SLAVE_PORT?=	no
21
20
22
USES=		gmake libtool pathfix pkgconfig tar:xz
21
USES=		libtool meson pathfix pkgconfig tar:xz
23
GNU_CONFIGURE=	yes
24
INSTALL_TARGET=	install-strip
22
INSTALL_TARGET=	install-strip
25
23
26
# this port doesn't work with py-gobject < 2.28.6_2, clungle below
24
# this port doesn't work with py-gobject < 2.28.6_2, clungle below
Lines 33-38 Link Here
33
# Override PYTHON_VERSION from DEPENDS_ARGS
31
# Override PYTHON_VERSION from DEPENDS_ARGS
34
MAKE_ARGS=	PYTHON_VERSION=${PYTHON_VER}
32
MAKE_ARGS=	PYTHON_VERSION=${PYTHON_VER}
35
33
34
post-patch:
35
	@${REINPLACE_CMD} "s|find_installation(get_option('python')|find_installation('python${PYTHON_VER}'|" ${WRKSRC}/meson.build
36
36
.if ${SLAVE_PORT} == no
37
.if ${SLAVE_PORT} == no
37
PORTSCOUT?=	limitw:1,even
38
PORTSCOUT?=	limitw:1,even
38
39
Lines 45-52 Link Here
45
	@${MKDIR} ${STAGEDIR}${PREFIX}/include/pygobject-3.0/
46
	@${MKDIR} ${STAGEDIR}${PREFIX}/include/pygobject-3.0/
46
	${INSTALL_DATA} ${WRKSRC}/gi/pygobject.h \
47
	${INSTALL_DATA} ${WRKSRC}/gi/pygobject.h \
47
		${STAGEDIR}${PREFIX}/include/pygobject-3.0/pygobject.h
48
		${STAGEDIR}${PREFIX}/include/pygobject-3.0/pygobject.h
48
	${INSTALL_DATA} ${WRKSRC}/pygobject-3.0.pc \
49
		${STAGEDIR}${PREFIX}/libdata/pkgconfig/pygobject-3.0.pc
50
.else
49
.else
51
PORTSCOUT=	ignore:1
50
PORTSCOUT=	ignore:1
52
51
Lines 63-70 Link Here
63
.endif
62
.endif
64
63
65
post-install:
64
post-install:
66
	@${RM} -r ${STAGEDIR}${PREFIX}/include/pygobject-3.0 \
65
	@${RM} -r ${STAGEDIR}${PREFIX}/include/pygobject-3.0
67
		${STAGEDIR}${PREFIX}/libdata/pkgconfig/pygobject-3.0.pc
68
.endif
66
.endif
69
67
70
.include <bsd.port.pre.mk>
68
.include <bsd.port.pre.mk>
(-)devel/pygobject3-common/distinfo (-3 / +3 lines)
Lines 1-3 Link Here
1
TIMESTAMP = 1527917161
1
TIMESTAMP = 1605995433
2
SHA256 (gnome/pygobject-3.28.3.tar.xz) = 3dd3e21015d06e00482ea665fc1733b77e754a6ab656a5db5d7f7bfaf31ad0b0
2
SHA256 (gnome/pygobject-3.38.0.tar.xz) = 0372d1bb9122fc19f500a249b1f38c2bb67485000f5887497b4b205b3e7084d5
3
SIZE (gnome/pygobject-3.28.3.tar.xz) = 1005368
3
SIZE (gnome/pygobject-3.38.0.tar.xz) = 553892
(-)devel/pygobject3-common/files/patch-python38 (-88 lines)
Lines 1-88 Link Here
1
https://gitlab.gnome.org/GNOME/pygobject/-/commit/bfc759c9c0bb
2
3
--- gi/gimodule.c.orig	2018-05-31 14:39:04 UTC
4
+++ gi/gimodule.c
5
@@ -685,7 +685,10 @@ PYGLIB_MODULE_START(_gi, "_gi")
6
     pygi_error_register_types (module);
7
     _pygi_repository_register_types (module);
8
     _pygi_info_register_types (module);
9
+    pygobject_type_register_types (module_dict);
10
+    pygobject_pointer_register_types (module_dict);
11
     _pygi_struct_register_types (module);
12
+    pygobject_boxed_register_types (module_dict);
13
     _pygi_boxed_register_types (module);
14
     _pygi_ccallback_register_types (module);
15
     pygi_resulttuple_register_types (module);
16
@@ -699,12 +702,9 @@ PYGLIB_MODULE_START(_gi, "_gi")
17
     pygobject_register_features (module_dict);
18
     pygobject_register_version_tuples (module_dict);
19
     pygobject_register_warnings (module_dict);
20
-    pygobject_type_register_types (module_dict);
21
     pygobject_object_register_types (module_dict);
22
     pygobject_interface_register_types (module_dict);
23
     pygobject_paramspec_register_types (module_dict);
24
-    pygobject_boxed_register_types (module_dict);
25
-    pygobject_pointer_register_types (module_dict);
26
     pygobject_enum_register_types (module_dict);
27
     pygobject_flags_register_types (module_dict);
28
 
29
--- gi/pygboxed.c.orig	2018-05-31 14:39:04 UTC
30
+++ gi/pygboxed.c
31
@@ -162,6 +162,7 @@ pyg_register_boxed(PyObject *dict, const gchar *class_
32
     if (!type->tp_dealloc)  type->tp_dealloc  = (destructor)pyg_boxed_dealloc;
33
 
34
     Py_TYPE(type) = &PyType_Type;
35
+    g_assert (Py_TYPE (&PyGBoxed_Type) != NULL);
36
     type->tp_base = &PyGBoxed_Type;
37
 
38
     if (PyType_Ready(type) < 0) {
39
--- gi/pygi-boxed.c.orig	2018-05-31 14:39:04 UTC
40
+++ gi/pygi-boxed.c
41
@@ -230,6 +230,7 @@ void
42
 _pygi_boxed_register_types (PyObject *m)
43
 {
44
     Py_TYPE(&PyGIBoxed_Type) = &PyType_Type;
45
+    g_assert (Py_TYPE (&PyGBoxed_Type) != NULL);
46
     PyGIBoxed_Type.tp_base = &PyGBoxed_Type;
47
     PyGIBoxed_Type.tp_new = (newfunc) _boxed_new;
48
     PyGIBoxed_Type.tp_init = (initproc) _boxed_init;
49
--- gi/pygi-struct.c.orig	2018-05-31 14:39:04 UTC
50
+++ gi/pygi-struct.c
51
@@ -231,6 +231,7 @@ void
52
 _pygi_struct_register_types (PyObject *m)
53
 {
54
     Py_TYPE(&PyGIStruct_Type) = &PyType_Type;
55
+    g_assert (Py_TYPE (&PyGPointer_Type) != NULL);
56
     PyGIStruct_Type.tp_base = &PyGPointer_Type;
57
     PyGIStruct_Type.tp_new = (newfunc) _struct_new;
58
     PyGIStruct_Type.tp_init = (initproc) _struct_init;
59
--- gi/pyginterface.c.orig	2018-05-31 14:39:04 UTC
60
+++ gi/pyginterface.c
61
@@ -72,6 +72,7 @@ pyg_register_interface(PyObject *dict, const gchar *cl
62
     PyObject *o;
63
 
64
     Py_TYPE(type) = &PyType_Type;
65
+    g_assert (Py_TYPE (&PyGInterface_Type) != NULL);
66
     type->tp_base = &PyGInterface_Type;
67
 
68
     if (PyType_Ready(type) < 0) {
69
--- gi/pygpointer.c.orig	2018-05-31 14:39:04 UTC
70
+++ gi/pygpointer.c
71
@@ -117,6 +117,7 @@ pyg_register_pointer(PyObject *dict, const gchar *clas
72
     if (!type->tp_dealloc) type->tp_dealloc = (destructor)pyg_pointer_dealloc;
73
 
74
     Py_TYPE(type) = &PyType_Type;
75
+    g_assert (Py_TYPE (&PyGPointer_Type) != NULL);
76
     type->tp_base = &PyGPointer_Type;
77
 
78
     if (PyType_Ready(type) < 0) {
79
--- gi/pygtype.c.orig	2018-05-31 14:39:04 UTC
80
+++ gi/pygtype.c
81
@@ -345,6 +345,7 @@ pyg_type_wrapper_new(GType type)
82
 {
83
     PyGTypeWrapper *self;
84
 
85
+    g_assert (Py_TYPE (&PyGTypeWrapper_Type) != NULL);
86
     self = (PyGTypeWrapper *)PyObject_NEW(PyGTypeWrapper,
87
 					  &PyGTypeWrapper_Type);
88
     if (self == NULL)
(-)devel/pygobject3-common/files/patch-python39 (-16 lines)
Lines 1-16 Link Here
1
https://gitlab.gnome.org/GNOME/pygobject/-/commit/07cb8d7dfc2f
2
3
--- gi/pygobject-object.c.orig	2018-05-31 14:39:04 UTC
4
+++ gi/pygobject-object.c
5
@@ -846,7 +846,10 @@ pygobject_inherit_slots(PyTypeObject *type, PyObject *
6
                                   offsetof(PyTypeObject, tp_iter),
7
                                   offsetof(PyTypeObject, tp_repr),
8
                                   offsetof(PyTypeObject, tp_str),
9
-                                  offsetof(PyTypeObject, tp_print) };
10
+#if PY_VERSION_HEX < 0x03000000
11
+                                  offsetof(PyTypeObject, tp_print),
12
+#endif
13
+    };
14
     gsize i;
15
 
16
     /* Happens when registering gobject.GObject itself, at least. */
(-)devel/pygobject3-common/pkg-plist (-1 lines)
Lines 1-2 Link Here
1
include/pygobject-3.0/pygobject.h
1
include/pygobject-3.0/pygobject.h
2
libdata/pkgconfig/pygobject-3.0.pc

Return to bug 251300