commit: a987ab75c8ac435f15f819f97590841025b6b183 Author: Yuan Liao <liaoyuan <AT> gmail <DOT> com> AuthorDate: Fri May 16 12:05:35 2025 +0000 Commit: Yuan Liao <liaoyuan <AT> gmail <DOT> com> CommitDate: Fri May 16 12:05:35 2025 +0000 URL: https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=a987ab75
gui-libs/text-engine: Treeclean Signed-off-by: Yuan Liao <liaoyuan <AT> gmail.com> gui-libs/text-engine/Manifest | 1 - ...ine-0.1.1-fix-Wincompatible-pointer-types.patch | 183 --------------------- .../files/text-engine-0.1.1-fix-Wreturn-type.patch | 31 ---- .../text-engine-0.1.1-fix-package-version.patch | 25 --- gui-libs/text-engine/metadata.xml | 11 -- gui-libs/text-engine/text-engine-0.1.1-r3.ebuild | 52 ------ gui-libs/text-engine/text-engine-9999.ebuild | 46 ------ profiles/package.mask | 8 - 8 files changed, 357 deletions(-) diff --git a/gui-libs/text-engine/Manifest b/gui-libs/text-engine/Manifest deleted file mode 100644 index 6bc42dd54..000000000 --- a/gui-libs/text-engine/Manifest +++ /dev/null @@ -1 +0,0 @@ -DIST text-engine-0.1.1.tar.gz 16568 BLAKE2B 71c6766592aa143413721c36d9282624e4bcd1f8594b5a9c1dde24f30704da690ebad8ae483fb04490ec383f6434c211f0c21c37661ba647c97bcae6241231e6 SHA512 8f3d4e7964d7256c1386200aa4338d8d6ff35e4578e50381b1fcbdc1a232f4da28c74bc8bfe66a5507888197cbf430cac03730d8624381bd5a2b023eecc73736 diff --git a/gui-libs/text-engine/files/text-engine-0.1.1-fix-Wincompatible-pointer-types.patch b/gui-libs/text-engine/files/text-engine-0.1.1-fix-Wincompatible-pointer-types.patch deleted file mode 100644 index 77c3b1840..000000000 --- a/gui-libs/text-engine/files/text-engine-0.1.1-fix-Wincompatible-pointer-types.patch +++ /dev/null @@ -1,183 +0,0 @@ -From 4190331e437081017296033b1202731302771726 Mon Sep 17 00:00:00 2001 -From: oscfdezdz <[email protected]> -Date: Fri, 24 May 2024 20:12:19 +0200 -Subject: [PATCH 1/2] display: Fix incompatible pointer types - ---- - src/ui/display.c | 24 ++++++++++++------------ - 1 file changed, 12 insertions(+), 12 deletions(-) - -diff --git a/src/ui/display.c b/src/ui/display.c -index cea11b9..a9c65f9 100644 ---- a/src/ui/display.c -+++ b/src/ui/display.c -@@ -29,7 +29,7 @@ struct _TextDisplay - - TextFrame *frame; - TextLayout *layout; -- TextLayoutBox *layout_tree; -+ TextNode *layout_tree; - }; - - G_DEFINE_FINAL_TYPE (TextDisplay, text_display, GTK_TYPE_WIDGET) -@@ -120,7 +120,7 @@ layout_snapshot_recursive (GtkWidget *widget, - g_assert (TEXT_IS_LAYOUT_BOX (node)); - - int delta_height; -- layout_snapshot_recursive (widget, node, snapshot, fg_color, &delta_height); -+ layout_snapshot_recursive (widget, TEXT_LAYOUT_BOX (node), snapshot, fg_color, &delta_height); - offset += delta_height; - } - -@@ -158,17 +158,17 @@ text_display_snapshot (GtkWidget *widget, - - // TODO: Don't recreate this each time - do in size allocate instead? - g_clear_object (&self->layout_tree); -- self->layout_tree = text_layout_build_layout_tree (self->layout, -- gtk_widget_get_pango_context (GTK_WIDGET (self)), -- self->frame, -- gtk_widget_get_width (GTK_WIDGET (self))); -+ self->layout_tree = TEXT_NODE (text_layout_build_layout_tree (self->layout, -+ gtk_widget_get_pango_context (GTK_WIDGET (self)), -+ self->frame, -+ gtk_widget_get_width (GTK_WIDGET (self)))); - - GdkRGBA fg_color; - gtk_style_context_get_color (gtk_widget_get_style_context (widget), &fg_color); - - // Display the layout tree - int delta_height; -- layout_snapshot_recursive (widget, self->layout_tree, snapshot, &fg_color, &delta_height); -+ layout_snapshot_recursive (widget, TEXT_LAYOUT_BOX (self->layout_tree), snapshot, &fg_color, &delta_height); - } - - static GtkSizeRequestMode -@@ -192,12 +192,12 @@ text_display_measure (GtkWidget *widget, - PangoContext *context = gtk_widget_get_pango_context (widget); - - g_clear_object (&self->layout_tree); -- self->layout_tree = text_layout_build_layout_tree (self->layout, -- context, -- self->frame, -- for_size); -+ self->layout_tree = TEXT_NODE (text_layout_build_layout_tree (self->layout, -+ context, -+ self->frame, -+ for_size)); - -- *minimum = *natural = text_layout_box_get_bbox (self->layout_tree)->height; -+ *minimum = *natural = text_layout_box_get_bbox (TEXT_LAYOUT_BOX (self->layout_tree))->height; - - g_debug ("Height: %d\n", *minimum); - } --- -2.44.2 - - -From 3defd388148f0ac72a7af995adc632efdf2ba40c Mon Sep 17 00:00:00 2001 -From: Yuan Liao <[email protected]> -Date: Sun, 7 Jul 2024 09:10:51 -0400 -Subject: [PATCH 2/2] layout: Clean g_debug statements to fix - -Wincompatible-pointer-types - -These statements have already been removed in upstream commits -221a5f9480b6ba861e1e53cfbc81f4bdbb821406 and -be5def2b352227c54bf03e68c01596ffa66fd6f8 after v0.1.1 release. These -statements should be for logging purposes only, and their removal should -not affect the package's functionality. ---- - src/layout/layout-box.c | 12 ------------ - src/layout/layout.c | 4 ---- - 2 files changed, 16 deletions(-) - -diff --git a/src/layout/layout-box.c b/src/layout/layout-box.c -index 9c635c9..b93df38 100644 ---- a/src/layout/layout-box.c -+++ b/src/layout/layout-box.c -@@ -111,11 +111,6 @@ text_layout_box_layout (TextLayoutBox *self, - - int height = 0; - -- g_debug ("Starting for %s\n", g_type_name_from_instance (self)); -- -- g_debug ("Has item: %d\n", priv->item != NULL); -- g_debug ("Has paragraph: %d\n", TEXT_IS_PARAGRAPH (priv->item)); -- - if (priv->item && TEXT_IS_PARAGRAPH (priv->item)) - { - GString *str = g_string_new (""); -@@ -126,11 +121,9 @@ text_layout_box_layout (TextLayoutBox *self, - const gchar *run_text; - g_object_get (run, "text", &run_text, NULL); - g_string_append (str, run_text); -- g_debug (" - Counting run\n"); - } - - gchar *text = g_string_free (str, FALSE); -- g_debug (" - String %s\n", text); - - if (!priv->layout) - priv->layout = pango_layout_new (context); -@@ -139,7 +132,6 @@ text_layout_box_layout (TextLayoutBox *self, - pango_layout_set_wrap (priv->layout, PANGO_WRAP_WORD_CHAR); - pango_layout_set_width (priv->layout, PANGO_SCALE * width); - pango_layout_get_pixel_size (priv->layout, NULL, &height); -- g_debug (" - Height %d\n", height); - - g_free (text); - } -@@ -153,14 +145,11 @@ text_layout_box_layout (TextLayoutBox *self, - { - TextLayoutBox *child_box = TEXT_LAYOUT_BOX (node); - -- g_debug (" - Found child\n"); -- - // We can assume bbox already exists by now, as the layout() method - // has been called already in the layout manager. - - TextLayoutBoxPrivate *priv = text_layout_box_get_instance_private (child_box); - height += priv->bbox.height; -- g_debug (" - Child height %d\n", height); - } - - priv->bbox.x = 0; -@@ -175,7 +164,6 @@ text_layout_box_set_item (TextLayoutBox *self, - { - TextLayoutBoxPrivate *priv = text_layout_box_get_instance_private (self); - priv->item = item; -- g_debug ("Set item to non null: %d\n", priv->item != NULL); - } - - TextItem * -diff --git a/src/layout/layout.c b/src/layout/layout.c -index b730455..04cf458 100644 ---- a/src/layout/layout.c -+++ b/src/layout/layout.c -@@ -96,8 +96,6 @@ do_layout_recursive (TextLayout *self, - { - g_assert (TEXT_IS_ITEM (node)); - -- g_debug ("Counting child %s\n", g_type_name_from_instance (node)); -- - // Let's treat paragraphs opaquely for now. In the future, we need - // to manually consider each text run in order for inline equations - // and images. -@@ -107,7 +105,6 @@ do_layout_recursive (TextLayout *self, - text_layout_box_set_item (box, TEXT_ITEM (node)); - - text_node_append_child (TEXT_NODE (parent), TEXT_NODE (box)); -- g_debug ("Added child %s\n", g_type_name_from_instance (node)); - - // TODO: This function should be properly recursive in the future, - // so avoid calling it here. Below should be the only time it is -@@ -117,7 +114,6 @@ do_layout_recursive (TextLayout *self, - } - - text_layout_box_layout (parent, context, width); -- g_debug ("Layout for %s\n", g_type_name_from_instance (parent)); - } - - TextLayoutBox * --- -2.44.2 - diff --git a/gui-libs/text-engine/files/text-engine-0.1.1-fix-Wreturn-type.patch b/gui-libs/text-engine/files/text-engine-0.1.1-fix-Wreturn-type.patch deleted file mode 100644 index 7afa7ff7a..000000000 --- a/gui-libs/text-engine/files/text-engine-0.1.1-fix-Wreturn-type.patch +++ /dev/null @@ -1,31 +0,0 @@ -Judging from the commit message, the main intention of this commit, -which is already staged in the upstream repository for the next release, -did not seem to be to eliminate compiler errors with -Wreturn-type. -However, it _is_ a resolution of the bug. - -Bug: https://bugs.gentoo.org/887649 - -From 749c94d853c0b0e29e79a1b270ec61947b65c319 Mon Sep 17 00:00:00 2001 -From: Matthew Jakeman <[email protected]> -Date: Mon, 6 Jun 2022 16:11:32 +1200 -Subject: [PATCH] fix: Support building on macos - ---- - src/layout/layout.c | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/src/layout/layout.c b/src/layout/layout.c -index dbeb690..32d1845 100644 ---- a/src/layout/layout.c -+++ b/src/layout/layout.c -@@ -129,8 +129,8 @@ text_layout_build_layout_tree (TextLayout *self, - TextFrame *frame, - int width) - { -- g_return_if_fail (TEXT_IS_LAYOUT (self)); -- g_return_if_fail (TEXT_IS_FRAME (frame)); -+ g_return_val_if_fail (TEXT_IS_LAYOUT (self), NULL); -+ g_return_val_if_fail (TEXT_IS_FRAME (frame), NULL); - - TextLayoutBox *root = text_layout_box_new (); - do_layout_recursive (self, root, context, cursor, TEXT_ITEM (frame), width); diff --git a/gui-libs/text-engine/files/text-engine-0.1.1-fix-package-version.patch b/gui-libs/text-engine/files/text-engine-0.1.1-fix-package-version.patch deleted file mode 100644 index 21fe6e5a3..000000000 --- a/gui-libs/text-engine/files/text-engine-0.1.1-fix-package-version.patch +++ /dev/null @@ -1,25 +0,0 @@ -From aac86863fbbf31c5ef557e5030e7a87f85db79af Mon Sep 17 00:00:00 2001 -From: Yuan Liao <[email protected]> -Date: Sat, 30 Jul 2022 07:24:51 -0700 -Subject: [PATCH] meson.build: Correct package version - -Bug: https://bugs.gentoo.org/860015 -Signed-off-by: Yuan Liao <[email protected]> ---- - meson.build | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/meson.build b/meson.build -index dab9b8a..80a505b 100644 ---- a/meson.build -+++ b/meson.build -@@ -1,5 +1,5 @@ - project('text-engine', 'c', -- version: '0.1.0', -+ version: '0.1.1', - meson_version: '>= 0.50.0', - default_options: [ 'warning_level=2', - 'c_std=gnu11', --- -2.35.1 - diff --git a/gui-libs/text-engine/metadata.xml b/gui-libs/text-engine/metadata.xml deleted file mode 100644 index 20643c52a..000000000 --- a/gui-libs/text-engine/metadata.xml +++ /dev/null @@ -1,11 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd";> -<pkgmetadata> - <maintainer type="person"> - <email>[email protected]</email> - <name>Yuan Liao</name> - </maintainer> - <upstream> - <remote-id type="github">mjakeman/text-engine</remote-id> - </upstream> -</pkgmetadata> diff --git a/gui-libs/text-engine/text-engine-0.1.1-r3.ebuild b/gui-libs/text-engine/text-engine-0.1.1-r3.ebuild deleted file mode 100644 index 396604643..000000000 --- a/gui-libs/text-engine/text-engine-0.1.1-r3.ebuild +++ /dev/null @@ -1,52 +0,0 @@ -# Copyright 2022-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit meson - -if [[ ${PV} == *9999 ]]; then - inherit git-r3 - EGIT_REPO_URI="https://github.com/mjakeman/text-engine.git"; -else - SRC_URI="https://github.com/mjakeman/text-engine/archive/v${PV}.tar.gz -> ${P}.tar.gz" - KEYWORDS="~amd64" -fi - -DESCRIPTION="A lightweight rich-text framework for GTK 4" -HOMEPAGE="https://github.com/mjakeman/text-engine"; - -LICENSE="LGPL-3+" -SLOT="0" - -BDEPEND=" - virtual/pkgconfig -" - -COMMON_DEPEND=" - dev-libs/glib:2 - dev-libs/libxml2:2 - gui-libs/gtk:4 -" - -DEPEND=" - ${COMMON_DEPEND} - dev-libs/json-glib -" - -RDEPEND=" - ${COMMON_DEPEND} - x11-libs/pango -" - -PATCHES=( - "${FILESDIR}/${P}-fix-package-version.patch" - "${FILESDIR}/${P}-fix-Wreturn-type.patch" - "${FILESDIR}/${P}-fix-Wincompatible-pointer-types.patch" -) - -src_prepare() { - default - sed -i -e "/subdir('demo')/d" meson.build || - die "Failed to modify meson.build to exclude the demo program" -} diff --git a/gui-libs/text-engine/text-engine-9999.ebuild b/gui-libs/text-engine/text-engine-9999.ebuild deleted file mode 100644 index f03fe156c..000000000 --- a/gui-libs/text-engine/text-engine-9999.ebuild +++ /dev/null @@ -1,46 +0,0 @@ -# Copyright 2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit meson - -if [[ ${PV} == *9999 ]]; then - inherit git-r3 - EGIT_REPO_URI="https://github.com/mjakeman/text-engine.git"; -else - SRC_URI="https://github.com/mjakeman/text-engine/archive/v${PV}.tar.gz -> ${P}.tar.gz" - KEYWORDS="~amd64" -fi - -DESCRIPTION="A lightweight rich-text framework for GTK 4" -HOMEPAGE="https://github.com/mjakeman/text-engine"; - -LICENSE="|| ( MPL-2.0 LGPL-2.1+ )" -SLOT="0" - -BDEPEND=" - virtual/pkgconfig -" - -COMMON_DEPEND=" - >=dev-libs/glib-2.72.0:2 - dev-libs/libxml2:2 - gui-libs/gtk:4 -" - -DEPEND=" - ${COMMON_DEPEND} - dev-libs/json-glib -" - -RDEPEND=" - ${COMMON_DEPEND} - x11-libs/pango -" - -src_prepare() { - default - sed -i -e "/subdir('demo')/d" meson.build || - die "Failed to modify meson.build to exclude the demo program" -} diff --git a/profiles/package.mask b/profiles/package.mask index b4a31d27b..e2d93f9cb 100644 --- a/profiles/package.mask +++ b/profiles/package.mask @@ -115,14 +115,6 @@ dev-python/glicko2 # Bug #954116. dev-ruby/asciidoctor-pdf -# Yuan Liao <[email protected]> (2025-04-16) -# No reverse dependencies left. Was added only for -# <gnome-extra/extension-manager-0.6.0; not widely used by -# other applications. -# Removal on 2025-05-16. -gui-libs/text-engine - - # David Roman <[email protected]> (2025-03-12) # Uses deprecated EGO_SUM. Last release in 2023. # Removal on 2025-05-12
