diff options
| author | ryoon <ryoon@pkgsrc.org> | 2015-07-03 10:25:40 +0000 |
|---|---|---|
| committer | ryoon <ryoon@pkgsrc.org> | 2015-07-03 10:25:40 +0000 |
| commit | 7d613eec3a96b3e8ac0f1fdd02a1bb2e5632b72e (patch) | |
| tree | 85eb37787c00c70d970aa93f0c34f07b1719caa8 /www/firefox | |
| parent | 14af4b9577440d0224a54d5948aff5908e9aa701 (diff) | |
| download | pkgsrc-7d613eec3a96b3e8ac0f1fdd02a1bb2e5632b72e.tar.gz | |
Update to 39.0
Changelog:
New Share Hello URLs with social networks
New Project Silk: Smoother animation and scrolling (Mac OS X)
New Support for 'switch' role in ARIA 1.1 (web accessibility)
New SafeBrowsing malware detection lookups enabled for downloads (Mac OS X and Linux)
New Support for new Unicode 8.0 skin tone emoji
Changed Removed support for insecure SSLv3 for network communications
Changed Disable use of RC4 except for temporarily whitelisted hosts
Changed The malware detection service for downloads now covers common Mac file types (Bug 1138721)
Changed of displaying dashed lines is improved (Mac OS X) (Bug 1123019)
HTML5 List-style-type now accepts a string value
HTML5 Enable the Fetch API for network requests from dedicated, shared and service workers
HTML5 Cascading of CSS transitions and animations now matches the current spec
HTML5 Implement <link rel="preconnect">allowing anticipation of a future connection without revealing any information
HTML5 Added support for CSS Scroll Snap Points
Developer Drag and drop enabled for nodes in Inspector markup view
Developer Webconsole input history persists even after closing the toolbox
Developer Cubic bezier tooltip now shows a gallery of timing-function presets for use with CSS animations
Developer localhost is now available offline for WebSocket connections
Fixed Improve performance for IPv6 fallback to IPv4
Fixed Fix incomplete downloads being marked as complete by detecting broken HTTP1.1 transfers
Fixed The Security state indicator on a page now correctly ignores loads caused by previous pages
Fixed Fixed an issue where a Hello conversation window would sometimes fail to open
Fixed A regression that could lead to Flash not displaying has been fixed
Fixed Update to NSS 3.19.2
Fixed Various security fixes
Fixed in Firefox 39
2015-71 NSS incorrectly permits skipping of ServerKeyExchange
2015-70 NSS accepts export-length DHE keys with regular DHE cipher suites
2015-69 Privilege escalation in PDF.js
2015-68 OS X crash reports may contain entered key press information
2015-67 Key pinning is ignored when overridable errors are encountered
2015-66 Vulnerabilities found through code inspection
2015-65 Use-after-free in workers while using XMLHttpRequest
2015-64 ECDSA signature validation fails to handle some signatures correctly
2015-63 Use-after-free in Content Policy due to microtask execution error
2015-62 Out-of-bound read while computing an oscillator rendering range in Web Audio
2015-61 Type confusion in Indexed Database Manager
2015-60 Local files or privileged URLs in pages can be opened into new tabs
2015-59 Miscellaneous memory safety hazards (rv:39.0 / rv:31.8 / rv:38.1)
Diffstat (limited to 'www/firefox')
20 files changed, 201 insertions, 856 deletions
diff --git a/www/firefox/Makefile b/www/firefox/Makefile index 42b6d342ee3..2f1d012c405 100644 --- a/www/firefox/Makefile +++ b/www/firefox/Makefile @@ -1,9 +1,8 @@ -# $NetBSD: Makefile,v 1.215 2015/06/30 09:57:42 ryoon Exp $ +# $NetBSD: Makefile,v 1.216 2015/07/03 10:25:40 ryoon Exp $ FIREFOX_VER= ${MOZ_BRANCH}${MOZ_BRANCH_MINOR} -MOZ_BRANCH= 38.0 -MOZ_BRANCH_MINOR= .5 -PKGREVISION= 1 +MOZ_BRANCH= 39.0 +MOZ_BRANCH_MINOR= DISTNAME= firefox-${FIREFOX_VER}.source PKGNAME= firefox-${MOZ_BRANCH}${MOZ_BRANCH_MINOR:S/b/beta/:S/esr//} diff --git a/www/firefox/PLIST b/www/firefox/PLIST index 90d30018f02..deb16e2b83c 100644 --- a/www/firefox/PLIST +++ b/www/firefox/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.97 2015/06/03 03:22:31 ryoon Exp $ +@comment $NetBSD: PLIST,v 1.98 2015/07/03 10:25:40 ryoon Exp $ bin/firefox lib/firefox/application.ini lib/firefox/browser/blocklist.xml @@ -137,6 +137,8 @@ lib/firefox/browser/chrome/browser/content/browser/devtools/app-manager/template lib/firefox/browser/chrome/browser/content/browser/devtools/app-manager/utils.js lib/firefox/browser/chrome/browser/content/browser/devtools/canvasdebugger.js lib/firefox/browser/chrome/browser/content/browser/devtools/canvasdebugger.xul +lib/firefox/browser/chrome/browser/content/browser/devtools/canvasdebugger/callslist.js +lib/firefox/browser/chrome/browser/content/browser/devtools/canvasdebugger/snapshotslist.js lib/firefox/browser/chrome/browser/content/browser/devtools/codemirror/activeline.js lib/firefox/browser/chrome/browser/content/browser/devtools/codemirror/brace-fold.js lib/firefox/browser/chrome/browser/content/browser/devtools/codemirror/clike.js @@ -693,6 +695,8 @@ lib/firefox/browser/chrome/browser/skin/classic/browser/devtools/editor-debug-lo lib/firefox/browser/chrome/browser/skin/classic/browser/devtools/editor-debug-location@2x.png lib/firefox/browser/chrome/browser/skin/classic/browser/devtools/editor-error.png lib/firefox/browser/chrome/browser/skin/classic/browser/devtools/eyedropper.css +lib/firefox/browser/chrome/browser/skin/classic/browser/devtools/fast-forward.png +lib/firefox/browser/chrome/browser/skin/classic/browser/devtools/fast-forward@2x.png lib/firefox/browser/chrome/browser/skin/classic/browser/devtools/filetype-dir-close.svg lib/firefox/browser/chrome/browser/skin/classic/browser/devtools/filetype-dir-open.svg lib/firefox/browser/chrome/browser/skin/classic/browser/devtools/filetype-globe.svg @@ -741,6 +745,8 @@ lib/firefox/browser/chrome/browser/skin/classic/browser/devtools/responsiveui-sc lib/firefox/browser/chrome/browser/skin/classic/browser/devtools/responsiveui-screenshot@2x.png lib/firefox/browser/chrome/browser/skin/classic/browser/devtools/responsiveui-touch.png lib/firefox/browser/chrome/browser/skin/classic/browser/devtools/responsiveui-touch@2x.png +lib/firefox/browser/chrome/browser/skin/classic/browser/devtools/rewind.png +lib/firefox/browser/chrome/browser/skin/classic/browser/devtools/rewind@2x.png lib/firefox/browser/chrome/browser/skin/classic/browser/devtools/ruleview.css lib/firefox/browser/chrome/browser/skin/classic/browser/devtools/scratchpad.css lib/firefox/browser/chrome/browser/skin/classic/browser/devtools/shadereditor.css @@ -868,6 +874,7 @@ lib/firefox/browser/chrome/browser/skin/classic/browser/preferences/Options.png lib/firefox/browser/chrome/browser/skin/classic/browser/preferences/aboutPermissions.css lib/firefox/browser/chrome/browser/skin/classic/browser/preferences/alwaysAsk.png lib/firefox/browser/chrome/browser/skin/classic/browser/preferences/applications.css +lib/firefox/browser/chrome/browser/skin/classic/browser/preferences/in-content/default-profile-image.svg lib/firefox/browser/chrome/browser/skin/classic/browser/preferences/in-content/dialog.css lib/firefox/browser/chrome/browser/skin/classic/browser/preferences/in-content/favicon.ico lib/firefox/browser/chrome/browser/skin/classic/browser/preferences/in-content/icons.svg @@ -1395,6 +1402,9 @@ lib/firefox/browser/chrome/webide/content/permissionstable.js lib/firefox/browser/chrome/webide/content/permissionstable.xhtml lib/firefox/browser/chrome/webide/content/prefs.js lib/firefox/browser/chrome/webide/content/prefs.xhtml +lib/firefox/browser/chrome/webide/content/project-listing.js +lib/firefox/browser/chrome/webide/content/project-listing.xhtml +lib/firefox/browser/chrome/webide/content/project-panel.js lib/firefox/browser/chrome/webide/content/runtimedetails.js lib/firefox/browser/chrome/webide/content/runtimedetails.xhtml lib/firefox/browser/chrome/webide/content/webide.js @@ -1410,7 +1420,7 @@ lib/firefox/browser/chrome/webide/skin/logs.css lib/firefox/browser/chrome/webide/skin/monitor.css lib/firefox/browser/chrome/webide/skin/newapp.css lib/firefox/browser/chrome/webide/skin/permissionstable.css -lib/firefox/browser/chrome/webide/skin/prefs.css +lib/firefox/browser/chrome/webide/skin/project-listing.css lib/firefox/browser/chrome/webide/skin/runtimedetails.css lib/firefox/browser/chrome/webide/skin/throbber.svg lib/firefox/browser/chrome/webide/skin/webide.css @@ -1581,6 +1591,7 @@ lib/firefox/browser/modules/devtools/shared/d3.js lib/firefox/browser/modules/devtools/shared/devices.js lib/firefox/browser/modules/devtools/shared/doorhanger.js lib/firefox/browser/modules/devtools/shared/frame-script-utils.js +lib/firefox/browser/modules/devtools/shared/getjson.js lib/firefox/browser/modules/devtools/shared/inplace-editor.js lib/firefox/browser/modules/devtools/shared/observable-object.js lib/firefox/browser/modules/devtools/shared/options-view.js @@ -1596,6 +1607,7 @@ lib/firefox/browser/modules/devtools/shared/timeline/markers-overview.js lib/firefox/browser/modules/devtools/shared/timeline/memory-overview.js lib/firefox/browser/modules/devtools/shared/timeline/waterfall.js lib/firefox/browser/modules/devtools/shared/undo.js +lib/firefox/browser/modules/devtools/shared/widgets/CubicBezierPresets.js lib/firefox/browser/modules/devtools/shared/widgets/CubicBezierWidget.js lib/firefox/browser/modules/devtools/shared/widgets/FastListWidget.js lib/firefox/browser/modules/devtools/shared/widgets/Spectrum.js @@ -1638,7 +1650,7 @@ lib/firefox/browser/modules/devtools/webide/addons.js lib/firefox/browser/modules/devtools/webide/app-manager.js lib/firefox/browser/modules/devtools/webide/build.js lib/firefox/browser/modules/devtools/webide/config-view.js -lib/firefox/browser/modules/devtools/webide/remote-resources.js +lib/firefox/browser/modules/devtools/webide/project-list.js lib/firefox/browser/modules/devtools/webide/runtimes.js lib/firefox/browser/modules/devtools/webide/simulator-process.js lib/firefox/browser/modules/devtools/webide/simulators.js @@ -1729,6 +1741,7 @@ lib/firefox/chrome/en-US/locale/en-US/global/aboutSupport.dtd lib/firefox/chrome/en-US/locale/en-US/global/aboutSupport.properties lib/firefox/chrome/en-US/locale/en-US/global/aboutTelemetry.dtd lib/firefox/chrome/en-US/locale/en-US/global/aboutTelemetry.properties +lib/firefox/chrome/en-US/locale/en-US/global/aboutWebrtc.properties lib/firefox/chrome/en-US/locale/en-US/global/appPicker.dtd lib/firefox/chrome/en-US/locale/en-US/global/appstrings.properties lib/firefox/chrome/en-US/locale/en-US/global/autocomplete.properties @@ -1862,14 +1875,21 @@ lib/firefox/chrome/marionette/content/EventUtils.js lib/firefox/chrome/marionette/content/MozillaLogger.js lib/firefox/chrome/marionette/content/SpecialPowersObserver.js lib/firefox/chrome/marionette/content/SpecialPowersObserverAPI.js +lib/firefox/chrome/marionette/content/actions.js lib/firefox/chrome/marionette/content/atoms.js -lib/firefox/chrome/marionette/content/marionette-common.js -lib/firefox/chrome/marionette/content/marionette-elements.js -lib/firefox/chrome/marionette/content/marionette-frame-manager.js -lib/firefox/chrome/marionette/content/marionette-listener.js -lib/firefox/chrome/marionette/content/marionette-sendkeys.js -lib/firefox/chrome/marionette/content/marionette-server.js -lib/firefox/chrome/marionette/content/marionette-simpletest.js +lib/firefox/chrome/marionette/content/command.js +lib/firefox/chrome/marionette/content/common.js +lib/firefox/chrome/marionette/content/dispatcher.js +lib/firefox/chrome/marionette/content/driver.js +lib/firefox/chrome/marionette/content/elements.js +lib/firefox/chrome/marionette/content/emulator.js +lib/firefox/chrome/marionette/content/error.js +lib/firefox/chrome/marionette/content/frame-manager.js +lib/firefox/chrome/marionette/content/listener.js +lib/firefox/chrome/marionette/content/modal.js +lib/firefox/chrome/marionette/content/sendkeys.js +lib/firefox/chrome/marionette/content/server.js +lib/firefox/chrome/marionette/content/simpletest.js lib/firefox/chrome/marionette/content/specialpowers.js lib/firefox/chrome/marionette/content/specialpowersAPI.js lib/firefox/chrome/marionette/modules/Assert.jsm @@ -1903,12 +1923,8 @@ lib/firefox/chrome/pippki/content/pippki/downloadcert.js lib/firefox/chrome/pippki/content/pippki/downloadcert.xul lib/firefox/chrome/pippki/content/pippki/editcacert.xul lib/firefox/chrome/pippki/content/pippki/editcerts.js -lib/firefox/chrome/pippki/content/pippki/editemailcert.xul -lib/firefox/chrome/pippki/content/pippki/escrowWarn.js -lib/firefox/chrome/pippki/content/pippki/escrowWarn.xul lib/firefox/chrome/pippki/content/pippki/exceptionDialog.js lib/firefox/chrome/pippki/content/pippki/exceptionDialog.xul -lib/firefox/chrome/pippki/content/pippki/getpassword.xul lib/firefox/chrome/pippki/content/pippki/load_device.xul lib/firefox/chrome/pippki/content/pippki/password.js lib/firefox/chrome/pippki/content/pippki/pippki.js @@ -1928,6 +1944,7 @@ lib/firefox/chrome/toolkit/content/formautofill/requestAutocomplete.xhtml lib/firefox/chrome/toolkit/content/global/BrowserElementChild.js lib/firefox/chrome/toolkit/content/global/BrowserElementChildPreload.js lib/firefox/chrome/toolkit/content/global/BrowserElementPanning.js +lib/firefox/chrome/toolkit/content/global/BrowserElementPanningAPZDisabled.js lib/firefox/chrome/toolkit/content/global/XPCNativeWrapper.js lib/firefox/chrome/toolkit/content/global/about.js lib/firefox/chrome/toolkit/content/global/about.xhtml @@ -2061,6 +2078,7 @@ lib/firefox/chrome/toolkit/content/global/printdialog.js lib/firefox/chrome/toolkit/content/global/printdialog.xul lib/firefox/chrome/toolkit/content/global/printjoboptions.js lib/firefox/chrome/toolkit/content/global/printjoboptions.xul +lib/firefox/chrome/toolkit/content/global/process-content.js lib/firefox/chrome/toolkit/content/global/reader/aboutReader.html lib/firefox/chrome/toolkit/content/global/reader/aboutReader.js lib/firefox/chrome/toolkit/content/global/remote-test-ipc.js @@ -2466,6 +2484,7 @@ lib/firefox/components/ActivityWrapper.js lib/firefox/components/AlarmsManager.js lib/firefox/components/AppsService.js lib/firefox/components/BrowserElementParent.js +lib/firefox/components/CSSUnprefixingService.js lib/firefox/components/ChromeNotifications.js lib/firefox/components/ColorAnalyzer.js lib/firefox/components/ConsoleAPIStorage.js @@ -2482,6 +2501,7 @@ lib/firefox/components/MainProcessSingleton.js lib/firefox/components/MozKeyboard.js lib/firefox/components/NetworkGeolocationProvider.js lib/firefox/components/NotificationStorage.js +lib/firefox/components/PACGenerator.js lib/firefox/components/PageThumbsProtocol.js lib/firefox/components/Payment.js lib/firefox/components/PaymentFlowInfo.js @@ -2528,14 +2548,12 @@ lib/firefox/components/nsBlocklistService.js lib/firefox/components/nsContentDispatchChooser.js lib/firefox/components/nsContentPrefService.js lib/firefox/components/nsCrashMonitor.js -lib/firefox/components/nsDOMIdentity.js lib/firefox/components/nsDefaultCLH.js lib/firefox/components/nsFilePicker.js lib/firefox/components/nsFormAutoComplete.js lib/firefox/components/nsFormHistory.js lib/firefox/components/nsHandlerService.js lib/firefox/components/nsHelperAppDlg.js -lib/firefox/components/nsIDService.js lib/firefox/components/nsINIProcessor.js lib/firefox/components/nsInputListAutoComplete.js lib/firefox/components/nsLivemarkService.js @@ -2616,8 +2634,10 @@ lib/firefox/modules/AboutReader.jsm lib/firefox/modules/ActivitiesService.jsm lib/firefox/modules/ActivitiesServiceFilter.jsm lib/firefox/modules/AddonManager.jsm +lib/firefox/modules/AddonWatcher.jsm lib/firefox/modules/AlarmDB.jsm lib/firefox/modules/AlarmService.jsm +lib/firefox/modules/AppConstants.jsm lib/firefox/modules/AppDownloadManager.jsm lib/firefox/modules/AppsServiceChild.jsm lib/firefox/modules/AppsUtils.jsm @@ -2657,7 +2677,6 @@ lib/firefox/modules/ContentPrefStore.jsm lib/firefox/modules/ContentPrefUtils.jsm lib/firefox/modules/CrashMonitor.jsm lib/firefox/modules/Credentials.jsm -lib/firefox/modules/DOMIdentity.jsm lib/firefox/modules/DOMRequestHelper.jsm lib/firefox/modules/DataStoreChangeNotifier.jsm lib/firefox/modules/DataStoreCursorImpl.jsm @@ -2692,6 +2711,8 @@ lib/firefox/modules/FxAccountsClient.jsm lib/firefox/modules/FxAccountsCommon.js lib/firefox/modules/FxAccountsOAuthClient.jsm lib/firefox/modules/FxAccountsOAuthGrantClient.jsm +lib/firefox/modules/FxAccountsProfile.jsm +lib/firefox/modules/FxAccountsProfileChannel.jsm lib/firefox/modules/FxAccountsProfileClient.jsm lib/firefox/modules/GMPInstallManager.jsm lib/firefox/modules/GMPUtils.jsm @@ -2716,6 +2737,7 @@ lib/firefox/modules/LoginHelper.jsm lib/firefox/modules/LoginImport.jsm lib/firefox/modules/LoginManagerContent.jsm lib/firefox/modules/LoginManagerParent.jsm +lib/firefox/modules/LoginRecipes.jsm lib/firefox/modules/LoginStore.jsm lib/firefox/modules/ManifestProcessor.jsm lib/firefox/modules/MessagePortBase.jsm @@ -2727,6 +2749,7 @@ lib/firefox/modules/NativeApp.jsm lib/firefox/modules/NetUtil.jsm lib/firefox/modules/NewTabUtils.jsm lib/firefox/modules/NotificationDB.jsm +lib/firefox/modules/ObjectUtils.jsm lib/firefox/modules/OfflineCacheInstaller.jsm lib/firefox/modules/OperatorApps.jsm lib/firefox/modules/PageMenu.jsm @@ -2755,6 +2778,7 @@ lib/firefox/modules/Preferences.jsm lib/firefox/modules/Prefetcher.jsm lib/firefox/modules/PresentationDeviceInfoManager.jsm lib/firefox/modules/PrivateBrowsingUtils.jsm +lib/firefox/modules/ProfileAge.jsm lib/firefox/modules/Promise-backend.js lib/firefox/modules/Promise.jsm lib/firefox/modules/PromiseUtils.jsm @@ -2766,6 +2790,7 @@ lib/firefox/modules/RemoteAddonsChild.jsm lib/firefox/modules/RemoteAddonsParent.jsm lib/firefox/modules/RemoteController.jsm lib/firefox/modules/RemoteFinder.jsm +lib/firefox/modules/RemotePageManager.jsm lib/firefox/modules/RemoteSecurityUI.jsm lib/firefox/modules/RemoteWebNavigation.jsm lib/firefox/modules/RemoteWebProgress.jsm @@ -2797,6 +2822,7 @@ lib/firefox/modules/Sqlite.jsm lib/firefox/modules/StoreTrustAnchor.jsm lib/firefox/modules/SystemMessagePermissionsChecker.jsm lib/firefox/modules/Task.jsm +lib/firefox/modules/TelemetryEnvironment.jsm lib/firefox/modules/TelemetryFile.jsm lib/firefox/modules/TelemetryLog.jsm lib/firefox/modules/TelemetryPing.jsm @@ -2847,6 +2873,8 @@ lib/firefox/modules/commonjs/dev/frame-script.js lib/firefox/modules/commonjs/dev/panel.js lib/firefox/modules/commonjs/dev/panel/view.js lib/firefox/modules/commonjs/dev/ports.js +lib/firefox/modules/commonjs/dev/theme.js +lib/firefox/modules/commonjs/dev/theme/hooks.js lib/firefox/modules/commonjs/dev/toolbox.js lib/firefox/modules/commonjs/dev/utils.js lib/firefox/modules/commonjs/dev/volcan.js @@ -2860,11 +2888,9 @@ lib/firefox/modules/commonjs/diffpatcher/test/index.js lib/firefox/modules/commonjs/diffpatcher/test/patch.js lib/firefox/modules/commonjs/diffpatcher/test/tap.js lib/firefox/modules/commonjs/framescript/FrameScriptManager.jsm -lib/firefox/modules/commonjs/framescript/LoaderHelper.jsm +lib/firefox/modules/commonjs/framescript/content.jsm lib/firefox/modules/commonjs/framescript/context-menu.js -lib/firefox/modules/commonjs/framescript/contextmenu-events.js lib/firefox/modules/commonjs/framescript/manager.js -lib/firefox/modules/commonjs/framescript/tab-events.js lib/firefox/modules/commonjs/framescript/util.js lib/firefox/modules/commonjs/index.js lib/firefox/modules/commonjs/method/core.js @@ -2887,9 +2913,12 @@ lib/firefox/modules/commonjs/sdk/content/content-worker.js lib/firefox/modules/commonjs/sdk/content/content.js lib/firefox/modules/commonjs/sdk/content/context-menu.js lib/firefox/modules/commonjs/sdk/content/events.js +lib/firefox/modules/commonjs/sdk/content/l10n-html.js lib/firefox/modules/commonjs/sdk/content/loader.js lib/firefox/modules/commonjs/sdk/content/mod.js +lib/firefox/modules/commonjs/sdk/content/page-mod.js lib/firefox/modules/commonjs/sdk/content/sandbox.js +lib/firefox/modules/commonjs/sdk/content/tab-events.js lib/firefox/modules/commonjs/sdk/content/thumbnail.js lib/firefox/modules/commonjs/sdk/content/utils.js lib/firefox/modules/commonjs/sdk/content/worker-child.js @@ -2996,6 +3025,10 @@ lib/firefox/modules/commonjs/sdk/preferences/utils.js lib/firefox/modules/commonjs/sdk/private-browsing.js lib/firefox/modules/commonjs/sdk/private-browsing/utils.js lib/firefox/modules/commonjs/sdk/querystring.js +lib/firefox/modules/commonjs/sdk/remote/child.js +lib/firefox/modules/commonjs/sdk/remote/core.js +lib/firefox/modules/commonjs/sdk/remote/parent.js +lib/firefox/modules/commonjs/sdk/remote/utils.js lib/firefox/modules/commonjs/sdk/request.js lib/firefox/modules/commonjs/sdk/selection.js lib/firefox/modules/commonjs/sdk/self.js @@ -3237,6 +3270,7 @@ lib/firefox/modules/devtools/server/actors/call-watcher.js lib/firefox/modules/devtools/server/actors/canvas.js lib/firefox/modules/devtools/server/actors/child-process.js lib/firefox/modules/devtools/server/actors/childtab.js +lib/firefox/modules/devtools/server/actors/chrome.js lib/firefox/modules/devtools/server/actors/common.js lib/firefox/modules/devtools/server/actors/csscoverage.js lib/firefox/modules/devtools/server/actors/device.js @@ -3265,7 +3299,9 @@ lib/firefox/modules/devtools/server/actors/stylesheets.js lib/firefox/modules/devtools/server/actors/timeline.js lib/firefox/modules/devtools/server/actors/tracer.js lib/firefox/modules/devtools/server/actors/utils/ScriptStore.js +lib/firefox/modules/devtools/server/actors/utils/TabSources.js lib/firefox/modules/devtools/server/actors/utils/actor-registry-utils.js +lib/firefox/modules/devtools/server/actors/utils/audionodes.json lib/firefox/modules/devtools/server/actors/utils/automation-timeline.js lib/firefox/modules/devtools/server/actors/utils/make-debugger.js lib/firefox/modules/devtools/server/actors/utils/map-uri-to-addon-id.js @@ -3438,6 +3474,18 @@ lib/firefox/res/table-remove-column.gif lib/firefox/res/table-remove-row-active.gif lib/firefox/res/table-remove-row-hover.gif lib/firefox/res/table-remove-row.gif +lib/firefox/res/text_caret.png +lib/firefox/res/text_caret@1.5x.png +lib/firefox/res/text_caret@2.25x.png +lib/firefox/res/text_caret@2x.png +lib/firefox/res/text_caret_tilt_left.png +lib/firefox/res/text_caret_tilt_left@1.5x.png +lib/firefox/res/text_caret_tilt_left@2.25x.png +lib/firefox/res/text_caret_tilt_left@2x.png +lib/firefox/res/text_caret_tilt_right.png +lib/firefox/res/text_caret_tilt_right@1.5x.png +lib/firefox/res/text_caret_tilt_right@2.25x.png +lib/firefox/res/text_caret_tilt_right@2x.png lib/firefox/run-mozilla.sh lib/firefox/webapprt-stub lib/firefox/webapprt/chrome.manifest diff --git a/www/firefox/distinfo b/www/firefox/distinfo index 184056ed57a..b3ebe0a1094 100644 --- a/www/firefox/distinfo +++ b/www/firefox/distinfo @@ -1,15 +1,14 @@ -$NetBSD: distinfo,v 1.206 2015/06/03 03:22:31 ryoon Exp $ +$NetBSD: distinfo,v 1.207 2015/07/03 10:25:40 ryoon Exp $ -SHA1 (firefox-38.0.5.source.tar.bz2) = 74da3e225d5b542e784549be63475802c45e1b02 -RMD160 (firefox-38.0.5.source.tar.bz2) = 5fbefc368222b2a9629fc141eae2be0d2384d7ad -Size (firefox-38.0.5.source.tar.bz2) = 180318459 bytes -SHA1 (patch-aa) = e9e8400fa86ae8d6910b49e3a98127122e714f1a -SHA1 (patch-accessible_atk_Platform.cpp) = c2deb81b300de44c4500328589185bbd4b6b02fb +SHA1 (firefox-39.0.source.tar.bz2) = 32785daee7ddb9da8d7509ef095258fc58fe838e +RMD160 (firefox-39.0.source.tar.bz2) = 21a001d8d73d54de14ec479af2becca3353c445b +Size (firefox-39.0.source.tar.bz2) = 182881881 bytes +SHA1 (patch-aa) = d460082b7bfa0d96db95ddb904208019195e3b55 SHA1 (patch-al) = cca5df21d018bb9f428ad26d00718f33afe88ec5 SHA1 (patch-ao) = ca7e6723a10b9f6e3306cd12557e1856727edee9 SHA1 (patch-as) = 6630ac63a5b0169c47dbc91bdabf7602e3979a8a SHA1 (patch-b2g_installer_Makefile.in) = 95eb82774734db093c990919ba669d4666e55df0 -SHA1 (patch-b2g_installer_package-manifest.in) = cdb43eece164b43b49a9c0f1a47de4e7db56ed76 +SHA1 (patch-b2g_installer_package-manifest.in) = daf8468729a96875d346643d4f9df54a39a4bdd7 SHA1 (patch-bf) = 75c971043e9f693203d6bd670b2c20c4952a7756 SHA1 (patch-bg) = d6c02294765265d9e85cf49c22320d88573c2e25 SHA1 (patch-browser_app_nsBrowserApp.cpp) = b7dd345b88dd03716f725c790364d06475aaf6bb @@ -24,12 +23,12 @@ SHA1 (patch-config_external_moz.build) = ee5fe1672333a7d71e61a23f3739ffefcca692d SHA1 (patch-config_rules.mk) = d7f7060b246092eae3d7a792e43b14e462a37abd SHA1 (patch-config_stl__wrappers_ios) = 00d723e2f2f252485350ede5833f0bb84c1235c1 SHA1 (patch-config_stl__wrappers_ostream) = 7be7fe36704ffbdc070a113b46b4f391a598206b -SHA1 (patch-config_system-headers) = 79f48d468edb4a5acdedb0c6d8d79c193cd140b2 +SHA1 (patch-config_system-headers) = da0f1754eebac0d4a8234345b8d201e0e8fe774f SHA1 (patch-config_system__wrappers_unwind.h) = b3bdac0710179b9c8f8eabd824216d0114504491 SHA1 (patch-dom_base_moz.build) = 8b59c33958b7037c4c051742c64f1455096ced46 SHA1 (patch-dom_media_AudioStream.h) = 96b5a1a2b1c930cfcfa77a125d47b6eb93fac1c6 SHA1 (patch-dom_media_gmp_GMPChild.cpp) = 534a2c921a2d4d5b71d5ab75b8484ee792329460 -SHA1 (patch-dom_media_gmp_GMPParent.cpp) = 8129d70855cd7d04dc9d909c689db3cdbafb5914 +SHA1 (patch-dom_media_gmp_GMPParent.cpp) = a51a6197cd7be0b751180babe65fb65f93bdbad6 SHA1 (patch-dom_media_gstreamer_GStreamerAllocator.cpp) = 4685a646a76282619d7c42fac43500e0065f067d SHA1 (patch-dom_media_moz.build) = a89695c9557f59e00b42c60742f27a82de0f77fb SHA1 (patch-dom_plugins_ipc_PluginModuleChild.cpp) = 6219ce1b3f2893c1d53453fcb5568d081b72e106 @@ -67,14 +66,13 @@ SHA1 (patch-ipc_chromium_src_chrome_common_transport__dib.h) = 7af18973c005d7b14 SHA1 (patch-ipc_glue_GeckoChildProcessHost.cpp) = 45f2f22b4f567ffddd4458f635179b5201e87e64 SHA1 (patch-ipc_glue_ScopedXREEmbed.cpp) = 97c39f25527dac4c22b38ce446ca2cd4cef08fd0 SHA1 (patch-ipc_glue_StringUtil.cpp) = f238adebb5bdf57f7109a781c6f3fb195763f3c0 -SHA1 (patch-ipc_glue_moz.build) = 2682ca9de9606e50602a124e287dded2b9f2859b +SHA1 (patch-ipc_glue_moz.build) = 5c3f99ede7ab2d8ad58e92b31576971de87cb528 SHA1 (patch-ipc_ipdl_ipdl_cxx_ast.py) = 047b7012dffdcfc2b07d2d249fb3523e7d4643f8 SHA1 (patch-ipc_ipdl_ipdl_cxx_cgen.py) = d7f7dc85b1ff26c6d7e902f94c0ac09f04497105 SHA1 (patch-ipc_ipdl_ipdl_lower.py) = 2ef9504e462d0e3db16f9b0a6303ea5971b9c2a2 SHA1 (patch-js__src__vm__SPSProfiler.cpp) = 989ba25e4c5308d21d07baa802decce13609a475 SHA1 (patch-js_public_CallArgs.h) = fde9a73b8a694c4c7415848aa25e14ccefe547dd SHA1 (patch-js_src_Makefile.in) = 77d2e7cb651b9f30ebf6458fd07678416cdecbcc -SHA1 (patch-js_src_asmjs_AsmJSSignalHandlers.cpp) = 976cc3099901d36a70cca4333fca13d5b8885b26 SHA1 (patch-js_src_ctypes_CTypes.h) = 768a084239f92a424c1c7dc9eaaf9be9456ca9f0 SHA1 (patch-js_src_frontend_ParseMaps.cpp) = c00117d79b78904bc50a1d664a8fc0e4e339bfbc SHA1 (patch-js_src_gc_Statistics.cpp) = 227d047f5befeff2a619e8bec9e98d69a78adf5c @@ -86,12 +84,12 @@ SHA1 (patch-js_src_jsapi.cpp) = 97aaa4eea1254b675cbfd9cfae92dd614a717f49 SHA1 (patch-js_src_jsdate.cpp) = 0e577aefa24693c7941ead0365c58b2b4b41dc8c SHA1 (patch-js_src_jskwgen.cpp) = 34d3b92e13366d4b43ff755ad54f392c116d5c59 SHA1 (patch-js_src_jsmath.cpp) = 7d4993ae91e9b5e6820358165603819aefb586f9 -SHA1 (patch-js_src_shell_jsoptparse.cpp) = 178415aa652ccbd5278629b5154d20c4d7bfffd0 +SHA1 (patch-js_src_shell_jsoptparse.cpp) = 2502ae2b4e6103788c2a888b6cb19cedf9d2976f SHA1 (patch-js_xpconnect_src_XPCConvert.cpp) = 915777e9bb5366be41866cdb6ea0ad2b1c006dde SHA1 (patch-js_xpconnect_src_xpcprivate.h) = 8a15ff542c9d3fce448d9ec63706f7dfb411d926 SHA1 (patch-media_libcubeb_AUTHORS) = 3db32086f98c2bbe16e9394bb5121d7a95cdb4af SHA1 (patch-media_libcubeb_src_cubeb.c) = effe8771e42adddb478ecb302352ef003bdd01db -SHA1 (patch-media_libcubeb_src_cubeb__alsa.c) = f8ab0c958e00b2ae52ac73ebcad5bf8a9fe2f2d1 +SHA1 (patch-media_libcubeb_src_cubeb__alsa.c) = 81e695c5cb20be3e864157c19ed07f9713490be5 SHA1 (patch-media_libcubeb_src_cubeb__oss.c) = 54e2a210411c7083bc395033fbf519d581bc4a62 SHA1 (patch-media_libcubeb_src_moz.build) = a793f0dd1bd90d9a9a967dbef8da1183cd909b7c SHA1 (patch-media_libpng_pngpriv.h) = c9cefd1b5dd85fbd0c875c3f9bc108975398fe3a @@ -126,7 +124,7 @@ SHA1 (patch-memory_jemalloc_src_configure) = d1e27220b223266f7a7d362dca1621012f8 SHA1 (patch-memory_mozalloc_mozalloc__abort.cpp) = 44cb29dac1e8032c3f58149227bfe5ad94e8edb9 SHA1 (patch-memory_volatile_VolatileBufferOSX.cpp) = ebea8a615443206376cb4264ed43b5c74e029b7d SHA1 (patch-mfbt_Alignment.h) = 9ebc9892fd11eba7105974979b54f4f8759b7749 -SHA1 (patch-mfbt_Attributes.h) = b3f54a35476e99ba3191ee99feafc86de21d8334 +SHA1 (patch-mfbt_Attributes.h) = 509d389e0053615aaf817d49f0cc5a12bd620aae SHA1 (patch-mfbt_Poison.cpp) = f502581db96b3e5eca25a9aa9035f436e9167503 SHA1 (patch-mobile_android_installer_Makefile.in) = 3d6b7ea3fc6249f2f8ebc88f15f34495a0ef41d6 SHA1 (patch-mobile_android_installer_package-manifest.in) = 5826a6585e76eecad46e8c8bf3a9c4ded61b5748 @@ -143,14 +141,12 @@ SHA1 (patch-toolkit_components_osfile_modules_osfile__unix__front.jsm) = f5adba2 SHA1 (patch-toolkit_library_moz.build) = 625d78e64959f78a5d0b8148749bb43a0abcbcf7 SHA1 (patch-toolkit_modules_GMPInstallManager.jsm) = 7aaf694c6466c2ab2beac3e9e9ca80461bc13c7f SHA1 (patch-toolkit_modules_GMPUtils.jsm) = 1b4472b466e1b736034434ef32a6d016993ddb00 -SHA1 (patch-toolkit_mozapps_extensions_internal_GMPProvider.jsm) = ca69c55505470082c2651313852b49b2d0002cc8 +SHA1 (patch-toolkit_mozapps_extensions_internal_GMPProvider.jsm) = 6e4ead21c1bcb1268a0530b3041ff4d5af20b743 SHA1 (patch-toolkit_xre_nsAppRunner.cpp) = f335d64cb0e1d248fd2c41a167ee1874218e7db6 SHA1 (patch-toolkit_xre_nsEmbedFunctions.cpp) = 6ee6fba04a3ecc6596f8aed67f752a1075901fa8 SHA1 (patch-webapprt_moz.build) = 177468d5e12c49db1ad5376f0f3df34fa9df070c -SHA1 (patch-widget_gtk_gtk2drawing.c) = dd63fd368a86aef1b9568ae625904ffd9542a874 -SHA1 (patch-widget_gtk_gtk3drawing.c) = 7224a3ef02ef98b6013ffeafcf6819c726bacbe6 -SHA1 (patch-widget_gtk_gtkdrawing.h) = ca582ba4f09c4a31600dcb630a7997ed5db7a7b4 -SHA1 (patch-widget_gtk_nsNativeThemeGTK.cpp) = 959ddb6501d2b3bff94ca3ff5fbdbfe8ce71879c +SHA1 (patch-widget_gtk_gtk3drawing.c) = 8f8e9b28b5ab98009cf60b236dc79d580cb6bd73 +SHA1 (patch-widget_gtk_nsNativeThemeGTK.cpp) = 340e5e9d1cd4f248af6908408188371a731d5474 SHA1 (patch-xpcom_base_nsStackWalk.cpp) = 8fb5eb1f1e548eda7151175d350eee9ec38b17b3 SHA1 (patch-xpcom_base_nscore.h) = f4fe66cc9e714a2101a4d1287359d1c300574438 SHA1 (patch-xpcom_build_PoisonIOInterposer.h) = b0a53ec580bf5c2277d19618c1240a447575ae68 diff --git a/www/firefox/mozilla-common.mk b/www/firefox/mozilla-common.mk index 62c693a5e25..5b6723bdff8 100644 --- a/www/firefox/mozilla-common.mk +++ b/www/firefox/mozilla-common.mk @@ -1,4 +1,4 @@ -# $NetBSD: mozilla-common.mk,v 1.57 2015/06/26 11:16:41 szptvlfn Exp $ +# $NetBSD: mozilla-common.mk,v 1.58 2015/07/03 10:25:40 ryoon Exp $ # # common Makefile fragment for mozilla packages based on gecko 2.0. # @@ -33,6 +33,7 @@ CHECK_PORTABILITY_SKIP+=${MOZILLA_DIR}security/nss/tests/libpkix/libpkix.sh CHECK_PORTABILITY_SKIP+=${MOZILLA_DIR}security/nss/tests/multinit/multinit.sh CHECK_PORTABILITY_SKIP+=${MOZILLA_DIR}js/src/tests/update-test262.sh CHECK_PORTABILITY_SKIP+=${MOZILLA_DIR}intl/icu/source/configure +CHECK_PORTABILITY_SKIP+=${MOZILLA_DIR}browser/components/loop/run-all-loop-tests.sh CONFIGURE_ARGS+= --disable-tests CONFIGURE_ARGS+= --disable-pedantic diff --git a/www/firefox/options.mk b/www/firefox/options.mk index 49b6f77f376..f1b00fe39f7 100644 --- a/www/firefox/options.mk +++ b/www/firefox/options.mk @@ -1,4 +1,4 @@ -# $NetBSD: options.mk,v 1.25 2015/04/15 12:36:23 ryoon Exp $ +# $NetBSD: options.mk,v 1.26 2015/07/03 10:25:40 ryoon Exp $ PKG_OPTIONS_VAR= PKG_OPTIONS.firefox PKG_SUPPORTED_OPTIONS= official-mozilla-branding @@ -27,7 +27,7 @@ CONFIGURE_ARGS+= --disable-alsa .if !empty(PKG_OPTIONS:Mgnome) .include "../../devel/libgnomeui/buildlink3.mk" -.include "../../sysutils/gnome-vfs/buildlink3.mk" +#.include "../../sysutils/gnome-vfs/buildlink3.mk" .include "../../sysutils/libnotify/buildlink3.mk" CONFIGURE_ARGS+= --enable-gio --enable-dbus --enable-gnomeui CONFIGURE_ARGS+= --enable-libnotify diff --git a/www/firefox/patches/patch-aa b/www/firefox/patches/patch-aa index 70d34a97ab2..15e9529af62 100644 --- a/www/firefox/patches/patch-aa +++ b/www/firefox/patches/patch-aa @@ -1,4 +1,4 @@ -$NetBSD: patch-aa,v 1.37 2015/05/12 22:48:54 ryoon Exp $ +$NetBSD: patch-aa,v 1.38 2015/07/03 10:25:40 ryoon Exp $ * The profiler does not support Darwin/PPC so don't try to enable it on that platform. @@ -13,9 +13,9 @@ $NetBSD: patch-aa,v 1.37 2015/05/12 22:48:54 ryoon Exp $ heavy patching. Ideally they should be fixed individually but that will be an extremely hard work, so don't define XP_MACOSX for now. ---- configure.in.orig 2015-05-04 00:43:23.000000000 +0000 +--- configure.in.orig 2015-06-18 20:55:30.000000000 +0000 +++ configure.in -@@ -1794,7 +1794,13 @@ Linux) +@@ -1796,7 +1796,13 @@ Linux) MOZ_ENABLE_PROFILER_SPS= esac ;; @@ -30,7 +30,7 @@ $NetBSD: patch-aa,v 1.37 2015/05/12 22:48:54 ryoon Exp $ *) MOZ_ENABLE_PROFILER_SPS= ;; -@@ -1898,7 +1904,7 @@ case "$host" in +@@ -1900,7 +1906,7 @@ case "$host" in ;; *-darwin*) @@ -39,7 +39,7 @@ $NetBSD: patch-aa,v 1.37 2015/05/12 22:48:54 ryoon Exp $ HOST_NSPR_MDCPUCFG='\"md/_darwin.cfg\"' HOST_OPTIMIZE_FLAGS="${HOST_OPTIMIZE_FLAGS=-O3}" ;; -@@ -2022,7 +2028,6 @@ case "$target" in +@@ -2024,7 +2030,6 @@ case "$target" in AC_DEFINE(XP_DARWIN) _PLATFORM_DEFAULT_TOOLKIT='cairo-uikit' else @@ -47,7 +47,7 @@ $NetBSD: patch-aa,v 1.37 2015/05/12 22:48:54 ryoon Exp $ AC_DEFINE(XP_DARWIN) _PLATFORM_DEFAULT_TOOLKIT='cairo-cocoa' # The ExceptionHandling framework is needed for Objective-C exception -@@ -2641,8 +2646,7 @@ MOZ_CXX11 +@@ -2643,8 +2648,7 @@ MOZ_CXX11 AC_LANG_C @@ -57,7 +57,7 @@ $NetBSD: patch-aa,v 1.37 2015/05/12 22:48:54 ryoon Exp $ dnl =============================================================== if test "$GNU_CC" -a "$OS_TARGET" != WINNT; then AC_DEFINE(HAVE_VISIBILITY_HIDDEN_ATTRIBUTE) -@@ -3663,6 +3667,14 @@ if test -n "$YASM"; then +@@ -3666,6 +3670,14 @@ if test -n "$YASM"; then _YASM_BUILD=` echo ${YASM_VERSION} | $AWK -F\. '{ print $4 }'` fi @@ -72,7 +72,7 @@ $NetBSD: patch-aa,v 1.37 2015/05/12 22:48:54 ryoon Exp $ if test -z "$SKIP_LIBRARY_CHECKS"; then dnl system JPEG support dnl ======================================================== -@@ -3690,11 +3702,7 @@ if test "$MOZ_NATIVE_JPEG" = 1; then +@@ -3693,11 +3705,7 @@ if test "$MOZ_NATIVE_JPEG" = 1; then #include <jpeglib.h> ], [ #if JPEG_LIB_VERSION < $MOZJPEG #error "Insufficient JPEG library version ($MOZJPEG required)." @@ -85,7 +85,7 @@ $NetBSD: patch-aa,v 1.37 2015/05/12 22:48:54 ryoon Exp $ MOZ_NATIVE_JPEG=1, AC_MSG_ERROR([Insufficient JPEG library version for --with-system-jpeg])) fi -@@ -4392,6 +4400,10 @@ cairo-gonk) +@@ -4403,6 +4411,10 @@ cairo-gonk) esac @@ -96,16 +96,7 @@ $NetBSD: patch-aa,v 1.37 2015/05/12 22:48:54 ryoon Exp $ AC_SUBST(MOZ_PDF_PRINTING) if test "$MOZ_PDF_PRINTING"; then PDF_SURFACE_FEATURE="#define CAIRO_HAS_PDF_SURFACE 1" -@@ -4408,7 +4420,7 @@ fi - - if test "$COMPILE_ENVIRONMENT"; then - if test "$MOZ_ENABLE_GTK3"; then -- PKG_CHECK_MODULES(MOZ_GTK3, gtk+-3.0 >= $GTK3_VERSION gtk+-unix-print-3.0 glib-2.0 gobject-2.0 atk-bridge-2.0 $GDK_PACKAGES) -+ PKG_CHECK_MODULES(MOZ_GTK3, gtk+-3.0 >= $GTK3_VERSION gtk+-unix-print-3.0 glib-2.0 gobject-2.0 $GDK_PACKAGES) - MOZ_GTK3_CFLAGS="-I${_topsrcdir}/widget/gtk/compat-gtk3 $MOZ_GTK3_CFLAGS" - dnl Contrary to MOZ_GTK2_LIBS, MOZ_GTK3_LIBS needs to be literally added to TK_LIBS instead - dnl of a make reference because of how TK_LIBS is mangled in toolkit/library/moz.build -@@ -5149,6 +5161,9 @@ if test -n "$MOZ_WEBRTC"; then +@@ -5137,6 +5149,9 @@ if test -n "$MOZ_WEBRTC"; then MOZ_VPX=1 MOZ_VPX_ERROR_CONCEALMENT=1 @@ -115,7 +106,7 @@ $NetBSD: patch-aa,v 1.37 2015/05/12 22:48:54 ryoon Exp $ dnl enable once Signaling lands MOZ_WEBRTC_SIGNALING=1 AC_DEFINE(MOZ_WEBRTC_SIGNALING) -@@ -5252,6 +5267,157 @@ if test "${ac_cv_c_attribute_aligned}" ! +@@ -5240,6 +5255,157 @@ if test "${ac_cv_c_attribute_aligned}" ! fi dnl ======================================================== @@ -273,7 +264,7 @@ $NetBSD: patch-aa,v 1.37 2015/05/12 22:48:54 ryoon Exp $ dnl = Disable VP8 decoder support dnl ======================================================== MOZ_ARG_DISABLE_BOOL(webm, -@@ -5606,6 +5772,67 @@ fi +@@ -5608,6 +5774,67 @@ fi AC_SUBST(MOZ_WEBM_ENCODER) dnl ================================== @@ -341,7 +332,7 @@ $NetBSD: patch-aa,v 1.37 2015/05/12 22:48:54 ryoon Exp $ dnl = Check alsa availability on Linux dnl ================================== -@@ -5619,12 +5846,23 @@ MOZ_ARG_ENABLE_BOOL(alsa, +@@ -5621,12 +5848,23 @@ MOZ_ARG_ENABLE_BOOL(alsa, MOZ_ALSA=1, MOZ_ALSA=) @@ -365,7 +356,7 @@ $NetBSD: patch-aa,v 1.37 2015/05/12 22:48:54 ryoon Exp $ AC_SUBST(MOZ_ALSA) dnl ======================================================== -@@ -6046,7 +6284,9 @@ MOZ_ARG_DISABLE_BOOL(gamepad, +@@ -6054,7 +6292,9 @@ MOZ_ARG_DISABLE_BOOL(gamepad, if test "$MOZ_GAMEPAD"; then case "$OS_TARGET" in Darwin) @@ -376,7 +367,7 @@ $NetBSD: patch-aa,v 1.37 2015/05/12 22:48:54 ryoon Exp $ ;; WINNT) MOZ_GAMEPAD_BACKEND=windows -@@ -8066,6 +8306,49 @@ if test "$USE_FC_FREETYPE"; then +@@ -8073,6 +8313,49 @@ if test "$USE_FC_FREETYPE"; then fi dnl ======================================================== diff --git a/www/firefox/patches/patch-accessible_atk_Platform.cpp b/www/firefox/patches/patch-accessible_atk_Platform.cpp deleted file mode 100644 index 8414b6625b7..00000000000 --- a/www/firefox/patches/patch-accessible_atk_Platform.cpp +++ /dev/null @@ -1,98 +0,0 @@ -$NetBSD: patch-accessible_atk_Platform.cpp,v 1.2 2015/05/12 22:48:54 ryoon Exp $ - ---- accessible/atk/Platform.cpp.orig 2015-05-04 00:43:17.000000000 +0000 -+++ accessible/atk/Platform.cpp -@@ -18,8 +18,9 @@ - #include <dbus/dbus.h> - #endif - #include <gtk/gtk.h> -+ - #if (MOZ_WIDGET_GTK == 3) --#include <atk-bridge.h> -+extern "C" __attribute__((weak,visibility("default"))) int atk_bridge_adaptor_init(int*, char **[]); - #endif - - using namespace mozilla; -@@ -46,7 +47,6 @@ static gulong sToplevel_hide_hook = 0; - - GType g_atk_hyperlink_impl_type = G_TYPE_INVALID; - --#if (MOZ_WIDGET_GTK == 2) - struct GnomeAccessibilityModule - { - const char *libName; -@@ -67,11 +67,13 @@ static GnomeAccessibilityModule sAtkBrid - "gnome_accessibility_module_shutdown", nullptr - }; - -+#if (MOZ_WIDGET_GTK == 2) - static GnomeAccessibilityModule sGail = { - "libgail.so", nullptr, - "gnome_accessibility_module_init", nullptr, - "gnome_accessibility_module_shutdown", nullptr - }; -+#endif - - static nsresult - LoadGtkModule(GnomeAccessibilityModule& aModule) -@@ -98,7 +100,11 @@ LoadGtkModule(GnomeAccessibilityModule& - else - subLen = loc2 - loc1; - nsAutoCString sub(Substring(libPath, loc1, subLen)); -+#if (MOZ_WIDGET_GTK == 2) - sub.AppendLiteral("/gtk-2.0/modules/"); -+#else -+ sub.AppendLiteral("/gtk-3.0/modules/"); -+#endif - sub.Append(aModule.libName); - aModule.lib = PR_LoadLibrary(sub.get()); - if (aModule.lib) -@@ -123,7 +129,6 @@ LoadGtkModule(GnomeAccessibilityModule& - } - return NS_OK; - } --#endif // (MOZ_WIDGET_GTK == 2) - - void - a11y::PlatformInit() -@@ -175,14 +180,17 @@ a11y::PlatformInit() - - // Init atk-bridge now - PR_SetEnv("NO_AT_BRIDGE=0"); --#if (MOZ_WIDGET_GTK == 2) -- rv = LoadGtkModule(sAtkBridge); -- if (NS_SUCCEEDED(rv)) { -- (*sAtkBridge.init)(); -- } --#else -- atk_bridge_adaptor_init(nullptr, nullptr); -+#if (MOZ_WIDGET_GTK == 3) -+ if (atk_bridge_adaptor_init) { -+ atk_bridge_adaptor_init(nullptr, nullptr); -+ } else - #endif -+ { -+ nsresult rv = LoadGtkModule(sAtkBridge); -+ if (NS_SUCCEEDED(rv)) { -+ (*sAtkBridge.init)(); -+ } -+ } - - if (!sToplevel_event_hook_added) { - sToplevel_event_hook_added = true; -@@ -210,7 +218,6 @@ a11y::PlatformShutdown() - sToplevel_hide_hook); - } - --#if (MOZ_WIDGET_GTK == 2) - if (sAtkBridge.lib) { - // Do not shutdown/unload atk-bridge, - // an exit function registered will take care of it -@@ -221,6 +228,7 @@ a11y::PlatformShutdown() - sAtkBridge.init = nullptr; - sAtkBridge.shutdown = nullptr; - } -+#if (MOZ_WIDGET_GTK == 2) - if (sGail.lib) { - // Do not shutdown gail because - // 1) Maybe it's not init-ed by us. e.g. GtkEmbed diff --git a/www/firefox/patches/patch-b2g_installer_package-manifest.in b/www/firefox/patches/patch-b2g_installer_package-manifest.in index ede4681aa9d..f9e367465f7 100644 --- a/www/firefox/patches/patch-b2g_installer_package-manifest.in +++ b/www/firefox/patches/patch-b2g_installer_package-manifest.in @@ -1,13 +1,13 @@ -$NetBSD: patch-b2g_installer_package-manifest.in,v 1.4 2015/02/28 04:30:55 ryoon Exp $ +$NetBSD: patch-b2g_installer_package-manifest.in,v 1.5 2015/07/03 10:25:40 ryoon Exp $ ---- b2g/installer/package-manifest.in.orig 2015-02-17 21:40:34.000000000 +0000 +--- b2g/installer/package-manifest.in.orig 2015-06-18 20:55:24.000000000 +0000 +++ b2g/installer/package-manifest.in -@@ -609,7 +609,7 @@ - @BINPATH@/components/EngineeringModeAPI.js - @BINPATH@/components/EngineeringModeService.js +@@ -671,7 +671,7 @@ + @RESPATH@/components/EngineeringModeAPI.js + @RESPATH@/components/EngineeringModeService.js -#ifdef MOZ_DEBUG +#if defined(ENABLE_TESTS) && defined(MOZ_DEBUG) - @BINPATH@/components/TestInterfaceJS.js - @BINPATH@/components/TestInterfaceJS.manifest + @RESPATH@/components/TestInterfaceJS.js + @RESPATH@/components/TestInterfaceJS.manifest #endif diff --git a/www/firefox/patches/patch-config_system-headers b/www/firefox/patches/patch-config_system-headers index fe8e889418d..ae6ad830f0d 100644 --- a/www/firefox/patches/patch-config_system-headers +++ b/www/firefox/patches/patch-config_system-headers @@ -1,24 +1,16 @@ -$NetBSD: patch-config_system-headers,v 1.13 2015/05/12 22:48:54 ryoon Exp $ +$NetBSD: patch-config_system-headers,v 1.14 2015/07/03 10:25:40 ryoon Exp $ ---- config/system-headers.orig 2015-05-04 00:43:23.000000000 +0000 +--- config/system-headers.orig 2015-06-18 20:55:30.000000000 +0000 +++ config/system-headers -@@ -189,7 +189,6 @@ asm/signal.h - ASRegistry.h - assert.h - atk/atk.h --atk-bridge.h - atlcom.h - atlconv.h - atlctl.cpp -@@ -636,6 +635,7 @@ libgnomevfs/gnome-vfs-mime-handlers.h - libgnomevfs/gnome-vfs-mime-utils.h - libgnomevfs/gnome-vfs-ops.h - libgnomevfs/gnome-vfs-standard-callbacks.h +@@ -628,6 +628,7 @@ libgnome/libgnome.h + libgnomeui/gnome-icon-lookup.h + libgnomeui/gnome-icon-theme.h + libgnomeui/gnome-ui-init.h +libv4l2.h lib$routines.h limits limits.h -@@ -1266,7 +1266,6 @@ X11/Xlocale.h +@@ -1258,7 +1259,6 @@ X11/Xlocale.h X11/Xos.h X11/Xutil.h zmouse.h @@ -26,7 +18,7 @@ $NetBSD: patch-config_system-headers,v 1.13 2015/05/12 22:48:54 ryoon Exp $ #if MOZ_NATIVE_PNG==1 png.h #endif -@@ -1328,10 +1327,13 @@ vorbis/codec.h +@@ -1320,10 +1320,13 @@ vorbis/codec.h theora/theoradec.h tremor/ivorbiscodec.h speex/speex_resampler.h @@ -40,7 +32,7 @@ $NetBSD: patch-config_system-headers,v 1.13 2015/05/12 22:48:54 ryoon Exp $ #endif gst/gst.h gst/app/gstappsink.h -@@ -1360,3 +1362,43 @@ unicode/utypes.h +@@ -1352,3 +1355,43 @@ unicode/utypes.h #endif libutil.h unwind.h diff --git a/www/firefox/patches/patch-dom_media_gmp_GMPParent.cpp b/www/firefox/patches/patch-dom_media_gmp_GMPParent.cpp index 92144de3370..d4d57ac58ab 100644 --- a/www/firefox/patches/patch-dom_media_gmp_GMPParent.cpp +++ b/www/firefox/patches/patch-dom_media_gmp_GMPParent.cpp @@ -1,8 +1,8 @@ -$NetBSD: patch-dom_media_gmp_GMPParent.cpp,v 1.1 2015/02/28 04:30:55 ryoon Exp $ +$NetBSD: patch-dom_media_gmp_GMPParent.cpp,v 1.2 2015/07/03 10:25:40 ryoon Exp $ ---- dom/media/gmp/GMPParent.cpp.orig 2015-02-17 21:40:44.000000000 +0000 +--- dom/media/gmp/GMPParent.cpp.orig 2015-06-18 20:55:35.000000000 +0000 +++ dom/media/gmp/GMPParent.cpp -@@ -96,23 +96,16 @@ GMPParent::Init(GeckoMediaPluginService +@@ -101,22 +101,15 @@ GMPParent::Init(GeckoMediaPluginService mService = aService; mDirectory = aPluginDir; @@ -10,19 +10,18 @@ $NetBSD: patch-dom_media_gmp_GMPParent.cpp,v 1.1 2015/02/28 04:30:55 ryoon Exp $ - // where <gmp-plugin-id> should be gmp-gmpopenh264 - nsCOMPtr<nsIFile> parent; - nsresult rv = aPluginDir->GetParent(getter_AddRefs(parent)); -- if (NS_FAILED(rv)) { -- return rv; -- } -- nsAutoString parentLeafName; -- rv = parent->GetLeafName(parentLeafName); + nsAutoString leafname; + nsresult rv = aPluginDir->GetLeafName(leafname); if (NS_FAILED(rv)) { return rv; } - LOGD(("%s::%s: %p for %s", __CLASS__, __FUNCTION__, this, -- NS_LossyConvertUTF16toASCII(parentLeafName).get())); -+ NS_LossyConvertUTF16toASCII(leafname).get())); +- nsAutoString parentLeafName; +- rv = parent->GetLeafName(parentLeafName); +- if (NS_FAILED(rv)) { +- return rv; +- } +- LOGD("%s: for %s", __FUNCTION__, NS_LossyConvertUTF16toASCII(parentLeafName).get()); ++ LOGD("%s: for %s", __FUNCTION__, NS_LossyConvertUTF16toASCII(leafname).get()); - MOZ_ASSERT(parentLeafName.Length() > 4); - mName = Substring(parentLeafName, 4); diff --git a/www/firefox/patches/patch-ipc_glue_moz.build b/www/firefox/patches/patch-ipc_glue_moz.build index cc44540c24c..a1f17a3abcf 100644 --- a/www/firefox/patches/patch-ipc_glue_moz.build +++ b/www/firefox/patches/patch-ipc_glue_moz.build @@ -1,14 +1,14 @@ -$NetBSD: patch-ipc_glue_moz.build,v 1.1 2015/01/30 07:32:24 pho Exp $ +$NetBSD: patch-ipc_glue_moz.build,v 1.2 2015/07/03 10:25:40 ryoon Exp $ Don't assume cocoa toolkit just because OS_ARCH is Darwin. ---- ipc/glue/moz.build.orig 2015-01-29 12:45:33.000000000 +0000 +--- ipc/glue/moz.build.orig 2015-06-18 20:55:28.000000000 +0000 +++ ipc/glue/moz.build @@ -87,7 +87,7 @@ elif CONFIG['OS_ARCH'] in ('DragonFly', UNIFIED_SOURCES += [ 'ProcessUtils_bsd.cpp' ] --elif CONFIG['OS_ARCH'] in ('Darwin'): +-elif CONFIG['OS_ARCH'] == 'Darwin': +elif CONFIG['MOZ_WIDGET_TOOLKIT'] == 'cocoa': UNIFIED_SOURCES += [ 'ProcessUtils_mac.mm' diff --git a/www/firefox/patches/patch-js_src_asmjs_AsmJSSignalHandlers.cpp b/www/firefox/patches/patch-js_src_asmjs_AsmJSSignalHandlers.cpp deleted file mode 100644 index 7a3cbb9e8f6..00000000000 --- a/www/firefox/patches/patch-js_src_asmjs_AsmJSSignalHandlers.cpp +++ /dev/null @@ -1,22 +0,0 @@ -$NetBSD: patch-js_src_asmjs_AsmJSSignalHandlers.cpp,v 1.3 2015/05/12 22:48:54 ryoon Exp $ - -Increase portability for non-x86 Darwin by not hardwiring -x86_THREAD_STATE. - ---- js/src/asmjs/AsmJSSignalHandlers.cpp.orig 2015-05-04 00:43:23.000000000 +0000 -+++ js/src/asmjs/AsmJSSignalHandlers.cpp -@@ -637,10 +637,11 @@ HandleMachException(JSRuntime* rt, const - mach_port_t rtThread = request.body.thread.name; - - // Read out the JSRuntime thread's register state. -- x86_thread_state_t state; -- unsigned int count = x86_THREAD_STATE_COUNT; -+ moz_platform_thread_state_t state; -+ thread_state_flavor_t flavor = MOZ_PLATFORM_THREAD_STATE_FLAVOR; -+ mach_msg_type_number_t count = MOZ_PLATFORM_THREAD_STATE_COUNT; - kern_return_t kret; -- kret = thread_get_state(rtThread, x86_THREAD_STATE, (thread_state_t)&state, &count); -+ kret = thread_get_state(rtThread, flavor, (thread_state_t)&state, &count); - if (kret != KERN_SUCCESS) - return false; - diff --git a/www/firefox/patches/patch-js_src_shell_jsoptparse.cpp b/www/firefox/patches/patch-js_src_shell_jsoptparse.cpp index 5e669703e99..29c62224a18 100644 --- a/www/firefox/patches/patch-js_src_shell_jsoptparse.cpp +++ b/www/firefox/patches/patch-js_src_shell_jsoptparse.cpp @@ -1,9 +1,9 @@ -$NetBSD: patch-js_src_shell_jsoptparse.cpp,v 1.3 2015/05/12 22:48:54 ryoon Exp $ +$NetBSD: patch-js_src_shell_jsoptparse.cpp,v 1.4 2015/07/03 10:25:40 ryoon Exp $ ---- js/src/shell/jsoptparse.cpp.orig 2015-05-04 00:43:27.000000000 +0000 +--- js/src/shell/jsoptparse.cpp.orig 2015-06-18 20:55:32.000000000 +0000 +++ js/src/shell/jsoptparse.cpp -@@ -90,7 +90,7 @@ PrintParagraph(const char* text, unsigne - printf("%*s", startColno, ""); +@@ -95,7 +95,7 @@ PrintParagraph(const char* text, unsigne + ++it; while (*it != '\0') { - MOZ_ASSERT(!isspace(*it)); diff --git a/www/firefox/patches/patch-media_libcubeb_src_cubeb__alsa.c b/www/firefox/patches/patch-media_libcubeb_src_cubeb__alsa.c index 19bf917df22..3d2e6e7dba1 100644 --- a/www/firefox/patches/patch-media_libcubeb_src_cubeb__alsa.c +++ b/www/firefox/patches/patch-media_libcubeb_src_cubeb__alsa.c @@ -1,7 +1,7 @@ -$NetBSD: patch-media_libcubeb_src_cubeb__alsa.c,v 1.10 2015/05/14 15:30:54 bad Exp $ +$NetBSD: patch-media_libcubeb_src_cubeb__alsa.c,v 1.11 2015/07/03 10:25:40 ryoon Exp $ ---- media/libcubeb/src/cubeb_alsa.c.orig 2015-05-08 16:55:17.000000000 +0000 -+++ media/libcubeb/src/cubeb_alsa.c 2015-05-14 15:22:34.000000000 +0000 +--- media/libcubeb/src/cubeb_alsa.c.orig 2015-06-18 20:55:30.000000000 +0000 ++++ media/libcubeb/src/cubeb_alsa.c @@ -7,12 +7,18 @@ #undef NDEBUG #define _DEFAULT_SOURCE @@ -73,7 +73,7 @@ $NetBSD: patch-media_libcubeb_src_cubeb__alsa.c,v 1.10 2015/05/14 15:30:54 bad E /* ALSA is not thread-safe. snd_pcm_t instances are individually protected by the owning cubeb_stream's mutex. snd_pcm_t creation and destruction is not thread-safe until ALSA 1.0.24 (see alsa-lib.git commit 91c9c8f1), -@@ -65,6 +116,8 @@ +@@ -65,6 +116,8 @@ struct cubeb { workaround is not required. */ snd_config_t * local_config; int is_pa; @@ -82,7 +82,7 @@ $NetBSD: patch-media_libcubeb_src_cubeb__alsa.c,v 1.10 2015/05/14 15:30:54 bad E }; enum stream_state { -@@ -258,32 +311,35 @@ +@@ -258,32 +311,35 @@ alsa_refill_stream(cubeb_stream * stm) long got; void * p; int draining; @@ -137,7 +137,7 @@ $NetBSD: patch-media_libcubeb_src_cubeb__alsa.c,v 1.10 2015/05/14 15:30:54 bad E /* This should never happen. */ if ((unsigned int) avail > stm->buffer_size) { -@@ -294,8 +350,8 @@ +@@ -294,8 +350,8 @@ alsa_refill_stream(cubeb_stream * stm) available to write. If avail is still zero here, the stream must be in a funky state, so recover and try again. */ if (avail == 0) { @@ -148,7 +148,7 @@ $NetBSD: patch-media_libcubeb_src_cubeb__alsa.c,v 1.10 2015/05/14 15:30:54 bad E if (avail <= 0) { pthread_mutex_unlock(&stm->mutex); stm->state_callback(stm, stm->user_ptr, CUBEB_STATE_ERROR); -@@ -303,7 +359,7 @@ +@@ -303,7 +359,7 @@ alsa_refill_stream(cubeb_stream * stm) } } @@ -157,7 +157,7 @@ $NetBSD: patch-media_libcubeb_src_cubeb__alsa.c,v 1.10 2015/05/14 15:30:54 bad E assert(p); pthread_mutex_unlock(&stm->mutex); -@@ -312,10 +368,11 @@ +@@ -312,10 +368,11 @@ alsa_refill_stream(cubeb_stream * stm) if (got < 0) { pthread_mutex_unlock(&stm->mutex); stm->state_callback(stm, stm->user_ptr, CUBEB_STATE_ERROR); @@ -170,7 +170,7 @@ $NetBSD: patch-media_libcubeb_src_cubeb__alsa.c,v 1.10 2015/05/14 15:30:54 bad E if (stm->params.format == CUBEB_SAMPLE_FLOAT32NE) { float * b = (float *) p; -@@ -328,14 +385,64 @@ +@@ -328,14 +385,62 @@ alsa_refill_stream(cubeb_stream * stm) b[i] *= stm->volume; } } @@ -206,7 +206,6 @@ $NetBSD: patch-media_libcubeb_src_cubeb__alsa.c,v 1.10 2015/05/14 15:30:54 bad E + return ERROR; + } + continue; -+#if defined(EBADFD) + case -EBADFD: + fprintf(stderr, "%s: snc_pcm_writei returned -%s, giving up\n", + __func__, "EBADFD"); @@ -214,7 +213,6 @@ $NetBSD: patch-media_libcubeb_src_cubeb__alsa.c,v 1.10 2015/05/14 15:30:54 bad E + stm->state_callback(stm, stm->user_ptr, CUBEB_STATE_ERROR); + pthread_mutex_unlock(&stm->mutex); + return ERROR; -+#endif + } + if (wrote < 0) { + fprintf(stderr, "%s: snc_pcm_writei returned unexpected error %lld, " @@ -243,7 +241,7 @@ $NetBSD: patch-media_libcubeb_src_cubeb__alsa.c,v 1.10 2015/05/14 15:30:54 bad E } if (got != avail) { long buffer_fill = stm->buffer_size - (avail - got); -@@ -343,7 +450,7 @@ +@@ -343,7 +448,7 @@ alsa_refill_stream(cubeb_stream * stm) /* Fill the remaining buffer with silence to guarantee one full period has been written. */ @@ -252,7 +250,7 @@ $NetBSD: patch-media_libcubeb_src_cubeb__alsa.c,v 1.10 2015/05/14 15:30:54 bad E set_timeout(&stm->drain_timeout, buffer_time * 1000); -@@ -454,26 +561,26 @@ +@@ -454,26 +559,26 @@ get_slave_pcm_node(snd_config_t * lconf, slave_def = NULL; @@ -284,7 +282,7 @@ $NetBSD: patch-media_libcubeb_src_cubeb__alsa.c,v 1.10 2015/05/14 15:30:54 bad E if (r < 0) { break; } -@@ -482,7 +589,7 @@ +@@ -482,7 +587,7 @@ get_slave_pcm_node(snd_config_t * lconf, if (r < 0 || r > (int) sizeof(node_name)) { break; } @@ -293,7 +291,7 @@ $NetBSD: patch-media_libcubeb_src_cubeb__alsa.c,v 1.10 2015/05/14 15:30:54 bad E if (r < 0) { break; } -@@ -491,7 +598,7 @@ +@@ -491,7 +596,7 @@ get_slave_pcm_node(snd_config_t * lconf, } while (0); if (slave_def) { @@ -302,7 +300,7 @@ $NetBSD: patch-media_libcubeb_src_cubeb__alsa.c,v 1.10 2015/05/14 15:30:54 bad E } return NULL; -@@ -514,22 +621,22 @@ +@@ -514,22 +619,22 @@ init_local_config_with_workaround(char c lconf = NULL; @@ -329,7 +327,7 @@ $NetBSD: patch-media_libcubeb_src_cubeb__alsa.c,v 1.10 2015/05/14 15:30:54 bad E if (r < 0) { break; } -@@ -538,7 +645,7 @@ +@@ -538,7 +643,7 @@ init_local_config_with_workaround(char c if (r < 0 || r > (int) sizeof(node_name)) { break; } @@ -338,7 +336,7 @@ $NetBSD: patch-media_libcubeb_src_cubeb__alsa.c,v 1.10 2015/05/14 15:30:54 bad E if (r < 0) { break; } -@@ -549,12 +656,12 @@ +@@ -549,12 +654,12 @@ init_local_config_with_workaround(char c } /* Fetch the PCM node's type, and bail out if it's not the PulseAudio plugin. */ @@ -353,7 +351,7 @@ $NetBSD: patch-media_libcubeb_src_cubeb__alsa.c,v 1.10 2015/05/14 15:30:54 bad E if (r < 0) { break; } -@@ -565,18 +672,18 @@ +@@ -565,18 +670,18 @@ init_local_config_with_workaround(char c /* Don't clobber an explicit existing handle_underrun value, set it only if it doesn't already exist. */ @@ -375,7 +373,7 @@ $NetBSD: patch-media_libcubeb_src_cubeb__alsa.c,v 1.10 2015/05/14 15:30:54 bad E if (r < 0) { break; } -@@ -584,7 +691,7 @@ +@@ -584,7 +689,7 @@ init_local_config_with_workaround(char c return lconf; } while (0); @@ -384,7 +382,7 @@ $NetBSD: patch-media_libcubeb_src_cubeb__alsa.c,v 1.10 2015/05/14 15:30:54 bad E return NULL; } -@@ -596,9 +703,9 @@ +@@ -596,9 +701,9 @@ alsa_locked_pcm_open(snd_pcm_t ** pcm, s pthread_mutex_lock(&cubeb_alsa_mutex); if (local_config) { @@ -396,7 +394,7 @@ $NetBSD: patch-media_libcubeb_src_cubeb__alsa.c,v 1.10 2015/05/14 15:30:54 bad E } pthread_mutex_unlock(&cubeb_alsa_mutex); -@@ -611,7 +718,7 @@ +@@ -611,7 +716,7 @@ alsa_locked_pcm_close(snd_pcm_t * pcm) int r; pthread_mutex_lock(&cubeb_alsa_mutex); @@ -405,7 +403,7 @@ $NetBSD: patch-media_libcubeb_src_cubeb__alsa.c,v 1.10 2015/05/14 15:30:54 bad E pthread_mutex_unlock(&cubeb_alsa_mutex); return r; -@@ -668,12 +775,65 @@ +@@ -668,12 +773,65 @@ alsa_init(cubeb ** context, char const * pthread_attr_t attr; snd_pcm_t * dummy; @@ -472,7 +470,7 @@ $NetBSD: patch-media_libcubeb_src_cubeb__alsa.c,v 1.10 2015/05/14 15:30:54 bad E cubeb_alsa_error_handler_set = 1; } pthread_mutex_unlock(&cubeb_alsa_mutex); -@@ -681,6 +841,8 @@ +@@ -681,6 +839,8 @@ alsa_init(cubeb ** context, char const * ctx = calloc(1, sizeof(*ctx)); assert(ctx); @@ -481,7 +479,7 @@ $NetBSD: patch-media_libcubeb_src_cubeb__alsa.c,v 1.10 2015/05/14 15:30:54 bad E ctx->ops = &alsa_ops; r = pthread_mutex_init(&ctx->mutex, NULL); -@@ -730,7 +892,7 @@ +@@ -730,7 +890,7 @@ alsa_init(cubeb ** context, char const * config fails with EINVAL, the PA PCM is too old for this workaround. */ if (r == -EINVAL) { pthread_mutex_lock(&cubeb_alsa_mutex); @@ -490,7 +488,7 @@ $NetBSD: patch-media_libcubeb_src_cubeb__alsa.c,v 1.10 2015/05/14 15:30:54 bad E pthread_mutex_unlock(&cubeb_alsa_mutex); ctx->local_config = NULL; } else if (r >= 0) { -@@ -769,9 +931,13 @@ +@@ -769,9 +929,13 @@ alsa_destroy(cubeb * ctx) pthread_mutex_destroy(&ctx->mutex); free(ctx->fds); @@ -505,7 +503,7 @@ $NetBSD: patch-media_libcubeb_src_cubeb__alsa.c,v 1.10 2015/05/14 15:30:54 bad E pthread_mutex_unlock(&cubeb_alsa_mutex); } -@@ -839,7 +1005,7 @@ +@@ -839,7 +1003,7 @@ alsa_stream_init(cubeb * ctx, cubeb_stre return CUBEB_ERROR; } @@ -514,7 +512,7 @@ $NetBSD: patch-media_libcubeb_src_cubeb__alsa.c,v 1.10 2015/05/14 15:30:54 bad E assert(r == 0); /* Ugly hack: the PA ALSA plugin allows buffer configurations that can't -@@ -849,23 +1015,23 @@ +@@ -849,23 +1013,23 @@ alsa_stream_init(cubeb * ctx, cubeb_stre latency = latency < 500 ? 500 : latency; } @@ -544,7 +542,7 @@ $NetBSD: patch-media_libcubeb_src_cubeb__alsa.c,v 1.10 2015/05/14 15:30:54 bad E assert((nfds_t) r == stm->nfds); r = pthread_cond_init(&stm->cond, NULL); -@@ -896,7 +1062,7 @@ +@@ -896,7 +1060,7 @@ alsa_stream_destroy(cubeb_stream * stm) pthread_mutex_lock(&stm->mutex); if (stm->pcm) { if (stm->state == DRAINING) { @@ -553,7 +551,7 @@ $NetBSD: patch-media_libcubeb_src_cubeb__alsa.c,v 1.10 2015/05/14 15:30:54 bad E } alsa_locked_pcm_close(stm->pcm); stm->pcm = NULL; -@@ -906,7 +1072,10 @@ +@@ -906,7 +1070,10 @@ alsa_stream_destroy(cubeb_stream * stm) pthread_mutex_destroy(&stm->mutex); r = pthread_cond_destroy(&stm->cond); @@ -565,7 +563,7 @@ $NetBSD: patch-media_libcubeb_src_cubeb__alsa.c,v 1.10 2015/05/14 15:30:54 bad E alsa_unregister_stream(stm); -@@ -938,12 +1107,12 @@ +@@ -938,12 +1105,12 @@ alsa_get_max_channel_count(cubeb * ctx, return CUBEB_ERROR; } @@ -580,7 +578,7 @@ $NetBSD: patch-media_libcubeb_src_cubeb__alsa.c,v 1.10 2015/05/14 15:30:54 bad E if (r < 0) { return CUBEB_ERROR; } -@@ -963,34 +1132,34 @@ +@@ -963,34 +1130,34 @@ alsa_get_preferred_sample_rate(cubeb * c /* get a pcm, disabling resampling, so we get a rate the * hardware/dmix/pulse/etc. supports. */ @@ -623,7 +621,7 @@ $NetBSD: patch-media_libcubeb_src_cubeb__alsa.c,v 1.10 2015/05/14 15:30:54 bad E return CUBEB_OK; } -@@ -1014,7 +1183,7 @@ +@@ -1014,7 +1181,7 @@ alsa_stream_start(cubeb_stream * stm) ctx = stm->context; pthread_mutex_lock(&stm->mutex); @@ -632,7 +630,7 @@ $NetBSD: patch-media_libcubeb_src_cubeb__alsa.c,v 1.10 2015/05/14 15:30:54 bad E gettimeofday(&stm->last_activity, NULL); pthread_mutex_unlock(&stm->mutex); -@@ -1048,7 +1217,7 @@ +@@ -1048,7 +1215,7 @@ alsa_stream_stop(cubeb_stream * stm) pthread_mutex_unlock(&ctx->mutex); pthread_mutex_lock(&stm->mutex); @@ -641,7 +639,7 @@ $NetBSD: patch-media_libcubeb_src_cubeb__alsa.c,v 1.10 2015/05/14 15:30:54 bad E pthread_mutex_unlock(&stm->mutex); return CUBEB_OK; -@@ -1064,14 +1233,17 @@ +@@ -1064,14 +1231,17 @@ alsa_stream_get_position(cubeb_stream * pthread_mutex_lock(&stm->mutex); delay = -1; @@ -662,7 +660,7 @@ $NetBSD: patch-media_libcubeb_src_cubeb__alsa.c,v 1.10 2015/05/14 15:30:54 bad E *position = 0; if (stm->write_position >= (snd_pcm_uframes_t) delay) { -@@ -1090,7 +1262,7 @@ +@@ -1090,7 +1260,7 @@ alsa_stream_get_latency(cubeb_stream * s snd_pcm_sframes_t delay; /* This function returns the delay in frames until a frame written using snd_pcm_writei is sent to the DAC. The DAC delay should be < 1ms anyways. */ diff --git a/www/firefox/patches/patch-mfbt_Attributes.h b/www/firefox/patches/patch-mfbt_Attributes.h index 43eabd117d6..33278d4ca58 100644 --- a/www/firefox/patches/patch-mfbt_Attributes.h +++ b/www/firefox/patches/patch-mfbt_Attributes.h @@ -1,6 +1,6 @@ -$NetBSD: patch-mfbt_Attributes.h,v 1.4 2015/05/12 22:48:54 ryoon Exp $ +$NetBSD: patch-mfbt_Attributes.h,v 1.5 2015/07/03 10:25:40 ryoon Exp $ ---- mfbt/Attributes.h.orig 2015-05-04 00:43:30.000000000 +0000 +--- mfbt/Attributes.h.orig 2015-06-18 20:55:34.000000000 +0000 +++ mfbt/Attributes.h @@ -50,6 +50,7 @@ * don't indicate support for them here, due to @@ -20,13 +20,11 @@ $NetBSD: patch-mfbt_Attributes.h,v 1.4 2015/05/12 22:48:54 ryoon Exp $ # if __has_extension(cxx_constexpr) # define MOZ_HAVE_CXX11_CONSTEXPR # endif -@@ -84,6 +88,9 @@ - # endif - #elif defined(__GNUC__) +@@ -86,6 +90,7 @@ # if defined(__GXX_EXPERIMENTAL_CXX0X__) || __cplusplus >= 201103L -+# if MOZ_GCC_VERSION_AT_LEAST(4, 8, 0) + # define MOZ_HAVE_CXX11_CONSTEXPR + # if MOZ_GCC_VERSION_AT_LEAST(4, 8, 0) +# define MOZ_HAVE_CXX11_ALIGNAS -+# endif - # define MOZ_HAVE_CXX11_CONSTEXPR - # define MOZ_HAVE_EXPLICIT_CONVERSION - # endif + # define MOZ_HAVE_CXX11_CONSTEXPR_IN_TEMPLATES + # endif + # define MOZ_HAVE_EXPLICIT_CONVERSION diff --git a/www/firefox/patches/patch-toolkit_mozapps_extensions_internal_GMPProvider.jsm b/www/firefox/patches/patch-toolkit_mozapps_extensions_internal_GMPProvider.jsm index cda997fd077..bac06c158ed 100644 --- a/www/firefox/patches/patch-toolkit_mozapps_extensions_internal_GMPProvider.jsm +++ b/www/firefox/patches/patch-toolkit_mozapps_extensions_internal_GMPProvider.jsm @@ -1,8 +1,8 @@ -$NetBSD: patch-toolkit_mozapps_extensions_internal_GMPProvider.jsm,v 1.2 2015/05/12 22:48:54 ryoon Exp $ +$NetBSD: patch-toolkit_mozapps_extensions_internal_GMPProvider.jsm,v 1.3 2015/07/03 10:25:40 ryoon Exp $ ---- toolkit/mozapps/extensions/internal/GMPProvider.jsm.orig 2015-05-04 00:43:33.000000000 +0000 +--- toolkit/mozapps/extensions/internal/GMPProvider.jsm.orig 2015-06-18 20:55:37.000000000 +0000 +++ toolkit/mozapps/extensions/internal/GMPProvider.jsm -@@ -101,12 +101,11 @@ function GMPWrapper(aPluginInfo) { +@@ -112,12 +112,11 @@ function GMPWrapper(aPluginInfo) { Log.repository.getLoggerWithMessagePrefix("Toolkit.GMP", "GMPWrapper(" + this._plugin.id + ") "); @@ -18,7 +18,7 @@ $NetBSD: patch-toolkit_mozapps_extensions_internal_GMPProvider.jsm,v 1.2 2015/05 if (this._plugin.isEME) { Preferences.observe(GMPPrefs.KEY_EME_ENABLED, this.onPrefEMEGlobalEnabledChanged, this); -@@ -123,17 +122,14 @@ GMPWrapper.prototype = { +@@ -134,17 +133,14 @@ GMPWrapper.prototype = { optionsType: AddonManager.OPTIONS_TYPE_INLINE, get optionsURL() { return this._plugin.optionsURL; }, @@ -36,10 +36,10 @@ $NetBSD: patch-toolkit_mozapps_extensions_internal_GMPProvider.jsm,v 1.2 2015/05 return this._gmpPath; }, - - get id() { return this._plugin.id; }, - get type() { return "plugin"; }, - get isGMPlugin() { return true; }, -@@ -144,8 +140,13 @@ GMPWrapper.prototype = { + get missingKey() { + return this._plugin.missingKey; + }, +@@ -159,8 +155,13 @@ GMPWrapper.prototype = { get description() { return this._plugin.description; }, get fullDescription() { return this._plugin.fullDescription; }, @@ -55,7 +55,7 @@ $NetBSD: patch-toolkit_mozapps_extensions_internal_GMPProvider.jsm,v 1.2 2015/05 get isActive() { return !this.appDisabled && !this.userDisabled; }, get appDisabled() { -@@ -292,24 +293,17 @@ GMPWrapper.prototype = { +@@ -307,24 +308,17 @@ GMPWrapper.prototype = { get pluginMimeTypes() { return []; }, get pluginLibraries() { @@ -86,7 +86,7 @@ $NetBSD: patch-toolkit_mozapps_extensions_internal_GMPProvider.jsm,v 1.2 2015/05 }, _handleEnabledChanged: function() { -@@ -389,10 +383,10 @@ GMPWrapper.prototype = { +@@ -404,10 +398,10 @@ GMPWrapper.prototype = { } }, @@ -99,7 +99,7 @@ $NetBSD: patch-toolkit_mozapps_extensions_internal_GMPProvider.jsm,v 1.2 2015/05 this._gmpPath); gmpService.removeAndDeletePluginDirectory(this._gmpPath, true /* can defer */); } -@@ -401,15 +395,10 @@ GMPWrapper.prototype = { +@@ -416,15 +410,10 @@ GMPWrapper.prototype = { AddonManagerPrivate.callInstallListeners("onExternalInstall", null, this, null, false); AddonManagerPrivate.callAddonListeners("onInstalling", this, false); @@ -118,7 +118,7 @@ $NetBSD: patch-toolkit_mozapps_extensions_internal_GMPProvider.jsm,v 1.2 2015/05 this._gmpPath); gmpService.addPluginDirectory(this._gmpPath); } -@@ -431,9 +420,9 @@ GMPWrapper.prototype = { +@@ -446,9 +435,9 @@ GMPWrapper.prototype = { Preferences.ignore(GMPPrefs.getPrefKey(GMPPrefs.KEY_PLUGIN_ENABLED, this._plugin.id), this.onPrefEnabledChanged, this); diff --git a/www/firefox/patches/patch-widget_gtk_gtk2drawing.c b/www/firefox/patches/patch-widget_gtk_gtk2drawing.c deleted file mode 100644 index 1b339e7dca8..00000000000 --- a/www/firefox/patches/patch-widget_gtk_gtk2drawing.c +++ /dev/null @@ -1,22 +0,0 @@ -$NetBSD: patch-widget_gtk_gtk2drawing.c,v 1.3 2015/04/05 12:54:12 ryoon Exp $ - ---- widget/gtk/gtk2drawing.c.orig 2015-03-27 02:20:33.000000000 +0000 -+++ widget/gtk/gtk2drawing.c -@@ -831,7 +831,7 @@ moz_gtk_get_focus_outline_size(gint* foc - return MOZ_GTK_SUCCESS; - } - --gint -+static gint - moz_gtk_widget_get_focus(GtkWidget* widget, gboolean* interior_focus, - gint* focus_width, gint* focus_pad) - { -@@ -928,7 +928,7 @@ moz_gtk_splitter_get_metrics(gint orient - return MOZ_GTK_SUCCESS; - } - --gint -+static gint - moz_gtk_button_get_inner_border(GtkWidget* widget, GtkBorder* inner_border) - { - static const GtkBorder default_inner_border = { 1, 1, 1, 1 }; diff --git a/www/firefox/patches/patch-widget_gtk_gtk3drawing.c b/www/firefox/patches/patch-widget_gtk_gtk3drawing.c index 451b2368144..4436a3a9365 100644 --- a/www/firefox/patches/patch-widget_gtk_gtk3drawing.c +++ b/www/firefox/patches/patch-widget_gtk_gtk3drawing.c @@ -1,6 +1,6 @@ -$NetBSD: patch-widget_gtk_gtk3drawing.c,v 1.4 2015/05/12 22:48:54 ryoon Exp $ +$NetBSD: patch-widget_gtk_gtk3drawing.c,v 1.5 2015/07/03 10:25:40 ryoon Exp $ ---- widget/gtk/gtk3drawing.c.orig 2015-05-04 00:43:35.000000000 +0000 +--- widget/gtk/gtk3drawing.c.orig 2015-06-18 20:55:38.000000000 +0000 +++ widget/gtk/gtk3drawing.c @@ -65,6 +65,7 @@ static GtkWidget* gScrolledWindowWidget; static style_prop_t style_prop_func; @@ -25,296 +25,7 @@ $NetBSD: patch-widget_gtk_gtk3drawing.c,v 1.4 2015/05/12 22:48:54 ryoon Exp $ /* Add style property to GtkEntry. * Adding the style property to the normal GtkEntry class means that it * will work without issues inside GtkComboBox and for Spinbuttons. */ -@@ -762,37 +771,17 @@ moz_gtk_radio_get_metrics(gint* indicato - gint - moz_gtk_get_focus_outline_size(gint* focus_h_width, gint* focus_v_width) - { -- gboolean interior_focus; -- gint focus_width = 0; -+ GtkBorder border; -+ GtkBorder padding; -+ GtkStyleContext *style; - - ensure_entry_widget(); -- gtk_widget_style_get(gEntryWidget, -- "interior-focus", &interior_focus, -- "focus-line-width", &focus_width, -- NULL); -- if (interior_focus) { -- GtkBorder border; -- GtkStyleContext *style = gtk_widget_get_style_context(gEntryWidget); -- gtk_style_context_get_border(style, 0, &border); -- *focus_h_width = border.left + focus_width; -- *focus_v_width = border.top + focus_width; -- } else { -- *focus_h_width = focus_width; -- *focus_v_width = focus_width; -- } -- return MOZ_GTK_SUCCESS; --} -- --gint --moz_gtk_widget_get_focus(GtkWidget* widget, gboolean* interior_focus, -- gint* focus_width, gint* focus_pad) --{ -- gtk_widget_style_get (widget, -- "interior-focus", interior_focus, -- "focus-line-width", focus_width, -- "focus-padding", focus_pad, -- NULL); -+ style = gtk_widget_get_style_context(gEntryWidget); - -+ gtk_style_context_get_border(style, 0, &border); -+ gtk_style_context_get_padding(style, 0, &padding); -+ *focus_h_width = border.left + padding.left; -+ *focus_v_width = border.top + padding.top; - return MOZ_GTK_SUCCESS; - } - -@@ -880,24 +869,6 @@ moz_gtk_splitter_get_metrics(gint orient - return MOZ_GTK_SUCCESS; - } - --gint --moz_gtk_button_get_inner_border(GtkWidget* widget, GtkBorder* inner_border) --{ -- static const GtkBorder default_inner_border = { 1, 1, 1, 1 }; -- GtkBorder *tmp_border; -- -- gtk_widget_style_get (widget, "inner-border", &tmp_border, NULL); -- -- if (tmp_border) { -- *inner_border = *tmp_border; -- gtk_border_free(tmp_border); -- } -- else -- *inner_border = default_inner_border; -- -- return MOZ_GTK_SUCCESS; --} -- - static gint - moz_gtk_button_paint(cairo_t *cr, GdkRectangle* rect, - GtkWidgetState* state, -@@ -908,19 +879,8 @@ moz_gtk_button_paint(cairo_t *cr, GdkRec - GtkStyleContext* style = gtk_widget_get_style_context(widget); - gint x = rect->x, y=rect->y, width=rect->width, height=rect->height; - -- gboolean interior_focus; -- gint focus_width, focus_pad; -- -- moz_gtk_widget_get_focus(widget, &interior_focus, &focus_width, &focus_pad); - gtk_widget_set_direction(widget, direction); -- -- if (!interior_focus && state->focused) { -- x += focus_width + focus_pad; -- y += focus_width + focus_pad; -- width -= 2 * (focus_width + focus_pad); -- height -= 2 * (focus_width + focus_pad); -- } -- -+ - gtk_style_context_save(style); - gtk_style_context_set_state(style, state_flags); - -@@ -953,20 +913,12 @@ moz_gtk_button_paint(cairo_t *cr, GdkRec - } - - if (state->focused) { -- if (interior_focus) { -- GtkBorder border; -- gtk_style_context_get_border(style, state_flags, &border); -- x += border.left + focus_pad; -- y += border.top + focus_pad; -- width -= 2 * (border.left + focus_pad); -- height -= 2 * (border.top + focus_pad); -- } else { -- x -= focus_width + focus_pad; -- y -= focus_width + focus_pad; -- width += 2 * (focus_width + focus_pad); -- height += 2 * (focus_width + focus_pad); -- } -- -+ GtkBorder border; -+ gtk_style_context_get_border(style, state_flags, &border); -+ x += border.left; -+ y += border.top; -+ width -= (border.left + border.right); -+ height -= (border.top + border.bottom); - gtk_render_focus(style, cr, x, y, width, height); - } - gtk_style_context_restore(style); -@@ -1056,33 +1008,23 @@ calculate_button_inner_rect(GtkWidget* b - GtkTextDirection direction, - gboolean ignore_focus) - { -- GtkBorder inner_border; -- gboolean interior_focus; -- gint focus_width, focus_pad; - GtkStyleContext* style; - GtkBorder border; -+ GtkBorder padding = {0, 0, 0, 0}; - - style = gtk_widget_get_style_context(button); - - /* This mirrors gtkbutton's child positioning */ -- moz_gtk_button_get_inner_border(button, &inner_border); -- moz_gtk_widget_get_focus(button, &interior_focus, -- &focus_width, &focus_pad); -- -- if (ignore_focus) -- focus_width = focus_pad = 0; -- - gtk_style_context_get_border(style, 0, &border); -+ if (!ignore_focus) -+ gtk_style_context_get_padding(style, 0, &padding); - -- inner_rect->x = rect->x + border.left + focus_width + focus_pad; -- inner_rect->x += direction == GTK_TEXT_DIR_LTR ? -- inner_border.left : inner_border.right; -- inner_rect->y = rect->y + inner_border.top + border.top + -- focus_width + focus_pad; -- inner_rect->width = MAX(1, rect->width - inner_border.left - -- inner_border.right - (border.left + focus_pad + focus_width) * 2); -- inner_rect->height = MAX(1, rect->height - inner_border.top - -- inner_border.bottom - (border.top + focus_pad + focus_width) * 2); -+ inner_rect->x = rect->x + border.left + padding.left; -+ inner_rect->y = rect->y + padding.top + border.top; -+ inner_rect->width = MAX(1, rect->width - padding.left - -+ padding.right - border.left * 2); -+ inner_rect->height = MAX(1, rect->height - padding.top - -+ padding.bottom - border.top * 2); - - return MOZ_GTK_SUCCESS; - } -@@ -1230,6 +1172,7 @@ moz_gtk_scrollbar_thumb_paint(GtkThemeWi - GtkStyleContext* style; - GtkScrollbar *scrollbar; - GtkAdjustment *adj; -+ GtkBorder margin; - - ensure_scrollbar_widget(); - -@@ -1239,15 +1182,20 @@ moz_gtk_scrollbar_thumb_paint(GtkThemeWi - scrollbar = GTK_SCROLLBAR(gVertScrollbarWidget); - - gtk_widget_set_direction(GTK_WIDGET(scrollbar), direction); -- -+ - style = gtk_widget_get_style_context(GTK_WIDGET(scrollbar)); - gtk_style_context_save(style); -- -+ - gtk_style_context_add_class(style, GTK_STYLE_CLASS_SLIDER); - gtk_style_context_set_state(style, state_flags); - -- gtk_render_slider(style, cr, rect->x, rect->y, -- rect->width, rect->height, -+ gtk_style_context_get_margin (style, state_flags, &margin); -+ -+ gtk_render_slider(style, cr, -+ rect->x + margin.left, -+ rect->y + margin.top, -+ rect->width - margin.left - margin.right, -+ rect->height - margin.top - margin.bottom, - (widget == MOZ_GTK_SCROLLBAR_THUMB_HORIZONTAL) ? - GTK_ORIENTATION_HORIZONTAL : GTK_ORIENTATION_VERTICAL); - -@@ -1451,19 +1399,12 @@ moz_gtk_entry_paint(cairo_t *cr, GdkRect - { - gint x = rect->x, y = rect->y, width = rect->width, height = rect->height; - GtkStyleContext* style; -- gboolean interior_focus; -- gint focus_width; - int draw_focus_outline_only = state->depressed; // NS_THEME_FOCUS_OUTLINE - - gtk_widget_set_direction(widget, direction); - - style = gtk_widget_get_style_context(widget); - -- gtk_widget_style_get(widget, -- "interior-focus", &interior_focus, -- "focus-line-width", &focus_width, -- NULL); -- - if (draw_focus_outline_only) { - // Inflate the given 'rect' with the focus outline size. - gint h, v; -@@ -1495,14 +1436,6 @@ moz_gtk_entry_paint(cairo_t *cr, GdkRect - /* This will get us the lit borders that focused textboxes enjoy on - * some themes. */ - gtk_style_context_set_state(style, GTK_STATE_FLAG_FOCUSED); -- if (!interior_focus) { -- /* Indent the border a little bit if we have exterior focus -- (this is what GTK does to draw native entries) */ -- x += focus_width; -- y += focus_width; -- width -= 2 * focus_width; -- height -= 2 * focus_width; -- } - } - - if (state->disabled) { -@@ -1514,11 +1447,6 @@ moz_gtk_entry_paint(cairo_t *cr, GdkRect - } - gtk_render_frame(style, cr, x, y, width, height); - -- if (state->focused && !state->disabled) { -- if (!interior_focus) { -- gtk_render_focus(style, cr, rect->x, rect->y, rect->width, rect->height); -- } -- } - gtk_style_context_restore(style); - - return MOZ_GTK_SUCCESS; -@@ -1823,8 +1751,6 @@ moz_gtk_container_paint(cairo_t *cr, Gdk - GtkStateFlags state_flags = GetStateFlagsFromGtkWidgetState(state); - GtkStyleContext* style; - GtkWidget *widget; -- gboolean interior_focus; -- gint focus_width, focus_pad; - - if (isradio) { - ensure_radiobutton_widget(); -@@ -1837,7 +1763,6 @@ moz_gtk_container_paint(cairo_t *cr, Gdk - - style = gtk_widget_get_style_context(widget); - gtk_style_context_save(style); -- moz_gtk_widget_get_focus(widget, &interior_focus, &focus_width, &focus_pad); - gtk_style_context_set_state(style, state_flags); - - /* this is for drawing a prelight box */ -@@ -1846,10 +1771,6 @@ moz_gtk_container_paint(cairo_t *cr, Gdk - rect->x, rect->y, rect->width, rect->height); - } - -- if (state->focused && !interior_focus) { -- gtk_render_focus(style, cr, -- rect->x, rect->y, rect->width, rect->height); -- } - gtk_style_context_restore(style); - - return MOZ_GTK_SUCCESS; -@@ -1862,7 +1783,6 @@ moz_gtk_toggle_label_paint(cairo_t *cr, - { - GtkStyleContext *style; - GtkWidget *widget; -- gboolean interior_focus; - - if (!state->focused) - return MOZ_GTK_SUCCESS; -@@ -1883,10 +1803,6 @@ moz_gtk_toggle_label_paint(cairo_t *cr, - } - gtk_widget_set_direction(widget, direction); - -- gtk_widget_style_get(widget, "interior-focus", &interior_focus, NULL); -- if (!interior_focus) -- return MOZ_GTK_SUCCESS; -- - gtk_style_context_set_state(style, GetStateFlagsFromGtkWidgetState(state)); - gtk_render_focus(style, cr, - rect->x, rect->y, rect->width, rect->height); -@@ -2105,6 +2021,9 @@ moz_gtk_get_tab_thickness(void) +@@ -2012,6 +2021,9 @@ moz_gtk_get_tab_thickness(void) GtkStyleContext * style; ensure_tab_widget(); @@ -324,7 +35,7 @@ $NetBSD: patch-widget_gtk_gtk3drawing.c,v 1.4 2015/05/12 22:48:54 ryoon Exp $ style = gtk_widget_get_style_context(gTabWidget); gtk_style_context_add_class(style, GTK_STYLE_CLASS_NOTEBOOK); gtk_style_context_get_border(style, 0, &border); -@@ -2150,7 +2069,7 @@ moz_gtk_tab_paint(cairo_t *cr, GdkRectan +@@ -2057,7 +2069,7 @@ moz_gtk_tab_paint(cairo_t *cr, GdkRectan ensure_tab_widget(); gtk_widget_set_direction(gTabWidget, direction); @@ -333,7 +44,7 @@ $NetBSD: patch-widget_gtk_gtk3drawing.c,v 1.4 2015/05/12 22:48:54 ryoon Exp $ gtk_style_context_save(style); moz_gtk_tab_prepare_style_context(style, flags); -@@ -2167,143 +2086,155 @@ moz_gtk_tab_paint(cairo_t *cr, GdkRectan +@@ -2074,143 +2086,155 @@ moz_gtk_tab_paint(cairo_t *cr, GdkRectan focusRect = backRect = tabRect; @@ -612,195 +323,7 @@ $NetBSD: patch-widget_gtk_gtk3drawing.c,v 1.4 2015/05/12 22:48:54 ryoon Exp $ return MOZ_GTK_SUCCESS; } -@@ -2684,26 +2615,18 @@ moz_gtk_get_widget_border(GtkThemeWidget - switch (widget) { - case MOZ_GTK_BUTTON: - { -- GtkBorder inner_border; -- gboolean interior_focus; -- gint focus_width, focus_pad; -- - ensure_button_widget(); -+ style = gtk_widget_get_style_context(gButtonWidget); -+ - *left = *top = *right = *bottom = gtk_container_get_border_width(GTK_CONTAINER(gButtonWidget)); - - /* Don't add this padding in HTML, otherwise the buttons will - become too big and stuff the layout. */ - if (!inhtml) { -- moz_gtk_widget_get_focus(gButtonWidget, &interior_focus, &focus_width, &focus_pad); -- moz_gtk_button_get_inner_border(gButtonWidget, &inner_border); -- *left += focus_width + focus_pad + inner_border.left; -- *right += focus_width + focus_pad + inner_border.right; -- *top += focus_width + focus_pad + inner_border.top; -- *bottom += focus_width + focus_pad + inner_border.bottom; -+ moz_gtk_add_style_padding(style, left, top, right, bottom); - } - -- moz_gtk_add_style_border(gtk_widget_get_style_context(gButtonWidget), -- left, top, right, bottom); -+ moz_gtk_add_style_border(style, left, top, right, bottom); - return MOZ_GTK_SUCCESS; - } - case MOZ_GTK_ENTRY: -@@ -2711,7 +2634,13 @@ moz_gtk_get_widget_border(GtkThemeWidget - ensure_entry_widget(); - style = gtk_widget_get_style_context(gEntryWidget); - moz_gtk_add_style_border(style, left, top, right, bottom); -- moz_gtk_add_style_padding(style, left, top, right, bottom); -+ -+ /* Use the document padding in HTML -+ and GTK style padding in XUL. */ -+ if (!inhtml) { -+ moz_gtk_add_style_padding(style, left, top, right, bottom); -+ } -+ - return MOZ_GTK_SUCCESS; - } - case MOZ_GTK_TREEVIEW: -@@ -2731,23 +2660,15 @@ moz_gtk_get_widget_border(GtkThemeWidget - * assigned. - * That is why the following code is the same as for MOZ_GTK_BUTTON. - * */ -- -- GtkBorder inner_border; -- gboolean interior_focus; -- gint focus_width, focus_pad; -+ GtkStyleContext *style; - - ensure_tree_header_cell_widget(); - *left = *top = *right = *bottom = gtk_container_get_border_width(GTK_CONTAINER(gTreeHeaderCellWidget)); - -- moz_gtk_widget_get_focus(gTreeHeaderCellWidget, &interior_focus, &focus_width, &focus_pad); -- moz_gtk_button_get_inner_border(gTreeHeaderCellWidget, &inner_border); -- *left += focus_width + focus_pad + inner_border.left; -- *right += focus_width + focus_pad + inner_border.right; -- *top += focus_width + focus_pad + inner_border.top; -- *bottom += focus_width + focus_pad + inner_border.bottom; -- -- moz_gtk_add_style_border(gtk_widget_get_style_context(gTreeHeaderCellWidget), -- left, top, right, bottom); -+ style = gtk_widget_get_style_context(gTreeHeaderCellWidget); -+ -+ moz_gtk_add_style_border(style, left, top, right, bottom); -+ moz_gtk_add_style_padding(style, left, top, right, bottom); - return MOZ_GTK_SUCCESS; - } - case MOZ_GTK_TREE_HEADER_SORTARROW: -@@ -2767,29 +2688,23 @@ moz_gtk_get_widget_border(GtkThemeWidget - /* We need to account for the arrow on the dropdown, so text - * doesn't come too close to the arrow, or in some cases spill - * into the arrow. */ -- gboolean ignored_interior_focus, wide_separators; -- gint focus_width, focus_pad, separator_width; -+ gboolean wide_separators; -+ gint separator_width; - GtkRequisition arrow_req; - GtkBorder border; - - ensure_combo_box_widgets(); - -- *left = gtk_container_get_border_width(GTK_CONTAINER(gComboBoxButtonWidget)); -+ *left = *top = *right = *bottom = -+ gtk_container_get_border_width(GTK_CONTAINER(gComboBoxButtonWidget)); -+ -+ style = gtk_widget_get_style_context(gComboBoxButtonWidget); - - if (!inhtml) { -- moz_gtk_widget_get_focus(gComboBoxButtonWidget, -- &ignored_interior_focus, -- &focus_width, &focus_pad); -- *left += focus_width + focus_pad; -+ moz_gtk_add_style_padding(style, left, top, right, bottom); - } - -- style = gtk_widget_get_style_context(gComboBoxButtonWidget); -- gtk_style_context_get_border(style, 0, &border); -- -- *top = *left + border.top; -- *left += border.left; -- -- *right = *left; *bottom = *top; -+ moz_gtk_add_style_border(style, left, top, right, bottom); - - /* If there is no separator, don't try to count its width. */ - separator_width = 0; -@@ -2841,60 +2756,23 @@ moz_gtk_get_widget_border(GtkThemeWidget - ensure_frame_widget(); - w = gFrameWidget; - break; -- case MOZ_GTK_CHECKBUTTON_LABEL: -- case MOZ_GTK_RADIOBUTTON_LABEL: -- { -- gboolean interior_focus; -- gint focus_width, focus_pad; -- -- /* If the focus is interior, then the label has a border of -- (focus_width + focus_pad). */ -- if (widget == MOZ_GTK_CHECKBUTTON_LABEL) { -- ensure_checkbox_widget(); -- moz_gtk_widget_get_focus(gCheckboxWidget, &interior_focus, -- &focus_width, &focus_pad); -- } -- else { -- ensure_radiobutton_widget(); -- moz_gtk_widget_get_focus(gRadiobuttonWidget, &interior_focus, -- &focus_width, &focus_pad); -- } -- -- if (interior_focus) -- *left = *top = *right = *bottom = (focus_width + focus_pad); -- -- return MOZ_GTK_SUCCESS; -- } -- - case MOZ_GTK_CHECKBUTTON_CONTAINER: - case MOZ_GTK_RADIOBUTTON_CONTAINER: - { -- gboolean interior_focus; -- gint focus_width, focus_pad; -- -- /* If the focus is _not_ interior, then the container has a border -- of (focus_width + focus_pad). */ - if (widget == MOZ_GTK_CHECKBUTTON_CONTAINER) { - ensure_checkbox_widget(); -- moz_gtk_widget_get_focus(gCheckboxWidget, &interior_focus, -- &focus_width, &focus_pad); - w = gCheckboxWidget; - } else { - ensure_radiobutton_widget(); -- moz_gtk_widget_get_focus(gRadiobuttonWidget, &interior_focus, -- &focus_width, &focus_pad); - w = gRadiobuttonWidget; - } -+ style = gtk_widget_get_style_context(w); - - *left = *top = *right = *bottom = gtk_container_get_border_width(GTK_CONTAINER(w)); -- -- if (!interior_focus) { -- *left += (focus_width + focus_pad); -- *right += (focus_width + focus_pad); -- *top += (focus_width + focus_pad); -- *bottom += (focus_width + focus_pad); -- } -- -+ moz_gtk_add_style_border(style, -+ left, top, right, bottom); -+ moz_gtk_add_style_padding(style, -+ left, top, right, bottom); - return MOZ_GTK_SUCCESS; - } - case MOZ_GTK_MENUPOPUP: -@@ -2921,6 +2799,8 @@ moz_gtk_get_widget_border(GtkThemeWidget - return MOZ_GTK_SUCCESS; - } - /* These widgets have no borders, since they are not containers. */ -+ case MOZ_GTK_CHECKBUTTON_LABEL: -+ case MOZ_GTK_RADIOBUTTON_LABEL: - case MOZ_GTK_SPLITTER_HORIZONTAL: - case MOZ_GTK_SPLITTER_VERTICAL: - case MOZ_GTK_CHECKBUTTON: -@@ -2975,11 +2855,7 @@ moz_gtk_get_tab_border(gint* left, gint* +@@ -2831,11 +2855,7 @@ moz_gtk_get_tab_border(gint* left, gint* gtk_style_context_save(style); moz_gtk_tab_prepare_style_context(style, flags); @@ -812,7 +335,7 @@ $NetBSD: patch-widget_gtk_gtk3drawing.c,v 1.4 2015/05/12 22:48:54 ryoon Exp $ moz_gtk_add_style_padding(style, left, top, right, bottom); gtk_widget_style_get (gTabWidget, "tab-curvature", &tab_curvature, NULL); -@@ -2990,16 +2866,9 @@ moz_gtk_get_tab_border(gint* left, gint* +@@ -2846,16 +2866,9 @@ moz_gtk_get_tab_border(gint* left, gint* int initial_gap; gtk_widget_style_get (gTabWidget, "initial-gap", &initial_gap, NULL); if (direction == GTK_TEXT_DIR_RTL) diff --git a/www/firefox/patches/patch-widget_gtk_gtkdrawing.h b/www/firefox/patches/patch-widget_gtk_gtkdrawing.h deleted file mode 100644 index fe0b7acba6c..00000000000 --- a/www/firefox/patches/patch-widget_gtk_gtkdrawing.h +++ /dev/null @@ -1,41 +0,0 @@ -$NetBSD: patch-widget_gtk_gtkdrawing.h,v 1.3 2015/04/05 12:54:12 ryoon Exp $ - ---- widget/gtk/gtkdrawing.h.orig 2015-03-27 02:20:33.000000000 +0000 -+++ widget/gtk/gtkdrawing.h -@@ -293,16 +293,6 @@ moz_gtk_checkbox_get_metrics(gint* indic - gint - moz_gtk_radio_get_metrics(gint* indicator_size, gint* indicator_spacing); - --/** -- * Get the inner-border value for a GtkButton widget (button or tree header) -- * widget: [IN] the widget to get the border value for -- * inner_border: [OUT] the inner border -- * -- * returns: MOZ_GTK_SUCCESS if there was no error, an error code otherwise -- */ --gint --moz_gtk_button_get_inner_border(GtkWidget* widget, GtkBorder* inner_border); -- - /** Get the extra size for the focus ring for outline:auto. - * widget: [IN] the widget to get the focus metrics for - * focus_h_width: [OUT] the horizontal width -@@ -313,19 +303,6 @@ moz_gtk_button_get_inner_border(GtkWidge - gint - moz_gtk_get_focus_outline_size(gint* focus_h_width, gint* focus_v_width); - --/** Get the focus metrics for a treeheadercell, button, checkbox, or radio button. -- * widget: [IN] the widget to get the focus metrics for -- * interior_focus: [OUT] whether the focus is drawn around the -- * label (TRUE) or around the whole container (FALSE) -- * focus_width: [OUT] the width of the focus line -- * focus_pad: [OUT] the padding between the focus line and children -- * -- * returns: MOZ_GTK_SUCCESS if there was no error, an error code otherwise -- */ --gint --moz_gtk_widget_get_focus(GtkWidget* widget, gboolean* interior_focus, -- gint* focus_width, gint* focus_pad); -- - /** Get the horizontal padding for the menuitem widget or checkmenuitem widget. - * horizontal_padding: [OUT] The left and right padding of the menuitem or checkmenuitem - * diff --git a/www/firefox/patches/patch-widget_gtk_nsNativeThemeGTK.cpp b/www/firefox/patches/patch-widget_gtk_nsNativeThemeGTK.cpp index 90a061aa59b..9be36629b18 100644 --- a/www/firefox/patches/patch-widget_gtk_nsNativeThemeGTK.cpp +++ b/www/firefox/patches/patch-widget_gtk_nsNativeThemeGTK.cpp @@ -1,6 +1,6 @@ -$NetBSD: patch-widget_gtk_nsNativeThemeGTK.cpp,v 1.4 2015/05/12 22:48:54 ryoon Exp $ +$NetBSD: patch-widget_gtk_nsNativeThemeGTK.cpp,v 1.5 2015/07/03 10:25:40 ryoon Exp $ ---- widget/gtk/nsNativeThemeGTK.cpp.orig 2015-05-04 00:43:35.000000000 +0000 +--- widget/gtk/nsNativeThemeGTK.cpp.orig 2015-06-18 20:55:38.000000000 +0000 +++ widget/gtk/nsNativeThemeGTK.cpp @@ -761,6 +761,8 @@ nsNativeThemeGTK::GetExtraSizeForWidget( return false; @@ -11,20 +11,3 @@ $NetBSD: patch-widget_gtk_nsNativeThemeGTK.cpp,v 1.4 2015/05/12 22:48:54 ryoon E int32_t extra = gap_height - GetTabMarginPixels(aFrame); if (extra <= 0) -@@ -1528,9 +1530,15 @@ nsNativeThemeGTK::GetWidgetTransparency( - case NS_THEME_MENUPOPUP: - case NS_THEME_WINDOW: - case NS_THEME_DIALOG: -- // Tooltips use gtk_paint_flat_box(). -+ return eOpaque; -+ // Tooltips use gtk_paint_flat_box() on Gtk2 -+ // but are shaped on Gtk3 - case NS_THEME_TOOLTIP: -+#if (MOZ_WIDGET_GTK == 2) - return eOpaque; -+#else -+ return eTransparent; -+#endif - } - - return eUnknownTransparency; |