| 1 |
commit: 5f4515ef307ec91b186e7e06064f46b9eb8db15d |
| 2 |
Author: Timo Tambet <ttambet <AT> gmail <DOT> com> |
| 3 |
AuthorDate: Sat Feb 25 14:07:51 2017 +0000 |
| 4 |
Commit: Mart Raudsepp <leio <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Wed Mar 8 12:10:54 2017 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5f4515ef |
| 7 |
|
| 8 |
gnome-base/gnome-settings-daemon: bump to 3.23.90 |
| 9 |
|
| 10 |
Blocks older gnome-session, because the daemon was split up into several |
| 11 |
smaller daemons, but old gnome-session requires the big settings daemon. |
| 12 |
|
| 13 |
Package-Manager: Portage-2.3.3, Repoman-2.3.1 |
| 14 |
|
| 15 |
gnome-base/gnome-settings-daemon/Manifest | 1 + |
| 16 |
.../gnome-settings-daemon-3.23.90-optional.patch | 145 ++++++++++++++++++++ |
| 17 |
.../gnome-settings-daemon-3.23.90.ebuild | 151 +++++++++++++++++++++ |
| 18 |
3 files changed, 297 insertions(+) |
| 19 |
|
| 20 |
diff --git a/gnome-base/gnome-settings-daemon/Manifest b/gnome-base/gnome-settings-daemon/Manifest |
| 21 |
index 30a5a9f6953..2cd1df7d4c0 100644 |
| 22 |
--- a/gnome-base/gnome-settings-daemon/Manifest |
| 23 |
+++ b/gnome-base/gnome-settings-daemon/Manifest |
| 24 |
@@ -1,2 +1,3 @@ |
| 25 |
DIST gnome-settings-daemon-3.20.2.tar.xz 1620696 SHA256 1dd7a084449a2c240308d253f86d60f3efe25f59322c3f5ec3b9e2e9f5eabb45 SHA512 b23ac4cfc5c1fe4b1eeb4ba37cae448b2a23e11b988ae609c3d23168a9c22502829b68a4ab5fc8291bde91b429fcb4159c0f37bef78437838de6c6f3417817ed WHIRLPOOL 94463af0fcc3c3e36ded002e359aa1049d8a6171ae9b7edbf1e3ceeda5f1d2ee9389c09fa2929c2197b20a48fa613cc35fb31dc3eed30feec5f370868b1b4e49 |
| 26 |
DIST gnome-settings-daemon-3.22.1.tar.xz 1622420 SHA256 b57d97cdd992263baffa78ccecbbf9f5a9771dd994f19687353d6eec4fd636ba SHA512 7afd550d5e018524e1aadad540d85816d4f42245af025356d079c28fe78754120b3b0d1de2746603331122659e1f43496d5a1160db069e4b1e9669c3404619b2 WHIRLPOOL d9cb415c3874ba9e650dbfc95d3482b83f6dab8ce2fb17a98e4c892230d8e82a34acb43bbb7fe2d620864d09a068dd32467f08063e7fe56a3589d30acfe83159 |
| 27 |
+DIST gnome-settings-daemon-3.23.90.tar.xz 1614204 SHA256 c9e860558a8132763f6441f317e1df47fc5fe64bc5517bcc9ff9d44a08824fac SHA512 995eae1876df7918746a0050fd4fa08fd50d6bef9e0c5474da33eb5fd7fc53a1f4214179035f6b0716f60620f198697cef4eaf70cb24c510ce5a30cfc761bdcb WHIRLPOOL 45b21a328a57c08fd6872fd1b7e1df30a5f2a47ffd2dc32d41b85ccc3e7c0937c505aa9aa7b21910140759c0f30d90bc5a9afba773547755805866822cf061fb |
| 28 |
|
| 29 |
diff --git a/gnome-base/gnome-settings-daemon/files/gnome-settings-daemon-3.23.90-optional.patch b/gnome-base/gnome-settings-daemon/files/gnome-settings-daemon-3.23.90-optional.patch |
| 30 |
new file mode 100644 |
| 31 |
index 00000000000..64c47a92e3f |
| 32 |
--- /dev/null |
| 33 |
+++ b/gnome-base/gnome-settings-daemon/files/gnome-settings-daemon-3.23.90-optional.patch |
| 34 |
@@ -0,0 +1,145 @@ |
| 35 |
+From 22f6a45b665e604f874e82a817d45bb976d8c5ae Mon Sep 17 00:00:00 2001 |
| 36 |
+From: Timo Tambet <ttambet@×××××.com> |
| 37 |
+Date: Sat, 25 Feb 2017 14:48:19 +0200 |
| 38 |
+Subject: [PATCH 1/1] [PATCH] Make colord and wacom support optional |
| 39 |
+ |
| 40 |
+--- |
| 41 |
+ configure.ac | 56 +++++++++++++++++++++++++++++++---------------- |
| 42 |
+ plugins/Makefile.am | 9 ++++++-- |
| 43 |
+ plugins/dummy/Makefile.am | 5 ++++- |
| 44 |
+ 3 files changed, 48 insertions(+), 22 deletions(-) |
| 45 |
+ |
| 46 |
+diff --git a/configure.ac b/configure.ac |
| 47 |
+index 0d169c8f..792195aa 100644 |
| 48 |
+--- a/configure.ac |
| 49 |
++++ b/configure.ac |
| 50 |
+@@ -158,13 +158,23 @@ PKG_CHECK_MODULES(CLIPBOARD, |
| 51 |
+ gtk+-x11-3.0 |
| 52 |
+ x11) |
| 53 |
+ |
| 54 |
+-PKG_CHECK_MODULES(COLOR, |
| 55 |
+- colord >= 1.0.2 |
| 56 |
+- gnome-desktop-3.0 >= $GNOME_DESKTOP_REQUIRED_VERSION |
| 57 |
+- libcanberra-gtk3 |
| 58 |
+- libgeoclue-2.0 >= $GEOCLUE_REQUIRED_VERSION |
| 59 |
+- lcms2 >= $LCMS_REQUIRED_VERSION |
| 60 |
+- libnotify) |
| 61 |
++AC_ARG_ENABLE([color], |
| 62 |
++ AS_HELP_STRING([--disable-color], |
| 63 |
++ [turn off color plugin]), |
| 64 |
++ [], |
| 65 |
++ [enable_color=yes]) |
| 66 |
++ |
| 67 |
++AS_IF([test "$enable_color" = "yes"], |
| 68 |
++ [PKG_CHECK_MODULES(COLOR, |
| 69 |
++ colord >= 1.0.2 |
| 70 |
++ gnome-desktop-3.0 >= $GNOME_DESKTOP_REQUIRED_VERSION |
| 71 |
++ libcanberra-gtk3 |
| 72 |
++ libgeoclue-2.0 >= $GEOCLUE_REQUIRED_VERSION |
| 73 |
++ lcms2 >= $LCMS_REQUIRED_VERSION |
| 74 |
++ libnotify) |
| 75 |
++ AC_DEFINE(HAVE_COLOR, 1, [Define if color plugin is enabled]) |
| 76 |
++ ]) |
| 77 |
++AM_CONDITIONAL(BUILD_COLOR, test "x$enable_color" = "xyes") |
| 78 |
+ |
| 79 |
+ PKG_CHECK_MODULES(DATETIME, |
| 80 |
+ libnotify >= $LIBNOTIFY_REQUIRED_VERSION |
| 81 |
+@@ -268,23 +278,31 @@ case $host_os in |
| 82 |
+ if test "$host_cpu" = s390 -o "$host_cpu" = s390x; then |
| 83 |
+ have_wacom=no |
| 84 |
+ else |
| 85 |
+- if test x$enable_gudev != xno; then |
| 86 |
+- LIBWACOM_PKG="libwacom >= $LIBWACOM_REQUIRED_VERSION" |
| 87 |
+- PKG_CHECK_MODULES(LIBWACOM, [libwacom >= $LIBWACOM_REQUIRED_VERSION]) |
| 88 |
+- PKG_CHECK_MODULES(WACOM, [gtk+-3.0 pango >= $PANGO_REQUIRED_VERSION]) |
| 89 |
+- PKG_CHECK_MODULES(WACOM_OLED, [gudev-1.0]) |
| 90 |
+- else |
| 91 |
++ have_wacom=no |
| 92 |
++ AS_IF([test "$enable_gudev" != "no"], |
| 93 |
++ [AC_ARG_ENABLE([wacom], |
| 94 |
++ AS_HELP_STRING([--disable-wacom], |
| 95 |
++ [turn off wacom plugin]), |
| 96 |
++ [], |
| 97 |
++ [enable_wacom=no]) dnl Default value |
| 98 |
++ AS_IF([test "$enable_wacom" = "xyes"], |
| 99 |
++ [ |
| 100 |
++ PKG_CHECK_MODULES(LIBWACOM, [libwacom >= $LIBWACOM_REQUIRED_VERSION]) |
| 101 |
++ PKG_CHECK_MODULES(WACOM, [gtk+-3.0, pango >= $PANGO_REQUIRED_VERSION]) |
| 102 |
++ PKG_CHECK_MODULES(WACOM_OLED, [gudev-1.0]) |
| 103 |
++ have_wacom=yes |
| 104 |
++ AC_DEFINE_UNQUOTED(HAVE_WACOM, 1, [Define to 1 if wacom support is available]) |
| 105 |
++ ]) |
| 106 |
++ ], [ |
| 107 |
+ AC_MSG_ERROR([GUdev is necessary to compile Wacom support]) |
| 108 |
+- fi |
| 109 |
+- AC_DEFINE_UNQUOTED(HAVE_WACOM, 1, [Define to 1 if wacom support is available]) |
| 110 |
+- have_wacom=yes |
| 111 |
++ ]) |
| 112 |
+ fi |
| 113 |
+ ;; |
| 114 |
+ *) |
| 115 |
+- have_wacom=no |
| 116 |
+- ;; |
| 117 |
++ have_wacom=no |
| 118 |
++ ;; |
| 119 |
+ esac |
| 120 |
+-AM_CONDITIONAL(HAVE_WACOM, test x$have_wacom = xyes) |
| 121 |
++AM_CONDITIONAL(BUILD_WACOM, test x$have_wacom = xyes) |
| 122 |
+ |
| 123 |
+ dnl --------------------------------------------------------------------------- |
| 124 |
+ dnl - common |
| 125 |
+diff --git a/plugins/Makefile.am b/plugins/Makefile.am |
| 126 |
+index 9324b406..ee78d6d0 100644 |
| 127 |
+--- a/plugins/Makefile.am |
| 128 |
++++ b/plugins/Makefile.am |
| 129 |
+@@ -4,7 +4,6 @@ enabled_plugins = \ |
| 130 |
+ a11y-keyboard \ |
| 131 |
+ a11y-settings \ |
| 132 |
+ clipboard \ |
| 133 |
+- color \ |
| 134 |
+ datetime \ |
| 135 |
+ dummy \ |
| 136 |
+ power \ |
| 137 |
+@@ -22,13 +21,19 @@ enabled_plugins = \ |
| 138 |
+ |
| 139 |
+ disabled_plugins = $(NULL) |
| 140 |
+ |
| 141 |
++if BUILD_COLOR |
| 142 |
++enabled_plugins += color |
| 143 |
++else |
| 144 |
++disabled_plugins += color |
| 145 |
++endif |
| 146 |
++ |
| 147 |
+ if SMARTCARD_SUPPORT |
| 148 |
+ enabled_plugins += smartcard |
| 149 |
+ else |
| 150 |
+ disabled_plugins += smartcard |
| 151 |
+ endif |
| 152 |
+ |
| 153 |
+-if HAVE_WACOM |
| 154 |
++if BUILD_WACOM |
| 155 |
+ enabled_plugins += wacom |
| 156 |
+ else |
| 157 |
+ disabled_plugins += wacom |
| 158 |
+diff --git a/plugins/dummy/Makefile.am b/plugins/dummy/Makefile.am |
| 159 |
+index cb5856cf..06ac595a 100644 |
| 160 |
+--- a/plugins/dummy/Makefile.am |
| 161 |
++++ b/plugins/dummy/Makefile.am |
| 162 |
+@@ -22,10 +22,13 @@ gsd_dummy_LDADD = $(DUMMY_LIBS) $(top_builddir)/gnome-settings-daemon/libgsd.la |
| 163 |
+ desktopdir = $(sysconfdir)/xdg/autostart |
| 164 |
+ |
| 165 |
+ desktop_DATA = |
| 166 |
++if !BUILD_COLOR |
| 167 |
++desktop_DATA += org.gnome.SettingsDaemon.Color.desktop |
| 168 |
++endif |
| 169 |
+ if !SMARTCARD_SUPPORT |
| 170 |
+ desktop_DATA += org.gnome.SettingsDaemon.Smartcard.desktop |
| 171 |
+ endif |
| 172 |
+-if !HAVE_WACOM |
| 173 |
++if !BUILD_WACOM |
| 174 |
+ desktop_DATA += org.gnome.SettingsDaemon.Wacom.desktop |
| 175 |
+ endif |
| 176 |
+ if !BUILD_PRINT_NOTIFICATIONS |
| 177 |
+-- |
| 178 |
+2.11.1 |
| 179 |
+ |
| 180 |
|
| 181 |
diff --git a/gnome-base/gnome-settings-daemon/gnome-settings-daemon-3.23.90.ebuild b/gnome-base/gnome-settings-daemon/gnome-settings-daemon-3.23.90.ebuild |
| 182 |
new file mode 100644 |
| 183 |
index 00000000000..a0aa249cabb |
| 184 |
--- /dev/null |
| 185 |
+++ b/gnome-base/gnome-settings-daemon/gnome-settings-daemon-3.23.90.ebuild |
| 186 |
@@ -0,0 +1,151 @@ |
| 187 |
+# Copyright 1999-2017 Gentoo Foundation |
| 188 |
+# Distributed under the terms of the GNU General Public License v2 |
| 189 |
+ |
| 190 |
+EAPI=6 |
| 191 |
+GNOME2_LA_PUNT="yes" |
| 192 |
+PYTHON_COMPAT=( python{2_7,3_4,3_5} ) |
| 193 |
+ |
| 194 |
+inherit autotools eutils gnome2 python-any-r1 systemd udev virtualx |
| 195 |
+ |
| 196 |
+DESCRIPTION="Gnome Settings Daemon" |
| 197 |
+HOMEPAGE="https://git.gnome.org/browse/gnome-settings-daemon" |
| 198 |
+ |
| 199 |
+LICENSE="GPL-2+" |
| 200 |
+SLOT="0" |
| 201 |
+IUSE="+colord +cups debug input_devices_wacom -openrc-force networkmanager policykit smartcard test +udev wayland" |
| 202 |
+REQUIRED_USE=" |
| 203 |
+ input_devices_wacom? ( udev ) |
| 204 |
+ smartcard? ( udev ) |
| 205 |
+" |
| 206 |
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-solaris" |
| 207 |
+ |
| 208 |
+COMMON_DEPEND=" |
| 209 |
+ >=dev-libs/glib-2.44.0:2[dbus] |
| 210 |
+ >=x11-libs/gtk+-3.15.3:3 |
| 211 |
+ >=gnome-base/gnome-desktop-3.11.1:3= |
| 212 |
+ >=gnome-base/gsettings-desktop-schemas-3.23.3 |
| 213 |
+ >=gnome-base/librsvg-2.36.2:2 |
| 214 |
+ media-fonts/cantarell |
| 215 |
+ media-libs/alsa-lib |
| 216 |
+ media-libs/fontconfig |
| 217 |
+ media-libs/libcanberra[gtk3] |
| 218 |
+ >=media-sound/pulseaudio-2 |
| 219 |
+ >=sys-power/upower-0.99:= |
| 220 |
+ x11-libs/cairo |
| 221 |
+ x11-libs/gdk-pixbuf:2 |
| 222 |
+ >=x11-libs/libnotify-0.7.3:= |
| 223 |
+ x11-libs/libX11 |
| 224 |
+ x11-libs/libxkbfile |
| 225 |
+ x11-libs/libXi |
| 226 |
+ x11-libs/libXext |
| 227 |
+ x11-libs/libXfixes |
| 228 |
+ x11-libs/libXtst |
| 229 |
+ x11-libs/libXxf86misc |
| 230 |
+ x11-misc/xkeyboard-config |
| 231 |
+ |
| 232 |
+ >=app-misc/geoclue-2.3.1:2.0 |
| 233 |
+ >=dev-libs/libgweather-3.9.5:2= |
| 234 |
+ >=sci-geosciences/geocode-glib-3.10 |
| 235 |
+ >=sys-auth/polkit-0.103 |
| 236 |
+ |
| 237 |
+ colord? ( |
| 238 |
+ >=media-libs/lcms-2.2:2 |
| 239 |
+ >=x11-misc/colord-1.0.2:= ) |
| 240 |
+ cups? ( >=net-print/cups-1.4[dbus] ) |
| 241 |
+ input_devices_wacom? ( |
| 242 |
+ >=dev-libs/libwacom-0.7 |
| 243 |
+ >=x11-libs/pango-1.20 |
| 244 |
+ x11-drivers/xf86-input-wacom |
| 245 |
+ virtual/libgudev:= ) |
| 246 |
+ networkmanager? ( >=net-misc/networkmanager-1.0 ) |
| 247 |
+ smartcard? ( >=dev-libs/nss-3.11.2 ) |
| 248 |
+ udev? ( virtual/libgudev:= ) |
| 249 |
+ wayland? ( dev-libs/wayland ) |
| 250 |
+" |
| 251 |
+# Themes needed by g-s-d, gnome-shell, gtk+:3 apps to work properly |
| 252 |
+# <gnome-color-manager-3.1.1 has file collisions with g-s-d-3.1.x |
| 253 |
+# <gnome-power-manager-3.1.3 has file collisions with g-s-d-3.1.x |
| 254 |
+# systemd needed for power and session management, bug #464944 |
| 255 |
+RDEPEND="${COMMON_DEPEND} |
| 256 |
+ gnome-base/dconf |
| 257 |
+ !openrc-force? ( sys-apps/systemd ) |
| 258 |
+ !<gnome-base/gnome-control-center-2.22 |
| 259 |
+ !<gnome-extra/gnome-color-manager-3.1.1 |
| 260 |
+ !<gnome-extra/gnome-power-manager-3.1.3 |
| 261 |
+ !<gnome-base/gnome-session-3.23.2 |
| 262 |
+" |
| 263 |
+# xproto-7.0.15 needed for power plugin |
| 264 |
+# FIXME: tests require dbus-mock |
| 265 |
+DEPEND="${COMMON_DEPEND} |
| 266 |
+ cups? ( sys-apps/sed ) |
| 267 |
+ test? ( |
| 268 |
+ ${PYTHON_DEPS} |
| 269 |
+ $(python_gen_any_dep 'dev-python/pygobject:3[${PYTHON_USEDEP}]') |
| 270 |
+ gnome-base/gnome-session ) |
| 271 |
+ app-text/docbook-xsl-stylesheets |
| 272 |
+ dev-libs/libxml2:2 |
| 273 |
+ dev-libs/libxslt |
| 274 |
+ sys-devel/gettext |
| 275 |
+ >=dev-util/intltool-0.40 |
| 276 |
+ virtual/pkgconfig |
| 277 |
+ x11-proto/inputproto |
| 278 |
+ x11-proto/xf86miscproto |
| 279 |
+ >=x11-proto/xproto-7.0.15 |
| 280 |
+" |
| 281 |
+ |
| 282 |
+python_check_deps() { |
| 283 |
+ use test && has_version "dev-python/pygobject:3[${PYTHON_USEDEP}]" |
| 284 |
+} |
| 285 |
+ |
| 286 |
+pkg_setup() { |
| 287 |
+ use test && python-any-r1_pkg_setup |
| 288 |
+} |
| 289 |
+ |
| 290 |
+src_prepare() { |
| 291 |
+ # Make colord and wacom optional; requires eautoreconf |
| 292 |
+ eapply "${FILESDIR}"/${P}-optional.patch |
| 293 |
+ |
| 294 |
+ eautoreconf |
| 295 |
+ gnome2_src_prepare |
| 296 |
+} |
| 297 |
+ |
| 298 |
+src_configure() { |
| 299 |
+ gnome2_src_configure \ |
| 300 |
+ --disable-static \ |
| 301 |
+ --enable-man \ |
| 302 |
+ $(use_enable colord color) \ |
| 303 |
+ $(use_enable cups) \ |
| 304 |
+ $(use_enable debug) \ |
| 305 |
+ $(use_enable debug more-warnings) \ |
| 306 |
+ $(use_enable networkmanager network-manager) \ |
| 307 |
+ $(use_enable smartcard smartcard-support) \ |
| 308 |
+ $(use_enable udev gudev) \ |
| 309 |
+ $(use_enable input_devices_wacom wacom) \ |
| 310 |
+ $(use_enable wayland) |
| 311 |
+} |
| 312 |
+ |
| 313 |
+src_test() { |
| 314 |
+ virtx emake check |
| 315 |
+} |
| 316 |
+ |
| 317 |
+src_install() { |
| 318 |
+ gnome2_src_install udevrulesdir="$(get_udevdir)"/rules.d #509484 |
| 319 |
+} |
| 320 |
+ |
| 321 |
+pkg_postinst() { |
| 322 |
+ gnome2_pkg_postinst |
| 323 |
+ |
| 324 |
+ if ! systemd_is_booted; then |
| 325 |
+ ewarn "${PN} needs Systemd to be *running* for working" |
| 326 |
+ ewarn "properly. Please follow the this guide to migrate:" |
| 327 |
+ ewarn "https://wiki.gentoo.org/wiki/Systemd" |
| 328 |
+ fi |
| 329 |
+ |
| 330 |
+ if use openrc-force; then |
| 331 |
+ ewarn "You are enabling 'openrc-force' USE flag to skip systemd requirement," |
| 332 |
+ ewarn "this can lead to unexpected problems and is not supported neither by" |
| 333 |
+ ewarn "upstream neither by Gnome Gentoo maintainers. If you suffer any problem," |
| 334 |
+ ewarn "you will need to disable this USE flag system wide and retest before" |
| 335 |
+ ewarn "opening any bug report." |
| 336 |
+ fi |
| 337 |
+} |
Archives