From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 08DEC158087 for ; Thu, 20 Jan 2022 03:11:08 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 12CE4E077F; Thu, 20 Jan 2022 03:11:07 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (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) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id DBB72E076B for ; Thu, 20 Jan 2022 03:11:05 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (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) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id DA4C03432D9 for ; Thu, 20 Jan 2022 03:11:03 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 6CE2B2A4 for ; Thu, 20 Jan 2022 03:11:02 +0000 (UTC) From: "Sam James" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Sam James" Message-ID: <1642648166.b02e1593d0916e5657fb7e1d3bf34a90b8f34f03.sam@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: app-text/zathura/, app-text/zathura/files/ X-VCS-Repository: repo/gentoo X-VCS-Files: app-text/zathura/files/zathura-0.4.8-meson-0.61-build.patch app-text/zathura/zathura-0.4.8.ebuild X-VCS-Directories: app-text/zathura/ app-text/zathura/files/ X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: b02e1593d0916e5657fb7e1d3bf34a90b8f34f03 X-VCS-Branch: master Date: Thu, 20 Jan 2022 03:11:02 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 0ab1b38b-f9d5-4060-847d-3f306b9a2015 X-Archives-Hash: 1ee11616f6c715047c47605297c950d9 commit: b02e1593d0916e5657fb7e1d3bf34a90b8f34f03 Author: Sam James gentoo org> AuthorDate: Thu Jan 20 03:09:26 2022 +0000 Commit: Sam James gentoo org> CommitDate: Thu Jan 20 03:09:26 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b02e1593 app-text/zathura: fix build with meson 0.61 Closes: https://bugs.gentoo.org/831468 Signed-off-by: Sam James gentoo.org> .../files/zathura-0.4.8-meson-0.61-build.patch | 27 ++++++++++++++++++++++ app-text/zathura/zathura-0.4.8.ebuild | 6 ++++- 2 files changed, 32 insertions(+), 1 deletion(-) diff --git a/app-text/zathura/files/zathura-0.4.8-meson-0.61-build.patch b/app-text/zathura/files/zathura-0.4.8-meson-0.61-build.patch new file mode 100644 index 000000000000..577eddc4da1f --- /dev/null +++ b/app-text/zathura/files/zathura-0.4.8-meson-0.61-build.patch @@ -0,0 +1,27 @@ +https://github.com/pwmt/zathura/commit/c6ec5044c5ff843979050bfb81742d14740bb656.patch +https://bugs.gentoo.org/831468 + +From: Sebastian Ramacher +Date: Sat, 30 Oct 2021 15:41:25 +0200 +Subject: [PATCH] Fix build with meson 0.60 + +--- a/data/meson.build ++++ b/data/meson.build +@@ -19,7 +19,7 @@ endif + i18n = import('i18n') + podir = join_paths(meson.project_source_root(), 'po') + +-desktop = i18n.merge_file('desktop', ++desktop = i18n.merge_file( + input: 'org.pwmt.zathura.desktop.in', + output: 'org.pwmt.zathura.desktop', + install: true, +@@ -28,7 +28,7 @@ desktop = i18n.merge_file('desktop', + type: 'desktop' + ) + +-appdata = i18n.merge_file('appdata', ++appdata = i18n.merge_file( + input: 'org.pwmt.zathura.appdata.xml.in', + output: 'org.pwmt.zathura.appdata.xml', + install: true, diff --git a/app-text/zathura/zathura-0.4.8.ebuild b/app-text/zathura/zathura-0.4.8.ebuild index 0de2aed7939f..83b02ddfd08f 100644 --- a/app-text/zathura/zathura-0.4.8.ebuild +++ b/app-text/zathura/zathura-0.4.8.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -40,6 +40,10 @@ BDEPEND="doc? ( dev-python/sphinx ) dev-libs/check ) virtual/pkgconfig" +PATCHES=( + "${FILESDIR}"/${P}-meson-0.61-build.patch +) + src_configure() { local emesonargs=( -Dconvert-icon=disabled