chromium: updated to 42.0.2311.90

diff --git a/chromium/.footprint b/chromium/.footprint
index 48f49316cbfff0bb0f07391bbb38b628e2a52865..41c25072b1c75c0e75a5e9ece15a97df641f36cd 100644 (file)
--- a/chromium/.footprint
+++ b/chromium/.footprint
@@ -4,72 +4,63 @@ drwxr-xr-x    root/root       usr/bin/
 drwxr-xr-x     root/root       usr/lib/
 drwxr-xr-x     root/root       usr/lib/chromium/
 -rwsr-xr-x     root/root       usr/lib/chromium/chrome-sandbox
--rw-r--r--     root/root       usr/lib/chromium/chrome.pak
 -rw-r--r--     root/root       usr/lib/chromium/chrome_100_percent.pak
 -rwxr-xr-x     root/root       usr/lib/chromium/chromium
 -rw-r--r--     root/root       usr/lib/chromium/content_resources.pak
+-rw-r--r--     root/root       usr/lib/chromium/keyboard_resources.pak
 -rwxr-xr-x     root/root       usr/lib/chromium/libffmpegsumo.so
 drwxr-xr-x     root/root       usr/lib/chromium/locales/
 -rw-r--r--     root/root       usr/lib/chromium/locales/en-US.pak
+-rw-r--r--     root/root       usr/lib/chromium/natives_blob.bin
 -rw-r--r--     root/root       usr/lib/chromium/resources.pak
 drwxr-xr-x     root/root       usr/lib/chromium/resources/
 drwxr-xr-x     root/root       usr/lib/chromium/resources/extension/
 drwxr-xr-x     root/root       usr/lib/chromium/resources/extension/demo/
 -rw-rw-r--     root/root       usr/lib/chromium/resources/extension/demo/library.js
 drwxr-xr-x     root/root       usr/lib/chromium/resources/inspector/
--rw-r--r--     root/root       usr/lib/chromium/resources/inspector/AuditsPanel.js
--rw-r--r--     root/root       usr/lib/chromium/resources/inspector/CodeMirrorTextEditor.js
--rw-r--r--     root/root       usr/lib/chromium/resources/inspector/ElementsPanel.js
--rw-r--r--     root/root       usr/lib/chromium/resources/inspector/HeapSnapshotWorker.js
 drwxr-xr-x     root/root       usr/lib/chromium/resources/inspector/Images/
--rw-rw-r--     root/root       usr/lib/chromium/resources/inspector/Images/addIcon.png
 -rw-rw-r--     root/root       usr/lib/chromium/resources/inspector/Images/applicationCache.png
--rw-rw-r--     root/root       usr/lib/chromium/resources/inspector/Images/back.png
--rw-rw-r--     root/root       usr/lib/chromium/resources/inspector/Images/breakpoint2.png
--rw-rw-r--     root/root       usr/lib/chromium/resources/inspector/Images/breakpoint2_2x.png
--rw-rw-r--     root/root       usr/lib/chromium/resources/inspector/Images/breakpointBorder.png
--rw-rw-r--     root/root       usr/lib/chromium/resources/inspector/Images/breakpointConditional2.png
--rw-rw-r--     root/root       usr/lib/chromium/resources/inspector/Images/breakpointConditional2_2x.png
--rw-rw-r--     root/root       usr/lib/chromium/resources/inspector/Images/breakpointConditionalBorder.png
--rw-rw-r--     root/root       usr/lib/chromium/resources/inspector/Images/breakpointConditionalCounterBorder.png
--rw-rw-r--     root/root       usr/lib/chromium/resources/inspector/Images/breakpointCounterBorder.png
+-rw-rw-r--     root/root       usr/lib/chromium/resources/inspector/Images/breakpoint.png
+-rw-rw-r--     root/root       usr/lib/chromium/resources/inspector/Images/breakpointConditional.png
+-rw-rw-r--     root/root       usr/lib/chromium/resources/inspector/Images/breakpointConditional_2x.png
+-rw-rw-r--     root/root       usr/lib/chromium/resources/inspector/Images/breakpoint_2x.png
 -rw-rw-r--     root/root       usr/lib/chromium/resources/inspector/Images/checker.png
