Gentoo Archives: gentoo-commits

From: Sobhan Mohammadpour <sobhan@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] proj/gnome:master commit in: gnome-base/gnome-settings-daemon/, gnome-base/gnome-settings-daemon/files/
Date: Fri, 09 Feb 2018 15:56:02
Message-Id: 1518190969.e588ec09d3603c3e92b10ccee617258b92132b7a.sobhan@gentoo
1 commit: e588ec09d3603c3e92b10ccee617258b92132b7a
2 Author: Sobhan Mohammadpour <sobhan <AT> gentoo <DOT> org>
3 AuthorDate: Fri Feb 9 15:42:49 2018 +0000
4 Commit: Sobhan Mohammadpour <sobhan <AT> gentoo <DOT> org>
5 CommitDate: Fri Feb 9 15:42:49 2018 +0000
6 URL: https://gitweb.gentoo.org/proj/gnome.git/commit/?id=e588ec09
7
8 gnome-base/gnome-settings-daemon: bump
9
10 Package-Manager: Portage-2.3.23, Repoman-2.3.6
11 Manifest-Sign-Key: 0x7DF238CF0AA182E1
12
13 .../files/3.24.2-udevrulesdir-configure.patch | 48 ++++++
14 .../files/3.24.3-fix-wayland-build.patch | 53 +++++++
15 .../files/3.26.1-optional.patch | 169 +++++++++++++++++++++
16 .../gnome-settings-daemon-3.26.1.ebuild | 156 +++++++++++++++++++
17 4 files changed, 426 insertions(+)
18
19 diff --git a/gnome-base/gnome-settings-daemon/files/3.24.2-udevrulesdir-configure.patch b/gnome-base/gnome-settings-daemon/files/3.24.2-udevrulesdir-configure.patch
20 new file mode 100644
21 index 00000000..16988f94
22 --- /dev/null
23 +++ b/gnome-base/gnome-settings-daemon/files/3.24.2-udevrulesdir-configure.patch
24 @@ -0,0 +1,48 @@
25 +From 04d399edc26bfa44d6053aba929e0776a193cea8 Mon Sep 17 00:00:00 2001
26 +From: Mart Raudsepp <leio@g.o>
27 +Date: Mon, 29 May 2017 00:38:57 +0300
28 +Subject: [PATCH 1/5] build: Get udevrulesdir from pkg-config
29 +
30 +Use the standard way to find the udev rules directory via pkg-config by default,
31 +and support specifying it, should it be necessary.
32 +This is the same logic as in colord.
33 +---
34 + configure.ac | 9 +++++++++
35 + plugins/rfkill/Makefile.am | 1 -
36 + 2 files changed, 9 insertions(+), 1 deletion(-)
37 +
38 +diff --git a/configure.ac b/configure.ac
39 +index 1107578..475821d 100644
40 +--- a/configure.ac
41 ++++ b/configure.ac
42 +@@ -104,6 +104,15 @@ fi
43 + AM_CONDITIONAL(HAVE_GUDEV, test x$have_gudev = xyes)
44 +
45 + dnl ---------------------------------------------------------------------------
46 ++dnl - Where to install udev rules
47 ++dnl ---------------------------------------------------------------------------
48 ++AC_ARG_WITH([udevrulesdir],
49 ++ AS_HELP_STRING([--with-udevrulesdir=DIR], [Directory for udev rules files]),
50 ++ [],
51 ++ [with_udevrulesdir=$($PKG_CONFIG --variable=udevdir udev)/rules.d])
52 ++AC_SUBST([udevrulesdir], [$with_udevrulesdir])
53 ++
54 ++dnl ---------------------------------------------------------------------------
55 + dnl - ALSA integration (default enabled)
56 + dnl ---------------------------------------------------------------------------
57 + ALSA_PKG=""
58 +diff --git a/plugins/rfkill/Makefile.am b/plugins/rfkill/Makefile.am
59 +index 3c5ec47..bfc34c6 100644
60 +--- a/plugins/rfkill/Makefile.am
61 ++++ b/plugins/rfkill/Makefile.am
62 +@@ -30,7 +30,6 @@ desktop_DATA = $(desktop_in_files:.desktop.in=.desktop)
63 + org.gnome.SettingsDaemon.Rfkill.desktop: $(desktop_in_files) Makefile
64 + $(AM_V_GEN) sed -e "s|\@libexecdir\@|$(libexecdir)|" $< > $@
65 +
66 +-udevrulesdir = $(prefix)/lib/udev/rules.d
67 + udevrules_DATA = 61-gnome-settings-daemon-rfkill.rules
68 +
69 + EXTRA_DIST = $(udevrules_DATA) $(desktop_in_files)
70 +--
71 +2.10.2
72 +
73
74 diff --git a/gnome-base/gnome-settings-daemon/files/3.24.3-fix-wayland-build.patch b/gnome-base/gnome-settings-daemon/files/3.24.3-fix-wayland-build.patch
75 new file mode 100644
76 index 00000000..4a06889a
77 --- /dev/null
78 +++ b/gnome-base/gnome-settings-daemon/files/3.24.3-fix-wayland-build.patch
79 @@ -0,0 +1,53 @@
80 +From 58403ad7677d98fbb14b020dc4d15c52a695496e Mon Sep 17 00:00:00 2001
81 +From: Gilles Dartiguelongue <eva@g.o>
82 +Date: Fri, 18 Aug 2017 09:42:56 +0200
83 +Subject: [PATCH] Fix build issue when gudev is detected in the absence of
84 + wayland
85 +
86 +See https://bugs.gentoo.org/show_bug.cgi?id=627966
87 +---
88 + configure.ac | 5 +++++
89 + plugins/common/Makefile.am | 2 +-
90 + 2 files changed, 6 insertions(+), 1 deletion(-)
91 +
92 +diff --git a/configure.ac b/configure.ac
93 +index 908b3a3a..c89d5e2d 100644
94 +--- a/configure.ac
95 ++++ b/configure.ac
96 +@@ -140,15 +140,20 @@ AC_ARG_ENABLE(wayland,
97 + AS_HELP_STRING([--disable-wayland],[Disable wayland support (default: auto)]),
98 + enable_wayland=$enableval, enable_wayland=auto)
99 + if test x$enable_wayland != xno; then
100 ++ AS_IF([test "$have_udev" = no],
101 ++ [AC_MSG_ERROR([udev is required for Wayland support])])
102 ++
103 + PKG_CHECK_MODULES(WAYLAND, wayland-client, have_wayland=yes, have_wayland=no)
104 + if test x$have_wayland = xyes; then
105 + AC_DEFINE(HAVE_WAYLAND, 1, [Define if libwayland-client is available])
106 ++ GUDEV_PKG="$GUDEV_PKG gdk-wayland-3.0"
107 + else
108 + if test x$enable_wayland = xyes; then
109 + AC_MSG_ERROR([Wayland enabled but not found])
110 + fi
111 + fi
112 + fi
113 ++AM_CONDITIONAL(HAVE_WAYLAND, test x$have_wayland = xyes)
114 +
115 + dnl ================================================================
116 + dnl Plugins
117 +diff --git a/plugins/common/Makefile.am b/plugins/common/Makefile.am
118 +index 107e4d3b..760f3198 100644
119 +--- a/plugins/common/Makefile.am
120 ++++ b/plugins/common/Makefile.am
121 +@@ -40,7 +40,7 @@ libcommon_la_SOURCES = \
122 + gsd-shell-helper.c \
123 + gsd-shell-helper.h
124 +
125 +-if HAVE_GUDEV
126 ++if HAVE_WAYLAND
127 + libcommon_la_SOURCES += \
128 + gsd-device-manager-udev.c \
129 + gsd-device-manager-udev.h
130 +--
131 +2.14.1
132 +
133
134 diff --git a/gnome-base/gnome-settings-daemon/files/3.26.1-optional.patch b/gnome-base/gnome-settings-daemon/files/3.26.1-optional.patch
135 new file mode 100644
136 index 00000000..608784c4
137 --- /dev/null
138 +++ b/gnome-base/gnome-settings-daemon/files/3.26.1-optional.patch
139 @@ -0,0 +1,169 @@
140 +From 9116667b39f7a3ef622b0fd4e09ffa77718fa5c2 Mon Sep 17 00:00:00 2001
141 +From: Ole Reifschneider <mail@×××××××××××××××××.de>
142 +Date: Tue, 15 Aug 2017 18:51:42 +0200
143 +Subject: [PATCH 1/6] Make colord and wacom support optional
144 +
145 +Signed-off-by: Gilles Dartiguelongue <eva@g.o>
146 +Signed-off-by: Timo Tambet <ttambet@×××××.com>
147 +Signed-off-by: Yuh-Horng Chen <yhchens@×××××.com>
148 +---
149 + configure.ac | 54 ++++++++++++++++++++++++++++++----------------
150 + plugins/Makefile.am | 9 ++++++--
151 + plugins/common/Makefile.am | 7 ++++--
152 + plugins/dummy/Makefile.am | 5 ++++-
153 + 4 files changed, 52 insertions(+), 23 deletions(-)
154 +
155 +diff --git a/configure.ac b/configure.ac
156 +index 73fe91e6..d8778c93 100644
157 +--- a/configure.ac
158 ++++ b/configure.ac
159 +@@ -158,13 +158,23 @@ PKG_CHECK_MODULES(CLIPBOARD,
160 + gtk+-x11-3.0
161 + x11)
162 +
163 +-PKG_CHECK_MODULES(COLOR,
164 +- colord >= 1.0.2
165 +- gnome-desktop-3.0 >= $GNOME_DESKTOP_REQUIRED_VERSION
166 +- libcanberra-gtk3
167 +- libgeoclue-2.0 >= $GEOCLUE_REQUIRED_VERSION
168 +- lcms2 >= $LCMS_REQUIRED_VERSION
169 +- libnotify)
170 ++AC_ARG_ENABLE([color],
171 ++ AS_HELP_STRING([--disable-color],
172 ++ [turn off color plugin]),
173 ++ [],
174 ++ [enable_color=yes])
175 ++
176 ++AS_IF([test "$enable_color" = "yes"],
177 ++ [PKG_CHECK_MODULES(COLOR,
178 ++ colord >= 1.0.2
179 ++ gnome-desktop-3.0 >= $GNOME_DESKTOP_REQUIRED_VERSION
180 ++ libcanberra-gtk3
181 ++ libgeoclue-2.0 >= $GEOCLUE_REQUIRED_VERSION
182 ++ lcms2 >= $LCMS_REQUIRED_VERSION
183 ++ libnotify)
184 ++ AC_DEFINE(HAVE_COLOR, 1, [Define if color plugin is enabled])
185 ++ ])
186 ++AM_CONDITIONAL(BUILD_COLOR, test "x$enable_color" = "xyes")
187 +
188 + PKG_CHECK_MODULES(DATETIME,
189 + libnotify >= $LIBNOTIFY_REQUIRED_VERSION
190 +@@ -268,23 +278,31 @@ case $host_os in
191 + if test "$host_cpu" = s390 -o "$host_cpu" = s390x; then
192 + have_wacom=no
193 + else
194 +- if test x$enable_gudev != xno; then
195 +- LIBWACOM_PKG="libwacom >= $LIBWACOM_REQUIRED_VERSION"
196 +- PKG_CHECK_MODULES(LIBWACOM, [libwacom >= $LIBWACOM_REQUIRED_VERSION])
197 +- PKG_CHECK_MODULES(WACOM, [gtk+-3.0 pango >= $PANGO_REQUIRED_VERSION])
198 +- PKG_CHECK_MODULES(WACOM_OLED, [gudev-1.0])
199 +- else
200 +- AC_MSG_ERROR([GUdev is necessary to compile Wacom support])
201 +- fi
202 +- AC_DEFINE_UNQUOTED(HAVE_WACOM, 1, [Define to 1 if wacom support is available])
203 +- have_wacom=yes
204 ++ have_wacom=no
205 ++ AS_IF([test "$enable_gudev" != "no"],
206 ++ [AC_ARG_ENABLE([wacom],
207 ++ AS_HELP_STRING([--disable-wacom],
208 ++ [turn off wacom plugin]),
209 ++ [],
210 ++ [enable_wacom=no]) dnl Default value
211 ++ AS_IF([test "$enable_wacom" = "yes"],
212 ++ [
213 ++ PKG_CHECK_MODULES(LIBWACOM, [libwacom >= $LIBWACOM_REQUIRED_VERSION])
214 ++ PKG_CHECK_MODULES(WACOM, [gtk+-3.0 pango >= $PANGO_REQUIRED_VERSION])
215 ++ PKG_CHECK_MODULES(WACOM_OLED, [gudev-1.0])
216 ++ have_wacom=yes
217 ++ AC_DEFINE_UNQUOTED(HAVE_WACOM, 1, [Define to 1 if wacom support is available])
218 ++ ])
219 ++ ], [
220 ++ AC_MSG_ERROR([GUdev is necessary to compile Wacom support])
221 ++ ])
222 + fi
223 + ;;
224 + *)
225 + have_wacom=no
226 + ;;
227 + esac
228 +-AM_CONDITIONAL(HAVE_WACOM, test x$have_wacom = xyes)
229 ++AM_CONDITIONAL(BUILD_WACOM, test x$have_wacom = xyes)
230 +
231 + dnl ---------------------------------------------------------------------------
232 + dnl - common
233 +diff --git a/plugins/Makefile.am b/plugins/Makefile.am
234 +index 9324b406..ee78d6d0 100644
235 +--- a/plugins/Makefile.am
236 ++++ b/plugins/Makefile.am
237 +@@ -4,7 +4,6 @@ enabled_plugins = \
238 + a11y-keyboard \
239 + a11y-settings \
240 + clipboard \
241 +- color \
242 + datetime \
243 + dummy \
244 + power \
245 +@@ -22,13 +21,19 @@ enabled_plugins = \
246 +
247 + disabled_plugins = $(NULL)
248 +
249 ++if BUILD_COLOR
250 ++enabled_plugins += color
251 ++else
252 ++disabled_plugins += color
253 ++endif
254 ++
255 + if SMARTCARD_SUPPORT
256 + enabled_plugins += smartcard
257 + else
258 + disabled_plugins += smartcard
259 + endif
260 +
261 +-if HAVE_WACOM
262 ++if BUILD_WACOM
263 + enabled_plugins += wacom
264 + else
265 + disabled_plugins += wacom
266 +diff --git a/plugins/common/Makefile.am b/plugins/common/Makefile.am
267 +index 239c6015..65de4007 100644
268 +--- a/plugins/common/Makefile.am
269 ++++ b/plugins/common/Makefile.am
270 +@@ -49,14 +49,17 @@ libcommon_la_CPPFLAGS = \
271 + -I$(top_builddir)/gnome-settings-daemon \
272 + -I$(top_srcdir)/data/
273 +
274 +-libcommon_la_CFLAGS = $(COMMON_CFLAGS)
275 ++libcommon_la_CFLAGS = \
276 ++ $(COMMON_CFLAGS) \
277 ++ $(LIBWACOM_CFLAGS)
278 +
279 + libcommon_la_LDFLAGS = \
280 + $(GSD_PLUGIN_LDFLAGS)
281 +
282 + libcommon_la_LIBADD = \
283 + $(top_builddir)/gnome-settings-daemon/libgsd.la \
284 +- $(COMMON_LIBS)
285 ++ $(COMMON_LIBS) \
286 ++ $(LIBWACOM_LIBS)
287 +
288 + libexec_PROGRAMS = gsd-test-input-helper
289 +
290 +diff --git a/plugins/dummy/Makefile.am b/plugins/dummy/Makefile.am
291 +index cb5856cf..d8e8bc4e 100644
292 +--- a/plugins/dummy/Makefile.am
293 ++++ b/plugins/dummy/Makefile.am
294 +@@ -25,7 +25,10 @@ desktop_DATA =
295 + if !SMARTCARD_SUPPORT
296 + desktop_DATA += org.gnome.SettingsDaemon.Smartcard.desktop
297 + endif
298 +-if !HAVE_WACOM
299 ++if !BUILD_COLOR
300 ++desktop_DATA += org.gnome.SettingsDaemon.Color.desktop
301 ++endif
302 ++if !BUILD_WACOM
303 + desktop_DATA += org.gnome.SettingsDaemon.Wacom.desktop
304 + endif
305 + if !BUILD_PRINT_NOTIFICATIONS
306 +--
307 +2.14.1
308 +
309
310 diff --git a/gnome-base/gnome-settings-daemon/gnome-settings-daemon-3.26.1.ebuild b/gnome-base/gnome-settings-daemon/gnome-settings-daemon-3.26.1.ebuild
311 new file mode 100644
312 index 00000000..0dd04c34
313 --- /dev/null
314 +++ b/gnome-base/gnome-settings-daemon/gnome-settings-daemon-3.26.1.ebuild
315 @@ -0,0 +1,156 @@
316 +# Copyright 1999-2018 Gentoo Foundation
317 +# Distributed under the terms of the GNU General Public License v2
318 +
319 +EAPI=6
320 +GNOME2_EAUTORECONF="yes"
321 +GNOME2_LA_PUNT="yes"
322 +#PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} ) # https://bugzilla.gnome.org/show_bug.cgi?id=783186
323 +PYTHON_COMPAT=( python2_7 )
324 +
325 +inherit gnome2 python-any-r1 systemd udev virtualx
326 +
327 +DESCRIPTION="Gnome Settings Daemon"
328 +HOMEPAGE="https://git.gnome.org/browse/gnome-settings-daemon"
329 +
330 +LICENSE="GPL-2+"
331 +SLOT="0"
332 +IUSE="+colord +cups debug input_devices_wacom -openrc-force networkmanager policykit smartcard test +udev wayland"
333 +REQUIRED_USE="
334 + input_devices_wacom? ( udev )
335 + smartcard? ( udev )
336 + wayland? ( udev )
337 +"
338 +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-solaris"
339 +
340 +COMMON_DEPEND="
341 + >=dev-libs/glib-2.53.0:2[dbus]
342 + >=x11-libs/gtk+-3.15.3:3[X,wayland?]
343 + >=gnome-base/gnome-desktop-3.11.1:3=
344 + >=gnome-base/gsettings-desktop-schemas-3.23.3
345 + >=gnome-base/librsvg-2.36.2:2
346 + media-fonts/cantarell
347 + media-libs/alsa-lib
348 + media-libs/fontconfig
349 + media-libs/libcanberra[gtk3]
350 + >=media-sound/pulseaudio-2
351 + >=sys-power/upower-0.99:=
352 + x11-libs/cairo
353 + x11-libs/gdk-pixbuf:2
354 + >=x11-libs/libnotify-0.7.3:=
355 + x11-libs/libX11
356 + x11-libs/libxkbfile
357 + x11-libs/libXi
358 + x11-libs/libXext
359 + x11-libs/libXfixes
360 + x11-libs/libXtst
361 + x11-libs/libXxf86misc
362 + x11-misc/xkeyboard-config
363 +
364 + >=app-misc/geoclue-2.3.1:2.0
365 + >=dev-libs/libgweather-3.9.5:2=
366 + >=sci-geosciences/geocode-glib-3.10
367 + >=sys-auth/polkit-0.103
368 +
369 + colord? (
370 + >=media-libs/lcms-2.2:2
371 + >=x11-misc/colord-1.0.2:= )
372 + cups? ( >=net-print/cups-1.4[dbus] )
373 + input_devices_wacom? (
374 + >=dev-libs/libwacom-0.7
375 + >=x11-libs/pango-1.20
376 + x11-drivers/xf86-input-wacom
377 + virtual/libgudev:= )
378 + networkmanager? ( >=net-misc/networkmanager-1.0 )
379 + smartcard? ( >=dev-libs/nss-3.11.2 )
380 + udev? ( virtual/libgudev:= )
381 + wayland? ( dev-libs/wayland )
382 +"
383 +# Themes needed by g-s-d, gnome-shell, gtk+:3 apps to work properly
384 +# <gnome-color-manager-3.1.1 has file collisions with g-s-d-3.1.x
385 +# <gnome-power-manager-3.1.3 has file collisions with g-s-d-3.1.x
386 +# systemd needed for power and session management, bug #464944
387 +RDEPEND="${COMMON_DEPEND}
388 + gnome-base/dconf
389 + !openrc-force? ( sys-apps/systemd )
390 + !<gnome-base/gnome-control-center-2.22
391 + !<gnome-extra/gnome-color-manager-3.1.1
392 + !<gnome-extra/gnome-power-manager-3.1.3
393 + !<gnome-base/gnome-session-3.23.2
394 +"
395 +# xproto-7.0.15 needed for power plugin
396 +DEPEND="${COMMON_DEPEND}
397 + cups? ( sys-apps/sed )
398 + test? (
399 + ${PYTHON_DEPS}
400 + $(python_gen_any_dep 'dev-python/pygobject:3[${PYTHON_USEDEP}]')
401 + $(python_gen_any_dep 'dev-python/dbusmock[${PYTHON_USEDEP}]')
402 + gnome-base/gnome-session )
403 + dev-libs/libxml2:2
404 + sys-devel/gettext
405 + >=dev-util/intltool-0.40
406 + virtual/pkgconfig
407 + x11-proto/inputproto
408 + x11-proto/xf86miscproto
409 + x11-proto/kbproto
410 + >=x11-proto/xproto-7.0.15
411 +"
412 +
413 +# TypeErrors with python3; weird test errors with python2; all in power component that was made required now
414 +RESTRICT="!test? ( test )"
415 +
416 +PATCHES=(
417 + # Make colord and wacom optional; requires eautoreconf
418 + "${FILESDIR}"/${PV}-optional.patch
419 + # Allow specifying udevrulesdir via configure, bug 509484; requires eautoreconf
420 + "${FILESDIR}"/3.24.2-udevrulesdir-configure.patch
421 + # Fix build issue when gudev is present but not wayland, bug #627966
422 + "${FILESDIR}"/3.24.3-fix-wayland-build.patch
423 +)
424 +
425 +python_check_deps() {
426 + if use test; then
427 + has_version "dev-python/pygobject:3[${PYTHON_USEDEP}]" &&
428 + has_version "dev-python/dbusmock[${PYTHON_USEDEP}]"
429 + fi
430 +}
431 +
432 +pkg_setup() {
433 + use test && python-any-r1_pkg_setup
434 +}
435 +
436 +src_configure() {
437 + gnome2_src_configure \
438 + --disable-static \
439 + --with-udevrulesdir="$(get_udevdir)"/rules.d \
440 + $(use_enable colord color) \
441 + $(use_enable cups) \
442 + $(use_enable debug) \
443 + $(use_enable debug more-warnings) \
444 + $(use_enable networkmanager network-manager) \
445 + $(use_enable smartcard smartcard-support) \
446 + $(use_enable udev gudev) \
447 + $(use_enable input_devices_wacom wacom) \
448 + $(use_enable wayland)
449 +}
450 +
451 +src_test() {
452 + virtx emake check
453 +}
454 +
455 +pkg_postinst() {
456 + gnome2_pkg_postinst
457 +
458 + if ! systemd_is_booted; then
459 + ewarn "${PN} needs Systemd to be *running* for working"
460 + ewarn "properly. Please follow the this guide to migrate:"
461 + ewarn "https://wiki.gentoo.org/wiki/Systemd"
462 + fi
463 +
464 + if use openrc-force; then
465 + ewarn "You are enabling 'openrc-force' USE flag to skip systemd requirement,"
466 + ewarn "this can lead to unexpected problems and is not supported neither by"
467 + ewarn "upstream neither by Gnome Gentoo maintainers. If you suffer any problem,"
468 + ewarn "you will need to disable this USE flag system wide and retest before"
469 + ewarn "opening any bug report."
470 + fi
471 +}