After an evaluation, GNOME has moved from Bugzilla to GitLab. Learn more about GitLab.
No new issues can be reported in GNOME Bugzilla anymore.
To report an issue in a GNOME project, go to GNOME GitLab.
Do not go to GNOME Gitlab for: Bluefish, Doxygen, GnuCash, GStreamer, java-gnome, LDTP, NetworkManager, Tomboy.
Bug 570015 - Patch for gnome-shell-build
Patch for gnome-shell-build
Status: RESOLVED FIXED
Product: gnome-shell
Classification: Core
Component: general
unspecified
Other Linux
: Normal enhancement
: ---
Assigned To: gnome-shell-maint
gnome-shell-maint
Depends on:
Blocks:
 
 
Reported: 2009-01-31 20:11 UTC by timbobsteve
Modified: 2009-02-02 22:26 UTC
See Also:
GNOME target: ---
GNOME version: ---


Attachments
build-deps patch (1.38 KB, patch)
2009-01-31 20:12 UTC, timbobsteve
committed Details | Review

Description timbobsteve 2009-01-31 20:11:43 UTC
Here is a patch to add a few missing build-deps for the gnome-shell-build-setup.sh and make an additional test for curl before running the rest of the script.

Added:

Test for curl (else writing ~/,jhbuild fails)

Debian Deps:
    libgnomeui-dev
    libwnck-dev 
    libreadline5-dev
    librsvg2-dev

RedHat Deps:
    GConf2-devel
    libreadline5-devel
Comment 1 timbobsteve 2009-01-31 20:12:21 UTC
Created attachment 127648 [details] [review]
build-deps patch
Comment 2 timbobsteve 2009-01-31 20:21:30 UTC
Comment on attachment 127648 [details] [review]
build-deps patch

>--- gnome-shell-build-setup.sh	2009-01-31 19:32:02.000000000 +0000
>+++ gnome-shell-build-setup.sh	2009-01-31 19:41:44.000000000 +0000
>@@ -12,6 +12,13 @@
> SOURCE=$HOME/Source
> BASEURL=http://svn.gnome.org/svn/gnome-shell/trunk/tools/build
> 
>+if ! which curl > /dev/null 2>&1; then
>+	echo -n "This script requires the curl program to run\n\
>+	 	For Debian-based systems run:\n\tapt-get install curl\n\n\
>+		For RedHat-based systems run:\n\tyum install curl"
>+	exit 1
>+fi
>+
> if [ -d $SOURCE ] ; then : ; else
>     mkdir $SOURCE
>     echo "Created $SOURCE"
>@@ -58,7 +65,7 @@
>   for pkg in build-essential automake gnome-common flex bison curl \
>     git-core subversion gtk-doc-tools mesa-common-dev xulrunner-1.9-dev \
>     libdbus-glib-1-dev libffi-dev libgconf2-dev libgtk2.0-dev libgl1-mesa-dev \
>-    libgstreamer-plugins-base0.10-dev python2.5-dev; do
>+    libgstreamer-plugins-base0.10-dev python2.5-dev libwnck-dev libreadline5-dev librsvg2-dev libgnomeui-dev; do
>       if ! dpkg --status $pkg > /dev/null 2>&1; then
>         reqd="$pkg $reqd"
>       fi
>@@ -73,7 +80,7 @@
>   reqd=""
>   for pkg in libffi-devel libXdamage-devel gnome-doc-utils xulrunner-devel \
>     librsvg2-devel libgnomeui-devel xterm xorg-x11-apps xorg-x11-server-Xephyr \
>-    libwnck-devel; do
>+    libwnck-devel GConf2-devel readline-devel; do
>       if ! rpm -q $pkg > /dev/null 2>&1; then
>         reqd="$pkg $reqd"
>       fi
Comment 3 Owen Taylor 2009-02-02 22:26:12 UTC
Patch committed. Something went wrong with the patch update (see above)
so I had to make the changes manually.

I also made two other small changes:

 - RedHat => Red Hat

 - echo -n "\n" doesn't work with bash - you need -e to get it to
   except escape sequences. I went with the more portable/readable
   here document.

cat <<EOF
The message
  and more of the message
EOF

   bash-isms that don't work with /bin/sh as ash are common, but
   this is apparently the reverse, which I haven't seen before :-)

Thanks!