+-rw-rw-r--     root/root       usr/lib/chromium/resources/inspector/Images/chromeDisabledSelect.png
+-rw-rw-r--     root/root       usr/lib/chromium/resources/inspector/Images/chromeDisabledSelect_2x.png
+-rw-rw-r--     root/root       usr/lib/chromium/resources/inspector/Images/chromeLeft.png
+-rw-rw-r--     root/root       usr/lib/chromium/resources/inspector/Images/chromeMiddle.png
+-rw-rw-r--     root/root       usr/lib/chromium/resources/inspector/Images/chromeRight.png
+-rw-rw-r--     root/root       usr/lib/chromium/resources/inspector/Images/chromeSelect.png
+-rw-rw-r--     root/root       usr/lib/chromium/resources/inspector/Images/chromeSelect_2x.png
 -rw-rw-r--     root/root       usr/lib/chromium/resources/inspector/Images/cookie.png
 -rw-rw-r--     root/root       usr/lib/chromium/resources/inspector/Images/database.png
 -rw-rw-r--     root/root       usr/lib/chromium/resources/inspector/Images/databaseTable.png
 -rw-rw-r--     root/root       usr/lib/chromium/resources/inspector/Images/deleteIcon.png
 -rw-rw-r--     root/root       usr/lib/chromium/resources/inspector/Images/domain.png
+-rw-rw-r--     root/root       usr/lib/chromium/resources/inspector/Images/errorWave.png
+-rw-rw-r--     root/root       usr/lib/chromium/resources/inspector/Images/errorWave_2x.png
 -rw-rw-r--     root/root       usr/lib/chromium/resources/inspector/Images/fileSystem.png
 -rw-rw-r--     root/root       usr/lib/chromium/resources/inspector/Images/forward.png
 -rw-rw-r--     root/root       usr/lib/chromium/resources/inspector/Images/frame.png
--rw-rw-r--     root/root       usr/lib/chromium/resources/inspector/Images/glossyHeader.png
--rw-rw-r--     root/root       usr/lib/chromium/resources/inspector/Images/glossyHeaderPressed.png
--rw-rw-r--     root/root       usr/lib/chromium/resources/inspector/Images/glossyHeaderSelected.png
--rw-rw-r--     root/root       usr/lib/chromium/resources/inspector/Images/glossyHeaderSelectedPressed.png
 -rw-rw-r--     root/root       usr/lib/chromium/resources/inspector/Images/graphLabelCalloutLeft.png
 -rw-rw-r--     root/root       usr/lib/chromium/resources/inspector/Images/graphLabelCalloutRight.png
 -rw-rw-r--     root/root       usr/lib/chromium/resources/inspector/Images/indexedDB.png
 -rw-rw-r--     root/root       usr/lib/chromium/resources/inspector/Images/indexedDBIndex.png
 -rw-rw-r--     root/root       usr/lib/chromium/resources/inspector/Images/indexedDBObjectStore.png
 -rw-rw-r--     root/root       usr/lib/chromium/resources/inspector/Images/localStorage.png
--rw-rw-r--     root/root       usr/lib/chromium/resources/inspector/Images/namedFlowOverflow.png
 -rw-rw-r--     root/root       usr/lib/chromium/resources/inspector/Images/navigationControls.png
 -rw-rw-r--     root/root       usr/lib/chromium/resources/inspector/Images/navigationControls_2x.png
 -rw-rw-r--     root/root       usr/lib/chromium/resources/inspector/Images/paneAddButtons.png
+-rw-rw-r--     root/root       usr/lib/chromium/resources/inspector/Images/paneAnimationsButtons.png
 -rw-rw-r--     root/root       usr/lib/chromium/resources/inspector/Images/paneElementStateButtons.png
 -rw-rw-r--     root/root       usr/lib/chromium/resources/inspector/Images/paneFilterButtons.png
 -rw-rw-r--     root/root       usr/lib/chromium/resources/inspector/Images/paneRefreshButtons.png
