From nobody Fri Jun 30 07:22:37 2023 X-Original-To: dev-commits-ports-main@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 4Qsmx93YLTz4krpM; Fri, 30 Jun 2023 07:22:37 +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 4Qsmx92bMMz42yC; Fri, 30 Jun 2023 07:22:37 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1688109757; 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=qkZflCiLCDV24eERu+VH1LeG83DTBQzS4tiFM3pt9b4=; b=l/urXbpf1yVvs5svAbP0T405Pw51myp4EW9lvl78JiOg2cf4EBmCFz96n7pQdWCxIV+fsU yAK1Ee24ZDVhvpmrDbR+KLBCjX1kDA5So84x3gGYqcjdlCDePh8205IYExKE83hRRfQECI xph6yPRZMsoOsSaDn1ama7bWHxiq/P5nFbZYdvE7V37VL/b0fS+E7xN415oH6qAEUS1dDu Im/n2ert7yPF0ZD2Sy8Sq8OQo/5ZdQ4FUuVzVMcdEArEd2ppKy72mhtrsE/PpF/e9sSbJE JsuagGQ7Un2F1ZZeFR9jiOfC+P+qlluH4IjohYtk/sPsRNYF2dK730LdDZe9hQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1688109757; 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=qkZflCiLCDV24eERu+VH1LeG83DTBQzS4tiFM3pt9b4=; b=EMb7axVAaJ55kRhIb8TUePrm0dz34jJ8pmgAr/KpWflIHxBRX3+nC7AIjulfMr/SdSKRUd ciY5Fo6kLplM14ohxwygtdKYv2fGUn43lLgq52koX5BVjcos9d74Lw11uu37vPPrAtafwk BI/rPioubWGP8gh2yL1EtnDMR+Tu9nZtDrGjy56XGYU+ky9tOZEiH7GNixiFBEEIfp2ubv 9r//eUxFklpkdtZOkLmiey2gDzcNUpt/E35RAloovVwLZtF00d3IN03YlHS5LUmn9Kgomy BAwerIdu8aG8udt53yy6vW94urEnAsQG7QfNikVZrjMYWqaPHunPEOjCP21gCA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1688109757; a=rsa-sha256; cv=none; b=FNDk6m07DGZZrX/DL1QpdsQIEoxN2Tq0zbk4CnG2VJu29Eoi//NOAEm5ogFUEkbrlDPVDG /FqEfpXNkbraXdFEMUdt/EPXbt+QUQUxM8gv9edyC4B+syr11Sl6FpaBzCeOjIKulIhQ86 bSGIzfX0FnDJFY3lzaU1qT9JwLbAL2PIW5HUAD0ih1NQtumtrMa4JUn3tOiDNnM57jnkQT dUyPtkACn/wA1Em/1dmJuYGw6j9BZQFmX+a6CYGQipliNLiL0E3jeqHZOXVMHIVhWEQCOY aopbhI4+lfffuplLr8yPE0P54f6BQoRkV1NB4UYD8O5AdQsgdcIjNIpbApPA6w== 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 4Qsmx91Vhdzqgh; Fri, 30 Jun 2023 07:22:37 +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 35U7MbqK084363; Fri, 30 Jun 2023 07:22:37 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 35U7MbUQ084362; Fri, 30 Jun 2023 07:22:37 GMT (envelope-from git) Date: Fri, 30 Jun 2023 07:22:37 GMT Message-Id: <202306300722.35U7MbUQ084362@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: 9b4ff447e9d2 - main - x11-toolkits/rubygem-gtk2: Fix build with Clang 15 and revert a4021dd9e20bca9ada21837282e476b6c1356f23 List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@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: 9b4ff447e9d2248dcd1b2ad1cf8170ae1cc64771 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by sunpoet: URL: https://cgit.FreeBSD.org/ports/commit/?id=9b4ff447e9d2248dcd1b2ad1cf8170ae1cc64771 commit 9b4ff447e9d2248dcd1b2ad1cf8170ae1cc64771 Author: Po-Chuan Hsieh AuthorDate: 2023-06-30 07:08:01 +0000 Commit: Po-Chuan Hsieh CommitDate: 2023-06-30 07:08:01 +0000 x11-toolkits/rubygem-gtk2: Fix build with Clang 15 and revert a4021dd9e20bca9ada21837282e476b6c1356f23 --- x11-toolkits/rubygem-gtk2/Makefile | 14 ++------------ x11-toolkits/rubygem-gtk2/files/patch-clang15 | 22 ++++++++++++++++++++++ 2 files changed, 24 insertions(+), 12 deletions(-) diff --git a/x11-toolkits/rubygem-gtk2/Makefile b/x11-toolkits/rubygem-gtk2/Makefile index 738ee1fdb2c5..bcdb9980b672 100644 --- a/x11-toolkits/rubygem-gtk2/Makefile +++ b/x11-toolkits/rubygem-gtk2/Makefile @@ -11,21 +11,11 @@ WWW= https://ruby-gnome2.osdn.jp/ LICENSE= LGPL21+ LICENSE_FILE= ${WRKSRC}/COPYING.LIB -LIB_DEPENDS= libharfbuzz.so:print/harfbuzz \ - libfontconfig.so:x11-fonts/fontconfig \ - libfreetype.so:print/freetype2 RUN_DEPENDS= rubygem-atk>=${PORTVERSION}:accessibility/rubygem-atk \ rubygem-gdk_pixbuf2>=${PORTVERSION}:graphics/rubygem-gdk_pixbuf2 \ rubygem-pango>=${PORTVERSION}:x11-toolkits/rubygem-pango -USES= gem gnome xorg -USE_GNOME= cairo gdkpixbuf2 gtk20 introspection -USE_XORG= x11 - -.include - -.if ${OPSYS} == FreeBSD && ( ${OSVERSION} >= 1400079 || ( ${OSVERSION} >= 1302505 && ${OSVERSION} < 1400000 )) -CONFIGURE_ARGS+= --with-cflags="-Wno-error=int-conversion" -.endif +USES= gem gnome +USE_GNOME= gtk20 .include diff --git a/x11-toolkits/rubygem-gtk2/files/patch-clang15 b/x11-toolkits/rubygem-gtk2/files/patch-clang15 new file mode 100644 index 000000000000..8f2fe28674b0 --- /dev/null +++ b/x11-toolkits/rubygem-gtk2/files/patch-clang15 @@ -0,0 +1,22 @@ +--- ext/gtk2/rbgdkscreen.c.orig 2023-06-13 15:11:58 UTC ++++ ext/gtk2/rbgdkscreen.c +@@ -255,7 +255,7 @@ rg_window_stack(VALUE self) + static void + child_setup(gpointer func) + { +- if (! NIL_P(func)){ ++ if (! NIL_P((VALUE) func)){ + rb_funcall((VALUE)func, id_call, 0); + } + } +--- ext/gtk2/rbgtkdrag.c.orig 2023-06-13 15:21:51 UTC ++++ ext/gtk2/rbgtkdrag.c +@@ -358,7 +358,7 @@ static VALUE + rg_m_source_get_target_list(G_GNUC_UNUSED VALUE self, VALUE widget) + { + GtkTargetList* ret = gtk_drag_source_get_target_list(RVAL2WIDGET(widget)); +- return NIL_P(ret) ? Qnil : BOXED2RVAL(ret, GTK_TYPE_TARGET_LIST); ++ return NIL_P((VALUE) ret) ? Qnil : BOXED2RVAL(ret, GTK_TYPE_TARGET_LIST); + } + + static VALUE