From e7884f5a8bb0a182393fbf86a38a20abacfdd2c1 Mon Sep 17 00:00:00 2001 From: orchidman Date: Wed, 21 Sep 2011 15:08:52 +0200 Subject: chromium 14.0.835.186-1 maj --- extra/chromium/.footprint.i686 | 40 ++----- extra/chromium/.footprint.x86_64 | 40 ++----- extra/chromium/.md5sum.i686 | 5 +- extra/chromium/.md5sum.x86_64 | 5 +- extra/chromium/Pkgfile | 34 +++--- extra/chromium/chromium-gcc-4.6.patch | 64 +---------- ...webrtc-r240-r242-make-pulseaudio-optional.patch | 122 +++++++++++++++++++++ 7 files changed, 172 insertions(+), 138 deletions(-) create mode 100644 extra/chromium/webrtc-r240-r242-make-pulseaudio-optional.patch (limited to 'extra') diff --git a/extra/chromium/.footprint.i686 b/extra/chromium/.footprint.i686 index 0faa9de25..febbac02c 100644 --- a/extra/chromium/.footprint.i686 +++ b/extra/chromium/.footprint.i686 @@ -64,21 +64,16 @@ drwxr-xr-x root/root usr/lib/chromium/locales/ drwxr-xr-x root/root usr/lib/chromium/resources/ drwxr-xr-x root/root usr/lib/chromium/resources/inspector/ -rw-r--r-- root/root usr/lib/chromium/resources/inspector/DevTools.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/applicationCache.png --rw-r--r-- root/root usr/lib/chromium/resources/inspector/Images/auditsIcon.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/breakpointBorder.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/breakpointsActivateButtonGlyph.png --rw-r--r-- root/root usr/lib/chromium/resources/inspector/Images/breakpointsDeactivateButtonGlyph.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/clearConsoleButtonGlyph.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/consoleButtonGlyph.png --rw-r--r-- root/root usr/lib/chromium/resources/inspector/Images/consoleIcon.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 @@ -87,6 +82,7 @@ drwxr-xr-x root/root usr/lib/chromium/resources/inspector/Images/ -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 @@ -96,19 +92,11 @@ drwxr-xr-x root/root usr/lib/chromium/resources/inspector/Images/ -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/dockButtonGlyph.png --rw-r--r-- root/root usr/lib/chromium/resources/inspector/Images/elementsIcon.png --rw-r--r-- root/root usr/lib/chromium/resources/inspector/Images/enableOutlineButtonGlyph.png --rw-r--r-- root/root usr/lib/chromium/resources/inspector/Images/enableSolidButtonGlyph.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/excludeButtonGlyph.png --rw-r--r-- root/root usr/lib/chromium/resources/inspector/Images/focusButtonGlyph.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 --rw-r--r-- root/root usr/lib/chromium/resources/inspector/Images/garbageCollectButtonGlyph.png --rw-r--r-- root/root usr/lib/chromium/resources/inspector/Images/gearButtonGlyph.png -rw-r--r-- root/root usr/lib/chromium/resources/inspector/Images/glossyHeader.png -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 @@ -116,40 +104,31 @@ drwxr-xr-x root/root usr/lib/chromium/resources/inspector/Images/ -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/helpButtonGlyph.png --rw-r--r-- root/root usr/lib/chromium/resources/inspector/Images/largerResourcesButtonGlyph.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/networkIcon.png --rw-r--r-- root/root usr/lib/chromium/resources/inspector/Images/nodeSearchButtonGlyph.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/pauseOnExceptionButtonGlyph.png --rw-r--r-- root/root usr/lib/chromium/resources/inspector/Images/percentButtonGlyph.png -rw-r--r-- root/root usr/lib/chromium/resources/inspector/Images/popoverArrows.png -rw-r--r-- root/root usr/lib/chromium/resources/inspector/Images/popoverBackground.png -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/profilesIcon.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/recordButtonGlyph.png --rw-r--r-- root/root usr/lib/chromium/resources/inspector/Images/recordToggledButtonGlyph.png --rw-r--r-- root/root usr/lib/chromium/resources/inspector/Images/reloadButtonGlyph.png -rw-r--r-- root/root usr/lib/chromium/resources/inspector/Images/resourceCSSIcon.png -rw-r--r-- root/root usr/lib/chromium/resources/inspector/Images/resourceDocumentIcon.png -rw-r--r-- root/root usr/lib/chromium/resources/inspector/Images/resourceDocumentIconSmall.png -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/resourcesIcon.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/scriptsIcon.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/searchSmallBlue.png -rw-r--r-- root/root usr/lib/chromium/resources/inspector/Images/searchSmallBrightBlue.png @@ -168,12 +147,17 @@ drwxr-xr-x root/root usr/lib/chromium/resources/inspector/Images/ -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/statusbarBackground.png -rw-r--r-- root/root usr/lib/chromium/resources/inspector/Images/statusbarBackgroundChromium.png -rw-r--r-- root/root usr/lib/chromium/resources/inspector/Images/statusbarBottomBackground.png -rw-r--r-- root/root usr/lib/chromium/resources/inspector/Images/statusbarBottomBackgroundChromium.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/statusbarButtons.png -rw-r--r-- root/root usr/lib/chromium/resources/inspector/Images/statusbarButtonsChromium.png -rw-r--r-- root/root usr/lib/chromium/resources/inspector/Images/statusbarMenuButton.png @@ -205,7 +189,6 @@ drwxr-xr-x root/root usr/lib/chromium/resources/inspector/Images/ -rw-r--r-- root/root usr/lib/chromium/resources/inspector/Images/timelineHollowPillPurple.png -rw-r--r-- root/root usr/lib/chromium/resources/inspector/Images/timelineHollowPillRed.png -rw-r--r-- root/root usr/lib/chromium/resources/inspector/Images/timelineHollowPillYellow.png --rw-r--r-- root/root usr/lib/chromium/resources/inspector/Images/timelineIcon.png -rw-r--r-- root/root usr/lib/chromium/resources/inspector/Images/timelinePillBlue.png -rw-r--r-- root/root usr/lib/chromium/resources/inspector/Images/timelinePillGray.png -rw-r--r-- root/root usr/lib/chromium/resources/inspector/Images/timelinePillGreen.png @@ -213,6 +196,8 @@ drwxr-xr-x root/root usr/lib/chromium/resources/inspector/Images/ -rw-r--r-- root/root usr/lib/chromium/resources/inspector/Images/timelinePillPurple.png -rw-r--r-- root/root usr/lib/chromium/resources/inspector/Images/timelinePillRed.png -rw-r--r-- root/root usr/lib/chromium/resources/inspector/Images/timelinePillYellow.png +-rw-r--r-- root/root usr/lib/chromium/resources/inspector/Images/toolbarIcons.png +-rw-r--r-- root/root usr/lib/chromium/resources/inspector/Images/toolbarIconsSmall.png -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 @@ -222,7 +207,6 @@ drwxr-xr-x root/root usr/lib/chromium/resources/inspector/Images/ -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/undockButtonGlyph.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 diff --git a/extra/chromium/.footprint.x86_64 b/extra/chromium/.footprint.x86_64 index 0faa9de25..febbac02c 100644 --- a/extra/chromium/.footprint.x86_64 +++ b/extra/chromium/.footprint.x86_64 @@ -64,21 +64,16 @@ drwxr-xr-x root/root usr/lib/chromium/locales/ drwxr-xr-x root/root usr/lib/chromium/resources/ drwxr-xr-x root/root usr/lib/chromium/resources/inspector/ -rw-r--r-- root/root usr/lib/chromium/resources/inspector/DevTools.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/applicationCache.png --rw-r--r-- root/root usr/lib/chromium/resources/inspector/Images/auditsIcon.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/breakpointBorder.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/breakpointsActivateButtonGlyph.png --rw-r--r-- root/root usr/lib/chromium/resources/inspector/Images/breakpointsDeactivateButtonGlyph.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/clearConsoleButtonGlyph.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/consoleButtonGlyph.png --rw-r--r-- root/root usr/lib/chromium/resources/inspector/Images/consoleIcon.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 @@ -87,6 +82,7 @@ drwxr-xr-x root/root usr/lib/chromium/resources/inspector/Images/ -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 @@ -96,19 +92,11 @@ drwxr-xr-x root/root usr/lib/chromium/resources/inspector/Images/ -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/dockButtonGlyph.png --rw-r--r-- root/root usr/lib/chromium/resources/inspector/Images/elementsIcon.png --rw-r--r-- root/root usr/lib/chromium/resources/inspector/Images/enableOutlineButtonGlyph.png --rw-r--r-- root/root usr/lib/chromium/resources/inspector/Images/enableSolidButtonGlyph.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/excludeButtonGlyph.png --rw-r--r-- root/root usr/lib/chromium/resources/inspector/Images/focusButtonGlyph.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 --rw-r--r-- root/root usr/lib/chromium/resources/inspector/Images/garbageCollectButtonGlyph.png --rw-r--r-- root/root usr/lib/chromium/resources/inspector/Images/gearButtonGlyph.png -rw-r--r-- root/root usr/lib/chromium/resources/inspector/Images/glossyHeader.png -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 @@ -116,40 +104,31 @@ drwxr-xr-x root/root usr/lib/chromium/resources/inspector/Images/ -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/helpButtonGlyph.png --rw-r--r-- root/root usr/lib/chromium/resources/inspector/Images/largerResourcesButtonGlyph.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/networkIcon.png --rw-r--r-- root/root usr/lib/chromium/resources/inspector/Images/nodeSearchButtonGlyph.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/pauseOnExceptionButtonGlyph.png --rw-r--r-- root/root usr/lib/chromium/resources/inspector/Images/percentButtonGlyph.png -rw-r--r-- root/root usr/lib/chromium/resources/inspector/Images/popoverArrows.png -rw-r--r-- root/root usr/lib/chromium/resources/inspector/Images/popoverBackground.png -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/profilesIcon.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/recordButtonGlyph.png --rw-r--r-- root/root usr/lib/chromium/resources/inspector/Images/recordToggledButtonGlyph.png --rw-r--r-- root/root usr/lib/chromium/resources/inspector/Images/reloadButtonGlyph.png -rw-r--r-- root/root usr/lib/chromium/resources/inspector/Images/resourceCSSIcon.png -rw-r--r-- root/root usr/lib/chromium/resources/inspector/Images/resourceDocumentIcon.png -rw-r--r-- root/root usr/lib/chromium/resources/inspector/Images/resourceDocumentIconSmall.png -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/resourcesIcon.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/scriptsIcon.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/searchSmallBlue.png -rw-r--r-- root/root usr/lib/chromium/resources/inspector/Images/searchSmallBrightBlue.png @@ -168,12 +147,17 @@ drwxr-xr-x root/root usr/lib/chromium/resources/inspector/Images/ -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/statusbarBackground.png -rw-r--r-- root/root usr/lib/chromium/resources/inspector/Images/statusbarBackgroundChromium.png -rw-r--r-- root/root usr/lib/chromium/resources/inspector/Images/statusbarBottomBackground.png -rw-r--r-- root/root usr/lib/chromium/resources/inspector/Images/statusbarBottomBackgroundChromium.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/statusbarButtons.png -rw-r--r-- root/root usr/lib/chromium/resources/inspector/Images/statusbarButtonsChromium.png -rw-r--r-- root/root usr/lib/chromium/resources/inspector/Images/statusbarMenuButton.png @@ -205,7 +189,6 @@ drwxr-xr-x root/root usr/lib/chromium/resources/inspector/Images/ -rw-r--r-- root/root usr/lib/chromium/resources/inspector/Images/timelineHollowPillPurple.png -rw-r--r-- root/root usr/lib/chromium/resources/inspector/Images/timelineHollowPillRed.png -rw-r--r-- root/root usr/lib/chromium/resources/inspector/Images/timelineHollowPillYellow.png --rw-r--r-- root/root usr/lib/chromium/resources/inspector/Images/timelineIcon.png -rw-r--r-- root/root usr/lib/chromium/resources/inspector/Images/timelinePillBlue.png -rw-r--r-- root/root usr/lib/chromium/resources/inspector/Images/timelinePillGray.png -rw-r--r-- root/root usr/lib/chromium/resources/inspector/Images/timelinePillGreen.png @@ -213,6 +196,8 @@ drwxr-xr-x root/root usr/lib/chromium/resources/inspector/Images/ -rw-r--r-- root/root usr/lib/chromium/resources/inspector/Images/timelinePillPurple.png -rw-r--r-- root/root usr/lib/chromium/resources/inspector/Images/timelinePillRed.png -rw-r--r-- root/root usr/lib/chromium/resources/inspector/Images/timelinePillYellow.png +-rw-r--r-- root/root usr/lib/chromium/resources/inspector/Images/toolbarIcons.png +-rw-r--r-- root/root usr/lib/chromium/resources/inspector/Images/toolbarIconsSmall.png -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 @@ -222,7 +207,6 @@ drwxr-xr-x root/root usr/lib/chromium/resources/inspector/Images/ -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/undockButtonGlyph.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 diff --git a/extra/chromium/.md5sum.i686 b/extra/chromium/.md5sum.i686 index f97bf4c8d..50658de68 100644 --- a/extra/chromium/.md5sum.i686 +++ b/extra/chromium/.md5sum.i686 @@ -1,4 +1,5 @@ -b4df4771c79e1ce2fa704bde2d501037 chromium-12.0.742.100.tar.bz2 -919647e08dd5a9667b5e7868d745ac87 chromium-gcc-4.6.patch +9b9cc4251e2695348cee26bd053dac73 chromium-14.0.835.186.tar.bz2 +a4c98df2c9cc60c9fe7cf6b284114e7b chromium-gcc-4.6.patch b0cd6503593e3abb05beba510fa99fd0 chromium.desktop ade38bd8683710f4bf5ce4f006a06788 chromium.sh +86eb5bc546890abba4f9cba6bf3af4ef webrtc-r240-r242-make-pulseaudio-optional.patch diff --git a/extra/chromium/.md5sum.x86_64 b/extra/chromium/.md5sum.x86_64 index f97bf4c8d..50658de68 100644 --- a/extra/chromium/.md5sum.x86_64 +++ b/extra/chromium/.md5sum.x86_64 @@ -1,4 +1,5 @@ -b4df4771c79e1ce2fa704bde2d501037 chromium-12.0.742.100.tar.bz2 -919647e08dd5a9667b5e7868d745ac87 chromium-gcc-4.6.patch +9b9cc4251e2695348cee26bd053dac73 chromium-14.0.835.186.tar.bz2 +a4c98df2c9cc60c9fe7cf6b284114e7b chromium-gcc-4.6.patch b0cd6503593e3abb05beba510fa99fd0 chromium.desktop ade38bd8683710f4bf5ce4f006a06788 chromium.sh +86eb5bc546890abba4f9cba6bf3af4ef webrtc-r240-r242-make-pulseaudio-optional.patch diff --git a/extra/chromium/Pkgfile b/extra/chromium/Pkgfile index 55735d813..c1386ff34 100644 --- a/extra/chromium/Pkgfile +++ b/extra/chromium/Pkgfile @@ -6,21 +6,25 @@ # Run on: gtk,dbus-glib,nss,alsa-lib,xdg-utils,bzip2,libevent,dejavu-ttf,desktop-file-utils,hicolor-icon-theme,keyutils name=chromium -version=12.0.742.100 +version=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) + chromium-gcc-4.6.patch + webrtc-r240-r242-make-pulseaudio-optional.patch) build() { - cd "$SRC/chromium-$version" + cd $SRC/chromium-$version + + patch -Np0 -i $SRC/chromium-gcc-4.6.patch + + sed -i '/#include / a #include ' \ + chrome/browser/ui/webui/print_preview_handler.cc - # Patches to fix gcc 4.6 compilation from - # http://code.google.com/p/chromium/issues/detail?id=80071 - # http://code.google.com/p/chromium/issues/detail?id=70746 - # http://code.google.com/p/chromium/issues/detail?id=46411 - patch -Np0 -i "$SRC/chromium-gcc-4.6.patch" + patch -d third_party/webrtc -Np1 -i \ + $SRC/webrtc-r240-r242-make-pulseaudio-optional.patch ### Configure @@ -39,7 +43,6 @@ build() { # (See https://bugzilla.mozilla.org/show_bug.cgi?id=547312) build/gyp_chromium -f make build/all.gyp --depth=. \ - -Dgcc_version=45 \ -Dno_strict_aliasing=1 \ -Dwerror= \ -Dlinux_sandbox_path=/usr/lib/chromium/chromium-sandbox \ @@ -47,19 +50,20 @@ build() { -Drelease_extra_cflags="$CFLAGS" \ -Dffmpeg_branding=Chrome \ -Dproprietary_codecs=1 \ - -Duse_system_libjpeg=1 \ - -Duse_system_libxslt=0 \ - -Duse_system_libxml=0 \ -Duse_system_bzip2=1 \ - -Duse_system_zlib=1 \ - -Duse_system_libpng=0 \ -Duse_system_ffmpeg=0 \ - -Duse_system_yasm=1 \ -Duse_system_libevent=1 \ + -Duse_system_libjpeg=1 \ + -Duse_system_libpng=1 \ + -Duse_system_libxml=0 \ -Duse_system_ssl=0 \ + -Duse_system_yasm=1 \ + -Duse_system_zlib=1 \ -Duse_gconf=0 \ + -Ddisable_nacl=1 \ $([[ $CARCH == i686 ]] && echo '-Ddisable_sse2=1') + make chrome chrome_sandbox BUILDTYPE=Release cd $SRC/chromium-$version diff --git a/extra/chromium/chromium-gcc-4.6.patch b/extra/chromium/chromium-gcc-4.6.patch index 95532a2eb..b5e61dc30 100644 --- a/extra/chromium/chromium-gcc-4.6.patch +++ b/extra/chromium/chromium-gcc-4.6.patch @@ -31,17 +31,6 @@ diff -u -r ppapi/cpp/paint_aggregator.h ppapi/cpp/paint_aggregator.h namespace pp { -diff -u -r third_party/libjingle/source/talk/base/sigslot.h third_party/libjingle/source/talk/base/sigslot.h ---- third_party/libjingle/source/talk/base/sigslot.h 2011-04-13 13:25:41.000000000 +0400 -+++ third_party/libjingle/source/talk/base/sigslot.h 2011-04-20 20:00:43.000000000 +0400 -@@ -80,6 +80,7 @@ - - #include - #include -+#include - - // On our copy of sigslot.h, we force single threading - #define SIGSLOT_PURE_ISO diff -u -r third_party/ots/src/os2.cc third_party/ots/src/os2.cc --- third_party/ots/src/os2.cc 2011-04-13 13:24:06.000000000 +0400 +++ third_party/ots/src/os2.cc 2011-04-20 19:45:44.000000000 +0400 @@ -79,9 +68,9 @@ diff -u -r third_party/tcmalloc/chromium/src/common.cc third_party/tcmalloc/chro --- third_party/tcmalloc/chromium/src/common.cc 2011-04-13 13:23:04.000000000 +0400 +++ third_party/tcmalloc/chromium/src/common.cc 2011-04-20 19:32:58.000000000 +0400 @@ -34,6 +34,7 @@ - #include "system-alloc.h" #include "config.h" #include "common.h" + #include "system-alloc.h" +#include namespace tcmalloc { @@ -97,17 +86,6 @@ diff -u -r third_party/tcmalloc/chromium/src/symbolize.h third_party/tcmalloc/ch using std::map; -diff -u -r third_party/tcmalloc/chromium/src/system-alloc.h third_party/tcmalloc/chromium/src/system-alloc.h ---- third_party/tcmalloc/chromium/src/system-alloc.h 2011-04-13 13:23:04.000000000 +0400 -+++ third_party/tcmalloc/chromium/src/system-alloc.h 2011-04-20 19:32:58.000000000 +0400 -@@ -37,6 +37,7 @@ - #define TCMALLOC_SYSTEM_ALLOC_H_ - - #include -+#include - #include "internal_logging.h" - - // REQUIRES: "alignment" is a power of two or "0" to indicate default alignment diff -u -r ui/gfx/codec/jpeg_codec.h ui/gfx/codec/jpeg_codec.h --- ui/gfx/codec/jpeg_codec.h 2011-04-13 13:23:45.000000000 +0400 +++ ui/gfx/codec/jpeg_codec.h 2011-04-20 19:32:58.000000000 +0400 @@ -119,43 +97,3 @@ diff -u -r ui/gfx/codec/jpeg_codec.h ui/gfx/codec/jpeg_codec.h class SkBitmap; ---- ppapi/cpp/paint_aggregator.h 2010-12-23 18:10:27.000000000 -0600 -+++ ppapi/cpp/paint_aggregator.h~ 2011-04-19 05:34:56.085582885 -0500 -@@ -5,6 +5,7 @@ - #ifndef PPAPI_CPP_PAINT_AGGREGATOR_H_ - #define PPAPI_CPP_PAINT_AGGREGATOR_H_ - -+#include - #include - - #include "ppapi/cpp/point.h" -Index: Source/WebCore/ChangeLog -=================================================================== ---- third_party/WebKit/Source/WebCore/ChangeLog (revision 84120) -+++ third_party/WebKit/Source/WebCore/ChangeLog (revision 84123) -@@ -1,2 +1,24 @@ -+2011-04-17 Thierry Reding -+ -+ Reviewed by Adam Barth. -+ -+ Fix build with GCC 4.6. -+ -+ * dom/make_names.pl: Execute preprocessor without the -P option. The -+ preprocessor in GCC 4.6 eats empty lines, effectively breaking the -+ parsing performed by this script. Dropping the -P option when invoking -+ the preprocessor keeps the empty lines but as a side-effect also adds -+ additional linemarkers. -+ -+ From the cpp manpage: -+ -+ -P Inhibit generation of linemarkers in the output from the -+ preprocessor. This might be useful when running the preprocessor -+ on something that is not C code, and will be sent to a program -+ which might be confused by the linemarkers. -+ -+ The linemarkers are not problematic, however, because the script -+ properly handles them by ignoring all lines starting with a #. -+ - 2011-04-17 David Kilzer - - diff --git a/extra/chromium/webrtc-r240-r242-make-pulseaudio-optional.patch b/extra/chromium/webrtc-r240-r242-make-pulseaudio-optional.patch new file mode 100644 index 000000000..51ef9fee5 --- /dev/null +++ b/extra/chromium/webrtc-r240-r242-make-pulseaudio-optional.patch @@ -0,0 +1,122 @@ +Index: src/build/common.gypi +=================================================================== +--- src/build/common.gypi (revision 239) ++++ src/build/common.gypi (revision 240) +@@ -25,6 +25,13 @@ + 'direct_show_base_classes': + 'C:/Program Files/Microsoft SDKs/Windows/v7.1/Samples/multimedia/directshow/baseclasses/', + }], ++ ['build_with_chromium==1', { ++ # Exclude pulse audio on Chromium since its prerequisites don't ++ # include pulse audio. ++ 'include_pulse_audio%': 0, ++ }, { ++ 'include_pulse_audio%': 1, ++ }], + ], # conditions + }, + 'target_defaults': { +Index: src/modules/audio_device/main/source/audio_device.gyp +=================================================================== +--- src/modules/audio_device/main/source/audio_device.gyp (revision 239) ++++ src/modules/audio_device/main/source/audio_device.gyp (revision 240) +@@ -52,18 +52,12 @@ + 'Linux/alsasymboltable.h', + 'Linux/audio_device_linux_alsa.cc', + 'Linux/audio_device_linux_alsa.h', +- 'Linux/audio_device_linux_pulse.cc', +- 'Linux/audio_device_linux_pulse.h', + 'Linux/audio_device_utility_linux.cc', + 'Linux/audio_device_utility_linux.h', + 'Linux/audio_mixer_manager_linux_alsa.cc', + 'Linux/audio_mixer_manager_linux_alsa.h', +- 'Linux/audio_mixer_manager_linux_pulse.cc', +- 'Linux/audio_mixer_manager_linux_pulse.h', + 'Linux/latebindingsymboltable.cc', + 'Linux/latebindingsymboltable.h', +- 'Linux/pulseaudiosymboltable.cc', +- 'Linux/pulseaudiosymboltable.h', + 'Mac/audio_device_mac.cc', + 'Mac/audio_device_mac.h', + 'Mac/audio_device_utility_mac.cc', +@@ -89,16 +83,10 @@ + 'Linux/alsasymboltable.h', + 'Linux/audio_device_linux_alsa.cc', + 'Linux/audio_device_linux_alsa.h', +- 'Linux/audio_device_linux_pulse.cc', +- 'Linux/audio_device_linux_pulse.h', + 'Linux/audio_mixer_manager_linux_alsa.cc', + 'Linux/audio_mixer_manager_linux_alsa.h', +- 'Linux/audio_mixer_manager_linux_pulse.cc', +- 'Linux/audio_mixer_manager_linux_pulse.h', + 'Linux/latebindingsymboltable.cc', + 'Linux/latebindingsymboltable.h', +- 'Linux/pulseaudiosymboltable.cc', +- 'Linux/pulseaudiosymboltable.h', + # Don't remove these, needed for dummy device + # 'Linux/audio_device_utility_linux.cc', + # 'Linux/audio_device_utility_linux.h', +@@ -131,7 +119,6 @@ + }], + ['OS=="linux"', { + 'defines': [ +- 'LINUX_PULSE', + 'LINUX_ALSA', + ], + 'include_dirs': [ +@@ -141,9 +128,28 @@ + 'libraries': [ + '-ldl', + '-lasound', +- '-lpulse', + ], + }, ++ 'conditions': [ ++ ['include_pulse_audio==1', { ++ 'defines': [ ++ 'LINUX_PULSE', ++ ], ++ 'sources': [ ++ 'Linux/audio_device_linux_pulse.cc', ++ 'Linux/audio_device_linux_pulse.h', ++ 'Linux/audio_mixer_manager_linux_pulse.cc', ++ 'Linux/audio_mixer_manager_linux_pulse.h', ++ 'Linux/pulseaudiosymboltable.cc', ++ 'Linux/pulseaudiosymboltable.h', ++ ], ++ 'link_settings': { ++ 'libraries': [ ++ '-lpulse', ++ ], ++ }, ++ }], ++ ], + }], + ['OS=="mac"', { + 'include_dirs': [ +Index: src/build/common.gypi +=================================================================== +--- src/build/common.gypi (revision 241) ++++ src/build/common.gypi (revision 242) +@@ -10,9 +10,19 @@ + + { + 'variables': { +- # TODO(ajm): use webrtc_standalone to match NaCl? +- 'build_with_chromium%': 1, # 1 to build webrtc with chromium ++ # Putting a variables dict inside another variables dict looks kind of ++ # weird. This is done so that 'build_with_chromium' is defined as ++ # variable within the outer variables dict here. This is necessary ++ # to get these variables defined for the conditions within this variables ++ # dict that operate on these variables (e.g., for setting ++ # 'include_pulse_audio', we need to have 'build_with_chromium' already set). ++ 'variables': { ++ # TODO(ajm): use webrtc_standalone to match NaCl? ++ 'build_with_chromium%': 1, # 1 to build webrtc with chromium ++ }, + ++ 'build_with_chromium%': '<(build_with_chromium)', ++ + # Selects fixed-point code where possible. + # TODO(ajm): we'd like to set this based on the target OS/architecture. + 'prefer_fixed_point%': 0, -- cgit v1.2.3-70-g09d2