Page MenuHomeFreeBSD
Files F111649010

D26630.id84325.diff
No OneTemporary
Actions

D26630.id84325.diff
View Options

Index: devel/py-gobject3/pkg-plist
===================================================================
--- devel/py-gobject3/pkg-plist
+++ devel/py-gobject3/pkg-plist
@@ -1,78 +1,30 @@
+%%PYTHON_SITELIBDIR%%/PyGObject-%%VERSION%%.egg-info
%%PYTHON_SITELIBDIR%%/gi/__init__.py
-%%PYTHON_SITELIBDIR%%/gi/__init__.pyc
-%%PYTHON_SITELIBDIR%%/gi/__init__.pyo
%%PYTHON_SITELIBDIR%%/gi/_constants.py
-%%PYTHON_SITELIBDIR%%/gi/_constants.pyc
-%%PYTHON_SITELIBDIR%%/gi/_constants.pyo
%%PYTHON_SITELIBDIR%%/gi/_error.py
-%%PYTHON_SITELIBDIR%%/gi/_error.pyc
-%%PYTHON_SITELIBDIR%%/gi/_error.pyo
%%PYTHON_SITELIBDIR%%/gi/_gi%%PYTHON_EXT_SUFFIX%%.so
%%PYTHON_SITELIBDIR%%/gi/_gi_cairo%%PYTHON_EXT_SUFFIX%%.so
+%%PYTHON_SITELIBDIR%%/gi/_gtktemplate.py
%%PYTHON_SITELIBDIR%%/gi/_option.py
-%%PYTHON_SITELIBDIR%%/gi/_option.pyc
-%%PYTHON_SITELIBDIR%%/gi/_option.pyo
%%PYTHON_SITELIBDIR%%/gi/_ossighelper.py
-%%PYTHON_SITELIBDIR%%/gi/_ossighelper.pyc
-%%PYTHON_SITELIBDIR%%/gi/_ossighelper.pyo
%%PYTHON_SITELIBDIR%%/gi/_propertyhelper.py
-%%PYTHON_SITELIBDIR%%/gi/_propertyhelper.pyc
-%%PYTHON_SITELIBDIR%%/gi/_propertyhelper.pyo
%%PYTHON_SITELIBDIR%%/gi/_signalhelper.py
-%%PYTHON_SITELIBDIR%%/gi/_signalhelper.pyc
-%%PYTHON_SITELIBDIR%%/gi/_signalhelper.pyo
%%PYTHON_SITELIBDIR%%/gi/docstring.py
-%%PYTHON_SITELIBDIR%%/gi/docstring.pyc
-%%PYTHON_SITELIBDIR%%/gi/docstring.pyo
%%PYTHON_SITELIBDIR%%/gi/importer.py
-%%PYTHON_SITELIBDIR%%/gi/importer.pyc
-%%PYTHON_SITELIBDIR%%/gi/importer.pyo
%%PYTHON_SITELIBDIR%%/gi/module.py
-%%PYTHON_SITELIBDIR%%/gi/module.pyc
-%%PYTHON_SITELIBDIR%%/gi/module.pyo
%%PYTHON_SITELIBDIR%%/gi/overrides/GIMarshallingTests.py
-%%PYTHON_SITELIBDIR%%/gi/overrides/GIMarshallingTests.pyc
-%%PYTHON_SITELIBDIR%%/gi/overrides/GIMarshallingTests.pyo
%%PYTHON_SITELIBDIR%%/gi/overrides/GLib.py
-%%PYTHON_SITELIBDIR%%/gi/overrides/GLib.pyc
-%%PYTHON_SITELIBDIR%%/gi/overrides/GLib.pyo
%%PYTHON_SITELIBDIR%%/gi/overrides/GObject.py
-%%PYTHON_SITELIBDIR%%/gi/overrides/GObject.pyc
-%%PYTHON_SITELIBDIR%%/gi/overrides/GObject.pyo
%%PYTHON_SITELIBDIR%%/gi/overrides/Gdk.py
-%%PYTHON_SITELIBDIR%%/gi/overrides/Gdk.pyc
-%%PYTHON_SITELIBDIR%%/gi/overrides/Gdk.pyo
+%%PYTHON_SITELIBDIR%%/gi/overrides/GdkPixbuf.py
%%PYTHON_SITELIBDIR%%/gi/overrides/Gio.py
-%%PYTHON_SITELIBDIR%%/gi/overrides/Gio.pyc
-%%PYTHON_SITELIBDIR%%/gi/overrides/Gio.pyo
%%PYTHON_SITELIBDIR%%/gi/overrides/Gtk.py
-%%PYTHON_SITELIBDIR%%/gi/overrides/Gtk.pyc
-%%PYTHON_SITELIBDIR%%/gi/overrides/Gtk.pyo
%%PYTHON_SITELIBDIR%%/gi/overrides/Pango.py
-%%PYTHON_SITELIBDIR%%/gi/overrides/Pango.pyc
-%%PYTHON_SITELIBDIR%%/gi/overrides/Pango.pyo
%%PYTHON_SITELIBDIR%%/gi/overrides/__init__.py
-%%PYTHON_SITELIBDIR%%/gi/overrides/__init__.pyc
-%%PYTHON_SITELIBDIR%%/gi/overrides/__init__.pyo
%%PYTHON_SITELIBDIR%%/gi/overrides/keysyms.py
-%%PYTHON_SITELIBDIR%%/gi/overrides/keysyms.pyc
-%%PYTHON_SITELIBDIR%%/gi/overrides/keysyms.pyo
%%PYTHON_SITELIBDIR%%/gi/pygtkcompat.py
-%%PYTHON_SITELIBDIR%%/gi/pygtkcompat.pyc
-%%PYTHON_SITELIBDIR%%/gi/pygtkcompat.pyo
%%PYTHON_SITELIBDIR%%/gi/repository/__init__.py
-%%PYTHON_SITELIBDIR%%/gi/repository/__init__.pyc
-%%PYTHON_SITELIBDIR%%/gi/repository/__init__.pyo
%%PYTHON_SITELIBDIR%%/gi/types.py
-%%PYTHON_SITELIBDIR%%/gi/types.pyc
-%%PYTHON_SITELIBDIR%%/gi/types.pyo
-%%PYTHON_SITELIBDIR%%/pygobject-%%VERSION%%-py%%PYTHON_VER%%.egg-info
%%PYTHON_SITELIBDIR%%/pygtkcompat/__init__.py
-%%PYTHON_SITELIBDIR%%/pygtkcompat/__init__.pyc
-%%PYTHON_SITELIBDIR%%/pygtkcompat/__init__.pyo
%%PYTHON_SITELIBDIR%%/pygtkcompat/generictreemodel.py
-%%PYTHON_SITELIBDIR%%/pygtkcompat/generictreemodel.pyc
-%%PYTHON_SITELIBDIR%%/pygtkcompat/generictreemodel.pyo
%%PYTHON_SITELIBDIR%%/pygtkcompat/pygtkcompat.py
-%%PYTHON_SITELIBDIR%%/pygtkcompat/pygtkcompat.pyc
-%%PYTHON_SITELIBDIR%%/pygtkcompat/pygtkcompat.pyo
Index: devel/pygobject3-common/Makefile
===================================================================
--- devel/pygobject3-common/Makefile
+++ devel/pygobject3-common/Makefile
@@ -2,8 +2,8 @@
# $FreeBSD$
PORTNAME= gobject
-PORTVERSION= 3.28.3
-PORTREVISION= 3
+PORTVERSION= 3.38.0
+PORTREVISION= 0
CATEGORIES= devel python
MASTER_SITES= GNOME/sources/pygobject/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
PKGNAMEPREFIX?= py
@@ -19,9 +19,7 @@
SLAVE_PORT?= no
-USES= gmake libtool pathfix pkgconfig tar:xz
-GNU_CONFIGURE= yes
-INSTALL_TARGET= install-strip
+USES= meson pkgconfig tar:xz
# this port doesn't work with py-gobject < 2.28.6_2, clungle below
CONFLICTS= py*-gtk-0* py*-gobject-2.*.[0-6] py*-gobject-2.*.[7-9] \
@@ -31,7 +29,10 @@
OPSYS=${OPSYS:tl} UNAME_M=${UNAME_M}
# Override PYTHON_VERSION from DEPENDS_ARGS
-MAKE_ARGS= PYTHON_VERSION=${PYTHON_VER}
+# ????
+#MAKE_ARGS= PYTHON_VERSION=${PYTHON_VER}
+
+BINARY_ALIAS= python3=${PYTHON_CMD}
.if ${SLAVE_PORT} == no
PORTSCOUT?= limitw:1,even
@@ -45,7 +46,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
@@ -58,6 +59,7 @@
.if ${SLAVE_PORT} == python
USES+= python:3.6+
USE_PYTHON= flavors py3kplist
+MESON_ARGS+= -Dpython=${PYTHON_VERSION}
BUILD_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}cairo>=0:graphics/py-cairo@${PY_FLAVOR}
RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}cairo>=0:graphics/py-cairo@${PY_FLAVOR}
.endif
Index: devel/pygobject3-common/distinfo
===================================================================
--- devel/pygobject3-common/distinfo
+++ devel/pygobject3-common/distinfo
@@ -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 = 1613821135
+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
+++ devel/pygobject3-common/files/patch-python38
@@ -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)
Index: devel/pygobject3-common/files/patch-python39
===================================================================
--- devel/pygobject3-common/files/patch-python39
+++ devel/pygobject3-common/files/patch-python39
@@ -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. */

File Metadata

Mime Type
text/plain
Expires
Fri, Mar 7, 12:17 PM (20 h, 15 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
17031883
Default Alt Text
D26630.id84325.diff (10 KB)

Event Timeline