OpenPKG CVS Repository
http://cvs.openpkg.org/
____________________________________________________________________________
Server: cvs.openpkg.org Name: Michael Schloh
Root: /v/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src Date: 25-Apr-2005 19:34:26
Branch: HEAD Handle: 2005042518342600
Modified files:
openpkg-src/firefox firefox.patch firefox.spec
Log:
correct buildconf by not specifying typeaheadfind which is broken
since Firefox 1.0PR
Summary:
Revision Changes Path
1.5 +11 -0 openpkg-src/firefox/firefox.patch
1.16 +7 -2 openpkg-src/firefox/firefox.spec
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/firefox/firefox.patch
============================================================================
$ cvs diff -u -r1.4 -r1.5 firefox.patch
--- openpkg-src/firefox/firefox.patch 24 Mar 2005 11:41:33 -0000 1.4
+++ openpkg-src/firefox/firefox.patch 25 Apr 2005 17:34:26 -0000 1.5
@@ -117,3 +117,14 @@
#include <cairo.h>
/**
+Index: config/make-jars.pl
+--- config/make-jars.pl.orig 2004-07-21 20:33:37 +0200
++++ config/make-jars.pl 2005-04-22 20:34:14 +0200
+@@ -40,6 +40,7 @@
+ last if ($arg eq "--");
+ }
+ my $defines = join(' ', @ARGV[ $ddindex .. $#ARGV ]);
++splice @ARGV, $ddindex, $#ARGV;
+
+ getopts("d:s:t:f:avlD:o:p:xz:");
+
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/firefox/firefox.spec
============================================================================
$ cvs diff -u -r1.15 -r1.16 firefox.spec
--- openpkg-src/firefox/firefox.spec 22 Apr 2005 15:38:38 -0000 1.15
+++ openpkg-src/firefox/firefox.spec 25 Apr 2005 17:34:26 -0000 1.16
@@ -33,7 +33,7 @@
Group: Web
License: MPL
Version: 1.0.2
-Release: 20050422
+Release: 20050425
# package options
%option with_optimize yes
@@ -110,6 +110,11 @@
export MOZILLA_OFFICIAL BUILD_OFFICIAL
export MOZ_PHOENIX
+ # specify custom extensions, leaving out the broken 'typeaheadfind'
+ custext="cookie,wallet,content-packs,xml-rpc,xmlextras,help,p3p,pref"
+ custext="${custext},transformiix,venkman,inspector,irc,universalchardet"
+ custext="${custext},webservices,spellcheck,gnomevfs,negotiateauth"
+
# configure source
./configure \
--prefix=%{l_prefix} \
@@ -131,7 +136,7 @@
--with-system-zlib=%{l_prefix} \
--with-ft-prefix=%{l_prefix} \
--with-user-appdir=.firefox \
-
--enable-extensions="cookie,wallet,content-packs,xml-rpc,xmlextras,help,p3p,pref,transformiix,venkman,inspector,irc,universalchardet,webservices,spellcheck,gnomevfs,negotiateauth"
\
+ --enable-extensions="$custext" \
--enable-jsd \
--enable-crypto \
--enable-chrome-format=jar \
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List [email protected]
