Date: Monday, October 8, 2012 @ 16:01:11 Author: foutrelis Revision: 168325
upgpkg: chromium 22.0.1229.92-1 New upstream release. Modified: chromium/trunk/PKGBUILD Deleted: chromium/trunk/chromium-22.0.1229.79-only-use-the-different-return-type-under-test.patch ---------------------------------------------------------------------------+ PKGBUILD | 12 +------ chromium-22.0.1229.79-only-use-the-different-return-type-under-test.patch | 17 ---------- 2 files changed, 3 insertions(+), 26 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2012-10-08 19:48:38 UTC (rev 168324) +++ PKGBUILD 2012-10-08 20:01:11 UTC (rev 168325) @@ -5,8 +5,8 @@ # Contributor: Daniel J Griffiths <[email protected]> pkgname=chromium -pkgver=22.0.1229.79 -pkgrel=2 +pkgver=22.0.1229.92 +pkgrel=1 pkgdesc="The open-source project behind Google Chrome, an attempt at creating a safer, faster, and more stable browser" arch=('i686' 'x86_64') url="http://www.chromium.org/"; @@ -24,14 +24,12 @@ chromium.default chromium.sh chromium-20.0.1132.57-glib-2.16-use-siginfo_t.patch - chromium-22.0.1229.79-only-use-the-different-return-type-under-test.patch chromium-ppapi-r0.patch) -sha256sums=('06cab1c48092def5bd94e9f4aa764f6ff5728ce35bbcdcc12fddbad3a0f0f738' +sha256sums=('7f796f9df9ac2030801f5e0fc4b19d00757568f295d46e9cbc235853ec861e19' '09bfac44104f4ccda4c228053f689c947b3e97da9a4ab6fa34ce061ee83d0322' '478340d5760a9bd6c549e19b1b5d1c5b4933ebf5f8cfb2b3e2d70d07443fe232' '4999fded897af692f4974f0a3e3bbb215193519918a1fa9b31ed51e74a2dccb9' 'c1baf14121502efbc2a31b64029dcafa0e28ca5b71ad0e28a3c6342d18198615' - '9fd5cb18b109e172e6244456ba265c343460537d6acc0eb5c3def6ebc8272056' '1f4b57670d317959bc2dc60e5d2a44aa8fc6028f7ed540cdb502fa0aa99c81bd') build() { @@ -40,10 +38,6 @@ # Fix build with glibc 2.16 patch -Np1 -i "$srcdir/chromium-20.0.1132.57-glib-2.16-use-siginfo_t.patch" - # Fix return code when reusing the existing browser - # http://code.google.com/p/chromium/issues/detail?id=146842 - patch -Np2 -i "$srcdir/chromium-22.0.1229.79-only-use-the-different-return-type-under-test.patch" - # Fix build without NaCl glibc toolchain (patch from Gentoo) patch -Np0 -i "$srcdir/chromium-ppapi-r0.patch" Deleted: chromium-22.0.1229.79-only-use-the-different-return-type-under-test.patch =================================================================== --- chromium-22.0.1229.79-only-use-the-different-return-type-under-test.patch 2012-10-08 19:48:38 UTC (rev 168324) +++ chromium-22.0.1229.79-only-use-the-different-return-type-under-test.patch 2012-10-08 20:01:11 UTC (rev 168325) @@ -1,17 +0,0 @@ ---- trunk/src/chrome/browser/chrome_browser_main.cc 2012/09/07 19:44:53 155456 -+++ trunk/src/chrome/browser/chrome_browser_main.cc 2012/09/07 19:45:06 155457 -@@ -1081,7 +1081,13 @@ - printf("%s\n", base::SysWideToNativeMB(UTF16ToWide( - l10n_util::GetStringUTF16(IDS_USED_EXISTING_BROWSER))).c_str()); - #endif -- return chrome::RESULT_CODE_NORMAL_EXIT_PROCESS_NOTIFIED; -+ // Having a differentiated return type for testing allows for tests to -+ // verify proper handling of some switches. When not testing, stick to -+ // the standard Unix convention of returning zero when things went as -+ // expected. -+ if (parsed_command_line().HasSwitch(switches::kTestType)) -+ return chrome::RESULT_CODE_NORMAL_EXIT_PROCESS_NOTIFIED; -+ return content::RESULT_CODE_NORMAL_EXIT; - - case ProcessSingleton::PROFILE_IN_USE: - return chrome::RESULT_CODE_PROFILE_IN_USE;
