Import of pkgsrc-2015Q3
This commit is contained in:
@@ -1,9 +1,8 @@
|
||||
# $NetBSD: Makefile,v 1.131 2015/05/14 15:28:04 bad Exp $
|
||||
# $NetBSD: Makefile,v 1.134 2015/09/21 05:03:45 ryoon Exp $
|
||||
|
||||
DISTNAME= # empty
|
||||
PKGNAME= seamonkey-${SM_VER:S/b/beta/}
|
||||
PKGREVISION= 3
|
||||
SM_VER= 2.33.1
|
||||
SM_VER= 2.35
|
||||
#LIGHTNINGVER= 1.9
|
||||
CATEGORIES= www
|
||||
MASTER_SITES= ${MASTER_SITE_MOZILLA:=seamonkey/releases/${SM_VER}/source/}
|
||||
@@ -23,7 +22,7 @@ PLIST_SRC+= ${PLIST_SRC_DFLT}
|
||||
USE_LANGUAGES+= c c++
|
||||
USE_TOOLS+= unzip pax
|
||||
|
||||
.include "../../www/firefox/mozilla-common.mk"
|
||||
.include "../../www/firefox38/mozilla-common.mk"
|
||||
.include "options.mk"
|
||||
|
||||
# Workaround to fix pixman.h detection
|
||||
|
||||
+90
-20
@@ -1,4 +1,4 @@
|
||||
@comment $NetBSD: PLIST,v 1.50 2015/03/17 19:50:42 ryoon Exp $
|
||||
@comment $NetBSD: PLIST,v 1.52 2015/09/21 05:03:45 ryoon Exp $
|
||||
bin/seamonkey
|
||||
lib/seamonkey/application.ini
|
||||
lib/seamonkey/blocklist.xml
|
||||
@@ -381,6 +381,7 @@ lib/seamonkey/chrome/comm/content/branding/messenger-start-hdr.png
|
||||
lib/seamonkey/chrome/comm/content/communicator/about.js
|
||||
lib/seamonkey/chrome/comm/content/communicator/about.xhtml
|
||||
lib/seamonkey/chrome/comm/content/communicator/aboutLife.xhtml
|
||||
lib/seamonkey/chrome/comm/content/communicator/aboutPrivateBrowsing.css
|
||||
lib/seamonkey/chrome/comm/content/communicator/aboutPrivateBrowsing.js
|
||||
lib/seamonkey/chrome/comm/content/communicator/aboutPrivateBrowsing.xul
|
||||
lib/seamonkey/chrome/comm/content/communicator/aboutSessionRestore.js
|
||||
@@ -457,7 +458,6 @@ lib/seamonkey/chrome/comm/content/communicator/history/places.css
|
||||
lib/seamonkey/chrome/comm/content/communicator/history/placesOverlay.xul
|
||||
lib/seamonkey/chrome/comm/content/communicator/history/tree.xml
|
||||
lib/seamonkey/chrome/comm/content/communicator/history/treeView.js
|
||||
lib/seamonkey/chrome/comm/content/communicator/history/utils.js
|
||||
lib/seamonkey/chrome/comm/content/communicator/labelsencodings.properties
|
||||
lib/seamonkey/chrome/comm/content/communicator/license.html
|
||||
lib/seamonkey/chrome/comm/content/communicator/migration/migration.js
|
||||
@@ -950,7 +950,6 @@ lib/seamonkey/chrome/en-US/locale/en-US/communicator/help/using_certs_help.xhtml
|
||||
lib/seamonkey/chrome/en-US/locale/en-US/communicator/help/using_priv_help.xhtml
|
||||
lib/seamonkey/chrome/en-US/locale/en-US/communicator/help/welcome_help.xhtml
|
||||
lib/seamonkey/chrome/en-US/locale/en-US/communicator/history/history.dtd
|
||||
lib/seamonkey/chrome/en-US/locale/en-US/communicator/history/places.properties
|
||||
lib/seamonkey/chrome/en-US/locale/en-US/communicator/migration/migration.dtd
|
||||
lib/seamonkey/chrome/en-US/locale/en-US/communicator/migration/migration.properties
|
||||
lib/seamonkey/chrome/en-US/locale/en-US/communicator/notification.dtd
|
||||
@@ -1096,6 +1095,7 @@ lib/seamonkey/chrome/en-US/locale/en-US/global/AccessFu.properties
|
||||
lib/seamonkey/chrome/en-US/locale/en-US/global/about.dtd
|
||||
lib/seamonkey/chrome/en-US/locale/en-US/global/aboutAbout.dtd
|
||||
lib/seamonkey/chrome/en-US/locale/en-US/global/aboutNetworking.dtd
|
||||
lib/seamonkey/chrome/en-US/locale/en-US/global/aboutReader.properties
|
||||
lib/seamonkey/chrome/en-US/locale/en-US/global/aboutRights.dtd
|
||||
lib/seamonkey/chrome/en-US/locale/en-US/global/aboutSupport.dtd
|
||||
lib/seamonkey/chrome/en-US/locale/en-US/global/aboutSupport.properties
|
||||
@@ -1130,6 +1130,7 @@ lib/seamonkey/chrome/en-US/locale/en-US/global/dialog.properties
|
||||
lib/seamonkey/chrome/en-US/locale/en-US/global/dialogOverlay.dtd
|
||||
lib/seamonkey/chrome/en-US/locale/en-US/global/dom/dom.properties
|
||||
lib/seamonkey/chrome/en-US/locale/en-US/global/editMenuOverlay.dtd
|
||||
lib/seamonkey/chrome/en-US/locale/en-US/global/fallbackMenubar.properties
|
||||
lib/seamonkey/chrome/en-US/locale/en-US/global/filefield.properties
|
||||
lib/seamonkey/chrome/en-US/locale/en-US/global/filepicker.dtd
|
||||
lib/seamonkey/chrome/en-US/locale/en-US/global/filepicker.properties
|
||||
@@ -1372,7 +1373,6 @@ lib/seamonkey/chrome/en-US/locale/en-US/passwordmgr/passwordManager.dtd
|
||||
lib/seamonkey/chrome/en-US/locale/en-US/passwordmgr/passwordmgr.properties
|
||||
lib/seamonkey/chrome/en-US/locale/en-US/pipnss/nsserrors.properties
|
||||
lib/seamonkey/chrome/en-US/locale/en-US/pipnss/pipnss.properties
|
||||
lib/seamonkey/chrome/en-US/locale/en-US/pipnss/security.properties
|
||||
lib/seamonkey/chrome/en-US/locale/en-US/pippki/certManager.dtd
|
||||
lib/seamonkey/chrome/en-US/locale/en-US/pippki/deviceManager.dtd
|
||||
lib/seamonkey/chrome/en-US/locale/en-US/pippki/pippki.dtd
|
||||
@@ -1704,7 +1704,6 @@ lib/seamonkey/chrome/pippki/content/pippki/escrowWarn.js
|
||||
lib/seamonkey/chrome/pippki/content/pippki/escrowWarn.xul
|
||||
lib/seamonkey/chrome/pippki/content/pippki/exceptionDialog.js
|
||||
lib/seamonkey/chrome/pippki/content/pippki/exceptionDialog.xul
|
||||
lib/seamonkey/chrome/pippki/content/pippki/getp12password.xul
|
||||
lib/seamonkey/chrome/pippki/content/pippki/getpassword.xul
|
||||
lib/seamonkey/chrome/pippki/content/pippki/load_device.xul
|
||||
lib/seamonkey/chrome/pippki/content/pippki/password.js
|
||||
@@ -1735,9 +1734,8 @@ lib/seamonkey/chrome/toolkit/content/global/about.xhtml
|
||||
lib/seamonkey/chrome/toolkit/content/global/aboutAbout.js
|
||||
lib/seamonkey/chrome/toolkit/content/global/aboutAbout.xhtml
|
||||
lib/seamonkey/chrome/toolkit/content/global/aboutCache.js
|
||||
lib/seamonkey/chrome/toolkit/content/global/aboutCompartments.js
|
||||
lib/seamonkey/chrome/toolkit/content/global/aboutCompartments.xhtml
|
||||
lib/seamonkey/chrome/toolkit/content/global/aboutMedia.js
|
||||
lib/seamonkey/chrome/toolkit/content/global/aboutMedia.xhtml
|
||||
lib/seamonkey/chrome/toolkit/content/global/aboutMemory.css
|
||||
lib/seamonkey/chrome/toolkit/content/global/aboutMemory.js
|
||||
lib/seamonkey/chrome/toolkit/content/global/aboutMemory.xhtml
|
||||
@@ -1850,6 +1848,7 @@ lib/seamonkey/chrome/toolkit/content/global/nsUserSettings.js
|
||||
lib/seamonkey/chrome/toolkit/content/global/platformHTMLBindings.xml
|
||||
lib/seamonkey/chrome/toolkit/content/global/plugins.css
|
||||
lib/seamonkey/chrome/toolkit/content/global/plugins.html
|
||||
lib/seamonkey/chrome/toolkit/content/global/post-fork-preload.js
|
||||
lib/seamonkey/chrome/toolkit/content/global/preload.js
|
||||
lib/seamonkey/chrome/toolkit/content/global/printPageSetup.js
|
||||
lib/seamonkey/chrome/toolkit/content/global/printPageSetup.xul
|
||||
@@ -1863,6 +1862,8 @@ lib/seamonkey/chrome/toolkit/content/global/printdialog.js
|
||||
lib/seamonkey/chrome/toolkit/content/global/printdialog.xul
|
||||
lib/seamonkey/chrome/toolkit/content/global/printjoboptions.js
|
||||
lib/seamonkey/chrome/toolkit/content/global/printjoboptions.xul
|
||||
lib/seamonkey/chrome/toolkit/content/global/reader/aboutReader.html
|
||||
lib/seamonkey/chrome/toolkit/content/global/reader/aboutReader.js
|
||||
lib/seamonkey/chrome/toolkit/content/global/remote-test-ipc.js
|
||||
lib/seamonkey/chrome/toolkit/content/global/resetProfile.css
|
||||
lib/seamonkey/chrome/toolkit/content/global/resetProfile.js
|
||||
@@ -1915,11 +1916,11 @@ lib/seamonkey/chrome/toolkit/content/mozapps/extensions/extensions.css
|
||||
lib/seamonkey/chrome/toolkit/content/mozapps/extensions/extensions.js
|
||||
lib/seamonkey/chrome/toolkit/content/mozapps/extensions/extensions.xml
|
||||
lib/seamonkey/chrome/toolkit/content/mozapps/extensions/extensions.xul
|
||||
lib/seamonkey/chrome/toolkit/content/mozapps/extensions/gmpPrefs.xul
|
||||
lib/seamonkey/chrome/toolkit/content/mozapps/extensions/list.js
|
||||
lib/seamonkey/chrome/toolkit/content/mozapps/extensions/list.xul
|
||||
lib/seamonkey/chrome/toolkit/content/mozapps/extensions/newaddon.js
|
||||
lib/seamonkey/chrome/toolkit/content/mozapps/extensions/newaddon.xul
|
||||
lib/seamonkey/chrome/toolkit/content/mozapps/extensions/openH264Prefs.xul
|
||||
lib/seamonkey/chrome/toolkit/content/mozapps/extensions/pluginPrefs.xul
|
||||
lib/seamonkey/chrome/toolkit/content/mozapps/extensions/selectAddons.css
|
||||
lib/seamonkey/chrome/toolkit/content/mozapps/extensions/selectAddons.js
|
||||
@@ -1985,6 +1986,7 @@ lib/seamonkey/chrome/toolkit/skin/classic/global/about.css
|
||||
lib/seamonkey/chrome/toolkit/skin/classic/global/aboutCache.css
|
||||
lib/seamonkey/chrome/toolkit/skin/classic/global/aboutCacheEntry.css
|
||||
lib/seamonkey/chrome/toolkit/skin/classic/global/aboutMemory.css
|
||||
lib/seamonkey/chrome/toolkit/skin/classic/global/aboutReader.css
|
||||
lib/seamonkey/chrome/toolkit/skin/classic/global/aboutSupport.css
|
||||
lib/seamonkey/chrome/toolkit/skin/classic/global/alerts/alert.css
|
||||
lib/seamonkey/chrome/toolkit/skin/classic/global/alerts/notification-48.png
|
||||
@@ -2093,17 +2095,18 @@ lib/seamonkey/chrome/toolkit/skin/classic/global/icons/warning-16.png
|
||||
lib/seamonkey/chrome/toolkit/skin/classic/global/icons/warning-24.png
|
||||
lib/seamonkey/chrome/toolkit/skin/classic/global/icons/warning-64.png
|
||||
lib/seamonkey/chrome/toolkit/skin/classic/global/icons/warning-large.png
|
||||
lib/seamonkey/chrome/toolkit/skin/classic/global/icons/warning.svg
|
||||
lib/seamonkey/chrome/toolkit/skin/classic/global/icons/webapps-16.png
|
||||
lib/seamonkey/chrome/toolkit/skin/classic/global/icons/webapps-64.png
|
||||
lib/seamonkey/chrome/toolkit/skin/classic/global/icons/windowControls.png
|
||||
lib/seamonkey/chrome/toolkit/skin/classic/global/icons/wrap.png
|
||||
lib/seamonkey/chrome/toolkit/skin/classic/global/in-content/check.png
|
||||
lib/seamonkey/chrome/toolkit/skin/classic/global/in-content/check@2x.png
|
||||
lib/seamonkey/chrome/toolkit/skin/classic/global/in-content/check-partial.svg
|
||||
lib/seamonkey/chrome/toolkit/skin/classic/global/in-content/check.svg
|
||||
lib/seamonkey/chrome/toolkit/skin/classic/global/in-content/common.css
|
||||
lib/seamonkey/chrome/toolkit/skin/classic/global/in-content/dropdown.svg
|
||||
lib/seamonkey/chrome/toolkit/skin/classic/global/in-content/help-glyph.svg
|
||||
lib/seamonkey/chrome/toolkit/skin/classic/global/in-content/sorter.png
|
||||
lib/seamonkey/chrome/toolkit/skin/classic/global/in-content/sorter@2x.png
|
||||
lib/seamonkey/chrome/toolkit/skin/classic/global/in-content/info-pages.css
|
||||
lib/seamonkey/chrome/toolkit/skin/classic/global/in-content/radio.svg
|
||||
lib/seamonkey/chrome/toolkit/skin/classic/global/inContentUI.css
|
||||
lib/seamonkey/chrome/toolkit/skin/classic/global/inContentUI/background-texture.png
|
||||
lib/seamonkey/chrome/toolkit/skin/classic/global/linkTree.css
|
||||
@@ -2147,6 +2150,14 @@ lib/seamonkey/chrome/toolkit/skin/classic/global/progressmeter.css
|
||||
lib/seamonkey/chrome/toolkit/skin/classic/global/radio.css
|
||||
lib/seamonkey/chrome/toolkit/skin/classic/global/radio/radio-check-dis.gif
|
||||
lib/seamonkey/chrome/toolkit/skin/classic/global/radio/radio-check.gif
|
||||
lib/seamonkey/chrome/toolkit/skin/classic/global/reader/RM-Add-24x24.svg
|
||||
lib/seamonkey/chrome/toolkit/skin/classic/global/reader/RM-Close-24x24.svg
|
||||
lib/seamonkey/chrome/toolkit/skin/classic/global/reader/RM-Delete-24x24.svg
|
||||
lib/seamonkey/chrome/toolkit/skin/classic/global/reader/RM-Minus-24x24.svg
|
||||
lib/seamonkey/chrome/toolkit/skin/classic/global/reader/RM-Plus-24x24.svg
|
||||
lib/seamonkey/chrome/toolkit/skin/classic/global/reader/RM-Reading-List-24x24.svg
|
||||
lib/seamonkey/chrome/toolkit/skin/classic/global/reader/RM-Type-Controls-24x24.svg
|
||||
lib/seamonkey/chrome/toolkit/skin/classic/global/reader/RM-Type-Controls-Arrow.svg
|
||||
lib/seamonkey/chrome/toolkit/skin/classic/global/resizer.css
|
||||
lib/seamonkey/chrome/toolkit/skin/classic/global/richlistbox.css
|
||||
lib/seamonkey/chrome/toolkit/skin/classic/global/scale.css
|
||||
@@ -2228,7 +2239,7 @@ lib/seamonkey/chrome/toolkit/skin/classic/mozapps/extensions/stripes-warning.png
|
||||
lib/seamonkey/chrome/toolkit/skin/classic/mozapps/extensions/themeGeneric-16.png
|
||||
lib/seamonkey/chrome/toolkit/skin/classic/mozapps/extensions/themeGeneric.png
|
||||
lib/seamonkey/chrome/toolkit/skin/classic/mozapps/extensions/update.css
|
||||
lib/seamonkey/chrome/toolkit/skin/classic/mozapps/extensions/utilities.png
|
||||
lib/seamonkey/chrome/toolkit/skin/classic/mozapps/extensions/utilities.svg
|
||||
lib/seamonkey/chrome/toolkit/skin/classic/mozapps/formautofill/requestAutocomplete.css
|
||||
lib/seamonkey/chrome/toolkit/skin/classic/mozapps/handling/handling.css
|
||||
lib/seamonkey/chrome/toolkit/skin/classic/mozapps/passwordmgr/key-16.png
|
||||
@@ -2261,6 +2272,7 @@ lib/seamonkey/chrome/toolkit/skin/classic/mozapps/xpinstall/xpinstallItemGeneric
|
||||
lib/seamonkey/components/AlarmsManager.js
|
||||
lib/seamonkey/components/AppsService.js
|
||||
lib/seamonkey/components/BrowserElementParent.js
|
||||
lib/seamonkey/components/ChromeNotifications.js
|
||||
lib/seamonkey/components/ColorAnalyzer.js
|
||||
lib/seamonkey/components/ConsoleAPIStorage.js
|
||||
lib/seamonkey/components/ContactManager.js
|
||||
@@ -2271,12 +2283,15 @@ lib/seamonkey/components/FeedConverter.js
|
||||
lib/seamonkey/components/FeedProcessor.js
|
||||
lib/seamonkey/components/FeedWriter.js
|
||||
lib/seamonkey/components/FormAutofillContentService.js
|
||||
lib/seamonkey/components/FormAutofillStartup.js
|
||||
lib/seamonkey/components/FormHistoryStartup.js
|
||||
lib/seamonkey/components/MainProcessSingleton.js
|
||||
lib/seamonkey/components/NetworkGeolocationProvider.js
|
||||
lib/seamonkey/components/NotificationStorage.js
|
||||
lib/seamonkey/components/PermissionSettings.js
|
||||
lib/seamonkey/components/PhoneNumberService.js
|
||||
lib/seamonkey/components/PlacesCategoriesStarter.js
|
||||
lib/seamonkey/components/PresentationDeviceInfoManager.js
|
||||
lib/seamonkey/components/SettingsManager.js
|
||||
lib/seamonkey/components/SiteSpecificUserAgent.js
|
||||
lib/seamonkey/components/SlowScriptDebug.js
|
||||
@@ -2297,6 +2312,7 @@ lib/seamonkey/components/contentAreaDropListener.js
|
||||
lib/seamonkey/components/crypto-SDR.js
|
||||
lib/seamonkey/components/folderLookupService.js
|
||||
lib/seamonkey/components/glautocomp.js
|
||||
lib/seamonkey/components/htmlMenuBuilder.js
|
||||
lib/seamonkey/components/interfaces.xpt
|
||||
lib/seamonkey/components/jsconsole-clhandler.js
|
||||
lib/seamonkey/components/jsmimeemitter.js
|
||||
@@ -2306,6 +2322,7 @@ lib/seamonkey/components/mdn-service.js
|
||||
lib/seamonkey/components/messageWakeupService.js
|
||||
lib/seamonkey/components/mimeJSComponents.js
|
||||
lib/seamonkey/components/msgAsyncPrompter.js
|
||||
lib/seamonkey/components/msgOAuth2Module.js
|
||||
lib/seamonkey/components/newMailNotificationService.js
|
||||
lib/seamonkey/components/newsblog.js
|
||||
lib/seamonkey/components/nsAbAutoCompleteMyDomain.js
|
||||
@@ -2320,6 +2337,7 @@ lib/seamonkey/components/nsContentDispatchChooser.js
|
||||
lib/seamonkey/components/nsContentPrefService.js
|
||||
lib/seamonkey/components/nsDOMIdentity.js
|
||||
lib/seamonkey/components/nsDefaultCLH.js
|
||||
lib/seamonkey/components/nsDownloadsStartup.js
|
||||
lib/seamonkey/components/nsFilePicker.js
|
||||
lib/seamonkey/components/nsFormAutoComplete.js
|
||||
lib/seamonkey/components/nsFormHistory.js
|
||||
@@ -2365,6 +2383,7 @@ lib/seamonkey/components/txEXSLTRegExFunctions.js
|
||||
lib/seamonkey/defaults/autoconfig/platform.js
|
||||
lib/seamonkey/defaults/autoconfig/prefcalls.js
|
||||
lib/seamonkey/defaults/messenger/mailViews.dat
|
||||
lib/seamonkey/defaults/permissions
|
||||
lib/seamonkey/defaults/pref/browser-prefs.js
|
||||
lib/seamonkey/defaults/pref/channel-prefs.js
|
||||
lib/seamonkey/defaults/pref/composer.js
|
||||
@@ -3100,6 +3119,7 @@ lib/seamonkey/libmozjs.so
|
||||
lib/seamonkey/libprldap60.so
|
||||
lib/seamonkey/libxul.so
|
||||
lib/seamonkey/license.txt
|
||||
lib/seamonkey/modules/AboutReader.jsm
|
||||
lib/seamonkey/modules/ActivitiesService.jsm
|
||||
lib/seamonkey/modules/ActivitiesServiceFilter.jsm
|
||||
lib/seamonkey/modules/AddonManager.jsm
|
||||
@@ -3122,6 +3142,14 @@ lib/seamonkey/modules/BrowserUtils.jsm
|
||||
lib/seamonkey/modules/CertUtils.jsm
|
||||
lib/seamonkey/modules/CharsetMenu.jsm
|
||||
lib/seamonkey/modules/ChromeManifestParser.jsm
|
||||
lib/seamonkey/modules/CloudSync.jsm
|
||||
lib/seamonkey/modules/CloudSyncAdapters.jsm
|
||||
lib/seamonkey/modules/CloudSyncBookmarks.jsm
|
||||
lib/seamonkey/modules/CloudSyncBookmarksFolderCache.jsm
|
||||
lib/seamonkey/modules/CloudSyncEventSource.jsm
|
||||
lib/seamonkey/modules/CloudSyncLocal.jsm
|
||||
lib/seamonkey/modules/CloudSyncPlacesWrapper.jsm
|
||||
lib/seamonkey/modules/CloudSyncTabs.jsm
|
||||
lib/seamonkey/modules/ClusterLib.js
|
||||
lib/seamonkey/modules/ColorAnalyzer_worker.js
|
||||
lib/seamonkey/modules/ColorConversion.js
|
||||
@@ -3171,8 +3199,10 @@ lib/seamonkey/modules/FxAccounts.jsm
|
||||
lib/seamonkey/modules/FxAccountsClient.jsm
|
||||
lib/seamonkey/modules/FxAccountsCommon.js
|
||||
lib/seamonkey/modules/FxAccountsOAuthClient.jsm
|
||||
lib/seamonkey/modules/FxAccountsOAuthGrantClient.jsm
|
||||
lib/seamonkey/modules/FxAccountsProfileClient.jsm
|
||||
lib/seamonkey/modules/GMPInstallManager.jsm
|
||||
lib/seamonkey/modules/GMPUtils.jsm
|
||||
lib/seamonkey/modules/Geometry.jsm
|
||||
lib/seamonkey/modules/History.jsm
|
||||
lib/seamonkey/modules/Http.jsm
|
||||
@@ -3186,6 +3216,7 @@ lib/seamonkey/modules/InsecurePasswordUtils.jsm
|
||||
lib/seamonkey/modules/InterAppCommService.jsm
|
||||
lib/seamonkey/modules/JXON.js
|
||||
lib/seamonkey/modules/Keyboard.jsm
|
||||
lib/seamonkey/modules/Langpacks.jsm
|
||||
lib/seamonkey/modules/LightweightThemeConsumer.jsm
|
||||
lib/seamonkey/modules/LightweightThemeManager.jsm
|
||||
lib/seamonkey/modules/LoadContextInfo.jsm
|
||||
@@ -3206,9 +3237,11 @@ lib/seamonkey/modules/NetUtil.jsm
|
||||
lib/seamonkey/modules/NewTabUtils.jsm
|
||||
lib/seamonkey/modules/NotificationDB.jsm
|
||||
lib/seamonkey/modules/OAuth2.jsm
|
||||
lib/seamonkey/modules/OAuth2Providers.jsm
|
||||
lib/seamonkey/modules/OfflineCacheInstaller.jsm
|
||||
lib/seamonkey/modules/OperatorApps.jsm
|
||||
lib/seamonkey/modules/PageMenu.jsm
|
||||
lib/seamonkey/modules/PageMetadata.jsm
|
||||
lib/seamonkey/modules/PageThumbUtils.jsm
|
||||
lib/seamonkey/modules/PageThumbs.jsm
|
||||
lib/seamonkey/modules/PageThumbsWorker.js
|
||||
@@ -3230,6 +3263,8 @@ lib/seamonkey/modules/PlacesUtils.jsm
|
||||
lib/seamonkey/modules/PluralForm.jsm
|
||||
lib/seamonkey/modules/PopupNotifications.jsm
|
||||
lib/seamonkey/modules/Preferences.jsm
|
||||
lib/seamonkey/modules/Prefetcher.jsm
|
||||
lib/seamonkey/modules/PresentationDeviceInfoManager.jsm
|
||||
lib/seamonkey/modules/PrivateBrowsingUtils.jsm
|
||||
lib/seamonkey/modules/Promise-backend.js
|
||||
lib/seamonkey/modules/Promise.jsm
|
||||
@@ -3237,6 +3272,7 @@ lib/seamonkey/modules/PromiseUtils.jsm
|
||||
lib/seamonkey/modules/PromiseWorker.jsm
|
||||
lib/seamonkey/modules/PropertyListUtils.jsm
|
||||
lib/seamonkey/modules/PushService.jsm
|
||||
lib/seamonkey/modules/ReaderMode.jsm
|
||||
lib/seamonkey/modules/RemoteAddonsChild.jsm
|
||||
lib/seamonkey/modules/RemoteAddonsParent.jsm
|
||||
lib/seamonkey/modules/RemoteController.jsm
|
||||
@@ -3245,6 +3281,9 @@ lib/seamonkey/modules/RemoteSecurityUI.jsm
|
||||
lib/seamonkey/modules/RemoteWebNavigation.jsm
|
||||
lib/seamonkey/modules/RemoteWebProgress.jsm
|
||||
lib/seamonkey/modules/RequestAutocompleteUI.jsm
|
||||
lib/seamonkey/modules/RequestSyncApp.jsm
|
||||
lib/seamonkey/modules/RequestSyncService.jsm
|
||||
lib/seamonkey/modules/RequestSyncTask.jsm
|
||||
lib/seamonkey/modules/ResetProfile.jsm
|
||||
lib/seamonkey/modules/ResourceStatsDB.jsm
|
||||
lib/seamonkey/modules/ResourceStatsService.jsm
|
||||
@@ -3274,6 +3313,7 @@ lib/seamonkey/modules/Task.jsm
|
||||
lib/seamonkey/modules/TelemetryFile.jsm
|
||||
lib/seamonkey/modules/TelemetryLog.jsm
|
||||
lib/seamonkey/modules/TelemetryPing.jsm
|
||||
lib/seamonkey/modules/TelemetrySession.jsm
|
||||
lib/seamonkey/modules/TelemetryStopwatch.jsm
|
||||
lib/seamonkey/modules/TelemetryTimestamps.jsm
|
||||
lib/seamonkey/modules/ThirdPartyCookieProbe.jsm
|
||||
@@ -3284,6 +3324,7 @@ lib/seamonkey/modules/UITelemetry.jsm
|
||||
lib/seamonkey/modules/UpdateChannel.jsm
|
||||
lib/seamonkey/modules/UserAgentOverrides.jsm
|
||||
lib/seamonkey/modules/UserAgentUpdates.jsm
|
||||
lib/seamonkey/modules/UserCustomizations.jsm
|
||||
lib/seamonkey/modules/WebChannel.jsm
|
||||
lib/seamonkey/modules/WebappOSUtils.jsm
|
||||
lib/seamonkey/modules/Webapps.jsm
|
||||
@@ -3309,8 +3350,8 @@ lib/seamonkey/modules/addons/AddonRepository.jsm
|
||||
lib/seamonkey/modules/addons/AddonRepository_SQLiteMigrator.jsm
|
||||
lib/seamonkey/modules/addons/AddonUpdateChecker.jsm
|
||||
lib/seamonkey/modules/addons/Content.js
|
||||
lib/seamonkey/modules/addons/GMPProvider.jsm
|
||||
lib/seamonkey/modules/addons/LightweightThemeImageOptimizer.jsm
|
||||
lib/seamonkey/modules/addons/OpenH264Provider.jsm
|
||||
lib/seamonkey/modules/addons/PluginProvider.jsm
|
||||
lib/seamonkey/modules/addons/SpellCheckDictionaryBootstrap.js
|
||||
lib/seamonkey/modules/addons/XPIProvider.jsm
|
||||
@@ -3334,12 +3375,17 @@ lib/seamonkey/modules/commonjs/diffpatcher/test/patch.js
|
||||
lib/seamonkey/modules/commonjs/diffpatcher/test/tap.js
|
||||
lib/seamonkey/modules/commonjs/framescript/FrameScriptManager.jsm
|
||||
lib/seamonkey/modules/commonjs/framescript/LoaderHelper.jsm
|
||||
lib/seamonkey/modules/commonjs/framescript/context-menu.js
|
||||
lib/seamonkey/modules/commonjs/framescript/contextmenu-events.js
|
||||
lib/seamonkey/modules/commonjs/framescript/manager.js
|
||||
lib/seamonkey/modules/commonjs/framescript/tab-events.js
|
||||
lib/seamonkey/modules/commonjs/framescript/util.js
|
||||
lib/seamonkey/modules/commonjs/index.js
|
||||
lib/seamonkey/modules/commonjs/method/core.js
|
||||
lib/seamonkey/modules/commonjs/method/test/browser.js
|
||||
lib/seamonkey/modules/commonjs/method/test/common.js
|
||||
lib/seamonkey/modules/commonjs/node/os.js
|
||||
lib/seamonkey/modules/commonjs/sdk/addon/bootstrap.js
|
||||
lib/seamonkey/modules/commonjs/sdk/addon/events.js
|
||||
lib/seamonkey/modules/commonjs/sdk/addon/host.js
|
||||
lib/seamonkey/modules/commonjs/sdk/addon/installer.js
|
||||
@@ -3361,9 +3407,12 @@ lib/seamonkey/modules/commonjs/sdk/content/sandbox.js
|
||||
lib/seamonkey/modules/commonjs/sdk/content/thumbnail.js
|
||||
lib/seamonkey/modules/commonjs/sdk/content/utils.js
|
||||
lib/seamonkey/modules/commonjs/sdk/content/worker-child.js
|
||||
lib/seamonkey/modules/commonjs/sdk/content/worker-parent.js
|
||||
lib/seamonkey/modules/commonjs/sdk/content/worker.js
|
||||
lib/seamonkey/modules/commonjs/sdk/context-menu.js
|
||||
lib/seamonkey/modules/commonjs/sdk/context-menu/context.js
|
||||
lib/seamonkey/modules/commonjs/sdk/context-menu/core.js
|
||||
lib/seamonkey/modules/commonjs/sdk/context-menu/readers.js
|
||||
lib/seamonkey/modules/commonjs/sdk/context-menu@2.js
|
||||
lib/seamonkey/modules/commonjs/sdk/core/disposable.js
|
||||
lib/seamonkey/modules/commonjs/sdk/core/heritage.js
|
||||
lib/seamonkey/modules/commonjs/sdk/core/namespace.js
|
||||
@@ -3379,6 +3428,7 @@ lib/seamonkey/modules/commonjs/sdk/deprecated/light-traits.js
|
||||
lib/seamonkey/modules/commonjs/sdk/deprecated/list.js
|
||||
lib/seamonkey/modules/commonjs/sdk/deprecated/memory.js
|
||||
lib/seamonkey/modules/commonjs/sdk/deprecated/symbiont.js
|
||||
lib/seamonkey/modules/commonjs/sdk/deprecated/sync-worker.js
|
||||
lib/seamonkey/modules/commonjs/sdk/deprecated/traits-worker.js
|
||||
lib/seamonkey/modules/commonjs/sdk/deprecated/traits.js
|
||||
lib/seamonkey/modules/commonjs/sdk/deprecated/traits/core.js
|
||||
@@ -3441,7 +3491,6 @@ lib/seamonkey/modules/commonjs/sdk/page-worker.js
|
||||
lib/seamonkey/modules/commonjs/sdk/panel.js
|
||||
lib/seamonkey/modules/commonjs/sdk/panel/events.js
|
||||
lib/seamonkey/modules/commonjs/sdk/panel/utils.js
|
||||
lib/seamonkey/modules/commonjs/sdk/panel/window.js
|
||||
lib/seamonkey/modules/commonjs/sdk/passwords.js
|
||||
lib/seamonkey/modules/commonjs/sdk/passwords/utils.js
|
||||
lib/seamonkey/modules/commonjs/sdk/places/bookmarks.js
|
||||
@@ -3480,6 +3529,7 @@ lib/seamonkey/modules/commonjs/sdk/system/process.js
|
||||
lib/seamonkey/modules/commonjs/sdk/system/runtime.js
|
||||
lib/seamonkey/modules/commonjs/sdk/system/unload.js
|
||||
lib/seamonkey/modules/commonjs/sdk/system/xul-app.js
|
||||
lib/seamonkey/modules/commonjs/sdk/system/xul-app.jsm
|
||||
lib/seamonkey/modules/commonjs/sdk/tab/events.js
|
||||
lib/seamonkey/modules/commonjs/sdk/tabs.js
|
||||
lib/seamonkey/modules/commonjs/sdk/tabs/common.js
|
||||
@@ -3510,6 +3560,7 @@ lib/seamonkey/modules/commonjs/sdk/ui/button/contract.js
|
||||
lib/seamonkey/modules/commonjs/sdk/ui/button/toggle.js
|
||||
lib/seamonkey/modules/commonjs/sdk/ui/button/view.js
|
||||
lib/seamonkey/modules/commonjs/sdk/ui/button/view/events.js
|
||||
lib/seamonkey/modules/commonjs/sdk/ui/component.js
|
||||
lib/seamonkey/modules/commonjs/sdk/ui/frame.js
|
||||
lib/seamonkey/modules/commonjs/sdk/ui/frame/model.js
|
||||
lib/seamonkey/modules/commonjs/sdk/ui/frame/view.html
|
||||
@@ -3526,9 +3577,11 @@ lib/seamonkey/modules/commonjs/sdk/ui/state/events.js
|
||||
lib/seamonkey/modules/commonjs/sdk/ui/toolbar.js
|
||||
lib/seamonkey/modules/commonjs/sdk/ui/toolbar/model.js
|
||||
lib/seamonkey/modules/commonjs/sdk/ui/toolbar/view.js
|
||||
lib/seamonkey/modules/commonjs/sdk/uri/resource.js
|
||||
lib/seamonkey/modules/commonjs/sdk/url.js
|
||||
lib/seamonkey/modules/commonjs/sdk/url/utils.js
|
||||
lib/seamonkey/modules/commonjs/sdk/util/array.js
|
||||
lib/seamonkey/modules/commonjs/sdk/util/bond.js
|
||||
lib/seamonkey/modules/commonjs/sdk/util/collection.js
|
||||
lib/seamonkey/modules/commonjs/sdk/util/contract.js
|
||||
lib/seamonkey/modules/commonjs/sdk/util/deprecate.js
|
||||
@@ -3536,7 +3589,6 @@ lib/seamonkey/modules/commonjs/sdk/util/dispatcher.js
|
||||
lib/seamonkey/modules/commonjs/sdk/util/list.js
|
||||
lib/seamonkey/modules/commonjs/sdk/util/match-pattern.js
|
||||
lib/seamonkey/modules/commonjs/sdk/util/object.js
|
||||
lib/seamonkey/modules/commonjs/sdk/util/registry.js
|
||||
lib/seamonkey/modules/commonjs/sdk/util/rules.js
|
||||
lib/seamonkey/modules/commonjs/sdk/util/sequence.js
|
||||
lib/seamonkey/modules/commonjs/sdk/util/uuid.js
|
||||
@@ -3551,7 +3603,6 @@ lib/seamonkey/modules/commonjs/sdk/windows.js
|
||||
lib/seamonkey/modules/commonjs/sdk/windows/dom.js
|
||||
lib/seamonkey/modules/commonjs/sdk/windows/fennec.js
|
||||
lib/seamonkey/modules/commonjs/sdk/windows/firefox.js
|
||||
lib/seamonkey/modules/commonjs/sdk/windows/loader.js
|
||||
lib/seamonkey/modules/commonjs/sdk/windows/observer.js
|
||||
lib/seamonkey/modules/commonjs/sdk/windows/tabs-fennec.js
|
||||
lib/seamonkey/modules/commonjs/sdk/windows/tabs-firefox.js
|
||||
@@ -3690,7 +3741,12 @@ lib/seamonkey/modules/devtools/pretty-fast.js
|
||||
lib/seamonkey/modules/devtools/qrcode/decoder/index.js
|
||||
lib/seamonkey/modules/devtools/qrcode/encoder/index.js
|
||||
lib/seamonkey/modules/devtools/qrcode/index.js
|
||||
lib/seamonkey/modules/devtools/security/auth.js
|
||||
lib/seamonkey/modules/devtools/security/cert.js
|
||||
lib/seamonkey/modules/devtools/security/prompt.js
|
||||
lib/seamonkey/modules/devtools/security/socket.js
|
||||
lib/seamonkey/modules/devtools/server/actors/actor-registry.js
|
||||
lib/seamonkey/modules/devtools/server/actors/animation.js
|
||||
lib/seamonkey/modules/devtools/server/actors/call-watcher.js
|
||||
lib/seamonkey/modules/devtools/server/actors/canvas.js
|
||||
lib/seamonkey/modules/devtools/server/actors/child-process.js
|
||||
@@ -3698,6 +3754,8 @@ lib/seamonkey/modules/devtools/server/actors/childtab.js
|
||||
lib/seamonkey/modules/devtools/server/actors/common.js
|
||||
lib/seamonkey/modules/devtools/server/actors/csscoverage.js
|
||||
lib/seamonkey/modules/devtools/server/actors/device.js
|
||||
lib/seamonkey/modules/devtools/server/actors/director-manager.js
|
||||
lib/seamonkey/modules/devtools/server/actors/director-registry.js
|
||||
lib/seamonkey/modules/devtools/server/actors/eventlooplag.js
|
||||
lib/seamonkey/modules/devtools/server/actors/framerate.js
|
||||
lib/seamonkey/modules/devtools/server/actors/gcli.js
|
||||
@@ -3712,6 +3770,7 @@ lib/seamonkey/modules/devtools/server/actors/pretty-print-worker.js
|
||||
lib/seamonkey/modules/devtools/server/actors/profiler.js
|
||||
lib/seamonkey/modules/devtools/server/actors/root.js
|
||||
lib/seamonkey/modules/devtools/server/actors/script.js
|
||||
lib/seamonkey/modules/devtools/server/actors/settings.js
|
||||
lib/seamonkey/modules/devtools/server/actors/storage.js
|
||||
lib/seamonkey/modules/devtools/server/actors/string.js
|
||||
lib/seamonkey/modules/devtools/server/actors/styleeditor.js
|
||||
@@ -3719,8 +3778,12 @@ lib/seamonkey/modules/devtools/server/actors/styles.js
|
||||
lib/seamonkey/modules/devtools/server/actors/stylesheets.js
|
||||
lib/seamonkey/modules/devtools/server/actors/timeline.js
|
||||
lib/seamonkey/modules/devtools/server/actors/tracer.js
|
||||
lib/seamonkey/modules/devtools/server/actors/utils/ScriptStore.js
|
||||
lib/seamonkey/modules/devtools/server/actors/utils/actor-registry-utils.js
|
||||
lib/seamonkey/modules/devtools/server/actors/utils/automation-timeline.js
|
||||
lib/seamonkey/modules/devtools/server/actors/utils/make-debugger.js
|
||||
lib/seamonkey/modules/devtools/server/actors/utils/map-uri-to-addon-id.js
|
||||
lib/seamonkey/modules/devtools/server/actors/utils/stack.js
|
||||
lib/seamonkey/modules/devtools/server/actors/webapps.js
|
||||
lib/seamonkey/modules/devtools/server/actors/webaudio.js
|
||||
lib/seamonkey/modules/devtools/server/actors/webbrowser.js
|
||||
@@ -3730,6 +3793,7 @@ lib/seamonkey/modules/devtools/server/child.js
|
||||
lib/seamonkey/modules/devtools/server/content-globals.js
|
||||
lib/seamonkey/modules/devtools/server/main.js
|
||||
lib/seamonkey/modules/devtools/server/protocol.js
|
||||
lib/seamonkey/modules/devtools/shared/async-storage.js
|
||||
lib/seamonkey/modules/devtools/source-map.js
|
||||
lib/seamonkey/modules/devtools/styleinspector/css-logic.js
|
||||
lib/seamonkey/modules/devtools/tern/browser.js
|
||||
@@ -3751,6 +3815,7 @@ lib/seamonkey/modules/devtools/transport/transport.js
|
||||
lib/seamonkey/modules/devtools/worker-loader.js
|
||||
lib/seamonkey/modules/editorUtilities.jsm
|
||||
lib/seamonkey/modules/errUtils.js
|
||||
lib/seamonkey/modules/extraMimeParsers.jsm
|
||||
lib/seamonkey/modules/folderUtils.jsm
|
||||
lib/seamonkey/modules/gloda/collection.js
|
||||
lib/seamonkey/modules/gloda/connotent.js
|
||||
@@ -3796,7 +3861,7 @@ lib/seamonkey/modules/jsmime/jsmime.js
|
||||
lib/seamonkey/modules/mailServices.js
|
||||
lib/seamonkey/modules/mailnewsMigrator.js
|
||||
lib/seamonkey/modules/mcc_iso3166_table.jsm
|
||||
lib/seamonkey/modules/media/IdpProxy.jsm
|
||||
lib/seamonkey/modules/media/IdpSandbox.jsm
|
||||
lib/seamonkey/modules/media/PeerConnectionIdp.jsm
|
||||
lib/seamonkey/modules/media/RTCStatsReport.jsm
|
||||
lib/seamonkey/modules/mimeParser.jsm
|
||||
@@ -3817,14 +3882,18 @@ lib/seamonkey/modules/osfile/osfile_win_front.jsm
|
||||
lib/seamonkey/modules/osfile/ospath.jsm
|
||||
lib/seamonkey/modules/osfile/ospath_unix.jsm
|
||||
lib/seamonkey/modules/osfile/ospath_win.jsm
|
||||
lib/seamonkey/modules/reader/JSDOMParser.js
|
||||
lib/seamonkey/modules/reader/Readability.js
|
||||
lib/seamonkey/modules/reader/ReaderWorker.js
|
||||
lib/seamonkey/modules/reader/ReaderWorker.jsm
|
||||
lib/seamonkey/modules/reflect.jsm
|
||||
lib/seamonkey/modules/sdk/bootstrap.js
|
||||
lib/seamonkey/modules/sdk/system/Startup.js
|
||||
lib/seamonkey/modules/sdk/system/XulApp.js
|
||||
lib/seamonkey/modules/services-common/async.js
|
||||
lib/seamonkey/modules/services-common/bagheeraclient.js
|
||||
lib/seamonkey/modules/services-common/hawkclient.js
|
||||
lib/seamonkey/modules/services-common/hawkrequest.js
|
||||
lib/seamonkey/modules/services-common/logmanager.js
|
||||
lib/seamonkey/modules/services-common/observers.js
|
||||
lib/seamonkey/modules/services-common/rest.js
|
||||
lib/seamonkey/modules/services-common/storageservice.js
|
||||
@@ -3833,6 +3902,7 @@ lib/seamonkey/modules/services-common/tokenserverclient.js
|
||||
lib/seamonkey/modules/services-common/utils.js
|
||||
lib/seamonkey/modules/services-crypto/WeaveCrypto.js
|
||||
lib/seamonkey/modules/services-crypto/utils.js
|
||||
lib/seamonkey/modules/services-sync/FxaMigrator.jsm
|
||||
lib/seamonkey/modules/services-sync/addonsreconciler.js
|
||||
lib/seamonkey/modules/services-sync/addonutils.js
|
||||
lib/seamonkey/modules/services-sync/browserid_identity.js
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
@comment $NetBSD: PLIST.chatzilla,v 1.6 2015/03/17 19:50:42 ryoon Exp $
|
||||
@comment $NetBSD: PLIST.chatzilla,v 1.7 2015/09/21 05:03:45 ryoon Exp $
|
||||
lib/seamonkey/extensions/inspector@mozilla.org/chrome.manifest
|
||||
lib/seamonkey/extensions/inspector@mozilla.org/chrome/.mkdir.done
|
||||
lib/seamonkey/extensions/inspector@mozilla.org/chrome/icons/default/winInspectorMain.ico
|
||||
@@ -131,6 +131,30 @@ lib/seamonkey/extensions/inspector@mozilla.org/chrome/inspector/locale/de/inspec
|
||||
lib/seamonkey/extensions/inspector@mozilla.org/chrome/inspector/locale/de/inspector/viewers/stylesheets.dtd
|
||||
lib/seamonkey/extensions/inspector@mozilla.org/chrome/inspector/locale/de/inspector/viewers/usedFontFaces.dtd
|
||||
lib/seamonkey/extensions/inspector@mozilla.org/chrome/inspector/locale/de/inspector/viewers/xblBindings.dtd
|
||||
lib/seamonkey/extensions/inspector@mozilla.org/chrome/inspector/locale/el/inspector/editing.dtd
|
||||
lib/seamonkey/extensions/inspector@mozilla.org/chrome/inspector/locale/el/inspector/inspector.dtd
|
||||
lib/seamonkey/extensions/inspector@mozilla.org/chrome/inspector/locale/el/inspector/inspector.properties
|
||||
lib/seamonkey/extensions/inspector@mozilla.org/chrome/inspector/locale/el/inspector/prefs.dtd
|
||||
lib/seamonkey/extensions/inspector@mozilla.org/chrome/inspector/locale/el/inspector/tasksOverlay.dtd
|
||||
lib/seamonkey/extensions/inspector@mozilla.org/chrome/inspector/locale/el/inspector/viewer-registry.dtd
|
||||
lib/seamonkey/extensions/inspector@mozilla.org/chrome/inspector/locale/el/inspector/viewers/accessibleEvent.dtd
|
||||
lib/seamonkey/extensions/inspector@mozilla.org/chrome/inspector/locale/el/inspector/viewers/accessibleEvents.dtd
|
||||
lib/seamonkey/extensions/inspector@mozilla.org/chrome/inspector/locale/el/inspector/viewers/accessibleEvents.properties
|
||||
lib/seamonkey/extensions/inspector@mozilla.org/chrome/inspector/locale/el/inspector/viewers/accessibleEventsHandlerHelpDialog.dtd
|
||||
lib/seamonkey/extensions/inspector@mozilla.org/chrome/inspector/locale/el/inspector/viewers/accessibleProps.dtd
|
||||
lib/seamonkey/extensions/inspector@mozilla.org/chrome/inspector/locale/el/inspector/viewers/accessibleProps.properties
|
||||
lib/seamonkey/extensions/inspector@mozilla.org/chrome/inspector/locale/el/inspector/viewers/accessibleRelations.dtd
|
||||
lib/seamonkey/extensions/inspector@mozilla.org/chrome/inspector/locale/el/inspector/viewers/accessibleTree.dtd
|
||||
lib/seamonkey/extensions/inspector@mozilla.org/chrome/inspector/locale/el/inspector/viewers/accessibleTreeEvalJSDialog.dtd
|
||||
lib/seamonkey/extensions/inspector@mozilla.org/chrome/inspector/locale/el/inspector/viewers/boxModel.dtd
|
||||
lib/seamonkey/extensions/inspector@mozilla.org/chrome/inspector/locale/el/inspector/viewers/computedStyle.dtd
|
||||
lib/seamonkey/extensions/inspector@mozilla.org/chrome/inspector/locale/el/inspector/viewers/dom.dtd
|
||||
lib/seamonkey/extensions/inspector@mozilla.org/chrome/inspector/locale/el/inspector/viewers/domNode.dtd
|
||||
lib/seamonkey/extensions/inspector@mozilla.org/chrome/inspector/locale/el/inspector/viewers/jsObject.dtd
|
||||
lib/seamonkey/extensions/inspector@mozilla.org/chrome/inspector/locale/el/inspector/viewers/styleRules.dtd
|
||||
lib/seamonkey/extensions/inspector@mozilla.org/chrome/inspector/locale/el/inspector/viewers/stylesheets.dtd
|
||||
lib/seamonkey/extensions/inspector@mozilla.org/chrome/inspector/locale/el/inspector/viewers/usedFontFaces.dtd
|
||||
lib/seamonkey/extensions/inspector@mozilla.org/chrome/inspector/locale/el/inspector/viewers/xblBindings.dtd
|
||||
lib/seamonkey/extensions/inspector@mozilla.org/chrome/inspector/locale/en-GB/inspector/editing.dtd
|
||||
lib/seamonkey/extensions/inspector@mozilla.org/chrome/inspector/locale/en-GB/inspector/inspector.dtd
|
||||
lib/seamonkey/extensions/inspector@mozilla.org/chrome/inspector/locale/en-GB/inspector/inspector.properties
|
||||
@@ -305,8 +329,6 @@ lib/seamonkey/extensions/inspector@mozilla.org/chrome/inspector/skin/modern/insp
|
||||
lib/seamonkey/extensions/inspector@mozilla.org/chrome/inspector/skin/modern/inspector/viewers/domNode/domNode.css
|
||||
lib/seamonkey/extensions/inspector@mozilla.org/chrome/inspector/skin/modern/inspector/viewers/styleRules/styleRules.css
|
||||
lib/seamonkey/extensions/inspector@mozilla.org/chrome/inspector/skin/modern/inspector/viewers/xblBindings/xblBindings.css
|
||||
lib/seamonkey/extensions/inspector@mozilla.org/components/inspector-cmdline.js
|
||||
lib/seamonkey/extensions/inspector@mozilla.org/components/inspector-cmdline.js
|
||||
lib/seamonkey/extensions/inspector@mozilla.org/defaults/preferences/inspector.js
|
||||
lib/seamonkey/extensions/inspector@mozilla.org/install.rdf
|
||||
lib/seamonkey/extensions/{59c81df5-4b7a-477b-912d-4e0fdf64e5f2}/chrome.manifest
|
||||
@@ -440,6 +462,4 @@ lib/seamonkey/extensions/{59c81df5-4b7a-477b-912d-4e0fdf64e5f2}/chrome/chatzilla
|
||||
lib/seamonkey/extensions/{59c81df5-4b7a-477b-912d-4e0fdf64e5f2}/chrome/icons/default/chatzilla-window.ico
|
||||
lib/seamonkey/extensions/{59c81df5-4b7a-477b-912d-4e0fdf64e5f2}/chrome/icons/default/chatzilla-window.xpm
|
||||
lib/seamonkey/extensions/{59c81df5-4b7a-477b-912d-4e0fdf64e5f2}/chrome/icons/default/chatzilla-window16.xpm
|
||||
lib/seamonkey/extensions/{59c81df5-4b7a-477b-912d-4e0fdf64e5f2}/components/chatzilla-service.js
|
||||
lib/seamonkey/extensions/{59c81df5-4b7a-477b-912d-4e0fdf64e5f2}/components/chatzilla-service.js
|
||||
lib/seamonkey/extensions/{59c81df5-4b7a-477b-912d-4e0fdf64e5f2}/install.rdf
|
||||
|
||||
@@ -1,27 +0,0 @@
|
||||
@comment $NetBSD: PLIST.enigmail,v 1.11 2015/03/26 20:41:53 ryoon Exp $
|
||||
lib/seamonkey/extensions/{847b3a00-7ab1-11d4-8f02-006008948af5}/chrome.manifest
|
||||
lib/seamonkey/extensions/{847b3a00-7ab1-11d4-8f02-006008948af5}/chrome/enigmail.jar
|
||||
lib/seamonkey/extensions/{847b3a00-7ab1-11d4-8f02-006008948af5}/components/enigMsgCompFields.js
|
||||
lib/seamonkey/extensions/{847b3a00-7ab1-11d4-8f02-006008948af5}/components/enigmail.js
|
||||
lib/seamonkey/extensions/{847b3a00-7ab1-11d4-8f02-006008948af5}/components/enigmail.xpt
|
||||
lib/seamonkey/extensions/{847b3a00-7ab1-11d4-8f02-006008948af5}/components/enigprefs-service.js
|
||||
lib/seamonkey/extensions/{847b3a00-7ab1-11d4-8f02-006008948af5}/components/mimeDecrypt.js
|
||||
lib/seamonkey/extensions/{847b3a00-7ab1-11d4-8f02-006008948af5}/components/mimeEncrypt.js
|
||||
lib/seamonkey/extensions/{847b3a00-7ab1-11d4-8f02-006008948af5}/defaults/preferences/enigmail.js
|
||||
lib/seamonkey/extensions/{847b3a00-7ab1-11d4-8f02-006008948af5}/install.rdf
|
||||
lib/seamonkey/extensions/{847b3a00-7ab1-11d4-8f02-006008948af5}/modules/commonFuncs.jsm
|
||||
lib/seamonkey/extensions/{847b3a00-7ab1-11d4-8f02-006008948af5}/modules/enigmailCommon.jsm
|
||||
lib/seamonkey/extensions/{847b3a00-7ab1-11d4-8f02-006008948af5}/modules/enigmailConvert.jsm
|
||||
lib/seamonkey/extensions/{847b3a00-7ab1-11d4-8f02-006008948af5}/modules/enigmailCore.jsm
|
||||
lib/seamonkey/extensions/{847b3a00-7ab1-11d4-8f02-006008948af5}/modules/fixExchangeMsg.jsm
|
||||
lib/seamonkey/extensions/{847b3a00-7ab1-11d4-8f02-006008948af5}/modules/gpgAgentHandler.jsm
|
||||
lib/seamonkey/extensions/{847b3a00-7ab1-11d4-8f02-006008948af5}/modules/installGnuPG.jsm
|
||||
lib/seamonkey/extensions/{847b3a00-7ab1-11d4-8f02-006008948af5}/modules/keyManagement.jsm
|
||||
lib/seamonkey/extensions/{847b3a00-7ab1-11d4-8f02-006008948af5}/modules/mimeVerify.jsm
|
||||
lib/seamonkey/extensions/{847b3a00-7ab1-11d4-8f02-006008948af5}/modules/passwordCheck.jsm
|
||||
lib/seamonkey/extensions/{847b3a00-7ab1-11d4-8f02-006008948af5}/modules/pipeConsole.jsm
|
||||
lib/seamonkey/extensions/{847b3a00-7ab1-11d4-8f02-006008948af5}/modules/subprocess.jsm
|
||||
lib/seamonkey/extensions/{847b3a00-7ab1-11d4-8f02-006008948af5}/modules/subprocess_worker_unix.js
|
||||
lib/seamonkey/extensions/{847b3a00-7ab1-11d4-8f02-006008948af5}/modules/subprocess_worker_win.js
|
||||
lib/seamonkey/extensions/{847b3a00-7ab1-11d4-8f02-006008948af5}/platform/${OPSYS}_${TARGET_XPCOM_ABI}/lib/libsubprocess-${TARGET_XPCOM_ABI}.so
|
||||
lib/seamonkey/extensions/{847b3a00-7ab1-11d4-8f02-006008948af5}/wrappers/gpg-agent-wrapper.sh
|
||||
@@ -1,4 +1,4 @@
|
||||
@comment $NetBSD: PLIST.lightning,v 1.20 2015/03/17 19:50:42 ryoon Exp $
|
||||
@comment $NetBSD: PLIST.lightning,v 1.21 2015/09/21 05:03:45 ryoon Exp $
|
||||
lib/seamonkey/extensions/quitter@mozilla.org/chrome.manifest
|
||||
lib/seamonkey/extensions/quitter@mozilla.org/chrome/.mkdir.done
|
||||
lib/seamonkey/extensions/quitter@mozilla.org/chrome/quitter/content/contentscript.js
|
||||
@@ -8,26 +8,44 @@ lib/seamonkey/extensions/{a62ef8ec-5fdc-40c2-873c-223b8a6925cc}/chrome.manifest
|
||||
lib/seamonkey/extensions/{a62ef8ec-5fdc-40c2-873c-223b8a6925cc}/chrome/.mkdir.done
|
||||
lib/seamonkey/extensions/{a62ef8ec-5fdc-40c2-873c-223b8a6925cc}/chrome/gdata-provider-en-US/locale/en-US/gdata.dtd
|
||||
lib/seamonkey/extensions/{a62ef8ec-5fdc-40c2-873c-223b8a6925cc}/chrome/gdata-provider-en-US/locale/en-US/gdata.properties
|
||||
lib/seamonkey/extensions/{a62ef8ec-5fdc-40c2-873c-223b8a6925cc}/chrome/gdata-provider/content/calendarCreation.xul
|
||||
lib/seamonkey/extensions/{a62ef8ec-5fdc-40c2-873c-223b8a6925cc}/chrome/gdata-provider/content/browserRequest.js
|
||||
lib/seamonkey/extensions/{a62ef8ec-5fdc-40c2-873c-223b8a6925cc}/chrome/gdata-provider/content/browserRequest.xul
|
||||
lib/seamonkey/extensions/{a62ef8ec-5fdc-40c2-873c-223b8a6925cc}/chrome/gdata-provider/content/gcal.png
|
||||
lib/seamonkey/extensions/{a62ef8ec-5fdc-40c2-873c-223b8a6925cc}/chrome/gdata-provider/content/gdata-calendar-creation.js
|
||||
lib/seamonkey/extensions/{a62ef8ec-5fdc-40c2-873c-223b8a6925cc}/chrome/gdata-provider/content/gdata-calendar-creation.xul
|
||||
lib/seamonkey/extensions/{a62ef8ec-5fdc-40c2-873c-223b8a6925cc}/chrome/gdata-provider/content/gdata-calendar-event-dialog.js
|
||||
lib/seamonkey/extensions/{a62ef8ec-5fdc-40c2-873c-223b8a6925cc}/chrome/gdata-provider/content/gdata-calendar-event-dialog.xul
|
||||
lib/seamonkey/extensions/{a62ef8ec-5fdc-40c2-873c-223b8a6925cc}/chrome/gdata-provider/content/gdata-calendar-properties.js
|
||||
lib/seamonkey/extensions/{a62ef8ec-5fdc-40c2-873c-223b8a6925cc}/chrome/gdata-provider/content/gdata-calendar-properties.xul
|
||||
lib/seamonkey/extensions/{a62ef8ec-5fdc-40c2-873c-223b8a6925cc}/chrome/gdata-provider/content/gdata-event-dialog-reminder.js
|
||||
lib/seamonkey/extensions/{a62ef8ec-5fdc-40c2-873c-223b8a6925cc}/chrome/gdata-provider/content/gdata-event-dialog-reminder.xul
|
||||
lib/seamonkey/extensions/{a62ef8ec-5fdc-40c2-873c-223b8a6925cc}/chrome/gdata-provider/content/gdata-list-tree.xml
|
||||
lib/seamonkey/extensions/{a62ef8ec-5fdc-40c2-873c-223b8a6925cc}/chrome/gdata-provider/content/gdata-migration-overlay.xul
|
||||
lib/seamonkey/extensions/{a62ef8ec-5fdc-40c2-873c-223b8a6925cc}/chrome/gdata-provider/content/gdata-migration-wizard.xul
|
||||
lib/seamonkey/extensions/{a62ef8ec-5fdc-40c2-873c-223b8a6925cc}/chrome/gdata-provider/content/gdata-migration.js
|
||||
lib/seamonkey/extensions/{a62ef8ec-5fdc-40c2-873c-223b8a6925cc}/chrome/gdata-provider/skin/browserRequest.css
|
||||
lib/seamonkey/extensions/{a62ef8ec-5fdc-40c2-873c-223b8a6925cc}/chrome/gdata-provider/skin/gdata-bindings.css
|
||||
lib/seamonkey/extensions/{a62ef8ec-5fdc-40c2-873c-223b8a6925cc}/chrome/gdata-provider/skin/gdata-event-dialog-reminder.css
|
||||
lib/seamonkey/extensions/{a62ef8ec-5fdc-40c2-873c-223b8a6925cc}/chrome/gdata-provider/skin/reminder-action-sms.png
|
||||
lib/seamonkey/extensions/{a62ef8ec-5fdc-40c2-873c-223b8a6925cc}/components/.mkdir.done
|
||||
lib/seamonkey/extensions/{a62ef8ec-5fdc-40c2-873c-223b8a6925cc}/components/calGoogleCalendarModule.js
|
||||
lib/seamonkey/extensions/{a62ef8ec-5fdc-40c2-873c-223b8a6925cc}/components/calGoogleCalendarModule.manifest
|
||||
lib/seamonkey/extensions/{a62ef8ec-5fdc-40c2-873c-223b8a6925cc}/components/gdata.xpt
|
||||
lib/seamonkey/extensions/{a62ef8ec-5fdc-40c2-873c-223b8a6925cc}/components/interfaces.manifest
|
||||
lib/seamonkey/extensions/{a62ef8ec-5fdc-40c2-873c-223b8a6925cc}/components/calGoogleCalendar.js
|
||||
lib/seamonkey/extensions/{a62ef8ec-5fdc-40c2-873c-223b8a6925cc}/components/calGoogleCalendar.manifest
|
||||
lib/seamonkey/extensions/{a62ef8ec-5fdc-40c2-873c-223b8a6925cc}/defaults/preferences/preferences.js
|
||||
lib/seamonkey/extensions/{a62ef8ec-5fdc-40c2-873c-223b8a6925cc}/install.rdf
|
||||
lib/seamonkey/extensions/{a62ef8ec-5fdc-40c2-873c-223b8a6925cc}/js/calGoogleCalendar.js
|
||||
lib/seamonkey/extensions/{a62ef8ec-5fdc-40c2-873c-223b8a6925cc}/js/calGoogleRequest.js
|
||||
lib/seamonkey/extensions/{a62ef8ec-5fdc-40c2-873c-223b8a6925cc}/js/calGoogleSession.js
|
||||
lib/seamonkey/extensions/{a62ef8ec-5fdc-40c2-873c-223b8a6925cc}/js/calGoogleUtils.js
|
||||
lib/seamonkey/extensions/{a62ef8ec-5fdc-40c2-873c-223b8a6925cc}/modules/OAuth2.jsm
|
||||
lib/seamonkey/extensions/{a62ef8ec-5fdc-40c2-873c-223b8a6925cc}/modules/gdataLogging.jsm
|
||||
lib/seamonkey/extensions/{a62ef8ec-5fdc-40c2-873c-223b8a6925cc}/modules/gdataRequest.jsm
|
||||
lib/seamonkey/extensions/{a62ef8ec-5fdc-40c2-873c-223b8a6925cc}/modules/gdataSession.jsm
|
||||
lib/seamonkey/extensions/{a62ef8ec-5fdc-40c2-873c-223b8a6925cc}/modules/gdataUtils.jsm
|
||||
lib/seamonkey/extensions/{a62ef8ec-5fdc-40c2-873c-223b8a6925cc}/modules/shim/Calendar.jsm
|
||||
lib/seamonkey/extensions/{a62ef8ec-5fdc-40c2-873c-223b8a6925cc}/modules/shim/Http.jsm
|
||||
lib/seamonkey/extensions/{a62ef8ec-5fdc-40c2-873c-223b8a6925cc}/modules/shim/Loader.jsm
|
||||
lib/seamonkey/extensions/{a62ef8ec-5fdc-40c2-873c-223b8a6925cc}/modules/shim/Preferences.jsm
|
||||
lib/seamonkey/extensions/{a62ef8ec-5fdc-40c2-873c-223b8a6925cc}/modules/shim/Promise.jsm
|
||||
lib/seamonkey/extensions/{a62ef8ec-5fdc-40c2-873c-223b8a6925cc}/modules/shim/PromiseExtras.jsm
|
||||
lib/seamonkey/extensions/{a62ef8ec-5fdc-40c2-873c-223b8a6925cc}/modules/shim/PromiseUtils.jsm
|
||||
lib/seamonkey/extensions/{a62ef8ec-5fdc-40c2-873c-223b8a6925cc}/modules/shim/Task.jsm
|
||||
lib/seamonkey/extensions/{a62ef8ec-5fdc-40c2-873c-223b8a6925cc}/modules/shim/Timer.jsm
|
||||
lib/seamonkey/extensions/{a62ef8ec-5fdc-40c2-873c-223b8a6925cc}/modules/timezoneMap.jsm
|
||||
lib/seamonkey/extensions/{e2fda1a4-762b-4020-b5ad-a41df1933103}/application.ini
|
||||
lib/seamonkey/extensions/{e2fda1a4-762b-4020-b5ad-a41df1933103}/calendar-js/calAlarm.js
|
||||
lib/seamonkey/extensions/{e2fda1a4-762b-4020-b5ad-a41df1933103}/calendar-js/calAlarmMonitor.js
|
||||
@@ -77,7 +95,34 @@ lib/seamonkey/extensions/{e2fda1a4-762b-4020-b5ad-a41df1933103}/calendar-js/calW
|
||||
lib/seamonkey/extensions/{e2fda1a4-762b-4020-b5ad-a41df1933103}/calendar-js/calWeekPrinter.js
|
||||
lib/seamonkey/extensions/{e2fda1a4-762b-4020-b5ad-a41df1933103}/chrome.manifest
|
||||
lib/seamonkey/extensions/{e2fda1a4-762b-4020-b5ad-a41df1933103}/chrome/.mkdir.done
|
||||
lib/seamonkey/extensions/{e2fda1a4-762b-4020-b5ad-a41df1933103}/chrome/calendar-en-US.jar
|
||||
lib/seamonkey/extensions/{e2fda1a4-762b-4020-b5ad-a41df1933103}/chrome/calendar-en-US/locale/en-US/calendar/calendar-alarms.properties
|
||||
lib/seamonkey/extensions/{e2fda1a4-762b-4020-b5ad-a41df1933103}/chrome/calendar-en-US/locale/en-US/calendar/calendar-event-dialog-attendees.properties
|
||||
lib/seamonkey/extensions/{e2fda1a4-762b-4020-b5ad-a41df1933103}/chrome/calendar-en-US/locale/en-US/calendar/calendar-event-dialog.dtd
|
||||
lib/seamonkey/extensions/{e2fda1a4-762b-4020-b5ad-a41df1933103}/chrome/calendar-en-US/locale/en-US/calendar/calendar-event-dialog.properties
|
||||
lib/seamonkey/extensions/{e2fda1a4-762b-4020-b5ad-a41df1933103}/chrome/calendar-en-US/locale/en-US/calendar/calendar-extract.properties
|
||||
lib/seamonkey/extensions/{e2fda1a4-762b-4020-b5ad-a41df1933103}/chrome/calendar-en-US/locale/en-US/calendar/calendar-invitations-dialog.dtd
|
||||
lib/seamonkey/extensions/{e2fda1a4-762b-4020-b5ad-a41df1933103}/chrome/calendar-en-US/locale/en-US/calendar/calendar-occurrence-prompt.dtd
|
||||
lib/seamonkey/extensions/{e2fda1a4-762b-4020-b5ad-a41df1933103}/chrome/calendar-en-US/locale/en-US/calendar/calendar-occurrence-prompt.properties
|
||||
lib/seamonkey/extensions/{e2fda1a4-762b-4020-b5ad-a41df1933103}/chrome/calendar-en-US/locale/en-US/calendar/calendar-subscriptions-dialog.dtd
|
||||
lib/seamonkey/extensions/{e2fda1a4-762b-4020-b5ad-a41df1933103}/chrome/calendar-en-US/locale/en-US/calendar/calendar.dtd
|
||||
lib/seamonkey/extensions/{e2fda1a4-762b-4020-b5ad-a41df1933103}/chrome/calendar-en-US/locale/en-US/calendar/calendar.properties
|
||||
lib/seamonkey/extensions/{e2fda1a4-762b-4020-b5ad-a41df1933103}/chrome/calendar-en-US/locale/en-US/calendar/calendarCreation.dtd
|
||||
lib/seamonkey/extensions/{e2fda1a4-762b-4020-b5ad-a41df1933103}/chrome/calendar-en-US/locale/en-US/calendar/calendarCreation.properties
|
||||
lib/seamonkey/extensions/{e2fda1a4-762b-4020-b5ad-a41df1933103}/chrome/calendar-en-US/locale/en-US/calendar/categories.properties
|
||||
lib/seamonkey/extensions/{e2fda1a4-762b-4020-b5ad-a41df1933103}/chrome/calendar-en-US/locale/en-US/calendar/dateFormat.properties
|
||||
lib/seamonkey/extensions/{e2fda1a4-762b-4020-b5ad-a41df1933103}/chrome/calendar-en-US/locale/en-US/calendar/dialogs/calendar-event-dialog-reminder.dtd
|
||||
lib/seamonkey/extensions/{e2fda1a4-762b-4020-b5ad-a41df1933103}/chrome/calendar-en-US/locale/en-US/calendar/global.dtd
|
||||
lib/seamonkey/extensions/{e2fda1a4-762b-4020-b5ad-a41df1933103}/chrome/calendar-en-US/locale/en-US/calendar/menuOverlay.dtd
|
||||
lib/seamonkey/extensions/{e2fda1a4-762b-4020-b5ad-a41df1933103}/chrome/calendar-en-US/locale/en-US/calendar/migration.dtd
|
||||
lib/seamonkey/extensions/{e2fda1a4-762b-4020-b5ad-a41df1933103}/chrome/calendar-en-US/locale/en-US/calendar/migration.properties
|
||||
lib/seamonkey/extensions/{e2fda1a4-762b-4020-b5ad-a41df1933103}/chrome/calendar-en-US/locale/en-US/calendar/preferences/alarms.dtd
|
||||
lib/seamonkey/extensions/{e2fda1a4-762b-4020-b5ad-a41df1933103}/chrome/calendar-en-US/locale/en-US/calendar/preferences/categories.dtd
|
||||
lib/seamonkey/extensions/{e2fda1a4-762b-4020-b5ad-a41df1933103}/chrome/calendar-en-US/locale/en-US/calendar/preferences/general.dtd
|
||||
lib/seamonkey/extensions/{e2fda1a4-762b-4020-b5ad-a41df1933103}/chrome/calendar-en-US/locale/en-US/calendar/preferences/preferences.dtd
|
||||
lib/seamonkey/extensions/{e2fda1a4-762b-4020-b5ad-a41df1933103}/chrome/calendar-en-US/locale/en-US/calendar/preferences/views.dtd
|
||||
lib/seamonkey/extensions/{e2fda1a4-762b-4020-b5ad-a41df1933103}/chrome/calendar-en-US/locale/en-US/calendar/provider-uninstall.dtd
|
||||
lib/seamonkey/extensions/{e2fda1a4-762b-4020-b5ad-a41df1933103}/chrome/calendar-en-US/locale/en-US/calendar/timezones.properties
|
||||
lib/seamonkey/extensions/{e2fda1a4-762b-4020-b5ad-a41df1933103}/chrome/calendar-en-US/locale/en-US/calendar/wcap.properties
|
||||
lib/seamonkey/extensions/{e2fda1a4-762b-4020-b5ad-a41df1933103}/chrome/calendar/content/calendar/WindowsNTToZoneInfoTZId.properties
|
||||
lib/seamonkey/extensions/{e2fda1a4-762b-4020-b5ad-a41df1933103}/chrome/calendar/content/calendar/agenda-listbox.js
|
||||
lib/seamonkey/extensions/{e2fda1a4-762b-4020-b5ad-a41df1933103}/chrome/calendar/content/calendar/agenda-listbox.xml
|
||||
@@ -171,8 +216,6 @@ lib/seamonkey/extensions/{e2fda1a4-762b-4020-b5ad-a41df1933103}/chrome/calendar/
|
||||
lib/seamonkey/extensions/{e2fda1a4-762b-4020-b5ad-a41df1933103}/chrome/calendar/content/calendar/preferences/editCategory.xul
|
||||
lib/seamonkey/extensions/{e2fda1a4-762b-4020-b5ad-a41df1933103}/chrome/calendar/content/calendar/preferences/general.js
|
||||
lib/seamonkey/extensions/{e2fda1a4-762b-4020-b5ad-a41df1933103}/chrome/calendar/content/calendar/preferences/general.xul
|
||||
lib/seamonkey/extensions/{e2fda1a4-762b-4020-b5ad-a41df1933103}/chrome/calendar/content/calendar/preferences/timezones.js
|
||||
lib/seamonkey/extensions/{e2fda1a4-762b-4020-b5ad-a41df1933103}/chrome/calendar/content/calendar/preferences/timezones.xul
|
||||
lib/seamonkey/extensions/{e2fda1a4-762b-4020-b5ad-a41df1933103}/chrome/calendar/content/calendar/preferences/views.js
|
||||
lib/seamonkey/extensions/{e2fda1a4-762b-4020-b5ad-a41df1933103}/chrome/calendar/content/calendar/preferences/views.xul
|
||||
lib/seamonkey/extensions/{e2fda1a4-762b-4020-b5ad-a41df1933103}/chrome/calendar/content/calendar/publish.js
|
||||
@@ -191,7 +234,9 @@ lib/seamonkey/extensions/{e2fda1a4-762b-4020-b5ad-a41df1933103}/chrome/icons/def
|
||||
lib/seamonkey/extensions/{e2fda1a4-762b-4020-b5ad-a41df1933103}/chrome/icons/default/calendar-event-summary-dialog.png
|
||||
lib/seamonkey/extensions/{e2fda1a4-762b-4020-b5ad-a41df1933103}/chrome/icons/default/calendar-task-dialog.png
|
||||
lib/seamonkey/extensions/{e2fda1a4-762b-4020-b5ad-a41df1933103}/chrome/icons/default/calendar-task-summary-dialog.png
|
||||
lib/seamonkey/extensions/{e2fda1a4-762b-4020-b5ad-a41df1933103}/chrome/lightning-en-US.jar
|
||||
lib/seamonkey/extensions/{e2fda1a4-762b-4020-b5ad-a41df1933103}/chrome/lightning-en-US/locale/en-US/lightning/lightning-toolbar.dtd
|
||||
lib/seamonkey/extensions/{e2fda1a4-762b-4020-b5ad-a41df1933103}/chrome/lightning-en-US/locale/en-US/lightning/lightning.dtd
|
||||
lib/seamonkey/extensions/{e2fda1a4-762b-4020-b5ad-a41df1933103}/chrome/lightning-en-US/locale/en-US/lightning/lightning.properties
|
||||
lib/seamonkey/extensions/{e2fda1a4-762b-4020-b5ad-a41df1933103}/chrome/lightning/content/lightning/imip-bar-overlay.xul
|
||||
lib/seamonkey/extensions/{e2fda1a4-762b-4020-b5ad-a41df1933103}/chrome/lightning/content/lightning/imip-bar.js
|
||||
lib/seamonkey/extensions/{e2fda1a4-762b-4020-b5ad-a41df1933103}/chrome/lightning/content/lightning/lightning-calendar-creation.js
|
||||
@@ -245,6 +290,7 @@ lib/seamonkey/extensions/{e2fda1a4-762b-4020-b5ad-a41df1933103}/chrome/skin/comm
|
||||
lib/seamonkey/extensions/{e2fda1a4-762b-4020-b5ad-a41df1933103}/chrome/skin/common/today-pane.css
|
||||
lib/seamonkey/extensions/{e2fda1a4-762b-4020-b5ad-a41df1933103}/chrome/skin/common/widgets/calendar-widgets.css
|
||||
lib/seamonkey/extensions/{e2fda1a4-762b-4020-b5ad-a41df1933103}/chrome/skin/common/widgets/drag-center.svg
|
||||
lib/seamonkey/extensions/{e2fda1a4-762b-4020-b5ad-a41df1933103}/chrome/skin/common/widgets/minimonth.css
|
||||
lib/seamonkey/extensions/{e2fda1a4-762b-4020-b5ad-a41df1933103}/chrome/skin/common/widgets/nav-arrow.svg
|
||||
lib/seamonkey/extensions/{e2fda1a4-762b-4020-b5ad-a41df1933103}/chrome/skin/common/widgets/nav-today-hov.svg
|
||||
lib/seamonkey/extensions/{e2fda1a4-762b-4020-b5ad-a41df1933103}/chrome/skin/common/widgets/nav-today.svg
|
||||
@@ -436,10 +482,10 @@ lib/seamonkey/extensions/{e2fda1a4-762b-4020-b5ad-a41df1933103}/components/calWc
|
||||
lib/seamonkey/extensions/{e2fda1a4-762b-4020-b5ad-a41df1933103}/components/calbase.xpt
|
||||
lib/seamonkey/extensions/{e2fda1a4-762b-4020-b5ad-a41df1933103}/components/calbaseinternal.xpt
|
||||
lib/seamonkey/extensions/{e2fda1a4-762b-4020-b5ad-a41df1933103}/components/caldav.xpt
|
||||
lib/seamonkey/extensions/{e2fda1a4-762b-4020-b5ad-a41df1933103}/components/icaljs.manifest
|
||||
lib/seamonkey/extensions/{e2fda1a4-762b-4020-b5ad-a41df1933103}/components/icaljs-manifest
|
||||
lib/seamonkey/extensions/{e2fda1a4-762b-4020-b5ad-a41df1933103}/components/interfaces.manifest
|
||||
lib/seamonkey/extensions/{e2fda1a4-762b-4020-b5ad-a41df1933103}/components/libcalbasecomps.so
|
||||
lib/seamonkey/extensions/{e2fda1a4-762b-4020-b5ad-a41df1933103}/components/libical.manifest
|
||||
lib/seamonkey/extensions/{e2fda1a4-762b-4020-b5ad-a41df1933103}/components/libical-manifest
|
||||
lib/seamonkey/extensions/{e2fda1a4-762b-4020-b5ad-a41df1933103}/components/lightningTextCalendarConverter.js
|
||||
lib/seamonkey/extensions/{e2fda1a4-762b-4020-b5ad-a41df1933103}/components/lightningTextCalendarConverter.manifest
|
||||
lib/seamonkey/extensions/{e2fda1a4-762b-4020-b5ad-a41df1933103}/components/wcap.xpt
|
||||
@@ -462,4 +508,4 @@ lib/seamonkey/extensions/{e2fda1a4-762b-4020-b5ad-a41df1933103}/modules/calUtils
|
||||
lib/seamonkey/extensions/{e2fda1a4-762b-4020-b5ad-a41df1933103}/modules/calViewUtils.jsm
|
||||
lib/seamonkey/extensions/{e2fda1a4-762b-4020-b5ad-a41df1933103}/modules/calXMLUtils.jsm
|
||||
lib/seamonkey/extensions/{e2fda1a4-762b-4020-b5ad-a41df1933103}/modules/ical.js
|
||||
lib/seamonkey/extensions/{e2fda1a4-762b-4020-b5ad-a41df1933103}/timezones.sqlite
|
||||
lib/seamonkey/extensions/{e2fda1a4-762b-4020-b5ad-a41df1933103}/timezones/zones.json
|
||||
|
||||
+50
-54
@@ -1,15 +1,11 @@
|
||||
$NetBSD: distinfo,v 1.121 2015/03/26 20:41:53 ryoon Exp $
|
||||
$NetBSD: distinfo,v 1.123 2015/09/21 05:03:45 ryoon Exp $
|
||||
|
||||
SHA1 (enigmail-1.8.1.tar.gz) = 2ddd71a752c8cfc0b110c9a05bddf16b4d5b59db
|
||||
RMD160 (enigmail-1.8.1.tar.gz) = 2c4c53d02901198f1111f47f31f5d7721e19fd5b
|
||||
Size (enigmail-1.8.1.tar.gz) = 1592706 bytes
|
||||
SHA1 (seamonkey-2.33.1.source.tar.bz2) = f50a8ca1590a046dbdcf5d33396b9d4c2a5bc2a9
|
||||
RMD160 (seamonkey-2.33.1.source.tar.bz2) = d454b105854dbb31f5811cc036ffc48807a5652a
|
||||
Size (seamonkey-2.33.1.source.tar.bz2) = 203015246 bytes
|
||||
SHA1 (patch-aa) = 21421051f61d852631ac510fac1372048c91ecb5
|
||||
SHA1 (patch-ak) = 5495058581061d5291a0d3d329c146a926d5fbf2
|
||||
SHA1 (seamonkey-2.35.source.tar.bz2) = 309078b0e2d7d1d25ef57e12df679bc3bbccfa81
|
||||
RMD160 (seamonkey-2.35.source.tar.bz2) = 6ce430d36a82e18b389b88e9dbad4226189db13e
|
||||
Size (seamonkey-2.35.source.tar.bz2) = 204983795 bytes
|
||||
SHA1 (patch-aa) = 9cd28dd4c16d7fb676bcaed5cc3dbf5076d7a212
|
||||
SHA1 (patch-al) = 2643bc1585ec320c63acb5d47c34573a517cd3db
|
||||
SHA1 (patch-ao) = 2185bc6e95e08f6b4279f4c64db09b56ea7e880a
|
||||
SHA1 (patch-ao) = 5eb1edb50dce02e4756b95cefc9c3a7236282897
|
||||
SHA1 (patch-as) = dee521998229f57e17fdf04f22d366d5daa44f8b
|
||||
SHA1 (patch-bf) = cf7fef695c6db66a3653d3258a2385c6f1eb709e
|
||||
SHA1 (patch-bg) = 9aba8618a4f0777527c6e7af33cb234cb0627501
|
||||
@@ -17,33 +13,34 @@ SHA1 (patch-ldap_sdks_c-sdk_build.mk) = 541604f0f63f5c1b3ce5509260517f68f417eb73
|
||||
SHA1 (patch-ldap_sdks_c-sdk_ldap_include_portable.h) = 4ce9e1a0e8f0d05367243e8d2b5118606a35da94
|
||||
SHA1 (patch-mail_app_Makefile.in) = 4d69a03cac313bd7f55c6dd5a54d8d361c3a9131
|
||||
SHA1 (patch-mailnews_base_search_src_nsMsgSearchTerm.cpp) = 0cbabcf5b188e86404e3ded8452c73a7f498efe3
|
||||
SHA1 (patch-mozilla_accessible_atk_Platform.cpp) = c5f43a6b66fcf8a6c242b2b9400679e44b5ee8e8
|
||||
SHA1 (patch-mozilla_b2g_installer_Makefile.in) = 9281d16c242b7e7d8608244363bd32ab431fc5f0
|
||||
SHA1 (patch-mozilla_b2g_installer_package-manifest.in) = 2de99fe5dc609e0955d5b20d78813143c461e40f
|
||||
SHA1 (patch-mozilla_browser_app_nsBrowserApp.cpp) = 895b2e788b924ab0d5f7ac7c264d3e8e1c5934ed
|
||||
SHA1 (patch-mozilla_browser_app_nsBrowserApp.cpp) = b2a9784925d95947194d7ad3a4812abd91728b9d
|
||||
SHA1 (patch-mozilla_browser_installer_package-manifest.in) = 84825ae3eb2ed39da9792e890a5bfbf8fa7e4708
|
||||
SHA1 (patch-mozilla_build_autoconf_compiler-opts.m4) = 1970fa246049adde4f2338ccd51f3651081bea56
|
||||
SHA1 (patch-mozilla_build_autoconf_nss.m4) = 3b05127e72a76ac2f87c8362cbde13ce76485a19
|
||||
SHA1 (patch-mozilla_build_autoconf_nss.m4) = afe8d308f6258708b3f61cb45c2cf090b21d16fa
|
||||
SHA1 (patch-mozilla_build_gyp.mozbuild) = 6362ff65a0ade82ed5145cb5a278b58bc3d827e5
|
||||
SHA1 (patch-mozilla_build_pgo_profileserver.py) = 33acdc58e155ada7a4090bf3dcb7d2ba39ced1dd
|
||||
SHA1 (patch-mozilla_config_Makefile.in) = 3806a60bbdc2f54d0fc974e245bfc9e5c3057ece
|
||||
SHA1 (patch-mozilla_config_Makefile.in) = 07277b79bd759b961e11883a6940250e5c66fbf4
|
||||
SHA1 (patch-mozilla_config_baseconfig.mk) = 09754212f7c01fc4effc2698fea5b12b12ec022a
|
||||
SHA1 (patch-mozilla_config_external_moz.build) = 172f2066e14f38ac56defc76b41e0f3104f6674d
|
||||
SHA1 (patch-mozilla_config_external_moz.build) = 7777843430a0074c59f2a7a6a16f6f6f86b52b3b
|
||||
SHA1 (patch-mozilla_config_rules.mk) = ce24fd149c05a252acffc05a72dc0f86eabe16b4
|
||||
SHA1 (patch-mozilla_config_stl__wrappers_ios) = 9200935d025d899a5810dc615345b9a7005369b2
|
||||
SHA1 (patch-mozilla_config_stl__wrappers_ostream) = 232e253bca5d8f7f0de1b880dc34b613f8852ee7
|
||||
SHA1 (patch-mozilla_config_system-headers) = 13aaec8d3a4a45da6e26fe05ddeccb31d007876a
|
||||
SHA1 (patch-mozilla_config_system__wrappers_unwind.h) = e88b3a5d1f884bc645762a74f95bc4b7e360c9bf
|
||||
SHA1 (patch-mozilla_config_system-headers) = 35e01aa6f0fdb7299ea5ee4d07a7aa1b95d5b381
|
||||
SHA1 (patch-mozilla_config_system__wrappers_unwind.h) = e1e0b68c13af61edd54a6f12d63a8da3ddb21132
|
||||
SHA1 (patch-mozilla_dom_base_moz.build) = de05328ca4339e0e3a92da3e4517697df9d3b53a
|
||||
SHA1 (patch-mozilla_dom_media_AudioStream.h) = 92029dfdf3cfd168b88e313806340db9d13d408f
|
||||
SHA1 (patch-mozilla_dom_media_gmp_GMPChild.cpp) = 39bd9871057efd69853f26b2230f58bcf9e4c94b
|
||||
SHA1 (patch-mozilla_dom_media_gmp_GMPParent.cpp) = 8e3c3738e80c63503b34d20437a389e595cf4acb
|
||||
SHA1 (patch-mozilla_dom_media_gstreamer_GStreamerAllocator.cpp) = c160b78d4ea5058df602c74be43be9476cb78d1f
|
||||
SHA1 (patch-mozilla_dom_media_moz.build) = 5d6e2ce865bf96c4efc271eb99f1065e9ee2d627
|
||||
SHA1 (patch-mozilla_dom_plugins_ipc_PluginModuleChild.cpp) = 16a7d1d6d951911f966f85e9cacf7c742681c332
|
||||
SHA1 (patch-mozilla_dom_media_moz.build) = e21f162f6fb2f053e3e04a8273033b92bd6a75dd
|
||||
SHA1 (patch-mozilla_dom_plugins_ipc_PluginModuleChild.cpp) = 005a611073f3a8b865d19e7204df9d40e5e1c3ff
|
||||
SHA1 (patch-mozilla_dom_plugins_ipc_PluginModuleChild.h) = 14038ce0ee2b38db6c7952056a97a65839a2c1a9
|
||||
SHA1 (patch-mozilla_dom_plugins_ipc_PluginProcessChild.cpp) = ef2b3f3c134be64c9dbb688e36a8b767c25a008a
|
||||
SHA1 (patch-mozilla_dom_system_OSFileConstants.cpp) = 9faf89e6dbaced276077c5f1ff9c726991d5675c
|
||||
SHA1 (patch-mozilla_extensions_spellcheck_hunspell_src_mozHunspell.cpp) = 186f9e6e064f84c16143a843e8d19f4d4975a49b
|
||||
SHA1 (patch-mozilla_extensions_spellcheck_hunspell_src_mozHunspell.cpp) = bb4a892fb7761bf39caf29877fbb7edb9704423c
|
||||
SHA1 (patch-mozilla_gfx_graphite2_moz-gr-update.sh) = ba55405496adf27442dd26a5420397e51a784539
|
||||
SHA1 (patch-mozilla_gfx_graphite2_src_Bidi.cpp) = fb97becdfeeea742e8c0bc51e10efc124a2a11f3
|
||||
SHA1 (patch-mozilla_gfx_moz.build) = 9cd67c170321c399b85f9f7729a6d130bb331f17
|
||||
@@ -52,9 +49,9 @@ SHA1 (patch-mozilla_gfx_skia_moz.build) = 32a5330cecb8b4dadd823bc13aebc1e5891c39
|
||||
SHA1 (patch-mozilla_gfx_thebes_moz.build) = c9fc7811cf24c735f1f829f206af5d8bba27d505
|
||||
SHA1 (patch-mozilla_gfx_ycbcr_moz.build) = 263c37980558d485e868a7097689cdf35c5f678d
|
||||
SHA1 (patch-mozilla_gfx_ycbcr_yuv__row__arm.S) = 74c70bad49b9781dae6be4fd46c33da886bcfd34
|
||||
SHA1 (patch-mozilla_image_decoders_nsJPEGDecoder.cpp) = b64b83c9abd0a9b454fbb6061278e51c6754a193
|
||||
SHA1 (patch-mozilla_image_decoders_nsJPEGDecoder.cpp) = 4ba95ca821e8367e97530e9d7e6cafc1cbdf581b
|
||||
SHA1 (patch-mozilla_intl_hyphenation_hnjalloc.h) = ec6eeebc8d7edb2f6d021d22d9621b057141c736
|
||||
SHA1 (patch-mozilla_intl_unicharutil_util_moz.build) = 20a291273822f4e6a8310ca98408ca30da94b686
|
||||
SHA1 (patch-mozilla_intl_unicharutil_util_moz.build) = af054bca1355939dba6df16e4328eb6826354b44
|
||||
SHA1 (patch-mozilla_ipc_chromium_Makefile.in) = 78241924f121b0344b2fe5a42413eddf9cc3e7fd
|
||||
SHA1 (patch-mozilla_ipc_chromium_moz.build) = 1a651bbf83cad22c6e4514804daeb6d111edcc3f
|
||||
SHA1 (patch-mozilla_ipc_chromium_src_base_atomicops.h) = e7ef5b1f94f7121846cab97cddabfbfd207b730e
|
||||
@@ -78,26 +75,27 @@ SHA1 (patch-mozilla_ipc_glue_moz.build) = 28377845abc15356181f6c3b640391bad2b004
|
||||
SHA1 (patch-mozilla_ipc_ipdl_ipdl_cxx_ast.py) = 9e193b1f50b05573d3c580bd629b21c7ee38ef61
|
||||
SHA1 (patch-mozilla_ipc_ipdl_ipdl_cxx_cgen.py) = d7f0c9af3df86236c5dc754aa2e8c8393f1b2446
|
||||
SHA1 (patch-mozilla_ipc_ipdl_ipdl_lower.py) = b77cdb2593bd264843167742211a1746d02f25af
|
||||
SHA1 (patch-mozilla_js_public_CallArgs.h) = ec3cde3ab4ace75c143398a079522cab1305640c
|
||||
SHA1 (patch-mozilla_js_src_Makefile.in) = 714f47ab1f8833618f1558c3049ac8a5d97a66c7
|
||||
SHA1 (patch-mozilla_js_src_asmjs_AsmJSSignalHandlers.cpp) = 9df8c3e48040396c7232f80b0e96ba41a81a4523
|
||||
SHA1 (patch-mozilla_js_src_asmjs_AsmJSSignalHandlers.cpp) = efe5fbf8fa7d18839e9a43b7350ac45f679b5728
|
||||
SHA1 (patch-mozilla_js_src_ctypes_CTypes.h) = 37ef9e49c21199d8506e7c0c048a7651800a249a
|
||||
SHA1 (patch-mozilla_js_src_frontend_ParseMaps.cpp) = af9c153c78a3d50e926f7820db3c98b7fe1db063
|
||||
SHA1 (patch-mozilla_js_src_gc_Memory.cpp) = 89c6b8d6a35c0168e8d28ea4daa205c154a56a2a
|
||||
SHA1 (patch-mozilla_js_src_gc_Statistics.cpp) = 8940aea6179c00a187df598cd4e9faf1c581f860
|
||||
SHA1 (patch-mozilla_js_src_jit_ExecutableAllocator.h) = 5687ea907bcbe66a1a1c4de2a37879119fa68e47
|
||||
SHA1 (patch-mozilla_js_src_jit_LIR.cpp) = 1fd3e14c30aef91cba99be6dec61446ac9820157
|
||||
SHA1 (patch-mozilla_js_src_jit_MIR.cpp) = fe9c165234c7796697b58bd06b8708e17e7b5e80
|
||||
SHA1 (patch-mozilla_js_src_jit_arm_Architecture-arm.cpp) = e855d5d835b4ac75aa99c19be252e6dd1738035c
|
||||
SHA1 (patch-mozilla_js_src_jsapi.cpp) = fded9355907bc06175dcab4416dc550ba585ec34
|
||||
SHA1 (patch-mozilla_js_src_jit_ExecutableAllocator.h) = 97aed14de401070a8376321d8ef30aa9223099c1
|
||||
SHA1 (patch-mozilla_js_src_jit_LIR.cpp) = f8a3bc7677aaf46d132cb192975ca699b2b1ac62
|
||||
SHA1 (patch-mozilla_js_src_jit_MIR.cpp) = a373006ed518cbde9a31a5b0142f5b32c1565551
|
||||
SHA1 (patch-mozilla_js_src_jit_arm_Architecture-arm.cpp) = 8a21c200dfd0854765774642de7ffa9d7fb04541
|
||||
SHA1 (patch-mozilla_js_src_jsapi.cpp) = e6a3ff44a05a46875dfbf85d9207b7c29139fa21
|
||||
SHA1 (patch-mozilla_js_src_jsdate.cpp) = 459f93773b7dbc8de85509971e7aab2770916ca3
|
||||
SHA1 (patch-mozilla_js_src_jskwgen.cpp) = efcb5898c6ddcd012bf37ff04dcbb223e753ee94
|
||||
SHA1 (patch-mozilla_js_src_jsmath.cpp) = 25225d4b9f05766314dfb7a809e8f4cf7ffa1f4b
|
||||
SHA1 (patch-mozilla_js_src_shell_jsoptparse.cpp) = 962a545ae4742b0dc871ddefe071965a213df2a5
|
||||
SHA1 (patch-mozilla_js_src_shell_jsoptparse.cpp) = f58e2dabde4638d84296240eeaea268f1479331b
|
||||
SHA1 (patch-mozilla_js_src_vm_SPSProfiler.cpp) = f609c8f2feac9aa6d5a6f37bf4ac0270bde7e8a4
|
||||
SHA1 (patch-mozilla_js_xpconnect_src_XPCConvert.cpp) = d866b89d5d741125430c0e3ac900c7ead401a495
|
||||
SHA1 (patch-mozilla_js_xpconnect_src_xpcprivate.h) = 56e9de48605f2310fdc2777b4fcab8ce2de50d0a
|
||||
SHA1 (patch-mozilla_media_libcubeb_AUTHORS) = 1a516754289470319fd181315f0bc7a04a4aaf85
|
||||
SHA1 (patch-mozilla_media_libcubeb_src_cubeb.c) = f4018f850cfd2b73226c66dbddb310e1efe40475
|
||||
SHA1 (patch-mozilla_media_libcubeb_src_cubeb__alsa.c) = 808a1d8d4b8d6dbc3d16d8b7f1280234703a114e
|
||||
SHA1 (patch-mozilla_media_libcubeb_src_cubeb__alsa.c) = 4931e241c940570a9be71419258babded4534950
|
||||
SHA1 (patch-mozilla_media_libcubeb_src_cubeb__oss.c) = 808c5b237e83c9db99095def1ef546fdb3ad3b3c
|
||||
SHA1 (patch-mozilla_media_libcubeb_src_moz.build) = 1dd0bbca331d487b589b582c6ad9d6324003e519
|
||||
SHA1 (patch-mozilla_media_libpng_pngpriv.h) = b3bf9d7aeaf00a7cd0c9cc491fe6ac474c002655
|
||||
@@ -116,53 +114,51 @@ SHA1 (patch-mozilla_media_libvorbis_moz.build) = fb6fcfe90569aac85a78013f8ac7769
|
||||
SHA1 (patch-mozilla_media_libyuv_include_libyuv_scale__row.h) = c61f35af1a6cf9f71041c8871cff3a0b22e6593b
|
||||
SHA1 (patch-mozilla_media_mtransport_third__party_nICEr_src_util_mbslen.c) = 7990869143e4edb253b1cd67ab20c78ca2a573ea
|
||||
SHA1 (patch-mozilla_media_mtransport_third__party_nrappkit_src_port_generic_include_sys_queue.h) = 9e3198f44e9689d98b538efd62c9bfb66a10277e
|
||||
SHA1 (patch-mozilla_media_webrtc_signaling_signaling.gyp) = 4b24e7c4c96c25613a912a559c7b0191f43daeec
|
||||
SHA1 (patch-mozilla_media_webrtc_signaling_test_moz.build) = 05a191e253420669b140d680cd74f90949c9d3cc
|
||||
SHA1 (patch-mozilla_media_webrtc_trunk_webrtc_build_common.gypi) = 523391b109802a604c90c30af6d06b45e14554ab
|
||||
SHA1 (patch-mozilla_media_webrtc_trunk_webrtc_modules_audio__coding_codecs_opus_opus.gypi) = 52b95a931d931d51e5dc8260cff745089dc349a0
|
||||
SHA1 (patch-mozilla_media_webrtc_trunk_webrtc_modules_audio__coding_codecs_opus_opus.gypi) = 14abbffa0223f003bf220f6c7ee4020f4a616623
|
||||
SHA1 (patch-mozilla_media_webrtc_trunk_webrtc_modules_audio__coding_neteq_neteq.gypi) = 43ecabebe2026907719551f7bb67fe97c2981344
|
||||
SHA1 (patch-mozilla_media_webrtc_trunk_webrtc_modules_desktop__capture_screen__capturer.cc) = 11477be4a67107f2a6e0e7a2cf3fff38164270ed
|
||||
SHA1 (patch-mozilla_media_webrtc_trunk_webrtc_modules_desktop__capture_screen__capturer.h) = 0726d82c269532750b93eb3f4104f96ceceea6b4
|
||||
SHA1 (patch-mozilla_media_webrtc_trunk_webrtc_modules_video__capture_linux_device__info__linux.cc) = ef8baef63c072f34a3d7137f0ea286a93e8793c4
|
||||
SHA1 (patch-mozilla_media_webrtc_trunk_webrtc_modules_video__capture_linux_video__capture__linux.cc) = 80cb51d4641de3eb69c23c33867661413df9357d
|
||||
SHA1 (patch-mozilla_media_webrtc_trunk_webrtc_modules_video__capture_video__capture.gypi) = 3dcb786a83d9daf8aed8f7eaf2a761de9df7ccc9
|
||||
SHA1 (patch-mozilla_media_webrtc_trunk_webrtc_modules_video__coding_main_source_receiver.cc) = 9e75e1e55b80dab35c71aef1777a84dd6e43034d
|
||||
SHA1 (patch-mozilla_media_webrtc_trunk_webrtc_system__wrappers_source_spreadsortlib_spreadsort.hpp) = e35964a2e645125e014ee10a2a9cc923dc2a238c
|
||||
SHA1 (patch-mozilla_memory_build_mozjemalloc__compat.c) = edad841566cdd9da8475a79910781fa8a8dad00a
|
||||
SHA1 (patch-mozilla_media_webrtc_trunk_webrtc_modules_video__capture_video__capture.gypi) = cafc491b64cbc4fffb812ee8236c25915f3cc5f8
|
||||
SHA1 (patch-mozilla_media_webrtc_trunk_webrtc_system__wrappers_source_spreadsortlib_spreadsort.hpp) = 0e6a4a26ca61f73be72be2309aca8e3523c3f4b1
|
||||
SHA1 (patch-mozilla_memory_build_mozjemalloc__compat.c) = 857e06f47a4af1b2c5309db3f98885dea6eedde4
|
||||
SHA1 (patch-mozilla_memory_jemalloc_Makefile.in) = 711184596fedbafea25be1fd708eaaa429dc067c
|
||||
SHA1 (patch-mozilla_memory_jemalloc_src_configure) = a20a0bfe688b6b92ac56eaacb2479c542326b277
|
||||
SHA1 (patch-mozilla_memory_mozalloc_VolatileBufferOSX.cpp) = 9c4614bc438b90c6eeff2ea643192b268910638d
|
||||
SHA1 (patch-mozilla_memory_jemalloc_src_configure) = 9759c7dd893a58d123da3ceec961753fe0b591c0
|
||||
SHA1 (patch-mozilla_memory_mozalloc_mozalloc__abort.cpp) = d7d97bc0d6f2804bb09423e7fa1150b3247b93ad
|
||||
SHA1 (patch-mozilla_memory_volatile_VolatileBufferOSX.cpp) = 5a2addaa0d46ab8a58849f5da5876ac48a5917a0
|
||||
SHA1 (patch-mozilla_mfbt_Alignment.h) = 74e67cdaa109db06a5d72a33c826102ac672e757
|
||||
SHA1 (patch-mozilla_mfbt_Attributes.h) = 2e47958d46edf5d5d23cf6635e083f7b00d6b041
|
||||
SHA1 (patch-mozilla_mfbt_Attributes.h) = ed8cafeadb7a9d188f560ccb134eaf19047f3acc
|
||||
SHA1 (patch-mozilla_mfbt_Poison.cpp) = 8a45775687244c6d1d6e422dbaa2364862fb33b7
|
||||
SHA1 (patch-mozilla_mobile_android_installer_Makefile.in) = 51a82959db4a672c1e9c6aa7178d72c80406f35a
|
||||
SHA1 (patch-mozilla_mobile_android_installer_package-manifest.in) = 53aab8a32f10eb110fe16a35601abb76e8184b91
|
||||
SHA1 (patch-mozilla_modules_libjar_nsZipArchive.cpp) = a399e0bd0e83c47938bbee077eaa79fc52386241
|
||||
SHA1 (patch-mozilla_netwerk_base_public_nsNetUtil.h) = f4ea538b3166d2336dca932affae644a0f037714
|
||||
SHA1 (patch-mozilla_netwerk_dns_Makefile.in) = 20fe4e68220ebe49556d1505a99f34002f357ee3
|
||||
SHA1 (patch-mozilla_netwerk_dns_moz.build) = 67b664fac0bf1542debfca570251622e43fd869b
|
||||
SHA1 (patch-mozilla_netwerk_base_nsNetUtil.h) = 1595be8a1cc0520db923c69934eb9a4567a1dd6a
|
||||
SHA1 (patch-mozilla_netwerk_dns_moz.build) = 08449c0c0f7491c86ea5ffcfe109cffaf59268f2
|
||||
SHA1 (patch-mozilla_netwerk_protocol_http_Http2Session.cpp) = 91b725fcddd276a45eabbc7218ec194d970f44e8
|
||||
SHA1 (patch-mozilla_netwerk_wifi_moz.build) = 69fcddff29dfe3a0001561ceaa06f2c1ca15d20e
|
||||
SHA1 (patch-mozilla_netwerk_wifi_nsWifiScannerFreeBSD.cpp) = 2ac991e5ddee0862f8ba7d7cd5966552dc70b720
|
||||
SHA1 (patch-mozilla_security_manager_ssl_src_nsNSSComponent.cpp) = 0ab4f1ff35d400159d4227b39fde956eb0fbe96e
|
||||
SHA1 (patch-mozilla_toolkit_components_osfile_modules_osfile__unix__back.jsm) = abf9d1bb447264172ac7e7421e98113d926f44cd
|
||||
SHA1 (patch-mozilla_toolkit_components_osfile_modules_osfile__unix__front.jsm) = 9637d1ecc330845c43b02ab75873c2c1f4e446a2
|
||||
SHA1 (patch-mozilla_toolkit_library_moz.build) = 58482170e1a9db292627e1880f86b1b5d1389331
|
||||
SHA1 (patch-mozilla_toolkit_modules_GMPInstallManager.jsm) = efdffba110265916fcddfd0396366ecddc89d987
|
||||
SHA1 (patch-mozilla_toolkit_mozapps_extensions_internal_OpenH264Provider.jsm) = 4db8e40a60754cf7216039deb6726ef97563d9a4
|
||||
SHA1 (patch-mozilla_toolkit_library_moz.build) = ce5cf8db841d8161ee661f54bd30aa37cb08eaf5
|
||||
SHA1 (patch-mozilla_toolkit_modules_GMPInstallManager.jsm) = a9474a17fd78874bf6e646812d07cc5fa4d8deb6
|
||||
SHA1 (patch-mozilla_toolkit_modules_GMPUtils.jsm) = 2e4ea40458200837de154fc9e854b06ad7d41777
|
||||
SHA1 (patch-mozilla_toolkit_mozapps_extensions_internal_GMPProvider.jsm) = c65f084cee178bbf427cd1851b1e9c71757ff282
|
||||
SHA1 (patch-mozilla_toolkit_xre_nsAppRunner.cpp) = 6ce047ed4a029f0935ebc9c297e99c8b9ccd76f1
|
||||
SHA1 (patch-mozilla_toolkit_xre_nsEmbedFunctions.cpp) = 70030e59b2ed09b9bc9827d35e17b12be7f0cd71
|
||||
SHA1 (patch-mozilla_webapprt_moz.build) = 8323bfea8fe835571bf60d95cfa59859b745083f
|
||||
SHA1 (patch-mozilla_widget_gtk_gtk3drawing.c) = 77fa2626fefa09e76eadda1fcd341a5c05fa565d
|
||||
SHA1 (patch-mozilla_widget_gtk_nsLookAndFeel.cpp) = f8156a206e82e8c6c4d020e50df791253ae7397d
|
||||
SHA1 (patch-mozilla_widget_gtk_nsLookAndFeel.h) = 7d8d06975af97f54e50754f57c7ae9152e3fa9d2
|
||||
SHA1 (patch-mozilla_xpcom_base_nsStackWalk.cpp) = 9edfb7d97266513eabdc4c2acbcdae3cd6aed154
|
||||
SHA1 (patch-mozilla_widget_gtk_gtk2drawing.c) = 28af6a3f8cf02529f2e5eecde364ada9b240cc9f
|
||||
SHA1 (patch-mozilla_widget_gtk_gtk3drawing.c) = bb7e5a14cc07728f4cde0da8c910f8613b8905e3
|
||||
SHA1 (patch-mozilla_widget_gtk_gtkdrawing.h) = 551c77abb3c8513a57ea9d3a1812e08af42f3975
|
||||
SHA1 (patch-mozilla_widget_gtk_nsNativeThemeGTK.cpp) = 860d108a98343f40de29c9e37fb67f3cc9edc635
|
||||
SHA1 (patch-mozilla_xpcom_base_nsStackWalk.cpp) = b083411381ba2e06f6da50ac2ae9ee9f8bcbda8d
|
||||
SHA1 (patch-mozilla_xpcom_base_nscore.h) = a69c532d2891ac2a2227445e85e581749685153e
|
||||
SHA1 (patch-mozilla_xpcom_build_PoisonIOInterposer.h) = aa3e168c7c23ad6e63f521044336a03354ec9030
|
||||
SHA1 (patch-mozilla_xpcom_build_XPCOMInit.cpp) = eab706573133ba1cec868b5f854693d5e7c935f7
|
||||
SHA1 (patch-mozilla_xpcom_build_XPCOMInit.cpp) = e7c5cbd373f8a69af31aa17b1edc1539dac4d0f1
|
||||
SHA1 (patch-mozilla_xpcom_glue_standalone_nsXPCOMGlue.cpp) = 87924ccc21ef5d1cc6adadfa4ce3c14d4fd1d33b
|
||||
SHA1 (patch-mozilla_xpcom_reflect_xptcall_md_unix_Makefile.in) = 2681b1371352c8b0c0f7a574e89da9e2b41ed5cd
|
||||
SHA1 (patch-mozilla_xpcom_reflect_xptcall_md_unix_moz.build) = 54b4efb465302fccd34d8d83e41071032a5d43a7
|
||||
SHA1 (patch-mozilla_xpcom_reflect_xptcall_md_unix_moz.build) = b7006f11bd451dfeaacd9c1d53deba74fbe4f1fd
|
||||
SHA1 (patch-mozilla_xpcom_reflect_xptcall_md_unix_xptcinvoke__arm__netbsd.cpp) = cb2a4769f04351e92580e3daaca88fc7f1dfedbd
|
||||
SHA1 (patch-mozilla_xpcom_reflect_xptcall_md_unix_xptcinvoke__asm__mips.S) = fd7da8e0a424030e5a4a129d6dda521459d8ab73
|
||||
SHA1 (patch-mozilla_xpcom_reflect_xptcall_md_unix_xptcinvoke__asm__ppc__netbsd.s) = 4ba8ce148b5cd8df3dd02ec623a7da4ac5309473
|
||||
@@ -178,5 +174,5 @@ SHA1 (patch-mozilla_xpcom_reflect_xptcall_md_unix_xptcstubs__netbsd__m68k.cpp) =
|
||||
SHA1 (patch-mozilla_xulrunner_installer_Makefile.in) = 013e4de8500a17deb6c68bd1cd3072bed5785fa0
|
||||
SHA1 (patch-pb) = 0ce511845a30024e1abd357c24ecb925d81e1db1
|
||||
SHA1 (patch-pc) = a1995c9ef5d675b5a8826390cd94abdf0e4b48a7
|
||||
SHA1 (patch-rc) = e4dbdbb142869c84cc9a79d54b72352db4afdfc0
|
||||
SHA1 (patch-rc) = 38106f1ea13061f1b65c4875569bb27d6e42c5b3
|
||||
SHA1 (patch-suite_installer_Makefile.in) = ec8d455118fa3f64762f91c32027d712b58f5ea5
|
||||
|
||||
@@ -1,62 +0,0 @@
|
||||
# $NetBSD: enigmail.mk,v 1.17 2015/03/28 22:12:27 ryoon Exp $
|
||||
#
|
||||
# This Makefile fragment hooks the Enigmail OpenPGP extension
|
||||
# (see http://www.mozilla-enigmail.org/ ) into the build.
|
||||
|
||||
ENIGMAIL_DIST= enigmail-1.8.1.tar.gz
|
||||
XPI_FILES+= ${WRKDIR}/enigmail.xpi
|
||||
.if !defined(DISTFILES)
|
||||
DISTFILES= ${DEFAULT_DISTFILES}
|
||||
.endif
|
||||
DISTFILES+= ${ENIGMAIL_DIST}
|
||||
SITES.${ENIGMAIL_DIST}= http://www.mozilla-enigmail.org/download/source/
|
||||
#SITES.${ENIGMAIL_DIST}= https://dev.gentoo.org/~polynomial-c/mozilla/
|
||||
|
||||
DEPENDS+= gnupg2-[0-9]*:../../security/gnupg2
|
||||
FIND_PREFIX:= GNUPG2DIR=gnupg2
|
||||
.include "../../mk/find-prefix.mk"
|
||||
|
||||
PLIST_SRC+= PLIST.enigmail
|
||||
|
||||
TARGET_XPCOM_ABI= ${MACHINE_ARCH:S/i386/x86/}-gcc3
|
||||
PLIST_SUBST+= TARGET_XPCOM_ABI=${TARGET_XPCOM_ABI}
|
||||
|
||||
USE_TOOLS+= patch pax
|
||||
|
||||
REPLACE_PERL+= ${WRKSRC}/${OBJDIR}/mailnews/extensions/enigmail/util/fixlang.pl
|
||||
|
||||
SUBST_CLASSES+= gpg2
|
||||
SUBST_STAGE.gpg2= pre-configure
|
||||
SUBST_MESSAGE.gpg2= Setting GnuPG2 command
|
||||
SUBST_FILES.gpg2+= ${WRKSRC}/${OBJDIR}/mailnews/extensions/enigmail/package/prefs/enigmail.js
|
||||
SUBST_SED.gpg2+= -e 's|"extensions.enigmail.agentPath","|"extensions.enigmail.agentPath","${GNUPG2DIR}/bin/gpg2"|'
|
||||
|
||||
post-extract: enigmail-post-extract
|
||||
.PHONY: enigmail-post-extract
|
||||
enigmail-post-extract:
|
||||
${RUN} mkdir ${WRKSRC}/${OBJDIR}/mailnews/extensions
|
||||
${RUN} mv ${WRKDIR}/enigmail ${WRKSRC}/${OBJDIR}/mailnews/extensions
|
||||
${RUN} cd ${WRKSRC}/${OBJDIR} && \
|
||||
${PATCH} < ${FILESDIR}/mailnews_extensions_enigmail_ipc_modules_subprocess.jsm && \
|
||||
${PATCH} < ${FILESDIR}/patch-mailnews_extensions_enigmail_Makefile
|
||||
|
||||
post-configure: enigmail-post-configure
|
||||
.PHONY: enigmail-post-configure
|
||||
enigmail-post-configure:
|
||||
cd ${WRKSRC}/${OBJDIR}/mailnews/extensions/enigmail && \
|
||||
${SETENV} ${CONFIGURE_ENV} \
|
||||
./configure --prefix=${PREFIX}
|
||||
|
||||
# We need to do a switcheroo of the dist directory while building enigmail;
|
||||
# otherwise we get extra files contamination in the PLIST.
|
||||
post-build: enigmail-post-build
|
||||
.PHONY: enigmail-post-build
|
||||
enigmail-post-build:
|
||||
rm -rf ${WRKSRC}/${OBJDIR}/mozilla/dist.save
|
||||
cd ${WRKSRC}/${OBJDIR}/dist && pax -rwpe . ../dist.save
|
||||
cd ${WRKSRC}/${OBJDIR}/mailnews/extensions/enigmail && \
|
||||
${SETENV} ${MAKE_ENV} ${MAKE_PROGRAM} all xpi
|
||||
${CP} ${WRKSRC}/${OBJDIR}/mailnews/extensions/enigmail/build/enigmail*.xpi \
|
||||
${WRKDIR}/enigmail.xpi
|
||||
rm -rf ${WRKSRC}/${OBJDIR}/dist
|
||||
cd ${WRKSRC}/${OBJDIR}/dist.save && pax -rwpe . ../dist
|
||||
@@ -1,12 +0,0 @@
|
||||
$NetBSD: mailnews_extensions_enigmail_ipc_modules_subprocess.jsm,v 1.3 2015/03/26 20:41:53 ryoon Exp $
|
||||
|
||||
--- mailnews/extensions/enigmail/ipc/modules/subprocess.jsm.orig 2015-03-23 16:38:43.000000000 +0000
|
||||
+++ mailnews/extensions/enigmail/ipc/modules/subprocess.jsm
|
||||
@@ -341,6 +341,7 @@ function getPlatformValue(valueType) {
|
||||
'freebsd': [ 'libc.so.7', 0x04 , ctypes.int64_t , 8 ],
|
||||
'dragonfly':[ 'libc.so.8', 0x04, , ctypes.int64_t , 8 ],
|
||||
'gnu/kfreebsd': [ 'libc.so.0.1', 0x04 , ctypes.int64_t , 8 ],
|
||||
+ 'netbsd': [ 'libc.so', 0x04 , ctypes.int64_t , 8 ],
|
||||
'openbsd': [ 'libc.so.61.0', 0x04 , ctypes.int64_t , 8 ],
|
||||
'sunos': [ 'libc.so', 0x80 , ctypes.unsigned_long, 5 ]
|
||||
};
|
||||
@@ -1,23 +0,0 @@
|
||||
$NetBSD: patch-mailnews_extensions_enigmail_Makefile,v 1.1 2014/03/30 04:13:17 ryoon Exp $
|
||||
|
||||
--- mailnews/extensions/enigmail/Makefile.orig 2014-01-12 13:08:29.000000000 +0000
|
||||
+++ mailnews/extensions/enigmail/Makefile
|
||||
@@ -36,10 +36,18 @@ ifeq ($(OS_TARGET),Darwin)
|
||||
PLATFORM_STR = darwin
|
||||
endif
|
||||
|
||||
+ifeq ($(OS_TARGET),DragonFly)
|
||||
+PLATFORM_STR = dragonfly
|
||||
+endif
|
||||
+
|
||||
ifeq ($(OS_TARGET),FreeBSD)
|
||||
PLATFORM_STR = freebsd
|
||||
endif
|
||||
|
||||
+ifeq ($(OS_TARGET),NetBSD)
|
||||
+PLATFORM_STR = netbsd
|
||||
+endif
|
||||
+
|
||||
ifeq ($(OS_TARGET),OpenBSD)
|
||||
PLATFORM_STR = openbsd
|
||||
endif
|
||||
@@ -1,7 +1,7 @@
|
||||
# $NetBSD: options.mk,v 1.31 2015/03/17 19:50:42 ryoon Exp $
|
||||
# $NetBSD: options.mk,v 1.32 2015/07/01 13:02:30 ryoon Exp $
|
||||
|
||||
PKG_OPTIONS_VAR= PKG_OPTIONS.seamonkey
|
||||
PKG_SUPPORTED_OPTIONS= alsa debug mozilla-jemalloc mozilla-enigmail # gnome
|
||||
PKG_SUPPORTED_OPTIONS= alsa debug mozilla-jemalloc # gnome
|
||||
PKG_SUPPORTED_OPTIONS+= mozilla-lightning webrtc mozilla-chatzilla pulseaudio
|
||||
|
||||
PLIST_VARS+= debug gnome jemalloc
|
||||
@@ -62,10 +62,6 @@ CONFIGURE_ARGS+= --disable-debug --disable-debug-symbols
|
||||
CONFIGURE_ARGS+= --enable-install-strip
|
||||
.endif
|
||||
|
||||
.if !empty(PKG_OPTIONS:Mmozilla-enigmail) || make(distinfo)
|
||||
.include "enigmail.mk"
|
||||
.endif
|
||||
|
||||
.if !empty(PKG_OPTIONS:Mmozilla-lightning)
|
||||
CONFIGURE_ARGS+= --enable-calendar
|
||||
PLIST_SRC+= PLIST.lightning
|
||||
|
||||
@@ -1,8 +1,8 @@
|
||||
$NetBSD: patch-aa,v 1.26 2015/03/17 19:50:42 ryoon Exp $
|
||||
$NetBSD: patch-aa,v 1.27 2015/09/21 05:03:45 ryoon Exp $
|
||||
|
||||
--- mozilla/configure.in.orig 2015-03-09 05:34:34.000000000 +0000
|
||||
--- mozilla/configure.in.orig 2015-09-02 09:28:08.000000000 +0000
|
||||
+++ mozilla/configure.in
|
||||
@@ -1766,7 +1766,13 @@ Linux)
|
||||
@@ -1794,7 +1794,13 @@ Linux)
|
||||
MOZ_ENABLE_PROFILER_SPS=
|
||||
esac
|
||||
;;
|
||||
@@ -17,7 +17,7 @@ $NetBSD: patch-aa,v 1.26 2015/03/17 19:50:42 ryoon Exp $
|
||||
*)
|
||||
MOZ_ENABLE_PROFILER_SPS=
|
||||
;;
|
||||
@@ -1870,7 +1876,7 @@ case "$host" in
|
||||
@@ -1898,7 +1904,7 @@ case "$host" in
|
||||
;;
|
||||
|
||||
*-darwin*)
|
||||
@@ -26,7 +26,7 @@ $NetBSD: patch-aa,v 1.26 2015/03/17 19:50:42 ryoon Exp $
|
||||
HOST_NSPR_MDCPUCFG='\"md/_darwin.cfg\"'
|
||||
HOST_OPTIMIZE_FLAGS="${HOST_OPTIMIZE_FLAGS=-O3}"
|
||||
;;
|
||||
@@ -2002,7 +2008,6 @@ case "$target" in
|
||||
@@ -2022,7 +2028,6 @@ case "$target" in
|
||||
AC_DEFINE(XP_DARWIN)
|
||||
_PLATFORM_DEFAULT_TOOLKIT='cairo-uikit'
|
||||
else
|
||||
@@ -34,7 +34,7 @@ $NetBSD: patch-aa,v 1.26 2015/03/17 19:50:42 ryoon Exp $
|
||||
AC_DEFINE(XP_DARWIN)
|
||||
_PLATFORM_DEFAULT_TOOLKIT='cairo-cocoa'
|
||||
# The ExceptionHandling framework is needed for Objective-C exception
|
||||
@@ -2622,8 +2627,7 @@ MOZ_CXX11
|
||||
@@ -2641,8 +2646,7 @@ MOZ_CXX11
|
||||
|
||||
AC_LANG_C
|
||||
|
||||
@@ -44,7 +44,7 @@ $NetBSD: patch-aa,v 1.26 2015/03/17 19:50:42 ryoon Exp $
|
||||
dnl ===============================================================
|
||||
if test "$GNU_CC" -a "$OS_TARGET" != WINNT; then
|
||||
AC_DEFINE(HAVE_VISIBILITY_HIDDEN_ATTRIBUTE)
|
||||
@@ -3645,6 +3649,14 @@ if test -n "$YASM"; then
|
||||
@@ -3663,6 +3667,14 @@ if test -n "$YASM"; then
|
||||
_YASM_BUILD=` echo ${YASM_VERSION} | $AWK -F\. '{ print $4 }'`
|
||||
fi
|
||||
|
||||
@@ -59,7 +59,7 @@ $NetBSD: patch-aa,v 1.26 2015/03/17 19:50:42 ryoon Exp $
|
||||
if test -z "$SKIP_LIBRARY_CHECKS"; then
|
||||
dnl system JPEG support
|
||||
dnl ========================================================
|
||||
@@ -3672,11 +3684,7 @@ if test "$MOZ_NATIVE_JPEG" = 1; then
|
||||
@@ -3690,11 +3702,7 @@ if test "$MOZ_NATIVE_JPEG" = 1; then
|
||||
#include <jpeglib.h> ],
|
||||
[ #if JPEG_LIB_VERSION < $MOZJPEG
|
||||
#error "Insufficient JPEG library version ($MOZJPEG required)."
|
||||
@@ -72,7 +72,7 @@ $NetBSD: patch-aa,v 1.26 2015/03/17 19:50:42 ryoon Exp $
|
||||
MOZ_NATIVE_JPEG=1,
|
||||
AC_MSG_ERROR([Insufficient JPEG library version for --with-system-jpeg]))
|
||||
fi
|
||||
@@ -4391,6 +4399,10 @@ cairo-gonk)
|
||||
@@ -4392,6 +4400,10 @@ cairo-gonk)
|
||||
|
||||
esac
|
||||
|
||||
@@ -83,7 +83,16 @@ $NetBSD: patch-aa,v 1.26 2015/03/17 19:50:42 ryoon Exp $
|
||||
AC_SUBST(MOZ_PDF_PRINTING)
|
||||
if test "$MOZ_PDF_PRINTING"; then
|
||||
PDF_SURFACE_FEATURE="#define CAIRO_HAS_PDF_SURFACE 1"
|
||||
@@ -5131,6 +5143,9 @@ if test -n "$MOZ_WEBRTC"; then
|
||||
@@ -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
|
||||
MOZ_VPX=1
|
||||
MOZ_VPX_ERROR_CONCEALMENT=1
|
||||
|
||||
@@ -93,7 +102,7 @@ $NetBSD: patch-aa,v 1.26 2015/03/17 19:50:42 ryoon Exp $
|
||||
dnl enable once Signaling lands
|
||||
MOZ_WEBRTC_SIGNALING=1
|
||||
AC_DEFINE(MOZ_WEBRTC_SIGNALING)
|
||||
@@ -5234,6 +5249,57 @@ if test "${ac_cv_c_attribute_aligned}" !
|
||||
@@ -5252,6 +5267,157 @@ if test "${ac_cv_c_attribute_aligned}" !
|
||||
fi
|
||||
|
||||
dnl ========================================================
|
||||
@@ -127,7 +136,7 @@ $NetBSD: patch-aa,v 1.26 2015/03/17 19:50:42 ryoon Exp $
|
||||
+MOZ_NATIVE_VORBIS=)
|
||||
+
|
||||
+if test -n "$MOZ_NATIVE_VORBIS"; then
|
||||
+ PKG_CHECK_MODULES(MOZ_VORBIS, vorbis vorbisenc >= 1.3.4)
|
||||
+ PKG_CHECK_MODULES(MOZ_VORBIS, vorbis vorbisenc >= 1.3.5)
|
||||
+fi
|
||||
+
|
||||
+AC_SUBST(MOZ_NATIVE_VORBIS)
|
||||
@@ -148,13 +157,23 @@ $NetBSD: patch-aa,v 1.26 2015/03/17 19:50:42 ryoon Exp $
|
||||
+AC_SUBST(MOZ_NATIVE_TREMOR)
|
||||
+
|
||||
+dnl ========================================================
|
||||
dnl = Disable Opus audio codec support
|
||||
dnl ========================================================
|
||||
MOZ_ARG_DISABLE_BOOL(opus,
|
||||
@@ -5242,6 +5308,89 @@ MOZ_ARG_DISABLE_BOOL(opus,
|
||||
MOZ_OPUS=1)
|
||||
|
||||
dnl ========================================================
|
||||
+dnl Check for libcelt
|
||||
+dnl ========================================================
|
||||
+
|
||||
+MOZ_ARG_WITH_BOOL(system-celt,
|
||||
+[ --with-system-celt Use system libcelt (located with pkgconfig)],
|
||||
+MOZ_NATIVE_CELT=1,
|
||||
+MOZ_NATIVE_CELT=)
|
||||
+
|
||||
+if test -n "$MOZ_NATIVE_CELT"; then
|
||||
+ PKG_CHECK_MODULES(MOZ_CELT, celt)
|
||||
+else
|
||||
+ MOZ_CELT_CFLAGS='-I$(topsrcdir)/media/libopus'
|
||||
+fi
|
||||
+
|
||||
+AC_SUBST(MOZ_NATIVE_CELT)
|
||||
+
|
||||
+dnl ========================================================
|
||||
+dnl Check for libopus
|
||||
+dnl ========================================================
|
||||
+
|
||||
@@ -241,7 +260,7 @@ $NetBSD: patch-aa,v 1.26 2015/03/17 19:50:42 ryoon Exp $
|
||||
dnl = Disable VP8 decoder support
|
||||
dnl ========================================================
|
||||
MOZ_ARG_DISABLE_BOOL(webm,
|
||||
@@ -5600,6 +5749,67 @@ fi
|
||||
@@ -5606,6 +5772,67 @@ fi
|
||||
AC_SUBST(MOZ_WEBM_ENCODER)
|
||||
|
||||
dnl ==================================
|
||||
@@ -309,7 +328,7 @@ $NetBSD: patch-aa,v 1.26 2015/03/17 19:50:42 ryoon Exp $
|
||||
dnl = Check alsa availability on Linux
|
||||
dnl ==================================
|
||||
|
||||
@@ -5613,12 +5823,23 @@ MOZ_ARG_ENABLE_BOOL(alsa,
|
||||
@@ -5619,12 +5846,23 @@ MOZ_ARG_ENABLE_BOOL(alsa,
|
||||
MOZ_ALSA=1,
|
||||
MOZ_ALSA=)
|
||||
|
||||
@@ -321,7 +340,7 @@ $NetBSD: patch-aa,v 1.26 2015/03/17 19:50:42 ryoon Exp $
|
||||
if test -n "$MOZ_ALSA"; then
|
||||
PKG_CHECK_MODULES(MOZ_ALSA, alsa, ,
|
||||
[echo "$MOZ_ALSA_PKG_ERRORS"
|
||||
AC_MSG_ERROR([Need alsa for Ogg, Wave or WebM decoding on Linux. Disable with --disable-ogg --disable-wave --disable-webm. (On Ubuntu, you might try installing the package libasound2-dev.)])])
|
||||
AC_MSG_ERROR([Need alsa for audio output on Linux. (On Ubuntu, you might try installing the package libasound2-dev.)])])
|
||||
fi
|
||||
|
||||
+if test -n "$DISABLE_LIBASOUND_DLOPEN"; then
|
||||
@@ -333,7 +352,7 @@ $NetBSD: patch-aa,v 1.26 2015/03/17 19:50:42 ryoon Exp $
|
||||
AC_SUBST(MOZ_ALSA)
|
||||
|
||||
dnl ========================================================
|
||||
@@ -6046,7 +6267,9 @@ MOZ_ARG_DISABLE_BOOL(gamepad,
|
||||
@@ -6046,7 +6284,9 @@ MOZ_ARG_DISABLE_BOOL(gamepad,
|
||||
if test "$MOZ_GAMEPAD"; then
|
||||
case "$OS_TARGET" in
|
||||
Darwin)
|
||||
@@ -343,8 +362,8 @@ $NetBSD: patch-aa,v 1.26 2015/03/17 19:50:42 ryoon Exp $
|
||||
+ fi
|
||||
;;
|
||||
WINNT)
|
||||
case "$MOZ_WINSDK_MAXVER" in
|
||||
@@ -8089,6 +8312,49 @@ if test "$USE_FC_FREETYPE"; then
|
||||
MOZ_GAMEPAD_BACKEND=windows
|
||||
@@ -8066,6 +8306,49 @@ if test "$USE_FC_FREETYPE"; then
|
||||
fi
|
||||
|
||||
dnl ========================================================
|
||||
@@ -357,7 +376,7 @@ $NetBSD: patch-aa,v 1.26 2015/03/17 19:50:42 ryoon Exp $
|
||||
+MOZ_NATIVE_HARFBUZZ=)
|
||||
+
|
||||
+if test -n "$MOZ_NATIVE_HARFBUZZ"; then
|
||||
+ PKG_CHECK_MODULES(MOZ_HARFBUZZ, harfbuzz >= 0.9.25)
|
||||
+ PKG_CHECK_MODULES(MOZ_HARFBUZZ, harfbuzz >= 0.9.34)
|
||||
+fi
|
||||
+
|
||||
+AC_SUBST(MOZ_NATIVE_HARFBUZZ)
|
||||
@@ -394,12 +413,3 @@ $NetBSD: patch-aa,v 1.26 2015/03/17 19:50:42 ryoon Exp $
|
||||
dnl Check for pixman and cairo
|
||||
dnl ========================================================
|
||||
|
||||
@@ -8344,7 +8610,7 @@ case "$OS_TARGET" in
|
||||
NECKO_WIFI=1
|
||||
fi
|
||||
;;
|
||||
- Darwin|FreeBSD|SunOS|WINNT)
|
||||
+ Darwin|DragonFly|FreeBSD|SunOS|WINNT)
|
||||
NECKO_WIFI=1
|
||||
;;
|
||||
Linux)
|
||||
|
||||
@@ -1,13 +0,0 @@
|
||||
$NetBSD: patch-ak,v 1.12 2014/11/02 05:40:31 ryoon Exp $
|
||||
|
||||
--- mozilla/js/src/ctypes/libffi/configure.orig 2014-10-14 06:36:16.000000000 +0000
|
||||
+++ mozilla/js/src/ctypes/libffi/configure
|
||||
@@ -17226,7 +17226,7 @@ case "$host" in
|
||||
powerpc-*-aix* | rs6000-*-aix*)
|
||||
TARGET=POWERPC_AIX; TARGETDIR=powerpc
|
||||
;;
|
||||
- powerpc-*-freebsd* | powerpc-*-openbsd*)
|
||||
+ powerpc-*-freebsd* | powerpc-*-openbsd* | powerpc-*-netbsd*)
|
||||
TARGET=POWERPC_FREEBSD; TARGETDIR=powerpc
|
||||
HAVE_LONG_DOUBLE_VARIANT=1
|
||||
;;
|
||||
@@ -1,12 +1,14 @@
|
||||
$NetBSD: patch-ao,v 1.14 2014/03/30 04:13:17 ryoon Exp $
|
||||
$NetBSD: patch-ao,v 1.15 2015/09/21 05:03:45 ryoon Exp $
|
||||
|
||||
--- mozilla/toolkit/mozapps/installer/packager.mk.orig 2014-03-19 01:42:17.000000000 +0000
|
||||
--- mozilla/toolkit/mozapps/installer/packager.mk.orig 2015-09-02 09:27:31.000000000 +0000
|
||||
+++ mozilla/toolkit/mozapps/installer/packager.mk
|
||||
@@ -775,7 +775,7 @@ endif
|
||||
@@ -122,8 +122,8 @@ endif
|
||||
(cd $(DESTDIR)$(installdir) && tar -xf -)
|
||||
$(NSINSTALL) -D $(DESTDIR)$(bindir)
|
||||
$(RM) -f $(DESTDIR)$(bindir)/$(MOZ_APP_NAME)
|
||||
ln -s $(installdir)/$(MOZ_APP_NAME) $(DESTDIR)$(bindir)
|
||||
- ln -s $(installdir)/$(MOZ_APP_NAME) $(DESTDIR)$(bindir)
|
||||
-ifdef INSTALL_SDK # Here comes the hard part
|
||||
+ ln -s $(installdir)/$(MOZ_APP_NAME) $(DESTDIR)$(bindir)/$(MOZILLA_PKG_NAME)
|
||||
+ifeq ($(MOZ_APP_NAME),xulrunner)
|
||||
$(NSINSTALL) -D $(DESTDIR)$(includedir)
|
||||
(cd $(DIST)/include && $(TAR) $(TAR_CREATE_FLAGS) - .) | \
|
||||
|
||||
@@ -0,0 +1,98 @@
|
||||
$NetBSD: patch-mozilla_accessible_atk_Platform.cpp,v 1.1 2015/09/21 05:03:45 ryoon Exp $
|
||||
|
||||
--- mozilla/accessible/atk/Platform.cpp.orig 2015-09-02 09:27:10.000000000 +0000
|
||||
+++ mozilla/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
|
||||
@@ -1,15 +0,0 @@
|
||||
$NetBSD: patch-mozilla_b2g_installer_Makefile.in,v 1.3 2015/03/17 19:50:42 ryoon Exp $
|
||||
|
||||
--- mozilla/b2g/installer/Makefile.in.orig 2015-03-09 05:34:16.000000000 +0000
|
||||
+++ mozilla/b2g/installer/Makefile.in
|
||||
@@ -79,6 +79,10 @@ ifneq (,$(filter rtsp,$(NECKO_PROTOCOLS)
|
||||
DEFINES += -DMOZ_RTSP
|
||||
endif
|
||||
|
||||
+ifdef MOZ_DEBUG
|
||||
+DEFINES += -DMOZ_DEBUG=1
|
||||
+endif
|
||||
+
|
||||
ifdef GKMEDIAS_SHARED_LIBRARY
|
||||
DEFINES += -DGKMEDIAS_SHARED_LIBRARY
|
||||
endif
|
||||
@@ -1,13 +0,0 @@
|
||||
$NetBSD: patch-mozilla_b2g_installer_package-manifest.in,v 1.3 2015/03/17 19:50:42 ryoon Exp $
|
||||
|
||||
--- mozilla/b2g/installer/package-manifest.in.orig 2015-03-09 05:34:16.000000000 +0000
|
||||
+++ mozilla/b2g/installer/package-manifest.in
|
||||
@@ -609,7 +609,7 @@
|
||||
@BINPATH@/components/EngineeringModeAPI.js
|
||||
@BINPATH@/components/EngineeringModeService.js
|
||||
|
||||
-#ifdef MOZ_DEBUG
|
||||
+#if defined(ENABLE_TESTS) && defined(MOZ_DEBUG)
|
||||
@BINPATH@/components/TestInterfaceJS.js
|
||||
@BINPATH@/components/TestInterfaceJS.manifest
|
||||
#endif
|
||||
@@ -1,6 +1,6 @@
|
||||
$NetBSD: patch-mozilla_browser_app_nsBrowserApp.cpp,v 1.3 2015/01/29 22:22:26 wiz Exp $
|
||||
$NetBSD: patch-mozilla_browser_app_nsBrowserApp.cpp,v 1.4 2015/09/21 05:03:45 ryoon Exp $
|
||||
|
||||
--- mozilla/browser/app/nsBrowserApp.cpp.orig 2014-06-13 00:46:02.000000000 +0000
|
||||
--- mozilla/browser/app/nsBrowserApp.cpp.orig 2015-09-02 09:27:14.000000000 +0000
|
||||
+++ mozilla/browser/app/nsBrowserApp.cpp
|
||||
@@ -18,8 +18,10 @@
|
||||
#include <unistd.h>
|
||||
@@ -14,7 +14,7 @@ $NetBSD: patch-mozilla_browser_app_nsBrowserApp.cpp,v 1.3 2015/01/29 22:22:26 wi
|
||||
#include "MacQuirks.h"
|
||||
#endif
|
||||
|
||||
@@ -447,7 +449,7 @@ TimeStamp_Now()
|
||||
@@ -459,7 +461,7 @@ TimeStamp_Now()
|
||||
}
|
||||
|
||||
return sGetTickCount64() * freq.QuadPart;
|
||||
@@ -23,3 +23,11 @@ $NetBSD: patch-mozilla_browser_app_nsBrowserApp.cpp,v 1.3 2015/01/29 22:22:26 wi
|
||||
return mach_absolute_time();
|
||||
#elif defined(HAVE_CLOCK_MONOTONIC)
|
||||
struct timespec ts;
|
||||
@@ -606,6 +608,7 @@ int main(int argc, char* argv[])
|
||||
TriggerQuirks();
|
||||
#endif
|
||||
|
||||
+ setenv("MOZ_PLUGIN_PATH", "%%LOCALBASE%%/lib/browser_plugins/symlinks/gecko", 0);
|
||||
int gotCounters;
|
||||
#if defined(XP_UNIX)
|
||||
struct rusage initialRUsage;
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
$NetBSD: patch-mozilla_build_autoconf_nss.m4,v 1.6 2013/01/07 21:55:30 ryoon Exp $
|
||||
$NetBSD: patch-mozilla_build_autoconf_nss.m4,v 1.7 2015/09/21 05:03:45 ryoon Exp $
|
||||
|
||||
--- mozilla/build/autoconf/nss.m4.orig 2012-11-18 10:19:31.000000000 +0000
|
||||
--- mozilla/build/autoconf/nss.m4.orig 2015-09-02 09:28:02.000000000 +0000
|
||||
+++ mozilla/build/autoconf/nss.m4
|
||||
@@ -22,18 +22,18 @@ AC_ARG_WITH(nss-exec-prefix,
|
||||
if test -n "$nss_config_exec_prefix"; then
|
||||
@@ -35,12 +35,12 @@ $NetBSD: patch-mozilla_build_autoconf_nss.m4,v 1.6 2013/01/07 21:55:30 ryoon Exp
|
||||
|
||||
- nss_config_major_version=`$NSS_CONFIG $nss_config_args --version | \
|
||||
+ nss_config_major_version=`$NSS_CONFIG $nss_config_args nss --modversion | \
|
||||
sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\1/'`
|
||||
sed 's/\([[0-9]]*\)\.\([[0-9]]*\)\(\.\([[0-9]]*\)\)\{0,1\}/\1/'`
|
||||
- nss_config_minor_version=`$NSS_CONFIG $nss_config_args --version | \
|
||||
+ nss_config_minor_version=`$NSS_CONFIG $nss_config_args nss --modversion | \
|
||||
sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\2/'`
|
||||
sed 's/\([[0-9]]*\)\.\([[0-9]]*\)\(\.\([[0-9]]*\)\)\{0,1\}/\2/'`
|
||||
- nss_config_micro_version=`$NSS_CONFIG $nss_config_args --version | \
|
||||
+ nss_config_micro_version=`$NSS_CONFIG $nss_config_args nss --modversion | \
|
||||
sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\3/'`
|
||||
min_nss_major_version=`echo $min_nss_version | \
|
||||
sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\1/'`
|
||||
sed 's/\([[0-9]]*\)\.\([[0-9]]*\)\(\.\([[0-9]]*\)\)\{0,1\}/\4/'`
|
||||
if test -z "$nss_config_micro_version"; then
|
||||
nss_config_micro_version="0"
|
||||
|
||||
@@ -1,8 +1,8 @@
|
||||
$NetBSD: patch-mozilla_config_Makefile.in,v 1.4 2014/06/22 08:54:39 ryoon Exp $
|
||||
$NetBSD: patch-mozilla_config_Makefile.in,v 1.5 2015/09/21 05:03:45 ryoon Exp $
|
||||
|
||||
--- mozilla/config/Makefile.in.orig 2014-06-13 00:46:03.000000000 +0000
|
||||
--- mozilla/config/Makefile.in.orig 2015-09-02 09:28:07.000000000 +0000
|
||||
+++ mozilla/config/Makefile.in
|
||||
@@ -77,6 +77,15 @@ export:: $(export-preqs)
|
||||
@@ -77,6 +77,16 @@ export:: $(export-preqs)
|
||||
-DMOZ_NATIVE_LIBEVENT=$(MOZ_NATIVE_LIBEVENT) \
|
||||
-DMOZ_NATIVE_LIBVPX=$(MOZ_NATIVE_LIBVPX) \
|
||||
-DMOZ_NATIVE_ICU=$(MOZ_NATIVE_ICU) \
|
||||
@@ -12,6 +12,7 @@ $NetBSD: patch-mozilla_config_Makefile.in,v 1.4 2014/06/22 08:54:39 ryoon Exp $
|
||||
+ -DMOZ_NATIVE_THEORA=$(MOZ_NATIVE_THEORA) \
|
||||
+ -DMOZ_NATIVE_VORBIS=$(MOZ_NATIVE_VORBIS) \
|
||||
+ -DMOZ_NATIVE_TREMOR=$(MOZ_NATIVE_TREMOR) \
|
||||
+ -DMOZ_NATIVE_CELT=$(MOZ_NATIVE_CELT) \
|
||||
+ -DMOZ_NATIVE_OPUS=$(MOZ_NATIVE_OPUS) \
|
||||
+ -DMOZ_NATIVE_SPEEX=$(MOZ_NATIVE_SPEEX) \
|
||||
+ -DMOZ_NATIVE_SOUNDTOUCH=$(MOZ_NATIVE_SOUNDTOUCH) \
|
||||
|
||||
@@ -1,8 +1,8 @@
|
||||
$NetBSD: patch-mozilla_config_external_moz.build,v 1.5 2015/02/15 02:11:03 ryoon Exp $
|
||||
$NetBSD: patch-mozilla_config_external_moz.build,v 1.6 2015/09/21 05:03:45 ryoon Exp $
|
||||
|
||||
--- mozilla/config/external/moz.build.orig 2015-02-05 04:39:28.000000000 +0000
|
||||
--- mozilla/config/external/moz.build.orig 2015-09-02 09:28:07.000000000 +0000
|
||||
+++ mozilla/config/external/moz.build
|
||||
@@ -19,13 +19,19 @@ if CONFIG['MOZ_UPDATER']:
|
||||
@@ -19,10 +19,19 @@ if CONFIG['MOZ_UPDATER']:
|
||||
# There's no "native brotli" yet, but probably in the future...
|
||||
external_dirs += ['modules/brotli']
|
||||
|
||||
@@ -10,6 +10,9 @@ $NetBSD: patch-mozilla_config_external_moz.build,v 1.5 2015/02/15 02:11:03 ryoon
|
||||
+if not CONFIG['MOZ_NATIVE_OGG']:
|
||||
+ external_dirs += ['media/libogg']
|
||||
+
|
||||
+if not CONFIG['MOZ_NATIVE_CELT'] or not CONFIG['MOZ_NATIVE_OPUS']:
|
||||
+ external_dirs += ['media/libopus']
|
||||
+
|
||||
+if not CONFIG['MOZ_NATIVE_THEORA']:
|
||||
+ external_dirs += ['media/libtheora']
|
||||
+
|
||||
@@ -20,12 +23,8 @@ $NetBSD: patch-mozilla_config_external_moz.build,v 1.5 2015/02/15 02:11:03 ryoon
|
||||
+if CONFIG['MOZ_TREMOR'] and not CONFIG['MOZ_NATIVE_TREMOR']:
|
||||
external_dirs += ['media/libtremor']
|
||||
|
||||
-if CONFIG['MOZ_OPUS']:
|
||||
+if CONFIG['MOZ_OPUS'] and not CONFIG['MOZ_NATIVE_OPUS']:
|
||||
external_dirs += ['media/libopus']
|
||||
|
||||
if CONFIG['MOZ_WEBM']:
|
||||
@@ -40,14 +46,16 @@ if CONFIG['MOZ_VPX'] and not CONFIG['MOZ
|
||||
@@ -37,15 +46,16 @@ if CONFIG['MOZ_VPX'] and not CONFIG['MOZ
|
||||
if not CONFIG['MOZ_NATIVE_PNG']:
|
||||
external_dirs += ['media/libpng']
|
||||
|
||||
@@ -39,6 +38,7 @@ $NetBSD: patch-mozilla_config_external_moz.build,v 1.5 2015/02/15 02:11:03 ryoon
|
||||
'media/kiss_fft',
|
||||
'media/libcubeb',
|
||||
- 'media/libogg',
|
||||
- 'media/libopus',
|
||||
- 'media/libtheora',
|
||||
- 'media/libspeex_resampler',
|
||||
'media/libstagefright',
|
||||
|
||||
@@ -1,8 +1,32 @@
|
||||
$NetBSD: patch-mozilla_config_system-headers,v 1.13 2015/01/02 04:26:21 ryoon Exp $
|
||||
$NetBSD: patch-mozilla_config_system-headers,v 1.15 2015/09/21 05:03:45 ryoon Exp $
|
||||
|
||||
--- mozilla/config/system-headers.orig 2014-12-03 06:22:33.000000000 +0000
|
||||
--- mozilla/config/system-headers.orig 2015-09-02 09:28:08.000000000 +0000
|
||||
+++ mozilla/config/system-headers
|
||||
@@ -1267,7 +1267,6 @@ X11/Xlocale.h
|
||||
@@ -189,7 +189,6 @@ asm/signal.h
|
||||
ASRegistry.h
|
||||
assert.h
|
||||
atk/atk.h
|
||||
-atk-bridge.h
|
||||
atlcom.h
|
||||
atlconv.h
|
||||
atlctl.cpp
|
||||
@@ -471,6 +470,7 @@ freetype/ftbitmap.h
|
||||
freetype/ftxf86.h
|
||||
freetype.h
|
||||
ftcache.h
|
||||
+ftfntfmt.h
|
||||
ftglyph.h
|
||||
ftsynth.h
|
||||
ftoutln.h
|
||||
@@ -636,6 +636,7 @@ libgnomevfs/gnome-vfs-mime-handlers.h
|
||||
libgnomevfs/gnome-vfs-mime-utils.h
|
||||
libgnomevfs/gnome-vfs-ops.h
|
||||
libgnomevfs/gnome-vfs-standard-callbacks.h
|
||||
+libv4l2.h
|
||||
lib$routines.h
|
||||
limits
|
||||
limits.h
|
||||
@@ -1266,7 +1267,6 @@ X11/Xlocale.h
|
||||
X11/Xos.h
|
||||
X11/Xutil.h
|
||||
zmouse.h
|
||||
@@ -10,7 +34,7 @@ $NetBSD: patch-mozilla_config_system-headers,v 1.13 2015/01/02 04:26:21 ryoon Ex
|
||||
#if MOZ_NATIVE_PNG==1
|
||||
png.h
|
||||
#endif
|
||||
@@ -1329,10 +1328,13 @@ vorbis/codec.h
|
||||
@@ -1328,10 +1328,13 @@ vorbis/codec.h
|
||||
theora/theoradec.h
|
||||
tremor/ivorbiscodec.h
|
||||
speex/speex_resampler.h
|
||||
@@ -24,7 +48,7 @@ $NetBSD: patch-mozilla_config_system-headers,v 1.13 2015/01/02 04:26:21 ryoon Ex
|
||||
#endif
|
||||
gst/gst.h
|
||||
gst/app/gstappsink.h
|
||||
@@ -1361,3 +1363,37 @@ unicode/utypes.h
|
||||
@@ -1360,3 +1363,43 @@ unicode/utypes.h
|
||||
#endif
|
||||
libutil.h
|
||||
unwind.h
|
||||
@@ -50,6 +74,12 @@ $NetBSD: patch-mozilla_config_system-headers,v 1.13 2015/01/02 04:26:21 ryoon Ex
|
||||
+#if MOZ_NATIVE_TREMOR==1
|
||||
+tremor/ivorbiscodec.h
|
||||
+#endif
|
||||
+#if MOZ_NATIVE_CELT==1
|
||||
+celt.h
|
||||
+celt_header.h
|
||||
+celt/celt.h
|
||||
+celt/celt_header.h
|
||||
+#endif
|
||||
+#if MOZ_NATIVE_OPUS==1
|
||||
+opus.h
|
||||
+opus_multistream.h
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
$NetBSD: patch-mozilla_config_system__wrappers_unwind.h,v 1.5 2015/01/02 04:26:21 ryoon Exp $
|
||||
$NetBSD: patch-mozilla_config_system__wrappers_unwind.h,v 1.7 2015/09/21 05:03:45 ryoon Exp $
|
||||
|
||||
--- mozilla/config/system_wrappers/unwind.h.orig 2015-01-01 17:44:51.000000000 +0000
|
||||
--- mozilla/config/system_wrappers/unwind.h.orig 2015-09-21 03:33:26.000000000 +0000
|
||||
+++ mozilla/config/system_wrappers/unwind.h
|
||||
@@ -0,0 +1,4 @@
|
||||
+#pragma GCC system_header
|
||||
|
||||
@@ -1,8 +1,8 @@
|
||||
$NetBSD: patch-mozilla_dom_media_moz.build,v 1.1 2015/03/17 19:50:42 ryoon Exp $
|
||||
$NetBSD: patch-mozilla_dom_media_moz.build,v 1.2 2015/09/21 05:03:45 ryoon Exp $
|
||||
|
||||
--- mozilla/dom/media/moz.build.orig 2015-03-09 05:34:53.000000000 +0000
|
||||
--- mozilla/dom/media/moz.build.orig 2015-09-02 09:28:33.000000000 +0000
|
||||
+++ mozilla/dom/media/moz.build
|
||||
@@ -270,6 +270,27 @@ if CONFIG['ANDROID_VERSION'] > '15':
|
||||
@@ -280,6 +280,27 @@ if CONFIG['ANDROID_VERSION'] > '15':
|
||||
CFLAGS += CONFIG['GSTREAMER_CFLAGS']
|
||||
CXXFLAGS += CONFIG['GSTREAMER_CFLAGS']
|
||||
|
||||
@@ -29,4 +29,4 @@ $NetBSD: patch-mozilla_dom_media_moz.build,v 1.1 2015/03/17 19:50:42 ryoon Exp $
|
||||
+
|
||||
include('/ipc/chromium/chromium-config.mozbuild')
|
||||
|
||||
FINAL_LIBRARY = 'xul'
|
||||
# Suppress some GCC warnings being treated as errors:
|
||||
|
||||
@@ -1,8 +1,8 @@
|
||||
$NetBSD: patch-mozilla_dom_plugins_ipc_PluginModuleChild.cpp,v 1.9 2015/03/17 19:50:42 ryoon Exp $
|
||||
$NetBSD: patch-mozilla_dom_plugins_ipc_PluginModuleChild.cpp,v 1.10 2015/09/21 05:03:45 ryoon Exp $
|
||||
|
||||
--- mozilla/dom/plugins/ipc/PluginModuleChild.cpp.orig 2015-03-09 05:35:00.000000000 +0000
|
||||
--- mozilla/dom/plugins/ipc/PluginModuleChild.cpp.orig 2015-09-02 09:28:36.000000000 +0000
|
||||
+++ mozilla/dom/plugins/ipc/PluginModuleChild.cpp
|
||||
@@ -307,7 +307,7 @@ PluginModuleChild::InitForChrome(const s
|
||||
@@ -320,7 +320,7 @@ PluginModuleChild::InitForChrome(const s
|
||||
|
||||
// TODO: use PluginPRLibrary here
|
||||
|
||||
@@ -11,7 +11,7 @@ $NetBSD: patch-mozilla_dom_plugins_ipc_PluginModuleChild.cpp,v 1.9 2015/03/17 19
|
||||
mShutdownFunc =
|
||||
(NP_PLUGINSHUTDOWN) PR_FindFunctionSymbol(mLibrary, "NP_Shutdown");
|
||||
|
||||
@@ -1869,7 +1869,7 @@ PluginModuleChild::AnswerNP_GetEntryPoin
|
||||
@@ -1882,7 +1882,7 @@ PluginModuleChild::AnswerNP_GetEntryPoin
|
||||
AssertPluginThread();
|
||||
MOZ_ASSERT(mIsChrome);
|
||||
|
||||
@@ -20,12 +20,12 @@ $NetBSD: patch-mozilla_dom_plugins_ipc_PluginModuleChild.cpp,v 1.9 2015/03/17 19
|
||||
return true;
|
||||
#elif defined(OS_WIN) || defined(OS_MACOSX)
|
||||
*_retval = mGetEntryPointsFunc(&mFunctions);
|
||||
@@ -1899,7 +1899,7 @@ PluginModuleChild::AnswerNP_Initialize(c
|
||||
SendBackUpXResources(FileDescriptor(xSocketFd));
|
||||
@@ -1927,7 +1927,7 @@ PluginModuleChild::DoNP_Initialize(const
|
||||
#endif
|
||||
|
||||
NPError result;
|
||||
-#if defined(OS_LINUX) || defined(OS_BSD)
|
||||
+#if defined(OS_LINUX) || defined(OS_BSD) || defined(OS_SOLARIS)
|
||||
*_retval = mInitializeFunc(&sBrowserFuncs, &mFunctions);
|
||||
return true;
|
||||
result = mInitializeFunc(&sBrowserFuncs, &mFunctions);
|
||||
#elif defined(OS_WIN) || defined(OS_MACOSX)
|
||||
result = mInitializeFunc(&sBrowserFuncs);
|
||||
|
||||
+8
-6
@@ -1,16 +1,18 @@
|
||||
$NetBSD: patch-mozilla_extensions_spellcheck_hunspell_src_mozHunspell.cpp,v 1.3 2015/03/17 19:50:42 ryoon Exp $
|
||||
$NetBSD: patch-mozilla_extensions_spellcheck_hunspell_src_mozHunspell.cpp,v 1.4 2015/09/21 05:03:45 ryoon Exp $
|
||||
|
||||
--- mozilla/extensions/spellcheck/hunspell/src/mozHunspell.cpp.orig 2015-03-09 05:35:11.000000000 +0000
|
||||
--- mozilla/extensions/spellcheck/hunspell/src/mozHunspell.cpp.orig 2015-09-02 09:28:48.000000000 +0000
|
||||
+++ mozilla/extensions/spellcheck/hunspell/src/mozHunspell.cpp
|
||||
@@ -400,6 +400,12 @@ mozHunspell::LoadDictionaryList(bool aNo
|
||||
@@ -400,6 +400,14 @@ mozHunspell::LoadDictionaryList(bool aNo
|
||||
}
|
||||
}
|
||||
|
||||
+ // load system hunspell dictionaries
|
||||
+ nsIFile* hunDir;
|
||||
+ nsCOMPtr<nsIFile> hunDir;
|
||||
+ NS_NewNativeLocalFile(NS_LITERAL_CSTRING("@PREFIX@/share/hunspell"),
|
||||
+ true, &hunDir);
|
||||
+ LoadDictionariesFromDir(hunDir);
|
||||
+ true, getter_AddRefs(hunDir));
|
||||
+ if (hunDir) {
|
||||
+ LoadDictionariesFromDir(hunDir);
|
||||
+ }
|
||||
+
|
||||
// find dictionaries from extensions requiring restart
|
||||
nsCOMPtr<nsISimpleEnumerator> dictDirs;
|
||||
|
||||
@@ -1,15 +1,15 @@
|
||||
$NetBSD: patch-mozilla_image_decoders_nsJPEGDecoder.cpp,v 1.2 2015/03/17 19:50:42 ryoon Exp $
|
||||
$NetBSD: patch-mozilla_image_decoders_nsJPEGDecoder.cpp,v 1.3 2015/09/21 05:03:45 ryoon Exp $
|
||||
|
||||
--- mozilla/image/decoders/nsJPEGDecoder.cpp.orig 2015-03-09 05:34:16.000000000 +0000
|
||||
--- mozilla/image/decoders/nsJPEGDecoder.cpp.orig 2015-09-02 09:27:13.000000000 +0000
|
||||
+++ mozilla/image/decoders/nsJPEGDecoder.cpp
|
||||
@@ -21,13 +21,28 @@
|
||||
@@ -23,13 +23,28 @@
|
||||
|
||||
extern "C" {
|
||||
#include "iccjpeg.h"
|
||||
-}
|
||||
|
||||
+#ifdef JCS_EXTENSIONS
|
||||
#if defined(IS_BIG_ENDIAN)
|
||||
#if MOZ_BIG_ENDIAN
|
||||
#define MOZ_JCS_EXT_NATIVE_ENDIAN_XRGB JCS_EXT_XRGB
|
||||
#else
|
||||
#define MOZ_JCS_EXT_NATIVE_ENDIAN_XRGB JCS_EXT_BGRX
|
||||
@@ -32,7 +32,7 @@ $NetBSD: patch-mozilla_image_decoders_nsJPEGDecoder.cpp,v 1.2 2015/03/17 19:50:4
|
||||
|
||||
static void cmyk_convert_rgb(JSAMPROW row, JDIMENSION width);
|
||||
|
||||
@@ -358,6 +373,7 @@ nsJPEGDecoder::WriteInternal(const char*
|
||||
@@ -373,6 +388,7 @@ nsJPEGDecoder::WriteInternal(const char*
|
||||
case JCS_GRAYSCALE:
|
||||
case JCS_RGB:
|
||||
case JCS_YCbCr:
|
||||
@@ -40,7 +40,7 @@ $NetBSD: patch-mozilla_image_decoders_nsJPEGDecoder.cpp,v 1.2 2015/03/17 19:50:4
|
||||
// if we're not color managing we can decode directly to
|
||||
// MOZ_JCS_EXT_NATIVE_ENDIAN_XRGB
|
||||
if (mCMSMode != eCMSMode_All) {
|
||||
@@ -366,6 +382,9 @@ nsJPEGDecoder::WriteInternal(const char*
|
||||
@@ -381,6 +397,9 @@ nsJPEGDecoder::WriteInternal(const char*
|
||||
} else {
|
||||
mInfo.out_color_space = JCS_RGB;
|
||||
}
|
||||
@@ -50,7 +50,7 @@ $NetBSD: patch-mozilla_image_decoders_nsJPEGDecoder.cpp,v 1.2 2015/03/17 19:50:4
|
||||
break;
|
||||
case JCS_CMYK:
|
||||
case JCS_YCCK:
|
||||
@@ -424,6 +443,15 @@ nsJPEGDecoder::WriteInternal(const char*
|
||||
@@ -450,6 +469,15 @@ nsJPEGDecoder::WriteInternal(const char*
|
||||
return; // I/O suspension
|
||||
}
|
||||
|
||||
@@ -66,9 +66,9 @@ $NetBSD: patch-mozilla_image_decoders_nsJPEGDecoder.cpp,v 1.2 2015/03/17 19:50:4
|
||||
|
||||
// If this is a progressive JPEG ...
|
||||
mState = mInfo.buffered_image ?
|
||||
@@ -596,7 +624,11 @@ nsJPEGDecoder::OutputScanlines(bool* sus
|
||||
uint32_t* imageRow = ((uint32_t*)mImageData) +
|
||||
(mInfo.output_scanline * mInfo.output_width);
|
||||
@@ -632,7 +660,11 @@ nsJPEGDecoder::OutputScanlines(bool* sus
|
||||
|
||||
MOZ_ASSERT(imageRow, "Should have a row buffer here");
|
||||
|
||||
+#ifdef JCS_EXTENSIONS
|
||||
if (mInfo.out_color_space == MOZ_JCS_EXT_NATIVE_ENDIAN_XRGB) {
|
||||
@@ -78,7 +78,7 @@ $NetBSD: patch-mozilla_image_decoders_nsJPEGDecoder.cpp,v 1.2 2015/03/17 19:50:4
|
||||
// Special case: scanline will be directly converted into packed ARGB
|
||||
if (jpeg_read_scanlines(&mInfo, (JSAMPARRAY)&imageRow, 1) != 1) {
|
||||
*suspend = true; // suspend
|
||||
@@ -911,6 +943,282 @@ term_source (j_decompress_ptr jd)
|
||||
@@ -959,6 +991,282 @@ term_source (j_decompress_ptr jd)
|
||||
} // namespace mozilla
|
||||
|
||||
|
||||
|
||||
@@ -1,11 +1,13 @@
|
||||
$NetBSD: patch-mozilla_intl_unicharutil_util_moz.build,v 1.1 2015/01/02 04:26:21 ryoon Exp $
|
||||
$NetBSD: patch-mozilla_intl_unicharutil_util_moz.build,v 1.2 2015/09/21 05:03:45 ryoon Exp $
|
||||
|
||||
--- mozilla/intl/unicharutil/util/moz.build.orig 2014-12-03 06:22:47.000000000 +0000
|
||||
--- mozilla/intl/unicharutil/util/moz.build.orig 2015-09-02 09:27:18.000000000 +0000
|
||||
+++ mozilla/intl/unicharutil/util/moz.build
|
||||
@@ -37,3 +37,6 @@ if CONFIG['_MSC_VER']:
|
||||
|
||||
@@ -38,5 +38,8 @@ if CONFIG['_MSC_VER']:
|
||||
if CONFIG['ENABLE_INTL_API']:
|
||||
CXXFLAGS += CONFIG['MOZ_ICU_CFLAGS']
|
||||
+
|
||||
|
||||
+if CONFIG['MOZ_NATIVE_HARFBUZZ']:
|
||||
+ CXXFLAGS += CONFIG['MOZ_HARFBUZZ_CFLAGS']
|
||||
+
|
||||
if CONFIG['GNU_CXX']:
|
||||
FAIL_ON_WARNINGS = True
|
||||
|
||||
@@ -0,0 +1,13 @@
|
||||
$NetBSD: patch-mozilla_js_public_CallArgs.h,v 1.1 2015/09/21 05:03:45 ryoon Exp $
|
||||
|
||||
--- mozilla/js/public/CallArgs.h.orig 2015-09-02 09:27:18.000000000 +0000
|
||||
+++ mozilla/js/public/CallArgs.h
|
||||
@@ -344,7 +344,7 @@ class MOZ_STACK_CLASS CallArgs : public
|
||||
* Returns true if there are at least |required| arguments passed in. If
|
||||
* false, it reports an error message on the context.
|
||||
*/
|
||||
- bool requireAtLeast(JSContext* cx, const char* fnname, unsigned required);
|
||||
+ JS_PUBLIC_API(bool) requireAtLeast(JSContext* cx, const char* fnname, unsigned required);
|
||||
|
||||
};
|
||||
|
||||
@@ -1,48 +1,8 @@
|
||||
$NetBSD: patch-mozilla_js_src_asmjs_AsmJSSignalHandlers.cpp,v 1.2 2015/03/17 19:50:42 ryoon Exp $
|
||||
$NetBSD: patch-mozilla_js_src_asmjs_AsmJSSignalHandlers.cpp,v 1.3 2015/09/21 05:03:45 ryoon Exp $
|
||||
|
||||
--- mozilla/js/src/asmjs/AsmJSSignalHandlers.cpp.orig 2015-03-09 05:34:25.000000000 +0000
|
||||
--- mozilla/js/src/asmjs/AsmJSSignalHandlers.cpp.orig 2015-09-02 09:27:18.000000000 +0000
|
||||
+++ mozilla/js/src/asmjs/AsmJSSignalHandlers.cpp
|
||||
@@ -504,8 +504,38 @@ AsmJSFaultHandler(LPEXCEPTION_POINTERS e
|
||||
#elif defined(XP_MACOSX)
|
||||
# include <mach/exc.h>
|
||||
|
||||
+# if defined(ARM_THREAD_STATE)
|
||||
+typedef arm_thread_state_t moz_platform_thread_state_t;
|
||||
+static const thread_state_flavor_t MOZ_PLATFORM_THREAD_STATE_FLAVOR = ARM_THREAD_STATE;
|
||||
+static const mach_msg_type_number_t MOZ_PLATFORM_THREAD_STATE_COUNT = ARM_THREAD_STATE_COUNT;
|
||||
+
|
||||
+# elif defined(PPC_THREAD_STATE)
|
||||
+typedef ppc_thread_state_t moz_platform_thread_state_t;
|
||||
+static const thread_state_flavor_t MOZ_PLATFORM_THREAD_STATE_FLAVOR = PPC_THREAD_STATE;
|
||||
+static const mach_msg_type_number_t MOZ_PLATFORM_THREAD_STATE_COUNT = PPC_THREAD_STATE_COUNT;
|
||||
+
|
||||
+# elif defined(PPC_THREAD_STATE64)
|
||||
+typedef ppc_thread_state64_t moz_platform_thread_state_t;
|
||||
+static const thread_state_flavor_t MOZ_PLATFORM_THREAD_STATE_FLAVOR = PPC_THREAD_STATE64;
|
||||
+static const mach_msg_type_number_t MOZ_PLATFORM_THREAD_STATE_COUNT = PPC_THREAD_STATE64_COUNT;
|
||||
+
|
||||
+# elif defined(x86_THREAD_STATE)
|
||||
+typedef x86_thread_state_t moz_platform_thread_state_t;
|
||||
+static const thread_state_flavor_t MOZ_PLATFORM_THREAD_STATE_FLAVOR = x86_THREAD_STATE;
|
||||
+static const mach_msg_type_number_t MOZ_PLATFORM_THREAD_STATE_COUNT = x86_THREAD_STATE_COUNT;
|
||||
+
|
||||
+# else
|
||||
+# error Type unknown for platform-specific thread_state_t
|
||||
+# endif
|
||||
+
|
||||
+# if defined(__DARWIN_UNIX03)
|
||||
+# define REG_FIELD(NAME) __ ## NAME
|
||||
+# else
|
||||
+# define REG_FIELD(NAME) NAME
|
||||
+# endif
|
||||
+
|
||||
static uint8_t **
|
||||
-ContextToPC(x86_thread_state_t &state)
|
||||
+ContextToPC(moz_platform_thread_state_t &state)
|
||||
{
|
||||
# if defined(JS_CPU_X64)
|
||||
static_assert(sizeof(state.uts.ts64.__rip) == sizeof(void*),
|
||||
@@ -617,10 +647,11 @@ HandleMachException(JSRuntime *rt, const
|
||||
@@ -637,10 +637,11 @@ HandleMachException(JSRuntime* rt, const
|
||||
mach_port_t rtThread = request.body.thread.name;
|
||||
|
||||
// Read out the JSRuntime thread's register state.
|
||||
|
||||
@@ -1,13 +0,0 @@
|
||||
$NetBSD: patch-mozilla_js_src_gc_Memory.cpp,v 1.4 2014/11/02 05:40:31 ryoon Exp $
|
||||
|
||||
--- mozilla/js/src/gc/Memory.cpp.orig 2014-10-14 06:36:16.000000000 +0000
|
||||
+++ mozilla/js/src/gc/Memory.cpp
|
||||
@@ -406,7 +406,7 @@ static inline void *
|
||||
MapMemory(size_t length, int prot = PROT_READ | PROT_WRITE,
|
||||
int flags = MAP_PRIVATE | MAP_ANON, int fd = -1, off_t offset = 0)
|
||||
{
|
||||
-#if defined(__ia64__)
|
||||
+#if defined(__ia64__) || (defined(__sparc64__) && defined(__NetBSD__))
|
||||
/*
|
||||
* The JS engine assumes that all allocated pointers have their high 17 bits clear,
|
||||
* which ia64's mmap doesn't support directly. However, we can emulate it by passing
|
||||
@@ -1,10 +1,10 @@
|
||||
$NetBSD: patch-mozilla_js_src_jit_ExecutableAllocator.h,v 1.2 2015/03/17 19:50:42 ryoon Exp $
|
||||
$NetBSD: patch-mozilla_js_src_jit_ExecutableAllocator.h,v 1.3 2015/09/21 05:03:45 ryoon Exp $
|
||||
|
||||
--- mozilla/js/src/jit/ExecutableAllocator.h.orig 2015-03-09 05:34:36.000000000 +0000
|
||||
--- mozilla/js/src/jit/ExecutableAllocator.h.orig 2015-09-02 09:27:29.000000000 +0000
|
||||
+++ mozilla/js/src/jit/ExecutableAllocator.h
|
||||
@@ -425,6 +425,11 @@ public:
|
||||
|
||||
#undef GCC_VERSION
|
||||
@@ -419,6 +419,11 @@ class ExecutableAllocator {
|
||||
{
|
||||
__clear_cache(code, reinterpret_cast<char*>(code) + size);
|
||||
}
|
||||
+#elif defined(JS_CODEGEN_ARM) && (defined(__FreeBSD__) || defined(__NetBSD__))
|
||||
+ static void cacheFlush(void* code, size_t size)
|
||||
|
||||
@@ -1,9 +1,9 @@
|
||||
$NetBSD: patch-mozilla_js_src_jit_LIR.cpp,v 1.1 2015/03/17 19:50:42 ryoon Exp $
|
||||
$NetBSD: patch-mozilla_js_src_jit_LIR.cpp,v 1.2 2015/09/21 05:03:45 ryoon Exp $
|
||||
|
||||
--- mozilla/js/src/jit/LIR.cpp.orig 2015-03-09 05:34:37.000000000 +0000
|
||||
--- mozilla/js/src/jit/LIR.cpp.orig 2015-09-02 09:27:30.000000000 +0000
|
||||
+++ mozilla/js/src/jit/LIR.cpp
|
||||
@@ -314,7 +314,7 @@ LNode::printName(FILE *fp, Opcode op)
|
||||
const char *name = names[op];
|
||||
@@ -323,7 +323,7 @@ LNode::printName(FILE* fp, Opcode op)
|
||||
const char* name = names[op];
|
||||
size_t len = strlen(name);
|
||||
for (size_t i = 0; i < len; i++)
|
||||
- fprintf(fp, "%c", tolower(name[i]));
|
||||
|
||||
@@ -1,13 +1,13 @@
|
||||
$NetBSD: patch-mozilla_js_src_jit_MIR.cpp,v 1.1 2015/03/17 19:50:42 ryoon Exp $
|
||||
$NetBSD: patch-mozilla_js_src_jit_MIR.cpp,v 1.2 2015/09/21 05:03:45 ryoon Exp $
|
||||
|
||||
--- mozilla/js/src/jit/MIR.cpp.orig 2015-03-09 05:34:37.000000000 +0000
|
||||
--- mozilla/js/src/jit/MIR.cpp.orig 2015-09-02 09:27:30.000000000 +0000
|
||||
+++ mozilla/js/src/jit/MIR.cpp
|
||||
@@ -68,7 +68,7 @@ MDefinition::PrintOpcodeName(FILE *fp, M
|
||||
const char *name = names[op];
|
||||
@@ -71,7 +71,7 @@ MDefinition::PrintOpcodeName(FILE* fp, M
|
||||
const char* name = names[op];
|
||||
size_t len = strlen(name);
|
||||
for (size_t i = 0; i < len; i++)
|
||||
- fprintf(fp, "%c", tolower(name[i]));
|
||||
+ fprintf(fp, "%c", tolower(((unsigned char)name[i])));
|
||||
}
|
||||
|
||||
static MConstant *
|
||||
const Value&
|
||||
|
||||
@@ -1,12 +1,12 @@
|
||||
$NetBSD: patch-mozilla_js_src_jit_arm_Architecture-arm.cpp,v 1.2 2015/03/17 19:50:42 ryoon Exp $
|
||||
$NetBSD: patch-mozilla_js_src_jit_arm_Architecture-arm.cpp,v 1.3 2015/09/21 05:03:45 ryoon Exp $
|
||||
|
||||
--- mozilla/js/src/jit/arm/Architecture-arm.cpp.orig 2015-03-09 05:34:37.000000000 +0000
|
||||
--- mozilla/js/src/jit/arm/Architecture-arm.cpp.orig 2015-09-02 09:27:31.000000000 +0000
|
||||
+++ mozilla/js/src/jit/arm/Architecture-arm.cpp
|
||||
@@ -16,7 +16,7 @@
|
||||
#include "jit/arm/Assembler-arm.h"
|
||||
#include "jit/RegisterSets.h"
|
||||
|
||||
-#if defined(ANDROID) || defined(JS_ARM_SIMULATOR)
|
||||
-#if !defined(__linux__) || defined(ANDROID) || defined(JS_ARM_SIMULATOR)
|
||||
+#if !defined(__linux__) || defined(ANDROID) || defined(JS_ARM_SIMULATOR) || defined(__NetBSD__)
|
||||
// The Android NDK and B2G do not include the hwcap.h kernel header, and it is not
|
||||
// defined when building the simulator, so inline the header defines we need.
|
||||
|
||||
@@ -1,22 +1,13 @@
|
||||
$NetBSD: patch-mozilla_js_src_jsapi.cpp,v 1.3 2015/03/17 19:50:42 ryoon Exp $
|
||||
$NetBSD: patch-mozilla_js_src_jsapi.cpp,v 1.4 2015/09/21 05:03:45 ryoon Exp $
|
||||
|
||||
--- mozilla/js/src/jsapi.cpp.orig 2015-03-09 05:34:38.000000000 +0000
|
||||
--- mozilla/js/src/jsapi.cpp.orig 2015-09-02 09:27:32.000000000 +0000
|
||||
+++ mozilla/js/src/jsapi.cpp
|
||||
@@ -233,7 +233,7 @@ JS_ConvertArgumentsVA(JSContext *cx, con
|
||||
assertSameCompartment(cx, args);
|
||||
required = true;
|
||||
while ((c = *format++) != '\0') {
|
||||
- if (isspace(c))
|
||||
+ if (isspace(((unsigned char)c)))
|
||||
continue;
|
||||
if (c == '/') {
|
||||
required = false;
|
||||
@@ -522,7 +522,7 @@ MessageParameterCount(const char *format
|
||||
{
|
||||
unsigned numfmtspecs = 0;
|
||||
for (const char *fmt = format; *fmt != '\0'; fmt++) {
|
||||
- if (*fmt == '{' && isdigit(fmt[1]))
|
||||
+ if (*fmt == '{' && isdigit((unsigned char)fmt[1]))
|
||||
++numfmtspecs;
|
||||
}
|
||||
return numfmtspecs;
|
||||
@@ -115,7 +115,7 @@ using js::frontend::Parser;
|
||||
#define JS_ADDRESSOF_VA_LIST(ap) (&(ap))
|
||||
#endif
|
||||
|
||||
-bool
|
||||
+JS_PUBLIC_API(bool)
|
||||
JS::CallArgs::requireAtLeast(JSContext* cx, const char* fnname, unsigned required) {
|
||||
if (length() < required) {
|
||||
char numArgsStr[40];
|
||||
|
||||
@@ -1,8 +1,8 @@
|
||||
$NetBSD: patch-mozilla_js_src_shell_jsoptparse.cpp,v 1.1 2015/03/17 19:50:42 ryoon Exp $
|
||||
$NetBSD: patch-mozilla_js_src_shell_jsoptparse.cpp,v 1.2 2015/09/21 05:03:45 ryoon Exp $
|
||||
|
||||
--- mozilla/js/src/shell/jsoptparse.cpp.orig 2015-03-09 05:34:41.000000000 +0000
|
||||
--- mozilla/js/src/shell/jsoptparse.cpp.orig 2015-09-02 09:27:36.000000000 +0000
|
||||
+++ mozilla/js/src/shell/jsoptparse.cpp
|
||||
@@ -90,11 +90,11 @@ PrintParagraph(const char *text, unsigne
|
||||
@@ -90,7 +90,7 @@ PrintParagraph(const char* text, unsigne
|
||||
printf("%*s", startColno, "");
|
||||
|
||||
while (*it != '\0') {
|
||||
@@ -10,9 +10,4 @@ $NetBSD: patch-mozilla_js_src_shell_jsoptparse.cpp,v 1.1 2015/03/17 19:50:42 ryo
|
||||
+ MOZ_ASSERT(!isspace((unsigned char)*it));
|
||||
|
||||
/* Delimit the current token. */
|
||||
const char *limit = it;
|
||||
- while (!isspace(*limit) && *limit != '\0')
|
||||
+ while (!isspace(((unsigned char)*limit)) && *limit != '\0')
|
||||
++limit;
|
||||
|
||||
/*
|
||||
const char* limit = it;
|
||||
|
||||
@@ -0,0 +1,13 @@
|
||||
$NetBSD: patch-mozilla_js_xpconnect_src_XPCConvert.cpp,v 1.1 2015/09/21 05:03:45 ryoon Exp $
|
||||
|
||||
--- mozilla/js/xpconnect/src/XPCConvert.cpp.orig 2015-09-02 09:28:14.000000000 +0000
|
||||
+++ mozilla/js/xpconnect/src/XPCConvert.cpp
|
||||
@@ -134,7 +134,7 @@ XPCConvert::NativeData2JS(MutableHandleV
|
||||
d.setNumber(*static_cast<const float*>(s));
|
||||
return true;
|
||||
case nsXPTType::T_DOUBLE:
|
||||
- d.setNumber(*static_cast<const double*>(s));
|
||||
+ d.setNumber(CanonicalizeNaN(*static_cast<const double*>(s)));
|
||||
return true;
|
||||
case nsXPTType::T_BOOL :
|
||||
d.setBoolean(*static_cast<const bool*>(s));
|
||||
@@ -1,10 +1,10 @@
|
||||
$NetBSD: patch-mozilla_media_libcubeb_src_cubeb__alsa.c,v 1.4 2015/03/17 19:50:42 ryoon Exp $
|
||||
$NetBSD: patch-mozilla_media_libcubeb_src_cubeb__alsa.c,v 1.5 2015/09/21 05:03:45 ryoon Exp $
|
||||
|
||||
--- mozilla/media/libcubeb/src/cubeb_alsa.c.orig 2015-03-09 05:34:21.000000000 +0000
|
||||
--- mozilla/media/libcubeb/src/cubeb_alsa.c.orig 2015-09-02 09:27:22.000000000 +0000
|
||||
+++ mozilla/media/libcubeb/src/cubeb_alsa.c
|
||||
@@ -6,12 +6,18 @@
|
||||
*/
|
||||
@@ -7,12 +7,18 @@
|
||||
#undef NDEBUG
|
||||
#define _DEFAULT_SOURCE
|
||||
#define _BSD_SOURCE
|
||||
+#if defined(__NetBSD__)
|
||||
+#define _NETBSD_SOURCE
|
||||
@@ -21,7 +21,7 @@ $NetBSD: patch-mozilla_media_libcubeb_src_cubeb__alsa.c,v 1.4 2015/03/17 19:50:4
|
||||
#include <unistd.h>
|
||||
#include <alsa/asoundlib.h>
|
||||
#include "cubeb/cubeb.h"
|
||||
@@ -24,6 +30,51 @@
|
||||
@@ -25,6 +31,51 @@
|
||||
|
||||
#define ALSA_PA_PLUGIN "ALSA <-> PulseAudio PCM I/O Plugin"
|
||||
|
||||
@@ -73,7 +73,7 @@ $NetBSD: patch-mozilla_media_libcubeb_src_cubeb__alsa.c,v 1.4 2015/03/17 19:50:4
|
||||
/* 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),
|
||||
@@ -64,6 +115,8 @@ struct cubeb {
|
||||
@@ -65,6 +116,8 @@ struct cubeb {
|
||||
workaround is not required. */
|
||||
snd_config_t * local_config;
|
||||
int is_pa;
|
||||
@@ -82,7 +82,7 @@ $NetBSD: patch-mozilla_media_libcubeb_src_cubeb__alsa.c,v 1.4 2015/03/17 19:50:4
|
||||
};
|
||||
|
||||
enum stream_state {
|
||||
@@ -257,32 +310,35 @@ alsa_refill_stream(cubeb_stream * stm)
|
||||
@@ -258,32 +311,35 @@ alsa_refill_stream(cubeb_stream * stm)
|
||||
long got;
|
||||
void * p;
|
||||
int draining;
|
||||
@@ -137,7 +137,7 @@ $NetBSD: patch-mozilla_media_libcubeb_src_cubeb__alsa.c,v 1.4 2015/03/17 19:50:4
|
||||
|
||||
/* This should never happen. */
|
||||
if ((unsigned int) avail > stm->buffer_size) {
|
||||
@@ -293,8 +349,8 @@ alsa_refill_stream(cubeb_stream * stm)
|
||||
@@ -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-mozilla_media_libcubeb_src_cubeb__alsa.c,v 1.4 2015/03/17 19:50:4
|
||||
if (avail <= 0) {
|
||||
pthread_mutex_unlock(&stm->mutex);
|
||||
stm->state_callback(stm, stm->user_ptr, CUBEB_STATE_ERROR);
|
||||
@@ -302,7 +358,7 @@ alsa_refill_stream(cubeb_stream * stm)
|
||||
@@ -303,7 +359,7 @@ alsa_refill_stream(cubeb_stream * stm)
|
||||
}
|
||||
}
|
||||
|
||||
@@ -157,7 +157,7 @@ $NetBSD: patch-mozilla_media_libcubeb_src_cubeb__alsa.c,v 1.4 2015/03/17 19:50:4
|
||||
assert(p);
|
||||
|
||||
pthread_mutex_unlock(&stm->mutex);
|
||||
@@ -311,10 +367,11 @@ alsa_refill_stream(cubeb_stream * stm)
|
||||
@@ -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-mozilla_media_libcubeb_src_cubeb__alsa.c,v 1.4 2015/03/17 19:50:4
|
||||
|
||||
if (stm->params.format == CUBEB_SAMPLE_FLOAT32NE) {
|
||||
float * b = (float *) p;
|
||||
@@ -327,14 +384,62 @@ alsa_refill_stream(cubeb_stream * stm)
|
||||
@@ -328,14 +385,64 @@ alsa_refill_stream(cubeb_stream * stm)
|
||||
b[i] *= stm->volume;
|
||||
}
|
||||
}
|
||||
@@ -206,6 +206,7 @@ $NetBSD: patch-mozilla_media_libcubeb_src_cubeb__alsa.c,v 1.4 2015/03/17 19:50:4
|
||||
+ return ERROR;
|
||||
+ }
|
||||
+ continue;
|
||||
+#if defined(EBADFD)
|
||||
+ case -EBADFD:
|
||||
+ fprintf(stderr, "%s: snc_pcm_writei returned -%s, giving up\n",
|
||||
+ __func__, "EBADFD");
|
||||
@@ -213,6 +214,7 @@ $NetBSD: patch-mozilla_media_libcubeb_src_cubeb__alsa.c,v 1.4 2015/03/17 19:50:4
|
||||
+ 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, "
|
||||
@@ -241,7 +243,7 @@ $NetBSD: patch-mozilla_media_libcubeb_src_cubeb__alsa.c,v 1.4 2015/03/17 19:50:4
|
||||
}
|
||||
if (got != avail) {
|
||||
long buffer_fill = stm->buffer_size - (avail - got);
|
||||
@@ -342,7 +447,7 @@ alsa_refill_stream(cubeb_stream * stm)
|
||||
@@ -343,7 +450,7 @@ alsa_refill_stream(cubeb_stream * stm)
|
||||
|
||||
/* Fill the remaining buffer with silence to guarantee one full period
|
||||
has been written. */
|
||||
@@ -250,7 +252,7 @@ $NetBSD: patch-mozilla_media_libcubeb_src_cubeb__alsa.c,v 1.4 2015/03/17 19:50:4
|
||||
|
||||
set_timeout(&stm->drain_timeout, buffer_time * 1000);
|
||||
|
||||
@@ -453,26 +558,26 @@ get_slave_pcm_node(snd_config_t * lconf,
|
||||
@@ -454,26 +561,26 @@ get_slave_pcm_node(snd_config_t * lconf,
|
||||
|
||||
slave_def = NULL;
|
||||
|
||||
@@ -282,7 +284,7 @@ $NetBSD: patch-mozilla_media_libcubeb_src_cubeb__alsa.c,v 1.4 2015/03/17 19:50:4
|
||||
if (r < 0) {
|
||||
break;
|
||||
}
|
||||
@@ -481,7 +586,7 @@ get_slave_pcm_node(snd_config_t * lconf,
|
||||
@@ -482,7 +589,7 @@ get_slave_pcm_node(snd_config_t * lconf,
|
||||
if (r < 0 || r > (int) sizeof(node_name)) {
|
||||
break;
|
||||
}
|
||||
@@ -291,7 +293,7 @@ $NetBSD: patch-mozilla_media_libcubeb_src_cubeb__alsa.c,v 1.4 2015/03/17 19:50:4
|
||||
if (r < 0) {
|
||||
break;
|
||||
}
|
||||
@@ -490,7 +595,7 @@ get_slave_pcm_node(snd_config_t * lconf,
|
||||
@@ -491,7 +598,7 @@ get_slave_pcm_node(snd_config_t * lconf,
|
||||
} while (0);
|
||||
|
||||
if (slave_def) {
|
||||
@@ -300,7 +302,7 @@ $NetBSD: patch-mozilla_media_libcubeb_src_cubeb__alsa.c,v 1.4 2015/03/17 19:50:4
|
||||
}
|
||||
|
||||
return NULL;
|
||||
@@ -513,22 +618,22 @@ init_local_config_with_workaround(char c
|
||||
@@ -514,22 +621,22 @@ init_local_config_with_workaround(char c
|
||||
|
||||
lconf = NULL;
|
||||
|
||||
@@ -327,7 +329,7 @@ $NetBSD: patch-mozilla_media_libcubeb_src_cubeb__alsa.c,v 1.4 2015/03/17 19:50:4
|
||||
if (r < 0) {
|
||||
break;
|
||||
}
|
||||
@@ -537,7 +642,7 @@ init_local_config_with_workaround(char c
|
||||
@@ -538,7 +645,7 @@ init_local_config_with_workaround(char c
|
||||
if (r < 0 || r > (int) sizeof(node_name)) {
|
||||
break;
|
||||
}
|
||||
@@ -336,7 +338,7 @@ $NetBSD: patch-mozilla_media_libcubeb_src_cubeb__alsa.c,v 1.4 2015/03/17 19:50:4
|
||||
if (r < 0) {
|
||||
break;
|
||||
}
|
||||
@@ -548,12 +653,12 @@ init_local_config_with_workaround(char c
|
||||
@@ -549,12 +656,12 @@ init_local_config_with_workaround(char c
|
||||
}
|
||||
|
||||
/* Fetch the PCM node's type, and bail out if it's not the PulseAudio plugin. */
|
||||
@@ -351,7 +353,7 @@ $NetBSD: patch-mozilla_media_libcubeb_src_cubeb__alsa.c,v 1.4 2015/03/17 19:50:4
|
||||
if (r < 0) {
|
||||
break;
|
||||
}
|
||||
@@ -564,18 +669,18 @@ init_local_config_with_workaround(char c
|
||||
@@ -565,18 +672,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. */
|
||||
@@ -373,7 +375,7 @@ $NetBSD: patch-mozilla_media_libcubeb_src_cubeb__alsa.c,v 1.4 2015/03/17 19:50:4
|
||||
if (r < 0) {
|
||||
break;
|
||||
}
|
||||
@@ -583,7 +688,7 @@ init_local_config_with_workaround(char c
|
||||
@@ -584,7 +691,7 @@ init_local_config_with_workaround(char c
|
||||
return lconf;
|
||||
} while (0);
|
||||
|
||||
@@ -382,7 +384,7 @@ $NetBSD: patch-mozilla_media_libcubeb_src_cubeb__alsa.c,v 1.4 2015/03/17 19:50:4
|
||||
|
||||
return NULL;
|
||||
}
|
||||
@@ -595,9 +700,9 @@ alsa_locked_pcm_open(snd_pcm_t ** pcm, s
|
||||
@@ -596,9 +703,9 @@ alsa_locked_pcm_open(snd_pcm_t ** pcm, s
|
||||
|
||||
pthread_mutex_lock(&cubeb_alsa_mutex);
|
||||
if (local_config) {
|
||||
@@ -394,7 +396,7 @@ $NetBSD: patch-mozilla_media_libcubeb_src_cubeb__alsa.c,v 1.4 2015/03/17 19:50:4
|
||||
}
|
||||
pthread_mutex_unlock(&cubeb_alsa_mutex);
|
||||
|
||||
@@ -610,7 +715,7 @@ alsa_locked_pcm_close(snd_pcm_t * pcm)
|
||||
@@ -611,7 +718,7 @@ alsa_locked_pcm_close(snd_pcm_t * pcm)
|
||||
int r;
|
||||
|
||||
pthread_mutex_lock(&cubeb_alsa_mutex);
|
||||
@@ -403,7 +405,7 @@ $NetBSD: patch-mozilla_media_libcubeb_src_cubeb__alsa.c,v 1.4 2015/03/17 19:50:4
|
||||
pthread_mutex_unlock(&cubeb_alsa_mutex);
|
||||
|
||||
return r;
|
||||
@@ -667,12 +772,65 @@ alsa_init(cubeb ** context, char const *
|
||||
@@ -668,12 +775,65 @@ alsa_init(cubeb ** context, char const *
|
||||
pthread_attr_t attr;
|
||||
snd_pcm_t * dummy;
|
||||
|
||||
@@ -470,7 +472,7 @@ $NetBSD: patch-mozilla_media_libcubeb_src_cubeb__alsa.c,v 1.4 2015/03/17 19:50:4
|
||||
cubeb_alsa_error_handler_set = 1;
|
||||
}
|
||||
pthread_mutex_unlock(&cubeb_alsa_mutex);
|
||||
@@ -680,6 +838,8 @@ alsa_init(cubeb ** context, char const *
|
||||
@@ -681,6 +841,8 @@ alsa_init(cubeb ** context, char const *
|
||||
ctx = calloc(1, sizeof(*ctx));
|
||||
assert(ctx);
|
||||
|
||||
@@ -479,7 +481,7 @@ $NetBSD: patch-mozilla_media_libcubeb_src_cubeb__alsa.c,v 1.4 2015/03/17 19:50:4
|
||||
ctx->ops = &alsa_ops;
|
||||
|
||||
r = pthread_mutex_init(&ctx->mutex, NULL);
|
||||
@@ -729,7 +889,7 @@ alsa_init(cubeb ** context, char const *
|
||||
@@ -730,7 +892,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);
|
||||
@@ -488,7 +490,7 @@ $NetBSD: patch-mozilla_media_libcubeb_src_cubeb__alsa.c,v 1.4 2015/03/17 19:50:4
|
||||
pthread_mutex_unlock(&cubeb_alsa_mutex);
|
||||
ctx->local_config = NULL;
|
||||
} else if (r >= 0) {
|
||||
@@ -768,9 +928,13 @@ alsa_destroy(cubeb * ctx)
|
||||
@@ -769,9 +931,13 @@ alsa_destroy(cubeb * ctx)
|
||||
pthread_mutex_destroy(&ctx->mutex);
|
||||
free(ctx->fds);
|
||||
|
||||
@@ -503,7 +505,7 @@ $NetBSD: patch-mozilla_media_libcubeb_src_cubeb__alsa.c,v 1.4 2015/03/17 19:50:4
|
||||
pthread_mutex_unlock(&cubeb_alsa_mutex);
|
||||
}
|
||||
|
||||
@@ -838,7 +1002,7 @@ alsa_stream_init(cubeb * ctx, cubeb_stre
|
||||
@@ -839,7 +1005,7 @@ alsa_stream_init(cubeb * ctx, cubeb_stre
|
||||
return CUBEB_ERROR;
|
||||
}
|
||||
|
||||
@@ -512,7 +514,7 @@ $NetBSD: patch-mozilla_media_libcubeb_src_cubeb__alsa.c,v 1.4 2015/03/17 19:50:4
|
||||
assert(r == 0);
|
||||
|
||||
/* Ugly hack: the PA ALSA plugin allows buffer configurations that can't
|
||||
@@ -848,23 +1012,23 @@ alsa_stream_init(cubeb * ctx, cubeb_stre
|
||||
@@ -849,23 +1015,23 @@ alsa_stream_init(cubeb * ctx, cubeb_stre
|
||||
latency = latency < 500 ? 500 : latency;
|
||||
}
|
||||
|
||||
@@ -542,7 +544,7 @@ $NetBSD: patch-mozilla_media_libcubeb_src_cubeb__alsa.c,v 1.4 2015/03/17 19:50:4
|
||||
assert((nfds_t) r == stm->nfds);
|
||||
|
||||
r = pthread_cond_init(&stm->cond, NULL);
|
||||
@@ -895,7 +1059,7 @@ alsa_stream_destroy(cubeb_stream * stm)
|
||||
@@ -896,7 +1062,7 @@ alsa_stream_destroy(cubeb_stream * stm)
|
||||
pthread_mutex_lock(&stm->mutex);
|
||||
if (stm->pcm) {
|
||||
if (stm->state == DRAINING) {
|
||||
@@ -551,7 +553,7 @@ $NetBSD: patch-mozilla_media_libcubeb_src_cubeb__alsa.c,v 1.4 2015/03/17 19:50:4
|
||||
}
|
||||
alsa_locked_pcm_close(stm->pcm);
|
||||
stm->pcm = NULL;
|
||||
@@ -905,7 +1069,10 @@ alsa_stream_destroy(cubeb_stream * stm)
|
||||
@@ -906,7 +1072,10 @@ alsa_stream_destroy(cubeb_stream * stm)
|
||||
pthread_mutex_destroy(&stm->mutex);
|
||||
|
||||
r = pthread_cond_destroy(&stm->cond);
|
||||
@@ -563,42 +565,42 @@ $NetBSD: patch-mozilla_media_libcubeb_src_cubeb__alsa.c,v 1.4 2015/03/17 19:50:4
|
||||
|
||||
alsa_unregister_stream(stm);
|
||||
|
||||
@@ -937,12 +1104,12 @@ alsa_get_max_channel_count(cubeb * ctx,
|
||||
@@ -938,12 +1107,12 @@ alsa_get_max_channel_count(cubeb * ctx,
|
||||
return CUBEB_ERROR;
|
||||
}
|
||||
|
||||
- rv = snd_pcm_hw_params_any(stm->pcm, hw_params);
|
||||
+ rv = WRAP(snd_pcm_hw_params_any)(stm->pcm, hw_params);
|
||||
if (rv < 0) {
|
||||
- r = snd_pcm_hw_params_any(stm->pcm, hw_params);
|
||||
+ r = WRAP(snd_pcm_hw_params_any)(stm->pcm, hw_params);
|
||||
if (r < 0) {
|
||||
return CUBEB_ERROR;
|
||||
}
|
||||
|
||||
- rv = snd_pcm_hw_params_get_channels_max(hw_params, max_channels);
|
||||
+ rv = WRAP(snd_pcm_hw_params_get_channels_max)(hw_params, max_channels);
|
||||
if (rv < 0) {
|
||||
- r = snd_pcm_hw_params_get_channels_max(hw_params, max_channels);
|
||||
+ r = WRAP(snd_pcm_hw_params_get_channels_max)(hw_params, max_channels);
|
||||
if (r < 0) {
|
||||
return CUBEB_ERROR;
|
||||
}
|
||||
@@ -962,34 +1129,34 @@ alsa_get_preferred_sample_rate(cubeb * c
|
||||
@@ -963,34 +1132,34 @@ alsa_get_preferred_sample_rate(cubeb * c
|
||||
|
||||
/* get a pcm, disabling resampling, so we get a rate the
|
||||
* hardware/dmix/pulse/etc. supports. */
|
||||
- rv = snd_pcm_open(&pcm, "", SND_PCM_STREAM_PLAYBACK | SND_PCM_NO_AUTO_RESAMPLE, 0);
|
||||
+ rv = WRAP(snd_pcm_open)(&pcm, "", SND_PCM_STREAM_PLAYBACK | SND_PCM_NO_AUTO_RESAMPLE, 0);
|
||||
if (rv < 0) {
|
||||
- r = snd_pcm_open(&pcm, "default", SND_PCM_STREAM_PLAYBACK | SND_PCM_NO_AUTO_RESAMPLE, 0);
|
||||
+ r = WRAP(snd_pcm_open)(&pcm, "default", SND_PCM_STREAM_PLAYBACK | SND_PCM_NO_AUTO_RESAMPLE, 0);
|
||||
if (r < 0) {
|
||||
return CUBEB_ERROR;
|
||||
}
|
||||
|
||||
- rv = snd_pcm_hw_params_any(pcm, hw_params);
|
||||
+ rv = WRAP(snd_pcm_hw_params_any)(pcm, hw_params);
|
||||
if (rv < 0) {
|
||||
- r = snd_pcm_hw_params_any(pcm, hw_params);
|
||||
+ r = WRAP(snd_pcm_hw_params_any)(pcm, hw_params);
|
||||
if (r < 0) {
|
||||
- snd_pcm_close(pcm);
|
||||
+ WRAP(snd_pcm_close)(pcm);
|
||||
return CUBEB_ERROR;
|
||||
}
|
||||
|
||||
- rv = snd_pcm_hw_params_get_rate(hw_params, rate, &dir);
|
||||
+ rv = WRAP(snd_pcm_hw_params_get_rate)(hw_params, rate, &dir);
|
||||
if (rv >= 0) {
|
||||
- r = snd_pcm_hw_params_get_rate(hw_params, rate, &dir);
|
||||
+ r = WRAP(snd_pcm_hw_params_get_rate)(hw_params, rate, &dir);
|
||||
if (r >= 0) {
|
||||
/* There is a default rate: use it. */
|
||||
- snd_pcm_close(pcm);
|
||||
+ WRAP(snd_pcm_close)(pcm);
|
||||
@@ -608,9 +610,9 @@ $NetBSD: patch-mozilla_media_libcubeb_src_cubeb__alsa.c,v 1.4 2015/03/17 19:50:4
|
||||
/* Use a common rate, alsa may adjust it based on hw/etc. capabilities. */
|
||||
*rate = 44100;
|
||||
|
||||
- rv = snd_pcm_hw_params_set_rate_near(pcm, hw_params, rate, NULL);
|
||||
+ rv = WRAP(snd_pcm_hw_params_set_rate_near)(pcm, hw_params, rate, NULL);
|
||||
if (rv < 0) {
|
||||
- r = snd_pcm_hw_params_set_rate_near(pcm, hw_params, rate, NULL);
|
||||
+ r = WRAP(snd_pcm_hw_params_set_rate_near)(pcm, hw_params, rate, NULL);
|
||||
if (r < 0) {
|
||||
- snd_pcm_close(pcm);
|
||||
+ WRAP(snd_pcm_close)(pcm);
|
||||
return CUBEB_ERROR;
|
||||
@@ -621,7 +623,7 @@ $NetBSD: patch-mozilla_media_libcubeb_src_cubeb__alsa.c,v 1.4 2015/03/17 19:50:4
|
||||
|
||||
return CUBEB_OK;
|
||||
}
|
||||
@@ -1013,7 +1180,7 @@ alsa_stream_start(cubeb_stream * stm)
|
||||
@@ -1014,7 +1183,7 @@ alsa_stream_start(cubeb_stream * stm)
|
||||
ctx = stm->context;
|
||||
|
||||
pthread_mutex_lock(&stm->mutex);
|
||||
@@ -630,7 +632,7 @@ $NetBSD: patch-mozilla_media_libcubeb_src_cubeb__alsa.c,v 1.4 2015/03/17 19:50:4
|
||||
gettimeofday(&stm->last_activity, NULL);
|
||||
pthread_mutex_unlock(&stm->mutex);
|
||||
|
||||
@@ -1047,7 +1214,7 @@ alsa_stream_stop(cubeb_stream * stm)
|
||||
@@ -1048,7 +1217,7 @@ alsa_stream_stop(cubeb_stream * stm)
|
||||
pthread_mutex_unlock(&ctx->mutex);
|
||||
|
||||
pthread_mutex_lock(&stm->mutex);
|
||||
@@ -639,7 +641,7 @@ $NetBSD: patch-mozilla_media_libcubeb_src_cubeb__alsa.c,v 1.4 2015/03/17 19:50:4
|
||||
pthread_mutex_unlock(&stm->mutex);
|
||||
|
||||
return CUBEB_OK;
|
||||
@@ -1063,14 +1230,17 @@ alsa_stream_get_position(cubeb_stream *
|
||||
@@ -1064,14 +1233,17 @@ alsa_stream_get_position(cubeb_stream *
|
||||
pthread_mutex_lock(&stm->mutex);
|
||||
|
||||
delay = -1;
|
||||
@@ -660,7 +662,7 @@ $NetBSD: patch-mozilla_media_libcubeb_src_cubeb__alsa.c,v 1.4 2015/03/17 19:50:4
|
||||
|
||||
*position = 0;
|
||||
if (stm->write_position >= (snd_pcm_uframes_t) delay) {
|
||||
@@ -1089,7 +1259,7 @@ alsa_stream_get_latency(cubeb_stream * s
|
||||
@@ -1090,7 +1262,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. */
|
||||
|
||||
@@ -1,20 +0,0 @@
|
||||
$NetBSD: patch-mozilla_media_webrtc_signaling_signaling.gyp,v 1.3 2014/06/22 08:54:39 ryoon Exp $
|
||||
|
||||
--- mozilla/media/webrtc/signaling/signaling.gyp.orig 2014-06-13 00:46:10.000000000 +0000
|
||||
+++ mozilla/media/webrtc/signaling/signaling.gyp
|
||||
@@ -825,14 +825,13 @@
|
||||
['OS=="mac"', {
|
||||
'defines' : [
|
||||
'SIP_OS_OSX',
|
||||
- '_POSIX_SOURCE',
|
||||
+ # using BSD extensions, leave _POSIX_SOURCE undefined
|
||||
'CPR_MEMORY_LITTLE_ENDIAN',
|
||||
'NO_SOCKET_POLLING',
|
||||
'USE_TIMER_SELECT_BASED',
|
||||
'FULL_BUILD',
|
||||
'STUBBED_OUT',
|
||||
'USE_PRINTF',
|
||||
- '_DARWIN_C_SOURCE',
|
||||
'NO_NSPR_10_SUPPORT',
|
||||
],
|
||||
}],
|
||||
+15
-5
@@ -1,17 +1,27 @@
|
||||
$NetBSD: patch-mozilla_media_webrtc_trunk_webrtc_modules_audio__coding_codecs_opus_opus.gypi,v 1.2 2014/06/22 08:54:39 ryoon Exp $
|
||||
$NetBSD: patch-mozilla_media_webrtc_trunk_webrtc_modules_audio__coding_codecs_opus_opus.gypi,v 1.3 2015/09/21 05:03:45 ryoon Exp $
|
||||
|
||||
--- mozilla/media/webrtc/trunk/webrtc/modules/audio_coding/codecs/opus/opus.gypi.orig 2014-06-13 00:45:44.000000000 +0000
|
||||
--- mozilla/media/webrtc/trunk/webrtc/modules/audio_coding/codecs/opus/opus.gypi.orig 2015-09-02 09:27:27.000000000 +0000
|
||||
+++ mozilla/media/webrtc/trunk/webrtc/modules/audio_coding/codecs/opus/opus.gypi
|
||||
@@ -14,9 +14,9 @@
|
||||
@@ -17,18 +17,11 @@
|
||||
'conditions': [
|
||||
['build_with_mozilla==1', {
|
||||
# Mozilla provides its own build of the opus library.
|
||||
- 'include_dirs': [
|
||||
- '/media/libopus/include',
|
||||
- ]
|
||||
- '/media/libopus/src',
|
||||
- '/media/libopus/celt',
|
||||
+ 'cflags_mozilla': [
|
||||
+ '$(filter -I%, $(MOZ_CELT_CFLAGS))/celt',
|
||||
+ '$(MOZ_OPUS_CFLAGS)',
|
||||
+ ],
|
||||
+ '$(filter -I%, $(MOZ_OPUS_CFLAGS))/../src',
|
||||
],
|
||||
- 'direct_dependent_settings': {
|
||||
- 'include_dirs': [
|
||||
- '/media/libopus/include',
|
||||
- '/media/libopus/src',
|
||||
- '/media/libopus/celt',
|
||||
- ],
|
||||
- },
|
||||
}, {
|
||||
'dependencies': [
|
||||
'<(DEPTH)/third_party/opus/opus.gyp:opus'
|
||||
|
||||
+28
@@ -0,0 +1,28 @@
|
||||
$NetBSD: patch-mozilla_media_webrtc_trunk_webrtc_modules_audio__coding_neteq_neteq.gypi,v 1.1 2015/09/21 05:03:45 ryoon Exp $
|
||||
|
||||
--- mozilla/media/webrtc/trunk/webrtc/modules/audio_coding/neteq/neteq.gypi.orig 2015-09-02 09:27:27.000000000 +0000
|
||||
+++ mozilla/media/webrtc/trunk/webrtc/modules/audio_coding/neteq/neteq.gypi
|
||||
@@ -84,19 +84,11 @@
|
||||
],
|
||||
}],
|
||||
['build_with_mozilla==1', {
|
||||
- 'include_dirs': [
|
||||
- # Need Opus header files for the audio classifier.
|
||||
- '<(DEPTH)/../../../media/opus/celt',
|
||||
-# '<(DEPTH)/third_party/opus/src/src',
|
||||
+ 'cflags_mozilla': [
|
||||
+ '$(filter -I%, $(MOZ_CELT_CFLAGS))/celt',
|
||||
+ '$(MOZ_OPUS_CFLAGS)',
|
||||
+ '$(filter -I%, $(MOZ_OPUS_CFLAGS))/../src',
|
||||
],
|
||||
- 'direct_dependent_settings': {
|
||||
- 'include_dirs': [
|
||||
- '../../../../../../media/opus/celt',
|
||||
- # Need Opus header files for the audio classifier.
|
||||
- '<(DEPTH)/../../../media/opus/celt',
|
||||
-# '<(DEPTH)/third_party/opus/src/src',
|
||||
- ],
|
||||
- },
|
||||
}],
|
||||
],
|
||||
'sources': [
|
||||
+22
-22
@@ -1,6 +1,6 @@
|
||||
$NetBSD: patch-mozilla_media_webrtc_trunk_webrtc_modules_video__capture_video__capture.gypi,v 1.3 2014/11/02 05:40:31 ryoon Exp $
|
||||
$NetBSD: patch-mozilla_media_webrtc_trunk_webrtc_modules_video__capture_video__capture.gypi,v 1.4 2015/09/21 05:03:45 ryoon Exp $
|
||||
|
||||
--- mozilla/media/webrtc/trunk/webrtc/modules/video_capture/video_capture.gypi.orig 2014-10-14 06:36:31.000000000 +0000
|
||||
--- mozilla/media/webrtc/trunk/webrtc/modules/video_capture/video_capture.gypi.orig 2015-09-02 09:27:28.000000000 +0000
|
||||
+++ mozilla/media/webrtc/trunk/webrtc/modules/video_capture/video_capture.gypi
|
||||
@@ -7,6 +7,9 @@
|
||||
# be found in the AUTHORS file in the root of the source tree.
|
||||
@@ -11,24 +11,24 @@ $NetBSD: patch-mozilla_media_webrtc_trunk_webrtc_modules_video__capture_video__c
|
||||
+ },
|
||||
'targets': [
|
||||
{
|
||||
'target_name': 'video_capture_module',
|
||||
@@ -46,6 +49,19 @@
|
||||
'linux/video_capture_linux.cc',
|
||||
'linux/video_capture_linux.h',
|
||||
],
|
||||
+ 'conditions': [
|
||||
+ ['use_libv4l2==1', {
|
||||
+ 'defines': [
|
||||
+ 'HAVE_LIBV4L2',
|
||||
+ ],
|
||||
+ 'cflags_mozilla': [
|
||||
+ '$(MOZ_LIBV4L2_CFLAGS)',
|
||||
+ ],
|
||||
+ 'libraries': [
|
||||
+ '-lv4l2',
|
||||
+ ],
|
||||
+ }],
|
||||
# Note this library is missing an implementation for the video capture.
|
||||
@@ -69,6 +72,19 @@
|
||||
'linux/video_capture_linux.cc',
|
||||
'linux/video_capture_linux.h',
|
||||
],
|
||||
+ 'conditions': [
|
||||
+ ['use_libv4l2==1', {
|
||||
+ 'defines': [
|
||||
+ 'HAVE_LIBV4L2',
|
||||
+ ],
|
||||
}], # linux
|
||||
['OS=="mac"', {
|
||||
'sources': [
|
||||
+ 'cflags_mozilla': [
|
||||
+ '$(MOZ_LIBV4L2_CFLAGS)',
|
||||
+ ],
|
||||
+ 'libraries': [
|
||||
+ '-lv4l2',
|
||||
+ ],
|
||||
+ }],
|
||||
+ ],
|
||||
}], # linux
|
||||
['OS=="mac"', {
|
||||
'sources': [
|
||||
|
||||
-20
@@ -1,20 +0,0 @@
|
||||
$NetBSD: patch-mozilla_media_webrtc_trunk_webrtc_modules_video__coding_main_source_receiver.cc,v 1.1 2015/03/17 19:50:42 ryoon Exp $
|
||||
|
||||
--- mozilla/media/webrtc/trunk/webrtc/modules/video_coding/main/source/receiver.cc.orig 2015-03-09 05:34:40.000000000 +0000
|
||||
+++ mozilla/media/webrtc/trunk/webrtc/modules/video_coding/main/source/receiver.cc
|
||||
@@ -159,12 +159,13 @@ VCMEncodedFrame* VCMReceiver::FrameForDe
|
||||
// Assume that render timing errors are due to changes in the video stream.
|
||||
if (next_render_time_ms < 0) {
|
||||
timing_error = true;
|
||||
- } else if (std::abs(next_render_time_ms - now_ms) > max_video_delay_ms_) {
|
||||
+ } else if (std::abs(static_cast<int>(next_render_time_ms - now_ms)) >
|
||||
+ max_video_delay_ms_) {
|
||||
WEBRTC_TRACE(webrtc::kTraceWarning, webrtc::kTraceVideoCoding,
|
||||
VCMId(vcm_id_, receiver_id_),
|
||||
"This frame is out of our delay bounds, resetting jitter "
|
||||
"buffer: %d > %d",
|
||||
- static_cast<int>(std::abs(next_render_time_ms - now_ms)),
|
||||
+ std::abs(static_cast<int>(next_render_time_ms - now_ms)),
|
||||
max_video_delay_ms_);
|
||||
timing_error = true;
|
||||
} else if (static_cast<int>(timing_->TargetVideoDelay()) >
|
||||
+5
-5
@@ -1,6 +1,6 @@
|
||||
$NetBSD: patch-mozilla_media_webrtc_trunk_webrtc_system__wrappers_source_spreadsortlib_spreadsort.hpp,v 1.4 2015/02/15 02:11:03 ryoon Exp $
|
||||
$NetBSD: patch-mozilla_media_webrtc_trunk_webrtc_system__wrappers_source_spreadsortlib_spreadsort.hpp,v 1.5 2015/09/21 05:03:45 ryoon Exp $
|
||||
|
||||
--- mozilla/media/webrtc/trunk/webrtc/system_wrappers/source/spreadsortlib/spreadsort.hpp.orig 2015-02-05 04:39:00.000000000 +0000
|
||||
--- mozilla/media/webrtc/trunk/webrtc/system_wrappers/source/spreadsortlib/spreadsort.hpp.orig 2015-09-02 09:27:31.000000000 +0000
|
||||
+++ mozilla/media/webrtc/trunk/webrtc/system_wrappers/source/spreadsortlib/spreadsort.hpp
|
||||
@@ -14,6 +14,13 @@ Cygwin fix provided by:
|
||||
Scott McMurray
|
||||
@@ -27,6 +27,6 @@ $NetBSD: patch-mozilla_media_webrtc_trunk_webrtc_system__wrappers_source_spreads
|
||||
+# endif
|
||||
+#endif
|
||||
+
|
||||
namespace boost {
|
||||
namespace detail {
|
||||
//This only works on unsigned data types
|
||||
#ifdef getchar
|
||||
#undef getchar
|
||||
#endif
|
||||
|
||||
@@ -1,35 +1,9 @@
|
||||
$NetBSD: patch-mozilla_memory_build_mozjemalloc__compat.c,v 1.2 2015/03/17 19:50:42 ryoon Exp $
|
||||
$NetBSD: patch-mozilla_memory_build_mozjemalloc__compat.c,v 1.3 2015/09/21 05:03:45 ryoon Exp $
|
||||
|
||||
--- mozilla/memory/build/mozjemalloc_compat.c.orig 2015-03-09 05:34:43.000000000 +0000
|
||||
--- mozilla/memory/build/mozjemalloc_compat.c.orig 2015-09-02 09:27:33.000000000 +0000
|
||||
+++ mozilla/memory/build/mozjemalloc_compat.c
|
||||
@@ -12,6 +12,8 @@
|
||||
#include "jemalloc_types.h"
|
||||
#include "mozilla/Types.h"
|
||||
|
||||
+#include <stdbool.h>
|
||||
+
|
||||
#if defined(MOZ_NATIVE_JEMALLOC)
|
||||
|
||||
MOZ_IMPORT_API int
|
||||
@@ -47,6 +49,16 @@ je_(nallocm)(size_t *rsize, size_t size,
|
||||
je_(mallctlbymib)(mib, miblen, &v, &sz, NULL, 0); \
|
||||
} while (0)
|
||||
|
||||
+#define CTL_IJ_GET(n, v, i, j) do { \
|
||||
+ size_t mib[6]; \
|
||||
+ size_t miblen = sizeof(mib) / sizeof(mib[0]); \
|
||||
+ size_t sz = sizeof(v); \
|
||||
+ je_(mallctlnametomib)(n, mib, &miblen); \
|
||||
+ mib[2] = i; \
|
||||
+ mib[4] = j; \
|
||||
+ je_(mallctlbymib)(mib, miblen, &v, &sz, NULL, 0); \
|
||||
+} while (0)
|
||||
+
|
||||
MOZ_MEMORY_API size_t
|
||||
malloc_good_size_impl(size_t size)
|
||||
{
|
||||
@@ -61,6 +73,48 @@ malloc_good_size_impl(size_t size)
|
||||
return size;
|
||||
@@ -131,6 +131,48 @@ compute_bin_unused(unsigned int narenas)
|
||||
return bin_unused;
|
||||
}
|
||||
|
||||
+static size_t
|
||||
@@ -77,13 +51,3 @@ $NetBSD: patch-mozilla_memory_build_mozjemalloc__compat.c,v 1.2 2015/03/17 19:50
|
||||
MOZ_JEMALLOC_API void
|
||||
jemalloc_stats_impl(jemalloc_stats_t *stats)
|
||||
{
|
||||
@@ -93,7 +147,8 @@ jemalloc_stats_impl(jemalloc_stats_t *st
|
||||
// We could get this value out of base.c::base_pages, but that really should
|
||||
// be an upstream change, so don't worry about it for now.
|
||||
stats->bookkeeping = 0;
|
||||
- stats->bin_unused = 0;
|
||||
+
|
||||
+ stats->bin_unused = compute_bin_unused(narenas);
|
||||
}
|
||||
|
||||
MOZ_JEMALLOC_API void
|
||||
|
||||
@@ -1,31 +1,13 @@
|
||||
$NetBSD: patch-mozilla_memory_jemalloc_src_configure,v 1.1 2014/11/02 05:40:31 ryoon Exp $
|
||||
$NetBSD: patch-mozilla_memory_jemalloc_src_configure,v 1.2 2015/09/21 05:03:45 ryoon Exp $
|
||||
|
||||
--- mozilla/memory/jemalloc/src/configure.orig 2014-10-14 06:36:32.000000000 +0000
|
||||
--- mozilla/memory/jemalloc/src/configure.orig 2015-09-02 09:27:33.000000000 +0000
|
||||
+++ mozilla/memory/jemalloc/src/configure
|
||||
@@ -6344,7 +6344,7 @@ else
|
||||
@@ -6566,7 +6566,7 @@ else
|
||||
LG_PAGE="detect"
|
||||
fi
|
||||
|
||||
if test "x$have_sbrk" = "x1" ; then
|
||||
- if test "x$sbrk_deprecated" == "x1" ; then
|
||||
+ if test "x$sbrk_deprecated" = "x1" ; then
|
||||
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: Disabling dss allocation because sbrk is deprecated" >&5
|
||||
$as_echo "Disabling dss allocation because sbrk is deprecated" >&6; }
|
||||
enable_dss="0"
|
||||
@@ -6945,7 +6945,7 @@ fi
|
||||
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $je_cv_gcc_builtin_ffsl" >&5
|
||||
$as_echo "$je_cv_gcc_builtin_ffsl" >&6; }
|
||||
|
||||
-if test "x${je_cv_gcc_builtin_ffsl}" == "xyes" ; then
|
||||
+if test "x${je_cv_gcc_builtin_ffsl}" = "xyes" ; then
|
||||
$as_echo "#define JEMALLOC_INTERNAL_FFSL __builtin_ffsl" >>confdefs.h
|
||||
|
||||
$as_echo "#define JEMALLOC_INTERNAL_FFS __builtin_ffs" >>confdefs.h
|
||||
@@ -6988,7 +6988,7 @@ fi
|
||||
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $je_cv_function_ffsl" >&5
|
||||
$as_echo "$je_cv_function_ffsl" >&6; }
|
||||
|
||||
- if test "x${je_cv_function_ffsl}" == "xyes" ; then
|
||||
+ if test "x${je_cv_function_ffsl}" = "xyes" ; then
|
||||
$as_echo "#define JEMALLOC_INTERNAL_FFSL ffsl" >>confdefs.h
|
||||
|
||||
$as_echo "#define JEMALLOC_INTERNAL_FFS ffs" >>confdefs.h
|
||||
-if test "x$LG_PAGE" == "xdetect"; then
|
||||
+if test "x$LG_PAGE" = "xdetect"; then
|
||||
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking LG_PAGE" >&5
|
||||
$as_echo_n "checking LG_PAGE... " >&6; }
|
||||
if ${je_cv_lg_page+:} false; then :
|
||||
|
||||
+4
-4
@@ -1,8 +1,8 @@
|
||||
$NetBSD: patch-mozilla_memory_mozalloc_VolatileBufferOSX.cpp,v 1.1 2015/02/15 02:11:03 ryoon Exp $
|
||||
$NetBSD: patch-mozilla_memory_volatile_VolatileBufferOSX.cpp,v 1.1 2015/09/21 05:03:45 ryoon Exp $
|
||||
|
||||
--- mozilla/memory/mozalloc/VolatileBufferOSX.cpp.orig 2015-02-05 04:39:05.000000000 +0000
|
||||
+++ mozilla/memory/mozalloc/VolatileBufferOSX.cpp
|
||||
@@ -46,7 +46,14 @@ VolatileBuffer::Init(size_t aSize, size_
|
||||
--- mozilla/memory/volatile/VolatileBufferOSX.cpp.orig 2015-09-02 09:27:34.000000000 +0000
|
||||
+++ mozilla/memory/volatile/VolatileBufferOSX.cpp
|
||||
@@ -47,7 +47,14 @@ VolatileBuffer::Init(size_t aSize, size_
|
||||
}
|
||||
|
||||
heap_alloc:
|
||||
@@ -1,16 +1,16 @@
|
||||
$NetBSD: patch-mozilla_mfbt_Attributes.h,v 1.1 2014/11/02 05:40:31 ryoon Exp $
|
||||
$NetBSD: patch-mozilla_mfbt_Attributes.h,v 1.2 2015/09/21 05:03:45 ryoon Exp $
|
||||
|
||||
--- mozilla/mfbt/Attributes.h.orig 2014-10-14 06:36:32.000000000 +0000
|
||||
--- mozilla/mfbt/Attributes.h.orig 2015-09-02 09:27:34.000000000 +0000
|
||||
+++ mozilla/mfbt/Attributes.h
|
||||
@@ -51,6 +51,7 @@
|
||||
@@ -50,6 +50,7 @@
|
||||
* don't indicate support for them here, due to
|
||||
* http://stackoverflow.com/questions/20498142/visual-studio-2013-explicit-keyword-bug
|
||||
*/
|
||||
# if _MSC_VER >= 1800
|
||||
+# define MOZ_HAVE_CXX11_ALIGNAS
|
||||
# define MOZ_HAVE_CXX11_DELETE
|
||||
# endif
|
||||
# if _MSC_VER >= 1700
|
||||
@@ -74,6 +75,9 @@
|
||||
+# define MOZ_HAVE_CXX11_ALIGNAS
|
||||
# define MOZ_HAVE_NEVER_INLINE __declspec(noinline)
|
||||
# define MOZ_HAVE_NORETURN __declspec(noreturn)
|
||||
# ifdef __clang__
|
||||
@@ -70,6 +71,9 @@
|
||||
# ifndef __has_extension
|
||||
# define __has_extension __has_feature /* compatibility, for older versions of clang */
|
||||
# endif
|
||||
@@ -20,13 +20,13 @@ $NetBSD: patch-mozilla_mfbt_Attributes.h,v 1.1 2014/11/02 05:40:31 ryoon Exp $
|
||||
# if __has_extension(cxx_constexpr)
|
||||
# define MOZ_HAVE_CXX11_CONSTEXPR
|
||||
# endif
|
||||
@@ -95,6 +99,9 @@
|
||||
@@ -84,6 +88,9 @@
|
||||
# endif
|
||||
#elif defined(__GNUC__)
|
||||
# if defined(__GXX_EXPERIMENTAL_CXX0X__) || __cplusplus >= 201103L
|
||||
+# if MOZ_GCC_VERSION_AT_LEAST(4, 8, 0)
|
||||
+# define MOZ_HAVE_CXX11_ALIGNAS
|
||||
+# endif
|
||||
# if MOZ_GCC_VERSION_AT_LEAST(4, 7, 0)
|
||||
# define MOZ_HAVE_CXX11_OVERRIDE
|
||||
# define MOZ_HAVE_CXX11_FINAL final
|
||||
# define MOZ_HAVE_CXX11_CONSTEXPR
|
||||
# define MOZ_HAVE_EXPLICIT_CONVERSION
|
||||
# endif
|
||||
|
||||
+4
-4
@@ -1,7 +1,7 @@
|
||||
$NetBSD: patch-mozilla_netwerk_base_public_nsNetUtil.h,v 1.1 2015/03/17 19:50:42 ryoon Exp $
|
||||
$NetBSD: patch-mozilla_netwerk_base_nsNetUtil.h,v 1.1 2015/09/21 05:03:45 ryoon Exp $
|
||||
|
||||
--- mozilla/netwerk/base/public/nsNetUtil.h.orig 2015-03-09 05:34:54.000000000 +0000
|
||||
+++ mozilla/netwerk/base/public/nsNetUtil.h
|
||||
--- mozilla/netwerk/base/nsNetUtil.h.orig 2015-09-02 09:27:59.000000000 +0000
|
||||
+++ mozilla/netwerk/base/nsNetUtil.h
|
||||
@@ -13,6 +13,7 @@
|
||||
#include "nsMemory.h"
|
||||
#include "nsCOMPtr.h"
|
||||
@@ -10,7 +10,7 @@ $NetBSD: patch-mozilla_netwerk_base_public_nsNetUtil.h,v 1.1 2015/03/17 19:50:42
|
||||
#include "nsHashKeys.h"
|
||||
|
||||
#include "plstr.h"
|
||||
@@ -2869,6 +2870,26 @@ NS_IsSrcdocChannel(nsIChannel *aChannel)
|
||||
@@ -2828,6 +2829,26 @@ NS_IsSrcdocChannel(nsIChannel *aChannel)
|
||||
bool NS_IsReasonableHTTPHeaderValue(const nsACString& aValue);
|
||||
|
||||
/**
|
||||
@@ -1,15 +0,0 @@
|
||||
$NetBSD: patch-mozilla_netwerk_dns_Makefile.in,v 1.2 2014/06/22 08:54:39 ryoon Exp $
|
||||
|
||||
--- mozilla/netwerk/dns/Makefile.in.orig 2014-06-13 00:45:47.000000000 +0000
|
||||
+++ mozilla/netwerk/dns/Makefile.in
|
||||
@@ -5,6 +5,10 @@
|
||||
|
||||
include $(topsrcdir)/config/rules.mk
|
||||
|
||||
+ifdef MOZ_NATIVE_HARFBUZZ
|
||||
+CXXFLAGS += $(MOZ_HARFBUZZ_CFLAGS)
|
||||
+endif
|
||||
+
|
||||
# Generate the include file containing compact, static definitions
|
||||
# for effective TLD data.
|
||||
etld_data.inc: $(srcdir)/prepare_tlds.py $(srcdir)/effective_tld_names.dat
|
||||
@@ -1,11 +1,13 @@
|
||||
$NetBSD: patch-mozilla_netwerk_dns_moz.build,v 1.1 2015/01/02 04:26:21 ryoon Exp $
|
||||
$NetBSD: patch-mozilla_netwerk_dns_moz.build,v 1.2 2015/09/21 05:03:45 ryoon Exp $
|
||||
|
||||
--- mozilla/netwerk/dns/moz.build.orig 2014-12-03 06:23:17.000000000 +0000
|
||||
--- mozilla/netwerk/dns/moz.build.orig 2015-09-02 09:28:02.000000000 +0000
|
||||
+++ mozilla/netwerk/dns/moz.build
|
||||
@@ -63,3 +63,6 @@ GENERATED_FILES = [
|
||||
LOCAL_INCLUDES += [
|
||||
'../base/src',
|
||||
@@ -68,5 +68,8 @@ LOCAL_INCLUDES += [
|
||||
'/netwerk/base',
|
||||
]
|
||||
+
|
||||
|
||||
+if CONFIG['MOZ_NATIVE_HARFBUZZ']:
|
||||
+ CXXFLAGS += CONFIG['MOZ_HARFBUZZ_CFLAGS']
|
||||
+
|
||||
if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'gonk' and CONFIG['ANDROID_VERSION'] > '19':
|
||||
CXXFLAGS += ['-I%s/bionic/libc/dns/include' % CONFIG['ANDROID_SOURCE']]
|
||||
|
||||
@@ -1,13 +0,0 @@
|
||||
$NetBSD: patch-mozilla_netwerk_wifi_moz.build,v 1.6 2015/01/02 04:26:21 ryoon Exp $
|
||||
|
||||
--- mozilla/netwerk/wifi/moz.build.orig 2014-12-03 06:23:17.000000000 +0000
|
||||
+++ mozilla/netwerk/wifi/moz.build
|
||||
@@ -35,7 +35,7 @@ if CONFIG['OS_ARCH'] == 'Darwin':
|
||||
UNIFIED_SOURCES += [
|
||||
'osx_corewlan.mm',
|
||||
]
|
||||
-elif CONFIG['OS_ARCH'] == 'FreeBSD':
|
||||
+elif CONFIG['OS_ARCH'] in ('DragonFly', 'FreeBSD'):
|
||||
UNIFIED_SOURCES += [
|
||||
'nsWifiScannerFreeBSD.cpp',
|
||||
]
|
||||
@@ -1,16 +0,0 @@
|
||||
$NetBSD: patch-mozilla_netwerk_wifi_nsWifiScannerFreeBSD.cpp,v 1.4 2015/01/02 04:26:21 ryoon Exp $
|
||||
|
||||
--- mozilla/netwerk/wifi/nsWifiScannerFreeBSD.cpp.orig 2014-12-03 06:23:17.000000000 +0000
|
||||
+++ mozilla/netwerk/wifi/nsWifiScannerFreeBSD.cpp
|
||||
@@ -13,7 +13,11 @@
|
||||
#include <sys/socket.h>
|
||||
#include <net/if.h>
|
||||
#include <net/if_media.h>
|
||||
+#ifdef __DragonFly__
|
||||
+#include <netproto/802_11/ieee80211_ioctl.h>
|
||||
+#else
|
||||
#include <net80211/ieee80211_ioctl.h>
|
||||
+#endif
|
||||
|
||||
#include <ifaddrs.h>
|
||||
#include <string.h>
|
||||
@@ -1,6 +1,6 @@
|
||||
$NetBSD: patch-mozilla_toolkit_library_moz.build,v 1.3 2015/03/17 19:50:42 ryoon Exp $
|
||||
$NetBSD: patch-mozilla_toolkit_library_moz.build,v 1.4 2015/09/21 05:03:45 ryoon Exp $
|
||||
|
||||
--- mozilla/toolkit/library/moz.build.orig 2015-03-09 05:34:27.000000000 +0000
|
||||
--- mozilla/toolkit/library/moz.build.orig 2015-09-02 09:27:31.000000000 +0000
|
||||
+++ mozilla/toolkit/library/moz.build
|
||||
@@ -214,6 +214,7 @@ if CONFIG['OS_ARCH'] == 'Linux' and CONF
|
||||
]
|
||||
@@ -10,7 +10,7 @@ $NetBSD: patch-mozilla_toolkit_library_moz.build,v 1.3 2015/03/17 19:50:42 ryoon
|
||||
OS_LIBS += CONFIG['MOZ_WEBRTC_X11_LIBS']
|
||||
|
||||
if CONFIG['MOZ_NATIVE_JPEG']:
|
||||
@@ -225,6 +226,27 @@ if CONFIG['MOZ_NATIVE_PNG']:
|
||||
@@ -225,6 +226,30 @@ if CONFIG['MOZ_NATIVE_PNG']:
|
||||
if CONFIG['MOZ_NATIVE_HUNSPELL']:
|
||||
OS_LIBS += CONFIG['MOZ_HUNSPELL_LIBS']
|
||||
|
||||
@@ -26,6 +26,9 @@ $NetBSD: patch-mozilla_toolkit_library_moz.build,v 1.3 2015/03/17 19:50:42 ryoon
|
||||
+if CONFIG['MOZ_NATIVE_TREMOR']:
|
||||
+ OS_LIBS += CONFIG['MOZ_TREMOR_LIBS']
|
||||
+
|
||||
+if CONFIG['MOZ_NATIVE_CELT']:
|
||||
+ OS_LIBS += CONFIG['MOZ_CELT_LIBS']
|
||||
+
|
||||
+if CONFIG['MOZ_NATIVE_OPUS']:
|
||||
+ OS_LIBS += CONFIG['MOZ_OPUS_LIBS']
|
||||
+
|
||||
@@ -38,7 +41,7 @@ $NetBSD: patch-mozilla_toolkit_library_moz.build,v 1.3 2015/03/17 19:50:42 ryoon
|
||||
if CONFIG['MOZ_NATIVE_LIBEVENT']:
|
||||
OS_LIBS += CONFIG['MOZ_LIBEVENT_LIBS']
|
||||
|
||||
@@ -234,8 +256,14 @@ if CONFIG['MOZ_NATIVE_LIBVPX']:
|
||||
@@ -234,8 +259,14 @@ if CONFIG['MOZ_NATIVE_LIBVPX']:
|
||||
if not CONFIG['MOZ_TREE_PIXMAN']:
|
||||
OS_LIBS += CONFIG['MOZ_PIXMAN_LIBS']
|
||||
|
||||
@@ -55,7 +58,7 @@ $NetBSD: patch-mozilla_toolkit_library_moz.build,v 1.3 2015/03/17 19:50:42 ryoon
|
||||
|
||||
if CONFIG['HAVE_CLOCK_MONOTONIC']:
|
||||
OS_LIBS += CONFIG['REALTIME_LIBS']
|
||||
@@ -364,7 +392,7 @@ if CONFIG['OS_ARCH'] == 'WINNT':
|
||||
@@ -365,7 +396,7 @@ if CONFIG['OS_ARCH'] == 'WINNT':
|
||||
if CONFIG['MOZ_ENABLE_QT']:
|
||||
OS_LIBS += CONFIG['XEXT_LIBS']
|
||||
|
||||
|
||||
@@ -1,16 +1,8 @@
|
||||
$NetBSD: patch-mozilla_toolkit_modules_GMPInstallManager.jsm,v 1.1 2014/11/02 05:40:31 ryoon Exp $
|
||||
$NetBSD: patch-mozilla_toolkit_modules_GMPInstallManager.jsm,v 1.2 2015/09/21 05:03:45 ryoon Exp $
|
||||
|
||||
--- mozilla/toolkit/modules/GMPInstallManager.jsm.orig 2014-10-14 06:36:44.000000000 +0000
|
||||
--- mozilla/toolkit/modules/GMPInstallManager.jsm.orig 2015-09-02 09:27:31.000000000 +0000
|
||||
+++ mozilla/toolkit/modules/GMPInstallManager.jsm
|
||||
@@ -107,6 +107,7 @@ let GMPPrefs = {
|
||||
*/
|
||||
KEY_LOG_ENABLED: "media.gmp-manager.log",
|
||||
KEY_ADDON_LAST_UPDATE: "media.{0}.lastUpdate",
|
||||
+ KEY_ADDON_PATH: "media.{0}.path",
|
||||
KEY_ADDON_VERSION: "media.{0}.version",
|
||||
KEY_ADDON_AUTOUPDATE: "media.{0}.autoupdate",
|
||||
KEY_URL: "media.gmp-manager.url",
|
||||
@@ -888,9 +889,7 @@ GMPDownloader.prototype = {
|
||||
@@ -874,9 +874,7 @@ GMPDownloader.prototype = {
|
||||
let gmpAddon = this._gmpAddon;
|
||||
let installToDirPath = Cc["@mozilla.org/file/local;1"].
|
||||
createInstance(Ci.nsIFile);
|
||||
@@ -21,17 +13,17 @@ $NetBSD: patch-mozilla_toolkit_modules_GMPInstallManager.jsm,v 1.1 2014/11/02 05
|
||||
installToDirPath.initWithPath(path);
|
||||
log.info("install to directory path: " + installToDirPath.path);
|
||||
let gmpInstaller = new GMPExtractor(zipPath, installToDirPath.path);
|
||||
@@ -899,10 +898,12 @@ GMPDownloader.prototype = {
|
||||
@@ -885,10 +883,12 @@ GMPDownloader.prototype = {
|
||||
// Success, set the prefs
|
||||
let now = Math.round(Date.now() / 1000);
|
||||
GMPPrefs.set(GMPPrefs.KEY_ADDON_LAST_UPDATE, now, gmpAddon.id);
|
||||
GMPPrefs.set(GMPPrefs.KEY_PLUGIN_LAST_UPDATE, now, gmpAddon.id);
|
||||
- // Setting the version pref signals installation completion to consumers,
|
||||
- // if you need to set other prefs etc. do it before this.
|
||||
+ // Setting the path pref signals installation completion to consumers,
|
||||
+ // so set the version and potential other information they use first.
|
||||
GMPPrefs.set(GMPPrefs.KEY_ADDON_VERSION, gmpAddon.version,
|
||||
GMPPrefs.set(GMPPrefs.KEY_PLUGIN_VERSION, gmpAddon.version,
|
||||
gmpAddon.id);
|
||||
+ GMPPrefs.set(GMPPrefs.KEY_ADDON_PATH,
|
||||
+ GMPPrefs.set(GMPPrefs.KEY_PLUGIN_PATH,
|
||||
+ installToDirPath.path, gmpAddon.id);
|
||||
this._deferred.resolve(extractedPaths);
|
||||
}, err => {
|
||||
|
||||
@@ -0,0 +1,12 @@
|
||||
$NetBSD: patch-mozilla_toolkit_modules_GMPUtils.jsm,v 1.1 2015/09/21 05:03:45 ryoon Exp $
|
||||
|
||||
--- mozilla/toolkit/modules/GMPUtils.jsm.orig 2015-09-02 09:27:31.000000000 +0000
|
||||
+++ mozilla/toolkit/modules/GMPUtils.jsm
|
||||
@@ -74,6 +74,7 @@ this.GMPPrefs = {
|
||||
KEY_EME_ENABLED: "media.eme.enabled",
|
||||
KEY_PLUGIN_ENABLED: "media.{0}.enabled",
|
||||
KEY_PLUGIN_LAST_UPDATE: "media.{0}.lastUpdate",
|
||||
+ KEY_PLUGIN_PATH: "media.{0}.path",
|
||||
KEY_PLUGIN_VERSION: "media.{0}.version",
|
||||
KEY_PLUGIN_AUTOUPDATE: "media.{0}.autoupdate",
|
||||
KEY_PLUGIN_FORCEVISIBLE: "media.{0}.forcevisible",
|
||||
+132
@@ -0,0 +1,132 @@
|
||||
$NetBSD: patch-mozilla_toolkit_mozapps_extensions_internal_GMPProvider.jsm,v 1.1 2015/09/21 05:03:45 ryoon Exp $
|
||||
|
||||
--- mozilla/toolkit/mozapps/extensions/internal/GMPProvider.jsm.orig 2015-09-02 09:27:31.000000000 +0000
|
||||
+++ mozilla/toolkit/mozapps/extensions/internal/GMPProvider.jsm
|
||||
@@ -101,12 +101,11 @@ function GMPWrapper(aPluginInfo) {
|
||||
Log.repository.getLoggerWithMessagePrefix("Toolkit.GMP",
|
||||
"GMPWrapper(" +
|
||||
this._plugin.id + ") ");
|
||||
- Preferences.observe(GMPPrefs.getPrefKey(GMPPrefs.KEY_PLUGIN_ENABLED,
|
||||
- this._plugin.id),
|
||||
+ Preferences.observe(GMPPrefs.getPrefKey(GMPPrefs.KEY_PLUGIN_ENABLED, this._plugin.id),
|
||||
this.onPrefEnabledChanged, this);
|
||||
- Preferences.observe(GMPPrefs.getPrefKey(GMPPrefs.KEY_PLUGIN_VERSION,
|
||||
+ Preferences.observe(GMPPrefs.getPrefKey(GMPPrefs.KEY_PLUGIN_PATH,
|
||||
this._plugin.id),
|
||||
- this.onPrefVersionChanged, this);
|
||||
+ this.onPrefPathChanged, this);
|
||||
if (this._plugin.isEME) {
|
||||
Preferences.observe(GMPPrefs.KEY_EME_ENABLED,
|
||||
this.onPrefEMEGlobalEnabledChanged, this);
|
||||
@@ -123,17 +122,14 @@ GMPWrapper.prototype = {
|
||||
optionsType: AddonManager.OPTIONS_TYPE_INLINE,
|
||||
get optionsURL() { return this._plugin.optionsURL; },
|
||||
|
||||
+
|
||||
set gmpPath(aPath) { this._gmpPath = aPath; },
|
||||
get gmpPath() {
|
||||
- if (!this._gmpPath && this.isInstalled) {
|
||||
- this._gmpPath = OS.Path.join(OS.Constants.Path.profileDir,
|
||||
- this._plugin.id,
|
||||
- GMPPrefs.get(GMPPrefs.KEY_PLUGIN_VERSION,
|
||||
- null, this._plugin.id));
|
||||
+ if (!this._gmpPath) {
|
||||
+ this._gmpPath = GMPPrefs.get(GMPPrefs.KEY_PLUGIN_PATH, null, this._plugin.id);
|
||||
}
|
||||
return this._gmpPath;
|
||||
},
|
||||
-
|
||||
get id() { return this._plugin.id; },
|
||||
get type() { return "plugin"; },
|
||||
get isGMPlugin() { return true; },
|
||||
@@ -144,8 +140,13 @@ GMPWrapper.prototype = {
|
||||
get description() { return this._plugin.description; },
|
||||
get fullDescription() { return this._plugin.fullDescription; },
|
||||
|
||||
- get version() { return GMPPrefs.get(GMPPrefs.KEY_PLUGIN_VERSION, null,
|
||||
- this._plugin.id); },
|
||||
+ get version() {
|
||||
+ if (this.isInstalled) {
|
||||
+ return GMPPrefs.get(GMPPrefs.KEY_PLUGIN_VERSION, null,
|
||||
+ this._plugin.id);
|
||||
+ }
|
||||
+ return null;
|
||||
+ },
|
||||
|
||||
get isActive() { return !this.appDisabled && !this.userDisabled; },
|
||||
get appDisabled() {
|
||||
@@ -292,24 +293,17 @@ GMPWrapper.prototype = {
|
||||
|
||||
get pluginMimeTypes() { return []; },
|
||||
get pluginLibraries() {
|
||||
- if (this.isInstalled) {
|
||||
- let path = this.version;
|
||||
- return [path];
|
||||
- }
|
||||
- return [];
|
||||
+ let path = GMPPrefs.get(GMPPrefs.KEY_PLUGIN_PATH, null, this._plugin.id);
|
||||
+ return path && path.length ? [OS.Path.basename(path)] : [];
|
||||
},
|
||||
get pluginFullpath() {
|
||||
- if (this.isInstalled) {
|
||||
- let path = OS.Path.join(OS.Constants.Path.profileDir,
|
||||
- this._plugin.id,
|
||||
- this.version);
|
||||
- return [path];
|
||||
- }
|
||||
- return [];
|
||||
+ let path = GMPPrefs.get(GMPPrefs.KEY_PLUGIN_PATH, null, this._plugin.id);
|
||||
+ return path && path.length ? [path] : [];
|
||||
},
|
||||
|
||||
get isInstalled() {
|
||||
- return this.version && this.version.length > 0;
|
||||
+ let path = GMPPrefs.get(GMPPrefs.KEY_PLUGIN_PATH, null, this._plugin.id);
|
||||
+ return path && path.length > 0;
|
||||
},
|
||||
|
||||
_handleEnabledChanged: function() {
|
||||
@@ -389,10 +383,10 @@ GMPWrapper.prototype = {
|
||||
}
|
||||
},
|
||||
|
||||
- onPrefVersionChanged: function() {
|
||||
+ onPrefPathChanged: function() {
|
||||
AddonManagerPrivate.callAddonListeners("onUninstalling", this, false);
|
||||
if (this._gmpPath) {
|
||||
- this._log.info("onPrefVersionChanged() - unregistering gmp directory " +
|
||||
+ this._log.info("onPrefPathChanged() - unregistering gmp directory " +
|
||||
this._gmpPath);
|
||||
gmpService.removeAndDeletePluginDirectory(this._gmpPath, true /* can defer */);
|
||||
}
|
||||
@@ -401,15 +395,10 @@ GMPWrapper.prototype = {
|
||||
AddonManagerPrivate.callInstallListeners("onExternalInstall", null, this,
|
||||
null, false);
|
||||
AddonManagerPrivate.callAddonListeners("onInstalling", this, false);
|
||||
- this._gmpPath = null;
|
||||
- if (this.isInstalled) {
|
||||
- this._gmpPath = OS.Path.join(OS.Constants.Path.profileDir,
|
||||
- this._plugin.id,
|
||||
- GMPPrefs.get(GMPPrefs.KEY_PLUGIN_VERSION,
|
||||
- null, this._plugin.id));
|
||||
- }
|
||||
+ this._gmpPath = GMPPrefs.get(GMPPrefs.KEY_PLUGIN_PATH,
|
||||
+ null, this._plugin.id);
|
||||
if (this._gmpPath && this.isActive) {
|
||||
- this._log.info("onPrefVersionChanged() - registering gmp directory " +
|
||||
+ this._log.info("onPrefPathChanged() - registering gmp directory " +
|
||||
this._gmpPath);
|
||||
gmpService.addPluginDirectory(this._gmpPath);
|
||||
}
|
||||
@@ -431,9 +420,9 @@ GMPWrapper.prototype = {
|
||||
Preferences.ignore(GMPPrefs.getPrefKey(GMPPrefs.KEY_PLUGIN_ENABLED,
|
||||
this._plugin.id),
|
||||
this.onPrefEnabledChanged, this);
|
||||
- Preferences.ignore(GMPPrefs.getPrefKey(GMPPrefs.KEY_PLUGIN_VERSION,
|
||||
+ Preferences.ignore(GMPPrefs.getPrefKey(GMPPrefs.KEY_PLUGIN_PATH,
|
||||
this._plugin.id),
|
||||
- this.onPrefVersionChanged, this);
|
||||
+ this.onPrefPathChanged, this);
|
||||
if (this._plugin.isEME) {
|
||||
Preferences.ignore(GMPPrefs.KEY_EME_ENABLED,
|
||||
this.onPrefEMEGlobalEnabledChanged, this);
|
||||
-118
@@ -1,118 +0,0 @@
|
||||
$NetBSD: patch-mozilla_toolkit_mozapps_extensions_internal_OpenH264Provider.jsm,v 1.1 2014/11/02 05:40:31 ryoon Exp $
|
||||
|
||||
--- mozilla/toolkit/mozapps/extensions/internal/OpenH264Provider.jsm.orig 2014-10-14 06:36:45.000000000 +0000
|
||||
+++ mozilla/toolkit/mozapps/extensions/internal/OpenH264Provider.jsm
|
||||
@@ -29,6 +29,7 @@ const SEC_IN_A_DAY = 24 * 6
|
||||
const OPENH264_PLUGIN_ID = "gmp-gmpopenh264";
|
||||
const OPENH264_PREF_BRANCH = "media." + OPENH264_PLUGIN_ID + ".";
|
||||
const OPENH264_PREF_ENABLED = "enabled";
|
||||
+const OPENH264_PREF_PATH = "path";
|
||||
const OPENH264_PREF_VERSION = "version";
|
||||
const OPENH264_PREF_LASTUPDATE = "lastUpdate";
|
||||
const OPENH264_PREF_AUTOUPDATE = "autoupdate";
|
||||
@@ -99,7 +100,12 @@ let OpenH264Wrapper = {
|
||||
get description() { return pluginsBundle.GetStringFromName("openH264_description"); },
|
||||
get fullDescription() { return OPENH264_FULLDESCRIPTION; },
|
||||
|
||||
- get version() { return prefs.get(OPENH264_PREF_VERSION, ""); },
|
||||
+ get version() {
|
||||
+ if (this.isInstalled) {
|
||||
+ return prefs.get(OPENH264_PREF_VERSION, "");
|
||||
+ }
|
||||
+ return "";
|
||||
+ },
|
||||
|
||||
get isActive() { return !this.userDisabled; },
|
||||
get appDisabled() { return false; },
|
||||
@@ -223,24 +229,17 @@ let OpenH264Wrapper = {
|
||||
|
||||
get pluginMimeTypes() { return []; },
|
||||
get pluginLibraries() {
|
||||
- if (this.isInstalled) {
|
||||
- let path = this.version;
|
||||
- return [path];
|
||||
- }
|
||||
- return [];
|
||||
+ let path = prefs.get(OPENH264_PREF_PATH, null);
|
||||
+ return path && path.length ? [OS.Path.basename(path)] : [];
|
||||
},
|
||||
get pluginFullpath() {
|
||||
- if (this.isInstalled) {
|
||||
- let path = OS.Path.join(OS.Constants.Path.profileDir,
|
||||
- OPENH264_PLUGIN_ID,
|
||||
- this.version);
|
||||
- return [path];
|
||||
- }
|
||||
- return [];
|
||||
+ let path = prefs.get(OPENH264_PREF_PATH, null);
|
||||
+ return path && path.length ? [path] : [];
|
||||
},
|
||||
|
||||
get isInstalled() {
|
||||
- return this.version.length > 0;
|
||||
+ let path = prefs.get(OPENH264_PREF_PATH, "");
|
||||
+ return path.length > 0;
|
||||
},
|
||||
};
|
||||
|
||||
@@ -251,19 +250,14 @@ let OpenH264Provider = {
|
||||
"OpenH264Provider" + "::");
|
||||
OpenH264Wrapper._log = Log.repository.getLoggerWithMessagePrefix("Toolkit.OpenH264Provider",
|
||||
"OpenH264Wrapper" + "::");
|
||||
- this.gmpPath = null;
|
||||
- if (OpenH264Wrapper.isInstalled) {
|
||||
- this.gmpPath = OS.Path.join(OS.Constants.Path.profileDir,
|
||||
- OPENH264_PLUGIN_ID,
|
||||
- prefs.get(OPENH264_PREF_VERSION, null));
|
||||
- }
|
||||
+ this.gmpPath = prefs.get(OPENH264_PREF_PATH, null);
|
||||
let enabled = prefs.get(OPENH264_PREF_ENABLED, true);
|
||||
this._log.trace("startup() - enabled=" + enabled + ", gmpPath="+this.gmpPath);
|
||||
|
||||
|
||||
Services.obs.addObserver(this, AddonManager.OPTIONS_NOTIFICATION_DISPLAYED, false);
|
||||
prefs.observe(OPENH264_PREF_ENABLED, this.onPrefEnabledChanged, this);
|
||||
- prefs.observe(OPENH264_PREF_VERSION, this.onPrefVersionChanged, this);
|
||||
+ prefs.observe(OPENH264_PREF_PATH, this.onPrefPathChanged, this);
|
||||
prefs.observe(OPENH264_PREF_LOGGING, configureLogging);
|
||||
|
||||
if (this.gmpPath && enabled) {
|
||||
@@ -280,7 +274,7 @@ let OpenH264Provider = {
|
||||
this._log.trace("shutdown()");
|
||||
Services.obs.removeObserver(this, AddonManager.OPTIONS_NOTIFICATION_DISPLAYED);
|
||||
prefs.ignore(OPENH264_PREF_ENABLED, this.onPrefEnabledChanged, this);
|
||||
- prefs.ignore(OPENH264_PREF_VERSION, this.onPrefVersionChanged, this);
|
||||
+ prefs.ignore(OPENH264_PREF_PATH, this.onPrefPathChanged, this);
|
||||
prefs.ignore(OPENH264_PREF_LOGGING, configureLogging);
|
||||
|
||||
return OpenH264Wrapper._updateTask;
|
||||
@@ -306,25 +300,20 @@ let OpenH264Provider = {
|
||||
wrapper);
|
||||
},
|
||||
|
||||
- onPrefVersionChanged: function() {
|
||||
+ onPrefPathChanged: function() {
|
||||
let wrapper = OpenH264Wrapper;
|
||||
|
||||
AddonManagerPrivate.callAddonListeners("onUninstalling", wrapper, false);
|
||||
if (this.gmpPath) {
|
||||
- this._log.info("onPrefVersionChanged() - unregistering gmp directory " + this.gmpPath);
|
||||
+ this._log.info("onPrefPathChanged() - removing gmp directory " + this.gmpPath);
|
||||
gmpService.removePluginDirectory(this.gmpPath);
|
||||
}
|
||||
AddonManagerPrivate.callAddonListeners("onUninstalled", wrapper);
|
||||
|
||||
AddonManagerPrivate.callInstallListeners("onExternalInstall", null, wrapper, null, false);
|
||||
- this.gmpPath = null;
|
||||
- if (OpenH264Wrapper.isInstalled) {
|
||||
- this.gmpPath = OS.Path.join(OS.Constants.Path.profileDir,
|
||||
- OPENH264_PLUGIN_ID,
|
||||
- prefs.get(OPENH264_PREF_VERSION, null));
|
||||
- }
|
||||
+ this.gmpPath = prefs.get(OPENH264_PREF_PATH, null);
|
||||
if (this.gmpPath && wrapper.isActive) {
|
||||
- this._log.info("onPrefVersionChanged() - registering gmp directory " + this.gmpPath);
|
||||
+ this._log.info("onPrefPathChanged() - adding gmp directory " + this.gmpPath);
|
||||
gmpService.addPluginDirectory(this.gmpPath);
|
||||
}
|
||||
AddonManagerPrivate.callAddonListeners("onInstalled", wrapper);
|
||||
@@ -0,0 +1,22 @@
|
||||
$NetBSD: patch-mozilla_widget_gtk_gtk2drawing.c,v 1.3 2015/09/21 05:03:45 ryoon Exp $
|
||||
|
||||
--- mozilla/widget/gtk/gtk2drawing.c.orig 2015-09-02 09:27:33.000000000 +0000
|
||||
+++ mozilla/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 };
|
||||
@@ -1,69 +1,833 @@
|
||||
$NetBSD: patch-mozilla_widget_gtk_gtk3drawing.c,v 1.2 2015/02/15 02:11:03 ryoon Exp $
|
||||
$NetBSD: patch-mozilla_widget_gtk_gtk3drawing.c,v 1.3 2015/09/21 05:03:45 ryoon Exp $
|
||||
|
||||
--- mozilla/widget/gtk/gtk3drawing.c.orig 2015-02-05 04:38:47.000000000 +0000
|
||||
--- mozilla/widget/gtk/gtk3drawing.c.orig 2015-09-02 09:27:33.000000000 +0000
|
||||
+++ mozilla/widget/gtk/gtk3drawing.c
|
||||
@@ -64,6 +64,7 @@ static GtkWidget* gScrolledWindowWidget;
|
||||
|
||||
@@ -65,6 +65,7 @@ static GtkWidget* gScrolledWindowWidget;
|
||||
static style_prop_t style_prop_func;
|
||||
static gboolean have_arrow_scaling;
|
||||
+static gboolean checkbox_check_state;
|
||||
static gboolean checkbox_check_state;
|
||||
+static gboolean notebook_has_tab_gap;
|
||||
static gboolean is_initialized;
|
||||
|
||||
#define ARROW_UP 0
|
||||
@@ -71,6 +72,10 @@ static gboolean is_initialized;
|
||||
#define ARROW_RIGHT G_PI_2
|
||||
#define ARROW_LEFT (G_PI+G_PI_2)
|
||||
@@ -725,6 +726,14 @@ moz_gtk_init()
|
||||
else
|
||||
checkbox_check_state = GTK_STATE_FLAG_ACTIVE;
|
||||
|
||||
+#if !GTK_CHECK_VERSION(3,14,0)
|
||||
+#define GTK_STATE_FLAG_CHECKED (1 << 11)
|
||||
+#endif
|
||||
+ if(!gtk_check_version(3, 12, 0)) {
|
||||
+ ensure_tab_widget();
|
||||
+ gtk_widget_style_get(gTabWidget, "has-tab-gap", ¬ebook_has_tab_gap, NULL);
|
||||
+ }
|
||||
+ else {
|
||||
+ notebook_has_tab_gap = TRUE;
|
||||
+ }
|
||||
+
|
||||
static GtkStateFlags
|
||||
GetStateFlagsFromGtkWidgetState(GtkWidgetState* state)
|
||||
{
|
||||
@@ -714,6 +719,11 @@ moz_gtk_init()
|
||||
is_initialized = TRUE;
|
||||
have_arrow_scaling = (gtk_major_version > 2 ||
|
||||
(gtk_major_version == 2 && gtk_minor_version >= 12));
|
||||
+ if (gtk_major_version > 3 ||
|
||||
+ (gtk_major_version == 3 && gtk_minor_version >= 14))
|
||||
+ checkbox_check_state = GTK_STATE_FLAG_CHECKED;
|
||||
+ else
|
||||
+ checkbox_check_state = GTK_STATE_FLAG_ACTIVE;
|
||||
|
||||
/* Add style property to GtkEntry.
|
||||
* Adding the style property to the normal GtkEntry class means that it
|
||||
@@ -1004,10 +1014,10 @@ moz_gtk_toggle_paint(cairo_t *cr, GdkRec
|
||||
gtk_widget_set_sensitive(w, !state->disabled);
|
||||
gtk_widget_set_direction(w, direction);
|
||||
* 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);
|
||||
-
|
||||
+
|
||||
if (isradio) {
|
||||
gtk_style_context_add_class(style, GTK_STYLE_CLASS_RADIO);
|
||||
- gtk_style_context_set_state(style, selected ? GTK_STATE_FLAG_ACTIVE :
|
||||
+ gtk_style_context_set_state(style, selected ? checkbox_check_state :
|
||||
GTK_STATE_FLAG_NORMAL);
|
||||
gtk_render_option(style, cr, x, y, width, height);
|
||||
if (state->focused) {
|
||||
@@ -1025,7 +1035,7 @@ moz_gtk_toggle_paint(cairo_t *cr, GdkRec
|
||||
gtk_style_context_set_state(style, GTK_STATE_FLAG_INCONSISTENT);
|
||||
gtk_toggle_button_set_inconsistent(GTK_TOGGLE_BUTTON(gCheckboxWidget), TRUE);
|
||||
} else if (selected) {
|
||||
- gtk_style_context_set_state(style, GTK_STATE_FLAG_ACTIVE);
|
||||
+ gtk_style_context_set_state(style, checkbox_check_state);
|
||||
} else {
|
||||
gtk_toggle_button_set_inconsistent(GTK_TOGGLE_BUTTON(gCheckboxWidget), FALSE);
|
||||
}
|
||||
@@ -2588,8 +2598,9 @@ moz_gtk_check_menu_item_paint(cairo_t *c
|
||||
gtk_style_context_add_class(style, GTK_STYLE_CLASS_CHECK);
|
||||
gtk_style_context_set_state(style, state_flags);
|
||||
|
||||
@@ -953,20 +913,12 @@ moz_gtk_button_paint(cairo_t *cr, GdkRec
|
||||
}
|
||||
|
||||
- if (checked)
|
||||
- state_flags |= GTK_STATE_FLAG_ACTIVE;
|
||||
+ if (checked) {
|
||||
+ state_flags |= checkbox_check_state;
|
||||
+ }
|
||||
|
||||
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_style_context_get_padding(style, state_flags, &padding);
|
||||
|
||||
- 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)
|
||||
GtkStyleContext * style;
|
||||
|
||||
ensure_tab_widget();
|
||||
+ if (!notebook_has_tab_gap)
|
||||
+ return 0; /* tabs do not overdraw the tabpanel border with "no gap" style */
|
||||
+
|
||||
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
|
||||
ensure_tab_widget();
|
||||
gtk_widget_set_direction(gTabWidget, direction);
|
||||
|
||||
- style = gtk_widget_get_style_context(gTabWidget);
|
||||
+ style = gtk_widget_get_style_context(gTabWidget);
|
||||
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
|
||||
|
||||
focusRect = backRect = tabRect;
|
||||
|
||||
- if ((flags & MOZ_GTK_TAB_SELECTED) == 0) {
|
||||
- /* Only draw the tab */
|
||||
- gtk_render_extension(style, cr,
|
||||
- tabRect.x, tabRect.y, tabRect.width, tabRect.height,
|
||||
- (flags & MOZ_GTK_TAB_BOTTOM) ?
|
||||
- GTK_POS_TOP : GTK_POS_BOTTOM );
|
||||
- } else {
|
||||
- /* Draw the tab and the gap
|
||||
- * We want the gap to be positioned exactly on the tabpanel top
|
||||
- * border; since tabbox.css may set a negative margin so that the tab
|
||||
- * frame rect already overlaps the tabpanel frame rect, we need to take
|
||||
- * that into account when drawing. To that effect, nsNativeThemeGTK
|
||||
- * passes us this negative margin (bmargin in the graphic below) in the
|
||||
- * lowest bits of |flags|. We use it to set gap_voffset, the distance
|
||||
- * between the top of the gap and the bottom of the tab (resp. the
|
||||
- * bottom of the gap and the top of the tab when we draw a bottom tab),
|
||||
- * while ensuring that the gap always touches the border of the tab,
|
||||
- * i.e. 0 <= gap_voffset <= gap_height, to avoid surprinsing results
|
||||
- * with big negative or positive margins.
|
||||
- * Here is a graphical explanation in the case of top tabs:
|
||||
- * ___________________________
|
||||
- * / \
|
||||
- * | T A B |
|
||||
- * ----------|. . . . . . . . . . . . . . .|----- top of tabpanel
|
||||
- * : ^ bmargin : ^
|
||||
- * : | (-negative margin, : |
|
||||
- * bottom : v passed in flags) : | gap_height
|
||||
- * of -> :.............................: | (the size of the
|
||||
- * the tab . part of the gap . | tabpanel top border)
|
||||
- * . outside of the tab . v
|
||||
- * ----------------------------------------------
|
||||
- *
|
||||
- * To draw the gap, we use gtk_paint_box_gap(), see comment in
|
||||
- * moz_gtk_tabpanels_paint(). This box_gap is made 3 * gap_height tall,
|
||||
- * which should suffice to ensure that the only visible border is the
|
||||
- * pierced one. If the tab is in the middle, we make the box_gap begin
|
||||
- * a bit to the left of the tab and end a bit to the right, adjusting
|
||||
- * the gap position so it still is under the tab, because we want the
|
||||
- * rendering of a gap in the middle of a tabpanel. This is the role of
|
||||
- * the gints gap_{l,r}_offset. On the contrary, if the tab is the
|
||||
- * first, we align the start border of the box_gap with the start
|
||||
- * border of the tab (left if LTR, right if RTL), by setting the
|
||||
- * appropriate offset to 0.*/
|
||||
- gint gap_loffset, gap_roffset, gap_voffset, gap_height;
|
||||
-
|
||||
- /* Get height needed by the gap */
|
||||
- gap_height = moz_gtk_get_tab_thickness();
|
||||
-
|
||||
- /* Extract gap_voffset from the first bits of flags */
|
||||
- gap_voffset = flags & MOZ_GTK_TAB_MARGIN_MASK;
|
||||
- if (gap_voffset > gap_height)
|
||||
- gap_voffset = gap_height;
|
||||
-
|
||||
- /* Set gap_{l,r}_offset to appropriate values */
|
||||
- gap_loffset = gap_roffset = 20; /* should be enough */
|
||||
- if (flags & MOZ_GTK_TAB_FIRST) {
|
||||
- if (direction == GTK_TEXT_DIR_RTL)
|
||||
- gap_roffset = initial_gap;
|
||||
- else
|
||||
- gap_loffset = initial_gap;
|
||||
- }
|
||||
-
|
||||
- if (flags & MOZ_GTK_TAB_BOTTOM) {
|
||||
- /* Draw the tab on bottom */
|
||||
- focusRect.y += gap_voffset;
|
||||
- focusRect.height -= gap_voffset;
|
||||
-
|
||||
+ if (notebook_has_tab_gap) {
|
||||
+ if ((flags & MOZ_GTK_TAB_SELECTED) == 0) {
|
||||
+ /* Only draw the tab */
|
||||
gtk_render_extension(style, cr,
|
||||
- tabRect.x, tabRect.y + gap_voffset, tabRect.width,
|
||||
- tabRect.height - gap_voffset, GTK_POS_TOP);
|
||||
-
|
||||
- gtk_style_context_remove_region(style, GTK_STYLE_REGION_TAB);
|
||||
-
|
||||
- backRect.y += (gap_voffset - gap_height);
|
||||
- backRect.height = gap_height;
|
||||
-
|
||||
- /* Draw the gap; erase with background color before painting in
|
||||
- * case theme does not */
|
||||
- gtk_render_background(style, cr, backRect.x, backRect.y,
|
||||
- backRect.width, backRect.height);
|
||||
- cairo_save(cr);
|
||||
- cairo_rectangle(cr, backRect.x, backRect.y, backRect.width, backRect.height);
|
||||
- cairo_clip(cr);
|
||||
-
|
||||
- gtk_render_frame_gap(style, cr,
|
||||
- tabRect.x - gap_loffset,
|
||||
- tabRect.y + gap_voffset - 3 * gap_height,
|
||||
- tabRect.width + gap_loffset + gap_roffset,
|
||||
- 3 * gap_height, GTK_POS_BOTTOM,
|
||||
- gap_loffset, gap_loffset + tabRect.width);
|
||||
- cairo_restore(cr);
|
||||
+ tabRect.x, tabRect.y, tabRect.width, tabRect.height,
|
||||
+ (flags & MOZ_GTK_TAB_BOTTOM) ?
|
||||
+ GTK_POS_TOP : GTK_POS_BOTTOM );
|
||||
} else {
|
||||
- /* Draw the tab on top */
|
||||
- focusRect.height -= gap_voffset;
|
||||
- gtk_render_extension(style, cr,
|
||||
- tabRect.x, tabRect.y, tabRect.width,
|
||||
- tabRect.height - gap_voffset, GTK_POS_BOTTOM);
|
||||
-
|
||||
- gtk_style_context_remove_region(style, GTK_STYLE_REGION_TAB);
|
||||
-
|
||||
- backRect.y += (tabRect.height - gap_voffset);
|
||||
- backRect.height = gap_height;
|
||||
+ /* Draw the tab and the gap
|
||||
+ * We want the gap to be positioned exactly on the tabpanel top
|
||||
+ * border; since tabbox.css may set a negative margin so that the tab
|
||||
+ * frame rect already overlaps the tabpanel frame rect, we need to take
|
||||
+ * that into account when drawing. To that effect, nsNativeThemeGTK
|
||||
+ * passes us this negative margin (bmargin in the graphic below) in the
|
||||
+ * lowest bits of |flags|. We use it to set gap_voffset, the distance
|
||||
+ * between the top of the gap and the bottom of the tab (resp. the
|
||||
+ * bottom of the gap and the top of the tab when we draw a bottom tab),
|
||||
+ * while ensuring that the gap always touches the border of the tab,
|
||||
+ * i.e. 0 <= gap_voffset <= gap_height, to avoid surprinsing results
|
||||
+ * with big negative or positive margins.
|
||||
+ * Here is a graphical explanation in the case of top tabs:
|
||||
+ * ___________________________
|
||||
+ * / \
|
||||
+ * | T A B |
|
||||
+ * ----------|. . . . . . . . . . . . . . .|----- top of tabpanel
|
||||
+ * : ^ bmargin : ^
|
||||
+ * : | (-negative margin, : |
|
||||
+ * bottom : v passed in flags) : | gap_height
|
||||
+ * of -> :.............................: | (the size of the
|
||||
+ * the tab . part of the gap . | tabpanel top border)
|
||||
+ * . outside of the tab . v
|
||||
+ * ----------------------------------------------
|
||||
+ *
|
||||
+ * To draw the gap, we use gtk_paint_box_gap(), see comment in
|
||||
+ * moz_gtk_tabpanels_paint(). This box_gap is made 3 * gap_height tall,
|
||||
+ * which should suffice to ensure that the only visible border is the
|
||||
+ * pierced one. If the tab is in the middle, we make the box_gap begin
|
||||
+ * a bit to the left of the tab and end a bit to the right, adjusting
|
||||
+ * the gap position so it still is under the tab, because we want the
|
||||
+ * rendering of a gap in the middle of a tabpanel. This is the role of
|
||||
+ * the gints gap_{l,r}_offset. On the contrary, if the tab is the
|
||||
+ * first, we align the start border of the box_gap with the start
|
||||
+ * border of the tab (left if LTR, right if RTL), by setting the
|
||||
+ * appropriate offset to 0.*/
|
||||
+ gint gap_loffset, gap_roffset, gap_voffset, gap_height;
|
||||
+
|
||||
+ /* Get height needed by the gap */
|
||||
+ gap_height = moz_gtk_get_tab_thickness();
|
||||
+
|
||||
+ /* Extract gap_voffset from the first bits of flags */
|
||||
+ gap_voffset = flags & MOZ_GTK_TAB_MARGIN_MASK;
|
||||
+ if (gap_voffset > gap_height)
|
||||
+ gap_voffset = gap_height;
|
||||
+
|
||||
+ /* Set gap_{l,r}_offset to appropriate values */
|
||||
+ gap_loffset = gap_roffset = 20; /* should be enough */
|
||||
+ if (flags & MOZ_GTK_TAB_FIRST) {
|
||||
+ if (direction == GTK_TEXT_DIR_RTL)
|
||||
+ gap_roffset = initial_gap;
|
||||
+ else
|
||||
+ gap_loffset = initial_gap;
|
||||
+ }
|
||||
|
||||
- /* Draw the gap; erase with background color before painting in
|
||||
- * case theme does not */
|
||||
- gtk_render_background(style, cr, backRect.x, backRect.y,
|
||||
- backRect.width, backRect.height);
|
||||
-
|
||||
- cairo_save(cr);
|
||||
- cairo_rectangle(cr, backRect.x, backRect.y, backRect.width, backRect.height);
|
||||
- cairo_clip(cr);
|
||||
-
|
||||
- gtk_render_frame_gap(style, cr,
|
||||
- tabRect.x - gap_loffset,
|
||||
- tabRect.y + tabRect.height - gap_voffset,
|
||||
- tabRect.width + gap_loffset + gap_roffset,
|
||||
- 3 * gap_height, GTK_POS_TOP,
|
||||
- gap_loffset, gap_loffset + tabRect.width);
|
||||
- cairo_restore(cr);
|
||||
+ if (flags & MOZ_GTK_TAB_BOTTOM) {
|
||||
+ /* Draw the tab on bottom */
|
||||
+ focusRect.y += gap_voffset;
|
||||
+ focusRect.height -= gap_voffset;
|
||||
+
|
||||
+ gtk_render_extension(style, cr,
|
||||
+ tabRect.x, tabRect.y + gap_voffset, tabRect.width,
|
||||
+ tabRect.height - gap_voffset, GTK_POS_TOP);
|
||||
+
|
||||
+ gtk_style_context_remove_region(style, GTK_STYLE_REGION_TAB);
|
||||
+
|
||||
+ backRect.y += (gap_voffset - gap_height);
|
||||
+ backRect.height = gap_height;
|
||||
+
|
||||
+ /* Draw the gap; erase with background color before painting in
|
||||
+ * case theme does not */
|
||||
+ gtk_render_background(style, cr, backRect.x, backRect.y,
|
||||
+ backRect.width, backRect.height);
|
||||
+ cairo_save(cr);
|
||||
+ cairo_rectangle(cr, backRect.x, backRect.y, backRect.width, backRect.height);
|
||||
+ cairo_clip(cr);
|
||||
+
|
||||
+ gtk_render_frame_gap(style, cr,
|
||||
+ tabRect.x - gap_loffset,
|
||||
+ tabRect.y + gap_voffset - 3 * gap_height,
|
||||
+ tabRect.width + gap_loffset + gap_roffset,
|
||||
+ 3 * gap_height, GTK_POS_BOTTOM,
|
||||
+ gap_loffset, gap_loffset + tabRect.width);
|
||||
+ cairo_restore(cr);
|
||||
+ } else {
|
||||
+ /* Draw the tab on top */
|
||||
+ focusRect.height -= gap_voffset;
|
||||
+ gtk_render_extension(style, cr,
|
||||
+ tabRect.x, tabRect.y, tabRect.width,
|
||||
+ tabRect.height - gap_voffset, GTK_POS_BOTTOM);
|
||||
+
|
||||
+ gtk_style_context_remove_region(style, GTK_STYLE_REGION_TAB);
|
||||
+
|
||||
+ backRect.y += (tabRect.height - gap_voffset);
|
||||
+ backRect.height = gap_height;
|
||||
+
|
||||
+ /* Draw the gap; erase with background color before painting in
|
||||
+ * case theme does not */
|
||||
+ gtk_render_background(style, cr, backRect.x, backRect.y,
|
||||
+ backRect.width, backRect.height);
|
||||
+
|
||||
+ cairo_save(cr);
|
||||
+ cairo_rectangle(cr, backRect.x, backRect.y, backRect.width, backRect.height);
|
||||
+ cairo_clip(cr);
|
||||
+
|
||||
+ gtk_render_frame_gap(style, cr,
|
||||
+ tabRect.x - gap_loffset,
|
||||
+ tabRect.y + tabRect.height - gap_voffset,
|
||||
+ tabRect.width + gap_loffset + gap_roffset,
|
||||
+ 3 * gap_height, GTK_POS_TOP,
|
||||
+ gap_loffset, gap_loffset + tabRect.width);
|
||||
+ cairo_restore(cr);
|
||||
+ }
|
||||
}
|
||||
+ } else {
|
||||
+ gtk_render_background(style, cr, tabRect.x, tabRect.y, tabRect.width, tabRect.height);
|
||||
+ gtk_render_frame(style, cr, tabRect.x, tabRect.y, tabRect.width, tabRect.height);
|
||||
}
|
||||
|
||||
+ gtk_style_context_restore(style);
|
||||
+
|
||||
if (state->focused) {
|
||||
/* Paint the focus ring */
|
||||
- GtkBorder border;
|
||||
- gtk_style_context_get_border(style, GetStateFlagsFromGtkWidgetState(state), &border);
|
||||
+ GtkBorder padding;
|
||||
+
|
||||
+ gtk_style_context_save(style);
|
||||
+ moz_gtk_tab_prepare_style_context(style, flags);
|
||||
|
||||
- focusRect.x += border.left;
|
||||
- focusRect.width -= (border.left + border.right);
|
||||
- focusRect.y += border.top;
|
||||
- focusRect.height -= (border.top + border.bottom);
|
||||
+ gtk_style_context_get_padding(style, GetStateFlagsFromGtkWidgetState(state), &padding);
|
||||
+
|
||||
+ focusRect.x += padding.left;
|
||||
+ focusRect.width -= (padding.left + padding.right);
|
||||
+ focusRect.y += padding.top;
|
||||
+ focusRect.height -= (padding.top + padding.bottom);
|
||||
|
||||
gtk_render_focus(style, cr,
|
||||
focusRect.x, focusRect.y, focusRect.width, focusRect.height);
|
||||
+
|
||||
+ gtk_style_context_restore(style);
|
||||
}
|
||||
|
||||
- gtk_style_context_restore(style);
|
||||
|
||||
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*
|
||||
gtk_style_context_save(style);
|
||||
moz_gtk_tab_prepare_style_context(style, flags);
|
||||
|
||||
- // TODO add_style_border() should be replaced
|
||||
- // with focus-line-width and focus-padding
|
||||
- // see Bug 877605
|
||||
*left = *top = *right = *bottom = 0;
|
||||
- moz_gtk_add_style_border(style, left, top, right, bottom);
|
||||
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*
|
||||
int initial_gap;
|
||||
gtk_widget_style_get (gTabWidget, "initial-gap", &initial_gap, NULL);
|
||||
if (direction == GTK_TEXT_DIR_RTL)
|
||||
- *right += initial_gap;
|
||||
+ *right += initial_gap;
|
||||
else
|
||||
- *left += initial_gap;
|
||||
- }
|
||||
-
|
||||
- // Top tabs have no bottom border, bottom tabs have no top border
|
||||
- if (flags & MOZ_GTK_TAB_BOTTOM) {
|
||||
- *top = 0;
|
||||
- } else {
|
||||
- *bottom = 0;
|
||||
+ *left += initial_gap;
|
||||
}
|
||||
|
||||
gtk_style_context_restore(style);
|
||||
|
||||
@@ -0,0 +1,41 @@
|
||||
$NetBSD: patch-mozilla_widget_gtk_gtkdrawing.h,v 1.3 2015/09/21 05:03:45 ryoon Exp $
|
||||
|
||||
--- mozilla/widget/gtk/gtkdrawing.h.orig 2015-09-02 09:27:33.000000000 +0000
|
||||
+++ mozilla/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
|
||||
*
|
||||
@@ -1,207 +0,0 @@
|
||||
$NetBSD: patch-mozilla_widget_gtk_nsLookAndFeel.cpp,v 1.1 2015/02/15 02:11:03 ryoon Exp $
|
||||
|
||||
--- mozilla/widget/gtk/nsLookAndFeel.cpp.orig 2015-02-05 04:38:47.000000000 +0000
|
||||
+++ mozilla/widget/gtk/nsLookAndFeel.cpp
|
||||
@@ -38,7 +38,6 @@ nsLookAndFeel::nsLookAndFeel()
|
||||
mStyle(nullptr),
|
||||
#else
|
||||
mBackgroundStyle(nullptr),
|
||||
- mViewStyle(nullptr),
|
||||
mButtonStyle(nullptr),
|
||||
#endif
|
||||
mDefaultFontCached(false), mButtonFontCached(false),
|
||||
@@ -53,7 +52,6 @@ nsLookAndFeel::~nsLookAndFeel()
|
||||
g_object_unref(mStyle);
|
||||
#else
|
||||
g_object_unref(mBackgroundStyle);
|
||||
- g_object_unref(mViewStyle);
|
||||
g_object_unref(mButtonStyle);
|
||||
#endif
|
||||
}
|
||||
@@ -114,13 +112,19 @@ nsLookAndFeel::NativeGetColor(ColorID aI
|
||||
case eColorID_IMESelectedRawTextBackground:
|
||||
case eColorID_IMESelectedConvertedTextBackground:
|
||||
case eColorID__moz_dragtargetzone:
|
||||
- aColor = sMozWindowSelectedBackground;
|
||||
+ case eColorID__moz_cellhighlight:
|
||||
+ case eColorID__moz_html_cellhighlight:
|
||||
+ case eColorID_highlight: // preference selected item,
|
||||
+ aColor = sTextSelectedBackground;
|
||||
break;
|
||||
case eColorID_WidgetSelectForeground:
|
||||
case eColorID_TextSelectForeground:
|
||||
case eColorID_IMESelectedRawTextForeground:
|
||||
case eColorID_IMESelectedConvertedTextForeground:
|
||||
- aColor = sMozWindowSelectedText;
|
||||
+ case eColorID_highlighttext:
|
||||
+ case eColorID__moz_cellhighlighttext:
|
||||
+ case eColorID__moz_html_cellhighlighttext:
|
||||
+ aColor = sTextSelectedText;
|
||||
break;
|
||||
#endif
|
||||
case eColorID_Widget3DHighlight:
|
||||
@@ -238,19 +242,6 @@ nsLookAndFeel::NativeGetColor(ColorID aI
|
||||
GTK_STATE_FLAG_INSENSITIVE, &gdk_color);
|
||||
aColor = GDK_RGBA_TO_NS_RGBA(gdk_color);
|
||||
break;
|
||||
- case eColorID_highlight: // preference selected item,
|
||||
- // background of selected item
|
||||
- gtk_style_context_get_background_color(mViewStyle,
|
||||
- GTK_STATE_FLAG_SELECTED,
|
||||
- &gdk_color);
|
||||
- aColor = GDK_RGBA_TO_NS_RGBA(gdk_color);
|
||||
- break;
|
||||
- case eColorID_highlighttext:
|
||||
- // text of selected item
|
||||
- gtk_style_context_get_color(mViewStyle,
|
||||
- GTK_STATE_FLAG_SELECTED, &gdk_color);
|
||||
- aColor = GDK_RGBA_TO_NS_RGBA(gdk_color);
|
||||
- break;
|
||||
case eColorID_inactivecaption:
|
||||
// inactive window caption
|
||||
gtk_style_context_get_background_color(mBackgroundStyle,
|
||||
@@ -284,10 +275,17 @@ nsLookAndFeel::NativeGetColor(ColorID aI
|
||||
#endif
|
||||
break;
|
||||
|
||||
+ case eColorID_threedlightshadow:
|
||||
+ // 3-D highlighted inner edge color
|
||||
+ // always same as background in GTK code
|
||||
case eColorID_threedface:
|
||||
case eColorID_buttonface:
|
||||
// 3-D face color
|
||||
- aColor = sFrameBackground;
|
||||
+#if (MOZ_WIDGET_GTK == 3)
|
||||
+ aColor = sMozWindowBackground;
|
||||
+#else
|
||||
+ aColor = sButtonBackground;
|
||||
+#endif
|
||||
break;
|
||||
|
||||
case eColorID_buttontext:
|
||||
@@ -302,11 +300,6 @@ nsLookAndFeel::NativeGetColor(ColorID aI
|
||||
aColor = sFrameOuterLightBorder;
|
||||
break;
|
||||
|
||||
- case eColorID_threedlightshadow:
|
||||
- // 3-D highlighted inner edge color
|
||||
- aColor = sFrameBackground; // always same as background in GTK code
|
||||
- break;
|
||||
-
|
||||
case eColorID_buttonshadow:
|
||||
// 3-D shadow edge color
|
||||
case eColorID_threedshadow:
|
||||
@@ -391,19 +384,6 @@ nsLookAndFeel::NativeGetColor(ColorID aI
|
||||
case eColorID__moz_buttonhovertext:
|
||||
aColor = sButtonHoverText;
|
||||
break;
|
||||
- case eColorID__moz_cellhighlight:
|
||||
- case eColorID__moz_html_cellhighlight:
|
||||
- gtk_style_context_get_background_color(mViewStyle,
|
||||
- GTK_STATE_FLAG_SELECTED,
|
||||
- &gdk_color);
|
||||
- aColor = GDK_RGBA_TO_NS_RGBA(gdk_color);
|
||||
- break;
|
||||
- case eColorID__moz_cellhighlighttext:
|
||||
- case eColorID__moz_html_cellhighlighttext:
|
||||
- gtk_style_context_get_color(mViewStyle,
|
||||
- GTK_STATE_FLAG_SELECTED, &gdk_color);
|
||||
- aColor = GDK_RGBA_TO_NS_RGBA(gdk_color);
|
||||
- break;
|
||||
#endif
|
||||
case eColorID__moz_menuhover:
|
||||
aColor = sMenuHover;
|
||||
@@ -965,7 +945,7 @@ nsLookAndFeel::Init()
|
||||
GtkStyleContext *style;
|
||||
|
||||
// Gtk manages a screen's CSS in the settings object so we
|
||||
- // ask Gtk to create it explicitly. Otherwise we may end up
|
||||
+ // ask Gtk to create it explicitly. Otherwise we may end up
|
||||
// with wrong color theme, see Bug 972382
|
||||
(void)gtk_settings_get_for_screen(gdk_screen_get_default());
|
||||
|
||||
@@ -975,9 +955,6 @@ nsLookAndFeel::Init()
|
||||
mBackgroundStyle = create_context(path);
|
||||
gtk_style_context_add_class(mBackgroundStyle, GTK_STYLE_CLASS_BACKGROUND);
|
||||
|
||||
- mViewStyle = create_context(path);
|
||||
- gtk_style_context_add_class(mViewStyle, GTK_STYLE_CLASS_VIEW);
|
||||
-
|
||||
mButtonStyle = create_context(path);
|
||||
gtk_style_context_add_class(mButtonStyle, GTK_STYLE_CLASS_BUTTON);
|
||||
|
||||
@@ -990,11 +967,24 @@ nsLookAndFeel::Init()
|
||||
g_object_unref(style);
|
||||
|
||||
// Text colors
|
||||
- gtk_style_context_get_background_color(mViewStyle, GTK_STATE_FLAG_NORMAL, &color);
|
||||
+ style = create_context(path);
|
||||
+ gtk_style_context_add_class(style, GTK_STYLE_CLASS_VIEW);
|
||||
+ gtk_style_context_get_background_color(style, GTK_STATE_FLAG_NORMAL, &color);
|
||||
sMozFieldBackground = GDK_RGBA_TO_NS_RGBA(color);
|
||||
- gtk_style_context_get_color(mViewStyle, GTK_STATE_FLAG_NORMAL, &color);
|
||||
+ gtk_style_context_get_color(style, GTK_STATE_FLAG_NORMAL, &color);
|
||||
sMozFieldText = GDK_RGBA_TO_NS_RGBA(color);
|
||||
|
||||
+ // Selected text and background
|
||||
+ gtk_style_context_get_background_color(style,
|
||||
+ static_cast<GtkStateFlags>(GTK_STATE_FLAG_FOCUSED|GTK_STATE_FLAG_SELECTED),
|
||||
+ &color);
|
||||
+ sTextSelectedBackground = GDK_RGBA_TO_NS_RGBA(color);
|
||||
+ gtk_style_context_get_color(style,
|
||||
+ static_cast<GtkStateFlags>(GTK_STATE_FLAG_FOCUSED|GTK_STATE_FLAG_SELECTED),
|
||||
+ &color);
|
||||
+ sTextSelectedText = GDK_RGBA_TO_NS_RGBA(color);
|
||||
+ g_object_unref(style);
|
||||
+
|
||||
// Window colors
|
||||
style = create_context(path);
|
||||
gtk_style_context_save(style);
|
||||
@@ -1003,12 +993,6 @@ nsLookAndFeel::Init()
|
||||
sMozWindowBackground = GDK_RGBA_TO_NS_RGBA(color);
|
||||
gtk_style_context_get_color(style, GTK_STATE_FLAG_NORMAL, &color);
|
||||
sMozWindowText = GDK_RGBA_TO_NS_RGBA(color);
|
||||
-
|
||||
- // Selected text and background
|
||||
- gtk_style_context_get_background_color(style, GTK_STATE_FLAG_SELECTED, &color);
|
||||
- sMozWindowSelectedBackground = GDK_RGBA_TO_NS_RGBA(color);
|
||||
- gtk_style_context_get_color(style, GTK_STATE_FLAG_SELECTED, &color);
|
||||
- sMozWindowSelectedText = GDK_RGBA_TO_NS_RGBA(color);
|
||||
gtk_style_context_restore(style);
|
||||
|
||||
// tooltip foreground and background
|
||||
@@ -1141,7 +1125,7 @@ nsLookAndFeel::Init()
|
||||
|
||||
style = gtk_widget_get_style(button);
|
||||
if (style) {
|
||||
- sFrameBackground = GDK_COLOR_TO_NS_RGB(style->bg[GTK_STATE_NORMAL]);
|
||||
+ sButtonBackground = GDK_COLOR_TO_NS_RGB(style->bg[GTK_STATE_NORMAL]);
|
||||
sFrameOuterLightBorder =
|
||||
GDK_COLOR_TO_NS_RGB(style->light[GTK_STATE_NORMAL]);
|
||||
sFrameInnerDarkBorder =
|
||||
@@ -1189,12 +1173,9 @@ nsLookAndFeel::Init()
|
||||
GtkWidget *frame = gtk_frame_new(nullptr);
|
||||
gtk_container_add(GTK_CONTAINER(parent), frame);
|
||||
|
||||
- style = gtk_widget_get_style_context(frame);
|
||||
- gtk_style_context_get_background_color(style, GTK_STATE_FLAG_NORMAL, &color);
|
||||
- sFrameBackground = GDK_RGBA_TO_NS_RGBA(color);
|
||||
-
|
||||
// TODO GTK3 - update sFrameOuterLightBorder
|
||||
// for GTK_BORDER_STYLE_INSET/OUTSET/GROVE/RIDGE border styles (Bug 978172).
|
||||
+ style = gtk_widget_get_style_context(frame);
|
||||
gtk_style_context_get_border_color(style, GTK_STATE_FLAG_NORMAL, &color);
|
||||
sFrameInnerDarkBorder = sFrameOuterLightBorder = GDK_RGBA_TO_NS_RGBA(color);
|
||||
#endif
|
||||
@@ -1257,11 +1238,9 @@ nsLookAndFeel::RefreshImpl()
|
||||
mStyle = nullptr;
|
||||
#else
|
||||
g_object_unref(mBackgroundStyle);
|
||||
- g_object_unref(mViewStyle);
|
||||
g_object_unref(mButtonStyle);
|
||||
|
||||
mBackgroundStyle = nullptr;
|
||||
- mViewStyle = nullptr;
|
||||
mButtonStyle = nullptr;
|
||||
#endif
|
||||
|
||||
@@ -1,32 +0,0 @@
|
||||
$NetBSD: patch-mozilla_widget_gtk_nsLookAndFeel.h,v 1.1 2015/02/15 02:11:03 ryoon Exp $
|
||||
|
||||
--- mozilla/widget/gtk/nsLookAndFeel.h.orig 2015-02-05 04:38:47.000000000 +0000
|
||||
+++ mozilla/widget/gtk/nsLookAndFeel.h
|
||||
@@ -35,7 +35,6 @@ protected:
|
||||
struct _GtkStyle *mStyle;
|
||||
#else
|
||||
struct _GtkStyleContext *mBackgroundStyle;
|
||||
- struct _GtkStyleContext *mViewStyle;
|
||||
struct _GtkStyleContext *mButtonStyle;
|
||||
#endif
|
||||
|
||||
@@ -64,7 +63,7 @@ protected:
|
||||
nscolor sMenuHoverText;
|
||||
nscolor sButtonText;
|
||||
nscolor sButtonHoverText;
|
||||
- nscolor sFrameBackground;
|
||||
+ nscolor sButtonBackground;
|
||||
nscolor sFrameOuterLightBorder;
|
||||
nscolor sFrameInnerDarkBorder;
|
||||
nscolor sOddCellBackground;
|
||||
@@ -75,8 +74,8 @@ protected:
|
||||
nscolor sMozFieldBackground;
|
||||
nscolor sMozWindowText;
|
||||
nscolor sMozWindowBackground;
|
||||
- nscolor sMozWindowSelectedText;
|
||||
- nscolor sMozWindowSelectedBackground;
|
||||
+ nscolor sTextSelectedText;
|
||||
+ nscolor sTextSelectedBackground;
|
||||
nscolor sMozScrollbar;
|
||||
char16_t sInvisibleCharacter;
|
||||
float sCaretRatio;
|
||||
@@ -0,0 +1,30 @@
|
||||
$NetBSD: patch-mozilla_widget_gtk_nsNativeThemeGTK.cpp,v 1.3 2015/09/21 05:03:45 ryoon Exp $
|
||||
|
||||
--- mozilla/widget/gtk/nsNativeThemeGTK.cpp.orig 2015-09-02 09:27:33.000000000 +0000
|
||||
+++ mozilla/widget/gtk/nsNativeThemeGTK.cpp
|
||||
@@ -761,6 +761,8 @@ nsNativeThemeGTK::GetExtraSizeForWidget(
|
||||
return false;
|
||||
|
||||
gint gap_height = moz_gtk_get_tab_thickness();
|
||||
+ if (!gap_height)
|
||||
+ return false;
|
||||
|
||||
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;
|
||||
@@ -1,6 +1,6 @@
|
||||
$NetBSD: patch-mozilla_xpcom_base_nsStackWalk.cpp,v 1.5 2015/02/15 02:11:03 ryoon Exp $
|
||||
$NetBSD: patch-mozilla_xpcom_base_nsStackWalk.cpp,v 1.6 2015/09/21 05:03:45 ryoon Exp $
|
||||
|
||||
--- mozilla/xpcom/base/nsStackWalk.cpp.orig 2015-02-05 04:38:49.000000000 +0000
|
||||
--- mozilla/xpcom/base/nsStackWalk.cpp.orig 2015-09-02 09:27:33.000000000 +0000
|
||||
+++ mozilla/xpcom/base/nsStackWalk.cpp
|
||||
@@ -34,12 +34,12 @@ static CriticalAddress gCriticalAddress;
|
||||
#define _GNU_SOURCE
|
||||
@@ -27,7 +27,7 @@ $NetBSD: patch-mozilla_xpcom_base_nsStackWalk.cpp,v 1.5 2015/02/15 02:11:03 ryoo
|
||||
#include <pthread.h>
|
||||
#include <CoreServices/CoreServices.h>
|
||||
|
||||
@@ -832,7 +832,7 @@ NS_DescribeCodeAddress(void* aPC, nsCode
|
||||
@@ -830,7 +830,7 @@ NS_DescribeCodeAddress(void* aPC, nsCode
|
||||
}
|
||||
|
||||
// i386 or PPC Linux stackwalking code
|
||||
@@ -36,7 +36,7 @@ $NetBSD: patch-mozilla_xpcom_base_nsStackWalk.cpp,v 1.5 2015/02/15 02:11:03 ryoo
|
||||
|
||||
#include <stdlib.h>
|
||||
#include <string.h>
|
||||
@@ -903,7 +903,7 @@ FramePointerStackWalk(NS_WalkStackCallba
|
||||
@@ -901,7 +901,7 @@ FramePointerStackWalk(NS_WalkStackCallba
|
||||
(long(next) & 3)) {
|
||||
break;
|
||||
}
|
||||
@@ -45,12 +45,12 @@ $NetBSD: patch-mozilla_xpcom_base_nsStackWalk.cpp,v 1.5 2015/02/15 02:11:03 ryoo
|
||||
// ppc mac or powerpc64 linux
|
||||
void* pc = *(bp + 2);
|
||||
bp += 3;
|
||||
@@ -933,7 +933,7 @@ FramePointerStackWalk(NS_WalkStackCallba
|
||||
@@ -931,7 +931,7 @@ FramePointerStackWalk(NS_WalkStackCallba
|
||||
}
|
||||
|
||||
#define X86_OR_PPC (defined(__i386) || defined(PPC) || defined(__ppc__))
|
||||
-#if X86_OR_PPC && (NSSTACKWALK_SUPPORTS_MACOSX || NSSTACKWALK_SUPPORTS_LINUX) // i386 or PPC Linux or Mac stackwalking code
|
||||
+#if X86_OR_PPC && (NSSTACKWALK_SUPPORTS_DARWIN || NSSTACKWALK_SUPPORTS_LINUX) // i386 or PPC Linux or Mac stackwalking code
|
||||
|
||||
EXPORT_XPCOM_API(nsresult)
|
||||
XPCOM_API(nsresult)
|
||||
NS_StackWalk(NS_WalkStackCallback aCallback, uint32_t aSkipFrames,
|
||||
|
||||
@@ -1,8 +1,8 @@
|
||||
$NetBSD: patch-mozilla_xpcom_build_XPCOMInit.cpp,v 1.1 2015/02/15 02:11:03 ryoon Exp $
|
||||
$NetBSD: patch-mozilla_xpcom_build_XPCOMInit.cpp,v 1.2 2015/09/21 05:03:45 ryoon Exp $
|
||||
|
||||
--- mozilla/xpcom/build/XPCOMInit.cpp.orig 2015-02-05 04:38:49.000000000 +0000
|
||||
--- mozilla/xpcom/build/XPCOMInit.cpp.orig 2015-09-02 09:27:33.000000000 +0000
|
||||
+++ mozilla/xpcom/build/XPCOMInit.cpp
|
||||
@@ -139,7 +139,9 @@ extern nsresult nsStringInputStreamConst
|
||||
@@ -141,7 +141,9 @@ extern nsresult nsStringInputStreamConst
|
||||
#include "mozilla/VisualEventTracer.h"
|
||||
#endif
|
||||
|
||||
@@ -10,9 +10,9 @@ $NetBSD: patch-mozilla_xpcom_build_XPCOMInit.cpp,v 1.1 2015/02/15 02:11:03 ryoon
|
||||
#include "ogg/ogg.h"
|
||||
+#endif
|
||||
#if defined(MOZ_VPX) && !defined(MOZ_VPX_NO_MEM_REPORTING)
|
||||
#include "vpx_mem/vpx_mem.h"
|
||||
#endif
|
||||
@@ -652,11 +654,13 @@ NS_InitXPCOM2(nsIServiceManager** aResul
|
||||
#if defined(HAVE_STDINT_H)
|
||||
// mozilla-config.h defines HAVE_STDINT_H, and then it's defined *again* in
|
||||
@@ -669,11 +671,13 @@ NS_InitXPCOM2(nsIServiceManager** aResul
|
||||
// this oddness.
|
||||
mozilla::SetICUMemoryFunctions();
|
||||
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
$NetBSD: patch-mozilla_xpcom_reflect_xptcall_md_unix_moz.build,v 1.2 2015/03/17 19:50:42 ryoon Exp $
|
||||
$NetBSD: patch-mozilla_xpcom_reflect_xptcall_md_unix_moz.build,v 1.3 2015/09/21 05:03:45 ryoon Exp $
|
||||
|
||||
--- mozilla/xpcom/reflect/xptcall/md/unix/moz.build.orig 2015-03-09 05:34:28.000000000 +0000
|
||||
--- mozilla/xpcom/reflect/xptcall/md/unix/moz.build.orig 2015-09-02 09:27:34.000000000 +0000
|
||||
+++ mozilla/xpcom/reflect/xptcall/md/unix/moz.build
|
||||
@@ -9,7 +9,7 @@ if CONFIG['OS_ARCH'] == 'Darwin':
|
||||
'xptcinvoke_darwin.cpp',
|
||||
@@ -11,20 +11,12 @@ $NetBSD: patch-mozilla_xpcom_reflect_xptcall_md_unix_moz.build,v 1.2 2015/03/17
|
||||
SOURCES += [
|
||||
'xptcinvoke_asm_ppc_rhapsody.s',
|
||||
]
|
||||
@@ -19,14 +19,14 @@ if CONFIG['OS_ARCH'] == 'Darwin':
|
||||
if '86' in CONFIG['OS_TEST'] and CONFIG['OS_TEST'] != 'x86_64':
|
||||
DEFINES['MOZ_NEED_LEADING_UNDERSCORE'] = True
|
||||
|
||||
-if CONFIG['OS_ARCH'] in ('NetBSD', 'GNU'):
|
||||
+if CONFIG['OS_ARCH'] in ('OpenBSD', 'GNU'):
|
||||
if CONFIG['CPU_ARCH'] == 'x86':
|
||||
SOURCES += [
|
||||
'xptcinvoke_gcc_x86_unix.cpp',
|
||||
@@ -26,7 +26,7 @@ if CONFIG['OS_ARCH'] == 'GNU':
|
||||
'xptcstubs_gcc_x86_unix.cpp'
|
||||
]
|
||||
|
||||
-if CONFIG['OS_ARCH'] in ('Linux', 'FreeBSD', 'OpenBSD') or \
|
||||
+if CONFIG['OS_ARCH'] in ('Linux', 'FreeBSD', 'NetBSD', 'DragonFly') or \
|
||||
-if CONFIG['OS_ARCH'] in ('Linux', 'FreeBSD', 'NetBSD', 'OpenBSD') or \
|
||||
+if CONFIG['OS_ARCH'] in ('Linux', 'FreeBSD', 'NetBSD', 'OpenBSD', 'DragonFly') or \
|
||||
CONFIG['OS_ARCH'].startswith('GNU_'):
|
||||
if CONFIG['OS_TEST'] == 'x86_64':
|
||||
SOURCES += [
|
||||
|
||||
@@ -1,13 +1,15 @@
|
||||
$NetBSD: patch-rc,v 1.8 2013/01/07 21:55:30 ryoon Exp $
|
||||
$NetBSD: patch-rc,v 1.9 2015/09/21 05:03:45 ryoon Exp $
|
||||
|
||||
--- mozilla/browser/branding/unofficial/locales/en-US/brand.dtd.orig 2012-11-18 10:19:30.000000000 +0000
|
||||
--- mozilla/browser/branding/unofficial/locales/en-US/brand.dtd.orig 2015-09-02 09:27:26.000000000 +0000
|
||||
+++ mozilla/browser/branding/unofficial/locales/en-US/brand.dtd
|
||||
@@ -2,7 +2,7 @@
|
||||
@@ -2,8 +2,8 @@
|
||||
- License, v. 2.0. If a copy of the MPL was not distributed with this
|
||||
- file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
|
||||
|
||||
-<!ENTITY brandShorterName "Mozilla Developer Preview">
|
||||
-<!ENTITY brandShortName "Mozilla Developer Preview">
|
||||
-<!ENTITY brandFullName "Mozilla Developer Preview">
|
||||
+<!ENTITY brandShorterName "Browser">
|
||||
+<!ENTITY brandShortName "Browser">
|
||||
+<!ENTITY brandFullName "Browser">
|
||||
<!ENTITY vendorShortName "mozilla.org">
|
||||
|
||||
Reference in New Issue
Block a user