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