From nobody Sat Apr 6 00:03:13 2024 X-Original-To: dev-commits-ports-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4VBFtX2vqtz5HSyg; Sat, 6 Apr 2024 00:03:16 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4VBFtW6DCRz45gx; Sat, 6 Apr 2024 00:03:14 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1712361795; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=WpiB9ya04lbSi8u0zbSWc/XPtE803NA3MAc6CJ8DpGA=; b=EFTQtug3k/JM7I5+SQVLxBnDNTWFeC9jqTuFXOHMCidvzmpsckRaPHGb+vPX17tIhr5sEn hpjewnqhwNsM6+qMsCR+TNZTFBLsdHHi/XH7JJ6Fupn2ui3UaOu58QWbcAgAReq7Q3ACU1 GNFz6fOxifgmVQYV1Aac9X1goH9NYBwP03M69e8V0/u4IuuxnXdOmPJ6kKYv4/CIr3sTid mMFWcMnyCrQhMJJ+u5cFEfcEfebmYmkX00n5inJmb1MFaTjAo7pP16RA3h1Fy3++BDDhcj cCFcbiXpk8f6yAKBQg6ml5ohHrATPFFb0VxDUKo4CHOsX+45tkgr4RVdjgsvHA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1712361795; a=rsa-sha256; cv=none; b=u5/xMqvqBrKOxGEcChtiOxyML99Kyh7PX/WZoyFcRX8kSjAs7vQ9agUptqTyJ9SyRHE6fA aMHNz1r1tIUqxAzVuve3dKJTAKBLlhI4to/5RsQ9MsaWaxPA2YkByxF+7jL1I7n/XEXbVb ILkPQLQs/VBqDDy6RS+rKFTIPgvAgnT4PVcp572S9EQCd1uWUGRUBzmdZiYTGHR6sfbZeu 6TiRNjlQx0uEj18knklNXYtC4gfHtmKNIDnQVDGaXxDAD00BA0DLErTAVIL5XeOfGRnbSd yTD5NzMsZ1/YxiOPJ6aFEL709xIeAfQgWyctw1/vcm7uSPN9UG2VYpDeKBpGPg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1712361795; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=WpiB9ya04lbSi8u0zbSWc/XPtE803NA3MAc6CJ8DpGA=; b=WxD1f5t8G+bmdUJvaChJZhDPpbkBvk0OzUOV4bslaiFT25At0T4cSw0B7fyduNNHtAzzVu vcpKC5Qm6ZO/H0+YgEDhfYjV/sDlwKjXhZG3qg0jkpN/nDlgryEhjT/vq9zRpuuSfiROd+ V5280IcQIaY9s8ek7iZrEb3TLEJom2Pf9yj9C31BT2Oyjjc0cQAD1CK84bv8ZUXMI3esum FqIVUkvdU13OCAcwoqOv8qwcOHYQw2y9DVRYD5TtrsFCbfORnZORy9ZKKq0mDCrCbxy2tU 1Bzg2eiucZOhWLn0eELb1JM7o5IeEKNSrTPaIZN1LosUJKTTumgCiINjLHDa9w== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4VBFtV129mzLM2; Sat, 6 Apr 2024 00:03:14 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 43603Dnl081012; Sat, 6 Apr 2024 00:03:13 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 43603DRA081009; Sat, 6 Apr 2024 00:03:13 GMT (envelope-from git) Date: Sat, 6 Apr 2024 00:03:13 GMT Message-Id: <202404060003.43603DRA081009@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Po-Chuan Hsieh Subject: git: 0a652002cc99 - main - x11-toolkits/rubygem-gtk2: Fix build with Ruby 3.2+ List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-all@freebsd.org X-BeenThere: dev-commits-ports-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: sunpoet X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 0a652002cc99ac5ad962711ffa1af091ea8728a1 Auto-Submitted: auto-generated The branch main has been updated by sunpoet: URL: https://cgit.FreeBSD.org/ports/commit/?id=0a652002cc99ac5ad962711ffa1af091ea8728a1 commit 0a652002cc99ac5ad962711ffa1af091ea8728a1 Author: Dirk Meyer AuthorDate: 2024-04-06 00:00:09 +0000 Commit: Po-Chuan Hsieh CommitDate: 2024-04-06 00:00:09 +0000 x11-toolkits/rubygem-gtk2: Fix build with Ruby 3.2+ PR: 277916 --- x11-toolkits/rubygem-gtk2/Makefile | 2 -- x11-toolkits/rubygem-gtk2/files/patch-ruby32 | 42 ++++++++++++++++++++++++++++ 2 files changed, 42 insertions(+), 2 deletions(-) diff --git a/x11-toolkits/rubygem-gtk2/Makefile b/x11-toolkits/rubygem-gtk2/Makefile index 77c136280167..5b300b8ad145 100644 --- a/x11-toolkits/rubygem-gtk2/Makefile +++ b/x11-toolkits/rubygem-gtk2/Makefile @@ -12,8 +12,6 @@ WWW= https://ruby-gnome.github.io/ \ LICENSE= LGPL21+ LICENSE_FILE= ${WRKSRC}/COPYING.LIB -BROKEN_RUBY32= yes - RUN_DEPENDS= rubygem-atk>=${PORTVERSION}:accessibility/rubygem-atk \ rubygem-gdk_pixbuf2>=${PORTVERSION}:graphics/rubygem-gdk_pixbuf2 \ rubygem-pango>=${PORTVERSION}:x11-toolkits/rubygem-pango diff --git a/x11-toolkits/rubygem-gtk2/files/patch-ruby32 b/x11-toolkits/rubygem-gtk2/files/patch-ruby32 new file mode 100644 index 000000000000..aa8105d525e4 --- /dev/null +++ b/x11-toolkits/rubygem-gtk2/files/patch-ruby32 @@ -0,0 +1,42 @@ +--- ext/gtk2/rbgtkcontainer.c.orig 2024-04-05 14:08:42 UTC ++++ ext/gtk2/rbgtkcontainer.c +@@ -172,7 +172,7 @@ rbgtkcontainer_register_child_property_setter(GType gt + pspec = gtk_container_class_find_child_property(oclass, name); + + rb_hash_aset(table, rb_intern(g_param_spec_get_name(pspec)), +- Data_Wrap_Struct(rb_cData, NULL, NULL, func)); ++ Data_Wrap_Struct(rb_cObject, NULL, NULL, func)); + + g_type_class_unref(oclass); + } +@@ -193,7 +193,7 @@ rbgtkcontainer_register_child_property_getter(GType gt + pspec = gtk_container_class_find_child_property(oclass, name); + + rb_hash_aset(table, rb_intern(g_param_spec_get_name(pspec)), +- Data_Wrap_Struct(rb_cData, NULL, NULL, func)); ++ Data_Wrap_Struct(rb_cObject, NULL, NULL, func)); + } + + static VALUE +--- ext/gtk2/rbgtktreeiter.c.orig 2024-04-05 14:08:42 UTC ++++ ext/gtk2/rbgtktreeiter.c +@@ -29,7 +29,7 @@ rbgtk_register_treeiter_set_value_func(GType gtype, rb + rbgtk_register_treeiter_set_value_func(GType gtype, rbgtkiter_set_value_func func) + { + rb_hash_aset(treeiter_set_value_table, INT2NUM(gtype), +- Data_Wrap_Struct(rb_cData, NULL, NULL, func)); ++ Data_Wrap_Struct(rb_cObject, NULL, NULL, func)); + } + + static VALUE +--- ext/gtk2/rbgtkwindow.c.orig 2024-04-05 14:08:42 UTC ++++ ext/gtk2/rbgtkwindow.c +@@ -582,7 +582,7 @@ Init_gtk_window(VALUE mGtk) + { + static VALUE toplevels_marker; + toplevels_marker = +- rb_data_object_alloc(rb_cData, NULL, mark_toplevels, NULL); ++ rb_data_object_alloc(rb_cObject, NULL, mark_toplevels, NULL); + rb_global_variable(&toplevels_marker); + } + }