瀏覽代碼

correct buildconf by not specifying typeaheadfind which is broken since Firefox 1.0PR

Michael Schloh von Bennewitz 20 年之前
父節點
當前提交
d98ff7ef8c
共有 2 個文件被更改,包括 18 次插入2 次删除
  1. 11 0
      firefox/firefox.patch
  2. 7 2
      firefox/firefox.spec

+ 11 - 0
firefox/firefox.patch

@@ -117,3 +117,14 @@ Index: layout/svg/renderer/src/cairo/nsSVGCairoGlyphMetrics.cpp
  #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:");
+ 

+ 7 - 2
firefox/firefox.spec

@@ -33,7 +33,7 @@ Class:        EVAL
 Group:        Web
 License:      MPL
 Version:      1.0.2
-Release:      20050422
+Release:      20050425
 
 #   package options
 %option       with_optimize   yes
@@ -110,6 +110,11 @@ AutoReqProv:  no
     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 @@ AutoReqProv:  no
         --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 \