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.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 0D42C1382C5 for ; Thu, 29 Apr 2021 01:56:19 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 5A055E086E; Thu, 29 Apr 2021 01:56:18 +0000 (UTC) Received: from smtp.gentoo.org (dev.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 40EC5E086E for ; Thu, 29 Apr 2021 01:56:18 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 61216340C30 for ; Thu, 29 Apr 2021 01:56:17 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 1C73771B for ; Thu, 29 Apr 2021 01:56:16 +0000 (UTC) From: "Matt Turner" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Matt Turner" Message-ID: <1619661367.2a99448fde4dd9e790ae7381a466d332bc3812ec.mattst88@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: x11-misc/colord/, x11-misc/colord/files/ X-VCS-Repository: repo/gentoo X-VCS-Files: x11-misc/colord/colord-1.4.5-r1.ebuild x11-misc/colord/colord-1.4.5.ebuild x11-misc/colord/files/1.4.5-build-Fix-building-without-vapi.patch X-VCS-Directories: x11-misc/colord/ x11-misc/colord/files/ X-VCS-Committer: mattst88 X-VCS-Committer-Name: Matt Turner X-VCS-Revision: 2a99448fde4dd9e790ae7381a466d332bc3812ec X-VCS-Branch: master Date: Thu, 29 Apr 2021 01:56:16 +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: 74b7e01c-284a-4f35-8665-1738f26b6e37 X-Archives-Hash: 5c84f488d78ba72ae8872d6f5cfc551a commit: 2a99448fde4dd9e790ae7381a466d332bc3812ec Author: Matt Turner gentoo org> AuthorDate: Thu Apr 29 01:48:46 2021 +0000 Commit: Matt Turner gentoo org> CommitDate: Thu Apr 29 01:56:07 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2a99448f x11-misc/colord: Drop unnecessary (???) build patch I wrote this patch to fix a failure in the configure stage, but I now cannot reproduce the failure without the patch, and the patch made USE=vala control whether introspection files were generated and installed. Closes: https://bugs.gentoo.org/784272 Signed-off-by: Matt Turner gentoo.org> ...{colord-1.4.5.ebuild => colord-1.4.5-r1.ebuild} | 1 - .../1.4.5-build-Fix-building-without-vapi.patch | 53 ---------------------- 2 files changed, 54 deletions(-) diff --git a/x11-misc/colord/colord-1.4.5.ebuild b/x11-misc/colord/colord-1.4.5-r1.ebuild similarity index 98% rename from x11-misc/colord/colord-1.4.5.ebuild rename to x11-misc/colord/colord-1.4.5-r1.ebuild index deeb744abd9..b1f278d89fb 100644 --- a/x11-misc/colord/colord-1.4.5.ebuild +++ b/x11-misc/colord/colord-1.4.5-r1.ebuild @@ -63,7 +63,6 @@ BDEPEND="${BDEPEND} PATCHES=( "${FILESDIR}"/${PV}-tests-Don-t-use-exact-floating-point-comparisons.patch - "${FILESDIR}"/${PV}-build-Fix-building-without-vapi.patch ) src_prepare() { diff --git a/x11-misc/colord/files/1.4.5-build-Fix-building-without-vapi.patch b/x11-misc/colord/files/1.4.5-build-Fix-building-without-vapi.patch deleted file mode 100644 index cbf79a830c0..00000000000 --- a/x11-misc/colord/files/1.4.5-build-Fix-building-without-vapi.patch +++ /dev/null @@ -1,53 +0,0 @@ -From 2bbcefa35225ba836b1672449f1de59ce9a90078 Mon Sep 17 00:00:00 2001 -From: Matt Turner -Date: Sun, 18 Apr 2021 16:46:52 -0400 -Subject: [PATCH] build: Fix building without vapi - ---- - lib/colord/meson.build | 2 +- - lib/colorhug/meson.build | 2 ++ - 2 files changed, 3 insertions(+), 1 deletion(-) - -diff --git a/lib/colord/meson.build b/lib/colord/meson.build -index dbb3d19..3126046 100644 ---- a/lib/colord/meson.build -+++ b/lib/colord/meson.build -@@ -146,6 +146,7 @@ pkgg.generate( - description : 'colord is a system daemon for managing color devices', - ) - -+if get_option('vapi') - libcolord_girtarget = gnome.generate_gir(colord, - sources : [ - 'cd-client.c', -@@ -203,7 +204,6 @@ libcolord_girtarget = gnome.generate_gir(colord, - libcolord_gir = libcolord_girtarget[0] - libcolord_typelib = libcolord_girtarget[1] - --if get_option('vapi') - gnome.generate_vapi('colord', - sources: libcolord_girtarget[0], - packages: ['gio-2.0'], -diff --git a/lib/colorhug/meson.build b/lib/colorhug/meson.build -index 9526ea4..9f17553 100644 ---- a/lib/colorhug/meson.build -+++ b/lib/colorhug/meson.build -@@ -73,6 +73,7 @@ pkgg.generate( - description : 'ColorHug is a simple display hardware colorimeter', - ) - -+if get_option('vapi') - libcolorhug_gir = gnome.generate_gir(colorhug, - sources : [ - 'ch-common.c', -@@ -107,6 +108,7 @@ libcolorhug_gir = gnome.generate_gir(colorhug, - ], - install : true - ) -+endif - - if get_option('tests') - e = executable( --- -2.26.3 -