1 |
commit: 77cd248086005aec8854caf0b2eb5574ffe08cae |
2 |
Author: Mart Raudsepp <leio <AT> gentoo <DOT> org> |
3 |
AuthorDate: Sun Jul 9 00:24:30 2017 +0000 |
4 |
Commit: Mart Raudsepp <leio <AT> gentoo <DOT> org> |
5 |
CommitDate: Sun Jul 9 00:24:59 2017 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=77cd2480 |
7 |
|
8 |
gnome-base/gnome-settings-daemon: fix optional wacom plugin building |
9 |
|
10 |
Gentoo-bug: 620486 |
11 |
Thanks-to: Yuh-Horng Chen |
12 |
Package-Manager: Portage-2.3.5, Repoman-2.3.2 |
13 |
|
14 |
.../gnome-settings-daemon-3.22.0-optional.patch | 2 +- |
15 |
.../gnome-settings-daemon-3.22.2-r1.ebuild | 149 +++++++++++++++++++++ |
16 |
2 files changed, 150 insertions(+), 1 deletion(-) |
17 |
|
18 |
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 |
19 |
index 3188337445f..9b5369bb346 100644 |
20 |
--- a/gnome-base/gnome-settings-daemon/files/gnome-settings-daemon-3.22.0-optional.patch |
21 |
+++ b/gnome-base/gnome-settings-daemon/files/gnome-settings-daemon-3.22.0-optional.patch |
22 |
@@ -51,7 +51,7 @@ index 6d9408a..628af0e 100644 |
23 |
+ [turn off wacom plugin]), |
24 |
+ [], |
25 |
+ [enable_wacom=no]) dnl Default value |
26 |
-+ AS_IF([test "$enable_wacom" = "xyes"], |
27 |
++ AS_IF([test "x$enable_wacom" = "xyes"], |
28 |
+ [ |
29 |
+ PKG_CHECK_MODULES(LIBWACOM, [libwacom >= $LIBWACOM_REQUIRED_VERSION]) |
30 |
+ 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]) |
31 |
|
32 |
diff --git a/gnome-base/gnome-settings-daemon/gnome-settings-daemon-3.22.2-r1.ebuild b/gnome-base/gnome-settings-daemon/gnome-settings-daemon-3.22.2-r1.ebuild |
33 |
new file mode 100644 |
34 |
index 00000000000..ae86f10d52e |
35 |
--- /dev/null |
36 |
+++ b/gnome-base/gnome-settings-daemon/gnome-settings-daemon-3.22.2-r1.ebuild |
37 |
@@ -0,0 +1,149 @@ |
38 |
+# Copyright 1999-2017 Gentoo Foundation |
39 |
+# Distributed under the terms of the GNU General Public License v2 |
40 |
+ |
41 |
+EAPI=6 |
42 |
+GNOME2_EAUTORECONF="yes" |
43 |
+GNOME2_LA_PUNT="yes" |
44 |
+PYTHON_COMPAT=( python{2_7,3_4,3_5} ) |
45 |
+ |
46 |
+inherit gnome2 python-any-r1 systemd udev virtualx |
47 |
+ |
48 |
+DESCRIPTION="Gnome Settings Daemon" |
49 |
+HOMEPAGE="https://git.gnome.org/browse/gnome-settings-daemon" |
50 |
+ |
51 |
+LICENSE="GPL-2+" |
52 |
+SLOT="0" |
53 |
+IUSE="+colord +cups debug input_devices_wacom -openrc-force networkmanager policykit smartcard test +udev wayland" |
54 |
+REQUIRED_USE=" |
55 |
+ input_devices_wacom? ( udev ) |
56 |
+ smartcard? ( udev ) |
57 |
+" |
58 |
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-solaris" |
59 |
+ |
60 |
+COMMON_DEPEND=" |
61 |
+ >=dev-libs/glib-2.37.7:2[dbus] |
62 |
+ >=x11-libs/gtk+-3.15.3:3 |
63 |
+ >=gnome-base/gnome-desktop-3.11.1:3= |
64 |
+ >=gnome-base/gsettings-desktop-schemas-3.20 |
65 |
+ >=gnome-base/librsvg-2.36.2:2 |
66 |
+ media-fonts/cantarell |
67 |
+ media-libs/alsa-lib |
68 |
+ media-libs/fontconfig |
69 |
+ media-libs/libcanberra[gtk3] |
70 |
+ >=media-sound/pulseaudio-2 |
71 |
+ >=sys-power/upower-0.99:= |
72 |
+ x11-libs/cairo |
73 |
+ x11-libs/gdk-pixbuf:2 |
74 |
+ >=x11-libs/libnotify-0.7.3:= |
75 |
+ x11-libs/libX11 |
76 |
+ x11-libs/libxkbfile |
77 |
+ x11-libs/libXi |
78 |
+ x11-libs/libXext |
79 |
+ x11-libs/libXfixes |
80 |
+ x11-libs/libXtst |
81 |
+ x11-libs/libXxf86misc |
82 |
+ x11-misc/xkeyboard-config |
83 |
+ |
84 |
+ >=app-misc/geoclue-2.3.1:2.0 |
85 |
+ >=dev-libs/libgweather-3.9.5:2= |
86 |
+ >=sci-geosciences/geocode-glib-3.10 |
87 |
+ >=sys-auth/polkit-0.103 |
88 |
+ |
89 |
+ colord? ( |
90 |
+ >=media-libs/lcms-2.2:2 |
91 |
+ >=x11-misc/colord-1.0.2:= ) |
92 |
+ cups? ( >=net-print/cups-1.4[dbus] ) |
93 |
+ input_devices_wacom? ( |
94 |
+ >=dev-libs/libwacom-0.7 |
95 |
+ >=x11-libs/pango-1.20 |
96 |
+ x11-drivers/xf86-input-wacom |
97 |
+ virtual/libgudev:= ) |
98 |
+ networkmanager? ( >=net-misc/networkmanager-1.0 ) |
99 |
+ smartcard? ( >=dev-libs/nss-3.11.2 ) |
100 |
+ udev? ( virtual/libgudev:= ) |
101 |
+ wayland? ( dev-libs/wayland ) |
102 |
+" |
103 |
+# Themes needed by g-s-d, gnome-shell, gtk+:3 apps to work properly |
104 |
+# <gnome-color-manager-3.1.1 has file collisions with g-s-d-3.1.x |
105 |
+# <gnome-power-manager-3.1.3 has file collisions with g-s-d-3.1.x |
106 |
+# systemd needed for power and session management, bug #464944 |
107 |
+RDEPEND="${COMMON_DEPEND} |
108 |
+ gnome-base/dconf |
109 |
+ !openrc-force? ( sys-apps/systemd ) |
110 |
+ !<gnome-base/gnome-control-center-2.22 |
111 |
+ !<gnome-extra/gnome-color-manager-3.1.1 |
112 |
+ !<gnome-extra/gnome-power-manager-3.1.3 |
113 |
+" |
114 |
+# xproto-7.0.15 needed for power plugin |
115 |
+# FIXME: tests require dbus-mock |
116 |
+DEPEND="${COMMON_DEPEND} |
117 |
+ cups? ( sys-apps/sed ) |
118 |
+ test? ( |
119 |
+ ${PYTHON_DEPS} |
120 |
+ $(python_gen_any_dep 'dev-python/pygobject:3[${PYTHON_USEDEP}]') |
121 |
+ gnome-base/gnome-session ) |
122 |
+ app-text/docbook-xsl-stylesheets |
123 |
+ dev-libs/libxml2:2 |
124 |
+ dev-libs/libxslt |
125 |
+ sys-devel/gettext |
126 |
+ >=dev-util/intltool-0.40 |
127 |
+ virtual/pkgconfig |
128 |
+ x11-proto/inputproto |
129 |
+ x11-proto/xf86miscproto |
130 |
+ >=x11-proto/xproto-7.0.15 |
131 |
+" |
132 |
+ |
133 |
+PATCHES=( |
134 |
+ # Make colord and wacom optional; requires eautoreconf |
135 |
+ "${FILESDIR}"/${PN}-3.22.0-optional.patch |
136 |
+ # Allow specifying udevrulesdir via configure, bug 509484; requires eautoreconf |
137 |
+ "${FILESDIR}"/${PV}-udevrulesdir-configure.patch |
138 |
+) |
139 |
+ |
140 |
+python_check_deps() { |
141 |
+ if use test; then |
142 |
+ has_version "dev-python/pygobject:3[${PYTHON_USEDEP}]" |
143 |
+ fi |
144 |
+} |
145 |
+ |
146 |
+pkg_setup() { |
147 |
+ use test && python-any-r1_pkg_setup |
148 |
+} |
149 |
+ |
150 |
+src_configure() { |
151 |
+ gnome2_src_configure \ |
152 |
+ --disable-static \ |
153 |
+ --enable-man \ |
154 |
+ --with-udevrulesdir="$(get_udevdir)"/rules.d \ |
155 |
+ $(use_enable colord color) \ |
156 |
+ $(use_enable cups) \ |
157 |
+ $(use_enable debug) \ |
158 |
+ $(use_enable debug more-warnings) \ |
159 |
+ $(use_enable networkmanager network-manager) \ |
160 |
+ $(use_enable smartcard smartcard-support) \ |
161 |
+ $(use_enable udev gudev) \ |
162 |
+ $(use_enable input_devices_wacom wacom) \ |
163 |
+ $(use_enable wayland) |
164 |
+} |
165 |
+ |
166 |
+src_test() { |
167 |
+ virtx emake check |
168 |
+} |
169 |
+ |
170 |
+pkg_postinst() { |
171 |
+ gnome2_pkg_postinst |
172 |
+ |
173 |
+ if ! systemd_is_booted; then |
174 |
+ ewarn "${PN} needs Systemd to be *running* for working" |
175 |
+ ewarn "properly. Please follow the this guide to migrate:" |
176 |
+ ewarn "https://wiki.gentoo.org/wiki/Systemd" |
177 |
+ fi |
178 |
+ |
179 |
+ if use openrc-force; then |
180 |
+ ewarn "You are enabling 'openrc-force' USE flag to skip systemd requirement," |
181 |
+ ewarn "this can lead to unexpected problems and is not supported neither by" |
182 |
+ ewarn "upstream neither by Gnome Gentoo maintainers. If you suffer any problem," |
183 |
+ ewarn "you will need to disable this USE flag system wide and retest before" |
184 |
+ ewarn "opening any bug report." |
185 |
+ fi |
186 |
+} |