From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: <gentoo-commits+bounces-1713002-garchives=archives.gentoo.org@lists.gentoo.org> Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (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 finch.gentoo.org (Postfix) with ESMTPS id C18A21580E0 for <garchives@archives.gentoo.org>; Sun, 26 Jan 2025 17:33:02 +0000 (UTC) Received: from lists.gentoo.org (bobolink.gentoo.org [140.211.166.189]) (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) (Authenticated sender: relay-lists.gentoo.org@gentoo.org) by smtp.gentoo.org (Postfix) with ESMTPSA id A9F86343548 for <garchives@archives.gentoo.org>; Sun, 26 Jan 2025 17:33:02 +0000 (UTC) Received: from bobolink.gentoo.org (localhost [127.0.0.1]) by bobolink.gentoo.org (Postfix) with ESMTP id 24830110471; Sun, 26 Jan 2025 17:32:59 +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 bobolink.gentoo.org (Postfix) with ESMTPS id 1D144110470 for <gentoo-commits@lists.gentoo.org>; Sun, 26 Jan 2025 17:32:59 +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) server-digest SHA256) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id B53BF343527 for <gentoo-commits@lists.gentoo.org>; Sun, 26 Jan 2025 17:32:58 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 1DD702082 for <gentoo-commits@lists.gentoo.org>; Sun, 26 Jan 2025 17:32:57 +0000 (UTC) From: "Pacho Ramos" <pacho@gentoo.org> To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Pacho Ramos" <pacho@gentoo.org> Message-ID: <1737906421.7c0abf85800ce5aac7b9bddd470ab35fc5943f81.pacho@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: gnome-base/gnome-control-center/ X-VCS-Repository: repo/gentoo X-VCS-Files: gnome-base/gnome-control-center/Manifest gnome-base/gnome-control-center/gnome-control-center-47.3.ebuild X-VCS-Directories: gnome-base/gnome-control-center/ X-VCS-Committer: pacho X-VCS-Committer-Name: Pacho Ramos X-VCS-Revision: 7c0abf85800ce5aac7b9bddd470ab35fc5943f81 X-VCS-Branch: master Date: Sun, 26 Jan 2025 17:32:57 +0000 (UTC) Precedence: bulk List-Post: <mailto:gentoo-commits@lists.gentoo.org> List-Help: <mailto:gentoo-commits+help@lists.gentoo.org> List-Unsubscribe: <mailto:gentoo-commits+unsubscribe@lists.gentoo.org> List-Subscribe: <mailto:gentoo-commits+subscribe@lists.gentoo.org> List-Id: Gentoo Linux mail <gentoo-commits.gentoo.org> X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 8ad805dd-a02d-4921-a9bb-fbbfe14d8dfd X-Archives-Hash: 152d20d6d5b2cd3da52ee03241fd2be3 commit: 7c0abf85800ce5aac7b9bddd470ab35fc5943f81 Author: Guillermo Joandet <gjoandet <AT> gmail <DOT> com> AuthorDate: Wed Aug 7 01:22:44 2024 +0000 Commit: Pacho Ramos <pacho <AT> gentoo <DOT> org> CommitDate: Sun Jan 26 15:47:01 2025 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7c0abf85 gnome-base/gnome-control-center: Bump to 47.3 Signed-off-by: Guillermo Joandet <gjoandet <AT> gmail.com> Closes: https://github.com/gentoo/gentoo/pull/38667 Signed-off-by: Pacho Ramos <pacho <AT> gentoo.org> gnome-base/gnome-control-center/Manifest | 2 + .../gnome-control-center-47.3.ebuild | 215 +++++++++++++++++++++ 2 files changed, 217 insertions(+) diff --git a/gnome-base/gnome-control-center/Manifest b/gnome-base/gnome-control-center/Manifest index fff2d159a69f..99dd50fb9831 100644 --- a/gnome-base/gnome-control-center/Manifest +++ b/gnome-base/gnome-control-center/Manifest @@ -5,5 +5,7 @@ DIST gnome-control-center-46.2-patchset.tar.xz 5872 BLAKE2B 745e817b0fcec81d5e39 DIST gnome-control-center-46.2.tar.xz 8030924 BLAKE2B 2c51bc6929ae6692f2c52f1b7b38972ac563b511b321e2b09358ee75a6c78254b0f0b60a079fb22bd5019f4d49effb32967029c9526cf3acd399098cf5e2b975 SHA512 0c91a0480f4f46ae3a9ec62294716bb5dbd0e606f22f842a4f7bc1d388496f0a3a36ed1da4a9f31139d8fd07e23e22367c212c98a0afc00842920092d71aecf5 DIST gnome-control-center-46.4-patchset-r1.tar.xz 5996 BLAKE2B 0df54d229f05d8803d99d32d60afb40c2ccd08c79061301a568a854fe2a6462003391b5d71ccb8bfd828cb189a56320d03d97674a06429a8e129d6b87dc14f81 SHA512 e7a48d431aa432513c90b41ed20327a8d6b378801a02d8c77dba147db04d287a719a3fb24965b0aab5f54684a69917fa0799aa080275fb58b7edcc474fb4c2e2 DIST gnome-control-center-46.4.tar.xz 8031580 BLAKE2B f26c2fde336d94cd53b3e3044b2e82de16729cfd48dae7b8dace3512dec9e4a298cd42135a6b5f7e8127d6802862dc3289065c7ac2e0eb543814b4caa7269650 SHA512 83a935cea6bec668c64bfbe4c72fe872d85d393f7cbad8c09a996008c35253c76801739d9dddfada186185403dee3ef7838384218853cd076694085c39b44d69 +DIST gnome-control-center-47.3-patchset.tar.xz 4980 BLAKE2B a9c8e8b20462d368d579c004e17ba837b7bae4d391ce5ecca5311dd3d3d11a20b7b06c1abe419adcda22e97ba0d3dd752926bccf27756353e9cbaaf8d0afed0a SHA512 a5ade6c98b3ba5b51e20ec22ea3d64c169b08f23c99fe988afd8d8699edaec8b158da652dacb236e0b16c446e9bd2d384cc4e383c5148acaa0792ca44a6e8bb1 +DIST gnome-control-center-47.3.tar.xz 7084876 BLAKE2B f7958d5d7b226bf94111a84dafd615343d92ba11ae21fce7c1466142d196267258ec2ea8050279e2cc0084b88be0e18c0947a35ddbcbc6b509463cf1c4dd1c44 SHA512 045c6e1dc50340c2f79d5ea333cdc2274aeb71b36b2b3c0ae707685e81d09d016b7de776793b690f8901461e36e0d3619b6c296e0453d93b19e7c2ecaa2b51b4 DIST gnome-control-center-gentoo-logo-dark.svg 14293 BLAKE2B 570e9326b8abe45849c31fd5cdb3fcfb1b2f18eac522f958928df5c3b747b0699f50a882f31cf7c0ae1f2138194f18596f738f42c942b57d340c53d46d82c551 SHA512 91227dafcf2091bb1568b0f9eec68b5e371ec64c9a6bc3605821f60d6bf2bd94dec0564f6a16a4a70d1db4d4df49fc25b6c910367bae3b85205cc609a9f2701b DIST gnome-control-center-gentoo-logo.svg 14288 BLAKE2B 371fc68b1015c8672db3e3858ae9077b1e3a9937e6add8690c39db36302ec031391c4d35e0c0b87094ca474a00c4187849e2d7111df34f43bc5bd7be52678527 SHA512 cf88933546de54ca15e2e830ac1086a78c4150f0ff59b8091e7e1cade5961c4e4cb83120a818a960b77841353ce3584ddc8f36b6edbde05543600283a143ad7b diff --git a/gnome-base/gnome-control-center/gnome-control-center-47.3.ebuild b/gnome-base/gnome-control-center/gnome-control-center-47.3.ebuild new file mode 100644 index 000000000000..c76cd6ed807e --- /dev/null +++ b/gnome-base/gnome-control-center/gnome-control-center-47.3.ebuild @@ -0,0 +1,215 @@ +# Copyright 2023-2025 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 +PYTHON_COMPAT=( python3_{10..13} ) + +inherit flag-o-matic gnome.org gnome2-utils meson python-any-r1 virtualx xdg + +DESCRIPTION="GNOME's main interface to configure various aspects of the desktop" +HOMEPAGE="https://gitlab.gnome.org/GNOME/gnome-control-center" +SRC_URI+=" https://dev.gentoo.org/~pacho/${PN}/${P}-patchset.tar.xz" +SRC_URI+=" https://dev.gentoo.org/~mattst88/distfiles/${PN}-gentoo-logo.svg" +SRC_URI+=" https://dev.gentoo.org/~mattst88/distfiles/${PN}-gentoo-logo-dark.svg" +# Logo is CC-BY-SA-2.5 +LICENSE="GPL-2+ CC-BY-SA-2.5" +SLOT="2" +KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~x86" + +IUSE="+bluetooth +cups debug elogind +gnome-online-accounts +ibus input_devices_wacom kerberos +geolocation networkmanager systemd test wayland" +REQUIRED_USE=" + ^^ ( elogind systemd ) +" # Theoretically "?? ( elogind systemd )" is fine too, lacking some functionality at runtime, +# but needs testing if handled gracefully enough + +RESTRICT="!test? ( test )" + +# kerberos unfortunately means mit-krb5; build fails with heimdal +# display panel requires colord and gnome-settings-daemon[colord] +# wacom panel requires gsd-enums.h from gsd at build time, probably also runtime support +# printer panel requires cups and smbclient (the latter is not patched yet to be separately optional) +# First block is toplevel meson.build deps in order of occurrence (plus deeper deps if in same conditional). +# Second block is dependency() from subdir meson.builds, sorted by directory name occurrence order +DEPEND=" + gnome-online-accounts? ( + x11-libs/gtk+:3 + >=net-libs/gnome-online-accounts-3.51.0:= + ) + >=media-libs/libpulse-2.0[glib] + >=gui-libs/gtk-4.15.2:4[X,wayland=] + >=gui-libs/libadwaita-1.6_beta:1 + >=sys-apps/accountsservice-0.6.39 + >=x11-misc/colord-0.1.34:0= + >=x11-libs/gdk-pixbuf-2.23.0:2 + >=dev-libs/glib-2.76.6:2 + gnome-base/gnome-desktop:4= + >=gnome-base/gnome-settings-daemon-41.0[colord,input_devices_wacom?] + >=gnome-base/gsettings-desktop-schemas-47.0 + dev-libs/libxml2:2 + >=sys-power/upower-0.99.8:= + >=dev-libs/libgudev-232 + >=x11-libs/libX11-1.8 + >=x11-libs/libXi-1.2 + media-libs/libepoxy + >=app-crypt/gcr-4.1.0 + >=dev-libs/libpwquality-1.2.2 + >=sys-auth/polkit-0.114 + cups? ( + >=net-print/cups-1.7[dbus] + >=net-fs/samba-4.0.0[client] + ) + ibus? ( >=app-i18n/ibus-1.5.2 ) + networkmanager? ( + >=net-libs/libnma-1.10.2 + >=net-misc/networkmanager-1.24.0[modemmanager] + >=net-misc/modemmanager-0.7.990:= + ) + bluetooth? ( net-wireless/gnome-bluetooth:3= ) + input_devices_wacom? ( >=dev-libs/libwacom-1.4:= ) + kerberos? ( app-crypt/mit-krb5 ) + + x11-libs/cairo[glib] + >=x11-libs/colord-gtk-0.3.0:= + media-libs/fontconfig + gnome-base/libgtop:2= + >=sys-fs/udisks-2.1.8:2 + app-crypt/libsecret + net-libs/gnutls:= + media-libs/gsound + + x11-libs/pango +" +# media-libs/libcanberra[pulseaudio,sound] needed for Speaker tests in +# Settings/Sound/Output/Output Device, bug #814110 +# systemd/elogind USE flagged because package manager will potentially try to satisfy a +# "|| ( systemd ( elogind openrc-settingsd)" via systemd if openrc-settingsd isn't already installed. +# gnome-color-manager needed for gcm-calibrate and gcm-viewer calls from color panel +# <gnome-color-manager-3.1.2 has file collisions with g-c-c-3.1.x +# +# mouse panel needs a concrete set of X11 drivers at runtime, bug #580474 +# Also we need newer driver versions to allow wacom and libinput drivers to +# not collide +# +# system-config-printer provides org.fedoraproject.Config.Printing service and interface +# cups-pk-helper provides org.opensuse.cupspkhelper.mechanism.all-edit policykit helper policy +RDEPEND="${DEPEND} + media-libs/libcanberra[pulseaudio,sound(+)] + systemd? ( >=sys-apps/systemd-31 ) + elogind? ( + app-admin/openrc-settingsd + sys-auth/elogind + ) + x11-themes/adwaita-icon-theme + >=gnome-extra/gnome-color-manager-3.1.2 + cups? ( + app-admin/system-config-printer + net-print/cups-pk-helper + ) + gnome-extra/tecla + wayland? ( dev-libs/libinput ) + !wayland? ( + >=x11-drivers/xf86-input-libinput-0.19.0 + input_devices_wacom? ( >=x11-drivers/xf86-input-wacom-0.33.0 ) + ) +" +# PDEPEND to avoid circular dependency; gnome-session-check-accelerated called by info panel +# gnome-session-2.91.6-r1 also needed so that 10-user-dirs-update is run at login +PDEPEND=">=gnome-base/gnome-session-2.91.6-r1 + networkmanager? ( gnome-extra/nm-applet )" # networking panel can call into nm-connection-editor + +# meson.build depends on python unconditionally +BDEPEND="${PYTHON_DEPS} + dev-libs/libxslt + app-text/docbook-xsl-stylesheets + app-text/docbook-xml-dtd:4.2 + x11-base/xorg-proto + dev-libs/libxml2:2 + dev-util/gdbus-codegen + dev-util/glib-utils + >=sys-devel/gettext-0.19.8 + virtual/pkgconfig + test? ( + $(python_gen_any_dep ' + dev-python/python-dbusmock[${PYTHON_USEDEP}] + ') + x11-apps/setxkbmap + ) +" + +PATCHES=( + # Makes some panels and dependencies optional + # https://bugzilla.gnome.org/686840, 697478, 700145 + # Fix some absolute paths to be appropriate for Gentoo + "${WORKDIR}"/patches/ +) + +python_check_deps() { + use test || return 0 + python_has_version "dev-python/python-dbusmock[${PYTHON_USEDEP}]" +} + +pkg_setup() { + python-any-r1_pkg_setup +} + +src_prepare() { + default + xdg_environment_reset + # Mark python tests with shebang executable, so that meson will launch them directly, instead + # of via its own python-single-r1 version, which might not match what we get from python_check_deps + chmod a+x tests/network/test-network-panel.py tests/datetime/test-datetime.py || die +} + +src_configure() { + # -Werror=strict-aliasing + # https://bugs.gentoo.org/889008 + # https://gitlab.gnome.org/GNOME/gnome-control-center/-/issues/2563 + # + # Do not trust with LTO either + append-flags -fno-strict-aliasing + filter-lto + + local emesonargs=( + $(meson_use bluetooth) + -Dcups=$(usex cups enabled disabled) + -Ddeprecated-declarations=disabled + -Ddocumentation=true # manpage + -Dlocation-services=$(usex geolocation enabled disabled) + -Dgoa=$(usex gnome-online-accounts enabled disabled) + $(meson_use ibus) + -Dkerberos=$(usex kerberos enabled disabled) + $(meson_use networkmanager network_manager) + -Dprivileged_group=wheel + -Dsnap=false + $(meson_use test tests) + $(meson_use input_devices_wacom wacom) + #$(meson_use wayland) # doesn't do anything in 3.34 and 3.36 due to unified gudev handling code + # bashcompletions installed to $datadir/bash-completion/completions by v3.28.2, + # which is the same as $(get_bashcompdir) + -Dmalcontent=false # unpackaged + -Ddistributor_logo=/usr/share/pixmaps/gnome-control-center-gentoo-logo.svg + -Ddark_mode_distributor_logo=/usr/share/pixmaps/gnome-control-center-gentoo-logo-dark.svg + ) + meson_src_configure +} + +src_test() { + virtx meson_src_test +} + +src_install() { + meson_src_install + insinto /usr/share/pixmaps + doins "${DISTDIR}"/gnome-control-center-gentoo-logo.svg + doins "${DISTDIR}"/gnome-control-center-gentoo-logo-dark.svg +} + +pkg_postinst() { + xdg_pkg_postinst + gnome2_schemas_update +} + +pkg_postrm() { + xdg_pkg_postrm + gnome2_schemas_update +}