--rw-rw-r--     root/root       usr/lib/chromium/resources/inspector/Images/paneSettingsButtons.png
 -rw-rw-r--     root/root       usr/lib/chromium/resources/inspector/Images/popoverArrows.png
 -rw-rw-r--     root/root       usr/lib/chromium/resources/inspector/Images/popoverBackground.png
 -rw-rw-r--     root/root       usr/lib/chromium/resources/inspector/Images/profileGroupIcon.png
 -rw-rw-r--     root/root       usr/lib/chromium/resources/inspector/Images/profileIcon.png
 -rw-rw-r--     root/root       usr/lib/chromium/resources/inspector/Images/profileSmallIcon.png
--rw-rw-r--     root/root       usr/lib/chromium/resources/inspector/Images/programCounterBorder.png
 -rw-rw-r--     root/root       usr/lib/chromium/resources/inspector/Images/radioDot.png
--rw-rw-r--     root/root       usr/lib/chromium/resources/inspector/Images/regionEmpty.png
--rw-rw-r--     root/root       usr/lib/chromium/resources/inspector/Images/regionFit.png
--rw-rw-r--     root/root       usr/lib/chromium/resources/inspector/Images/regionOverset.png
 -rw-rw-r--     root/root       usr/lib/chromium/resources/inspector/Images/resourceCSSIcon.png
 -rw-rw-r--     root/root       usr/lib/chromium/resources/inspector/Images/resourceDocumentIcon.png
 -rw-rw-r--     root/root       usr/lib/chromium/resources/inspector/Images/resourceDocumentIconSmall.png
@@ -77,18 +68,15 @@ drwxr-xr-x  root/root       usr/lib/chromium/resources/inspector/Images/
 -rw-rw-r--     root/root       usr/lib/chromium/resources/inspector/Images/resourcePlainIcon.png
 -rw-rw-r--     root/root       usr/lib/chromium/resources/inspector/Images/resourcePlainIconSmall.png
 -rw-rw-r--     root/root       usr/lib/chromium/resources/inspector/Images/resourcesTimeGraphIcon.png
+-rw-rw-r--     root/root       usr/lib/chromium/resources/inspector/Images/responsiveDesign.png
+-rw-rw-r--     root/root       usr/lib/chromium/resources/inspector/Images/responsiveDesign_2x.png
 -rw-rw-r--     root/root       usr/lib/chromium/resources/inspector/Images/searchNext.png
 -rw-rw-r--     root/root       usr/lib/chromium/resources/inspector/Images/searchPrev.png
 -rw-rw-r--     root/root       usr/lib/chromium/resources/inspector/Images/sessionStorage.png
 -rw-rw-r--     root/root       usr/lib/chromium/resources/inspector/Images/settingsListRemove.png
 -rw-rw-r--     root/root       usr/lib/chromium/resources/inspector/Images/settingsListRemove_2x.png
--rw-rw-r--     root/root       usr/lib/chromium/resources/inspector/Images/spinner.gif
--rw-rw-r--     root/root       usr/lib/chromium/resources/inspector/Images/spinnerActive.gif
--rw-rw-r--     root/root       usr/lib/chromium/resources/inspector/Images/spinnerActiveSelected.gif
--rw-rw-r--     root/root       usr/lib/chromium/resources/inspector/Images/spinnerInactive.gif
--rw-rw-r--     root/root       usr/lib/chromium/resources/inspector/Images/spinnerInactiveSelected.gif
 -rw-rw-r--     root/root       usr/lib/chromium/resources/inspector/Images/statusbarButtonGlyphs.png
--rw-rw-r--     root/root       usr/lib/chromium/resources/inspector/Images/statusbarButtonGlyphs2x.png
+-rw-rw-r--     root/root       usr/lib/chromium/resources/inspector/Images/statusbarButtonGlyphs_2x.png
 -rw-rw-r--     root/root       usr/lib/chromium/resources/inspector/Images/statusbarResizerHorizontal.png
 -rw-rw-r--     root/root       usr/lib/chromium/resources/inspector/Images/statusbarResizerVertical.png
 -rw-rw-r--     root/root       usr/lib/chromium/resources/inspector/Images/thumbActiveHoriz.png
