From nobody Sat Apr 15 17:50:06 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 4PzLSH3JHWz44lld; Sat, 15 Apr 2023 17:50:07 +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 4PzLSG6cJfz4lMn; Sat, 15 Apr 2023 17:50:06 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1681581007; 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=AKuGfIRzLif7pOEv7X/CtAnQmXU3nzmGENkKR3br9k0=; b=xjIDxOhDReqOy7aIR6UbKPC9z44MqiNSpnfszoP+FnUspNpeCC3cvc2VMAYq+iuesTaE4f jFa1VLnJ6/ZcjxmKT/P0EgEZPCsiuM/mNDT772XrrXHZmzQGhdvpOhCWp9SeBBH7p5fyoh JS1CdRgKlF8eLT2o9JlFcrDnKMjrsHS057JwsMHQXcoyIU/kVoTjpiv3xR6Tvwvg+bWR+A WSNlRHP8RIwpz8mKViDb4XZXiSoDCUhbcidr3/JXMWFdbatI1a0AS3KjIFGMmSiARfc1yq 2M2P7QgAQBe7F/hx8JJu8oTLaO58Zee/cCyWy0QXBgunNEITWgouWVyhqJmnIg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1681581007; 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=AKuGfIRzLif7pOEv7X/CtAnQmXU3nzmGENkKR3br9k0=; b=l0VQMIvOzNmnVd1HCIOoQHgcIduus5BQuzlHcuGoh18avsjAQbKg1XXDUtc2u/ttY0+CeY lQzHqYqp95tbBXSMYqJ4nepMdwsxfPqst27DTsHUH3qLZmYuF9+a2Pb575uySvOYnan81c wI4IsL72Y7btwufYOoImbAMEA4mmsP2gOFNvz+an/akqoUHybhgBm7nSn8bWsmHifvAd53 BBHS6eM5Y7C1OnAigW6Sln7v0/FfnSW+/tJopZmCrRQ6B3REno8D+E/f7Ce4+YtjgGZS0B ghQG1S/LQzFs1J0AXgxLqM3dJzrg/HXDQOGuFS+t9cwv2FCIl2OS/RwuhX2GHw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1681581007; a=rsa-sha256; cv=none; b=wVRTKIRFwwXeB3N8nQJ+QL2l4J+fpMeRIVE/x5vjiW/nlq9z417n/9FICt3sc0cJXgioNZ Hiw6AKczdM/c/n4XVC/MB/uA6vENCtn1Rki/IwcdoUB7E6PRKpMaPmMk1PbGzVYxs+o0n9 zCYvXhoEzKbtS8ay4RGqQ0zZwKlbbojXdAjm6bbNiPqSHWnyu6VeOzoKKK+iKB62qgJNBa 3RlcaQlF0OLCjL9oNqcZChBEX5Of127O3haRBbANyCKnDADmXTtwT2kpaGyvGYWp4jPwwv vRRBlWoWdEg5WqwfpMXXXd37rS2zACBwcWbKe5qcfvOkotYo8St0Gc9EBx+TEA== 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 4PzLSG52xCzG3v; Sat, 15 Apr 2023 17:50:06 +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 33FHo6j7027159; Sat, 15 Apr 2023 17:50:06 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 33FHo6uA027157; Sat, 15 Apr 2023 17:50:06 GMT (envelope-from git) Date: Sat, 15 Apr 2023 17:50:06 GMT Message-Id: <202304151750.33FHo6uA027157@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Gleb Popov Subject: git: b472fd9630da - main - devel/appstream-compose: Fix crash when processing Qt translation files. 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: arrowd X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: b472fd9630da4677706c36722c4fd4517ff45701 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by arrowd: URL: https://cgit.FreeBSD.org/ports/commit/?id=b472fd9630da4677706c36722c4fd4517ff45701 commit b472fd9630da4677706c36722c4fd4517ff45701 Author: Gleb Popov AuthorDate: 2023-04-13 12:57:06 +0000 Commit: Gleb Popov CommitDate: 2023-04-15 17:49:59 +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 --- 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; + } + }