[meego-commits] 9503: Changes to devel:browser/fennec-qt

[Lokesh Goel]

Hi,
I have made the following changes to fennec-qt in project devel:browser. Please review and accept ASAP.

Thank You,
 Lokesh Goel

[This message was auto-generated]

---

Request #9503:

  submit:   home:logoel:branch-devel-browser/fennec-qt(r26)(update) -> devel:browser/fennec-qt


Message:
    None

State:   new          2010-11-15T12:22:24 logoel
Comment: None



changes files:
--------------
--- fennec-qt.changes
+++ fennec-qt.changes
@@ -0,0 +1,18 @@
+* Mon Nov 15 10:01:02 EST 2010 Lokesh Goel <lokesh.k.goel at nokia.com> - 4.0b8pre1109.3
+- Update to upstream 4ef3abd2012c-35bf7da77ccd. 
+- Apply patches from WORKBASE of hg.meego.com/mozilla-central & mobile-browser.
+- Fixes: BMC#9656 - fennec crashes at js::mjit::EnterMethodJIT
+- Fixes: BMC#9796 - Fennec easily crash  when repeatedly zoom in and zoom out
+- Fixes: BMC#8614 - Browser loading page never completes when certain pages are visited
+- Fixes: BMC#8608 - Unable to play ogg Audio from web browser
+- Fixes: BMC#8858 - Bookmarks edit bar is not closed when finished editing
+- Fixes: BMC#9196 - [Trunk:Testing] Fennec is launched to full screen in device and no status bar seen on top
+- Fixes: BMC#9324 - [REG]Popup layer when tap-and-hold link display dynamic short-lines
+- Fixes: BMC#9610 - [trunk:testing] can't enter to awesome bar after fennec is opened
+- Fixes: BMC#9755 - Come about many dynamic short-lines when browse meego.com
+- Fixes: BMC#9786 - The issue about button icon and blue background when selected
+- Fixes: BMC#9770 - Screen blinks after maximizing Fennec
+- Fixes: BMC#9829 - [Trunk:Testing] Unable to load page with HTML5 ogg video
+- Fixes: BMC#9830 - Lot of artifacts seen on the browser UI on the test image
+- Fixes: BMC#8041 - Larry UI - encrypted site identity information is missing of many secure sites
+

old:
----
  BMO570078_xcb_assertion_hack.patch
  BMO589389_enable_plugins.patch
  BMO589725_show_remain_time.patch
  BMO597316_overwrite_wmode_param.patch
  fennec-tip-b3bc32ff0612-7b2fed0166ec.tar.bz2

new:
----
  central-patches.tar
  fennec-tip-4ef3abd2012c-35bf7da77ccd.tar.bz2
  mobile-patches.tar

spec files:
-----------
--- fennec-qt.spec
+++ fennec-qt.spec
@@ -8,22 +8,19 @@
 
 Name:       fennec-qt
 Summary:    Fennec Mobile Web Browser with Qt/MeeGo Touch
-Version:    2.0b8pre1025.3
+Version:    4.0b8pre1109.3
 Release:    1
 Group:      Applications/Internet
 License:    MPLv1.1 or GPLv2+ or LGPLv2+
 URL:        http://www.mozilla.org/projects/fennec/
-Source0:    fennec-tip-b3bc32ff0612-7b2fed0166ec.tar.bz2 
+Source0:    fennec-tip-4ef3abd2012c-35bf7da77ccd.tar.bz2 
+Source1:    mobile-patches.tar
+Source2:    central-patches.tar
 Source3:    mozconfig
 Source4:    fennec.desktop
 Source5:    fennec.arm
 Source6:    fennec.x86
 Source9:    fennec.png
-Patch0:     BMO570078_xcb_assertion_hack.patch
-Patch1:     BMO589389_enable_plugins.patch
-Patch2:     arm-build.patch
-Patch3:     BMO597316_overwrite_wmode_param.patch
-Patch5:     BMO589725_show_remain_time.patch
 Requires:   libmeegotouch
 Requires:   libcontentaction
 BuildRequires:  pkgconfig(gstreamer-0.10)
@@ -54,6 +51,10 @@
 BuildRequires:  git
 BuildRequires:  desktop-file-utils
 BuildRequires:  yasm
+BuildRequires:  libqttracker-devel 
+BuildRequires:  libffi-devel 
+BuildRequires:  pixman-devel 
+BuildRequires:  cairo-devel 
 Conflicts:   fennec
 
 
@@ -64,11 +65,13 @@
 %prep
 %setup -q -n mozilla-central
 
-%patch0 -p1
-%patch1 -p1 -d mobile
-%patch2 -p1
-%patch3 -p1
-%patch5 -p1 -d mobile
+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
@@ -81,11 +84,11 @@
 
 %ifarch %{arm}
 echo "ac_add_options --with-arm-kuser" >> .mozconfig
-echo "ac_add_options --enable-optimize=\"-g -O2 -fno-tree-ter -fno-ipa-reference -fno-tree-switch-conversion\"" >> .mozconfig
+echo "ac_add_options --enable-optimize=\"-g -O2 -D__ARM_PCS -fno-tree-ter -fno-ipa-reference -fno-tree-switch-conversion\"" >> .mozconfig
 echo "ac_add_options --disable-jemalloc" >> .mozconfig
-echo "ac_add_options --disable-methodjit" >> .mozconfig
 echo "ac_cv_visibility_pragma=no" >> .mozconfig
 echo "ac_cv_visibility_hidden=no" >> .mozconfig
+echo "ac_add_options --disable-methodjit" >> .mozconfig
 %endif
 
 for i in -fexceptions -fasynchronous-unwind-tables; do   

other changes:
--------------

++++++ central-patches.tar (new)

++++++ fennec-tip-4ef3abd2012c-35bf7da77ccd.tar.bz2 (new)

++++++ fennec.x86
--- fennec.x86
+++ fennec.x86
@@ -1,5 +1,5 @@
 #!/bin/bash
-export MOZ_QT_SOFTWARE_MODE=0
+export MOZ_QT_SOFTWARE_MODE=1
 
 if test $MOZ_QT_SOFTWARE_MODE -eq 1; then
   ARGS="$ARGS -software"

++++++ mobile-patches.tar (new)

++++++ mozconfig
--- mozconfig
+++ mozconfig
@@ -19,7 +19,9 @@
 
 ac_add_options --with-system-jpeg
 ac_add_options --with-system-zlib
-#ac_add_options --with-system-png
+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
@@ -55,7 +57,7 @@
 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 --enable-gstreamer
 #ac_add_options --disable-ogg
 #ac_add_options --disable-webm
 

++++++ deleted files:
--- BMO570078_xcb_assertion_hack.patch
--- BMO589389_enable_plugins.patch
--- BMO589725_show_remain_time.patch
--- BMO597316_overwrite_wmode_param.patch
--- fennec-tip-b3bc32ff0612-7b2fed0166ec.tar.bz2