[arch-commits] Commit in chromium/trunk (PKGBUILD chromium-nss-3.15.patch)

[Evangelos Foutras]

    Date: Wednesday, July 31, 2013 @ 10:56:59
  Author: foutrelis
Revision: 191826

upgpkg: chromium 28.0.1500.95-1

New upstream release.

Added:
  chromium/trunk/chromium-nss-3.15.patch
Modified:
  chromium/trunk/PKGBUILD

-------------------------+
 PKGBUILD                |   13 ++++++++-----
 chromium-nss-3.15.patch |   26 ++++++++++++++++++++++++++
 2 files changed, 34 insertions(+), 5 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2013-07-31 08:49:27 UTC (rev 191825)
+++ PKGBUILD	2013-07-31 08:56:59 UTC (rev 191826)
@@ -5,7 +5,7 @@
 # Contributor: Daniel J Griffiths <ghost1227 at archlinux.us>
 
 pkgname=chromium
-pkgver=28.0.1500.71
+pkgver=28.0.1500.95
 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')
@@ -20,19 +20,19 @@
 optdepends=('kdebase-kdialog: needed for file dialogs in KDE')
 backup=('etc/chromium/default')
 install=chromium.install
-#source=(http://commondatastorage.googleapis.com/chromium-browser-official/$pkgname-$pkgver.tar.xz
-source=(https://dev.archlinux.org/~foutrelis/sources/$pkgname/$pkgname-$pkgver.tar.xz{,.sig}
+source=(https://commondatastorage.googleapis.com/chromium-browser-official/$pkgname-$pkgver.tar.xz
         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=('a8a821fb7cf1dc2425ecba6d48be0f771d993179411ba3bcdc71d179ea7ec671'
-            'SKIP'
+sha256sums=('3c38888bebed3d13f860babc7fb667d425723c350e25cdfb73fc746f4f91d734'
             '09bfac44104f4ccda4c228053f689c947b3e97da9a4ab6fa34ce061ee83d0322'
             '478340d5760a9bd6c549e19b1b5d1c5b4933ebf5f8cfb2b3e2d70d07443fe232'
             '4999fded897af692f4974f0a3e3bbb215193519918a1fa9b31ed51e74a2dccb9'
             '7c2e448c30677999f524f9513c2f998f3cb15bc6084692cad9c3f310aa813530'
+            'a5ca532d213cc6f9ad19341445309ad4e4aec9530f4309536fb42ee97deca5a6'
             '2bc4cf17adac9864f4e832e57247984f28fce171d3699c0fc2c3596d1ab20386')
 
 # Google API keys (see http://www.chromium.org/developers/how-tos/api-keys)
@@ -51,6 +51,9 @@
   # 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"
 

Added: chromium-nss-3.15.patch
===================================================================
--- chromium-nss-3.15.patch	                        (rev 0)
+++ chromium-nss-3.15.patch	2013-07-31 08:56:59 UTC (rev 191826)
@@ -0,0 +1,26 @@
+--- 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)