[meego-commits] 9575: Changes to Trunk:Testing/fennec-qt
Lokesh Goel
no_reply at build.meego.com
Thu Nov 18 12:52:07 UTC 2010
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 #9575:
submit: devel:browser/fennec-qt(r45)(update) -> Trunk:Testing/fennec-qt
Message:
[URGENT]We need to get this integrated to Trunk so that it gets into this week's release.
State: new 2010-11-18T04:52:06 logoel
Comment: None
changes files:
--------------
--- fennec-qt.changes
+++ fennec-qt.changes
@@ -0,0 +1,4 @@
+* Tue Nov 16 17:50:00 UTC 2010 Stephan Binner <stephan.binner at basyskom.de> - 4.0b8pre1109.4
+- Build a fennec-qt-devel sub-package containing xulrunner SDK for extension building
+- Fixes: BMC#10156 - fennec-qt-devel package needed for extension development
+
new:
----
mobile-install-fail-gracefully.diff
spec files:
-----------
--- fennec-qt.spec
+++ fennec-qt.spec
@@ -1,14 +1,8 @@
-#
-# Do not Edit! Generated by:
-# spectacle version 0.17
-#
-# >> macros
-AutoReqProv: no
-# << macros
+%define moz_milestone 2.0b8pre
Name: fennec-qt
Summary: Fennec Mobile Web Browser with Qt/MeeGo Touch
-Version: 4.0b8pre1109.3
+Version: 4.0b8pre1109.4
Release: 1
Group: Applications/Internet
License: MPLv1.1 or GPLv2+ or LGPLv2+
@@ -21,8 +15,7 @@
Source5: fennec.arm
Source6: fennec.x86
Source9: fennec.png
-Requires: libmeegotouch
-Requires: libcontentaction
+Patch0: mobile-install-fail-gracefully.diff
BuildRequires: pkgconfig(gstreamer-0.10)
BuildRequires: pkgconfig(gstreamer-plugins-base-0.10)
BuildRequires: pkgconfig(gconf-2.0)
@@ -55,6 +48,7 @@
BuildRequires: libffi-devel
BuildRequires: pixman-devel
BuildRequires: cairo-devel
+BuildRequires: fdupes
Conflicts: fennec
@@ -62,8 +56,18 @@
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
cp %{SOURCE2} .
tar xvf %{SOURCE2}
@@ -76,6 +80,7 @@
# >> setup
cp %{SOURCE3} .mozconfig
# << setup
+echo "mk_add_options MOZ_OBJDIR=.objects" >> .mozconfig
%build
# >> build pre
@@ -110,7 +115,7 @@
rm -rf %{buildroot}
# >> install pre
mkdir -p %{buildroot}/usr/lib/fennec
-cp -a ../release/dist/bin/* %{buildroot}/usr/lib/fennec/
+cp -a .objects/mobile/dist/bin/* %{buildroot}/usr/lib/fennec/
mkdir -p %{buildroot}/usr/share/pixmaps
cp %{SOURCE9} %{buildroot}/usr/share/pixmaps/fennec.png
@@ -134,11 +139,100 @@
--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.so
+ln -s %{_libdir}/xulrunner-%{moz_milestone}/libmozsqlite3.so %{buildroot}%{_libdir}/xulrunner-devel-%{moz_milestone}/sdk/lib/libmozsqlite3.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,-)
-# >> files
/usr/lib/fennec
/usr/share/applications/fennec.desktop
/usr/share/pixmaps/fennec.png
/usr/bin/fennec
-# << files
+
+%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}/pkgconfig/mozilla-nss.pc
+%{_libdir}/pkgconfig/mozilla-nspr.pc
+%{_libdir}/xulrunner-%{moz_milestone}/nspr-config
+%{_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}/libsoftokn3.chk
+%{_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}/libfreebl3.chk
+%{_libdir}/xulrunner-%{moz_milestone}/libnssdbm3.chk
+
+%{_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}/mozilla-runti*
+%{_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:
--------------
++++++ mobile-install-fail-gracefully.diff (new)
--- mobile-install-fail-gracefully.diff
+++ mobile-install-fail-gracefully.diff
+--- mobile/build.mk 2010/11/15 17:07:19 1.1
++++ mobile/build.mk 2010/11/15 17:07:29
+@@ -75,7 +75,7 @@
+
+ install::
+ @echo "Mobile can't be installed directly."
+- @exit 1
++ @exit 0
+
+ deb: package
+ @$(MAKE) -C mobile/installer deb
++++++ mozconfig
--- mozconfig
+++ mozconfig
@@ -1,5 +1,5 @@
# Build mobile browser
-ac_add_options --enable-application=mobile
+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
@@ -27,7 +27,7 @@
#ac_add_options --disable-jemalloc
-#mk_add_options MOZ_BUILD_PROJECTS="xulrunner 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"
@@ -46,9 +46,9 @@
#ac_add_options --enable-faststart
# MTF related options
-ac_add_options --enable-official-branding
+#ac_add_options --enable-official-branding
ac_add_options --enable-meegotouch
-ac_add_options --enable-application=mobile
+#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
@@ -73,15 +73,15 @@
#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
+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
+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
More information about the MeeGo-commits
mailing list