Gentoo Archives: gentoo-commits

From: Matt Turner <mattst88@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: gnome-base/gnome-control-center/
Date: Thu, 28 Apr 2022 15:31:43
Message-Id: 1651159865.46642f8897eeb1ecba7dbe51d038d75281603460.mattst88@gentoo
1 commit: 46642f8897eeb1ecba7dbe51d038d75281603460
2 Author: Matt Turner <mattst88 <AT> gentoo <DOT> org>
3 AuthorDate: Thu Apr 28 15:05:35 2022 +0000
4 Commit: Matt Turner <mattst88 <AT> gentoo <DOT> org>
5 CommitDate: Thu Apr 28 15:31:05 2022 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=46642f88
7
8 gnome-base/gnome-control-center: Version bump to 42.1
9
10 Signed-off-by: Matt Turner <mattst88 <AT> gentoo.org>
11
12 gnome-base/gnome-control-center/Manifest | 1 +
13 .../gnome-control-center-42.1.ebuild | 174 +++++++++++++++++++++
14 2 files changed, 175 insertions(+)
15
16 diff --git a/gnome-base/gnome-control-center/Manifest b/gnome-base/gnome-control-center/Manifest
17 index 61899d540167..f271c2459a75 100644
18 --- a/gnome-base/gnome-control-center/Manifest
19 +++ b/gnome-base/gnome-control-center/Manifest
20 @@ -2,3 +2,4 @@ DIST gnome-control-center-41.2-patchset.tar.xz 6380 BLAKE2B de9eacf549686e43870d
21 DIST gnome-control-center-41.4.tar.xz 6616908 BLAKE2B 7c1a2692667c0447590d81c17ae990bff4b3bb7b85007ec70f8623d284cc0743ca79380dc60f1a9f97c01f897260c74acae0d730b197e8d4314e8002c7eec826 SHA512 63fa20041a06f5075d172b543176b4f037fcd623d9fa5ca5f785e047a9b95ccd002c423d29de673dcb28b7d99a83157b39d7bd65ef77fe70065e9a03b5ae38a4
22 DIST gnome-control-center-42.0-patchset.tar.xz 5932 BLAKE2B 1c9311481be6a07dc2ff61fc9e65f190bc1668026fba2a1e4a8edf9a033e6b2b9019542d89aac4480323ee4802e00b765654008f5252e87040f013a990cb8048 SHA512 b76c1facd3566edcadfe33f81027966da35bb03909bfbae6faad72005b92447e291fa424611196bfae6e1dc5bf5982917f3ae14c36d87206f6bfb4af502bf1a4
23 DIST gnome-control-center-42.0.tar.xz 6238096 BLAKE2B 63540c94d64d312ff9ce523cc3ef0023b35b93bbd0593cc6a3f5d671cc70980969617b2436b0c9994b8d225fac972d639b935affac36bc32bf621c4593d490bd SHA512 d8097240444ab45174e89db0f543d6523051829b124933cdbb84b1bc5d2d6809ee810f6d2c09702da51c991fe11496635b3164b490ed1e2ac523481d5466cf3e
24 +DIST gnome-control-center-42.1.tar.xz 6239960 BLAKE2B ba539267a00bca7218a8088fba1c2790d26239ea57ef45cdbbe6b54b687b30ab15ec4ced0078d9fab48a7d6d8fd9e966ffa3dd92bcae164d99a5e64c458e5852 SHA512 a29df2604d90e42a602060a7042d70238eed9e59c46b500610c6b5842e015ba0d9567528a3dfd6bf365973f274de47ccd4b8f2f50cfa35c8f88bb05cb31e774d
25
26 diff --git a/gnome-base/gnome-control-center/gnome-control-center-42.1.ebuild b/gnome-base/gnome-control-center/gnome-control-center-42.1.ebuild
27 new file mode 100644
28 index 000000000000..31035fb2e818
29 --- /dev/null
30 +++ b/gnome-base/gnome-control-center/gnome-control-center-42.1.ebuild
31 @@ -0,0 +1,174 @@
32 +# Copyright 1999-2022 Gentoo Authors
33 +# Distributed under the terms of the GNU General Public License v2
34 +
35 +EAPI=8
36 +PYTHON_COMPAT=( python3_{8..10} )
37 +
38 +inherit gnome.org gnome2-utils meson python-any-r1 xdg
39 +
40 +DESCRIPTION="GNOME's main interface to configure various aspects of the desktop"
41 +HOMEPAGE="https://gitlab.gnome.org/GNOME/gnome-control-center"
42 +SRC_URI+=" https://dev.gentoo.org/~mattst88/distfiles/${PN}-42.0-patchset.tar.xz"
43 +
44 +LICENSE="GPL-2+"
45 +SLOT="2"
46 +IUSE="+bluetooth +cups debug elogind +gnome-online-accounts +ibus input_devices_wacom kerberos networkmanager systemd test wayland"
47 +RESTRICT="!test? ( test )"
48 +REQUIRED_USE="
49 + ^^ ( elogind systemd )
50 +" # Theoretically "?? ( elogind systemd )" is fine too, lacking some functionality at runtime, but needs testing if handled gracefully enough
51 +KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
52 +
53 +# meson.build depends on python unconditionally
54 +BDEPEND="${PYTHON_DEPS}"
55 +
56 +# kerberos unfortunately means mit-krb5; build fails with heimdal
57 +# display panel requires colord and gnome-settings-daemon[colord]
58 +# wacom panel requires gsd-enums.h from gsd at build time, probably also runtime support
59 +# printer panel requires cups and smbclient (the latter is not patched yet to be separately optional)
60 +# 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
61 +DEPEND="
62 + gnome-online-accounts? ( >=net-libs/gnome-online-accounts-3.25.3:= )
63 + >=media-sound/pulseaudio-2.0[glib]
64 + >=gui-libs/libadwaita-1.1:1=
65 + >=sys-apps/accountsservice-0.6.39
66 + >=x11-misc/colord-0.1.34:0=
67 + >=x11-libs/gdk-pixbuf-2.23.0:2
68 + >=dev-libs/glib-2.56.0:2
69 + gnome-base/gnome-desktop:4=
70 + >=gnome-base/gnome-settings-daemon-41.0[colord,input_devices_wacom?]
71 + >=gnome-base/gsettings-desktop-schemas-42_alpha
72 + dev-libs/libxml2:2
73 + >=sys-power/upower-0.99.8:=
74 + >=dev-libs/libgudev-232
75 + x11-libs/libX11
76 + >=x11-libs/libXi-1.2
77 + media-libs/libepoxy
78 + app-crypt/gcr:=
79 + >=dev-libs/libpwquality-1.2.2
80 + >=gui-libs/gtk-4.4:4[X,wayland=]
81 + >=sys-auth/polkit-0.114
82 + cups? (
83 + >=net-print/cups-1.7[dbus]
84 + >=net-fs/samba-4.0.0[client]
85 + )
86 + ibus? ( >=app-i18n/ibus-1.5.2 )
87 + networkmanager? (
88 + >=net-libs/libnma-1.8.36
89 + >=net-misc/networkmanager-1.24.0:=[modemmanager]
90 + >=net-misc/modemmanager-0.7.990 )
91 + bluetooth? ( net-wireless/gnome-bluetooth:3= )
92 + input_devices_wacom? ( >=dev-libs/libwacom-0.27 )
93 + kerberos? ( app-crypt/mit-krb5 )
94 +
95 + x11-libs/cairo[glib]
96 + >=x11-libs/colord-gtk-0.3.0
97 + media-libs/fontconfig
98 + gnome-base/libgtop:2=
99 + >=sys-fs/udisks-2.1.8:2
100 + app-crypt/libsecret
101 + net-libs/gnutls:=
102 + media-libs/gsound
103 +"
104 +# systemd/elogind USE flagged because package manager will potentially try to satisfy a
105 +# "|| ( systemd ( elogind openrc-settingsd)" via systemd if openrc-settingsd isn't already installed.
106 +# libgnomekbd needed only for gkbd-keyboard-display tool
107 +# gnome-color-manager needed for gcm-calibrate and gcm-viewer calls from color panel
108 +# <gnome-color-manager-3.1.2 has file collisions with g-c-c-3.1.x
109 +#
110 +# mouse panel needs a concrete set of X11 drivers at runtime, bug #580474
111 +# Also we need newer driver versions to allow wacom and libinput drivers to
112 +# not collide
113 +#
114 +# system-config-printer provides org.fedoraproject.Config.Printing service and interface
115 +# cups-pk-helper provides org.opensuse.cupspkhelper.mechanism.all-edit policykit helper policy
116 +RDEPEND="${DEPEND}
117 + systemd? ( >=sys-apps/systemd-31 )
118 + elogind? ( app-admin/openrc-settingsd
119 + sys-auth/elogind )
120 + x11-themes/adwaita-icon-theme
121 + >=gnome-extra/gnome-color-manager-3.1.2
122 + cups? (
123 + app-admin/system-config-printer
124 + net-print/cups-pk-helper )
125 + >=gnome-base/libgnomekbd-3
126 + wayland? ( dev-libs/libinput )
127 + !wayland? (
128 + >=x11-drivers/xf86-input-libinput-0.19.0
129 + input_devices_wacom? ( >=x11-drivers/xf86-input-wacom-0.33.0 ) )
130 +"
131 +# PDEPEND to avoid circular dependency; gnome-session-check-accelerated called by info panel
132 +# gnome-session-2.91.6-r1 also needed so that 10-user-dirs-update is run at login
133 +PDEPEND=">=gnome-base/gnome-session-2.91.6-r1
134 + networkmanager? ( gnome-extra/nm-applet )" # networking panel can call into nm-connection-editor
135 +
136 +BDEPEND="
137 + dev-libs/libxslt
138 + app-text/docbook-xsl-stylesheets
139 + app-text/docbook-xml-dtd:4.2
140 + x11-base/xorg-proto
141 + dev-libs/libxml2:2
142 + dev-util/gdbus-codegen
143 + dev-util/glib-utils
144 + >=sys-devel/gettext-0.19.8
145 + virtual/pkgconfig
146 + test? ( $(python_gen_any_dep '
147 + dev-python/python-dbusmock[${PYTHON_USEDEP}]
148 + ') )
149 +"
150 +
151 +PATCHES=(
152 + # Patches from gnome-40 branch on top of 40.0
153 + # Makes some panels and dependencies optional
154 + # https://bugzilla.gnome.org/686840, 697478, 700145
155 + # Fix some absolute paths to be appropriate for Gentoo
156 + "${WORKDIR}"/patches/
157 +)
158 +
159 +python_check_deps() {
160 + use test || return 0
161 + has_version "dev-python/python-dbusmock[${PYTHON_USEDEP}]"
162 +}
163 +
164 +pkg_setup() {
165 + python-any-r1_pkg_setup
166 +}
167 +
168 +src_prepare() {
169 + default
170 + xdg_environment_reset
171 + # Mark python tests with shebang executable, so that meson will launch them directly, instead
172 + # of via its own python-single-r1 version, which might not match what we get from python_check_deps
173 + chmod a+x tests/network/test-network-panel.py tests/datetime/test-datetime.py || die
174 +}
175 +
176 +src_configure() {
177 + local emesonargs=(
178 + $(meson_use bluetooth)
179 + -Dcups=$(usex cups enabled disabled)
180 + -Ddocumentation=true # manpage
181 + -Dgoa=$(usex gnome-online-accounts enabled disabled)
182 + $(meson_use ibus)
183 + -Dkerberos=$(usex kerberos enabled disabled)
184 + $(meson_use networkmanager network_manager)
185 + -Dprivileged_group=wheel
186 + -Dsnap=false
187 + $(meson_use test tests)
188 + $(meson_use debug tracing)
189 + $(meson_use input_devices_wacom wacom)
190 + #$(meson_use wayland) # doesn't do anything in 3.34 and 3.36 due to unified gudev handling code
191 + # bashcompletions installed to $datadir/bash-completion/completions by v3.28.2, which is the same as $(get_bashcompdir)
192 + -Dmalcontent=false # unpackaged
193 + )
194 + meson_src_configure
195 +}
196 +
197 +pkg_postinst() {
198 + xdg_pkg_postinst
199 + gnome2_schemas_update
200 +}
201 +
202 +pkg_postrm() {
203 + xdg_pkg_postrm
204 + gnome2_schemas_update
205 +}