OpenPKG CVS Repository
http://cvs.openpkg.org/
____________________________________________________________________________
Server: cvs.openpkg.org Name: Ralf S. Engelschall
Root: /v/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src Date: 01-Jul-2005 13:54:29
Branch: HEAD Handle: 2005070112542800
Modified files:
openpkg-src/firefox firefox.sh firefox.spec
Log:
synchronize Mozilla Firefox control program with Mozilla Suite version
by adding wmctrl and file:// support
Summary:
Revision Changes Path
1.6 +6 -2 openpkg-src/firefox/firefox.sh
1.25 +1 -1 openpkg-src/firefox/firefox.spec
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/firefox/firefox.sh
============================================================================
$ cvs diff -u -r1.5 -r1.6 firefox.sh
--- openpkg-src/firefox/firefox.sh 25 Jun 2005 17:23:36 -0000 1.5
+++ openpkg-src/firefox/firefox.sh 1 Jul 2005 11:54:28 -0000 1.6
@@ -28,6 +28,7 @@
firefox_browser_bin="$firefox_dir/firefox"
firefox_remote_bin="$firefox_dir/run-mozilla.sh
$firefox_dir/mozilla-xremote-client"
xsel_bin="@l_prefix@/bin/xsel"
+wmctrl_bin="@l_prefix@/bin/wmctrl"
# option parsing
opt_v=no
@@ -94,7 +95,7 @@
auto:* )
url=`echo "$url" | sed -e 's;^auto:;;'`
case "$url" in
- http://* | https://* | ftp://* ) ;;
+ http://* | https://* | ftp://* | file://* ) ;;
www.* ) url="http://$url"; ;;
ftp.* ) url="ftp://$url"; ;;
*.tar.gz | *.tgz ) url="ftpsearch:$url" ;;
@@ -105,7 +106,7 @@
;;
esac
case "$url" in
- http://* | https://* | ftp://* )
+ http://* | https://* | ftp://* | file://* )
: # URL is already fully qualified
;;
google:* )
@@ -178,6 +179,9 @@
done
fi
+ # try to activate (and bring to foreground) the Mozilla Firefox
window
+ $wmctrl_bin -a "Mozilla Firefox" >/dev/null 2>&1 || true
+
# determine remote command
if [ ".$opt_w" = .yes ]; then
if [ ".$url" = ".about:blank" ]; then
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/firefox/firefox.spec
============================================================================
$ cvs diff -u -r1.24 -r1.25 firefox.spec
--- openpkg-src/firefox/firefox.spec 25 Jun 2005 17:23:36 -0000 1.24
+++ openpkg-src/firefox/firefox.spec 1 Jul 2005 11:54:28 -0000 1.25
@@ -33,7 +33,7 @@
Group: Web
License: MPL
Version: 1.0.4
-Release: 20050625
+Release: 20050701
# package options
%option with_optimize yes
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List openpkg-cvs@openpkg.org
