From nobody Thu Apr 28 18:25:17 2022 X-Original-To: dev-commits-ports-all@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 C8EC11AB12B5; Thu, 28 Apr 2022 18:25:17 +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 4Kq3vK5GX2z3J9j; Thu, 28 Apr 2022 18:25:17 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1651170317; 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=hJ59UOGYREMfgOdO5R3X3Q4YHHwPafpD1L6rG55CCjg=; b=JdrBuaQgXz2TI5UP27s1DS7DooCYqAOXYax6Up5zuuNessrzpJN1BefetnoQFv5YgTlbE8 mybV4S0ci++MQc5fFYH8++fIgju8xqUp4PT7tOu8YN1NGOCrg2UQkjZsI9ApbaR31qXyKR tiokwTsTGO2tIp7h0GIO45dl//6aBziFbnrR5HriN527MdS6c4IEpWsVKrPJkwp+0Ga4Tv uEegYQLqh3utbHnqjuRH5eaifxrH8VHQEojk/jlcAoBuD7O5DbIW5xEf1sdTazzhKsoPZz 0Bgkb26nbBzmRd7SJpETdcqMt19eDJWni+yigV1DgyiPK0YIVQgVjVHJjwZW6g== 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 90A221DC84; Thu, 28 Apr 2022 18:25:17 +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 23SIPHU3011618; Thu, 28 Apr 2022 18:25:17 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 23SIPHJK011617; Thu, 28 Apr 2022 18:25:17 GMT (envelope-from git) Date: Thu, 28 Apr 2022 18:25:17 GMT Message-Id: <202204281825.23SIPHJK011617@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Neel Chauhan Subject: git: 7f0f07a1e2b2 - main - www/netsurf: Fix crash on preferences dialog with certain languages List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-all@freebsd.org X-BeenThere: dev-commits-ports-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: nc X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 7f0f07a1e2b21fa2809ffd325e574aec73b64a57 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1651170317; 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=hJ59UOGYREMfgOdO5R3X3Q4YHHwPafpD1L6rG55CCjg=; b=LOfCrqszSqTJiRAMefwzLAywmEwF3hwMfuoWLVKgD3+FBN1lfp8MPiVu9pEUT1DiUFyaFl +MgeZw1kt2WquJfy4OSDCxe8RWav07nPZN1Sz8R2B9rkP0ZbmZiIwnMQulhDkHdAPCue4A SdP40eBLqavhpVMziH/ykLphopVtlSbhHkNOVPfd2aCrae99rN3VbdUJIIzR0mg7O3QYb7 x/4KYxh5ZYTIKEpL5PlvZar4avGlke55u009ciEfPG9bOGP6SZDo6EuKekDMFLF9Ursv16 PRDIPM3mc6DEnq8fAKXijIMPuFEqbGIN3jLaXOtzfdNj+3HlZf1c7FlyOu2k0g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1651170317; a=rsa-sha256; cv=none; b=ahCvSiSivtB50nTo2gYKq828hGD/TeMMjIPfvVw/OsrzuGE/VK1AGOaBDBW48wV7dFEAOo /hoR7utCKwPpQuRVIay2arOeHVs6ft9uFc6Iu2YT/PGH4fahPVpc+6Z+1VwYZ1lmsVfSYA 7TBWL3PslUQ+RxN9Yy+UsBHhtcX/SFNbiMWLq4UMlL2yZQxBZZmvJD0FUjiOuX+DOezejQ z6dt1gU5UHmVe85lRYsn7BinxMH3Tzl3/BGC3OIKEkwzMaVzPtPn+/W5qllAQBb35IrrQe a91nwdGuMt8XQ2W8JLE5A0s45iTivNhXcbkOV6Vt4cCHgBhDnsLGP54oaRgkpQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by nc: URL: https://cgit.FreeBSD.org/ports/commit/?id=7f0f07a1e2b21fa2809ffd325e574aec73b64a57 commit 7f0f07a1e2b21fa2809ffd325e574aec73b64a57 Author: Marcin Cieślak AuthorDate: 2022-04-28 18:23:54 +0000 Commit: Neel Chauhan CommitDate: 2022-04-28 18:25:12 +0000 www/netsurf: Fix crash on preferences dialog with certain languages This happens with certain languages like pl_PL.UTF-8. PR: 263498 --- www/netsurf/Makefile | 2 +- www/netsurf/files/patch-frontends_gtk_preferences.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/www/netsurf/Makefile b/www/netsurf/Makefile index 02e2a9559e62..0e41f353deb9 100644 --- a/www/netsurf/Makefile +++ b/www/netsurf/Makefile @@ -2,7 +2,7 @@ PORTNAME= netsurf PORTVERSION= 3.10 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= www MASTER_SITES= http://download.netsurf-browser.org/netsurf/releases/source/ DISTNAME= ${PORTNAME}-${PORTVERSION}-src diff --git a/www/netsurf/files/patch-frontends_gtk_preferences.c b/www/netsurf/files/patch-frontends_gtk_preferences.c index 337e1bf73f03..b3b09646026c 100644 --- a/www/netsurf/files/patch-frontends_gtk_preferences.c +++ b/www/netsurf/files/patch-frontends_gtk_preferences.c @@ -22,7 +22,7 @@ + res = nsgtk_builder_new_from_resname(ui_lang, &preferences_builder); + if (res != NSERROR_OK) { + //LANG not found, so fall back to english i guess -+ res = nsgtk_builder_new_from_resname("enoption", &preferences_builder); ++ res = nsgtk_builder_new_from_resname("enoptions", &preferences_builder); + } + if (res != NSERROR_OK) { + NSLOG(netsurf, INFO, "Preferences UI builder init failed");