chromium 15.0.874.106-1 maj port

6 files changed, 31 insertions, 13 deletions

diff --git a/extra/chromium/.footprint.i686 b/extra/chromium/.footprint.i686
index febbac02c..9bf948565 100644
--- a/extra/chromium/.footprint.i686
+++ b/extra/chromium/.footprint.i686
@@ -215,8 +215,11 @@ drwxr-xr-x	root/root	usr/lib/chromium/resources/inspector/Images/
 -rw-r--r--	root/root	usr/lib/chromium/resources/inspector/Images/warningOrangeDot.png
 -rw-r--r--	root/root	usr/lib/chromium/resources/inspector/Images/warningsErrors.png
 -rw-r--r--	root/root	usr/lib/chromium/resources/inspector/ScriptFormatterWorker.js
+-rw-r--r--	root/root	usr/lib/chromium/resources/inspector/dataGrid.css
 -rw-r--r--	root/root	usr/lib/chromium/resources/inspector/devTools.css
 -rw-r--r--	root/root	usr/lib/chromium/resources/inspector/devtools.html
+-rw-r--r--	root/root	usr/lib/chromium/resources/inspector/inspectorCommon.css
+-rw-r--r--	root/root	usr/lib/chromium/resources/inspector/networkLogView.css
 drwxr-xr-x	root/root	usr/share/
 drwxr-xr-x	root/root	usr/share/applications/
 -rw-r--r--	root/root	usr/share/applications/chromium.desktop
diff --git a/extra/chromium/.footprint.x86_64 b/extra/chromium/.footprint.x86_64
index febbac02c..9bf948565 100644
--- a/extra/chromium/.footprint.x86_64
+++ b/extra/chromium/.footprint.x86_64
@@ -215,8 +215,11 @@ drwxr-xr-x	root/root	usr/lib/chromium/resources/inspector/Images/
 -rw-r--r--	root/root	usr/lib/chromium/resources/inspector/Images/warningOrangeDot.png
 -rw-r--r--	root/root	usr/lib/chromium/resources/inspector/Images/warningsErrors.png
 -rw-r--r--	root/root	usr/lib/chromium/resources/inspector/ScriptFormatterWorker.js
+-rw-r--r--	root/root	usr/lib/chromium/resources/inspector/dataGrid.css
 -rw-r--r--	root/root	usr/lib/chromium/resources/inspector/devTools.css
 -rw-r--r--	root/root	usr/lib/chromium/resources/inspector/devtools.html
+-rw-r--r--	root/root	usr/lib/chromium/resources/inspector/inspectorCommon.css
+-rw-r--r--	root/root	usr/lib/chromium/resources/inspector/networkLogView.css
 drwxr-xr-x	root/root	usr/share/
 drwxr-xr-x	root/root	usr/share/applications/
 -rw-r--r--	root/root	usr/share/applications/chromium.desktop
diff --git a/extra/chromium/.md5sum.i686 b/extra/chromium/.md5sum.i686
index 50658de68..b16a25381 100644
--- a/extra/chromium/.md5sum.i686
+++ b/extra/chromium/.md5sum.i686
@@ -1,5 +1,6 @@
-9b9cc4251e2695348cee26bd053dac73  chromium-14.0.835.186.tar.bz2
+49ce2d68ce0c68dbc9175dfee97a71c9  chromium-15.0.874.106.tar.bz2
 a4c98df2c9cc60c9fe7cf6b284114e7b  chromium-gcc-4.6.patch
 b0cd6503593e3abb05beba510fa99fd0  chromium.desktop
 ade38bd8683710f4bf5ce4f006a06788  chromium.sh
+1d78eeed9aee022d542e7c095a06378c  nacl.gypi
 86eb5bc546890abba4f9cba6bf3af4ef  webrtc-r240-r242-make-pulseaudio-optional.patch
