Remove pre-GNOME-2.26 panel-replacement code

gnome-shell.in: Remove the code to replace gnome-panel by attaching
  to it with GDB; this was always problematical (required gdb, debug
  symbols, finding the pid of gnome-panel, etc.)

gnome-shell-build-setup.sh: Require 2.26 to be in place before building
  the shell; remove gdb from the list of required packages.

http://bugzilla.gnome.org/show_bug.cgi?id=593325
This commit is contained in:
Owen W. Taylor
2009-08-27 16:19:35 -04:00
parent d116f707c5
commit 3adec65e20
2 changed files with 19 additions and 61 deletions

View File

@ -10,6 +10,23 @@
# Copyright (C) 2006, 2007, 2008 Imendio AB
#
# Pre-check on GNOME version
gnome_version=`gnome-session --version 2>/dev/null | (read name version && echo $version)`
have_gnome_26=false
case $gnome_version in
2.2[6789]*|2.[3456789]*|3.*)
have_gnome_26=true
;;
esac
if $have_gnome_26 ; then : ; else
echo "GNOME 2.26 or newer is required to build GNOME Shell" 1>&2
exit 1
fi
############################################################
if which lsb_release > /dev/null 2>&1; then
system=`lsb_release -is`
elif [ -f /etc/fedora-release ] ; then
@ -35,7 +52,7 @@ fi
# ({mozilla,firefox,xulrunner}-js), xdamage
#
# Non-devel packages needed by gnome-shell and its deps:
# gdb, glxinfo, gstreamer-plugins-base, gstreamer-plugins-good,
# glxinfo, gstreamer-plugins-base, gstreamer-plugins-good,
# python, Xephyr, xeyes*, xlogo*, xterm*, zenity
#
# (*)ed packages are only needed because gnome-shell launches them
@ -88,7 +105,7 @@ if test x$system = xFedora ; then
librsvg2-devel libwnck-devel mesa-libGL-devel python-devel readline-devel \
xulrunner-devel libXdamage-devel \
gstreamer-devel gstreamer-plugins-base gstreamer-plugins-good \
gdb glx-utils xorg-x11-apps xorg-x11-server-Xephyr xterm zenity \
glx-utils xorg-x11-apps xorg-x11-server-Xephyr xterm zenity \
; do
if ! rpm -q $pkg > /dev/null 2>&1; then
reqd="$pkg $reqd"