* [gentoo-commits] repo/gentoo:master commit in: dev-libs/gobject-introspection/files/, dev-libs/gobject-introspection/
@ 2015-11-14 18:40 Pacho Ramos
0 siblings, 0 replies; 5+ messages in thread
From: Pacho Ramos @ 2015-11-14 18:40 UTC (permalink / raw
To: gentoo-commits
commit: ecd471875a2f27df8bccb916cc4883471cd2b97a
Author: Pacho Ramos <pacho <AT> gentoo <DOT> org>
AuthorDate: Sat Nov 14 17:35:56 2015 +0000
Commit: Pacho Ramos <pacho <AT> gentoo <DOT> org>
CommitDate: Sat Nov 14 18:38:32 2015 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ecd47187
dev-libs/gobject-introspection: Drop old
Package-Manager: portage-2.2.24
dev-libs/gobject-introspection/Manifest | 1 -
.../gobject-introspection-1.40.0-gjs-crash.patch | 484 ---------------------
.../gobject-introspection-1.40.0-r2.ebuild | 79 ----
3 files changed, 564 deletions(-)
diff --git a/dev-libs/gobject-introspection/Manifest b/dev-libs/gobject-introspection/Manifest
index feb83c9..29d6f15 100644
--- a/dev-libs/gobject-introspection/Manifest
+++ b/dev-libs/gobject-introspection/Manifest
@@ -1,4 +1,3 @@
-DIST gobject-introspection-1.40.0.tar.xz 1286424 SHA256 96ea75e9679083e7fe39a105e810e2ead2d708abf189a5ba420bfccfffa24e98 SHA512 d6cc91be018d812f1b04281bc322b8809c2cc12e5e16adf8b826a82505315ec140ce2b823c107ed98c6dced8f62afb6071eed2702a9e76b0e8e73ad193824c04 WHIRLPOOL b5ab2bb221816802cd3d1d3aedcb6b9b5ea9f516b51b4a3a892de1098d834c78cf94aa3e552dc58f0d2530c032e9ba08b41c24b31992afc4493ac3f0bfdc2f78
DIST gobject-introspection-1.42.0.tar.xz 1308056 SHA256 3ba2edfad4f71d4f0de16960b5d5f2511335fa646b2c49bbb93ce5942b3f95f7 SHA512 2f84aae6ebb73f1cda70be6070fdbd0791777baed0f12921518a3c9cc890c406d6649bf0441bef5b93b6da4320d0c2639d9090c43d1011deebd1652f1e958021 WHIRLPOOL fe2703c82c83617093fa9ee74b28a2f6bec87d43f4b6eadf7f124a8454a817b6a30b635ea7c0388e429ae081f23c943ca31c34f2aa68811b1d4d10758b8a6a16
DIST gobject-introspection-1.44.0.tar.xz 1319168 SHA256 6f0c2c28aeaa37b5037acbf21558098c4f95029b666db755d3a12c2f1e1627ad SHA512 294bee6c935991620e6bfe4bd63d7b5c586079cdc9ac349dd5228f5822f86983a5a4518838c808c3fdd1152cb37f79db5ad8674245939ecad97459ce178f03e7 WHIRLPOOL fb032ae524bdbb011963c58e9d5d4a488fe89d95f2a353d0871176c26f1cb2f276743ec4bb97149f76135565965c173f149f163b78de47b994a5b4b32f3aa6aa
DIST gobject-introspection-1.46.0.tar.xz 1359436 SHA256 6658bd3c2b8813eb3e2511ee153238d09ace9d309e4574af27443d87423e4233 SHA512 2bdf988caadd6c4286ed90e35d26e1478d8ca627c8fb34f23d44473d0520f16b6082f0ee4f0acf44769bb5de2354119f2e28595ad8919668bebe5aec4c1ac210 WHIRLPOOL fb6c8570c41ebb06808e994811da2794ce3fe70ea1e5d50dcf2a4e72646efe8d49ce0ca176cecfc0bb6c9a3d7f47c13edd1c238b0e0e9649552793ff62145164
diff --git a/dev-libs/gobject-introspection/files/gobject-introspection-1.40.0-gjs-crash.patch b/dev-libs/gobject-introspection/files/gobject-introspection-1.40.0-gjs-crash.patch
deleted file mode 100644
index b4ee77e..0000000
--- a/dev-libs/gobject-introspection/files/gobject-introspection-1.40.0-gjs-crash.patch
+++ /dev/null
@@ -1,484 +0,0 @@
-From a4c9d09d7a89d3c80b4465a5c2ae0efa24158b24 Mon Sep 17 00:00:00 2001
-From: Giovanni Campagna <gcampagna@src.gnome.org>
-Date: Tue, 6 May 2014 18:53:21 +0200
-Subject: Parse and expose ownership transfer for instance parameters
-
-Knowing the ownership transfer for instance parameters is
-necessary for correct memory management of functions which
-"eat" their instance argument, such as g_dbus_method_invocation_return_*.
-Parse this information from the gir file and store in the
-typelib, and then provide new API on GICallableInfo to
-retrieve this.
-
-https://bugzilla.gnome.org/show_bug.cgi?id=729662
-
-diff --git a/girepository/gicallableinfo.c b/girepository/gicallableinfo.c
-index e69e3e9..702e16c 100644
---- a/girepository/gicallableinfo.c
-+++ b/girepository/gicallableinfo.c
-@@ -276,6 +276,32 @@ g_callable_info_get_caller_owns (GICallableInfo *info)
- }
-
- /**
-+ * g_callable_info_get_instance_ownership_transfer:
-+ * @info: a #GICallableInfo
-+ *
-+ * Obtains the ownership transfer for the instance argument.
-+ * #GITransfer contains a list of possible transfer values.
-+ *
-+ * Returns: the transfer
-+ */
-+GITransfer
-+g_callable_info_get_instance_ownership_transfer (GICallableInfo *info)
-+{
-+ GIRealInfo *rinfo = (GIRealInfo*) info;
-+ SignatureBlob *blob;
-+
-+ g_return_val_if_fail (info != NULL, -1);
-+ g_return_val_if_fail (GI_IS_CALLABLE_INFO (info), -1);
-+
-+ blob = (SignatureBlob *)&rinfo->typelib->data[signature_offset (info)];
-+
-+ if (blob->instance_transfer_ownership)
-+ return GI_TRANSFER_EVERYTHING;
-+ else
-+ return GI_TRANSFER_NOTHING;
-+}
-+
-+/**
- * g_callable_info_get_n_args:
- * @info: a #GICallableInfo
- *
-diff --git a/girepository/gicallableinfo.h b/girepository/gicallableinfo.h
-index 71f9d0c..f273d29 100644
---- a/girepository/gicallableinfo.h
-+++ b/girepository/gicallableinfo.h
-@@ -73,6 +73,8 @@ gboolean g_callable_info_invoke (GICallableInfo *info,
- gboolean is_method,
- gboolean throws,
- GError **error);
-+GITransfer g_callable_info_get_instance_ownership_transfer (GICallableInfo *info);
-+
- G_END_DECLS
-
-
-diff --git a/girepository/girepository.symbols b/girepository/girepository.symbols
-index 5f01adf..48fb0d9 100644
---- a/girepository/girepository.symbols
-+++ b/girepository/girepository.symbols
-@@ -26,6 +26,7 @@ g_info_new
- g_callable_info_can_throw_gerror
- g_callable_info_get_arg
- g_callable_info_get_caller_owns
-+g_callable_info_get_instance_ownership_transfer
- g_callable_info_get_n_args
- g_callable_info_get_return_attribute
- g_callable_info_get_return_type
-diff --git a/girepository/girnode.c b/girepository/girnode.c
-index 53385c2..a7a77e3 100644
---- a/girepository/girnode.c
-+++ b/girepository/girnode.c
-@@ -1664,6 +1664,7 @@ _g_ir_node_build_typelib (GIrNode *node,
- blob2->caller_owns_return_value = function->result->transfer;
- blob2->caller_owns_return_container = function->result->shallow_transfer;
- blob2->skip_return = function->result->skip;
-+ blob2->instance_transfer_ownership = function->instance_transfer_full;
- blob2->reserved = 0;
- blob2->n_arguments = n;
-
-@@ -1762,6 +1763,7 @@ _g_ir_node_build_typelib (GIrNode *node,
- blob2->may_return_null = signal->result->nullable;
- blob2->caller_owns_return_value = signal->result->transfer;
- blob2->caller_owns_return_container = signal->result->shallow_transfer;
-+ blob2->instance_transfer_ownership = signal->instance_transfer_full;
- blob2->reserved = 0;
- blob2->n_arguments = n;
-
-@@ -1820,6 +1822,7 @@ _g_ir_node_build_typelib (GIrNode *node,
- blob2->may_return_null = vfunc->result->nullable;
- blob2->caller_owns_return_value = vfunc->result->transfer;
- blob2->caller_owns_return_container = vfunc->result->shallow_transfer;
-+ blob2->instance_transfer_ownership = vfunc->instance_transfer_full;
- blob2->reserved = 0;
- blob2->n_arguments = n;
-
-diff --git a/girepository/girnode.h b/girepository/girnode.h
-index 4beef7f..02196e7 100644
---- a/girepository/girnode.h
-+++ b/girepository/girnode.h
-@@ -100,6 +100,7 @@ struct _GIrNodeFunction
- gboolean is_constructor;
- gboolean wraps_vfunc;
- gboolean throws;
-+ gboolean instance_transfer_full;
-
- gchar *symbol;
-
-@@ -188,6 +189,7 @@ struct _GIrNodeSignal
- gboolean detailed;
- gboolean action;
- gboolean no_hooks;
-+ gboolean instance_transfer_full;
-
- gboolean has_class_closure;
- gboolean true_stops_emit;
-@@ -208,6 +210,7 @@ struct _GIrNodeVFunc
- gboolean must_not_be_implemented;
- gboolean is_class_closure;
- gboolean throws;
-+ gboolean instance_transfer_full;
-
- char *invoker;
-
-diff --git a/girepository/girparser.c b/girepository/girparser.c
-index 6c76866..f928c2e 100644
---- a/girepository/girparser.c
-+++ b/girepository/girparser.c
-@@ -1047,6 +1047,71 @@ parse_param_transfer (GIrNodeParam *param, const gchar *transfer, const gchar *n
- }
-
- static gboolean
-+start_instance_parameter (GMarkupParseContext *context,
-+ const gchar *element_name,
-+ const gchar **attribute_names,
-+ const gchar **attribute_values,
-+ ParseContext *ctx,
-+ GError **error)
-+{
-+ const gchar *transfer;
-+ gboolean transfer_full;
-+
-+ if (!(strcmp (element_name, "instance-parameter") == 0 &&
-+ ctx->state == STATE_FUNCTION_PARAMETERS))
-+ return FALSE;
-+
-+ transfer = find_attribute ("transfer-ownership", attribute_names, attribute_values);
-+
-+ state_switch (ctx, STATE_PASSTHROUGH);
-+
-+ if (strcmp (transfer, "full") == 0)
-+ transfer_full = TRUE;
-+ else if (strcmp (transfer, "none") == 0)
-+ transfer_full = FALSE;
-+ else
-+ {
-+ g_set_error (error, G_MARKUP_ERROR,
-+ G_MARKUP_ERROR_INVALID_CONTENT,
-+ "invalid value for 'transfer-ownership' for instance parameter: %s", transfer);
-+ return FALSE;
-+ }
-+
-+ switch (CURRENT_NODE (ctx)->type)
-+ {
-+ case G_IR_NODE_FUNCTION:
-+ case G_IR_NODE_CALLBACK:
-+ {
-+ GIrNodeFunction *func;
-+
-+ func = (GIrNodeFunction *)CURRENT_NODE (ctx);
-+ func->instance_transfer_full = transfer_full;
-+ }
-+ break;
-+ case G_IR_NODE_SIGNAL:
-+ {
-+ GIrNodeSignal *signal;
-+
-+ signal = (GIrNodeSignal *)CURRENT_NODE (ctx);
-+ signal->instance_transfer_full = transfer_full;
-+ }
-+ break;
-+ case G_IR_NODE_VFUNC:
-+ {
-+ GIrNodeVFunc *vfunc;
-+
-+ vfunc = (GIrNodeVFunc *)CURRENT_NODE (ctx);
-+ vfunc->instance_transfer_full = transfer_full;
-+ }
-+ break;
-+ default:
-+ g_assert_not_reached ();
-+ }
-+
-+ return TRUE;
-+}
-+
-+static gboolean
- start_parameter (GMarkupParseContext *context,
- const gchar *element_name,
- const gchar **attribute_names,
-@@ -2848,11 +2913,10 @@ start_element_handler (GMarkupParseContext *context,
- attribute_names, attribute_values,
- ctx, error))
- goto out;
-- else if (strcmp (element_name, "instance-parameter") == 0)
-- {
-- state_switch (ctx, STATE_PASSTHROUGH);
-- goto out;
-- }
-+ else if (start_instance_parameter (context, element_name,
-+ attribute_names, attribute_values,
-+ ctx, error))
-+ goto out;
- else if (strcmp (element_name, "c:include") == 0)
- {
- state_switch (ctx, STATE_C_INCLUDE);
-diff --git a/girepository/gitypelib-internal.h b/girepository/gitypelib-internal.h
-index 93d621b..5ccb617 100644
---- a/girepository/gitypelib-internal.h
-+++ b/girepository/gitypelib-internal.h
-@@ -465,6 +465,8 @@ typedef struct {
- * freeing the container, but not its contents.
- * @skip_return: Indicates that the return value is only useful in C and should
- * be skipped.
-+ * @instance_transfer_ownership: When calling, the function assumes ownership of
-+ * the instance parameter.
- * @reserved: Reserved for future use.
- * @n_arguments: The number of arguments that this function expects, also the
- * length of the array of ArgBlobs.
-@@ -479,7 +481,8 @@ typedef struct {
- guint16 caller_owns_return_value : 1;
- guint16 caller_owns_return_container : 1;
- guint16 skip_return : 1;
-- guint16 reserved :12;
-+ guint16 instance_transfer_ownership : 1;
-+ guint16 reserved :11;
-
- guint16 n_arguments;
-
-diff --git a/tests/repository/gitypelibtest.c b/tests/repository/gitypelibtest.c
-index 565c95c..7b9cb35 100644
---- a/tests/repository/gitypelibtest.c
-+++ b/tests/repository/gitypelibtest.c
-@@ -276,6 +276,34 @@ test_signal_array_len (GIRepository * repo)
- g_base_info_unref (testobj_info);
- }
-
-+static void
-+test_instance_transfer_ownership (GIRepository * repo)
-+{
-+ GIObjectInfo *testobj_info;
-+ GIFunctionInfo *func_info;
-+ GITransfer transfer;
-+
-+ g_assert (g_irepository_require (repo, "Regress", NULL, 0, NULL));
-+ testobj_info = g_irepository_find_by_name (repo, "Regress", "TestObj");
-+ g_assert (testobj_info != NULL);
-+
-+ func_info = g_object_info_find_method (testobj_info, "instance_method");
-+ g_assert (func_info != NULL);
-+ transfer = g_callable_info_get_instance_ownership_transfer ((GICallableInfo*) func_info);
-+ g_assert_cmpint (GI_TRANSFER_NOTHING, ==, transfer);
-+
-+ g_base_info_unref (func_info);
-+
-+ func_info = g_object_info_find_method (testobj_info, "instance_method_full");
-+ g_assert (func_info != NULL);
-+ transfer = g_callable_info_get_instance_ownership_transfer ((GICallableInfo*) func_info);
-+ g_assert_cmpint (GI_TRANSFER_EVERYTHING, ==, transfer);
-+
-+ g_base_info_unref (func_info);
-+
-+ g_base_info_unref (testobj_info);
-+}
-+
- int
- main (int argc, char **argv)
- {
-@@ -292,6 +320,7 @@ main (int argc, char **argv)
- test_hash_with_cairo_typelib (repo);
- test_char_types (repo);
- test_signal_array_len (repo);
-+ test_instance_transfer_ownership (repo);
-
- exit (0);
- }
-diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.TestObj.instance_method_full.page b/tests/scanner/Regress-1.0-C-expected/Regress.TestObj.instance_method_full.page
-new file mode 100644
-index 0000000..2222bec
---- /dev/null
-+++ b/tests/scanner/Regress-1.0-C-expected/Regress.TestObj.instance_method_full.page
-@@ -0,0 +1,38 @@
-+<?xml version="1.0"?>
-+<page id="Regress.TestObj.instance_method_full"
-+ type="topic"
-+ style="method"
-+ xmlns="http://projectmallard.org/1.0/"
-+ xmlns:api="http://projectmallard.org/experimental/api/"
-+ xmlns:ui="http://projectmallard.org/1.0/ui/">
-+ <info>
-+ <link xref="Regress.TestObj" group="method" type="guide"/>
-+ <api:function>
-+ <api:returns>
-+ <api:type>void</api:type>
-+ </api:returns>
-+ <api:name>regress_test_obj_instance_method_full</api:name>
-+ <api:arg>
-+ <api:type>RegressTestObj*</api:type>
-+ <api:name>obj</api:name>
-+ </api:arg>
-+ </api:function>
-+ </info>
-+ <title>regress_test_obj_instance_method_full</title>
-+ <synopsis><code mime="text/x-csrc">
-+void regress_test_obj_instance_method_full (RegressTestObj* obj);
-+ </code></synopsis>
-+
-+
-+<terms>
-+<item>
-+<title><code>obj</code></title>
-+
-+</item>
-+<item>
-+<title><code>Returns</code></title>
-+
-+</item>
-+</terms>
-+
-+</page>
-diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj.instance_method_full.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj.instance_method_full.page
-new file mode 100644
-index 0000000..5b7e1c9
---- /dev/null
-+++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj.instance_method_full.page
-@@ -0,0 +1,26 @@
-+<?xml version="1.0"?>
-+<page id="Regress.TestObj.instance_method_full"
-+ type="topic"
-+ style="method"
-+ xmlns="http://projectmallard.org/1.0/"
-+ xmlns:api="http://projectmallard.org/experimental/api/"
-+ xmlns:ui="http://projectmallard.org/1.0/ui/">
-+ <info>
-+ <link xref="Regress.TestObj" group="method" type="guide"/>
-+ <api:function>
-+ <api:returns>
-+ <api:type>void</api:type>
-+ </api:returns>
-+ <api:name>regress_test_obj_instance_method_full</api:name>
-+ </api:function>
-+ </info>
-+ <title>Regress.TestObj.prototype.instance_method_full</title>
-+ <synopsis><code mime="text/x-gjs">
-+function instance_method_full(): void {
-+ // Gjs wrapper for regress_test_obj_instance_method_full()
-+}
-+ </code></synopsis>
-+
-+
-+
-+</page>
-diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj.instance_method_full.page b/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj.instance_method_full.page
-new file mode 100644
-index 0000000..2b5c1dc
---- /dev/null
-+++ b/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj.instance_method_full.page
-@@ -0,0 +1,37 @@
-+<?xml version="1.0"?>
-+<page id="Regress.TestObj.instance_method_full"
-+ type="topic"
-+ style="method"
-+ xmlns="http://projectmallard.org/1.0/"
-+ xmlns:api="http://projectmallard.org/experimental/api/"
-+ xmlns:ui="http://projectmallard.org/1.0/ui/">
-+ <info>
-+ <link xref="Regress.TestObj" group="method" type="guide"/>
-+ <api:function>
-+ <api:returns>
-+ <api:type>none</api:type>
-+ </api:returns>
-+ <api:name>regress_test_obj_instance_method_full</api:name>
-+ <api:arg>
-+ <api:type>Regress.TestObj</api:type>
-+ <api:name>self</api:name>
-+ </api:arg>
-+ </api:function>
-+ </info>
-+ <title>Regress.TestObj.instance_method_full</title>
-+ <synopsis><code mime="text/x-python">
-+@accepts(Regress.TestObj)
-+@returns(none)
-+def instance_method_full(self):
-+ # Python wrapper for regress_test_obj_instance_method_full()
-+ </code></synopsis>
-+
-+
-+<terms>
-+<item>
-+<title><code>self</code></title>
-+
-+</item>
-+</terms>
-+
-+</page>
-diff --git a/tests/scanner/Regress-1.0-expected.gir b/tests/scanner/Regress-1.0-expected.gir
-index 1c9c300..89ecaa4 100644
---- a/tests/scanner/Regress-1.0-expected.gir
-+++ b/tests/scanner/Regress-1.0-expected.gir
-@@ -3057,6 +3057,17 @@ case.</doc>
- </parameter>
- </parameters>
- </method>
-+ <method name="instance_method_full"
-+ c:identifier="regress_test_obj_instance_method_full">
-+ <return-value transfer-ownership="none">
-+ <type name="none" c:type="void"/>
-+ </return-value>
-+ <parameters>
-+ <instance-parameter name="obj" transfer-ownership="full">
-+ <type name="TestObj" c:type="RegressTestObj*"/>
-+ </instance-parameter>
-+ </parameters>
-+ </method>
- <method name="set_bare" c:identifier="regress_test_obj_set_bare">
- <return-value transfer-ownership="none">
- <type name="none" c:type="void"/>
-diff --git a/tests/scanner/Regress-1.0-sections-expected.txt b/tests/scanner/Regress-1.0-sections-expected.txt
-index c9ff60a..187aa16 100644
---- a/tests/scanner/Regress-1.0-sections-expected.txt
-+++ b/tests/scanner/Regress-1.0-sections-expected.txt
-@@ -334,6 +334,7 @@ regress_test_obj_emit_sig_with_uint64
- regress_forced_method
- regress_test_obj_instance_method
- regress_test_obj_instance_method_callback
-+regress_test_obj_instance_method_full
- regress_test_obj_set_bare
- regress_test_obj_skip_inout_param
- regress_test_obj_skip_out_param
-diff --git a/tests/scanner/regress.c b/tests/scanner/regress.c
-index 1bad36e..b42e0cd 100644
---- a/tests/scanner/regress.c
-+++ b/tests/scanner/regress.c
-@@ -2679,6 +2679,17 @@ regress_test_obj_instance_method (RegressTestObj *obj)
- return -1;
- }
-
-+/**
-+ * regress_test_obj_instance_method_full:
-+ * @obj: (transfer full):
-+ *
-+ */
-+void
-+regress_test_obj_instance_method_full (RegressTestObj *obj)
-+{
-+ g_object_unref (obj);
-+}
-+
- double
- regress_test_obj_static_method (int x)
- {
-diff --git a/tests/scanner/regress.h b/tests/scanner/regress.h
-index e2e645b..667f129 100644
---- a/tests/scanner/regress.h
-+++ b/tests/scanner/regress.h
-@@ -527,6 +527,7 @@ void regress_test_obj_emit_sig_with_foreign_struct (RegressTestObj *obj);
- void regress_test_obj_emit_sig_with_int64 (RegressTestObj *obj);
- void regress_test_obj_emit_sig_with_uint64 (RegressTestObj *obj);
- int regress_test_obj_instance_method (RegressTestObj *obj);
-+void regress_test_obj_instance_method_full (RegressTestObj *obj);
- double regress_test_obj_static_method (int x);
- void regress_forced_method (RegressTestObj *obj);
-
---
-cgit v0.10.1
-
diff --git a/dev-libs/gobject-introspection/gobject-introspection-1.40.0-r2.ebuild b/dev-libs/gobject-introspection/gobject-introspection-1.40.0-r2.ebuild
deleted file mode 100644
index 0ba67d9..0000000
--- a/dev-libs/gobject-introspection/gobject-introspection-1.40.0-r2.ebuild
+++ /dev/null
@@ -1,79 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-GCONF_DEBUG="no"
-PYTHON_COMPAT=( python2_7 )
-PYTHON_REQ_USE="xml"
-
-inherit eutils gnome2 python-single-r1 toolchain-funcs versionator
-
-DESCRIPTION="Introspection infrastructure for generating gobject library bindings for various languages"
-HOMEPAGE="https://wiki.gnome.org/Projects/GObjectIntrospection"
-
-LICENSE="LGPL-2+ GPL-2+"
-SLOT="0"
-IUSE="cairo doctool test"
-REQUIRED_USE="
- ${PYTHON_REQUIRED_USE}
- test? ( cairo )
-"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-
-# virtual/pkgconfig needed at runtime, bug #505408
-# We force glib and goi to be in sync by this way as explained in bug #518424
-RDEPEND="
- >=dev-libs/gobject-introspection-common-${PV}
- >=dev-libs/glib-2.$(get_version_component_range 2):2
- doctool? ( dev-python/mako )
- virtual/libffi:=
- virtual/pkgconfig
- !<dev-lang/vala-0.20.0
- ${PYTHON_DEPS}
-"
-# Wants real bison, not virtual/yacc
-DEPEND="${RDEPEND}
- >=dev-util/gtk-doc-am-1.19
- sys-devel/bison
- sys-devel/flex
-"
-# PDEPEND to avoid circular dependencies, bug #391213
-PDEPEND="cairo? ( x11-libs/cairo[glib] )"
-
-pkg_setup() {
- python-single-r1_pkg_setup
-}
-
-src_prepare() {
- # Prevent gjs crashes, bug #523608 (from 'master')
- epatch "${FILESDIR}/${PN}-1.40.0-gjs-crash.patch"
- gnome2_src_prepare
-}
-
-src_configure() {
- if ! has_version "x11-libs/cairo[glib]"; then
- # Bug #391213: enable cairo-gobject support even if it's not installed
- # We only PDEPEND on cairo to avoid circular dependencies
- export CAIRO_LIBS="-lcairo -lcairo-gobject"
- export CAIRO_CFLAGS="-I${EPREFIX}/usr/include/cairo"
- fi
-
- # To prevent crosscompiling problems, bug #414105
- gnome2_src_configure \
- --disable-static \
- CC=$(tc-getCC) \
- YACC=$(type -p yacc) \
- $(use_with cairo) \
- $(use_enable doctool)
-}
-
-src_install() {
- DOCS="AUTHORS CONTRIBUTORS ChangeLog NEWS README TODO"
- gnome2_src_install
-
- # Prevent collision with gobject-introspection-common
- rm -v "${ED}"usr/share/aclocal/introspection.m4 \
- "${ED}"usr/share/gobject-introspection-1.0/Makefile.introspection || die
- rmdir "${ED}"usr/share/aclocal || die
-}
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-libs/gobject-introspection/files/, dev-libs/gobject-introspection/
@ 2022-01-18 22:25 Sam James
0 siblings, 0 replies; 5+ messages in thread
From: Sam James @ 2022-01-18 22:25 UTC (permalink / raw
To: gentoo-commits
commit: b1cf68faebc69cf8ce20b257bb7e6b185bfac279
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Tue Jan 18 22:25:05 2022 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Tue Jan 18 22:25:05 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b1cf68fa
dev-libs/gobject-introspection: fix build with meson 0.61
Closes: https://bugs.gentoo.org/831427
Signed-off-by: Sam James <sam <AT> gentoo.org>
.../gobject-introspection-1.70.0-meson-0.61.patch | 220 +++++++++++++++++++++
.../gobject-introspection-1.70.0.ebuild | 6 +-
2 files changed, 225 insertions(+), 1 deletion(-)
diff --git a/dev-libs/gobject-introspection/files/gobject-introspection-1.70.0-meson-0.61.patch b/dev-libs/gobject-introspection/files/gobject-introspection-1.70.0-meson-0.61.patch
new file mode 100644
index 000000000000..df1663116ccd
--- /dev/null
+++ b/dev-libs/gobject-introspection/files/gobject-introspection-1.70.0-meson-0.61.patch
@@ -0,0 +1,220 @@
+https://gitlab.gnome.org/GNOME/gobject-introspection/-/commit/effb1e09dee263cdac4ec593e8caf316e6f01fe2.patch
+https://bugs.gentoo.org/831427
+
+From effb1e09dee263cdac4ec593e8caf316e6f01fe2 Mon Sep 17 00:00:00 2001
+From: Emmanuele Bassi <ebassi@gnome.org>
+Date: Tue, 11 Jan 2022 15:51:10 +0000
+Subject: [PATCH] build: Avoid the doctemplates hack
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+The hack that copies the doctemplates directory into the build
+directory has stopped working with newer versions of Meson; while it's
+possible to copy files, custom_target() cannot depend on a directory.
+Additionally, the dependency has always been broken.
+
+Instead, we enumerate the template files—after all, it's not like they
+change a lot—and then we list them as dependencies for the test targets.
+
+Fixes: #414
+---
+ giscanner/doctemplates/devdocs/meson.build | 19 +++++++
+ giscanner/doctemplates/mallard/meson.build | 63 ++++++++++++++++++++++
+ giscanner/meson.build | 14 ++---
+ tests/scanner/meson.build | 24 +++++----
+ 4 files changed, 98 insertions(+), 22 deletions(-)
+ create mode 100644 giscanner/doctemplates/devdocs/meson.build
+ create mode 100644 giscanner/doctemplates/mallard/meson.build
+
+diff --git a/giscanner/doctemplates/devdocs/meson.build b/giscanner/doctemplates/devdocs/meson.build
+new file mode 100644
+index 00000000..2037182a
+--- /dev/null
++++ b/giscanner/doctemplates/devdocs/meson.build
+@@ -0,0 +1,19 @@
++doc_templates += files([
++ 'Gjs/_doc.tmpl',
++ 'Gjs/_index.tmpl',
++ 'Gjs/_method.tmpl',
++ 'Gjs/_methods.tmpl',
++ 'Gjs/_properties.tmpl',
++ 'Gjs/_signals.tmpl',
++ 'Gjs/_staticmethods.tmpl',
++ 'Gjs/_vfuncs.tmpl',
++ 'Gjs/base.tmpl',
++ 'Gjs/callback.tmpl',
++ 'Gjs/class.tmpl',
++ 'Gjs/default.tmpl',
++ 'Gjs/enum.tmpl',
++ 'Gjs/function.tmpl',
++ 'Gjs/interface.tmpl',
++ 'Gjs/method.tmpl',
++ 'Gjs/namespace.tmpl',
++])
+diff --git a/giscanner/doctemplates/mallard/meson.build b/giscanner/doctemplates/mallard/meson.build
+new file mode 100644
+index 00000000..5fe4e2af
+--- /dev/null
++++ b/giscanner/doctemplates/mallard/meson.build
+@@ -0,0 +1,63 @@
++base_templates = files([
++ 'base.tmpl',
++ 'class.tmpl',
++ 'namespace.tmpl',
++])
++
++c_templates = files([
++ 'C/callback.tmpl',
++ 'C/class.tmpl',
++ 'C/constructor.tmpl',
++ 'C/default.tmpl',
++ 'C/enum.tmpl',
++ 'C/field.tmpl',
++ 'C/function.tmpl',
++ 'C/interface.tmpl',
++ 'C/method.tmpl',
++ 'C/namespace.tmpl',
++ 'C/property.tmpl',
++ 'C/record.tmpl',
++ 'C/signal.tmpl',
++ 'C/vfunc.tmpl',
++])
++
++gjs_templates = files([
++ 'Gjs/callback.tmpl',
++ 'Gjs/class.tmpl',
++ 'Gjs/constructor.tmpl',
++ 'Gjs/default.tmpl',
++ 'Gjs/enum.tmpl',
++ 'Gjs/field.tmpl',
++ 'Gjs/function.tmpl',
++ 'Gjs/interface.tmpl',
++ 'Gjs/method.tmpl',
++ 'Gjs/namespace.tmpl',
++ 'Gjs/property.tmpl',
++ 'Gjs/record.tmpl',
++ 'Gjs/signal.tmpl',
++ 'Gjs/vfunc.tmpl',
++])
++
++py_templates = files([
++ 'Python/callback.tmpl',
++ 'Python/class.tmpl',
++ 'Python/constructor.tmpl',
++ 'Python/default.tmpl',
++ 'Python/enum.tmpl',
++ 'Python/field.tmpl',
++ 'Python/function.tmpl',
++ 'Python/interface.tmpl',
++ 'Python/method.tmpl',
++ 'Python/namespace.tmpl',
++ 'Python/property.tmpl',
++ 'Python/record.tmpl',
++ 'Python/signal.tmpl',
++ 'Python/vfunc.tmpl',
++])
++
++doc_templates += [
++ base_templates,
++ c_templates,
++ gjs_templates,
++ py_templates,
++]
+diff --git a/giscanner/meson.build b/giscanner/meson.build
+index 41edcd44..3d7dc678 100644
+--- a/giscanner/meson.build
++++ b/giscanner/meson.build
+@@ -53,17 +53,9 @@ configure_file(input : '../girepository/gdump.c',
+
+ install_subdir('doctemplates', install_dir: giscannerdir)
+
+-# XXX: this doesn't track the input, but there is nothing to copy many files
+-# in meson.
+-doc_templates = custom_target('copy-templates',
+- input : 'doctemplates',
+- output : 'doctemplates',
+- command : [
+- python, '-c',
+- 'import sys, shutil;' +
+- 'shutil.rmtree(sys.argv[2], ignore_errors=True);' +
+- 'shutil.copytree(sys.argv[1], sys.argv[2])',
+- '@INPUT@', '@OUTPUT@'])
++doc_templates = []
++subdir('doctemplates/devdocs')
++subdir('doctemplates/mallard')
+
+ flex = find_program('flex', 'win_flex')
+ bison = find_program('bison', 'win_bison')
+diff --git a/tests/scanner/meson.build b/tests/scanner/meson.build
+index 5176b957..b81b3fd5 100644
+--- a/tests/scanner/meson.build
++++ b/tests/scanner/meson.build
+@@ -525,19 +525,26 @@ foreach gir : test_girs
+ endforeach
+
+ if has_girdoctool and glib_dep.type_name() == 'pkgconfig'
++ doctool_env = environment()
++ doctool_env.set('srcdir', meson.current_source_dir())
++ doctool_env.set('builddir', meson.current_build_dir())
++
+ foreach language : ['C', 'Python', 'Gjs']
+ regress_docs = custom_target(
+ 'generate-docs-' + language,
+ input: regress_gir,
+- depends: [doc_templates],
++ depend_files: doc_templates,
+ build_by_default: not cairo_deps_found,
++ env: doctool_env,
+ output: 'Regress-1.0-' + language,
+ command: [
+ python, girdoctool,
+ '--add-include-path=' + join_paths(build_root, 'gir'),
+ '--add-include-path=' + meson.current_build_dir(),
+ '--language', language,
+- '@INPUT@', '-o', '@OUTPUT@'],
++ '--templates-dir=' + join_paths(meson.current_source_dir(), '../../giscanner/doctemplates'),
++ '@INPUT@', '-o', '@OUTPUT@',
++ ],
+ )
+
+ if cairo_deps_found
+@@ -546,10 +553,7 @@ if has_girdoctool and glib_dep.type_name() == 'pkgconfig'
+ python,
+ args: [gi_tester, 'Regress-1.0-' + language],
+ depends: [regress_docs],
+- env: [
+- 'srcdir=' + meson.current_source_dir(),
+- 'builddir=' + meson.current_build_dir(),
+- ],
++ env: doctool_env,
+ )
+ endif
+ endforeach
+@@ -557,9 +561,10 @@ if has_girdoctool and glib_dep.type_name() == 'pkgconfig'
+ regress_sections = custom_target(
+ 'generate-docs-sections',
+ input: regress_gir,
+- depends: [doc_templates],
++ depend_files: [doc_templates],
+ build_by_default: not cairo_deps_found,
+ output: 'Regress-1.0-sections.txt',
++ env: doctool_env,
+ command: [
+ python, girdoctool,
+ '--add-include-path=' + join_paths(build_root, 'gir'),
+@@ -574,10 +579,7 @@ if has_girdoctool and glib_dep.type_name() == 'pkgconfig'
+ python,
+ args: [gi_tester, 'Regress-1.0-sections.txt'],
+ depends: [regress_sections],
+- env: [
+- 'srcdir=' + meson.current_source_dir(),
+- 'builddir=' + meson.current_build_dir(),
+- ],
++ env: doctool_env,
+ )
+ endif
+ endif
+--
+GitLab
+
diff --git a/dev-libs/gobject-introspection/gobject-introspection-1.70.0.ebuild b/dev-libs/gobject-introspection/gobject-introspection-1.70.0.ebuild
index fed69d6f20c8..ee6705aed0e9 100644
--- a/dev-libs/gobject-introspection/gobject-introspection-1.70.0.ebuild
+++ b/dev-libs/gobject-introspection/gobject-introspection-1.70.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -48,6 +48,10 @@ DEPEND="${RDEPEND}
)
"
+PATCHES=(
+ "${FILESDIR}"/${P}-meson-0.61.patch
+)
+
pkg_setup() {
python-single-r1_pkg_setup
}
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-libs/gobject-introspection/files/, dev-libs/gobject-introspection/
@ 2022-01-27 1:23 Sam James
0 siblings, 0 replies; 5+ messages in thread
From: Sam James @ 2022-01-27 1:23 UTC (permalink / raw
To: gentoo-commits
commit: e47f971b066fc1655eca431dff1f3a888d91cded
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Thu Jan 27 01:22:04 2022 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Thu Jan 27 01:23:21 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e47f971b
dev-libs/gobject-introspection: add additional meson 0.61 patches
I'd missed additional upstream commits when fixing the initial Meson 0.61
bug we had reported which led to build failures with USE=doctool not being
fixed.
This now includes (additionally):
- https://gitlab.gnome.org/GNOME/gobject-introspection/-/commit/827494d6415b696a98fa195cbd883b50cc893bfc.patch
- https://gitlab.gnome.org/GNOME/gobject-introspection/-/commit/7c1178069f1c58a05ec56a94ca6ba124215a947b.patch
Bug: https://bugs.gentoo.org/831427
Closes: https://bugs.gentoo.org/831463
Signed-off-by: Sam James <sam <AT> gentoo.org>
dev-libs/gobject-introspection/Manifest | 1 +
.../gobject-introspection-1.70.0-meson-0.61.patch | 220 ---------------------
.../gobject-introspection-1.70.0.ebuild | 3 +-
3 files changed, 3 insertions(+), 221 deletions(-)
diff --git a/dev-libs/gobject-introspection/Manifest b/dev-libs/gobject-introspection/Manifest
index b731b07ae141..4dd84dca0b07 100644
--- a/dev-libs/gobject-introspection/Manifest
+++ b/dev-libs/gobject-introspection/Manifest
@@ -1 +1,2 @@
+DIST gobject-introspection-1.70.0-meson-0.61.patch.bz2 4211 BLAKE2B 0453266900dfdf24da3531d205fe03d8eb5f6e3d76db4b945852453dc46d26a77449f0ddd81bad6df6d8108d8a7369b60a07b7c4f8e0c01811f735da76cf4d56 SHA512 ba5861baaabfe20185d85ccbc02425d1e44c525a5d05c28ee84552c43ab30497bed4e713e6f1b2f9c6508714020b04b5228532e1489e8a732ba99ea61ca950c7
DIST gobject-introspection-1.70.0.tar.xz 1029372 BLAKE2B a649ea77b2b7ca392202e21a7f4814aafe57afea7fedb39e78f1df1cd97d0437207c3807a51ece6c9e9bce51fdf961ee7438ccd4efd84b45dbdb57ae19a39272 SHA512 216b376ed423f607e36c723dd6b67975dbfb63c253f2d8bd0b3661e3d69f8c8059cf221db8c5260b0262fad1b7d738f3b2e5fbd51fdbc31e40ccb115c209baf0
diff --git a/dev-libs/gobject-introspection/files/gobject-introspection-1.70.0-meson-0.61.patch b/dev-libs/gobject-introspection/files/gobject-introspection-1.70.0-meson-0.61.patch
deleted file mode 100644
index df1663116ccd..000000000000
--- a/dev-libs/gobject-introspection/files/gobject-introspection-1.70.0-meson-0.61.patch
+++ /dev/null
@@ -1,220 +0,0 @@
-https://gitlab.gnome.org/GNOME/gobject-introspection/-/commit/effb1e09dee263cdac4ec593e8caf316e6f01fe2.patch
-https://bugs.gentoo.org/831427
-
-From effb1e09dee263cdac4ec593e8caf316e6f01fe2 Mon Sep 17 00:00:00 2001
-From: Emmanuele Bassi <ebassi@gnome.org>
-Date: Tue, 11 Jan 2022 15:51:10 +0000
-Subject: [PATCH] build: Avoid the doctemplates hack
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-The hack that copies the doctemplates directory into the build
-directory has stopped working with newer versions of Meson; while it's
-possible to copy files, custom_target() cannot depend on a directory.
-Additionally, the dependency has always been broken.
-
-Instead, we enumerate the template files—after all, it's not like they
-change a lot—and then we list them as dependencies for the test targets.
-
-Fixes: #414
----
- giscanner/doctemplates/devdocs/meson.build | 19 +++++++
- giscanner/doctemplates/mallard/meson.build | 63 ++++++++++++++++++++++
- giscanner/meson.build | 14 ++---
- tests/scanner/meson.build | 24 +++++----
- 4 files changed, 98 insertions(+), 22 deletions(-)
- create mode 100644 giscanner/doctemplates/devdocs/meson.build
- create mode 100644 giscanner/doctemplates/mallard/meson.build
-
-diff --git a/giscanner/doctemplates/devdocs/meson.build b/giscanner/doctemplates/devdocs/meson.build
-new file mode 100644
-index 00000000..2037182a
---- /dev/null
-+++ b/giscanner/doctemplates/devdocs/meson.build
-@@ -0,0 +1,19 @@
-+doc_templates += files([
-+ 'Gjs/_doc.tmpl',
-+ 'Gjs/_index.tmpl',
-+ 'Gjs/_method.tmpl',
-+ 'Gjs/_methods.tmpl',
-+ 'Gjs/_properties.tmpl',
-+ 'Gjs/_signals.tmpl',
-+ 'Gjs/_staticmethods.tmpl',
-+ 'Gjs/_vfuncs.tmpl',
-+ 'Gjs/base.tmpl',
-+ 'Gjs/callback.tmpl',
-+ 'Gjs/class.tmpl',
-+ 'Gjs/default.tmpl',
-+ 'Gjs/enum.tmpl',
-+ 'Gjs/function.tmpl',
-+ 'Gjs/interface.tmpl',
-+ 'Gjs/method.tmpl',
-+ 'Gjs/namespace.tmpl',
-+])
-diff --git a/giscanner/doctemplates/mallard/meson.build b/giscanner/doctemplates/mallard/meson.build
-new file mode 100644
-index 00000000..5fe4e2af
---- /dev/null
-+++ b/giscanner/doctemplates/mallard/meson.build
-@@ -0,0 +1,63 @@
-+base_templates = files([
-+ 'base.tmpl',
-+ 'class.tmpl',
-+ 'namespace.tmpl',
-+])
-+
-+c_templates = files([
-+ 'C/callback.tmpl',
-+ 'C/class.tmpl',
-+ 'C/constructor.tmpl',
-+ 'C/default.tmpl',
-+ 'C/enum.tmpl',
-+ 'C/field.tmpl',
-+ 'C/function.tmpl',
-+ 'C/interface.tmpl',
-+ 'C/method.tmpl',
-+ 'C/namespace.tmpl',
-+ 'C/property.tmpl',
-+ 'C/record.tmpl',
-+ 'C/signal.tmpl',
-+ 'C/vfunc.tmpl',
-+])
-+
-+gjs_templates = files([
-+ 'Gjs/callback.tmpl',
-+ 'Gjs/class.tmpl',
-+ 'Gjs/constructor.tmpl',
-+ 'Gjs/default.tmpl',
-+ 'Gjs/enum.tmpl',
-+ 'Gjs/field.tmpl',
-+ 'Gjs/function.tmpl',
-+ 'Gjs/interface.tmpl',
-+ 'Gjs/method.tmpl',
-+ 'Gjs/namespace.tmpl',
-+ 'Gjs/property.tmpl',
-+ 'Gjs/record.tmpl',
-+ 'Gjs/signal.tmpl',
-+ 'Gjs/vfunc.tmpl',
-+])
-+
-+py_templates = files([
-+ 'Python/callback.tmpl',
-+ 'Python/class.tmpl',
-+ 'Python/constructor.tmpl',
-+ 'Python/default.tmpl',
-+ 'Python/enum.tmpl',
-+ 'Python/field.tmpl',
-+ 'Python/function.tmpl',
-+ 'Python/interface.tmpl',
-+ 'Python/method.tmpl',
-+ 'Python/namespace.tmpl',
-+ 'Python/property.tmpl',
-+ 'Python/record.tmpl',
-+ 'Python/signal.tmpl',
-+ 'Python/vfunc.tmpl',
-+])
-+
-+doc_templates += [
-+ base_templates,
-+ c_templates,
-+ gjs_templates,
-+ py_templates,
-+]
-diff --git a/giscanner/meson.build b/giscanner/meson.build
-index 41edcd44..3d7dc678 100644
---- a/giscanner/meson.build
-+++ b/giscanner/meson.build
-@@ -53,17 +53,9 @@ configure_file(input : '../girepository/gdump.c',
-
- install_subdir('doctemplates', install_dir: giscannerdir)
-
--# XXX: this doesn't track the input, but there is nothing to copy many files
--# in meson.
--doc_templates = custom_target('copy-templates',
-- input : 'doctemplates',
-- output : 'doctemplates',
-- command : [
-- python, '-c',
-- 'import sys, shutil;' +
-- 'shutil.rmtree(sys.argv[2], ignore_errors=True);' +
-- 'shutil.copytree(sys.argv[1], sys.argv[2])',
-- '@INPUT@', '@OUTPUT@'])
-+doc_templates = []
-+subdir('doctemplates/devdocs')
-+subdir('doctemplates/mallard')
-
- flex = find_program('flex', 'win_flex')
- bison = find_program('bison', 'win_bison')
-diff --git a/tests/scanner/meson.build b/tests/scanner/meson.build
-index 5176b957..b81b3fd5 100644
---- a/tests/scanner/meson.build
-+++ b/tests/scanner/meson.build
-@@ -525,19 +525,26 @@ foreach gir : test_girs
- endforeach
-
- if has_girdoctool and glib_dep.type_name() == 'pkgconfig'
-+ doctool_env = environment()
-+ doctool_env.set('srcdir', meson.current_source_dir())
-+ doctool_env.set('builddir', meson.current_build_dir())
-+
- foreach language : ['C', 'Python', 'Gjs']
- regress_docs = custom_target(
- 'generate-docs-' + language,
- input: regress_gir,
-- depends: [doc_templates],
-+ depend_files: doc_templates,
- build_by_default: not cairo_deps_found,
-+ env: doctool_env,
- output: 'Regress-1.0-' + language,
- command: [
- python, girdoctool,
- '--add-include-path=' + join_paths(build_root, 'gir'),
- '--add-include-path=' + meson.current_build_dir(),
- '--language', language,
-- '@INPUT@', '-o', '@OUTPUT@'],
-+ '--templates-dir=' + join_paths(meson.current_source_dir(), '../../giscanner/doctemplates'),
-+ '@INPUT@', '-o', '@OUTPUT@',
-+ ],
- )
-
- if cairo_deps_found
-@@ -546,10 +553,7 @@ if has_girdoctool and glib_dep.type_name() == 'pkgconfig'
- python,
- args: [gi_tester, 'Regress-1.0-' + language],
- depends: [regress_docs],
-- env: [
-- 'srcdir=' + meson.current_source_dir(),
-- 'builddir=' + meson.current_build_dir(),
-- ],
-+ env: doctool_env,
- )
- endif
- endforeach
-@@ -557,9 +561,10 @@ if has_girdoctool and glib_dep.type_name() == 'pkgconfig'
- regress_sections = custom_target(
- 'generate-docs-sections',
- input: regress_gir,
-- depends: [doc_templates],
-+ depend_files: [doc_templates],
- build_by_default: not cairo_deps_found,
- output: 'Regress-1.0-sections.txt',
-+ env: doctool_env,
- command: [
- python, girdoctool,
- '--add-include-path=' + join_paths(build_root, 'gir'),
-@@ -574,10 +579,7 @@ if has_girdoctool and glib_dep.type_name() == 'pkgconfig'
- python,
- args: [gi_tester, 'Regress-1.0-sections.txt'],
- depends: [regress_sections],
-- env: [
-- 'srcdir=' + meson.current_source_dir(),
-- 'builddir=' + meson.current_build_dir(),
-- ],
-+ env: doctool_env,
- )
- endif
- endif
---
-GitLab
-
diff --git a/dev-libs/gobject-introspection/gobject-introspection-1.70.0.ebuild b/dev-libs/gobject-introspection/gobject-introspection-1.70.0.ebuild
index 34cad38517a5..6ee20137414c 100644
--- a/dev-libs/gobject-introspection/gobject-introspection-1.70.0.ebuild
+++ b/dev-libs/gobject-introspection/gobject-introspection-1.70.0.ebuild
@@ -9,6 +9,7 @@ inherit gnome.org meson python-single-r1 xdg
DESCRIPTION="Introspection system for GObject-based libraries"
HOMEPAGE="https://wiki.gnome.org/Projects/GObjectIntrospection"
+SRC_URI+=" https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${P}-meson-0.61.patch.bz2"
LICENSE="LGPL-2+ GPL-2+"
SLOT="0"
@@ -49,7 +50,7 @@ DEPEND="${RDEPEND}
"
PATCHES=(
- "${FILESDIR}"/${P}-meson-0.61.patch
+ "${WORKDIR}"/${P}-meson-0.61.patch
)
pkg_setup() {
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-libs/gobject-introspection/files/, dev-libs/gobject-introspection/
@ 2024-09-06 9:29 Michał Górny
0 siblings, 0 replies; 5+ messages in thread
From: Michał Górny @ 2024-09-06 9:29 UTC (permalink / raw
To: gentoo-commits
commit: 7ad11f4f5215243e9853d6de4d12cefbdce74f51
Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Tue Sep 3 05:53:10 2024 +0000
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Fri Sep 6 09:27:51 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7ad11f4f
dev-libs/gobject-introspection: Add a patch for >=setuptools-74
Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>
...object-introspection-1.80.1-setuptools-74.patch | 101 +++++++++++++++++++++
.../gobject-introspection-1.76.1-r2.ebuild | 84 +++++++++++++++++
.../gobject-introspection-1.78.1-r2.ebuild | 88 ++++++++++++++++++
.../gobject-introspection-1.80.1-r2.ebuild | 90 ++++++++++++++++++
4 files changed, 363 insertions(+)
diff --git a/dev-libs/gobject-introspection/files/gobject-introspection-1.80.1-setuptools-74.patch b/dev-libs/gobject-introspection/files/gobject-introspection-1.80.1-setuptools-74.patch
new file mode 100644
index 000000000000..712fafe27946
--- /dev/null
+++ b/dev-libs/gobject-introspection/files/gobject-introspection-1.80.1-setuptools-74.patch
@@ -0,0 +1,101 @@
+From a2139dba59eac283a7f543ed737f038deebddc19 Mon Sep 17 00:00:00 2001
+From: Christoph Reiter <reiter.christoph@gmail.com>
+Date: Wed, 28 Aug 2024 21:26:02 +0200
+Subject: [PATCH] giscanner: remove dependency on distutils.msvccompiler
+
+It was removed with setuptools 74.0.0. Since we still depend on the
+MSVCCompiler class use new_compiler() to get it some other way.
+
+Remove any reference to MSVC9Compiler, which was for Visual Studio 2008
+which we no longer support anyway.
+
+Fixes #515
+---
+ giscanner/ccompiler.py | 7 +++----
+ giscanner/msvccompiler.py | 14 +++++++-------
+ 2 files changed, 10 insertions(+), 11 deletions(-)
+
+diff --git a/giscanner/ccompiler.py b/giscanner/ccompiler.py
+index d0ed70a3c..9a732cd5e 100644
+--- a/giscanner/ccompiler.py
++++ b/giscanner/ccompiler.py
+@@ -26,7 +26,6 @@ import tempfile
+ import sys
+ import distutils
+
+-from distutils.msvccompiler import MSVCCompiler
+ from distutils.unixccompiler import UnixCCompiler
+ from distutils.cygwinccompiler import Mingw32CCompiler
+ from distutils.sysconfig import get_config_vars
+@@ -167,7 +166,7 @@ class CCompiler(object):
+ # Now, create the distutils ccompiler instance based on the info we have.
+ if compiler_name == 'msvc':
+ # For MSVC, we need to create a instance of a subclass of distutil's
+- # MSVC9Compiler class, as it does not provide a preprocess()
++ # MSVCCompiler class, as it does not provide a preprocess()
+ # implementation
+ from . import msvccompiler
+ self.compiler = msvccompiler.get_msvc_compiler()
+@@ -460,7 +459,7 @@ class CCompiler(object):
+ return self.compiler.linker_exe
+
+ def check_is_msvc(self):
+- return isinstance(self.compiler, MSVCCompiler)
++ return self.compiler.compiler_type == "msvc"
+
+ # Private APIs
+ def _set_cpp_options(self, options):
+@@ -486,7 +485,7 @@ class CCompiler(object):
+ # macros for compiling using distutils
+ # get dropped for MSVC builds, so
+ # escape the escape character.
+- if isinstance(self.compiler, MSVCCompiler):
++ if self.check_is_msvc():
+ macro_value = macro_value.replace('\"', '\\\"')
+ macros.append((macro_name, macro_value))
+ elif option.startswith('-U'):
+diff --git a/giscanner/msvccompiler.py b/giscanner/msvccompiler.py
+index 0a5439820..e333a80f5 100644
+--- a/giscanner/msvccompiler.py
++++ b/giscanner/msvccompiler.py
+@@ -19,30 +19,30 @@
+ #
+
+ import os
+-import distutils
++from typing import Type
+
+ from distutils.errors import DistutilsExecError, CompileError
+-from distutils.ccompiler import CCompiler, gen_preprocess_options
++from distutils.ccompiler import CCompiler, gen_preprocess_options, new_compiler
+ from distutils.dep_util import newer
+
+ # Distutil's MSVCCompiler does not provide a preprocess()
+ # Implementation, so do our own here.
+
+
++DistutilsMSVCCompiler: Type = type(new_compiler(compiler="msvc"))
++
++
+ def get_msvc_compiler():
+ return MSVCCompiler()
+
+
+-class MSVCCompiler(distutils.msvccompiler.MSVCCompiler):
++class MSVCCompiler(DistutilsMSVCCompiler):
+
+ def __init__(self, verbose=0, dry_run=0, force=0):
+- super(distutils.msvccompiler.MSVCCompiler, self).__init__()
++ super(DistutilsMSVCCompiler, self).__init__()
+ CCompiler.__init__(self, verbose, dry_run, force)
+ self.__paths = []
+ self.__arch = None # deprecated name
+- if os.name == 'nt':
+- if isinstance(self, distutils.msvc9compiler.MSVCCompiler):
+- self.__version = distutils.msvc9compiler.VERSION
+ self.initialized = False
+ self.preprocess_options = None
+ if self.check_is_clang_cl():
+--
+GitLab
+
diff --git a/dev-libs/gobject-introspection/gobject-introspection-1.76.1-r2.ebuild b/dev-libs/gobject-introspection/gobject-introspection-1.76.1-r2.ebuild
new file mode 100644
index 000000000000..c0dcfeffdea9
--- /dev/null
+++ b/dev-libs/gobject-introspection/gobject-introspection-1.76.1-r2.ebuild
@@ -0,0 +1,84 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{10..11} )
+PYTHON_REQ_USE="xml(+)"
+inherit gnome.org meson python-single-r1 xdg
+
+DESCRIPTION="Introspection system for GObject-based libraries"
+HOMEPAGE="https://wiki.gnome.org/Projects/GObjectIntrospection"
+
+LICENSE="LGPL-2+ GPL-2+"
+SLOT="0"
+IUSE="doctool gtk-doc test"
+RESTRICT="!test? ( test )"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
+
+# virtual/pkgconfig needed at runtime, bug #505408
+RDEPEND="
+ >=dev-libs/gobject-introspection-common-${PV}
+ >=dev-libs/glib-2.75.0:2
+ dev-libs/libffi:=
+ doctool? (
+ $(python_gen_cond_dep '
+ dev-python/mako[${PYTHON_USEDEP}]
+ dev-python/markdown[${PYTHON_USEDEP}]
+ ')
+ )
+ virtual/pkgconfig
+ ${PYTHON_DEPS}
+"
+# Wants real bison, not app-alternatives/yacc
+DEPEND="${RDEPEND}"
+BDEPEND="
+ gtk-doc? (
+ >=dev-util/gtk-doc-1.19
+ app-text/docbook-xml-dtd:4.3
+ app-text/docbook-xml-dtd:4.5
+ )
+ sys-devel/bison
+ app-alternatives/lex
+ test? (
+ x11-libs/cairo[glib]
+ $(python_gen_cond_dep '
+ dev-python/mako[${PYTHON_USEDEP}]
+ dev-python/markdown[${PYTHON_USEDEP}]
+ ')
+ )
+"
+
+PATCHES=(
+ # https://gitlab.gnome.org/GNOME/gobject-introspection/-/merge_requests/490
+ "${FILESDIR}/${PN}-1.80.1-setuptools-74.patch"
+)
+
+pkg_setup() {
+ python-single-r1_pkg_setup
+}
+
+src_configure() {
+ local emesonargs=(
+ $(meson_feature test cairo)
+ $(meson_feature doctool)
+ #-Dglib_src_dir
+ $(meson_use gtk-doc gtk_doc)
+ #-Dcairo_libname
+ -Dpython="${EPYTHON}"
+ #-Dgir_dir_prefix
+ )
+ meson_src_configure
+}
+
+src_install() {
+ meson_src_install
+ python_fix_shebang "${ED}"/usr/bin/
+ python_optimize "${ED}"/usr/$(get_libdir)/gobject-introspection/giscanner
+
+ # Prevent collision with gobject-introspection-common
+ rm -v "${ED}"/usr/share/aclocal/introspection.m4 \
+ "${ED}"/usr/share/gobject-introspection-1.0/Makefile.introspection || die
+ rmdir "${ED}"/usr/share/aclocal || die
+}
diff --git a/dev-libs/gobject-introspection/gobject-introspection-1.78.1-r2.ebuild b/dev-libs/gobject-introspection/gobject-introspection-1.78.1-r2.ebuild
new file mode 100644
index 000000000000..2387e4af0ab7
--- /dev/null
+++ b/dev-libs/gobject-introspection/gobject-introspection-1.78.1-r2.ebuild
@@ -0,0 +1,88 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{10..13} )
+PYTHON_REQ_USE="xml(+)"
+inherit gnome.org meson python-single-r1 xdg
+
+DESCRIPTION="Introspection system for GObject-based libraries"
+HOMEPAGE="https://gi.readthedocs.io"
+
+LICENSE="LGPL-2+ GPL-2+"
+SLOT="0"
+IUSE="doctool gtk-doc test"
+RESTRICT="!test? ( test )"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
+
+# virtual/pkgconfig needed at runtime, bug #505408
+RDEPEND="
+ >=dev-libs/gobject-introspection-common-${PV}
+ >=dev-libs/glib-2.$(($(ver_cut 2) - 1)).0:2
+ dev-libs/libffi:=
+ $(python_gen_cond_dep '
+ dev-python/setuptools[${PYTHON_USEDEP}]
+ ')
+ doctool? (
+ $(python_gen_cond_dep '
+ dev-python/mako[${PYTHON_USEDEP}]
+ dev-python/markdown[${PYTHON_USEDEP}]
+ ')
+ )
+ virtual/pkgconfig
+ ${PYTHON_DEPS}
+"
+# Wants real bison, not app-alternatives/yacc
+DEPEND="${RDEPEND}"
+BDEPEND="
+ gtk-doc? (
+ >=dev-util/gtk-doc-1.19
+ app-text/docbook-xml-dtd:4.3
+ app-text/docbook-xml-dtd:4.5
+ )
+ sys-devel/bison
+ app-alternatives/lex
+ test? (
+ x11-libs/cairo[glib]
+ $(python_gen_cond_dep '
+ dev-python/mako[${PYTHON_USEDEP}]
+ dev-python/markdown[${PYTHON_USEDEP}]
+ ')
+ )
+"
+
+PATCHES=(
+ "${FILESDIR}/${P}-tests-py312.patch"
+ # https://gitlab.gnome.org/GNOME/gobject-introspection/-/merge_requests/490
+ "${FILESDIR}/${PN}-1.80.1-setuptools-74.patch"
+)
+
+pkg_setup() {
+ python-single-r1_pkg_setup
+}
+
+src_configure() {
+ local emesonargs=(
+ $(meson_feature test cairo)
+ $(meson_feature doctool)
+ #-Dglib_src_dir
+ $(meson_use gtk-doc gtk_doc)
+ #-Dcairo_libname
+ -Dpython="${EPYTHON}"
+ #-Dgir_dir_prefix
+ )
+ meson_src_configure
+}
+
+src_install() {
+ meson_src_install
+ python_fix_shebang "${ED}"/usr/bin/
+ python_optimize "${ED}"/usr/$(get_libdir)/gobject-introspection/giscanner
+
+ # Prevent collision with gobject-introspection-common
+ rm -v "${ED}"/usr/share/aclocal/introspection.m4 \
+ "${ED}"/usr/share/gobject-introspection-1.0/Makefile.introspection || die
+ rmdir "${ED}"/usr/share/aclocal || die
+}
diff --git a/dev-libs/gobject-introspection/gobject-introspection-1.80.1-r2.ebuild b/dev-libs/gobject-introspection/gobject-introspection-1.80.1-r2.ebuild
new file mode 100644
index 000000000000..92368b5dd6c0
--- /dev/null
+++ b/dev-libs/gobject-introspection/gobject-introspection-1.80.1-r2.ebuild
@@ -0,0 +1,90 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{10..13} )
+PYTHON_REQ_USE="xml(+)"
+inherit gnome.org meson python-single-r1 xdg
+
+DESCRIPTION="Introspection system for GObject-based libraries"
+HOMEPAGE="https://gi.readthedocs.io/"
+
+LICENSE="LGPL-2+ GPL-2+"
+SLOT="0"
+
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
+
+IUSE="doctool gtk-doc test"
+RESTRICT="!test? ( test )"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+# virtual/pkgconfig needed at runtime, bug #505408
+RDEPEND="
+ >=dev-libs/gobject-introspection-common-${PV}
+ >=dev-libs/glib-2.79.0:2
+ dev-libs/libffi:=
+ $(python_gen_cond_dep '
+ dev-python/setuptools[${PYTHON_USEDEP}]
+ ')
+ doctool? (
+ $(python_gen_cond_dep '
+ dev-python/mako[${PYTHON_USEDEP}]
+ dev-python/markdown[${PYTHON_USEDEP}]
+ ')
+ )
+ virtual/pkgconfig
+ ${PYTHON_DEPS}
+"
+# Wants real bison, not app-alternatives/yacc
+DEPEND="${RDEPEND}"
+BDEPEND="
+ gtk-doc? (
+ >=dev-util/gtk-doc-1.19
+ app-text/docbook-xml-dtd:4.3
+ app-text/docbook-xml-dtd:4.5
+ )
+ sys-devel/bison
+ app-alternatives/lex
+ test? (
+ x11-libs/cairo[glib]
+ $(python_gen_cond_dep '
+ dev-python/mako[${PYTHON_USEDEP}]
+ dev-python/markdown[${PYTHON_USEDEP}]
+ ')
+ )
+"
+
+PATCHES=(
+ # https://gitlab.gnome.org/GNOME/gobject-introspection/-/merge_requests/490
+ "${FILESDIR}/${PN}-1.80.1-setuptools-74.patch"
+)
+
+pkg_setup() {
+ python-single-r1_pkg_setup
+}
+
+src_configure() {
+ local emesonargs=(
+ $(meson_feature test cairo)
+ $(meson_feature doctool)
+ #-Dglib_src_dir
+ $(meson_use gtk-doc gtk_doc)
+ #-Dcairo_libname
+ -Dpython="${EPYTHON}"
+ -Dbuild_introspection_data=true
+ #-Dgir_dir_prefix
+ )
+ meson_src_configure
+}
+
+src_install() {
+ meson_src_install
+ python_fix_shebang "${ED}"/usr/bin/
+ python_optimize "${ED}"/usr/$(get_libdir)/gobject-introspection/giscanner
+
+ # Prevent collision with gobject-introspection-common
+ rm -v "${ED}"/usr/share/aclocal/introspection.m4 \
+ "${ED}"/usr/share/gobject-introspection-1.0/Makefile.introspection || die
+ rmdir "${ED}"/usr/share/aclocal || die
+}
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-libs/gobject-introspection/files/, dev-libs/gobject-introspection/
@ 2025-02-23 5:11 Sam James
0 siblings, 0 replies; 5+ messages in thread
From: Sam James @ 2025-02-23 5:11 UTC (permalink / raw
To: gentoo-commits
commit: 75be2076d0fafa5c6913a4582df724c03ac48422
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sun Feb 23 05:07:16 2025 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sun Feb 23 05:09:06 2025 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=75be2076
dev-libs/gobject-introspection: fix runtime w/ clang + glibc-2.41
Signed-off-by: Sam James <sam <AT> gentoo.org>
...ect-introspection-1.82.0-clang-glibc-2.41.patch | 43 +++++++++++
.../gobject-introspection-1.82.0-r2.ebuild | 89 ++++++++++++++++++++++
2 files changed, 132 insertions(+)
diff --git a/dev-libs/gobject-introspection/files/gobject-introspection-1.82.0-clang-glibc-2.41.patch b/dev-libs/gobject-introspection/files/gobject-introspection-1.82.0-clang-glibc-2.41.patch
new file mode 100644
index 000000000000..e2706b95fbac
--- /dev/null
+++ b/dev-libs/gobject-introspection/files/gobject-introspection-1.82.0-clang-glibc-2.41.patch
@@ -0,0 +1,43 @@
+https://gitlab.gnome.org/GNOME/gobject-introspection/-/issues/519
+https://gitlab.gnome.org/GNOME/gobject-introspection/-/commit/2812471365c75ab51347a9101771128f8ab283ab
+
+From 2812471365c75ab51347a9101771128f8ab283ab Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Bernhard=20Rosenkr=C3=A4nzer?= <bero@lindev.ch>
+Date: Sat, 8 Feb 2025 14:04:12 +0100
+Subject: [PATCH] Handle C99 _Complex declarations
+
+Fixes https://gitlab.gnome.org/GNOME/gobject-introspection/-/issues/519
+--- a/giscanner/scannerlexer.l
++++ b/giscanner/scannerlexer.l
+@@ -211,6 +211,7 @@ stringtext ([^\\\"])|(\\.)
+ "break" { return BREAK; }
+ "case" { return CASE; }
+ "char" { return BASIC_TYPE; }
++"_Complex" { return COMPLEX; }
+ "const" { return CONST; }
+ "continue" { return CONTINUE; }
+ "default" { return DEFAULT; }
+--- a/giscanner/scannerparser.y
++++ b/giscanner/scannerparser.y
+@@ -275,7 +275,7 @@ set_or_merge_base_type (GISourceType *type,
+ %token ELLIPSIS ADDEQ SUBEQ MULEQ DIVEQ MODEQ XOREQ ANDEQ OREQ SL SR
+ %token SLEQ SREQ EQ NOTEQ LTEQ GTEQ ANDAND OROR PLUSPLUS MINUSMINUS ARROW
+
+-%token AUTO BREAK CASE CONST CONTINUE DEFAULT DO ELSE ENUM
++%token AUTO BREAK CASE COMPLEX CONST CONTINUE DEFAULT DO ELSE ENUM
+ %token EXTENSION EXTERN FOR GOTO IF INLINE REGISTER RESTRICT
+ %token RETURN SHORT SIGNED SIZEOF STATIC STRUCT SWITCH THREAD_LOCAL TYPEDEF
+ %token UNION UNSIGNED VOID VOLATILE WHILE
+@@ -907,6 +907,10 @@ type_specifier
+ {
+ $$ = gi_source_type_new (CTYPE_VOID);
+ }
++ | COMPLEX
++ {
++ $$ = gi_source_basic_type_new ("_Complex");
++ }
+ | SIGNED
+ {
+ $$ = gi_source_basic_type_new ("signed");
+--
+GitLab
diff --git a/dev-libs/gobject-introspection/gobject-introspection-1.82.0-r2.ebuild b/dev-libs/gobject-introspection/gobject-introspection-1.82.0-r2.ebuild
new file mode 100644
index 000000000000..474938c2fb4e
--- /dev/null
+++ b/dev-libs/gobject-introspection/gobject-introspection-1.82.0-r2.ebuild
@@ -0,0 +1,89 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{10..13} )
+PYTHON_REQ_USE="xml(+)"
+inherit gnome.org meson python-single-r1 xdg
+
+DESCRIPTION="Introspection system for GObject-based libraries"
+HOMEPAGE="https://gi.readthedocs.io/"
+
+LICENSE="LGPL-2+ GPL-2+"
+SLOT="0"
+
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
+
+IUSE="doctool gtk-doc test"
+RESTRICT="!test? ( test )"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+# virtual/pkgconfig needed at runtime, bug #505408
+RDEPEND="
+ >=dev-libs/gobject-introspection-common-${PV}
+ >=dev-libs/glib-2.82.0:2[introspection]
+ dev-libs/libffi:=
+ $(python_gen_cond_dep '
+ dev-python/setuptools[${PYTHON_USEDEP}]
+ ')
+ doctool? (
+ $(python_gen_cond_dep '
+ dev-python/mako[${PYTHON_USEDEP}]
+ dev-python/markdown[${PYTHON_USEDEP}]
+ ')
+ )
+ virtual/pkgconfig
+ ${PYTHON_DEPS}
+"
+# Wants real bison, not app-alternatives/yacc
+DEPEND="${RDEPEND}"
+BDEPEND="
+ gtk-doc? (
+ >=dev-util/gtk-doc-1.19
+ app-text/docbook-xml-dtd:4.3
+ app-text/docbook-xml-dtd:4.5
+ )
+ sys-devel/bison
+ app-alternatives/lex
+ test? (
+ x11-libs/cairo[glib]
+ $(python_gen_cond_dep '
+ dev-python/mako[${PYTHON_USEDEP}]
+ dev-python/markdown[${PYTHON_USEDEP}]
+ ')
+ )
+"
+
+PATCHES=(
+ "${FILESDIR}"/${P}-clang-glibc-2.41.patch
+)
+
+pkg_setup() {
+ python-single-r1_pkg_setup
+}
+
+src_configure() {
+ local emesonargs=(
+ $(meson_feature test cairo)
+ $(meson_feature doctool)
+ #-Dglib_src_dir
+ $(meson_use gtk-doc gtk_doc)
+ #-Dcairo_libname
+ -Dpython="${EPYTHON}"
+ -Dbuild_introspection_data=true
+ #-Dgir_dir_prefix
+ )
+ meson_src_configure
+}
+
+src_install() {
+ meson_src_install
+ python_fix_shebang "${ED}"/usr/bin/
+ python_optimize "${ED}"/usr/$(get_libdir)/gobject-introspection/giscanner
+
+ # Prevent collision with gobject-introspection-common
+ rm -v "${ED}"/usr/share/aclocal/introspection.m4 \
+ "${ED}"/usr/share/gobject-introspection-1.0/Makefile.introspection || die
+ rmdir "${ED}"/usr/share/aclocal || die
+}
^ permalink raw reply related [flat|nested] 5+ messages in thread
end of thread, other threads:[~2025-02-23 5:12 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2022-01-18 22:25 [gentoo-commits] repo/gentoo:master commit in: dev-libs/gobject-introspection/files/, dev-libs/gobject-introspection/ Sam James
-- strict thread matches above, loose matches on Subject: below --
2025-02-23 5:11 Sam James
2024-09-06 9:29 Michał Górny
2022-01-27 1:23 Sam James
2015-11-14 18:40 Pacho Ramos
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox