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 F226D15808B for ; Wed, 23 Mar 2022 06:14:50 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 4D448E088B; Wed, 23 Mar 2022 06:14:48 +0000 (UTC) Received: from smtp.gentoo.org (dev.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 107BEE088B for ; Wed, 23 Mar 2022 06:14:48 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (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 F28C43431D6 for ; Wed, 23 Mar 2022 06:14:46 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 5037E342 for ; Wed, 23 Mar 2022 06:14:44 +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: <1648016075.72c94dab3debdbe8eddb02df923ba0b91a0473b5.mattst88@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: gnome-base/gnome-settings-daemon/files/, gnome-base/gnome-settings-daemon/ X-VCS-Repository: repo/gentoo X-VCS-Files: gnome-base/gnome-settings-daemon/Manifest gnome-base/gnome-settings-daemon/files/42.1-build-Make-wacom-optional-and-controllable-via-meson.patch gnome-base/gnome-settings-daemon/gnome-settings-daemon-42.1.ebuild X-VCS-Directories: gnome-base/gnome-settings-daemon/files/ gnome-base/gnome-settings-daemon/ X-VCS-Committer: mattst88 X-VCS-Committer-Name: Matt Turner X-VCS-Revision: 72c94dab3debdbe8eddb02df923ba0b91a0473b5 X-VCS-Branch: master Date: Wed, 23 Mar 2022 06:14:44 +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: 5fdab786-1bb2-4257-a8ea-2fb4169b75cc X-Archives-Hash: 35904e4d0b6be120f4edb57917bab18c commit: 72c94dab3debdbe8eddb02df923ba0b91a0473b5 Author: Matt Turner gentoo org> AuthorDate: Wed Mar 23 06:12:41 2022 +0000 Commit: Matt Turner gentoo org> CommitDate: Wed Mar 23 06:14:35 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=72c94dab gnome-base/gnome-settings-daemon: Version bump to 42.1 Signed-off-by: Matt Turner gentoo.org> gnome-base/gnome-settings-daemon/Manifest | 1 + ...wacom-optional-and-controllable-via-meson.patch | 40 ++++++ .../gnome-settings-daemon-42.1.ebuild | 147 +++++++++++++++++++++ 3 files changed, 188 insertions(+) diff --git a/gnome-base/gnome-settings-daemon/Manifest b/gnome-base/gnome-settings-daemon/Manifest index 70eeb5a866c5..a0ec3b528cb3 100644 --- a/gnome-base/gnome-settings-daemon/Manifest +++ b/gnome-base/gnome-settings-daemon/Manifest @@ -1 +1,2 @@ DIST gnome-settings-daemon-41.0.tar.xz 1477876 BLAKE2B f17005b03cbee142434f0805e8f590d6d9edad0f09b3226bb40ab7e312ee13bcd46c211efb140303d4a351d8818238a28bd9aa3fe760fb617fb006e97eebde61 SHA512 2c6848a749f84fd0c3a9ade6f4a83ae3ff7464da429b2d73030c9dcbd278b070c40475c678c819e31464941f2bd38d81f11b96f24d0d1fb05271267c3a1ecc2a +DIST gnome-settings-daemon-42.1.tar.xz 1481432 BLAKE2B d045b2e2a17c6c54f0014db03e1b2d645086d907383b849de82f972af39463acf06ab1207817f171fd3b7a33b60303d058f04495158bb49aab7899da740f732c SHA512 20e87fc2318d77af016ec071cc6070f43ac42eaaf60a1f9bdb4278f59e038268e0a37759f0ab31068d8701b9dc64d142c0a875f0eeaa700ad47e0dbca3b9d141 diff --git a/gnome-base/gnome-settings-daemon/files/42.1-build-Make-wacom-optional-and-controllable-via-meson.patch b/gnome-base/gnome-settings-daemon/files/42.1-build-Make-wacom-optional-and-controllable-via-meson.patch new file mode 100644 index 000000000000..3956b7413978 --- /dev/null +++ b/gnome-base/gnome-settings-daemon/files/42.1-build-Make-wacom-optional-and-controllable-via-meson.patch @@ -0,0 +1,40 @@ +From 1e07481d4fd989828a7237c365e5420f50196ddd Mon Sep 17 00:00:00 2001 +From: Mart Raudsepp +Date: Thu, 14 Mar 2019 09:43:00 +0200 +Subject: [PATCH] build: Make wacom optional and controllable via meson_options + +--- + meson.build | 4 ++-- + meson_options.txt | 1 + + 2 files changed, 3 insertions(+), 2 deletions(-) + +diff --git a/meson.build b/meson.build +index a8955a49..0ac4f3ba 100644 +--- a/meson.build ++++ b/meson.build +@@ -154,8 +154,8 @@ if enable_wayland + endif + config_h.set10('HAVE_WAYLAND', enable_wayland) + +-# wacom (disabled for s390/s390x and non Linux platforms) +-enable_wacom = host_is_linux_not_s390 ++# wacom ++enable_wacom = get_option('wacom') + if enable_wacom + assert(enable_gudev, 'GUDev support is required for wacom support.') + libwacom_dep = dependency('libwacom', version: '>= 0.7') +diff --git a/meson_options.txt b/meson_options.txt +index 3e04cf64..010053e2 100644 +--- a/meson_options.txt ++++ b/meson_options.txt +@@ -9,6 +9,7 @@ option('network_manager', type: 'boolean', value: true, description: 'build with + option('rfkill', type: 'boolean', value: true, description: 'build with rfkill support (not optional on Linux platforms)') + option('smartcard', type: 'boolean', value: true, description: 'build with smartcard support') + option('usb-protection', type: 'boolean', value: true, description: 'build with usb-protection support') ++option('wacom', type: 'boolean', value: true, description: 'build with Wacom devices support') + option('wayland', type: 'boolean', value: true, description: 'build with Wayland support') + option('wwan', type: 'boolean', value: true, description: 'build with WWAN support') + option('colord', type: 'boolean', value: true, description: 'build with colord support') +-- +2.34.1 + diff --git a/gnome-base/gnome-settings-daemon/gnome-settings-daemon-42.1.ebuild b/gnome-base/gnome-settings-daemon/gnome-settings-daemon-42.1.ebuild new file mode 100644 index 000000000000..43fc4b23d465 --- /dev/null +++ b/gnome-base/gnome-settings-daemon/gnome-settings-daemon-42.1.ebuild @@ -0,0 +1,147 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 +PYTHON_COMPAT=( python3_{8..10} ) + +inherit gnome.org gnome2-utils python-any-r1 meson udev virtualx xdg + +DESCRIPTION="Gnome Settings Daemon" +HOMEPAGE="https://gitlab.gnome.org/GNOME/gnome-settings-daemon" + +LICENSE="GPL-2+ LGPL-2+" +SLOT="0" +IUSE="+colord +cups debug elogind input_devices_wacom modemmanager networkmanager smartcard systemd test +udev wayland" +RESTRICT="!test? ( test )" +REQUIRED_USE=" + ^^ ( elogind systemd ) + input_devices_wacom? ( udev ) + wayland? ( udev ) +" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-solaris" + +DEPEND=" + >=sci-geosciences/geocode-glib-3.10 + >=dev-libs/glib-2.58:2 + >=gnome-base/gnome-desktop-3.37.1:3= + >=gnome-base/gsettings-desktop-schemas-42 + >=x11-libs/gtk+-3.15.3:3[X,wayland?] + >=dev-libs/libgweather-4.0.0:4= + colord? ( + >=x11-misc/colord-1.4.5:= + >=media-libs/lcms-2.2:2 + ) + media-libs/libcanberra[gtk3] + >=app-misc/geoclue-2.3.1:2.0 + >=x11-libs/libnotify-0.7.3 + >=media-sound/pulseaudio-12.99.3[glib] + >=sys-auth/polkit-0.114 + >=sys-power/upower-0.99.12:= + x11-libs/libX11 + >=x11-libs/libXfixes-6.0.0 + udev? ( dev-libs/libgudev:= ) + wayland? ( dev-libs/wayland ) + input_devices_wacom? ( + >=dev-libs/libwacom-0.7 + >=x11-libs/pango-1.20.0 + x11-libs/gdk-pixbuf:2 + ) + smartcard? ( >=dev-libs/nss-3.11.2 ) + cups? ( >=net-print/cups-1.4[dbus] ) + modemmanager? ( + >=app-crypt/gcr-3.7.5:= + >=net-misc/modemmanager-1.0:= + ) + networkmanager? ( >=net-misc/networkmanager-1.0 ) + media-libs/alsa-lib + x11-libs/libXi + x11-libs/libXext + media-libs/fontconfig + systemd? ( + >=sys-apps/systemd-243 + ) +" +# logind needed for power and session management, bug #464944 +# gnome-session-3.33.90/gdm-3.33.90/gnome-shell-extensions-3.34.1/gnome-flashback-3.33.1 adapt to Clipboard and Mouse component removals (moved to mutter) +RDEPEND="${DEPEND} + gnome-base/dconf + elogind? ( sys-auth/elogind ) + !