From owner-dev-commits-ports-all@freebsd.org Sat Jul 24 07:23:33 2021 Return-Path: Delivered-To: dev-commits-ports-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 317DA65ABCE; Sat, 24 Jul 2021 07:23:33 +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 4GWyN50S64z4rhS; Sat, 24 Jul 2021 07:23:33 +0000 (UTC) (envelope-from git@FreeBSD.org) 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 DE67E48C2; Sat, 24 Jul 2021 07:23:32 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 16O7NWJx051656; Sat, 24 Jul 2021 07:23:32 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 16O7NWk1051655; Sat, 24 Jul 2021 07:23:32 GMT (envelope-from git) Date: Sat, 24 Jul 2021 07:23:32 GMT Message-Id: <202107240723.16O7NWk1051655@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: "Tobias C. Berner" Subject: git: 2dddefa150b4 - main - x11-toolkits/scintilla: prepare for glib-2.68.3 MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: tcberner X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 2dddefa150b4fa21a8ab02dac9b49160a84bdcb8 Auto-Submitted: auto-generated X-BeenThere: dev-commits-ports-all@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Commit messages for all branches of the ports repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 24 Jul 2021 07:23:33 -0000 The branch main has been updated by tcberner: URL: https://cgit.FreeBSD.org/ports/commit/?id=2dddefa150b4fa21a8ab02dac9b49160a84bdcb8 commit 2dddefa150b4fa21a8ab02dac9b49160a84bdcb8 Author: Tobias C. Berner AuthorDate: 2021-07-24 07:21:28 +0000 Commit: Tobias C. Berner CommitDate: 2021-07-24 07:21:28 +0000 x11-toolkits/scintilla: prepare for glib-2.68.3 Add upstream fix removing 'volatile' Obtained from: https://sourceforge.net/p/scintilla/code/ci/790bfd4c0747 PR: 256200 --- .../patch-hg_8719-790bfd4c0747_fix-glib_2.68.3 | 33 ++++++++++++++++++++++ 1 file changed, 33 insertions(+) diff --git a/x11-toolkits/scintilla/files/patch-hg_8719-790bfd4c0747_fix-glib_2.68.3 b/x11-toolkits/scintilla/files/patch-hg_8719-790bfd4c0747_fix-glib_2.68.3 new file mode 100644 index 000000000000..9615fc336296 --- /dev/null +++ b/x11-toolkits/scintilla/files/patch-hg_8719-790bfd4c0747_fix-glib_2.68.3 @@ -0,0 +1,33 @@ +# HG changeset patch +# User Neil Hodgson +# Date 1619159850 -36000 +# Fri Apr 23 16:37:30 2021 +1000 +# Node ID 790bfd4c0747eb5e0bc4d627a101298207a8421e +# Parent bf180d712ff771fe40a2d5dc178fa0a15cf14b2d +Remove volatile qualifiers as they cause an error with Clang 12. +The glib documentation shows use without volatile and mentions that - + While location has a volatile qualifier, this is a historical artifact and + the pointer passed to it should not be volatile. +https://developer.gnome.org/glib/stable/glib-Threads.html#g-once-init-enter + +diff -r bf180d712ff7 -r 790bfd4c0747 gtk/ScintillaGTKAccessible.cxx +--- gtk/ScintillaGTKAccessible.cxx Fri Apr 23 16:05:55 2021 +1000 ++++ gtk/ScintillaGTKAccessible.cxx Fri Apr 23 16:37:30 2021 +1000 +@@ -1008,7 +1008,7 @@ + + // @p parent_type is only required on GTK 3.2 to 3.6, and only on the first call + static GType scintilla_object_accessible_get_type(GType parent_type G_GNUC_UNUSED) { +- static volatile gsize type_id_result = 0; ++ static gsize type_id_result = 0; + + if (g_once_init_enter(&type_id_result)) { + GTypeInfo tinfo = { +@@ -1099,7 +1099,7 @@ + #if HAVE_GTK_A11Y_H // just instantiate the accessible + *cache = scintilla_object_accessible_new(0, G_OBJECT(widget)); + #elif HAVE_GTK_FACTORY // register in the factory and let GTK instantiate +- static volatile gsize registered = 0; ++ static gsize registered = 0; + + if (g_once_init_enter(®istered)) { + // Figure out whether accessibility is enabled by looking at the type of the accessible