[meego-commits] 5850: Changes to Trunk:Testing/fennec-qt

[Roger WANG]

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

Thank You,
Roger WANG

[This message was auto-generated]

---

Request #5850:

  submit:   home:wwang29:branches:Trunk:Testing/fennec-qt(r2)(cleanup) -> Trunk:Testing/fennec-qt


Message:
    None

State:   new          2010-07-19T12:53:28 wwang29
Comment: None



changes files:
--------------
--- fennec-qt.changes
+++ fennec-qt.changes
@@ -0,0 +1,5 @@
+* Tue Jul 20 08:25:57 CST 2010 Roger WANG <roger.wang at intel.com> 2.0a1pre0531.3
+- Split larget patch into patch series
+- remove MTF link hack
+- enable mobile application in build
+

old:
----
  fennec-tip.tar.bz2
  fullscreen.patch
  meego-central.patch
  meego-mobile.patch

new:
----
  fennec-tip-a206d1143cc2-09a4cf2bcaf1.tar.bz2
  meego-mobile.tar.gz
  meego-platform.tar.gz

spec files:
-----------
--- fennec-qt.spec
+++ fennec-qt.spec
@@ -8,23 +8,23 @@
 
 Name:       fennec-qt
 Summary:    Fennec Mobile Web Browser with Qt/MeeGo Touch
-Version:    2.0a1pre0531.2
+Version:    2.0a1pre0531.3
 Release:    1
 Group:      Applications/Internet
 License:    MPLv1.1 or GPLv2+ or LGPLv2+
 URL:        http://www.mozilla.org/projects/fennec/
-Source0:    fennec-tip.tar.bz2
-Source1:    mozconfig
-Source2:    fennec.desktop
-Source3:    fennec
-Source4:    fennec.svg
-Source5:    home-64.png
-Source6:    meego-theme.tar.gz
-Source7:    fennec.png
+Source0:    fennec-tip-a206d1143cc2-09a4cf2bcaf1.tar.bz2
+Source1:    meego-platform.tar.gz
+Source2:    meego-mobile.tar.gz
+Source3:    mozconfig
+Source4:    fennec.desktop
+Source5:    fennec
+Source6:    fennec.svg
+Source7:    home-64.png
+Source8:    meego-theme.tar.gz
+Source9:    fennec.png
 Source100:  fennec-qt.yaml
-Patch0:     meego-central.patch
-Patch1:     meego-mobile.patch
-Patch2:     fennec-qt-nsFrame-visibility-hack.patch
+Patch0:     fennec-qt-nsFrame-visibility-hack.patch
 BuildRequires:  pkgconfig(gtk+-2.0)
 BuildRequires:  pkgconfig(gconf-2.0)
 BuildRequires:  pkgconfig(dbus-glib-1)
@@ -70,15 +70,21 @@
 %prep
 %setup -q -n mozilla-central
 
-# meego-central.patch
-%patch0 -p1
-# meego-mobile.patch
-%patch1 -p1
 # fennec-qt-nsFrame-visibility-hack.patch
-%patch2 -p1
+%patch0 -p1
 # >> setup
-cp %{SOURCE1} .mozconfig
-cp -f %{SOURCE5} mobile/themes/hildon/images/
+cp %{SOURCE3} .mozconfig
+cp -f %{SOURCE7} mobile/themes/hildon/images/
+
+rm -rf patches
+tar xzf %{SOURCE1}
+cat patches/series| while read p; do echo patching $p; patch -s -p1 < "patches/$p"; done
+
+rm -rf patches
+tar xzf %{SOURCE2}
+cat patches/series| while read p; do echo patching $p; patch -s -p1 -d mobile < "patches/$p"; done
+
+rm -rf patches
 # << setup
 
 %build
@@ -91,7 +97,7 @@
 echo "ac_add_options --enable-cpp-exceptions" >> .mozconfig
 %endif
 
