Hi, It appears that this commit made fennec-taskswitcher-extension unhappy in Trunk:Testing. It's not able to resolve fennec-qt-devel dependency.
Could you please take a look at this and resolve the issue as soon as possible? Thanks, Tracy -----Original Message----- From: [email protected] [mailto:[email protected]] On Behalf Of Lokesh Goel Sent: Thursday, March 17, 2011 5:16 AM To: [email protected] Subject: [meego-commits] 14942: Changes to Trunk:Testing/fennec-qt 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 #14942: submit: devel:browser/fennec-qt(r49)(update) -> Trunk:Testing/fennec-qt Message: New Fennec for MeeGo1.2 State: new 2011-03-17T05:15:52 logoel Comment: None changes files: -------------- --- fennec-qt.changes +++ fennec-qt.changes @@ -0,0 +1,3 @@ +* Mon Mar 7 20:57:48 UTC 2011 - Lokesh Goel <[email protected]> - 4.0b6pre.c60c4769c89a.527ce2a1d1c1 +- Fixes: BMC#14228 - Update fennec packaging to eliminate devel package & use system nss & nspr + old: ---- central-patches.tar fennec-tip-4ef3abd2012c-35bf7da77ccd.tar.bz2 fennec.png mobile-install-fail-gracefully.diff mobile-patches.tar new: ---- fennec-tip-c60c4769c89a.527ce2a1d1c1.tar.bz2 spec files: ----------- --- fennec-qt.spec +++ fennec-qt.spec @@ -1,21 +1,16 @@ -%define moz_milestone 2.0b8pre - Name: fennec-qt Summary: Fennec Mobile Web Browser with Qt/MeeGo Touch -Version: 4.0b8pre1109.5 +Version: 4.0b6pre.c60c4769c89a.527ce2a1d1c1 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-c60c4769c89a.527ce2a1d1c1.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 +35,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 @@ -58,36 +53,28 @@ Fennec is the code name of the effort to build a mobile version of Firefox. -%package devel -Summary: Development headers for Fennec extension building -Group: Development/Browser -Requires: %{name} >= %{version} - -%description devel -Development headers for Fennec extension building - - %prep %setup -q -n mozilla-central -%patch0 -p0 +#%patch0 -p0 +%patch1 -p1 -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 +#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 # >> setup cp %{SOURCE3} .mozconfig # << setup -echo "mk_add_options MOZ_OBJDIR=.objects" >> .mozconfig - +#echo "mk_add_options MOZ_OBJDIR=.objects" >> .mozconfig +echo "mk_add_options MOZ_OBJDIR=@TOPSRCDIR@/../release" >> .mozconfig %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=-j15" >> .mozconfig +echo "export MOZ_MAKE_FLAGS=-j15" >> .mozconfig %ifarch %{arm} echo "ac_add_options --with-arm-kuser" >> .mozconfig @@ -95,7 +82,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 @@ -117,10 +104,10 @@ rm -rf %{buildroot} # >> install pre mkdir -p %{buildroot}/usr/lib/fennec -cp -a .objects/mobile/dist/bin/* %{buildroot}/usr/lib/fennec/ +cp -a ../release/dist/bin/* %{buildroot}/usr/lib/fennec/ mkdir -p %{buildroot}/usr/share/pixmaps -cp %{SOURCE9} %{buildroot}/usr/share/pixmaps/fennec.png +cp mobile/branding/official/content/fennec_scalable.png %{buildroot}/usr/share/pixmaps/fennec.png mkdir -p %{buildroot}/usr/share/applications cp %{SOURCE4} %{buildroot}/usr/share/applications/ @@ -141,93 +128,9 @@ --dir %{buildroot}%{_datadir}/applications \ %{buildroot}%{_datadir}/applications/*.desktop -make -f client.mk install DESTDIR=%{buildroot} -mkdir %{buildroot}/tmp -mkdir -p %{buildroot}/%{_datadir}/xulrunner-%{moz_milestone} -cd %{_builddir}/%{buildsubdir} -tar --exclude=*.cpp -cvzf %{buildroot}/%{_datadir}/xulrunner-%{moz_milestone}/mozilla-src.tar.gz configure.in Makefile.in client.py toolkit/xre toolkit/locales toolkit/mozapps probes allmakefiles.sh config client.mk .mozconfig.mk aclocal.m4 build js/src/* testing browser/config services -%fdupes %{buildroot}%{_includedir}/ -%fdupes %{buildroot}%{_libdir}/xulrunner*/ - -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 - -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 -ln -s %{_libdir}/xulrunner-%{moz_milestone}/libxul.so %{buildroot}%{_libdir}/xulrunner-devel-%{moz_milestone}/sdk/lib/libxul.so -ln -s %{_libdir}/xulrunner-%{moz_milestone}/libfreebl3.so %{buildroot}%{_libdir}/xulrunner-devel-%{moz_milestone}/sdk/lib/libfreebl3.s o -ln -s %{_libdir}/xulrunner-%{moz_milestone}/libmozsqlite3.so %{buildroot}%{_libdir}/xulrunner-devel-%{moz_milestone}/sdk/lib/libmozsqlite 3.so - -rm %{buildroot}/%{_libdir}/xulrunner-devel-%{moz_milestone}/bin - -rm %{buildroot}/%{_libdir}/xulrunner-devel-%{moz_milestone}/lib -ln -s %{_libdir}/xulrunner-devel-%{moz_milestone}/sdk/lib %{buildroot}%{_libdir}/xulrunner-devel-%{moz_milestone}/lib - -chmod a-x %{buildroot}/%{_libdir}/xulrunner-devel-%{moz_milestone}/sdk/lib/*.a - %files %defattr(-,root,root,-) /usr/lib/fennec /usr/share/applications/fennec.desktop /usr/share/pixmaps/fennec.png /usr/bin/fennec - -%files devel -%defattr(-,root,root,-) -%{_bindir}/xulrunner -%config %{_sysconfdir}/gre.d/*.system.conf -%{_includedir}/xulrunner-%{moz_milestone} -%{_datadir}/idl -%{_libdir}/xulrunner-devel-%{moz_milestone}/sdk/lib/*.a -%{_libdir}/xulrunner-devel-%{moz_milestone}/sdk/lib/*.so -%{_libdir}/xulrunner-devel-%{moz_milestone}/xpcom-config.h -%{_libdir}/xulrunner-devel-%{moz_milestone}/idl -%{_libdir}/xulrunner-devel-%{moz_milestone}/include -%{_libdir}/xulrunner-devel-%{moz_milestone}/lib -%{_libdir}/pkgconfig/libxul.pc -%{_libdir}/pkgconfig/libxul-embedding.pc -%{_libdir}/pkgconfig/mozilla-gtkmozembed.pc -%{_libdir}/pkgconfig/mozilla-gtkmozembed-embedding.pc -%{_libdir}/pkgconfig/mozilla-plugin.pc -%{_libdir}/pkgconfig/mozilla-js.pc -%{_libdir}/xulrunner-%{moz_milestone}/xpt_dump -%{_libdir}/xulrunner-%{moz_milestone}/xpt_link -%{_libdir}/xulrunner-%{moz_milestone}/xpidl -%{_datadir}/xulrunner-%{moz_milestone}/mozilla-src.tar.gz -%{_libdir}/xulrunner-%{moz_milestone}/chrome -%{_libdir}/xulrunner-%{moz_milestone}/defaults -%{_libdir}/xulrunner-%{moz_milestone}/greprefs.js -%{_libdir}/xulrunner-%{moz_milestone}/modules -%{_libdir}/xulrunner-%{moz_milestone}/res -%{_libdir}/xulrunner-%{moz_milestone}/LICENSE -%{_libdir}/xulrunner-%{moz_milestone}/README.txt -%{_libdir}/xulrunner-%{moz_milestone}/dictionaries -%{_libdir}/xulrunner-%{moz_milestone}/chrome.manifest -%{_libdir}/xulrunner-%{moz_milestone}/components -%{_libdir}/xulrunner-%{moz_milestone}/dependentlibs.list -%{_libdir}/xulrunner-%{moz_milestone}/platform.ini - -%{_datadir}/xulrunner-%{moz_milestone}/chrome -%{_datadir}/xulrunner-%{moz_milestone}/defaults -%{_datadir}/xulrunner-%{moz_milestone}/greprefs.js -%{_datadir}/xulrunner-%{moz_milestone}/modules -%{_datadir}/xulrunner-%{moz_milestone}/res - - -%{_libdir}/xulrunner-%{moz_milestone}/lib*.so - -%{_libdir}/xulrunner-%{moz_milestone}/run-mozilla.sh -%{_libdir}/xulrunner-%{moz_milestone}/xpcshell -%{_libdir}/xulrunner-%{moz_milestone}/mozilla-xremote-client -%{_libdir}/xulrunner-%{moz_milestone}/plugin-cont* -%{_libdir}/xulrunner-%{moz_milestone}/xulrunner -%{_libdir}/xulrunner-%{moz_milestone}/xulrunner-bin -%{_libdir}/xulrunner-%{moz_milestone}/xulrunner-stub - -%changelog other changes: -------------- ++++++ fennec-tip-c60c4769c89a.527ce2a1d1c1.tar.bz2 (new) ++++++ fennec.arm --- fennec.arm +++ fennec.arm @@ -1,6 +1,6 @@ #!/bin/bash -export MOZ_QT_GRAPHICSSYSTEM=raster -export MOZ_QT_SOFTWARE_MODE=1 +export MOZ_QT_GRAPHICSSYSTEM=meego +export MOZ_QT_SOFTWARE_MODE=0 STYLE="windows" if test $MOZ_QT_SOFTWARE_MODE -eq 1; then ++++++ fennec.x86 --- fennec.x86 +++ fennec.x86 @@ -1,5 +1,6 @@ #!/bin/bash -export MOZ_QT_SOFTWARE_MODE=1 +export MOZ_QT_SOFTWARE_MODE=0 +export MOZ_QT_GRAPHICSSYSTEM=meego if test $MOZ_QT_SOFTWARE_MODE -eq 1; then ARGS="$ARGS -software" ++++++ mozconfig --- mozconfig +++ mozconfig @@ -1,92 +1,30 @@ -# Build mobile browser -ac_add_options --enable-application=xulrunner -# this is fail to build on Qt... need BMO report and get that fixed +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" + +mk_add_options MOZ_MAKE_FLAGS=-j9 + +ac_add_options -prefix=/usr + +export ac_cv_have_usable_wchar_option_v2="no" + +ac_add_options --enable-application=mobile +ac_add_options --enable-update-channel=nightly +ac_add_options --enable-update-packaging +ac_add_options --enable-tests ac_add_options --enable-default-toolkit=cairo-qt -# Make it works with meegotouch +#ac_add_options --with-maemo-version=6 +ac_add_options --with-system-nss +ac_add_options --with-system-nspr + +# required for 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 - -# 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 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 - -# Global options -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-accessibility - -# 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 - -#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="" +export MOZ_DEBUG_SYMBOLS=1 +ac_add_options --enable-debug-symbols="-gdwarf-2" +export MOZILLA_OFFICIAL=1 +mk_add_options PROFILE_GEN_SCRIPT=@TOPSRCDIR@/build/profile_pageloader.pl + +#ac_add_options --enable-debug +#ac_add_options --disable-optimize +#ac_add_options --enable-chrome-format=flat ++++++ deleted files: --- central-patches.tar --- fennec-tip-4ef3abd2012c-35bf7da77ccd.tar.bz2 --- fennec.png --- mobile-install-fail-gracefully.diff --- 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
