| 1 |
commit: 3a4a482651f7d7d9e5a00efba702074c492d273f |
| 2 |
Author: Alexandre Rostovtsev <tetromino <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Fri Apr 6 08:24:47 2012 +0000 |
| 4 |
Commit: Alexandre Restovtsev <tetromino <AT> gmail <DOT> com> |
| 5 |
CommitDate: Fri Apr 6 08:38:10 2012 +0000 |
| 6 |
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=3a4a4826 |
| 7 |
|
| 8 |
gnome-base/gnome-settings-daemon: 3.3.92 → 3.4.0 |
| 9 |
|
| 10 |
Now with systemd and wacom support. |
| 11 |
|
| 12 |
--- |
| 13 |
...ttings-daemon-3.4.0-optional-color-wacom.patch} | 12 +++++----- |
| 14 |
...2.ebuild => gnome-settings-daemon-3.4.0.ebuild} | 23 ++++++++++--------- |
| 15 |
.../gnome-settings-daemon-9999.ebuild | 23 ++++++++++--------- |
| 16 |
3 files changed, 30 insertions(+), 28 deletions(-) |
| 17 |
|
| 18 |
diff --git a/gnome-base/gnome-settings-daemon/files/gnome-settings-daemon-3.3.92-optional-color-wacom.patch b/gnome-base/gnome-settings-daemon/files/gnome-settings-daemon-3.4.0-optional-color-wacom.patch |
| 19 |
similarity index 94% |
| 20 |
rename from gnome-base/gnome-settings-daemon/files/gnome-settings-daemon-3.3.92-optional-color-wacom.patch |
| 21 |
rename to gnome-base/gnome-settings-daemon/files/gnome-settings-daemon-3.4.0-optional-color-wacom.patch |
| 22 |
index 6af221d..045b4d6 100644 |
| 23 |
--- a/gnome-base/gnome-settings-daemon/files/gnome-settings-daemon-3.3.92-optional-color-wacom.patch |
| 24 |
+++ b/gnome-base/gnome-settings-daemon/files/gnome-settings-daemon-3.4.0-optional-color-wacom.patch |
| 25 |
@@ -12,14 +12,14 @@ diff -Naur gnome-settings-daemon-3.3.92//configure.ac gnome-settings-daemon-3.3. |
| 26 |
+ [with_color=$enableval], |
| 27 |
+ [with_color=yes]) dnl Default value |
| 28 |
+ |
| 29 |
-+if test x$WANT_COLOR = xyes; then |
| 30 |
++if test x$with_color = xyes; then |
| 31 |
+ PKG_CHECK_MODULES(COLOR, [colord >= 0.1.9 gnome-desktop-3.0 >= $GNOME_DESKTOP_REQUIRED_VERSION libcanberra-gtk3]) |
| 32 |
-+ AC_DEFINE(HAVE_WACOM, 1, [Define if wacom plugin is enabled]) |
| 33 |
++ AC_DEFINE(HAVE_COLOR, 1, [Define if wacom plugin is enabled]) |
| 34 |
+fi |
| 35 |
-+AM_CONDITIONAL(WITH_COLOR, test "x$with_color" = "xtrue") |
| 36 |
++AM_CONDITIONAL(WITH_COLOR, test "x$with_color" = "xyes") |
| 37 |
+ |
| 38 |
-+AC_SUBST(COLORD_CFLAGS) |
| 39 |
-+AC_SUBST(COLORD_LIBS) |
| 40 |
++AC_SUBST(COLOR_CFLAGS) |
| 41 |
++AC_SUBST(COLOR_LIBS) |
| 42 |
|
| 43 |
dnl --------------------------------------------------------------------------- |
| 44 |
dnl - wacom |
| 45 |
@@ -36,7 +36,7 @@ diff -Naur gnome-settings-daemon-3.3.92//configure.ac gnome-settings-daemon-3.3. |
| 46 |
+ PKG_CHECK_MODULES(WACOM, [libwacom >= $LIBWACOM_REQUIRED_VERSION x11 xi xtst $GUDEV_PKG gnome-desktop-3.0 >= $GNOME_DESKTOP_REQUIRED_VERSION xorg-wacom]) |
| 47 |
+ AC_DEFINE(HAVE_WACOM, 1, [Define if wacom plugin is enabled]) |
| 48 |
+fi |
| 49 |
-+AM_CONDITIONAL(WITH_WACOM, test "x$with_wacom" = "xtrue") |
| 50 |
++AM_CONDITIONAL(WITH_WACOM, test "x$with_wacom" = "xyes") |
| 51 |
+ |
| 52 |
+AC_SUBST(WACOM_CFLAGS) |
| 53 |
+AC_SUBST(WACOM_LIBS) |
| 54 |
|
| 55 |
diff --git a/gnome-base/gnome-settings-daemon/gnome-settings-daemon-3.3.92.ebuild b/gnome-base/gnome-settings-daemon/gnome-settings-daemon-3.4.0.ebuild |
| 56 |
similarity index 89% |
| 57 |
rename from gnome-base/gnome-settings-daemon/gnome-settings-daemon-3.3.92.ebuild |
| 58 |
rename to gnome-base/gnome-settings-daemon/gnome-settings-daemon-3.4.0.ebuild |
| 59 |
index f7bbc6a..1a3a652 100644 |
| 60 |
--- a/gnome-base/gnome-settings-daemon/gnome-settings-daemon-3.3.92.ebuild |
| 61 |
+++ b/gnome-base/gnome-settings-daemon/gnome-settings-daemon-3.4.0.ebuild |
| 62 |
@@ -21,8 +21,7 @@ if [[ ${PV} = 9999 ]]; then |
| 63 |
else |
| 64 |
KEYWORDS="~amd64 ~arm ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~x86-solaris" |
| 65 |
fi |
| 66 |
-IUSE="+colord +cups debug packagekit policykit +short-touchpad-timeout smartcard |
| 67 |
-+udev" #wacom |
| 68 |
+IUSE="+colord +cups debug packagekit policykit +short-touchpad-timeout smartcard systemd +udev wacom" |
| 69 |
|
| 70 |
# colord-0.1.13 needed to avoid polkit errors in CreateProfile and CreateDevice |
| 71 |
COMMON_DEPEND=" |
| 72 |
@@ -57,9 +56,10 @@ COMMON_DEPEND=" |
| 73 |
smartcard? ( |
| 74 |
sys-fs/udev[gudev] |
| 75 |
>=dev-libs/nss-3.11.2 ) |
| 76 |
- udev? ( sys-fs/udev[gudev] )" |
| 77 |
-# Needs libwacom |
| 78 |
-# wacom? ( x11-drivers/xf86-input-wacom )" |
| 79 |
+ systemd? ( >=sys-apps/systemd-31 ) |
| 80 |
+ udev? ( sys-fs/udev[gudev] ) |
| 81 |
+ wacom? ( >=dev-libs/libwacom-0.3 |
| 82 |
+ x11-drivers/xf86-input-wacom )" |
| 83 |
# Themes needed by g-s-d, gnome-shell, gtk+:3 apps to work properly |
| 84 |
# <gnome-color-manager-3.1.1 has file collisions with g-s-d-3.1.x |
| 85 |
# <gnome-power-manager-3.1.3 has file collisions with g-s-d-3.1.x |
| 86 |
@@ -70,7 +70,9 @@ RDEPEND="${COMMON_DEPEND} |
| 87 |
>=x11-themes/gnome-icon-theme-symbolic-2.91 |
| 88 |
!<gnome-base/gnome-control-center-2.22 |
| 89 |
!<gnome-extra/gnome-color-manager-3.1.1 |
| 90 |
- !<gnome-extra/gnome-power-manager-3.1.3" |
| 91 |
+ !<gnome-extra/gnome-power-manager-3.1.3 |
| 92 |
+ |
| 93 |
+ !systemd? ( sys-auth/consolekit )" |
| 94 |
# xproto-7.0.15 needed for power plugin |
| 95 |
DEPEND="${COMMON_DEPEND} |
| 96 |
cups? ( sys-apps/sed ) |
| 97 |
@@ -89,16 +91,15 @@ pkg_setup() { |
| 98 |
G2CONF="${G2CONF} |
| 99 |
--disable-static |
| 100 |
--disable-schemas-compile |
| 101 |
- --disable-systemd |
| 102 |
$(use_enable colord color) |
| 103 |
$(use_enable cups) |
| 104 |
$(use_enable debug) |
| 105 |
$(use_enable debug more-warnings) |
| 106 |
$(use_enable packagekit) |
| 107 |
$(use_enable smartcard smartcard-support) |
| 108 |
- $(use_enable udev gudev)" |
| 109 |
- # TODO: libwacom is needem |
| 110 |
- #$(use_enable wacom) |
| 111 |
+ $(use_enable systemd) |
| 112 |
+ $(use_enable udev gudev) |
| 113 |
+ $(use_enable wacom)" |
| 114 |
} |
| 115 |
|
| 116 |
src_prepare() { |
| 117 |
@@ -110,7 +111,7 @@ src_prepare() { |
| 118 |
epatch "${FILESDIR}/${PN}-3.0.2-short-touchpad-timeout.patch" |
| 119 |
|
| 120 |
# Make colord and wacom optional; requires eautoreconf |
| 121 |
- epatch "${FILESDIR}/${PN}-3.3.92-optional-color-wacom.patch" |
| 122 |
+ epatch "${FILESDIR}/${PN}-3.4.0-optional-color-wacom.patch" |
| 123 |
|
| 124 |
eautoreconf |
| 125 |
|
| 126 |
|
| 127 |
diff --git a/gnome-base/gnome-settings-daemon/gnome-settings-daemon-9999.ebuild b/gnome-base/gnome-settings-daemon/gnome-settings-daemon-9999.ebuild |
| 128 |
index f7bbc6a..1a3a652 100644 |
| 129 |
--- a/gnome-base/gnome-settings-daemon/gnome-settings-daemon-9999.ebuild |
| 130 |
+++ b/gnome-base/gnome-settings-daemon/gnome-settings-daemon-9999.ebuild |
| 131 |
@@ -21,8 +21,7 @@ if [[ ${PV} = 9999 ]]; then |
| 132 |
else |
| 133 |
KEYWORDS="~amd64 ~arm ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~x86-solaris" |
| 134 |
fi |
| 135 |
-IUSE="+colord +cups debug packagekit policykit +short-touchpad-timeout smartcard |
| 136 |
-+udev" #wacom |
| 137 |
+IUSE="+colord +cups debug packagekit policykit +short-touchpad-timeout smartcard systemd +udev wacom" |
| 138 |
|
| 139 |
# colord-0.1.13 needed to avoid polkit errors in CreateProfile and CreateDevice |
| 140 |
COMMON_DEPEND=" |
| 141 |
@@ -57,9 +56,10 @@ COMMON_DEPEND=" |
| 142 |
smartcard? ( |
| 143 |
sys-fs/udev[gudev] |
| 144 |
>=dev-libs/nss-3.11.2 ) |
| 145 |
- udev? ( sys-fs/udev[gudev] )" |
| 146 |
-# Needs libwacom |
| 147 |
-# wacom? ( x11-drivers/xf86-input-wacom )" |
| 148 |
+ systemd? ( >=sys-apps/systemd-31 ) |
| 149 |
+ udev? ( sys-fs/udev[gudev] ) |
| 150 |
+ wacom? ( >=dev-libs/libwacom-0.3 |
| 151 |
+ x11-drivers/xf86-input-wacom )" |
| 152 |
# Themes needed by g-s-d, gnome-shell, gtk+:3 apps to work properly |
| 153 |
# <gnome-color-manager-3.1.1 has file collisions with g-s-d-3.1.x |
| 154 |
# <gnome-power-manager-3.1.3 has file collisions with g-s-d-3.1.x |
| 155 |
@@ -70,7 +70,9 @@ RDEPEND="${COMMON_DEPEND} |
| 156 |
>=x11-themes/gnome-icon-theme-symbolic-2.91 |
| 157 |
!<gnome-base/gnome-control-center-2.22 |
| 158 |
!<gnome-extra/gnome-color-manager-3.1.1 |
| 159 |
- !<gnome-extra/gnome-power-manager-3.1.3" |
| 160 |
+ !<gnome-extra/gnome-power-manager-3.1.3 |
| 161 |
+ |
| 162 |
+ !systemd? ( sys-auth/consolekit )" |
| 163 |
# xproto-7.0.15 needed for power plugin |
| 164 |
DEPEND="${COMMON_DEPEND} |
| 165 |
cups? ( sys-apps/sed ) |
| 166 |
@@ -89,16 +91,15 @@ pkg_setup() { |
| 167 |
G2CONF="${G2CONF} |
| 168 |
--disable-static |
| 169 |
--disable-schemas-compile |
| 170 |
- --disable-systemd |
| 171 |
$(use_enable colord color) |
| 172 |
$(use_enable cups) |
| 173 |
$(use_enable debug) |
| 174 |
$(use_enable debug more-warnings) |
| 175 |
$(use_enable packagekit) |
| 176 |
$(use_enable smartcard smartcard-support) |
| 177 |
- $(use_enable udev gudev)" |
| 178 |
- # TODO: libwacom is needem |
| 179 |
- #$(use_enable wacom) |
| 180 |
+ $(use_enable systemd) |
| 181 |
+ $(use_enable udev gudev) |
| 182 |
+ $(use_enable wacom)" |
| 183 |
} |
| 184 |
|
| 185 |
src_prepare() { |
| 186 |
@@ -110,7 +111,7 @@ src_prepare() { |
| 187 |
epatch "${FILESDIR}/${PN}-3.0.2-short-touchpad-timeout.patch" |
| 188 |
|
| 189 |
# Make colord and wacom optional; requires eautoreconf |
| 190 |
- epatch "${FILESDIR}/${PN}-3.3.92-optional-color-wacom.patch" |
| 191 |
+ epatch "${FILESDIR}/${PN}-3.4.0-optional-color-wacom.patch" |
| 192 |
|
| 193 |
eautoreconf |
Archives