diff options
author | Mike Gilbert <floppym@gentoo.org> | 2012-04-11 18:21:56 +0000 |
---|---|---|
committer | Mike Gilbert <floppym@gentoo.org> | 2012-04-11 18:21:56 +0000 |
commit | 3318bd7ddb784c61dd70fd80e66b2397a81704ac (patch) | |
tree | 22a61b3c3fc1ae15ef626648cfcfada82e405a22 /www-client | |
parent | add fix for prs1 loader (diff) | |
download | gentoo-2-3318bd7ddb784c61dd70fd80e66b2397a81704ac.tar.gz gentoo-2-3318bd7ddb784c61dd70fd80e66b2397a81704ac.tar.bz2 gentoo-2-3318bd7ddb784c61dd70fd80e66b2397a81704ac.zip |
Remove unused files.
(Portage version: 2.2.0_alpha100/cvs/Linux x86_64)
Diffstat (limited to 'www-client')
-rw-r--r-- | www-client/chromium/ChangeLog | 11 | ||||
-rw-r--r-- | www-client/chromium/files/chromium-cups-r0.patch | 20 | ||||
-rw-r--r-- | www-client/chromium/files/chromium-dev-shm-r0.patch | 193 | ||||
-rw-r--r-- | www-client/chromium/files/chromium-icu-compatibility-r0.patch | 53 | ||||
-rw-r--r-- | www-client/chromium/files/chromium-kerberos-r0.patch | 22 | ||||
-rw-r--r-- | www-client/chromium/files/chromium-revert-jpeg-swizzle-r0.patch | 62 | ||||
-rw-r--r-- | www-client/chromium/files/chromium-revert-jpeg-swizzle-r1.patch | 61 | ||||
-rw-r--r-- | www-client/chromium/files/chromium-system-libevent-r0.patch | 12 | ||||
-rw-r--r-- | www-client/chromium/files/extract_v8_version.py | 24 | ||||
-rw-r--r-- | www-client/chromium/files/nacl.gypi | 8 |
10 files changed, 10 insertions, 456 deletions
diff --git a/www-client/chromium/ChangeLog b/www-client/chromium/ChangeLog index 7aeb40f705e1..9735e310fe46 100644 --- a/www-client/chromium/ChangeLog +++ b/www-client/chromium/ChangeLog @@ -1,6 +1,15 @@ # ChangeLog for www-client/chromium # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/ChangeLog,v 1.607 2012/04/11 12:54:21 phajdan.jr Exp $ +# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/ChangeLog,v 1.608 2012/04/11 18:21:56 floppym Exp $ + + 11 Apr 2012; Mike Gilbert <floppym@gentoo.org> -files/chromium-cups-r0.patch, + -files/chromium-dev-shm-r0.patch, -files/chromium-icu-compatibility-r0.patch, + -files/chromium-kerberos-r0.patch, + -files/chromium-revert-jpeg-swizzle-r0.patch, + -files/chromium-revert-jpeg-swizzle-r1.patch, + -files/chromium-system-libevent-r0.patch, -files/extract_v8_version.py, + -files/nacl.gypi: + Remove unused files. *chromium-20.0.1096.1 (11 Apr 2012) diff --git a/www-client/chromium/files/chromium-cups-r0.patch b/www-client/chromium/files/chromium-cups-r0.patch deleted file mode 100644 index 7d534480a3c1..000000000000 --- a/www-client/chromium/files/chromium-cups-r0.patch +++ /dev/null @@ -1,20 +0,0 @@ -Index: chrome/browser/printing/print_dialog_gtk.cc -=================================================================== ---- chrome/browser/printing/print_dialog_gtk.cc (revision 108912) -+++ chrome/browser/printing/print_dialog_gtk.cc (working copy) -@@ -191,6 +191,7 @@ - gtk_print_settings_set_n_copies(gtk_settings_, copies); - gtk_print_settings_set_collate(gtk_settings_, collate); - -+#if defined(USE_CUPS) - std::string color_value; - std::string color_setting_name; - printing::GetColorModelForMode(color, &color_setting_name, &color_value); -@@ -214,6 +215,7 @@ - break; - } - gtk_print_settings_set(gtk_settings_, kCUPSDuplex, cups_duplex_mode); - } -+#endif - } - if (!page_setup_) diff --git a/www-client/chromium/files/chromium-dev-shm-r0.patch b/www-client/chromium/files/chromium-dev-shm-r0.patch deleted file mode 100644 index 2c4c2b7eaace..000000000000 --- a/www-client/chromium/files/chromium-dev-shm-r0.patch +++ /dev/null @@ -1,193 +0,0 @@ -Backport http://codereview.chromium.org/8800025 to fix issues with noexec /dev/shm -diff --git a/base/file_util.h b/base/file_util.h -index 90ec1ae..78827e9 100644 ---- a/base/file_util.h -+++ b/base/file_util.h -@@ -259,7 +259,7 @@ BASE_EXPORT bool IsDirectoryEmpty(const FilePath& dir_path); - BASE_EXPORT bool GetTempDir(FilePath* path); - // Get a temporary directory for shared memory files. - // Only useful on POSIX; redirects to GetTempDir() on Windows. --BASE_EXPORT bool GetShmemTempDir(FilePath* path); -+BASE_EXPORT bool GetShmemTempDir(FilePath* path, bool executable); - - // Get the home directory. This is more complicated than just getenv("HOME") - // as it knows to fall back on getpwent() etc. -@@ -279,7 +279,10 @@ BASE_EXPORT bool CreateTemporaryFileInDir(const FilePath& dir, - // Returns a handle to the opened file or NULL if an error occured. - BASE_EXPORT FILE* CreateAndOpenTemporaryFile(FilePath* path); - // Like above but for shmem files. Only useful for POSIX. --BASE_EXPORT FILE* CreateAndOpenTemporaryShmemFile(FilePath* path); -+// The executable flag says the file needs to support using -+// mprotect with PROT_EXEC after mapping. -+BASE_EXPORT FILE* CreateAndOpenTemporaryShmemFile(FilePath* path, -+ bool executable); - // Similar to CreateAndOpenTemporaryFile, but the file is created in |dir|. - BASE_EXPORT FILE* CreateAndOpenTemporaryFileInDir(const FilePath& dir, - FilePath* path); -diff --git a/base/file_util_android.cc b/base/file_util_android.cc -index eff3a46..6807d8d 100644 ---- a/base/file_util_android.cc -+++ b/base/file_util_android.cc -@@ -8,7 +8,7 @@ - - namespace file_util { - --bool GetShmemTempDir(FilePath* path) { -+bool GetShmemTempDir(FilePath* path, bool executable) { - *path = FilePath("/data/local/tmp"); - return true; - } -diff --git a/base/file_util_mac.mm b/base/file_util_mac.mm -index 95d4f25..bb4975d 100644 ---- a/base/file_util_mac.mm -+++ b/base/file_util_mac.mm -@@ -1,4 +1,4 @@ --// Copyright (c) 2010 The Chromium Authors. All rights reserved. -+// Copyright (c) 2011 The Chromium Authors. All rights reserved. - // Use of this source code is governed by a BSD-style license that can be - // found in the LICENSE file. - -@@ -22,7 +22,7 @@ bool GetTempDir(FilePath* path) { - return true; - } - --bool GetShmemTempDir(FilePath* path) { -+bool GetShmemTempDir(FilePath* path, bool executable) { - return GetTempDir(path); - } - -diff --git a/base/file_util_posix.cc b/base/file_util_posix.cc -index 582f70e..5c14abd 100644 ---- a/base/file_util_posix.cc -+++ b/base/file_util_posix.cc -@@ -481,9 +481,9 @@ bool CreateTemporaryFile(FilePath* path) { - return true; - } - --FILE* CreateAndOpenTemporaryShmemFile(FilePath* path) { -+FILE* CreateAndOpenTemporaryShmemFile(FilePath* path, bool executable) { - FilePath directory; -- if (!GetShmemTempDir(&directory)) -+ if (!GetShmemTempDir(&directory, executable)) - return NULL; - - return CreateAndOpenTemporaryFileInDir(directory, path); -@@ -910,15 +910,52 @@ bool GetTempDir(FilePath* path) { - } - - #if !defined(OS_ANDROID) --bool GetShmemTempDir(FilePath* path) { -+ - #if defined(OS_LINUX) -- *path = FilePath("/dev/shm"); -- return true; --#else -- return GetTempDir(path); --#endif -+// Determine if /dev/shm files can be mapped and then mprotect'd PROT_EXEC. -+// This depends on the mount options used for /dev/shm, which vary among -+// different Linux distributions and possibly local configuration. It also -+// depends on details of kernel--ChromeOS uses the noexec option for /dev/shm -+// but its kernel allows mprotect with PROT_EXEC anyway. -+ -+namespace { -+ -+bool DetermineDevShmExecutable() { -+ bool result = false; -+ FilePath path; -+ int fd = CreateAndOpenFdForTemporaryFile(FilePath("/dev/shm"), &path); -+ if (fd >= 0) { -+ ScopedFD shm_fd_closer(&fd); -+ Delete(path, false); -+ size_t pagesize = sysconf(_SC_PAGESIZE); -+ void *mapping = mmap(NULL, pagesize, PROT_READ, MAP_SHARED, fd, 0); -+ if (mapping != MAP_FAILED) { -+ if (mprotect(mapping, pagesize, PROT_READ | PROT_EXEC) == 0) -+ result = true; -+ munmap(mapping, pagesize); -+ } -+ } -+ return result; - } -+ -+}; // namespace -+#endif // defined(OS_LINUX) -+ -+bool GetShmemTempDir(FilePath* path, bool executable) { -+#if defined(OS_LINUX) -+ bool use_dev_shm = true; -+ if (executable) { -+ static const bool s_dev_shm_executable = DetermineDevShmExecutable(); -+ use_dev_shm = s_dev_shm_executable; -+ } -+ if (use_dev_shm) { -+ *path = FilePath("/dev/shm"); -+ return true; -+ } - #endif -+ return GetTempDir(path); -+} -+#endif // !defined(OS_ANDROID) - - FilePath GetHomeDir() { - const char* home_dir = getenv("HOME"); -diff --git a/base/file_util_unittest.cc b/base/file_util_unittest.cc -index 00cacd6..a9f9377 100644 ---- a/base/file_util_unittest.cc -+++ b/base/file_util_unittest.cc -@@ -1545,7 +1545,7 @@ TEST_F(FileUtilTest, CreateNewTemporaryDirInDirTest) { - - TEST_F(FileUtilTest, GetShmemTempDirTest) { - FilePath dir; -- EXPECT_TRUE(file_util::GetShmemTempDir(&dir)); -+ EXPECT_TRUE(file_util::GetShmemTempDir(&dir, false)); - EXPECT_TRUE(file_util::DirectoryExists(dir)); - } - -diff --git a/base/file_util_win.cc b/base/file_util_win.cc -index 8d9fbde..a6720a5 100644 ---- a/base/file_util_win.cc -+++ b/base/file_util_win.cc -@@ -556,7 +556,7 @@ bool GetTempDir(FilePath* path) { - return true; - } - --bool GetShmemTempDir(FilePath* path) { -+bool GetShmemTempDir(FilePath* path, bool executable) { - return GetTempDir(path); - } - -@@ -576,7 +576,7 @@ bool CreateTemporaryFile(FilePath* path) { - return false; - } - --FILE* CreateAndOpenTemporaryShmemFile(FilePath* path) { -+FILE* CreateAndOpenTemporaryShmemFile(FilePath* path, bool executable) { - base::ThreadRestrictions::AssertIOAllowed(); - return CreateAndOpenTemporaryFile(path); - } -diff --git a/base/shared_memory_posix.cc b/base/shared_memory_posix.cc -index 030061a..a66c859 100644 ---- a/base/shared_memory_posix.cc -+++ b/base/shared_memory_posix.cc -@@ -123,7 +123,7 @@ bool SharedMemory::Create(const SharedMemoryCreateOptions& options) { - DCHECK(!options.open_existing); - // Q: Why not use the shm_open() etc. APIs? - // A: Because they're limited to 4mb on OS X. FFFFFFFUUUUUUUUUUU -- fp = file_util::CreateAndOpenTemporaryShmemFile(&path); -+ fp = file_util::CreateAndOpenTemporaryShmemFile(&path, options.executable); - - // Deleting the file prevents anyone else from mapping it in - // (making it private), and prevents the need for cleanup (once -@@ -317,7 +317,7 @@ bool SharedMemory::FilePathForMemoryName(const std::string& mem_name, - DCHECK_EQ(std::string::npos, mem_name.find('\0')); - - FilePath temp_dir; -- if (!file_util::GetShmemTempDir(&temp_dir)) -+ if (!file_util::GetShmemTempDir(&temp_dir, false)) - return false; - - #if !defined(OS_MACOSX) --- -1.7.6.1 - diff --git a/www-client/chromium/files/chromium-icu-compatibility-r0.patch b/www-client/chromium/files/chromium-icu-compatibility-r0.patch deleted file mode 100644 index 305cb2fc64b2..000000000000 --- a/www-client/chromium/files/chromium-icu-compatibility-r0.patch +++ /dev/null @@ -1,53 +0,0 @@ -this patch fixes build failures with ICU 4.8 - -http://codereview.chromium.org/7421003/ -https://bugs.gentoo.org/show_bug.cgi?id=374903 - ---- v8/src/extensions/experimental/number-format.cc -+++ v8/src/extensions/experimental/number-format.cc -@@ -36,6 +36,8 @@ - #include "unicode/numfmt.h" - #include "unicode/uchar.h" - #include "unicode/ucurr.h" -+#include "unicode/unum.h" -+#include "unicode/uversion.h" - - namespace v8 { - namespace internal { -@@ -231,6 +233,8 @@ - } - - // Generates ICU number format pattern from given skeleton. -+// TODO(cira): Remove once ICU includes equivalent method -+// (see http://bugs.icu-project.org/trac/ticket/8610). - static icu::DecimalFormat* CreateFormatterFromSkeleton( - const icu::Locale& icu_locale, - const icu::UnicodeString& skeleton, -@@ -251,6 +255,7 @@ - // Case of non-consecutive U+00A4 is taken care of in i18n.js. - int32_t end_index = skeleton.lastIndexOf(currency_symbol, index); - -+#if (U_ICU_VERSION_MAJOR_NUM == 4) && (U_ICU_VERSION_MINOR_NUM <= 6) - icu::NumberFormat::EStyles style; - switch (end_index - index) { - case 0: -@@ -262,6 +267,19 @@ - default: - style = icu::NumberFormat::kPluralCurrencyStyle; - } -+#else // ICU version is 4.8 or above (we ignore versions below 4.0). -+ UNumberFormatStyle style; -+ switch (end_index - index) { -+ case 0: -+ style = UNUM_CURRENCY; -+ break; -+ case 1: -+ style = UNUM_CURRENCY_ISO; -+ break; -+ default: -+ style = UNUM_CURRENCY_PLURAL; -+ } -+#endif - - base_format = static_cast<icu::DecimalFormat*>( - icu::NumberFormat::createInstance(icu_locale, style, *status)); diff --git a/www-client/chromium/files/chromium-kerberos-r0.patch b/www-client/chromium/files/chromium-kerberos-r0.patch deleted file mode 100644 index 2e92b7c834f7..000000000000 --- a/www-client/chromium/files/chromium-kerberos-r0.patch +++ /dev/null @@ -1,22 +0,0 @@ -Index: net/http/http_auth_gssapi_posix.cc -diff --git a/net/http/http_auth_gssapi_posix.cc b/net/http/http_auth_gssapi_posix.cc -index 431cfc4f2b54730fa6b46a6801c25cf691b7c878..aff2ac1114e09ec202b1ce4bd8d63ebd41483632 100644 ---- a/net/http/http_auth_gssapi_posix.cc -+++ b/net/http/http_auth_gssapi_posix.cc -@@ -55,6 +55,16 @@ static gss_OID_desc GSS_C_NT_EXPORT_NAME_VAL = { - - } // namespace - -+// Heimdal >= 1.4 will define the following as preprocessor macros. -+// To avoid conflicting declarations, we have to undefine these. -+#undef GSS_C_NT_USER_NAME -+#undef GSS_C_NT_MACHINE_UID_NAME -+#undef GSS_C_NT_STRING_UID_NAME -+#undef GSS_C_NT_HOSTBASED_SERVICE_X -+#undef GSS_C_NT_HOSTBASED_SERVICE -+#undef GSS_C_NT_ANONYMOUS -+#undef GSS_C_NT_EXPORT_NAME -+ - gss_OID GSS_C_NT_USER_NAME = &GSS_C_NT_USER_NAME_VAL; - gss_OID GSS_C_NT_MACHINE_UID_NAME = &GSS_C_NT_MACHINE_UID_NAME_VAL; - gss_OID GSS_C_NT_STRING_UID_NAME = &GSS_C_NT_STRING_UID_NAME_VAL; diff --git a/www-client/chromium/files/chromium-revert-jpeg-swizzle-r0.patch b/www-client/chromium/files/chromium-revert-jpeg-swizzle-r0.patch deleted file mode 100644 index 1f1aff6bf88c..000000000000 --- a/www-client/chromium/files/chromium-revert-jpeg-swizzle-r0.patch +++ /dev/null @@ -1,62 +0,0 @@ -This reverts http://trac.webkit.org/changeset/101286 -to fix Gentoo bug https://bugs.gentoo.org/show_bug.cgi?id=393471 - -Index: third_party/WebKit/Source/WebCore/platform/image-decoders/jpeg/JPEGImageDecoder.cpp -=================================================================== ---- third_party/WebKit/Source/WebCore/platform/image-decoders/jpeg/JPEGImageDecoder.cpp (revision 96970) -+++ third_party/WebKit/Source/WebCore/platform/image-decoders/jpeg/JPEGImageDecoder.cpp (revision 101286) -@@ -63,20 +63,6 @@ - - #include <setjmp.h> - --#if CPU(BIG_ENDIAN) || CPU(MIDDLE_ENDIAN) --#define ASSUME_LITTLE_ENDIAN 0 --#else --#define ASSUME_LITTLE_ENDIAN 1 --#endif -- --#if defined(JCS_EXTENSIONS) && ASSUME_LITTLE_ENDIAN --#define TURBO_JPEG_RGB_SWIZZLE --inline J_COLOR_SPACE rgbOutputColorSpace() { return JCS_EXT_BGRX; } --inline bool turboSwizzled(J_COLOR_SPACE colorSpace) { return colorSpace == rgbOutputColorSpace(); } --#else --inline J_COLOR_SPACE rgbOutputColorSpace() { return JCS_RGB; } --#endif -- - namespace WebCore { - - struct decoder_error_mgr { -@@ -235,11 +221,10 @@ - // their color profile, CoreGraphics will "upsample" them - // again, resulting in horizontal distortions. - m_decoder->setIgnoreGammaAndColorProfile(true); -- m_info.out_color_space = JCS_RGB; -- break; -+ // Note fall-through! - case JCS_RGB: - case JCS_YCbCr: -- m_info.out_color_space = rgbOutputColorSpace(); -+ m_info.out_color_space = JCS_RGB; - break; - case JCS_CMYK: - case JCS_YCCK: -@@ -496,19 +481,6 @@ - } - - jpeg_decompress_struct* info = m_reader->info(); -- --#if !ENABLE(IMAGE_DECODER_DOWN_SAMPLING) && defined(TURBO_JPEG_RGB_SWIZZLE) -- if (turboSwizzled(info->out_color_space)) { -- ASSERT(!m_scaled); -- while (info->output_scanline < info->output_height) { -- unsigned char* row = reinterpret_cast<unsigned char*>(buffer.getAddr(0, info->output_scanline)); -- if (jpeg_read_scanlines(info, &row, 1) != 1) -- return false; -- } -- return true; -- } --#endif -- - JSAMPARRAY samples = m_reader->samples(); - - while (info->output_scanline < info->output_height) { diff --git a/www-client/chromium/files/chromium-revert-jpeg-swizzle-r1.patch b/www-client/chromium/files/chromium-revert-jpeg-swizzle-r1.patch deleted file mode 100644 index 5cf6a0966f4c..000000000000 --- a/www-client/chromium/files/chromium-revert-jpeg-swizzle-r1.patch +++ /dev/null @@ -1,61 +0,0 @@ -This reverts http://trac.webkit.org/changeset/101286 -to fix Gentoo bug https://bugs.gentoo.org/show_bug.cgi?id=393471 - -Index: third_party/WebKit/Source/WebCore/platform/image-decoders/jpeg/JPEGImageDecoder.cpp -=================================================================== ---- third_party/WebKit/Source/WebCore/platform/image-decoders/jpeg/JPEGImageDecoder.cpp (revision 96970) -+++ third_party/WebKit/Source/WebCore/platform/image-decoders/jpeg/JPEGImageDecoder.cpp (revision 101286) -@@ -67,24 +67,6 @@ - - #include <setjmp.h> - --#if CPU(BIG_ENDIAN) || CPU(MIDDLE_ENDIAN) --#define ASSUME_LITTLE_ENDIAN 0 --#else --#define ASSUME_LITTLE_ENDIAN 1 --#endif -- --#if defined(JCS_EXTENSIONS) && ASSUME_LITTLE_ENDIAN --#define TURBO_JPEG_RGB_SWIZZLE --#if USE(SKIA) && (!SK_R32_SHIFT && SK_G32_SHIFT == 8 && SK_B32_SHIFT == 16) --inline J_COLOR_SPACE rgbOutputColorSpace() { return JCS_EXT_RGBX; } --#else --inline J_COLOR_SPACE rgbOutputColorSpace() { return JCS_EXT_BGRX; } --#endif --inline bool turboSwizzled(J_COLOR_SPACE colorSpace) { return colorSpace == rgbOutputColorSpace(); } --#else --inline J_COLOR_SPACE rgbOutputColorSpace() { return JCS_RGB; } --#endif -- - namespace WebCore { - - struct decoder_error_mgr { -@@ -270,7 +252,7 @@ - case JCS_RGB: - case JCS_YCbCr: - // libjpeg can convert GRAYSCALE and YCbCr image pixels to RGB. -- m_info.out_color_space = rgbOutputColorSpace(); -+ m_info.out_color_space = JCS_RGB; - break; - case JCS_CMYK: - case JCS_YCCK: -@@ -525,19 +507,6 @@ - } - - jpeg_decompress_struct* info = m_reader->info(); -- --#if !ENABLE(IMAGE_DECODER_DOWN_SAMPLING) && defined(TURBO_JPEG_RGB_SWIZZLE) -- if (turboSwizzled(info->out_color_space)) { -- ASSERT(!m_scaled); -- while (info->output_scanline < info->output_height) { -- unsigned char* row = reinterpret_cast<unsigned char*>(buffer.getAddr(0, info->output_scanline)); -- if (jpeg_read_scanlines(info, &row, 1) != 1) -- return false; -- } -- return true; -- } --#endif -- - JSAMPARRAY samples = m_reader->samples(); - - while (info->output_scanline < info->output_height) { diff --git a/www-client/chromium/files/chromium-system-libevent-r0.patch b/www-client/chromium/files/chromium-system-libevent-r0.patch deleted file mode 100644 index fa9833defb09..000000000000 --- a/www-client/chromium/files/chromium-system-libevent-r0.patch +++ /dev/null @@ -1,12 +0,0 @@ ---- base/base.gyp.orig 2011-08-04 18:25:17.000000000 +0200 -+++ base/base.gyp 2011-08-04 18:25:24.000000000 +0200 -@@ -283,6 +283,9 @@ - 'message_pump_libevent_unittest.cc', - ], - }, { # OS != "win" -+ 'dependencies': [ -+ '../third_party/libevent/libevent.gyp:libevent' -+ ], - 'sources/': [ - ['exclude', '^win/'], - ], diff --git a/www-client/chromium/files/extract_v8_version.py b/www-client/chromium/files/extract_v8_version.py deleted file mode 100644 index 55615138b863..000000000000 --- a/www-client/chromium/files/extract_v8_version.py +++ /dev/null @@ -1,24 +0,0 @@ -#!/usr/bin/python2 - -import re -import sys - -MAJOR_VERSION_PATTERN = re.compile(r"#define\s+MAJOR_VERSION\s+(.*)") -MINOR_VERSION_PATTERN = re.compile(r"#define\s+MINOR_VERSION\s+(.*)") -BUILD_NUMBER_PATTERN = re.compile(r"#define\s+BUILD_NUMBER\s+(.*)") -PATCH_LEVEL_PATTERN = re.compile(r"#define\s+PATCH_LEVEL\s+(.*)") - -patterns = [MAJOR_VERSION_PATTERN, - MINOR_VERSION_PATTERN, - BUILD_NUMBER_PATTERN, - PATCH_LEVEL_PATTERN] - -source = open(sys.argv[1]).read() -version_components = [] -for pattern in patterns: - version_components.append(pattern.search(source).group(1).strip()) - -if version_components[len(version_components) - 1] == '0': - version_components.pop() - -print '.'.join(version_components) diff --git a/www-client/chromium/files/nacl.gypi b/www-client/chromium/files/nacl.gypi deleted file mode 100644 index 05638d6bfc61..000000000000 --- a/www-client/chromium/files/nacl.gypi +++ /dev/null @@ -1,8 +0,0 @@ -{ - 'targets': [ - { - 'target_name': 'nacl', - 'type': 'static_library', - }, - ], -} |