This change is bad, it again uses its own nss, instead of system nss. Please resubmit. package will be reverted!!
Anas On 8 Feb 2011, at 07:52, Lokesh Goel wrote: > Hi, > I have made the following changes to fennec-qt in project Trunk:Testing. > Please review and accept ASAP. > > Thank You, > Lokesh Goel > > [This message was auto-generated] > > --- > > Request #13404: > > submit: devel:browser/fennec-qt(r48)(update) -> Trunk:Testing/fennec-qt > > > Message: > We are migrating to pure upstream. There may be some problems in this > fennec version. But I was asked to push this one anyways. > > State: new 2011-02-07T18:51:54 logoel > Comment: None > > > > changes files: > -------------- > --- fennec-qt.changes > +++ fennec-qt.changes > @@ -0,0 +1,3 @@ > +* Mon Feb 07 10:50:00 UTC 2011 Lokesh Goel <[email protected]> - > 4.0b10pre.0fb025a84958.e2414a8d8f11 > +- Fixes: BMC#13294 - Fennec integration - Migrate to upstream > + > > old: > ---- > central-patches.tar > fennec-tip-4ef3abd2012c-35bf7da77ccd.tar.bz2 > mobile-patches.tar > > new: > ---- > fennec-tip-0fb025a84958.e2414a8d8f11.tar.bz2 > > spec files: > ----------- > --- fennec-qt.spec > +++ fennec-qt.spec > @@ -1,21 +1,20 @@ > -%define moz_milestone 2.0b8pre > +%define moz_milestone 2.0b10pre > > Name: fennec-qt > Summary: Fennec Mobile Web Browser with Qt/MeeGo Touch > -Version: 4.0b8pre1109.5 > +Version: 4.0b10pre.0fb025a84958.e2414a8d8f11 > Release: 1 > Group: Applications/Internet > License: MPLv1.1 or GPLv2+ or LGPLv2+ > URL: http://www.mozilla.org/projects/fennec/ > -Source0: fennec-tip-4ef3abd2012c-35bf7da77ccd.tar.bz2 > -Source1: mobile-patches.tar > -Source2: central-patches.tar > +Source0: fennec-tip-0fb025a84958.e2414a8d8f11.tar.bz2 > Source3: mozconfig > Source4: fennec.desktop > Source5: fennec.arm > Source6: fennec.x86 > Source9: fennec.png > Patch0: mobile-install-fail-gracefully.diff > +Patch1: arm-build.patch > BuildRequires: pkgconfig(gstreamer-0.10) > BuildRequires: pkgconfig(gstreamer-plugins-base-0.10) > BuildRequires: pkgconfig(gconf-2.0) > @@ -40,7 +39,7 @@ > BuildRequires: python > BuildRequires: autoconf213 > BuildRequires: zip > -BuildRequires: wireless-tools-devel libcontentaction-devel > +BuildRequires: wireless-tools-devel libcontentaction-devel mesa-libGL-devel > BuildRequires: git > BuildRequires: desktop-file-utils > BuildRequires: yasm > @@ -70,14 +69,7 @@ > %prep > %setup -q -n mozilla-central > %patch0 -p0 > - > -cp %{SOURCE2} . > -tar xvf %{SOURCE2} > -while read line;do echo "Patching: $line"; patch -p1 < > central-patches/$line;done < central-patches/series > - > -cp %{SOURCE1} . > -tar xvf %{SOURCE1} > -while read line;do echo "Patching: $line"; patch -p1 -d mobile < > mobile-patches/$line;done < mobile-patches/series > +%patch1 -p1 > > # >> setup > cp %{SOURCE3} .mozconfig > @@ -86,8 +78,8 @@ > > %build > # >> build pre > -echo "mk_add_options MOZ_MAKE_FLAGS=%{?_smp_mflags}" >> .mozconfig > -echo "export MOZ_MAKE_FLAGS=%{?_smp_mflags}" >> .mozconfig > +echo "mk_add_options MOZ_MAKE_FLAGS=-j9" >> .mozconfig > +echo "export MOZ_MAKE_FLAGS=-j9" >> .mozconfig > > %ifarch %{arm} > echo "ac_add_options --with-arm-kuser" >> .mozconfig > @@ -95,7 +87,7 @@ > echo "ac_add_options --disable-jemalloc" >> .mozconfig > echo "ac_cv_visibility_pragma=no" >> .mozconfig > echo "ac_cv_visibility_hidden=no" >> .mozconfig > -echo "ac_add_options --disable-methodjit" >> .mozconfig > +#echo "ac_add_options --disable-methodjit" >> .mozconfig > %endif > > for i in -fexceptions -fasynchronous-unwind-tables; do > @@ -151,12 +143,14 @@ > > rm -f %{buildroot}%{_libdir}/xulrunner-devel-%{moz_milestone}/sdk/lib/*.so > > + > ln -s %{_libdir}/xulrunner-%{moz_milestone}/greprefs.js > %{buildroot}%{_datadir}/xulrunner-%{moz_milestone}/greprefs.js > ln -s %{_libdir}/xulrunner-%{moz_milestone}/res > %{buildroot}%{_datadir}/xulrunner-%{moz_milestone}/res > ln -s %{_libdir}/xulrunner-%{moz_milestone}/defaults > %{buildroot}%{_datadir}/xulrunner-%{moz_milestone}/defaults > ln -s %{_libdir}/xulrunner-%{moz_milestone}/chrome > %{buildroot}%{_datadir}/xulrunner-%{moz_milestone}/chrome > ln -s %{_libdir}/xulrunner-%{moz_milestone}/modules > %{buildroot}%{_datadir}/xulrunner-%{moz_milestone}/modules > > +ls -l %{buildroot}%{_libdir}/xulrunner-devel-%{moz_milestone}/* > ln -s %{_libdir}/xulrunner-%{moz_milestone}/libmozalloc.so > %{buildroot}%{_libdir}/xulrunner-devel-%{moz_milestone}/sdk/lib/libmozalloc.so > ln -s %{_libdir}/xulrunner-%{moz_milestone}/libmozjs.so > %{buildroot}%{_libdir}/xulrunner-devel-%{moz_milestone}/sdk/lib/libmozjs.so > ln -s %{_libdir}/xulrunner-%{moz_milestone}/libxpcom.so > %{buildroot}%{_libdir}/xulrunner-devel-%{moz_milestone}/sdk/lib/libxpcom.so > @@ -164,6 +158,18 @@ > ln -s %{_libdir}/xulrunner-%{moz_milestone}/libfreebl3.so > %{buildroot}%{_libdir}/xulrunner-devel-%{moz_milestone}/sdk/lib/libfreebl3.so > > ln -s %{_libdir}/xulrunner-%{moz_milestone}/libmozsqlite3.so > %{buildroot}%{_libdir}/xulrunner-devel-%{moz_milestone}/sdk/lib/libmozsqlite3.so > > +ln -s %{_libdir}/xulrunner-%{moz_milestone}/libnssdbm3.so > %{buildroot}%{_libdir}/xulrunner-devel-%{moz_milestone}/sdk/lib/libnssdbm3.so > +ln -s %{_libdir}/xulrunner-%{moz_milestone}/libsmime3.so > %{buildroot}%{_libdir}/xulrunner-devel-%{moz_milestone}/sdk/lib/libsmime3.so > +ln -s %{_libdir}/xulrunner-%{moz_milestone}/libssl3.so > %{buildroot}%{_libdir}/xulrunner-devel-%{moz_milestone}/sdk/lib/libssl3.so > +ln -s %{_libdir}/xulrunner-%{moz_milestone}/libsoftokn3.so > %{buildroot}%{_libdir}/xulrunner-devel-%{moz_milestone}/sdk/lib/libsoftokn3.so > +ln -s %{_libdir}/xulrunner-%{moz_milestone}/libnss3.so > %{buildroot}%{_libdir}/xulrunner-devel-%{moz_milestone}/sdk/lib/libnss3.so > +ln -s %{_libdir}/xulrunner-%{moz_milestone}/libnssutil3.so > %{buildroot}%{_libdir}/xulrunner-devel-%{moz_milestone}/sdk/lib/libnssutil3.so > + > +ln -s %{_libdir}/xulrunner-%{moz_milestone}/libplds4.so > %{buildroot}%{_libdir}/xulrunner-devel-%{moz_milestone}/sdk/lib/libplds4.so > +ln -s %{_libdir}/xulrunner-%{moz_milestone}/libplc4.so > %{buildroot}%{_libdir}/xulrunner-devel-%{moz_milestone}/sdk/lib/libplc4.so > +ln -s %{_libdir}/xulrunner-%{moz_milestone}/libnspr4.so > %{buildroot}%{_libdir}/xulrunner-devel-%{moz_milestone}/sdk/lib/libnspr4.so > + > + > rm %{buildroot}/%{_libdir}/xulrunner-devel-%{moz_milestone}/bin > > rm %{buildroot}/%{_libdir}/xulrunner-devel-%{moz_milestone}/lib > @@ -183,6 +189,8 @@ > %{_bindir}/xulrunner > %config %{_sysconfdir}/gre.d/*.system.conf > %{_includedir}/xulrunner-%{moz_milestone} > +%{_includedir}/xulrunner-%{moz_milestone}/nss > +%{_includedir}/xulrunner-%{moz_milestone}/nspr > %{_datadir}/idl > %{_libdir}/xulrunner-devel-%{moz_milestone}/sdk/lib/*.a > %{_libdir}/xulrunner-devel-%{moz_milestone}/sdk/lib/*.so > @@ -229,5 +237,11 @@ > %{_libdir}/xulrunner-%{moz_milestone}/xulrunner > %{_libdir}/xulrunner-%{moz_milestone}/xulrunner-bin > %{_libdir}/xulrunner-%{moz_milestone}/xulrunner-stub > +%{_libdir}/pkgconfig/mozilla-nspr.pc > +%{_libdir}/pkgconfig/mozilla-nss.pc > +%{_libdir}/xulrunner-%{moz_milestone}/libfreebl3.chk > +%{_libdir}/xulrunner-%{moz_milestone}/libnssdbm3.chk > +%{_libdir}/xulrunner-%{moz_milestone}/libsoftokn3.chk > +#%{_libdir}/xulrunner-%{moz_milestone}/nspr-config > > %changelog > > other changes: > -------------- > > ++++++ fennec-tip-0fb025a84958.e2414a8d8f11.tar.bz2 (new) > > ++++++ fennec.arm > --- fennec.arm > +++ fennec.arm > @@ -1,7 +1,7 @@ > #!/bin/bash > -export MOZ_QT_GRAPHICSSYSTEM=raster > +export MOZ_QT_GRAPHICSSYSTEM=meego > export MOZ_QT_SOFTWARE_MODE=1 > -STYLE="windows" > +#STYLE="windows" > > if test $MOZ_QT_SOFTWARE_MODE -eq 1; then > ARGS="$ARGS -software" > > ++++++ fennec.desktop > --- fennec.desktop > +++ fennec.desktop > @@ -8,4 +8,3 @@ > Terminal=false > Type=Application > MimeType=text/html;text/xml;application/xhtml+xml;application/vnd.mozilla.xul+xml;text/mml; > - > > ++++++ fennec.x86 > --- fennec.x86 > +++ fennec.x86 > @@ -1,5 +1,6 @@ > #!/bin/bash > export MOZ_QT_SOFTWARE_MODE=1 > +export MOZ_QT_GRAPHICSSYSTEM=meego > > if test $MOZ_QT_SOFTWARE_MODE -eq 1; then > ARGS="$ARGS -software" > > ++++++ mozconfig > --- mozconfig > +++ mozconfig > @@ -1,92 +1,51 @@ > -# Build mobile browser > -ac_add_options --enable-application=xulrunner > -# this is fail to build on Qt... need BMO report and get that fixed > -ac_add_options --enable-default-toolkit=cairo-qt > -# Make it works with meegotouch > -ac_add_options --enable-cpp-rtti > -# should it be with-meego-version=1 ? > -ac_add_options --with-maemo-version=6 > -# Don't strip, and keep debug symbols > -ac_add_options --disable-install-strip > -ac_add_options --enable-optimize > - > -#Disable thumb for both arm and i386. Build fails otherwise. > -ac_add_options --disable-thumb2 > +export > LDFLAGS="-Wl,--no-keep-memory,-rpath-link,$PWD/dist/bin/:/usr/lib:/lib" > +export LD_LIBRARY_PATH="/lib:/usr/lib:/usr/local/lib:/usr/X11R6/lib" > > # Options for client.mk. > -ac_add_options --prefix="/usr" > -ac_add_options --libdir="/usr/lib" > - > -ac_add_options --with-system-jpeg > -ac_add_options --with-system-zlib > -ac_add_options --enable-system-pixman > -ac_add_options --enable-system-cairo > -ac_add_options --enable-system-ffi > -#ac_add_options --enable-system-sqlite > -#ac_add_options --with-pthreads > -#ac_add_options --disable-jemalloc > +mk_add_options MOZ_BUILD_PROJECTS="xulrunner mobile" > +#mk_add_options AUTOCONF=autoconf2.13 > +mk_add_options MOZ_MAKE_FLAGS=-j9 > + > +# XULRunner options > +ac_add_app_options xulrunner --enable-application=xulrunner > +ac_add_app_options xulrunner --disable-javaxpcom > > +# Mobile options > +ac_add_app_options mobile --enable-application=mobile > > -mk_add_options MOZ_BUILD_PROJECTS="xulrunner mobile" > -mk_add_options MOZ_OBJDIR=@TOPSRCDIR@/../release > -ac_add_options --disable-debug > -#ac_add_options --enable-optimize="-g -O2 -fomit-frame-pointer" > -ac_add_options --disable-logging > -ac_add_options --disable-tests > +#Enable RTTI > +ac_cv_visibility_pragma=no > > # Global options > +ac_add_options --enable-default-toolkit=cairo-qt > +ac_add_options --enable-faststart > +ac_add_options --enable-printing > +ac_add_options --enable-codesighs > +ac_add_options --enable-system-ffi > +ac_add_options --enable-cpp-rtti > +ac_add_options -prefix=/usr > + > +ac_add_options --disable-necko-wifi > +ac_add_options --disable-wave > +ac_add_options --disable-optimize > ac_add_options --disable-installer > ac_add_options --disable-crashreporter > ac_add_options --disable-javaxpcom > -ac_add_options --enable-printing > ac_add_options --disable-embedding-tests > ac_add_options --disable-elf-dynstr-gc > ac_add_options --disable-updater > -#ac_add_options --disable-wave > -#ac_add_options --enable-faststart > - > -# MTF related options > -#ac_add_options --enable-official-branding > -ac_add_options --enable-meegotouch > -#ac_add_options --enable-application=mobile > - > -# Disable wifi support in necko. This is connectivity UI feature on Firefox > and we dont need it. > -ac_add_options --disable-necko-wifi > - > -# Less disk space, faster startup, we are not using accessibility, on device > +ac_add_options --disable-pedantic > +ac_add_options --disable-elf-hack > +ac_add_options --disable-install-strip > +ac_add_options --disable-jemalloc > +ac_add_options --disable-logging > +ac_add_options --disable-logrefcnt > +ac_add_options --disable-tests --disable-mochitest > ac_add_options --disable-accessibility > +ac_add_options --disable-thumb2 # see bug 619481 > > -# All Gstreamer related patches have been removed. We disable it for time > being. > -ac_add_options --enable-gstreamer > -#ac_add_options --disable-ogg > -#ac_add_options --disable-webm > - > -ac_add_options --with-system-nspr > -ac_add_options --with-system-nss > - > -#Debugging > -export LDFLAGS="-Wl,--no-keep-memory" > -LDFLAGS="-Wl,--no-keep-memory" > > -#Enable if pixman-1 >= 0.17.3 installed > -#ac_add_options --enable-system-pixman > +#mk_add_options MOZ_OBJDIR=./obj-qt-buildxulrunner > > -#Enable for arm > -#ac_add_options --with-arm-kuser > - > -#ac_add_options --enable-default-toolkit=cairo-qt --disable-elf-dynstr-gc > --disable-install-strip --disable-logging --disable-logrefcnt --enable-tests > --enable-mochitest --enable-optimize="-g -O2 " --prefix=/usr > -# XULRunner options > -ac_add_app_options xulrunner --enable-application=xulrunner > -ac_add_app_options xulrunner --disable-printing > -ac_add_app_options xulrunner --disable-crashreporter > -ac_add_app_options xulrunner --disable-accessibility > -ac_add_app_options xulrunner --disable-javaxpcom > - > -# Fennec options > -ac_add_app_options mobile --enable-application=mobile > -ac_add_app_options mobile --with-libxul-sdk=../xulrunner/dist > > -# use Qt backend > -#ac_add_options --enable-default-toolkit=cairo-qt > -#ac_add_options --disable-ipc > -#ac_add_options --with-qtdir="" > + > > ++++++ deleted files: > --- central-patches.tar > --- fennec-tip-4ef3abd2012c-35bf7da77ccd.tar.bz2 > --- mobile-patches.tar > > _______________________________________________ > MeeGo-commits mailing list > [email protected] > http://lists.meego.com/listinfo/meego-commits _______________________________________________ MeeGo-packaging mailing list [email protected] http://lists.meego.com/listinfo/meego-packaging