@@ -97,74 +85,46 @@ drwxr-xr-x  root/root       usr/lib/chromium/resources/inspector/Images/
 -rw-rw-r--     root/root       usr/lib/chromium/resources/inspector/Images/thumbHoverHoriz.png
 -rw-rw-r--     root/root       usr/lib/chromium/resources/inspector/Images/thumbHoverVert.png
 -rw-rw-r--     root/root       usr/lib/chromium/resources/inspector/Images/thumbVert.png
--rw-rw-r--     root/root       usr/lib/chromium/resources/inspector/Images/timelineHollowPillBlue.png
--rw-rw-r--     root/root       usr/lib/chromium/resources/inspector/Images/timelineHollowPillGray.png
--rw-rw-r--     root/root       usr/lib/chromium/resources/inspector/Images/timelineHollowPillGreen.png
--rw-rw-r--     root/root       usr/lib/chromium/resources/inspector/Images/timelineHollowPillOrange.png
--rw-rw-r--     root/root       usr/lib/chromium/resources/inspector/Images/timelineHollowPillPurple.png
--rw-rw-r--     root/root       usr/lib/chromium/resources/inspector/Images/timelineHollowPillRed.png
--rw-rw-r--     root/root       usr/lib/chromium/resources/inspector/Images/timelineHollowPillYellow.png
--rw-rw-r--     root/root       usr/lib/chromium/resources/inspector/Images/timelinePillBlue.png
--rw-rw-r--     root/root       usr/lib/chromium/resources/inspector/Images/timelinePillGray.png
--rw-rw-r--     root/root       usr/lib/chromium/resources/inspector/Images/timelinePillGreen.png
--rw-rw-r--     root/root       usr/lib/chromium/resources/inspector/Images/timelinePillOrange.png
--rw-rw-r--     root/root       usr/lib/chromium/resources/inspector/Images/timelinePillPurple.png
--rw-rw-r--     root/root       usr/lib/chromium/resources/inspector/Images/timelinePillRed.png
--rw-rw-r--     root/root       usr/lib/chromium/resources/inspector/Images/timelinePillYellow.png
 -rw-rw-r--     root/root       usr/lib/chromium/resources/inspector/Images/toolbarItemSelected.png
--rw-rw-r--     root/root       usr/lib/chromium/resources/inspector/Images/trackHoriz.png
--rw-rw-r--     root/root       usr/lib/chromium/resources/inspector/Images/trackVert.png
--rw-r--r--     root/root       usr/lib/chromium/resources/inspector/LayersPanel.js
--rw-r--r--     root/root       usr/lib/chromium/resources/inspector/NetworkPanel.js
--rw-r--r--     root/root       usr/lib/chromium/resources/inspector/ProfilesPanel.js
--rw-r--r--     root/root       usr/lib/chromium/resources/inspector/ResourcesPanel.js
--rw-r--r--     root/root       usr/lib/chromium/resources/inspector/ScriptFormatterWorker.js
--rw-r--r--     root/root       usr/lib/chromium/resources/inspector/SourcesPanel.js
--rw-r--r--     root/root       usr/lib/chromium/resources/inspector/TimelinePanel.js
--rw-rw-r--     root/root       usr/lib/chromium/resources/inspector/accelerometer.css
--rw-rw-r--     root/root       usr/lib/chromium/resources/inspector/auditsPanel.css
--rw-rw-r--     root/root       usr/lib/chromium/resources/inspector/breadcrumbList.css
--rw-rw-r--     root/root       usr/lib/chromium/resources/inspector/breakpointsList.css
--rw-rw-r--     root/root       usr/lib/chromium/resources/inspector/buildSystemOnly.js
--rw-rw-r--     root/root       usr/lib/chromium/resources/inspector/canvasProfiler.css
--rw-rw-r--     root/root       usr/lib/chromium/resources/inspector/cmdevtools.css
--rw-rw-r--     root/root       usr/lib/chromium/resources/inspector/codemirror.css
--rw-rw-r--     root/root       usr/lib/chromium/resources/inspector/cssNamedFlows.css
--rw-rw-r--     root/root       usr/lib/chromium/resources/inspector/dataGrid.css
+-rw-rw-r--     root/root       usr/lib/chromium/resources/inspector/Images/touchCursor.png
+-rw-rw-r--     root/root       usr/lib/chromium/resources/inspector/Images/touchCursor_2x.png
+-rw-r--r--     root/root       usr/lib/chromium/resources/inspector/InspectorBackendCommands.js
+-rw-r--r--     root/root       usr/lib/chromium/resources/inspector/SupportedCSSProperties.js
+-rw-r--r--     root/root       usr/lib/chromium/resources/inspector/audits_module.js
+-rw-r--r--     root/root       usr/lib/chromium/resources/inspector/components_lazy_module.js
+-rw-r--r--     root/root       usr/lib/chromium/resources/inspector/console_module.js
+-rw-r--r--     root/root       usr/lib/chromium/resources/inspector/devices_module.js
+-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/devtools.js
 -rw-r--r--     root/root       usr/lib/chromium/resources/inspector/devtools_extension_api.js
