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