diff --git a/extra/chromium/.md5sum.x86_64 b/extra/chromium/.md5sum.x86_64
index 50658de68..b16a25381 100644
--- a/extra/chromium/.md5sum.x86_64
+++ b/extra/chromium/.md5sum.x86_64
@@ -1,5 +1,6 @@
-9b9cc4251e2695348cee26bd053dac73  chromium-14.0.835.186.tar.bz2
+49ce2d68ce0c68dbc9175dfee97a71c9  chromium-15.0.874.106.tar.bz2
 a4c98df2c9cc60c9fe7cf6b284114e7b  chromium-gcc-4.6.patch
 b0cd6503593e3abb05beba510fa99fd0  chromium.desktop
 ade38bd8683710f4bf5ce4f006a06788  chromium.sh
+1d78eeed9aee022d542e7c095a06378c  nacl.gypi
 86eb5bc546890abba4f9cba6bf3af4ef  webrtc-r240-r242-make-pulseaudio-optional.patch
diff --git a/extra/chromium/Pkgfile b/extra/chromium/Pkgfile
index c1386ff34..7566cc947 100644
--- a/extra/chromium/Pkgfile
+++ b/extra/chromium/Pkgfile
@@ -6,25 +6,30 @@
 # Run on: gtk,dbus-glib,nss,alsa-lib,xdg-utils,bzip2,libevent,dejavu-ttf,desktop-file-utils,hicolor-icon-theme,keyutils
 
 name=chromium
-version=14.0.835.186
+version=15.0.874.106
+#14.0.835.186
 #12.0.742.100
 release=1
 source=(http://build.chromium.org/official/chromium-$version.tar.bz2
         chromium.desktop
         chromium.sh
         chromium-gcc-4.6.patch
-	webrtc-r240-r242-make-pulseaudio-optional.patch)
+	webrtc-r240-r242-make-pulseaudio-optional.patch
+	nacl.gypi)
+
 
 build() {
   cd $SRC/chromium-$version
 
+  cp ../nacl.gypi chrome/
+
   patch -Np0 -i $SRC/chromium-gcc-4.6.patch
   
   sed -i '/#include <cups\/cups.h>/ a #include <cups/ppd.h>' \
     chrome/browser/ui/webui/print_preview_handler.cc
 
-  patch -d third_party/webrtc -Np1 -i \
-    $SRC/webrtc-r240-r242-make-pulseaudio-optional.patch
+#  patch -d third_party/webrtc -Np1 -i \
+#    $SRC/webrtc-r240-r242-make-pulseaudio-optional.patch
 
 ### Configure
 
@@ -33,14 +38,11 @@ build() {
     -e 's|/usr/bin/python$|\02|g' \
     -e 's|(/usr/bin/python2)\.4$|\1|g' \
     {} +
-  # There are still a lot of relative calls which need a workaround
-  mkdir "$SRC/python2-path"
-  ln -s /usr/bin/python2 "$SRC/python2-path/python"
-  export PATH="$SRC/python2-path:$PATH"
 
-  # We need to disable system_ssl until "next protocol negotiation" support is
-  # available in our nss package.
-  # (See https://bugzilla.mozilla.org/show_bug.cgi?id=547312)
+  # There are still a lot of relative calls which need a workaround
+  mkdir $SRC/python2-path
+  ln -s /usr/bin/python2 $SRC/python2-path/python
+  export PATH=$SRC/python2-path:$PATH
 
   build/gyp_chromium -f make build/all.gyp --depth=. \
     -Dno_strict_aliasing=1 \
diff --git a/extra/chromium/nacl.gypi b/extra/chromium/nacl.gypi
new file mode 100644
index 000000000..05638d6bf
--- /dev/null
+++ b/extra/chromium/nacl.gypi
@@ -0,0 +1,8 @@
+{
+  'targets': [
+    {
+      'target_name': 'nacl',
+      'type': 'static_library',
+    },
+  ],
+}