From nobody Thu Oct 17 18:36:29 2024 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 4XTxPT6W4Pz5ZKhX; Thu, 17 Oct 2024 18:36:29 +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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XTxPT5sppz4LY7; Thu, 17 Oct 2024 18:36:29 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1729190189; 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=DnXA4J3tInEPzgnvgMMVRWt4Dot/PjyzFg9vdTJIj+c=; b=KzsdS8scLov9y6PV/1bLVcBcQnPF79uRo3RGFfccaPzrvkXVbfGqbo2vPWOs0zS+/YFL9y 6TDSzr8Slb4yS9gnYSC3qffEdO4FkqpfMesbpkhPs60ULyoEUCw3bFRJsC+wuTJfMNQzlt XaUYKuSkdXYmuyCAEXxTNvFIfnB2ehg7VE/cwnUSCvB65a+rilsgR9CrXRSwSP0o8y52au 8hzTQVRdebaFQOS0nMseaJFsWTtJlXVTQjwWCNwcc/Z+bPhlyvubTw0N8BDp96lPUCBSWD L8qnNrIcJE8nzcn6kavyzS3IRjC48XwUikT9FPazBvi/ydk2m8yVBRLSBYy/EA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1729190189; 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=DnXA4J3tInEPzgnvgMMVRWt4Dot/PjyzFg9vdTJIj+c=; b=hxRvF6WGBgN8Ayea5lpE9YykrVNv86LVX6DwUmey9komPLiyZ8VSihsAUTmpPD9qakqFoa 2+H/d3LaYu1d7RLAEu4tIDdAWl1HaI/rp8mWElxmmrxskl6apRkI68+hRJKKpMoj+Do2B+ Mm8ysYUvjzGH8VVVmsei+crcZM0V41ahFOJ377leS1ZWOkNe5gwSVfIZhuOdWHnEWrE7Cb +ktUQZ5q3f5+h/z6t9/EhIQSY+QE8U6Nkr4I7QgHr04LYVSkHvuj3fU498XGL9KMvRbb4k tlkaYAXnhEmwLn5iTPc5OY+36pDj5WzihgG2YbMJyC596xXiPGZWmnJBm3xFpQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1729190189; a=rsa-sha256; cv=none; b=TH/ogDSuEoe+/OcRGkuiZko8+/O0UcLwZa2kYXzfT501XHWt51+Pl5KXIUbYTAXdMahvxD fH1feaMqRcRSy4oaSNamsrD+c6ooi1pMLdgXI/Ci9vhbPE9eQ4as1EVVsIsLi1PklYZ4zi xxmp8V8Ho9awtqzuIMD5DjFe7QRCqpLz96z2xYYXxVKTmchI7/wmzJNSFAIzTouBpBUbiB 3+JFn7PGdwqWxelzfIP/7JcV/y3uyYQqtM+hpyliovQItq3JjSLrAQLQ+NdV93qCbvlO38 qvHxYvFhNG/cphOBI5KubP4fE/F3dCYcWt4XgZsnJZUr0XV8t7blsFIdIaWHng== 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 4XTxPT5TGWz11dT; Thu, 17 Oct 2024 18:36:29 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 49HIaTe9036836; Thu, 17 Oct 2024 18:36:29 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 49HIaTDw036833; Thu, 17 Oct 2024 18:36:29 GMT (envelope-from git) Date: Thu, 17 Oct 2024 18:36:29 GMT Message-Id: <202410171836.49HIaTDw036833@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Jan Beich Subject: git: 26ebcdf99dfb - main - accessibility/feedbackd: unbreak build after 89965357906b 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: X-BeenThere: dev-commits-ports-main@freebsd.org Sender: owner-dev-commits-ports-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jbeich X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 26ebcdf99dfb8ccd330499cd8dc63f3590c7039f Auto-Submitted: auto-generated The branch main has been updated by jbeich: URL: https://cgit.FreeBSD.org/ports/commit/?id=26ebcdf99dfb8ccd330499cd8dc63f3590c7039f commit 26ebcdf99dfb8ccd330499cd8dc63f3590c7039f Author: Jan Beich AuthorDate: 2024-10-17 15:48:50 +0000 Commit: Jan Beich CommitDate: 2024-10-17 18:28:44 +0000 accessibility/feedbackd: unbreak build after 89965357906b /usr/local/bin/glib-compile-resources ../subprojects/gmobile/data/gmobile.gresources.xml --sourcedir ../subprojects/gmobile/data --c-name gm --internal --generate --target subprojects/gmobile/data/gm-resources.c --manual-register --dependency-file subprojects/gmobile/data/gm-resources.c.d json-glib-format: file:///wrkdirs/usr/ports/accessibility/feedbackd/work/feedbackd-v0.1.0/subprojects/gmobile/data/devices/display-panels/fairphone,fp4.json: error parsing file: :12:1: Parse error: scanner: unterminated string constant (json-glib-format:24182): GLib-CRITICAL **: 01:08:27.552: g_close(fd:-1) failed with EBADF. This is not a valid file descriptor ../subprojects/gmobile/data/gmobile.gresources.xml: Child process exited with code 1. Reported by: pkg-fallout --- accessibility/feedbackd/files/patch-gmobile | 87 +++++++++++++++++++++++++++++ 1 file changed, 87 insertions(+) diff --git a/accessibility/feedbackd/files/patch-gmobile b/accessibility/feedbackd/files/patch-gmobile new file mode 100644 index 000000000000..ad05c4022811 --- /dev/null +++ b/accessibility/feedbackd/files/patch-gmobile @@ -0,0 +1,87 @@ +https://gitlab.gnome.org/World/Phosh/gmobile/-/commit/965fb5febdf4 + +--- subprojects/gmobile/data/devices/display-panels/fairphone,fp4.json.orig 2024-02-24 10:41:47 UTC ++++ subprojects/gmobile/data/devices/display-panels/fairphone,fp4.json +@@ -8,11 +8,7 @@ + "cutouts" : [ + { + "name": "notch", +- "path": "M 355,0 +- H 725 +- C 580,0 615,82 540,82 +- C 465,82 500,0 355,0 +- Z" ++ "path": "M 355,0 H 725 C 580,0 615,82 540,82 C 465,82 500,0 355,0 Z" + } + ] + } +--- subprojects/gmobile/data/devices/display-panels/fairphone,fp5.json.orig 2024-02-24 10:41:47 UTC ++++ subprojects/gmobile/data/devices/display-panels/fairphone,fp5.json +@@ -8,10 +8,7 @@ + "cutouts" : [ + { + "name": "notch", +- "path": "M 612 16 +- a 42 42 0 0 0 0 84 +- a 42 42 0 0 0 0 -84 +- Z" ++ "path": "M 612 16 a 42 42 0 0 0 0 84 a 42 42 0 0 0 0 -84 Z" + } + ] + } +--- subprojects/gmobile/data/devices/display-panels/oneplus,enchilada.json.orig 2024-02-24 10:41:47 UTC ++++ subprojects/gmobile/data/devices/display-panels/oneplus,enchilada.json +@@ -9,13 +9,7 @@ + "cutouts" : [ + { + "name": "notch", +- "path": "M 357 0 +- A 24 24 0 0 1 381 22 +- A 64 64 0 0 0 445 80 +- L 635 80 +- A 64 64 0 0 0 699 22 +- A 24 24 0 0 1 723 0 +- Z" ++ "path": "M 357 0 A 24 24 0 0 1 381 22 A 64 64 0 0 0 445 80 L 635 80 A 64 64 0 0 0 699 22 A 24 24 0 0 1 723 0 Z" + } + ] + } +--- subprojects/gmobile/data/devices/display-panels/oneplus,fajita.json.orig 2024-02-24 10:41:47 UTC ++++ subprojects/gmobile/data/devices/display-panels/oneplus,fajita.json +@@ -8,18 +8,7 @@ + "cutouts" : [ + { + "name": "notch", +- "path": "M 355,0 +- h 368.34 +- c -9.77,0.44 -19.57,0.08 -29.28,1.24 +- c -20.33,1.14 -41.18,5.17 -58.62,16.24 +- c -16.9,10.79 -29.44,26.78 -43.44,40.81 +- a 72.73,72.73 0 0 1 -38.29 19.58 +- c -16.53,2.51 -34,1 -49.09,-6.62 +- c -9.85,-4.62 -17.88,-12.24 -25.21,-20.18 +- c -10.46,-11.27 -20.9,-22.75 -33.53,-31.66 +- c -11.49,-8 -24.9,-12.78 -38.53,-15.42 +- c -17.27,-3.18 -34.86,-3.6 -52.35,-3.99 +- Z" ++ "path": "M 355,0 h 368.34 c -9.77,0.44 -19.57,0.08 -29.28,1.24 c -20.33,1.14 -41.18,5.17 -58.62,16.24 c -16.9,10.79 -29.44,26.78 -43.44,40.81 a 72.73,72.73 0 0 1 -38.29 19.58 c -16.53,2.51 -34,1 -49.09,-6.62 c -9.85,-4.62 -17.88,-12.24 -25.21,-20.18 c -10.46,-11.27 -20.9,-22.75 -33.53,-31.66 c -11.49,-8 -24.9,-12.78 -38.53,-15.42 c -17.27,-3.18 -34.86,-3.6 -52.35,-3.99 Z" + } + ] + } +--- subprojects/gmobile/data/devices/display-panels/xiaomi,beryllium.json.orig 2024-02-24 10:41:47 UTC ++++ subprojects/gmobile/data/devices/display-panels/xiaomi,beryllium.json +@@ -8,13 +8,7 @@ + "cutouts" : [ + { + "name": "notch", +- "path": "M 834,0 +- c -10.516,0 -19.04,8.557 -19.04,19.11 +- c 0,40.084 -26.988,69.89 -60.283,69.89 +- l -428.354,0 +- c -33.295,0 -60.283,-29.806 -60.283,-63.227 +- c 0,-17.216 -8.524,-25.773 -19.04,-25.773 +- Z" ++ "path": "M 834,0 c -10.516,0 -19.04,8.557 -19.04,19.11 c 0,40.084 -26.988,69.89 -60.283,69.89 l -428.354,0 c -33.295,0 -60.283,-29.806 -60.283,-63.227 c 0,-17.216 -8.524,-25.773 -19.04,-25.773 Z" + } + ] + }