Attachment 217556 Details for Bug 248559 – pygobject3-common-3.36.1

[patch] pygobject3-common-3.36.1

gobject-3.36.1.patch (text/plain), 5.91 KB, created by yzrh on 2020-08-26 21:20:50 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: yzrh

Created: 2020-08-26 21:20:50 UTC

Size: 5.91 KB

patch

obsolete

>diff -urN pygobject3-common.orig/Makefile pygobject3-common/Makefile
>--- pygobject3-common.orig/Makefile	2020-08-26 19:37:27.425394000 +0000
>+++ pygobject3-common/Makefile	2020-08-26 19:15:43.699911000 +0000
>@@ -2,8 +2,7 @@
> # $FreeBSD: head/devel/pygobject3-common/Makefile 541232 2020-07-04 18:11:42Z zeising $
> 
> PORTNAME=	gobject
>-PORTVERSION=	3.28.3
>-PORTREVISION=	2
>+PORTVERSION=	3.36.1
> CATEGORIES=	devel python
> MASTER_SITES=	GNOME/sources/pygobject/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
> PKGNAMEPREFIX?=	py
>@@ -14,13 +13,12 @@
> MAINTAINER=	gnome@FreeBSD.org
> COMMENT?=	Common files for the Python bindings for GObject
> 
>-LICENSE=	LGPL21
>+LICENSE=	LGPL21+
> LICENSE_FILE=	${WRKSRC}/COPYING
> 
> SLAVE_PORT?=	no
> 
>-USES=		gmake libtool pathfix pkgconfig tar:xz
>-GNU_CONFIGURE=	yes
>+USES=		gmake libtool meson pathfix pkgconfig tar:xz
> INSTALL_TARGET=	install-strip
> 
> # this port doesn't work with py-gobject < 2.28.6_2, clungle below
>@@ -30,8 +28,7 @@
> PLIST_SUB=	ARCH=${ARCH} UNAME_R=${UNAME_R} VERSION=${PORTVERSION} \
> 		OPSYS=${OPSYS:tl} UNAME_M=${UNAME_M}
> 
>-# Override PYTHON_VERSION from DEPENDS_ARGS
>-MAKE_ARGS=	PYTHON_VERSION=${PYTHON_VER}
>+BINARY_ALIAS=	python3=${PYTHON_CMD:T} python=${PYTHON_CMD:T}
> 
> .if ${SLAVE_PORT} == no
> PORTSCOUT?=	limitw:1,even
>@@ -45,7 +42,7 @@
> 	@${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 \
>+	${INSTALL_DATA} ${WRKSRC}/_build/pygobject-3.0.pc \
> 		${STAGEDIR}${PREFIX}/libdata/pkgconfig/pygobject-3.0.pc
> .else
> PORTSCOUT=	ignore:1
>diff -urN pygobject3-common.orig/distinfo pygobject3-common/distinfo
>--- pygobject3-common.orig/distinfo	2020-08-26 19:37:27.574867000 +0000
>+++ pygobject3-common/distinfo	2020-08-26 19:15:43.700014000 +0000
>@@ -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 = 1598467484
>+SHA256 (gnome/pygobject-3.36.1.tar.xz) = d1bf42802d1cec113b5adaa0e7bf7f3745b44521dc2163588d276d5cd61d718f
>+SIZE (gnome/pygobject-3.36.1.tar.xz) = 556568
>diff -urN pygobject3-common.orig/files/patch-python38 pygobject3-common/files/patch-python38
>--- pygobject3-common.orig/files/patch-python38	2020-08-26 19:37:27.426520000 +0000
>+++ pygobject3-common/files/patch-python38	1970-01-01 00:00:00.000000000 +0000
>@@ -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)

Actions: View | Diff

Attachments on bug 248559: 217117 | 217135 | 217381 | 217382 | 217383 | 217384 | 217555 | 217556 | 217557 | 217558 | 217559 | 217560 | 223149