diff options
author | Florian Müllner <fmuellner@gnome.org> | 2011-07-09 17:16:18 +0200 |
---|---|---|
committer | Florian Müllner <fmuellner@gnome.org> | 2011-07-13 19:45:29 +0200 |
commit | bf28c24c8207fb85f81ca80a8462541444f79340 (patch) | |
tree | 855a914d9ec44e3a2eb559f78188429dc99f37ea /tools | |
parent | 32df0e80ca5544e40101b5af3a7ca25f29a8e932 (diff) | |
download | gnome-shell-bf28c24c8207fb85f81ca80a8462541444f79340.tar.gz |
build: Remove upower from the moduleset
The upower version in the moduleset is too old for the power plugin
of gnome-settings-daemon. As at least Fedora and Ubuntu have a
recent enough version in their repositories, use that instead of
bumping the version in the moduleset.
https://bugzilla.gnome.org/show_bug.cgi?id=654300
Diffstat (limited to 'tools')
-rw-r--r-- | tools/build/gnome-shell-build-setup.sh | 6 | ||||
-rw-r--r-- | tools/build/gnome-shell.modules | 14 |
2 files changed, 3 insertions, 17 deletions
diff --git a/tools/build/gnome-shell-build-setup.sh b/tools/build/gnome-shell-build-setup.sh index 5b856019d..62888741e 100644 --- a/tools/build/gnome-shell-build-setup.sh +++ b/tools/build/gnome-shell-build-setup.sh @@ -59,7 +59,7 @@ fi # Devel packages needed by gnome-shell and its deps: # dbus-glib, expat, GL, gnome-menus, gstreamer, libffi, # libjasper, libjpeg, libpng, libpulse, libtiff, libwnck, -# iso-codes, libical, libxml2, ORBit2, pam, python, readline, +# iso-codes, libical, libxml2, ORBit2, pam, python, readline, upower, # spidermonkey ({mozilla,firefox,xulrunner}-js), startup-notification, # xdamage, icon-naming-utils, upower, libtool-ltdl, libvorbis, # libgcrypt, libtasn1, libgnome-keyring, libgtop, cups, xcb, WebKit-gtk @@ -84,7 +84,7 @@ if test "x$system" = xUbuntu -o "x$system" = xDebian -o "x$system" = xLinuxMint libltdl-dev libvorbis-dev iso-codes libgnome-keyring-dev libusb-1.0-0-dev libupower-glib-dev libcups2-dev libproxy-dev libdb-dev libproxy-dev libsqlite3-dev libgudev-1.0-dev libsane-dev libwebkitgtk-3.0-0 - libx11-xcb-dev + libx11-xcb-dev libupower-glib-dev " if apt-cache show libxcb-util0-dev > /dev/null 2> /dev/null; then @@ -125,7 +125,7 @@ if test "x$system" = xFedora ; then pulseaudio-libs-devel python-devel pygobject2 readline-devel xulrunner-devel libXdamage-devel libcroco-devel libxml2-devel gstreamer-devel gstreamer-plugins-base gstreamer-plugins-good glx-utils expat-devel - startup-notification-devel zenity webkitgtk3-devel + startup-notification-devel zenity webkitgtk3-devel upower-devel icon-naming-utils upower-devel libtool-ltdl-devel libvorbis-devel iso-codes-devel libgcrypt-devel libtasn1-devel libtasn1-tools libusb1-devel libgnome-keyring-devel libgtop2-devel cups-devel db4-devel libproxy-devel diff --git a/tools/build/gnome-shell.modules b/tools/build/gnome-shell.modules index 52867f3c0..a539cada2 100644 --- a/tools/build/gnome-shell.modules +++ b/tools/build/gnome-shell.modules @@ -342,7 +342,6 @@ <dep package="gnome-bluetooth"/> <dep package="telepathy-glib"/> <dep package="telepathy-logger"/> - <dep package="upower"/> <dep package="libsoup"/> </dependencies> </autotools> @@ -386,19 +385,6 @@ </suggests> </tarball> - <tarball id="upower" version="0.9.8"> - <source href="http://upower.freedesktop.org/releases/upower-0.9.8.tar.bz2" - hash="sha256:7afaec3cb10ebbc898308c7abd250c27fd58e10379a42e80444d7a4b32f2eb91" - size="462754"/> - <dependencies> - <dep package="polkit"/> - </dependencies> - <suggests> - <dep package="gobject-introspection"/> - <dep package="gudev"/> - </suggests> - </tarball> - <autotools id="libnotify"> <branch repo="git.gnome.org" module="libnotify"/> <dependencies> |