sm-commit AT lists.ibiblio.org
Subject: Source Mage code commit list
List archive
[SM-Commit] GIT changes to master grimoire by Julien ROZO (ecf58ab091d4455df1ad7501a6eeb31d6d58850a)
- From: Julien ROZO <scm AT sourcemage.org>
- To: sm-commit AT lists.ibiblio.org
- Subject: [SM-Commit] GIT changes to master grimoire by Julien ROZO (ecf58ab091d4455df1ad7501a6eeb31d6d58850a)
- Date: Tue, 4 Mar 2008 17:01:12 -0600
GIT changes to master grimoire by Julien ROZO <julien AT rozo.org>:
ChangeLog | 1
dev/null |binary
disk/gphotofs/DEPENDS | 5
disk/gphotofs/DETAILS | 16
disk/gphotofs/HISTORY | 3
gnome2-apps/gnomesword/DETAILS | 4
gnome2-apps/gnomesword/HISTORY | 3
gnome2-apps/gnomesword/gnomesword-2.1.7.tar.gz.sig | 0
mobile/laptop-mode-tools/DETAILS | 5
mobile/laptop-mode-tools/HISTORY | 8
mobile/laptop-mode-tools/PRE_BUILD | 3
mobile/laptop-mode-tools/init.d/laptop-mode | 108 ++++-
mobile/laptop-mode-tools/laptop-mode-tools-1.35.patch | 327
++++++++++++++++++
mobile/laptop-mode-tools/laptop-mode-tools-1_34.patch | 282 ---------------
utils/virtualbox/BUILD | 7
utils/virtualbox/HISTORY | 4
utils/virtualbox/Xcursor.patch | 10
17 files changed, 468 insertions(+), 318 deletions(-)
New commits:
commit ecf58ab091d4455df1ad7501a6eeb31d6d58850a
Author: Julien ROZO <julien AT rozo.org>
Commit: Julien ROZO <julien AT rozo.org>
gphotofs: new spell, fuse FS for camera access (bug #14347)
commit 1c3d519e7395e5d1ce41dd4e4cf3ffb8953d6356
Author: Julien ROZO <julien AT rozo.org>
Commit: Julien ROZO <julien AT rozo.org>
laptop-mode-tools: updated version to 1.35 (bug #14345)
commit 14e3aa16d249e1f6609530e00c0e39716d11c83d
Author: Julien ROZO <julien AT rozo.org>
Commit: Julien ROZO <julien AT rozo.org>
gnomesword: updated version to 2.3.3 (fixes bug #13406)
commit 3aaf747ca50f85965334acab0e59296209cab41c
Author: Julien ROZO <julien AT rozo.org>
Commit: Julien ROZO <julien AT rozo.org>
virtualbox: readded a newer version of Xcursor.patch to solve compilation
issue with xorg-modular grimoire
diff --git a/ChangeLog b/ChangeLog
index 4ac1ce9..0c182e8 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,7 @@
2008-03-04 Julien "_kaze_" ROZO <julien AT rozo.org>
* groups: added avahi (gid=162)
* kde-apps/knetstats: new spell, a KDE network monitor
+ * disk/gphotofs: new spell, fuse FS for camera access
2008-03-03 Treeve Jelbert <treeve AT sourcemage.org>
* gnome2-apps/gnucash2: spell deprecated [replaced by ]
diff --git a/disk/gphotofs/DEPENDS b/disk/gphotofs/DEPENDS
new file mode 100755
index 0000000..344fb2c
--- /dev/null
+++ b/disk/gphotofs/DEPENDS
@@ -0,0 +1,5 @@
+depends libgphoto2 &&
+depends libexif &&
+depends libusb &&
+depends glib2 &&
+depends locale
diff --git a/disk/gphotofs/DETAILS b/disk/gphotofs/DETAILS
new file mode 100755
index 0000000..bfee94b
--- /dev/null
+++ b/disk/gphotofs/DETAILS
@@ -0,0 +1,16 @@
+ SPELL=gphotofs
+ VERSION=0.4.0
+ SOURCE=${SPELL}-$VERSION.tar.bz2
+SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
+ SOURCE_URL[0]=$SOURCEFORGE_URL/gphoto/$SOURCE
+ SOURCE_URL[1]=http://ufpr.dl.sourceforge.net/sourceforge/gphoto/$SOURCE
+
SOURCE_HASH=sha512:663ed1aaf5556efb235599174c42742408196aa85b058e11c40d5ba4ced003a8241530f16cf985f9a0b741532688ec8c113a5e2517b8e85dc2a8c82364f7af06
+ LICENSE[0]=GPL
+ WEB_SITE=http://www.gphoto.org/proj/gphotofs
+ ENTERED=20080301
+ SHORT="gphoto fuse FS"
+cat << EOF
+gphotofs is a FUSE filesystem module to mount your camera as a filesystem on
+Linux. This allow using your camera with any tool able to read from a mounted
+filesystem.
+EOF
diff --git a/disk/gphotofs/HISTORY b/disk/gphotofs/HISTORY
new file mode 100644
index 0000000..fe11e89
--- /dev/null
+++ b/disk/gphotofs/HISTORY
@@ -0,0 +1,3 @@
+2008-03-01 Javier Vasquez <jevv.cr AT gmail.com>
+ * DEPENDS, DETAILS, HISTORY: created this spell
+
diff --git a/gnome2-apps/gnomesword/DETAILS b/gnome2-apps/gnomesword/DETAILS
index 901db38..58c7918 100755
--- a/gnome2-apps/gnomesword/DETAILS
+++ b/gnome2-apps/gnomesword/DETAILS
@@ -1,9 +1,9 @@
SPELL=gnomesword
- VERSION=2.1.7
+ VERSION=2.3.3
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
SOURCE_URL[0]=$SOURCEFORGE_URL/$SPELL/$SOURCE
- SOURCE_GPG="gurus.gpg:${SOURCE}.sig"
+
SOURCE_HASH=sha512:128daa23655ad685fe24b72eea7ccbdc42f3159521c4bdd56a987512c146f529c926634e099172cc52fab4aaa747e457ae8b3f8ca03d9d93ab3070a855c6f16d
LICENSE[0]=GPL
KEYWORDS="gnome2"
WEB_SITE=http://gnomesword.sourceforge.net
diff --git a/gnome2-apps/gnomesword/HISTORY b/gnome2-apps/gnomesword/HISTORY
index cd4c36b..5d80905 100644
--- a/gnome2-apps/gnomesword/HISTORY
+++ b/gnome2-apps/gnomesword/HISTORY
@@ -1,3 +1,6 @@
+2008-03-04 Julien "_kaze_" ROZO <julien AT rozo.org>
+ * DETAILS: updated version to 2.3.3 (fixes bug #13406)
+
2006-10-03 Juuso Alasuutari <iuso AT sourcemage.org>
* DETAILS: [automated] Removed UPDATED.
diff --git a/gnome2-apps/gnomesword/gnomesword-2.1.7.tar.gz.sig
b/gnome2-apps/gnomesword/gnomesword-2.1.7.tar.gz.sig
deleted file mode 100644
index c2b4676..0000000
Binary files a/gnome2-apps/gnomesword/gnomesword-2.1.7.tar.gz.sig and
/dev/null differ
diff --git a/mobile/laptop-mode-tools/DETAILS
b/mobile/laptop-mode-tools/DETAILS
index eb4cff6..12ce715 100755
--- a/mobile/laptop-mode-tools/DETAILS
+++ b/mobile/laptop-mode-tools/DETAILS
@@ -1,11 +1,10 @@
SPELL=laptop-mode-tools
- VERSION=1.34
+ VERSION=1.35
SOURCE=${SPELL}_$VERSION.tar.gz
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
SOURCE_URL[0]=http://samwel.tk/laptop_mode/tools/downloads/$SOURCE
-
SOURCE_HASH=sha512:0ce1d8f754dd0764f2222209ddb2c49233ea93498cac92e4179389c904381901066375050c1b565bec5d32a85825ba2d7f9fd3e6c6d70470fb1df4f3f154d052
+
SOURCE_HASH=sha512:35d475926f1a4b093da8437ac3004f5efd36a74022522d2376b72395e1d2bb48e40b2ae31f22e5180ef3c0db173f0d2d3ee6b32b192e75c06a2d5d20b1ce199b
LICENSE[0]=GPL
- PATCHLEVEL=1
WEB_SITE=http://www.samwel.tk/laptop_mode
ENTERED=20070916
SHORT="laptop-mode linux feature tools"
diff --git a/mobile/laptop-mode-tools/HISTORY
b/mobile/laptop-mode-tools/HISTORY
index 448a571..20a7162 100644
--- a/mobile/laptop-mode-tools/HISTORY
+++ b/mobile/laptop-mode-tools/HISTORY
@@ -1,3 +1,11 @@
+2008-03-01 Javier Vasquez <jevv.cr AT gmail.com>
+ * DETAILS: Updating to new version 1.35.
+ * laptop-mode-tools-1.35.patch: Patch for
+ 1.35 new version, including changes from
+ 1.34...
+ * PRE_BUILD: Changing path for new version
+ one + adding execute permissions to install.sh
+
2007-10-17 Eric Sandall <sandalle AT sourcemage.org>
* DETAILS: Increment PATCHLEVEL
Change LICENSE -> LICENSE[0]
diff --git a/mobile/laptop-mode-tools/PRE_BUILD
b/mobile/laptop-mode-tools/PRE_BUILD
index a14ed35..6cb196e 100755
--- a/mobile/laptop-mode-tools/PRE_BUILD
+++ b/mobile/laptop-mode-tools/PRE_BUILD
@@ -1,3 +1,4 @@
default_pre_build &&
cd $SOURCE_DIRECTORY &&
-patch -p1 < "$SCRIPT_DIRECTORY/laptop-mode-tools-1_34.patch"
+patch -p1 < "$SCRIPT_DIRECTORY/laptop-mode-tools-1.35.patch" &&
+chmod ug+x install.sh
diff --git a/mobile/laptop-mode-tools/init.d/laptop-mode
b/mobile/laptop-mode-tools/init.d/laptop-mode
index ccdfe74..b177ca5 100755
--- a/mobile/laptop-mode-tools/init.d/laptop-mode
+++ b/mobile/laptop-mode-tools/init.d/laptop-mode
@@ -14,53 +14,101 @@ NEEDS="+local_fs"
test -f /usr/sbin/laptop_mode || exit 0
-#. /lib/lsb/init-functions
-
# Enable laptop mode when the system is booted when running on battery.
-TEMPFILE=`mktemp`
-echo "Failed to start laptop mode" > $TEMPFILE
-
+function start() {
+ TEMPFILE=`mktemp`
-trap "cat $TEMPFILE; rm $TEMPFILE; exit 10" HUP INT ABRT QUIT SEGV TERM
-set -e
+ mkdir -p /var/run/laptop-mode-tools
+ touch /var/run/laptop-mode-tools/enabled
+ if ($PROGRAM auto > $TEMPFILE) ; then
+ cat $TEMPFILE
+ logger -t LAPTOP-MODE -p daemon.info -- "$(cat $TEMPFILE)"
+ else
+ cat $TEMPFILE
+ logger -t LAPTOP-MODE -p daemon.notice -- "$(cat $TEMPFILE)"
+ fi
-function start() {
- touch /var/run/laptop-mode-enabled
- $PROGRAM auto > $TEMPFILE
- cat $TEMPFILE
+ if [ -f $TEMPFILE ] ; then
+ rm $TEMPFILE
+ fi
}
function restart() {
+ TEMPFILE=`mktemp`
+
# Full restart: first stop laptop mode completely (to restore default
mount options etc.)
- rm -f /var/run/laptop-mode-enabled
- $PROGRAM stop > $TEMPFILE
- cat $TEMPFILE
-
+ mkdir -p /var/run/laptop-mode-tools
+ rm -f /var/run/laptop-mode-tools/enabled
+ if ($PROGRAM stop > $TEMPFILE) ; then
+ cat $TEMPFILE
+ logger -t LAPTOP-MODE -p daemon.info -- "$(cat $TEMPFILE)"
+ else
+ cat $TEMPFILE
+ logger -t LAPTOP-MODE -p daemon.notice -- "$(cat $TEMPFILE)"
+ fi
+
# Now remove files containing stored status, re-enable, and start it up
again.
- rm -f /var/run/laptop-mode-*
- touch /var/run/laptop-mode-enabled
- $PROGRAM auto force > $TEMPFILE
- cat $TEMPFILE
+ rm -f /var/run/laptop-mode-tools/*
+ touch /var/run/laptop-mode-tools/enabled
+ if ($PROGRAM auto force > $TEMPFILE) ; then
+ cat $TEMPFILE
+ logger -t LAPTOP-MODE -p daemon.info -- "$(cat $TEMPFILE)"
+ else
+ cat $TEMPFILE
+ logger -t LAPTOP-MODE -p daemon.notice -- "$(cat $TEMPFILE)"
+ fi
+
+ if [ -f $TEMPFILE ] ; then
+ rm $TEMPFILE
+ fi
}
function reload() {
+ TEMPFILE=`mktemp`
+
# Full restart: first stop laptop mode completely (to restore default
mount options etc.)
- rm -f /var/run/laptop-mode-enabled
- $PROGRAM stop > $TEMPFILE
- cat $TEMPFILE
-
+ mkdir -p /var/run/laptop-mode-tools
+ rm -f /var/run/laptop-mode-tools/enabled
+ if ($PROGRAM stop > $TEMPFILE) ; then
+ cat $TEMPFILE
+ logger -t LAPTOP-MODE -p daemon.info -- "$(cat $TEMPFILE)"
+ else
+ cat $TEMPFILE
+ logger -t LAPTOP-MODE -p daemon.notice -- "$(cat $TEMPFILE)"
+ fi
+
# Now remove files containing stored status, re-enable, and start it up
again.
- rm -f /var/run/laptop-mode-*
- touch /var/run/laptop-mode-enabled
- $PROGRAM auto force > $TEMPFILE
- cat $TEMPFILE
+ rm -f /var/run/laptop-mode-tools/*
+ touch /var/run/laptop-mode-tools/enabled
+ if ($PROGRAM auto force > $TEMPFILE) ; then
+ cat $TEMPFILE
+ logger -t LAPTOP-MODE -p daemon.info -- "$(cat $TEMPFILE)"
+ else
+ cat $TEMPFILE
+ logger -t LAPTOP-MODE -p daemon.notice -- "$(cat $TEMPFILE)"
+ fi
+
+ if [ -f $TEMPFILE ] ; then
+ rm $TEMPFILE
+ fi
}
function stop() {
- rm -f /var/run/laptop-mode-enabled
- $PROGRAM stop > $TEMPFILE
- cat $TEMPFILE
+ TEMPFILE=`mktemp`
+
+ rm -f /var/run/laptop-mode-tools/enabled
+ if ($PROGRAM stop > $TEMPFILE) ; then
+ cat $TEMPFILE
+ logger -t LAPTOP-MODE -p daemon.info -- "$(cat $TEMPFILE)"
+ else
+ cat $TEMPFILE
+ logger -t LAPTOP-MODE -p daemon.notice -- "$(cat $TEMPFILE)"
+ fi
+
+ if [ -f $TEMPFILE ] ; then
+ rm $TEMPFILE
+ fi
}
function status() {
diff --git a/mobile/laptop-mode-tools/laptop-mode-tools-1.35.patch
b/mobile/laptop-mode-tools/laptop-mode-tools-1.35.patch
new file mode 100644
index 0000000..d631f2c
--- /dev/null
+++ b/mobile/laptop-mode-tools/laptop-mode-tools-1.35.patch
@@ -0,0 +1,327 @@
+diff -Naur laptop-mode-tools-1.35.orig/etc/init.d/laptop-mode
laptop-mode-tools-1.35/etc/init.d/laptop-mode
+--- laptop-mode-tools-1.35.orig/etc/init.d/laptop-mode 2007-11-18
09:33:43.000000000 -0600
++++ laptop-mode-tools-1.35/etc/init.d/laptop-mode 2008-03-01
01:36:05.000000000 -0600
+@@ -6,80 +6,113 @@
+ #
+ # config: /etc/laptop-mode/laptop-mode.conf
+
+-test -f /usr/sbin/laptop_mode || exit 0
++PROGRAM=/usr/sbin/laptop_mode
++RUNLEVEL=3
++NEEDS="+local_fs"
++
++. /etc/init.d/smgl_init
+
+-if [ -f /lib/lsb/init-functions ] ; then
+- . /lib/lsb/init-functions
+-else
+- log_success_msg()
+- {
+- logger -t LAPTOP-MODE -p daemon.info -- $*
+- echo "$*"
+- }
+- log_failure_msg()
+- {
+- logger -t LAPTOP-MODE -p daemon.notice -- $*
+- echo "$*"
+- }
+-fi
+-TEMPFILE=`mktemp`
++test -f /usr/sbin/laptop_mode || exit 0
+
+ # Enable laptop mode when the system is booted when running on battery.
+
+-case $1 in
+- start)
++function start() {
++ TEMPFILE=`mktemp`
++
++ mkdir -p /var/run/laptop-mode-tools
++ touch /var/run/laptop-mode-tools/enabled
++ if ($PROGRAM auto > $TEMPFILE) ; then
++ cat $TEMPFILE
++ logger -t LAPTOP-MODE -p daemon.info -- "$(cat $TEMPFILE)"
++ else
++ cat $TEMPFILE
++ logger -t LAPTOP-MODE -p daemon.notice -- "$(cat $TEMPFILE)"
++ fi
++
++ if [ -f $TEMPFILE ] ; then
++ rm $TEMPFILE
++ fi
++}
++
++function restart() {
++ TEMPFILE=`mktemp`
++
++ # Full restart: first stop laptop mode completely (to restore default
mount options etc.)
+ mkdir -p /var/run/laptop-mode-tools
++ rm -f /var/run/laptop-mode-tools/enabled
++ if ($PROGRAM stop > $TEMPFILE) ; then
++ cat $TEMPFILE
++ logger -t LAPTOP-MODE -p daemon.info -- "$(cat $TEMPFILE)"
++ else
++ cat $TEMPFILE
++ logger -t LAPTOP-MODE -p daemon.notice -- "$(cat $TEMPFILE)"
++ fi
++
++ # Now remove files containing stored status, re-enable, and start it up
again.
++ rm -f /var/run/laptop-mode-tools/*
+ touch /var/run/laptop-mode-tools/enabled
+- if (/usr/sbin/laptop_mode auto > $TEMPFILE) ; then
+- log_success_msg "$( cat $TEMPFILE )"
++ if ($PROGRAM auto force > $TEMPFILE) ; then
++ cat $TEMPFILE
++ logger -t LAPTOP-MODE -p daemon.info -- "$(cat $TEMPFILE)"
+ else
+- log_failure_msg "$( cat $TEMPFILE )"
++ cat $TEMPFILE
++ logger -t LAPTOP-MODE -p daemon.notice -- "$(cat $TEMPFILE)"
++ fi
++
++ if [ -f $TEMPFILE ] ; then
++ rm $TEMPFILE
+ fi
+- ;;
++}
++
++function reload() {
++ TEMPFILE=`mktemp`
+
+- restart|reload|force-reload)
+ # Full restart: first stop laptop mode completely (to restore default
mount options etc.)
+ mkdir -p /var/run/laptop-mode-tools
+ rm -f /var/run/laptop-mode-tools/enabled
+- if (/usr/sbin/laptop_mode stop > $TEMPFILE) ; then
+- log_success_msg "$( cat $TEMPFILE )"
++ if ($PROGRAM stop > $TEMPFILE) ; then
++ cat $TEMPFILE
++ logger -t LAPTOP-MODE -p daemon.info -- "$(cat $TEMPFILE)"
+ else
+- log_failure_msg "$( cat $TEMPFILE )"
++ cat $TEMPFILE
++ logger -t LAPTOP-MODE -p daemon.notice -- "$(cat $TEMPFILE)"
+ fi
+
+ # Now remove files containing stored status, re-enable, and start it up
again.
+ rm -f /var/run/laptop-mode-tools/*
+ touch /var/run/laptop-mode-tools/enabled
+- if (/usr/sbin/laptop_mode auto force > $TEMPFILE) ; then
+- log_success_msg "$( cat $TEMPFILE )"
++ if ($PROGRAM auto force > $TEMPFILE) ; then
++ cat $TEMPFILE
++ logger -t LAPTOP-MODE -p daemon.info -- "$(cat $TEMPFILE)"
+ else
+- log_failure_msg "$( cat $TEMPFILE )"
++ cat $TEMPFILE
++ logger -t LAPTOP-MODE -p daemon.notice -- "$(cat $TEMPFILE)"
++ fi
++
++ if [ -f $TEMPFILE ] ; then
++ rm $TEMPFILE
+ fi
+- ;;
++}
++
++function stop() {
++ TEMPFILE=`mktemp`
+
+- stop)
+ rm -f /var/run/laptop-mode-tools/enabled
+- if (/usr/sbin/laptop_mode stop > $TEMPFILE) ; then
+- log_success_msg "$( cat $TEMPFILE )"
++ if ($PROGRAM stop > $TEMPFILE) ; then
++ cat $TEMPFILE
++ logger -t LAPTOP-MODE -p daemon.info -- "$(cat $TEMPFILE)"
+ else
+- log_failure_msg "$( cat $TEMPFILE )"
++ cat $TEMPFILE
++ logger -t LAPTOP-MODE -p daemon.notice -- "$(cat $TEMPFILE)"
+ fi
+- ;;
+
+- status)
++ if [ -f $TEMPFILE ] ; then
++ rm $TEMPFILE
++ fi
++}
++
++function status() {
+ echo "Laptop mode status:"
+ echo
+- /usr/sbin/laptop_mode status
+- ;;
+-
+- *)
+- echo "Usage: $0 {stop|start|restart|reload|force-reload|status}" >&2
+- exit 2
+- ;;
+-esac
+-
+-if [ -f $TEMPFILE ] ; then
+- rm $TEMPFILE
+-fi
+-
+-exit 0
++ $PROGRAM status
++}
+diff -Naur laptop-mode-tools-1.35.orig/install.sh
laptop-mode-tools-1.35/install.sh
+--- laptop-mode-tools-1.35.orig/install.sh 2007-11-18 09:33:43.000000000
-0600
++++ laptop-mode-tools-1.35/install.sh 2008-03-01 02:03:28.000000000 -0600
+@@ -3,42 +3,10 @@
+ # If your distribution puts this in other locations, please adjust the
values of
+ # these variables before installing!
+ # INIT_D=/etc/init.d
+-MAN_D=/usr/local/man/man8
++MAN_D=/usr/share/man/man8
++RCPROG="/sbin/telinit run"
++INITSCRIPT=laptop-mode
+
+-if [ "$INIT_D" == "" ] ; then
+- # Try non-link directories first, then try links. This helps if one of
+- # the locations is linked to another, which is the case on some
distros.
+- if [ -d /etc/rc.d/init.d -a ! -L /etc/rc.d/init.d ] ; then
+- INIT_D=/etc/rc.d/init.d
+- elif [ -d /etc/rc.d -a ! -L /etc/rc.d -a ! -d /etc/rc.d/init.d ] ;
then
+- INIT_D=/etc/rc.d
+- elif [ -d /etc/init.d -a ! -L /etc/init.d ] ; then
+- INIT_D=/etc/init.d
+- elif [ -d /etc/rc.d/init.d ] ; then
+- INIT_D=/etc/rc.d/init.d
+- elif [ -d /etc/rc.d ] ; then
+- INIT_D=/etc/rc.d
+- elif [ -d /etc/init.d ] ; then
+- INIT_D=/etc/init.d
+- else
+- echo "Cannot determine location of init scripts. Please
modify install.sh."
+- exit 31
+- fi
+-fi
+-
+-if ( which invoke-rc.d > /dev/null ) ; then
+- # Debian uses invoke-rc.d
+- RCPROG=invoke-rc.d
+- INITSCRIPT=laptop-mode
+-elif ( which service > /dev/null ) ; then
+- # RedHat uses service
+- RCPROG=service
+- INITSCRIPT=laptop-mode
+-else
+- # Any other -- we start it ourselves.
+- RCPROG=
+- INITSCRIPT=$INIT_D/laptop-mode
+-fi
+
+ if [ "`whoami`" != "root" ] ; then
+ echo "You need to be root to install the laptop mode tools."
+@@ -49,9 +17,6 @@
+ echo "Warning: the kernel you are running does not support laptop
mode."
+ fi
+
+-echo 'Stopping existing laptop mode service (if any).'
+-$RCPROG $INITSCRIPT stop
+-
+ INSTALL="install -o root -g root"
+
+ mkdir -p /etc/laptop-mode /etc/laptop-mode/batt-start
/etc/laptop-mode/batt-stop /etc/laptop-mode/lm-ac-start
/etc/laptop-mode/lm-ac-stop /etc/laptop-mode/nolm-ac-start
/etc/laptop-mode/nolm-ac-stop /usr/lib/laptop-mode-tools/modules
/etc/laptop-mode/conf.d /etc/laptop-mode/modules
+@@ -147,7 +112,6 @@
+ echo "$0: Failed to install ACPI event file in
/etc/acpi/events. Installation failed."
+ exit 14
+ fi
+- killall -HUP acpid
+ echo "Installed ACPI support."
+ ACPI_DONE=1
+ fi
+@@ -202,31 +166,6 @@
+ echo "Install either acpid, apmd, pbbuttonsd or pmud (depending on
what your laptop supports) and reinstall."
+ fi
+
+-if [ -d $INIT_D ] ; then
+- if ( ! $INSTALL -m 700 etc/init.d/laptop-mode $INIT_D ) ; then
+- echo "$0: failed to install init script in $INIT_D. Installation
failed."
+- exit 16
+- fi
+- if [ -f /etc/rcS.d/S99laptop_mode ] ; then
+- # Old symlink.
+- rm $RCS_D/S99laptop-mode
+- fi
+- if ( which update-rc.d > /dev/null ) ; then
+- if ( ! update-rc.d laptop-mode defaults ) ; then
+- echo "$0: update-rc.d failed, laptop mode will not be initialized at
bootup."
+- exit 17
+- fi
+- elif ( which chkconfig > /dev/null ) ; then
+- if ( ! chkconfig laptop-mode on ) ; then
+- echo "$0: chkconfig failed, laptop mode will not be initialized at
bootup."
+- exit 30
+- fi
+- fi
+-else
+- echo "Directory $INIT_D not found: not installing script to initialize"
+- echo "laptop mode at boot time."
+-fi
+-
+ if ( ! mkdir -p $MAN_D ) ; then
+ echo "$0: Could not create directory $MAN_D. Installation failed."
+ exit 22
+@@ -236,9 +175,4 @@
+ exit 23
+ fi
+
+-if ( ! $RCPROG $INITSCRIPT start ) ; then
+- echo "$0: Could not start laptop mode init script
/etc/init.d/laptop-mode."
+- exit 24
+-fi
+-
+ echo "Installation complete."
+diff -Naur laptop-mode-tools-1.35.orig/usr/sbin/laptop_mode
laptop-mode-tools-1.35/usr/sbin/laptop_mode
+--- laptop-mode-tools-1.35.orig/usr/sbin/laptop_mode 2007-11-18
09:33:43.000000000 -0600
++++ laptop-mode-tools-1.35/usr/sbin/laptop_mode 2008-03-01
02:21:08.000000000 -0600
+@@ -384,18 +384,8 @@
+
+
#############################################################################
+
+-KLEVEL="$(uname -r |
+- {
+- IFS='.-' read a b c
+- echo $a.$b
+- }
+-)"
+-KMINOR="$(uname -r |
+- {
+- IFS='.-' read a b c d
+- echo $c
+- }
+-)"
++KLEVEL=`uname -r | sed 's/^\([0-9][0-9]*\.[0-9][0-9]*\)\..*/\1/'`
++KMINOR=`uname -r | sed 's/^[0-9][0-9]*\.[0-9][0-9]*\.\(.*\)/\1/'`
+
+ case "$KLEVEL" in
+ "2.4" ) ;;
+@@ -799,7 +789,7 @@
+ if [ -f /var/run/laptop-mode-tools/state ] ; then
+ read WAS_ACTIVE WAS_ON_AC WAS_ACTIVATE_WITH_POSSIBLE_DATA_LOSS <
/var/run/laptop-mode-tools/state
+ if [ "$WAS_ON_AC" != "" ] ; then
+- if [ "$WAS_ACTIVE" -eq "$ACTIVATE" -a "$WAS_ON_AC" -eq
"$ON_AC" -a "$WAS_ACTIVATE_WITH_POSSIBLE_DATA_LOSS" -eq
"$ACTIVATE_WITH_POSSIBLE_DATA_LOSS" -a "$FORCE" -eq 0 ] ; then
++ if [ "$WAS_ACTIVE" = "$ACTIVATE" -a "$WAS_ON_AC" = "$ON_AC"
-a "$WAS_ACTIVATE_WITH_POSSIBLE_DATA_LOSS" =
"$ACTIVATE_WITH_POSSIBLE_DATA_LOSS" -a "$FORCE" = 0 ] ; then
+ echo -n "$STATE, "
+ if [ "$WAS_ACTIVE" -eq 1 ] ; then
+ echo -n "active [unchanged]"
+@@ -1162,7 +1152,7 @@
+ # Retrieve original non-laptop mode mount
options and restore them.
+ # If the file that stores them doesn't exist,
then laptop mode
+ # has never been started.
+- if [ "$WAS_ACTIVE" -ne 0 -a -f
/var/run/laptop-mode-tools/nolm-mountopts ] ; then
++ if [ "$WAS_ACTIVE" != 0 -a -f
/var/run/laptop-mode-tools/nolm-mountopts ] ; then
+ SAVED_OPTS=`grep "^$DEV "
/var/run/laptop-mode-tools/nolm-mountopts`
+ SAVED_OPTS=${SAVED_OPTS#* } # trim
device name
+
+@@ -1610,7 +1600,7 @@
+ # from the INI files, but they may NOT assume the settings actually exist,
+ # as no defaults have been given for them.
+ export FORCE STATE ON_AC ACTIVATE
+-for SCRIPT in /usr/lib/laptop-mode-tools/modules/*
/usr/local/lib/laptop-mode-tools/modules/* /etc/laptop-mode/modules/*; do
++for SCRIPT in /usr/lib/laptop-mode-tools/modules/*
/etc/laptop-mode/modules/*; do
+ if [ -x "$SCRIPT" ] ; then
+ "$SCRIPT" >> $OUTPUT
+ else
diff --git a/mobile/laptop-mode-tools/laptop-mode-tools-1_34.patch
b/mobile/laptop-mode-tools/laptop-mode-tools-1_34.patch
deleted file mode 100644
index 794a5e9..0000000
--- a/mobile/laptop-mode-tools/laptop-mode-tools-1_34.patch
+++ /dev/null
@@ -1,282 +0,0 @@
-diff -Naur laptop-mode-tools-1.34.orig/etc/init.d/laptop-mode
laptop-mode-tools-1.34/etc/init.d/laptop-mode
---- laptop-mode-tools-1.34.orig/etc/init.d/laptop-mode 2007-10-17
20:43:21.952504025 -0700
-+++ laptop-mode-tools-1.34/etc/init.d/laptop-mode 2007-10-17
21:01:13.801986666 -0700
-@@ -6,9 +6,15 @@
- #
- # config: /etc/laptop-mode/laptop-mode.conf
-
-+PROGRAM=/usr/sbin/laptop_mode
-+RUNLEVEL=3
-+NEEDS="+local_fs"
-+
-+. /etc/init.d/smgl_init
-+
- test -f /usr/sbin/laptop_mode || exit 0
-
--. /lib/lsb/init-functions
-+#. /lib/lsb/init-functions
-
- # Enable laptop mode when the system is booted when running on battery.
-
-@@ -16,44 +22,62 @@
- echo "Failed to start laptop mode" > $TEMPFILE
-
-
--trap "log_failure_msg $( cat $TEMPFILE ) ; rm $TEMPFILE; exit 10" HUP INT
ABRT QUIT SEGV TERM
-+trap "cat $TEMPFILE; rm $TEMPFILE; exit 10" HUP INT ABRT QUIT SEGV TERM
- set -e
-
--case $1 in
-- start)
-+function start() {
- touch /var/run/laptop-mode-enabled
-- /usr/sbin/laptop_mode auto > $TEMPFILE
-- log_success_msg $( cat $TEMPFILE )
-- ;;
-+ $PROGRAM auto > $TEMPFILE
-+ cat $TEMPFILE
-+}
-
-- restart|reload|force-reload)
-+function restart() {
- # Full restart: first stop laptop mode completely (to restore default
mount options etc.)
- rm -f /var/run/laptop-mode-enabled
-- /usr/sbin/laptop_mode stop > $TEMPFILE
-- log_success_msg $( cat $TEMPFILE )
-+ $PROGRAM stop > $TEMPFILE
-+ cat $TEMPFILE
-
- # Now remove files containing stored status, re-enable, and start it up
again.
- rm -f /var/run/laptop-mode-*
- touch /var/run/laptop-mode-enabled
-- /usr/sbin/laptop_mode auto force > $TEMPFILE
-- log_success_msg $( cat $TEMPFILE )
-- ;;
-+ $PROGRAM auto force > $TEMPFILE
-+ cat $TEMPFILE
-+}
-
-- stop)
-+function reload() {
-+ # Full restart: first stop laptop mode completely (to restore default
mount options etc.)
- rm -f /var/run/laptop-mode-enabled
-- /usr/sbin/laptop_mode stop > $TEMPFILE
-- log_success_msg $( cat $TEMPFILE )
-- ;;
-+ $PROGRAM stop > $TEMPFILE
-+ cat $TEMPFILE
-+
-+ # Now remove files containing stored status, re-enable, and start it up
again.
-+ rm -f /var/run/laptop-mode-*
-+ touch /var/run/laptop-mode-enabled
-+ $PROGRAM auto force > $TEMPFILE
-+ cat $TEMPFILE
-+}
-
-- status)
-+function force-reload() {
-+ # Full restart: first stop laptop mode completely (to restore default
mount options etc.)
-+ rm -f /var/run/laptop-mode-enabled
-+ $PROGRAM stop > $TEMPFILE
-+ cat $TEMPFILE
-+
-+ # Now remove files containing stored status, re-enable, and start it up
again.
-+ rm -f /var/run/laptop-mode-*
-+ touch /var/run/laptop-mode-enabled
-+ $PROGRAM auto force > $TEMPFILE
-+ cat $TEMPFILE
-+}
-+
-+function stop() {
-+ rm -f /var/run/laptop-mode-enabled
-+ $PROGRAM stop > $TEMPFILE
-+ cat $TEMPFILE
-+}
-+
-+function status() {
- echo "Laptop mode status:"
- echo
-- /usr/sbin/laptop_mode status
-- ;;
--
-- *)
-- echo "Usage: $0 {stop|start|restart|reload|force-reload|status}" >&2
-- exit 2
-- ;;
--esac
--exit 0
-+ $PROGRAM status
-+}
-diff -Naur laptop-mode-tools-1.34.orig/install.sh
laptop-mode-tools-1.34/install.sh
---- laptop-mode-tools-1.34.orig/install.sh 2007-10-17 20:43:21.952504025
-0700
-+++ laptop-mode-tools-1.34/install.sh 2007-10-17 21:01:13.802986513 -0700
-@@ -2,43 +2,9 @@
-
- # If your distribution puts this in other locations, please adjust the
values of
- # these variables before installing!
--# INIT_D=/etc/init.d
--MAN_D=/usr/local/man/man8
--
--if [ "$INIT_D" == "" ] ; then
-- # Try non-link directories first, then try links. This helps if one of
-- # the locations is linked to another, which is the case on some
distros.
-- if [ -d /etc/rc.d/init.d -a ! -L /etc/rc.d/init.d ] ; then
-- INIT_D=/etc/rc.d/init.d
-- elif [ -d /etc/rc.d -a ! -L /etc/rc.d -a ! -d /etc/rc.d/init.d ] ;
then
-- INIT_D=/etc/rc.d
-- elif [ -d /etc/init.d -a ! -L /etc/init.d ] ; then
-- INIT_D=/etc/init.d
-- elif [ -d /etc/rc.d/init.d ] ; then
-- INIT_D=/etc/rc.d/init.d
-- elif [ -d /etc/rc.d ] ; then
-- INIT_D=/etc/rc.d
-- elif [ -d /etc/init.d ] ; then
-- INIT_D=/etc/init.d
-- else
-- echo "Cannot determine location of init scripts. Please
modify install.sh."
-- exit 31
-- fi
--fi
--
--if ( which invoke-rc.d > /dev/null ) ; then
-- # Debian uses invoke-rc.d
-- RCPROG=invoke-rc.d
-- INITSCRIPT=laptop-mode
--elif ( which service > /dev/null ) ; then
-- # RedHat uses service
-- RCPROG=service
-- INITSCRIPT=laptop-mode
--else
-- # Any other -- we start it ourselves.
-- RCPROG=
-- INITSCRIPT=$INIT_D/laptop-mode
--fi
-+MAN_D=/usr/share/man/man8
-+RCPROG="/sbin/telinit run"
-+INITSCRIPT=laptop-mode
-
- if [ "`whoami`" != "root" ] ; then
- echo "You need to be root to install the laptop mode tools."
-@@ -49,9 +15,6 @@
- echo "Warning: the kernel you are running does not support laptop
mode."
- fi
-
--echo 'Stopping existing laptop mode service (if any).'
--$RCPROG $INITSCRIPT stop
--
- INSTALL="install -o root -g root"
-
- mkdir -p /etc/laptop-mode /etc/laptop-mode/batt-start
/etc/laptop-mode/batt-stop /etc/laptop-mode/lm-ac-start
/etc/laptop-mode/lm-ac-stop /etc/laptop-mode/nolm-ac-start
/etc/laptop-mode/nolm-ac-stop /usr/lib/laptop-mode-tools/modules
/etc/laptop-mode/conf.d /etc/laptop-mode/modules
-@@ -147,7 +110,6 @@
- echo "$0: Failed to install ACPI event file in
/etc/acpi/events. Installation failed."
- exit 14
- fi
-- killall -HUP acpid
- echo "Installed ACPI support."
- ACPI_DONE=1
- fi
-@@ -202,31 +164,6 @@
- echo "Install either acpid, apmd, pbbuttonsd or pmud (depending on
what your laptop supports) and reinstall."
- fi
-
--if [ -d $INIT_D ] ; then
-- if ( ! $INSTALL -m 700 etc/init.d/laptop-mode $INIT_D ) ; then
-- echo "$0: failed to install init script in $INIT_D. Installation
failed."
-- exit 16
-- fi
-- if [ -f /etc/rcS.d/S99laptop_mode ] ; then
-- # Old symlink.
-- rm $RCS_D/S99laptop-mode
-- fi
-- if ( which update-rc.d > /dev/null ) ; then
-- if ( ! update-rc.d laptop-mode defaults ) ; then
-- echo "$0: update-rc.d failed, laptop mode will not be initialized at
bootup."
-- exit 17
-- fi
-- elif ( which chkconfig > /dev/null ) ; then
-- if ( ! chkconfig laptop-mode on ) ; then
-- echo "$0: chkconfig failed, laptop mode will not be initialized at
bootup."
-- exit 30
-- fi
-- fi
--else
-- echo "Directory $INIT_D not found: not installing script to initialize"
-- echo "laptop mode at boot time."
--fi
--
- if ( ! mkdir -p $MAN_D ) ; then
- echo "$0: Could not create directory $MAN_D. Installation failed."
- exit 22
-@@ -236,9 +173,4 @@
- exit 23
- fi
-
--if ( ! $RCPROG $INITSCRIPT start ) ; then
-- echo "$0: Could not start laptop mode init script
/etc/init.d/laptop-mode."
-- exit 24
--fi
--
- echo "Installation complete."
-diff -Naur laptop-mode-tools-1.34.orig/usr/sbin/laptop_mode
laptop-mode-tools-1.34/usr/sbin/laptop_mode
---- laptop-mode-tools-1.34.orig/usr/sbin/laptop_mode 2007-10-17
20:43:21.952504025 -0700
-+++ laptop-mode-tools-1.34/usr/sbin/laptop_mode 2007-10-17
21:02:29.838386836 -0700
-@@ -374,18 +374,20 @@
-
-
#############################################################################
-
--KLEVEL="$(uname -r |
-- {
-- IFS='.-' read a b c
-- echo $a.$b
-- }
--)"
--KMINOR="$(uname -r |
-- {
-- IFS='.-' read a b c d
-- echo $c
-- }
--)"
-+#KLEVEL="$(uname -r |
-+# {
-+# IFS='.-' read a b c
-+# echo $a.$b
-+# }
-+#)"
-+KLEVEL=`uname -r | sed 's/^\([0-9][0-9]*\.[0-9][0-9]*\)\..*/\1/'`
-+#KMINOR="$(uname -r |
-+# {
-+# IFS='.-' read a b c d
-+# echo $c
-+# }
-+#)"
-+KMINOR=`uname -r | sed 's/^[0-9][0-9]*\.[0-9][0-9]*\.\(.*\)/\1/'`
-
- case "$KLEVEL" in
- "2.4" ) ;;
-@@ -787,7 +789,7 @@
- if [ -f /var/run/laptop-mode-state ] ; then
- read WAS_ACTIVE WAS_ON_AC WAS_ACTIVATE_WITH_POSSIBLE_DATA_LOSS <
/var/run/laptop-mode-state
- if [ "$WAS_ON_AC" != "" ] ; then
-- if [ "$WAS_ACTIVE" -eq "$ACTIVATE" -a "$WAS_ON_AC" -eq
"$ON_AC" -a "$WAS_ACTIVATE_WITH_POSSIBLE_DATA_LOSS" -eq
"$ACTIVATE_WITH_POSSIBLE_DATA_LOSS" -a "$FORCE" -eq 0 ] ; then
-+ if [ "$WAS_ACTIVE" = "$ACTIVATE" -a "$WAS_ON_AC" = "$ON_AC"
-a "$WAS_ACTIVATE_WITH_POSSIBLE_DATA_LOSS" =
"$ACTIVATE_WITH_POSSIBLE_DATA_LOSS" -a "$FORCE" = 0 ] ; then
- echo -n "$STATE, "
- if [ "$WAS_ACTIVE" -eq 1 ] ; then
- echo -n "active [unchanged]"
-@@ -1153,7 +1155,7 @@
- # Retrieve original non-laptop mode mount
options and restore them.
- # If the file that stores them doesn't exist,
then laptop mode
- # has never been started.
-- if [ "$WAS_ACTIVE" -ne 0 -a -f
/var/run/laptop-mode-nolm-mountopts ] ; then
-+ if [ "$WAS_ACTIVE" != 0 -a -f
/var/run/laptop-mode-nolm-mountopts ] ; then
- SAVED_OPTS=`grep "^$DEV "
/var/run/laptop-mode-nolm-mountopts`
- SAVED_OPTS=${SAVED_OPTS#* } # trim
device name
-
-@@ -1593,7 +1595,7 @@
- # Finally, call laptop-mode-tools modules. The modules can use the settings
- # from the INI files, but they may NOT assume the settings actually exist,
- # as no defaults have been given for them.
--for SCRIPT in /usr/lib/laptop-mode-tools/modules/*
/usr/local/lib/laptop-mode-tools/modules/* /etc/laptop-mode/modules/*; do
-+for SCRIPT in /usr/lib/laptop-mode-tools/modules/*
/etc/laptop-mode/modules/*; do
- if [ -e "$SCRIPT" ] ; then
- "$SCRIPT" >> $OUTPUT
- else
diff --git a/utils/virtualbox/BUILD b/utils/virtualbox/BUILD
index 78ab2bc..ec633c3 100755
--- a/utils/virtualbox/BUILD
+++ b/utils/virtualbox/BUILD
@@ -1,3 +1,10 @@
./configure $OPTS &&
+
+# patch to make this spell compiling with libxcursor from xorg-modular
grimoire
+# this patch must be applied after configure is run
+if check_if_xorg_modular_libs ; then
+ patch -p0 < $SCRIPT_DIRECTORY/Xcursor.patch
+fi &&
+
source ./env.sh &&
kmk all
diff --git a/utils/virtualbox/HISTORY b/utils/virtualbox/HISTORY
index 03a6c7f..2bd30c5 100644
--- a/utils/virtualbox/HISTORY
+++ b/utils/virtualbox/HISTORY
@@ -1,3 +1,7 @@
+2008-03-04 Julien "_kaze_" ROZO <julien AT rozo.org>
+ * BUILD, Xcursor.patch: readded a newer version of this patch to solve
+ compilation issue with xorg-modular grimoire
+
2008-03-01 Ismael Luceno <ismael AT sourcemage.org>
* DETAILS: fixed SOURCE properly, it was a new tarball
diff --git a/utils/virtualbox/Xcursor.patch b/utils/virtualbox/Xcursor.patch
new file mode 100644
index 0000000..8bb806d
--- /dev/null
+++ b/utils/virtualbox/Xcursor.patch
@@ -0,0 +1,10 @@
+--- Config.kmk.orig 2008-03-04 20:01:03.000000000 +0100
++++ Config.kmk 2008-03-04 20:01:12.000000000 +0100
+@@ -2078,6 +2078,7 @@
+ TEMPLATE_VBOXQTGUIEXE_LIBS += \
+ Xext \
+ X11 \
++ Xcursor \
+ m \
+ $(LIB_PTHREAD)
+ TEMPLATE_VBOXQTGUIEXE_LIBPATH += \
- [SM-Commit] GIT changes to master grimoire by Julien ROZO (ecf58ab091d4455df1ad7501a6eeb31d6d58850a), Julien ROZO, 03/04/2008
Archive powered by MHonArc 2.6.24.