diff --git a/devel/blueprint-compiler/Makefile b/devel/blueprint-compiler/Makefile index 7084d92106e3..78f0d770d682 100644 --- a/devel/blueprint-compiler/Makefile +++ b/devel/blueprint-compiler/Makefile @@ -1,28 +1,27 @@ PORTNAME= blueprint-compiler DISTVERSIONPREFIX= v -DISTVERSION= 0.10.0 -PORTREVISION= 1 +DISTVERSION= 0.12.0 CATEGORIES= devel MAINTAINER= jbeich@FreeBSD.org COMMENT= Markup language for GTK user interfaces WWW= https://gitlab.gnome.org/jwestman/blueprint-compiler LICENSE= LGPL3+ LICENSE_FILE= ${WRKSRC}/COPYING TEST_DEPENDS= gtk4>0:x11-toolkits/gtk40 USES= gnome meson python shebangfix USE_GITLAB= yes USE_GNOME= pygobject3 GL_SITE= https://gitlab.gnome.org GL_ACCOUNT= jwestman SHEBANG_FILES= ${PORTNAME}.py NO_ARCH= yes post-patch: # Derive Python version from Meson @${REINPLACE_CMD} -e "s,'python3',," ${WRKSRC}/meson.build .include diff --git a/devel/blueprint-compiler/distinfo b/devel/blueprint-compiler/distinfo index da9d94d66197..68b97ff96612 100644 --- a/devel/blueprint-compiler/distinfo +++ b/devel/blueprint-compiler/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1689969978 -SHA256 (blueprint-compiler-v0.10.0.tar.bz2) = 9c3c6eecef9eb54ad43b9ef786697a9f99b21e35240e9ddc8541a2cbd9ea79ba -SIZE (blueprint-compiler-v0.10.0.tar.bz2) = 81856 +TIMESTAMP = 1711049847 +SHA256 (blueprint-compiler-v0.12.0.tar.bz2) = 0f762e8a0dfef9aa46b4bddf8ed4bbc09b5d2fa2baff5dec109ccc513c6e9e00 +SIZE (blueprint-compiler-v0.12.0.tar.bz2) = 90521 diff --git a/devel/blueprint-compiler/files/patch-blueprintcompiler_gir.py b/devel/blueprint-compiler/files/patch-blueprintcompiler_gir.py deleted file mode 100644 index 48471f4d9a05..000000000000 --- a/devel/blueprint-compiler/files/patch-blueprintcompiler_gir.py +++ /dev/null @@ -1,13 +0,0 @@ ---- blueprintcompiler/gir.py.orig 2023-09-26 21:07:04 UTC -+++ blueprintcompiler/gir.py -@@ -888,8 +888,8 @@ class Repository(GirNode): - return self.lookup_namespace(ns).get_type(dir_entry.DIR_ENTRY_NAME) - - def _resolve_type_id(self, type_id: int) -> GirType: -- if type_id & 0xFFFFFF == 0: -- type_id = (type_id >> 27) & 0x1F -+ if type_id & (0xFFFFFF if sys.byteorder == "little" else 0xFFFFFF00) == 0: -+ type_id = ((type_id >> 27) if sys.byteorder == "little" else type_id) & 0x1F - # simple type - if type_id == typelib.TYPE_BOOLEAN: - return BoolType() diff --git a/devel/blueprint-compiler/files/patch-blueprintcompiler_typelib.py b/devel/blueprint-compiler/files/patch-blueprintcompiler_typelib.py deleted file mode 100644 index 4953a57016ef..000000000000 --- a/devel/blueprint-compiler/files/patch-blueprintcompiler_typelib.py +++ /dev/null @@ -1,38 +0,0 @@ ---- blueprintcompiler/typelib.py.orig 2023-07-21 20:06:18 UTC -+++ blueprintcompiler/typelib.py -@@ -61,7 +61,14 @@ class Field: - def __init__(self, offset: int, type: str, shift=0, mask=None): - self._offset = offset - self._type = type -- self._shift = shift -+ if not mask or sys.byteorder == "little": -+ self._shift = shift -+ elif self._type == "u8" or self._type == "i8": -+ self._shift = 8 - (shift + mask) -+ elif self._type == "u16" or self._type == "i16": -+ self._shift = 16 - (shift + mask) -+ else: -+ self._shift = 32 - (shift + mask) - self._mask = (1 << mask) - 1 if mask else None - self._name = f"{offset}__{type}__{shift}__{mask}" - -@@ -170,7 +177,7 @@ class Typelib: - OBJ_FINAL = Field(0x02, "u16", 3, 1) - OBJ_GTYPE_NAME = Field(0x08, "string") - OBJ_PARENT = Field(0x10, "dir_entry") -- OBJ_GTYPE_STRUCT = Field(0x14, "string") -+ OBJ_GTYPE_STRUCT = Field(0x12, "string") - OBJ_N_INTERFACES = Field(0x14, "u16") - OBJ_N_FIELDS = Field(0x16, "u16") - OBJ_N_PROPERTIES = Field(0x18, "u16") -@@ -255,7 +262,9 @@ class Typelib: - - def _int(self, size, signed) -> int: - return int.from_bytes( -- self._typelib_file[self._offset : self._offset + size], sys.byteorder -+ self._typelib_file[self._offset : self._offset + size], -+ sys.byteorder, -+ signed=signed, - ) - - diff --git a/devel/blueprint-compiler/pkg-plist b/devel/blueprint-compiler/pkg-plist index 8b651fd0e429..d4d4c3d5d279 100644 --- a/devel/blueprint-compiler/pkg-plist +++ b/devel/blueprint-compiler/pkg-plist @@ -1,50 +1,52 @@ bin/blueprint-compiler %%PYTHON_SITELIBDIR%%/blueprintcompiler/__init__.py %%PYTHON_SITELIBDIR%%/blueprintcompiler/ast_utils.py %%PYTHON_SITELIBDIR%%/blueprintcompiler/completions.py %%PYTHON_SITELIBDIR%%/blueprintcompiler/completions_utils.py %%PYTHON_SITELIBDIR%%/blueprintcompiler/decompiler.py %%PYTHON_SITELIBDIR%%/blueprintcompiler/errors.py +%%PYTHON_SITELIBDIR%%/blueprintcompiler/formatter.py %%PYTHON_SITELIBDIR%%/blueprintcompiler/gir.py %%PYTHON_SITELIBDIR%%/blueprintcompiler/interactive_port.py %%PYTHON_SITELIBDIR%%/blueprintcompiler/language/__init__.py %%PYTHON_SITELIBDIR%%/blueprintcompiler/language/adw_breakpoint.py -%%PYTHON_SITELIBDIR%%/blueprintcompiler/language/adw_message_dialog.py +%%PYTHON_SITELIBDIR%%/blueprintcompiler/language/adw_response_dialog.py %%PYTHON_SITELIBDIR%%/blueprintcompiler/language/attributes.py %%PYTHON_SITELIBDIR%%/blueprintcompiler/language/binding.py %%PYTHON_SITELIBDIR%%/blueprintcompiler/language/common.py %%PYTHON_SITELIBDIR%%/blueprintcompiler/language/contexts.py %%PYTHON_SITELIBDIR%%/blueprintcompiler/language/expression.py %%PYTHON_SITELIBDIR%%/blueprintcompiler/language/gobject_object.py %%PYTHON_SITELIBDIR%%/blueprintcompiler/language/gobject_property.py %%PYTHON_SITELIBDIR%%/blueprintcompiler/language/gobject_signal.py %%PYTHON_SITELIBDIR%%/blueprintcompiler/language/gtk_a11y.py %%PYTHON_SITELIBDIR%%/blueprintcompiler/language/gtk_combo_box_text.py %%PYTHON_SITELIBDIR%%/blueprintcompiler/language/gtk_file_filter.py %%PYTHON_SITELIBDIR%%/blueprintcompiler/language/gtk_layout.py %%PYTHON_SITELIBDIR%%/blueprintcompiler/language/gtk_list_item_factory.py %%PYTHON_SITELIBDIR%%/blueprintcompiler/language/gtk_menu.py %%PYTHON_SITELIBDIR%%/blueprintcompiler/language/gtk_scale.py %%PYTHON_SITELIBDIR%%/blueprintcompiler/language/gtk_size_group.py %%PYTHON_SITELIBDIR%%/blueprintcompiler/language/gtk_string_list.py %%PYTHON_SITELIBDIR%%/blueprintcompiler/language/gtk_styles.py %%PYTHON_SITELIBDIR%%/blueprintcompiler/language/gtkbuilder_child.py %%PYTHON_SITELIBDIR%%/blueprintcompiler/language/gtkbuilder_template.py %%PYTHON_SITELIBDIR%%/blueprintcompiler/language/imports.py %%PYTHON_SITELIBDIR%%/blueprintcompiler/language/response_id.py +%%PYTHON_SITELIBDIR%%/blueprintcompiler/language/translation_domain.py %%PYTHON_SITELIBDIR%%/blueprintcompiler/language/types.py %%PYTHON_SITELIBDIR%%/blueprintcompiler/language/ui.py %%PYTHON_SITELIBDIR%%/blueprintcompiler/language/values.py %%PYTHON_SITELIBDIR%%/blueprintcompiler/lsp.py %%PYTHON_SITELIBDIR%%/blueprintcompiler/lsp_utils.py %%PYTHON_SITELIBDIR%%/blueprintcompiler/main.py %%PYTHON_SITELIBDIR%%/blueprintcompiler/outputs/__init__.py %%PYTHON_SITELIBDIR%%/blueprintcompiler/outputs/xml/__init__.py %%PYTHON_SITELIBDIR%%/blueprintcompiler/outputs/xml/xml_emitter.py %%PYTHON_SITELIBDIR%%/blueprintcompiler/parse_tree.py %%PYTHON_SITELIBDIR%%/blueprintcompiler/parser.py %%PYTHON_SITELIBDIR%%/blueprintcompiler/tokenizer.py %%PYTHON_SITELIBDIR%%/blueprintcompiler/typelib.py %%PYTHON_SITELIBDIR%%/blueprintcompiler/utils.py %%PYTHON_SITELIBDIR%%/blueprintcompiler/xml_reader.py share/pkgconfig/blueprint-compiler.pc