From ca8b7837f70c2a6168507fdbf182ca77aa71606a Mon Sep 17 00:00:00 2001 From: Jose V Beneyto Date: Tue, 6 Aug 2013 18:28:23 +0200 Subject: [PATCH] chromium: updated to 28.0.1500.71 (fixes build with nss >= 3.15) --- chromium/.footprint | 62 ++++---------------------------- chromium/.md5sum | 4 +-- chromium/Pkgfile | 12 ++++--- chromium/nss-3.15.diff | 29 +++++++++++++++ chromium/speech-dispatcher.patch | 11 ------ 5 files changed, 45 insertions(+), 73 deletions(-) create mode 100644 chromium/nss-3.15.diff delete mode 100644 chromium/speech-dispatcher.patch diff --git a/chromium/.footprint b/chromium/.footprint index 79ebf24af..7e2007b3c 100644 --- a/chromium/.footprint +++ b/chromium/.footprint @@ -18,44 +18,28 @@ drwxr-xr-x root/root usr/lib/chromium/resources/extension/ drwxr-xr-x root/root usr/lib/chromium/resources/extension/demo/ -rw-r--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/AceTextEditor.js -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/DevTools.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-r--r-- root/root usr/lib/chromium/resources/inspector/Images/addIcon.png -rw-r--r-- root/root usr/lib/chromium/resources/inspector/Images/applicationCache.png -rw-r--r-- root/root usr/lib/chromium/resources/inspector/Images/back.png +-rw-r--r-- root/root usr/lib/chromium/resources/inspector/Images/breakpoint2.png +-rw-r--r-- root/root usr/lib/chromium/resources/inspector/Images/breakpoint2_2x.png -rw-r--r-- root/root usr/lib/chromium/resources/inspector/Images/breakpointBorder.png +-rw-r--r-- root/root usr/lib/chromium/resources/inspector/Images/breakpointConditional2.png +-rw-r--r-- root/root usr/lib/chromium/resources/inspector/Images/breakpointConditional2_2x.png -rw-r--r-- root/root usr/lib/chromium/resources/inspector/Images/breakpointConditionalBorder.png -rw-r--r-- root/root usr/lib/chromium/resources/inspector/Images/breakpointConditionalCounterBorder.png -rw-r--r-- root/root usr/lib/chromium/resources/inspector/Images/breakpointCounterBorder.png -rw-r--r-- root/root usr/lib/chromium/resources/inspector/Images/checker.png --rw-r--r-- root/root usr/lib/chromium/resources/inspector/Images/closeButtons.png -rw-r--r-- root/root usr/lib/chromium/resources/inspector/Images/cookie.png -rw-r--r-- root/root usr/lib/chromium/resources/inspector/Images/database.png -rw-r--r-- root/root usr/lib/chromium/resources/inspector/Images/databaseTable.png --rw-r--r-- root/root usr/lib/chromium/resources/inspector/Images/debuggerContinue.png --rw-r--r-- root/root usr/lib/chromium/resources/inspector/Images/debuggerPause.png --rw-r--r-- root/root usr/lib/chromium/resources/inspector/Images/debuggerStepInto.png --rw-r--r-- root/root usr/lib/chromium/resources/inspector/Images/debuggerStepOut.png --rw-r--r-- root/root usr/lib/chromium/resources/inspector/Images/debuggerStepOver.png -rw-r--r-- root/root usr/lib/chromium/resources/inspector/Images/deleteIcon.png --rw-r--r-- root/root usr/lib/chromium/resources/inspector/Images/disclosureTriangleSmallDown.png --rw-r--r-- root/root usr/lib/chromium/resources/inspector/Images/disclosureTriangleSmallDownBlack.png --rw-r--r-- root/root usr/lib/chromium/resources/inspector/Images/disclosureTriangleSmallDownWhite.png --rw-r--r-- root/root usr/lib/chromium/resources/inspector/Images/disclosureTriangleSmallRight.png --rw-r--r-- root/root usr/lib/chromium/resources/inspector/Images/disclosureTriangleSmallRightBlack.png --rw-r--r-- root/root usr/lib/chromium/resources/inspector/Images/disclosureTriangleSmallRightDown.png --rw-r--r-- root/root usr/lib/chromium/resources/inspector/Images/disclosureTriangleSmallRightDownBlack.png --rw-r--r-- root/root usr/lib/chromium/resources/inspector/Images/disclosureTriangleSmallRightDownWhite.png --rw-r--r-- root/root usr/lib/chromium/resources/inspector/Images/disclosureTriangleSmallRightWhite.png -rw-r--r-- root/root usr/lib/chromium/resources/inspector/Images/domain.png --rw-r--r-- root/root usr/lib/chromium/resources/inspector/Images/errorIcon.png --rw-r--r-- root/root usr/lib/chromium/resources/inspector/Images/errorMediumIcon.png --rw-r--r-- root/root usr/lib/chromium/resources/inspector/Images/errorRedDot.png -rw-r--r-- root/root usr/lib/chromium/resources/inspector/Images/fileSystem.png -rw-r--r-- root/root usr/lib/chromium/resources/inspector/Images/forward.png -rw-r--r-- root/root usr/lib/chromium/resources/inspector/Images/frame.png @@ -63,7 +47,6 @@ drwxr-xr-x root/root usr/lib/chromium/resources/inspector/Images/ -rw-r--r-- root/root usr/lib/chromium/resources/inspector/Images/glossyHeaderPressed.png -rw-r--r-- root/root usr/lib/chromium/resources/inspector/Images/glossyHeaderSelected.png -rw-r--r-- root/root usr/lib/chromium/resources/inspector/Images/glossyHeaderSelectedPressed.png --rw-r--r-- root/root usr/lib/chromium/resources/inspector/Images/goArrow.png -rw-r--r-- root/root usr/lib/chromium/resources/inspector/Images/graphLabelCalloutLeft.png -rw-r--r-- root/root usr/lib/chromium/resources/inspector/Images/graphLabelCalloutRight.png -rw-r--r-- root/root usr/lib/chromium/resources/inspector/Images/indexedDB.png @@ -71,13 +54,9 @@ drwxr-xr-x root/root usr/lib/chromium/resources/inspector/Images/ -rw-r--r-- root/root usr/lib/chromium/resources/inspector/Images/indexedDBObjectStore.png -rw-r--r-- root/root usr/lib/chromium/resources/inspector/Images/localStorage.png -rw-r--r-- root/root usr/lib/chromium/resources/inspector/Images/namedFlowOverflow.png --rw-r--r-- root/root usr/lib/chromium/resources/inspector/Images/navigatorShowHideButton.png -rw-r--r-- root/root usr/lib/chromium/resources/inspector/Images/paneAddButtons.png --rw-r--r-- root/root usr/lib/chromium/resources/inspector/Images/paneBottomGrow.png --rw-r--r-- root/root usr/lib/chromium/resources/inspector/Images/paneBottomGrowActive.png -rw-r--r-- root/root usr/lib/chromium/resources/inspector/Images/paneElementStateButtons.png -rw-r--r-- root/root usr/lib/chromium/resources/inspector/Images/paneFilterButtons.png --rw-r--r-- root/root usr/lib/chromium/resources/inspector/Images/paneGrowHandleLine.png -rw-r--r-- root/root usr/lib/chromium/resources/inspector/Images/paneRefreshButtons.png -rw-r--r-- root/root usr/lib/chromium/resources/inspector/Images/paneSettingsButtons.png -rw-r--r-- root/root usr/lib/chromium/resources/inspector/Images/popoverArrows.png @@ -85,7 +64,6 @@ drwxr-xr-x root/root usr/lib/chromium/resources/inspector/Images/ -rw-r--r-- root/root usr/lib/chromium/resources/inspector/Images/profileGroupIcon.png -rw-r--r-- root/root usr/lib/chromium/resources/inspector/Images/profileIcon.png -rw-r--r-- root/root usr/lib/chromium/resources/inspector/Images/profileSmallIcon.png --rw-r--r-- root/root usr/lib/chromium/resources/inspector/Images/profilesSilhouette.png -rw-r--r-- root/root usr/lib/chromium/resources/inspector/Images/programCounterBorder.png -rw-r--r-- root/root usr/lib/chromium/resources/inspector/Images/radioDot.png -rw-r--r-- root/root usr/lib/chromium/resources/inspector/Images/regionEmpty.png @@ -97,9 +75,7 @@ drwxr-xr-x root/root usr/lib/chromium/resources/inspector/Images/ -rw-r--r-- root/root usr/lib/chromium/resources/inspector/Images/resourceJSIcon.png -rw-r--r-- root/root usr/lib/chromium/resources/inspector/Images/resourcePlainIcon.png -rw-r--r-- root/root usr/lib/chromium/resources/inspector/Images/resourcePlainIconSmall.png --rw-r--r-- root/root usr/lib/chromium/resources/inspector/Images/resourcesSizeGraphIcon.png -rw-r--r-- root/root usr/lib/chromium/resources/inspector/Images/resourcesTimeGraphIcon.png --rw-r--r-- root/root usr/lib/chromium/resources/inspector/Images/scriptsSilhouette.png -rw-r--r-- root/root usr/lib/chromium/resources/inspector/Images/searchNext.png -rw-r--r-- root/root usr/lib/chromium/resources/inspector/Images/searchPrev.png -rw-r--r-- root/root usr/lib/chromium/resources/inspector/Images/searchSmallBlue.png @@ -107,36 +83,27 @@ drwxr-xr-x root/root usr/lib/chromium/resources/inspector/Images/ -rw-r--r-- root/root usr/lib/chromium/resources/inspector/Images/searchSmallGray.png -rw-r--r-- root/root usr/lib/chromium/resources/inspector/Images/searchSmallWhite.png -rw-r--r-- root/root usr/lib/chromium/resources/inspector/Images/segment.png --rw-r--r-- root/root usr/lib/chromium/resources/inspector/Images/segmentChromium.png -rw-r--r-- root/root usr/lib/chromium/resources/inspector/Images/segmentEnd.png -rw-r--r-- root/root usr/lib/chromium/resources/inspector/Images/segmentHover.png --rw-r--r-- root/root usr/lib/chromium/resources/inspector/Images/segmentHoverChromium.png -rw-r--r-- root/root usr/lib/chromium/resources/inspector/Images/segmentHoverEnd.png --rw-r--r-- root/root usr/lib/chromium/resources/inspector/Images/segmentHoverEndChromium.png -rw-r--r-- root/root usr/lib/chromium/resources/inspector/Images/segmentSelected.png --rw-r--r-- root/root usr/lib/chromium/resources/inspector/Images/segmentSelectedChromium.png -rw-r--r-- root/root usr/lib/chromium/resources/inspector/Images/segmentSelectedEnd.png --rw-r--r-- root/root usr/lib/chromium/resources/inspector/Images/segmentSelectedEndChromium.png -rw-r--r-- root/root usr/lib/chromium/resources/inspector/Images/sessionStorage.png -rw-r--r-- root/root usr/lib/chromium/resources/inspector/Images/spinner.gif -rw-r--r-- root/root usr/lib/chromium/resources/inspector/Images/spinnerActive.gif -rw-r--r-- root/root usr/lib/chromium/resources/inspector/Images/spinnerActiveSelected.gif -rw-r--r-- root/root usr/lib/chromium/resources/inspector/Images/spinnerInactive.gif -rw-r--r-- root/root usr/lib/chromium/resources/inspector/Images/spinnerInactiveSelected.gif --rw-r--r-- root/root usr/lib/chromium/resources/inspector/Images/splitviewDimple.png --rw-r--r-- root/root usr/lib/chromium/resources/inspector/Images/splitviewDividerBackground.png -rw-r--r-- root/root usr/lib/chromium/resources/inspector/Images/statusbarButtonGlyphs.png -rw-r--r-- root/root usr/lib/chromium/resources/inspector/Images/statusbarButtonGlyphs2x.png -rw-r--r-- root/root usr/lib/chromium/resources/inspector/Images/statusbarResizerHorizontal.png -rw-r--r-- root/root usr/lib/chromium/resources/inspector/Images/statusbarResizerVertical.png --rw-r--r-- root/root usr/lib/chromium/resources/inspector/Images/successGreenDot.png -rw-r--r-- root/root usr/lib/chromium/resources/inspector/Images/thumbActiveHoriz.png -rw-r--r-- root/root usr/lib/chromium/resources/inspector/Images/thumbActiveVert.png -rw-r--r-- root/root usr/lib/chromium/resources/inspector/Images/thumbHoriz.png -rw-r--r-- root/root usr/lib/chromium/resources/inspector/Images/thumbHoverHoriz.png -rw-r--r-- root/root usr/lib/chromium/resources/inspector/Images/thumbHoverVert.png -rw-r--r-- root/root usr/lib/chromium/resources/inspector/Images/thumbVert.png --rw-r--r-- root/root usr/lib/chromium/resources/inspector/Images/tickMark.png -rw-r--r-- root/root usr/lib/chromium/resources/inspector/Images/timelineHollowPillBlue.png -rw-r--r-- root/root usr/lib/chromium/resources/inspector/Images/timelineHollowPillGray.png -rw-r--r-- root/root usr/lib/chromium/resources/inspector/Images/timelineHollowPillGreen.png @@ -156,26 +123,12 @@ drwxr-xr-x root/root usr/lib/chromium/resources/inspector/Images/ -rw-r--r-- root/root usr/lib/chromium/resources/inspector/Images/toolbarItemSelected.png -rw-r--r-- root/root usr/lib/chromium/resources/inspector/Images/trackHoriz.png -rw-r--r-- root/root usr/lib/chromium/resources/inspector/Images/trackVert.png --rw-r--r-- root/root usr/lib/chromium/resources/inspector/Images/treeDownTriangleBlack.png --rw-r--r-- root/root usr/lib/chromium/resources/inspector/Images/treeDownTriangleWhite.png --rw-r--r-- root/root usr/lib/chromium/resources/inspector/Images/treeRightTriangleBlack.png --rw-r--r-- root/root usr/lib/chromium/resources/inspector/Images/treeRightTriangleWhite.png --rw-r--r-- root/root usr/lib/chromium/resources/inspector/Images/treeUpTriangleBlack.png --rw-r--r-- root/root usr/lib/chromium/resources/inspector/Images/treeUpTriangleWhite.png --rw-r--r-- root/root usr/lib/chromium/resources/inspector/Images/userInputIcon.png --rw-r--r-- root/root usr/lib/chromium/resources/inspector/Images/userInputPreviousIcon.png --rw-r--r-- root/root usr/lib/chromium/resources/inspector/Images/userInputResultIcon.png --rw-r--r-- root/root usr/lib/chromium/resources/inspector/Images/warningIcon.png --rw-r--r-- root/root usr/lib/chromium/resources/inspector/Images/warningMediumIcon.png --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/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/ScriptsPanel.js -rw-r--r-- root/root usr/lib/chromium/resources/inspector/TimelinePanel.js --rw-r--r-- root/root usr/lib/chromium/resources/inspector/acedevtools.css -rw-r--r-- root/root usr/lib/chromium/resources/inspector/auditsPanel.css -rw-r--r-- root/root usr/lib/chromium/resources/inspector/breadcrumbList.css -rw-r--r-- root/root usr/lib/chromium/resources/inspector/breakpointsList.css @@ -185,7 +138,6 @@ drwxr-xr-x root/root usr/lib/chromium/resources/inspector/Images/ -rw-r--r-- root/root usr/lib/chromium/resources/inspector/codemirror.css -rw-r--r-- root/root usr/lib/chromium/resources/inspector/cssNamedFlows.css -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/devtools_extension_api.js -rw-r--r-- root/root usr/lib/chromium/resources/inspector/elementsPanel.css @@ -194,10 +146,9 @@ drwxr-xr-x root/root usr/lib/chromium/resources/inspector/Images/ -rw-r--r-- root/root usr/lib/chromium/resources/inspector/heapProfiler.css -rw-r--r-- root/root usr/lib/chromium/resources/inspector/helpScreen.css -rw-r--r-- root/root usr/lib/chromium/resources/inspector/indexedDBViews.css +-rw-r--r-- root/root usr/lib/chromium/resources/inspector/inspector.css +-rw-r--r-- root/root usr/lib/chromium/resources/inspector/inspector.js -rw-r--r-- root/root usr/lib/chromium/resources/inspector/inspectorCommon.css --rw-r--r-- root/root usr/lib/chromium/resources/inspector/mode_css.js --rw-r--r-- root/root usr/lib/chromium/resources/inspector/mode_html.js --rw-r--r-- root/root usr/lib/chromium/resources/inspector/mode_javascript.js -rw-r--r-- root/root usr/lib/chromium/resources/inspector/nativeMemoryProfiler.css -rw-r--r-- root/root usr/lib/chromium/resources/inspector/navigatorView.css -rw-r--r-- root/root usr/lib/chromium/resources/inspector/networkLogView.css @@ -214,7 +165,6 @@ drwxr-xr-x root/root usr/lib/chromium/resources/inspector/Images/ -rw-r--r-- root/root usr/lib/chromium/resources/inspector/tabbedPane.css -rw-r--r-- root/root usr/lib/chromium/resources/inspector/textEditor.css -rw-r--r-- root/root usr/lib/chromium/resources/inspector/textPrompt.css --rw-r--r-- root/root usr/lib/chromium/resources/inspector/theme_textmate.js -rw-r--r-- root/root usr/lib/chromium/resources/inspector/timelinePanel.css drwxr-xr-x root/root usr/man/ drwxr-xr-x root/root usr/man/man1/ diff --git a/chromium/.md5sum b/chromium/.md5sum index ca29722b6..7ba49ba09 100644 --- a/chromium/.md5sum +++ b/chromium/.md5sum @@ -1,3 +1,3 @@ -ff402aa41ce6eb3730c0b295338ce361 chromium-27.0.1453.116.tar.xz +67c287ec44dc353ec57fad6379ad5de6 chromium-28.0.1500.71.tar.xz 64968626706b07721983ac59fb3babbf chromium.sh -31267242d18b416f903f25231c3ece7f speech-dispatcher.patch +406827ad7d1fe469828cb76a4e19d67e nss-3.15.diff diff --git a/chromium/Pkgfile b/chromium/Pkgfile index 946f93c84..103b02502 100644 --- a/chromium/Pkgfile +++ b/chromium/Pkgfile @@ -5,16 +5,20 @@ # Depends on: dbus-glib gtk libevent nss xorg-libxscrnsaver xorg-libxtst libgcrypt xorg-libxdamage yasm xorg-libxt gperf speech-dispatcher name=chromium -version=27.0.1453.116 +version=28.0.1500.71 release=1 source=(http://commondatastorage.googleapis.com/chromium-browser-official/$name-$version.tar.xz \ - $name.sh speech-dispatcher.patch) + $name.sh nss-3.15.diff) build() { cd $name-$version - # fix building issues - patch -p2 -i $SRC/speech-dispatcher.patch + # fix for speech-dispatcher >= 0.8 + sed -e 's|<<(libspeechd_h_prefix)libspeechd.h>||' \ + -i build/linux/system.gyp + + # fix for nss >= 3.15 + patch -p1 -i $SRC/nss-3.15.diff find third_party/WebKit/Source ui/base/ime \ -type f -exec sed -e 's|||g' -i {} \; diff --git a/chromium/nss-3.15.diff b/chromium/nss-3.15.diff new file mode 100644 index 000000000..84534f1aa --- /dev/null +++ b/chromium/nss-3.15.diff @@ -0,0 +1,29 @@ +Index: net/third_party/nss/ssl/bodge/secitem_array.c +diff --git a/net/third_party/nss/ssl/bodge/secitem_array.c b/net/third_party/nss/ssl/bodge/secitem_array.c +index ac80da8e4770106c4b50cc4e4c205c4183d2ad69..62e590742194012b49f17d72b0cdf383c135416a 100644 +--- 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 @@ + + typedef struct SECItemArrayStr SECItemArray; + ++#define NSSUTIL_VERSION_NUM \ ++ (NSSUTIL_VMAJOR * 10000 + NSSUTIL_VMINOR * 100 + NSSUTIL_VPATCH) ++#if NSSUTIL_VERSION_NUM < 31500 ++// Added in NSS 3.15. + struct SECItemArrayStr { + SECItem *items; + unsigned int len; + }; ++#endif + + SECItemArray * + SECITEM_AllocArray(PLArenaPool *arena, SECItemArray *array, unsigned int len) diff --git a/chromium/speech-dispatcher.patch b/chromium/speech-dispatcher.patch deleted file mode 100644 index c2e11e6ee..000000000 --- a/chromium/speech-dispatcher.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- chromium-browser-26.0.1410.19/src/build/linux/system.gyp~ 2013-03-04 00:04:06.000000000 +0200 -+++ chromium-browser-26.0.1410.19/src/build/linux/system.gyp 2013-03-04 13:45:31.822101677 +0200 -@@ -494,7 +494,7 @@ - '--name', 'LibSpeechdLoader', - '--output-h', '<(output_h)', - '--output-cc', '<(output_cc)', -- '--header', '', -+ '--header', '', - '--link-directly=<(linux_link_libspeechd)', - 'spd_open', - 'spd_say',