Hi Ginn,
Thanks for the review.
Ginn Chen wrote:
>
> On Sep 8, 2008, at 1:54 AM, Alfred Peng wrote:
>
>>
>> --- firefox/toolkit/mozapps/installer/packager.mk.ori 2007-12-26
>> 16:21:34.738674000 +0800
>> +++ firefox/toolkit/mozapps/installer/packager.mk 2007-12-26
>> 15:57:42.839901000 +0800
>> @@ -211,6 +211,16 @@
>> endif # !CROSS_COMPILE
>>
>> NO_PKG_FILES += \
>> + libnspr4.so \
>> + libplc4.so \
>> + libplds4.so \
>> + libnss3.so \
>> + libsmime3.so \
>> + libsoftokn3.chk \
>> + libsoftokn3.so \
>> + libssl3.so \
>> + libnssckbi.so \
>> + cpu/sparcv8plus/libnspr_flt4.so \
>> core \
>> bsdecho \
>> gtscc \
>
> I think your list is not complete. libfreebl* is missed.
Check the code logic again. Songbird has its own packaging code and
doesn't depend on Mozilla's packaging module. I'll remove this patch.
>>
>> Index: core/SUNWsongbird.spec
>> ===================================================================
>> --- core/SUNWsongbird.spec (revision 317)
>> +++ core/SUNWsongbird.spec (working copy)
> [snip]
>>
>> +# Don't deliver nss, nspr libraries on OpenSolaris
>> +rm -rf
>> $RPM_BUILD_ROOT%{_libdir}/songbird-%version/xulrunner/libfreebl3*
>> +rm -rf $RPM_BUILD_ROOT%{_libdir}/songbird-%version/xulrunner/libnss*
>> +rm -rf $RPM_BUILD_ROOT%{_libdir}/songbird-%version/xulrunner/libnspr*
>> +rm -rf $RPM_BUILD_ROOT%{_libdir}/songbird-%version/xulrunner/libpl*
>> +rm -rf $RPM_BUILD_ROOT%{_libdir}/songbird-%version/xulrunner/libs*
>> +
>
> On SPARC, it doesn't have libfreebl3* but libfreebl_32*.
>
> If you're using Firefox nss, nspr, why you need to build them for
> Xulrunner/Songbird?
> I don't think build and delete is a good thing.
> Also you don't have "+%if %without_moz_nss_nspr" here.
To make Songbird depends on Firefox's nss/nspr is a temporary solution
which is from ARC review. When the system nss/nspr are upgraded to meet
the requirement(nss from 3.11.9 to 3.12.0), Songbird(and also Firefox)
will both be linked with the system ones.
I tried to build Songbird with Firefox's nss/nspr libraries and headers.
Some headers are missing, for example, nspr.h and breaks the build. As
Songbird and Firefox share the same nss/nspr source code, it should be
fine to hack like this for now.
Also include your gecko patch from Firefox:
firefox3-21-donot-delay-stopping-realplayer.diff as attached.
Thanks,
-Alfred
-------------- next part --------------
An embedded and charset-unspecified text was scrubbed...
Name: firefox3-21-donot-delay-stopping-realplayer.diff
URL:
<http://mail.opensolaris.org/pipermail/jds-review/attachments/20080908/90d3dace/attachment.ksh>
-------------- next part --------------
An embedded and charset-unspecified text was scrubbed...
Name: SUNWsongbird.specv2.diff
URL:
<http://mail.opensolaris.org/pipermail/jds-review/attachments/20080908/90d3dace/attachment-0001.ksh>