--rw-rw-r--     root/root       usr/lib/chromium/resources/inspector/elementsPanel.css
--rw-rw-r--     root/root       usr/lib/chromium/resources/inspector/filter.css
--rw-rw-r--     root/root       usr/lib/chromium/resources/inspector/filteredItemSelectionDialog.css
--rw-rw-r--     root/root       usr/lib/chromium/resources/inspector/flameChart.css
--rw-rw-r--     root/root       usr/lib/chromium/resources/inspector/heapProfiler.css
--rw-rw-r--     root/root       usr/lib/chromium/resources/inspector/helpScreen.css
--rw-rw-r--     root/root       usr/lib/chromium/resources/inspector/indexedDBViews.css
+-rw-r--r--     root/root       usr/lib/chromium/resources/inspector/elements_module.js
+-rw-r--r--     root/root       usr/lib/chromium/resources/inspector/heap_snapshot_worker_module.js
 -rw-r--r--     root/root       usr/lib/chromium/resources/inspector/inspector.css
+-rw-r--r--     root/root       usr/lib/chromium/resources/inspector/inspector.html
 -rw-r--r--     root/root       usr/lib/chromium/resources/inspector/inspector.js
--rw-rw-r--     root/root       usr/lib/chromium/resources/inspector/inspectorCommon.css
--rw-rw-r--     root/root       usr/lib/chromium/resources/inspector/layersPanel.css
--rw-rw-r--     root/root       usr/lib/chromium/resources/inspector/navigatorView.css
--rw-rw-r--     root/root       usr/lib/chromium/resources/inspector/networkLogView.css
--rw-rw-r--     root/root       usr/lib/chromium/resources/inspector/networkPanel.css
--rw-rw-r--     root/root       usr/lib/chromium/resources/inspector/overrides.css
--rw-rw-r--     root/root       usr/lib/chromium/resources/inspector/panelEnablerView.css
--rw-rw-r--     root/root       usr/lib/chromium/resources/inspector/profilesPanel.css
--rw-rw-r--     root/root       usr/lib/chromium/resources/inspector/resourceView.css
--rw-rw-r--     root/root       usr/lib/chromium/resources/inspector/resourcesPanel.css
--rw-rw-r--     root/root       usr/lib/chromium/resources/inspector/revisionHistory.css
--rw-rw-r--     root/root       usr/lib/chromium/resources/inspector/screencastView.css
--rw-rw-r--     root/root       usr/lib/chromium/resources/inspector/sidebarPane.css
--rw-rw-r--     root/root       usr/lib/chromium/resources/inspector/sourcesPanel.css
--rw-rw-r--     root/root       usr/lib/chromium/resources/inspector/sourcesView.css
--rw-rw-r--     root/root       usr/lib/chromium/resources/inspector/spectrum.css
--rw-rw-r--     root/root       usr/lib/chromium/resources/inspector/splitView.css
--rw-rw-r--     root/root       usr/lib/chromium/resources/inspector/textPrompt.css
--rw-rw-r--     root/root       usr/lib/chromium/resources/inspector/timelinePanel.css
+-rw-r--r--     root/root       usr/lib/chromium/resources/inspector/layers_module.js
+-rw-r--r--     root/root       usr/lib/chromium/resources/inspector/network_module.js
+-rw-r--r--     root/root       usr/lib/chromium/resources/inspector/profiler_module.js
+-rw-r--r--     root/root       usr/lib/chromium/resources/inspector/promises_module.js
+-rw-r--r--     root/root       usr/lib/chromium/resources/inspector/resources_module.js
+-rw-r--r--     root/root       usr/lib/chromium/resources/inspector/script_formatter_worker_module.js
+-rw-r--r--     root/root       usr/lib/chromium/resources/inspector/settings_module.js
+-rw-r--r--     root/root       usr/lib/chromium/resources/inspector/source_frame_module.js
+-rw-r--r--     root/root       usr/lib/chromium/resources/inspector/sources_module.js
+-rw-r--r--     root/root       usr/lib/chromium/resources/inspector/temp_storage_shared_worker_module.js
+-rw-r--r--     root/root       usr/lib/chromium/resources/inspector/timeline_module.js
+-rw-r--r--     root/root       usr/lib/chromium/resources/inspector/toolbox.css
+-rw-r--r--     root/root       usr/lib/chromium/resources/inspector/toolbox.html
+-rw-r--r--     root/root       usr/lib/chromium/resources/inspector/toolbox.js
+-rw-r--r--     root/root       usr/lib/chromium/resources/inspector/ui_lazy_module.js
+-rw-r--r--     root/root       usr/lib/chromium/snapshot_blob.bin
 drwxr-xr-x     root/root       usr/man/
 drwxr-xr-x     root/root       usr/man/man1/
 -rw-r--r--     root/root       usr/man/man1/chromium.1.gz
 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
 drwxr-xr-x     root/root       usr/share/icons/
 drwxr-xr-x     root/root       usr/share/icons/hicolor/
 drwxr-xr-x     root/root       usr/share/icons/hicolor/128x128/
