From nobody Sat Apr 15 19:30:30 2023 X-Original-To: dev-commits-ports-branches@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 4PzNh70kH6z44vyZ; Sat, 15 Apr 2023 19:30:31 +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 4PzNh7060Xz3PgX; Sat, 15 Apr 2023 19:30:31 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1681587031; 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=eGBbA7uMjqOm0HMEGTy0TLHSvMFpT9lYaLWoiUM8Q9k=; b=A/NTUrEQW21fjCzbAHdcUjp/djidxyRugv15F5wp8+JB57nRpe+1izmgPdWSjccpO/zNLP sUv0zXjj9eckVXXrjbkDXh32ydoQcNpH7f3juJhN5XRAh6mZVu80coXFV1E92h3Hqi42jY uyfmJJ4UdmmVWW5TceA+ZirJtW3Hh9UiSlqkUvI7WD1GVPwY9uIyAhuQBhU89EOw7A4tu4 N0X2D0Ew2H7JNkcnogk7r/ZuHloxQyO9jeMdveDeqKTVP59nx9W3XTtGgjAzuiJGFFaoRs eNAAN4v4xwC0KYf9sDrXklykqaHE5yj6468lF2F6NqHaABpiwU9T0FIE8vEYxA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1681587031; 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=eGBbA7uMjqOm0HMEGTy0TLHSvMFpT9lYaLWoiUM8Q9k=; b=AyllqFE+dd9jHgCBCtfaDmUXEpH5fumPWtnNpxfuZNuzY+vQ3V2notu6BVPnWwTajQs5ed AcbBTx3v+uQheYRVNG0RmME6cZboxrOEl8uLikRRC40M64yb26D7dSglWV5KT+nX/yzcY6 M+Rmy6AHABjZUX3JsgMIDVfTj7hE9kjIZASco3Rry8vHRKtfvou0OkpTtMUVbm7MrfcI42 xa+gCTuK3quuPDR8g9tJBwtpBqgYSn9BuWVszKXrbD724Km4k7fuCFlAliVCFQaA+7zsv3 6t0Y202cLG2Gi8x7alg7+aj7CjjT62secjc5V3lL2ZbqIQSao1kGsngzKPfB8Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1681587031; a=rsa-sha256; cv=none; b=lI1gxoslYMs8eZfk+X4vcY2wU/FiAN+e1R0hirgdkekstnQ8TpcvRe9aTUcVrQwfyFGh7Q QuDJj+NBxFnYS+jIPhm9H+0kYck3nA5scmdAnj7QxykU3S+v08JX04FdZV9v/QBn+0fgZF hpKbRuuhSLtfEKo/yWl9oEcYhlIFysSqyeDkZp63Q5CE36fczZi5/rxqkD1ocpfqDsMY2e UdaJt0alWo6od9tVooCa1irqtfl2z1y449tMyFwdkv6GxTWJjhZHN8OHGYkGj+GMRmInbz ayydiByxJLCJDCgzgWjLd2sGbBkBxqk73eQh4O3bXTk+764uyu2Q4VDG92N9vw== 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 4PzNh66CMfzJFK; Sat, 15 Apr 2023 19:30:30 +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 33FJUUVP099065; Sat, 15 Apr 2023 19:30:30 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 33FJUUqj099064; Sat, 15 Apr 2023 19:30:30 GMT (envelope-from git) Date: Sat, 15 Apr 2023 19:30:30 GMT Message-Id: <202304151930.33FJUUqj099064@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-branches@FreeBSD.org From: Gleb Popov Subject: git: 2f4db26fc878 - 2023Q2 - devel/appstream-compose: Fix crash when processing Qt translation files. List-Id: Commits to the quarterly branches of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-branches@freebsd.org X-BeenThere: dev-commits-ports-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: arrowd X-Git-Repository: ports X-Git-Refname: refs/heads/2023Q2 X-Git-Reftype: branch X-Git-Commit: 2f4db26fc878c05fb042b440254c6cbf4d2b0975 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch 2023Q2 has been updated by arrowd: URL: https://cgit.FreeBSD.org/ports/commit/?id=2f4db26fc878c05fb042b440254c6cbf4d2b0975 commit 2f4db26fc878c05fb042b440254c6cbf4d2b0975 Author: Gleb Popov AuthorDate: 2023-04-13 12:57:06 +0000 Commit: Gleb Popov CommitDate: 2023-04-15 19:30:17 +0000 devel/appstream-compose: Fix crash when processing Qt translation files. Upstream PR: https://github.com/ximion/appstream/pull/484 Sponsored by: Serenity Cybersecurity, LLC (cherry picked from commit b472fd9630da4677706c36722c4fd4517ff45701) --- devel/appstream-compose/Makefile | 2 +- devel/appstream/files/patch-compose_asc-utils-l10n.c | 15 +++++++++++++++ 2 files changed, 16 insertions(+), 1 deletion(-) diff --git a/devel/appstream-compose/Makefile b/devel/appstream-compose/Makefile index 06b780de3734..07d24c7568f4 100644 --- a/devel/appstream-compose/Makefile +++ b/devel/appstream-compose/Makefile @@ -1,4 +1,4 @@ -PORTREVISION= 0 +PORTREVISION= 1 PKGNAMESUFFIX= Compose COMMENT?= AppStream Compose application and library diff --git a/devel/appstream/files/patch-compose_asc-utils-l10n.c b/devel/appstream/files/patch-compose_asc-utils-l10n.c new file mode 100644 index 000000000000..289b96b827f4 --- /dev/null +++ b/devel/appstream/files/patch-compose_asc-utils-l10n.c @@ -0,0 +1,15 @@ +--- compose/asc-utils-l10n.c.orig 2023-02-10 19:54:13 UTC ++++ compose/asc-utils-l10n.c +@@ -390,11 +390,7 @@ asc_l10n_search_translations_qt (AscLocaleContext *ctx + locale = g_strdup (fname + strlen (qm_root) + 1); + g_strdelimit (locale, ".", '\0'); + tmp = g_strstr_len (locale, -1, "/"); +- if (tmp != NULL) { +- /* we have the ${hint}/${locale}.qm form */ +- locale = tmp + 1; +- } +- if (!asc_l10n_parse_file_qt (ctx, unit, locale, fname, error)) ++ if (!asc_l10n_parse_file_qt (ctx, unit, tmp == NULL ? locale : tmp + 1, fname, error)) + return FALSE; + } + }