CVS commit: pkgsrc/net/mikutter

["Izumi Tsutsui" <tsutsui%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   tsutsui
Date:           Fri Mar 13 17:09:50 UTC 2026

Modified Files:
        pkgsrc/net/mikutter: Makefile distinfo
Added Files:
        pkgsrc/net/mikutter/patches: patch-core_mui_cairo__markup__generator.rb
            patch-core_mui_cairo__sub__parts__message__base.rb
            patch-plugin_gtk3_widget_miraclepainter.rb

Log Message:
mikutter: apply upstream patch for pango rendering

Bump PKGREVISION.


To generate a diff of this commit:
cvs rdiff -u -r1.233 -r1.234 pkgsrc/net/mikutter/Makefile
cvs rdiff -u -r1.192 -r1.193 pkgsrc/net/mikutter/distinfo
cvs rdiff -u -r0 -r1.3 \
    pkgsrc/net/mikutter/patches/patch-core_mui_cairo__markup__generator.rb
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/net/mikutter/patches/patch-core_mui_cairo__sub__parts__message__base.rb \
    pkgsrc/net/mikutter/patches/patch-plugin_gtk3_widget_miraclepainter.rb

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/net/mikutter/Makefile
diff -u pkgsrc/net/mikutter/Makefile:1.233 pkgsrc/net/mikutter/Makefile:1.234
--- pkgsrc/net/mikutter/Makefile:1.233  Tue Jan 27 08:40:22 2026
+++ pkgsrc/net/mikutter/Makefile        Fri Mar 13 17:09:49 2026
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.233 2026/01/27 08:40:22 wiz Exp $
+# $NetBSD: Makefile,v 1.234 2026/03/13 17:09:49 tsutsui Exp $
 
 DISTNAME=      mikutter-5.1.1
 PKGNAME=       ${RUBY_PKGPREFIX}-${DISTNAME}
-PKGREVISION=   6
+PKGREVISION=   7
 CATEGORIES=    net
 MASTER_SITES=  https://mikutter.hachune.net/bin/
 

Index: pkgsrc/net/mikutter/distinfo
diff -u pkgsrc/net/mikutter/distinfo:1.192 pkgsrc/net/mikutter/distinfo:1.193
--- pkgsrc/net/mikutter/distinfo:1.192  Sat Feb  8 14:13:53 2025
+++ pkgsrc/net/mikutter/distinfo        Fri Mar 13 17:09:49 2026
@@ -1,7 +1,10 @@
-$NetBSD: distinfo,v 1.192 2025/02/08 14:13:53 tsutsui Exp $
+$NetBSD: distinfo,v 1.193 2026/03/13 17:09:49 tsutsui Exp $
 
 BLAKE2s (mikutter-5.1.1.tar.gz) = 0639e3a47a333237d05ab772f45bc7070e73cbc74f0172571996f4ed41467be3
 SHA512 (mikutter-5.1.1.tar.gz) = 65f52cf0385b8cda1f6714fd47e8bb19a5c7be2e264c9a447af1d266b08d1a8a97d46d347c2e78d5fbb7e90aff88f31372b57154414be3be6fd57a3dfc0863eb
 Size (mikutter-5.1.1.tar.gz) = 2384508 bytes
 SHA1 (patch-core_config.rb) = a3167ba101f840983d9d27ea36252ec5e0b0435d
+SHA1 (patch-core_mui_cairo__markup__generator.rb) = 196b7c8a0bc5384fb189f854e3a5fc695849a520
+SHA1 (patch-core_mui_cairo__sub__parts__message__base.rb) = 661a41e96b4b64d796de9348b46cb6b8f9664301
 SHA1 (patch-mikutter.rb) = 9eaf234bb01f8a429c84d5055537284b7e0450aa
+SHA1 (patch-plugin_gtk3_widget_miraclepainter.rb) = 85e440f46d40f570f5bfc5af772ecebdeb2b9c3d

Added files:

Index: pkgsrc/net/mikutter/patches/patch-core_mui_cairo__markup__generator.rb
diff -u /dev/null pkgsrc/net/mikutter/patches/patch-core_mui_cairo__markup__generator.rb:1.3
--- /dev/null   Fri Mar 13 17:09:50 2026
+++ pkgsrc/net/mikutter/patches/patch-core_mui_cairo__markup__generator.rb      Fri Mar 13 17:09:50 2026
@@ -0,0 +1,29 @@
+$NetBSD: patch-core_mui_cairo__markup__generator.rb,v 1.3 2026/03/13 17:09:50 tsutsui Exp $
+
+- pull fix for upstream ticket #1290
+  https://dev.mikutter.hachune.net/issues/1290
+
+--- core/mui/cairo_markup_generator.rb.orig    2025-02-08 12:21:47.000000000 +0000
++++ core/mui/cairo_markup_generator.rb
+@@ -33,12 +33,19 @@ module Gdk::MarkupGenerator
+   # 表示する際に本文に適用すべき装飾オブジェクトを作成する
+   # ==== Return
+   # Pango::AttrList 本文に適用する装飾
+-  def description_attr_list(attr_list=Pango::AttrList.new, emoji_height: 24)
++  def description_attr_list(attr_list=Pango::AttrList.new, emoji_height: 24, pango_context: nil)
++    descent = 0
++    if pango_context
++      metrics = pango_context.get_metrics(pango_context.font_description, pango_context.language)
++      descent = metrics.descent
++    end
++    height = emoji_height * Pango::SCALE
++    y = -height + descent
+     score.inject(0){|start_index, note|
+       end_index = start_index + note.description.bytesize
+       if UserConfig[:miraclepainter_expand_custom_emoji] && note.respond_to?(:inline_photo)
+         end_index += -note.description.bytesize + 1
+-        rect = Pango::Rectangle.new(0, 0, emoji_height * Pango::SCALE, emoji_height * Pango::SCALE)
++        rect = Pango::Rectangle.new(0, y, height, height)
+         shape = Pango::AttrShape.new(rect, rect, note.inline_photo)
+         shape.start_index = start_index
+         shape.end_index = end_index

Index: pkgsrc/net/mikutter/patches/patch-core_mui_cairo__sub__parts__message__base.rb
diff -u /dev/null pkgsrc/net/mikutter/patches/patch-core_mui_cairo__sub__parts__message__base.rb:1.1
--- /dev/null   Fri Mar 13 17:09:50 2026
+++ pkgsrc/net/mikutter/patches/patch-core_mui_cairo__sub__parts__message__base.rb      Fri Mar 13 17:09:50 2026
@@ -0,0 +1,39 @@
+$NetBSD: patch-core_mui_cairo__sub__parts__message__base.rb,v 1.1 2026/03/13 17:09:50 tsutsui Exp $
+
+- pull fix for upstream ticket #1290
+  https://dev.mikutter.hachune.net/issues/1290
+
+--- core/mui/cairo_sub_parts_message_base.rb.orig      2025-02-08 12:21:47.000000000 +0000
++++ core/mui/cairo_sub_parts_message_base.rb
+@@ -367,7 +367,8 @@ class Gdk::SubPartsMessageBase < Gdk::Su
+       layout.width = (width - icon_width - margin*3 - edge*2) * Pango::SCALE
+       layout.attributes = description_attr_list(
+         message,
+-        emoji_height: layout.context.font_description.forecast_font_size
++        emoji_height: layout.context.font_description.forecast_font_size,
++        pango_context: layout.context
+       )
+       layout.wrap = Pango::WrapMode::CHAR
+       layout.text = plain_description(message)
+@@ -489,12 +490,19 @@ class Gdk::SubPartsMessageBase < Gdk::Su
+   # 表示する際に本文に適用すべき装飾オブジェクトを作成する
+   # ==== Return
+   # Pango::AttrList 本文に適用する装飾
+-  def description_attr_list(message, attr_list: Pango::AttrList.new, emoji_height: 24)
++  def description_attr_list(message, attr_list: Pango::AttrList.new, emoji_height: 24, pango_context: nil)
++    descent = 0
++    if pango_context
++      metrics = pango_context.get_metrics(pango_context.font_description, pango_context.language)
++      descent = metrics.descent
++    end
++    height = emoji_height * Pango::SCALE
++    y = -height + descent
+     score(message).inject(0){|start_index, note|
+       end_index = start_index + note.description.bytesize
+       if UserConfig[:miraclepainter_expand_custom_emoji] && note.respond_to?(:inline_photo)
+         end_index += -note.description.bytesize + 1
+-        rect = Pango::Rectangle.new(0, 0, emoji_height * Pango::SCALE, emoji_height * Pango::SCALE)
++        rect = Pango::Rectangle.new(0, y, height, height)
+         shape = Pango::AttrShape.new(rect, rect, note.inline_photo)
+         shape.start_index = start_index
+         shape.end_index = end_index
Index: pkgsrc/net/mikutter/patches/patch-plugin_gtk3_widget_miraclepainter.rb
diff -u /dev/null pkgsrc/net/mikutter/patches/patch-plugin_gtk3_widget_miraclepainter.rb:1.1
--- /dev/null   Fri Mar 13 17:09:50 2026
+++ pkgsrc/net/mikutter/patches/patch-plugin_gtk3_widget_miraclepainter.rb      Fri Mar 13 17:09:50 2026
@@ -0,0 +1,16 @@
+$NetBSD: patch-plugin_gtk3_widget_miraclepainter.rb,v 1.1 2026/03/13 17:09:50 tsutsui Exp $
+
+- pull fix for upstream ticket #1290
+  https://dev.mikutter.hachune.net/issues/1290
+
+--- plugin/gtk3/widget/miraclepainter.rb.orig  2025-02-08 12:21:47.000000000 +0000
++++ plugin/gtk3/widget/miraclepainter.rb
+@@ -467,7 +467,7 @@ class Plugin::Gtk3::MiraclePainter < Gtk
+     layout.text = plain_description
+     layout.width = main_text_rect.width * Pango::SCALE
+     layout.attributes = textselector_attr_list(
+-      description_attr_list(emoji_height: layout.context.font_description.forecast_font_size)
++      description_attr_list(emoji_height: layout.context.font_description.forecast_font_size, pango_context: layout.context)
+     )
+     layout.wrap = Pango::WrapMode::CHAR
+     if context