diff options
| author |   Mart Raudsepp <leio@gentoo.org> | 2019-03-14 23:51:21 +0200 |
|---|---|---|
| committer | Mart Raudsepp <leio@gentoo.org> | 2019-03-14 23:51:36 +0200 |
| commit | 4be168f317269bae57ec50cd551e0f798f517f47 (patch) | |
| tree | 9a9876541e34e86925b333cfd8d58dd88e03a0d1 /gnome-base/gnome-control-center | |
| parent | dev-python/django-js-asset: additional attributes for django.forms.Media (diff) | |
| download | gentoo-4be168f317269bae57ec50cd551e0f798f517f47.tar.gz gentoo-4be168f317269bae57ec50cd551e0f798f517f47.tar.bz2 gentoo-4be168f317269bae57ec50cd551e0f798f517f47.zip | |
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@gentoo.org>
Diffstat (limited to 'gnome-base/gnome-control-center')
| -rw-r--r-- | gnome-base/gnome-control-center/files/3.30.3-conditional-cups-tests.patch | 28 | ||||
| -rw-r--r-- | gnome-base/gnome-control-center/gnome-control-center-3.30.3.ebuild | 2 |
2 files changed, 30 insertions, 0 deletions
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 000000000000..8b9d738c10fb --- /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 <leio@gentoo.org> +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 0e9bf5c64ab1..7beb2fd313cc 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() { |