From owner-freebsd-gecko@FreeBSD.ORG Mon Sep 24 00:26: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 AFFE2106564A for ; Mon, 24 Sep 2012 00:26:18 +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 414838FC0A for ; Mon, 24 Sep 2012 00:26: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 q8O0QBKv045904 for ; Mon, 24 Sep 2012 00:26:11 GMT (envelope-from svn-freebsd-gecko@chruetertee.ch) Received: (from www@localhost) by trillian.chruetertee.ch (8.14.4/8.14.3/Submit) id q8O0Q5g2045408 for freebsd-gecko@freebsd.org; Mon, 24 Sep 2012 00:26:05 GMT (envelope-from svn-freebsd-gecko@chruetertee.ch) Date: Mon, 24 Sep 2012 00:26:05 GMT Message-Id: <201209240026.q8O0Q5g2045408@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] r1030 - 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, 24 Sep 2012 00:26:18 -0000 Author: jbeich Date: Mon Sep 24 00:26:05 2012 New Revision: 1030 Log: sync changelog with reality Modified: trunk/Gecko_ChangeLog Modified: trunk/Gecko_ChangeLog ============================================================================== --- trunk/Gecko_ChangeLog Sat Sep 22 21:54:07 2012 (r1029) +++ trunk/Gecko_ChangeLog Mon Sep 24 00:26:05 2012 (r1030) @@ -1,2 +1,21 @@ 16.0: -- improve debugging with nspr/nss +- switch firefox 16.0 and seamonkey 2.13 to ALSA by default for better + latency during pause and seeking with HTML5 video +- remove fedisableexcept() hacks, obsolete since FreeBSD 4.0 +- support system hunspell dictionaries [1] +- unbreak -esr ports with clang3.2 [2] +- 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: + - only heap-allocated reporter works in about:memory (see bug 762445) + - jemalloc is tuned to "narenas:1,lg_chunk:20" by default [3] +- 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 + +PR: ports/171534 [1], ports/171566 [2] + +[3] To achieve similar effect for -esr ports try tuning malloc(3): + + $ MALLOC_CONF="narenas:1,lg_chunk:20" firefox # FreeBSD 10.0 + $ MALLOC_OPTIONS="2n2k" firefox # FreeBSD 7.0-9.x From owner-freebsd-gecko@FreeBSD.ORG Mon Sep 24 11:07:44 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 3B9291065678 for ; Mon, 24 Sep 2012 11:07:44 +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 0D9648FC12 for ; Mon, 24 Sep 2012 11:07:44 +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 q8OB7hWj086233 for ; Mon, 24 Sep 2012 11:07:43 GMT (envelope-from owner-bugmaster@FreeBSD.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.14.5/8.14.5/Submit) id q8OB7htt086231 for gecko@FreeBSD.org; Mon, 24 Sep 2012 11:07:43 GMT (envelope-from owner-bugmaster@FreeBSD.org) Date: Mon, 24 Sep 2012 11:07:43 GMT Message-Id: <201209241107.q8OB7htt086231@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, 24 Sep 2012 11:07:44 -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/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 21 problems total. From owner-freebsd-gecko@FreeBSD.ORG Mon Sep 24 18:20:17 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 48CEA106566C for ; Mon, 24 Sep 2012 18:20: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 C40528FC0A for ; Mon, 24 Sep 2012 18:20:16 +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 q8OIKE4U086777 for ; Mon, 24 Sep 2012 18:20:14 GMT (envelope-from svn-freebsd-gecko@chruetertee.ch) Received: (from www@localhost) by trillian.chruetertee.ch (8.14.4/8.14.3/Submit) id q8OIK9kh086456 for freebsd-gecko@freebsd.org; Mon, 24 Sep 2012 18:20:09 GMT (envelope-from svn-freebsd-gecko@chruetertee.ch) Date: Mon, 24 Sep 2012 18:20:09 GMT Message-Id: <201209241820.q8OIK9kh086456@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] r1031 - trunk/www/firefox 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, 24 Sep 2012 18:20:17 -0000 Author: jbeich Date: Mon Sep 24 18:20:09 2012 New Revision: 1031 Log: re-apply r301964 after it was accidentally reverted during merge PR: ports/170275 Modified: trunk/www/firefox/Makefile.options Modified: trunk/www/firefox/Makefile.options ============================================================================== --- trunk/www/firefox/Makefile.options Mon Sep 24 00:26:05 2012 (r1030) +++ trunk/www/firefox/Makefile.options Mon Sep 24 18:20:09 2012 (r1031) @@ -16,5 +16,4 @@ GNOMEUI_DESC?= libgnomeui support module LIGHTNING_DESC?= Calendar extension LOGGING_DESC?= Additional log messages -PGO_DESC?= Profile-Guided Optimization # move to bsd.options.desc.mk LIBPROXY_DESC?= Proxy support via libproxy From owner-freebsd-gecko@FreeBSD.ORG Tue Sep 25 06:57:05 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 627DB106564A for ; Tue, 25 Sep 2012 06:57:05 +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 E15138FC16 for ; Tue, 25 Sep 2012 06:57:04 +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 q8P6uvEX065774 for ; Tue, 25 Sep 2012 06:56: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 q8P6uqax065536 for freebsd-gecko@freebsd.org; Tue, 25 Sep 2012 06:56:52 GMT (envelope-from svn-freebsd-gecko@chruetertee.ch) Date: Tue, 25 Sep 2012 06:56:52 GMT Message-Id: <201209250656.q8P6uqax065536@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] r1032 - 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: Tue, 25 Sep 2012 06:57:05 -0000 Author: jbeich Date: Tue Sep 25 06:56:52 2012 New Revision: 1032 Log: correct tunning example Modified: trunk/Gecko_ChangeLog Modified: trunk/Gecko_ChangeLog ============================================================================== --- trunk/Gecko_ChangeLog Mon Sep 24 18:20:09 2012 (r1031) +++ trunk/Gecko_ChangeLog Tue Sep 25 06:56:52 2012 (r1032) @@ -15,7 +15,10 @@ PR: ports/171534 [1], ports/171566 [2] -[3] To achieve similar effect for -esr ports try tuning malloc(3): +[3] To achieve similar effect for -esr ports on amd64: - $ MALLOC_CONF="narenas:1,lg_chunk:20" firefox # FreeBSD 10.0 - $ MALLOC_OPTIONS="2n2k" firefox # FreeBSD 7.0-9.x + $ MALLOC_CONF="narenas:1,lg_chunk:20" firefox # on FreeBSD 10.x + $ MALLOC_OPTIONS="2n2k" firefox # on FreeBSD 9.x + $ MALLOC_OPTIONS="2nk" firefox # on FreeBSD 8.1+ + $ MALLOC_OPTIONS="2n" firefox # on FreeBSD 8.0 + $ MALLOC_OPTIONS="4n" firefox # on FreeBSD 7.x From owner-freebsd-gecko@FreeBSD.ORG Tue Sep 25 07:03:04 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 D9C4D1065674 for ; Tue, 25 Sep 2012 07:03:04 +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 64FB58FC0A for ; Tue, 25 Sep 2012 07:03:04 +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 q8P733Xu095118 for ; Tue, 25 Sep 2012 07:03:03 GMT (envelope-from svn-freebsd-gecko@chruetertee.ch) Received: (from www@localhost) by trillian.chruetertee.ch (8.14.4/8.14.3/Submit) id q8P72wYT094717 for freebsd-gecko@freebsd.org; Tue, 25 Sep 2012 07:02:58 GMT (envelope-from svn-freebsd-gecko@chruetertee.ch) Date: Tue, 25 Sep 2012 07:02:58 GMT Message-Id: <201209250702.q8P72wYT094717@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] r1033 - 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: Tue, 25 Sep 2012 07:03:04 -0000 Author: jbeich Date: Tue Sep 25 07:02:58 2012 New Revision: 1033 Log: and remove it, this can only cause grief Modified: trunk/Gecko_ChangeLog Modified: trunk/Gecko_ChangeLog ============================================================================== --- trunk/Gecko_ChangeLog Tue Sep 25 06:56:52 2012 (r1032) +++ trunk/Gecko_ChangeLog Tue Sep 25 07:02:58 2012 (r1033) @@ -6,19 +6,10 @@ - unbreak -esr ports with clang3.2 [2] - 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: - - only heap-allocated reporter works in about:memory (see bug 762445) - - jemalloc is tuned to "narenas:1,lg_chunk:20" by default [3] +- use bundled jemalloc 3.0.0 on FreeBSD < 10.0 for gecko 16.0, + only heap-allocated reporter works in about:memory (see bug 762445) - 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 PR: ports/171534 [1], ports/171566 [2] - -[3] To achieve similar effect for -esr ports on amd64: - - $ MALLOC_CONF="narenas:1,lg_chunk:20" firefox # on FreeBSD 10.x - $ MALLOC_OPTIONS="2n2k" firefox # on FreeBSD 9.x - $ MALLOC_OPTIONS="2nk" firefox # on FreeBSD 8.1+ - $ MALLOC_OPTIONS="2n" firefox # on FreeBSD 8.0 - $ MALLOC_OPTIONS="4n" firefox # on FreeBSD 7.x From owner-freebsd-gecko@FreeBSD.ORG Thu Sep 27 19:14:59 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 5CD0810656E1 for ; Thu, 27 Sep 2012 19:14:59 +0000 (UTC) (envelope-from fiziologus@gmail.com) Received: from mail-ob0-f182.google.com (mail-ob0-f182.google.com [209.85.214.182]) by mx1.freebsd.org (Postfix) with ESMTP id 1C40B8FC12 for ; Thu, 27 Sep 2012 19:14:58 +0000 (UTC) Received: by obbwc20 with SMTP id wc20so1537175obb.13 for ; Thu, 27 Sep 2012 12:14:58 -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=b39KzFqMPIMLNeZ74iXJe4NXVL9C9WpHnTTHLnx73Bc=; b=AZwU1wyhm3E+4ygpDcnAPhUdDWxRJ8JkbCThIzlbSVVkSiiXMNxRm6wp8AC2JmfXI6 Yb45+wwrzcfVwQffGKk4ir3kvLPZgoobX7WEZ+mDUI9NNejNwpaNIj/ojVo8EqhLHbta ask0nPyzS9mh2Tahd2TKk98f1JANY5BHaxn2UwaJ+pUF/01vlrMHpA0oAzkLddOxeBfh n6uA2Mb++T4BMb0Dx0BRPVVZIFoKoh4ORKIPu42QyrppicKt9pF2QCgr5vEgS1YHGQr1 K07U10GOR0oojcs+VWO4dj/RMLIrpGWrf4WLR5/GGnTKOBfnhOlet3/T806pR1nvDjqO DCuw== MIME-Version: 1.0 Received: by 10.60.19.37 with SMTP id b5mr4106902oee.16.1348773298001; Thu, 27 Sep 2012 12:14:58 -0700 (PDT) Received: by 10.76.12.72 with HTTP; Thu, 27 Sep 2012 12:14:57 -0700 (PDT) Date: Thu, 27 Sep 2012 23:14:57 +0400 Message-ID: From: green dog To: gecko@FreeBSD.org Content-Type: multipart/mixed; boundary=e89a8ff1c4b84f578b04cab3c118 Cc: Subject: [security/nss] fix install error 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, 27 Sep 2012 19:14:59 -0000 --e89a8ff1c4b84f578b04cab3c118 Content-Type: text/plain; charset=ISO-8859-1 fix install error if CC is defined ====== cat /etc/make.conf CC=/usr/bin/clang CXX=/usr/bin/clang++ CPP=/usr/bin/clang-cpp # added by use.perl 2012-08-13 23:14:06 PERL_VERSION=5.14.2 QT4_OPTIONS= error # make install ===> Installing for nss-3.13.6 ===> nss-3.13.6 depends on shared library: nspr4.1 - found ===> nss-3.13.6 depends on shared library: sqlite3.8 - found ===> Generating temporary packing list ===> Checking if security/nss already installed /bin/mkdir -p /usr/local/include/nss/nss /usr/local/lib/nss /usr/bin/find /usr/ports/security/nss/work/nss-3.13.6/mozilla/dist/public/nss -type l -exec install -o root -g wheel -m 444 {} /usr/local/include/nss/nss \; install -o root -g wheel -m 444 /usr/ports/security/nss/work/nss-3.13.6/mozilla/dist/FreeBSD9.0_OPT.OBJ/lib/*.so.1 /usr/local/lib/nss install: /usr/ports/security/nss/work/nss-3.13.6/mozilla/dist/FreeBSD9.0_OPT.OBJ/lib/*.so.1: No such file or directory *** Error code 71 Stop in /usr/ports/security/nss. # ls /usr/ports/security/nss/work/nss-3.13.6/mozilla/dist FreeBSD9.0_clang_OPT.OBJ private public ======= if CC=/usr/local/cc then FreeBSD9.0_cc_OPT.OBJ --e89a8ff1c4b84f578b04cab3c118 Content-Type: application/octet-stream; name="patch-..::corefont::arch.mk" Content-Disposition: attachment; filename="patch-..::corefont::arch.mk" Content-Transfer-Encoding: base64 X-Attachment-Id: f_h7m8l8ck0 LS0tIC4uLy4uL3NlY3VyaXR5L2NvcmVjb25mL2FyY2gubWsub3JpZwkyMDEyLTA5LTI3IDIyOjUz OjEyLjAwMDAwMDAwMCArMDQwMAorKysgLi4vLi4vc2VjdXJpdHkvY29yZWNvbmYvYXJjaC5tawky MDEyLTA5LTI3IDIyOjUzOjU1LjAwMDAwMDAwMCArMDQwMApAQCAtMzI0LDcgKzMyNCw3IEBACiAj IElNUExfU1RSQVRFR1kgbWF5IGJlIGRlZmluZWQgdG9vLgogIwogCi1PQkpESVJfTkFNRSA9ICQo T1NfVEFSR0VUKSQoT1NfUkVMRUFTRSkkKENQVV9UQUcpJChDT01QSUxFUl9UQUcpJChMSUJDX1RB RykkKElNUExfU1RSQVRFR1kpJChPQkpESVJfVEFHKS5PQkoKK09CSkRJUl9OQU1FID0gJChPU19U QVJHRVQpJChPU19SRUxFQVNFKSQoQ1BVX1RBRykkKExJQkNfVEFHKSQoSU1QTF9TVFJBVEVHWSkk KE9CSkRJUl9UQUcpLk9CSgogCiBpZmVxICgsJChmaWx0ZXItb3V0IFdJTiUsJChPU19UQVJHRVQp KSkKIGlmbmRlZiBCVUlMRF9PUFQKQEAgLTMzMyw3ICszMzMsNyBAQAogIyAoUlRMKSBpbiB0aGUg ZGVidWcgYnVpbGQKICMKIGlmZGVmIFVTRV9ERUJVR19SVEwKLSAgICBPQkpESVJfTkFNRSA9ICQo T1NfVEFSR0VUKSQoT1NfUkVMRUFTRSkkKENQVV9UQUcpJChDT01QSUxFUl9UQUcpJChJTVBMX1NU UkFURUdZKSQoT0JKRElSX1RBRykuT0JKRAorICAgIE9CSkRJUl9OQU1FID0gJChPU19UQVJHRVQp JChPU19SRUxFQVNFKSQoQ1BVX1RBRykkKElNUExfU1RSQVRFR1kpJChPQkpESVJfVEFHKS5PQkpE CiBlbmRpZgogZW5kaWYKIGVuZGlmCg== --e89a8ff1c4b84f578b04cab3c118-- From owner-freebsd-gecko@FreeBSD.ORG Fri Sep 28 03:30:05 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 BE81E106564A for ; Fri, 28 Sep 2012 03:30:05 +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 4F53E8FC0C for ; Fri, 28 Sep 2012 03:30:04 +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 q8S3U3k1070205 for ; Fri, 28 Sep 2012 03:30:03 GMT (envelope-from svn-freebsd-gecko@chruetertee.ch) Received: (from www@localhost) by trillian.chruetertee.ch (8.14.4/8.14.3/Submit) id q8S3TwMN068261 for freebsd-gecko@freebsd.org; Fri, 28 Sep 2012 03:29:58 GMT (envelope-from svn-freebsd-gecko@chruetertee.ch) Date: Fri, 28 Sep 2012 03:29:58 GMT Message-Id: <201209280329.q8S3TwMN068261@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] r1034 - in trunk: . mail/thunderbird mail/thunderbird-esr www/firefox 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: Fri, 28 Sep 2012 03:30:05 -0000 Author: jbeich Date: Fri Sep 28 03:29:58 2012 New Revision: 1034 Log: integrate enigmail into thunderbird/seamonkey ports Submitted by: ale (earlier version) Tested by: flo Modified: trunk/Gecko_ChangeLog trunk/Gecko_TODO trunk/mail/thunderbird-esr/Makefile trunk/mail/thunderbird-esr/distinfo trunk/mail/thunderbird/Makefile trunk/mail/thunderbird/distinfo trunk/www/firefox/Makefile.options trunk/www/seamonkey/Makefile trunk/www/seamonkey/distinfo Modified: trunk/Gecko_ChangeLog ============================================================================== --- trunk/Gecko_ChangeLog Tue Sep 25 07:02:58 2012 (r1033) +++ trunk/Gecko_ChangeLog Fri Sep 28 03:29:58 2012 (r1034) @@ -1,4 +1,5 @@ 16.0: +- integrate enigmail into thunderbird/seamonkey - switch firefox 16.0 and seamonkey 2.13 to ALSA by default for better latency during pause and seeking with HTML5 video - remove fedisableexcept() hacks, obsolete since FreeBSD 4.0 Modified: trunk/Gecko_TODO ============================================================================== --- trunk/Gecko_TODO Tue Sep 25 07:02:58 2012 (r1033) +++ trunk/Gecko_TODO Fri Sep 28 03:29:58 2012 (r1034) @@ -7,7 +7,6 @@ - add BlueGriffon to replace www/kompozer - switch to system libxul (needs slaves with common patches); a Debian patch to reduce configure time can be useful -- integrate enigmail into thunderbird/seamonkey - move duplicated `>=' deps into bsd.gecko.mk (system libxul?) - push @plt/.hidden patch for JS upstream (needs a test case) - push system db(3) patch upstream Modified: trunk/mail/thunderbird-esr/Makefile ============================================================================== --- trunk/mail/thunderbird-esr/Makefile Tue Sep 25 07:02:58 2012 (r1033) +++ trunk/mail/thunderbird-esr/Makefile Fri Sep 28 03:29:58 2012 (r1034) @@ -10,7 +10,8 @@ CATEGORIES= mail ipv6 MASTER_SITES= ${MASTER_SITE_MOZILLA} MASTER_SITE_SUBDIR= ${PORTNAME}/releases/${DISTVERSION}esr/source -DISTNAME= ${PORTNAME}-${DISTVERSION}esr.source +DISTFILES= ${PORTNAME}-${DISTVERSION}esr.source${EXTRACT_SUFX} +EXTRACT_ONLY= ${PORTNAME}-${DISTVERSION}esr.source${EXTRACT_SUFX} MAINTAINER= gecko@FreeBSD.org COMMENT= Mozilla Thunderbird is standalone mail and news that stands above @@ -21,6 +22,8 @@ cairo>=1.10.2_1,1:${PORTSDIR}/graphics/cairo \ unzip:${PORTSDIR}/archivers/unzip +EM_VERSION= 1.4.4 + USE_AUTOTOOLS= autoconf213:env LATEST_LINK= thunderbird-esr USE_GECKO= gecko @@ -51,7 +54,8 @@ SYSTEM_PREFS= ${FAKEDIR}/lib/${PORTNAME}/defaults/pref/${PORTNAME}.js MOZ_PIS_SCRIPTS=moz_pis_S50cleanhome -OPTIONS_DEFINE= LIGHTNING +OPTIONS_DEFINE= ENIGMAIL LIGHTNING +OPTIONS_DEFAULT=ENIGMAIL .include "${.CURDIR}/../../www/firefox/Makefile.options" .include @@ -59,6 +63,8 @@ WRKSRC= ${WRKDIR}/comm-esr10 MOZSRC:= ${WRKSRC}/mozilla +XPI_LIBDIR= ${PREFIX}/lib/xpi + .if ${ARCH} == amd64 CONFIGURE_TARGET=x86_64-portbld-freebsd${OSREL} .elif ${ARCH} == powerpc64 @@ -78,12 +84,25 @@ CFLAGS+= -Wno-return-type-c-linkage .endif +.if ${PORT_OPTIONS:MENIGMAIL} +MASTER_SITES+= http://www.enigmail.net/download/source/:enigmail +DISTFILES+= ${EM_DISTFILE}:enigmail +RUN_DEPENDS+= gpg:${PORTSDIR}/security/gnupg +EM_DISTNAME= enigmail-${EM_VERSION} +EM_DISTFILE= ${EM_DISTNAME}.tar.gz +EM_XPI_FILE= ${MOZ_OBJDIR}/mozilla/dist/bin/${EM_DISTNAME}-freebsd-${ARCH:S/amd64/x86_64/}.xpi +EM_ORIG_ID= {847b3a00-7ab1-11d4-8f02-006008948af5} +EM_ID= ${PORTNAME}@mozilla-enigmail.org +EM_ID_RFILES= ${XPI_LIBDIR}/${EM_ID}/install.rdf \ + ${XPI_LIBDIR}/${EM_ID}/components/enigmail.js \ + ${XPI_LIBDIR}/${EM_ID}/modules/enigmailCommon.jsm +.endif + .if ${PORT_OPTIONS:MLIGHTNING} MOZ_OPTIONS+= --enable-calendar MOZ_MK_OPTIONS+= MOZ_CO_PROJECT=calendar LIGHTNING_DIR= share/lightning XPI_FILE= ${MOZ_OBJDIR}/mozilla/dist/xpi-stage/lightning.xpi -XPI_LIBDIR= ${PREFIX}/lib/xpi XPI_ORIG_ID= {e2fda1a4-762b-4020-b5ad-a41df1933103} XPI_ID= lightning@thunderbird.mozilla.org .else @@ -93,16 +112,37 @@ post-extract: @${SED} -e 's|@PORTNAME_ICON@|${PORTNAME_ICON}|;s|@MOZILLA@|${MOZILLA}|' \ <${FILESDIR}/thunderbird.desktop.in >${WRKDIR}/${MOZILLA_EXEC_NAME}.desktop +.if ${PORT_OPTIONS:MENIGMAIL} + @${TAR} -xf ${_DISTDIR}/${EM_DISTFILE} \ + -C ${WRKSRC}/mailnews/extensions +.endif post-patch: @${REINPLACE_CMD} -e 's|%%LOCALBASE%%|${LOCALBASE}|g' \ ${WRKSRC}/mail/app/nsMailApp.cpp +.if ${PORT_OPTIONS:MENIGMAIL} + @${REINPLACE_CMD} -e 's,/usr/bin/perl,${PERL},' \ + ${WRKSRC}/mailnews/extensions/enigmail/makemake + @${REINPLACE_CMD} -e '/^xpi/s/$$/ all/' \ + -e '/^XPI_MODULE_VERS/s/= .*/= ${EM_VERSION}/' \ + ${WRKSRC}/mailnews/extensions/enigmail/Makefile.in + @${REINPLACE_CMD} -e '/em:version/s,>[^<]*<,>${EM_VERSION}<,' \ + ${WRKSRC}/mailnews/extensions/enigmail/package/install.rdf +.endif pre-configure: (cd ${WRKSRC} && ${AUTOCONF}) (cd ${MOZSRC} && ${AUTOCONF}) (cd ${MOZSRC}/js/src/ && ${AUTOCONF}) +.if ${PORT_OPTIONS:MENIGMAIL} +post-build: + cd ${WRKSRC}/mailnews/extensions/enigmail && \ + ./makemake -r -o ${MOZ_OBJDIR} + ${SETENV} ${MAKE_ENV} ${GMAKE} ${_MAKE_JOBS} all xpi \ + -C ${MOZ_OBJDIR}/mailnews/extensions/enigmail +.endif + port-pre-install: ${MKDIR} ${FAKEDIR}/lib/${PORTNAME}/defaults @@ -130,7 +170,25 @@ @${ECHO_CMD} '@unexec ${RM} -f ${LOCALBASE}/lib/thunderbird/extensions/${XPI_ID}' >> ${TMPPLIST} @(cd ${XPI_LIBDIR}; ${FIND} ${XPI_ID} -type d) | ${SORT} -r | \ ${SED} -ne 's,^,@dirrm lib/xpi/,p' >> ${TMPPLIST} - @${ECHO_CMD} '@unexec rmdir %D/lib/xpi/symlinks/thunderbird 2>/dev/null || true' >> ${TMPPLIST} +.endif +.if ${PORT_OPTIONS:MENIGMAIL} + @${MKDIR} ${XPI_LIBDIR}/${EM_ID} ${XPI_LIBDIR}/symlinks/${PORTNAME} + @(cd ${XPI_LIBDIR}/${EM_ID}; ${TAR} -xf ${EM_XPI_FILE}) + @${CHOWN} -R ${SHAREOWN}:${SHAREGRP} ${XPI_LIBDIR}/${EM_ID} + @${REINPLACE_CMD} -i "" "s/${EM_ORIG_ID}/${EM_ID}/" ${EM_ID_RFILES} + @${CHMOD} -R a+rX,go-w ${XPI_LIBDIR}/${EM_ID} + @${LN} -sf ${XPI_LIBDIR}/${EM_ID} ${LOCALBASE}/lib/${PORTNAME}/extensions 2>/dev/null || true + @${LN} -sf ${XPI_LIBDIR}/${EM_ID} ${XPI_LIBDIR}/symlinks/${PORTNAME} 2>/dev/null || true + @(cd ${XPI_LIBDIR}; ${FIND} ${EM_ID} -not -type d) | ${SORT} | \ + ${SED} -ne 's,^,lib/xpi/,p' >> ${TMPPLIST} + @${ECHO_CMD} 'lib/xpi/symlinks/${PORTNAME}/${EM_ID}' >> ${TMPPLIST} + @${ECHO_CMD} '@exec ${LN} -sf %D/lib/xpi/${EM_ID} ${LOCALBASE}/lib/${PORTNAME}/extensions 2>/dev/null || true' >> ${TMPPLIST} + @${ECHO_CMD} '@unexec ${RM} -f ${LOCALBASE}/lib/${PORTNAME}/extensions/${EM_ID}' >> ${TMPPLIST} + @(cd ${XPI_LIBDIR}; ${FIND} ${EM_ID} -type d) | ${SORT} -r | \ + ${SED} -ne 's,^,@dirrm lib/xpi/,p' >> ${TMPPLIST} +.endif +.if ${PORT_OPTIONS:MLIGHTNING} || ${PORT_OPTIONS:MENIGMAIL} + @${ECHO_CMD} '@unexec rmdir %D/lib/xpi/symlinks/${PORTNAME} 2>/dev/null || true' >> ${TMPPLIST} @${ECHO_CMD} '@unexec rmdir %D/lib/xpi/symlinks 2>/dev/null || true' >> ${TMPPLIST} @${ECHO_CMD} '@unexec rmdir %D/lib/xpi 2>/dev/null || true' >> ${TMPPLIST} .endif Modified: trunk/mail/thunderbird-esr/distinfo ============================================================================== --- trunk/mail/thunderbird-esr/distinfo Tue Sep 25 07:02:58 2012 (r1033) +++ trunk/mail/thunderbird-esr/distinfo Fri Sep 28 03:29:58 2012 (r1034) @@ -1,2 +1,4 @@ SHA256 (thunderbird-10.0.7esr.source.tar.bz2) = 994ca16a01e4446747b54b1b5fb2bda11aec2c92359571bffa0f6c8e45f27c35 SIZE (thunderbird-10.0.7esr.source.tar.bz2) = 97590919 +SHA256 (enigmail-1.4.4.tar.gz) = ec62bb701968f72ad35546660132e6e47d4ebe684df1d27fc615cb9010a203b8 +SIZE (enigmail-1.4.4.tar.gz) = 1269444 Modified: trunk/mail/thunderbird/Makefile ============================================================================== --- trunk/mail/thunderbird/Makefile Tue Sep 25 07:02:58 2012 (r1033) +++ trunk/mail/thunderbird/Makefile Fri Sep 28 03:29:58 2012 (r1034) @@ -10,7 +10,8 @@ CATEGORIES= mail ipv6 MASTER_SITES= ${MASTER_SITE_MOZILLA} MASTER_SITE_SUBDIR= ${PORTNAME}/releases/${DISTVERSION}/source -DISTNAME= ${PORTNAME}-${DISTVERSION}.source +DISTFILES= ${PORTNAME}-${DISTVERSION}.source${EXTRACT_SUFX} +EXTRACT_ONLY= ${PORTNAME}-${DISTVERSION}.source${EXTRACT_SUFX} MAINTAINER= gecko@FreeBSD.org COMMENT= Mozilla Thunderbird is standalone mail and news that stands above @@ -22,6 +23,8 @@ cairo>=1.10.2_1,1:${PORTSDIR}/graphics/cairo \ unzip:${PORTSDIR}/archivers/unzip +EM_VERSION= 1.4.4 + USE_AUTOTOOLS= autoconf213:env USE_PYTHON_BUILD=yes USE_GECKO= gecko @@ -52,7 +55,8 @@ SYSTEM_PREFS= ${FAKEDIR}/lib/${PORTNAME}/defaults/pref/${PORTNAME}.js MOZ_PIS_SCRIPTS=moz_pis_S50cleanhome -OPTIONS_DEFINE= GSTREAMER LIGHTNING +OPTIONS_DEFINE= ENIGMAIL GSTREAMER LIGHTNING +OPTIONS_DEFAULT=ENIGMAIL .include "${.CURDIR}/../../www/firefox/Makefile.options" .include @@ -60,6 +64,8 @@ WRKSRC= ${WRKDIR}/comm-beta MOZSRC:= ${WRKSRC}/mozilla +XPI_LIBDIR= ${PREFIX}/lib/xpi + .if ${ARCH} == amd64 CONFIGURE_TARGET=x86_64-portbld-freebsd${OSREL} .elif ${ARCH} == powerpc64 @@ -75,12 +81,25 @@ BUILD_DEPENDS+= yasm:${PORTSDIR}/devel/yasm .endif +.if ${PORT_OPTIONS:MENIGMAIL} +MASTER_SITES+= http://www.enigmail.net/download/source/:enigmail +DISTFILES+= ${EM_DISTFILE}:enigmail +RUN_DEPENDS+= gpg:${PORTSDIR}/security/gnupg +EM_DISTNAME= enigmail-${EM_VERSION} +EM_DISTFILE= ${EM_DISTNAME}.tar.gz +EM_XPI_FILE= ${MOZ_OBJDIR}/mozilla/dist/bin/${EM_DISTNAME}-freebsd-${ARCH:S/amd64/x86_64/}.xpi +EM_ORIG_ID= {847b3a00-7ab1-11d4-8f02-006008948af5} +EM_ID= ${PORTNAME}@mozilla-enigmail.org +EM_ID_RFILES= ${XPI_LIBDIR}/${EM_ID}/install.rdf \ + ${XPI_LIBDIR}/${EM_ID}/components/enigmail.js \ + ${XPI_LIBDIR}/${EM_ID}/modules/enigmailCommon.jsm +.endif + .if ${PORT_OPTIONS:MLIGHTNING} MOZ_OPTIONS+= --enable-calendar MOZ_MK_OPTIONS+= MOZ_CO_PROJECT=calendar LIGHTNING_DIR= share/lightning XPI_FILE= ${MOZ_OBJDIR}/mozilla/dist/xpi-stage/lightning.xpi -XPI_LIBDIR= ${PREFIX}/lib/xpi XPI_ORIG_ID= {e2fda1a4-762b-4020-b5ad-a41df1933103} XPI_ID= lightning@thunderbird.mozilla.org .else @@ -90,16 +109,37 @@ post-extract: @${SED} -e 's|@PORTNAME_ICON@|${PORTNAME_ICON}|;s|@MOZILLA@|${MOZILLA}|' \ <${FILESDIR}/thunderbird.desktop.in >${WRKDIR}/${MOZILLA_EXEC_NAME}.desktop +.if ${PORT_OPTIONS:MENIGMAIL} + @${TAR} -xf ${_DISTDIR}/${EM_DISTFILE} \ + -C ${WRKSRC}/mailnews/extensions +.endif post-patch: @${REINPLACE_CMD} -e 's|%%LOCALBASE%%|${LOCALBASE}|g' \ ${WRKSRC}/mail/app/nsMailApp.cpp +.if ${PORT_OPTIONS:MENIGMAIL} + @${REINPLACE_CMD} -e 's,/usr/bin/perl,${PERL},' \ + ${WRKSRC}/mailnews/extensions/enigmail/makemake + @${REINPLACE_CMD} -e '/^xpi/s/$$/ all/' \ + -e '/^XPI_MODULE_VERS/s/= .*/= ${EM_VERSION}/' \ + ${WRKSRC}/mailnews/extensions/enigmail/Makefile.in + @${REINPLACE_CMD} -e '/em:version/s,>[^<]*<,>${EM_VERSION}<,' \ + ${WRKSRC}/mailnews/extensions/enigmail/package/install.rdf +.endif pre-configure: (cd ${WRKSRC} && ${AUTOCONF}) (cd ${MOZSRC} && ${AUTOCONF}) (cd ${MOZSRC}/js/src/ && ${AUTOCONF}) +.if ${PORT_OPTIONS:MENIGMAIL} +post-build: + cd ${WRKSRC}/mailnews/extensions/enigmail && \ + ./makemake -r -o ${MOZ_OBJDIR} + ${SETENV} ${MAKE_ENV} ${GMAKE} ${_MAKE_JOBS} all xpi \ + -C ${MOZ_OBJDIR}/mailnews/extensions/enigmail +.endif + port-pre-install: ${MKDIR} ${FAKEDIR}/lib/${PORTNAME}/defaults @@ -127,7 +167,25 @@ @${ECHO_CMD} '@unexec ${RM} -f ${LOCALBASE}/lib/thunderbird/extensions/${XPI_ID}' >> ${TMPPLIST} @(cd ${XPI_LIBDIR}; ${FIND} ${XPI_ID} -type d) | ${SORT} -r | \ ${SED} -ne 's,^,@dirrm lib/xpi/,p' >> ${TMPPLIST} - @${ECHO_CMD} '@unexec rmdir %D/lib/xpi/symlinks/thunderbird 2>/dev/null || true' >> ${TMPPLIST} +.endif +.if ${PORT_OPTIONS:MENIGMAIL} + @${MKDIR} ${XPI_LIBDIR}/${EM_ID} ${XPI_LIBDIR}/symlinks/${PORTNAME} + @(cd ${XPI_LIBDIR}/${EM_ID}; ${TAR} -xf ${EM_XPI_FILE}) + @${CHOWN} -R ${SHAREOWN}:${SHAREGRP} ${XPI_LIBDIR}/${EM_ID} + @${REINPLACE_CMD} -i "" "s/${EM_ORIG_ID}/${EM_ID}/" ${EM_ID_RFILES} + @${CHMOD} -R a+rX,go-w ${XPI_LIBDIR}/${EM_ID} + @${LN} -sf ${XPI_LIBDIR}/${EM_ID} ${LOCALBASE}/lib/${PORTNAME}/extensions 2>/dev/null || true + @${LN} -sf ${XPI_LIBDIR}/${EM_ID} ${XPI_LIBDIR}/symlinks/${PORTNAME} 2>/dev/null || true + @(cd ${XPI_LIBDIR}; ${FIND} ${EM_ID} -not -type d) | ${SORT} | \ + ${SED} -ne 's,^,lib/xpi/,p' >> ${TMPPLIST} + @${ECHO_CMD} 'lib/xpi/symlinks/${PORTNAME}/${EM_ID}' >> ${TMPPLIST} + @${ECHO_CMD} '@exec ${LN} -sf %D/lib/xpi/${EM_ID} ${LOCALBASE}/lib/${PORTNAME}/extensions 2>/dev/null || true' >> ${TMPPLIST} + @${ECHO_CMD} '@unexec ${RM} -f ${LOCALBASE}/lib/${PORTNAME}/extensions/${EM_ID}' >> ${TMPPLIST} + @(cd ${XPI_LIBDIR}; ${FIND} ${EM_ID} -type d) | ${SORT} -r | \ + ${SED} -ne 's,^,@dirrm lib/xpi/,p' >> ${TMPPLIST} +.endif +.if ${PORT_OPTIONS:MLIGHTNING} || ${PORT_OPTIONS:MENIGMAIL} + @${ECHO_CMD} '@unexec rmdir %D/lib/xpi/symlinks/${PORTNAME} 2>/dev/null || true' >> ${TMPPLIST} @${ECHO_CMD} '@unexec rmdir %D/lib/xpi/symlinks 2>/dev/null || true' >> ${TMPPLIST} @${ECHO_CMD} '@unexec rmdir %D/lib/xpi 2>/dev/null || true' >> ${TMPPLIST} .endif Modified: trunk/mail/thunderbird/distinfo ============================================================================== --- trunk/mail/thunderbird/distinfo Tue Sep 25 07:02:58 2012 (r1033) +++ trunk/mail/thunderbird/distinfo Fri Sep 28 03:29:58 2012 (r1034) @@ -1,2 +1,4 @@ SHA256 (thunderbird-16.0b2.source.tar.bz2) = bba7d79e2939806c027ac82592c408ea815d3094a70f8f277b959966d1baa511 SIZE (thunderbird-16.0b2.source.tar.bz2) = 111787029 +SHA256 (enigmail-1.4.4.tar.gz) = ec62bb701968f72ad35546660132e6e47d4ebe684df1d27fc615cb9010a203b8 +SIZE (enigmail-1.4.4.tar.gz) = 1269444 Modified: trunk/www/firefox/Makefile.options ============================================================================== --- trunk/www/firefox/Makefile.options Tue Sep 25 07:02:58 2012 (r1033) +++ trunk/www/firefox/Makefile.options Fri Sep 28 03:29:58 2012 (r1034) @@ -12,8 +12,9 @@ OPTIONS_MULTI+= GNOME OPTIONS_MULTI_GNOME= GCONF GIO GNOMEUI GNOMEVFS2 +ENIGMAIL_DESC?= Enigmail extension GIO_DESC?= GIO for file I/O # move to bsd.options.desc.mk GNOMEUI_DESC?= libgnomeui support module +LIBPROXY_DESC?= Proxy support via libproxy LIGHTNING_DESC?= Calendar extension LOGGING_DESC?= Additional log messages -LIBPROXY_DESC?= Proxy support via libproxy Modified: trunk/www/seamonkey/Makefile ============================================================================== --- trunk/www/seamonkey/Makefile Tue Sep 25 07:02:58 2012 (r1033) +++ trunk/www/seamonkey/Makefile Fri Sep 28 03:29:58 2012 (r1034) @@ -10,7 +10,8 @@ CATEGORIES?= www ipv6 MASTER_SITES= ${MASTER_SITE_MOZILLA_EXTENDED} MASTER_SITE_SUBDIR= seamonkey/releases/${DISTVERSION}/source -DISTNAME= seamonkey-${DISTVERSION}.source +DISTFILES= seamonkey-${DISTVERSION}.source${EXTRACT_SUFX} +EXTRACT_ONLY= seamonkey-${DISTVERSION}.source${EXTRACT_SUFX} MAINTAINER= gecko@FreeBSD.org COMMENT= The open source, standards compliant web browser @@ -21,6 +22,8 @@ ${PYTHON_SITELIBDIR}/_sqlite3.so:${PORTSDIR}/databases/py-sqlite3 \ unzip:${PORTSDIR}/archivers/unzip +EM_VERSION= 1.4.4 + USE_AUTOTOOLS= autoconf213:env USE_PYTHON_BUILD=yes USE_BZIP2= yes @@ -45,8 +48,8 @@ NOT_FOR_ARCHS= ia64 -OPTIONS_DEFINE= CHATZILLA COMPOSER GSTREAMER LDAP LIGHTNING MAILNEWS -OPTIONS_DEFAULT=CHATZILLA COMPOSER LDAP MAILNEWS +OPTIONS_DEFINE= CHATZILLA COMPOSER ENIGMAIL GSTREAMER LDAP LIGHTNING MAILNEWS +OPTIONS_DEFAULT=CHATZILLA COMPOSER ENIGMAIL LDAP MAILNEWS CHATZILLA_DESC?=Chatzilla IRC module COMPOSER_DESC?= HTML Composer module @@ -62,6 +65,8 @@ WRKSRC= ${WRKDIR}/comm-beta MOZSRC:= ${WRKSRC}/mozilla +XPI_LIBDIR= ${PREFIX}/lib/xpi + .if ${ARCH} == amd64 CONFIGURE_TARGET=x86_64-portbld-freebsd${OSREL} .elif ${ARCH} == powerpc64 @@ -84,6 +89,19 @@ .else MOZ_OPTIONS+= --enable-ldap --enable-mailnews .endif +.if ${PORT_OPTIONS:MENIGMAIL} +MASTER_SITES+= http://www.enigmail.net/download/source/:enigmail +DISTFILES+= ${EM_DISTFILE}:enigmail +RUN_DEPENDS+= gpg:${PORTSDIR}/security/gnupg +EM_DISTNAME= enigmail-${EM_VERSION} +EM_DISTFILE= ${EM_DISTNAME}.tar.gz +EM_XPI_FILE= ${MOZ_OBJDIR}/mozilla/dist/bin/${EM_DISTNAME}-freebsd-${ARCH:S/amd64/x86_64/}.xpi +EM_ORIG_ID= {847b3a00-7ab1-11d4-8f02-006008948af5} +EM_ID= ${PORTNAME}@mozilla-enigmail.org +EM_ID_RFILES= ${XPI_LIBDIR}/${EM_ID}/install.rdf \ + ${XPI_LIBDIR}/${EM_ID}/components/enigmail.js \ + ${XPI_LIBDIR}/${EM_ID}/modules/enigmailCommon.jsm +.endif .endif .if ${PORT_OPTIONS:MCHATZILLA} MOZ_EXTENSIONS:= ${MOZ_EXTENSIONS},irc @@ -102,13 +120,18 @@ MOZ_MK_OPTIONS+= MOZ_CO_PROJECT=calendar LIGHTNING_DIR= share/lightning XPI_FILE= ${MOZ_OBJDIR}/mozilla/dist/xpi-stage/lightning.xpi -XPI_LIBDIR= ${PREFIX}/lib/xpi XPI_ORIG_ID= {e2fda1a4-762b-4020-b5ad-a41df1933103} XPI_ID= lightning@seamonkey.mozilla.org .else MOZ_OPTIONS+= --disable-calendar .endif +.if ${PORT_OPTIONS:MMAILNEWS} && ${PORT_OPTIONS:MENIGMAIL} +post-extract: + @${TAR} -xf ${_DISTDIR}/${EM_DISTFILE} \ + -C ${WRKSRC}/mailnews/extensions +.endif + post-patch: @${REINPLACE_CMD} -e 's|%%LOCALBASE%%|${LOCALBASE}|g' \ ${WRKSRC}/suite/app/nsSuiteApp.cpp @@ -117,11 +140,29 @@ @${SED} -e 's|%%MOZILLA%%|${MOZILLA}|g' \ < ${FILESDIR}/seamonkey.desktop.in > \ ${WRKDIR}/${MOZILLA}.desktop +.if ${PORT_OPTIONS:MMAILNEWS} && ${PORT_OPTIONS:MENIGMAIL} + @${REINPLACE_CMD} -e 's,/usr/bin/perl,${PERL},' \ + ${WRKSRC}/mailnews/extensions/enigmail/makemake + @${REINPLACE_CMD} -e '/^xpi/s/$$/ all/' \ + -e '/^XPI_MODULE_VERS/s/= .*/= ${EM_VERSION}/' \ + ${WRKSRC}/mailnews/extensions/enigmail/Makefile.in + @${REINPLACE_CMD} -e '/em:version/s,>[^<]*<,>${EM_VERSION}<,' \ + ${WRKSRC}/mailnews/extensions/enigmail/package/install.rdf +.endif + pre-configure: (cd ${WRKSRC} && ${AUTOCONF}) (cd ${MOZSRC} && ${AUTOCONF}) (cd ${MOZSRC}/js/src/ && ${AUTOCONF}) +.if ${PORT_OPTIONS:MMAILNEWS} && ${PORT_OPTIONS:MENIGMAIL} +post-build: + cd ${WRKSRC}/mailnews/extensions/enigmail && \ + ./makemake -r -o ${MOZ_OBJDIR} + ${SETENV} ${MAKE_ENV} ${GMAKE} ${_MAKE_JOBS} all xpi \ + -C ${MOZ_OBJDIR}/mailnews/extensions/enigmail +.endif + pre-install: ${ECHO_CMD} share/applications/${MOZILLA}.desktop >> ${PLIST} ${ECHO_CMD} "@unexec ${RMDIR} %D/share/applications 2>/dev/null || ${TRUE}" >> ${PLIST} @@ -149,7 +190,25 @@ @${ECHO_CMD} '@unexec ${RM} -f ${LOCALBASE}/lib/seamonkey/extensions/${XPI_ID}' >> ${TMPPLIST} @(cd ${XPI_LIBDIR}; ${FIND} ${XPI_ID} -type d) | ${SORT} -r | \ ${SED} -ne 's,^,@dirrm lib/xpi/,p' >> ${TMPPLIST} - @${ECHO_CMD} '@unexec rmdir %D/lib/xpi/symlinks/seamonkey 2>/dev/null || true' >> ${TMPPLIST} +.endif +.if ${PORT_OPTIONS:MMAILNEWS} && ${PORT_OPTIONS:MENIGMAIL} + @${MKDIR} ${XPI_LIBDIR}/${EM_ID} ${XPI_LIBDIR}/symlinks/${PORTNAME} + @(cd ${XPI_LIBDIR}/${EM_ID}; ${TAR} -xf ${EM_XPI_FILE}) + @${CHOWN} -R ${SHAREOWN}:${SHAREGRP} ${XPI_LIBDIR}/${EM_ID} + @${REINPLACE_CMD} -i "" "s/${EM_ORIG_ID}/${EM_ID}/" ${EM_ID_RFILES} + @${CHMOD} -R a+rX,go-w ${XPI_LIBDIR}/${EM_ID} + @${LN} -sf ${XPI_LIBDIR}/${EM_ID} ${LOCALBASE}/lib/${PORTNAME}/extensions 2>/dev/null || true + @${LN} -sf ${XPI_LIBDIR}/${EM_ID} ${XPI_LIBDIR}/symlinks/${PORTNAME} 2>/dev/null || true + @(cd ${XPI_LIBDIR}; ${FIND} ${EM_ID} -not -type d) | ${SORT} | \ + ${SED} -ne 's,^,lib/xpi/,p' >> ${TMPPLIST} + @${ECHO_CMD} 'lib/xpi/symlinks/${PORTNAME}/${EM_ID}' >> ${TMPPLIST} + @${ECHO_CMD} '@exec ${LN} -sf %D/lib/xpi/${EM_ID} ${LOCALBASE}/lib/${PORTNAME}/extensions 2>/dev/null || true' >> ${TMPPLIST} + @${ECHO_CMD} '@unexec ${RM} -f ${LOCALBASE}/lib/${PORTNAME}/extensions/${EM_ID}' >> ${TMPPLIST} + @(cd ${XPI_LIBDIR}; ${FIND} ${EM_ID} -type d) | ${SORT} -r | \ + ${SED} -ne 's,^,@dirrm lib/xpi/,p' >> ${TMPPLIST} +.endif +.if ${PORT_OPTIONS:MLIGHTNING} || ${PORT_OPTIONS:MMAILNEWS} && ${PORT_OPTIONS:MENIGMAIL} + @${ECHO_CMD} '@unexec rmdir %D/lib/xpi/symlinks/${PORTNAME} 2>/dev/null || true' >> ${TMPPLIST} @${ECHO_CMD} '@unexec rmdir %D/lib/xpi/symlinks 2>/dev/null || true' >> ${TMPPLIST} @${ECHO_CMD} '@unexec rmdir %D/lib/xpi 2>/dev/null || true' >> ${TMPPLIST} .endif Modified: trunk/www/seamonkey/distinfo ============================================================================== --- trunk/www/seamonkey/distinfo Tue Sep 25 07:02:58 2012 (r1033) +++ trunk/www/seamonkey/distinfo Fri Sep 28 03:29:58 2012 (r1034) @@ -1,2 +1,4 @@ SHA256 (seamonkey-2.13b3.source.tar.bz2) = eb22e00a0ab091c189e7048fcbeeb6469759603290556a5ff36c6961950aa14d SIZE (seamonkey-2.13b3.source.tar.bz2) = 112000158 +SHA256 (enigmail-1.4.4.tar.gz) = ec62bb701968f72ad35546660132e6e47d4ebe684df1d27fc615cb9010a203b8 +SIZE (enigmail-1.4.4.tar.gz) = 1269444 From owner-freebsd-gecko@FreeBSD.ORG Fri Sep 28 03:30:13 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 B78DD106567B for ; Fri, 28 Sep 2012 03:30:13 +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 46AC48FC08 for ; Fri, 28 Sep 2012 03:30: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 q8S3UCxJ075079 for ; Fri, 28 Sep 2012 03:30:12 GMT (envelope-from svn-freebsd-gecko@chruetertee.ch) Received: (from www@localhost) by trillian.chruetertee.ch (8.14.4/8.14.3/Submit) id q8S3U7q2074472 for freebsd-gecko@freebsd.org; Fri, 28 Sep 2012 03:30:07 GMT (envelope-from svn-freebsd-gecko@chruetertee.ch) Date: Fri, 28 Sep 2012 03:30:07 GMT Message-Id: <201209280330.q8S3U7q2074472@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] r1035 - in trunk: Mk security/nss/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: Fri, 28 Sep 2012 03:30:13 -0000 Author: jbeich Date: Fri Sep 28 03:30:07 2012 New Revision: 1035 Log: unbreak --with-system-nss on mozilla-central checkout Modified: trunk/Mk/bsd.gecko.mk trunk/security/nss/files/nss-config.in Modified: trunk/Mk/bsd.gecko.mk ============================================================================== --- trunk/Mk/bsd.gecko.mk Fri Sep 28 03:29:58 2012 (r1034) +++ trunk/Mk/bsd.gecko.mk Fri Sep 28 03:30:07 2012 (r1035) @@ -543,7 +543,7 @@ MOZ_OPTIONS+= --prefix="${FAKEDIR}" CPPFLAGS+= -isystem${LOCALBASE}/include -LDFLAGS+= -L${LOCALBASE}/lib +LDFLAGS+= -L${LOCALBASE}/lib -Wl,-rpath,${PREFIX}/lib/${MOZ_RPATH} # Standard depends _ALL_DEPENDS= cairo dbm event ffi hunspell jpeg nspr nss png sqlite vpx zip @@ -578,8 +578,6 @@ nss_MOZ_OPTIONS= --with-system-nss nss_EXTRACT_AFTER_ARGS= --exclude mozilla*/security/coreconf \ --exclude mozilla*/security/nss -nss_CPPFLAGS+= -I${LOCALBASE}/include/nss -I${LOCALBASE}/include/nss/nss -nss_LDFLAGS+= -L${LOCALBASE}/lib/nss -Wl,-rpath,${PREFIX}/lib/${MOZ_RPATH} png_LIB_DEPENDS= png15:${PORTSDIR}/graphics/png png_MOZ_OPTIONS= --with-system-png=${LOCALBASE} @@ -606,8 +604,6 @@ RUN_DEPENDS+= ${${dep}_RUN_DEPENDS} MOZ_OPTIONS+= ${${dep}_MOZ_OPTIONS} EXTRACT_AFTER_ARGS+= ${${dep}_EXTRACT_AFTER_ARGS} -CPPFLAGS+= ${${dep}_CPPFLAGS} -LDFLAGS+= ${${dep}_LDFLAGS} .endif .endfor Modified: trunk/security/nss/files/nss-config.in ============================================================================== --- trunk/security/nss/files/nss-config.in Fri Sep 28 03:29:58 2012 (r1034) +++ trunk/security/nss/files/nss-config.in Fri Sep 28 03:30:07 2012 (r1035) @@ -123,7 +123,7 @@ fi if test "$echo_cflags" = "yes"; then - echo -I$includedir + echo -I$includedir -I$includedir/nss fi if test "$echo_libs" = "yes"; then From owner-freebsd-gecko@FreeBSD.ORG Fri Sep 28 03:30:26 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 53250106564A for ; Fri, 28 Sep 2012 03:30:26 +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 78A4F8FC0C for ; Fri, 28 Sep 2012 03:30:25 +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 q8S3UOhL078337 for ; Fri, 28 Sep 2012 03:30:24 GMT (envelope-from svn-freebsd-gecko@chruetertee.ch) Received: (from www@localhost) by trillian.chruetertee.ch (8.14.4/8.14.3/Submit) id q8S3UJ7e077003 for freebsd-gecko@freebsd.org; Fri, 28 Sep 2012 03:30:19 GMT (envelope-from svn-freebsd-gecko@chruetertee.ch) Date: Fri, 28 Sep 2012 03:30:19 GMT Message-Id: <201209280330.q8S3UJ7e077003@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] r1036 - in trunk: Mk mail/thunderbird-esr/files mail/thunderbird/files www/firefox-esr/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: Fri, 28 Sep 2012 03:30:26 -0000 Author: jbeich Date: Fri Sep 28 03:30:19 2012 New Revision: 1036 Log: remove patches for bundled jpeg/vpx Deleted: trunk/mail/thunderbird-esr/files/patch-bug785638 trunk/mail/thunderbird/files/patch-bug785638 trunk/www/firefox-esr/files/patch-bug785638 trunk/www/firefox/files/patch-bug785638 trunk/www/libxul/files/patch-bug785638 trunk/www/seamonkey/files/patch-bug785638 Modified: trunk/Mk/bsd.gecko.mk Modified: trunk/Mk/bsd.gecko.mk ============================================================================== --- trunk/Mk/bsd.gecko.mk Fri Sep 28 03:30:07 2012 (r1035) +++ trunk/Mk/bsd.gecko.mk Fri Sep 28 03:30:19 2012 (r1036) @@ -588,7 +588,7 @@ vpx_LIB_DEPENDS= vpx:${PORTSDIR}/multimedia/libvpx vpx_MOZ_OPTIONS= --with-system-libvpx -#vpx_EXTRACT_AFTER_ARGS= --exclude mozilla*/media/libvpx +vpx_EXTRACT_AFTER_ARGS= --exclude mozilla*/media/libvpx zip_BUILD_DEPENDS= zip:${PORTSDIR}/archivers/zip zip_RUN_DEPENDS= ${zip_BUILD_DEPENDS} Deleted: trunk/mail/thunderbird-esr/files/patch-bug785638 ============================================================================== --- trunk/mail/thunderbird-esr/files/patch-bug785638 Fri Sep 28 03:30:19 2012 (r1035) +++ /dev/null 00:00:00 1970 (deleted) @@ -1,168 +0,0 @@ -diff --git configure.in configure.in -index cef992b..3bd39ca 100644 ---- mozilla/configure.in -+++ mozilla/configure.in -@@ -5353,22 +5353,6 @@ if test -n "$MOZ_VP8" -a -z "$MOZ_NATIVE_LIBVPX"; then - - dnl See if we have assembly on this platform. - case "$OS_ARCH:$CPU_ARCH" in -- Linux:x86) -- VPX_ASFLAGS="-f elf32 -rnasm -pnasm" -- VPX_X86_ASM=1 -- ;; -- Linux:x86_64) -- VPX_ASFLAGS="-f elf64 -rnasm -pnasm -DPIC" -- VPX_X86_ASM=1 -- ;; -- SunOS:x86) -- VPX_ASFLAGS="-f elf32 -rnasm -pnasm" -- VPX_X86_ASM=1 -- ;; -- SunOS:x86_64) -- VPX_ASFLAGS="-f elf64 -rnasm -pnasm -DPIC" -- VPX_X86_ASM=1 -- ;; - Darwin:x86) - VPX_ASFLAGS="-f macho32 -rnasm -pnasm -DPIC" - VPX_X86_ASM=1 -@@ -5412,6 +5388,19 @@ if test -n "$MOZ_VP8" -a -z "$MOZ_NATIVE_LIBVPX"; then - VPX_ASM_SUFFIX="$ASM_SUFFIX" - VPX_ARM_ASM=1 - fi -+ ;; -+ *:x86) -+ if $CC -E -dM - 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 98D311065678 for ; Fri, 28 Sep 2012 03:30:33 +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 164EF8FC12 for ; Fri, 28 Sep 2012 03:30:32 +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 q8S3UWYQ078890 for ; Fri, 28 Sep 2012 03:30:32 GMT (envelope-from svn-freebsd-gecko@chruetertee.ch) Received: (from www@localhost) by trillian.chruetertee.ch (8.14.4/8.14.3/Submit) id q8S3UR42078734 for freebsd-gecko@freebsd.org; Fri, 28 Sep 2012 03:30:27 GMT (envelope-from svn-freebsd-gecko@chruetertee.ch) Date: Fri, 28 Sep 2012 03:30:27 GMT Message-Id: <201209280330.q8S3UR42078734@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] r1037 - trunk/security/nss/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: Fri, 28 Sep 2012 03:30:33 -0000 Author: jbeich Date: Fri Sep 28 03:30:26 2012 New Revision: 1037 Log: don't change objdir when $(CC) contains full path Reported by: green dog Added: trunk/security/nss/files/patch-..::coreconf::ruleset.mk Added: trunk/security/nss/files/patch-..::coreconf::ruleset.mk ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ trunk/security/nss/files/patch-..::coreconf::ruleset.mk Fri Sep 28 03:30:26 2012 (r1037) @@ -0,0 +1,11 @@ +--- ../coreconf/ruleset.mk~ ++++ ../coreconf/ruleset.mk +@@ -85,7 +85,7 @@ + # + + ifndef COMPILER_TAG +- ifneq ($(DEFAULT_COMPILER), $(notdir $(firstword $(CC)))) ++ ifneq ($(DEFAULT_COMPILER), $(CC)) + # + # Temporary define for the Client; to be removed when binary release is used + # From owner-freebsd-gecko@FreeBSD.ORG Fri Sep 28 04:05:42 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 6C1DD106564A for ; Fri, 28 Sep 2012 04:05:42 +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 CE58A8FC08 for ; Fri, 28 Sep 2012 04:05:41 +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 q8S45eJt013735 for ; Fri, 28 Sep 2012 04:05:40 GMT (envelope-from svn-freebsd-gecko@chruetertee.ch) Received: (from www@localhost) by trillian.chruetertee.ch (8.14.4/8.14.3/Submit) id q8S45Z2g013116 for freebsd-gecko@freebsd.org; Fri, 28 Sep 2012 04:05:35 GMT (envelope-from svn-freebsd-gecko@chruetertee.ch) Date: Fri, 28 Sep 2012 04:05:35 GMT Message-Id: <201209280405.q8S45Z2g013116@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] r1038 - in trunk: mail/thunderbird mail/thunderbird-esr 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: Fri, 28 Sep 2012 04:05:42 -0000 Author: jbeich Date: Fri Sep 28 04:05:35 2012 New Revision: 1038 Log: make enigmail work on -betas Modified: trunk/mail/thunderbird-esr/Makefile trunk/mail/thunderbird/Makefile trunk/www/seamonkey/Makefile Modified: trunk/mail/thunderbird-esr/Makefile ============================================================================== --- trunk/mail/thunderbird-esr/Makefile Fri Sep 28 03:30:26 2012 (r1037) +++ trunk/mail/thunderbird-esr/Makefile Fri Sep 28 04:05:35 2012 (r1038) @@ -127,6 +127,7 @@ -e '/^XPI_MODULE_VERS/s/= .*/= ${EM_VERSION}/' \ ${WRKSRC}/mailnews/extensions/enigmail/Makefile.in @${REINPLACE_CMD} -e '/em:version/s,>[^<]*<,>${EM_VERSION}<,' \ + -e '/em:maxVersion/s/pre//' \ ${WRKSRC}/mailnews/extensions/enigmail/package/install.rdf .endif Modified: trunk/mail/thunderbird/Makefile ============================================================================== --- trunk/mail/thunderbird/Makefile Fri Sep 28 03:30:26 2012 (r1037) +++ trunk/mail/thunderbird/Makefile Fri Sep 28 04:05:35 2012 (r1038) @@ -124,6 +124,7 @@ -e '/^XPI_MODULE_VERS/s/= .*/= ${EM_VERSION}/' \ ${WRKSRC}/mailnews/extensions/enigmail/Makefile.in @${REINPLACE_CMD} -e '/em:version/s,>[^<]*<,>${EM_VERSION}<,' \ + -e '/em:maxVersion/s/pre//' \ ${WRKSRC}/mailnews/extensions/enigmail/package/install.rdf .endif Modified: trunk/www/seamonkey/Makefile ============================================================================== --- trunk/www/seamonkey/Makefile Fri Sep 28 03:30:26 2012 (r1037) +++ trunk/www/seamonkey/Makefile Fri Sep 28 04:05:35 2012 (r1038) @@ -147,6 +147,7 @@ -e '/^XPI_MODULE_VERS/s/= .*/= ${EM_VERSION}/' \ ${WRKSRC}/mailnews/extensions/enigmail/Makefile.in @${REINPLACE_CMD} -e '/em:version/s,>[^<]*<,>${EM_VERSION}<,' \ + -e '/em:maxVersion/s/pre//' \ ${WRKSRC}/mailnews/extensions/enigmail/package/install.rdf .endif From owner-freebsd-gecko@FreeBSD.ORG Fri Sep 28 17:54:35 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 986FB106566C for ; Fri, 28 Sep 2012 17:54:35 +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 F0F818FC18 for ; Fri, 28 Sep 2012 17:54:34 +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 q8SHsWDA011621 for ; Fri, 28 Sep 2012 13:54:32 -0400 (EDT) (envelope-from andy@neu.net) Date: Fri, 28 Sep 2012 13:54:32 -0400 (EDT) From: AN To: freebsd-gecko@freebsd.org In-Reply-To: <201209280330.q8S3U7q2074472@trillian.chruetertee.ch> Message-ID: References: <201209280330.q8S3U7q2074472@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: Re: [SVN-Commit] r1035 - in trunk: Mk security/nss/files 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: Fri, 28 Sep 2012 17:54:35 -0000 On Fri, 28 Sep 2012, svn-freebsd-gecko@chruetertee.ch wrote: > Author: jbeich > Date: Fri Sep 28 03:30:07 2012 > New Revision: 1035 > > Log: > unbreak --with-system-nss on mozilla-central checkout > > Modified: > trunk/Mk/bsd.gecko.mk > trunk/security/nss/files/nss-config.in > > Modified: trunk/Mk/bsd.gecko.mk > ============================================================================== > --- trunk/Mk/bsd.gecko.mk Fri Sep 28 03:29:58 2012 (r1034) > +++ trunk/Mk/bsd.gecko.mk Fri Sep 28 03:30:07 2012 (r1035) > @@ -543,7 +543,7 @@ > MOZ_OPTIONS+= --prefix="${FAKEDIR}" > > CPPFLAGS+= -isystem${LOCALBASE}/include > -LDFLAGS+= -L${LOCALBASE}/lib > +LDFLAGS+= -L${LOCALBASE}/lib -Wl,-rpath,${PREFIX}/lib/${MOZ_RPATH} > > # Standard depends > _ALL_DEPENDS= cairo dbm event ffi hunspell jpeg nspr nss png sqlite vpx zip > @@ -578,8 +578,6 @@ > nss_MOZ_OPTIONS= --with-system-nss > nss_EXTRACT_AFTER_ARGS= --exclude mozilla*/security/coreconf \ > --exclude mozilla*/security/nss > -nss_CPPFLAGS+= -I${LOCALBASE}/include/nss -I${LOCALBASE}/include/nss/nss > -nss_LDFLAGS+= -L${LOCALBASE}/lib/nss -Wl,-rpath,${PREFIX}/lib/${MOZ_RPATH} > > png_LIB_DEPENDS= png15:${PORTSDIR}/graphics/png > png_MOZ_OPTIONS= --with-system-png=${LOCALBASE} > @@ -606,8 +604,6 @@ > RUN_DEPENDS+= ${${dep}_RUN_DEPENDS} > MOZ_OPTIONS+= ${${dep}_MOZ_OPTIONS} > EXTRACT_AFTER_ARGS+= ${${dep}_EXTRACT_AFTER_ARGS} > -CPPFLAGS+= ${${dep}_CPPFLAGS} > -LDFLAGS+= ${${dep}_LDFLAGS} > .endif > .endfor > > > Modified: trunk/security/nss/files/nss-config.in > ============================================================================== > --- trunk/security/nss/files/nss-config.in Fri Sep 28 03:29:58 2012 (r1034) > +++ trunk/security/nss/files/nss-config.in Fri Sep 28 03:30:07 2012 (r1035) > @@ -123,7 +123,7 @@ > fi > > if test "$echo_cflags" = "yes"; then > - echo -I$includedir > + echo -I$includedir -I$includedir/nss > fi > > if test "$echo_libs" = "yes"; then > _______________________________________________ > freebsd-gecko@freebsd.org mailing list > http://lists.freebsd.org/mailman/listinfo/freebsd-gecko > To unsubscribe, send any mail to "freebsd-gecko-unsubscribe@freebsd.org" > FreeBSD FBSD10 10.0-CURRENT FreeBSD 10.0-CURRENT #21 r241019: Thu Sep 27 23:09:26 EDT 2012 root@FBSD10:/usr/obj/usr/src/sys/MYKERNEL amd64 <...> clang++ -o nsNSSCleaner.o -c -I../../../../dist/stl_wrappers -I../../../../dist/system_wrappers -include ../../../../../config/gcc_hidden.h -DNSS_ENABLE_ECC -DDLL_PREFIX=\"lib\" -DDLL_SUFFIX=\".so\" -DMOZ_GLUE_IN_PROGRAM -DXPCOM_TRANSLATE_NSGM_ENTRY_POINT=1 -DMOZILLA_INTERNAL_API -D_IMPL_NS_COM -DEXPORT_XPT_API -DEXPORT_XPTC_API -D_IMPL_NS_GFX -D_IMPL_NS_WIDGET -DIMPL_XREAPI -DIMPL_NS_NET -DIMPL_THEBES -DSTATIC_EXPORTABLE_JS_API -I/usr/local/include/nss -I../../../../../security/manager/ssl/src -I. -I../../../../dist/include -I/usr/local/include/nspr -I/usr/local/include/nss -I/usr/local/include -I/usr/local/include -fPIC -Qunused-arguments -isystem/usr/local/include -I/usr/local/include -Qunused-arguments -Wall -Wpointer-arith -Woverloaded-virtual -Werror=return-type -Wtype-limits -Wempty-body -Wno-ctor-dtor-privacy -Wno-overlength-strings -Wno-invalid-offsetof -Wno-variadic-macros -Wno-c++0x-extensions -Wno-extended-offsetof -Wno-unknown-warning-option -Wno-return-type-c-linkage -Wno-mismatched-tags -O2 -pipe -fno-strict-aliasing -fno-exceptions -fno-strict-aliasing -fno-rtti -ffunction-sections -fdata-sections -fno-exceptions -std=gnu++0x -pipe -DNDEBUG -DTRIMMED -O2 -fomit-frame-pointer -Qunused-arguments -isystem/usr/local/include -I/usr/local/include -DMOZILLA_CLIENT -include ../../../../mozilla-config.h -MD -MF .deps/nsNSSCleaner.o.pp /home/root/ff_nightly/work/mozilla-central-cdd4506bc66c/security/manager/ssl/src/nsNSSCleaner.cpp nsCertOverrideService.cpp clang++ -o nsCertOverrideService.o -c -I../../../../dist/stl_wrappers -I../../../../dist/system_wrappers -include ../../../../../config/gcc_hidden.h -DNSS_ENABLE_ECC -DDLL_PREFIX=\"lib\" -DDLL_SUFFIX=\".so\" -DMOZ_GLUE_IN_PROGRAM -DXPCOM_TRANSLATE_NSGM_ENTRY_POINT=1 -DMOZILLA_INTERNAL_API -D_IMPL_NS_COM -DEXPORT_XPT_API -DEXPORT_XPTC_API -D_IMPL_NS_GFX -D_IMPL_NS_WIDGET -DIMPL_XREAPI -DIMPL_NS_NET -DIMPL_THEBES -DSTATIC_EXPORTABLE_JS_API -I/usr/local/include/nss -I../../../../../security/manager/ssl/src -I. -I../../../../dist/include -I/usr/local/include/nspr -I/usr/local/include/nss -I/usr/local/include -I/usr/local/include -fPIC -Qunused-arguments -isystem/usr/local/include -I/usr/local/include -Qunused-arguments -Wall -Wpointer-arith -Woverloaded-virtual -Werror=return-type -Wtype-limits -Wempty-body -Wno-ctor-dtor-privacy -Wno-overlength-strings -Wno-invalid-offsetof -Wno-variadic-macros -Wno-c++0x-extensions -Wno-extended-offsetof -Wno-unknown-warning-option -Wno-return-type-c-linkage -Wno-mismatched-tags -O2 -pipe -fno-strict-aliasing -fno-exceptions -fno-strict-aliasing -fno-rtti -ffunction-sections -fdata-sections -fno-exceptions -std=gnu++0x -pipe -DNDEBUG -DTRIMMED -O2 -fomit-frame-pointer -Qunused-arguments -isystem/usr/local/include -I/usr/local/include -DMOZILLA_CLIENT -include ../../../../mozilla-config.h -MD -MF .deps/nsCertOverrideService.o.pp /home/root/ff_nightly/work/mozilla-central-cdd4506bc66c/security/manager/ssl/src/nsCertOverrideService.cpp nsRecentBadCerts.cpp In file included from /home/root/ff_nightly/work/mozilla-central-cdd4506bc66c/security/manager/ssl/src/nsNSSCleaner.cpp:5: In file included from ../../../../../security/manager/ssl/src/nsNSSCleaner.h:94: ../../../../dist/system_wrappers/certt.h:2:15: fatal error: 'certt.h' file not found #include_next ^ 1 error generated. gmake[5]: *** [nsNSSCleaner.o] Error 1 gmake[5]: *** Waiting for unfinished jobs.... In file included from /home/root/ff_nightly/work/mozilla-central-cdd4506bc66c/security/manager/ssl/src/nsCERTValInParamWrapper.cpp:5: In file included from ../../../../../security/manager/ssl/src/nsCERTValInParamWrapper.h:9: ../../../../dist/system_wrappers/cert.h:2:15: fatal error: 'cert.h' file not found #include_next ^ 1 error generated. gmake[5]: *** [nsCERTValInParamWrapper.o] Error 1 In file included from /home/root/ff_nightly/work/mozilla-central-cdd4506bc66c/security/manager/ssl/src/nsCertOverrideService.cpp:7: In file included from ../../../../../security/manager/ssl/src/nsCertOverrideService.h:16: ../../../../dist/system_wrappers/secoidt.h:2:15: fatal error: 'secoidt.h' file not found #include_next ^ 1 error generated. gmake[5]: *** [nsCertOverrideService.o] Error 1 gmake[5]: Leaving directory `/home/root/ff_nightly/work/mozilla-central-cdd4506bc66c/obj-x86_64-portbld-freebsd10.0/security/manager/ssl/src' gmake[4]: *** [libs] Error 2 gmake[4]: Leaving directory `/home/root/ff_nightly/work/mozilla-central-cdd4506bc66c/obj-x86_64-portbld-freebsd10.0/security/manager/ssl' gmake[3]: *** [libs] Error 2 gmake[3]: Leaving directory `/home/root/ff_nightly/work/mozilla-central-cdd4506bc66c/obj-x86_64-portbld-freebsd10.0/security/manager' gmake[2]: *** [libs_tier_platform] Error 2 gmake[2]: Leaving directory `/home/root/ff_nightly/work/mozilla-central-cdd4506bc66c/obj-x86_64-portbld-freebsd10.0' gmake[1]: *** [tier_platform] Error 2 gmake[1]: Leaving directory `/home/root/ff_nightly/work/mozilla-central-cdd4506bc66c/obj-x86_64-portbld-freebsd10.0' gmake: *** [default] Error 2 *** [do-build] Error code 1 Stop in /home/root/ff_nightly. *** [/home/root/ff_nightly/work/.build_done.firefox._usr_local] Error code 1 Stop in /home/root/ff_nightly. *** [build] Error code 1 From owner-freebsd-gecko@FreeBSD.ORG Fri Sep 28 21:57:22 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 837F0106566C for ; Fri, 28 Sep 2012 21:57:22 +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 2013D8FC08 for ; Fri, 28 Sep 2012 21:57:21 +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 1THiYa-00027K-3f; Sat, 29 Sep 2012 01:57:13 +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=RBC/CE316rB2/QMI0jJbQdwHOfkTIHKRyeJA7DmGbAc=; b=pNL9iZP1T6YEfGALsuzOPFvjvVdPQujmP7o988/lqGkipMn0Z6O0sP3CTt8b5pJ/mDyeKaOCkM1VzkCivwVTESmbN+Al0noAx7McK1bDf0K+0V2O6XN/MuPjOXCuLzdQsRYRLX6eOFd+5FXu8fJ/sNFZlSBdQ0aYXCgzadbk6jo=; Received: from jbeich by internal.tormail.org with local (Exim 4.63) (envelope-from ) id 1THiWW-000DLT-Ps; Fri, 28 Sep 2012 21:55:08 +0000 From: Jan Beich To: AN In-Reply-To: (AN's message of "Fri, 28 Sep 2012 13:54:32 -0400 (EDT)") Date: Sat, 29 Sep 2012 08:55:10 +1100 References: <201209280330.q8S3U7q2074472@trillian.chruetertee.ch> MIME-Version: 1.0 Content-Type: text/plain X-TorMail-User: jbeich Message-Id: <1THiWW-000DLT-Ps@internal.tormail.org> Cc: freebsd-gecko@freebsd.org Subject: Re: [SVN-Commit] r1035 - in trunk: Mk security/nss/files 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: Fri, 28 Sep 2012 21:57:22 -0000 AN writes: > On Fri, 28 Sep 2012, svn-freebsd-gecko@chruetertee.ch wrote: > >> Author: jbeich >> Date: Fri Sep 28 03:30:07 2012 >> New Revision: 1035 >> >> Log: >> unbreak --with-system-nss on mozilla-central checkout >> >> Modified: >> trunk/Mk/bsd.gecko.mk >> trunk/security/nss/files/nss-config.in [...] >> Modified: trunk/security/nss/files/nss-config.in >> ============================================================================== >> --- trunk/security/nss/files/nss-config.in Fri Sep 28 03:29:58 2012 (r1034) >> +++ trunk/security/nss/files/nss-config.in Fri Sep 28 03:30:07 2012 (r1035) >> @@ -123,7 +123,7 @@ >> fi >> >> if test "$echo_cflags" = "yes"; then >> - echo -I$includedir >> + echo -I$includedir -I$includedir/nss [...] > ../../../../dist/system_wrappers/cert.h:2:15: fatal error: 'cert.h' > file not found > #include_next > ^ Make sure $ nss-config --cflags -I/usr/local/include/nss -I/usr/local/include/nss/nss If not, reinstall security/nss port. From owner-freebsd-gecko@FreeBSD.ORG Fri Sep 28 22:18:59 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 C73E8106566C for ; Fri, 28 Sep 2012 22:18: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 626848FC08 for ; Fri, 28 Sep 2012 22:18: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 q8SMIqJO078607 for ; Fri, 28 Sep 2012 22:18:52 GMT (envelope-from svn-freebsd-gecko@chruetertee.ch) Received: (from www@localhost) by trillian.chruetertee.ch (8.14.4/8.14.3/Submit) id q8SMIlHc075801 for freebsd-gecko@freebsd.org; Fri, 28 Sep 2012 22:18:47 GMT (envelope-from svn-freebsd-gecko@chruetertee.ch) Date: Fri, 28 Sep 2012 22:18:47 GMT Message-Id: <201209282218.q8SMIlHc075801@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] r1039 - in trunk: mail/thunderbird mail/thunderbird-esr mail/thunderbird3 security/nss www/firefox www/firefox-esr www/firefox-nightly www/firefox36 www/kompozer www/libxul www/libxul19 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: Fri, 28 Sep 2012 22:18:59 -0000 Author: jbeich Date: Fri Sep 28 22:18:46 2012 New Revision: 1039 Log: bump nss pkgversion after r1035 Modified: trunk/mail/thunderbird-esr/Makefile trunk/mail/thunderbird/Makefile trunk/mail/thunderbird3/Makefile trunk/security/nss/Makefile trunk/www/firefox-esr/Makefile trunk/www/firefox-nightly/Makefile trunk/www/firefox/Makefile trunk/www/firefox36/Makefile trunk/www/kompozer/Makefile trunk/www/libxul/Makefile trunk/www/libxul19/Makefile trunk/www/seamonkey/Makefile Modified: trunk/mail/thunderbird-esr/Makefile ============================================================================== --- trunk/mail/thunderbird-esr/Makefile Fri Sep 28 04:05:35 2012 (r1038) +++ trunk/mail/thunderbird-esr/Makefile Fri Sep 28 22:18:46 2012 (r1039) @@ -17,7 +17,7 @@ COMMENT= Mozilla Thunderbird is standalone mail and news that stands above BUILD_DEPENDS= nspr>=4.8.8:${PORTSDIR}/devel/nspr \ - nss>=3.13.1:${PORTSDIR}/security/nss \ + nss>=3.13.6_1:${PORTSDIR}/security/nss \ sqlite3>=3.7.7.1:${PORTSDIR}/databases/sqlite3 \ cairo>=1.10.2_1,1:${PORTSDIR}/graphics/cairo \ unzip:${PORTSDIR}/archivers/unzip Modified: trunk/mail/thunderbird/Makefile ============================================================================== --- trunk/mail/thunderbird/Makefile Fri Sep 28 04:05:35 2012 (r1038) +++ trunk/mail/thunderbird/Makefile Fri Sep 28 22:18:46 2012 (r1039) @@ -17,7 +17,7 @@ COMMENT= Mozilla Thunderbird is standalone mail and news that stands above BUILD_DEPENDS= nspr>=4.9:${PORTSDIR}/devel/nspr \ - nss>=3.13.2:${PORTSDIR}/security/nss \ + nss>=3.13.6_1:${PORTSDIR}/security/nss \ sqlite3>=3.7.12.1:${PORTSDIR}/databases/sqlite3 \ ${PYTHON_SITELIBDIR}/_sqlite3.so:${PORTSDIR}/databases/py-sqlite3 \ cairo>=1.10.2_1,1:${PORTSDIR}/graphics/cairo \ Modified: trunk/mail/thunderbird3/Makefile ============================================================================== --- trunk/mail/thunderbird3/Makefile Fri Sep 28 04:05:35 2012 (r1038) +++ trunk/mail/thunderbird3/Makefile Fri Sep 28 22:18:46 2012 (r1039) @@ -16,7 +16,7 @@ COMMENT= Mozilla Thunderbird is standalone mail and news that stands above BUILD_DEPENDS= nspr>=4.8.6:${PORTSDIR}/devel/nspr \ - nss>=3.12.8:${PORTSDIR}/security/nss + nss>=3.13.6_1:${PORTSDIR}/security/nss DEPRECATED= will be unsupported by when Thunderbird 12 is release, migrate to mail/thunderbird now USE_AUTOTOOLS= autoconf213:env Modified: trunk/security/nss/Makefile ============================================================================== --- trunk/security/nss/Makefile Fri Sep 28 04:05:35 2012 (r1038) +++ trunk/security/nss/Makefile Fri Sep 28 22:18:46 2012 (r1039) @@ -7,6 +7,7 @@ PORTNAME= nss PORTVERSION= ${_MAJOR}.${_MINOR}.${_PATCH} +PORTREVISION= 1 CATEGORIES= security MASTER_SITES= ${MASTER_SITE_MOZILLA} MASTER_SITE_SUBDIR= security/nss/releases/NSS_${PORTVERSION:S/./_/g}_RTM/src Modified: trunk/www/firefox-esr/Makefile ============================================================================== --- trunk/www/firefox-esr/Makefile Fri Sep 28 04:05:35 2012 (r1038) +++ trunk/www/firefox-esr/Makefile Fri Sep 28 22:18:46 2012 (r1039) @@ -17,7 +17,7 @@ COMMENT= Web browser based on the browser portion of Mozilla BUILD_DEPENDS= nspr>=4.8.8:${PORTSDIR}/devel/nspr \ - nss>=3.13.1:${PORTSDIR}/security/nss \ + nss>=3.13.6_1:${PORTSDIR}/security/nss \ sqlite3>=3.7.7.1:${PORTSDIR}/databases/sqlite3 \ cairo>=1.10.2_1,1:${PORTSDIR}/graphics/cairo \ unzip:${PORTSDIR}/archivers/unzip Modified: trunk/www/firefox-nightly/Makefile ============================================================================== --- trunk/www/firefox-nightly/Makefile Fri Sep 28 04:05:35 2012 (r1038) +++ trunk/www/firefox-nightly/Makefile Fri Sep 28 22:18:46 2012 (r1039) @@ -18,7 +18,7 @@ COMMENT= Web browser based on the browser portion of Mozilla BUILD_DEPENDS= nspr>=4.9.2:${PORTSDIR}/devel/nspr \ - nss>=3.13.2:${PORTSDIR}/security/nss \ + nss>=3.13.6_1:${PORTSDIR}/security/nss \ sqlite3>=3.7.14:${PORTSDIR}/databases/sqlite3 \ ${PYTHON_SITELIBDIR}/_sqlite3.so:${PORTSDIR}/databases/py-sqlite3 \ cairo>=1.10.2_1,1:${PORTSDIR}/graphics/cairo \ Modified: trunk/www/firefox/Makefile ============================================================================== --- trunk/www/firefox/Makefile Fri Sep 28 04:05:35 2012 (r1038) +++ trunk/www/firefox/Makefile Fri Sep 28 22:18:46 2012 (r1039) @@ -17,7 +17,7 @@ COMMENT= Web browser based on the browser portion of Mozilla BUILD_DEPENDS= nspr>=4.9:${PORTSDIR}/devel/nspr \ - nss>=3.13.2:${PORTSDIR}/security/nss \ + nss>=3.13.6_1:${PORTSDIR}/security/nss \ sqlite3>=3.7.12.1:${PORTSDIR}/databases/sqlite3 \ ${PYTHON_SITELIBDIR}/_sqlite3.so:${PORTSDIR}/databases/py-sqlite3 \ cairo>=1.10.2_1,1:${PORTSDIR}/graphics/cairo \ Modified: trunk/www/firefox36/Makefile ============================================================================== --- trunk/www/firefox36/Makefile Fri Sep 28 04:05:35 2012 (r1038) +++ trunk/www/firefox36/Makefile Fri Sep 28 22:18:46 2012 (r1039) @@ -17,7 +17,7 @@ COMMENT= Web browser based on the browser portion of Mozilla BUILD_DEPENDS= nspr>=4.8.6:${PORTSDIR}/devel/nspr \ - nss>=3.12.8:${PORTSDIR}/security/nss + nss>=3.13.6_1:${PORTSDIR}/security/nss DEPRECATED= will be unsupported by when Firefox 12 is release, migrate to www/firefox now USE_AUTOTOOLS= autoconf213:env Modified: trunk/www/kompozer/Makefile ============================================================================== --- trunk/www/kompozer/Makefile Fri Sep 28 04:05:35 2012 (r1038) +++ trunk/www/kompozer/Makefile Fri Sep 28 22:18:46 2012 (r1039) @@ -16,6 +16,8 @@ MAINTAINER= gecko@FreeBSD.org COMMENT= Complete Web Authoring Suite +BUILD_DEPENDS= nss>=3.13.6_1:${PORTSDIR}/security/nss + WANT_GNOME= yes WANT_PERL= yes USE_BZIP2= yes Modified: trunk/www/libxul/Makefile ============================================================================== --- trunk/www/libxul/Makefile Fri Sep 28 04:05:35 2012 (r1038) +++ trunk/www/libxul/Makefile Fri Sep 28 22:18:46 2012 (r1039) @@ -16,7 +16,7 @@ COMMENT?= Mozilla runtime package that can be used to bootstrap XUL+XPCOM apps BUILD_DEPENDS= nspr>=4.8.8:${PORTSDIR}/devel/nspr \ - nss>=3.13.1:${PORTSDIR}/security/nss \ + nss>=3.13.6_1:${PORTSDIR}/security/nss \ sqlite3>=3.7.7.1:${PORTSDIR}/databases/sqlite3 \ cairo>=1.10.2_1,1:${PORTSDIR}/graphics/cairo \ unzip:${PORTSDIR}/archivers/unzip Modified: trunk/www/libxul19/Makefile ============================================================================== --- trunk/www/libxul19/Makefile Fri Sep 28 04:05:35 2012 (r1038) +++ trunk/www/libxul19/Makefile Fri Sep 28 22:18:46 2012 (r1039) @@ -16,6 +16,9 @@ MAINTAINER?= gecko@FreeBSD.org COMMENT?= Mozilla runtime package that can be used to bootstrap XUL+XPCOM apps +BUILD_DEPENDS= nspr>=4.8.6:${PORTSDIR}/devel/nspr \ + nss>=3.13.6_1:${PORTSDIR}/security/nss + WRKSRC= ${WRKDIR}/mozilla-1.9.2 CONFLICTS= mozilla-[0-9]* libxul-[0-9][0-9].* GECKO_PLIST_PRE_DIRS= lib/${MOZILLA}/bin lib/${MOZILLA}/idl \ Modified: trunk/www/seamonkey/Makefile ============================================================================== --- trunk/www/seamonkey/Makefile Fri Sep 28 04:05:35 2012 (r1038) +++ trunk/www/seamonkey/Makefile Fri Sep 28 22:18:46 2012 (r1039) @@ -17,7 +17,7 @@ COMMENT= The open source, standards compliant web browser BUILD_DEPENDS= nspr>=4.9:${PORTSDIR}/devel/nspr \ - nss>=3.13.2:${PORTSDIR}/security/nss \ + nss>=3.13.6_1:${PORTSDIR}/security/nss \ sqlite3>=3.7.12.1:${PORTSDIR}/databases/sqlite3 \ ${PYTHON_SITELIBDIR}/_sqlite3.so:${PORTSDIR}/databases/py-sqlite3 \ unzip:${PORTSDIR}/archivers/unzip From owner-freebsd-gecko@FreeBSD.ORG Sat Sep 29 04:02:54 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 B10F2106564A for ; Sat, 29 Sep 2012 04:02:54 +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 40C638FC12 for ; Sat, 29 Sep 2012 04:02:53 +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 q8T42qgD027488 for ; Sat, 29 Sep 2012 04:02:52 GMT (envelope-from svn-freebsd-gecko@chruetertee.ch) Received: (from www@localhost) by trillian.chruetertee.ch (8.14.4/8.14.3/Submit) id q8T42lej026886 for freebsd-gecko@freebsd.org; Sat, 29 Sep 2012 04:02:47 GMT (envelope-from svn-freebsd-gecko@chruetertee.ch) Date: Sat, 29 Sep 2012 04:02:47 GMT Message-Id: <201209290402.q8T42lej026886@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] r1040 - in trunk: . www/firefox 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, 29 Sep 2012 04:02:54 -0000 Author: jbeich Date: Sat Sep 29 04:02:46 2012 New Revision: 1040 Log: enable Glib I/O by default (follow bug 713802) Modified: trunk/Gecko_ChangeLog trunk/www/firefox/Makefile.options Modified: trunk/Gecko_ChangeLog ============================================================================== --- trunk/Gecko_ChangeLog Fri Sep 28 22:18:46 2012 (r1039) +++ trunk/Gecko_ChangeLog Sat Sep 29 04:02:46 2012 (r1040) @@ -1,4 +1,5 @@ 16.0: +- enable GIO option by default - integrate enigmail into thunderbird/seamonkey - switch firefox 16.0 and seamonkey 2.13 to ALSA by default for better latency during pause and seeking with HTML5 video Modified: trunk/www/firefox/Makefile.options ============================================================================== --- trunk/www/firefox/Makefile.options Fri Sep 28 22:18:46 2012 (r1039) +++ trunk/www/firefox/Makefile.options Sat Sep 29 04:02:46 2012 (r1040) @@ -1,7 +1,7 @@ # -*- makefile-bsdmake -*- OPTIONS_DEFINE+= DBUS DEBUG GNOME LIBPROXY LOGGING OPTIMIZED_CFLAGS -OPTIONS_DEFAULT+= DBUS GTK2 LOGGING OSS +OPTIONS_DEFAULT+= DBUS GIO GTK2 LOGGING OSS OPTIONS_SINGLE+= AUDIO OPTIONS_SINGLE_AUDIO= ALSA OSS PULSEAUDIO From owner-freebsd-gecko@FreeBSD.ORG Sat Sep 29 06:08:07 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 E4E06106566B for ; Sat, 29 Sep 2012 06:08: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 6BE5F8FC08 for ; Sat, 29 Sep 2012 06:08: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 q8T6857H067017 for ; Sat, 29 Sep 2012 06:08: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 q8T6805C066662 for freebsd-gecko@freebsd.org; Sat, 29 Sep 2012 06:08:00 GMT (envelope-from svn-freebsd-gecko@chruetertee.ch) Date: Sat, 29 Sep 2012 06:08:00 GMT Message-Id: <201209290608.q8T6805C066662@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] r1041 - in trunk/www: firefox kompozer 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, 29 Sep 2012 06:08:08 -0000 Author: jbeich Date: Sat Sep 29 06:08:00 2012 New Revision: 1041 Log: get rid of GNOME option, it hinders turning subptions on by default Modified: trunk/www/firefox/Makefile.options trunk/www/kompozer/Makefile Modified: trunk/www/firefox/Makefile.options ============================================================================== --- trunk/www/firefox/Makefile.options Sat Sep 29 04:02:46 2012 (r1040) +++ trunk/www/firefox/Makefile.options Sat Sep 29 06:08:00 2012 (r1041) @@ -1,6 +1,7 @@ # -*- makefile-bsdmake -*- -OPTIONS_DEFINE+= DBUS DEBUG GNOME LIBPROXY LOGGING OPTIMIZED_CFLAGS +OPTIONS_DEFINE+= DBUS DEBUG GCONF GIO GNOMEUI GNOMEVFS2 LIBPROXY \ + LOGGING OPTIMIZED_CFLAGS OPTIONS_DEFAULT+= DBUS GIO GTK2 LOGGING OSS OPTIONS_SINGLE+= AUDIO @@ -9,9 +10,6 @@ OPTIONS_SINGLE+= TOOLKIT OPTIONS_SINGLE_TOOLKIT= GTK2 QT4 -OPTIONS_MULTI+= GNOME -OPTIONS_MULTI_GNOME= GCONF GIO GNOMEUI GNOMEVFS2 - ENIGMAIL_DESC?= Enigmail extension GIO_DESC?= GIO for file I/O # move to bsd.options.desc.mk GNOMEUI_DESC?= libgnomeui support module Modified: trunk/www/kompozer/Makefile ============================================================================== --- trunk/www/kompozer/Makefile Sat Sep 29 04:02:46 2012 (r1040) +++ trunk/www/kompozer/Makefile Sat Sep 29 06:08:00 2012 (r1041) @@ -46,7 +46,6 @@ OPTIONS_DEFINE:=${OPTIONS_DEFINE:NDBUS:NGIO:NLIBPROXY} OPTIONS_SINGLE:=${OPTIONS_SINGLE:NAUDIO:NTOOLKIT} -OPTIONS_MULTI_GNOME:=${OPTIONS_MULTI_GNOME:NGIO} .include From owner-freebsd-gecko@FreeBSD.ORG Sat Sep 29 06:08:20 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 04479106564A for ; Sat, 29 Sep 2012 06:08:20 +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 2F44F8FC0A for ; Sat, 29 Sep 2012 06:08:18 +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 q8T68IIl071093 for ; Sat, 29 Sep 2012 06:08:18 GMT (envelope-from svn-freebsd-gecko@chruetertee.ch) Received: (from www@localhost) by trillian.chruetertee.ch (8.14.4/8.14.3/Submit) id q8T68Dhp067626 for freebsd-gecko@freebsd.org; Sat, 29 Sep 2012 06:08:13 GMT (envelope-from svn-freebsd-gecko@chruetertee.ch) Date: Sat, 29 Sep 2012 06:08:13 GMT Message-Id: <201209290608.q8T68Dhp067626@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] r1042 - in trunk: mail/thunderbird3 www/firefox www/firefox-esr www/firefox-esr/files www/firefox-nightly www/firefox/files www/firefox36 www/libxul/files www/libxul19 www/seamonkey 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: Sat, 29 Sep 2012 06:08:20 -0000 Author: jbeich Date: Sat Sep 29 06:08:12 2012 New Revision: 1042 Log: limit GIO to ports with gio extension Added: trunk/www/firefox-esr/files/patch-bug713802 trunk/www/firefox/files/patch-bug713802 trunk/www/libxul/files/patch-bug713802 trunk/www/seamonkey/files/patch-bug713802 Modified: trunk/mail/thunderbird3/Makefile trunk/www/firefox-esr/Makefile trunk/www/firefox-esr/pkg-message trunk/www/firefox-nightly/Makefile trunk/www/firefox-nightly/pkg-message trunk/www/firefox/Makefile trunk/www/firefox/Makefile.options trunk/www/firefox/pkg-message trunk/www/firefox36/Makefile trunk/www/libxul19/Makefile trunk/www/seamonkey/Makefile Modified: trunk/mail/thunderbird3/Makefile ============================================================================== --- trunk/mail/thunderbird3/Makefile Sat Sep 29 06:08:00 2012 (r1041) +++ trunk/mail/thunderbird3/Makefile Sat Sep 29 06:08:12 2012 (r1042) @@ -51,7 +51,7 @@ .include "${.CURDIR}/../../www/firefox/Makefile.options" -OPTIONS_DEFINE:=${OPTIONS_DEFINE:NLIBPROXY} +OPTIONS_DEFINE:=${OPTIONS_DEFINE:NLIBPROXY:NGIO} OPTIONS_SINGLE:=${OPTIONS_SINGLE:NTOOLKIT} .include Modified: trunk/www/firefox-esr/Makefile ============================================================================== --- trunk/www/firefox-esr/Makefile Sat Sep 29 06:08:00 2012 (r1041) +++ trunk/www/firefox-esr/Makefile Sat Sep 29 06:08:12 2012 (r1042) @@ -48,6 +48,7 @@ --enable-official-branding OPTIONS_DEFINE= PGO +OPTIONS_DEFAULT=GIO .include "${.CURDIR}/../../www/firefox/Makefile.options" .include Added: trunk/www/firefox-esr/files/patch-bug713802 ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ trunk/www/firefox-esr/files/patch-bug713802 Sat Sep 29 06:08:12 2012 (r1042) @@ -0,0 +1,163 @@ +commit 20586fa +Author: Karl Tomlinson +Date: Thu Sep 27 18:35:06 2012 +1200 + + b=713802 default enable GIO support and disable GnomeVFS r=glandium + + --HG-- + extra : transplant_source : wk%ADr%CA%8EN%AE%C93p/p%0A%26%0E%1D0%F20 +--- + browser/confvars.sh | 2 +- + configure.in | 20 ++++++++++---------- + xulrunner/confvars.sh | 2 +- + 3 files changed, 12 insertions(+), 12 deletions(-) + +diff --git browser/confvars.sh browser/confvars.sh +index 40ab494..eae5645 100755 +--- browser/confvars.sh ++++ browser/confvars.sh +@@ -21,7 +21,7 @@ MOZ_SERVICES_AITC=1 + MOZ_SERVICES_NOTIFICATIONS=1 + MOZ_SERVICES_SYNC=1 + MOZ_APP_VERSION=$FIREFOX_VERSION +-MOZ_EXTENSIONS_DEFAULT=" gnomevfs" ++MOZ_EXTENSIONS_DEFAULT=" gio" + # MOZ_APP_DISPLAYNAME will be set by branding/configure.sh + # Changing MOZ_*BRANDING_DIRECTORY requires a clobber to ensure correct results, + # because branding dependencies are broken. +diff --git configure.in configure.in +index 87a9391..2118651 100644 +--- configure.in ++++ configure.in +@@ -4846,21 +4846,21 @@ dnl ======================================================== + + if test "$MOZ_X11" + then +- dnl build the gnomevfs extension by default only when the ++ dnl build the GIO extension by default only when the + dnl GTK2 toolkit is in use. + if test "$MOZ_ENABLE_GTK2" + then +- MOZ_ENABLE_GNOMEVFS=1 ++ MOZ_ENABLE_GIO=1 + MOZ_ENABLE_GCONF=1 + fi + + dnl ======================================================== + dnl = GnomeVFS support module + dnl ======================================================== +- MOZ_ARG_DISABLE_BOOL(gnomevfs, +- [ --disable-gnomevfs Disable GnomeVFS support ], +- MOZ_ENABLE_GNOMEVFS=, +- MOZ_ENABLE_GNOMEVFS=force) ++ MOZ_ARG_ENABLE_BOOL(gnomevfs, ++ [ --enable-gnomevfs Enable GnomeVFS support (default: disabled)], ++ MOZ_ENABLE_GNOMEVFS=force, ++ MOZ_ENABLE_GNOMEVFS=) + + if test "$MOZ_ENABLE_GNOMEVFS" + then +@@ -4884,10 +4884,10 @@ then + dnl ======================================================== + dnl = GIO support module + dnl ======================================================== +- MOZ_ARG_ENABLE_BOOL(gio, +- [ --enable-gio Enable GIO support (default: disabled)], +- MOZ_ENABLE_GIO=force, +- MOZ_ENABLE_GIO=) ++ MOZ_ARG_DISABLE_BOOL(gio, ++ [ --disable-gio Disable GIO support], ++ MOZ_ENABLE_GIO=, ++ MOZ_ENABLE_GIO=force) + + if test "$MOZ_ENABLE_GIO" -a "$MOZ_ENABLE_GTK2" + then +diff --git xulrunner/confvars.sh xulrunner/confvars.sh +index 2fa6ead..5fe2c3d 100755 +--- xulrunner/confvars.sh ++++ xulrunner/confvars.sh +@@ -10,5 +10,5 @@ MOZ_XULRUNNER=1 + MOZ_CHROME_FILE_FORMAT=omni + MOZ_APP_VERSION=$MOZILLA_VERSION + MOZ_PLACES=1 +-MOZ_EXTENSIONS_DEFAULT=" gnomevfs" ++MOZ_EXTENSIONS_DEFAULT=" gio" + MOZ_URL_CLASSIFIER=1 + +commit d884d75 +Author: Karl Tomlinson +Date: Thu Sep 27 18:34:44 2012 +1200 + + b=713802 disable gnomevfs extension without --enable-gnomevfs r=glandium + + --HG-- + extra : transplant_source : i%07%81%E9%90_%C1%05b%194%9B%1E%93%FC%03%279%F9%8A +--- + configure.in | 12 +++--------- + 1 file changed, 3 insertions(+), 9 deletions(-) + +diff --git configure.in configure.in +index f2b4041..87a9391 100644 +--- configure.in ++++ configure.in +@@ -4875,12 +4875,6 @@ then + fi + MOZ_ENABLE_GNOMEVFS= + ]) +- else +- if test `echo "$MOZ_EXTENSIONS" | grep -c gnomevfs` -ne 0; then +- PKG_CHECK_MODULES(MOZ_GNOMEVFS, gnome-vfs-2.0 >= $GNOMEVFS_VERSION gnome-vfs-module-2.0 >= $GNOMEVFS_VERSION,[ +- MOZ_GNOMEVFS_LIBS=`echo $MOZ_GNOMEVFS_LIBS | sed 's/-llinc\>//'` +- ]) +- fi + fi + + AC_SUBST(MOZ_ENABLE_GNOMEVFS) +@@ -5967,10 +5961,10 @@ MOZ_ARG_ENABLE_STRING(extensions, + done], + MOZ_EXTENSIONS="$MOZ_EXTENSIONS_DEFAULT") + +-if test -z "$MOZ_ENABLE_GNOMEVFS" -a -z "$MOZ_GNOMEVFS_LIBS" -a `echo "$MOZ_EXTENSIONS" | grep -c gnomevfs` -ne 0; then ++if test -z "$MOZ_ENABLE_GNOMEVFS" -a `echo "$MOZ_EXTENSIONS" | grep -c gnomevfs` -ne 0; then + # Suppress warning on non-X11 platforms + if test -n "$MOZ_X11"; then +- AC_MSG_WARN([Cannot build gnomevfs without required libraries. Removing gnomevfs from MOZ_EXTENSIONS.]) ++ AC_MSG_WARN([Removing gnomevfs from MOZ_EXTENSIONS due to no --enable-gnomevfs.]) + fi + MOZ_EXTENSIONS=`echo $MOZ_EXTENSIONS | sed -e 's|gnomevfs||'` + fi +@@ -5983,7 +5977,7 @@ fi + if test -z "$MOZ_ENABLE_GIO" -a `echo "$MOZ_EXTENSIONS" | grep -c gio` -ne 0; then + # Suppress warning on non-X11 platforms + if test -n "$MOZ_X11"; then +- AC_MSG_WARN([Cannot build gio without required libraries. Removing gio from MOZ_EXTENSIONS.]) ++ AC_MSG_WARN([Removing gio from MOZ_EXTENSIONS due to --disable-gio.]) + fi + MOZ_EXTENSIONS=`echo $MOZ_EXTENSIONS | sed -e 's|gio||'` + fi + +commit ddedeea +Author: Karl Tomlinson +Date: Thu Sep 27 13:47:19 2012 +1200 + + b=713802 link gio extension against libxul for tracemalloc stack functions r=bsmedberg + + --HG-- + extra : transplant_source : %C8%A3o%BE%A0z%F7%C8%8A%E6%0E%D4s%7D%90%9C%D9%0F%06%7E +--- + extensions/gio/Makefile.in | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git extensions/gio/Makefile.in extensions/gio/Makefile.in +index 46412c4..ccf2846 100644 +--- extensions/gio/Makefile.in ++++ extensions/gio/Makefile.in +@@ -23,7 +23,7 @@ LOCAL_INCLUDES = $(MOZ_GIO_CFLAGS) + + EXTRA_DSO_LDOPTS = \ + $(XPCOM_GLUE_LDOPTS) \ +- $(NSPR_LIBS) \ ++ $(MOZ_COMPONENT_LIBS) \ + $(MOZ_GIO_LIBS) \ + $(NULL) + Modified: trunk/www/firefox-esr/pkg-message ============================================================================== --- trunk/www/firefox-esr/pkg-message Sat Sep 29 06:08:00 2012 (r1041) +++ trunk/www/firefox-esr/pkg-message Sat Sep 29 06:08:12 2012 (r1042) @@ -1,9 +1,9 @@ ====================================================================== -smb:// issues (GNOMEVFS2 option): +smb:// issues (Gvfs/GIO or GNOMEVFS2 option): Network group, machine, and share browsing does not work correctly. -sftp:// (GNOMEVFS2 option): +sftp:// (Gvfs/GIO or GNOMEVFS2 option): Only sftp access using public key authentication works. To easily setup public key authentication to "remote_host": Modified: trunk/www/firefox-nightly/Makefile ============================================================================== --- trunk/www/firefox-nightly/Makefile Sat Sep 29 06:08:00 2012 (r1041) +++ trunk/www/firefox-nightly/Makefile Sat Sep 29 06:08:12 2012 (r1042) @@ -51,7 +51,7 @@ MOZ_OPTIONS= --program-transform-name='s/firefox/${MOZILLA}/' \ --enable-application=browser -OPTIONS_DEFAULT=GSTREAMER +OPTIONS_DEFAULT=GIO GSTREAMER OPTIONS_DEFINE= GSTREAMER PGO .if ${USE_MOZILLA:M-nss} Modified: trunk/www/firefox-nightly/pkg-message ============================================================================== --- trunk/www/firefox-nightly/pkg-message Sat Sep 29 06:08:00 2012 (r1041) +++ trunk/www/firefox-nightly/pkg-message Sat Sep 29 06:08:12 2012 (r1042) @@ -1,9 +1,9 @@ ====================================================================== -smb:// issues (GNOMEVFS2 option): +smb:// issues (Gvfs/GIO or GNOMEVFS2 option): Network group, machine, and share browsing does not work correctly. -sftp:// (GNOMEVFS2 option): +sftp:// (Gvfs/GIO or GNOMEVFS2 option): Only sftp access using public key authentication works. To easily setup public key authentication to "remote_host": Modified: trunk/www/firefox/Makefile ============================================================================== --- trunk/www/firefox/Makefile Sat Sep 29 06:08:00 2012 (r1041) +++ trunk/www/firefox/Makefile Sat Sep 29 06:08:12 2012 (r1042) @@ -49,6 +49,7 @@ --enable-official-branding OPTIONS_DEFINE= GSTREAMER PGO +OPTIONS_DEFAULT=GIO .include "${.CURDIR}/../../www/firefox/Makefile.options" Modified: trunk/www/firefox/Makefile.options ============================================================================== --- trunk/www/firefox/Makefile.options Sat Sep 29 06:08:00 2012 (r1041) +++ trunk/www/firefox/Makefile.options Sat Sep 29 06:08:12 2012 (r1042) @@ -2,7 +2,7 @@ OPTIONS_DEFINE+= DBUS DEBUG GCONF GIO GNOMEUI GNOMEVFS2 LIBPROXY \ LOGGING OPTIMIZED_CFLAGS -OPTIONS_DEFAULT+= DBUS GIO GTK2 LOGGING OSS +OPTIONS_DEFAULT+= DBUS GTK2 LOGGING OSS OPTIONS_SINGLE+= AUDIO OPTIONS_SINGLE_AUDIO= ALSA OSS PULSEAUDIO Added: trunk/www/firefox/files/patch-bug713802 ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ trunk/www/firefox/files/patch-bug713802 Sat Sep 29 06:08:12 2012 (r1042) @@ -0,0 +1,163 @@ +commit 20586fa +Author: Karl Tomlinson +Date: Thu Sep 27 18:35:06 2012 +1200 + + b=713802 default enable GIO support and disable GnomeVFS r=glandium + + --HG-- + extra : transplant_source : wk%ADr%CA%8EN%AE%C93p/p%0A%26%0E%1D0%F20 +--- + browser/confvars.sh | 2 +- + configure.in | 20 ++++++++++---------- + xulrunner/confvars.sh | 2 +- + 3 files changed, 12 insertions(+), 12 deletions(-) + +diff --git browser/confvars.sh browser/confvars.sh +index 40ab494..eae5645 100755 +--- browser/confvars.sh ++++ browser/confvars.sh +@@ -21,7 +21,7 @@ MOZ_SERVICES_AITC=1 + MOZ_SERVICES_NOTIFICATIONS=1 + MOZ_SERVICES_SYNC=1 + MOZ_APP_VERSION=$FIREFOX_VERSION +-MOZ_EXTENSIONS_DEFAULT=" gnomevfs" ++MOZ_EXTENSIONS_DEFAULT=" gio" + # MOZ_APP_DISPLAYNAME will be set by branding/configure.sh + # Changing MOZ_*BRANDING_DIRECTORY requires a clobber to ensure correct results, + # because branding dependencies are broken. +diff --git configure.in configure.in +index 87a9391..2118651 100644 +--- configure.in ++++ configure.in +@@ -4846,21 +4846,21 @@ dnl ======================================================== + + if test "$MOZ_X11" + then +- dnl build the gnomevfs extension by default only when the ++ dnl build the GIO extension by default only when the + dnl GTK2 toolkit is in use. + if test "$MOZ_ENABLE_GTK2" + then +- MOZ_ENABLE_GNOMEVFS=1 ++ MOZ_ENABLE_GIO=1 + MOZ_ENABLE_GCONF=1 + fi + + dnl ======================================================== + dnl = GnomeVFS support module + dnl ======================================================== +- MOZ_ARG_DISABLE_BOOL(gnomevfs, +- [ --disable-gnomevfs Disable GnomeVFS support ], +- MOZ_ENABLE_GNOMEVFS=, +- MOZ_ENABLE_GNOMEVFS=force) ++ MOZ_ARG_ENABLE_BOOL(gnomevfs, ++ [ --enable-gnomevfs Enable GnomeVFS support (default: disabled)], ++ MOZ_ENABLE_GNOMEVFS=force, ++ MOZ_ENABLE_GNOMEVFS=) + + if test "$MOZ_ENABLE_GNOMEVFS" + then +@@ -4884,10 +4884,10 @@ then + dnl ======================================================== + dnl = GIO support module + dnl ======================================================== +- MOZ_ARG_ENABLE_BOOL(gio, +- [ --enable-gio Enable GIO support (default: disabled)], +- MOZ_ENABLE_GIO=force, +- MOZ_ENABLE_GIO=) ++ MOZ_ARG_DISABLE_BOOL(gio, ++ [ --disable-gio Disable GIO support], ++ MOZ_ENABLE_GIO=, ++ MOZ_ENABLE_GIO=force) + + if test "$MOZ_ENABLE_GIO" -a "$MOZ_ENABLE_GTK2" + then +diff --git xulrunner/confvars.sh xulrunner/confvars.sh +index 2fa6ead..5fe2c3d 100755 +--- xulrunner/confvars.sh ++++ xulrunner/confvars.sh +@@ -10,5 +10,5 @@ MOZ_XULRUNNER=1 + MOZ_CHROME_FILE_FORMAT=omni + MOZ_APP_VERSION=$MOZILLA_VERSION + MOZ_PLACES=1 +-MOZ_EXTENSIONS_DEFAULT=" gnomevfs" ++MOZ_EXTENSIONS_DEFAULT=" gio" + MOZ_URL_CLASSIFIER=1 + +commit d884d75 +Author: Karl Tomlinson +Date: Thu Sep 27 18:34:44 2012 +1200 + + b=713802 disable gnomevfs extension without --enable-gnomevfs r=glandium + + --HG-- + extra : transplant_source : i%07%81%E9%90_%C1%05b%194%9B%1E%93%FC%03%279%F9%8A +--- + configure.in | 12 +++--------- + 1 file changed, 3 insertions(+), 9 deletions(-) + +diff --git configure.in configure.in +index f2b4041..87a9391 100644 +--- configure.in ++++ configure.in +@@ -4875,12 +4875,6 @@ then + fi + MOZ_ENABLE_GNOMEVFS= + ]) +- else +- if test `echo "$MOZ_EXTENSIONS" | grep -c gnomevfs` -ne 0; then +- PKG_CHECK_MODULES(MOZ_GNOMEVFS, gnome-vfs-2.0 >= $GNOMEVFS_VERSION gnome-vfs-module-2.0 >= $GNOMEVFS_VERSION,[ +- MOZ_GNOMEVFS_LIBS=`echo $MOZ_GNOMEVFS_LIBS | sed 's/-llinc\>//'` +- ]) +- fi + fi + + AC_SUBST(MOZ_ENABLE_GNOMEVFS) +@@ -5967,10 +5961,10 @@ MOZ_ARG_ENABLE_STRING(extensions, + done], + MOZ_EXTENSIONS="$MOZ_EXTENSIONS_DEFAULT") + +-if test -z "$MOZ_ENABLE_GNOMEVFS" -a -z "$MOZ_GNOMEVFS_LIBS" -a `echo "$MOZ_EXTENSIONS" | grep -c gnomevfs` -ne 0; then ++if test -z "$MOZ_ENABLE_GNOMEVFS" -a `echo "$MOZ_EXTENSIONS" | grep -c gnomevfs` -ne 0; then + # Suppress warning on non-X11 platforms + if test -n "$MOZ_X11"; then +- AC_MSG_WARN([Cannot build gnomevfs without required libraries. Removing gnomevfs from MOZ_EXTENSIONS.]) ++ AC_MSG_WARN([Removing gnomevfs from MOZ_EXTENSIONS due to no --enable-gnomevfs.]) + fi + MOZ_EXTENSIONS=`echo $MOZ_EXTENSIONS | sed -e 's|gnomevfs||'` + fi +@@ -5983,7 +5977,7 @@ fi + if test -z "$MOZ_ENABLE_GIO" -a `echo "$MOZ_EXTENSIONS" | grep -c gio` -ne 0; then + # Suppress warning on non-X11 platforms + if test -n "$MOZ_X11"; then +- AC_MSG_WARN([Cannot build gio without required libraries. Removing gio from MOZ_EXTENSIONS.]) ++ AC_MSG_WARN([Removing gio from MOZ_EXTENSIONS due to --disable-gio.]) + fi + MOZ_EXTENSIONS=`echo $MOZ_EXTENSIONS | sed -e 's|gio||'` + fi + +commit ddedeea +Author: Karl Tomlinson +Date: Thu Sep 27 13:47:19 2012 +1200 + + b=713802 link gio extension against libxul for tracemalloc stack functions r=bsmedberg + + --HG-- + extra : transplant_source : %C8%A3o%BE%A0z%F7%C8%8A%E6%0E%D4s%7D%90%9C%D9%0F%06%7E +--- + extensions/gio/Makefile.in | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git extensions/gio/Makefile.in extensions/gio/Makefile.in +index 46412c4..ccf2846 100644 +--- extensions/gio/Makefile.in ++++ extensions/gio/Makefile.in +@@ -23,7 +23,7 @@ LOCAL_INCLUDES = $(MOZ_GIO_CFLAGS) + + EXTRA_DSO_LDOPTS = \ + $(XPCOM_GLUE_LDOPTS) \ +- $(NSPR_LIBS) \ ++ $(MOZ_COMPONENT_LIBS) \ + $(MOZ_GIO_LIBS) \ + $(NULL) + Modified: trunk/www/firefox/pkg-message ============================================================================== --- trunk/www/firefox/pkg-message Sat Sep 29 06:08:00 2012 (r1041) +++ trunk/www/firefox/pkg-message Sat Sep 29 06:08:12 2012 (r1042) @@ -1,9 +1,9 @@ ====================================================================== -smb:// issues (GNOMEVFS2 option): +smb:// issues (Gvfs/GIO or GNOMEVFS2 option): Network group, machine, and share browsing does not work correctly. -sftp:// (GNOMEVFS2 option): +sftp:// (Gvfs/GIO or GNOMEVFS2 option): Only sftp access using public key authentication works. To easily setup public key authentication to "remote_host": Modified: trunk/www/firefox36/Makefile ============================================================================== --- trunk/www/firefox36/Makefile Sat Sep 29 06:08:00 2012 (r1041) +++ trunk/www/firefox36/Makefile Sat Sep 29 06:08:12 2012 (r1042) @@ -48,7 +48,7 @@ .include "${.CURDIR}/../../www/firefox/Makefile.options" -OPTIONS_DEFINE:=${OPTIONS_DEFINE:NLIBPROXY} +OPTIONS_DEFINE:=${OPTIONS_DEFINE:NLIBPROXY:NGIO} OPTIONS_SINGLE:=${OPTIONS_SINGLE:NTOOLKIT} .include Added: trunk/www/libxul/files/patch-bug713802 ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ trunk/www/libxul/files/patch-bug713802 Sat Sep 29 06:08:12 2012 (r1042) @@ -0,0 +1,163 @@ +commit 20586fa +Author: Karl Tomlinson +Date: Thu Sep 27 18:35:06 2012 +1200 + + b=713802 default enable GIO support and disable GnomeVFS r=glandium + + --HG-- + extra : transplant_source : wk%ADr%CA%8EN%AE%C93p/p%0A%26%0E%1D0%F20 +--- + browser/confvars.sh | 2 +- + configure.in | 20 ++++++++++---------- + xulrunner/confvars.sh | 2 +- + 3 files changed, 12 insertions(+), 12 deletions(-) + +diff --git browser/confvars.sh browser/confvars.sh +index 40ab494..eae5645 100755 +--- browser/confvars.sh ++++ browser/confvars.sh +@@ -21,7 +21,7 @@ MOZ_SERVICES_AITC=1 + MOZ_SERVICES_NOTIFICATIONS=1 + MOZ_SERVICES_SYNC=1 + MOZ_APP_VERSION=$FIREFOX_VERSION +-MOZ_EXTENSIONS_DEFAULT=" gnomevfs" ++MOZ_EXTENSIONS_DEFAULT=" gio" + # MOZ_APP_DISPLAYNAME will be set by branding/configure.sh + # Changing MOZ_*BRANDING_DIRECTORY requires a clobber to ensure correct results, + # because branding dependencies are broken. +diff --git configure.in configure.in +index 87a9391..2118651 100644 +--- configure.in ++++ configure.in +@@ -4846,21 +4846,21 @@ dnl ======================================================== + + if test "$MOZ_X11" + then +- dnl build the gnomevfs extension by default only when the ++ dnl build the GIO extension by default only when the + dnl GTK2 toolkit is in use. + if test "$MOZ_ENABLE_GTK2" + then +- MOZ_ENABLE_GNOMEVFS=1 ++ MOZ_ENABLE_GIO=1 + MOZ_ENABLE_GCONF=1 + fi + + dnl ======================================================== + dnl = GnomeVFS support module + dnl ======================================================== +- MOZ_ARG_DISABLE_BOOL(gnomevfs, +- [ --disable-gnomevfs Disable GnomeVFS support ], +- MOZ_ENABLE_GNOMEVFS=, +- MOZ_ENABLE_GNOMEVFS=force) ++ MOZ_ARG_ENABLE_BOOL(gnomevfs, ++ [ --enable-gnomevfs Enable GnomeVFS support (default: disabled)], ++ MOZ_ENABLE_GNOMEVFS=force, ++ MOZ_ENABLE_GNOMEVFS=) + + if test "$MOZ_ENABLE_GNOMEVFS" + then +@@ -4884,10 +4884,10 @@ then + dnl ======================================================== + dnl = GIO support module + dnl ======================================================== +- MOZ_ARG_ENABLE_BOOL(gio, +- [ --enable-gio Enable GIO support (default: disabled)], +- MOZ_ENABLE_GIO=force, +- MOZ_ENABLE_GIO=) ++ MOZ_ARG_DISABLE_BOOL(gio, ++ [ --disable-gio Disable GIO support], ++ MOZ_ENABLE_GIO=, ++ MOZ_ENABLE_GIO=force) + + if test "$MOZ_ENABLE_GIO" -a "$MOZ_ENABLE_GTK2" + then +diff --git xulrunner/confvars.sh xulrunner/confvars.sh +index 2fa6ead..5fe2c3d 100755 +--- xulrunner/confvars.sh ++++ xulrunner/confvars.sh +@@ -10,5 +10,5 @@ MOZ_XULRUNNER=1 + MOZ_CHROME_FILE_FORMAT=omni + MOZ_APP_VERSION=$MOZILLA_VERSION + MOZ_PLACES=1 +-MOZ_EXTENSIONS_DEFAULT=" gnomevfs" ++MOZ_EXTENSIONS_DEFAULT=" gio" + MOZ_URL_CLASSIFIER=1 + +commit d884d75 +Author: Karl Tomlinson +Date: Thu Sep 27 18:34:44 2012 +1200 + + b=713802 disable gnomevfs extension without --enable-gnomevfs r=glandium + + --HG-- + extra : transplant_source : i%07%81%E9%90_%C1%05b%194%9B%1E%93%FC%03%279%F9%8A +--- + configure.in | 12 +++--------- + 1 file changed, 3 insertions(+), 9 deletions(-) + +diff --git configure.in configure.in +index f2b4041..87a9391 100644 +--- configure.in ++++ configure.in +@@ -4875,12 +4875,6 @@ then + fi + MOZ_ENABLE_GNOMEVFS= + ]) +- else +- if test `echo "$MOZ_EXTENSIONS" | grep -c gnomevfs` -ne 0; then +- PKG_CHECK_MODULES(MOZ_GNOMEVFS, gnome-vfs-2.0 >= $GNOMEVFS_VERSION gnome-vfs-module-2.0 >= $GNOMEVFS_VERSION,[ +- MOZ_GNOMEVFS_LIBS=`echo $MOZ_GNOMEVFS_LIBS | sed 's/-llinc\>//'` +- ]) +- fi + fi + + AC_SUBST(MOZ_ENABLE_GNOMEVFS) +@@ -5967,10 +5961,10 @@ MOZ_ARG_ENABLE_STRING(extensions, + done], + MOZ_EXTENSIONS="$MOZ_EXTENSIONS_DEFAULT") + +-if test -z "$MOZ_ENABLE_GNOMEVFS" -a -z "$MOZ_GNOMEVFS_LIBS" -a `echo "$MOZ_EXTENSIONS" | grep -c gnomevfs` -ne 0; then ++if test -z "$MOZ_ENABLE_GNOMEVFS" -a `echo "$MOZ_EXTENSIONS" | grep -c gnomevfs` -ne 0; then + # Suppress warning on non-X11 platforms + if test -n "$MOZ_X11"; then +- AC_MSG_WARN([Cannot build gnomevfs without required libraries. Removing gnomevfs from MOZ_EXTENSIONS.]) ++ AC_MSG_WARN([Removing gnomevfs from MOZ_EXTENSIONS due to no --enable-gnomevfs.]) + fi + MOZ_EXTENSIONS=`echo $MOZ_EXTENSIONS | sed -e 's|gnomevfs||'` + fi +@@ -5983,7 +5977,7 @@ fi + if test -z "$MOZ_ENABLE_GIO" -a `echo "$MOZ_EXTENSIONS" | grep -c gio` -ne 0; then + # Suppress warning on non-X11 platforms + if test -n "$MOZ_X11"; then +- AC_MSG_WARN([Cannot build gio without required libraries. Removing gio from MOZ_EXTENSIONS.]) ++ AC_MSG_WARN([Removing gio from MOZ_EXTENSIONS due to --disable-gio.]) + fi + MOZ_EXTENSIONS=`echo $MOZ_EXTENSIONS | sed -e 's|gio||'` + fi + +commit ddedeea +Author: Karl Tomlinson +Date: Thu Sep 27 13:47:19 2012 +1200 + + b=713802 link gio extension against libxul for tracemalloc stack functions r=bsmedberg + + --HG-- + extra : transplant_source : %C8%A3o%BE%A0z%F7%C8%8A%E6%0E%D4s%7D%90%9C%D9%0F%06%7E +--- + extensions/gio/Makefile.in | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git extensions/gio/Makefile.in extensions/gio/Makefile.in +index 46412c4..ccf2846 100644 +--- extensions/gio/Makefile.in ++++ extensions/gio/Makefile.in +@@ -23,7 +23,7 @@ LOCAL_INCLUDES = $(MOZ_GIO_CFLAGS) + + EXTRA_DSO_LDOPTS = \ + $(XPCOM_GLUE_LDOPTS) \ +- $(NSPR_LIBS) \ ++ $(MOZ_COMPONENT_LIBS) \ + $(MOZ_GIO_LIBS) \ + $(NULL) + Modified: trunk/www/libxul19/Makefile ============================================================================== --- trunk/www/libxul19/Makefile Sat Sep 29 06:08:00 2012 (r1041) +++ trunk/www/libxul19/Makefile Sat Sep 29 06:08:12 2012 (r1042) @@ -54,7 +54,7 @@ .include "${.CURDIR}/../../www/firefox/Makefile.options" -OPTIONS_DEFINE:=${OPTIONS_DEFINE:NLIBPROXY} +OPTIONS_DEFINE:=${OPTIONS_DEFINE:NLIBPROXY:NGIO} OPTIONS_SINGLE:=${OPTIONS_SINGLE:NTOOLKIT} .include Modified: trunk/www/seamonkey/Makefile ============================================================================== --- trunk/www/seamonkey/Makefile Sat Sep 29 06:08:00 2012 (r1041) +++ trunk/www/seamonkey/Makefile Sat Sep 29 06:08:12 2012 (r1042) @@ -49,7 +49,7 @@ NOT_FOR_ARCHS= ia64 OPTIONS_DEFINE= CHATZILLA COMPOSER ENIGMAIL GSTREAMER LDAP LIGHTNING MAILNEWS -OPTIONS_DEFAULT=CHATZILLA COMPOSER ENIGMAIL LDAP MAILNEWS +OPTIONS_DEFAULT=CHATZILLA COMPOSER ENIGMAIL GIO LDAP MAILNEWS CHATZILLA_DESC?=Chatzilla IRC module COMPOSER_DESC?= HTML Composer module Added: trunk/www/seamonkey/files/patch-bug713802 ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ trunk/www/seamonkey/files/patch-bug713802 Sat Sep 29 06:08:12 2012 (r1042) @@ -0,0 +1,176 @@ +commit 20586fa +Author: Karl Tomlinson +Date: Thu Sep 27 18:35:06 2012 +1200 + + b=713802 default enable GIO support and disable GnomeVFS r=glandium + + --HG-- + extra : transplant_source : wk%ADr%CA%8EN%AE%C93p/p%0A%26%0E%1D0%F20 +--- + browser/confvars.sh | 2 +- + configure.in | 20 ++++++++++---------- + xulrunner/confvars.sh | 2 +- + 3 files changed, 12 insertions(+), 12 deletions(-) + +diff --git mozilla/browser/confvars.sh mozilla/browser/confvars.sh +index 40ab494..eae5645 100755 +--- mozilla/browser/confvars.sh ++++ mozilla/browser/confvars.sh +@@ -21,7 +21,7 @@ MOZ_SERVICES_AITC=1 + MOZ_SERVICES_NOTIFICATIONS=1 + MOZ_SERVICES_SYNC=1 + MOZ_APP_VERSION=$FIREFOX_VERSION +-MOZ_EXTENSIONS_DEFAULT=" gnomevfs" ++MOZ_EXTENSIONS_DEFAULT=" gio" + # MOZ_APP_DISPLAYNAME will be set by branding/configure.sh + # Changing MOZ_*BRANDING_DIRECTORY requires a clobber to ensure correct results, + # because branding dependencies are broken. +diff --git mozilla/configure.in mozilla/configure.in +index 87a9391..2118651 100644 +--- mozilla/configure.in ++++ mozilla/configure.in +@@ -4846,21 +4846,21 @@ dnl ======================================================== + + if test "$MOZ_X11" + then +- dnl build the gnomevfs extension by default only when the ++ dnl build the GIO extension by default only when the + dnl GTK2 toolkit is in use. + if test "$MOZ_ENABLE_GTK2" + then +- MOZ_ENABLE_GNOMEVFS=1 ++ MOZ_ENABLE_GIO=1 + MOZ_ENABLE_GCONF=1 + fi + + dnl ======================================================== + dnl = GnomeVFS support module + dnl ======================================================== +- MOZ_ARG_DISABLE_BOOL(gnomevfs, +- [ --disable-gnomevfs Disable GnomeVFS support ], +- MOZ_ENABLE_GNOMEVFS=, +- MOZ_ENABLE_GNOMEVFS=force) ++ MOZ_ARG_ENABLE_BOOL(gnomevfs, ++ [ --enable-gnomevfs Enable GnomeVFS support (default: disabled)], ++ MOZ_ENABLE_GNOMEVFS=force, ++ MOZ_ENABLE_GNOMEVFS=) + + if test "$MOZ_ENABLE_GNOMEVFS" + then +@@ -4884,10 +4884,10 @@ then + dnl ======================================================== + dnl = GIO support module + dnl ======================================================== +- MOZ_ARG_ENABLE_BOOL(gio, +- [ --enable-gio Enable GIO support (default: disabled)], +- MOZ_ENABLE_GIO=force, +- MOZ_ENABLE_GIO=) ++ MOZ_ARG_DISABLE_BOOL(gio, ++ [ --disable-gio Disable GIO support], ++ MOZ_ENABLE_GIO=, ++ MOZ_ENABLE_GIO=force) + + if test "$MOZ_ENABLE_GIO" -a "$MOZ_ENABLE_GTK2" + then +diff --git mozilla/xulrunner/confvars.sh mozilla/xulrunner/confvars.sh +index 2fa6ead..5fe2c3d 100755 +--- mozilla/xulrunner/confvars.sh ++++ mozilla/xulrunner/confvars.sh +@@ -10,5 +10,5 @@ MOZ_XULRUNNER=1 + MOZ_CHROME_FILE_FORMAT=omni + MOZ_APP_VERSION=$MOZILLA_VERSION + MOZ_PLACES=1 +-MOZ_EXTENSIONS_DEFAULT=" gnomevfs" ++MOZ_EXTENSIONS_DEFAULT=" gio" + MOZ_URL_CLASSIFIER=1 +diff --git suite/confvars.sh suite/confvars.sh +index 8c13a33..cdedd30 100755 +--- suite/confvars.sh ++++ suite/confvars.sh +@@ -15,7 +15,7 @@ MOZ_COMPOSER=1 + MOZ_SUITE=1 + MOZ_BRANDING_DIRECTORY=suite/branding/nightly + MOZ_OFFICIAL_BRANDING_DIRECTORY=suite/branding/nightly +-MOZ_EXTENSIONS_DEFAULT=" venkman inspector irc gnomevfs" ++MOZ_EXTENSIONS_DEFAULT=" venkman inspector irc gio" + MOZ_UPDATER=1 + # This should usually be the same as the value MAR_CHANNEL_ID. + # If more than one ID is needed, then you should use a comma separated list + +commit d884d75 +Author: Karl Tomlinson +Date: Thu Sep 27 18:34:44 2012 +1200 + + b=713802 disable gnomevfs extension without --enable-gnomevfs r=glandium + + --HG-- + extra : transplant_source : i%07%81%E9%90_%C1%05b%194%9B%1E%93%FC%03%279%F9%8A +--- + configure.in | 12 +++--------- + 1 file changed, 3 insertions(+), 9 deletions(-) + +diff --git mozilla/configure.in mozilla/configure.in +index f2b4041..87a9391 100644 +--- mozilla/configure.in ++++ mozilla/configure.in +@@ -4875,12 +4875,6 @@ then + fi + MOZ_ENABLE_GNOMEVFS= + ]) +- else +- if test `echo "$MOZ_EXTENSIONS" | grep -c gnomevfs` -ne 0; then +- PKG_CHECK_MODULES(MOZ_GNOMEVFS, gnome-vfs-2.0 >= $GNOMEVFS_VERSION gnome-vfs-module-2.0 >= $GNOMEVFS_VERSION,[ +- MOZ_GNOMEVFS_LIBS=`echo $MOZ_GNOMEVFS_LIBS | sed 's/-llinc\>//'` +- ]) +- fi + fi + + AC_SUBST(MOZ_ENABLE_GNOMEVFS) +@@ -5967,10 +5961,10 @@ MOZ_ARG_ENABLE_STRING(extensions, + done], + MOZ_EXTENSIONS="$MOZ_EXTENSIONS_DEFAULT") + +-if test -z "$MOZ_ENABLE_GNOMEVFS" -a -z "$MOZ_GNOMEVFS_LIBS" -a `echo "$MOZ_EXTENSIONS" | grep -c gnomevfs` -ne 0; then ++if test -z "$MOZ_ENABLE_GNOMEVFS" -a `echo "$MOZ_EXTENSIONS" | grep -c gnomevfs` -ne 0; then + # Suppress warning on non-X11 platforms + if test -n "$MOZ_X11"; then +- AC_MSG_WARN([Cannot build gnomevfs without required libraries. Removing gnomevfs from MOZ_EXTENSIONS.]) ++ AC_MSG_WARN([Removing gnomevfs from MOZ_EXTENSIONS due to no --enable-gnomevfs.]) + fi + MOZ_EXTENSIONS=`echo $MOZ_EXTENSIONS | sed -e 's|gnomevfs||'` + fi +@@ -5983,7 +5977,7 @@ fi + if test -z "$MOZ_ENABLE_GIO" -a `echo "$MOZ_EXTENSIONS" | grep -c gio` -ne 0; then + # Suppress warning on non-X11 platforms + if test -n "$MOZ_X11"; then +- AC_MSG_WARN([Cannot build gio without required libraries. Removing gio from MOZ_EXTENSIONS.]) ++ AC_MSG_WARN([Removing gio from MOZ_EXTENSIONS due to --disable-gio.]) + fi + MOZ_EXTENSIONS=`echo $MOZ_EXTENSIONS | sed -e 's|gio||'` + fi + +commit ddedeea +Author: Karl Tomlinson +Date: Thu Sep 27 13:47:19 2012 +1200 + + b=713802 link gio extension against libxul for tracemalloc stack functions r=bsmedberg + + --HG-- + extra : transplant_source : %C8%A3o%BE%A0z%F7%C8%8A%E6%0E%D4s%7D%90%9C%D9%0F%06%7E +--- + extensions/gio/Makefile.in | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git mozilla/extensions/gio/Makefile.in mozilla/extensions/gio/Makefile.in +index 46412c4..ccf2846 100644 +--- mozilla/extensions/gio/Makefile.in ++++ mozilla/extensions/gio/Makefile.in +@@ -23,7 +23,7 @@ LOCAL_INCLUDES = $(MOZ_GIO_CFLAGS) + + EXTRA_DSO_LDOPTS = \ + $(XPCOM_GLUE_LDOPTS) \ +- $(NSPR_LIBS) \ ++ $(MOZ_COMPONENT_LIBS) \ + $(MOZ_GIO_LIBS) \ + $(NULL) + From owner-freebsd-gecko@FreeBSD.ORG Sat Sep 29 06:08:26 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 C6B7610656A8 for ; Sat, 29 Sep 2012 06:08:26 +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 515AA8FC15 for ; Sat, 29 Sep 2012 06:08: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 q8T68P4L071952 for ; Sat, 29 Sep 2012 06:08:25 GMT (envelope-from svn-freebsd-gecko@chruetertee.ch) Received: (from www@localhost) by trillian.chruetertee.ch (8.14.4/8.14.3/Submit) id q8T68K7F071564 for freebsd-gecko@freebsd.org; Sat, 29 Sep 2012 06:08:20 GMT (envelope-from svn-freebsd-gecko@chruetertee.ch) Date: Sat, 29 Sep 2012 06:08:20 GMT Message-Id: <201209290608.q8T68K7F071564@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] r1043 - 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: Sat, 29 Sep 2012 06:08:26 -0000 Author: jbeich Date: Sat Sep 29 06:08:20 2012 New Revision: 1043 Log: don't hardcode path to runtime Modified: trunk/Mk/bsd.gecko.mk Modified: trunk/Mk/bsd.gecko.mk ============================================================================== --- trunk/Mk/bsd.gecko.mk Sat Sep 29 06:08:12 2012 (r1042) +++ trunk/Mk/bsd.gecko.mk Sat Sep 29 06:08:20 2012 (r1043) @@ -543,7 +543,13 @@ MOZ_OPTIONS+= --prefix="${FAKEDIR}" CPPFLAGS+= -isystem${LOCALBASE}/include -LDFLAGS+= -L${LOCALBASE}/lib -Wl,-rpath,${PREFIX}/lib/${MOZ_RPATH} +LDFLAGS+= -L${LOCALBASE}/lib + +.if ${OSVERSION} > 800072 +LDFLAGS+= -Wl,-z,origin -Wl,-rpath,\\\$$\$$ORIGIN +.else +LDFLAGS+= -Wl,-rpath,${PREFIX}/lib/${MOZ_RPATH} +.endif # Standard depends _ALL_DEPENDS= cairo dbm event ffi hunspell jpeg nspr nss png sqlite vpx zip @@ -613,7 +619,6 @@ MOZ_OPTIONS+= --disable-tests \ --enable-chrome-format=${MOZ_CHROME} \ --enable-default-toolkit=${MOZ_TOOLKIT} \ - --with-default-mozilla-five-home=${PREFIX}/lib/${MOZILLA} \ --with-pthreads # Configure options for install .if !defined(MOZ_EXTENSIONS) From owner-freebsd-gecko@FreeBSD.ORG Sat Sep 29 15:40:56 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 698C2106564A; Sat, 29 Sep 2012 15:40:56 +0000 (UTC) (envelope-from sunpoet@sunpoet.net) Received: from sunpoet.net (sunpoet.net [220.133.12.240]) by mx1.freebsd.org (Postfix) with ESMTP id EED7E8FC15; Sat, 29 Sep 2012 15:40:55 +0000 (UTC) Received: by sunpoet.net (Postfix, from userid 1000) id 3XTYjZ50J1z6Tl; Sat, 29 Sep 2012 23:35:14 +0800 (CST) To: FreeBSD-gnats-submit@freebsd.org From: Sunpoet Po-Chuan Hsieh X-send-pr-version: 3.113 X-GNATS-Notify: Message-Id: <3XTYjZ50J1z6Tl@sunpoet.net> Date: Sat, 29 Sep 2012 23:35:14 +0800 (CST) Cc: gecko@FreeBSD.org Subject: [PATCH] security/nss: fix 'make install' when built with clang 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: Sat, 29 Sep 2012 15:40:56 -0000 >Submitter-Id: current-users >Originator: Sunpoet Po-Chuan Hsieh >Organization: The FreeBSD Project >Confidential: no >Synopsis: [PATCH] security/nss: fix 'make install' when built with clang >Severity: non-critical >Priority: low >Category: ports >Class: change-request >Release: FreeBSD 9.1-PRERELEASE amd64 >Environment: System: FreeBSD bonjour.sunpoet.net 9.1-PRERELEASE FreeBSD 9.1-PRERELEASE #0: Sat Sep 8 01:52:48 CST >Description: - Fix 'make install' when built with clang To build port with clang, I have following lines in /etc/make.conf: CC= /usr/bin/clang CPP= /usr/bin/clang-cpp CXX= /usr/bin/clang++ The installation failed when it tries to copy *.so.1 from ${BINS}, which should be either ${DIST}/${OPSYS}${OSREL}_OPT.OBJ or ${DIST}/${OPSYS}${OSREL}_DBG.OBJ. However, it's actually ${DIST}/${OPSYS}${OSREL}_clang_OPT.OBJ if DEBUG option is off. This patch simply sets COMPILER_TAG empty to avoid such condition. Port maintainer (gecko@FreeBSD.org) is cc'd. Generated with FreeBSD Port Tools 0.99_6 (mode: change, diff: SVN) >How-To-Repeat: >Fix: --- nss-3.13.6.patch begins here --- Index: Makefile =================================================================== --- Makefile (revision 305013) +++ Makefile (working copy) @@ -77,6 +77,8 @@ ${FILESDIR}/nss-config.in >${WRKDIR}/nss-config @${SED} -e 's|@PREFIX@|${PREFIX}|; s|@PORTVERSION@|${PORTVERSION}|' \ ${FILESDIR}/nss.pc.in >${WRKDIR}/nss.pc + @${REINPLACE_CMD} -e 's|\(COMPILER_TAG = \).*|\1|' \ + ${WRKSRC}/../coreconf/ruleset.mk .for i in MAJOR MINOR PATCH @${SED} -i.${i} -e 's|@${i}@|${_${i}}|' ${WRKDIR}/nss-config .endfor --- nss-3.13.6.patch ends here --- From owner-freebsd-gecko@FreeBSD.ORG Sat Sep 29 15:50:18 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 E61C6106564A; Sat, 29 Sep 2012 15:50:18 +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 B904C8FC15; Sat, 29 Sep 2012 15:50:18 +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 q8TFoIJu023927; Sat, 29 Sep 2012 15:50:18 GMT (envelope-from edwin@freefall.freebsd.org) Received: (from edwin@localhost) by freefall.freebsd.org (8.14.5/8.14.5/Submit) id q8TFoIU2023912; Sat, 29 Sep 2012 15:50:18 GMT (envelope-from edwin) Date: Sat, 29 Sep 2012 15:50:18 GMT Message-Id: <201209291550.q8TFoIU2023912@freefall.freebsd.org> To: edwin@FreeBSD.org, freebsd-ports-bugs@FreeBSD.org, gecko@FreeBSD.org From: edwin@FreeBSD.org Cc: Subject: Re: ports/172164: [PATCH] security/nss: fix 'make install' when built with clang 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: Sat, 29 Sep 2012 15:50:19 -0000 Synopsis: [PATCH] security/nss: fix 'make install' when built with clang Responsible-Changed-From-To: freebsd-ports-bugs->gecko Responsible-Changed-By: edwin Responsible-Changed-When: Sat Sep 29 15:50:18 UTC 2012 Responsible-Changed-Why: Over to maintainer (via the GNATS Auto Assign Tool) http://www.freebsd.org/cgi/query-pr.cgi?pr=172164 From owner-freebsd-gecko@FreeBSD.ORG Sat Sep 29 16:19:25 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 4E53D1065781 for ; Sat, 29 Sep 2012 16:19:25 +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 E1D2B8FC12 for ; Sat, 29 Sep 2012 16:19:24 +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 q8TGJNNw090631 for ; Sat, 29 Sep 2012 16:19:23 GMT (envelope-from svn-freebsd-gecko@chruetertee.ch) Received: (from www@localhost) by trillian.chruetertee.ch (8.14.4/8.14.3/Submit) id q8TGJImg090083 for freebsd-gecko@freebsd.org; Sat, 29 Sep 2012 16:19:18 GMT (envelope-from svn-freebsd-gecko@chruetertee.ch) Date: Sat, 29 Sep 2012 16:19:18 GMT Message-Id: <201209291619.q8TGJImg090083@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] r1044 - in trunk/www: firefox-esr/files libxul libxul/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, 29 Sep 2012 16:19:25 -0000 Author: jbeich Date: Sat Sep 29 16:19:18 2012 New Revision: 1044 Log: - unbreak GIO extension on -esr - enable GIO by default on libxul Added: trunk/www/firefox-esr/files/patch-bug696030 trunk/www/libxul/files/patch-bug696030 Modified: trunk/www/libxul/Makefile Added: trunk/www/firefox-esr/files/patch-bug696030 ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ trunk/www/firefox-esr/files/patch-bug696030 Sat Sep 29 16:19:18 2012 (r1044) @@ -0,0 +1,34 @@ +commit 5e354b9 +Author: Chris Coulson +Date: Thu Jan 5 11:19:50 2012 +1300 + + Bug 696030 - Use MonitorAutoLock rather than MonitorAutoEnter in nsGIOProtocolHandler r=karlt + + --HG-- + extra : rebase_source : 6f3d1a49a07affab679e41cd8cf968d62c072299 +--- + extensions/gio/nsGIOProtocolHandler.cpp | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git extensions/gio/nsGIOProtocolHandler.cpp extensions/gio/nsGIOProtocolHandler.cpp +index 9347b6e..e8f153d 100644 +--- extensions/gio/nsGIOProtocolHandler.cpp ++++ extensions/gio/nsGIOProtocolHandler.cpp +@@ -238,7 +238,7 @@ class nsGIOInputStream : public nsIInputStream + void + nsGIOInputStream::SetMountResult(MountOperationResult result, gint error_code) + { +- mozilla::MonitorAutoEnter mon(mMonitorMountInProgress); ++ mozilla::MonitorAutoLock mon(mMonitorMountInProgress); + mMountRes = result; + mMountErrorCode = error_code; + mon.Notify(); +@@ -263,7 +263,7 @@ nsGIOInputStream::MountVolume() { + NULL, + mount_enclosing_volume_finished, + this); +- mozilla::MonitorAutoEnter mon(mMonitorMountInProgress); ++ mozilla::MonitorAutoLock mon(mMonitorMountInProgress); + /* Waiting for finish of mount operation thread */ + while (mMountRes == MOUNT_OPERATION_IN_PROGRESS) + mon.Wait(); Modified: trunk/www/libxul/Makefile ============================================================================== --- trunk/www/libxul/Makefile Sat Sep 29 06:08:20 2012 (r1043) +++ trunk/www/libxul/Makefile Sat Sep 29 16:19:18 2012 (r1044) @@ -49,6 +49,8 @@ MOZ_PKGCONFIG_FILES= libxul-embedding libxul mozilla-js \ mozilla-plugin +OPTIONS_DEFAULT=GIO + .include "${.CURDIR}/../../www/firefox/Makefile.options" .include Added: trunk/www/libxul/files/patch-bug696030 ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ trunk/www/libxul/files/patch-bug696030 Sat Sep 29 16:19:18 2012 (r1044) @@ -0,0 +1,34 @@ +commit 5e354b9 +Author: Chris Coulson +Date: Thu Jan 5 11:19:50 2012 +1300 + + Bug 696030 - Use MonitorAutoLock rather than MonitorAutoEnter in nsGIOProtocolHandler r=karlt + + --HG-- + extra : rebase_source : 6f3d1a49a07affab679e41cd8cf968d62c072299 +--- + extensions/gio/nsGIOProtocolHandler.cpp | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git extensions/gio/nsGIOProtocolHandler.cpp extensions/gio/nsGIOProtocolHandler.cpp +index 9347b6e..e8f153d 100644 +--- extensions/gio/nsGIOProtocolHandler.cpp ++++ extensions/gio/nsGIOProtocolHandler.cpp +@@ -238,7 +238,7 @@ class nsGIOInputStream : public nsIInputStream + void + nsGIOInputStream::SetMountResult(MountOperationResult result, gint error_code) + { +- mozilla::MonitorAutoEnter mon(mMonitorMountInProgress); ++ mozilla::MonitorAutoLock mon(mMonitorMountInProgress); + mMountRes = result; + mMountErrorCode = error_code; + mon.Notify(); +@@ -263,7 +263,7 @@ nsGIOInputStream::MountVolume() { + NULL, + mount_enclosing_volume_finished, + this); +- mozilla::MonitorAutoEnter mon(mMonitorMountInProgress); ++ mozilla::MonitorAutoLock mon(mMonitorMountInProgress); + /* Waiting for finish of mount operation thread */ + while (mMountRes == MOUNT_OPERATION_IN_PROGRESS) + mon.Wait(); From owner-freebsd-gecko@FreeBSD.ORG Sat Sep 29 16:19:34 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 B152E1065782 for ; Sat, 29 Sep 2012 16:19:34 +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 527AB8FC16 for ; Sat, 29 Sep 2012 16:19:34 +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 q8TGJXdC092224 for ; Sat, 29 Sep 2012 16:19:33 GMT (envelope-from svn-freebsd-gecko@chruetertee.ch) Received: (from www@localhost) by trillian.chruetertee.ch (8.14.4/8.14.3/Submit) id q8TGJS3W091391 for freebsd-gecko@freebsd.org; Sat, 29 Sep 2012 16:19:28 GMT (envelope-from svn-freebsd-gecko@chruetertee.ch) Date: Sat, 29 Sep 2012 16:19:28 GMT Message-Id: <201209291619.q8TGJS3W091391@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] r1045 - in trunk/www: firefox-esr/files firefox-nightly/files firefox/files libxul/files 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: Sat, 29 Sep 2012 16:19:34 -0000 Author: jbeich Date: Sat Sep 29 16:19:28 2012 New Revision: 1045 Log: actually install gio extension Added: trunk/www/firefox-nightly/files/patch-bug713802 Modified: trunk/www/firefox-esr/files/patch-bug713802 trunk/www/firefox/files/patch-bug713802 trunk/www/libxul/files/patch-bug713802 trunk/www/seamonkey/files/patch-bug713802 Modified: trunk/www/firefox-esr/files/patch-bug713802 ============================================================================== --- trunk/www/firefox-esr/files/patch-bug713802 Sat Sep 29 16:19:18 2012 (r1044) +++ trunk/www/firefox-esr/files/patch-bug713802 Sat Sep 29 16:19:28 2012 (r1045) @@ -25,6 +25,19 @@ # MOZ_APP_DISPLAYNAME will be set by branding/configure.sh # Changing MOZ_*BRANDING_DIRECTORY requires a clobber to ensure correct results, # because branding dependencies are broken. +--- browser/installer/package-manifest.in~ ++++ browser/installer/package-manifest.in +@@ -679,6 +679,10 @@ bin/libfreebl_32int64_3.so + + ; [Extensions] + ; ++#ifdef MOZ_ENABLE_GIO ++bin/components/@DLL_PREFIX@nkgio@DLL_SUFFIX@ ++#endif ++ + #ifdef MOZ_ENABLE_GNOMEVFS + bin/components/@DLL_PREFIX@nkgnomevfs@DLL_SUFFIX@ + #endif diff --git configure.in configure.in index 87a9391..2118651 100644 --- configure.in Added: trunk/www/firefox-nightly/files/patch-bug713802 ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ trunk/www/firefox-nightly/files/patch-bug713802 Sat Sep 29 16:19:28 2012 (r1045) @@ -0,0 +1,13 @@ +--- browser/installer/package-manifest.in~ ++++ browser/installer/package-manifest.in +@@ -679,6 +679,10 @@ bin/libfreebl_32int64_3.so + + ; [Extensions] + ; ++#ifdef MOZ_ENABLE_GIO ++bin/components/@DLL_PREFIX@nkgio@DLL_SUFFIX@ ++#endif ++ + #ifdef MOZ_ENABLE_GNOMEVFS + bin/components/@DLL_PREFIX@nkgnomevfs@DLL_SUFFIX@ + #endif Modified: trunk/www/firefox/files/patch-bug713802 ============================================================================== --- trunk/www/firefox/files/patch-bug713802 Sat Sep 29 16:19:18 2012 (r1044) +++ trunk/www/firefox/files/patch-bug713802 Sat Sep 29 16:19:28 2012 (r1045) @@ -25,6 +25,19 @@ # MOZ_APP_DISPLAYNAME will be set by branding/configure.sh # Changing MOZ_*BRANDING_DIRECTORY requires a clobber to ensure correct results, # because branding dependencies are broken. +--- browser/installer/package-manifest.in~ ++++ browser/installer/package-manifest.in +@@ -679,6 +679,10 @@ bin/libfreebl_32int64_3.so + + ; [Extensions] + ; ++#ifdef MOZ_ENABLE_GIO ++bin/components/@DLL_PREFIX@nkgio@DLL_SUFFIX@ ++#endif ++ + #ifdef MOZ_ENABLE_GNOMEVFS + bin/components/@DLL_PREFIX@nkgnomevfs@DLL_SUFFIX@ + #endif diff --git configure.in configure.in index 87a9391..2118651 100644 --- configure.in Modified: trunk/www/libxul/files/patch-bug713802 ============================================================================== --- trunk/www/libxul/files/patch-bug713802 Sat Sep 29 16:19:18 2012 (r1044) +++ trunk/www/libxul/files/patch-bug713802 Sat Sep 29 16:19:28 2012 (r1045) @@ -25,6 +25,19 @@ # MOZ_APP_DISPLAYNAME will be set by branding/configure.sh # Changing MOZ_*BRANDING_DIRECTORY requires a clobber to ensure correct results, # because branding dependencies are broken. +--- browser/installer/package-manifest.in~ ++++ browser/installer/package-manifest.in +@@ -679,6 +679,10 @@ bin/libfreebl_32int64_3.so + + ; [Extensions] + ; ++#ifdef MOZ_ENABLE_GIO ++bin/components/@DLL_PREFIX@nkgio@DLL_SUFFIX@ ++#endif ++ + #ifdef MOZ_ENABLE_GNOMEVFS + bin/components/@DLL_PREFIX@nkgnomevfs@DLL_SUFFIX@ + #endif diff --git configure.in configure.in index 87a9391..2118651 100644 --- configure.in Modified: trunk/www/seamonkey/files/patch-bug713802 ============================================================================== --- trunk/www/seamonkey/files/patch-bug713802 Sat Sep 29 16:19:18 2012 (r1044) +++ trunk/www/seamonkey/files/patch-bug713802 Sat Sep 29 16:19:28 2012 (r1045) @@ -25,6 +25,19 @@ # MOZ_APP_DISPLAYNAME will be set by branding/configure.sh # Changing MOZ_*BRANDING_DIRECTORY requires a clobber to ensure correct results, # because branding dependencies are broken. +--- mozilla/browser/installer/package-manifest.in~ ++++ mozilla/browser/installer/package-manifest.in +@@ -679,6 +679,10 @@ bin/libfreebl_32int64_3.so + + ; [Extensions] + ; ++#ifdef MOZ_ENABLE_GIO ++bin/components/@DLL_PREFIX@nkgio@DLL_SUFFIX@ ++#endif ++ + #ifdef MOZ_ENABLE_GNOMEVFS + bin/components/@DLL_PREFIX@nkgnomevfs@DLL_SUFFIX@ + #endif diff --git mozilla/configure.in mozilla/configure.in index 87a9391..2118651 100644 --- mozilla/configure.in @@ -96,6 +109,18 @@ MOZ_UPDATER=1 # This should usually be the same as the value MAR_CHANNEL_ID. # If more than one ID is needed, then you should use a comma separated list +--- suite/installer/package-manifest.in~ ++++ suite/installer/package-manifest.in +@@ -265,6 +265,9 @@ + @BINPATH@/components/necko_wifi.xpt + #endif + @BINPATH@/components/necko_wyciwyg.xpt ++#ifdef MOZ_ENABLE_GIO ++@BINPATH@/components/@DLL_PREFIX@nkgio@DLL_SUFFIX@ ++#endif + #ifdef MOZ_ENABLE_GNOMEVFS + @BINPATH@/components/@DLL_PREFIX@nkgnomevfs@DLL_SUFFIX@ + #endif commit d884d75 Author: Karl Tomlinson From owner-freebsd-gecko@FreeBSD.ORG Sat Sep 29 16:19:43 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 5A891106567C for ; Sat, 29 Sep 2012 16:19:43 +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 BC86F8FC19 for ; Sat, 29 Sep 2012 16:19:42 +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 q8TGJfE1094216 for ; Sat, 29 Sep 2012 16:19:41 GMT (envelope-from svn-freebsd-gecko@chruetertee.ch) Received: (from www@localhost) by trillian.chruetertee.ch (8.14.4/8.14.3/Submit) id q8TGJaWk093164 for freebsd-gecko@freebsd.org; Sat, 29 Sep 2012 16:19:36 GMT (envelope-from svn-freebsd-gecko@chruetertee.ch) Date: Sat, 29 Sep 2012 16:19:36 GMT Message-Id: <201209291619.q8TGJaWk093164@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] r1046 - in trunk: . mail/thunderbird mail/thunderbird-esr 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: Sat, 29 Sep 2012 16:19:43 -0000 Author: jbeich Date: Sat Sep 29 16:19:36 2012 New Revision: 1046 Log: build lightning extension by default Suggested by: flo Modified: trunk/Gecko_ChangeLog trunk/mail/thunderbird-esr/Makefile trunk/mail/thunderbird/Makefile trunk/www/seamonkey/Makefile Modified: trunk/Gecko_ChangeLog ============================================================================== --- trunk/Gecko_ChangeLog Sat Sep 29 16:19:28 2012 (r1045) +++ trunk/Gecko_ChangeLog Sat Sep 29 16:19:36 2012 (r1046) @@ -1,6 +1,6 @@ 16.0: -- enable GIO option by default - integrate enigmail into thunderbird/seamonkey +- enable GIO and LIGHTNING options by default - switch firefox 16.0 and seamonkey 2.13 to ALSA by default for better latency during pause and seeking with HTML5 video - remove fedisableexcept() hacks, obsolete since FreeBSD 4.0 Modified: trunk/mail/thunderbird-esr/Makefile ============================================================================== --- trunk/mail/thunderbird-esr/Makefile Sat Sep 29 16:19:28 2012 (r1045) +++ trunk/mail/thunderbird-esr/Makefile Sat Sep 29 16:19:36 2012 (r1046) @@ -55,7 +55,7 @@ MOZ_PIS_SCRIPTS=moz_pis_S50cleanhome OPTIONS_DEFINE= ENIGMAIL LIGHTNING -OPTIONS_DEFAULT=ENIGMAIL +OPTIONS_DEFAULT=ENIGMAIL LIGHTNING .include "${.CURDIR}/../../www/firefox/Makefile.options" .include Modified: trunk/mail/thunderbird/Makefile ============================================================================== --- trunk/mail/thunderbird/Makefile Sat Sep 29 16:19:28 2012 (r1045) +++ trunk/mail/thunderbird/Makefile Sat Sep 29 16:19:36 2012 (r1046) @@ -56,7 +56,7 @@ MOZ_PIS_SCRIPTS=moz_pis_S50cleanhome OPTIONS_DEFINE= ENIGMAIL GSTREAMER LIGHTNING -OPTIONS_DEFAULT=ENIGMAIL +OPTIONS_DEFAULT=ENIGMAIL LIGHTNING .include "${.CURDIR}/../../www/firefox/Makefile.options" .include Modified: trunk/www/seamonkey/Makefile ============================================================================== --- trunk/www/seamonkey/Makefile Sat Sep 29 16:19:28 2012 (r1045) +++ trunk/www/seamonkey/Makefile Sat Sep 29 16:19:36 2012 (r1046) @@ -49,7 +49,7 @@ NOT_FOR_ARCHS= ia64 OPTIONS_DEFINE= CHATZILLA COMPOSER ENIGMAIL GSTREAMER LDAP LIGHTNING MAILNEWS -OPTIONS_DEFAULT=CHATZILLA COMPOSER ENIGMAIL GIO LDAP MAILNEWS +OPTIONS_DEFAULT=CHATZILLA COMPOSER ENIGMAIL GIO LDAP LIGHTNING MAILNEWS CHATZILLA_DESC?=Chatzilla IRC module COMPOSER_DESC?= HTML Composer module From owner-freebsd-gecko@FreeBSD.ORG Sat Sep 29 16:19:49 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 C40ED106567E for ; Sat, 29 Sep 2012 16:19:49 +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 538298FC17 for ; Sat, 29 Sep 2012 16:19:49 +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 q8TGJmYY095813 for ; Sat, 29 Sep 2012 16:19:48 GMT (envelope-from svn-freebsd-gecko@chruetertee.ch) Received: (from www@localhost) by trillian.chruetertee.ch (8.14.4/8.14.3/Submit) id q8TGJheV095378 for freebsd-gecko@freebsd.org; Sat, 29 Sep 2012 16:19:43 GMT (envelope-from svn-freebsd-gecko@chruetertee.ch) Date: Sat, 29 Sep 2012 16:19:43 GMT Message-Id: <201209291619.q8TGJheV095378@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] r1047 - 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: Sat, 29 Sep 2012 16:19:49 -0000 Author: jbeich Date: Sat Sep 29 16:19:43 2012 New Revision: 1047 Log: clarify enigmail option in changelog Modified: trunk/Gecko_ChangeLog Modified: trunk/Gecko_ChangeLog ============================================================================== --- trunk/Gecko_ChangeLog Sat Sep 29 16:19:36 2012 (r1046) +++ trunk/Gecko_ChangeLog Sat Sep 29 16:19:43 2012 (r1047) @@ -1,6 +1,6 @@ 16.0: -- integrate enigmail into thunderbird/seamonkey -- enable GIO and LIGHTNING options by default +- integrate enigmail into thunderbird/seamonkey as an option +- enable ENIGMAIL, LIGHTNING and GIO options by default - switch firefox 16.0 and seamonkey 2.13 to ALSA by default for better latency during pause and seeking with HTML5 video - remove fedisableexcept() hacks, obsolete since FreeBSD 4.0 From owner-freebsd-gecko@FreeBSD.ORG Sat Sep 29 16:30:44 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 E71811065675 for ; Sat, 29 Sep 2012 16:30:44 +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 759F18FC1A for ; Sat, 29 Sep 2012 16:30:43 +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 q8TGUhN7037600 for ; Sat, 29 Sep 2012 16:30: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 q8TGUc5A037089 for freebsd-gecko@freebsd.org; Sat, 29 Sep 2012 16:30:38 GMT (envelope-from svn-freebsd-gecko@chruetertee.ch) Date: Sat, 29 Sep 2012 16:30:38 GMT Message-Id: <201209291630.q8TGUc5A037089@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] r1048 - 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: Sat, 29 Sep 2012 16:30:45 -0000 Author: jbeich Date: Sat Sep 29 16:30:37 2012 New Revision: 1048 Log: pin one more PR to changelog Modified: trunk/Gecko_ChangeLog Modified: trunk/Gecko_ChangeLog ============================================================================== --- trunk/Gecko_ChangeLog Sat Sep 29 16:19:43 2012 (r1047) +++ trunk/Gecko_ChangeLog Sat Sep 29 16:30:37 2012 (r1048) @@ -6,6 +6,7 @@ - remove fedisableexcept() hacks, obsolete since FreeBSD 4.0 - support system hunspell dictionaries [1] - unbreak -esr ports with clang3.2 [2] +- unbreak nss build when CC contains full path [3] - 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,4 +15,4 @@ - use libjpeg-turbo's faster color conversion if available during build - record startup time for telemetry -PR: ports/171534 [1], ports/171566 [2] +PR: ports/171534 [1], ports/171566 [2], ports/172164 [3]