Jelajahi Sumber

1. explicitly require libiconv, 2. add libart_lgpl, 3. add workaround for locality 'problems' causing Japanese characters on file:// URLs

Ralf S. Engelschall 23 tahun lalu
induk
melakukan
3af003c665
2 mengubah file dengan 13 tambahan dan 5 penghapusan
  1. 2 0
      mozilla/mozilla.sh
  2. 11 5
      mozilla/mozilla.spec

+ 2 - 0
mozilla/mozilla.sh

@@ -57,6 +57,8 @@ verbose () {
 #   establish Mozilla environment
 MOZILLA_FIVE_HOME="$mozilla_dir"
 export MOZILLA_FIVE_HOME
+LANG=en_US.ISO8859-1
+export LANG
 
 #   special case of direct remote option
 if [ ".$opt_r" != . ]; then

+ 11 - 5
mozilla/mozilla.spec

@@ -41,19 +41,20 @@ Distribution: OpenPKG [EVAL]
 Group:        Web
 License:      MPL
 Version:      1.2.1
-Release:      20021215
+Release:      20021217
 
 #   list of sources
 Source0:      ftp://ftp.mozilla.org/pub/mozilla/releases/mozilla%{version}/src/mozilla-source-%{version}.tar.bz2
-Source1:      mozilla.sh
-Source2:      mozilla.pod
+Source1:      http://people.freebsd.org/~marcus/libart_lgpl-%{version}.tar.bz2
+Source2:      mozilla.sh
+Source3:      mozilla.pod
 Patch0:       mozilla.patch
 
 #   build information
 Prefix:       %{l_prefix}
 BuildRoot:    %{l_buildroot}
-BuildPreReq:  OpenPKG, openpkg >= 20021204, X11, glib, gtk, orbit, infozip, openssl, freetype, make, gcc, perl
-PreReq:       OpenPKG, openpkg >= 20021204, X11, glib, gtk, orbit, infozip, openssl, freetype, xsel
+BuildPreReq:  OpenPKG, openpkg >= 20021204, X11, glib, gtk, orbit, libiconv, infozip, openssl, freetype, make, gcc, perl
+PreReq:       OpenPKG, openpkg >= 20021204, X11, glib, gtk, orbit, libiconv, infozip, openssl, freetype, xsel
 AutoReq:      no
 AutoReqProv:  no
 
@@ -73,6 +74,10 @@ AutoReqProv:  no
     #   extract source distribution
     %setup -q -n mozilla
 
+    #   add back the modified libart which is included in Mozilla CVS
+    #   but left out of the source distribution for licensing reasons.
+    %{l_gzip} -d -c %{SOURCE1} | %{l_tar} xf -
+
     #   patch source distribution
     %patch -p0
 
@@ -95,6 +100,7 @@ AutoReqProv:  no
     GLIB_CONFIG="%{l_prefix}/bin/glib-config" \
     GTK_CONFIG="%{l_prefix}/bin/gtk-config" \
     LIBIDL_CONFIG="%{l_prefix}/bin/libIDL-config" \
+    MOZ_INTERNAL_LIBART_LGPL=1 \
     ./configure \
         --prefix=%{l_prefix} \
         --libdir=%{l_prefix}/lib/mozilla \