[meego-commits] 8728: Changes to devel:browser/chromium
wfang6
no_reply at build.meego.com
Fri Oct 22 00:47:27 UTC 2010
Hi,
I have made the following changes to chromium in project devel:browser. Please review and accept ASAP.
Thank You,
wfang6
[This message was auto-generated]
---
Request #8728:
submit: home:wfang6:branches:devel:browser/chromium(r7)(cleanup) -> devel:browser/chromium
Message:
Upgrade to 7.0.542.0 for BMC#8739
State: new 2010-10-21T17:47:26 wfang6
Comment: None
changes files:
--------------
--- chromium.changes
+++ chromium.changes
@@ -1,2 +1,2 @@
-* Mon Oct 18 2010 Wei Fang <wei.w.fang at intel.com> - 7.0.542.0
-- Update to 7.0.542.0, rebase some patches
+* Mon Oct 21 2010 Wei Fang <wei.w.fang at intel.com> - 7.0.542.0
+- Update to 7.0.542.0 for BMC#8739, rebase some patches
old:
----
master_preferences
spec files:
-----------
--- chromium.spec
+++ chromium.spec
@@ -163,7 +163,7 @@
Source4: chromium-daily-tarball.sh
Source5: chromium-browser.xml
# Set default prefs
-Source6: master_preferences
+#Source6: master_preferences
# Also, only used if you want to reproduce the clean tarball.
Source7: chromium-latest.py
# Official ffmpeg headers
@@ -503,8 +503,8 @@
cp -a %{SOURCE5} %{buildroot}%{_datadir}/gnome-control-center/default-apps/
# Install the master_preferences file
-mkdir -p %{buildroot}%{_sysconfdir}
-install -m 0644 %{SOURCE6} %{buildroot}%{_sysconfdir}/%{name}
+#mkdir -p %{buildroot}%{_sysconfdir}
+#install -m 0644 %{SOURCE6} %{buildroot}%{_sysconfdir}/%{name}
# This enables HTML5 video if you have ffmpeg installed, you naughty naughty user.
pushd %{buildroot}%{_libdir}/chromium-browser
@@ -541,7 +541,7 @@
%{_datadir}/pixmaps/chromium-browser.png
%{_datadir}/applications/*.desktop
%{_datadir}/gnome-control-center/default-apps/chromium-browser.xml
-%{_sysconfdir}/%{name}
+# %{_sysconfdir}/%{name}
%if 0%{?sharedbuild}
# Do nothing, we're covered in -libs
%else
@@ -662,273 +662,3 @@
%exclude %{_libdir}/libavformat.so.52
%endif
-%changelog
-* Fri Oct 8 2010 Tom "spot" Callaway <tcallawa at redhat.com> 7.0.542.0-4
-- pass -fno-ipa-cp as an optflag with gcc 4.5
-
-* Fri Oct 8 2010 Tom "spot" Callaway <tcallawa at redhat.com> 7.0.542.0-3
-- add logic path for vanillabuild FOR DEBUGGING ONLY
-
-* Wed Oct 6 2010 Tom "spot" Callaway <tcallawa at redhat.com> 7.0.542.0-2
-- fix system-libvpx patch
-
-* Mon Oct 4 2010 Tom "spot" Callaway <tcallawa at redhat.com> 7.0.542.0-1
-- update to 7.0.542.0
-
-* Tue Sep 14 2010 Tom "spot" Callaway <tcallawa at redhat.com> 7.0.522.0-1
-- update to 7.0.522.0
-
-* Fri Aug 27 2010 Tom "spot" Callaway <tcallawa at redhat.com> 7.0.506.0-1
-- update to 7.0.506.0
-
-* Wed Aug 25 2010 Tom "spot" Callaway <tcallawa at redhat.com> 7.0.504.0-1
-- update to 7.0.504.0
-
-* Thu Aug 19 2010 Tom "spot" Callaway <tcallawa at redhat.com> 7.0.500.0-1.20100819svn56724
-- update to 7.0.500.0 (svn56724)
-
-* Thu Aug 12 2010 Tom "spot" Callaway <tcallawa at redhat.com> 6.0.491.0-1
-- update to 6.0.491.0
-
-* Mon Aug 9 2010 Tom "spot" Callaway <tcallawa at redhat.com> 6.0.488.0-1
-- fix chromium-latest.py
-- fix chromium-browser.desktop
-- update to 6.0.488.0
-
-* Fri Aug 6 2010 Tom "spot" Callaway <tcallawa at redhat.com> 6.0.486.0-2
-- Fix NULL errors with gcc45
-
-* Mon Jul 26 2010 Tom "spot" Callaway <tcallawa at redhat.com> 6.0.476.0-2
-- more gcc 4.5 fixes
-
-* Mon Jul 26 2010 Tom "spot" Callaway <tcallawa at redhat.com> 6.0.476.0-1
-- update to 6.0.476.0
-
-* Mon Jul 19 2010 Tom "spot" Callaway <tcallawa at redhat.com> 6.0.467.0-2
-- fix code to compile with gcc 4.5
-
-* Fri Jul 16 2010 Tom "spot" Callaway <tcallawa at redhat.com> 6.0.467.0-1
-- update to 6.0.467.0
-
-* Tue Jul 6 2010 Tom "spot" Callaway <tcallawa at redhat.com> 6.0.457.0-1
-- update to 6.0.457.0
-
-* Fri Jul 2 2010 Tom "spot" Callaway <tcallawa at redhat.com> 6.0.453.1-1
-- update to 6.0.453.1
-
-* Wed Jun 30 2010 Tom "spot" Callaway <tcallawa at redhat.com> 6.0.451.0-2.1
-- conditionalize gnome-keyring BR for Fedora 12
-
-* Wed Jun 30 2010 Tom "spot" Callaway <tcallawa at redhat.com> 6.0.451.0-2
-- fix code to compile against icu 4.4
-
-* Wed Jun 30 2010 Tom "spot" Callaway <tcallawa at redhat.com> 6.0.451.0-1
-- update to 6.0.451.0
-
-* Thu Jun 3 2010 Tom "spot" Callaway <tcallawa at redhat.com> 6.0.425.0-1.20100603svn48849
-- update to 6.0.425.0, svn 48849
-
-* Thu May 27 2010 Tom "spot" Callaway <tcallawa at redhat.com> 6.0.417.0-1.20100526svn48276
-- update to 6.0.417.0, svn 48276
-- conditionalize svncheckout so if it is set, it works, and if unset, it works. :)
-
-* Tue May 25 2010 Tom "spot" Callaway <tcallawa at redhat.com> 6.0.416.0-1.20100525svn48189
-- update to 6.0.416.0, svn 48189
-
-* Tue May 25 2010 Tom "spot" Callaway <tcallawa at redhat.com> 6.0.414.0-1
-- update to 6.0.414.0
-
-* Thu May 20 2010 Tom "spot" Callaway <tcallawa at redhat.com> 6.0.412.0-1.20100520svn47812
-- update to 6.0.412.0, svn 47812
-
-* Tue May 18 2010 Tom "spot" Callaway <tcallawa at redhat.com> 6.0.406.0-1.2
-- include rhel fixes (thanks to mcepl)
-- debugging for webgl
-
-* Mon May 17 2010 Tom "spot" Callaway <tcallawa at redhat.com> 6.0.406.0-1
-- update to 6.0.406.0
-
-* Fri May 14 2010 Tom "spot" Callaway <tcallawa at redhat.com> 6.0.401.1-3
-- conditionalize -fPIC as part of the shared build only
-
-* Thu May 13 2010 Tom "spot" Callaway <tcallawa at redhat.com> 6.0.401.1-2
-- conditionalize shared/static build
-
-* Thu May 13 2010 Tom "spot" Callaway <tcallawa at redhat.com> 6.0.401.1-1
-- updated to 6.0.401.1
-
-* Mon May 10 2010 Tom "spot" Callaway <tcallawa at redhat.com> 6.0.399.0-1
-- updated to 6.0.399.0
-
-* Tue May 4 2010 Tom "spot" Callaway <tcallawa at redhat.com> 5.0.395.0-1
-- move to using cleaned versions of official build tarballs
-- disable sse2
-
-* Mon Apr 19 2010 Tom "spot" Callaway <tcallawa at redhat.com> 5.0.382.0-0.1.20100419svn44917
-- updated to svn44917
-
-* Tue Apr 13 2010 Tom "spot" Callaway <tcallawa at redhat.com> 5.0.377.0-0.1.20100413svn44349
-- updated to svn44349
-
-* Thu Apr 8 2010 Tom "spot" Callaway <tcallawa at redhat.com> 5.0.372.0-0.1.20100408svn43945
-- updated to svn43945
-
-* Mon Mar 29 2010 Tom "spot" Callaway <tcallawa at redhat.com> 5.0.365.0-0.1.20100329svn42989
-- updated to svn42989
-
-* Mon Mar 22 2010 Tom "spot" Callaway <tcallawa at redhat.com> 5.0.360.0-0.1.20100322svn42211
-- updated to svn42211
-
-* Thu Mar 18 2010 Tom "spot" Callaway <tcallawa at redhat.com> 5.0.358.0-0.1.20100318svn41971
-- merge useful patches from opensuse build
-- build with make, not scons
-- smaller source, lzma compressed
-- updated to svn41971
-
-* Mon Mar 15 2010 Tom "spot" Callaway <tcallawa at redhat.com> 5.0.355.0-0.1.20100315svn41580
-- updated to svn41615
-
-* Thu Feb 18 2010 Tom "spot" Callaway <tcallawa at redhat.com> 5.0.330.0-0.1.20100218svn39394
-- updated to svn39394
-
-* Fri Jan 22 2010 Tom "spot" Callaway <tcallawa at redhat.com> 4.0.305.0-0.1.20100122svn36865
-- updated to svn36865
-
-* Wed Dec 30 2009 Tom "spot" Callaway <tcallawa at redhat.com> 4.0.285.0-0.1.20091230svn35370
-- updated to svn35370
-- hardcode v8 requires on chromium-libs to force clean update
-
-* Mon Dec 21 2009 Tom "spot" Callaway <tcallawa at redhat.com> 4.0.277.0-0.1.20091221svn35107
-- 20091221svn35107
-
-* Wed Dec 16 2009 Tom "spot" Callaway <tcallawa at redhat.com> 4.0.268.0-0.1.20091216svn34775
-- 20091216svn34775
-
-* Tue Dec 15 2009 Tom "spot" Callaway <tcallawa at redhat.com> 4.0.268.0-0.1.20091209svn34196
-- 20091209svn34196
-- rewrite most patches
-- nuke second copy of zlib
-- build libraries as shared libs
-- put shared libs in subpackage (in preparation for courgette subpackage)
-- add conditional for verbose mode
-- conditional for system-sqlite
-- courgette subpackage
-
-* Wed Nov 18 2009 Tom "spot" Callaway <tcallawa at redhat.com> 4.0.252.0-0.1.20091119svn32498
-- 20091119svn32498
-- add minimal nss requires
-
-* Tue Oct 27 2009 Tom "spot" Callaway <tcallawa at redhat.com> 4.0.227.0-0.1.20091027svn30269
-- 20091027svn30269
-- apply hack fix to stop double free bug (http://code.google.com/p/chromium/issues/detail?id=23362)
-
-* Tue Oct 13 2009 Tom "spot" Callaway <tcallawa at redhat.com> 4.0.222.6-0.1.20091013svn28872
-- 20091013svn28872
-
-* Thu Oct 8 2009 Tom "spot" Callaway <tcallawa at redhat.com> 4.0.222.2-0.1.20091008svn28391
-- 20091008svn28391
-
-* Wed Sep 30 2009 Tom "spot" Callaway <tcallawa at redhat.com> 4.0.220.0-0.1.20090930svn27599
-- 20090930svn27599
-
-* Tue Sep 29 2009 Tom "spot" Callaway <tcallawa at redhat.com> 4.0.219.8-0.1.20090929svn27489
-- 20090929svn27489
-
-* Wed Sep 16 2009 Tom "spot" Callaway <tcallawa at redhat.com> 4.0.212.0-0.1.20090916svn26424
-- 20090916svn26424
-- revert http://src.chromium.org/viewvc/chrome/trunk/src/chrome/common/sqlite_utils.cc?r1=24321&r2=25633
- to stop crashes when typing in url bar
-
-* Thu Sep 10 2009 Tom "spot" Callaway <tcallawa at redhat.com> 4.0.208.0-0.1.20090910svn25958
-- 20090910svn25958
-
-* Wed Sep 9 2009 Tom "spot" Callaway <tcallawa at redhat.com> 4.0.208.0-0.1.20090909svn25824
-- 20090909svn25824
-- drop hardcoded Requires on bug-buddy (fixes issue where it is being obsoleted by abrt in rawhide)
-- disable webkit deopt, flash bug is fixed now
-- use system libicu
-
-* Thu Aug 27 2009 Tom "spot" Callaway <tcallawa at redhat.com> 4.0.204.0-0.1.20090827svn24640
-- 20090827svn24640
-
-* Tue Aug 25 2009 Tom "spot" Callaway <tcallawa at redhat.com> 4.0.203.0-0.1.20090824svn24148
-- 20090824svn24148
-- find proper plugin dir on x86_64
-- pass --enable-user-scripts (instead of old --enable-greasemonkey)
-
-* Tue Aug 18 2009 Tom "spot" Callaway <tcallawa at redhat.com> 4.0.202.0-0.1.20090818svn23628
-- 20090818svn23628
-
-* Fri Aug 14 2009 Tom "spot" Callaway <tcallawa at redhat.com> 4.0.202.0-0.1.20090814svn23460
-- 20090814svn23460
-
-* Wed Aug 12 2009 Tom "spot" Callaway <tcallawa at redhat.com> 4.0.202.0-0.1.20090812svn23201
-- Bump to 4.0.202 (we're not tracking 3.0, no one can tell me exactly how to manage that)
-
-* Mon Aug 10 2009 Tom "spot" Callaway <tcallawa at redhat.com> 3.0.198.0-0.1.20090810svn22925
-- 20090810svn22925
-
-* Fri Aug 7 2009 Tom "spot" Callaway <tcallawa at redhat.com> 3.0.198.0-0.1.20090807svn22807
-- 20090807svn22807
-
-* Wed Aug 5 2009 Tom "spot" Callaway <tcallawa at redhat.com> 3.0.198.0-0.1.20090805svn22496
-- 20090805svn22496
-
-* Mon Aug 3 2009 Tom "spot" Callaway <tcallawa at redhat.com> 3.0.197.0-0.1.20090803svn22262
-- 20090803svn22262
-
-* Fri Jul 31 2009 Tom "spot" Callaway <tcallawa at redhat.com> 3.0.197.0-0.1.20090731svn22188
-- 20090731svn22188
-
-* Thu Jul 30 2009 Tom "spot" Callaway <tcallawa at redhat.com> 3.0.197.0-0.1.20090730svn22105
-- 20090730svn22105
-
-* Mon Jul 27 2009 Tom "spot" Callaway <tcallawa at redhat.com> 3.0.196.0-0.1.20090727svn21648
-- 20090727svn21648
-
-* Fri Jul 24 2009 Tom "spot" Callaway <tcallawa at redhat.com> 3.0.196.0-0.1.20090724svn21567
-- 20090724svn21567
-- drop ffmpeg binaries (only code remaining is headers, doesn't infringe patents)
-- package up manpage
-
-* Mon Jul 20 2009 Tom "spot" Callaway <tcallawa at redhat.com> 3.0.195.0-0.1.20090720svn21073
-- 20090720svn21073
-
-* Thu Jul 16 2009 Tom "spot" Callaway <tcallawa at redhat.com> 3.0.195.0-0.1.20090716svn20889
-- 20090716svn20889
-
-* Wed Jul 15 2009 Tom "spot" Callaway <tcallawa at redhat.com> 3.0.195.0-0.1.20090715svn20726
-- 20090715svn20726
-
-* Mon Jul 13 2009 Tom "spot" Callaway <tcallawa at redhat.com> 3.0.194.0-0.1.20090713svn20473
-- 20090713svn20473
-
-* Sat Jul 11 2009 Tom "spot" Callaway <tcallawa at redhat.com> 3.0.194.0-0.1.20090711svn20464
-- 20090711svn20464
-- fix sandboxing up to match code changes (no longer need to be read-only, doesn't need /var/run/chrome-sandbox)
-
-* Wed Jul 8 2009 Tom "spot" Callaway <tcallawa at redhat.com> 3.0.193.0-0.1.20090708svn20141
-- 20090708svn20141
-- support LinuxZygote sandboxing
-
-* Sat Jul 4 2009 Tom "spot" Callaway <tcallawa at redhat.com> 3.0.192.0-0.1.20090704svn19929
-- 20090704svn19929
-- hack in correct optflags
-
-* Sun Jun 28 2009 Tom "spot" Callaway <tcallawa at redhat.com>
-- 20090628svn19474
-
-* Fri Jun 26 2009 Tom "spot" Callaway <tcallawa at redhat.com>
-- 20090626svn19370
-
-* Thu Jun 25 2009 Tom "spot" Callaway <tcallawa at redhat.com>
-- 3.0.191.0 20090625svn19237
-
-* Thu Jun 18 2009 Tom "spot" Callaway <tcallawa at redhat.com>
-- 3.0.190.0 20090618svn18706
-
-* Mon Jun 8 2009 Tom "spot" Callaway <tcallawa at redhat.com>
-- 20090608svn17870
-
-* Sat Jun 6 2009 Tom "spot" Callaway <tcallawa at redhat.com>
-- 20090606svn17834
other changes:
--------------
++++++ chromium-browser.sh
--- chromium-browser.sh
+++ chromium-browser.sh
@@ -10,6 +10,11 @@
LIBDIR=/usr/lib/chromium-browser
GDB=/usr/bin/gdb
+# Let the Chromium aware MeeGo desktop environment.
+# For system proxy setting integration.
+GNOME_DESKTOP_SESSION_ID="this-is-deprecated"
+export GNOME_DESKTOP_SESSION_ID
+
usage () {
echo "$APPNAME [-h|--help] [-g|--debug] [options] [URL]"
echo
@@ -25,6 +30,10 @@
fi
export LD_LIBRARY_PATH
+# xdg-settings should in PATH
+PATH=$PATH:$LIBDIR
+export PATH
+
want_debug=0
while [ $# -gt 0 ]; do
case "$1" in
@@ -42,6 +51,67 @@
esac
done
+# Set plugin search path. Chromium will read mozilla's plugin
+# search path. This is for platforms (handset, TV, etc..) where
+# plugins are not copied/linked to the standard mozilla plugin
+# path due to reasons. PDF plugin is in the list though it is
+# not really supported by chromium on Linux.
+moz_plugin_path=$(find /usr/java/jre* \
+ /usr/lib/flash-plugin \
+ /opt/Adobe* /usr/Adobe* \
+ -name "libnpjp2.so" -exec dirname {} \; -o \
+ -name "libflashplayer.so" -exec dirname {} \; -o \
+ -name "nppdf.so" -exec dirname {} \; 2>/dev/null | xargs echo)
+MOZ_PLUGIN_PATH=$MOZ_PLUGIN_PATH:${moz_plugin_path// /:}
+export MOZ_PLUGIN_PATH
+
+# Setup the default profile if this is none
+# Set the default theme as GTK+ with system window decoration
+if [ ! -d ~/.config/chromium/Default ]; then
+ mkdir -p ~/.config/chromium/Default
+ cat <<EOF > ~/.config/chromium/Default/Preferences
+{
+ "browser": {
+ "custom_chrome_frame": false
+ },
+ "extensions": {
+ "theme": {
+ "colors": {
+
+ },
+ "id": "",
+ "images": {
+
+ },
+ "properties": {
+
+ },
+ "tints": {
+
+ },
+ "use_system": true
+ }
+ },
+ "homepage": "http://meego.com/",
+ "homepage_is_newtabpage": false,
+ "session": {
+ "restore_on_startup": 1
+ },
+ "webkit": {
+ "webprefs": {
+ "default_fixed_font_size": 13,
+ "default_font_size": 16,
+ "fixed_font_family": "Droid Sans Mono",
+ "sansserif_font_family": "Droid Sans",
+ "serif_font_family": "Droid Serif"
+ }
+ }
+}
+EOF
+ # Set the default browser
+ $LIBDIR/xdg-settings set default-web-browser chromium-browser.desktop
+fi
+
if [ $want_debug -eq 1 ] ; then
if [ ! -x $GDB ] ; then
echo "Sorry, can't find usable $GDB. Please install it."
@@ -56,6 +126,6 @@
$GDB "$LIBDIR/$APPNAME" -x $tmpfile
exit $?
else
- exec $LIBDIR/$APPNAME "$@"
+ exec $LIBDIR/$APPNAME "--start-maximized" "--no-first-run" "--enable-experimental-extension-apis" "$@"
fi
++++++ deleted files:
--- master_preferences
More information about the MeeGo-commits
mailing list