From owner-freebsd-gecko@FreeBSD.ORG Mon Oct 1 09:30:24 2012 Return-Path: Delivered-To: gecko@hub.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 2590710656DA; Mon, 1 Oct 2012 09:30:24 +0000 (UTC) (envelope-from edwin@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [IPv6:2001:4f8:fff6::28]) by mx1.freebsd.org (Postfix) with ESMTP id EDFEB8FC08; Mon, 1 Oct 2012 09:30:23 +0000 (UTC) Received: from freefall.freebsd.org (localhost [127.0.0.1]) by freefall.freebsd.org (8.14.5/8.14.5) with ESMTP id q919UNjD035294; Mon, 1 Oct 2012 09:30:23 GMT (envelope-from edwin@freefall.freebsd.org) Received: (from edwin@localhost) by freefall.freebsd.org (8.14.5/8.14.5/Submit) id q919UNNw035280; Mon, 1 Oct 2012 09:30:23 GMT (envelope-from edwin) Date: Mon, 1 Oct 2012 09:30:23 GMT Message-Id: <201210010930.q919UNNw035280@freefall.freebsd.org> To: edwin@FreeBSD.org, freebsd-ports-bugs@FreeBSD.org, gecko@FreeBSD.org From: edwin@FreeBSD.org Cc: Subject: Re: ports/172201: www/firefox options too long for 8-stable X-BeenThere: freebsd-gecko@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Gecko Rendering Engine issues List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 01 Oct 2012 09:30:24 -0000 Synopsis: www/firefox options too long for 8-stable Responsible-Changed-From-To: freebsd-ports-bugs->gecko Responsible-Changed-By: edwin Responsible-Changed-When: Mon Oct 1 09:30:23 UTC 2012 Responsible-Changed-Why: Over to maintainer (via the GNATS Auto Assign Tool) http://www.freebsd.org/cgi/query-pr.cgi?pr=172201 From owner-freebsd-gecko@FreeBSD.ORG Mon Oct 1 10:30:10 2012 Return-Path: Delivered-To: gecko@hub.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 6A80C106564A for ; Mon, 1 Oct 2012 10:30:10 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [IPv6:2001:4f8:fff6::28]) by mx1.freebsd.org (Postfix) with ESMTP id 4E66E8FC12 for ; Mon, 1 Oct 2012 10:30:10 +0000 (UTC) Received: from freefall.freebsd.org (localhost [127.0.0.1]) by freefall.freebsd.org (8.14.5/8.14.5) with ESMTP id q91AU9dc087545 for ; Mon, 1 Oct 2012 10:30:09 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.14.5/8.14.5/Submit) id q91AU9PY087536; Mon, 1 Oct 2012 10:30:09 GMT (envelope-from gnats) Date: Mon, 1 Oct 2012 10:30:09 GMT Message-Id: <201210011030.q91AU9PY087536@freefall.freebsd.org> To: gecko@FreeBSD.org From: "Marat N.Afanasyev" Cc: Subject: Re: ports/172201: www/firefox options too long for 8-stable X-BeenThere: freebsd-gecko@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list Reply-To: "Marat N.Afanasyev" List-Id: Gecko Rendering Engine issues List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 01 Oct 2012 10:30:10 -0000 The following reply was made to PR ports/172201; it has been noted by GNATS. From: "Marat N.Afanasyev" To: bug-followup@FreeBSD.org, dougb@freebsd.org Cc: Subject: Re: ports/172201: www/firefox options too long for 8-stable Date: Mon, 01 Oct 2012 14:06:18 +0400 This is a cryptographically signed message in MIME format. --------------ms020909020407030707080206 Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: quoted-printable the same applies to www/seamonkey --=20 SY, Marat --------------ms020909020407030707080206 Content-Type: application/pkcs7-signature; name="smime.p7s" Content-Transfer-Encoding: base64 Content-Disposition: attachment; filename="smime.p7s" Content-Description: S/MIME Cryptographic Signature MIAGCSqGSIb3DQEHAqCAMIACAQExCzAJBgUrDgMCGgUAMIAGCSqGSIb3DQEHAQAAoIINJjCC BjQwggQcoAMCAQICAR4wDQYJKoZIhvcNAQEFBQAwfTELMAkGA1UEBhMCSUwxFjAUBgNVBAoT DVN0YXJ0Q29tIEx0ZC4xKzApBgNVBAsTIlNlY3VyZSBEaWdpdGFsIENlcnRpZmljYXRlIFNp Z25pbmcxKTAnBgNVBAMTIFN0YXJ0Q29tIENlcnRpZmljYXRpb24gQXV0aG9yaXR5MB4XDTA3 MTAyNDIxMDE1NVoXDTE3MTAyNDIxMDE1NVowgYwxCzAJBgNVBAYTAklMMRYwFAYDVQQKEw1T dGFydENvbSBMdGQuMSswKQYDVQQLEyJTZWN1cmUgRGlnaXRhbCBDZXJ0aWZpY2F0ZSBTaWdu aW5nMTgwNgYDVQQDEy9TdGFydENvbSBDbGFzcyAxIFByaW1hcnkgSW50ZXJtZWRpYXRlIENs aWVudCBDQTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAMcJg8zOLdgasSmkLhOr lr6KMoOMpohBllVHrdRvEg/q6r8jR+EK75xCGhR8ToREoqe7zM9/UnC6TS2y9UKTpT1v7RSM zR0t6ndl0TWBuUr/UXBhPk+Kmy7bI4yW4urC+y7P3/1/X7U8ocb8VpH/Clt+4iq7nirMcNh6 qJR+xjOhV+VHzQMALuGYn5KZmc1NbJQYclsGkDxDz2UbFqE2+6vIZoL+jb9x4Pa5gNf1TwSD kOkikZB1xtB4ZqtXThaABSONdfmv/Z1pua3FYxnCFmdr/+N2JLKutIxMYqQOJebr/f/h5t95 m4JgrM3Y/w7YX9d7YAL9jvN4SydHsU6n65cCAwEAAaOCAa0wggGpMA8GA1UdEwEB/wQFMAMB Af8wDgYDVR0PAQH/BAQDAgEGMB0GA1UdDgQWBBRTcu2SnODaywFcfH6WNU7y1LhRgjAfBgNV HSMEGDAWgBROC+8apEBbpRdphzDKNGhD0EGu8jBmBggrBgEFBQcBAQRaMFgwJwYIKwYBBQUH MAGGG2h0dHA6Ly9vY3NwLnN0YXJ0c3NsLmNvbS9jYTAtBggrBgEFBQcwAoYhaHR0cDovL3d3 dy5zdGFydHNzbC5jb20vc2ZzY2EuY3J0MFsGA1UdHwRUMFIwJ6AloCOGIWh0dHA6Ly93d3cu c3RhcnRzc2wuY29tL3Nmc2NhLmNybDAnoCWgI4YhaHR0cDovL2NybC5zdGFydHNzbC5jb20v c2ZzY2EuY3JsMIGABgNVHSAEeTB3MHUGCysGAQQBgbU3AQIBMGYwLgYIKwYBBQUHAgEWImh0 dHA6Ly93d3cuc3RhcnRzc2wuY29tL3BvbGljeS5wZGYwNAYIKwYBBQUHAgEWKGh0dHA6Ly93 d3cuc3RhcnRzc2wuY29tL2ludGVybWVkaWF0ZS5wZGYwDQYJKoZIhvcNAQEFBQADggIBAAqD CH14qywGXLhjjF6uHLkjd02hcdh9hrw+VUsv+q1eeQWB21jWj3kJ96AUlPCoEGZ/ynJNScWy 6QMVQjbbMXltUfO4n4bGGdKo3awPWp61tjAFgraLJgDk+DsSvUD6EowjMTNx25GQgyYJ5RPI zKKR9tQW8gGK+2+RHxkUCTbYFnL6kl8Ch507rUdPPipJ9CgJFws3kDS3gOS5WFMxcjO5DwKf KSETEPrHh7p5shuuNktvsv6hxHTLhiMKX893gxdT3XLS9OKmCv87vkINQcNEcIIoFWbP9HOR z9v3vQwR4e3ksLc2JZOAFK+ssS5XMEoznzpihEP0PLc4dCBYjbvSD7kxgDwZ+Aj8Q9PkbvE9 sIPP7ON0fz095HdThKjiVJe6vofq+n6b1NBc8XdrQvBmunwxD5nvtTW4vtN6VY7mUCmxsCie uoBJ9OlqmsVWQvifIYf40dJPZkk9YgGTzWLpXDSfLSplbY2LL9C9U0ptvjcDjefLTvqSFc7t w1sEhF0n/qpA2r0GpvkLRDmcSwVyPvmjFBGqUp/pNy8ZuPGQmHwFi2/14+xeSUDG2bwnsYJQ G2EdJCB6luQ57GEnTA/yKZSTKI8dDQa8Sd3zfXb19mOgSF0bBdXbuKhEpuP9wirslFe6fQ1t 5j5R0xi72MZ8ikMu1RQZKCyDbMwazlHiMIIG6jCCBdKgAwIBAgIDBNFwMA0GCSqGSIb3DQEB CwUAMIGMMQswCQYDVQQGEwJJTDEWMBQGA1UEChMNU3RhcnRDb20gTHRkLjErMCkGA1UECxMi U2VjdXJlIERpZ2l0YWwgQ2VydGlmaWNhdGUgU2lnbmluZzE4MDYGA1UEAxMvU3RhcnRDb20g Q2xhc3MgMSBQcmltYXJ5IEludGVybWVkaWF0ZSBDbGllbnQgQ0EwHhcNMTIwODI5MTIxMTA4 WhcNMTMwODMwMTU0NDAzWjA2MRYwFAYDVQQDDA1hbWFyYXRAa3N1LnJ1MRwwGgYJKoZIhvcN AQkBFg1hbWFyYXRAa3N1LnJ1MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAunSf xbCntS3sO05BRjxC8V4KJhW9DjK9Al6ZQXVZhdH7abVhdomuRomAp46/vBUMHaSxvpnfugu7 lOOvdDB2yV9XJLGNXtAczO5DomuNUQpBcMwAiUCI2nppNsCOTWJBoNV/AFiA1Nlufprny5wP tiGDJlxz+CrDILh1k19oZLm3ul2uk0kqw9IS7M1JixsljnimEj6lATUi67SBxzpJKgbSXHNh uCbKLkXtGSDwW+NbjZiXgMh7s+a6vhm6wP6BGKrW+f0cmoMZHQ2O52KNpE0swosE2mmGTepc YQjqR1Sz1+kcL4Y7zBLUfBPJkObgufbACLWPloa3x74EWD8tOQIDAQABo4IDqDCCA6QwCQYD VR0TBAIwADALBgNVHQ8EBAMCBLAwHQYDVR0lBBYwFAYIKwYBBQUHAwIGCCsGAQUFBwMEMB0G A1UdDgQWBBR6Kl6WYaDUhXwqS0Yyi5JKui5NlzAfBgNVHSMEGDAWgBRTcu2SnODaywFcfH6W NU7y1LhRgjAYBgNVHREEETAPgQ1hbWFyYXRAa3N1LnJ1MIICIQYDVR0gBIICGDCCAhQwggIQ BgsrBgEEAYG1NwECAjCCAf8wLgYIKwYBBQUHAgEWImh0dHA6Ly93d3cuc3RhcnRzc2wuY29t L3BvbGljeS5wZGYwNAYIKwYBBQUHAgEWKGh0dHA6Ly93d3cuc3RhcnRzc2wuY29tL2ludGVy bWVkaWF0ZS5wZGYwgfcGCCsGAQUFBwICMIHqMCcWIFN0YXJ0Q29tIENlcnRpZmljYXRpb24g QXV0aG9yaXR5MAMCAQEagb5UaGlzIGNlcnRpZmljYXRlIHdhcyBpc3N1ZWQgYWNjb3JkaW5n IHRvIHRoZSBDbGFzcyAxIFZhbGlkYXRpb24gcmVxdWlyZW1lbnRzIG9mIHRoZSBTdGFydENv bSBDQSBwb2xpY3ksIHJlbGlhbmNlIG9ubHkgZm9yIHRoZSBpbnRlbmRlZCBwdXJwb3NlIGlu IGNvbXBsaWFuY2Ugb2YgdGhlIHJlbHlpbmcgcGFydHkgb2JsaWdhdGlvbnMuMIGcBggrBgEF BQcCAjCBjzAnFiBTdGFydENvbSBDZXJ0aWZpY2F0aW9uIEF1dGhvcml0eTADAgECGmRMaWFi aWxpdHkgYW5kIHdhcnJhbnRpZXMgYXJlIGxpbWl0ZWQhIFNlZSBzZWN0aW9uICJMZWdhbCBh bmQgTGltaXRhdGlvbnMiIG9mIHRoZSBTdGFydENvbSBDQSBwb2xpY3kuMDYGA1UdHwQvMC0w K6ApoCeGJWh0dHA6Ly9jcmwuc3RhcnRzc2wuY29tL2NydHUxLWNybC5jcmwwgY4GCCsGAQUF BwEBBIGBMH8wOQYIKwYBBQUHMAGGLWh0dHA6Ly9vY3NwLnN0YXJ0c3NsLmNvbS9zdWIvY2xh c3MxL2NsaWVudC9jYTBCBggrBgEFBQcwAoY2aHR0cDovL2FpYS5zdGFydHNzbC5jb20vY2Vy dHMvc3ViLmNsYXNzMS5jbGllbnQuY2EuY3J0MCMGA1UdEgQcMBqGGGh0dHA6Ly93d3cuc3Rh cnRzc2wuY29tLzANBgkqhkiG9w0BAQsFAAOCAQEAwvQFPImFY8mQ5iB7OrTpRZNx/Zhc1a4q SdQAAH2ZjY5ypeaNsajWEAWVQgwz3CeGNJnLtIuXDsPoq/y+QnwrR/1APaQ3BOWuUx9WLtfa cfFQb7IfsTdQunVFmW5Cdu48AdJDwKOS65Ux7sHDSuT0Z7AuG+0oqH9RzfjtdP1hJMbBwMxR jh1nCVSug0+VVk1nZtAPPeuaAFS06ytFkvGdZoeEIEyNEEpHedJNV7LEmUgpPT4C5SSqASkO ohi/XdSwRq3ik50KFTQO/sHxXTk7ROz19jLrpP6uZ8RDqX7tgARz5lbodmjKPZ+8JN+krfLX 1GsGKrJ2+hAdxu0kh58KFTGCA90wggPZAgEBMIGUMIGMMQswCQYDVQQGEwJJTDEWMBQGA1UE ChMNU3RhcnRDb20gTHRkLjErMCkGA1UECxMiU2VjdXJlIERpZ2l0YWwgQ2VydGlmaWNhdGUg U2lnbmluZzE4MDYGA1UEAxMvU3RhcnRDb20gQ2xhc3MgMSBQcmltYXJ5IEludGVybWVkaWF0 ZSBDbGllbnQgQ0ECAwTRcDAJBgUrDgMCGgUAoIICHTAYBgkqhkiG9w0BCQMxCwYJKoZIhvcN AQcBMBwGCSqGSIb3DQEJBTEPFw0xMjEwMDExMDA2MThaMCMGCSqGSIb3DQEJBDEWBBSb5Is1 d3xH64TR8qbi1IpN0VjznzBsBgkqhkiG9w0BCQ8xXzBdMAsGCWCGSAFlAwQBKjALBglghkgB ZQMEAQIwCgYIKoZIhvcNAwcwDgYIKoZIhvcNAwICAgCAMA0GCCqGSIb3DQMCAgFAMAcGBSsO AwIHMA0GCCqGSIb3DQMCAgEoMIGlBgkrBgEEAYI3EAQxgZcwgZQwgYwxCzAJBgNVBAYTAklM MRYwFAYDVQQKEw1TdGFydENvbSBMdGQuMSswKQYDVQQLEyJTZWN1cmUgRGlnaXRhbCBDZXJ0 aWZpY2F0ZSBTaWduaW5nMTgwNgYDVQQDEy9TdGFydENvbSBDbGFzcyAxIFByaW1hcnkgSW50 ZXJtZWRpYXRlIENsaWVudCBDQQIDBNFwMIGnBgsqhkiG9w0BCRACCzGBl6CBlDCBjDELMAkG A1UEBhMCSUwxFjAUBgNVBAoTDVN0YXJ0Q29tIEx0ZC4xKzApBgNVBAsTIlNlY3VyZSBEaWdp dGFsIENlcnRpZmljYXRlIFNpZ25pbmcxODA2BgNVBAMTL1N0YXJ0Q29tIENsYXNzIDEgUHJp bWFyeSBJbnRlcm1lZGlhdGUgQ2xpZW50IENBAgME0XAwDQYJKoZIhvcNAQEBBQAEggEAOqF+ sDZg5fQ1G5aVm+njw72sOVHtxKRx8WUXf0poKvaeMFCwd23NM+83wzueiEP+chI1wq0K5eC5 RsTpo85aOebLZ/Zc3kUZ095nN9LKNpP+RVorl0Ymvlu9lXqEOsmWNfW3T1axa7fQZFuhdlcB 1kq9lyD9fWK/yhLqU1wBaEGgn2OM6gTv/1MO5ADsNLBMoYpjfJ3bo4a63W3wj8x7uR24GUMD mTG+pRSiP6pFvCU/X4Iaa9/YQeQErfnUcrB42JH5RZLiQ5145HjlYXqDQFVklGxPIyS3qcVc 6B6TLAC/kVLC4Mh6e7Dhv7PIkxWL6q8anuPq1tkpJED1QzN2HwAAAAAAAA== --------------ms020909020407030707080206-- From owner-freebsd-gecko@FreeBSD.ORG Mon Oct 1 10:34:10 2012 Return-Path: Delivered-To: freebsd-gecko@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 5164C106566B for ; Mon, 1 Oct 2012 10:34:10 +0000 (UTC) (envelope-from svn-freebsd-gecko@chruetertee.ch) Received: from trillian.chruetertee.ch (trillian.chruetertee.ch [217.150.245.56]) by mx1.freebsd.org (Postfix) with ESMTP id CD7B88FC15 for ; Mon, 1 Oct 2012 10:34:09 +0000 (UTC) Received: from trillian.chruetertee.ch (trillian [217.150.245.56]) by trillian.chruetertee.ch (8.14.4/8.14.3) with ESMTP id q91AY1HP006587 for ; Mon, 1 Oct 2012 10:34:01 GMT (envelope-from svn-freebsd-gecko@chruetertee.ch) Received: (from www@localhost) by trillian.chruetertee.ch (8.14.4/8.14.3/Submit) id q91AXuMG006110 for freebsd-gecko@freebsd.org; Mon, 1 Oct 2012 10:33:56 GMT (envelope-from svn-freebsd-gecko@chruetertee.ch) Date: Mon, 1 Oct 2012 10:33:56 GMT Message-Id: <201210011033.q91AXuMG006110@trillian.chruetertee.ch> X-Authentication-Warning: trillian.chruetertee.ch: www set sender to svn-freebsd-gecko@chruetertee.ch using -f From: svn-freebsd-gecko@chruetertee.ch To: freebsd-gecko@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Subject: [SVN-Commit] r1049 - trunk X-BeenThere: freebsd-gecko@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list Reply-To: freebsd-gecko@freebsd.org List-Id: Gecko Rendering Engine issues List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 01 Oct 2012 10:34:10 -0000 Author: jbeich Date: Mon Oct 1 10:33:56 2012 New Revision: 1049 Log: more changelog entries ports/172201 issue happens for any option > 34 chars long and defined via OPTIONS_SINGLE or OPTIONS_MULTI. dialogwrapper.sh is supposed to be the official workaround. Modified: trunk/Gecko_ChangeLog Modified: trunk/Gecko_ChangeLog ============================================================================== --- trunk/Gecko_ChangeLog Sat Sep 29 16:30:37 2012 (r1048) +++ trunk/Gecko_ChangeLog Mon Oct 1 10:33:56 2012 (r1049) @@ -7,6 +7,7 @@ - support system hunspell dictionaries [1] - unbreak -esr ports with clang3.2 [2] - unbreak nss build when CC contains full path [3] +- remove GNOME option grouping [4] - add more reporters in about:memory: page-faults-hard, page-faults-soft, resident, vsize - use bundled jemalloc 3.0.0 on FreeBSD < 10.0 for gecko 16.0, @@ -14,5 +15,7 @@ - use lrintf() instead of slow C cast in bundled libopus - use libjpeg-turbo's faster color conversion if available during build - record startup time for telemetry +- use -z origin instead of hardcoding path to gecko runtime +- *miscellaneous cleanups and fixups* -PR: ports/171534 [1], ports/171566 [2], ports/172164 [3] +PR: ports/171534 [1], ports/171566 [2], ports/172164 [3], ports/172201 [4] From owner-freebsd-gecko@FreeBSD.ORG Mon Oct 1 10:34:14 2012 Return-Path: Delivered-To: freebsd-gecko@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 691EE106564A for ; Mon, 1 Oct 2012 10:34:14 +0000 (UTC) (envelope-from svn-freebsd-gecko@chruetertee.ch) Received: from trillian.chruetertee.ch (trillian.chruetertee.ch [217.150.245.56]) by mx1.freebsd.org (Postfix) with ESMTP id 0AA318FC1D for ; Mon, 1 Oct 2012 10:34:13 +0000 (UTC) Received: from trillian.chruetertee.ch (trillian [217.150.245.56]) by trillian.chruetertee.ch (8.14.4/8.14.3) with ESMTP id q91AYD1X009390 for ; Mon, 1 Oct 2012 10:34:13 GMT (envelope-from svn-freebsd-gecko@chruetertee.ch) Received: (from www@localhost) by trillian.chruetertee.ch (8.14.4/8.14.3/Submit) id q91AY7fs007580 for freebsd-gecko@freebsd.org; Mon, 1 Oct 2012 10:34:07 GMT (envelope-from svn-freebsd-gecko@chruetertee.ch) Date: Mon, 1 Oct 2012 10:34:07 GMT Message-Id: <201210011034.q91AY7fs007580@trillian.chruetertee.ch> X-Authentication-Warning: trillian.chruetertee.ch: www set sender to svn-freebsd-gecko@chruetertee.ch using -f From: svn-freebsd-gecko@chruetertee.ch To: freebsd-gecko@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Subject: [SVN-Commit] r1050 - in trunk: mail/thunderbird www/firefox www/firefox-nightly www/seamonkey X-BeenThere: freebsd-gecko@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list Reply-To: freebsd-gecko@freebsd.org List-Id: Gecko Rendering Engine issues List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 01 Oct 2012 10:34:14 -0000 Author: jbeich Date: Mon Oct 1 10:34:07 2012 New Revision: 1050 Log: update Modified: trunk/mail/thunderbird/Makefile trunk/mail/thunderbird/distinfo trunk/www/firefox-nightly/Makefile.hgrev trunk/www/firefox-nightly/distinfo trunk/www/firefox/Makefile trunk/www/firefox/distinfo trunk/www/seamonkey/Makefile trunk/www/seamonkey/distinfo Modified: trunk/mail/thunderbird/Makefile ============================================================================== --- trunk/mail/thunderbird/Makefile Mon Oct 1 10:33:56 2012 (r1049) +++ trunk/mail/thunderbird/Makefile Mon Oct 1 10:34:07 2012 (r1050) @@ -6,7 +6,7 @@ # PORTNAME= thunderbird -DISTVERSION= 16.0b2 +DISTVERSION= 16.0b3 CATEGORIES= mail ipv6 MASTER_SITES= ${MASTER_SITE_MOZILLA} MASTER_SITE_SUBDIR= ${PORTNAME}/releases/${DISTVERSION}/source Modified: trunk/mail/thunderbird/distinfo ============================================================================== --- trunk/mail/thunderbird/distinfo Mon Oct 1 10:33:56 2012 (r1049) +++ trunk/mail/thunderbird/distinfo Mon Oct 1 10:34:07 2012 (r1050) @@ -1,4 +1,4 @@ -SHA256 (thunderbird-16.0b2.source.tar.bz2) = bba7d79e2939806c027ac82592c408ea815d3094a70f8f277b959966d1baa511 -SIZE (thunderbird-16.0b2.source.tar.bz2) = 111787029 +SHA256 (thunderbird-16.0b3.source.tar.bz2) = fc089c1a374ec6fb85f693286a2331e2161e4d53cf3e6cbb7cc377a5b8e7ec8c +SIZE (thunderbird-16.0b3.source.tar.bz2) = 111775667 SHA256 (enigmail-1.4.4.tar.gz) = ec62bb701968f72ad35546660132e6e47d4ebe684df1d27fc615cb9010a203b8 SIZE (enigmail-1.4.4.tar.gz) = 1269444 Modified: trunk/www/firefox-nightly/Makefile.hgrev ============================================================================== --- trunk/www/firefox-nightly/Makefile.hgrev Mon Oct 1 10:33:56 2012 (r1049) +++ trunk/www/firefox-nightly/Makefile.hgrev Mon Oct 1 10:34:07 2012 (r1050) @@ -1 +1 @@ -HGREV= 107671:abada9261f82 +HGREV= 108704:4a7836f11aa7 Modified: trunk/www/firefox-nightly/distinfo ============================================================================== --- trunk/www/firefox-nightly/distinfo Mon Oct 1 10:33:56 2012 (r1049) +++ trunk/www/firefox-nightly/distinfo Mon Oct 1 10:34:07 2012 (r1050) @@ -1,2 +1,2 @@ -SHA256 (firefox-nightly/abada9261f82.tar.bz2) = 91c60e041e5788feba1819a48b69df3e902a7bf738abd7a8cb9b3a7cc5643cf5 -SIZE (firefox-nightly/abada9261f82.tar.bz2) = 90098597 +SHA256 (firefox-nightly/4a7836f11aa7.tar.bz2) = 0b708abb61997c773b6168337cf67e28c41e64659971ceba19fb4dfa6de623a7 +SIZE (firefox-nightly/4a7836f11aa7.tar.bz2) = 92561724 Modified: trunk/www/firefox/Makefile ============================================================================== --- trunk/www/firefox/Makefile Mon Oct 1 10:33:56 2012 (r1049) +++ trunk/www/firefox/Makefile Mon Oct 1 10:34:07 2012 (r1050) @@ -6,7 +6,7 @@ # PORTNAME= firefox -DISTVERSION= 16.0b4 +DISTVERSION= 16.0b5 PORTEPOCH= 1 CATEGORIES= www ipv6 MASTER_SITES= ${MASTER_SITE_MOZILLA} Modified: trunk/www/firefox/distinfo ============================================================================== --- trunk/www/firefox/distinfo Mon Oct 1 10:33:56 2012 (r1049) +++ trunk/www/firefox/distinfo Mon Oct 1 10:34:07 2012 (r1050) @@ -1,2 +1,2 @@ -SHA256 (firefox-16.0b4.source.tar.bz2) = 2ac8065bb32a3cfe5de791042caf6141f833a980f559f72e4813c17e23697ee8 -SIZE (firefox-16.0b4.source.tar.bz2) = 89186049 +SHA256 (firefox-16.0b5.source.tar.bz2) = 9284cc2288bf314379f494dfbdb79e3e5685edf6ce6c8f869aad89cd7c17c3d5 +SIZE (firefox-16.0b5.source.tar.bz2) = 89154869 Modified: trunk/www/seamonkey/Makefile ============================================================================== --- trunk/www/seamonkey/Makefile Mon Oct 1 10:33:56 2012 (r1049) +++ trunk/www/seamonkey/Makefile Mon Oct 1 10:34:07 2012 (r1050) @@ -6,7 +6,7 @@ # PORTNAME= seamonkey -DISTVERSION= 2.13b3 +DISTVERSION= 2.13b5 CATEGORIES?= www ipv6 MASTER_SITES= ${MASTER_SITE_MOZILLA_EXTENDED} MASTER_SITE_SUBDIR= seamonkey/releases/${DISTVERSION}/source Modified: trunk/www/seamonkey/distinfo ============================================================================== --- trunk/www/seamonkey/distinfo Mon Oct 1 10:33:56 2012 (r1049) +++ trunk/www/seamonkey/distinfo Mon Oct 1 10:34:07 2012 (r1050) @@ -1,4 +1,4 @@ -SHA256 (seamonkey-2.13b3.source.tar.bz2) = eb22e00a0ab091c189e7048fcbeeb6469759603290556a5ff36c6961950aa14d -SIZE (seamonkey-2.13b3.source.tar.bz2) = 112000158 +SHA256 (seamonkey-2.13b5.source.tar.bz2) = f889be2870eca444c8bc9fcf580f24094ee73f68ccd7864111ecff8a64072cdb +SIZE (seamonkey-2.13b5.source.tar.bz2) = 111970776 SHA256 (enigmail-1.4.4.tar.gz) = ec62bb701968f72ad35546660132e6e47d4ebe684df1d27fc615cb9010a203b8 SIZE (enigmail-1.4.4.tar.gz) = 1269444 From owner-freebsd-gecko@FreeBSD.ORG Mon Oct 1 11:07:40 2012 Return-Path: Delivered-To: gecko@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id EED7C106564A for ; Mon, 1 Oct 2012 11:07:39 +0000 (UTC) (envelope-from owner-bugmaster@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [IPv6:2001:4f8:fff6::28]) by mx1.freebsd.org (Postfix) with ESMTP id C08CA8FC12 for ; Mon, 1 Oct 2012 11:07:39 +0000 (UTC) Received: from freefall.freebsd.org (localhost [127.0.0.1]) by freefall.freebsd.org (8.14.5/8.14.5) with ESMTP id q91B7d09025253 for ; Mon, 1 Oct 2012 11:07:39 GMT (envelope-from owner-bugmaster@FreeBSD.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.14.5/8.14.5/Submit) id q91B7dqu025251 for gecko@FreeBSD.org; Mon, 1 Oct 2012 11:07:39 GMT (envelope-from owner-bugmaster@FreeBSD.org) Date: Mon, 1 Oct 2012 11:07:39 GMT Message-Id: <201210011107.q91B7dqu025251@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: gnats set sender to owner-bugmaster@FreeBSD.org using -f From: FreeBSD bugmaster To: gecko@FreeBSD.org Cc: Subject: Current problem reports assigned to gecko@FreeBSD.org X-BeenThere: freebsd-gecko@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Gecko Rendering Engine issues List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 01 Oct 2012 11:07:40 -0000 Note: to view an individual PR, use: http://www.freebsd.org/cgi/query-pr.cgi?pr=(number). The following is a listing of current problems submitted by FreeBSD users. These represent problem reports covering all versions including experimental development code and obsolete releases. S Tracker Resp. Description -------------------------------------------------------------------------------- o ports/172201 gecko www/firefox options too long for 8-stable o ports/172164 gecko [PATCH] security/nss: fix 'make install' when built wi o ports/171566 gecko www/libxul: ./jscompartment.h:394:8: error: visibility o ports/171534 gecko www/firefox doesn't use system hunspell dictionary p ports/171255 gecko Fix www/firefox on FreeBSD 7.4/amd64 o ports/171219 gecko www/firefox-i18n russian language pack don't translate o ports/170402 gecko www/linux-firefox: crash with flashplugin o ports/170310 gecko mail/thunderbird: coredump/crash when used with OpenLD o ports/169729 gecko www/firefox-esr "make package" produces package with z o ports/169366 gecko www/xpi-* ports need re-install after each Firefox upd o ports/169241 gecko www/firefox Right mouse buttom click freeze screen o ports/168091 gecko Mk/bsd.gecko.mk error: USE_FIREFOX doesn't work correc o ports/167397 gecko mail/thunderbird-i18n Version 12.0 and freebsd 9.0: ca o ports/167298 gecko mail/thunderbird-i18n and www/firefox-i18n fail to fet f ports/165263 gecko mail/thunderbird: core dumping most time when users ar o ports/164239 gecko [PATCH] mail/thunderbird: crash with nss_ldap o ports/164013 gecko www/firefox: Firefox-9 Icons & xpi-addons from ports o ports/162939 gecko www/firefox crashes with Zotero add-on o ports/162075 gecko www/firefox >= 7.0.1_2 bug with respect to pentadactyl o ports/160387 gecko security/ca_root_nss: Allow user to trust extra local o ports/156335 gecko www/firefox: Repeatable firefox-4.0_1,1 crash f ports/155949 gecko www/firefox: firefox 4, WITH_PGO, better Text against o ports/144044 gecko [PATCH] www/firefox: Makefile.webplugins target order 23 problems total. From owner-freebsd-gecko@FreeBSD.ORG Mon Oct 1 13:37:07 2012 Return-Path: Delivered-To: gecko@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id DE8501065670 for ; Mon, 1 Oct 2012 13:37:07 +0000 (UTC) (envelope-from andrnils@gmail.com) Received: from mail-oa0-f54.google.com (mail-oa0-f54.google.com [209.85.219.54]) by mx1.freebsd.org (Postfix) with ESMTP id 9EAA68FC1B for ; Mon, 1 Oct 2012 13:37:07 +0000 (UTC) Received: by oagn9 with SMTP id n9so4717071oag.13 for ; Mon, 01 Oct 2012 06:37:06 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=mime-version:date:message-id:subject:from:to:content-type; bh=+UuNmtjm5+WeGJ92XFAfNTV06R635kMhZYlS0BR3RcI=; b=J+1K9a/WOFi9PPYjxTuEZICzKHHLcizSUoEtX3jGIiZLvJQzAUISYtepFjXA9NYJqI uGjb+JWyJN9VF+O/AULEnoUjrSzfDCjYQ1/N5SKsJizTB0jqt09+/DkPuqttdbizmt+c TnU95uIWjxXJMVqJCUgnpkYzW4F0DKbbVmRya+bvTG4ERVVQSIH6dqGPveAeb5O8V63N HCzkWnD5C+bTtcF3+HALyTpuOIVtwOofFWSNyDNRkY6N8+Xlnaiqf99ZVHDpkoiGx/vQ cVyKW5IgR0YdFQk7mZM14pHxmrUc7LKdiE3cBj3mvtyAqprhKvkN191jc5XFVHmiQoed 8cPA== MIME-Version: 1.0 Received: by 10.60.169.148 with SMTP id ae20mr11524544oec.53.1349098626789; Mon, 01 Oct 2012 06:37:06 -0700 (PDT) Received: by 10.60.46.165 with HTTP; Mon, 1 Oct 2012 06:37:06 -0700 (PDT) Date: Mon, 1 Oct 2012 15:37:06 +0200 Message-ID: From: Andreas Nilsson To: gecko@freebsd.org Content-Type: text/plain; charset=ISO-8859-1 X-Content-Filtered-By: Mailman/MimeDel 2.1.5 Cc: Subject: firefox-15.0.1 built with poudriere and pkgng fails to run X-BeenThere: freebsd-gecko@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Gecko Rendering Engine issues List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 01 Oct 2012 13:37:08 -0000 Hello, when building firefox for amd64 and 9.1-RC1 with poudriere and pkgng, the resulting binary fails. See http://fossil.etoilebsd.net/poudriere/tktview?name=06c3886e22 Error messages such as [andrnils@caolila ~]$ firefox XError: X_ShmAttach: BadAccess (attempt to access private resource denied); 8 requests ago XError: X_ShmPutImage: BadShmSeg (invalid shared segment parameter); 6 requests ago XError: X_ShmAttach: BadAccess (attempt to access private resource denied); 2 requests ago XError: X_ShmDetach: BadShmSeg (invalid shared segment parameter); 8 requests ago XError: X_ShmPutImage: BadShmSeg (invalid shared segment parameter); 6 requests ago XError: X_ShmPutImage: BadShmSeg (invalid shared segment parameter); 5 requests ago XError: X_ShmPutImage: BadShmSeg (invalid shared segment parameter); 23 requests ago XError: X_ShmPutImage: BadShmSeg (invalid shared segment parameter); 7 requests ago in terminal. If I run with MOZ_X_SYNC=1 I get a coredump: [andrnils@caolila ~]$ MOZ_X_SYNC=1 firefox QCoreApplication::postEvent: Unexpected null receiver ###!!! ABORT: X_ShmAttach: BadAccess (attempt to access private resource denied); sync: file /wrkdirs/usr/ports/www/firefox/work/mozilla-release/toolkit/xre/nsX11ErrorHandler.cpp, line 157 ###!!! ABORT: X_ShmAttach: BadAccess (attempt to access private resource denied); sync: file /wrkdirs/usr/ports/www/firefox/work/mozilla-release/toolkit/xre/nsX11ErrorHandler.cpp, line 157 Segmentation fault: 11 (core dumped) Firefox was built with # This file is auto-generated by 'make config'. # Options for firefox-15.0.1,1 _OPTIONS_READ=firefox-15.0.1,1 _FILE_COMPLETE_OPTIONS_LIST=DBUS DEBUG GNOME GSTREAMER LIBPROXY LOGGING OPTIMIZED_CFLAGS PGO ALSA OSS PULSEAUDIO GTK2 QT4 GCONF GIO GNOMEUI GNOMEVFS2 OPTIONS_FILE_SET+=DBUS OPTIONS_FILE_UNSET+=DEBUG OPTIONS_FILE_UNSET+=GNOME OPTIONS_FILE_UNSET+=GSTREAMER OPTIONS_FILE_UNSET+=LIBPROXY OPTIONS_FILE_SET+=LOGGING OPTIONS_FILE_SET+=OPTIMIZED_CFLAGS OPTIONS_FILE_UNSET+=PGO OPTIONS_FILE_UNSET+=ALSA OPTIONS_FILE_SET+=OSS OPTIONS_FILE_UNSET+=PULSEAUDIO OPTIONS_FILE_UNSET+=GTK2 OPTIONS_FILE_SET+=QT4 OPTIONS_FILE_UNSET+=GCONF OPTIONS_FILE_UNSET+=GIO OPTIONS_FILE_UNSET+=GNOMEUI OPTIONS_FILE_UNSET+=GNOMEVFS2 Any ideas what could cause this? Best regards Andreas Nilsson From owner-freebsd-gecko@FreeBSD.ORG Tue Oct 2 07:39:46 2012 Return-Path: Delivered-To: freebsd-gecko@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id D0090106582A for ; Tue, 2 Oct 2012 07:39:46 +0000 (UTC) (envelope-from svn-freebsd-gecko@chruetertee.ch) Received: from trillian.chruetertee.ch (trillian.chruetertee.ch [217.150.245.56]) by mx1.freebsd.org (Postfix) with ESMTP id 430378FC12 for ; Tue, 2 Oct 2012 07:39:45 +0000 (UTC) Received: from trillian.chruetertee.ch (trillian [217.150.245.56]) by trillian.chruetertee.ch (8.14.4/8.14.3) with ESMTP id q927dj3A097970 for ; Tue, 2 Oct 2012 07:39:45 GMT (envelope-from svn-freebsd-gecko@chruetertee.ch) Received: (from www@localhost) by trillian.chruetertee.ch (8.14.4/8.14.3/Submit) id q927ddKA097088 for freebsd-gecko@freebsd.org; Tue, 2 Oct 2012 07:39:39 GMT (envelope-from svn-freebsd-gecko@chruetertee.ch) Date: Tue, 2 Oct 2012 07:39:39 GMT Message-Id: <201210020739.q927ddKA097088@trillian.chruetertee.ch> X-Authentication-Warning: trillian.chruetertee.ch: www set sender to svn-freebsd-gecko@chruetertee.ch using -f From: svn-freebsd-gecko@chruetertee.ch To: freebsd-gecko@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Subject: [SVN-Commit] r1051 - in trunk: mail/thunderbird/files www/firefox-nightly/files www/firefox/files www/seamonkey/files X-BeenThere: freebsd-gecko@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list Reply-To: freebsd-gecko@freebsd.org List-Id: Gecko Rendering Engine issues List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 02 Oct 2012 07:39:46 -0000 Author: jbeich Date: Tue Oct 2 07:39:39 2012 New Revision: 1051 Log: sync with bug 788955 Modified: trunk/mail/thunderbird/files/patch-bug788955 trunk/www/firefox-nightly/files/patch-bug788955 trunk/www/firefox/files/patch-bug788955 trunk/www/seamonkey/files/patch-bug788955 Modified: trunk/mail/thunderbird/files/patch-bug788955 ============================================================================== --- trunk/mail/thunderbird/files/patch-bug788955 Mon Oct 1 10:34:07 2012 (r1050) +++ trunk/mail/thunderbird/files/patch-bug788955 Tue Oct 2 07:39:39 2012 (r1051) @@ -14,7 +14,7 @@ endif ifndef MOZ_NATIVE_ZLIB diff --git allmakefiles.sh allmakefiles.sh -index 6a9be4b..544beff 100755 +index 6a9be4b..d2e49e3 100755 --- mozilla/allmakefiles.sh +++ mozilla/allmakefiles.sh @@ -59,7 +59,7 @@ if [ ! "$LIBXUL_SDK" ]; then @@ -22,7 +22,7 @@ mozglue/build/Makefile " - if [ "$MOZ_JEMALLOC" ]; then -+ if [ "$MOZ_JEMALLOC" -a ! "$MOZ_NATIVE_JEMALLOC" ]; then ++ if [ "$MOZ_JEMALLOC" -a -z "$MOZ_NATIVE_JEMALLOC" ]; then add_makefiles " memory/jemalloc/Makefile " @@ -37,10 +37,10 @@ MOZ_ENABLE_PROFILER_SPS = @MOZ_ENABLE_PROFILER_SPS@ MOZ_JPROF = @MOZ_JPROF@ diff --git configure.in configure.in -index cfcdbc0..ee9a299 100644 +index bb05782..2f32516 100644 --- mozilla/configure.in +++ mozilla/configure.in -@@ -3730,21 +3730,22 @@ fi +@@ -3711,21 +3711,22 @@ fi dnl Check for the existence of various allocation headers/functions @@ -72,7 +72,7 @@ dnl See if compiler supports some gcc-style attributes AC_CACHE_CHECK(for __attribute__((always_inline)), -@@ -6960,6 +6961,18 @@ else +@@ -6939,6 +6940,18 @@ else fi if test -z "$MOZ_MEMORY"; then @@ -91,7 +91,7 @@ case "${target}" in *-mingw*) if test -z "$WIN32_REDIST_DIR" -a -z "$MOZ_DEBUG"; then -@@ -7054,6 +7067,7 @@ else +@@ -7033,6 +7046,7 @@ else fi # MOZ_MEMORY AC_SUBST(MOZ_MEMORY) AC_SUBST(MOZ_JEMALLOC) @@ -99,7 +99,7 @@ AC_SUBST(MOZ_GLUE_LDFLAGS) AC_SUBST(MOZ_GLUE_PROGRAM_LDFLAGS) AC_SUBST(WIN32_CRT_LIBS) -@@ -8819,10 +8833,27 @@ fi +@@ -8820,10 +8834,22 @@ fi # Run jemalloc configure script @@ -109,63 +109,22 @@ - if test "$OS_ARCH" = "Linux"; then - MANGLE="malloc calloc valloc free realloc memalign posix_memalign malloc_usable_size" + case "$OS_ARCH" in -+ Linux) -+ MANGLE="malloc calloc valloc free realloc memalign posix_memalign malloc_usable_size" -+ ;; -+ DragonFly|NetBSD|OpenBSD) ++ Linux|DragonFly|FreeBSD|NetBSD|OpenBSD) + MANGLE="malloc calloc valloc free realloc posix_memalign" -+ ;; -+ FreeBSD) -+ # common -+ MANGLE="malloc calloc valloc free realloc posix_memalign malloc_usable_size" -+ # old jemalloc -+ MANGLE="$MANGLE reallocf _malloc_message _malloc_options" -+ # jemalloc 3.0.0 -+ MANGLE="$MANGLE aligned_alloc malloc_message malloc_conf" -+ MANGLE="$MANGLE malloc_stats_print mallctl mallctlnametomib mallctlbymib" -+ MANGLE="$MANGLE allocm rallocm sallocm dallocm nallocm" ++ case "$OS_ARCH" in ++ Linux) ++ MANGLE="$MANGLE memalign malloc_usable_size" ++ ;; ++ FreeBSD) ++ MANGLE="$MANGLE malloc_usable_size" ++ ;; ++ esac + ;; + esac + if test -n "$MANGLE"; then MANGLED= JEMALLOC_WRAPPER= if test -n "$_WRAP_MALLOC"; then -diff --git js/src/configure.in js/src/configure.in -index 846482c..4022506 100644 ---- mozilla/js/src/configure.in -+++ mozilla/js/src/configure.in -@@ -3094,21 +3094,22 @@ fi - - dnl Check for the existence of various allocation headers/functions - -+MALLOC_HEADERS="malloc.h malloc_np.h malloc/malloc.h sys/malloc.h" - MALLOC_H= --MOZ_CHECK_HEADER(malloc.h, [MALLOC_H=malloc.h]) --if test "$MALLOC_H" = ""; then -- MOZ_CHECK_HEADER(malloc/malloc.h, [MALLOC_H=malloc/malloc.h]) -- if test "$MALLOC_H" = ""; then -- MOZ_CHECK_HEADER(sys/malloc.h, [MALLOC_H=sys/malloc.h]) -+ -+for file in $MALLOC_HEADERS; do -+ MOZ_CHECK_HEADER($file, [MALLOC_H=$file]) -+ if test "$MALLOC_H" != ""; then -+ AC_DEFINE_UNQUOTED(MALLOC_H, <$MALLOC_H>) -+ break - fi --fi --if test "$MALLOC_H" != ""; then -- AC_DEFINE_UNQUOTED(MALLOC_H, <$MALLOC_H>) --fi -+done - - MOZ_ALLOCATING_FUNCS="strndup posix_memalign memalign valloc" - AC_CHECK_FUNCS(strndup posix_memalign memalign valloc) - -+AC_CHECK_FUNCS(malloc_usable_size) -+ - dnl See if compiler supports some gcc-style attributes - - AC_CACHE_CHECK(for __attribute__((always_inline)), diff --git memory/build/Makefile.in memory/build/Makefile.in index dca0f48..af93ee0 100644 --- mozilla/memory/build/Makefile.in @@ -181,51 +140,57 @@ SHARED_LIBRARY_LIBS += $(call EXPAND_LIBNAME_PATH,jemalloc,$(DEPTH)/memory/mozjemalloc) endif diff --git memory/build/extraMallocFuncs.c memory/build/extraMallocFuncs.c -index 9d87629..76a2981 100644 +index 9d87629..03c8320 100644 --- mozilla/memory/build/extraMallocFuncs.c +++ mozilla/memory/build/extraMallocFuncs.c -@@ -94,7 +94,19 @@ wrap(wcsdup)(const wchar_t *src) +@@ -94,8 +94,16 @@ wrap(wcsdup)(const wchar_t *src) #endif #ifdef MOZ_JEMALLOC -+#if defined(MALLOC_H) && defined(MOZ_NATIVE_JEMALLOC) -+#include MALLOC_H -+#endif + -+#if defined(MOZ_NATIVE_JEMALLOC) || defined(__FreeBSD__) -+#define je_malloc_conf malloc_conf -+#define je_malloc_message malloc_message ++#undef wrap ++#if defined(MOZ_NATIVE_JEMALLOC) ++#define wrap(a) a ++#else ++#define wrap(a) je_ ## a +#endif + /* Override some jemalloc defaults */ -+#if defined(MOZ_NATIVE_JEMALLOC) -+MOZ_EXTERNAL_VIS -+#endif - const char *je_malloc_conf = "narenas:1,lg_chunk:20"; +-const char *je_malloc_conf = "narenas:1,lg_chunk:20"; ++MOZ_IMPORT_DATA(const char *) wrap(malloc_conf) = "narenas:1,lg_chunk:20"; #ifdef ANDROID + #include diff --git memory/build/mozjemalloc_compat.c memory/build/mozjemalloc_compat.c -index 10a845a..798c299 100644 +index 10a845a..94ad96e 100644 --- mozilla/memory/build/mozjemalloc_compat.c +++ mozilla/memory/build/mozjemalloc_compat.c -@@ -5,7 +5,17 @@ +@@ -5,14 +5,21 @@ #include "mozilla/Types.h" #include "jemalloc_types.h" -+#if defined(MALLOC_H) && defined(MOZ_NATIVE_JEMALLOC) -+#include MALLOC_H -+#endif -+ -+#if defined(MOZ_NATIVE_JEMALLOC) || defined(__FreeBSD__) -+#define je_mallctl mallctl -+#endif -+ -+#if !defined(MOZ_NATIVE_JEMALLOC) - extern int je_mallctl(const char*, void*, size_t*, void*, size_t); +-extern int je_mallctl(const char*, void*, size_t*, void*, size_t); ++#if defined(MOZ_NATIVE_JEMALLOC) ++#define wrap(a) a ++#else ++#define wrap(a) je_ ## a +#endif - MOZ_EXPORT_API (void) +-MOZ_EXPORT_API (void) ++extern MOZ_IMPORT_API(int) ++wrap(mallctl)(const char*, void*, size_t*, void*, size_t); ++ ++MOZ_EXPORT_API(void) jemalloc_stats(jemalloc_stats_t *stats) + { + size_t size = sizeof(stats->mapped); +- je_mallctl("stats.mapped", &stats->mapped, &size, NULL, 0); +- je_mallctl("stats.allocated", &stats->allocated, &size, NULL, 0); ++ wrap(mallctl)("stats.mapped", &stats->mapped, &size, NULL, 0); ++ wrap(mallctl)("stats.allocated", &stats->allocated, &size, NULL, 0); + stats->committed = -1; + stats->dirty = -1; + } diff --git memory/jemalloc/src/src/mutex.c memory/jemalloc/src/src/mutex.c index 37a843e..55e18c2 100644 --- mozilla/memory/jemalloc/src/src/mutex.c @@ -272,23 +237,17 @@ #elif defined(XP_WIN) return _msize(ptr); diff --git memory/mozjemalloc/jemalloc.h memory/mozjemalloc/jemalloc.h -index f0e0878..e74fb4d 100644 +index f0e0878..2486e83 100644 --- mozilla/memory/mozjemalloc/jemalloc.h +++ mozilla/memory/mozjemalloc/jemalloc.h -@@ -32,23 +32,29 @@ - #ifndef _JEMALLOC_H_ - #define _JEMALLOC_H_ - --#if defined(MOZ_MEMORY_DARWIN) --#include -+#if defined(MALLOC_H) \ -+ && (defined(MOZ_NATIVE_JEMALLOC) || defined(MOZ_MEMORY_DARWIN)) -+#include MALLOC_H +@@ -37,22 +37,29 @@ #endif #include "jemalloc_types.h" -+#if defined(MOZ_NATIVE_JEMALLOC) || defined(__FreeBSD__) -+#define je_nallocm nallocm ++#if defined(MOZ_NATIVE_JEMALLOC) ++#define wrap(a) a ++#else ++#define wrap(a) je_ ## a +#endif + #ifdef __cplusplus @@ -303,13 +262,38 @@ void jemalloc_stats(jemalloc_stats_t *stats); /* Computes the usable size in advance. */ --#if !defined(MOZ_MEMORY_DARWIN) + #if !defined(MOZ_MEMORY_DARWIN) -#if defined(MOZ_MEMORY_LINUX) -+#if !defined(MOZ_NATIVE_JEMALLOC) && !defined(MOZ_MEMORY_DARWIN) +#if defined(MOZ_MEMORY_LINUX) || defined(MOZ_MEMORY_BSD) __attribute__((weak)) #endif #if defined(MOZ_JEMALLOC) +-int je_nallocm(size_t *rsize, size_t size, int flags); ++MOZ_IMPORT_API(int) wrap(nallocm)(size_t *rsize, size_t size, int flags); + #else + size_t je_malloc_good_size(size_t size); + #endif +@@ -62,11 +69,11 @@ static inline size_t je_malloc_usable_size_in_advance(size_t size) { + #if defined(MOZ_MEMORY_DARWIN) + return malloc_good_size(size); + #elif defined(MOZ_JEMALLOC) +- if (je_nallocm) { ++ if (wrap(nallocm)) { + size_t ret; + if (size == 0) + size = 1; +- if (!je_nallocm(&ret, size, 0)) ++ if (!wrap(nallocm)(&ret, size, 0)) + return ret; + } + return size; +@@ -113,4 +120,6 @@ void jemalloc_purge_freed_pages(); + } /* extern "C" */ + #endif + ++#undef wrap ++ + #endif /* _JEMALLOC_H_ */ diff --git mozglue/build/Makefile.in mozglue/build/Makefile.in index c333647..15ba505 100644 --- mozilla/mozglue/build/Makefile.in Modified: trunk/www/firefox-nightly/files/patch-bug788955 ============================================================================== --- trunk/www/firefox-nightly/files/patch-bug788955 Mon Oct 1 10:34:07 2012 (r1050) +++ trunk/www/firefox-nightly/files/patch-bug788955 Tue Oct 2 07:39:39 2012 (r1051) @@ -14,7 +14,7 @@ endif ifndef MOZ_NATIVE_ZLIB diff --git allmakefiles.sh allmakefiles.sh -index 6a9be4b..544beff 100755 +index 6a9be4b..d2e49e3 100755 --- allmakefiles.sh +++ allmakefiles.sh @@ -59,7 +59,7 @@ if [ ! "$LIBXUL_SDK" ]; then @@ -22,15 +22,15 @@ mozglue/build/Makefile " - if [ "$MOZ_JEMALLOC" ]; then -+ if [ "$MOZ_JEMALLOC" -a ! "$MOZ_NATIVE_JEMALLOC" ]; then ++ if [ "$MOZ_JEMALLOC" -a -z "$MOZ_NATIVE_JEMALLOC" ]; then add_makefiles " memory/jemalloc/Makefile " diff --git configure.in configure.in -index cfcdbc0..ee9a299 100644 +index bb05782..2f32516 100644 --- configure.in +++ configure.in -@@ -3730,21 +3730,22 @@ fi +@@ -3711,21 +3711,22 @@ fi dnl Check for the existence of various allocation headers/functions @@ -62,7 +62,7 @@ dnl See if compiler supports some gcc-style attributes AC_CACHE_CHECK(for __attribute__((always_inline)), -@@ -6960,6 +6961,18 @@ else +@@ -6939,6 +6940,18 @@ else fi if test -z "$MOZ_MEMORY"; then @@ -81,7 +81,7 @@ case "${target}" in *-mingw*) if test -z "$WIN32_REDIST_DIR" -a -z "$MOZ_DEBUG"; then -@@ -7054,6 +7067,7 @@ else +@@ -7033,6 +7046,7 @@ else fi # MOZ_MEMORY AC_SUBST(MOZ_MEMORY) AC_SUBST(MOZ_JEMALLOC) @@ -89,7 +89,7 @@ AC_SUBST(MOZ_GLUE_LDFLAGS) AC_SUBST(MOZ_GLUE_PROGRAM_LDFLAGS) AC_SUBST(WIN32_CRT_LIBS) -@@ -8819,10 +8833,27 @@ fi +@@ -8820,10 +8834,22 @@ fi # Run jemalloc configure script @@ -99,63 +99,22 @@ - if test "$OS_ARCH" = "Linux"; then - MANGLE="malloc calloc valloc free realloc memalign posix_memalign malloc_usable_size" + case "$OS_ARCH" in -+ Linux) -+ MANGLE="malloc calloc valloc free realloc memalign posix_memalign malloc_usable_size" -+ ;; -+ DragonFly|NetBSD|OpenBSD) ++ Linux|DragonFly|FreeBSD|NetBSD|OpenBSD) + MANGLE="malloc calloc valloc free realloc posix_memalign" -+ ;; -+ FreeBSD) -+ # common -+ MANGLE="malloc calloc valloc free realloc posix_memalign malloc_usable_size" -+ # old jemalloc -+ MANGLE="$MANGLE reallocf _malloc_message _malloc_options" -+ # jemalloc 3.0.0 -+ MANGLE="$MANGLE aligned_alloc malloc_message malloc_conf" -+ MANGLE="$MANGLE malloc_stats_print mallctl mallctlnametomib mallctlbymib" -+ MANGLE="$MANGLE allocm rallocm sallocm dallocm nallocm" ++ case "$OS_ARCH" in ++ Linux) ++ MANGLE="$MANGLE memalign malloc_usable_size" ++ ;; ++ FreeBSD) ++ MANGLE="$MANGLE malloc_usable_size" ++ ;; ++ esac + ;; + esac + if test -n "$MANGLE"; then MANGLED= JEMALLOC_WRAPPER= if test -n "$_WRAP_MALLOC"; then -diff --git js/src/configure.in js/src/configure.in -index 846482c..4022506 100644 ---- js/src/configure.in -+++ js/src/configure.in -@@ -3094,21 +3094,22 @@ fi - - dnl Check for the existence of various allocation headers/functions - -+MALLOC_HEADERS="malloc.h malloc_np.h malloc/malloc.h sys/malloc.h" - MALLOC_H= --MOZ_CHECK_HEADER(malloc.h, [MALLOC_H=malloc.h]) --if test "$MALLOC_H" = ""; then -- MOZ_CHECK_HEADER(malloc/malloc.h, [MALLOC_H=malloc/malloc.h]) -- if test "$MALLOC_H" = ""; then -- MOZ_CHECK_HEADER(sys/malloc.h, [MALLOC_H=sys/malloc.h]) -+ -+for file in $MALLOC_HEADERS; do -+ MOZ_CHECK_HEADER($file, [MALLOC_H=$file]) -+ if test "$MALLOC_H" != ""; then -+ AC_DEFINE_UNQUOTED(MALLOC_H, <$MALLOC_H>) -+ break - fi --fi --if test "$MALLOC_H" != ""; then -- AC_DEFINE_UNQUOTED(MALLOC_H, <$MALLOC_H>) --fi -+done - - MOZ_ALLOCATING_FUNCS="strndup posix_memalign memalign valloc" - AC_CHECK_FUNCS(strndup posix_memalign memalign valloc) - -+AC_CHECK_FUNCS(malloc_usable_size) -+ - dnl See if compiler supports some gcc-style attributes - - AC_CACHE_CHECK(for __attribute__((always_inline)), diff --git memory/build/Makefile.in memory/build/Makefile.in index dca0f48..af93ee0 100644 --- memory/build/Makefile.in @@ -171,51 +130,57 @@ SHARED_LIBRARY_LIBS += $(call EXPAND_LIBNAME_PATH,jemalloc,$(DEPTH)/memory/mozjemalloc) endif diff --git memory/build/extraMallocFuncs.c memory/build/extraMallocFuncs.c -index 9d87629..76a2981 100644 +index 9d87629..03c8320 100644 --- memory/build/extraMallocFuncs.c +++ memory/build/extraMallocFuncs.c -@@ -94,7 +94,19 @@ wrap(wcsdup)(const wchar_t *src) +@@ -94,8 +94,16 @@ wrap(wcsdup)(const wchar_t *src) #endif #ifdef MOZ_JEMALLOC -+#if defined(MALLOC_H) && defined(MOZ_NATIVE_JEMALLOC) -+#include MALLOC_H -+#endif + -+#if defined(MOZ_NATIVE_JEMALLOC) || defined(__FreeBSD__) -+#define je_malloc_conf malloc_conf -+#define je_malloc_message malloc_message ++#undef wrap ++#if defined(MOZ_NATIVE_JEMALLOC) ++#define wrap(a) a ++#else ++#define wrap(a) je_ ## a +#endif + /* Override some jemalloc defaults */ -+#if defined(MOZ_NATIVE_JEMALLOC) -+MOZ_EXTERNAL_VIS -+#endif - const char *je_malloc_conf = "narenas:1,lg_chunk:20"; +-const char *je_malloc_conf = "narenas:1,lg_chunk:20"; ++MOZ_IMPORT_DATA(const char *) wrap(malloc_conf) = "narenas:1,lg_chunk:20"; #ifdef ANDROID + #include diff --git memory/build/mozjemalloc_compat.c memory/build/mozjemalloc_compat.c -index 10a845a..798c299 100644 +index 10a845a..94ad96e 100644 --- memory/build/mozjemalloc_compat.c +++ memory/build/mozjemalloc_compat.c -@@ -5,7 +5,17 @@ +@@ -5,14 +5,21 @@ #include "mozilla/Types.h" #include "jemalloc_types.h" -+#if defined(MALLOC_H) && defined(MOZ_NATIVE_JEMALLOC) -+#include MALLOC_H -+#endif -+ -+#if defined(MOZ_NATIVE_JEMALLOC) || defined(__FreeBSD__) -+#define je_mallctl mallctl -+#endif -+ -+#if !defined(MOZ_NATIVE_JEMALLOC) - extern int je_mallctl(const char*, void*, size_t*, void*, size_t); +-extern int je_mallctl(const char*, void*, size_t*, void*, size_t); ++#if defined(MOZ_NATIVE_JEMALLOC) ++#define wrap(a) a ++#else ++#define wrap(a) je_ ## a +#endif - MOZ_EXPORT_API (void) +-MOZ_EXPORT_API (void) ++extern MOZ_IMPORT_API(int) ++wrap(mallctl)(const char*, void*, size_t*, void*, size_t); ++ ++MOZ_EXPORT_API(void) jemalloc_stats(jemalloc_stats_t *stats) + { + size_t size = sizeof(stats->mapped); +- je_mallctl("stats.mapped", &stats->mapped, &size, NULL, 0); +- je_mallctl("stats.allocated", &stats->allocated, &size, NULL, 0); ++ wrap(mallctl)("stats.mapped", &stats->mapped, &size, NULL, 0); ++ wrap(mallctl)("stats.allocated", &stats->allocated, &size, NULL, 0); + stats->committed = -1; + stats->dirty = -1; + } diff --git memory/jemalloc/src/src/mutex.c memory/jemalloc/src/src/mutex.c index 37a843e..55e18c2 100644 --- memory/jemalloc/src/src/mutex.c @@ -262,23 +227,17 @@ #elif defined(XP_WIN) return _msize(ptr); diff --git memory/mozjemalloc/jemalloc.h memory/mozjemalloc/jemalloc.h -index f0e0878..e74fb4d 100644 +index f0e0878..2486e83 100644 --- memory/mozjemalloc/jemalloc.h +++ memory/mozjemalloc/jemalloc.h -@@ -32,23 +32,29 @@ - #ifndef _JEMALLOC_H_ - #define _JEMALLOC_H_ - --#if defined(MOZ_MEMORY_DARWIN) --#include -+#if defined(MALLOC_H) \ -+ && (defined(MOZ_NATIVE_JEMALLOC) || defined(MOZ_MEMORY_DARWIN)) -+#include MALLOC_H +@@ -37,22 +37,29 @@ #endif #include "jemalloc_types.h" -+#if defined(MOZ_NATIVE_JEMALLOC) || defined(__FreeBSD__) -+#define je_nallocm nallocm ++#if defined(MOZ_NATIVE_JEMALLOC) ++#define wrap(a) a ++#else ++#define wrap(a) je_ ## a +#endif + #ifdef __cplusplus @@ -293,13 +252,38 @@ void jemalloc_stats(jemalloc_stats_t *stats); /* Computes the usable size in advance. */ --#if !defined(MOZ_MEMORY_DARWIN) + #if !defined(MOZ_MEMORY_DARWIN) -#if defined(MOZ_MEMORY_LINUX) -+#if !defined(MOZ_NATIVE_JEMALLOC) && !defined(MOZ_MEMORY_DARWIN) +#if defined(MOZ_MEMORY_LINUX) || defined(MOZ_MEMORY_BSD) __attribute__((weak)) #endif #if defined(MOZ_JEMALLOC) +-int je_nallocm(size_t *rsize, size_t size, int flags); ++MOZ_IMPORT_API(int) wrap(nallocm)(size_t *rsize, size_t size, int flags); + #else + size_t je_malloc_good_size(size_t size); + #endif +@@ -62,11 +69,11 @@ static inline size_t je_malloc_usable_size_in_advance(size_t size) { + #if defined(MOZ_MEMORY_DARWIN) + return malloc_good_size(size); + #elif defined(MOZ_JEMALLOC) +- if (je_nallocm) { ++ if (wrap(nallocm)) { + size_t ret; + if (size == 0) + size = 1; +- if (!je_nallocm(&ret, size, 0)) ++ if (!wrap(nallocm)(&ret, size, 0)) + return ret; + } + return size; +@@ -113,4 +120,6 @@ void jemalloc_purge_freed_pages(); + } /* extern "C" */ + #endif + ++#undef wrap ++ + #endif /* _JEMALLOC_H_ */ diff --git mozglue/build/Makefile.in mozglue/build/Makefile.in index c333647..15ba505 100644 --- mozglue/build/Makefile.in Modified: trunk/www/firefox/files/patch-bug788955 ============================================================================== --- trunk/www/firefox/files/patch-bug788955 Mon Oct 1 10:34:07 2012 (r1050) +++ trunk/www/firefox/files/patch-bug788955 Tue Oct 2 07:39:39 2012 (r1051) @@ -14,7 +14,7 @@ endif ifndef MOZ_NATIVE_ZLIB diff --git allmakefiles.sh allmakefiles.sh -index 6a9be4b..544beff 100755 +index 6a9be4b..d2e49e3 100755 --- allmakefiles.sh +++ allmakefiles.sh @@ -59,7 +59,7 @@ if [ ! "$LIBXUL_SDK" ]; then @@ -22,7 +22,7 @@ mozglue/build/Makefile " - if [ "$MOZ_JEMALLOC" ]; then -+ if [ "$MOZ_JEMALLOC" -a ! "$MOZ_NATIVE_JEMALLOC" ]; then ++ if [ "$MOZ_JEMALLOC" -a -z "$MOZ_NATIVE_JEMALLOC" ]; then add_makefiles " memory/jemalloc/Makefile " @@ -37,10 +37,10 @@ MOZ_ENABLE_PROFILER_SPS = @MOZ_ENABLE_PROFILER_SPS@ MOZ_JPROF = @MOZ_JPROF@ diff --git configure.in configure.in -index cfcdbc0..ee9a299 100644 +index bb05782..2f32516 100644 --- configure.in +++ configure.in -@@ -3730,21 +3730,22 @@ fi +@@ -3711,21 +3711,22 @@ fi dnl Check for the existence of various allocation headers/functions @@ -72,7 +72,7 @@ dnl See if compiler supports some gcc-style attributes AC_CACHE_CHECK(for __attribute__((always_inline)), -@@ -6960,6 +6961,18 @@ else +@@ -6939,6 +6940,18 @@ else fi if test -z "$MOZ_MEMORY"; then @@ -91,7 +91,7 @@ case "${target}" in *-mingw*) if test -z "$WIN32_REDIST_DIR" -a -z "$MOZ_DEBUG"; then -@@ -7054,6 +7067,7 @@ else +@@ -7033,6 +7046,7 @@ else fi # MOZ_MEMORY AC_SUBST(MOZ_MEMORY) AC_SUBST(MOZ_JEMALLOC) @@ -99,7 +99,7 @@ AC_SUBST(MOZ_GLUE_LDFLAGS) AC_SUBST(MOZ_GLUE_PROGRAM_LDFLAGS) AC_SUBST(WIN32_CRT_LIBS) -@@ -8819,10 +8833,27 @@ fi +@@ -8820,10 +8834,22 @@ fi # Run jemalloc configure script @@ -109,63 +109,22 @@ - if test "$OS_ARCH" = "Linux"; then - MANGLE="malloc calloc valloc free realloc memalign posix_memalign malloc_usable_size" + case "$OS_ARCH" in -+ Linux) -+ MANGLE="malloc calloc valloc free realloc memalign posix_memalign malloc_usable_size" -+ ;; -+ DragonFly|NetBSD|OpenBSD) ++ Linux|DragonFly|FreeBSD|NetBSD|OpenBSD) + MANGLE="malloc calloc valloc free realloc posix_memalign" -+ ;; -+ FreeBSD) -+ # common -+ MANGLE="malloc calloc valloc free realloc posix_memalign malloc_usable_size" -+ # old jemalloc -+ MANGLE="$MANGLE reallocf _malloc_message _malloc_options" -+ # jemalloc 3.0.0 -+ MANGLE="$MANGLE aligned_alloc malloc_message malloc_conf" -+ MANGLE="$MANGLE malloc_stats_print mallctl mallctlnametomib mallctlbymib" -+ MANGLE="$MANGLE allocm rallocm sallocm dallocm nallocm" ++ case "$OS_ARCH" in ++ Linux) ++ MANGLE="$MANGLE memalign malloc_usable_size" ++ ;; ++ FreeBSD) ++ MANGLE="$MANGLE malloc_usable_size" ++ ;; ++ esac + ;; + esac + if test -n "$MANGLE"; then MANGLED= JEMALLOC_WRAPPER= if test -n "$_WRAP_MALLOC"; then -diff --git js/src/configure.in js/src/configure.in -index 846482c..4022506 100644 ---- js/src/configure.in -+++ js/src/configure.in -@@ -3094,21 +3094,22 @@ fi - - dnl Check for the existence of various allocation headers/functions - -+MALLOC_HEADERS="malloc.h malloc_np.h malloc/malloc.h sys/malloc.h" - MALLOC_H= --MOZ_CHECK_HEADER(malloc.h, [MALLOC_H=malloc.h]) --if test "$MALLOC_H" = ""; then -- MOZ_CHECK_HEADER(malloc/malloc.h, [MALLOC_H=malloc/malloc.h]) -- if test "$MALLOC_H" = ""; then -- MOZ_CHECK_HEADER(sys/malloc.h, [MALLOC_H=sys/malloc.h]) -+ -+for file in $MALLOC_HEADERS; do -+ MOZ_CHECK_HEADER($file, [MALLOC_H=$file]) -+ if test "$MALLOC_H" != ""; then -+ AC_DEFINE_UNQUOTED(MALLOC_H, <$MALLOC_H>) -+ break - fi --fi --if test "$MALLOC_H" != ""; then -- AC_DEFINE_UNQUOTED(MALLOC_H, <$MALLOC_H>) --fi -+done - - MOZ_ALLOCATING_FUNCS="strndup posix_memalign memalign valloc" - AC_CHECK_FUNCS(strndup posix_memalign memalign valloc) - -+AC_CHECK_FUNCS(malloc_usable_size) -+ - dnl See if compiler supports some gcc-style attributes - - AC_CACHE_CHECK(for __attribute__((always_inline)), diff --git memory/build/Makefile.in memory/build/Makefile.in index dca0f48..af93ee0 100644 --- memory/build/Makefile.in @@ -181,51 +140,57 @@ SHARED_LIBRARY_LIBS += $(call EXPAND_LIBNAME_PATH,jemalloc,$(DEPTH)/memory/mozjemalloc) endif diff --git memory/build/extraMallocFuncs.c memory/build/extraMallocFuncs.c -index 9d87629..76a2981 100644 +index 9d87629..03c8320 100644 --- memory/build/extraMallocFuncs.c +++ memory/build/extraMallocFuncs.c -@@ -94,7 +94,19 @@ wrap(wcsdup)(const wchar_t *src) +@@ -94,8 +94,16 @@ wrap(wcsdup)(const wchar_t *src) #endif #ifdef MOZ_JEMALLOC -+#if defined(MALLOC_H) && defined(MOZ_NATIVE_JEMALLOC) -+#include MALLOC_H -+#endif + -+#if defined(MOZ_NATIVE_JEMALLOC) || defined(__FreeBSD__) -+#define je_malloc_conf malloc_conf -+#define je_malloc_message malloc_message ++#undef wrap ++#if defined(MOZ_NATIVE_JEMALLOC) ++#define wrap(a) a ++#else ++#define wrap(a) je_ ## a +#endif + /* Override some jemalloc defaults */ -+#if defined(MOZ_NATIVE_JEMALLOC) -+MOZ_EXTERNAL_VIS -+#endif - const char *je_malloc_conf = "narenas:1,lg_chunk:20"; +-const char *je_malloc_conf = "narenas:1,lg_chunk:20"; ++MOZ_IMPORT_DATA(const char *) wrap(malloc_conf) = "narenas:1,lg_chunk:20"; #ifdef ANDROID + #include diff --git memory/build/mozjemalloc_compat.c memory/build/mozjemalloc_compat.c -index 10a845a..798c299 100644 +index 10a845a..94ad96e 100644 --- memory/build/mozjemalloc_compat.c +++ memory/build/mozjemalloc_compat.c -@@ -5,7 +5,17 @@ +@@ -5,14 +5,21 @@ #include "mozilla/Types.h" #include "jemalloc_types.h" -+#if defined(MALLOC_H) && defined(MOZ_NATIVE_JEMALLOC) -+#include MALLOC_H -+#endif -+ -+#if defined(MOZ_NATIVE_JEMALLOC) || defined(__FreeBSD__) -+#define je_mallctl mallctl -+#endif -+ -+#if !defined(MOZ_NATIVE_JEMALLOC) - extern int je_mallctl(const char*, void*, size_t*, void*, size_t); +-extern int je_mallctl(const char*, void*, size_t*, void*, size_t); ++#if defined(MOZ_NATIVE_JEMALLOC) ++#define wrap(a) a ++#else ++#define wrap(a) je_ ## a +#endif - MOZ_EXPORT_API (void) +-MOZ_EXPORT_API (void) ++extern MOZ_IMPORT_API(int) ++wrap(mallctl)(const char*, void*, size_t*, void*, size_t); ++ ++MOZ_EXPORT_API(void) jemalloc_stats(jemalloc_stats_t *stats) + { + size_t size = sizeof(stats->mapped); +- je_mallctl("stats.mapped", &stats->mapped, &size, NULL, 0); +- je_mallctl("stats.allocated", &stats->allocated, &size, NULL, 0); ++ wrap(mallctl)("stats.mapped", &stats->mapped, &size, NULL, 0); ++ wrap(mallctl)("stats.allocated", &stats->allocated, &size, NULL, 0); + stats->committed = -1; + stats->dirty = -1; + } diff --git memory/jemalloc/src/src/mutex.c memory/jemalloc/src/src/mutex.c index 37a843e..55e18c2 100644 --- memory/jemalloc/src/src/mutex.c @@ -272,23 +237,17 @@ #elif defined(XP_WIN) return _msize(ptr); diff --git memory/mozjemalloc/jemalloc.h memory/mozjemalloc/jemalloc.h -index f0e0878..e74fb4d 100644 +index f0e0878..2486e83 100644 --- memory/mozjemalloc/jemalloc.h +++ memory/mozjemalloc/jemalloc.h -@@ -32,23 +32,29 @@ - #ifndef _JEMALLOC_H_ - #define _JEMALLOC_H_ - --#if defined(MOZ_MEMORY_DARWIN) --#include -+#if defined(MALLOC_H) \ -+ && (defined(MOZ_NATIVE_JEMALLOC) || defined(MOZ_MEMORY_DARWIN)) -+#include MALLOC_H +@@ -37,22 +37,29 @@ #endif #include "jemalloc_types.h" -+#if defined(MOZ_NATIVE_JEMALLOC) || defined(__FreeBSD__) -+#define je_nallocm nallocm ++#if defined(MOZ_NATIVE_JEMALLOC) ++#define wrap(a) a ++#else ++#define wrap(a) je_ ## a +#endif + #ifdef __cplusplus @@ -303,13 +262,38 @@ void jemalloc_stats(jemalloc_stats_t *stats); /* Computes the usable size in advance. */ --#if !defined(MOZ_MEMORY_DARWIN) + #if !defined(MOZ_MEMORY_DARWIN) -#if defined(MOZ_MEMORY_LINUX) -+#if !defined(MOZ_NATIVE_JEMALLOC) && !defined(MOZ_MEMORY_DARWIN) +#if defined(MOZ_MEMORY_LINUX) || defined(MOZ_MEMORY_BSD) __attribute__((weak)) #endif #if defined(MOZ_JEMALLOC) +-int je_nallocm(size_t *rsize, size_t size, int flags); ++MOZ_IMPORT_API(int) wrap(nallocm)(size_t *rsize, size_t size, int flags); + #else + size_t je_malloc_good_size(size_t size); + #endif +@@ -62,11 +69,11 @@ static inline size_t je_malloc_usable_size_in_advance(size_t size) { + #if defined(MOZ_MEMORY_DARWIN) + return malloc_good_size(size); + #elif defined(MOZ_JEMALLOC) +- if (je_nallocm) { ++ if (wrap(nallocm)) { + size_t ret; + if (size == 0) + size = 1; +- if (!je_nallocm(&ret, size, 0)) ++ if (!wrap(nallocm)(&ret, size, 0)) + return ret; + } + return size; +@@ -113,4 +120,6 @@ void jemalloc_purge_freed_pages(); + } /* extern "C" */ + #endif + ++#undef wrap ++ + #endif /* _JEMALLOC_H_ */ diff --git mozglue/build/Makefile.in mozglue/build/Makefile.in index c333647..15ba505 100644 --- mozglue/build/Makefile.in Modified: trunk/www/seamonkey/files/patch-bug788955 ============================================================================== --- trunk/www/seamonkey/files/patch-bug788955 Mon Oct 1 10:34:07 2012 (r1050) +++ trunk/www/seamonkey/files/patch-bug788955 Tue Oct 2 07:39:39 2012 (r1051) @@ -14,7 +14,7 @@ endif ifndef MOZ_NATIVE_ZLIB diff --git allmakefiles.sh allmakefiles.sh -index 6a9be4b..544beff 100755 +index 6a9be4b..d2e49e3 100755 --- mozilla/allmakefiles.sh +++ mozilla/allmakefiles.sh @@ -59,7 +59,7 @@ if [ ! "$LIBXUL_SDK" ]; then @@ -22,7 +22,7 @@ mozglue/build/Makefile " - if [ "$MOZ_JEMALLOC" ]; then -+ if [ "$MOZ_JEMALLOC" -a ! "$MOZ_NATIVE_JEMALLOC" ]; then ++ if [ "$MOZ_JEMALLOC" -a -z "$MOZ_NATIVE_JEMALLOC" ]; then add_makefiles " memory/jemalloc/Makefile " @@ -37,10 +37,10 @@ MOZ_ENABLE_PROFILER_SPS = @MOZ_ENABLE_PROFILER_SPS@ MOZ_JPROF = @MOZ_JPROF@ diff --git configure.in configure.in -index cfcdbc0..ee9a299 100644 +index bb05782..2f32516 100644 --- mozilla/configure.in +++ mozilla/configure.in -@@ -3730,21 +3730,22 @@ fi +@@ -3711,21 +3711,22 @@ fi dnl Check for the existence of various allocation headers/functions @@ -72,7 +72,7 @@ dnl See if compiler supports some gcc-style attributes AC_CACHE_CHECK(for __attribute__((always_inline)), -@@ -6960,6 +6961,18 @@ else +@@ -6939,6 +6940,18 @@ else fi if test -z "$MOZ_MEMORY"; then @@ -91,7 +91,7 @@ case "${target}" in *-mingw*) if test -z "$WIN32_REDIST_DIR" -a -z "$MOZ_DEBUG"; then -@@ -7054,6 +7067,7 @@ else +@@ -7033,6 +7046,7 @@ else fi # MOZ_MEMORY AC_SUBST(MOZ_MEMORY) AC_SUBST(MOZ_JEMALLOC) @@ -99,7 +99,7 @@ AC_SUBST(MOZ_GLUE_LDFLAGS) AC_SUBST(MOZ_GLUE_PROGRAM_LDFLAGS) AC_SUBST(WIN32_CRT_LIBS) -@@ -8819,10 +8833,27 @@ fi +@@ -8820,10 +8834,22 @@ fi # Run jemalloc configure script @@ -109,63 +109,22 @@ - if test "$OS_ARCH" = "Linux"; then - MANGLE="malloc calloc valloc free realloc memalign posix_memalign malloc_usable_size" + case "$OS_ARCH" in -+ Linux) -+ MANGLE="malloc calloc valloc free realloc memalign posix_memalign malloc_usable_size" -+ ;; -+ DragonFly|NetBSD|OpenBSD) ++ Linux|DragonFly|FreeBSD|NetBSD|OpenBSD) + MANGLE="malloc calloc valloc free realloc posix_memalign" -+ ;; -+ FreeBSD) -+ # common -+ MANGLE="malloc calloc valloc free realloc posix_memalign malloc_usable_size" -+ # old jemalloc -+ MANGLE="$MANGLE reallocf _malloc_message _malloc_options" -+ # jemalloc 3.0.0 -+ MANGLE="$MANGLE aligned_alloc malloc_message malloc_conf" -+ MANGLE="$MANGLE malloc_stats_print mallctl mallctlnametomib mallctlbymib" -+ MANGLE="$MANGLE allocm rallocm sallocm dallocm nallocm" ++ case "$OS_ARCH" in ++ Linux) ++ MANGLE="$MANGLE memalign malloc_usable_size" ++ ;; ++ FreeBSD) ++ MANGLE="$MANGLE malloc_usable_size" ++ ;; ++ esac + ;; + esac + if test -n "$MANGLE"; then MANGLED= JEMALLOC_WRAPPER= if test -n "$_WRAP_MALLOC"; then -diff --git js/src/configure.in js/src/configure.in -index 846482c..4022506 100644 ---- mozilla/js/src/configure.in -+++ mozilla/js/src/configure.in -@@ -3094,21 +3094,22 @@ fi - - dnl Check for the existence of various allocation headers/functions - -+MALLOC_HEADERS="malloc.h malloc_np.h malloc/malloc.h sys/malloc.h" - MALLOC_H= --MOZ_CHECK_HEADER(malloc.h, [MALLOC_H=malloc.h]) --if test "$MALLOC_H" = ""; then -- MOZ_CHECK_HEADER(malloc/malloc.h, [MALLOC_H=malloc/malloc.h]) -- if test "$MALLOC_H" = ""; then -- MOZ_CHECK_HEADER(sys/malloc.h, [MALLOC_H=sys/malloc.h]) -+ -+for file in $MALLOC_HEADERS; do -+ MOZ_CHECK_HEADER($file, [MALLOC_H=$file]) -+ if test "$MALLOC_H" != ""; then -+ AC_DEFINE_UNQUOTED(MALLOC_H, <$MALLOC_H>) -+ break - fi --fi --if test "$MALLOC_H" != ""; then -- AC_DEFINE_UNQUOTED(MALLOC_H, <$MALLOC_H>) --fi -+done - - MOZ_ALLOCATING_FUNCS="strndup posix_memalign memalign valloc" - AC_CHECK_FUNCS(strndup posix_memalign memalign valloc) - -+AC_CHECK_FUNCS(malloc_usable_size) -+ - dnl See if compiler supports some gcc-style attributes - - AC_CACHE_CHECK(for __attribute__((always_inline)), diff --git memory/build/Makefile.in memory/build/Makefile.in index dca0f48..af93ee0 100644 --- mozilla/memory/build/Makefile.in @@ -181,51 +140,57 @@ SHARED_LIBRARY_LIBS += $(call EXPAND_LIBNAME_PATH,jemalloc,$(DEPTH)/memory/mozjemalloc) endif diff --git memory/build/extraMallocFuncs.c memory/build/extraMallocFuncs.c -index 9d87629..76a2981 100644 +index 9d87629..03c8320 100644 --- mozilla/memory/build/extraMallocFuncs.c +++ mozilla/memory/build/extraMallocFuncs.c -@@ -94,7 +94,19 @@ wrap(wcsdup)(const wchar_t *src) +@@ -94,8 +94,16 @@ wrap(wcsdup)(const wchar_t *src) #endif #ifdef MOZ_JEMALLOC -+#if defined(MALLOC_H) && defined(MOZ_NATIVE_JEMALLOC) -+#include MALLOC_H -+#endif + -+#if defined(MOZ_NATIVE_JEMALLOC) || defined(__FreeBSD__) -+#define je_malloc_conf malloc_conf -+#define je_malloc_message malloc_message ++#undef wrap ++#if defined(MOZ_NATIVE_JEMALLOC) ++#define wrap(a) a ++#else ++#define wrap(a) je_ ## a +#endif + /* Override some jemalloc defaults */ -+#if defined(MOZ_NATIVE_JEMALLOC) -+MOZ_EXTERNAL_VIS -+#endif - const char *je_malloc_conf = "narenas:1,lg_chunk:20"; +-const char *je_malloc_conf = "narenas:1,lg_chunk:20"; ++MOZ_IMPORT_DATA(const char *) wrap(malloc_conf) = "narenas:1,lg_chunk:20"; #ifdef ANDROID + #include diff --git memory/build/mozjemalloc_compat.c memory/build/mozjemalloc_compat.c -index 10a845a..798c299 100644 +index 10a845a..94ad96e 100644 --- mozilla/memory/build/mozjemalloc_compat.c +++ mozilla/memory/build/mozjemalloc_compat.c -@@ -5,7 +5,17 @@ +@@ -5,14 +5,21 @@ #include "mozilla/Types.h" #include "jemalloc_types.h" -+#if defined(MALLOC_H) && defined(MOZ_NATIVE_JEMALLOC) -+#include MALLOC_H -+#endif -+ -+#if defined(MOZ_NATIVE_JEMALLOC) || defined(__FreeBSD__) -+#define je_mallctl mallctl -+#endif -+ -+#if !defined(MOZ_NATIVE_JEMALLOC) - extern int je_mallctl(const char*, void*, size_t*, void*, size_t); +-extern int je_mallctl(const char*, void*, size_t*, void*, size_t); ++#if defined(MOZ_NATIVE_JEMALLOC) ++#define wrap(a) a ++#else ++#define wrap(a) je_ ## a +#endif - MOZ_EXPORT_API (void) +-MOZ_EXPORT_API (void) ++extern MOZ_IMPORT_API(int) ++wrap(mallctl)(const char*, void*, size_t*, void*, size_t); ++ ++MOZ_EXPORT_API(void) jemalloc_stats(jemalloc_stats_t *stats) + { + size_t size = sizeof(stats->mapped); +- je_mallctl("stats.mapped", &stats->mapped, &size, NULL, 0); +- je_mallctl("stats.allocated", &stats->allocated, &size, NULL, 0); ++ wrap(mallctl)("stats.mapped", &stats->mapped, &size, NULL, 0); ++ wrap(mallctl)("stats.allocated", &stats->allocated, &size, NULL, 0); + stats->committed = -1; + stats->dirty = -1; + } diff --git memory/jemalloc/src/src/mutex.c memory/jemalloc/src/src/mutex.c index 37a843e..55e18c2 100644 --- mozilla/memory/jemalloc/src/src/mutex.c @@ -272,23 +237,17 @@ #elif defined(XP_WIN) return _msize(ptr); diff --git memory/mozjemalloc/jemalloc.h memory/mozjemalloc/jemalloc.h -index f0e0878..e74fb4d 100644 +index f0e0878..2486e83 100644 --- mozilla/memory/mozjemalloc/jemalloc.h +++ mozilla/memory/mozjemalloc/jemalloc.h -@@ -32,23 +32,29 @@ - #ifndef _JEMALLOC_H_ - #define _JEMALLOC_H_ - --#if defined(MOZ_MEMORY_DARWIN) --#include -+#if defined(MALLOC_H) \ -+ && (defined(MOZ_NATIVE_JEMALLOC) || defined(MOZ_MEMORY_DARWIN)) -+#include MALLOC_H +@@ -37,22 +37,29 @@ #endif #include "jemalloc_types.h" -+#if defined(MOZ_NATIVE_JEMALLOC) || defined(__FreeBSD__) -+#define je_nallocm nallocm ++#if defined(MOZ_NATIVE_JEMALLOC) ++#define wrap(a) a ++#else ++#define wrap(a) je_ ## a +#endif + #ifdef __cplusplus @@ -303,13 +262,38 @@ void jemalloc_stats(jemalloc_stats_t *stats); /* Computes the usable size in advance. */ --#if !defined(MOZ_MEMORY_DARWIN) + #if !defined(MOZ_MEMORY_DARWIN) -#if defined(MOZ_MEMORY_LINUX) -+#if !defined(MOZ_NATIVE_JEMALLOC) && !defined(MOZ_MEMORY_DARWIN) +#if defined(MOZ_MEMORY_LINUX) || defined(MOZ_MEMORY_BSD) __attribute__((weak)) #endif #if defined(MOZ_JEMALLOC) +-int je_nallocm(size_t *rsize, size_t size, int flags); ++MOZ_IMPORT_API(int) wrap(nallocm)(size_t *rsize, size_t size, int flags); + #else + size_t je_malloc_good_size(size_t size); + #endif +@@ -62,11 +69,11 @@ static inline size_t je_malloc_usable_size_in_advance(size_t size) { + #if defined(MOZ_MEMORY_DARWIN) + return malloc_good_size(size); + #elif defined(MOZ_JEMALLOC) +- if (je_nallocm) { ++ if (wrap(nallocm)) { + size_t ret; + if (size == 0) + size = 1; +- if (!je_nallocm(&ret, size, 0)) ++ if (!wrap(nallocm)(&ret, size, 0)) + return ret; + } + return size; +@@ -113,4 +120,6 @@ void jemalloc_purge_freed_pages(); + } /* extern "C" */ + #endif + ++#undef wrap ++ + #endif /* _JEMALLOC_H_ */ diff --git mozglue/build/Makefile.in mozglue/build/Makefile.in index c333647..15ba505 100644 --- mozilla/mozglue/build/Makefile.in From owner-freebsd-gecko@FreeBSD.ORG Tue Oct 2 07:39:56 2012 Return-Path: Delivered-To: freebsd-gecko@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 68E0B106567C for ; Tue, 2 Oct 2012 07:39:56 +0000 (UTC) (envelope-from svn-freebsd-gecko@chruetertee.ch) Received: from trillian.chruetertee.ch (trillian.chruetertee.ch [217.150.245.56]) by mx1.freebsd.org (Postfix) with ESMTP id 09E7B8FC08 for ; Tue, 2 Oct 2012 07:39:55 +0000 (UTC) Received: from trillian.chruetertee.ch (trillian [217.150.245.56]) by trillian.chruetertee.ch (8.14.4/8.14.3) with ESMTP id q927dtWp000737 for ; Tue, 2 Oct 2012 07:39:55 GMT (envelope-from svn-freebsd-gecko@chruetertee.ch) Received: (from www@localhost) by trillian.chruetertee.ch (8.14.4/8.14.3/Submit) id q927doL6099383 for freebsd-gecko@freebsd.org; Tue, 2 Oct 2012 07:39:50 GMT (envelope-from svn-freebsd-gecko@chruetertee.ch) Date: Tue, 2 Oct 2012 07:39:50 GMT Message-Id: <201210020739.q927doL6099383@trillian.chruetertee.ch> X-Authentication-Warning: trillian.chruetertee.ch: www set sender to svn-freebsd-gecko@chruetertee.ch using -f From: svn-freebsd-gecko@chruetertee.ch To: freebsd-gecko@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Subject: [SVN-Commit] r1052 - in trunk: Mk mail/thunderbird/files www/firefox-nightly/files www/firefox/files www/seamonkey/files X-BeenThere: freebsd-gecko@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list Reply-To: freebsd-gecko@freebsd.org List-Id: Gecko Rendering Engine issues List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 02 Oct 2012 07:39:56 -0000 Author: jbeich Date: Tue Oct 2 07:39:49 2012 New Revision: 1052 Log: jemalloc doesn't work on 7.x, disable Reported by: flo Deleted: trunk/mail/thunderbird/files/patch-mozilla-configure.in trunk/www/firefox-nightly/files/patch-configure.in trunk/www/firefox/files/patch-configure.in trunk/www/seamonkey/files/patch-mozilla-configure.in Modified: trunk/Mk/bsd.gecko.mk Modified: trunk/Mk/bsd.gecko.mk ============================================================================== --- trunk/Mk/bsd.gecko.mk Tue Oct 2 07:39:39 2012 (r1051) +++ trunk/Mk/bsd.gecko.mk Tue Oct 2 07:39:49 2012 (r1052) @@ -551,6 +551,17 @@ LDFLAGS+= -Wl,-rpath,${PREFIX}/lib/${MOZ_RPATH} .endif +.if ${OSVERSION} > 1000011 +# use jemalloc 3.0.0 API in libc +MOZ_EXPORT+= MOZ_JEMALLOC=1 +.elif ${OSVERSION} > 800004 +MOZ_OPTIONS+= --enable-jemalloc +MOZ_EXPORT+= MOZ_JEMALLOC=1 +.elif ${OSVERSION} > 700101 +# has _pthread_mutex_init_calloc_cb but firefox crashes when jemalloc +# configured without --enable-debug +.endif + # Standard depends _ALL_DEPENDS= cairo dbm event ffi hunspell jpeg nspr nss png sqlite vpx zip Deleted: trunk/mail/thunderbird/files/patch-mozilla-configure.in ============================================================================== --- trunk/mail/thunderbird/files/patch-mozilla-configure.in Tue Oct 2 07:39:49 2012 (r1051) +++ /dev/null 00:00:00 1970 (deleted) @@ -1,35 +0,0 @@ ---- mozilla/configure.in~ -+++ mozilla/configure.in -@@ -6925,6 +6925,13 @@ MOZ_ARG_ENABLE_BOOL(jemalloc, - MOZ_MEMORY=1, - MOZ_MEMORY=) - -+MOZ_JEMALLOC=1 -+MOZ_NATIVE_JEMALLOC=1 -+AC_CHECK_FUNCS(mallctl nallocm,, -+ [MOZ_NATIVE_JEMALLOC= -+ MOZ_MEMORY=1 -+ break]) -+ - if test "$NS_TRACE_MALLOC"; then - MOZ_MEMORY= - fi -@@ -6961,18 +6968,12 @@ else - fi - - if test -z "$MOZ_MEMORY"; then -- if test -n "$MOZ_JEMALLOC"; then -- MOZ_NATIVE_JEMALLOC=1 -- AC_CHECK_FUNCS(mallctl nallocm,, -- [MOZ_NATIVE_JEMALLOC= -- break]) - if test -n "$MOZ_NATIVE_JEMALLOC"; then - MOZ_MEMORY=1 - AC_DEFINE(MOZ_MEMORY) - AC_DEFINE(MOZ_JEMALLOC) - AC_DEFINE(MOZ_NATIVE_JEMALLOC) - fi -- fi - case "${target}" in - *-mingw*) - if test -z "$WIN32_REDIST_DIR" -a -z "$MOZ_DEBUG"; then Deleted: trunk/www/firefox-nightly/files/patch-configure.in ============================================================================== --- trunk/www/firefox-nightly/files/patch-configure.in Tue Oct 2 07:39:49 2012 (r1051) +++ /dev/null 00:00:00 1970 (deleted) @@ -1,35 +0,0 @@ ---- configure.in~ -+++ configure.in -@@ -6925,6 +6925,13 @@ MOZ_ARG_ENABLE_BOOL(jemalloc, - MOZ_MEMORY=1, - MOZ_MEMORY=) - -+MOZ_JEMALLOC=1 -+MOZ_NATIVE_JEMALLOC=1 -+AC_CHECK_FUNCS(mallctl nallocm,, -+ [MOZ_NATIVE_JEMALLOC= -+ MOZ_MEMORY=1 -+ break]) -+ - if test "$NS_TRACE_MALLOC"; then - MOZ_MEMORY= - fi -@@ -6961,18 +6968,12 @@ else - fi - - if test -z "$MOZ_MEMORY"; then -- if test -n "$MOZ_JEMALLOC"; then -- MOZ_NATIVE_JEMALLOC=1 -- AC_CHECK_FUNCS(mallctl nallocm,, -- [MOZ_NATIVE_JEMALLOC= -- break]) - if test -n "$MOZ_NATIVE_JEMALLOC"; then - MOZ_MEMORY=1 - AC_DEFINE(MOZ_MEMORY) - AC_DEFINE(MOZ_JEMALLOC) - AC_DEFINE(MOZ_NATIVE_JEMALLOC) - fi -- fi - case "${target}" in - *-mingw*) - if test -z "$WIN32_REDIST_DIR" -a -z "$MOZ_DEBUG"; then Deleted: trunk/www/firefox/files/patch-configure.in ============================================================================== --- trunk/www/firefox/files/patch-configure.in Tue Oct 2 07:39:49 2012 (r1051) +++ /dev/null 00:00:00 1970 (deleted) @@ -1,35 +0,0 @@ ---- configure.in~ -+++ configure.in -@@ -6925,6 +6925,13 @@ MOZ_ARG_ENABLE_BOOL(jemalloc, - MOZ_MEMORY=1, - MOZ_MEMORY=) - -+MOZ_JEMALLOC=1 -+MOZ_NATIVE_JEMALLOC=1 -+AC_CHECK_FUNCS(mallctl nallocm,, -+ [MOZ_NATIVE_JEMALLOC= -+ MOZ_MEMORY=1 -+ break]) -+ - if test "$NS_TRACE_MALLOC"; then - MOZ_MEMORY= - fi -@@ -6961,18 +6968,12 @@ else - fi - - if test -z "$MOZ_MEMORY"; then -- if test -n "$MOZ_JEMALLOC"; then -- MOZ_NATIVE_JEMALLOC=1 -- AC_CHECK_FUNCS(mallctl nallocm,, -- [MOZ_NATIVE_JEMALLOC= -- break]) - if test -n "$MOZ_NATIVE_JEMALLOC"; then - MOZ_MEMORY=1 - AC_DEFINE(MOZ_MEMORY) - AC_DEFINE(MOZ_JEMALLOC) - AC_DEFINE(MOZ_NATIVE_JEMALLOC) - fi -- fi - case "${target}" in - *-mingw*) - if test -z "$WIN32_REDIST_DIR" -a -z "$MOZ_DEBUG"; then Deleted: trunk/www/seamonkey/files/patch-mozilla-configure.in ============================================================================== --- trunk/www/seamonkey/files/patch-mozilla-configure.in Tue Oct 2 07:39:49 2012 (r1051) +++ /dev/null 00:00:00 1970 (deleted) @@ -1,35 +0,0 @@ ---- mozilla/configure.in~ -+++ mozilla/configure.in -@@ -6925,6 +6925,13 @@ MOZ_ARG_ENABLE_BOOL(jemalloc, - MOZ_MEMORY=1, - MOZ_MEMORY=) - -+MOZ_JEMALLOC=1 -+MOZ_NATIVE_JEMALLOC=1 -+AC_CHECK_FUNCS(mallctl nallocm,, -+ [MOZ_NATIVE_JEMALLOC= -+ MOZ_MEMORY=1 -+ break]) -+ - if test "$NS_TRACE_MALLOC"; then - MOZ_MEMORY= - fi -@@ -6961,18 +6968,12 @@ else - fi - - if test -z "$MOZ_MEMORY"; then -- if test -n "$MOZ_JEMALLOC"; then -- MOZ_NATIVE_JEMALLOC=1 -- AC_CHECK_FUNCS(mallctl nallocm,, -- [MOZ_NATIVE_JEMALLOC= -- break]) - if test -n "$MOZ_NATIVE_JEMALLOC"; then - MOZ_MEMORY=1 - AC_DEFINE(MOZ_MEMORY) - AC_DEFINE(MOZ_JEMALLOC) - AC_DEFINE(MOZ_NATIVE_JEMALLOC) - fi -- fi - case "${target}" in - *-mingw*) - if test -z "$WIN32_REDIST_DIR" -a -z "$MOZ_DEBUG"; then From owner-freebsd-gecko@FreeBSD.ORG Tue Oct 2 08:44:07 2012 Return-Path: Delivered-To: freebsd-gecko@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id C2833106566C for ; Tue, 2 Oct 2012 08:44:07 +0000 (UTC) (envelope-from svn-freebsd-gecko@chruetertee.ch) Received: from trillian.chruetertee.ch (trillian.chruetertee.ch [217.150.245.56]) by mx1.freebsd.org (Postfix) with ESMTP id 46D778FC17 for ; Tue, 2 Oct 2012 08:44:06 +0000 (UTC) Received: from trillian.chruetertee.ch (trillian [217.150.245.56]) by trillian.chruetertee.ch (8.14.4/8.14.3) with ESMTP id q928i51u025463 for ; Tue, 2 Oct 2012 08:44:05 GMT (envelope-from svn-freebsd-gecko@chruetertee.ch) Received: (from www@localhost) by trillian.chruetertee.ch (8.14.4/8.14.3/Submit) id q928i0DY018737 for freebsd-gecko@freebsd.org; Tue, 2 Oct 2012 08:44:00 GMT (envelope-from svn-freebsd-gecko@chruetertee.ch) Date: Tue, 2 Oct 2012 08:44:00 GMT Message-Id: <201210020844.q928i0DY018737@trillian.chruetertee.ch> X-Authentication-Warning: trillian.chruetertee.ch: www set sender to svn-freebsd-gecko@chruetertee.ch using -f From: svn-freebsd-gecko@chruetertee.ch To: freebsd-gecko@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Subject: [SVN-Commit] r1053 - in trunk: mail/thunderbird www/firefox-nightly/files www/firefox/files www/seamonkey/files X-BeenThere: freebsd-gecko@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list Reply-To: freebsd-gecko@freebsd.org List-Id: Gecko Rendering Engine issues List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 02 Oct 2012 08:44:08 -0000 Author: jbeich Date: Tue Oct 2 08:44:00 2012 New Revision: 1053 Log: disable libcubeb by default on 7.x __FreeBSD_version defined via sydney_audio.h Added: trunk/mail/thunderbird/patch-mozilla-content-media-nsAudioStream.cpp trunk/www/firefox-nightly/files/patch-content-media-nsAudioStream.cpp trunk/www/firefox/files/patch-content-media-nsAudioStream.cpp trunk/www/seamonkey/files/patch-mozilla-content-media-nsAudioStream.cpp Added: trunk/mail/thunderbird/patch-mozilla-content-media-nsAudioStream.cpp ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ trunk/mail/thunderbird/patch-mozilla-content-media-nsAudioStream.cpp Tue Oct 2 08:44:00 2012 (r1053) @@ -0,0 +1,14 @@ +--- mozilla/content/media/nsAudioStream.cpp~ ++++ mozilla/content/media/nsAudioStream.cpp +@@ -298,7 +298,11 @@ static int PrefChanged(const char* aPref + gVolumeScale = NS_MAX(0, PR_strtod(utf8.get(), nsnull)); + } + } else if (strcmp(aPref, PREF_USE_CUBEB) == 0) { ++#if defined(__FreeBSD__) && __FreeBSD_version < 800097 ++ bool value = Preferences::GetBool(aPref, false); ++#else + bool value = Preferences::GetBool(aPref, true); ++#endif + mozilla::MutexAutoLock lock(*gAudioPrefsLock); + gUseCubeb = value; + } else if (strcmp(aPref, PREF_CUBEB_LATENCY) == 0) { Added: trunk/www/firefox-nightly/files/patch-content-media-nsAudioStream.cpp ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ trunk/www/firefox-nightly/files/patch-content-media-nsAudioStream.cpp Tue Oct 2 08:44:00 2012 (r1053) @@ -0,0 +1,11 @@ +--- content/media/nsAudioStream.cpp~ ++++ content/media/nsAudioStream.cpp +@@ -298,7 +298,7 @@ static int PrefChanged(const char* aPref, void* aClosure) + gVolumeScale = NS_MAX(0, PR_strtod(utf8.get(), nullptr)); + } + } else if (strcmp(aPref, PREF_USE_CUBEB) == 0) { +-#ifdef MOZ_WIDGET_GONK ++#if defined(MOZ_WIDGET_GONK) || defined(__FreeBSD__) && __FreeBSD_version < 800097 + bool value = Preferences::GetBool(aPref, false); + #else + bool value = Preferences::GetBool(aPref, true); Added: trunk/www/firefox/files/patch-content-media-nsAudioStream.cpp ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ trunk/www/firefox/files/patch-content-media-nsAudioStream.cpp Tue Oct 2 08:44:00 2012 (r1053) @@ -0,0 +1,14 @@ +--- content/media/nsAudioStream.cpp~ ++++ content/media/nsAudioStream.cpp +@@ -298,7 +298,11 @@ static int PrefChanged(const char* aPref + gVolumeScale = NS_MAX(0, PR_strtod(utf8.get(), nsnull)); + } + } else if (strcmp(aPref, PREF_USE_CUBEB) == 0) { ++#if defined(__FreeBSD__) && __FreeBSD_version < 800097 ++ bool value = Preferences::GetBool(aPref, false); ++#else + bool value = Preferences::GetBool(aPref, true); ++#endif + mozilla::MutexAutoLock lock(*gAudioPrefsLock); + gUseCubeb = value; + } else if (strcmp(aPref, PREF_CUBEB_LATENCY) == 0) { Added: trunk/www/seamonkey/files/patch-mozilla-content-media-nsAudioStream.cpp ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ trunk/www/seamonkey/files/patch-mozilla-content-media-nsAudioStream.cpp Tue Oct 2 08:44:00 2012 (r1053) @@ -0,0 +1,14 @@ +--- mozilla/content/media/nsAudioStream.cpp~ ++++ mozilla/content/media/nsAudioStream.cpp +@@ -298,7 +298,11 @@ static int PrefChanged(const char* aPref + gVolumeScale = NS_MAX(0, PR_strtod(utf8.get(), nsnull)); + } + } else if (strcmp(aPref, PREF_USE_CUBEB) == 0) { ++#if defined(__FreeBSD__) && __FreeBSD_version < 800097 ++ bool value = Preferences::GetBool(aPref, false); ++#else + bool value = Preferences::GetBool(aPref, true); ++#endif + mozilla::MutexAutoLock lock(*gAudioPrefsLock); + gUseCubeb = value; + } else if (strcmp(aPref, PREF_CUBEB_LATENCY) == 0) { From owner-freebsd-gecko@FreeBSD.ORG Tue Oct 2 08:44:18 2012 Return-Path: Delivered-To: freebsd-gecko@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id F23B21065673 for ; Tue, 2 Oct 2012 08:44:17 +0000 (UTC) (envelope-from svn-freebsd-gecko@chruetertee.ch) Received: from trillian.chruetertee.ch (trillian.chruetertee.ch [217.150.245.56]) by mx1.freebsd.org (Postfix) with ESMTP id 9401F8FC1B for ; Tue, 2 Oct 2012 08:44:17 +0000 (UTC) Received: from trillian.chruetertee.ch (trillian [217.150.245.56]) by trillian.chruetertee.ch (8.14.4/8.14.3) with ESMTP id q928iG0J030633 for ; Tue, 2 Oct 2012 08:44:16 GMT (envelope-from svn-freebsd-gecko@chruetertee.ch) Received: (from www@localhost) by trillian.chruetertee.ch (8.14.4/8.14.3/Submit) id q928iBjQ028975 for freebsd-gecko@freebsd.org; Tue, 2 Oct 2012 08:44:11 GMT (envelope-from svn-freebsd-gecko@chruetertee.ch) Date: Tue, 2 Oct 2012 08:44:11 GMT Message-Id: <201210020844.q928iBjQ028975@trillian.chruetertee.ch> X-Authentication-Warning: trillian.chruetertee.ch: www set sender to svn-freebsd-gecko@chruetertee.ch using -f From: svn-freebsd-gecko@chruetertee.ch To: freebsd-gecko@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Subject: [SVN-Commit] r1054 - in trunk: mail/thunderbird-esr/files mail/thunderbird/files www/firefox-esr/files www/firefox-nightly/files www/firefox/files www/libxul/files www/seamonkey/files X-BeenThere: freebsd-gecko@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list Reply-To: freebsd-gecko@freebsd.org List-Id: Gecko Rendering Engine issues List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 02 Oct 2012 08:44:18 -0000 Author: jbeich Date: Tue Oct 2 08:44:11 2012 New Revision: 1054 Log: don't implicitly #define __FreeBSD_version 0 Modified: trunk/mail/thunderbird-esr/files/patch-bug543241 trunk/mail/thunderbird/files/patch-bug543241 trunk/www/firefox-esr/files/patch-bug543241 trunk/www/firefox-nightly/files/patch-bug543241 trunk/www/firefox/files/patch-bug543241 trunk/www/libxul/files/patch-bug543241 trunk/www/seamonkey/files/patch-bug543241 Modified: trunk/mail/thunderbird-esr/files/patch-bug543241 ============================================================================== --- trunk/mail/thunderbird-esr/files/patch-bug543241 Tue Oct 2 08:44:00 2012 (r1053) +++ trunk/mail/thunderbird-esr/files/patch-bug543241 Tue Oct 2 08:44:11 2012 (r1054) @@ -1,5 +1,16 @@ --- ./mozilla/xpcom/threads/nsThreadManager.cpp.orig 2011-08-25 02:37:45.000000000 +0200 +++ ./mozilla/xpcom/threads/nsThreadManager.cpp 2011-08-28 17:14:14.000000000 +0200 +@@ -12,6 +12,10 @@ + #include "nsAutoPtr.h" + #include "nsCycleCollectorUtils.h" + ++#if defined(__FreeBSD__) ++#include ++#endif ++ + using namespace mozilla; + + #ifdef XP_WIN @@ -89,6 +89,11 @@ nsresult nsThreadManager::Init() Modified: trunk/mail/thunderbird/files/patch-bug543241 ============================================================================== --- trunk/mail/thunderbird/files/patch-bug543241 Tue Oct 2 08:44:00 2012 (r1053) +++ trunk/mail/thunderbird/files/patch-bug543241 Tue Oct 2 08:44:11 2012 (r1054) @@ -1,5 +1,16 @@ --- ./mozilla/xpcom/threads/nsThreadManager.cpp.orig 2011-08-25 02:37:45.000000000 +0200 +++ ./mozilla/xpcom/threads/nsThreadManager.cpp 2011-08-28 17:14:14.000000000 +0200 +@@ -12,6 +12,10 @@ + #include "nsAutoPtr.h" + #include "nsCycleCollectorUtils.h" + ++#if defined(__FreeBSD__) ++#include ++#endif ++ + using namespace mozilla; + + #ifdef XP_WIN @@ -57,6 +57,11 @@ nsresult nsThreadManager::Init() Modified: trunk/www/firefox-esr/files/patch-bug543241 ============================================================================== --- trunk/www/firefox-esr/files/patch-bug543241 Tue Oct 2 08:44:00 2012 (r1053) +++ trunk/www/firefox-esr/files/patch-bug543241 Tue Oct 2 08:44:11 2012 (r1054) @@ -1,5 +1,16 @@ --- ./xpcom/threads/nsThreadManager.cpp.orig 2011-08-25 02:37:45.000000000 +0200 +++ ./xpcom/threads/nsThreadManager.cpp 2011-08-28 17:14:14.000000000 +0200 +@@ -12,6 +12,10 @@ + #include "nsAutoPtr.h" + #include "nsCycleCollectorUtils.h" + ++#if defined(__FreeBSD__) ++#include ++#endif ++ + using namespace mozilla; + + #ifdef XP_WIN @@ -89,6 +89,11 @@ nsresult nsThreadManager::Init() Modified: trunk/www/firefox-nightly/files/patch-bug543241 ============================================================================== --- trunk/www/firefox-nightly/files/patch-bug543241 Tue Oct 2 08:44:00 2012 (r1053) +++ trunk/www/firefox-nightly/files/patch-bug543241 Tue Oct 2 08:44:11 2012 (r1054) @@ -1,5 +1,16 @@ --- ./xpcom/threads/nsThreadManager.cpp.orig 2011-08-25 02:37:45.000000000 +0200 +++ ./xpcom/threads/nsThreadManager.cpp 2011-08-28 17:14:14.000000000 +0200 +@@ -12,6 +12,10 @@ + #include "nsAutoPtr.h" + #include "nsCycleCollectorUtils.h" + ++#if defined(__FreeBSD__) ++#include ++#endif ++ + using namespace mozilla; + + #ifdef XP_WIN @@ -57,6 +57,11 @@ nsresult nsThreadManager::Init() Modified: trunk/www/firefox/files/patch-bug543241 ============================================================================== --- trunk/www/firefox/files/patch-bug543241 Tue Oct 2 08:44:00 2012 (r1053) +++ trunk/www/firefox/files/patch-bug543241 Tue Oct 2 08:44:11 2012 (r1054) @@ -1,5 +1,16 @@ --- ./xpcom/threads/nsThreadManager.cpp.orig 2011-08-25 02:37:45.000000000 +0200 +++ ./xpcom/threads/nsThreadManager.cpp 2011-08-28 17:14:14.000000000 +0200 +@@ -12,6 +12,10 @@ + #include "nsAutoPtr.h" + #include "nsCycleCollectorUtils.h" + ++#if defined(__FreeBSD__) ++#include ++#endif ++ + using namespace mozilla; + + #ifdef XP_WIN @@ -57,6 +57,11 @@ nsresult nsThreadManager::Init() Modified: trunk/www/libxul/files/patch-bug543241 ============================================================================== --- trunk/www/libxul/files/patch-bug543241 Tue Oct 2 08:44:00 2012 (r1053) +++ trunk/www/libxul/files/patch-bug543241 Tue Oct 2 08:44:11 2012 (r1054) @@ -1,5 +1,16 @@ --- ./xpcom/threads/nsThreadManager.cpp.orig 2011-08-25 02:37:45.000000000 +0200 +++ ./xpcom/threads/nsThreadManager.cpp 2011-08-28 17:14:14.000000000 +0200 +@@ -12,6 +12,10 @@ + #include "nsAutoPtr.h" + #include "nsCycleCollectorUtils.h" + ++#if defined(__FreeBSD__) ++#include ++#endif ++ + using namespace mozilla; + + #ifdef XP_WIN @@ -89,6 +89,11 @@ nsresult nsThreadManager::Init() Modified: trunk/www/seamonkey/files/patch-bug543241 ============================================================================== --- trunk/www/seamonkey/files/patch-bug543241 Tue Oct 2 08:44:00 2012 (r1053) +++ trunk/www/seamonkey/files/patch-bug543241 Tue Oct 2 08:44:11 2012 (r1054) @@ -1,5 +1,16 @@ --- ./mozilla/xpcom/threads/nsThreadManager.cpp.orig 2011-08-25 02:37:45.000000000 +0200 +++ ./mozilla/xpcom/threads/nsThreadManager.cpp 2011-08-28 17:14:14.000000000 +0200 +@@ -12,6 +12,10 @@ + #include "nsAutoPtr.h" + #include "nsCycleCollectorUtils.h" + ++#if defined(__FreeBSD__) ++#include ++#endif ++ + using namespace mozilla; + + #ifdef XP_WIN @@ -57,6 +57,11 @@ nsresult nsThreadManager::Init() From owner-freebsd-gecko@FreeBSD.ORG Tue Oct 2 11:03:27 2012 Return-Path: Delivered-To: freebsd-gecko@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id C5B08106564A for ; Tue, 2 Oct 2012 11:03:27 +0000 (UTC) (envelope-from svn-freebsd-gecko@chruetertee.ch) Received: from trillian.chruetertee.ch (trillian.chruetertee.ch [217.150.245.56]) by mx1.freebsd.org (Postfix) with ESMTP id 501C78FC0C for ; Tue, 2 Oct 2012 11:03:26 +0000 (UTC) Received: from trillian.chruetertee.ch (trillian [217.150.245.56]) by trillian.chruetertee.ch (8.14.4/8.14.3) with ESMTP id q92B3KIs082594 for ; Tue, 2 Oct 2012 11:03:20 GMT (envelope-from svn-freebsd-gecko@chruetertee.ch) Received: (from www@localhost) by trillian.chruetertee.ch (8.14.4/8.14.3/Submit) id q92B3Dh7082108 for freebsd-gecko@freebsd.org; Tue, 2 Oct 2012 11:03:13 GMT (envelope-from svn-freebsd-gecko@chruetertee.ch) Date: Tue, 2 Oct 2012 11:03:13 GMT Message-Id: <201210021103.q92B3Dh7082108@trillian.chruetertee.ch> X-Authentication-Warning: trillian.chruetertee.ch: www set sender to svn-freebsd-gecko@chruetertee.ch using -f From: svn-freebsd-gecko@chruetertee.ch To: freebsd-gecko@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Subject: [SVN-Commit] r1055 - trunk/Mk X-BeenThere: freebsd-gecko@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list Reply-To: freebsd-gecko@freebsd.org List-Id: Gecko Rendering Engine issues List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 02 Oct 2012 11:03:28 -0000 Author: jbeich Date: Tue Oct 2 11:03:13 2012 New Revision: 1055 Log: mozilla's fork of jemalloc doesn't work on FreeBSD, disable after r1052 Modified: trunk/Mk/bsd.gecko.mk Modified: trunk/Mk/bsd.gecko.mk ============================================================================== --- trunk/Mk/bsd.gecko.mk Tue Oct 2 08:44:11 2012 (r1054) +++ trunk/Mk/bsd.gecko.mk Tue Oct 2 11:03:13 2012 (r1055) @@ -551,6 +551,7 @@ LDFLAGS+= -Wl,-rpath,${PREFIX}/lib/${MOZ_RPATH} .endif +.if ${MOZILLA_VER:R:R} >= 16 || exists(${.CURDIR}/files/patch-bug788955) .if ${OSVERSION} > 1000011 # use jemalloc 3.0.0 API in libc MOZ_EXPORT+= MOZ_JEMALLOC=1 @@ -561,6 +562,7 @@ # has _pthread_mutex_init_calloc_cb but firefox crashes when jemalloc # configured without --enable-debug .endif +.endif # Standard depends _ALL_DEPENDS= cairo dbm event ffi hunspell jpeg nspr nss png sqlite vpx zip From owner-freebsd-gecko@FreeBSD.ORG Tue Oct 2 11:10:47 2012 Return-Path: Delivered-To: freebsd-gecko@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 7E44F106566B for ; Tue, 2 Oct 2012 11:10:47 +0000 (UTC) (envelope-from svn-freebsd-gecko@chruetertee.ch) Received: from trillian.chruetertee.ch (trillian.chruetertee.ch [217.150.245.56]) by mx1.freebsd.org (Postfix) with ESMTP id 0D1678FC17 for ; Tue, 2 Oct 2012 11:10:45 +0000 (UTC) Received: from trillian.chruetertee.ch (trillian [217.150.245.56]) by trillian.chruetertee.ch (8.14.4/8.14.3) with ESMTP id q92BAj4e099887 for ; Tue, 2 Oct 2012 11:10:45 GMT (envelope-from svn-freebsd-gecko@chruetertee.ch) Received: (from www@localhost) by trillian.chruetertee.ch (8.14.4/8.14.3/Submit) id q92BAe51099388 for freebsd-gecko@freebsd.org; Tue, 2 Oct 2012 11:10:40 GMT (envelope-from svn-freebsd-gecko@chruetertee.ch) Date: Tue, 2 Oct 2012 11:10:40 GMT Message-Id: <201210021110.q92BAe51099388@trillian.chruetertee.ch> X-Authentication-Warning: trillian.chruetertee.ch: www set sender to svn-freebsd-gecko@chruetertee.ch using -f From: svn-freebsd-gecko@chruetertee.ch To: freebsd-gecko@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Subject: [SVN-Commit] r1056 - in trunk/mail/thunderbird: . files X-BeenThere: freebsd-gecko@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list Reply-To: freebsd-gecko@freebsd.org List-Id: Gecko Rendering Engine issues List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 02 Oct 2012 11:10:47 -0000 Author: jbeich Date: Tue Oct 2 11:10:39 2012 New Revision: 1056 Log: move the patch where it belongs Added: trunk/mail/thunderbird/files/patch-mozilla-content-media-nsAudioStream.cpp - copied, changed from r1055, trunk/mail/thunderbird/patch-mozilla-content-media-nsAudioStream.cpp Deleted: trunk/mail/thunderbird/patch-mozilla-content-media-nsAudioStream.cpp Copied and modified: trunk/mail/thunderbird/files/patch-mozilla-content-media-nsAudioStream.cpp (from r1055, trunk/mail/thunderbird/patch-mozilla-content-media-nsAudioStream.cpp) ============================================================================== Deleted: trunk/mail/thunderbird/patch-mozilla-content-media-nsAudioStream.cpp ============================================================================== --- trunk/mail/thunderbird/patch-mozilla-content-media-nsAudioStream.cpp Tue Oct 2 11:10:39 2012 (r1055) +++ /dev/null 00:00:00 1970 (deleted) @@ -1,14 +0,0 @@ ---- mozilla/content/media/nsAudioStream.cpp~ -+++ mozilla/content/media/nsAudioStream.cpp -@@ -298,7 +298,11 @@ static int PrefChanged(const char* aPref - gVolumeScale = NS_MAX(0, PR_strtod(utf8.get(), nsnull)); - } - } else if (strcmp(aPref, PREF_USE_CUBEB) == 0) { -+#if defined(__FreeBSD__) && __FreeBSD_version < 800097 -+ bool value = Preferences::GetBool(aPref, false); -+#else - bool value = Preferences::GetBool(aPref, true); -+#endif - mozilla::MutexAutoLock lock(*gAudioPrefsLock); - gUseCubeb = value; - } else if (strcmp(aPref, PREF_CUBEB_LATENCY) == 0) { From owner-freebsd-gecko@FreeBSD.ORG Tue Oct 2 13:48:54 2012 Return-Path: Delivered-To: freebsd-gecko@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 064F7106566C for ; Tue, 2 Oct 2012 13:48:54 +0000 (UTC) (envelope-from andy@neu.net) Received: from mail.neu.net (unknown [IPv6:2607:fc50:0:d300:216:3eff:fe54:f1c6]) by mx1.freebsd.org (Postfix) with ESMTP id BE25B8FC08 for ; Tue, 2 Oct 2012 13:48:53 +0000 (UTC) Received: from neu.net (neu.net [199.48.129.194]) by mail.neu.net (8.14.5/8.14.5) with ESMTP id q92DmlZc027733 for ; Tue, 2 Oct 2012 09:48:47 -0400 (EDT) (envelope-from andy@neu.net) Date: Tue, 2 Oct 2012 09:48:47 -0400 (EDT) From: AN To: freebsd-gecko@freebsd.org In-Reply-To: <201210020844.q928iBjQ028975@trillian.chruetertee.ch> Message-ID: References: <201210020844.q928iBjQ028975@trillian.chruetertee.ch> User-Agent: Alpine 2.00 (BSF 1167 2008-08-23) MIME-Version: 1.0 Content-Type: TEXT/PLAIN; format=flowed; charset=US-ASCII X-Virus-Scanned: clamav-milter 0.97.6 at my.mail.server X-Virus-Status: Clean X-Spam-Status: No, score=0.0 required=4.5 tests=RP_MATCHES_RCVD autolearn=unavailable version=3.3.2 X-Spam-Checker-Version: SpamAssassin 3.3.2 (2011-06-06) on mail.neu.net Subject: NSPR - version >= 4.9.3... no X-BeenThere: freebsd-gecko@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Gecko Rendering Engine issues List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 02 Oct 2012 13:48:54 -0000 FreeBSD FBSD10 10.0-CURRENT FreeBSD 10.0-CURRENT #22 r241078: Sun Sep 30 20:06:38 EDT 2012 root@FBSD10:/usr/obj/usr/src/sys/MYKERNEL amd64 # svn up Updating '.': D files/patch-configure.in A files/patch-content-media-nsAudioStream.cpp U files/patch-bug788955 U files/patch-bug543241 Updated to revision 1056. <...> checking for nspr-config... /usr/local/bin/nspr-config checking for NSPR - version >= 4.9.3... no configure: error: your don't have NSPR installed or your version is too old ===> Script "../configure" failed unexpectedly. Bug 795987: Upgrade NSPR to NSPR_4_9_3_BETA1 https://hg.mozilla.org/mozilla-central/rev/a032bf27fa05 Bug 795972: Upgrade NSS to NSS_3_14_BETA1 https://hg.mozilla.org/mozilla-central/rev/699db88b5ea0 From owner-freebsd-gecko@FreeBSD.ORG Tue Oct 2 14:49:37 2012 Return-Path: Delivered-To: freebsd-gecko@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id D3667106566B for ; Tue, 2 Oct 2012 14:49:37 +0000 (UTC) (envelope-from jbeich@tormail.org) Received: from outgoing.tormail.org (outgoing.tormail.org [82.221.96.22]) by mx1.freebsd.org (Postfix) with ESMTP id 6F44D8FC0A for ; Tue, 2 Oct 2012 14:49:37 +0000 (UTC) Received: from localhost ([127.0.0.1] helo=internal.tormail.org) by outgoing.tormail.org with esmtp (Exim 4.72) (envelope-from ) id 1TJ3ms-0001V6-SZ; Tue, 02 Oct 2012 18:49:33 +0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=tormail.org; s=tm; h=Message-Id:X-TorMail-User:Content-Type:MIME-Version:References:Date:In-Reply-To:Subject:Cc:To:From; bh=LSj6fbdtBbprhbUQRzmdhEmfLhN8Qf5zEFd3HW6usKc=; b=v629ryPgyRT8f63P/Nz+qHuu0tbL2DfpsXoJBQpbe4RUeFI1zKhwVWjCxXIoNPGcRFVRAteAISKabRSZGA1uKW95RUW1PFyqbARDpDocAHacTAuo7pIu0IVhsBtcLQbER+CFmk+Jzf6jW8qLtLD2AjbwIwbTrvgSxEqju9CGjCI=; Received: from jbeich by internal.tormail.org with local (Exim 4.63) (envelope-from ) id 1TJ3lM-000LSZ-6y; Tue, 02 Oct 2012 14:47:58 +0000 From: Jan Beich To: AN In-Reply-To: (AN's message of "Tue, 2 Oct 2012 09:48:47 -0400 (EDT)") Date: Wed, 03 Oct 2012 01:47:57 +1100 References: <201210020844.q928iBjQ028975@trillian.chruetertee.ch> MIME-Version: 1.0 Content-Type: text/plain X-TorMail-User: jbeich Message-Id: <1TJ3lM-000LSZ-6y@internal.tormail.org> Cc: freebsd-gecko@freebsd.org Subject: Re: NSPR - version >= 4.9.3... no X-BeenThere: freebsd-gecko@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Gecko Rendering Engine issues List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 02 Oct 2012 14:49:37 -0000 AN writes: > checking for nspr-config... /usr/local/bin/nspr-config > checking for NSPR - version >= 4.9.3... no > configure: error: your don't have NSPR installed or your version is > too old > ===> Script "../configure" failed unexpectedly. 108704:4a7836f11aa7 (supported) builds fine. If you want newer either # misses a lot of patches in nspr/nss ports USE_MOZILLA += -nspr -nss -dbm or generate distfiles for and update dependencies $ cd /path/to/mozilla-central $ tar czf /usr/ports/distfiles/nspr-4.9.3.tar.gz -s,\^,nspr-4.9.3/mozilla/, nsprpub $ tar czf /usr/ports/distfiles/nss-3.14.tar.gz -s,\^,nss-3.14/mozilla/, security/nss security/coreconf security/dbm dbm or lower version requirements (may not work) # add to post-patch target @${REINPLACE_CMD} '/AM_PATH/{ s/4\.9\.3/4.9.2/; s/3\.14/3.13.6/; }' \ ${WRKSRC}/configure.in I'd probably just wait a week (or two) to see what Mozilla does. From owner-freebsd-gecko@FreeBSD.ORG Tue Oct 2 18:28:32 2012 Return-Path: Delivered-To: freebsd-gecko@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 9723A1065670 for ; Tue, 2 Oct 2012 18:28:32 +0000 (UTC) (envelope-from svn-freebsd-gecko@chruetertee.ch) Received: from trillian.chruetertee.ch (trillian.chruetertee.ch [217.150.245.56]) by mx1.freebsd.org (Postfix) with ESMTP id 26D988FC0A for ; Tue, 2 Oct 2012 18:28:31 +0000 (UTC) Received: from trillian.chruetertee.ch (trillian [217.150.245.56]) by trillian.chruetertee.ch (8.14.4/8.14.3) with ESMTP id q92ISUYQ056146 for ; Tue, 2 Oct 2012 18:28:30 GMT (envelope-from svn-freebsd-gecko@chruetertee.ch) Received: (from www@localhost) by trillian.chruetertee.ch (8.14.4/8.14.3/Submit) id q92ISOHc056074 for freebsd-gecko@freebsd.org; Tue, 2 Oct 2012 18:28:24 GMT (envelope-from svn-freebsd-gecko@chruetertee.ch) Date: Tue, 2 Oct 2012 18:28:24 GMT Message-Id: <201210021828.q92ISOHc056074@trillian.chruetertee.ch> X-Authentication-Warning: trillian.chruetertee.ch: www set sender to svn-freebsd-gecko@chruetertee.ch using -f From: svn-freebsd-gecko@chruetertee.ch To: freebsd-gecko@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Subject: [SVN-Commit] r1057 - trunk/Mk X-BeenThere: freebsd-gecko@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list Reply-To: freebsd-gecko@freebsd.org List-Id: Gecko Rendering Engine issues List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 02 Oct 2012 18:28:32 -0000 Author: jbeich Date: Tue Oct 2 18:28:24 2012 New Revision: 1057 Log: force conflict if incompatible libxul version is installed Modified: trunk/Mk/bsd.gecko.mk Modified: trunk/Mk/bsd.gecko.mk ============================================================================== --- trunk/Mk/bsd.gecko.mk Tue Oct 2 11:10:39 2012 (r1056) +++ trunk/Mk/bsd.gecko.mk Tue Oct 2 18:28:24 2012 (r1057) @@ -79,8 +79,8 @@ _GECKO_ALL= libxul libxul19 -libxul_PLIST= ${LOCALBASE}/lib/libxul/libxul.so -libxul19_PLIST= ${LOCALBASE}/lib/libxul/libxul.so +libxul_PLIST= libxul>=10 +libxul19_PLIST= libxul=1.9.2.28_1 # keep in sync with www/libxul19 .for gecko in ${_GECKO_ALL} ${gecko}_PORTSDIR?= www From owner-freebsd-gecko@FreeBSD.ORG Tue Oct 2 18:33:11 2012 Return-Path: Delivered-To: freebsd-gecko@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 96BF51065670 for ; Tue, 2 Oct 2012 18:33:11 +0000 (UTC) (envelope-from svn-freebsd-gecko@chruetertee.ch) Received: from trillian.chruetertee.ch (trillian.chruetertee.ch [217.150.245.56]) by mx1.freebsd.org (Postfix) with ESMTP id 1E18B8FC14 for ; Tue, 2 Oct 2012 18:33:10 +0000 (UTC) Received: from trillian.chruetertee.ch (trillian [217.150.245.56]) by trillian.chruetertee.ch (8.14.4/8.14.3) with ESMTP id q92IX9Ph082229 for ; Tue, 2 Oct 2012 18:33:09 GMT (envelope-from svn-freebsd-gecko@chruetertee.ch) Received: (from www@localhost) by trillian.chruetertee.ch (8.14.4/8.14.3/Submit) id q92IX4EC081961 for freebsd-gecko@freebsd.org; Tue, 2 Oct 2012 18:33:04 GMT (envelope-from svn-freebsd-gecko@chruetertee.ch) Date: Tue, 2 Oct 2012 18:33:04 GMT Message-Id: <201210021833.q92IX4EC081961@trillian.chruetertee.ch> X-Authentication-Warning: trillian.chruetertee.ch: www set sender to svn-freebsd-gecko@chruetertee.ch using -f From: svn-freebsd-gecko@chruetertee.ch To: freebsd-gecko@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Subject: [SVN-Commit] r1058 - trunk/Mk X-BeenThere: freebsd-gecko@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list Reply-To: freebsd-gecko@freebsd.org List-Id: Gecko Rendering Engine issues List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 02 Oct 2012 18:33:11 -0000 Author: jbeich Date: Tue Oct 2 18:33:04 2012 New Revision: 1058 Log: simplify Modified: trunk/Mk/bsd.gecko.mk Modified: trunk/Mk/bsd.gecko.mk ============================================================================== --- trunk/Mk/bsd.gecko.mk Tue Oct 2 18:28:24 2012 (r1057) +++ trunk/Mk/bsd.gecko.mk Tue Oct 2 18:33:04 2012 (r1058) @@ -80,7 +80,7 @@ _GECKO_ALL= libxul libxul19 libxul_PLIST= libxul>=10 -libxul19_PLIST= libxul=1.9.2.28_1 # keep in sync with www/libxul19 +libxul19_PLIST= libxul<2 .for gecko in ${_GECKO_ALL} ${gecko}_PORTSDIR?= www From owner-freebsd-gecko@FreeBSD.ORG Wed Oct 3 07:48:40 2012 Return-Path: Delivered-To: freebsd-gecko@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 43560106566C; Wed, 3 Oct 2012 07:48:40 +0000 (UTC) (envelope-from mexas@bristol.ac.uk) Received: from dirg.bris.ac.uk (dirg.bris.ac.uk [137.222.10.102]) by mx1.freebsd.org (Postfix) with ESMTP id F3E808FC19; Wed, 3 Oct 2012 07:48:39 +0000 (UTC) Received: from ncsc.bris.ac.uk ([137.222.10.41]) by dirg.bris.ac.uk with esmtp (Exim 4.72) (envelope-from ) id 1TJJh8-0002FZ-UM; Wed, 03 Oct 2012 08:48:38 +0100 Received: from mech-cluster241.men.bris.ac.uk ([137.222.187.241]) by ncsc.bris.ac.uk with esmtpsa (TLSv1:AES256-SHA:256) (Exim 4.72) (envelope-from ) id 1TJJh8-0000eG-Fu; Wed, 03 Oct 2012 08:48:38 +0100 Received: from mech-cluster241.men.bris.ac.uk (localhost [127.0.0.1]) by mech-cluster241.men.bris.ac.uk (8.14.5/8.14.5) with ESMTP id q937mchr094211; Wed, 3 Oct 2012 08:48:38 +0100 (BST) (envelope-from mexas@mech-cluster241.men.bris.ac.uk) Received: (from mexas@localhost) by mech-cluster241.men.bris.ac.uk (8.14.5/8.14.5/Submit) id q937mcku094210; Wed, 3 Oct 2012 08:48:38 +0100 (BST) (envelope-from mexas) Date: Wed, 3 Oct 2012 08:48:38 +0100 (BST) From: Anton Shterenlikht Message-Id: <201210030748.q937mcku094210@mech-cluster241.men.bris.ac.uk> To: freebsd-gecko@freebsd.org, freebsd-ports@freebsd.org Cc: Subject: graphics/evince depends on vulnerable libxul19 X-BeenThere: freebsd-gecko@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list Reply-To: mexas@bristol.ac.uk List-Id: Gecko Rendering Engine issues List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 03 Oct 2012 07:48:40 -0000 ===> Installing for evince-2.32.0_9 ===> evince-2.32.0_9 depends on file: /usr/local/share/icons/gnome/index.theme - found ===> evince-2.32.0_9 depends on executable: yelp - not found ===> Verifying install for yelp in /usr/ports/x11/yelp ===> yelp-2.30.2_4 depends on file: /usr/local/lib/libxul/libxul.so - not found ===> Verifying install for /usr/local/lib/libxul/libxul.so in /usr/ports/www/libxul19 ===> libxul-1.9.2.28_1 has known vulnerabilities: libxul-1.9.2.28_1 is vulnerable: mozilla -- multiple vulnerabilities Shouldn't evince be forcing www/libxul install instead? Anton From owner-freebsd-gecko@FreeBSD.ORG Wed Oct 3 14:29:30 2012 Return-Path: Delivered-To: freebsd-gecko@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 3CDD41065670 for ; Wed, 3 Oct 2012 14:29:30 +0000 (UTC) (envelope-from freebsd-ports-local@be-well.ilk.org) Received: from asbnvacz-mailrelay01.megapath.net (asbnvacz-mailrelay01.megapath.net [207.145.128.243]) by mx1.freebsd.org (Postfix) with ESMTP id 0A4008FC14 for ; Wed, 3 Oct 2012 14:29:29 +0000 (UTC) Received: from mail6.sea5.speakeasy.net (mail6.sea5.speakeasy.net [69.17.117.50]) by asbnvacz-mailrelay01.megapath.net (Postfix) with ESMTP id 20E4CA71639 for ; Wed, 3 Oct 2012 10:29:28 -0400 (EDT) Received: (qmail 18814 invoked from network); 3 Oct 2012 14:29:27 -0000 Received: by simscan 1.4.0 ppid: 25936, pid: 21622, t: 0.1682s scanners: clamav: 0.88.2/m:52/d:10739 Received: from unknown (HELO be-well.ilk.org) ([66.92.78.145]) (envelope-sender ) by mail6.sea5.speakeasy.net (qmail-ldap-1.03) with SMTP for ; 3 Oct 2012 14:29:27 -0000 Received: by be-well.ilk.org (Postfix, from userid 1147) id D4F8933C25; Wed, 3 Oct 2012 10:29:26 -0400 (EDT) From: Lowell Gilbert To: mexas@bristol.ac.uk References: <201210030748.q937mcku094210@mech-cluster241.men.bris.ac.uk> Date: Wed, 03 Oct 2012 10:29:26 -0400 In-Reply-To: <201210030748.q937mcku094210@mech-cluster241.men.bris.ac.uk> (Anton Shterenlikht's message of "Wed, 3 Oct 2012 08:48:38 +0100 (BST)") Message-ID: <44obkj39yx.fsf@be-well.ilk.org> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/24.2 (berkeley-unix) MIME-Version: 1.0 Content-Type: text/plain Cc: freebsd-gecko@freebsd.org, freebsd-ports@freebsd.org Subject: Re: graphics/evince depends on vulnerable libxul19 X-BeenThere: freebsd-gecko@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Gecko Rendering Engine issues List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 03 Oct 2012 14:29:30 -0000 Anton Shterenlikht writes: > ===> Installing for evince-2.32.0_9 > ===> evince-2.32.0_9 depends on file: /usr/local/share/icons/gnome/index.theme - found > ===> evince-2.32.0_9 depends on executable: yelp - not found > ===> Verifying install for yelp in /usr/ports/x11/yelp > ===> yelp-2.30.2_4 depends on file: /usr/local/lib/libxul/libxul.so - not found > ===> Verifying install for /usr/local/lib/libxul/libxul.so in /usr/ports/www/libxul19 > ===> libxul-1.9.2.28_1 has known vulnerabilities: > libxul-1.9.2.28_1 is vulnerable: > mozilla -- multiple vulnerabilities > > Shouldn't evince be forcing www/libxul install instead? It's yelp which is looking for libxul19, not evince directly. And yelp won't work with www/libxul last I heard. Personally, I'm just living without yelp right now. I think others are too. The quick-and-dirty hack someone just mentioned on another thread is to let yelp install with libxul19, then delete libxul19. Yelp won't work, but it will be installed and other programs that want it will go ahead and install happily. That sounds like it should work; what I did (before I heard that advice) was to change other ports to not try to use yelp at all. Good luck. From owner-freebsd-gecko@FreeBSD.ORG Wed Oct 3 15:41:51 2012 Return-Path: Delivered-To: freebsd-gecko@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 8A799106564A for ; Wed, 3 Oct 2012 15:41:51 +0000 (UTC) (envelope-from svn-freebsd-gecko@chruetertee.ch) Received: from trillian.chruetertee.ch (trillian.chruetertee.ch [217.150.245.56]) by mx1.freebsd.org (Postfix) with ESMTP id 19D468FC12 for ; Wed, 3 Oct 2012 15:41:50 +0000 (UTC) Received: from trillian.chruetertee.ch (trillian [217.150.245.56]) by trillian.chruetertee.ch (8.14.4/8.14.3) with ESMTP id q93Ffh8G098579 for ; Wed, 3 Oct 2012 15:41:43 GMT (envelope-from svn-freebsd-gecko@chruetertee.ch) Received: (from www@localhost) by trillian.chruetertee.ch (8.14.4/8.14.3/Submit) id q93FfcMm097961 for freebsd-gecko@freebsd.org; Wed, 3 Oct 2012 15:41:38 GMT (envelope-from svn-freebsd-gecko@chruetertee.ch) Date: Wed, 3 Oct 2012 15:41:38 GMT Message-Id: <201210031541.q93FfcMm097961@trillian.chruetertee.ch> X-Authentication-Warning: trillian.chruetertee.ch: www set sender to svn-freebsd-gecko@chruetertee.ch using -f From: svn-freebsd-gecko@chruetertee.ch To: freebsd-gecko@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Subject: [SVN-Commit] r1059 - trunk X-BeenThere: freebsd-gecko@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list Reply-To: freebsd-gecko@freebsd.org List-Id: Gecko Rendering Engine issues List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 03 Oct 2012 15:41:51 -0000 Author: jbeich Date: Wed Oct 3 15:41:38 2012 New Revision: 1059 Log: add r1057 to changelog Modified: trunk/Gecko_ChangeLog Modified: trunk/Gecko_ChangeLog ============================================================================== --- trunk/Gecko_ChangeLog Tue Oct 2 18:33:04 2012 (r1058) +++ trunk/Gecko_ChangeLog Wed Oct 3 15:41:38 2012 (r1059) @@ -16,6 +16,7 @@ - use libjpeg-turbo's faster color conversion if available during build - record startup time for telemetry - use -z origin instead of hardcoding path to gecko runtime +- fail early if incompatible libxul version is installed (in USE_GECKO) - *miscellaneous cleanups and fixups* PR: ports/171534 [1], ports/171566 [2], ports/172164 [3], ports/172201 [4] From owner-freebsd-gecko@FreeBSD.ORG Wed Oct 3 15:41:52 2012 Return-Path: Delivered-To: freebsd-gecko@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 9EC86106566B for ; Wed, 3 Oct 2012 15:41:52 +0000 (UTC) (envelope-from svn-freebsd-gecko@chruetertee.ch) Received: from trillian.chruetertee.ch (trillian.chruetertee.ch [217.150.245.56]) by mx1.freebsd.org (Postfix) with ESMTP id 2F0028FC15 for ; Wed, 3 Oct 2012 15:41:52 +0000 (UTC) Received: from trillian.chruetertee.ch (trillian [217.150.245.56]) by trillian.chruetertee.ch (8.14.4/8.14.3) with ESMTP id q93FfpOm099875 for ; Wed, 3 Oct 2012 15:41:51 GMT (envelope-from svn-freebsd-gecko@chruetertee.ch) Received: (from www@localhost) by trillian.chruetertee.ch (8.14.4/8.14.3/Submit) id q93FfklJ099243 for freebsd-gecko@freebsd.org; Wed, 3 Oct 2012 15:41:46 GMT (envelope-from svn-freebsd-gecko@chruetertee.ch) Date: Wed, 3 Oct 2012 15:41:46 GMT Message-Id: <201210031541.q93FfklJ099243@trillian.chruetertee.ch> X-Authentication-Warning: trillian.chruetertee.ch: www set sender to svn-freebsd-gecko@chruetertee.ch using -f From: svn-freebsd-gecko@chruetertee.ch To: freebsd-gecko@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Subject: [SVN-Commit] r1060 - trunk/www/firefox-nightly X-BeenThere: freebsd-gecko@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list Reply-To: freebsd-gecko@freebsd.org List-Id: Gecko Rendering Engine issues List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 03 Oct 2012 15:41:52 -0000 Author: jbeich Date: Wed Oct 3 15:41:45 2012 New Revision: 1060 Log: temporarily lower version requirements for Nightly Modified: trunk/www/firefox-nightly/Makefile Modified: trunk/www/firefox-nightly/Makefile ============================================================================== --- trunk/www/firefox-nightly/Makefile Wed Oct 3 15:41:38 2012 (r1059) +++ trunk/www/firefox-nightly/Makefile Wed Oct 3 15:41:45 2012 (r1060) @@ -112,6 +112,10 @@ <${FILESDIR}/firefox.desktop.in >${WRKDIR}/${MOZILLA}.desktop post-patch: + @${REINPLACE_CMD} -e '/MOZPNG/s/=[0-9]*/=10511/' \ + -e '/AM_PATH_NSPR/s/([0-9.]*,/(4.9.2,/' \ + -e '/AM_PATH_NSS/s/([0-9.]*,/(3.13.6,/' \ + ${WRKSRC}/configure.in @${REINPLACE_CMD} -e 's|%%LOCALBASE%%|${LOCALBASE}|g' \ ${WRKSRC}/browser/app/nsBrowserApp.cpp From owner-freebsd-gecko@FreeBSD.ORG Wed Oct 3 15:41:59 2012 Return-Path: Delivered-To: freebsd-gecko@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 4CEB4106566B for ; Wed, 3 Oct 2012 15:41:59 +0000 (UTC) (envelope-from svn-freebsd-gecko@chruetertee.ch) Received: from trillian.chruetertee.ch (trillian.chruetertee.ch [217.150.245.56]) by mx1.freebsd.org (Postfix) with ESMTP id CB2E08FC16 for ; Wed, 3 Oct 2012 15:41:58 +0000 (UTC) Received: from trillian.chruetertee.ch (trillian [217.150.245.56]) by trillian.chruetertee.ch (8.14.4/8.14.3) with ESMTP id q93FfvQ9002545 for ; Wed, 3 Oct 2012 15:41:57 GMT (envelope-from svn-freebsd-gecko@chruetertee.ch) Received: (from www@localhost) by trillian.chruetertee.ch (8.14.4/8.14.3/Submit) id q93FfquM002037 for freebsd-gecko@freebsd.org; Wed, 3 Oct 2012 15:41:52 GMT (envelope-from svn-freebsd-gecko@chruetertee.ch) Date: Wed, 3 Oct 2012 15:41:52 GMT Message-Id: <201210031541.q93FfquM002037@trillian.chruetertee.ch> X-Authentication-Warning: trillian.chruetertee.ch: www set sender to svn-freebsd-gecko@chruetertee.ch using -f From: svn-freebsd-gecko@chruetertee.ch To: freebsd-gecko@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Subject: [SVN-Commit] r1061 - trunk/Mk X-BeenThere: freebsd-gecko@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list Reply-To: freebsd-gecko@freebsd.org List-Id: Gecko Rendering Engine issues List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 03 Oct 2012 15:41:59 -0000 Author: jbeich Date: Wed Oct 3 15:41:52 2012 New Revision: 1061 Log: for bundled nspr/nss use the patches from ports Modified: trunk/Mk/bsd.gecko.mk Modified: trunk/Mk/bsd.gecko.mk ============================================================================== --- trunk/Mk/bsd.gecko.mk Wed Oct 3 15:41:45 2012 (r1060) +++ trunk/Mk/bsd.gecko.mk Wed Oct 3 15:41:52 2012 (r1061) @@ -832,6 +832,18 @@ s|"%FULL_NSPR_LIBS%"|`nspr-config --libs`|g' \ ${MOZSRC}/build/unix/mozilla-config.in .endif +.if ${USE_MOZILLA:M-nspr} + @${ECHO_MSG} "===> Applying NSPR patches" + @for i in ${.CURDIR}/../../devel/nspr/files/patch-*; do \ + ${PATCH} ${PATCH_ARGS} -d ${MOZSRC}/nsprpub/build < $$i; \ + done +.endif +.if ${USE_MOZILLA:M-nss} + @${ECHO_MSG} "===> Applying NSS patches" + @for i in ${.CURDIR}/../../security/nss/files/patch-*; do \ + ${PATCH} ${PATCH_ARGS} -d ${MOZSRC}/security/nss < $$i; \ + done +.endif .for subdir in "" nsprpub js/src @if [ -f ${MOZSRC}/${subdir}/config/system-headers ] ; then \ for f in \ From owner-freebsd-gecko@FreeBSD.ORG Wed Oct 3 20:17:09 2012 Return-Path: Delivered-To: freebsd-gecko@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id C3EE4106564A for ; Wed, 3 Oct 2012 20:17:09 +0000 (UTC) (envelope-from andy@neu.net) Received: from mail.neu.net (unknown [IPv6:2607:fc50:0:d300:216:3eff:fe54:f1c6]) by mx1.freebsd.org (Postfix) with ESMTP id 7A0D58FC08 for ; Wed, 3 Oct 2012 20:17:09 +0000 (UTC) Received: from neu.net (neu.net [199.48.129.194]) by mail.neu.net (8.14.5/8.14.5) with ESMTP id q93KH4lB041001 for ; Wed, 3 Oct 2012 16:17:04 -0400 (EDT) (envelope-from andy@neu.net) Date: Wed, 3 Oct 2012 16:17:04 -0400 (EDT) From: AN To: freebsd-gecko@freebsd.org In-Reply-To: <201210031541.q93FfklJ099243@trillian.chruetertee.ch> Message-ID: References: <201210031541.q93FfklJ099243@trillian.chruetertee.ch> User-Agent: Alpine 2.00 (BSF 1167 2008-08-23) MIME-Version: 1.0 Content-Type: TEXT/PLAIN; charset=US-ASCII; format=flowed X-Virus-Scanned: clamav-milter 0.97.6 at my.mail.server X-Virus-Status: Clean X-Spam-Status: No, score=1.8 required=4.5 tests=RP_MATCHES_RCVD,URIBL_BLACK autolearn=no version=3.3.2 X-Spam-Level: * X-Spam-Checker-Version: SpamAssassin 3.3.2 (2011-06-06) on mail.neu.net Subject: Re: [SVN-Commit] r1060 - trunk/www/firefox-nightly X-BeenThere: freebsd-gecko@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Gecko Rendering Engine issues List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 03 Oct 2012 20:17:09 -0000 On Wed, 3 Oct 2012, svn-freebsd-gecko@chruetertee.ch wrote: > Author: jbeich > Date: Wed Oct 3 15:41:45 2012 > New Revision: 1060 > > Log: > temporarily lower version requirements for Nightly > > Modified: > trunk/www/firefox-nightly/Makefile > > Modified: trunk/www/firefox-nightly/Makefile > ============================================================================== > --- trunk/www/firefox-nightly/Makefile Wed Oct 3 15:41:38 2012 (r1059) > +++ trunk/www/firefox-nightly/Makefile Wed Oct 3 15:41:45 2012 (r1060) > @@ -112,6 +112,10 @@ > <${FILESDIR}/firefox.desktop.in >${WRKDIR}/${MOZILLA}.desktop > > post-patch: > + @${REINPLACE_CMD} -e '/MOZPNG/s/=[0-9]*/=10511/' \ > + -e '/AM_PATH_NSPR/s/([0-9.]*,/(4.9.2,/' \ > + -e '/AM_PATH_NSS/s/([0-9.]*,/(3.13.6,/' \ > + ${WRKSRC}/configure.in > @${REINPLACE_CMD} -e 's|%%LOCALBASE%%|${LOCALBASE}|g' \ > ${WRKSRC}/browser/app/nsBrowserApp.cpp # svn up Updating '.': G Makefile Updated to revision 1061. [root@FBSD10 /home/root/ff_nightly]# make update && make makesum && time make all deinstall install clean ===> Found saved configuration for firefox-nightly-18.0.104181,1 => da6230dfa32e.tar.bz2 doesn't seem to exist in /usr/ports/distfiles/firefox-nightly. => Attempting to fetch http://hg.mozilla.org/mozilla-central/archive/da6230dfa32e.tar.bz2 fetch: http://hg.mozilla.org/mozilla-central/archive/da6230dfa32e.tar.bz2: size of remote file is not known da6230dfa32e.tar.bz2 88 MB 639 kBps ===> firefox-nightly-18.0.109037,1 depends on package: nspr>=4.9.2 - found ===> firefox-nightly-18.0.109037,1 depends on package: nss>=3.13.6_1 - not found ===> Found nss-3.13.6, but you need to upgrade to nss>=3.13.6_1. *** [build-depends] Error code 1 From owner-freebsd-gecko@FreeBSD.ORG Thu Oct 4 23:00:30 2012 Return-Path: Delivered-To: gecko@hub.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id A01591065670 for ; Thu, 4 Oct 2012 23:00:30 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [IPv6:2001:4f8:fff6::28]) by mx1.freebsd.org (Postfix) with ESMTP id 89FB78FC19 for ; Thu, 4 Oct 2012 23:00:30 +0000 (UTC) Received: from freefall.freebsd.org (localhost [127.0.0.1]) by freefall.freebsd.org (8.14.5/8.14.5) with ESMTP id q94N0UZc030332 for ; Thu, 4 Oct 2012 23:00:30 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.14.5/8.14.5/Submit) id q94N0TEl030329; Thu, 4 Oct 2012 23:00:29 GMT (envelope-from gnats) Date: Thu, 4 Oct 2012 23:00:29 GMT Message-Id: <201210042300.q94N0TEl030329@freefall.freebsd.org> To: gecko@FreeBSD.org From: dfilter@FreeBSD.ORG (dfilter service) Cc: Subject: Re: ports/172201: commit references a PR X-BeenThere: freebsd-gecko@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list Reply-To: dfilter service List-Id: Gecko Rendering Engine issues List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 04 Oct 2012 23:00:30 -0000 The following reply was made to PR ports/172201; it has been noted by GNATS. From: dfilter@FreeBSD.ORG (dfilter service) To: bug-followup@FreeBSD.org Cc: Subject: Re: ports/172201: commit references a PR Date: Thu, 4 Oct 2012 22:57:53 +0000 (UTC) Author: dougb Date: Thu Oct 4 22:57:45 2012 New Revision: 305288 URL: http://svn.freebsd.org/changeset/ports/305288 Log: Remove the word 'support' from most places that it occurs, since it is not only redundant and repetitive, it makes the descriptions of some options too long for RELENG_8. Removing it does not make the meaning of the option description less clear. While I'm here, make a few of the options more consistent with each other. PR: ports/172201 Submitted by: me Modified: head/Mk/bsd.gnome.mk head/Mk/bsd.options.desc.mk Modified: head/Mk/bsd.gnome.mk ============================================================================== --- head/Mk/bsd.gnome.mk Thu Oct 4 22:29:17 2012 (r305287) +++ head/Mk/bsd.gnome.mk Thu Oct 4 22:57:45 2012 (r305288) @@ -448,7 +448,7 @@ gtksourceview2_USE_GNOME_IMPL=gtk20 libx pkgconfig_DETECT= ${LOCALBASE}/bin/pkgconf pkgconfig_BUILD_DEPENDS= pkgconf:${PORTSDIR}/devel/pkgconf -pkgconfig_RUN_DEPENDS= pkgconf:${PORTSDIR}/devel/pkgconf +#pkgconfig_RUN_DEPENDS= pkgconf:${PORTSDIR}/devel/pkgconf libgsf_LIB_DEPENDS= gsf-1.114:${PORTSDIR}/devel/libgsf libgsf_DETECT= ${LOCALBASE}/libdata/pkgconfig/libgsf-1.pc Modified: head/Mk/bsd.options.desc.mk ============================================================================== --- head/Mk/bsd.options.desc.mk Thu Oct 4 22:29:17 2012 (r305287) +++ head/Mk/bsd.options.desc.mk Thu Oct 4 22:57:45 2012 (r305288) @@ -13,327 +13,327 @@ Options_Desc_MAINTAINER= ports@FreeBSD.o # OPTION_DESC: Description: # Length | | Length | # -A52_DESC?= AC-3 support via liba52 -AAC_DESC?= AAC/MP4 format support -AACPLUS_DESC?= AAC support via libaacplus -AALIB_DESC?= AAlib graphics library support -ALSA_DESC?= ALSA audio architecture support -AMR_DESC?= AMR 3GPP speech codec support (opencore) -AMR_NB_DESC?= AMR Narrow Band audio support (opencore) -AMR_WB_DESC?= AMR Wide Band audio support (opencore) -AO_DESC?= libao audio library support -APACHE_DESC?= Apache server support -APE_DESC?= Monkey's Audio lossless format support -ARCHIVE_DESC?= bzip2/zip/iso9660 archive support -ARTS_DESC?= aRts audio system support +A52_DESC?= AC-3 via liba52 +AAC_DESC?= AAC/MP4 format +AACPLUS_DESC?= AAC via libaacplus +AALIB_DESC?= AAlib graphics library +ALSA_DESC?= ALSA audio architecture +AMR_DESC?= AMR 3GPP speech codec (opencore) +AMR_NB_DESC?= AMR Narrow Band audio (opencore) +AMR_WB_DESC?= AMR Wide Band audio (opencore) +AO_DESC?= libao audio library +APACHE_DESC?= Apache server +APE_DESC?= Monkey's Audio lossless format +ARCHIVE_DESC?= bzip2/zip/iso9660 archive +ARTS_DESC?= aRts audio system ASM_DESC?= Use optimized assembly code -ASPELL_DESC?= Spell checking support via GNU Aspell +ASPELL_DESC?= Spell checking via GNU Aspell ASSERT_DESC?= Enable debug assertions -AVAHI_DESC?= Zeroconf support (via Avahi) -BDB_DESC?= Berkeley DB support -BDB1_DESC?= Berkeley DB 1.85 support +AVAHI_DESC?= Zeroconf via Avahi +BDB_DESC?= Berkeley Database +BDB1_DESC?= Berkeley DB 1.85 BITTORRENT_DESC?= BitTorrent support -BOOST_DESC?= Boost C++ libraries support -BZIP2_DESC?= bzip2 compression support -CACA_DESC?= libcaca graphics library support -CAIRO_DESC?= Cairo graphics library support +BOOST_DESC?= Boost C++ libraries +BZIP2_DESC?= bzip2 compression +CACA_DESC?= libcaca graphics library +CAIRO_DESC?= Cairo graphics library CARES_DESC?= Asynchronous DNS resolution via c-ares -CDDA2WAV_DESC?= CD ripping support (cdda2wav) -CDDB_DESC?= CDDB (compact disc database) support -CDIO_DESC?= CDIO support via libcdio -CDPARANOIA_DESC?= CD ripping support (cdparanoia) -CELT_DESC?= CELT audio codec support -CFITSIO_DESC?= FITS support via CFITSIO -COMPOSITE_DESC?= X11 Composite extension support -CUE_DESC?= Embedded CUE sheets support -CUPS_DESC?= CUPS printing system support -CURL_DESC?= Data transfer support via cURL +CDDA2WAV_DESC?= CD ripping (cdda2wav) +CDDB_DESC?= CDDB (compact disc database) +CDIO_DESC?= CDIO via libcdio +CDPARANOIA_DESC?= CD ripping (cdparanoia) +CELT_DESC?= CELT audio codec +CFITSIO_DESC?= FITS via CFITSIO +COMPOSITE_DESC?= X11 Composite extension +CUE_DESC?= Embedded CUE sheets +CUPS_DESC?= CUPS printing system +CURL_DESC?= Data transfer via cURL CXX_DESC?= C++ support -DAGRAB_DESC?= CD ripping support (dagrab) +DAGRAB_DESC?= CD ripping (dagrab) DATA_DESC?= Install data files DBM_DESC?= DBM support -DBUS_DESC?= D-Bus IPC system support -DCA_DESC?= DTS support via libdca -DCRAW_DESC?= dcraw (raw image converter) support +DBUS_DESC?= D-Bus IPC system +DCA_DESC?= DTS via libdca +DCRAW_DESC?= dcraw (raw image converter) DEBUG_DESC?= Install debug symbols DEVD_DESC?= Install devd(8) files -DIRAC_DESC?= Dirac codec support via libdirac +DIRAC_DESC?= Dirac codec via libdirac DOCS_DESC?= Build and/or install documentation DOXYGEN_DESC?= Build documentation with Doxygen -DV_DESC?= Quasar DV video codec support (libdv) -DVDCSS_DESC?= Encrypted DVD support via libdvdcss -ECW_DESC?= ECW image format support -ESOUND_DESC?= EsounD sound server support +DV_DESC?= Quasar DV video codec (libdv) +DVDCSS_DESC?= Encrypted DVD via libdvdcss +ECW_DESC?= ECW image format +ESOUND_DESC?= EsounD sound server EXAMPLES_DESC?= Build and/or install examples -EXPAT_DESC?= Expat XML parser support -FAAC_DESC?= FAAC AAC encoder support -FAAD_DESC?= FAAD AAC decoder support -FAM_DESC?= File Alteration Monitor support +EXPAT_DESC?= Expat XML parser +FAAC_DESC?= FAAC AAC encoder +FAAD_DESC?= FAAD AAC decoder +FAM_DESC?= File Alteration Monitor FASTCGI_DESC?= FastCGI support -FFMPEG_DESC?= FFmpeg support (WMA, AIFF, AC3, APE...) -FFTW_DESC?= Discrete Fourier Transform support +FFMPEG_DESC?= FFmpeg (WMA, AIFF, AC3, APE...) +FFTW_DESC?= Discrete Fourier Transform FINGER_DESC?= Finger support -FIREBIRD_DESC?= Firebird (Interbase) database support -FLAC_DESC?= FLAC lossless audio codec support -FLICKR_DESC?= Flickr support via flickcurl -FONTCONFIG_DESC?= X11 font configuration support +FIREBIRD_DESC?= Firebird (Interbase) database +FLAC_DESC?= FLAC lossless audio codec +FLICKR_DESC?= Flickr via flickcurl +FONTCONFIG_DESC?= X11 font configuration FORTRAN_DESC?= Fortran support FPECTL_DESC?= Floating point exception handling -FPX_DESC?= FlashPix image format support -FREETDS_DESC?= FreeTDS library support -FREETYPE_DESC?= TrueType font rendering support -FREI0R_DESC?= Frei0r video plugins support -FRIBIDI_DESC?= Bidirectional text support via GNU FriBidi +FPX_DESC?= FlashPix image format +FREETDS_DESC?= FreeTDS library +FREETYPE_DESC?= TrueType font rendering +FREI0R_DESC?= Frei0r video plugins +FRIBIDI_DESC?= Bidirectional text via GNU FriBidi FTP_DESC?= FTP support -FUSE_DESC?= FUSE (Filesystem in Userspace) support -GCONF_DESC?= GConf configuration backend support -GD_DESC?= GD graphics library support -GDBM_DESC?= GNU dbm library support +FUSE_DESC?= FUSE (Filesystem in Userspace) +GCONF_DESC?= GConf configuration backend +GD_DESC?= GD graphics library +GDBM_DESC?= GNU dbm library GDM_DESC?= Install GDM login manager GEOIP_DESC?= GeoIP support GEOS_DESC?= GEOS support -GEOTIFF_DESC?= GeoTIFF file format support -GGI_DESC?= General Graphics Interface support -GIF_DESC?= GIF image format support -GLADE_DESC?= Glade interface builder support -GLX_DESC?= X11 OpenGL rendering support -GMP_DESC?= GMP (multiple precision arithmetic) support -GNOME_DESC?= GNOME desktop environment support -GNOMEKEYRING_DESC?= GNOME Keyring password manager support -GNOMEVFS2_DESC?= GnomeVFS2 (virtual file system) support -GNUPG_DESC?= GNU Privacy Guard support -GNUPLOT_DESC?= Plotting support via gnuplot -GNUTLS_DESC?= SSL/TLS support via GnuTLS -GOGO_DESC?= GOGO MP3 audio encoder support +GEOTIFF_DESC?= GeoTIFF file format +GGI_DESC?= General Graphics Interface +GIF_DESC?= GIF image format +GLADE_DESC?= Glade interface builder +GLX_DESC?= X11 OpenGL rendering +GMP_DESC?= GMP (multiple precision arithmetic) +GNOME_DESC?= GNOME desktop environment +GNOMEKEYRING_DESC?= GNOME Keyring password manager +GNOMEVFS2_DESC?= GnomeVFS2 (virtual file system) +GNUPG_DESC?= GNU Privacy Guard +GNUPLOT_DESC?= Plotting via gnuplot +GNUTLS_DESC?= SSL/TLS via GnuTLS +GOGO_DESC?= GOGO MP3 audio encoder GOPHER_DESC?= Gopher support -GPERFTOOLS_DESC?= Google gperftools support -GPHOTO_DESC?= Digital cameras support via libgphoto2 -GRAPHMAGICK_DESC?= GraphicsMagick support +GPERFTOOLS_DESC?= Google gperftools +GPHOTO_DESC?= Digital cameras via libgphoto2 +GRAPHMAGICK_DESC?= GraphicsMagick GRAPHVIZ_DESC?= Graphviz support GRASS_DESC?= GRASS support GSM_DESC?= GSM codec support GSSAPI_DESC?= GSSAPI support -GSTREAMER_DESC?= Multimedia support via GStreamer -GTK1_DESC?= GTK+ 1 GUI toolkit support -GTK2_DESC?= GTK+ 2 GUI toolkit support -GTK3_DESC?= GTK+ 3 GUI toolkit support -GUI_DESC?= GUI (Graphical User Interface) support -GUILE_DESC?= Guile extension language support -GVFS_DESC?= Virtual filesystems support via GVFS +GSTREAMER_DESC?= Multimedia via GStreamer +GTK1_DESC?= GTK+ 1 GUI toolkit +GTK2_DESC?= GTK+ 2 GUI toolkit +GTK3_DESC?= GTK+ 3 GUI toolkit +GUI_DESC?= GUI (Graphical User Interface) +GUILE_DESC?= Guile extension language +GVFS_DESC?= Virtual filesystems via GVFS H323_DESC?= H.323 support -HAL_DESC?= HAL (Hardware Abstraction Layer) support -HDF5_DESC?= HDF-5 data format support -HTTPD_DESC?= httpd output streaming support +HAL_DESC?= HAL (Hardware Abstraction Layer) +HDF5_DESC?= HDF-5 data format +HTTPD_DESC?= httpd output streaming ICONS_DESC?= Install icons theme -ICONV_DESC?= Encoding conversion support via iconv -ID3_DESC?= ID3 tags support -ID3TAG_DESC?= ID3 v1/v2 tags support -IDN_DESC?= International Domain Names support -IMAGEMAGICK_DESC?= ImageMagick support -IMLIB_DESC?= imlib image library support -IMLIB2_DESC?= imlib2 image library support +ICONV_DESC?= Encoding conversion via iconv +ID3_DESC?= ID3 tags +ID3TAG_DESC?= ID3 v1/v2 tags +IDN_DESC?= International Domain Names +IMAGEMAGICK_DESC?= ImageMagick +IMLIB_DESC?= imlib image library +IMLIB2_DESC?= imlib2 image library IODBC_DESC?= ODBC backend via iODBC -IPV4_DESC?= IPv4 protocol support -IPV6_DESC?= IPv6 protocol support +IPV4_DESC?= IPv4 protocol +IPV6_DESC?= IPv6 protocol JABBER_DESC?= Jabber support -JACK_DESC?= JACK audio server support -JASPER_DESC?= JPEG 2000 support via JasPer -JAVA_DESC?= Java platform support -JBIG_DESC?= JBIG image format support -JHEAD_DESC?= jhead EXIF manipulator support -JPEG_DESC?= JPEG image format support -KDE3_DESC?= KDE 3 desktop environment support -KDE4_DESC?= KDE 4 desktop environment support +JACK_DESC?= JACK audio server +JASPER_DESC?= JPEG 2000 via JasPer +JAVA_DESC?= Java platform +JBIG_DESC?= JBIG image format +JHEAD_DESC?= jhead EXIF manipulator +JPEG_DESC?= JPEG image format +KDE3_DESC?= KDE 3 desktop environment +KDE4_DESC?= KDE 4 desktop environment KERBEROS_DESC?= Kerberos support KERBEROS4_DESC?= Kerberos 4 support KERBEROS5_DESC?= Kerberos 5 support KML_DESC?= KML support -KWALLET_DESC?= KWallet password manager support -LADSPA_DESC?= LADSPA audio plugins support -LAME_DESC?= LAME MP3 audio encoder support -LASH_DESC?= LASH audio support -LASTFM_DESC?= Last.fm streaming support +KWALLET_DESC?= KWallet password manager +LADSPA_DESC?= LADSPA audio plugins +LAME_DESC?= LAME MP3 audio encoder +LASH_DESC?= LASH audio +LASTFM_DESC?= Last.fm streaming LATEX_DESC?= LaTeX support LCMS2_DESC?= LCMS2 support LDAP_DESC?= LDAP support LDAPS_DESC?= LDAPS support LFS_DESC?= Large files support -LIBBLURAY_DESC?= Blu-ray discs support via libbluray +LIBBLURAY_DESC?= Blu-ray discs via libbluray LIBEDIT_DESC?= readline support -LIBEV_DESC?= High-performance events support via libev -LIBEXIF_DESC?= EXIF metadata support via libexif +LIBEV_DESC?= High-performance events via libev +LIBEXIF_DESC?= EXIF metadata via libexif LIBEXTRACTOR_DESC?= libextractor support -LIBMNG_DESC?= MNG animated images support via libmng +LIBMNG_DESC?= MNG animated images via libmng LIBPAPER_DESC?= libpaper support -LIBRSVG2_DESC?= SVG vector graphics support via librsvg2 -LIBVISUAL_DESC?= Audio visualisation support via libvisual +LIBRSVG2_DESC?= SVG vector graphics via librsvg2 +LIBVISUAL_DESC?= Audio visualisation via libvisual LIBWMF_DESC?= libwmf support LIBWRAP_DESC?= TCP wrapper support LIBXINE_DESC?= libxine support -LIGHTTPD_DESC?= Lighttpd server support +LIGHTTPD_DESC?= Lighttpd server LIRC_DESC?= LIRC support -LITE_DESC?= Reduced features and memory footprint -LIVEMEDIA_DESC?= Multimedia streaming support via liveMedia +LITE_DESC?= Reduced features/memory footprint +LIVEMEDIA_DESC?= Multimedia streaming via liveMedia LQR_DESC?= Liquid Rescale support -LUA_DESC?= Lua scripting language support -LZMA_DESC?= LZMA compression support -MAD_DESC?= MAD MP3 audio decoder support -MAGICK_DESC?= ImageMagick library support +LUA_DESC?= Lua scripting language +LZMA_DESC?= LZMA compression +MAD_DESC?= MAD MP3 audio decoder +MAGICK_DESC?= ImageMagick library MANPAGES_DESC?= Build and/or install manual pages MAPSERVER_DESC?= Mapserver support -MATROSKA_DESC?= Matroska container format support -MDNSRESPONDER_DESC?= Zeroconf support (via mDNSResponder) -MIKMOD_DESC?= MOD audio format support +MATROSKA_DESC?= Matroska container format +MDNSRESPONDER_DESC?= Zeroconf via mDNSResponder +MIKMOD_DESC?= MOD audio format MIXER_DESC?= Mixer support -MJPEGTOOLS_DESC?= MJPEG Tools support -MMKEYS_DESC?= Multimedia keys support -MMS_DESC?= MMS streaming support +MJPEGTOOLS_DESC?= MJPEG Tools +MMKEYS_DESC?= Multimedia keys +MMS_DESC?= MMS streaming MMX_DESC?= Use MMX optimized routines MODPERL_DESC?= mod_perl support -MODPLUG_DESC?= MODPLUG decoder support -MOTIF_DESC?= Motif widget library support +MODPLUG_DESC?= MODPLUG decoder +MOTIF_DESC?= Motif widget library MOUSE_DESC?= Mouse support -MP3_DESC?= MP3 audio format support -MP4_DESC?= MP4 format support -MPEG2_DESC?= MPEG-2 video support via libmpeg2 -MPG123_DESC?= MP3 decoding support via mpg123 -MPLAYER_DESC?= MPlayer media player support +MP3_DESC?= MP3 audio format +MP4_DESC?= MP4 audio format +MPEG2_DESC?= MPEG-2 video via libmpeg2 +MPG123_DESC?= MP3 decoding via mpg123 +MPLAYER_DESC?= MPlayer media player MPLS_DESC?= MPLS support -MPP_DESC?= Musepack audio format support -MSQL_DESC?= mSQL database support -MTP_DESC?= MTP device support -MULTIBYTE_DESC?= Multibyte character encoding support -MUSEPACK_DESC?= MPC audio format support -MYSQL_DESC?= MySQL database support +MPP_DESC?= Musepack audio format +MSQL_DESC?= mSQL database +MTP_DESC?= MTP device +MULTIBYTE_DESC?= Multibyte character encoding +MUSEPACK_DESC?= MPC audio format +MYSQL_DESC?= MySQL database MYSQL_JDBC_DESC?= JDBC connection to MySQL databases -NAS_DESC?= Network Audio System support -NETCDF_DESC?= NetCDF data format support -NETPBM_DESC?= Netpbm graphics toolkit support +NAS_DESC?= Network Audio System +NETCDF_DESC?= NetCDF data format +NETPBM_DESC?= Netpbm graphics toolkit NLS_DESC?= Native Language Support NNTP_DESC?= NNTP (News) support -NOTIFY_DESC?= Startup notification support -NTLM_DESC?= NTLM authentication support -NUMPY_DESC?= NumPy mathematical computing support +NOTIFY_DESC?= Startup notification +NTLM_DESC?= NTLM authentication +NUMPY_DESC?= NumPy mathematical computing OBJC_DESC?= Objective C support ODBC_DESC?= ODBC backend ODF_DESC?= ODF file support -OGG_DESC?= Ogg media format support +OGG_DESC?= Ogg media format OPENAL_DESC?= OpenAL support OPENCV_DESC?= OpenCV support -OPENEXR_DESC?= HDR support via OpenEXR +OPENEXR_DESC?= HDR via OpenEXR OPENGL_DESC?= OpenGL support -OPENJPEG_DESC?= Enhanced JPEG graphics support -OPENMP_DESC?= Parallel processing support via OpenMP -OPENSSL_DESC?= SSL/TLS support via OpenSSL +OPENJPEG_DESC?= Enhanced JPEG graphics +OPENMP_DESC?= Parallel processing via OpenMP +OPENSSL_DESC?= SSL/TLS via OpenSSL OPTIMIZED_CFLAGS_DESC?= Use extra compiler optimizations -ORACLE_DESC?= Oracle database support +ORACLE_DESC?= Oracle database ORACLE_JDBC_DESC?= JDBC connection to Oracle databases -OSD_DESC?= On-screen display support -OSS_DESC?= Open Sound System support +OSD_DESC?= On-screen display +OSS_DESC?= Open Sound System PAM_DESC?= PAM support -PANGO_DESC?= Pango rendering library support +PANGO_DESC?= Pango rendering library PCRE_DESC?= Use Perl Compatible Regular Expressions -PDF_DESC?= PDF document support -PERL_DESC?= Perl scripting language support +PDF_DESC?= PDF document +PERL_DESC?= Perl scripting language PGO_DESC?= Use Profile-Guided Optimization -PGSQL_DESC?= PostgreSQL database support +PGSQL_DESC?= PostgreSQL database PGSQL_JDBC_DESC?= JDBC connection to PostgreSQL databases PHP_DESC?= PHP binding/support -PIXBUF_DESC?= GDK-PixBuf library support -PNG_DESC?= PNG image format support -POPPLER_DESC?= PDF and PS file support -PORTAUDIO_DESC?= PortAudio library support +PIXBUF_DESC?= GDK-PixBuf library +PNG_DESC?= PNG image format +POPPLER_DESC?= PDF and PS file +PORTAUDIO_DESC?= PortAudio library POSTGIS_DESC?= PostGIS support PRINT_DESC?= Printer support -PROFILE_DESC?= Profiling library support +PROFILE_DESC?= Profiling library PROJ_DESC?= PROJ.4 support PROXY_DESC?= Proxy support PTH_DESC?= Use GNU Pth for threading/multiprocessing -PULSEAUDIO_DESC?= PulseAudio sound server support +PULSEAUDIO_DESC?= PulseAudio sound server PYMALLOC_DESC?= Use Python's internal malloc -PYTHON_DESC?= Python binding/support -QT4_DESC?= Qt 4 toolkit support +PYTHON_DESC?= Python bindings +QT4_DESC?= Qt 4 toolkit QUICKTIME_DESC?= QuickTime support -RADIUS_DESC?= RADIUS protocol support +RADIUS_DESC?= RADIUS protocol RAW_DESC?= RAW support -RESIN3_DESC?= Resin 3.x support -RTMP_DESC?= RTMP protocol support via librtmp +RESIN3_DESC?= Resin 3.x +RTMP_DESC?= RTMP protocol via librtmp RUBY_DESC?= Ruby binding/support -SAMPLERATE_DESC?= Sample rate conversion support +SAMPLERATE_DESC?= Sample rate conversion SASL_DESC?= SASL support -SCHROEDINGER_DESC?= Dirac codec support via libschroedinger -SCIPY_DESC?= SciPy scientific computing support -SDL_DESC?= Simple Direct Media Layer support -SEM_DESC?= POSIX semaphores support -SHOUTCAST_DESC?= Ogg Icecast and SHOUTcast support +SCHROEDINGER_DESC?= Dirac codec via libschroedinger +SCIPY_DESC?= SciPy scientific computing +SDL_DESC?= Simple Direct Media Layer +SEM_DESC?= POSIX semaphores +SHOUTCAST_DESC?= Ogg Icecast and SHOUTcast SIMD_DESC?= Use CPU-specific optimizations -SMB_DESC?= SMB protocol support -SNAPPY_DESC?= Snappy compression library support +SMB_DESC?= SMB protocol +SNAPPY_DESC?= Snappy compression library SNDFILE_DESC?= libsndfile support -SNMP_DESC?= SNMP protocol support -SOUND_DESC?= Sound (audio) support -SPANDSP_DESC?= Spandsp faxing support -SPEEX_DESC?= Speex audio format support -SQL_DESC?= SQL database support -SQLITE_DESC?= SQLite database support -SQLITE3_DESC?= SQLite3 database support +SNMP_DESC?= SNMP protocol +SOUND_DESC?= Sound (audio) +SPANDSP_DESC?= Spandsp faxing +SPEEX_DESC?= Speex audio format +SQL_DESC?= SQL database +SQLITE_DESC?= SQLite database +SQLITE3_DESC?= SQLite3 database SSE_DESC?= Use SSE optimized routines -SSH_DESC?= SSH protocol support -SSL_DESC?= SSL protocol support +SSH_DESC?= SSH protocol +SSL_DESC?= SSL protocol STATIC_DESC?= Build static executables/libraries -SVG_DESC?= SVG vector image format support -SVGALIB_DESC?= SVGA graphics support +SVG_DESC?= SVG vector image format +SVGALIB_DESC?= SVGA graphics SVN_DESC?= Subversion support -SWFDEC_DESC?= Flash support via Swfdec -SZIP_DESC?= Szip compression support -TCL_DESC?= Tcl scripting language support -TCLTK_DESC?= Tcl/Tk toolkit support -THEORA_DESC?= Ogg Theora video codec support +SWFDEC_DESC?= Flash via Swfdec +SZIP_DESC?= Szip compression +TCL_DESC?= Tcl scripting language +TCLTK_DESC?= Tcl/Tk toolkit +THEORA_DESC?= Ogg Theora video codec THREADS_DESC?= Threading support -TIDY_DESC?= Tidy HTML cleaner support -TIFF_DESC?= TIFF image format support -TINYXML_DESC?= XML parser support via TinyXML -TK_DESC?= Tk toolkit support +TIDY_DESC?= Tidy HTML cleaner +TIFF_DESC?= TIFF image format +TINYXML_DESC?= XML parser via TinyXML +TK_DESC?= Tk toolkit TLS_DESC?= TLS support -TOMCAT5_DESC?= Tomcat 5.x support -TOMCAT6_DESC?= Tomcat 6.x support -TOMCAT7_DESC?= Tomcat 7.x support -TREMOR_DESC?= Tremor audio decoder support -TWOLAME_DESC?= TwoLAME MP2 audio encoder support -UCS2_DESC?= Unicode UCS-2 encoding support -UCS4_DESC?= Unicode UCS-4 encoding support +TOMCAT5_DESC?= Tomcat 5.x +TOMCAT6_DESC?= Tomcat 6.x +TOMCAT7_DESC?= Tomcat 7.x +TREMOR_DESC?= Tremor audio decoder +TWOLAME_DESC?= TwoLAME MP2 audio encoder +UCS2_DESC?= Unicode UCS-2 encoding +UCS4_DESC?= Unicode UCS-4 encoding UNIXODBC_DESC?= ODBC backend via unixODBC -UNZIP_DESC?= UnZip compression support +UNZIP_DESC?= UnZip compression UPNP_DESC?= UPnP support -UTF8_DESC?= Unicode UTF-8 encoding support -VAAPI_DESC?= VAAPI (GPU video acceleration) support -VDPAU_DESC?= VDPAU (GPU video acceleration) support +UTF8_DESC?= Unicode UTF-8 encoding +VAAPI_DESC?= VAAPI (GPU video acceleration) +VDPAU_DESC?= VDPAU (GPU video acceleration) VIDEO_DESC?= Video support VO_AACENC_DESC?= AAC audio encoding via vo-aacenc VO_AMRWBENC_DESC?= AMR Wide Band encoding via vo-amrwbenc -VORBIS_DESC?= Ogg Vorbis audio codec support -VPX_DESC?= VP8 video codec support -WAV_DESC?= WAV audio format support -WAVPACK_DESC?= WavPack lossless audio format support -WEBP_DESC?= WebP image format support +VORBIS_DESC?= Ogg Vorbis audio codec +VPX_DESC?= VP8 video codec +WAV_DESC?= WAV audio format +WAVPACK_DESC?= WavPack lossless audio format +WEBP_DESC?= WebP image format WEBSERVER_DESC?= Build and/or install internal web server WMF_DESC?= Windows Metafile support -WXGTK_DESC?= wxGTK GUI toolkit support -X11_DESC?= X11 support (graphics) -X264_DESC?= H.264 video codec support via x264 -XALAN_DESC?= Xalan XSLT processor support -XCURSOR_DESC?= Cursor themes support -XERCES_DESC?= Xerces XML parser support -XFT_DESC?= Xft font library support -XINE_DESC?= Multimedia support via Xine -XINERAMA_DESC?= X11 Xinerama extension support +WXGTK_DESC?= wxGTK GUI toolkit +X11_DESC?= X11 (graphics) support +X264_DESC?= H.264 video codec via x264 +XALAN_DESC?= Xalan XSLT processor +XCURSOR_DESC?= Cursor themes +XERCES_DESC?= Xerces XML parser +XFT_DESC?= Xft font library +XINE_DESC?= Multimedia via Xine +XINERAMA_DESC?= X11 Xinerama extension XKLAVIER_DESC?= Keyboard layout settings -XML_DESC?= XML parser support -XPM_DESC?= XPM pixmaps support -XRANDR_DESC?= X11 XRandR extension support -XSPF_DESC?= XSPF playlist format support -XVID_DESC?= Xvid MPEG-4 video codec support -XVIDEO_DESC?= X11 Video extension library support -XVMC_DESC?= X11 XvMC video extension support -YAML_DESC?= YAML format support -ZLIB_DESC?= zlib compression support +XML_DESC?= XML parser +XPM_DESC?= XPM pixmaps +XRANDR_DESC?= X11 XRandR extension +XSPF_DESC?= XSPF playlist format +XVID_DESC?= Xvid MPEG-4 video codec +XVIDEO_DESC?= X11 Video extension library +XVMC_DESC?= X11 XvMC video extension +YAML_DESC?= YAML format +ZLIB_DESC?= zlib compression _______________________________________________ svn-ports-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-ports-all To unsubscribe, send any mail to "svn-ports-all-unsubscribe@freebsd.org" From owner-freebsd-gecko@FreeBSD.ORG Thu Oct 4 23:04:29 2012 Return-Path: Delivered-To: gecko@hub.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id D69DB106566C; Thu, 4 Oct 2012 23:04:29 +0000 (UTC) (envelope-from dougb@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [IPv6:2001:4f8:fff6::28]) by mx1.freebsd.org (Postfix) with ESMTP id A867D8FC08; Thu, 4 Oct 2012 23:04:29 +0000 (UTC) Received: from freefall.freebsd.org (localhost [127.0.0.1]) by freefall.freebsd.org (8.14.5/8.14.5) with ESMTP id q94N4Tdm030739; Thu, 4 Oct 2012 23:04:29 GMT (envelope-from dougb@freefall.freebsd.org) Received: (from dougb@localhost) by freefall.freebsd.org (8.14.5/8.14.5/Submit) id q94N4Tuc030735; Thu, 4 Oct 2012 23:04:29 GMT (envelope-from dougb) Date: Thu, 4 Oct 2012 23:04:29 GMT Message-Id: <201210042304.q94N4Tuc030735@freefall.freebsd.org> To: dougb@freebsd.org, dougb@FreeBSD.org, gecko@FreeBSD.org, dougb@FreeBSD.org From: dougb@FreeBSD.org Cc: Subject: Re: ports/172201: www/firefox options too long for 8-stable X-BeenThere: freebsd-gecko@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Gecko Rendering Engine issues List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 04 Oct 2012 23:04:29 -0000 Synopsis: www/firefox options too long for 8-stable State-Changed-From-To: open->closed State-Changed-By: dougb State-Changed-When: Thu Oct 4 23:03:55 UTC 2012 State-Changed-Why: Fixed in ports/Mk/bsd.options.desc.mk Responsible-Changed-From-To: gecko->dougb Responsible-Changed-By: dougb Responsible-Changed-When: Thu Oct 4 23:03:55 UTC 2012 Responsible-Changed-Why: I fixed it. http://www.freebsd.org/cgi/query-pr.cgi?pr=172201 From owner-freebsd-gecko@FreeBSD.ORG Sat Oct 6 10:54:28 2012 Return-Path: Delivered-To: freebsd-gecko@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 3948F106567A for ; Sat, 6 Oct 2012 10:54:28 +0000 (UTC) (envelope-from svn-freebsd-gecko@chruetertee.ch) Received: from trillian.chruetertee.ch (trillian.chruetertee.ch [217.150.245.56]) by mx1.freebsd.org (Postfix) with ESMTP id 9DEBB8FC1B for ; Sat, 6 Oct 2012 10:54:27 +0000 (UTC) Received: from trillian.chruetertee.ch (trillian [217.150.245.56]) by trillian.chruetertee.ch (8.14.4/8.14.3) with ESMTP id q96AsQNJ097815 for ; Sat, 6 Oct 2012 10:54:26 GMT (envelope-from svn-freebsd-gecko@chruetertee.ch) Received: (from www@localhost) by trillian.chruetertee.ch (8.14.4/8.14.3/Submit) id q96AsLpB096932 for freebsd-gecko@freebsd.org; Sat, 6 Oct 2012 10:54:21 GMT (envelope-from svn-freebsd-gecko@chruetertee.ch) Date: Sat, 6 Oct 2012 10:54:21 GMT Message-Id: <201210061054.q96AsLpB096932@trillian.chruetertee.ch> X-Authentication-Warning: trillian.chruetertee.ch: www set sender to svn-freebsd-gecko@chruetertee.ch using -f From: svn-freebsd-gecko@chruetertee.ch To: freebsd-gecko@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Subject: [SVN-Commit] r1062 - in trunk/mail: thunderbird-esr/files thunderbird/files X-BeenThere: freebsd-gecko@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list Reply-To: freebsd-gecko@freebsd.org List-Id: Gecko Rendering Engine issues List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 06 Oct 2012 10:54:28 -0000 Author: jbeich Date: Sat Oct 6 10:54:20 2012 New Revision: 1062 Log: remove workaround for bug 681026, obsolete since gecko9 Deleted: trunk/mail/thunderbird-esr/files/patch-mozilla_toolkit_xre_glxtest.cpp trunk/mail/thunderbird/files/patch-mozilla_toolkit_xre_glxtest.cpp Deleted: trunk/mail/thunderbird-esr/files/patch-mozilla_toolkit_xre_glxtest.cpp ============================================================================== --- trunk/mail/thunderbird-esr/files/patch-mozilla_toolkit_xre_glxtest.cpp Sat Oct 6 10:54:20 2012 (r1061) +++ /dev/null 00:00:00 1970 (deleted) @@ -1,25 +0,0 @@ ---- mozilla/toolkit/xre/glxtest.cpp.orig 2011-08-19 18:57:10.604870746 +0300 -+++ mozilla/toolkit/xre/glxtest.cpp 2011-08-19 18:59:43.620447963 +0300 -@@ -51,6 +51,8 @@ - // which runs the glxtest() static function. This creates a X connection, a GLX context, calls glGetString, and writes that - // to the 'write' end of the pipe. - -+#include -+#include - #include - #include - #include -@@ -224,6 +226,7 @@ - void fire_glxtest_process() - { - int pfd[2]; -+ int status; - if (pipe(pfd) == -1) { - perror("pipe"); - exit(EXIT_FAILURE); -@@ -244,4 +247,5 @@ - close(pfd[1]); - mozilla::widget::glxtest_pipe = pfd[0]; - mozilla::widget::glxtest_pid = pid; -+ waitpid(pid, &status, 0); - } Deleted: trunk/mail/thunderbird/files/patch-mozilla_toolkit_xre_glxtest.cpp ============================================================================== --- trunk/mail/thunderbird/files/patch-mozilla_toolkit_xre_glxtest.cpp Sat Oct 6 10:54:20 2012 (r1061) +++ /dev/null 00:00:00 1970 (deleted) @@ -1,25 +0,0 @@ ---- mozilla/toolkit/xre/glxtest.cpp.orig 2011-08-19 18:57:10.604870746 +0300 -+++ mozilla/toolkit/xre/glxtest.cpp 2011-08-19 18:59:43.620447963 +0300 -@@ -51,6 +51,8 @@ - // which runs the glxtest() static function. This creates a X connection, a GLX context, calls glGetString, and writes that - // to the 'write' end of the pipe. - -+#include -+#include - #include - #include - #include -@@ -224,6 +226,7 @@ - void fire_glxtest_process() - { - int pfd[2]; -+ int status; - if (pipe(pfd) == -1) { - perror("pipe"); - exit(EXIT_FAILURE); -@@ -244,4 +247,5 @@ - close(pfd[1]); - mozilla::widget::glxtest_pipe = pfd[0]; - mozilla::widget::glxtest_pid = pid; -+ waitpid(pid, &status, 0); - }