Home | History | Annotate | Download | only in patches
      1 --- firefox/toolkit/mozapps/installer/packager.mk.ori2	2006-04-27 09:29:19.904719000 +0800
      2 +++ firefox/toolkit/mozapps/installer/packager.mk	2006-04-28 06:33:28.590446000 +0800
      3 @@ -183,6 +183,16 @@
      4  endif # !CROSS_COMPILE
      5  
      6  NO_PKG_FILES += \
      7 +        libnspr4.so \
      8 +        libplc4.so \
      9 +        libplds4.so \
     10 +        libnss3.so \
     11 +        libsmime3.so \
     12 +        libsoftokn3.chk \
     13 +        libsoftokn3.so \
     14 +        libssl3.so \
     15 +        libnssckbi.so \
     16 +        cpu/sparcv8plus/libnspr_flt4.so \
     17  	core \
     18  	bsdecho \
     19  	gtscc \
     20 --- firefox/build/unix/mozilla-config.in.ori	2006-06-26 14:10:22.186019000 +0800
     21 +++ firefox/build/unix/mozilla-config.in	2006-06-26 20:16:23.469407000 +0800
     22 @@ -20,7 +20,6 @@
     23      *
     24  Libraries:
     25      xpcom
     26 -    nspr
     27      js
     28      jsj
     29      gfx
     30 @@ -74,7 +73,7 @@
     31      --idlflags)
     32        echo_idlflags=yes
     33        ;;
     34 -    xpcom|js|nspr|gfx|jsj)
     35 +    xpcom|js|gfx|jsj)
     36        echo_components="$echo_components $1"
     37        echo_libraries="$echo_libraries $1"
     38        ;;
     39 @@ -103,19 +102,17 @@
     40  fi
     41  
     42  if test "$echo_cflags" = "yes"; then
     43 -    nspr_cflags="%FULL_NSPR_CFLAGS%"
     44      for n in $echo_components; do
     45  	component_includes="$component_includes -I%includedir%/$n"
     46      done
     47 -    echo $component_includes $includes $nspr_cflags
     48 +    echo $component_includes $includes
     49  fi
     50  
     51  if test "$echo_idlflags" = "yes"; then
     52      echo "-I%idldir%"
     53  fi
     54  
     55 -_nspr_libs="%FULL_NSPR_LIBS%"
     56 -_xpcom_libs="-lxpcom -lxpcom_core $_nspr_libs"
     57 +_xpcom_libs="-lxpcom -lxpcom_core"
     58  _js_libs="-ljs"
     59  
     60  if test "$echo_libs" = "yes"; then
     61 @@ -127,9 +124,6 @@
     62  	xpcom)
     63  	    libs="$libs $_xpcom_libs"
     64  	    ;;
     65 -	nspr)
     66 -	    libs="$libs $_nspr_libs"
     67 -	    ;;
     68  	js)
     69  	    libs="$libs $_js_libs"
     70  	    ;;
     71 --- firefox/build/unix/mozilla-xpcom.pc.in.ori	2006-06-26 20:18:23.662416000 +0800
     72 +++ firefox/build/unix/mozilla-xpcom.pc.in	2006-06-26 20:24:22.166426000 +0800
     73 @@ -7,6 +7,5 @@
     74  Name: XPCOM
     75  Description: The Mozilla Cross Platform Component Library
     76  Version: %MOZILLA_VERSION%
     77 -Requires: %NSPR_NAME% >= %NSPR_VERSION%
     78  Libs: -L${libdir} -lxpcom -lxpcom_core
     79  Cflags: -I${includedir} -I${includedir}/xpcom -I${includedir}/string
     80 --- firefox-2.0.0.2/build/unix/mozilla-plugin.pc.in.orig	2007-03-08 15:35:42.298209000 +0000
     81 +++ firefox-2.0.0.2/build/unix/mozilla-plugin.pc.in	2007-03-08 15:35:52.225045000 +0000
     82 @@ -6,5 +6,5 @@
     83  Name: Mozilla Plug-In API
     84  Description: Mozilla Plug-In API
     85  Version: %MOZILLA_VERSION%
     86 -Requires: %NSPR_NAME% >= %NSPR_VERSION%
     87 +Requires: %MOZ_APP_NAME%-xpcom = %MOZILLA_VERSION%
     88  Cflags: -I${includedir}/java -I${includedir}/plugin
     89