summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMartin Schlemmer <azarah@gentoo.org>2002-12-26 01:41:34 +0000
committerMartin Schlemmer <azarah@gentoo.org>2002-12-26 01:41:34 +0000
commitc32f5bf778d1add740000ce3c464af8dfa918f9a (patch)
treeb8a0ec18cdc97576ed071b3c27883903f7995b3e /net-www
parentnew version (diff)
downloadgentoo-2-c32f5bf778d1add740000ce3c464af8dfa918f9a.tar.gz
gentoo-2-c32f5bf778d1add740000ce3c464af8dfa918f9a.tar.bz2
gentoo-2-c32f5bf778d1add740000ce3c464af8dfa918f9a.zip
update google plugin, fix bork
Diffstat (limited to 'net-www')
-rw-r--r--net-www/mozilla/ChangeLog8
-rw-r--r--net-www/mozilla/files/google.src29
-rw-r--r--net-www/mozilla/mozilla-1.2.1-r3.ebuild8
3 files changed, 42 insertions, 3 deletions
diff --git a/net-www/mozilla/ChangeLog b/net-www/mozilla/ChangeLog
index 37e808a8343c..7d4352bccb78 100644
--- a/net-www/mozilla/ChangeLog
+++ b/net-www/mozilla/ChangeLog
@@ -1,6 +1,12 @@
# ChangeLog for net-www/mozilla
# Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL
-# $Header: /var/cvsroot/gentoo-x86/net-www/mozilla/ChangeLog,v 1.76 2002/12/25 22:15:50 azarah Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-www/mozilla/ChangeLog,v 1.77 2002/12/26 01:41:34 azarah Exp $
+
+ 26 Dec 2002; Martin Schlemmer <azarah@gentoo.org> mozilla-1.2.1-r3.ebuild :
+
+ Update google search plugin, closing bug #10605.
+
+ Fix my braindead stuff up with the "WANT_GTK2" fix of yesterday.
25 Dec 2002; Martin Schlemmer <azarah@gentoo.org> mozilla-1.2.1-r3.ebuild :
diff --git a/net-www/mozilla/files/google.src b/net-www/mozilla/files/google.src
new file mode 100644
index 000000000000..c11e51bf39a2
--- /dev/null
+++ b/net-www/mozilla/files/google.src
@@ -0,0 +1,29 @@
+# Mozilla/Google plug-in by amitp+mozilla@google.com
+
+<search
+ name="Google"
+ description="Google Search"
+ method="GET"
+ action="http://www.google.com/search"
+ update="http://www.google.com/mozilla/google.src"
+ updateCheckDays=1
+ queryEncoding="utf-8"
+ queryCharset="utf-8"
+>
+
+<input name="q" user>
+<input name="sourceid" value="mozilla-search">
+<inputnext name="start" factor="10">
+<inputprev name="start" factor="10">
+<input name="ie" value="utf-8">
+<input name="oe" value="utf-8">
+
+<interpret
+ browserResultType="result"
+ charset = "UTF-8"
+ resultListStart="<!--a-->"
+ resultListEnd="<!--z-->"
+ resultItemStart="<!--m-->"
+ resultItemEnd="<!--n-->"
+>
+</search>
diff --git a/net-www/mozilla/mozilla-1.2.1-r3.ebuild b/net-www/mozilla/mozilla-1.2.1-r3.ebuild
index 14d1a2dd9a0b..2661d0e23fb4 100644
--- a/net-www/mozilla/mozilla-1.2.1-r3.ebuild
+++ b/net-www/mozilla/mozilla-1.2.1-r3.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2002 Gentoo Technologies, Inc.
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-www/mozilla/mozilla-1.2.1-r3.ebuild,v 1.6 2002/12/25 22:15:50 azarah Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-www/mozilla/mozilla-1.2.1-r3.ebuild,v 1.7 2002/12/26 01:41:34 azarah Exp $
IUSE="java crypt ipv6 gtk2 ssl ldap gnome"
# Internal USE flags that I do not really want to advertise ...
@@ -85,7 +85,7 @@ DEPEND="${RDEPEND}
pkg_setup() {
- if [ "${WANT_GTK2}" != "yes" ]
+ if [ "`use gtk2`" -a "${WANT_GTK2}" != "yes" ]
then
echo
eerror "Due to the many bugs related with gtk+-2.x support"
@@ -599,6 +599,10 @@ src_install() {
# Move plugins dir
src_mv_plugins usr/lib/mozilla/plugins
+ # Update Google search plugin to use UTF8 charset ...
+ insinto /usr/lib/mozilla/searchplugins
+ doins ${FILESDIR}/google.src
+
# Fix icons to look the same everywhere
insinto /usr/lib/mozilla/icons
doins ${S}/build/package/rpm/SOURCES/mozicon16.xpm