home:rwooninck:chromium/chromium -> openSUSE:Factory:Contrib/chromium https://build.opensuse.org/request/diff/76359 Description: Update to 14.0.825 changes files: -------------- --- chromium.changes +++ chromium.changes @@ -1,0 +2,16 @@ +Sun Jul 17 09:15:18 UTC 2011 - tittiatcoke@gmail.com + +- Update to 14.0.825 + +------------------------------------------------------------------- +Tue Jul 12 02:26:20 UTC 2011 - nmarques@opensuse.org + +- Fix for bnc#705223: + + Icons are installed in hicolor instead of oxygen, this ensures + compatibility with open Desktop standards. + + Add GTK icon cache update for >= 1140 on %post and %postun. + + Removed the .png in %{_datadir}/pixmaps as hicolor is a better + option. + + Add hicolor-icon-theme to BuildRequires and Requires. + +------------------------------------------------------------------- old: ---- chromium.14.0.792.0.svn88820.tar.lzma new: ---- buildfix.patch chromium.14.0.825.0.svn92811.tar.lzma spec files: ----------- --- chromium.spec +++ chromium.spec @@ -3,11 +3,11 @@ # Thanks to jhaygood for most of the icu patch -%define svn_rev 88820 -%define v8_ver 3.4.3.0 +%define svn_rev 92811 +%define v8_ver 3.4.12.1 Name: chromium -Version: 14.0.792.0 +Version: 14.0.825.0 Release: 1 License: BSD Summary: Google's opens source browser project @@ -75,6 +75,7 @@ # PATCH-FIX-OPENSUSE ensure that on newer kernels the right /proc/oom_score_adj file is used Patch99: chromium_patch_newer_kernels.patch %endif +Patch999: buildfix.patch BuildRequires: Mesa-devel BuildRequires: alsa-devel @@ -132,10 +133,12 @@ BuildRequires: libicu-devel >= 4.0 %endif BuildRequires: speex-devel +BuildRequires: hicolor-icon-theme Requires: alsa Requires: xdg-utils Requires: libv8-3 = %{v8_ver} +Requires: hicolor-icon-theme # Recommends the chromium-ffmpeg library (available from packman) Recommends: chromium-ffmpeg = %{version} @@ -173,6 +176,7 @@ %if 0%{?suse_version} > 1130 %patch99 -p1 %endif +%patch999 -p1 pushd src/third_party/ffmpeg/ tar xf %{SOURCE8} @@ -250,12 +254,10 @@ %fdupes %{buildroot}%{_mandir}/man1/ popd -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}/icons/ pushd %{buildroot}%{_datadir}/icons/ tar -xjf %{SOURCE104} +mv oxygen hicolor popd mkdir -p %{buildroot}%{_datadir}/applications/ @@ -277,6 +279,15 @@ %clean rm -rf %{buildroot} +# Add snipplets to update the GTK cache on package install. +%if 0%{?suse_version} >= 1140 +%post +%icon_theme_cache_post + +%postun +%icon_theme_cache_postun +%endif + # Files! %files @@ -291,10 +302,9 @@ %{_libdir}/chromium/resources/ %{_libdir}/chromium/xdg-settings %{_mandir}/man1/chrom* -%{_datadir}/pixmaps/chromium-browser.png %{_datadir}/applications/*.desktop %{_datadir}/gnome-control-center/default-apps/chromium-browser.xml -%{_datadir}/icons/oxygen/ +%{_datadir}/icons/hicolor/ %{_libdir}/chromium/chrome.pak %{_libdir}/chromium/resources.pak %{_libdir}/chromium/locales/ other changes: -------------- ++++++ buildfix.patch (new) --- buildfix.patch +++ buildfix.patch +--- chromium/src/third_party/WebKit/Source/WebCore/platform/ScrollAnimatorNone.cpp ++++ chromium/src/third_party/WebKit/Source/WebCore/platform/ScrollAnimatorNone.cpp +@@ -96,6 +96,7 @@ + t -= 2.625 / 2.75; + return 7.5625 * t * t + .984375; + } ++ return t; + } + + double ScrollAnimatorNone::PerAxisData::attackCurve(Curve curve, double deltaTime, double curveT, double startPosition, double attackPosition) +@@ -124,6 +125,7 @@ + case Bounce: + return t; + } ++ return t; + } + + ScrollAnimatorNone::PerAxisData::PerAxisData(ScrollAnimatorNone* parent, float* currentPosition) ++++++ chromium-6.0.406.0-system-gyp-v8.patch --- chromium-6.0.406.0-system-gyp-v8.patch +++ chromium-6.0.406.0-system-gyp-v8.patch @@ -1,6 +1,6 @@ --- chromium/src/build/all.gyp 2010-11-25 19:17:16.000000000 +0100 +++ new/src/build/all.gyp 2010-11-25 21:05:09.413000018 +0100 -@@ -57,7 +57,7 @@ +@@ -58,7 +58,7 @@ 'conditions': [ ['javascript_engine=="v8"', { 'dependencies': [ @@ -9,7 +9,7 @@ ], }], ['OS=="mac" or OS=="linux"', { -@@ -139,161 +139,6 @@ +@@ -140,161 +140,6 @@ }], ], }, # target_name: All @@ -17,7 +17,6 @@ - 'target_name': 'chromium_builder_tests', - 'type': 'none', - 'dependencies': [ -- '../app/app.gyp:app_unittests', - '../base/base.gyp:base_unittests', - '../chrome/chrome.gyp:browser_tests', - '../chrome/chrome.gyp:interactive_ui_tests', @@ -38,6 +37,7 @@ - '../net/net.gyp:net_unittests', - '../printing/printing.gyp:printing_unittests', - '../remoting/remoting.gyp:remoting_unittests', +- '../sql/sql.gyp:sql_unittests', - '../third_party/cacheinvalidation/cacheinvalidation.gyp:cacheinvalidation_unittests', - '../third_party/libphonenumber/libphonenumber.gyp:libphonenumber_unittests', - 'temp_gyp/googleurl.gyp:googleurl_unittests', @@ -76,7 +76,6 @@ - 'type': 'none', - 'dependencies': [ - '../chrome/chrome.gyp:chrome', -- '../app/app.gyp:app_unittests', - '../base/base.gyp:base_unittests', - '../chrome/chrome.gyp:browser_tests', - '../chrome/chrome.gyp:interactive_ui_tests', @@ -97,6 +96,7 @@ - '../net/net.gyp:net_unittests', - '../printing/printing.gyp:printing_unittests', - '../remoting/remoting.gyp:remoting_unittests', +- '../sql/sql.gyp:sql_unittests', - '../third_party/cacheinvalidation/cacheinvalidation.gyp:cacheinvalidation_unittests', - '../third_party/libphonenumber/libphonenumber.gyp:libphonenumber_unittests', - 'temp_gyp/googleurl.gyp:googleurl_unittests', ++++++ chromium-7.0.542.0-codechanges-system-minizip-v8.patch --- chromium-7.0.542.0-codechanges-system-minizip-v8.patch +++ chromium-7.0.542.0-codechanges-system-minizip-v8.patch @@ -61,9 +61,9 @@ diff -up chromium-7.0.542.0/chrome/renderer/extensions/chrome_app_bindings.cc.system-code chromium-7.0.542.0/chrome/renderer/extensions/chrome_app_bindings.cc --- chromium-7.0.542.0/src/chrome/renderer/extensions/chrome_app_bindings.cc.system-code 2010-10-04 05:42:44.000000000 -0400 +++ chromium-7.0.542.0/src/chrome/renderer/extensions/chrome_app_bindings.cc 2010-10-04 14:16:54.841498794 -0400 -@@ -18,7 +18,7 @@ - #include "content/renderer/render_view.h" +@@ -19,7 +19,7 @@ #include "content/renderer/v8_value_converter.h" + #include "third_party/WebKit/Source/WebKit/chromium/public/WebDocument.h" #include "third_party/WebKit/Source/WebKit/chromium/public/WebFrame.h" -#include "v8/include/v8.h" +#include @@ -121,8 +121,8 @@ diff -up chromium-7.0.542.0/chrome/renderer/external_extension.cc.system-code chromium-7.0.542.0/chrome/renderer/external_extension.cc --- chromium-7.0.542.0/src/chrome/renderer/external_extension.cc.system-code 2010-10-04 05:42:44.000000000 -0400 +++ chromium-7.0.542.0/src/chrome/renderer/external_extension.cc 2010-10-04 14:16:54.845500082 -0400 -@@ -11,7 +11,7 @@ - #include "content/renderer/render_view.h" +@@ -12,7 +12,7 @@ + #include "third_party/WebKit/Source/WebKit/chromium/public/WebDocument.h" #include "third_party/WebKit/Source/WebKit/chromium/public/WebFrame.h" #include "third_party/WebKit/Source/WebKit/chromium/public/WebView.h" -#include "v8/include/v8.h" ++++++ chromium-7.0.542.0-media-probe.patch --- chromium-7.0.542.0-media-probe.patch +++ chromium-7.0.542.0-media-probe.patch @@ -17,35 +17,50 @@ using std::string; namespace net { -@@ -199,45 +208,49 @@ static const char* const supported_image +@@ -224,51 +233,47 @@ "image/x-xbitmap" // xbm }; -+struct format_info { -+ const char* name; -+ const char* symbol; -+ const bool fallback; -+}; -+ -+#if defined(GOOGLE_CHROME_BUILD) || defined(USE_PROPRIETARY_CODECS) -+#define MPEG true -+#else -+#define MPEG false -+#endif - // A list of media types: http://en.wikipedia.org/wiki/Internet_media_type - // A comprehensive mime type list: http://plugindoc.mozdev.org/winmime.php +-// A list of media types: http://en.wikipedia.org/wiki/Internet_media_type +-// A comprehensive mime type list: http://plugindoc.mozdev.org/winmime.php -static const char* const supported_media_types[] = { -+static const format_info supported_media_types[] = { - // Ogg. +-#if defined(ENABLE_MEDIA_TYPE_OGG) +- // Ogg. - "video/ogg", - "audio/ogg", - "application/ogg", +-#endif +- +- // WebM. - "video/webm", - "audio/webm", - "audio/wav", - "audio/x-wav", ++struct format_info { ++ const char* name; ++ const char* symbol; ++ const bool fallback; ++}; + + #if defined(GOOGLE_CHROME_BUILD) || defined(USE_PROPRIETARY_CODECS) +- // MPEG-4. +- "video/mp4", +- "video/x-m4v", +- "audio/mp4", +- "audio/x-m4a", - --#if defined(GOOGLE_CHROME_BUILD) || defined(USE_PROPRIETARY_CODECS) +- // MP3. +- "audio/mp3", +- "audio/x-mp3", +- "audio/mpeg", ++#define MPEG true ++#else ++#define MPEG false + #endif ++ ++// A list of media types: http://en.wikipedia.org/wiki/Internet_media_type ++// A comprehensive mime type list: http://plugindoc.mozdev.org/winmime.php ++static const format_info supported_media_types[] = { + { "video/ogg", "ogg_demuxer", true }, + { "audio/ogg", "ogg_demuxer", true }, + { "application/ogg", "ogg_demuxer", true }, @@ -53,21 +68,10 @@ + { "audio/webm", "matroska_demuxer", true }, + { "audio/wav", "wav_demuxer", true }, + { "audio/x-wav", "wav_demuxer", true }, - // MPEG-4. -- "video/mp4", -- "video/x-m4v", -- "audio/mp4", -- "audio/x-m4a", -- + { "video/mp4", "mov_demuxer", MPEG }, + { "video/x-m4v", "mov_demuxer", MPEG }, + { "audio/mp4", "mov_demuxer", MPEG }, + { "audio/x-m4a", "mov_demuxer", MPEG }, - // MP3. -- "audio/mp3", -- "audio/x-mp3", -- "audio/mpeg", --#endif + { "audio/mp3", "mp3_demuxer", MPEG }, + { "audio/x-mp3", "mp3_demuxer", MPEG }, + { "audio/mpeg", "mp3_demuxer", MPEG }, @@ -82,7 +86,9 @@ - "avc1", - "mp4a", -#endif +-#if defined(ENABLE_MEDIA_CODEC_THEORA) - "theora", +-#endif - "vorbis", - "vp8", - "1" // PCM for WAV. @@ -95,7 +101,7 @@ }; // Note: does not include javascript types list (see supported_javascript_types) -@@ -312,7 +325,47 @@ static const MediaFormatStrict format_co +@@ -342,7 +347,47 @@ { "audio/wav", "1" } }; @@ -144,7 +150,7 @@ for (size_t i = 0; i < arraysize(supported_image_types); ++i) image_map_.insert(supported_image_types[i]); -@@ -322,11 +375,15 @@ void MimeUtil::InitializeMimeTypeMaps() +@@ -352,11 +397,15 @@ for (size_t i = 0; i < arraysize(supported_javascript_types); ++i) non_image_map_.insert(supported_javascript_types[i]); for (size_t i = 0; i < arraysize(supported_media_types); ++i) @@ -162,7 +168,7 @@ for (size_t i = 0; i < arraysize(supported_javascript_types); ++i) javascript_map_.insert(supported_javascript_types[i]); -@@ -335,7 +392,9 @@ void MimeUtil::InitializeMimeTypeMaps() +@@ -365,7 +414,9 @@ view_source_map_.insert(view_source_types[i]); for (size_t i = 0; i < arraysize(supported_media_codecs); ++i) @@ -173,7 +179,7 @@ // Initialize the strict supported media types. for (size_t i = 0; i < arraysize(format_codec_mappings); ++i) { -@@ -349,6 +408,8 @@ void MimeUtil::InitializeMimeTypeMaps() +@@ -379,6 +430,8 @@ codecs.insert(mime_type_codecs[j]); strict_format_map_[format_codec_mappings[i].mime_type] = codecs; } ++++++ chromium-gcc46.patch --- chromium-gcc46.patch +++ chromium-gcc46.patch @@ -26,8 +26,8 @@ +#include <cstddef> #include "config.h" + #include "common.h" #include "system-alloc.h" - #include "config.h" --- chromium/src/third_party/libjingle/source/talk/base/sigslot.h~ 2011-03-31 13:43:11.000000000 +0400 +++ chromium/src/third_party/libjingle/source/talk/base/sigslot.h 2011-03-31 13:52:32.000000000 +0400 @@ -81,6 +81,7 @@ @@ -50,29 +50,29 @@ // http://www.microsoft.com/opentype/otspec/os2.htm --- chromium/src/third_party/tcmalloc/chromium/src/base/vdso_support.h~ 2011-03-29 23:20:20.000000000 +0400 +++ chromium/src/third_party/tcmalloc/chromium/src/base/vdso_support.h 2011-03-29 23:20:37.000000000 +0400 -@@ -37,6 +37,7 @@ +@@ -38,6 +38,7 @@ #define HAVE_VDSO_SUPPORT 1 +#include <cstddef> #include // for NULL #include // for ElfW - #include "base/basictypes.h" + --- chromium/src/third_party/tcmalloc/chromium/src/base/stl_allocator.h~ 2011-03-31 12:53:13.000000000 +0400 +++ chromium/src/third_party/tcmalloc/chromium/src/base/stl_allocator.h 2011-03-31 12:53:32.000000000 +0400 -@@ -38,6 +38,7 @@ - #include +@@ -39,6 +39,7 @@ + #include // for std::ptrdiff_t #include <limits> +#include <cstddef> - #include "base/basictypes.h" #include "base/logging.h" + --- chromium/src/third_party/tcmalloc/chromium/src/symbolize.h~ 2011-03-31 12:58:42.000000000 +0400 +++ chromium/src/third_party/tcmalloc/chromium/src/symbolize.h 2011-03-31 12:59:00.000000000 +0400 -@@ -38,6 +38,7 @@ - #include // for uintptr_t +@@ -39,6 +39,7 @@ #endif + #include // for NULL #include <map> +#include <cstddef> @@ -85,9 +85,9 @@ #include +#include <cstddef> - #include "internal_logging.h" + #include // for size_t - // REQUIRES: "alignment" is a power of two or "0" to indicate default alignment + class SysAllocator; --- chromium/src/ppapi/cpp/paint_aggregator.h 2010-12-23 18:10:27.000000000 -0600 +++ chromium/src/ppapi/cpp/paint_aggregator.h 2011-04-19 05:34:56.085582885 -0500 @@ -5,6 +5,7 @@ ++++++ chromium-no-test-sources.patch --- chromium-no-test-sources.patch +++ chromium-no-test-sources.patch @@ -1,7 +1,7 @@ diff -up chromium-6.0.417.0-20100526svn48276/chrome/chrome.gyp.notests chromium-6.0.417.0-20100526svn48276/chrome/chrome.gyp --- chromium-6.0.417.0-20100526svn48276/src/chrome/chrome.gyp.notests 2010-05-27 11:08:15.000000000 -0400 +++ chromium-6.0.417.0-20100526svn48276/src/chrome/chrome.gyp 2010-05-27 11:09:38.961194394 -0400 -@@ -126,7 +126,6 @@ +@@ -132,7 +132,6 @@ 'chrome_installer.gypi', 'chrome_installer_util.gypi', 'chrome_renderer.gypi', @@ -9,7 +9,7 @@ 'common_constants.gypi', 'nacl.gypi', ], -@@ -861,7 +861,6 @@ +@@ -920,7 +919,6 @@ 'target_name': 'ipclist', 'type': 'executable', 'dependencies': [ @@ -17,15 +17,15 @@ '../skia/skia.gyp:skia', ], 'include_dirs': [ -@@ -1177,7 +1176,6 @@ - 'msvs_guid': '4539AFB3-B8DC-47F3-A491-6DAC8FD26657', +@@ -1238,7 +1236,6 @@ + 'type': 'executable', 'dependencies': [ '../base/base.gyp:base', - '../base/base.gyp:test_support_base', ], 'sources': [ 'tools/perf/flush_cache/flush_cache.cc', -@@ -1287,7 +1285,6 @@ +@@ -1351,7 +1348,6 @@ '..', ], 'dependencies': [ @@ -33,6 +33,14 @@ '../skia/skia.gyp:skia', ], 'sources': [ +@@ -1528,7 +1524,6 @@ + 'dependencies': [ + 'theme_resources', + 'theme_resources_standard', +- '../base/base.gyp:test_support_base', + '../skia/skia.gyp:skia', + '../testing/gtest.gyp:gtest', + ], --- chromium/src/chrome/browser/sync/tools/sync_tools.gyp 2011-04-08 16:44:28.737000131 +0200 +++ chromium/src/chrome/browser/sync/tools/sync_tools.gyp 2011-04-08 16:44:28.737000131 +0200 @@ -13,7 +13,6 @@ @@ -41,5 +49,5 @@ '<(DEPTH)/chrome/chrome.gyp:sync_notifier', - '<(DEPTH)/chrome/chrome.gyp:test_support_common', '<(DEPTH)/content/content.gyp:content_browser', + '<(DEPTH)/net/net.gyp:net', ], - }, ++++++ chromium-remoting-build-fix.diff --- chromium-remoting-build-fix.diff +++ chromium-remoting-build-fix.diff @@ -1,6 +1,6 @@ --- chromium/src/remoting/remoting.gyp 2010-10-03 15:13:07.746440175 +0200 +++ chromium/src/remoting/remoting.gyp 2010-10-03 15:13:07.746440175 +0200 -@@ -126,6 +126,11 @@ +@@ -243,6 +243,11 @@ # TODO(hclam): Enable VP8 in the build. #'third_party/on2/on2.gyp:vp8', ], @@ -11,4 +11,4 @@ + }, 'export_dependent_settings': [ '../base/base.gyp:base', - '../third_party/protobuf/protobuf.gyp:protobuf_lite', + '../net/net.gyp:net', ++++++ chromium-system-expat.patch --- chromium-system-expat.patch +++ chromium-system-expat.patch @@ -17,7 +17,7 @@ #include "talk/xmllite/xmlnsstack.h" -#ifdef EXPAT_RELATIVE_PATH --#include "lib/expat.h" +-#include "expat.h" -#else -#include "third_party/expat/v2_0_1/Source/lib/expat.h" -#endif // EXPAT_RELATIVE_PATH @@ -32,56 +32,11 @@ #include "talk/xmllite/xmlparser.h" -#ifdef EXPAT_RELATIVE_PATH --#include "lib/expat.h" +-#include "expat.h" -#else -#include "third_party/expat/v2_0_1/Source/lib/expat.h" -#endif // EXPAT_RELATIVE_PATH +#include namespace buzz { - ---- chromium-5.0.358.0-20100318svn41971/src/third_party/libjingle/source/talk/xmllite/xmlbuilder.cc.system-expat 2010-03-18 22:55:12.071283208 -0400 -+++ chromium-5.0.358.0-20100318svn41971/src/third_party/libjingle/source/talk/xmllite/xmlbuilder.cc 2010-03-18 22:55:27.671209061 -0400 -@@ -30,11 +30,7 @@ - #include "talk/base/common.h" - #include "talk/xmllite/xmlelement.h" - #include "talk/xmllite/xmlbuilder.h" --#ifdef EXPAT_RELATIVE_PATH --#include "lib/expat.h" --#else --#include "third_party/expat/v2_0_1/Source/lib/expat.h" --#endif // EXPAT_RELATIVE_PATH -+#include - - namespace buzz { - ---- chromium-5.0.358.0-20100318svn41971/src/third_party/libjingle/source/talk/xmllite/xmlparser.cc.system-expat 2010-03-18 22:55:12.071283208 -0400 -+++ chromium-5.0.358.0-20100318svn41971/src/third_party/libjingle/source/talk/xmllite/xmlparser.cc 2010-03-18 22:55:27.671209061 -0400 -@@ -35,11 +35,7 @@ - #include "talk/xmllite/xmlnsstack.h" - #include "talk/xmllite/xmlconstants.h" - #include "talk/xmllite/xmlnsstack.h" --#ifdef EXPAT_RELATIVE_PATH --#include "lib/expat.h" --#else --#include "third_party/expat/v2_0_1/Source/lib/expat.h" --#endif // EXPAT_RELATIVE_PATH -+#include - - namespace buzz { - ---- chromium-5.0.358.0-20100318svn41971/src/third_party/libjingle/source/talk/xmpp/xmppstanzaparser.cc.system-expat 2010-03-18 22:55:12.071283208 -0400 -+++ chromium-5.0.358.0-20100318svn41971/src/third_party/libjingle/source/talk/xmpp/xmppstanzaparser.cc 2010-03-18 22:55:27.671209061 -0400 -@@ -29,11 +29,7 @@ - #include "talk/base/common.h" - #include "talk/xmpp/xmppstanzaparser.h" - #include "talk/xmpp/constants.h" --#ifdef EXPAT_RELATIVE_PATH --#include "lib/expat.h" --#else --#include "third_party/expat/v2_0_1/Source/lib/expat.h" --#endif -+#include - - namespace buzz { ++++++ chromium.14.0.825.0.svn92811.tar.lzma (new) ++++++ ffmpeg-0.6-headers.tar.bz2 93768 lines of diff (skipped) ++++++ deleted files: --- chromium.14.0.792.0.svn88820.tar.lzma To REVIEW against the previous version: osc request show --diff 76359 To ACCEPT the request: osc request accept 76359 --message="reviewed ok." To DECLINE the request: osc request decline 76359 --message="declined for reason xyz (see ... for background / policy / ...)." To REVOKE the request: osc request revoke 76359 --message="retracted because ..., sorry / thx / see better version ..." -- Hermes messaging (http://hermes.opensuse.org) openSUSE Build Service (https://build.opensuse.org/) Collaboration: http://en.opensuse.org/Build_Service/Collaboration -- To unsubscribe, e-mail: opensuse-contrib+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-contrib+help@opensuse.org