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 4D453158087 for ; Fri, 21 Jan 2022 17:19:03 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 9157F2BC004; Fri, 21 Jan 2022 17:19:02 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 4FF9A2BC004 for ; Fri, 21 Jan 2022 17:19:02 +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)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 726823434BA for ; Fri, 21 Jan 2022 17:19:01 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 2BC6124E for ; Fri, 21 Jan 2022 17:19:00 +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: <1642785526.0bb38e37e4773eb4f5b53d5a5ee8e4c0cc04fb9d.sam@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: gnome-extra/cjs/files/, gnome-extra/cjs/ X-VCS-Repository: repo/gentoo X-VCS-Files: gnome-extra/cjs/cjs-5.0.1.ebuild gnome-extra/cjs/cjs-5.2.0.ebuild gnome-extra/cjs/files/cjs-5.0.1-meson-0.60.2.patch X-VCS-Directories: gnome-extra/cjs/files/ gnome-extra/cjs/ X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: 0bb38e37e4773eb4f5b53d5a5ee8e4c0cc04fb9d X-VCS-Branch: master Date: Fri, 21 Jan 2022 17:19:00 +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: 7f2f8294-0d50-46e3-997a-b0e2f562cd19 X-Archives-Hash: b7e008c80fc5d40c9427b0cee7846c12 commit: 0bb38e37e4773eb4f5b53d5a5ee8e4c0cc04fb9d Author: Sam James gentoo org> AuthorDate: Fri Jan 21 17:18:28 2022 +0000 Commit: Sam James gentoo org> CommitDate: Fri Jan 21 17:18:46 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0bb38e37 gnome-extra/cjs: fix build with meson 0.61 Just drop a patch which is going to end up reverted. Bug: https://github.com/linuxmint/cjs/pull/100 Closes: https://bugs.gentoo.org/831754 Signed-off-by: Sam James gentoo.org> gnome-extra/cjs/cjs-5.0.1.ebuild | 6 +-- gnome-extra/cjs/cjs-5.2.0.ebuild | 6 +-- gnome-extra/cjs/files/cjs-5.0.1-meson-0.60.2.patch | 58 ---------------------- 3 files changed, 2 insertions(+), 68 deletions(-) diff --git a/gnome-extra/cjs/cjs-5.0.1.ebuild b/gnome-extra/cjs/cjs-5.0.1.ebuild index b858d01e335f..cc39b0d608f5 100644 --- a/gnome-extra/cjs/cjs-5.0.1.ebuild +++ b/gnome-extra/cjs/cjs-5.0.1.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 @@ -38,10 +38,6 @@ BDEPEND=" virtual/pkgconfig " -PATCHES=( - "${FILESDIR}/cjs-5.0.1-meson-0.60.2.patch" -) - src_prepare() { default python_fix_shebang build diff --git a/gnome-extra/cjs/cjs-5.2.0.ebuild b/gnome-extra/cjs/cjs-5.2.0.ebuild index b51622fc3926..bf8e76b942a0 100644 --- a/gnome-extra/cjs/cjs-5.2.0.ebuild +++ b/gnome-extra/cjs/cjs-5.2.0.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 @@ -38,10 +38,6 @@ BDEPEND=" virtual/pkgconfig " -PATCHES=( - "${FILESDIR}/cjs-5.0.1-meson-0.60.2.patch" -) - src_prepare() { default python_fix_shebang build diff --git a/gnome-extra/cjs/files/cjs-5.0.1-meson-0.60.2.patch b/gnome-extra/cjs/files/cjs-5.0.1-meson-0.60.2.patch deleted file mode 100644 index 1ce4eef2abb2..000000000000 --- a/gnome-extra/cjs/files/cjs-5.0.1-meson-0.60.2.patch +++ /dev/null @@ -1,58 +0,0 @@ -From 61823ced59db5ce7a4223ce2759f3da52d83a0de Mon Sep 17 00:00:00 2001 -From: Jan Beich -Date: Sat, 27 Nov 2021 23:21:56 +0000 -Subject: [PATCH] build: disable gir install via list to pacify meson >= 0.60.2 - -meson.build:541:0: ERROR: "install_dir" must be specified when installing a target -installed-tests/js/meson.build:47:0: ERROR: "install_dir" must be specified when installing a target -installed-tests/js/meson.build:66:0: ERROR: "install_dir" must be specified when installing a target -installed-tests/js/meson.build:81:0: ERROR: "install_dir" must be specified when installing a target ---- - installed-tests/js/meson.build | 6 +++--- - meson.build | 2 +- - 2 files changed, 4 insertions(+), 4 deletions(-) - -diff --git a/installed-tests/js/meson.build b/installed-tests/js/meson.build -index d3125a7c..564124f2 100644 ---- a/installed-tests/js/meson.build -+++ b/installed-tests/js/meson.build -@@ -48,7 +48,7 @@ regress_gir = gnome.generate_gir(libregress, includes: regress_gir_includes, - sources: regress_sources, namespace: 'Regress', nsversion: '1.0', - identifier_prefix: 'Regress', symbol_prefix: 'regress_', - extra_args: ['--warn-all', '--warn-error'] + regress_gir_c_args, -- install: get_option('installed_tests'), install_dir_gir: false, -+ install: get_option('installed_tests'), install_dir_gir: [false], - install_dir_typelib: installed_tests_execdir) - regress_typelib = regress_gir[1] - -@@ -66,7 +66,7 @@ libwarnlib = library('warnlib', warnlib_sources, - warnlib_gir = gnome.generate_gir(libwarnlib, includes: ['Gio-2.0'], - sources: warnlib_sources, namespace: 'WarnLib', nsversion: '1.0', - symbol_prefix: 'warnlib_', header: 'warnlib.h', -- install: get_option('installed_tests'), install_dir_gir: false, -+ install: get_option('installed_tests'), install_dir_gir: [false], - install_dir_typelib: installed_tests_execdir) - warnlib_typelib = warnlib_gir[1] - -@@ -82,7 +82,7 @@ gimarshallingtests_gir = gnome.generate_gir(libgimarshallingtests, - includes: ['Gio-2.0'], sources: gimarshallingtests_sources, - namespace: 'GIMarshallingTests', nsversion: '1.0', - symbol_prefix: 'gi_marshalling_tests_', extra_args: '--warn-error', -- install: get_option('installed_tests'), install_dir_gir: false, -+ install: get_option('installed_tests'), install_dir_gir: [false], - install_dir_typelib: installed_tests_execdir) - gimarshallingtests_typelib = gimarshallingtests_gir[1] - -diff --git a/meson.build b/meson.build -index aa55addc..43ba4af1 100644 ---- a/meson.build -+++ b/meson.build -@@ -542,7 +542,7 @@ gjs_private_gir = gnome.generate_gir(libgjs, - includes: ['GObject-2.0', 'Gio-2.0'], sources: libgjs_private_sources, - namespace: 'CjsPrivate', nsversion: '1.0', identifier_prefix: 'Gjs', - symbol_prefix: 'gjs_', extra_args: '--warn-error', install: true, -- install_dir_gir: false, install_dir_typelib: pkglibdir / 'girepository-1.0') -+ install_dir_gir: [false], install_dir_typelib: pkglibdir / 'girepository-1.0') - gjs_private_typelib = gjs_private_gir[1] - - ### Build gjs-console interpreter ##############################################