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