commit: 4be168f317269bae57ec50cd551e0f798f517f47 Author: Mart Raudsepp <leio <AT> gentoo <DOT> org> AuthorDate: Thu Mar 14 21:51:21 2019 +0000 Commit: Mart Raudsepp <leio <AT> gentoo <DOT> org> CommitDate: Thu Mar 14 21:51:36 2019 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4be168f3
gnome-base/gnome-control-center-3.30: fix build with USE=-cups Fixes: https://bugs.gentoo.org/680354 Package-Manager: Portage-2.3.52, Repoman-2.3.12 Signed-off-by: Mart Raudsepp <leio <AT> gentoo.org> .../files/3.30.3-conditional-cups-tests.patch | 28 ++++++++++++++++++++++ .../gnome-control-center-3.30.3.ebuild | 2 ++ 2 files changed, 30 insertions(+) diff --git a/gnome-base/gnome-control-center/files/3.30.3-conditional-cups-tests.patch b/gnome-base/gnome-control-center/files/3.30.3-conditional-cups-tests.patch new file mode 100644 index 00000000000..8b9d738c10f --- /dev/null +++ b/gnome-base/gnome-control-center/files/3.30.3-conditional-cups-tests.patch @@ -0,0 +1,28 @@ +From f724fb0f41672bfa5cd6fe098223acc795de90a4 Mon Sep 17 00:00:00 2001 +From: Mart Raudsepp <[email protected]> +Date: Thu, 14 Mar 2019 23:35:08 +0200 +Subject: [PATCH] build: Conditionalize printer panel tests with enable_cups + +3.30 moved various tests from being alongside the panels to a +separate toplevel tests/ subdirectory, which was missed while +porting the patchset. Fix it. +--- + tests/meson.build | 4 +++- + 1 file changed, 3 insertions(+), 1 deletion(-) + +diff --git a/tests/meson.build b/tests/meson.build +index 7c894e480..fb39c9f48 100644 +--- a/tests/meson.build ++++ b/tests/meson.build +@@ -3,5 +3,7 @@ subdir('common') + #if host_is_linux + # subdir('network') + #endif +-subdir('printers') ++if enable_cups ++ subdir('printers') ++endif + subdir('info') +-- +2.17.0 + diff --git a/gnome-base/gnome-control-center/gnome-control-center-3.30.3.ebuild b/gnome-base/gnome-control-center/gnome-control-center-3.30.3.ebuild index 0e9bf5c64ab..7beb2fd313c 100644 --- a/gnome-base/gnome-control-center/gnome-control-center-3.30.3.ebuild +++ b/gnome-base/gnome-control-center/gnome-control-center-3.30.3.ebuild @@ -119,6 +119,8 @@ PATCHES=( # https://bugzilla.gnome.org/686840, 697478, 700145 # Fix some absolute paths to be appropriate for Gentoo "${WORKDIR}"/patches/ + # Extra patch to fix incomplete USE=-cups support in patchset; amend it into the cups optionality commit for next patchset + "${FILESDIR}"/${PV}-conditional-cups-tests.patch ) src_configure() {
