updated chromium

git-svn-id: http://trac.vinelinux.org/repos/projects/specs@3088 ec354946-7b23-47d6-9f5a-488ba84defc7

c/chromium/chromium-browser-vine.desktop

@@ -7,12 +7,12 @@ Comment=Browse the World Wide Web
 Comment[ja]=Webを閲覧する
 GenericName=Web Browser
 GenericName[ja]=ウェブブラウザ
-Exec=chromium --enable-plugins --enable-extensions --enable-user-scripts --enable-printing --enable-sync --auto-ssl-client-auth --enable-webgl --enable-geolocation %u
+Exec=chromium %u
 Terminal=false
 X-MultipleArgs=false
 Type=Application
-Icon=chromium-browser.png
+Icon=chromium-browser
 Categories=Network;WebBrowser;
-MimeType=text/html;
+MimeType=text/html;text/xml;application/xhtml+xml;x-scheme-handler/http;x-scheme-handler/https;
 StartupWMClass=Chromium
 StartupNotify=true

c/chromium/chromium-vendor-vine.patch.in

@@ -1,10 +1,10 @@
 --- src/webkit/glue/user_agent.cc
 +++ src/webkit/glue/user_agent.cc
-@@ -103,6 +103,7 @@ void BuildUserAgent(bool mimic_chrome1,
-   StringAppendF(
+@@ -106,6 +106,7 @@ void BuildUserAgent(bool mimic_chrome1,
+   base::StringAppendF(
        result,
-       "Mozilla/5.0 (%s; %c; %s; %s) AppleWebKit/%d.%d"
+       "Mozilla/5.0 (%s%s) AppleWebKit/%d.%d"
 +      " Vine/RPM_VERSION"
        " (KHTML, like Gecko) %s Safari/%d.%d",
-       mimic_windows ? "Windows" : kUserAgentPlatform,
-       kUserAgentSecurity,
+       mimic_windows ? "Windows " : kUserAgentPlatform,
+       BuildOSCpuInfo().c_str(),

c/chromium/chromium-vl.spec → c/chromium/chromium11-vl.spec

@@ -22,7 +22,7 @@ Name:           chromium
 Summary:        Google's opens source browser project
 Summary(ja):    Googleのオープンソースウェブブラウザ
 #'
-Version:        11.0.696.15
+Version:        11.0.696.20
 Release:        1%{?_dist_release}
 License:        BSD
 Group:          Applications/Internet
@@ -366,8 +366,12 @@ EOF
 %endif
 
 
-%__mkdir_p %{buildroot}%{_datadir}/pixmaps/
-%__cp -a src/chrome/app/theme/chromium/product_logo_48.png %{buildroot}%{_datadir}/pixmaps/chromium-browser.png
+# %__mkdir_p %{buildroot}%{_datadir}/pixmaps/
+# %__cp -a src/chrome/app/theme/chromium/product_logo_48.png %{buildroot}%{_datadir}/pixmaps/chromium-browser.png
+for i in 16 22 24 32 48 64 128 256; do
+    %__mkdir_p %{buildroot}%{_datadir}/icons/hicolor/${i}x${i}/apps
+    %__cp -a src/chrome/app/theme/chromium/product_logo_${i}.png %{buildroot}%{_datadir}/icons/hicolor/${i}x${i}/apps/chromium-browser.png || exit 1
+done
 
 %__mkdir_p %{buildroot}%{_datadir}/applications/
 desktop-file-install --dir %{buildroot}%{_datadir}/applications %{SOURCE101}
@@ -405,6 +409,20 @@ popd
 %clean
 %{__rm} -rf %{buildroot}
 
+%post
+touch --no-create %{_datadir}/icons/hicolor
+if [ -x %{_bindir}/gtk-update-icon-cache ]; then
+  %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor
+fi 
+%{_bindir}/update-desktop-database --quiet %{_datadir}/applications || :
+
+%postun
+%{_bindir}/update-desktop-database --quiet %{_datadir}/applications
+touch --no-create %{_datadir}/icons/hicolor
+if [ -x %{_bindir}/gtk-update-icon-cache ]; then
+  %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor
+fi || :
+
 
 %files
 %defattr(-,root,root,-)
@@ -419,7 +437,8 @@ popd
 %{_libdir}/chromium/resources/
 %{_libdir}/chromium/xdg-settings
 %{_mandir}/man1/chrom*
-%{_datadir}/pixmaps/chromium-browser.png
+#%{_datadir}/pixmaps/chromium-browser.png
+%{_datadir}/icons/hicolor/*/apps/chromium-browser.png
 %{_datadir}/applications/*.desktop
 %{_datadir}/gnome-control-center/default-apps/chromium-browser.xml
 %{_libdir}/chromium/libavcodec.so.52
@@ -443,10 +462,17 @@ popd
 %endif
 
 %changelog
+* Wed Mar 23 2011 Munehiro Yamamoto <munepi@vinelinux.org> 11.0.696.20-1
+- updated to 11.0.696.20
+- improved chromium-browser-vine.desktop
+
+* Sun Mar 20 2011 Munehiro Yamamoto <munepi@vinelinux.org> 11.0.696.17-1
+- updated to 11.0.696.17
+
 * Sat Mar 19 2011 Munehiro Yamamoto <munepi@vinelinux.org> 11.0.696.15-1
 - updated to 11.0.696.15
   - ready for Vine Linux 6 release
-- dropped BuildRequires: v8-devel, libvpx-devel, libicu-devel
+- dropped BuildRequires: v8-devel, libicu-devel
 
 * Wed Mar 09 2011 Munehiro Yamamoto <munepi@vinelinux.org> 11.0.696.5-1
 - updated to 11.0.696.5 with v8 3.2.0

c/chromium/pack_chromium_source-vine.sh → c/chromium/pack_chromium11_source-vine.sh

@@ -65,7 +65,6 @@ cp -ra $chromium_svn_dir ${chromium_tgt_dir}/src
 echo "Removing ffmpeg binaries/sources"
 cd $chromium_tgt_dir/src/third_party/ffmpeg/
 rm -rf binaries/
-rm -rf config
 rm -rf patched-ffmpeg-mt/*.c patched-ffmpeg-mt/*.h patched-ffmpeg-mt/doc patched-ffmpeg-mt/ffpresets patched-ffmpeg-mt/mt-work 
 rm -rf patched-ffmpeg-mt/libavformat/*.c patched-ffmpeg-mt/libavcodec/*.c patched-ffmpeg-mt/tools patched-ffmpeg-mt/tests
 rm -rf patched-ffmpeg-mt/libavutil/*.c patched-ffmpeg-mt/libavfilter/*.c patched-ffmpeg-mt/libavdevice/*.c patched-ffmpeg-mt/libpostproc/*.c patched-ffmpeg-mt/libswscale/*.c
@@ -81,12 +80,13 @@ rm -rf webkit/data/layout_tests/
 rm -rf third_party/hunspell/dictionaries/
 rm -rf src/third_party/WebKit/LayoutTests/
 rm -rf chrome/test/data/
-rm -rf third_party/icu/icudt42.dll  
-rm -rf third_party/icu/linux/  
-rm -rf third_party/icu/mac/  
-rm -rf third_party/icu/source/  
+#rm -rf third_party/icu/icudt42.dll  
+#rm -rf third_party/icu/linux/  
+#rm -rf third_party/icu/mac/  
+#rm -rf third_party/icu/source/  
 rm -rf native_client/tests/
-rm -rf third_party/libvpx/ third_party/speex/
+#rm -rf third_party/libvpx/ 
+#rm -rf third_party/speex/
 # Remove other directories (untested)
 cd $chromium_tgt_dir/src/third_party
 # First, just take out the sources for the items which have already been conditionalized so we're sure we're not using them.
@@ -110,7 +110,7 @@ rm -rf libxml/*c libxml/*.h libxml/*.in libxml/*sh libxml/*.m4 libxml/*.py libxm
 rm -rf libxslt/build libxslt/libexslt libxslt/libxslt libxslt/linux libxslt/mac libxslt/win32 libxslt/AUTHORS libxslt/COPYING libxslt/ChangeLog libxslt/FEATURES libxslt/INSTALL libxslt/NEWS libxslt/README libxslt/TODO libxslt/*.h libxslt/*.m4 libxslt/compile libxslt/config* libxslt/depcomp libxslt/*sh libxslt/*.in libxslt/*.spec libxslt/missing
 
 # Next, nuke the whole directories for things not yet conditionalized:
-rm -rf nss/ nspr/ 
+#rm -rf nss/ nspr/ 
 
 # expat is only built on windows
 rm -rf expat/files
@@ -118,8 +118,8 @@ rm -rf expat/files
 # Another copy of zlib? Unpossible!
 rm -rf src/third_party/WebKit/WebCore/platform/image-decoders/zlib/
 
-#Remove v8 as that we build against the system one
-rm -rf src/v8/include src/v8/src/
+# #Remove v8 as that we build against the system one
+# rm -rf src/v8/include src/v8/src/
 
 
 echo