@@ -182,3 +142,5 @@ drwxr-xr-x  root/root       usr/share/icons/hicolor/256x256/apps/
 drwxr-xr-x     root/root       usr/share/icons/hicolor/48x48/
 drwxr-xr-x     root/root       usr/share/icons/hicolor/48x48/apps/
 -rw-r--r--     root/root       usr/share/icons/hicolor/48x48/apps/chromium.png
+drwxr-xr-x     root/root       usr/share/pixmaps/
+lrwxrwxrwx     root/root       usr/share/pixmaps/chromium.png -> /usr/share/icons/hicolor/48x48/apps/chromium.png

diff --git a/chromium/.md5sum b/chromium/.md5sum
index d2206fa6f6b7e3794df64935501a2e9ae106edf6..2125713f3d92c56d26069d96fffe5e3cad263a59 100644 (file)
--- a/chromium/.md5sum
+++ b/chromium/.md5sum
@@ -1,4 +1,3 @@
-72b763a705ed8417c8244006503f69b9  chromium-33.0.1750.152.tar.xz
+6761495b1ea2c37e41105abded652af3  chromium-42.0.2311.90.tar.xz
+b527005e021b14869a669e42c46b661d  chromium.desktop
 64968626706b07721983ac59fb3babbf  chromium.sh
-92466b86aa63291bcfd77ceee10c3335  icu-native-arm.patch
-910f6c3c9110875ca974f132244cc38c  rungn.patch

diff --git a/chromium/Pkgfile b/chromium/Pkgfile
index 0f26fcd05061c62efe13c438244c095f4ad9fe3f..faf22355170b25b94f5ae881062277d0b1088da8 100644 (file)
--- a/chromium/Pkgfile
+++ b/chromium/Pkgfile
@@ -6,23 +6,16 @@
 # Depends on: dbus-glib gtk libevent nss xorg-libxscrnsaver xorg-libxtst libgcrypt xorg-libxdamage xorg-libxt gperf speech-dispatcher
 
 name=chromium
