Date: Wednesday, August 21, 2013 @ 04:10:52 Author: foutrelis Revision: 193475
upgpkg: chromium 29.0.1547.57-1 New upstream release. Modified: chromium/trunk/PKGBUILD Deleted: chromium/trunk/chromium-nss-3.15.patch chromium/trunk/chromium-system-harfbuzz-r0.patch -----------------------------------+ PKGBUILD | 21 ++++------------- chromium-nss-3.15.patch | 26 --------------------- chromium-system-harfbuzz-r0.patch | 44 ------------------------------------ 3 files changed, 6 insertions(+), 85 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2013-08-20 22:25:07 UTC (rev 193474) +++ PKGBUILD 2013-08-21 02:10:52 UTC (rev 193475) @@ -5,7 +5,7 @@ # Contributor: Daniel J Griffiths <[email protected]> pkgname=chromium -pkgver=28.0.1500.95 +pkgver=29.0.1547.57 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') @@ -24,16 +24,12 @@ chromium.desktop chromium.default chromium.sh - chromium-28.0.1500.71-avoid-std-string-copying-in-GetFileNameInWhitelist.patch - chromium-nss-3.15.patch - chromium-system-harfbuzz-r0.patch) -sha256sums=('3c38888bebed3d13f860babc7fb667d425723c350e25cdfb73fc746f4f91d734' + chromium-28.0.1500.71-avoid-std-string-copying-in-GetFileNameInWhitelist.patch) +sha256sums=('ae77204a5417ad7bf1ade257ba49f3ca64c83ed5741cb811a31f9f675d498576' '09bfac44104f4ccda4c228053f689c947b3e97da9a4ab6fa34ce061ee83d0322' '478340d5760a9bd6c549e19b1b5d1c5b4933ebf5f8cfb2b3e2d70d07443fe232' '4999fded897af692f4974f0a3e3bbb215193519918a1fa9b31ed51e74a2dccb9' - '7c2e448c30677999f524f9513c2f998f3cb15bc6084692cad9c3f310aa813530' - 'a5ca532d213cc6f9ad19341445309ad4e4aec9530f4309536fb42ee97deca5a6' - '2bc4cf17adac9864f4e832e57247984f28fce171d3699c0fc2c3596d1ab20386') + '7c2e448c30677999f524f9513c2f998f3cb15bc6084692cad9c3f310aa813530') # Google API keys (see http://www.chromium.org/developers/how-tos/api-keys) # Note: These are for Arch Linux use ONLY. For your own distribution, please @@ -51,12 +47,6 @@ # https://bugs.gentoo.org/show_bug.cgi?id=471198#c23 patch -Np1 -i "$srcdir/chromium-28.0.1500.71-avoid-std-string-copying-in-GetFileNameInWhitelist.patch" - # Fix build with NSS 3.15 (patch from Gentoo) - patch -Np1 -i "$srcdir/chromium-nss-3.15.patch" - - # Fix build with system harfbuzz (patch from Gentoo) - patch -Np1 -i "$srcdir/chromium-system-harfbuzz-r0.patch" - # Use Python 2 find . -type f -exec sed -i -r \ -e 's|/usr/bin/python$|&2|g' \ @@ -98,6 +88,7 @@ -Dlinux_use_gold_binary=0 -Dlinux_use_gold_flags=0 -Dlinux_use_tcmalloc=0 + -Dlogging_like_official_build=1 -Drelease_extra_cflags="$CFLAGS" -Dlibspeechd_h_prefix=speech-dispatcher/ -Dffmpeg_branding=Chrome @@ -125,7 +116,7 @@ -Ddisable_sse2=1) build/linux/unbundle/replace_gyp_files.py "${_chromium_conf[@]}" - build/gyp_chromium --depth=. "${_chromium_conf[@]}" + build/gyp_chromium -f make --depth=. "${_chromium_conf[@]}" make chrome chrome_sandbox BUILDTYPE=Release } Deleted: chromium-nss-3.15.patch =================================================================== --- chromium-nss-3.15.patch 2013-08-20 22:25:07 UTC (rev 193474) +++ chromium-nss-3.15.patch 2013-08-21 02:10:52 UTC (rev 193475) @@ -1,26 +0,0 @@ ---- a/net/third_party/nss/ssl/bodge/secitem_array.c -+++ b/net/third_party/nss/ssl/bodge/secitem_array.c -@@ -6,6 +6,7 @@ - * Support routines for SECItemArray data structure. - */ - -+#include "nssutil.h" - #include "seccomon.h" - #include "secitem.h" - #include "secerr.h" -@@ -13,10 +14,15 @@ - -+#define NSSUTIL_VERSION_NUM \ -+ (NSSUTIL_VMAJOR * 10000 + NSSUTIL_VMINOR * 100 + NSSUTIL_VPATCH) -+#if NSSUTIL_VERSION_NUM < 31500 -+// Added in NSS 3.15. - typedef struct SECItemArrayStr SECItemArray; - - struct SECItemArrayStr { - SECItem *items; - unsigned int len; - }; -+#endif - - SECItemArray * - SECITEM_AllocArray(PLArenaPool *arena, SECItemArray *array, unsigned int len) Deleted: chromium-system-harfbuzz-r0.patch =================================================================== --- chromium-system-harfbuzz-r0.patch 2013-08-20 22:25:07 UTC (rev 193474) +++ chromium-system-harfbuzz-r0.patch 2013-08-21 02:10:52 UTC (rev 193475) @@ -1,44 +0,0 @@ -Index: build/linux/unbundle/harfbuzz.gyp -diff --git a/build/linux/unbundle/harfbuzz.gyp b/build/linux/unbundle/harfbuzz.gyp -index 456dd384df2d5c57d9857cfb775d46ef87add2bc..93b2a69c12d7b7524fa0c2aa67b52136b779196d 100644 ---- a/build/linux/unbundle/harfbuzz.gyp -+++ b/build/linux/unbundle/harfbuzz.gyp -@@ -3,24 +3,34 @@ - # found in the LICENSE file. - - { -+ 'variables': { -+ # Check for presence of harfbuzz-icu library, use it if present. -+ 'harfbuzz_libraries': -+ '<!(python <(DEPTH)/tools/compile_test/compile_test.py ' -+ '--code "int main() { return 0; }" ' -+ '--run-linker ' -+ '--on-success "harfbuzz harfbuzz-icu" ' -+ '--on-failure "harfbuzz" ' -+ '-- -lharfbuzz-icu)', -+ }, - 'targets': [ - { - 'target_name': 'harfbuzz-ng', - 'type': 'none', - 'cflags': [ -- '<!@(pkg-config --cflags harfbuzz)', -+ '<!@(pkg-config --cflags <(harfbuzz_libraries))', - ], - 'direct_dependent_settings': { - 'cflags': [ -- '<!@(pkg-config --cflags harfbuzz)', -+ '<!@(pkg-config --cflags <(harfbuzz_libraries))', - ], - }, - 'link_settings': { - 'ldflags': [ -- '<!@(pkg-config --libs-only-L --libs-only-other harfbuzz)', -+ '<!@(pkg-config --libs-only-L --libs-only-other <(harfbuzz_libraries))', - ], - 'libraries': [ -- '<!@(pkg-config --libs-only-l harfbuzz)', -+ '<!@(pkg-config --libs-only-l <(harfbuzz_libraries))', - ], - }, - },