-make -f client.mk build
+make -f client.mk build NSDISTMODE=copy
 
 # << build pre
 
@@ -103,20 +109,20 @@
 rm -rf %{buildroot}
 # >> install pre
 mkdir -p %{buildroot}/usr/lib/fennec
-cp -a ../release/mobile/dist/bin/* %{buildroot}/usr/lib/fennec/
+cp -a ../release/dist/bin/* %{buildroot}/usr/lib/fennec/
 
 mkdir -p %{buildroot}/usr/share/pixmaps
-cp %{SOURCE7} %{buildroot}/usr/share/pixmaps/fennec.png
+cp %{SOURCE9} %{buildroot}/usr/share/pixmaps/fennec.png
 
 mkdir -p %{buildroot}/usr/share/applications
-cp %{SOURCE2} %{buildroot}/usr/share/applications/
+cp %{SOURCE4} %{buildroot}/usr/share/applications/
 
 mkdir -p %{buildroot}/usr/bin
-cp %{SOURCE3} %{buildroot}/usr/bin/
+cp %{SOURCE5} %{buildroot}/usr/bin/
 chmod 755 %{buildroot}/usr/bin/fennec
 
 mkdir -p %{buildroot}/usr/lib/fennec/extensions
-tar xzf %{SOURCE6} -C %{buildroot}/usr/lib/fennec/extensions
+tar xzf %{SOURCE8} -C %{buildroot}/usr/lib/fennec/extensions
 # << install pre
 
 # >> install post

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

++++++ fennec-qt.yaml
--- fennec-qt.yaml
+++ fennec-qt.yaml
@@ -1,12 +1,14 @@
 Name: fennec-qt
 Summary: Fennec Mobile Web Browser with Qt/MeeGo Touch
-Version: 2.0a1pre0531.2
+Version: 2.0a1pre0531.3
 Release: 1
 Group: Applications/Internet
 License: MPLv1.1 or GPLv2+ or LGPLv2+
 URL: http://www.mozilla.org/projects/fennec/
 Sources:
-    - fennec-tip.tar.bz2
+    - fennec-tip-a206d1143cc2-09a4cf2bcaf1.tar.bz2
+    - meego-platform.tar.gz
+    - meego-mobile.tar.gz
     - mozconfig
     - fennec.desktop
     - fennec
@@ -15,8 +17,6 @@
     - meego-theme.tar.gz
     - fennec.png
 Patches:
-    - meego-central.patch
-    - meego-mobile.patch
     - fennec-qt-nsFrame-visibility-hack.patch
 Description: Fennec is the code name of the effort to build a mobile version of Firefox.
 
@@ -49,8 +49,6 @@
     - fennec
 Configure: none
 Builder: none
-AutoReqProv:
-    - no
 SubPackages:
     - Name: branding-meego
       Summary: MeeGo Theme for Fennec-Qt

++++++ fennec-tip-a206d1143cc2-09a4cf2bcaf1.tar.bz2 (new)

++++++ meego-mobile.tar.gz (new)

++++++ meego-platform.tar.gz (new)

++++++ mozconfig
--- mozconfig
+++ mozconfig
@@ -11,7 +11,6 @@
 ac_add_options --disable-jemalloc
 
 
-mk_add_options MOZ_BUILD_PROJECTS="xulrunner mobile"
 
 
 # Release build
@@ -27,17 +26,13 @@
 ac_add_options --enable-meego
 ac_add_options --enable-meegotouch
 ac_add_options --enable-cpp-rtti
+ac_add_options --enable-application=mobile
+ac_add_options --disable-printing
+ac_add_options --disable-crashreporter
+ac_add_options --disable-accessibility
+ac_add_options --disable-javaxpcom
+
 
-# 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

++++++ deleted files:
--- fennec-tip.tar.bz2
--- fullscreen.patch
--- meego-central.patch
--- meego-mobile.patch