From nobody Mon Jan 16 21:16:44 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 4NwlFn0wRRz2pBPp; Mon, 16 Jan 2023 21:16:45 +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 4NwlFn0Sb9z42pC; Mon, 16 Jan 2023 21:16:45 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1673903805; 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=3OyjZTQqNvr1AIrUaHSfNOq2HHkKto0tAMHE9JjlTBw=; b=CQg2k/Mm/ms2HmCLeSNim4xKZKc7suC2qXqasz217pnkqAbMqnFjJQfj1Fw0b7jcn47iMs P+cv6V/S1/AhgKOeYZQjiYRCP8Q1IxJPdoB9SEVWkGAC7HBTxjdFiL9l6PnJCIsMTEquCe DW5JfoM/cdf6bZtiNrf0aIxomB5OF6PMs1E47BVRcZHXRxvhWquK5NHT+k+L8VUgX8tN+K 8QmX4Ev19eh8s2OfQInUVmLpXDUkNE4eUpN7cyD8a6kYFmSrzO8FAee0j9yfwdXYHyls6P +22iv48biR54Kl+Ua7U+bancnWPbDD3ZIuc7haooIXa0VN9KWQN+INgHFMgroQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1673903805; 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=3OyjZTQqNvr1AIrUaHSfNOq2HHkKto0tAMHE9JjlTBw=; b=G9KYdk8/OJXp/ldTfGsDL9gOTwXLAn9sLb0MtWg9Da1a2brwtpKW2+HVDNCbMJCZpNHqJC XIh/Zk/8tcCgcXyob50fefedAax4UFoOqYdox2192J350CsKmAavSm8mpPZci3SqbKrtKm hfSwDFeb8epjFal6N+xmFCny1jbNHHy1G4Z9K6XY8cPLY6A/iRuEocMHZzlm5kcYbav87J y/2uYQ3gGUk5EA9bOB0eQIAWm1h40NYyKSBYnybqXV0MUjcHOtdUu3jZfd8C6w+WocpHYM YmlMJCrczgqNLVgBMM4oQSmWPMrekynQCGf4NU09SDan6U7PUoKMYHbwwOhWiw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1673903805; a=rsa-sha256; cv=none; b=tRsPWJ2cqNFXrcxel5uAOfJ16FSAMm40sIgEDAqlrdB11LsRfMYYVrpw/2ePFyhIfwFiEt siwPFbr/vGmOrxaojfZbV37ISDdCAAihQQ8EYcPkfSU0bG+dS9v/DWgME2UYKHOGAlxv+4 bW71XgMRH/mUADWf4hVWHa32lVI9gU2y3DeXZR/QtCKvhmRpO2uEh8RA2JCWGAG7qWbmvG h5ciW8ww+kB51787IRKaQnncicUPba67YXSZCVH/bgrwGNSSIy3M/KGhpM1wq1+8noz5ou z1SNAlijqbmbxSTwgXpZ7rhfwHYg0mmbF2HCJINpU68FMyMFEL9r6o4+LjPOpA== 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 4NwlFm6XRvz1LCx; Mon, 16 Jan 2023 21:16:44 +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 30GLGiGc024590; Mon, 16 Jan 2023 21:16:44 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 30GLGiWG024589; Mon, 16 Jan 2023 21:16:44 GMT (envelope-from git) Date: Mon, 16 Jan 2023 21:16:44 GMT Message-Id: <202301162116.30GLGiWG024589@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Dima Panov Subject: git: fd04ff9618b5 - main - devel/doxygen: drop staled patches 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: fluffy X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: fd04ff9618b59127f5ffdb1b8be425d28b953bb3 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by fluffy: URL: https://cgit.FreeBSD.org/ports/commit/?id=fd04ff9618b59127f5ffdb1b8be425d28b953bb3 commit fd04ff9618b59127f5ffdb1b8be425d28b953bb3 Author: Dima Panov AuthorDate: 2023-01-16 21:12:10 +0000 Commit: Dima Panov CommitDate: 2023-01-16 21:16:32 +0000 devel/doxygen: drop staled patches --- devel/doxygen/files/patch-doc-doxygen_manual.tex | 11 ----------- devel/doxygen/files/patch-doc-translator.py | 23 ----------------------- 2 files changed, 34 deletions(-) diff --git a/devel/doxygen/files/patch-doc-doxygen_manual.tex b/devel/doxygen/files/patch-doc-doxygen_manual.tex deleted file mode 100644 index 0665af5b15f2..000000000000 --- a/devel/doxygen/files/patch-doc-doxygen_manual.tex +++ /dev/null @@ -1,11 +0,0 @@ ---- doc/doxygen_manual.tex.orig 2019-08-04 11:51:41 UTC -+++ doc/doxygen_manual.tex -@@ -22,7 +22,7 @@ - \usepackage{array}[=2016-10-06] - \fi - %% --\usepackage[a4paper,left=2.5cm,right=2.5cm,top=2.5cm,bottom=2.5cm]{geometry} -+\usepackage[left=2.5cm,right=2.5cm,top=2.5cm,bottom=2.5cm]{geometry} - \usepackage{makeidx} - \usepackage{natbib} - \usepackage{graphicx} diff --git a/devel/doxygen/files/patch-doc-translator.py b/devel/doxygen/files/patch-doc-translator.py deleted file mode 100644 index 646f420a67e1..000000000000 --- a/devel/doxygen/files/patch-doc-translator.py +++ /dev/null @@ -1,23 +0,0 @@ -Hack to avoid "UnicodeDecodeError: 'utf-8' codec can't decode byte 0xb0 in position 45: invalid start byte" -in src/._xmlgen.cpp which is binary. This doesn't seem like it should be present at the time the docs -are generated, but this is simpler for now. ---- doc/translator.py -+++ doc/translator.py -@@ -1454,10 +1454,13 @@ class TrManager: - - # Read content of the file as one string. - assert os.path.isfile(fname) -- f = xopen(fname) -- cont = f.read() -- cont = ''.join(cont.split('\n')) # otherwise the 'match' function won't work. -- f.close() -+ try: -+ with xopen(fname) as f: -+ cont = f.read() -+ cont = ''.join(cont.split('\n')) # otherwise the 'match' function won't work. -+ except UnicodeDecodeError: -+ print("Skipping {0} because of decoding errors".format(fname)) -+ return - - # Remove the items for identifiers that were found in the file. - while lst_in: