From 766d060551433dfbd44406113da4594a6fb0b5ed Mon Sep 17 00:00:00 2001 From: tnut Date: Thu, 14 Oct 2010 19:41:17 +0200 Subject: chromium, port nettoyé MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- extra/chromium/Pkgfile | 3 +- .../chromium/chromium-html5-video-mimetypes.patch | 48 ------ extra/chromium/chromium.desktop | 113 ------------- extra/chromium/chromium.install | 11 -- extra/chromium/chromium.sh | 4 - extra/chromium/createSource | 55 ------- extra/chromium/createSource.htm | 54 ------ extra/chromium/drop_sse2.patch | 18 -- extra/chromium/ffmpeg_branding_mime.patch | 29 ---- extra/chromium/gyp-make.patch | 33 ---- extra/chromium/issue1620003_1_2.diff | 13 -- extra/chromium/issue2019002_21001.diff | 182 --------------------- extra/chromium/libpng-1.4.patch | 15 -- 13 files changed, 1 insertion(+), 577 deletions(-) delete mode 100644 extra/chromium/chromium-html5-video-mimetypes.patch delete mode 100644 extra/chromium/chromium.desktop delete mode 100644 extra/chromium/chromium.install delete mode 100644 extra/chromium/chromium.sh delete mode 100644 extra/chromium/createSource delete mode 100644 extra/chromium/createSource.htm delete mode 100644 extra/chromium/drop_sse2.patch delete mode 100644 extra/chromium/ffmpeg_branding_mime.patch delete mode 100644 extra/chromium/gyp-make.patch delete mode 100644 extra/chromium/issue1620003_1_2.diff delete mode 100644 extra/chromium/issue2019002_21001.diff delete mode 100644 extra/chromium/libpng-1.4.patch (limited to 'extra') diff --git a/extra/chromium/Pkgfile b/extra/chromium/Pkgfile index 42e59ab6e..c2473c57a 100644 --- a/extra/chromium/Pkgfile +++ b/extra/chromium/Pkgfile @@ -9,8 +9,7 @@ version=6.0.472.63 release=1 source=(http://build.chromium.org/buildbot/official/$name-$version.tar.bz2 \ - chromium.desktop chromium.sh \ - gyp-make.patch) + http://nutyx.meticul.eu/files/patchs/$name/{chromium.desktop,chromium.sh,gyp-make.patch}) build() { diff --git a/extra/chromium/chromium-html5-video-mimetypes.patch b/extra/chromium/chromium-html5-video-mimetypes.patch deleted file mode 100644 index f4e534a16..000000000 --- a/extra/chromium/chromium-html5-video-mimetypes.patch +++ /dev/null @@ -1,48 +0,0 @@ ---- - net/base/mime_util.cc | 4 ---- - 1 file changed, 4 deletions(-) - -Index: src/net/base/mime_util.cc -=================================================================== ---- src.orig/net/base/mime_util.cc -+++ src/net/base/mime_util.cc -@@ -183,39 +183,35 @@ - // 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[] = { - // Ogg. - "video/ogg", - "audio/ogg", - "application/ogg", - --#if defined(GOOGLE_CHROME_BUILD) - // MPEG-4. - "video/mp4", - "video/x-m4v", - "audio/mp4", - "audio/x-m4a", - - // MP3. - "audio/mp3", - "audio/x-mp3", - "audio/mpeg", --#endif - }; - - // List of supported codecs when passed in with . - // - // Refer to http://wiki.whatwg.org/wiki/Video_type_parameters#Browser_Support - // for more information. - static const char* const supported_media_codecs[] = { --#if defined(GOOGLE_CHROME_BUILD) - "avc1", - "mp4a", --#endif - "theora", - "vorbis", - }; - - // Note: does not include javascript types list (see supported_javascript_types) - static const char* const supported_non_image_types[] = { - "text/html", - "text/xml", diff --git a/extra/chromium/chromium.desktop b/extra/chromium/chromium.desktop deleted file mode 100644 index 4bb6981cf..000000000 --- a/extra/chromium/chromium.desktop +++ /dev/null @@ -1,113 +0,0 @@ -[Desktop Entry] -Version=1.0 -Name=Chromium -# Only KDE 4 seems to use GenericName, so we reuse the KDE strings. -# From Ubuntu's language-pack-kde-XX-base packages, version 9.04-20090413. -GenericName=Web Browser -GenericName[ar]=متصفح الشبكة -GenericName[bg]=Уеб браузър -GenericName[ca]=Navegador web -GenericName[cs]=WWW prohlížeč -GenericName[da]=Browser -GenericName[de]=Web-Browser -GenericName[el]=Περιηγητής ιστού -GenericName[en_GB]=Web Browser -GenericName[es]=Navegador web -GenericName[et]=Veebibrauser -GenericName[fi]=WWW-selain -GenericName[fr]=Navigateur Web -GenericName[gu]=વેબ બ્રાઉઝર -GenericName[he]=דפדפן אינטרנט -GenericName[hi]=वेब ब्राउज़र -GenericName[hu]=Webböngésző -GenericName[it]=Browser Web -GenericName[ja]=ウェブブラウザ -GenericName[kn]=ಜಾಲ ವೀಕ್ಷಕ -GenericName[ko]=웹 브라우저 -GenericName[lt]=Žiniatinklio naršyklė -GenericName[lv]=Tīmekļa pārlūks -GenericName[ml]=വെബ് ബ്രൌസര്‍ -GenericName[mr]=वेब ब्राऊजर -GenericName[nb]=Nettleser -GenericName[nl]=Webbrowser -GenericName[pl]=Przeglądarka WWW -GenericName[pt]=Navegador Web -GenericName[pt_BR]=Navegador da Internet -GenericName[ro]=Navigator de Internet -GenericName[ru]=Веб-браузер -GenericName[sl]=Spletni brskalnik -GenericName[sv]=Webbläsare -GenericName[ta]=இணைய உலாவி -GenericName[th]=เว็บเบราว์เซอร์ -GenericName[tr]=Web Tarayıcı -GenericName[uk]=Навігатор Тенет -GenericName[zh_CN]=网页浏览器 -GenericName[zh_HK]=網頁瀏覽器 -GenericName[zh_TW]=網頁瀏覽器 -# Not translated in KDE, from Epiphany 2.26.1-0ubuntu1. -GenericName[bn]=ওয়েব ব্রাউজার -GenericName[fil]=Web Browser -GenericName[hr]=Web preglednik -GenericName[id]=Browser Web -GenericName[or]=ଓ୍ବେବ ବ୍ରାଉଜର -GenericName[sk]=WWW prehliadač -GenericName[sr]=Интернет прегледник -GenericName[te]=మహాతల అన్వేషి -GenericName[vi]=Bộ duyệt Web -# Gnome and KDE 3 uses Comment. -Comment=Access the Internet -Comment[ar]=الدخول إلى الإنترنت -Comment[bg]=Достъп до интернет -Comment[bn]=ইন্টারনেটটি অ্যাক্সেস করুন -Comment[ca]=Accedeix a Internet -Comment[cs]=Přístup k internetu -Comment[da]=Få adgang til internettet -Comment[de]=Internetzugriff -Comment[el]=Πρόσβαση στο Διαδίκτυο -Comment[en_GB]=Access the Internet -Comment[es]=Accede a Internet. -Comment[et]=Pääs Internetti -Comment[fi]=Käytä internetiä -Comment[fil]=I-access ang Internet -Comment[fr]=Accéder à Internet -Comment[gu]=ઇંટરનેટ ઍક્સેસ કરો -Comment[he]=גישה אל האינטרנט -Comment[hi]=इंटरनेट तक पहुंच स्थापित करें -Comment[hr]=Pristup Internetu -Comment[hu]=Internetelérés -Comment[id]=Akses Internet -Comment[it]=Accesso a Internet -Comment[ja]=インターネットにアクセス -Comment[kn]=ಇಂಟರ್ನೆಟ್ ಅನ್ನು ಪ್ರವೇಶಿಸಿ -Comment[ko]=인터넷 연결 -Comment[lt]=Interneto prieiga -Comment[lv]=Piekļūt internetam -Comment[ml]=ഇന്റര്‍‌നെറ്റ് ആക്‌സസ് ചെയ്യുക -Comment[mr]=इंटरनेटमध्ये प्रवेश करा -Comment[nb]=Gå til Internett -Comment[nl]=Verbinding maken met internet -Comment[or]=ଇଣ୍ଟର୍ନେଟ୍ ପ୍ରବେଶ କରନ୍ତୁ -Comment[pl]=Skorzystaj z internetu -Comment[pt]=Aceder à Internet -Comment[pt_BR]=Acessar a internet -Comment[ro]=Accesaţi Internetul -Comment[ru]=Доступ в Интернет -Comment[sk]=Prístup do siete Internet -Comment[sl]=Dostop do interneta -Comment[sr]=Приступите Интернету -Comment[sv]=Gå ut på Internet -Comment[ta]=இணையத்தை அணுகுதல் -Comment[te]=ఇంటర్నెట్‌ను ఆక్సెస్ చెయ్యండి -Comment[th]=เข้าถึงอินเทอร์เน็ต -Comment[tr]=İnternet'e erişin -Comment[uk]=Доступ до Інтернету -Comment[vi]=Truy cập Internet -Comment[zh_CN]=访问互联网 -Comment[zh_HK]=連線到網際網路 -Comment[zh_TW]=連線到網際網路 -Exec=chromium %U -Terminal=false -Icon=chromium -Type=Application -Categories=GTK;Network;WebBrowser; -MimeType=text/html;text/xml;application/xhtml_xml; diff --git a/extra/chromium/chromium.install b/extra/chromium/chromium.install deleted file mode 100644 index e70c054ec..000000000 --- a/extra/chromium/chromium.install +++ /dev/null @@ -1,11 +0,0 @@ -post_install() { - xdg-icon-resource forceupdate --theme hicolor &> /dev/null -} - -post_upgrade() { - post_install -} - -post_remove() { - post_install -} diff --git a/extra/chromium/chromium.sh b/extra/chromium/chromium.sh deleted file mode 100644 index e1c3388e5..000000000 --- a/extra/chromium/chromium.sh +++ /dev/null @@ -1,4 +0,0 @@ -#!/bin/sh -export CHROME_WRAPPER=/usr/lib/chromium/chromium -export CHROME_DESKTOP=chromium.desktop -exec /usr/lib/chromium/chromium "$@" diff --git a/extra/chromium/createSource b/extra/chromium/createSource deleted file mode 100644 index ddd0140a4..000000000 --- a/extra/chromium/createSource +++ /dev/null @@ -1,55 +0,0 @@ -#!/bin/bash - -. PKGBUILD - -# see http://src.chromium.org/svn/trunk/src/tools/export_tarball/export_tarball.py -nonessential_dirs=( - 'src/chrome/test/data' - 'src/chrome/tools/test/reference_build' - 'src/gears/binaries' - 'src/net/data/cache_tests' - 'src/o3d/documentation' - 'src/o3d/samples' - 'src/third_party/lighttpd' - 'src/third_party/WebKit/LayoutTests' - 'src/webkit/data/layout_tests' - 'src/webkit/tools/test/reference_build' -) - -current=$(pwd) -tmp=$(mktemp -d) -mkdir -p $tmp/chromium-$pkgver -cd $tmp/chromium-$pkgver - -# this should be updated to a more recent revision on major updates -svn co -r42572 -q http://src.chromium.org/svn/trunk/tools/depot_tools/ depot_tools - -export PATH=./depot_tools/:$PATH -chmod +x ./depot_tools/gclient.py -gclient.py config http://src.chromium.org/svn/releases/$pkgver -sed -e '15i\ "src/third_party/WebKit/LayoutTests": None,' \ - -e '15i\ "src/chrome/tools/test/reference_build": None,' \ - -e '15i\ "src/third_party/ffmpeg/binaries/chromium/linux/ia32": None,' \ - -e '15i\ "src/third_party/ffmpeg/binaries/chromium/linux/ia32_dbg": None,' \ - -e '15i\ "src/third_party/ffmpeg/binaries/chromium/linux/x64": None,' \ - -e '15i\ "src/third_party/ffmpeg/binaries/chromium/linux/x64_dbg": None,' \ - -i .gclient -gclient.py sync --force --nohooks - -svnversion src > src/build/LASTCHANGE.in - -for i in ${nonessential_dirs[@]}; do - rm -rf $i -done - -find . -name '.svn' -type d -exec rm -rf {} \; -find . -iname '*.dll' -delete -find . -iname '*.exe' -delete -find . -iname '*.o' -delete -find . -iname '*.nexe' -delete - -cd .. -bsdtar cJf $current/chromium-$pkgver.tar.xz chromium-$pkgver -cd $current - -rm -rf $tmp diff --git a/extra/chromium/createSource.htm b/extra/chromium/createSource.htm deleted file mode 100644 index 3df70baab..000000000 --- a/extra/chromium/createSource.htm +++ /dev/null @@ -1,54 +0,0 @@ -#!/bin/bash - -. PKGBUILD - -# see http://src.chromium.org/svn/trunk/src/tools/export_tarball/export_tarball.py -nonessential_dirs=( - 'src/chrome/test/data' - 'src/chrome/tools/test/reference_build' - 'src/gears/binaries' - 'src/net/data/cache_tests' - 'src/o3d/documentation' - 'src/o3d/samples' - 'src/third_party/lighttpd' - 'src/third_party/WebKit/LayoutTests' - 'src/webkit/data/layout_tests' - 'src/webkit/tools/test/reference_build' -) - -current=$(pwd) -tmp=$(mktemp -d) -mkdir -p $tmp/chromium-$pkgver -cd $tmp/chromium-$pkgver - -# this should be updated to a more recent revision on major updates -svn co -r38382 -q http://src.chromium.org/svn/trunk/tools/depot_tools/ depot_tools - -export PATH=./depot_tools/:$PATH -gclient.py config http://src.chromium.org/svn/releases/$pkgver -sed -e '15i\ "src/third_party/WebKit/LayoutTests": None,' \ - -e '15i\ "src/chrome/tools/test/reference_build": None,' \ - -e '15i\ "src/third_party/ffmpeg/binaries/chromium/linux/ia32": None,' \ - -e '15i\ "src/third_party/ffmpeg/binaries/chromium/linux/ia32_dbg": None,' \ - -e '15i\ "src/third_party/ffmpeg/binaries/chromium/linux/x64": None,' \ - -e '15i\ "src/third_party/ffmpeg/binaries/chromium/linux/x64_dbg": None,' \ - -i .gclient -gclient.py sync --force --nohooks - -svnversion src > src/build/LASTCHANGE.in - -for i in ${nonessential_dirs[@]}; do - rm -rf $i -done - -find . -name '.svn' -type d -exec rm -rf {} \; -find . -iname '*.dll' -delete -find . -iname '*.exe' -delete -find . -iname '*.o' -delete -find . -iname '*.nexe' -delete - -cd .. -bsdtar cJf $current/chromium-$pkgver.tar.xz chromium-$pkgver -cd $current - -rm -rf $tmp diff --git a/extra/chromium/drop_sse2.patch b/extra/chromium/drop_sse2.patch deleted file mode 100644 index 66051ff27..000000000 --- a/extra/chromium/drop_sse2.patch +++ /dev/null @@ -1,18 +0,0 @@ ---- src/build/common.gypi 2010-02-11 19:30:43.000000000 +0100 -+++ src/build/common.gypi 2010-02-11 21:07:58.505011143 +0100 -@@ -759,15 +759,6 @@ - # used during computation does not change depending on how the - # compiler optimized the code, since the value is always kept - # in its specified precision. -- 'conditions': [ -- ['branding=="Chromium"', { -- 'cflags': [ -- '-march=pentium4', -- '-msse2', -- '-mfpmath=sse', -- ], -- }], -- ], - 'cflags': [ - '-m32', - ], diff --git a/extra/chromium/ffmpeg_branding_mime.patch b/extra/chromium/ffmpeg_branding_mime.patch deleted file mode 100644 index 083026e76..000000000 --- a/extra/chromium/ffmpeg_branding_mime.patch +++ /dev/null @@ -1,29 +0,0 @@ ---- src/net/base/mime_util.cc 2010-02-11 20:07:33.939537145 +0100 -+++ src/net/base/mime_util.cc 2010-02-11 20:07:33.955373468 +0100 -@@ -188,7 +188,6 @@ - "audio/ogg", - "application/ogg", - --#if defined(GOOGLE_CHROME_BUILD) - // MPEG-4. - "video/mp4", - "video/x-m4v", -@@ -199,7 +198,6 @@ - "audio/mp3", - "audio/x-mp3", - "audio/mpeg", --#endif - }; - - // List of supported codecs when passed in with . -@@ -207,10 +205,8 @@ - // Refer to http://wiki.whatwg.org/wiki/Video_type_parameters#Browser_Support - // for more information. - static const char* const supported_media_codecs[] = { --#if defined(GOOGLE_CHROME_BUILD) - "avc1", - "mp4a", --#endif - "theora", - "vorbis", - }; diff --git a/extra/chromium/gyp-make.patch b/extra/chromium/gyp-make.patch deleted file mode 100644 index 7fa9d639a..000000000 --- a/extra/chromium/gyp-make.patch +++ /dev/null @@ -1,33 +0,0 @@ ---- tools/gyp/pylib/gyp/generator/make.py (revision 839) -+++ tools/gyp/pylib/gyp/generator/make.py (working copy) -@@ -497,6 +497,12 @@ - return string - - -+def StringToMakefileVariable(string): -+ """Convert a string to a value that is acceptable as a make variable name.""" -+ # TODO: replace other metacharacters that we encounter. -+ return string.replace(' ', '_') -+ -+ - srcdir_prefix = '' - def Sourceify(path): - """Convert a path to its source directory form.""" -@@ -656,7 +662,7 @@ - part_of_all: flag indicating this target is part of 'all' - """ - for action in actions: -- name = self.target + '_' + action['action_name'] -+ name = self.target + '_' + StringToMakefileVariable(action['action_name']) - self.WriteLn('### Rules for action "%s":' % action['action_name']) - inputs = action['inputs'] - outputs = action['outputs'] -@@ -725,7 +731,7 @@ - part_of_all: flag indicating this target is part of 'all' - """ - for rule in rules: -- name = self.target + '_' + rule['rule_name'] -+ name = self.target + '_' + StringToMakefileVariable(rule['rule_name']) - count = 0 - self.WriteLn('### Generated for rule %s:' % name) - diff --git a/extra/chromium/issue1620003_1_2.diff b/extra/chromium/issue1620003_1_2.diff deleted file mode 100644 index fd1ebd1b8..000000000 --- a/extra/chromium/issue1620003_1_2.diff +++ /dev/null @@ -1,13 +0,0 @@ -Index: chrome/browser/cocoa/browser_frame_view.mm -=================================================================== ---- chrome/browser/cocoa/browser_frame_view.mm (revision 43477) -+++ chrome/browser/cocoa/browser_frame_view.mm (working copy) -@@ -243,7 +243,7 @@ - - [[NSGraphicsContext currentContext] setPatternPhase:phase]; - [themeImageColor set]; -- NSRectFill(dirtyRect); -+ NSRectFillUsingOperation(dirtyRect, NSCompositeSourceOver); - themed = YES; - } else if (gradient) { - NSPoint startPoint = NSMakePoint(NSMinX(bounds), NSMaxY(bounds)); diff --git a/extra/chromium/issue2019002_21001.diff b/extra/chromium/issue2019002_21001.diff deleted file mode 100644 index 9890be55f..000000000 --- a/extra/chromium/issue2019002_21001.diff +++ /dev/null @@ -1,182 +0,0 @@ -Index: app/clipboard/clipboard_unittest.cc -diff --git a/app/clipboard/clipboard_unittest.cc b/app/clipboard/clipboard_unittest.cc -index d15247b51ba25af077154b8ce391fe2f47e961af..89702f1ae20b7a008ec729a75a27de4dfe026b75 100644 ---- a/app/clipboard/clipboard_unittest.cc -+++ b/app/clipboard/clipboard_unittest.cc -@@ -232,7 +232,7 @@ TEST_F(ClipboardTest, SharedBitmapTest) { - ASSERT_TRUE(shared_buf.Map(bytes)); - memcpy(shared_buf.memory(), fake_bitmap, bytes); - base::SharedMemoryHandle handle_to_share; -- base::ProcessHandle current_process = NULL; -+ base::ProcessHandle current_process = base::kNullProcessHandle; - #if defined(OS_WIN) - current_process = GetCurrentProcess(); - #endif -Index: chrome/browser/search_engines/template_url.cc -diff --git a/chrome/browser/search_engines/template_url.cc b/chrome/browser/search_engines/template_url.cc -index fe8356149d730aee4cc4525f29a4c213f646727a..43dae528ae41dcf12e37d5e8de59004026c4cb6d 100644 ---- a/chrome/browser/search_engines/template_url.cc -+++ b/chrome/browser/search_engines/template_url.cc -@@ -102,7 +102,7 @@ bool TemplateURLRef::ParseParameter(size_t start, - // Remove the parameter from the string. - url->erase(start, end - start + 1); - if (parameter == kSearchTermsParameter) { -- replacements->push_back(Replacement(SEARCH_TERMS, static_cast(start))); -+ replacements->push_back(Replacement(SEARCH_TERMS, start)); - } else if (parameter == kCountParameter) { - if (!optional) - url->insert(start, kDefaultCount); -@@ -115,30 +115,26 @@ bool TemplateURLRef::ParseParameter(size_t start, - url->insert(start, IntToWString(page_offset_)); - } - } else if (parameter == kLanguageParameter) { -- replacements->push_back(Replacement(LANGUAGE, static_cast(start))); -+ replacements->push_back(Replacement(LANGUAGE, start)); - } else if (parameter == kInputEncodingParameter) { -- replacements->push_back(Replacement(ENCODING, static_cast(start))); -+ replacements->push_back(Replacement(ENCODING, start)); - } else if (parameter == kOutputEncodingParameter) { - if (!optional) - url->insert(start, kOutputEncodingType); - } else if (parameter == kGoogleAcceptedSuggestionParameter) { -- replacements->push_back(Replacement(GOOGLE_ACCEPTED_SUGGESTION, -- static_cast(start))); -+ replacements->push_back(Replacement(GOOGLE_ACCEPTED_SUGGESTION, start)); - } else if (parameter == kGoogleBaseURLParameter) { -- replacements->push_back(Replacement(GOOGLE_BASE_URL, -- static_cast(start))); -+ replacements->push_back(Replacement(GOOGLE_BASE_URL, start)); - } else if (WideToUTF16Hack(parameter) == - ASCIIToUTF16(kGoogleBaseSuggestURLParameter)) { -- replacements->push_back(Replacement(GOOGLE_BASE_SUGGEST_URL, -- static_cast(start))); -+ replacements->push_back(Replacement(GOOGLE_BASE_SUGGEST_URL, start)); - } else if (parameter == kGoogleOriginalQueryForSuggestionParameter) { - replacements->push_back(Replacement(GOOGLE_ORIGINAL_QUERY_FOR_SUGGESTION, -- static_cast(start))); -+ start)); - } else if (parameter == kGoogleRLZParameter) { -- replacements->push_back(Replacement(GOOGLE_RLZ, static_cast(start))); -+ replacements->push_back(Replacement(GOOGLE_RLZ, start)); - } else if (parameter == kGoogleUnescapedSearchTermsParameter) { -- replacements->push_back(Replacement(GOOGLE_UNESCAPED_SEARCH_TERMS, -- static_cast(start))); -+ replacements->push_back(Replacement(GOOGLE_UNESCAPED_SEARCH_TERMS, start)); - } else { - // It can be some garbage but can also be a javascript block. Put it back. - url->insert(start, full_parameter); -Index: chrome/browser/search_engines/template_url.h -diff --git a/chrome/browser/search_engines/template_url.h b/chrome/browser/search_engines/template_url.h -index 90cd7341ca17818e2ba792e2d24be8c266420a6e..5a5c67f18a1611c646a5c722b39cc7efeb4e8db5 100644 ---- a/chrome/browser/search_engines/template_url.h -+++ b/chrome/browser/search_engines/template_url.h -@@ -136,9 +136,10 @@ class TemplateURLRef { - - // Used to identify an element of the raw url that can be replaced. - struct Replacement { -- Replacement(ReplacementType type, int index) : type(type), index(index) {} -+ Replacement(ReplacementType type, size_t index) -+ : type(type), index(index) {} - ReplacementType type; -- int index; -+ size_t index; - }; - - // The list of elements to replace. -Index: chrome/browser/search_engines/template_url_unittest.cc -diff --git a/chrome/browser/search_engines/template_url_unittest.cc b/chrome/browser/search_engines/template_url_unittest.cc -index b2ef832b1bc1b5a37e8c9b6d4e61a3c1371977ce..5f9bfff80929da9683e1aca58ffe079bab947187 100644 ---- a/chrome/browser/search_engines/template_url_unittest.cc -+++ b/chrome/browser/search_engines/template_url_unittest.cc -@@ -421,7 +421,7 @@ TEST_F(TemplateURLTest, ParseParameterKnown) { - EXPECT_TRUE(url_ref.ParseParameter(0, 12, &parsed_url, &replacements)); - EXPECT_EQ(std::wstring(), parsed_url); - ASSERT_EQ(1U, replacements.size()); -- EXPECT_EQ(0, replacements[0].index); -+ EXPECT_EQ(static_cast(0), replacements[0].index); - EXPECT_EQ(TemplateURLRef::SEARCH_TERMS, replacements[0].type); - } - -@@ -468,7 +468,7 @@ TEST_F(TemplateURLTest, ParseURLTwoParameters) { - EXPECT_EQ(L"{}{}", - url_ref.ParseURL(L"{}{{searchTerms}}", &replacements, &valid)); - ASSERT_EQ(1U, replacements.size()); -- EXPECT_EQ(3, replacements[0].index); -+ EXPECT_EQ(static_cast(3), replacements[0].index); - EXPECT_EQ(TemplateURLRef::SEARCH_TERMS, replacements[0].type); - EXPECT_TRUE(valid); - } -@@ -479,7 +479,7 @@ TEST_F(TemplateURLTest, ParseURLNestedParameter) { - bool valid = false; - EXPECT_EQ(L"{", url_ref.ParseURL(L"{{searchTerms}", &replacements, &valid)); - ASSERT_EQ(1U, replacements.size()); -- EXPECT_EQ(1, replacements[0].index); -+ EXPECT_EQ(static_cast(1), replacements[0].index); - EXPECT_EQ(TemplateURLRef::SEARCH_TERMS, replacements[0].type); - EXPECT_TRUE(valid); - } -Index: chrome/plugin/webplugin_delegate_stub.cc -diff --git a/chrome/plugin/webplugin_delegate_stub.cc b/chrome/plugin/webplugin_delegate_stub.cc -index 9b1ec53c8accbd22cd7e66b18540857629510708..0f47bd85cb7bfdeb5a0dcd66e0b2685428c5e5bf 100644 ---- a/chrome/plugin/webplugin_delegate_stub.cc -+++ b/chrome/plugin/webplugin_delegate_stub.cc -@@ -158,7 +158,7 @@ void WebPluginDelegateStub::OnInit(const PluginMsg_Init_Params& params, - command_line.GetSwitchValue(switches::kPluginPath)); - - -- gfx::PluginWindowHandle parent = 0; -+ gfx::PluginWindowHandle parent = gfx::kNullPluginWindow; - #if defined(OS_WIN) - parent = gfx::NativeViewFromId(params.containing_window); - #elif defined(OS_LINUX) -Index: chrome/renderer/webplugin_delegate_pepper.cc -diff --git a/chrome/renderer/webplugin_delegate_pepper.cc b/chrome/renderer/webplugin_delegate_pepper.cc -index 683382d76a89d5e6a8b15bb676f9a1b099ad7018..c545c875b3ec9899713ee6c86f43340261faa311 100644 ---- a/chrome/renderer/webplugin_delegate_pepper.cc -+++ b/chrome/renderer/webplugin_delegate_pepper.cc -@@ -395,7 +395,7 @@ NPError WebPluginDelegatePepper::Device2DInitializeContext( - // This is a windowless plugin, so set it to have no handle. Defer this - // until we know the plugin will use the 2D device. If it uses the 3D device - // it will have a window handle. -- plugin_->SetWindow(0); -+ plugin_->SetWindow(gfx::kNullPluginWindow); - - scoped_ptr g2d(new Graphics2DDeviceContext(this)); - NPError status = g2d->Initialize(window_rect_, config, context); -Index: webkit/glue/plugins/plugin_host.cc -diff --git a/webkit/glue/plugins/plugin_host.cc b/webkit/glue/plugins/plugin_host.cc -index 41d2fa288727c0d0db0a064f3a94ba24782c69a2..a6e0fde83d3883e967b265e953ae1538f88303ff 100644 ---- a/webkit/glue/plugins/plugin_host.cc -+++ b/webkit/glue/plugins/plugin_host.cc -@@ -656,7 +656,7 @@ NPError NPN_GetValue(NPP id, NPNVariable variable, void* value) { - - NPError rv = NPERR_GENERIC_ERROR; - -- switch (variable) { -+ switch (static_cast(variable)) { - case NPNVWindowNPObject: { - scoped_refptr plugin = FindInstance(id); - NPObject *np_object = plugin->webplugin()->GetWindowScriptNPObject(); -Index: webkit/glue/plugins/webplugin_impl.cc -diff --git a/webkit/glue/plugins/webplugin_impl.cc b/webkit/glue/plugins/webplugin_impl.cc -index 8a0e75e63b6f4570c7d78f6ce8afc8eca4ba9251..693232ba1fdde8de816717dffc29b19acf59f6f1 100644 ---- a/webkit/glue/plugins/webplugin_impl.cc -+++ b/webkit/glue/plugins/webplugin_impl.cc -@@ -412,7 +412,7 @@ WebPluginImpl::WebPluginImpl( - WebFrame* webframe, const WebPluginParams& params, - const base::WeakPtr& page_delegate) - : windowless_(false), -- window_(0), -+ window_(gfx::kNullPluginWindow), - accepts_input_events_(false), - page_delegate_(page_delegate), - webframe_(webframe), -@@ -473,7 +473,7 @@ void WebPluginImpl::SetWindow(gfx::PluginWindowHandle window) { - - void WebPluginImpl::WillDestroyWindow(gfx::PluginWindowHandle window) { - DCHECK_EQ(window, window_); -- window_ = 0; -+ window_ = gfx::kNullPluginWindow; - if (page_delegate_) - page_delegate_->WillDestroyPluginWindow(window); - } diff --git a/extra/chromium/libpng-1.4.patch b/extra/chromium/libpng-1.4.patch deleted file mode 100644 index e0e989539..000000000 --- a/extra/chromium/libpng-1.4.patch +++ /dev/null @@ -1,15 +0,0 @@ ---- src/third_party/WebKit/WebCore/platform/image-encoders/skia/orig/PNGImageEncoder.cpp 2009-11-19 13:39:07.000000000 -0800 -+++ src/third_party/WebKit/WebCore/platform/image-encoders/skia/PNGImageEncoder.cpp 2009-11-19 13:39:25.000000000 -0800 -@@ -130,9 +130,9 @@ - } - - png_struct* pngPtr = png_create_write_struct(PNG_LIBPNG_VER_STRING, -- png_voidp_NULL, -- png_error_ptr_NULL, -- png_error_ptr_NULL); -+ NULL, -+ NULL, -+ NULL); - if (!pngPtr) - return false; - -- cgit v1.2.3-54-g00ecf