-version=33.0.1750.152
+version=42.0.2311.90
 release=1
-source=(http://commondatastorage.googleapis.com/chromium-browser-official/$name-$version.tar.xz \
-        $name.sh icu-native-arm.patch rungn.patch)
+source=(http://commondatastorage.googleapis.com/$name-browser-official/$name-$version.tar.xz \
+        $name.sh $name.desktop)
 
 build() {
   cd $name-$version
 
   # avoid 32-bit flags (g++: error: unrecognized command line option '-m32')
-  patch -p1 -i $SRC/icu-native-arm.patch
-
-  # patch for supplemental_includes
-  patch -p0 -i $SRC/rungn.patch
-
-  # fix for speech-dispatcher >= 0.8
-  sed -e 's|<<(libspeechd_h_prefix)libspeechd.h>|<speech-dispatcher/libspeechd.h>|' \
-      -i build/linux/system.gyp
+#  patch -p1 -i $SRC/icu-native-arm.patch
 
   export CFLAGS="$CFLAGS $(pkg-config --cflags nspr)"
   export LDFLAGS="$LDFLAGS $(pkg-config --libs nspr)"
@@ -38,7 +31,7 @@ build() {
     esac
   done
 
-  build/gyp_chromium -f make build/all.gyp --depth=. \
+  build/gyp_chromium build/all.gyp --depth=. \
         -Dtarget_arch=arm \
         -Darm_float_abi=hard \
         -Darmv7=$USE_ARMV7 \
@@ -47,17 +40,18 @@ build() {
         -Dv8_target_arch=arm \
         -Dv8_use_arm_eabi_hardfloat=1 \
         -Dsysroot= \
+        -Dclang=0 \
         -Dpython_ver="2.7" \
         -Dno_strict_aliasing=1 \
         -Dwerror= \
-        -Dlinux_sandbox_path=/usr/lib/chromium/chrome-sandbox \
+        -Dlinux_sandbox_path=/usr/lib/$name/chrome-sandbox \
         -Dlinux_strip_binary=1 \
         -Dlinux_use_gold_binary=0 \
         -Dlinux_use_gold_flags=0 \
-        -Dlinux_use_tmalloc=0 \
         -Drelease_extra_cflags="$CFLAGS" \
         -Dproprietary_codecs=1 \
         -Dffmpeg_branding=Chrome \
+        -Dlibspeechd_h_prefix=speech-dispatcher/ \
         -Duse_system_libjpeg=1 \
         -Duse_system_libxslt=1 \
         -Duse_system_libxml=1 \
@@ -65,9 +59,10 @@ build() {
         -Duse_system_zlib=0 \
         -Duse_system_libpng=0 \
         -Duse_system_ffmpeg=0 \
-        -Duse_system_yasm=0 \
+        -Duse_system_yasm=1 \
         -Duse_system_libevent=1 \
         -Duse_system_sqlite=0 \
+        -Duse_system_ssl=0 \
         -Dremove_webcore_debug_symbols=1 \
         -Duse_gconf=0 \
         -Duse_cups=0 \
@@ -78,26 +73,30 @@ build() {
         -Dlinux_link_libpci=1 \
         -Dlinux_link_libspeechd=1 \
         -Denable_webrtc=1 \
-        -Ddisable_nacl=1
+        -Ddisable_nacl=1 \
+        -Dicu_use_data_file_flag=0
 
-  # fix issue with nspr libs
-  sed -e "s|LIBS := |LIBS := $LDFLAGS |" -i chrome/chrome.target.mk
+  ninja -C out/Release chrome chrome_sandbox
 
-  make chrome chrome_sandbox BUILDTYPE=Release
+  install -m 0755 -D out/Release/chrome $PKG/usr/lib/$name/$name
+  install -m 4755 -o root -g root -D out/Release/chrome_sandbox $PKG/usr/lib/$name/chrome-sandbox
+  install -m 0644 -D out/Release/*.pak $PKG/usr/lib/$name
+  install -m 0755 -D out/Release/libffmpegsumo.so $PKG/usr/lib/$name
+  install -d $PKG/usr/lib/$name/locales
+  install -m 0644 out/Release/locales/en-US.pak $PKG/usr/lib/$name/locales
+  cp -a out/Release/resources $PKG/usr/lib/$name
+  install -m 0644 -D out/Release/chrome.1 $PKG/usr/man/man1/$name.1
 
-  install -m 0755 -D out/Release/chrome $PKG/usr/lib/chromium/chromium
-  install -m 4755 -o root -g root -D out/Release/chrome_sandbox $PKG/usr/lib/chromium/chrome-sandbox
-  install -m 0644 -D out/Release/*.pak $PKG/usr/lib/chromium
-  install -m 0755 -D out/Release/libffmpegsumo.so $PKG/usr/lib/chromium
-  install -d $PKG/usr/lib/chromium/locales
-  install -m 0644 out/Release/locales/en-US.pak $PKG/usr/lib/chromium/locales
-  cp -a out/Release/resources $PKG/usr/lib/chromium
-  install -m 0644 -D out/Release/chrome.1 $PKG/usr/man/man1/chromium.1
+  # fix v8 natives
+  cp -a out/Release/{natives,snapshot}_blob.bin $PKG/usr/lib/$name
 
   for size in 22 24 48 128 256; do
-    install -m 0644 -D chrome/app/theme/chromium/product_logo_${size}.png \
-      $PKG/usr/share/icons/hicolor/${size}x${size}/apps/chromium.png
+    install -m 0644 -D chrome/app/theme/$name/product_logo_${size}.png \
+      $PKG/usr/share/icons/hicolor/${size}x${size}/apps/$name.png
   done
 
-  install -m 0755 -D $SRC/chromium.sh $PKG/usr/bin/chromium
+  install -d $PKG/usr/share/pixmaps
+  ln -sf /usr/share/icons/hicolor/48x48/apps/$name.png $PKG/usr/share/pixmaps/$name.png
+  install -m 0644 -D $SRC/$name.desktop $PKG/usr/share/applications/$name.desktop
+  install -m 0755 -D $SRC/$name.sh $PKG/usr/bin/$name
 }

diff --git a/chromium/chromium.desktop b/chromium/chromium.desktop
new file mode 100644 (file)
index 0000000..9a6e5e2
--- /dev/null
+++ b/chromium/chromium.desktop
@@ -0,0 +1,8 @@
+[Desktop Entry]
+Name=Chromium
+Comment=Browser
+Exec=chromium
+Icon=chromium.png
+Terminal=false
+Type=Application
+Categories=Application;Network;

diff --git a/chromium/icu-native-arm.patch b/chromium/icu-native-arm.patch
deleted file mode 100644 (file)
index 2228609..0000000
--- a/chromium/icu-native-arm.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- chromium-30.0.1599.114/third_party/icu/icu.gyp.orig        2013-10-22 02:11:03.000000000 +0200
-+++ chromium-30.0.1599.114/third_party/icu/icu.gyp     2013-10-22 02:14:00.000000000 +0200
-@@ -27,7 +27,7 @@
-       }],
-       ['(OS=="linux" or OS=="freebsd" or OS=="openbsd" or OS=="solaris" \
-          or OS=="netbsd" or OS=="mac" or OS=="android") and \
--        (target_arch=="arm" or target_arch=="ia32" or \
-+        (target_arch=="ia32" or \
-          target_arch=="mipsel")', {
-         'target_conditions': [
-           ['_toolset=="host"', {

diff --git a/chromium/rungn.patch b/chromium/rungn.patch
deleted file mode 100644 (file)
index 0e73a81..0000000
--- a/chromium/rungn.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- build/gyp_chromium.orig 2013-12-11 03:07:03.941915587 +0000
-+++ build/gyp_chromium  2013-12-11 03:07:29.812073301 +0000
-@@ -221,9 +221,6 @@
- 
-   supplemental_includes = GetSupplementalFiles()
- 
--  if not RunGN(supplemental_includes):
--    sys.exit(1)
--
-   args.extend(
-       ['-I' + i for i in additional_include_files(supplemental_includes, args)])