From owner-freebsd-gecko@FreeBSD.ORG Sun Nov 16 17:44:23 2014 Return-Path: Delivered-To: freebsd-gecko@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id B26567C1 for ; Sun, 16 Nov 2014 17:44:23 +0000 (UTC) Received: from vfemail.net (nine.vfemail.net [108.76.175.9]) (using TLSv1 with cipher ECDHE-RSA-AES256-SHA (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 3CFC71CD for ; Sun, 16 Nov 2014 17:44:22 +0000 (UTC) Received: (qmail 77566 invoked by uid 89); 16 Nov 2014 17:11:01 -0000 Received: from localhost (HELO freequeue.vfemail.net) (127.0.0.1) by localhost with (DHE-RSA-AES256-SHA encrypted) SMTP; 16 Nov 2014 17:10:46 -0000 Received: (qmail 3320 invoked by uid 89); 16 Nov 2014 10:23:11 -0000 Received: by simscan 1.3.1 ppid: 3318, pid: 3319, t: 0.0045s scanners:none Received: from unknown (HELO smtp102-2.vfemail.net) (172.16.100.62) by FreeQueue with SMTP; 16 Nov 2014 10:23:11 -0000 Received: (qmail 15389 invoked by uid 89); 16 Nov 2014 10:23:10 -0000 Received: by simscan 1.4.0 ppid: 15358, pid: 15375, t: 0.8136s scanners:none Received: from unknown (HELO nil) (amJlaWNoQHZmZW1haWwubmV0@172.16.100.27) by 172.16.100.62 with ESMTPA; 16 Nov 2014 10:23:09 -0000 From: Jan Beich To: brunomaximom@openmailbox.org Subject: Re: Tor browser References: <55a36fd9ce26f1796549327f9a05c4ff@openmailbox.org> Date: Sun, 16 Nov 2014 11:23:05 +0100 Message-ID: MIME-Version: 1.0 Content-Type: text/plain Cc: freebsd-gecko@freebsd.org X-BeenThere: freebsd-gecko@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: Gecko Rendering Engine issues List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 16 Nov 2014 17:44:23 -0000 brunomaximom@openmailbox.org writes: > Hi, I was trying to buil linux-tor-browser but when I run it I got this > error: > > mkdir: cannot create directory `.config': Permission denied > ln: creating symbolic link `.config/ibus': No such file or directory A regular user has no write access under /usr/local/lib/linux-tor-browser where those commands are run. As the port moves TorBrowser/Data to %%USERDATADIR%% the quoted path may need to be adjusted as well. ticket#9353 probably doesn't affect linux-tor-browser because only GTK_IM_MODULE=xim is supported due to lack of extra gtk immodules among linux- ports. So, the quoted error about applying IBus workaround can be ignored for now. > expr: error while loading shared libraries: libgmp.so.3: cannot open > shared object file: No such file or directory Indeed. linux_base-* are missing libgmp.so.3 despite some apps that maybe used within linux shell scripts depending on it. expr(1) usage in particular is pretty common even though one can easily replace it with $((...)) arithmetics and case/esac shell patterns. $ /compat/linux/usr/bin/expr /compat/linux/usr/bin/expr: error while loading shared libraries: libgmp.so.3: cannot open shared object file: No such file or directory $ /compat/linux/usr/bin/factor /compat/linux/usr/bin/factor: error while loading shared libraries: libgmp.so.3: cannot open shared object file: No such file or directory However, the quoted error wouldn't occur if: - the script is executed by linux shell - linuxulator strips /compat/linux prefix before giving up - PATH environment variable contains /bin before /usr/bin $ /compat/linux/bin/bash bash-4.1$ PATH=/bin:/usr/bin which expr /bin/expr bash-4.1$ PATH=/usr/bin:/bin which expr /usr/bin/expr To fix try default PATH or file a bug against emulators/linux_base-c6. > /usr/local/bin/linux-tor-browser: line 213: [: 32: unary operator > expected The code assumes *ARCHITECTURE assignments never fail. In your case TORARCHITECTURE is unset which leads to: $ /compat/linux/bin/bash bash-4.1$ [ 32 -ne ] bash: [: 32: unary operator expected > > Copying skeleton profile to /tmp/linux-tor-browser > Launching Tor Browser for Linux in > /usr/local/lib/linux-tor-browser/Browser... > Gtk-Message: Failed to load module "canberra-gtk-module" libcanberra dependency is optional and mostly used for theme sound effects and notifications (e.g. alarm, new mail). As there's no audio/linux-*-libcanberra dlopen(3) always fails for linux-firefox, linux-tor-browser, etc. > Fontconfig error: "/etc/fonts/conf.d/10-scale-bitmap-fonts.conf", line > 70: non-double matrix element > Fontconfig error: "/etc/fonts/conf.d/10-scale-bitmap-fonts.conf", line > 70: non-double matrix element > Fontconfig warning: "/etc/fonts/conf.d/10-scale-bitmap-fonts.conf", line > 78: saw unknown, expected number > Tor Browser exited abnormally. Exit code: 1 > > Any idea? Be careful with PATH and linux_base-* ports are known to provide only complementary environment not enough to chroot(8) into. ------------------------------------------------- VFEmail.net - http://www.vfemail.net ONLY AT VFEmail! - Use our Metadata Mitigator to keep your email out of the NSA's hands! $24.95 ONETIME Lifetime accounts with Privacy Features! 15GB disk! No bandwidth quotas! Commercial and Bulk Mail Options! From owner-freebsd-gecko@FreeBSD.ORG Sun Nov 16 21:00:11 2014 Return-Path: Delivered-To: gecko@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id B1279270 for ; Sun, 16 Nov 2014 21:00:11 +0000 (UTC) Received: from kenobi.freebsd.org (kenobi.freebsd.org [IPv6:2001:1900:2254:206a::16:76]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 8798F904 for ; Sun, 16 Nov 2014 21:00:11 +0000 (UTC) Received: from bugs.freebsd.org ([127.0.1.118]) by kenobi.freebsd.org (8.14.9/8.14.9) with ESMTP id sAGL0BvK025169 for ; Sun, 16 Nov 2014 21:00:11 GMT (envelope-from bugzilla-noreply@FreeBSD.org) Message-Id: <201411162100.sAGL0BvK025169@kenobi.freebsd.org> From: bugzilla-noreply@FreeBSD.org To: gecko@FreeBSD.org Subject: Problem reports for gecko@FreeBSD.org that need special attention X-Bugzilla-URL: https://bugs.freebsd.org/bugzilla/ Auto-Submitted: auto-generated MIME-Version: 1.0 Date: Sun, 16 Nov 2014 21:00:11 +0000 Content-Type: text/plain; charset="UTF-8" X-BeenThere: freebsd-gecko@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: Gecko Rendering Engine issues List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 16 Nov 2014 21:00:11 -0000 To view an individual PR, use: https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=(Bug Id). The following is a listing of current problems submitted by FreeBSD users, which need special attention. These represent problem reports covering all versions including experimental development code and obsolete releases. Status | Bug Id | Description ----------------+-----------+------------------------------------------------- Patch Ready | 194863 | Firefox 33 is not being built as a package in 1 1 problems total for which you should take action. From owner-freebsd-gecko@FreeBSD.ORG Mon Nov 17 21:43:20 2014 Return-Path: Delivered-To: gecko@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 487A9DDA for ; Mon, 17 Nov 2014 21:43:20 +0000 (UTC) Received: from kenobi.freebsd.org (kenobi.freebsd.org [IPv6:2001:1900:2254:206a::16:76]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 3086BAF1 for ; Mon, 17 Nov 2014 21:43:20 +0000 (UTC) Received: from bugs.freebsd.org ([127.0.1.118]) by kenobi.freebsd.org (8.14.9/8.14.9) with ESMTP id sAHLhKqn044708 for ; Mon, 17 Nov 2014 21:43:20 GMT (envelope-from bugzilla-noreply@freebsd.org) From: bugzilla-noreply@freebsd.org To: gecko@FreeBSD.org Subject: [Bug 195120] New: www/linux-firefox: Date: Mon, 17 Nov 2014 21:43:19 +0000 X-Bugzilla-Reason: AssignedTo X-Bugzilla-Type: new X-Bugzilla-Watch-Reason: None X-Bugzilla-Product: Ports Tree X-Bugzilla-Component: Individual Port(s) X-Bugzilla-Version: Latest X-Bugzilla-Keywords: patch, regression X-Bugzilla-Severity: Affects Only Me X-Bugzilla-Who: jbeich@vfemail.net X-Bugzilla-Status: Needs Triage X-Bugzilla-Priority: --- X-Bugzilla-Assigned-To: gecko@FreeBSD.org X-Bugzilla-Target-Milestone: --- X-Bugzilla-Flags: maintainer-feedback? X-Bugzilla-Changed-Fields: bug_id short_desc product version rep_platform op_sys bug_status keywords bug_severity priority component assigned_to reporter cc flagtypes.name attachments.created Message-ID: Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: 7bit X-Bugzilla-URL: https://bugs.freebsd.org/bugzilla/ Auto-Submitted: auto-generated MIME-Version: 1.0 X-BeenThere: freebsd-gecko@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: Gecko Rendering Engine issues List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 17 Nov 2014 21:43:20 -0000 https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=195120 Bug ID: 195120 Summary: www/linux-firefox: Product: Ports Tree Version: Latest Hardware: Any OS: Any Status: Needs Triage Keywords: patch, regression Severity: Affects Only Me Priority: --- Component: Individual Port(s) Assignee: gecko@FreeBSD.org Reporter: jbeich@vfemail.net CC: xmj@FreeBSD.org Flags: maintainer-feedback?(gecko@FreeBSD.org) Created attachment 149533 --> https://bugs.freebsd.org/bugzilla/attachment.cgi?id=149533&action=edit fix ports r372445 regressed linux- ports maintained by gecko@. $ linux-firefox -no-remote -P test XPCOMGlueLoad error for file /usr/local/lib/linux-firefox/libxul.so: libgdk_pixbuf-2.0.so.0: cannot open shared object file: No such file or directory Couldn't load XPCOM. --- Comment #1 from Bugzilla Automation --- Auto-assigned to maintainer gecko@FreeBSD.org -- You are receiving this mail because: You are the assignee for the bug. From owner-freebsd-gecko@FreeBSD.ORG Mon Nov 17 21:43:19 2014 Return-Path: Delivered-To: gecko@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id EDB0FDD7 for ; Mon, 17 Nov 2014 21:43:19 +0000 (UTC) Received: from kenobi.freebsd.org (kenobi.freebsd.org [IPv6:2001:1900:2254:206a::16:76]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id DBD88AEF for ; Mon, 17 Nov 2014 21:43:19 +0000 (UTC) Received: from bugs.freebsd.org ([127.0.1.118]) by kenobi.freebsd.org (8.14.9/8.14.9) with ESMTP id sAHLhJHC044702 for ; Mon, 17 Nov 2014 21:43:19 GMT (envelope-from bugzilla-noreply@freebsd.org) From: bugzilla-noreply@freebsd.org To: gecko@FreeBSD.org Subject: maintainer-feedback requested: [Bug 195120] www/linux-firefox: Date: Mon, 17 Nov 2014 21:43:19 +0000 X-Bugzilla-Type: request Message-ID: In-Reply-To: References: X-Bugzilla-URL: https://bugs.freebsd.org/bugzilla/ Auto-Submitted: auto-generated MIME-Version: 1.0 Content-Type: text/plain; charset="UTF-8" X-BeenThere: freebsd-gecko@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: Gecko Rendering Engine issues List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 17 Nov 2014 21:43:20 -0000 Jan Beich has asked gecko@FreeBSD.org for maintainer-feedback: Bug 195120: www/linux-firefox: https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=195120 --- Description --- Created attachment 149533 --> https://bugs.freebsd.org/bugzilla/attachment.cgi?id=149533&action=edit fix ports r372445 regressed linux- ports maintained by gecko@. $ linux-firefox -no-remote -P test XPCOMGlueLoad error for file /usr/local/lib/linux-firefox/libxul.so: libgdk_pixbuf-2.0.so.0: cannot open shared object file: No such file or directory Couldn't load XPCOM. --- Comment #1 from Bugzilla Automation --- Auto-assigned to maintainer gecko@FreeBSD.org From owner-freebsd-gecko@FreeBSD.ORG Mon Nov 17 21:44:58 2014 Return-Path: Delivered-To: gecko@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 9912D181 for ; Mon, 17 Nov 2014 21:44:58 +0000 (UTC) Received: from kenobi.freebsd.org (kenobi.freebsd.org [IPv6:2001:1900:2254:206a::16:76]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 80171B11 for ; Mon, 17 Nov 2014 21:44:58 +0000 (UTC) Received: from bugs.freebsd.org ([127.0.1.118]) by kenobi.freebsd.org (8.14.9/8.14.9) with ESMTP id sAHLiwjb045879 for ; Mon, 17 Nov 2014 21:44:58 GMT (envelope-from bugzilla-noreply@freebsd.org) From: bugzilla-noreply@freebsd.org To: gecko@FreeBSD.org Subject: [Bug 195120] www/linux-firefox: libgdk_pixbuf-2.0.so.0: cannot open shared object file: No such file or directory Date: Mon, 17 Nov 2014 21:44:58 +0000 X-Bugzilla-Reason: AssignedTo X-Bugzilla-Type: changed X-Bugzilla-Watch-Reason: None X-Bugzilla-Product: Ports Tree X-Bugzilla-Component: Individual Port(s) X-Bugzilla-Version: Latest X-Bugzilla-Keywords: patch, regression X-Bugzilla-Severity: Affects Only Me X-Bugzilla-Who: jbeich@vfemail.net X-Bugzilla-Status: Needs Triage X-Bugzilla-Priority: --- X-Bugzilla-Assigned-To: gecko@FreeBSD.org X-Bugzilla-Target-Milestone: --- X-Bugzilla-Flags: maintainer-feedback? X-Bugzilla-Changed-Fields: short_desc Message-ID: In-Reply-To: References: Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: 7bit X-Bugzilla-URL: https://bugs.freebsd.org/bugzilla/ Auto-Submitted: auto-generated MIME-Version: 1.0 X-BeenThere: freebsd-gecko@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: Gecko Rendering Engine issues List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 17 Nov 2014 21:44:58 -0000 https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=195120 Jan Beich changed: What |Removed |Added ---------------------------------------------------------------------------- Summary|www/linux-firefox: |www/linux-firefox: | |libgdk_pixbuf-2.0.so.0: | |cannot open shared object | |file: No such file or | |directory -- You are receiving this mail because: You are the assignee for the bug. From owner-freebsd-gecko@FreeBSD.ORG Mon Nov 17 21:53:12 2014 Return-Path: Delivered-To: gecko@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 86DB3534 for ; Mon, 17 Nov 2014 21:53:12 +0000 (UTC) Received: from kenobi.freebsd.org (kenobi.freebsd.org [IPv6:2001:1900:2254:206a::16:76]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 6E6C6C0C for ; Mon, 17 Nov 2014 21:53:12 +0000 (UTC) Received: from bugs.freebsd.org ([127.0.1.118]) by kenobi.freebsd.org (8.14.9/8.14.9) with ESMTP id sAHLrCGd081024 for ; Mon, 17 Nov 2014 21:53:12 GMT (envelope-from bugzilla-noreply@freebsd.org) From: bugzilla-noreply@freebsd.org To: gecko@FreeBSD.org Subject: [Bug 195120] www/linux-firefox: libgdk_pixbuf-2.0.so.0: cannot open shared object file: No such file or directory Date: Mon, 17 Nov 2014 21:53:12 +0000 X-Bugzilla-Reason: AssignedTo X-Bugzilla-Type: changed X-Bugzilla-Watch-Reason: None X-Bugzilla-Product: Ports Tree X-Bugzilla-Component: Individual Port(s) X-Bugzilla-Version: Latest X-Bugzilla-Keywords: patch, regression X-Bugzilla-Severity: Affects Only Me X-Bugzilla-Who: jbeich@vfemail.net X-Bugzilla-Status: Needs Triage X-Bugzilla-Priority: --- X-Bugzilla-Assigned-To: gecko@FreeBSD.org X-Bugzilla-Target-Milestone: --- X-Bugzilla-Flags: X-Bugzilla-Changed-Fields: flagtypes.name Message-ID: In-Reply-To: References: Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: 7bit X-Bugzilla-URL: https://bugs.freebsd.org/bugzilla/ Auto-Submitted: auto-generated MIME-Version: 1.0 X-BeenThere: freebsd-gecko@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: Gecko Rendering Engine issues List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 17 Nov 2014 21:53:12 -0000 https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=195120 Jan Beich changed: What |Removed |Added ---------------------------------------------------------------------------- Flags|maintainer-feedback?(gecko@ | |FreeBSD.org) | --- Comment #2 from Jan Beich --- Affects only linux-c6- so to reproduce add to make.conf: OVERRIDE_LINUX_BASE_PORT=c6 OVERRIDE_LINUX_NONBASE_PORTS=c6 -- You are receiving this mail because: You are the assignee for the bug. From owner-freebsd-gecko@FreeBSD.ORG Mon Nov 17 22:23:15 2014 Return-Path: Delivered-To: gecko@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 70E77D84 for ; Mon, 17 Nov 2014 22:23:15 +0000 (UTC) Received: from kenobi.freebsd.org (kenobi.freebsd.org [IPv6:2001:1900:2254:206a::16:76]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 592E8F45 for ; Mon, 17 Nov 2014 22:23:15 +0000 (UTC) Received: from bugs.freebsd.org ([127.0.1.118]) by kenobi.freebsd.org (8.14.9/8.14.9) with ESMTP id sAHMNFWm082142 for ; Mon, 17 Nov 2014 22:23:15 GMT (envelope-from bugzilla-noreply@freebsd.org) From: bugzilla-noreply@freebsd.org To: gecko@FreeBSD.org Subject: [Bug 194757] www/seamonkey: DTRACE is broken on 11.0-CURRENT Date: Mon, 17 Nov 2014 22:23:15 +0000 X-Bugzilla-Reason: AssignedTo X-Bugzilla-Type: changed X-Bugzilla-Watch-Reason: None X-Bugzilla-Product: Ports Tree X-Bugzilla-Component: Individual Port(s) X-Bugzilla-Version: Latest X-Bugzilla-Keywords: X-Bugzilla-Severity: Affects Many People X-Bugzilla-Who: commit-hook@freebsd.org X-Bugzilla-Status: In Discussion X-Bugzilla-Priority: --- X-Bugzilla-Assigned-To: gecko@FreeBSD.org X-Bugzilla-Target-Milestone: --- X-Bugzilla-Flags: X-Bugzilla-Changed-Fields: Message-ID: In-Reply-To: References: Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: 7bit X-Bugzilla-URL: https://bugs.freebsd.org/bugzilla/ Auto-Submitted: auto-generated MIME-Version: 1.0 X-BeenThere: freebsd-gecko@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: Gecko Rendering Engine issues List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 17 Nov 2014 22:23:15 -0000 https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=194757 --- Comment #7 from commit-hook@freebsd.org --- A commit references this bug: Author: markj Date: Mon Nov 17 22:22:18 UTC 2014 New revision: 274637 URL: https://svnweb.freebsd.org/changeset/base/274637 Log: DTrace imposes a 128-byte limit on the length of the function component of a probe name. When dtrace -G builds up a DOF section for the specified provider(s), the probe function names are truncated to fit in this limit. The DOF is later used to build the symbol table for the generated object file, so the table can end up with truncated references, causing link errors. Instead of potentially truncating symbol table entries, write the full function name to the DOF string table and allow the kernel to enforce the 128-byte function name limit when a process attempts to load its DOF. PR: 194757 Differential Revision: https://reviews.freebsd.org/D1175 Reviewed by: rpaulo MFC after: 2 weeks Changes: head/cddl/contrib/opensolaris/lib/libdtrace/common/dt_dof.c head/cddl/contrib/opensolaris/lib/libdtrace/common/dt_provider.c head/cddl/contrib/opensolaris/lib/libdtrace/common/dt_provider.h -- You are receiving this mail because: You are the assignee for the bug. From owner-freebsd-gecko@FreeBSD.ORG Mon Nov 17 22:30:18 2014 Return-Path: Delivered-To: freebsd-gecko@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id D3A8D1FE for ; Mon, 17 Nov 2014 22:30:18 +0000 (UTC) Received: from trillian.chruetertee.ch (trillian.chruetertee.ch [217.150.244.247]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 77E96FAC for ; Mon, 17 Nov 2014 22:30:17 +0000 (UTC) Received: from trillian.chruetertee.ch (trillian [217.150.244.247]) by trillian.chruetertee.ch (8.14.4/8.14.3) with ESMTP id sAHMF9Zc070490 for ; Mon, 17 Nov 2014 22:15:09 GMT (envelope-from svn-freebsd-gecko@chruetertee.ch) Received: (from www@localhost) by trillian.chruetertee.ch (8.14.4/8.14.3/Submit) id sAHMF4HB067781 for freebsd-gecko@freebsd.org; Mon, 17 Nov 2014 22:15:04 GMT (envelope-from svn-freebsd-gecko@chruetertee.ch) Date: Mon, 17 Nov 2014 22:15:04 GMT Message-Id: <201411172215.sAHMF4HB067781@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 Subject: [SVN-Commit] r1761 - branches/firefox33/audio/linux-f10-alsa-lib branches/firefox33/security/nss branches/firefox33/www/firefox branches/firefox33/www/libxul branches/firefox33/www/xpi-adblock trunk/audio/linux-f10-alsa-lib trunk/security/nss trunk/www/libxul trunk/www/xpi-adblock MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Reply-To: freebsd-gecko@freebsd.org X-BeenThere: freebsd-gecko@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: Gecko Rendering Engine issues List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 17 Nov 2014 22:30:18 -0000 Author: jbeich Date: Mon Nov 17 22:15:04 2014 New Revision: 1761 Log: sync with ports Modified: branches/firefox33/audio/linux-f10-alsa-lib/Makefile branches/firefox33/audio/linux-f10-alsa-lib/pkg-plist branches/firefox33/security/nss/Makefile branches/firefox33/security/nss/pkg-plist branches/firefox33/www/firefox/Makefile branches/firefox33/www/libxul/Makefile branches/firefox33/www/xpi-adblock/Makefile.xpi trunk/audio/linux-f10-alsa-lib/Makefile trunk/audio/linux-f10-alsa-lib/pkg-plist trunk/security/nss/Makefile trunk/security/nss/pkg-plist trunk/www/libxul/Makefile trunk/www/xpi-adblock/Makefile.xpi Modified: branches/firefox33/audio/linux-f10-alsa-lib/Makefile ============================================================================== --- branches/firefox33/audio/linux-f10-alsa-lib/Makefile Fri Nov 7 22:14:43 2014 (r1760) +++ branches/firefox33/audio/linux-f10-alsa-lib/Makefile Mon Nov 17 22:15:04 2014 (r1761) @@ -28,7 +28,7 @@ post-install: @${MKDIR} ${STAGEDIR}${PREFIX}/etc - @${LN} -fs ${LOCALBASE}/etc/asound.conf ${STAGEDIR}${PREFIX}/etc + ${LN} -fs ${LOCALBASE}/etc/asound.conf ${STAGEDIR}${PREFIX}/etc ${RM} ${STAGEDIR}${PREFIX}/usr/lib/alsa-lib/smixer/smixer-ac97.la ${RM} ${STAGEDIR}${PREFIX}/usr/lib/alsa-lib/smixer/smixer-hda.la ${RM} ${STAGEDIR}${PREFIX}/usr/lib/alsa-lib/smixer/smixer-sbase.la Modified: branches/firefox33/audio/linux-f10-alsa-lib/pkg-plist ============================================================================== --- branches/firefox33/audio/linux-f10-alsa-lib/pkg-plist Fri Nov 7 22:14:43 2014 (r1760) +++ branches/firefox33/audio/linux-f10-alsa-lib/pkg-plist Mon Nov 17 22:15:04 2014 (r1761) @@ -84,4 +84,3 @@ usr/share/doc/alsa-lib-1.0.21/ChangeLog usr/share/doc/alsa-lib-1.0.21/TODO usr/share/doc/alsa-lib-1.0.21/asoundrc.txt -@comment non-empty directory listing in revers order Modified: branches/firefox33/security/nss/Makefile ============================================================================== --- branches/firefox33/security/nss/Makefile Fri Nov 7 22:14:43 2014 (r1760) +++ branches/firefox33/security/nss/Makefile Mon Nov 17 22:15:04 2014 (r1761) @@ -1,8 +1,9 @@ # Created by: Maxim Sobolev -# $FreeBSD: head/security/nss/Makefile 370932 2014-10-15 15:48:16Z beat $ +# $FreeBSD: head/security/nss/Makefile 371936 2014-10-31 21:34:25Z rodrigo $ PORTNAME= nss PORTVERSION= 3.17.2 +PORTREVISION= 1 #DISTVERSIONSUFFIX= .with.ckbi.1.93 CATEGORIES= security MASTER_SITES= MOZILLA/security/${PORTNAME}/releases/${DISTNAME:tu:C/[-.]/_/g}_RTM/src Modified: branches/firefox33/security/nss/pkg-plist ============================================================================== --- branches/firefox33/security/nss/pkg-plist Fri Nov 7 22:14:43 2014 (r1760) +++ branches/firefox33/security/nss/pkg-plist Mon Nov 17 22:15:04 2014 (r1761) @@ -80,6 +80,7 @@ include/nss/nss/pk11pub.h include/nss/nss/pk11sdr.h include/nss/nss/pkcs11.h +include/nss/nss/pkcs1sig.h include/nss/nss/pkcs11f.h include/nss/nss/pkcs11n.h include/nss/nss/pkcs11p.h Modified: branches/firefox33/www/firefox/Makefile ============================================================================== --- branches/firefox33/www/firefox/Makefile Fri Nov 7 22:14:43 2014 (r1760) +++ branches/firefox33/www/firefox/Makefile Mon Nov 17 22:15:04 2014 (r1761) @@ -2,7 +2,7 @@ # $FreeBSD: head/www/firefox/Makefile 370932 2014-10-15 15:48:16Z beat $ PORTNAME= firefox -DISTVERSION= 33.1 +DISTVERSION= 33.1.1 DISTVERSIONSUFFIX=.source PORTEPOCH= 1 CATEGORIES= www ipv6 Modified: branches/firefox33/www/libxul/Makefile ============================================================================== --- branches/firefox33/www/libxul/Makefile Fri Nov 7 22:14:43 2014 (r1760) +++ branches/firefox33/www/libxul/Makefile Mon Nov 17 22:15:04 2014 (r1761) @@ -1,5 +1,5 @@ # Created by: Michael Johnson -# $FreeBSD: head/www/libxul/Makefile 370932 2014-10-15 15:48:16Z beat $ +# $FreeBSD: head/www/libxul/Makefile 371388 2014-10-23 11:43:23Z beat $ PORTNAME= libxul DISTVERSION= 31.2.1 Modified: branches/firefox33/www/xpi-adblock/Makefile.xpi ============================================================================== --- branches/firefox33/www/xpi-adblock/Makefile.xpi Fri Nov 7 22:14:43 2014 (r1760) +++ branches/firefox33/www/xpi-adblock/Makefile.xpi Mon Nov 17 22:15:04 2014 (r1761) @@ -1,5 +1,5 @@ # Created by: Andrew Pantyukhin -# $FreeBSD: head/www/xpi-adblock/Makefile.xpi 370932 2014-10-15 15:48:16Z beat $ +# $FreeBSD: head/www/xpi-adblock/Makefile.xpi 372585 2014-11-15 08:59:40Z antoine $ # XPI_ID - Extension id, might be in {12345-...} or dev@org format # XPI_NUM - Extension number, as in addons.mozilla.org URL @@ -150,6 +150,7 @@ _A= >> ${TMPPLIST} _Q= 2>/dev/null || true PLIST_FILES+= ${XPI_FILES:S!^!${_TD}/!} +PLIST_DIRS+= ${XPI_DIRS:S!^!${_TD}/!} .for dist in ${XPI_DISTNAMES} XPI_XPIDIR_${dist}= ${XPI_LIBDIR}/${XPI_ID_${dist}} @@ -164,7 +165,9 @@ @if [ -d ${FILESDIR} -a -f ${FILESDIR}/chrome.manifest ] ; \ then ${INSTALL_DATA} ${FILESDIR}/chrome.manifest ${STAGEDIR}${_TD_FULL}/ ; fi @${CHMOD} -R a+rX,go-w ${STAGEDIR}${_TD_FULL}/ - @${ECHO_CMD} '@exec ${INSTALL} -d ${XPI_SLDIRS_ALL:S,^${STAGEDIR}${PREFIX},%D,}' ${_A} + @for sldir in ${XPI_SLDIRS_ALL}; do \ + ${ECHO_CMD} "@dir $${sldir}" ${_A}; \ + done @${ECHO_CMD} '@exec for _dir in ${XPI_LINKFARMS} ; { ${LN} -sf ${_TD_FULL} $$_dir/ ${_Q}; }' ${_A} @${ECHO_CMD} '@unexec for _dir in ${XPI_LINKFARMS} ; { ${RM} -f $$_dir/${XPI_ID} ; }' ${_A} .endif Modified: trunk/audio/linux-f10-alsa-lib/Makefile ============================================================================== --- trunk/audio/linux-f10-alsa-lib/Makefile Fri Nov 7 22:14:43 2014 (r1760) +++ trunk/audio/linux-f10-alsa-lib/Makefile Mon Nov 17 22:15:04 2014 (r1761) @@ -28,7 +28,7 @@ post-install: @${MKDIR} ${STAGEDIR}${PREFIX}/etc - @${LN} -fs ${LOCALBASE}/etc/asound.conf ${STAGEDIR}${PREFIX}/etc + ${LN} -fs ${LOCALBASE}/etc/asound.conf ${STAGEDIR}${PREFIX}/etc ${RM} ${STAGEDIR}${PREFIX}/usr/lib/alsa-lib/smixer/smixer-ac97.la ${RM} ${STAGEDIR}${PREFIX}/usr/lib/alsa-lib/smixer/smixer-hda.la ${RM} ${STAGEDIR}${PREFIX}/usr/lib/alsa-lib/smixer/smixer-sbase.la Modified: trunk/audio/linux-f10-alsa-lib/pkg-plist ============================================================================== --- trunk/audio/linux-f10-alsa-lib/pkg-plist Fri Nov 7 22:14:43 2014 (r1760) +++ trunk/audio/linux-f10-alsa-lib/pkg-plist Mon Nov 17 22:15:04 2014 (r1761) @@ -84,4 +84,3 @@ usr/share/doc/alsa-lib-1.0.21/ChangeLog usr/share/doc/alsa-lib-1.0.21/TODO usr/share/doc/alsa-lib-1.0.21/asoundrc.txt -@comment non-empty directory listing in revers order Modified: trunk/security/nss/Makefile ============================================================================== --- trunk/security/nss/Makefile Fri Nov 7 22:14:43 2014 (r1760) +++ trunk/security/nss/Makefile Mon Nov 17 22:15:04 2014 (r1761) @@ -1,8 +1,9 @@ # Created by: Maxim Sobolev -# $FreeBSD: head/security/nss/Makefile 370932 2014-10-15 15:48:16Z beat $ +# $FreeBSD: head/security/nss/Makefile 371936 2014-10-31 21:34:25Z rodrigo $ PORTNAME= nss PORTVERSION= 3.17.2 +PORTREVISION= 1 #DISTVERSIONSUFFIX= .with.ckbi.1.93 CATEGORIES= security MASTER_SITES= MOZILLA/security/${PORTNAME}/releases/${DISTNAME:tu:C/[-.]/_/g}_RTM/src Modified: trunk/security/nss/pkg-plist ============================================================================== --- trunk/security/nss/pkg-plist Fri Nov 7 22:14:43 2014 (r1760) +++ trunk/security/nss/pkg-plist Mon Nov 17 22:15:04 2014 (r1761) @@ -80,6 +80,7 @@ include/nss/nss/pk11pub.h include/nss/nss/pk11sdr.h include/nss/nss/pkcs11.h +include/nss/nss/pkcs1sig.h include/nss/nss/pkcs11f.h include/nss/nss/pkcs11n.h include/nss/nss/pkcs11p.h Modified: trunk/www/libxul/Makefile ============================================================================== --- trunk/www/libxul/Makefile Fri Nov 7 22:14:43 2014 (r1760) +++ trunk/www/libxul/Makefile Mon Nov 17 22:15:04 2014 (r1761) @@ -1,5 +1,5 @@ # Created by: Michael Johnson -# $FreeBSD: head/www/libxul/Makefile 370932 2014-10-15 15:48:16Z beat $ +# $FreeBSD: head/www/libxul/Makefile 371388 2014-10-23 11:43:23Z beat $ PORTNAME= libxul DISTVERSION= 31.2.1 Modified: trunk/www/xpi-adblock/Makefile.xpi ============================================================================== --- trunk/www/xpi-adblock/Makefile.xpi Fri Nov 7 22:14:43 2014 (r1760) +++ trunk/www/xpi-adblock/Makefile.xpi Mon Nov 17 22:15:04 2014 (r1761) @@ -1,5 +1,5 @@ # Created by: Andrew Pantyukhin -# $FreeBSD: head/www/xpi-adblock/Makefile.xpi 370932 2014-10-15 15:48:16Z beat $ +# $FreeBSD: head/www/xpi-adblock/Makefile.xpi 372585 2014-11-15 08:59:40Z antoine $ # XPI_ID - Extension id, might be in {12345-...} or dev@org format # XPI_NUM - Extension number, as in addons.mozilla.org URL @@ -150,6 +150,7 @@ _A= >> ${TMPPLIST} _Q= 2>/dev/null || true PLIST_FILES+= ${XPI_FILES:S!^!${_TD}/!} +PLIST_DIRS+= ${XPI_DIRS:S!^!${_TD}/!} .for dist in ${XPI_DISTNAMES} XPI_XPIDIR_${dist}= ${XPI_LIBDIR}/${XPI_ID_${dist}} @@ -164,7 +165,9 @@ @if [ -d ${FILESDIR} -a -f ${FILESDIR}/chrome.manifest ] ; \ then ${INSTALL_DATA} ${FILESDIR}/chrome.manifest ${STAGEDIR}${_TD_FULL}/ ; fi @${CHMOD} -R a+rX,go-w ${STAGEDIR}${_TD_FULL}/ - @${ECHO_CMD} '@exec ${INSTALL} -d ${XPI_SLDIRS_ALL:S,^${STAGEDIR}${PREFIX},%D,}' ${_A} + @for sldir in ${XPI_SLDIRS_ALL}; do \ + ${ECHO_CMD} "@dir $${sldir}" ${_A}; \ + done @${ECHO_CMD} '@exec for _dir in ${XPI_LINKFARMS} ; { ${LN} -sf ${_TD_FULL} $$_dir/ ${_Q}; }' ${_A} @${ECHO_CMD} '@unexec for _dir in ${XPI_LINKFARMS} ; { ${RM} -f $$_dir/${XPI_ID} ; }' ${_A} .endif From owner-freebsd-gecko@FreeBSD.ORG Mon Nov 17 22:35:54 2014 Return-Path: Delivered-To: gecko@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 388E831E for ; Mon, 17 Nov 2014 22:35:54 +0000 (UTC) Received: from kenobi.freebsd.org (kenobi.freebsd.org [IPv6:2001:1900:2254:206a::16:76]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 1F9F6BE for ; Mon, 17 Nov 2014 22:35:54 +0000 (UTC) Received: from bugs.freebsd.org ([127.0.1.118]) by kenobi.freebsd.org (8.14.9/8.14.9) with ESMTP id sAHMZrlP021935 for ; Mon, 17 Nov 2014 22:35:53 GMT (envelope-from bugzilla-noreply@freebsd.org) From: bugzilla-noreply@freebsd.org To: gecko@FreeBSD.org Subject: [Bug 195120] www/linux-firefox: libgdk_pixbuf-2.0.so.0: cannot open shared object file: No such file or directory Date: Mon, 17 Nov 2014 22:35:54 +0000 X-Bugzilla-Reason: AssignedTo X-Bugzilla-Type: changed X-Bugzilla-Watch-Reason: None X-Bugzilla-Product: Ports Tree X-Bugzilla-Component: Individual Port(s) X-Bugzilla-Version: Latest X-Bugzilla-Keywords: patch, regression X-Bugzilla-Severity: Affects Only Me X-Bugzilla-Who: xmj@FreeBSD.org X-Bugzilla-Status: Open X-Bugzilla-Priority: --- X-Bugzilla-Assigned-To: xmj@FreeBSD.org X-Bugzilla-Target-Milestone: --- X-Bugzilla-Flags: X-Bugzilla-Changed-Fields: bug_status assigned_to Message-ID: In-Reply-To: References: Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: 7bit X-Bugzilla-URL: https://bugs.freebsd.org/bugzilla/ Auto-Submitted: auto-generated MIME-Version: 1.0 X-BeenThere: freebsd-gecko@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: Gecko Rendering Engine issues List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 17 Nov 2014 22:35:54 -0000 https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=195120 Johannes Jost Meixner changed: What |Removed |Added ---------------------------------------------------------------------------- Status|Needs Triage |Open Assignee|gecko@FreeBSD.org |xmj@FreeBSD.org --- Comment #3 from Johannes Jost Meixner --- I'll take it. gdk-pixbuf2 did not exist as separate package in CentOS 6.5. -- You are receiving this mail because: You are the assignee for the bug. From owner-freebsd-gecko@FreeBSD.ORG Mon Nov 17 22:38:34 2014 Return-Path: Delivered-To: freebsd-gecko@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id BC947351 for ; Mon, 17 Nov 2014 22:38:34 +0000 (UTC) Received: from trillian.chruetertee.ch (trillian.chruetertee.ch [217.150.244.247]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 61617D9 for ; Mon, 17 Nov 2014 22:38:34 +0000 (UTC) Received: from trillian.chruetertee.ch (trillian [217.150.244.247]) by trillian.chruetertee.ch (8.14.4/8.14.3) with ESMTP id sAHMcWBs022296 for ; Mon, 17 Nov 2014 22:38: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 sAHMcRDs021218 for freebsd-gecko@freebsd.org; Mon, 17 Nov 2014 22:38:27 GMT (envelope-from svn-freebsd-gecko@chruetertee.ch) Date: Mon, 17 Nov 2014 22:38:27 GMT Message-Id: <201411172238.sAHMcRDs021218@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 Subject: [SVN-Commit] r1762 - branches/firefox33/www/linux-c6-freshplayerplugin branches/firefox33/www/linux-seamonkey branches/firefox33/www/linux-tor-browser trunk/www/linux-c6-freshplayerplugin trunk/www/linux-seamonkey trunk/www/linux-tor-browser MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Reply-To: freebsd-gecko@freebsd.org X-BeenThere: freebsd-gecko@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: Gecko Rendering Engine issues List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 17 Nov 2014 22:38:34 -0000 Author: jbeich Date: Mon Nov 17 22:38:27 2014 New Revision: 1762 Log: require gdk-pixbuf2 after r372445 Modified: branches/firefox33/www/linux-c6-freshplayerplugin/Makefile branches/firefox33/www/linux-seamonkey/Makefile.common branches/firefox33/www/linux-tor-browser/Makefile trunk/www/linux-c6-freshplayerplugin/Makefile trunk/www/linux-seamonkey/Makefile.common trunk/www/linux-tor-browser/Makefile Modified: branches/firefox33/www/linux-c6-freshplayerplugin/Makefile ============================================================================== --- branches/firefox33/www/linux-c6-freshplayerplugin/Makefile Mon Nov 17 22:15:04 2014 (r1761) +++ branches/firefox33/www/linux-c6-freshplayerplugin/Makefile Mon Nov 17 22:38:27 2014 (r1762) @@ -20,7 +20,7 @@ USES= cmake webplugin:linux USE_LINUX= c6 -USE_LINUX_APPS= atk fontconfig gtk2 pango \ +USE_LINUX_APPS= atk fontconfig gdkpixbuf gtk2 pango \ alsalib alsa-plugins-oss BUILD_WRKSRC= ${WRKDIR}/centos6 WEBPLUGIN_FILES=libfreshwrapper-pepperflash.so Modified: branches/firefox33/www/linux-seamonkey/Makefile.common ============================================================================== --- branches/firefox33/www/linux-seamonkey/Makefile.common Mon Nov 17 22:15:04 2014 (r1761) +++ branches/firefox33/www/linux-seamonkey/Makefile.common Mon Nov 17 22:38:27 2014 (r1762) @@ -29,7 +29,7 @@ BIN_NAME?= ${PORTNAME} USE_LINUX= yes USE_LINUX_APPS+=alsalib alsa-plugins-oss atk dbusglib dbuslibs \ - fontconfig gtk2 hicontheme pango + fontconfig gdkpixbuf gtk2 hicontheme pango WRKSRC?= ${WRKDIR}/${BIN_NAME} FDIR= ${STAGEDIR}${PREFIX}/lib/${APP_NAME} Modified: branches/firefox33/www/linux-tor-browser/Makefile ============================================================================== --- branches/firefox33/www/linux-tor-browser/Makefile Mon Nov 17 22:15:04 2014 (r1761) +++ branches/firefox33/www/linux-tor-browser/Makefile Mon Nov 17 22:38:27 2014 (r1762) @@ -23,7 +23,7 @@ SHEBANG_FILES= Browser/start-tor-browser bash_CMD= ${LINUXBASE}/bin/bash USE_LINUX= c6 # __longjmp_chk@GLIBC_2.11 -USE_LINUX_APPS= atk fontconfig gtk2 pango \ +USE_LINUX_APPS= atk fontconfig gdkpixbuf gtk2 pango \ dbusglib dbuslibs alsalib alsa-plugins-oss NO_BUILD= yes Modified: trunk/www/linux-c6-freshplayerplugin/Makefile ============================================================================== --- trunk/www/linux-c6-freshplayerplugin/Makefile Mon Nov 17 22:15:04 2014 (r1761) +++ trunk/www/linux-c6-freshplayerplugin/Makefile Mon Nov 17 22:38:27 2014 (r1762) @@ -20,7 +20,7 @@ USES= cmake webplugin:linux USE_LINUX= c6 -USE_LINUX_APPS= atk fontconfig gtk2 pango \ +USE_LINUX_APPS= atk fontconfig gdkpixbuf gtk2 pango \ alsalib alsa-plugins-oss BUILD_WRKSRC= ${WRKDIR}/centos6 WEBPLUGIN_FILES=libfreshwrapper-pepperflash.so Modified: trunk/www/linux-seamonkey/Makefile.common ============================================================================== --- trunk/www/linux-seamonkey/Makefile.common Mon Nov 17 22:15:04 2014 (r1761) +++ trunk/www/linux-seamonkey/Makefile.common Mon Nov 17 22:38:27 2014 (r1762) @@ -29,7 +29,7 @@ BIN_NAME?= ${PORTNAME} USE_LINUX= yes USE_LINUX_APPS+=alsalib alsa-plugins-oss atk dbusglib dbuslibs \ - fontconfig gtk2 hicontheme pango + fontconfig gdkpixbuf gtk2 hicontheme pango WRKSRC?= ${WRKDIR}/${BIN_NAME} FDIR= ${STAGEDIR}${PREFIX}/lib/${APP_NAME} Modified: trunk/www/linux-tor-browser/Makefile ============================================================================== --- trunk/www/linux-tor-browser/Makefile Mon Nov 17 22:15:04 2014 (r1761) +++ trunk/www/linux-tor-browser/Makefile Mon Nov 17 22:38:27 2014 (r1762) @@ -23,7 +23,7 @@ SHEBANG_FILES= Browser/start-tor-browser bash_CMD= ${LINUXBASE}/bin/bash USE_LINUX= c6 # __longjmp_chk@GLIBC_2.11 -USE_LINUX_APPS= atk fontconfig gtk2 pango \ +USE_LINUX_APPS= atk fontconfig gdkpixbuf gtk2 pango \ dbusglib dbuslibs alsalib alsa-plugins-oss NO_BUILD= yes From owner-freebsd-gecko@FreeBSD.ORG Tue Nov 18 14:50:02 2014 Return-Path: Delivered-To: gecko@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 33959322 for ; Tue, 18 Nov 2014 14:50:02 +0000 (UTC) Received: from eyou.net (gw1.swu.edu.cn [202.202.96.135]) by mx1.freebsd.org (Postfix) with SMTP id 79538F51 for ; Tue, 18 Nov 2014 14:49:59 +0000 (UTC) X-EYOU-SPAMVALUE: 0 X-EMDG-ORIGINAL-FROM: X-EMDG-ORIGINAL-TO: X-EMDG-ORIGINAL-IP: 172.17.146.213 X-EMDG-VER: 4.0.2 Received: (eyou anti_spam gateway 4.0.2); Tue, 18 Nov 2014 22:49:09 +0800 Message-ID: <616322149.07434@eyou.net> X-EMDG-SMTPAUTH: zxl1985@swu.edu.cn Received: from 172.17.146.213 by 202.202.96.132 with SMTP; Tue, 18 Nov 2014 22:49:09 +0800 From: "Andio ZHONG \(ZHONG Xiaoling\)" To: Subject: Feedback Date: Tue, 18 Nov 2014 22:48:39 +0800 Message-ID: <000401d0033e$bdd5b760$39812620$@swu.edu.cn> MIME-Version: 1.0 X-Mailer: Microsoft Outlook 15.0 Thread-Index: AdADPiEkbDf7eG+PQFOOVZ3dvLbBjw== Content-Language: zh-cn X-Mailman-Approved-At: Tue, 18 Nov 2014 15:26:50 +0000 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit X-Content-Filtered-By: Mailman/MimeDel 2.1.18-1 Cc: zxl1985@yahoo.com X-BeenThere: freebsd-gecko@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: Gecko Rendering Engine issues List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 18 Nov 2014 14:50:02 -0000 Hello, Sir/Madam! I am very interested with PCBSD. Up to date, I experienced it several times with different edition. For now, the PC BSD system is still supported well with ATI graphic card for the drivers. I am not sure whether it's ok for USB 3.0 disk is OK on the PC BSD OS and solid state disk. If i change from windows os to PC BSD OS, my android phone and other devices could be charged and the App could be managed through PCBSD platform. Yours Sincerely! Andio ZHONG Ph.D Candidate @ Institution For Clean Energy & Advanced Materials, Southwest University, Beibei District, Chongqing, People's Republic of China Post Code: 400715 From owner-freebsd-gecko@FreeBSD.ORG Wed Nov 19 01:27:39 2014 Return-Path: Delivered-To: freebsd-gecko@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 80BB662A for ; Wed, 19 Nov 2014 01:27:39 +0000 (UTC) Received: from trillian.chruetertee.ch (trillian.chruetertee.ch [217.150.244.247]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id D468FDF for ; Wed, 19 Nov 2014 01:27:38 +0000 (UTC) Received: from trillian.chruetertee.ch (trillian [217.150.244.247]) by trillian.chruetertee.ch (8.14.4/8.14.3) with ESMTP id sAJ1RTSj013131 for ; Wed, 19 Nov 2014 01:27:29 GMT (envelope-from svn-freebsd-gecko@chruetertee.ch) Received: (from www@localhost) by trillian.chruetertee.ch (8.14.4/8.14.3/Submit) id sAJ1ROUP011079 for freebsd-gecko@freebsd.org; Wed, 19 Nov 2014 01:27:24 GMT (envelope-from svn-freebsd-gecko@chruetertee.ch) Date: Wed, 19 Nov 2014 01:27:24 GMT Message-Id: <201411190127.sAJ1ROUP011079@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 Subject: [SVN-Commit] r1763 - in trunk: mail/thunderbird/files www/firefox-esr/files www/firefox-nightly/files www/firefox/files www/libxul/files www/seamonkey/files MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Reply-To: freebsd-gecko@freebsd.org X-BeenThere: freebsd-gecko@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: Gecko Rendering Engine issues List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 19 Nov 2014 01:27:39 -0000 Author: jbeich Date: Wed Nov 19 01:27:24 2014 New Revision: 1763 Log: add a few about:memory fixes Added: trunk/mail/thunderbird/files/patch-bug1082199 trunk/www/firefox-esr/files/patch-bug1082199 trunk/www/firefox-nightly/files/patch-bug899126 trunk/www/firefox/files/patch-bug1082199 trunk/www/firefox/files/patch-bug899126 trunk/www/libxul/files/patch-bug1082199 trunk/www/seamonkey/files/patch-bug1082199 trunk/www/seamonkey/files/patch-bug899126 Added: trunk/mail/thunderbird/files/patch-bug1082199 ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ trunk/mail/thunderbird/files/patch-bug1082199 Wed Nov 19 01:27:24 2014 (r1763) @@ -0,0 +1,26 @@ +commit 258ec90 +Author: Guilherme Goncalves +Date: Fri Oct 17 15:55:00 2014 +0200 + + Bug 1082199 - Recompute stats in jemalloc_stats when using jemalloc3. r=glandium +--- + memory/build/mozjemalloc_compat.c | 6 ++++++ + 1 file changed, 6 insertions(+) + +diff --git memory/build/mozjemalloc_compat.c memory/build/mozjemalloc_compat.c +index 78bb13a..70265a7 100644 +--- mozilla/memory/build/mozjemalloc_compat.c ++++ mozilla/memory/build/mozjemalloc_compat.c +@@ -68,6 +68,12 @@ jemalloc_stats_impl(jemalloc_stats_t *stats) + size_t active, allocated, mapped, page, pdirty; + size_t lg_chunk; + ++ // Refresh jemalloc's stats by updating its epoch, see ctl_refresh in ++ // src/ctl.c ++ uint64_t epoch = 0; ++ size_t esz = sizeof(epoch); ++ int ret = je_(mallctl)("epoch", &epoch, &esz, &epoch, esz); ++ + CTL_GET("arenas.narenas", narenas); + CTL_GET("arenas.page", page); + CTL_GET("stats.active", active); Added: trunk/www/firefox-esr/files/patch-bug1082199 ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ trunk/www/firefox-esr/files/patch-bug1082199 Wed Nov 19 01:27:24 2014 (r1763) @@ -0,0 +1,26 @@ +commit 258ec90 +Author: Guilherme Goncalves +Date: Fri Oct 17 15:55:00 2014 +0200 + + Bug 1082199 - Recompute stats in jemalloc_stats when using jemalloc3. r=glandium +--- + memory/build/mozjemalloc_compat.c | 6 ++++++ + 1 file changed, 6 insertions(+) + +diff --git memory/build/mozjemalloc_compat.c memory/build/mozjemalloc_compat.c +index 78bb13a..70265a7 100644 +--- memory/build/mozjemalloc_compat.c ++++ memory/build/mozjemalloc_compat.c +@@ -68,6 +68,12 @@ jemalloc_stats_impl(jemalloc_stats_t *stats) + size_t active, allocated, mapped, page, pdirty; + size_t lg_chunk; + ++ // Refresh jemalloc's stats by updating its epoch, see ctl_refresh in ++ // src/ctl.c ++ uint64_t epoch = 0; ++ size_t esz = sizeof(epoch); ++ int ret = je_(mallctl)("epoch", &epoch, &esz, &epoch, esz); ++ + CTL_GET("arenas.narenas", narenas); + CTL_GET("arenas.page", page); + CTL_GET("stats.active", active); Added: trunk/www/firefox-nightly/files/patch-bug899126 ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ trunk/www/firefox-nightly/files/patch-bug899126 Wed Nov 19 01:27:24 2014 (r1763) @@ -0,0 +1,98 @@ +commit 0f63381 +Author: Guilherme Goncalves +Date: Tue Nov 18 14:03:00 2014 -0800 + + Bug 899126 - Part 1 - Implement bin_unused for jemalloc3. r=glandium +--- + memory/build/mozjemalloc_compat.c | 57 ++++++++++++++++++++++++++++++++++++++- + 1 file changed, 56 insertions(+), 1 deletion(-) + +diff --git memory/build/mozjemalloc_compat.c memory/build/mozjemalloc_compat.c +index 70265a7..0a9b21a 100644 +--- memory/build/mozjemalloc_compat.c ++++ memory/build/mozjemalloc_compat.c +@@ -12,6 +12,8 @@ + #include "jemalloc_types.h" + #include "mozilla/Types.h" + ++#include ++ + #if defined(MOZ_NATIVE_JEMALLOC) + + MOZ_IMPORT_API int +@@ -47,6 +49,16 @@ je_(nallocm)(size_t *rsize, size_t size, int flags); + je_(mallctlbymib)(mib, miblen, &v, &sz, NULL, 0); \ + } while (0) + ++#define CTL_IJ_GET(n, v, i, j) do { \ ++ size_t mib[6]; \ ++ size_t miblen = sizeof(mib) / sizeof(mib[0]); \ ++ size_t sz = sizeof(v); \ ++ je_(mallctlnametomib)(n, mib, &miblen); \ ++ mib[2] = i; \ ++ mib[4] = j; \ ++ je_(mallctlbymib)(mib, miblen, &v, &sz, NULL, 0); \ ++} while (0) ++ + MOZ_MEMORY_API size_t + malloc_good_size_impl(size_t size) + { +@@ -61,6 +73,48 @@ malloc_good_size_impl(size_t size) + return size; + } + ++static size_t ++compute_bin_unused(unsigned int narenas) ++{ ++ size_t bin_unused = 0; ++ ++ uint32_t nregs; // number of regions per run in the j-th bin ++ size_t reg_size; // size of regions served by the j-th bin ++ size_t curruns; // number of runs belonging to a bin ++ size_t curregs; // number of allocated regions in a bin ++ ++ unsigned int nbins; // number of bins per arena ++ unsigned int i, j; ++ ++ // curruns and curregs are not defined for uninitialized arenas, ++ // so we skip them when computing bin_unused. However, initialized ++ // arenas are not guaranteed to be sequential, so we must test each ++ // one when iterating below. ++ bool initialized[100]; // should be narenas, but MSVC doesn't have VLAs ++ size_t isz = sizeof(initialized) / sizeof(initialized[0]); ++ ++ je_(mallctl)("arenas.initialized", initialized, &isz, NULL, 0); ++ CTL_GET("arenas.nbins", nbins); ++ ++ for (j = 0; j < nbins; j++) { ++ CTL_I_GET("arenas.bin.0.nregs", nregs, j); ++ CTL_I_GET("arenas.bin.0.size", reg_size, j); ++ ++ for (i = 0; i < narenas; i++) { ++ if (!initialized[i]) { ++ continue; ++ } ++ ++ CTL_IJ_GET("stats.arenas.0.bins.0.curruns", curruns, i, j); ++ CTL_IJ_GET("stats.arenas.0.bins.0.curregs", curregs, i, j); ++ ++ bin_unused += (nregs * curruns - curregs) * reg_size; ++ } ++ } ++ ++ return bin_unused; ++} ++ + MOZ_JEMALLOC_API void + jemalloc_stats_impl(jemalloc_stats_t *stats) + { +@@ -93,7 +147,8 @@ jemalloc_stats_impl(jemalloc_stats_t *stats) + // We could get this value out of base.c::base_pages, but that really should + // be an upstream change, so don't worry about it for now. + stats->bookkeeping = 0; +- stats->bin_unused = 0; ++ ++ stats->bin_unused = compute_bin_unused(narenas); + } + + MOZ_JEMALLOC_API void Added: trunk/www/firefox/files/patch-bug1082199 ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ trunk/www/firefox/files/patch-bug1082199 Wed Nov 19 01:27:24 2014 (r1763) @@ -0,0 +1,26 @@ +commit 258ec90 +Author: Guilherme Goncalves +Date: Fri Oct 17 15:55:00 2014 +0200 + + Bug 1082199 - Recompute stats in jemalloc_stats when using jemalloc3. r=glandium +--- + memory/build/mozjemalloc_compat.c | 6 ++++++ + 1 file changed, 6 insertions(+) + +diff --git memory/build/mozjemalloc_compat.c memory/build/mozjemalloc_compat.c +index 78bb13a..70265a7 100644 +--- memory/build/mozjemalloc_compat.c ++++ memory/build/mozjemalloc_compat.c +@@ -68,6 +68,12 @@ jemalloc_stats_impl(jemalloc_stats_t *stats) + size_t active, allocated, mapped, page, pdirty; + size_t lg_chunk; + ++ // Refresh jemalloc's stats by updating its epoch, see ctl_refresh in ++ // src/ctl.c ++ uint64_t epoch = 0; ++ size_t esz = sizeof(epoch); ++ int ret = je_(mallctl)("epoch", &epoch, &esz, &epoch, esz); ++ + CTL_GET("arenas.narenas", narenas); + CTL_GET("arenas.page", page); + CTL_GET("stats.active", active); Added: trunk/www/firefox/files/patch-bug899126 ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ trunk/www/firefox/files/patch-bug899126 Wed Nov 19 01:27:24 2014 (r1763) @@ -0,0 +1,98 @@ +commit 0f63381 +Author: Guilherme Goncalves +Date: Tue Nov 18 14:03:00 2014 -0800 + + Bug 899126 - Part 1 - Implement bin_unused for jemalloc3. r=glandium +--- + memory/build/mozjemalloc_compat.c | 57 ++++++++++++++++++++++++++++++++++++++- + 1 file changed, 56 insertions(+), 1 deletion(-) + +diff --git memory/build/mozjemalloc_compat.c memory/build/mozjemalloc_compat.c +index 70265a7..0a9b21a 100644 +--- memory/build/mozjemalloc_compat.c ++++ memory/build/mozjemalloc_compat.c +@@ -12,6 +12,8 @@ + #include "jemalloc_types.h" + #include "mozilla/Types.h" + ++#include ++ + #if defined(MOZ_NATIVE_JEMALLOC) + + MOZ_IMPORT_API int +@@ -47,6 +49,16 @@ je_(nallocm)(size_t *rsize, size_t size, int flags); + je_(mallctlbymib)(mib, miblen, &v, &sz, NULL, 0); \ + } while (0) + ++#define CTL_IJ_GET(n, v, i, j) do { \ ++ size_t mib[6]; \ ++ size_t miblen = sizeof(mib) / sizeof(mib[0]); \ ++ size_t sz = sizeof(v); \ ++ je_(mallctlnametomib)(n, mib, &miblen); \ ++ mib[2] = i; \ ++ mib[4] = j; \ ++ je_(mallctlbymib)(mib, miblen, &v, &sz, NULL, 0); \ ++} while (0) ++ + MOZ_MEMORY_API size_t + malloc_good_size_impl(size_t size) + { +@@ -61,6 +73,48 @@ malloc_good_size_impl(size_t size) + return size; + } + ++static size_t ++compute_bin_unused(unsigned int narenas) ++{ ++ size_t bin_unused = 0; ++ ++ uint32_t nregs; // number of regions per run in the j-th bin ++ size_t reg_size; // size of regions served by the j-th bin ++ size_t curruns; // number of runs belonging to a bin ++ size_t curregs; // number of allocated regions in a bin ++ ++ unsigned int nbins; // number of bins per arena ++ unsigned int i, j; ++ ++ // curruns and curregs are not defined for uninitialized arenas, ++ // so we skip them when computing bin_unused. However, initialized ++ // arenas are not guaranteed to be sequential, so we must test each ++ // one when iterating below. ++ bool initialized[100]; // should be narenas, but MSVC doesn't have VLAs ++ size_t isz = sizeof(initialized) / sizeof(initialized[0]); ++ ++ je_(mallctl)("arenas.initialized", initialized, &isz, NULL, 0); ++ CTL_GET("arenas.nbins", nbins); ++ ++ for (j = 0; j < nbins; j++) { ++ CTL_I_GET("arenas.bin.0.nregs", nregs, j); ++ CTL_I_GET("arenas.bin.0.size", reg_size, j); ++ ++ for (i = 0; i < narenas; i++) { ++ if (!initialized[i]) { ++ continue; ++ } ++ ++ CTL_IJ_GET("stats.arenas.0.bins.0.curruns", curruns, i, j); ++ CTL_IJ_GET("stats.arenas.0.bins.0.curregs", curregs, i, j); ++ ++ bin_unused += (nregs * curruns - curregs) * reg_size; ++ } ++ } ++ ++ return bin_unused; ++} ++ + MOZ_JEMALLOC_API void + jemalloc_stats_impl(jemalloc_stats_t *stats) + { +@@ -93,7 +147,8 @@ jemalloc_stats_impl(jemalloc_stats_t *stats) + // We could get this value out of base.c::base_pages, but that really should + // be an upstream change, so don't worry about it for now. + stats->bookkeeping = 0; +- stats->bin_unused = 0; ++ ++ stats->bin_unused = compute_bin_unused(narenas); + } + + MOZ_JEMALLOC_API void Added: trunk/www/libxul/files/patch-bug1082199 ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ trunk/www/libxul/files/patch-bug1082199 Wed Nov 19 01:27:24 2014 (r1763) @@ -0,0 +1,26 @@ +commit 258ec90 +Author: Guilherme Goncalves +Date: Fri Oct 17 15:55:00 2014 +0200 + + Bug 1082199 - Recompute stats in jemalloc_stats when using jemalloc3. r=glandium +--- + memory/build/mozjemalloc_compat.c | 6 ++++++ + 1 file changed, 6 insertions(+) + +diff --git memory/build/mozjemalloc_compat.c memory/build/mozjemalloc_compat.c +index 78bb13a..70265a7 100644 +--- memory/build/mozjemalloc_compat.c ++++ memory/build/mozjemalloc_compat.c +@@ -68,6 +68,12 @@ jemalloc_stats_impl(jemalloc_stats_t *stats) + size_t active, allocated, mapped, page, pdirty; + size_t lg_chunk; + ++ // Refresh jemalloc's stats by updating its epoch, see ctl_refresh in ++ // src/ctl.c ++ uint64_t epoch = 0; ++ size_t esz = sizeof(epoch); ++ int ret = je_(mallctl)("epoch", &epoch, &esz, &epoch, esz); ++ + CTL_GET("arenas.narenas", narenas); + CTL_GET("arenas.page", page); + CTL_GET("stats.active", active); Added: trunk/www/seamonkey/files/patch-bug1082199 ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ trunk/www/seamonkey/files/patch-bug1082199 Wed Nov 19 01:27:24 2014 (r1763) @@ -0,0 +1,26 @@ +commit 258ec90 +Author: Guilherme Goncalves +Date: Fri Oct 17 15:55:00 2014 +0200 + + Bug 1082199 - Recompute stats in jemalloc_stats when using jemalloc3. r=glandium +--- + memory/build/mozjemalloc_compat.c | 6 ++++++ + 1 file changed, 6 insertions(+) + +diff --git memory/build/mozjemalloc_compat.c memory/build/mozjemalloc_compat.c +index 78bb13a..70265a7 100644 +--- mozilla/memory/build/mozjemalloc_compat.c ++++ mozilla/memory/build/mozjemalloc_compat.c +@@ -68,6 +68,12 @@ jemalloc_stats_impl(jemalloc_stats_t *stats) + size_t active, allocated, mapped, page, pdirty; + size_t lg_chunk; + ++ // Refresh jemalloc's stats by updating its epoch, see ctl_refresh in ++ // src/ctl.c ++ uint64_t epoch = 0; ++ size_t esz = sizeof(epoch); ++ int ret = je_(mallctl)("epoch", &epoch, &esz, &epoch, esz); ++ + CTL_GET("arenas.narenas", narenas); + CTL_GET("arenas.page", page); + CTL_GET("stats.active", active); Added: trunk/www/seamonkey/files/patch-bug899126 ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ trunk/www/seamonkey/files/patch-bug899126 Wed Nov 19 01:27:24 2014 (r1763) @@ -0,0 +1,98 @@ +commit 0f63381 +Author: Guilherme Goncalves +Date: Tue Nov 18 14:03:00 2014 -0800 + + Bug 899126 - Part 1 - Implement bin_unused for jemalloc3. r=glandium +--- + memory/build/mozjemalloc_compat.c | 57 ++++++++++++++++++++++++++++++++++++++- + 1 file changed, 56 insertions(+), 1 deletion(-) + +diff --git memory/build/mozjemalloc_compat.c memory/build/mozjemalloc_compat.c +index 70265a7..0a9b21a 100644 +--- mozilla/memory/build/mozjemalloc_compat.c ++++ mozilla/memory/build/mozjemalloc_compat.c +@@ -12,6 +12,8 @@ + #include "jemalloc_types.h" + #include "mozilla/Types.h" + ++#include ++ + #if defined(MOZ_NATIVE_JEMALLOC) + + MOZ_IMPORT_API int +@@ -47,6 +49,16 @@ je_(nallocm)(size_t *rsize, size_t size, int flags); + je_(mallctlbymib)(mib, miblen, &v, &sz, NULL, 0); \ + } while (0) + ++#define CTL_IJ_GET(n, v, i, j) do { \ ++ size_t mib[6]; \ ++ size_t miblen = sizeof(mib) / sizeof(mib[0]); \ ++ size_t sz = sizeof(v); \ ++ je_(mallctlnametomib)(n, mib, &miblen); \ ++ mib[2] = i; \ ++ mib[4] = j; \ ++ je_(mallctlbymib)(mib, miblen, &v, &sz, NULL, 0); \ ++} while (0) ++ + MOZ_MEMORY_API size_t + malloc_good_size_impl(size_t size) + { +@@ -61,6 +73,48 @@ malloc_good_size_impl(size_t size) + return size; + } + ++static size_t ++compute_bin_unused(unsigned int narenas) ++{ ++ size_t bin_unused = 0; ++ ++ uint32_t nregs; // number of regions per run in the j-th bin ++ size_t reg_size; // size of regions served by the j-th bin ++ size_t curruns; // number of runs belonging to a bin ++ size_t curregs; // number of allocated regions in a bin ++ ++ unsigned int nbins; // number of bins per arena ++ unsigned int i, j; ++ ++ // curruns and curregs are not defined for uninitialized arenas, ++ // so we skip them when computing bin_unused. However, initialized ++ // arenas are not guaranteed to be sequential, so we must test each ++ // one when iterating below. ++ bool initialized[100]; // should be narenas, but MSVC doesn't have VLAs ++ size_t isz = sizeof(initialized) / sizeof(initialized[0]); ++ ++ je_(mallctl)("arenas.initialized", initialized, &isz, NULL, 0); ++ CTL_GET("arenas.nbins", nbins); ++ ++ for (j = 0; j < nbins; j++) { ++ CTL_I_GET("arenas.bin.0.nregs", nregs, j); ++ CTL_I_GET("arenas.bin.0.size", reg_size, j); ++ ++ for (i = 0; i < narenas; i++) { ++ if (!initialized[i]) { ++ continue; ++ } ++ ++ CTL_IJ_GET("stats.arenas.0.bins.0.curruns", curruns, i, j); ++ CTL_IJ_GET("stats.arenas.0.bins.0.curregs", curregs, i, j); ++ ++ bin_unused += (nregs * curruns - curregs) * reg_size; ++ } ++ } ++ ++ return bin_unused; ++} ++ + MOZ_JEMALLOC_API void + jemalloc_stats_impl(jemalloc_stats_t *stats) + { +@@ -93,7 +147,8 @@ jemalloc_stats_impl(jemalloc_stats_t *stats) + // We could get this value out of base.c::base_pages, but that really should + // be an upstream change, so don't worry about it for now. + stats->bookkeeping = 0; +- stats->bin_unused = 0; ++ ++ stats->bin_unused = compute_bin_unused(narenas); + } + + MOZ_JEMALLOC_API void From owner-freebsd-gecko@FreeBSD.ORG Wed Nov 19 03:04:33 2014 Return-Path: Delivered-To: freebsd-gecko@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 879D89C2 for ; Wed, 19 Nov 2014 03:04:33 +0000 (UTC) Received: from trillian.chruetertee.ch (trillian.chruetertee.ch [217.150.244.247]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id F4050D08 for ; Wed, 19 Nov 2014 03:04:32 +0000 (UTC) Received: from trillian.chruetertee.ch (trillian [217.150.244.247]) by trillian.chruetertee.ch (8.14.4/8.14.3) with ESMTP id sAJ34UD5066166 for ; Wed, 19 Nov 2014 03:04:30 GMT (envelope-from svn-freebsd-gecko@chruetertee.ch) Received: (from www@localhost) by trillian.chruetertee.ch (8.14.4/8.14.3/Submit) id sAJ34OlT062716 for freebsd-gecko@freebsd.org; Wed, 19 Nov 2014 03:04:24 GMT (envelope-from svn-freebsd-gecko@chruetertee.ch) Date: Wed, 19 Nov 2014 03:04:24 GMT Message-Id: <201411190304.sAJ34OlT062716@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 Subject: [SVN-Commit] r1764 - in trunk: . www/firefox www/firefox-i18n www/firefox-nightly www/firefox-nightly/files www/firefox/files www/linux-firefox www/linux-pepperflash www/linux-tor-browser www/linux-tor-browser/files MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Reply-To: freebsd-gecko@freebsd.org X-BeenThere: freebsd-gecko@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: Gecko Rendering Engine issues List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 19 Nov 2014 03:04:33 -0000 Author: jbeich Date: Wed Nov 19 03:04:24 2014 New Revision: 1764 Log: update Added: trunk/Gecko_ChangeLog Deleted: trunk/www/firefox/files/patch-bug1061736 Modified: trunk/Gecko_TODO trunk/www/firefox-i18n/Makefile trunk/www/firefox-i18n/distinfo trunk/www/firefox-nightly/Makefile.hgrev trunk/www/firefox-nightly/distinfo trunk/www/firefox-nightly/files/patch-bug1013882 trunk/www/firefox-nightly/files/patch-ijg-libjpeg trunk/www/firefox-nightly/files/patch-z-bug517422 trunk/www/firefox/Makefile trunk/www/firefox/distinfo trunk/www/linux-firefox/Makefile trunk/www/linux-firefox/distinfo trunk/www/linux-pepperflash/Makefile trunk/www/linux-pepperflash/distinfo.i386 trunk/www/linux-tor-browser/Makefile trunk/www/linux-tor-browser/distinfo trunk/www/linux-tor-browser/files/pkg-message.in Added: trunk/Gecko_ChangeLog ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ trunk/Gecko_ChangeLog Wed Nov 19 03:04:24 2014 (r1764) @@ -0,0 +1,6 @@ +- improve CONFIGURE_TARGET handling +- always build using client.mk +- switch to clang by default on systems without libc++ (/stable/8 and /stable/9) +- drop lang/python2 dependency, only lang/python27 is required to build +- use DuckDuckGo searchplugin from upstream (has suggestions and purposes) +- backport a few about:memory fixes Modified: trunk/Gecko_TODO ============================================================================== --- trunk/Gecko_TODO Wed Nov 19 01:27:24 2014 (r1763) +++ trunk/Gecko_TODO Wed Nov 19 03:04:24 2014 (r1764) @@ -24,3 +24,4 @@ - move duplicated `>=' deps into bsd.gecko.mk (system libxul?) - get rid of symlink farms for webplugins and xpi-* ports - make linux-tor-browser work with multiple users, /tmp permissions +- unbreak PluggableTransports in linux-tor-browser Modified: trunk/www/firefox-i18n/Makefile ============================================================================== --- trunk/www/firefox-i18n/Makefile Wed Nov 19 01:27:24 2014 (r1763) +++ trunk/www/firefox-i18n/Makefile Wed Nov 19 03:04:24 2014 (r1764) @@ -2,7 +2,7 @@ # $FreeBSD: head/www/firefox-i18n/Makefile 370932 2014-10-15 15:48:16Z beat $ PORTNAME= firefox-i18n -PORTVERSION= 34.0b7 +PORTVERSION= 34.0b10 CATEGORIES= www MASTER_SITES= MOZILLA/${PORTNAME:S|-i18n||}/releases/${PORTVERSION}/linux-i686/xpi PKGNAMEPREFIX= Modified: trunk/www/firefox-i18n/distinfo ============================================================================== --- trunk/www/firefox-i18n/distinfo Wed Nov 19 01:27:24 2014 (r1763) +++ trunk/www/firefox-i18n/distinfo Wed Nov 19 03:04:24 2014 (r1764) @@ -1,180 +1,180 @@ -SHA256 (xpi/firefox-i18n-34.0b7/ach.xpi) = 899612bb3149608f671a73511bef9f4b21b53b0e90b08a240095a2c93a757ffb -SIZE (xpi/firefox-i18n-34.0b7/ach.xpi) = 452860 -SHA256 (xpi/firefox-i18n-34.0b7/af.xpi) = 0fbaff32ef00bf15e389a6adba29723038d433e81dad4477419fa24013280766 -SIZE (xpi/firefox-i18n-34.0b7/af.xpi) = 453239 -SHA256 (xpi/firefox-i18n-34.0b7/an.xpi) = 678d2f894febe1e8c7fa398e10f0431e9dc6bda043ba59ebe4b5bf69cf2ea38c -SIZE (xpi/firefox-i18n-34.0b7/an.xpi) = 429217 -SHA256 (xpi/firefox-i18n-34.0b7/ar.xpi) = b7589840be300aa8c0964add3fcf3f9b5c6703692c1552005606fd70fe6d8efb -SIZE (xpi/firefox-i18n-34.0b7/ar.xpi) = 484361 -SHA256 (xpi/firefox-i18n-34.0b7/as.xpi) = 68b4b4005c8dd9d9bcaf5eb7317bdce9bf3e8e6d1a3b31e624b029d826e2f343 -SIZE (xpi/firefox-i18n-34.0b7/as.xpi) = 473341 -SHA256 (xpi/firefox-i18n-34.0b7/ast.xpi) = 05734f5758f0cb01d54639b04ff328dcc7e54e2f8eb60d106f31f15ace963937 -SIZE (xpi/firefox-i18n-34.0b7/ast.xpi) = 361499 -SHA256 (xpi/firefox-i18n-34.0b7/az.xpi) = 00c917ad8d41d4f84a56c4712757875acfba50ac47c76df2ef62510dc022b625 -SIZE (xpi/firefox-i18n-34.0b7/az.xpi) = 447854 -SHA256 (xpi/firefox-i18n-34.0b7/be.xpi) = d9cfb64bc87305819a5845f2cac743ed37e80e8b115e93c966eb13600f63277f -SIZE (xpi/firefox-i18n-34.0b7/be.xpi) = 407082 -SHA256 (xpi/firefox-i18n-34.0b7/bg.xpi) = 1044c0784aa7e2320a43def08569c86c7c5e3e2e77416b5ca54dda4be8078c22 -SIZE (xpi/firefox-i18n-34.0b7/bg.xpi) = 462669 -SHA256 (xpi/firefox-i18n-34.0b7/bn-BD.xpi) = 6d2c7c3f43f32040bbd11e6c652ad8c8f5e9d2c5624dd80625d5492919db93b2 -SIZE (xpi/firefox-i18n-34.0b7/bn-BD.xpi) = 497138 -SHA256 (xpi/firefox-i18n-34.0b7/bn-IN.xpi) = ab726409b7c26f43496d6e69e11707b0a8d034bd5e12dc382259a783613cf82b -SIZE (xpi/firefox-i18n-34.0b7/bn-IN.xpi) = 487238 -SHA256 (xpi/firefox-i18n-34.0b7/br.xpi) = f1f86589f645b2cb51da4ffdaa4b1b6328c7241c177196fa88179953acb556e6 -SIZE (xpi/firefox-i18n-34.0b7/br.xpi) = 410337 -SHA256 (xpi/firefox-i18n-34.0b7/bs.xpi) = c92c70c8e543699334a53d4d027b3b7e729dd155bf715bdf0eac38fc3de241c1 -SIZE (xpi/firefox-i18n-34.0b7/bs.xpi) = 453728 -SHA256 (xpi/firefox-i18n-34.0b7/ca.xpi) = 9805150b6625f537e0720ee1a1f46b68e000bb83f679b06533caf6f233f92154 -SIZE (xpi/firefox-i18n-34.0b7/ca.xpi) = 425818 -SHA256 (xpi/firefox-i18n-34.0b7/cs.xpi) = d0c9def0667e4ae99922c713233230542f9c25f5f8b3f188f7073926f0ac9f19 -SIZE (xpi/firefox-i18n-34.0b7/cs.xpi) = 413756 -SHA256 (xpi/firefox-i18n-34.0b7/csb.xpi) = 50ee9144b0b902c954ce9f56dd1fe222311225968ff45bf5f1264032b8ac306a -SIZE (xpi/firefox-i18n-34.0b7/csb.xpi) = 408998 -SHA256 (xpi/firefox-i18n-34.0b7/cy.xpi) = 6492883881b6fbd3b474746bcb9eee336945914973c8fee06f7db053d220660f -SIZE (xpi/firefox-i18n-34.0b7/cy.xpi) = 412341 -SHA256 (xpi/firefox-i18n-34.0b7/da.xpi) = d2271b56938ceb98e635edf3c5f26a95ba84df806e1ae347a7b62205bcf665bd -SIZE (xpi/firefox-i18n-34.0b7/da.xpi) = 421661 -SHA256 (xpi/firefox-i18n-34.0b7/de.xpi) = f2e5ec613107dbf2a707de83b172000d05b3ce79a520777c5415d199d557b60d -SIZE (xpi/firefox-i18n-34.0b7/de.xpi) = 422657 -SHA256 (xpi/firefox-i18n-34.0b7/dsb.xpi) = dbd92d2f9b1aec02dbec82b7018ab96c944e9ba2d6c180b2d676abbd211aa7c1 -SIZE (xpi/firefox-i18n-34.0b7/dsb.xpi) = 437950 -SHA256 (xpi/firefox-i18n-34.0b7/el.xpi) = c0d3c5ad8b24becd3de9734df354224070d587f78ddf72b35a9394bd6be02c46 -SIZE (xpi/firefox-i18n-34.0b7/el.xpi) = 467030 -SHA256 (xpi/firefox-i18n-34.0b7/en-GB.xpi) = a8001fdd2ed0fc70b64a5cd511ea7f5a562fd57371686cb9234e0d3505969e86 -SIZE (xpi/firefox-i18n-34.0b7/en-GB.xpi) = 410925 -SHA256 (xpi/firefox-i18n-34.0b7/en-US.xpi) = 3ad181c54b6d966f52145a41236f3e029b3b8b9b14241e56deec35f7ba006a4d -SIZE (xpi/firefox-i18n-34.0b7/en-US.xpi) = 443061 -SHA256 (xpi/firefox-i18n-34.0b7/en-ZA.xpi) = 6307540b296d3cbb61efd742aa3dfb49928cbe555809f90529c20c809d1a4c2f -SIZE (xpi/firefox-i18n-34.0b7/en-ZA.xpi) = 406996 -SHA256 (xpi/firefox-i18n-34.0b7/eo.xpi) = b46e04dcc3a376bdbfd9e1bd7e67565b279d8fe5355a85d94796f89ea0e0c7ae -SIZE (xpi/firefox-i18n-34.0b7/eo.xpi) = 455595 -SHA256 (xpi/firefox-i18n-34.0b7/es-AR.xpi) = c30d7ff7bc038690b843622c94de2dee557958e7a69ed3eb5e43fd3148ab4196 -SIZE (xpi/firefox-i18n-34.0b7/es-AR.xpi) = 421752 -SHA256 (xpi/firefox-i18n-34.0b7/es-CL.xpi) = 8a616cbea39c0f94d95b466dd8055870aa2543f3708629a63805d15ef2b2b58c -SIZE (xpi/firefox-i18n-34.0b7/es-CL.xpi) = 362938 -SHA256 (xpi/firefox-i18n-34.0b7/es-ES.xpi) = c4b42d7d068212c3186081c24ba08f311fcdb38dd9eaca7414fa9d93fe438060 -SIZE (xpi/firefox-i18n-34.0b7/es-ES.xpi) = 349755 -SHA256 (xpi/firefox-i18n-34.0b7/es-MX.xpi) = fce7c297f2fba768f46e2a3b938d041b2fd9b7d3ddbfcc838d740aca69f2be13 -SIZE (xpi/firefox-i18n-34.0b7/es-MX.xpi) = 424431 -SHA256 (xpi/firefox-i18n-34.0b7/et.xpi) = 5d76fa8c9be40b732eab29ff3c3cbc0c74cf333e2824a46171176c54c0ab7699 -SIZE (xpi/firefox-i18n-34.0b7/et.xpi) = 411395 -SHA256 (xpi/firefox-i18n-34.0b7/eu.xpi) = c999ac66ab2800954f08df10144337738b3059b727a67c5f84c49a3b3fdd6fca -SIZE (xpi/firefox-i18n-34.0b7/eu.xpi) = 436803 -SHA256 (xpi/firefox-i18n-34.0b7/fa.xpi) = 2c0aa209303b047fcad81c1b623d42af0dae63471545f6effe7031cc1ce058a7 -SIZE (xpi/firefox-i18n-34.0b7/fa.xpi) = 483068 -SHA256 (xpi/firefox-i18n-34.0b7/ff.xpi) = 81451c24961199eb07978b9033f92a117905758814c66ce7e494cea6c2053ea5 -SIZE (xpi/firefox-i18n-34.0b7/ff.xpi) = 423447 -SHA256 (xpi/firefox-i18n-34.0b7/fi.xpi) = f9ec64c2c7d408d0ecf7bd13f3778d09f6f450d6c464817fe2d47f063e8c0af1 -SIZE (xpi/firefox-i18n-34.0b7/fi.xpi) = 413422 -SHA256 (xpi/firefox-i18n-34.0b7/fr.xpi) = 0c15681eff13b169841a0d5c4526db6b3870fbf3ea92392a1350b0eda723c9b7 -SIZE (xpi/firefox-i18n-34.0b7/fr.xpi) = 428842 -SHA256 (xpi/firefox-i18n-34.0b7/fy-NL.xpi) = 8ad6073e9bbc82416bdee380cbf662f8628c09129e5b3088c2f7676c69294d2c -SIZE (xpi/firefox-i18n-34.0b7/fy-NL.xpi) = 423444 -SHA256 (xpi/firefox-i18n-34.0b7/ga-IE.xpi) = e27e2c2488bf4ee871590ba1214734cbb151d9d78a8f8194aba02311ebb9bc20 -SIZE (xpi/firefox-i18n-34.0b7/ga-IE.xpi) = 431884 -SHA256 (xpi/firefox-i18n-34.0b7/gd.xpi) = 51a80477ec4618c1036239ad30094cdf51c62a55dd169d7964498c8557cc2dac -SIZE (xpi/firefox-i18n-34.0b7/gd.xpi) = 424210 -SHA256 (xpi/firefox-i18n-34.0b7/gl.xpi) = 0f2f6a75e482be134f8bd8ba527adee3b7451d779f8b855f82118843543e1a15 -SIZE (xpi/firefox-i18n-34.0b7/gl.xpi) = 413887 -SHA256 (xpi/firefox-i18n-34.0b7/gu-IN.xpi) = 4d89176f658eda8d1bec6eb1fc8c2cf54d85365f01b1ed58ed2d97b48e89f55d -SIZE (xpi/firefox-i18n-34.0b7/gu-IN.xpi) = 444144 -SHA256 (xpi/firefox-i18n-34.0b7/he.xpi) = 0afb6a1260213bfa033d19ab80b12ddc5a188a8b752f08f2b43d719210e31de3 -SIZE (xpi/firefox-i18n-34.0b7/he.xpi) = 454174 -SHA256 (xpi/firefox-i18n-34.0b7/hi-IN.xpi) = 45def457757e24c2963255084d4279568431d93bc4c95d4ddc9e0c2e1265597e -SIZE (xpi/firefox-i18n-34.0b7/hi-IN.xpi) = 474267 -SHA256 (xpi/firefox-i18n-34.0b7/hr.xpi) = 6b8c20b01dbbf283d2a825e649a0a4913cc2d845bfec4e2d77bc2c47d0a9a2a9 -SIZE (xpi/firefox-i18n-34.0b7/hr.xpi) = 446141 -SHA256 (xpi/firefox-i18n-34.0b7/hsb.xpi) = 1e7f950de02629e951fcf6828dfa72160b5a693cd52ba7f70192dcaabbbd1921 -SIZE (xpi/firefox-i18n-34.0b7/hsb.xpi) = 435862 -SHA256 (xpi/firefox-i18n-34.0b7/hu.xpi) = 3d695bef06055a606ba8e660e467b4d9eaed95439669cb4e13751b26e456ecaa -SIZE (xpi/firefox-i18n-34.0b7/hu.xpi) = 421060 -SHA256 (xpi/firefox-i18n-34.0b7/hy-AM.xpi) = 1c3d57ccbd287188bf696ae192805a4b8639c7b522593880aa09fdf9028c4d5e -SIZE (xpi/firefox-i18n-34.0b7/hy-AM.xpi) = 503470 -SHA256 (xpi/firefox-i18n-34.0b7/id.xpi) = 342120fd6053f7484af6425ddd20bf7c526495a86df232f0a9f2277cb99a56ef -SIZE (xpi/firefox-i18n-34.0b7/id.xpi) = 399548 -SHA256 (xpi/firefox-i18n-34.0b7/is.xpi) = 6711b070b4488d896a32f483eb0cc11e02c984eae455b026aeaa454c2aca452c -SIZE (xpi/firefox-i18n-34.0b7/is.xpi) = 453430 -SHA256 (xpi/firefox-i18n-34.0b7/it.xpi) = 7b791b0d92faa1bce7a7117f3d6b437830b7ecfcbf3e08568c342b623d28e2bb -SIZE (xpi/firefox-i18n-34.0b7/it.xpi) = 348505 -SHA256 (xpi/firefox-i18n-34.0b7/ja.xpi) = 8ab7fff4bca20150f7ffd6a6cb0fbdae17179eba9f161f4b669a589ec50f0b06 -SIZE (xpi/firefox-i18n-34.0b7/ja.xpi) = 444511 -SHA256 (xpi/firefox-i18n-34.0b7/kk.xpi) = a1fc7147da10782c6c44f306453fa83b9d006970ecee85af2ecc9baf2282d20d -SIZE (xpi/firefox-i18n-34.0b7/kk.xpi) = 463150 -SHA256 (xpi/firefox-i18n-34.0b7/km.xpi) = e9d3d8ab800c5ce91fd169c9c2f6431dec74abd1ad8375268f52afea70ce52e8 -SIZE (xpi/firefox-i18n-34.0b7/km.xpi) = 532090 -SHA256 (xpi/firefox-i18n-34.0b7/kn.xpi) = 09213479c4662a3eb14de2d90eed952d84c57c94d277c1bdca873591104d4f57 -SIZE (xpi/firefox-i18n-34.0b7/kn.xpi) = 497535 -SHA256 (xpi/firefox-i18n-34.0b7/ko.xpi) = 291a91aa152a06394b907597f4808e84d7b33f31e1e51fd71a7a03e8b05b30a4 -SIZE (xpi/firefox-i18n-34.0b7/ko.xpi) = 426817 -SHA256 (xpi/firefox-i18n-34.0b7/ku.xpi) = f0045e045ae004bf940d592c72794d6d9dda1b4a2cf5f71f79d1f9c40cf55d52 -SIZE (xpi/firefox-i18n-34.0b7/ku.xpi) = 443985 -SHA256 (xpi/firefox-i18n-34.0b7/lij.xpi) = f43d8e2563e2b20fcea41188162691ba7876b2b1e9f1aa239fbc1caa1765a4bb -SIZE (xpi/firefox-i18n-34.0b7/lij.xpi) = 411628 -SHA256 (xpi/firefox-i18n-34.0b7/lt.xpi) = 1419a9f11b81755fabd3bb98f6c9bac39364f9a307f8355c0b8c9e53c6ee8f14 -SIZE (xpi/firefox-i18n-34.0b7/lt.xpi) = 453498 -SHA256 (xpi/firefox-i18n-34.0b7/lv.xpi) = c9eb8470186462aa7a6e9d51d5a5566df64fba4ed91641359664eee58b49d1a0 -SIZE (xpi/firefox-i18n-34.0b7/lv.xpi) = 417506 -SHA256 (xpi/firefox-i18n-34.0b7/mai.xpi) = d04f6dd1b6bee6c8c3e96c03d96de065e3197696d3b508c867755814ac34a451 -SIZE (xpi/firefox-i18n-34.0b7/mai.xpi) = 467995 -SHA256 (xpi/firefox-i18n-34.0b7/mk.xpi) = 5d6fa2dcde08c13317fa075a5598f88d7145cc0365f255d6d9679c5f758a7302 -SIZE (xpi/firefox-i18n-34.0b7/mk.xpi) = 498478 -SHA256 (xpi/firefox-i18n-34.0b7/ml.xpi) = 5fa67d7008eaaca83de045dfad381e28c2e137aec921dc6f65e252e1949f48ab -SIZE (xpi/firefox-i18n-34.0b7/ml.xpi) = 496040 -SHA256 (xpi/firefox-i18n-34.0b7/mr.xpi) = 5ac52001150a0d570ea7b91efaf706470375f8835b8189f909bf06a655cb5a9f -SIZE (xpi/firefox-i18n-34.0b7/mr.xpi) = 476526 -SHA256 (xpi/firefox-i18n-34.0b7/ms.xpi) = 18aecd41790ac4e675fd404f59aeada608e120d93315ca95c071b96221d0ad88 -SIZE (xpi/firefox-i18n-34.0b7/ms.xpi) = 459356 -SHA256 (xpi/firefox-i18n-34.0b7/nb-NO.xpi) = 94d3acc7ca0d59d3fcb6ba8a48b0d048f3ca046237a16ca68948a9d7da905908 -SIZE (xpi/firefox-i18n-34.0b7/nb-NO.xpi) = 412573 -SHA256 (xpi/firefox-i18n-34.0b7/nl.xpi) = fbfdef6bbba9ee50cf7a88b919d390c708d372443b3e4234736b30b4633c2054 -SIZE (xpi/firefox-i18n-34.0b7/nl.xpi) = 412278 -SHA256 (xpi/firefox-i18n-34.0b7/nn-NO.xpi) = ae64635ae85573673756a9bff66d24599693f7830d078e8a9b7d59daca2740ee -SIZE (xpi/firefox-i18n-34.0b7/nn-NO.xpi) = 407083 -SHA256 (xpi/firefox-i18n-34.0b7/or.xpi) = 1f8e6d09ee0ea516bc3c82e40ad4f1800f21ea88a52b6fef7ae349c05f58430b -SIZE (xpi/firefox-i18n-34.0b7/or.xpi) = 490227 -SHA256 (xpi/firefox-i18n-34.0b7/pa-IN.xpi) = 97d06cec88fb92b67c4405ddb73fe1273cf4619e47834cb05f371bbe9741b482 -SIZE (xpi/firefox-i18n-34.0b7/pa-IN.xpi) = 462127 -SHA256 (xpi/firefox-i18n-34.0b7/pl.xpi) = 3b8d59297bb097326fed455129b6ae83e434824fe9810bc427240f18cc09b7f5 -SIZE (xpi/firefox-i18n-34.0b7/pl.xpi) = 390777 -SHA256 (xpi/firefox-i18n-34.0b7/pt-BR.xpi) = 6cd04459eff90ea0e4ce7aaea706927b6a5c51f0605947e2dcb02c5730228ab3 -SIZE (xpi/firefox-i18n-34.0b7/pt-BR.xpi) = 431734 -SHA256 (xpi/firefox-i18n-34.0b7/pt-PT.xpi) = 78c913b2cd32a76db25f0affd7d0881066d084a2a3c1454580d697fd686dcfc9 -SIZE (xpi/firefox-i18n-34.0b7/pt-PT.xpi) = 409716 -SHA256 (xpi/firefox-i18n-34.0b7/rm.xpi) = 325c21ed5dd3103cab45af9e7323c1118d078e6c53bbb9bc204a7d9e1a3a983c -SIZE (xpi/firefox-i18n-34.0b7/rm.xpi) = 422521 -SHA256 (xpi/firefox-i18n-34.0b7/ro.xpi) = 50c994238eb41f8ce43337a96a00df49e3233a41cb6eabc0e1dd4f7ebc2b064e -SIZE (xpi/firefox-i18n-34.0b7/ro.xpi) = 464689 -SHA256 (xpi/firefox-i18n-34.0b7/ru.xpi) = feb80bf0e1a1b89723ab5155c96939d1e5b1c019f3df707fae1396f1922e4028 -SIZE (xpi/firefox-i18n-34.0b7/ru.xpi) = 393161 -SHA256 (xpi/firefox-i18n-34.0b7/si.xpi) = b920738cafcdc335551c28638535205cdcebaeb4ca1033d8710cc76e7f570ba5 -SIZE (xpi/firefox-i18n-34.0b7/si.xpi) = 496439 -SHA256 (xpi/firefox-i18n-34.0b7/sk.xpi) = fc91295e27615425c5460bf1986315852a34f743c13832a685ba97040eba6692 -SIZE (xpi/firefox-i18n-34.0b7/sk.xpi) = 441071 -SHA256 (xpi/firefox-i18n-34.0b7/sl.xpi) = a9ab60a3a99ee2049495a6df469b1c10312b587750d00d0fc0aa4c8e87ab30df -SIZE (xpi/firefox-i18n-34.0b7/sl.xpi) = 413816 -SHA256 (xpi/firefox-i18n-34.0b7/son.xpi) = 701c961a26a1de65654f7ef8965f77ad48c6657c8fb7c5180b8ec38a520c68e2 -SIZE (xpi/firefox-i18n-34.0b7/son.xpi) = 416345 -SHA256 (xpi/firefox-i18n-34.0b7/sq.xpi) = f2c503188172a0f50cd95274bfce2f8b75040d653207fcc656c92ac239837e7f -SIZE (xpi/firefox-i18n-34.0b7/sq.xpi) = 455158 -SHA256 (xpi/firefox-i18n-34.0b7/sr.xpi) = 4c2f8afe184f0c55aee915bd15c74fdfdd18d35b651b324cc525ba09cd336d4e -SIZE (xpi/firefox-i18n-34.0b7/sr.xpi) = 451722 -SHA256 (xpi/firefox-i18n-34.0b7/sv-SE.xpi) = 8fa40abab95e28b81b90681a9248ff6834d682ee6e5284b64bee1ec1461d9192 -SIZE (xpi/firefox-i18n-34.0b7/sv-SE.xpi) = 420529 -SHA256 (xpi/firefox-i18n-34.0b7/ta.xpi) = 62a79dabab2a5183c8b8dc5b62c0cc2766f4d7da0724cf4f25b793d7a9394759 -SIZE (xpi/firefox-i18n-34.0b7/ta.xpi) = 473127 -SHA256 (xpi/firefox-i18n-34.0b7/te.xpi) = 3cebc10b76f92ab2ec2f223d2832cfe280e6d9c2e48233d7238c00bf36c33760 -SIZE (xpi/firefox-i18n-34.0b7/te.xpi) = 491741 -SHA256 (xpi/firefox-i18n-34.0b7/th.xpi) = 82f2147632179e15d5255473df1999e907c693c199e17945b737d134b1e144ff -SIZE (xpi/firefox-i18n-34.0b7/th.xpi) = 501156 -SHA256 (xpi/firefox-i18n-34.0b7/tr.xpi) = 7183e6051e9b77797bf0a743e741bb62a37ff0f471e7522a5a25838d356670f9 -SIZE (xpi/firefox-i18n-34.0b7/tr.xpi) = 449176 -SHA256 (xpi/firefox-i18n-34.0b7/uk.xpi) = d0a7e429229f215657fb23fc8efb532947cc9645fb77571aa57355df732af8d8 -SIZE (xpi/firefox-i18n-34.0b7/uk.xpi) = 453679 -SHA256 (xpi/firefox-i18n-34.0b7/vi.xpi) = ba50d883e5af3b64de6f71d142e3d55b51ed2a937fb95e01784a115471e273f7 -SIZE (xpi/firefox-i18n-34.0b7/vi.xpi) = 435945 -SHA256 (xpi/firefox-i18n-34.0b7/xh.xpi) = 256f14dd371d4913a1abd6a6a8683a3e32641670853c2ee411c3837166dd6ae0 -SIZE (xpi/firefox-i18n-34.0b7/xh.xpi) = 421805 -SHA256 (xpi/firefox-i18n-34.0b7/zh-CN.xpi) = d75b1decad4e330fe6e10e7992675d72679c26513d6cc44f1466bc6dbc8854bf -SIZE (xpi/firefox-i18n-34.0b7/zh-CN.xpi) = 444348 -SHA256 (xpi/firefox-i18n-34.0b7/zh-TW.xpi) = 6743b212220205f4044e990b2fd0f149f1cf182520150c0d46e1fcbb221fe512 -SIZE (xpi/firefox-i18n-34.0b7/zh-TW.xpi) = 434785 +SHA256 (xpi/firefox-i18n-34.0b10/ach.xpi) = c025b544df063343986a54ff498d4eedf25859933e2b1462e54f20531cf687d3 +SIZE (xpi/firefox-i18n-34.0b10/ach.xpi) = 462777 +SHA256 (xpi/firefox-i18n-34.0b10/af.xpi) = 9f5e894a41970dbda5c75927d6b1039ecef3a4e04fa62e4145051ff1d1cdf7a4 +SIZE (xpi/firefox-i18n-34.0b10/af.xpi) = 463156 +SHA256 (xpi/firefox-i18n-34.0b10/an.xpi) = e43b78c65f435db249da2323e6c28c5d36ca3d3ebcc391680665976012eac8d4 +SIZE (xpi/firefox-i18n-34.0b10/an.xpi) = 439134 +SHA256 (xpi/firefox-i18n-34.0b10/ar.xpi) = 2c175e6076cffc9a65f448a3d7e0516e68cea693d13e5e8816b765e5bcfc0eb5 +SIZE (xpi/firefox-i18n-34.0b10/ar.xpi) = 494278 +SHA256 (xpi/firefox-i18n-34.0b10/as.xpi) = 5cbc1a4cbc23d3fa2f539bb608134f04107a21479363fd3c9461d89de2773af2 +SIZE (xpi/firefox-i18n-34.0b10/as.xpi) = 483258 +SHA256 (xpi/firefox-i18n-34.0b10/ast.xpi) = b3311349f3c761a0455ed98f42e6bab378943a4322f8359dbd035bc19c712f51 +SIZE (xpi/firefox-i18n-34.0b10/ast.xpi) = 371416 +SHA256 (xpi/firefox-i18n-34.0b10/az.xpi) = 77e3978bf150c170f5124d4b662afe4924d06e5de1f7a0c90ca9094feb96e1ba +SIZE (xpi/firefox-i18n-34.0b10/az.xpi) = 457771 +SHA256 (xpi/firefox-i18n-34.0b10/be.xpi) = e7bed6ca93c801da304868395970f3cf040956c6d6c565656de814a36f8e9e04 +SIZE (xpi/firefox-i18n-34.0b10/be.xpi) = 416999 +SHA256 (xpi/firefox-i18n-34.0b10/bg.xpi) = 58cee518b3ef7e9f50d3f3db3b9977303b2cac8304afa23a60e43aaa5c70bad4 +SIZE (xpi/firefox-i18n-34.0b10/bg.xpi) = 472586 +SHA256 (xpi/firefox-i18n-34.0b10/bn-BD.xpi) = ae34f072bf68851d079bff63132b195300771de6e626e61d74828feec0820c7f +SIZE (xpi/firefox-i18n-34.0b10/bn-BD.xpi) = 507055 +SHA256 (xpi/firefox-i18n-34.0b10/bn-IN.xpi) = 31aaae47ab774def90d5d7c2ac3bb3fae2249bc31499a11f87568f0aacf0ce3d +SIZE (xpi/firefox-i18n-34.0b10/bn-IN.xpi) = 497155 +SHA256 (xpi/firefox-i18n-34.0b10/br.xpi) = fed1cdc01ef6f3923e7ef03e14155d9750d7dda8831716e0d4abed7619bddfd6 +SIZE (xpi/firefox-i18n-34.0b10/br.xpi) = 420254 +SHA256 (xpi/firefox-i18n-34.0b10/bs.xpi) = 53a27242dcaffbeda95353e46d31a2719f46ad02d8af59840c5171ae31bd7fb7 +SIZE (xpi/firefox-i18n-34.0b10/bs.xpi) = 463645 +SHA256 (xpi/firefox-i18n-34.0b10/ca.xpi) = c8f9fa40d7d79852ac8c36523fc99915587d9597242466af09e5eee01ac5dded +SIZE (xpi/firefox-i18n-34.0b10/ca.xpi) = 435735 +SHA256 (xpi/firefox-i18n-34.0b10/cs.xpi) = 72895f393b5a7781d574fbed3ad19dc0be745ece3c622e96e9bd1eb77d3e83b7 +SIZE (xpi/firefox-i18n-34.0b10/cs.xpi) = 423673 +SHA256 (xpi/firefox-i18n-34.0b10/csb.xpi) = 6d123a093bc5f2396a04e6e7f418a237cbd56a6077c9d59ac31b2bec940a7179 +SIZE (xpi/firefox-i18n-34.0b10/csb.xpi) = 418915 +SHA256 (xpi/firefox-i18n-34.0b10/cy.xpi) = 84ba8bd01ce72e0e35f137602906c945194157c6612f3b65b3566eb743c3aa3b +SIZE (xpi/firefox-i18n-34.0b10/cy.xpi) = 422258 +SHA256 (xpi/firefox-i18n-34.0b10/da.xpi) = 94bf8361f562663cfb517423a1b4c2c3a2e31269da8c7c068ca7ca0d663c9a60 +SIZE (xpi/firefox-i18n-34.0b10/da.xpi) = 429042 +SHA256 (xpi/firefox-i18n-34.0b10/de.xpi) = 307322c85eda29b08afcebc1e52307a3e6944f06f9970236a2d63601be96affb +SIZE (xpi/firefox-i18n-34.0b10/de.xpi) = 432576 +SHA256 (xpi/firefox-i18n-34.0b10/dsb.xpi) = e55da2e5ab58fa4a2797b8f91d28920a945098975adeaa76f81df685c61c4f5c +SIZE (xpi/firefox-i18n-34.0b10/dsb.xpi) = 447867 +SHA256 (xpi/firefox-i18n-34.0b10/el.xpi) = b88ef75005e75e2057a9b817349b4c80faac780b6e428122bdb49a22fe636623 +SIZE (xpi/firefox-i18n-34.0b10/el.xpi) = 476947 +SHA256 (xpi/firefox-i18n-34.0b10/en-GB.xpi) = d0336c55438999c86cee4fda654cf1f0ff3781f20928ceb55fae4f72d8362092 +SIZE (xpi/firefox-i18n-34.0b10/en-GB.xpi) = 420842 +SHA256 (xpi/firefox-i18n-34.0b10/en-US.xpi) = 7d7171ff1cc811eddc7bddca4225f81efb26113ffc7c49dd948df23b5e9f51dd +SIZE (xpi/firefox-i18n-34.0b10/en-US.xpi) = 452978 +SHA256 (xpi/firefox-i18n-34.0b10/en-ZA.xpi) = 1f846c351de0c877368a9f5547972b2261e7a82edb0aff21cd96f33db487200c +SIZE (xpi/firefox-i18n-34.0b10/en-ZA.xpi) = 416913 +SHA256 (xpi/firefox-i18n-34.0b10/eo.xpi) = 4e9ea0cbb4288943822e686a97b5e086a1ba5333e21386726ea3a720da0a77ce +SIZE (xpi/firefox-i18n-34.0b10/eo.xpi) = 463427 +SHA256 (xpi/firefox-i18n-34.0b10/es-AR.xpi) = 3a4e79a0b36bd959b9bc51b2b5ce73a872b187f2aa353ce8ebd7d7ae226a2c08 +SIZE (xpi/firefox-i18n-34.0b10/es-AR.xpi) = 431673 +SHA256 (xpi/firefox-i18n-34.0b10/es-CL.xpi) = 797ff9703ff4984ba61f9f25abee9c11c456ac6f4c2d6671e7520981ede6f656 +SIZE (xpi/firefox-i18n-34.0b10/es-CL.xpi) = 372855 +SHA256 (xpi/firefox-i18n-34.0b10/es-ES.xpi) = d47f0bcb1484ae6d9ddf2e7256a41376488f835f88d08b2491dfea8903d8c736 +SIZE (xpi/firefox-i18n-34.0b10/es-ES.xpi) = 359672 +SHA256 (xpi/firefox-i18n-34.0b10/es-MX.xpi) = c8bbd04a5f02c5fe6999ceb76db49fdc388812b971cb73064b9551cefc1cf1a8 +SIZE (xpi/firefox-i18n-34.0b10/es-MX.xpi) = 434348 +SHA256 (xpi/firefox-i18n-34.0b10/et.xpi) = 3d0ed28ab675b72ca8760952d2618b94e62e91a24da11d6c450d0be44aefa274 +SIZE (xpi/firefox-i18n-34.0b10/et.xpi) = 421312 +SHA256 (xpi/firefox-i18n-34.0b10/eu.xpi) = bcc1bc299ee657a724d94b5fa989a7e9ad43a7985a1f98c12d226e1414bc512e +SIZE (xpi/firefox-i18n-34.0b10/eu.xpi) = 446720 +SHA256 (xpi/firefox-i18n-34.0b10/fa.xpi) = b55158d734eeb68155b06798d2ff67f5e0a727ed6ed20ae15791d45cd7fd60d1 +SIZE (xpi/firefox-i18n-34.0b10/fa.xpi) = 492985 +SHA256 (xpi/firefox-i18n-34.0b10/ff.xpi) = f90056c9cf560745bb763d683cacefa324d18aad06cb89e17e2468983938a4d9 +SIZE (xpi/firefox-i18n-34.0b10/ff.xpi) = 433364 +SHA256 (xpi/firefox-i18n-34.0b10/fi.xpi) = 2808a535a2ca35c07214219bec1b645476f0265df5308887d3757f67431e0099 +SIZE (xpi/firefox-i18n-34.0b10/fi.xpi) = 423339 +SHA256 (xpi/firefox-i18n-34.0b10/fr.xpi) = 92e861ac34bd3c66de0e5873823fbc163ee026047c6c605c0e27d308417b5c9f +SIZE (xpi/firefox-i18n-34.0b10/fr.xpi) = 438759 +SHA256 (xpi/firefox-i18n-34.0b10/fy-NL.xpi) = cb2c63142bfac2a48a1aded583603776e5daf46412bc2b1146c7ba128715df4a +SIZE (xpi/firefox-i18n-34.0b10/fy-NL.xpi) = 433361 +SHA256 (xpi/firefox-i18n-34.0b10/ga-IE.xpi) = e77914ae80cd783ccf57a42d150b621081749890814db2a808b81162a3008c46 +SIZE (xpi/firefox-i18n-34.0b10/ga-IE.xpi) = 441801 +SHA256 (xpi/firefox-i18n-34.0b10/gd.xpi) = 45508314dd698b671a893ac0fdea2fde431c67dd7fdf21ec48598c3e02d94217 +SIZE (xpi/firefox-i18n-34.0b10/gd.xpi) = 434127 +SHA256 (xpi/firefox-i18n-34.0b10/gl.xpi) = e8fc282fcfd6ef2cfbfe89d20c2e02109b201ff8ede9365c25edcadb70f01073 +SIZE (xpi/firefox-i18n-34.0b10/gl.xpi) = 423804 +SHA256 (xpi/firefox-i18n-34.0b10/gu-IN.xpi) = 6d60fe68ba21d7476965d4cb4af0eaa69b2539a8834bc13e125d3046a8279f0f +SIZE (xpi/firefox-i18n-34.0b10/gu-IN.xpi) = 454061 +SHA256 (xpi/firefox-i18n-34.0b10/he.xpi) = a0328fcfab79a28a965fd16d62d763729f0cd78189463ee6f8f3d322188d218f +SIZE (xpi/firefox-i18n-34.0b10/he.xpi) = 464091 +SHA256 (xpi/firefox-i18n-34.0b10/hi-IN.xpi) = 68238115d95793feeeeaef6882551ce6e4af643639de9069cc079b64f91dcf2e +SIZE (xpi/firefox-i18n-34.0b10/hi-IN.xpi) = 484184 +SHA256 (xpi/firefox-i18n-34.0b10/hr.xpi) = 50cce21a9040c1b704f8255a66de3b626a0078866d79676630a421bfa5b1b17a +SIZE (xpi/firefox-i18n-34.0b10/hr.xpi) = 456058 +SHA256 (xpi/firefox-i18n-34.0b10/hsb.xpi) = 4afd03411f1bc974e7edfa09387f1692327facb6d1b1044811f2cce878745692 +SIZE (xpi/firefox-i18n-34.0b10/hsb.xpi) = 445779 +SHA256 (xpi/firefox-i18n-34.0b10/hu.xpi) = 1751b8d252c750eef3751d833354522d114a018d34b1aadb55912d0187c35ca2 +SIZE (xpi/firefox-i18n-34.0b10/hu.xpi) = 430978 +SHA256 (xpi/firefox-i18n-34.0b10/hy-AM.xpi) = 6e3a978eb1d9d4a6201e41afd538ca87b900e0f43ceeb3e7f40d32457e190122 +SIZE (xpi/firefox-i18n-34.0b10/hy-AM.xpi) = 513387 +SHA256 (xpi/firefox-i18n-34.0b10/id.xpi) = 1385c5e9bdf0d6c582f592a22e10138492efef2ad02de667ac36b4387944a4f1 +SIZE (xpi/firefox-i18n-34.0b10/id.xpi) = 409465 +SHA256 (xpi/firefox-i18n-34.0b10/is.xpi) = 8e3817bcace9c3d41ec223f81203d36189cc9acfbdec58c42abaab78bea22670 +SIZE (xpi/firefox-i18n-34.0b10/is.xpi) = 463347 +SHA256 (xpi/firefox-i18n-34.0b10/it.xpi) = 7bebf3732ea1d0b6b3890daaf3c8a86fb1dc9259293ed0a6094a685eda04544b +SIZE (xpi/firefox-i18n-34.0b10/it.xpi) = 358422 +SHA256 (xpi/firefox-i18n-34.0b10/ja.xpi) = 2048a4151178060c3f458af2c7727edefff2225f2307ff787faa808f1646886b +SIZE (xpi/firefox-i18n-34.0b10/ja.xpi) = 454428 +SHA256 (xpi/firefox-i18n-34.0b10/kk.xpi) = 5976ff60bd805f91a18c23eaddf96a3ef90c119c76b4b828c7fcb1ea0cae01e1 +SIZE (xpi/firefox-i18n-34.0b10/kk.xpi) = 473067 +SHA256 (xpi/firefox-i18n-34.0b10/km.xpi) = 1710a0f5e90c359106ad65248b12bd6324f70ec9c8fc03e75b39240d3d4fbe81 +SIZE (xpi/firefox-i18n-34.0b10/km.xpi) = 542007 +SHA256 (xpi/firefox-i18n-34.0b10/kn.xpi) = a50ab1cbfbbc2a17fc6d44fa3a8b491be4523e94dc0a95620e350e3cfd00fe5e +SIZE (xpi/firefox-i18n-34.0b10/kn.xpi) = 507452 +SHA256 (xpi/firefox-i18n-34.0b10/ko.xpi) = e571e1e76c90cf4b9c676983ac73dc19ca988367d022aef130ae1681626dee2f +SIZE (xpi/firefox-i18n-34.0b10/ko.xpi) = 436734 +SHA256 (xpi/firefox-i18n-34.0b10/ku.xpi) = 407041d45d646f2777c2ec8e000051c2e4d5cdcf57f1828873ace4410b0ab086 +SIZE (xpi/firefox-i18n-34.0b10/ku.xpi) = 453902 +SHA256 (xpi/firefox-i18n-34.0b10/lij.xpi) = 9be674e641da382d538a52883fd060d8ef086abc15de8e33a438894786cba453 +SIZE (xpi/firefox-i18n-34.0b10/lij.xpi) = 421545 +SHA256 (xpi/firefox-i18n-34.0b10/lt.xpi) = a77517bcaf1691df51f468e82403fd4a2258a4a56d39dcf7cb09e258301e632d +SIZE (xpi/firefox-i18n-34.0b10/lt.xpi) = 463415 +SHA256 (xpi/firefox-i18n-34.0b10/lv.xpi) = 4eeb5edac89633c76c36cca39b29efe1bc7fc3685d9a6f19c87b105e22da07b6 +SIZE (xpi/firefox-i18n-34.0b10/lv.xpi) = 427423 +SHA256 (xpi/firefox-i18n-34.0b10/mai.xpi) = 40fe3f403515bc52e5a95c5cf6dbc8dc8ba4366848b5b03bf3877fcc8dcb3244 +SIZE (xpi/firefox-i18n-34.0b10/mai.xpi) = 477912 +SHA256 (xpi/firefox-i18n-34.0b10/mk.xpi) = 022a1afc2ac4a3400425d6259a084cca21edb631089fe00ddc49aaec7a1f435a +SIZE (xpi/firefox-i18n-34.0b10/mk.xpi) = 508395 +SHA256 (xpi/firefox-i18n-34.0b10/ml.xpi) = 417ed13b76717761cbc0e17e907c503480caa6b8b6f9b08291aa2276eba88069 +SIZE (xpi/firefox-i18n-34.0b10/ml.xpi) = 505957 +SHA256 (xpi/firefox-i18n-34.0b10/mr.xpi) = dfed70a2851e814ee22fa60969c0aae45f94d45b53aace837f92bf0fa6517d04 +SIZE (xpi/firefox-i18n-34.0b10/mr.xpi) = 486443 +SHA256 (xpi/firefox-i18n-34.0b10/ms.xpi) = c5c8283079df1fb98cf820631232b0249e5d1733f4618105bb2c16ae8eafcd80 +SIZE (xpi/firefox-i18n-34.0b10/ms.xpi) = 469273 +SHA256 (xpi/firefox-i18n-34.0b10/nb-NO.xpi) = 3eadeed63fea1b5b7c731cd563b72719195135a659f0e737f837d193de8f6586 +SIZE (xpi/firefox-i18n-34.0b10/nb-NO.xpi) = 422488 +SHA256 (xpi/firefox-i18n-34.0b10/nl.xpi) = b58ff071208af2695613be170edf6b702c9962a0a6bcdba42067fd9955f130ed +SIZE (xpi/firefox-i18n-34.0b10/nl.xpi) = 422195 +SHA256 (xpi/firefox-i18n-34.0b10/nn-NO.xpi) = 3db8814bb48cde11d55c0859b7b7f790cc463fd2a8e099e8a2df3edaf5041c77 +SIZE (xpi/firefox-i18n-34.0b10/nn-NO.xpi) = 417000 +SHA256 (xpi/firefox-i18n-34.0b10/or.xpi) = 2d8bb9ee9b61ac827cead515631eb35ea37b741123d6e431008207c3f7a9c9cb +SIZE (xpi/firefox-i18n-34.0b10/or.xpi) = 500144 +SHA256 (xpi/firefox-i18n-34.0b10/pa-IN.xpi) = 008a0bf04794062edf9ebc4f31cd94c4ccb91784456e9dab8933325f851015b4 +SIZE (xpi/firefox-i18n-34.0b10/pa-IN.xpi) = 472044 +SHA256 (xpi/firefox-i18n-34.0b10/pl.xpi) = fc5a1d6b80d06513e814a947d144d1bfa3eb0809a2b2ce2537319d36c299dd18 +SIZE (xpi/firefox-i18n-34.0b10/pl.xpi) = 400694 +SHA256 (xpi/firefox-i18n-34.0b10/pt-BR.xpi) = 370eee13406088a7d238ceb94232b861175be5d525e02eef82000926ec4ed66e +SIZE (xpi/firefox-i18n-34.0b10/pt-BR.xpi) = 441651 +SHA256 (xpi/firefox-i18n-34.0b10/pt-PT.xpi) = c48e9747c5ae0860fe0e8ab769b3b37130ea1f0fb9cbb1d95d0a8d0368ad0398 +SIZE (xpi/firefox-i18n-34.0b10/pt-PT.xpi) = 419633 +SHA256 (xpi/firefox-i18n-34.0b10/rm.xpi) = bd590a0716edc1130dbc286a8193c8b6b7e08269c47a02d717fe8bc5a30e7d58 +SIZE (xpi/firefox-i18n-34.0b10/rm.xpi) = 432438 +SHA256 (xpi/firefox-i18n-34.0b10/ro.xpi) = 4e45d7a1bc1e0403b8517e30b021eb1f21c6cbd75a97ffb9cf952a8b9221338b +SIZE (xpi/firefox-i18n-34.0b10/ro.xpi) = 474606 +SHA256 (xpi/firefox-i18n-34.0b10/ru.xpi) = 8eef9bdde67e4a29f94e6349c7a4dc9c0eeee22ae494eb7434ae098f4c54b506 +SIZE (xpi/firefox-i18n-34.0b10/ru.xpi) = 403078 +SHA256 (xpi/firefox-i18n-34.0b10/si.xpi) = 42b2bb1206028a02b471b3dd89a181129df0f2671151308e8d5f4c268e550293 +SIZE (xpi/firefox-i18n-34.0b10/si.xpi) = 506356 +SHA256 (xpi/firefox-i18n-34.0b10/sk.xpi) = 5c93e740be765b108289ec32afd2bc1221e52cd06b6db9fd6490338195877b79 +SIZE (xpi/firefox-i18n-34.0b10/sk.xpi) = 450988 +SHA256 (xpi/firefox-i18n-34.0b10/sl.xpi) = 47973e942ff3700a57a4792f4d8de5d2fa05a5606fa60dca885c3d1997c304c8 +SIZE (xpi/firefox-i18n-34.0b10/sl.xpi) = 423733 +SHA256 (xpi/firefox-i18n-34.0b10/son.xpi) = ed23fe0837cc74f90178b0a775ca0dd3f6a6dc03dddcfcab8fed8c134a6cb62e +SIZE (xpi/firefox-i18n-34.0b10/son.xpi) = 426262 +SHA256 (xpi/firefox-i18n-34.0b10/sq.xpi) = 3740108274d4cf7c4a6cc10d184250a2c24d75ddebf56219969e1b4a34390f15 +SIZE (xpi/firefox-i18n-34.0b10/sq.xpi) = 463522 +SHA256 (xpi/firefox-i18n-34.0b10/sr.xpi) = f93aebe3fafb6165b67cb2ea86a8864b62ecf7d2bd12eb21b82f886a1feaa086 +SIZE (xpi/firefox-i18n-34.0b10/sr.xpi) = 461639 +SHA256 (xpi/firefox-i18n-34.0b10/sv-SE.xpi) = e7dd9ef07c354180e33ff35467da93992fb23c2f2164fa0b8372c1b089957018 +SIZE (xpi/firefox-i18n-34.0b10/sv-SE.xpi) = 430446 +SHA256 (xpi/firefox-i18n-34.0b10/ta.xpi) = bf3abdda9ed2d74c870dea51a5ffb6a6f37b2953a01c8269bf14f52cebbaac1c +SIZE (xpi/firefox-i18n-34.0b10/ta.xpi) = 483044 +SHA256 (xpi/firefox-i18n-34.0b10/te.xpi) = 744b0fad8d735ea3fcd36e6b654f3b7a33557a37eea9eb77688ae34ab14269cf +SIZE (xpi/firefox-i18n-34.0b10/te.xpi) = 501658 +SHA256 (xpi/firefox-i18n-34.0b10/th.xpi) = 3d5ee9aa14aa69256188386203ca017ceb9b41a94800db549e48edd7ce177f20 +SIZE (xpi/firefox-i18n-34.0b10/th.xpi) = 511073 +SHA256 (xpi/firefox-i18n-34.0b10/tr.xpi) = 872f87ddef6cf77118876a595032ee1ed09fc0101b125a689863bacb0849f480 +SIZE (xpi/firefox-i18n-34.0b10/tr.xpi) = 459137 +SHA256 (xpi/firefox-i18n-34.0b10/uk.xpi) = c70ec67487dd2d70d485da49170f103083a0c08782088f11c135bafe6758a6be +SIZE (xpi/firefox-i18n-34.0b10/uk.xpi) = 459911 +SHA256 (xpi/firefox-i18n-34.0b10/vi.xpi) = 4d4d657c167bbf081a1517e0eb93350c51e0571068530bdac284b0f7d75a14ee +SIZE (xpi/firefox-i18n-34.0b10/vi.xpi) = 445862 +SHA256 (xpi/firefox-i18n-34.0b10/xh.xpi) = beab21d83923e52146bb10dc3d75b9263b3af81c7301a365ea8bc6ef08213ba4 +SIZE (xpi/firefox-i18n-34.0b10/xh.xpi) = 431722 +SHA256 (xpi/firefox-i18n-34.0b10/zh-CN.xpi) = 23697c0dcac07ec8c28eb07d80a6df8100a37c2df384253d409e2d8b884e0fc7 +SIZE (xpi/firefox-i18n-34.0b10/zh-CN.xpi) = 454265 +SHA256 (xpi/firefox-i18n-34.0b10/zh-TW.xpi) = b15bf6798af37a668357cabc46c662808580b062be9d2fce9d98c02f18384834 +SIZE (xpi/firefox-i18n-34.0b10/zh-TW.xpi) = 444702 Modified: trunk/www/firefox-nightly/Makefile.hgrev ============================================================================== --- trunk/www/firefox-nightly/Makefile.hgrev Wed Nov 19 01:27:24 2014 (r1763) +++ trunk/www/firefox-nightly/Makefile.hgrev Wed Nov 19 03:04:24 2014 (r1764) @@ -1 +1 @@ -HGREV= 214422:e06adcf04636 +HGREV= 216336:20065dfb6476 Modified: trunk/www/firefox-nightly/distinfo ============================================================================== --- trunk/www/firefox-nightly/distinfo Wed Nov 19 01:27:24 2014 (r1763) +++ trunk/www/firefox-nightly/distinfo Wed Nov 19 03:04:24 2014 (r1764) @@ -1,2 +1,2 @@ -SHA256 (firefox-nightly/e06adcf04636.tar.bz2) = 860a365109f4e27e0d1e88826128cac2be558ad6fd54d09b502d894e3375c27d -SIZE (firefox-nightly/e06adcf04636.tar.bz2) = 174521168 +SHA256 (firefox-nightly/20065dfb6476.tar.bz2) = 1ba878b151604490970897b1b387a937702fe596f424317f42d1f0a1488ce648 +SIZE (firefox-nightly/20065dfb6476.tar.bz2) = 174587296 Modified: trunk/www/firefox-nightly/files/patch-bug1013882 ============================================================================== --- trunk/www/firefox-nightly/files/patch-bug1013882 Wed Nov 19 01:27:24 2014 (r1763) +++ trunk/www/firefox-nightly/files/patch-bug1013882 Wed Nov 19 03:04:24 2014 (r1764) @@ -30,14 +30,14 @@ index b509fd4..195345c 100644 --- browser/installer/package-manifest.in +++ browser/installer/package-manifest.in -@@ -583,7 +583,7 @@ - @BINPATH@/components/MozKeyboard.js - @BINPATH@/components/InputMethod.manifest +@@ -608,7 +608,7 @@ + @RESPATH@/components/MozKeyboard.js + @RESPATH@/components/InputMethod.manifest -#ifdef MOZ_DEBUG +#if defined(ENABLE_TESTS) && defined(MOZ_DEBUG) - @BINPATH@/components/TestInterfaceJS.js - @BINPATH@/components/TestInterfaceJS.manifest + @RESPATH@/components/TestInterfaceJS.js + @RESPATH@/components/TestInterfaceJS.manifest #endif diff --git mobile/android/installer/Makefile.in mobile/android/installer/Makefile.in index 96dceab..3528ad6 100644 Modified: trunk/www/firefox-nightly/files/patch-ijg-libjpeg ============================================================================== --- trunk/www/firefox-nightly/files/patch-ijg-libjpeg Wed Nov 19 01:27:24 2014 (r1763) +++ trunk/www/firefox-nightly/files/patch-ijg-libjpeg Wed Nov 19 03:04:24 2014 (r1764) @@ -51,26 +51,26 @@ static void cmyk_convert_rgb(JSAMPROW row, JDIMENSION width); -@@ -324,6 +340,7 @@ nsJPEGDecoder::WriteInternal(const char *aBuffer, uint32_t aCount) - case JCS_GRAYSCALE: - case JCS_RGB: - case JCS_YCbCr: +@@ -367,6 +382,7 @@ nsJPEGDecoder::WriteInternal(const char* + case JCS_GRAYSCALE: + case JCS_RGB: + case JCS_YCbCr: +#ifdef JCS_EXTENSIONS - // if we're not color managing we can decode directly to - // MOZ_JCS_EXT_NATIVE_ENDIAN_XRGB - if (mCMSMode != eCMSMode_All) { -@@ -332,6 +349,9 @@ nsJPEGDecoder::WriteInternal(const char *aBuffer, uint32_t aCount) - } else { - mInfo.out_color_space = JCS_RGB; - } + // if we're not color managing we can decode directly to + // MOZ_JCS_EXT_NATIVE_ENDIAN_XRGB + if (mCMSMode != eCMSMode_All) { +@@ -375,6 +391,9 @@ nsJPEGDecoder::WriteInternal(const char* + } else { + mInfo.out_color_space = JCS_RGB; + } +#else -+ mInfo.out_color_space = JCS_RGB; ++ mInfo.out_color_space = JCS_RGB; +#endif - break; - case JCS_CMYK: - case JCS_YCCK: -@@ -399,6 +419,15 @@ nsJPEGDecoder::WriteInternal(const char *aBuffer, uint32_t aCount) - return; /* I/O suspension */ + break; + case JCS_CMYK: + case JCS_YCCK: +@@ -433,6 +452,15 @@ nsJPEGDecoder::WriteInternal(const char* + return; // I/O suspension } +#ifndef JCS_EXTENSIONS @@ -83,10 +83,10 @@ + } +#endif - /* If this is a progressive JPEG ... */ - mState = mInfo.buffered_image ? JPEG_DECOMPRESS_PROGRESSIVE : JPEG_DECOMPRESS_SEQUENTIAL; -@@ -544,7 +573,11 @@ nsJPEGDecoder::OutputScanlines(bool* suspend) - uint32_t *imageRow = ((uint32_t*)mImageData) + + // If this is a progressive JPEG ... + mState = mInfo.buffered_image ? +@@ -605,7 +633,11 @@ nsJPEGDecoder::OutputScanlines(bool* sus + uint32_t* imageRow = ((uint32_t*)mImageData) + (mInfo.output_scanline * mInfo.output_width); +#ifdef JCS_EXTENSIONS @@ -94,10 +94,10 @@ +#else + if (mInfo.cconvert->color_convert == ycc_rgb_convert_argb) { +#endif - /* Special case: scanline will be directly converted into packed ARGB */ + // Special case: scanline will be directly converted into packed ARGB if (jpeg_read_scanlines(&mInfo, (JSAMPARRAY)&imageRow, 1) != 1) { - *suspend = true; /* suspend */ -@@ -854,6 +887,282 @@ term_source (j_decompress_ptr jd) + *suspend = true; // suspend +@@ -920,6 +952,282 @@ term_source (j_decompress_ptr jd) } // namespace mozilla @@ -377,6 +377,6 @@ +#endif + + - /**************** Inverted CMYK -> RGB conversion **************/ - /* - * Input is (Inverted) CMYK stored as 4 bytes per pixel. + ///*************** Inverted CMYK -> RGB conversion ************************* + /// Input is (Inverted) CMYK stored as 4 bytes per pixel. + /// Output is RGB stored as 3 bytes per pixel. Modified: trunk/www/firefox-nightly/files/patch-z-bug517422 ============================================================================== --- trunk/www/firefox-nightly/files/patch-z-bug517422 Wed Nov 19 01:27:24 2014 (r1763) +++ trunk/www/firefox-nightly/files/patch-z-bug517422 Wed Nov 19 03:04:24 2014 (r1764) @@ -382,9 +382,9 @@ index 14265b1..3069e99 100644 --- media/libtheora/moz.build +++ media/libtheora/moz.build -@@ -6,3 +6,5 @@ - - DIRS += ['include', 'lib'] +@@ -93,3 +93,5 @@ if CONFIG['GNU_AS']: + if CONFIG['OS_TARGET'] == 'Android': + DEFINES['__linux__'] = True +if CONFIG['MOZ_NATIVE_OGG']: + CFLAGS += CONFIG['MOZ_OGG_CFLAGS'] Modified: trunk/www/firefox/Makefile ============================================================================== --- trunk/www/firefox/Makefile Wed Nov 19 01:27:24 2014 (r1763) +++ trunk/www/firefox/Makefile Wed Nov 19 03:04:24 2014 (r1764) @@ -2,7 +2,7 @@ # $FreeBSD: head/www/firefox/Makefile 370932 2014-10-15 15:48:16Z beat $ PORTNAME= firefox -DISTVERSION= 34.0b7 +DISTVERSION= 34.0b10 DISTVERSIONSUFFIX=.source PORTEPOCH= 1 CATEGORIES= www ipv6 Modified: trunk/www/firefox/distinfo ============================================================================== --- trunk/www/firefox/distinfo Wed Nov 19 01:27:24 2014 (r1763) +++ trunk/www/firefox/distinfo Wed Nov 19 03:04:24 2014 (r1764) @@ -1,2 +1,2 @@ -SHA256 (firefox-34.0b7.source.tar.bz2) = e6f606f16fe831457f08c2114f145db2105a93e5c427bc7f9b813b7f409dd5c9 -SIZE (firefox-34.0b7.source.tar.bz2) = 164178141 +SHA256 (firefox-34.0b10.source.tar.bz2) = 28efbed49c0c552ff01f9d35191db30ea0daab369608a11084b019b7e4a48dfa +SIZE (firefox-34.0b10.source.tar.bz2) = 164370425 Deleted: trunk/www/firefox/files/patch-bug1061736 ============================================================================== --- trunk/www/firefox/files/patch-bug1061736 Wed Nov 19 03:04:24 2014 (r1763) +++ /dev/null 00:00:00 1970 (deleted) @@ -1,50 +0,0 @@ -commit a7add79 -Author: Gavin Sharp -Date: Mon Oct 27 18:43:51 2014 -0700 - - Bug 1061736: add DuckDuckGo as a search engine option in Firefox. r=dolske ---- - browser/locales/Makefile.in | 2 +- - browser/locales/en-US/searchplugins/ddg.xml | 21 +++++++++++++++++++++ - 2 files changed, 22 insertions(+), 1 deletion(-) - -diff --git browser/locales/Makefile.in browser/locales/Makefile.in -index eb3c30b..b172876 100644 ---- browser/locales/Makefile.in -+++ browser/locales/Makefile.in -@@ -71,7 +71,7 @@ endif - ifeq ($(MOZ_WIDGET_TOOLKIT) $(DIST_SUBDIR),windows metro) - SEARCHPLUGINS_NAMES = $(shell cat $(call MERGE_FILE,/searchplugins/metrolist.txt)) - else --SEARCHPLUGINS_NAMES = $(shell cat $(call MERGE_FILE,/searchplugins/list.txt)) -+SEARCHPLUGINS_NAMES = $(shell cat $(call MERGE_FILE,/searchplugins/list.txt)) ddg - endif - SEARCHPLUGINS_PATH := $(FINAL_TARGET)/searchplugins - SEARCHPLUGINS := $(addsuffix .xml,$(SEARCHPLUGINS_NAMES)) -diff --git browser/locales/en-US/searchplugins/ddg.xml browser/locales/en-US/searchplugins/ddg.xml -new file mode 100644 -index 0000000..d68deb4 ---- /dev/null -+++ browser/locales/en-US/searchplugins/ddg.xml -@@ -0,0 +1,21 @@ -+ -+ -+ DuckDuckGo -+ Search DuckDuckGo -+ UTF-8 -+ data:image/icon;base64,AAABAAIAEBAAAAEAIABoBAAAJgAAACAgAAABACAAqBAAAI4EAAAoAAAAEAAAACAAAAABACAAAAAAAAAEAAATCwAAEwsAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA11RgALs6oACbQ9wAj0v8AI9L/ACfQ9wAu0agANdUYAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAzzN4CNdL/oK/z//////////////////////+jsPv/BDXX/wAz0t4AAAAAAAAAAAAAAAAAAAAAAAAAAAAyzvNSduD//////8jK/v+P+Lf/IbQL/17RPP+J3Y//wOKX//////9YeuX/ADLO8wAAAAAAAAAAAAAAAAAw091piOX/8/X9/1Fx5P9xhu//WOWZ/0W9Lv9Lwjn/J8BB/xyDAP9bdfL/9fP//2mI5v8AMNPdAAAAAAc610YRQ9f//////0Zr4P8AGdD/sb32////////////wrv//wAh1/8MPab/ACPc/05r4///////EkPX/wc610YANtWkrr/y/6S48P8AJ9L/AB3R/+/w/v///////////3+D7f8AQeL/AYTw/wFr5/8AMNb/p7Tv/6698v8AM9WkADLW//////8yXt//AC3V/wAw1/////////////z///8A0P7/AKb1/wWI7P8AuPf/AJ3w/zZW3P//////ADHV/wAx2P//////AzrZ/wAu1/84ZOL////////////e////AND//wC1+f8Atff/AZbv/wY62f8ELNf//////wAw1/8AMtn//////wAw2f8ALNn/kKrz////+//cwbH////////////R////Rcb8/wDO/f8A/P//AHzo//////8AMNj/ADXa//////8vXuL/ACna/4yq9///79T/jUkg/9i+r///////r2Q0/7Cozv8B! Kdr/AirY/zdZ4P//////ADTa/wI72tOuv/T/prr0/wAl2v+JqPb//7yW/+bUxv/9+/n////u//W+n/+Op/L/ADPd/wAv2v+ru/T/r7/0/wI72tMLQd1DEEjg//////9Cbef/ADng///////////////////////R3///AC3g/wAy3v9SeOn//////xFI4P8LQd1DAAAAAAM64PNmiuz/9/j//2mN7f/m7P3///////////9Cb+n/ACXd/wAt3v9rju3//////2iL7P8DOuDzAAAAAAAAAAAAAAAAAT3g/0p16f//////3OT8/3OS7v8AKt3/ACPc/zhn5/+xw/b//////0956v8CPeD/AAAAAAAAAAAAAAAAAAAAAAAAAAAEPODzBUDh/5uz8//7/f7/////////////////prz0/wtF4v8FQeDzAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAtF5kYDQOOkADrj/wA44v8AOeP/ADzk/wVB46QPReZGAAAAAAAAAAAAAAAAAAAAAPAPAADgBwAAwAMAAIABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAIABAADAAwAA4AcAAPAPAAAoAAAAIAAAAEAAAAABACAAAAAAAAAQAAATCwAAEwsAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAChIzyAnRNFwJ0TQryND0d8nRNH/J0TR/ydE0f8nRNH/I0PR3ydE0K8nRNFwKEjPIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAChE00AlRdK/J0XS/ydF0v8nRdL/XXPd/11z3f94i+P/k6Lp/5Oi6f9rf+D/NVDV/ydF0v8nRdL/JUXSvyhE00AAAAAAAAAAAAAA! AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAC! BAzxAnRNOvJ0XT/ydF0/8lRdK/KEXSYOvu+6/+/v6//v7+v/39/c////////////7+/r/J0fOAKEXSYCVF0r8nRdP/J0XT/ydE068gQM8QAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAlRdUwJ0bT7ydG0/8nRtHPKETTQAAAAADHx8dA2vHhn5TYpN/o9+z/////////////////8PL83ydG0o8lRdUwAAAAAChE00AnRtHPJ0bT/ydG0+8lRdUwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAKEXVYCdG1P8nRtT/KEbTgAAAAAAmRtZQI0PU38jIyP/F6s//Rrtk/0a7ZP9/yIr/c796/4vLkv+JpNf/M3Kq/zyWh/8zeKTfJkbWUAAAAAAoRtOAJ0bU/ydG1P8oRdVgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACVF1TAnR9X/J0fV/yhF1WAgQM8QJ0fTrydH1f9CW8//2tra/6Pdsv9Gu2T/Rrtk/0WzWv9Gu2T/Rrtk/0a7ZP9Gu2T/Rrtk/z6egP8nR9X/J0fTryBAzxAoRdVgJ0fV/ydH1f8lRdUwAAAAAAAAAAAAAAAAAAAAAAAAAAAgQM8QJ0fV7ydH1f8oSNVgIEDPECdH1c8nR9X/J0fV/1xwyf/t7e3/o92y/0a7ZP9Gu2T/Ra5U/0a7ZP9Gu2T/Rrtk/0a7ZP9Gu2T/Pp6A/ydH1f8nR9X/J0fVzyBAzxAoSNVgJ0fV/ydH1e8gQM8QAAAAAAAAAAAAAAAAAAAAACdH1q8nR9b/KEjVgCBQzxAnR9bPJ0fW/ydH1v8nR9b/gIzB//r6+v+j3bL/Rrtk/13Ed/+i26//ruG7/z6egf8+noH/Rrtk/0a7ZP86kI//J0fW/ydH1v8nR9b/J0fWzyBQzxAoSNWAJ0fW/ydH1q8AAAAAAA! AAAAAAAAAoSNdAJkjW/yZH1s8AAAAAJEfWryZI1v8mSNb/JkjW/yZI1v+jqsT//////+j37P/R7tj////////////W3ff/JkjW/yZI1v8uZbr/PJeI/zJzrP8mSNb/JkjW/yZI1v8mSNb/JEfWrwAAAAAmR9bPJkjW/yhI10AAAAAAAAAAACVI1r8mSNf/KEjXQCZJ1lAmSNf/JkjX/yZI1/8mSNf/JkjX/9HR0f///////////////////////////5Ok6/8mSNf/JkjX/yZI1/8mSNf/JkjX/yZI1/8mSNf/JkjX/yZI1/8mSNf/JknWUChI10AmSNf/JUjWvwAAAAAoSNcgJknY/yZH2M8AAAAAI0nY3yZJ2P8mSdj/JknY/yZJ2P9KZM//39/f////////////////////////////XHfi/yZJ2P8mSdj/JknY/yZJ2P8mSdj/JknY/yZJ2P8mSdj/JknY/yZJ2P8jSdjfAAAAACZH2M8mSdj/KEjXICdJ2HAmSdj/JUjXYCVK2jAmSdj/JknY/yZJ2P8mSdj/JknY/2V4yf/t7e3///////////////////////////9cd+L/HXTj/xSf7/8Nwfj/CdL8/wnS/P8J0vz/ELDz/xt85v8mSdj/JknY/yZJ2P8lStowJUjXYCZJ2P8nSdhwJErZryZK2f8oSNcgJUnajyZK2f8mStn/JkrZ/yZK2f8mStn/iJPA////////////////////////////0ff+/xjV/P8J0vz/Drn1/xiO6/8Yjuv/GI7r/xCw8/8Lyvr/CdL8/xmF6P8mStn/JkrZ/yVJ2o8oSNcgJkrZ/yRK2a8jStrfI0rZ3wAAAAAlSdq/Jkra/yZK2v8mStr/Jkra/yZK2v+xtsf///////////////////////////8o2Pz/CdL8/wvK+v8mStr/Jkra/yZK2v8mStr/Jkra/yZK2v8iW9! 7/Jkra/yZK2v8mStr/JUnavwAAAAAjStnfI0ra3yZK2v8lSdq/AAAAACZH2O8mStr/Jkra/! yZK2v8mStr/L1HY/9HR0f///////////////////////////yjY/P8J0vz/CdL8/xCw9P8QsPT/ELD0/xSf7/8ddeX/Jkra/yZK2v8mStr/Jkra/yZK2v8mR9jvAAAAACVJ2r8mStr/Jkvb/yVJ2r8AAAAAJkvb/yZL2/8mS9v/Jkvb/yZL2/9KZtL/4+Pj////////////////////////////4Pn//0fd/f8J0vz/CdL8/wnS/P8J0vz/CdL8/wnS/P8Lyvr/Fpfu/yJc3/8mS9v/Jkvb/yZL2/8AAAAAJUnavyZL2/8mS9z/JUncvwAAAAAmS9z/Jkvc/yZL3P8mS9z/Jkvc/26AyP/x8fH//////////////////////////////////////9H3/v/C9P7/o+7+/2fa+/8Oufb/CdL8/wnS/P8J0vz/CdL8/xiP7P8mS9z/Jkvc/wAAAAAlSdy/Jkvc/yZM3P8lTNy/AAAAACZJ2e8mTNz/Jkzc/yZM3P8mTNz/iJTB////////////qnth/5VaOf/x6eX///////////////////////Hp5f/x6eX/ydL2/yZM3P8kVN7/G37o/xKo8v8QsfT/HXbm/yZM3P8mSdnvAAAAACVM3L8mTNz/I0vc3yZJ2u8AAAAAJUzevyZM3f8mTN3/Jkzd/yZM3f+fqc3///////////+VWjn/v5yI/+re1///////////////////////jk8s/7iRe//J0vb/Jkzd/yZM3f8mTN3/Jkzd/yZM3f8mTN3/Jkzd/yVM3r8AAAAAI0vc3yNL3N8kTd2vJk3d/yhQ3yAlTd2PJk3d/yZN3f8mTd3/Jk3d/6St0v////////////Hp5f/q3tf///////////////////////////+xhm7/49PK/6Cx8P8mTd3/Jk3d/yZN3f8mTd3/Jk3d/yZN3f8mTd3/JU3djyhQ3yAmTd3/J! E3drydN33AmTd7/J03fcCVK3zAmTd7/Jk3e/yZN3v8mTd7/pK7S///////Sp5r/////////////////////////////////////////////////T27k/yZN3v8mTd7/Jk3e/yZN3v8mTd7/Jk3e/yZN3v8lSt8wJ03fcCZN3v8nTd9wKFDfICZO3/8mTt3PAAAAACVN3r8mTt//Jk7f/yZO3/+EltX//////+fRyv/SqaD/59LO///////////////////////at63/vIBy/7Glxf8mTt//Jk7f/yZO3/8mTt//Jk7f/yZO3/8mTt//JU3evwAAAAAmTt3PJk7f/yhQ3yAAAAAAJE/dryZO3/8oUN9AKFDfQCZO3/8mTt//Jk7f/zhb2v/o6/T/////////////////////////////////////////////////XHrn/yZO3/8mTt//Jk7f/yZO3/8mTt//Jk7f/yZO3/8oUN9AKFDfQCZO3/8kT92vAAAAAAAAAAAoUN9AJk7g/yZO4M8AAAAAJk/hnyZO4P8mTuD/Jk7g/05v5v/k6fv//////////////////////////////////////3eR7P8mTuD/Jk7g/yZO4P8mTuD/Jk7g/yZO4P8mTuD/Jk/hnwAAAAAmTuDPJk7g/yhQ30AAAAAAAAAAAAAAAAAjT+GfJU/h/yVO4Y8gUN8QIk7gzyVP4f8lT+H/SWnW/0lp1v+bq+H/8fHx/////////////////6Cy8v9OcOb/JU/h/yVP4f8lT+H/JU/h/yVP4f8lT+H/JU/h/yJO4M8gUN8QJU7hjyVP4f8jT+GfAAAAAAAAAAAAAAAAAAAAACBQ3xAlTOHvJU/h/yVQ4mAgUN8QIk7hzyVP4f+ktOv///////////////////////H0/f9phur/JU/h/yVP4f8lT+H/JU/h/yVP4f8lT+H/JU/h/yVP4f8iT! uHPIFDfECVQ4mAlT+H/JUzh7yBQ3xAAAAAAAAAAAAAAAAAAAAAAAAAAACVQ3zAlUOLvJVDi! /yVQ4mAgUN8QI1Din4mb2//J0/j/ydP4/6299P93ku3/M1vk/yVQ4v8lUOL/JVDi/yVQ4v8lUOL/JVDi/yVQ4v8lUOL/I1DinyBQ3xAlUOJgJVDi/yVQ4u8lUN8wAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACVQ5DAlUOLvJVDi/yVQ4o8AAAAAJFDjQCVQ4r8lUOL/JVDi/yVQ4v8lUOL/JVDi/yVQ4v8lUOL/JVDi/yVQ4v8lUOL/JVDivyRQ40AAAAAAJVDijyVQ4v8lUOLvJVDkMAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACVQ5DAjUeTfJVHj/yNR5N8kUONAAAAAACVQ5DAmUuOAJVHivyNR5N8lUeP/JVHj/yNR5N8lUeK/JlLjgCVQ5DAAAAAAJFDjQCNR5N8lUeP/I1Hk3yVQ5DAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACBQ3xAjUuSfJVHk/yVR5P8jUeTfJFLkcChQ5yAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAoUOcgJFLkcCNR5N8lUeT/JVHk/yNS5J8gUN8QAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAkUONAI1LknyVS5P8lUuT/JVLk/yVS5O8lUeS/JVHkvyVR5L8lUeS/JVLk7yVS5P8lUuT/JVLk/yRS468kUONAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAIFDfECVS5GAjUuWfIlPlzyVS5f8lUuX/JVLl/yVS5f8iU+XPI1LlnyVS5GAgUN8QAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA! AAAAAP/AA///AAD//AAAP/ggBB/wgAEP4AAAB8AAAAPAAAADiAAAEYAAAAEQAAAIAAAAAAAAAAAgAAAEIAAABCAAAAQgAAAEIAAABCAAAAQAAAAAAAAAABAAAAiAAAABiAAAEcAAAAPAAAAD4AAAB/CAAQ/4IAQf/AfgP/8AAP//wAP/ -+ data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAEEAAAAaCAYAAADovjFxAAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAA2hpVFh0WE1MOmNvbS5hZG9iZS54bXAAAAAAADw/eHBhY2tldCBiZWdpbj0i77u/IiBpZD0iVzVNME1wQ2VoaUh6cmVTek5UY3prYzlkIj8+IDx4OnhtcG1ldGEgeG1sbnM6eD0iYWRvYmU6bnM6bWV0YS8iIHg6eG1wdGs9IkFkb2JlIFhNUCBDb3JlIDUuMy1jMDExIDY2LjE0NTY2MSwgMjAxMi8wMi8wNi0xNDo1NjoyNyAgICAgICAgIj4gPHJkZjpSREYgeG1sbnM6cmRmPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5LzAyLzIyLXJkZi1zeW50YXgtbnMjIj4gPHJkZjpEZXNjcmlwdGlvbiByZGY6YWJvdXQ9IiIgeG1sbnM6eG1wTU09Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9tbS8iIHhtbG5zOnN0UmVmPSJodHRwOi8vbnMuYWRvYmUuY29tL3hhcC8xLjAvc1R5cGUvUmVzb3VyY2VSZWYjIiB4bWxuczp4bXA9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC8iIHhtcE1NOk9yaWdpbmFsRG9jdW1lbnRJRD0ieG1wLmRpZDoxNTg5QTM3RjNCMjA2ODExODIyQUVEOUNBRDIxQzhDMyIgeG1wTU06RG9jdW1lbnRJRD0ieG1wLmRpZDoxRTYyNzYzMzFBQUUxMUU0ODc3NTg3NjMyNDFCNzExQSIgeG1wTU06SW5zdGFuY2VJRD0ieG1wLmlpZDoxRTYyNzYzMjFBQUUxMUU0ODc3NTg3NjMyNDFCNzExQSIgeG1wO! kNyZWF0b3JUb29sPSJBZG9iZSBQaG90b3Nob3AgQ1M2IChNYWNpbnRvc2gpIj4gPHhtcE1NOkRlcml2ZWRGcm9tIHN0UmVmOmluc3RhbmNlSUQ9InhtcC5paWQ6MDE4MDExNzQwNzIwNjgxMTg3MUZCQUIxMEI4RjU1NzYiIHN0UmVmOmRvY3VtZW50SUQ9InhtcC5kaWQ6MTU4OUEzN0YzQjIwNjgxMTgyMkFFRDlDQUQyMUM4QzMiLz4gPC9yZGY6RGVzY3JpcHRpb24+IDwvcmRmOlJERj4gPC94OnhtcG1ldGE+IDw/eHBhY2tldCBlbmQ9InIiPz7hxyCFAAAF4UlEQVR42tSZa2wUVRTH/3dmp92+tnRpCiUgxFoKCDQplsRIfZSgCEHSapBGBCURQvCLWkkQg9GYGNDwTYlGUCMoCA2EtEpEq1KjRJCA9EEElba2FajbN213d+b6vzOzZZfi99mb/DJ3d/aczD33vO6skFLCq6O9YubYXChE4n1+LublaVJO5hLDvRUhjaSefMolno+XU0uOX7WG5BxLSBsXc448Qo6SFWSuywr3O3XvnPqtK3PbkWxGUL5whHzN7WyAZeWQRZBWFz+v4v6+w3sKztFFFpEc0mDLOLJinNIkCocMXppJLhdcCssMw4zu5fOX2XGi6RAa91Rot8aNMsB6kkJOk24yh6seSjZPEHzoZmlfZaaU1pqR/Dsv+XfVlQXf/QbZ67dBz5sKKzxK20TpGBbU5qrtJWXkEllDMqWrK94jPG0ESzpwPTUkl8yQFvZL09oaLlqIG1LDQFoA6Y9vxJQ9Dch+bjus4WEaIwxpmjSGdJKgw1ay39bh6KqJ6U8GTyjnc1aQheQ1UqV2Of3LPTBPfI40RkVsEdmVGzClphmZy9bAitAQlhnvEbBlHR1KV4VbVbydE66sLFI+e8mN5e1Qc7o6IqMIr3sVhVUb/le2e1c1Bk8cgvAxFWjj9rqQv! A7HGIVeN4LqA1SJm0iOci/LQDc3aZrg4RZkpBgYHY4iK8OXIHetz4RPi6K/ao4! b9PrtkuVKElL9hafDgfuzjrQQk5QxH9hxPphfgAy/gYHByDgDqJGXrSOYlYrAo1WQUTc32LJj+aHM1dlEnvK2EYClpIasiotrmL5URE2JiQEDuw+ewunGjgS5hrNtWLp5P/QHKhk9lh1BDuKmIYAnyWGyxNuJUWI2+ZncG5/djKF+DA45ZX7Hh9/j2HdNCWKzC/JRsXg+sgrmQ4aFjS/LQvqsYejpqiTYepTOn8g8n8c9QQ21zdPiDxD+620IhULIC2TiYl01/CmJy8jNNrCxMh/hjiMIVvYioziK1BlRQJcIHc1B6KscqpLTXN2pPo/nhNjwxR2jIFgdBtouAzPuSDSAZLPUXgX0HYFgLjRIcLnO3sFAb33AJnLdYFNp9w/6Lco97Qm57o7dbKC5wpHffgHuL09srjo22AYY/tOPoQsBiFRgtJ3zljQqo/HoCfbSnULR6eq2vJ4TWskCcnYsJ9hGYIz/1YQR65bTYOARe5FW2EDfqQD+rQ1iqDkN/qlhTHhwAJnFQ6oxiuUWpfMe0uzpPuH3ZUV7eZlFVpPWsRjh+WA4OAV579UiPzghQaajuhgZc1qRWTIKnQ4g0i27N77RlI5rXwQR/seI9cnTyWfkvNfDYR8v35K/iSoBd8eSY8r1doR6escZYfRqLvrPDEDsM+ALWNADJiLdBttoYXuJEPamK13t5D6y1evNUj3pJzvIJqfRYV5XyZGFf/CPlnEy6UXzoLEZYDqEHBCIdBpsmFSsODEgHb1K105Xd4PnD1B86M2kmjSSA/Yi6AlSaBhtPG3/5mTXcTT3nLPnwYcq4KP7X52cgvc3TcWvpQFVDu1UIoWt74CrS+nc7P3qIO00rkLiBfcQdReZCamVqAqRcuUiolzJDx11aO4+gxxjOnqtbmhvzITO+6Yh0DthhF4jYmeHs4Q1FJfd+T6ZLC9VpHOcnk7qyQJSqzzB39WKnr5h+HhS1DUfOvs64RNRVgATlnD! awoghYoWl1pWtd3WVJ0WfEDf6pGqhnTdCTGqihCw3urt2h0LdecH0ydB1Aw8XLkfPjRGUTixB4JUtuDDXj0nXokMmsJbyddJJiOoYPZuO0ZdsRlDjsnTa5x/JCDTxEnPfpIH6Y28uXvHYttUFzyNb1cTY+4TyC8ezD37wltT1k5YmXmRkjbhhMI2BcTVpXrS2LJ011jmO/VfgPO7L/GKnfSQ0zU+EaR2SlnWGN53FaRpdw1cKTX+Cxlrr5oMt5G2713Kq7NhLxmQ1gpPvpXyWs2f4oSz+oHHznxrRwOvHnHwkYpK3McJ/AgwADmrfhvtTyFYAAAAASUVORK5CYII= -+ data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAIIAAAA0CAYAAABGkOCVAAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAA2hpVFh0WE1MOmNvbS5hZG9iZS54bXAAAAAAADw/eHBhY2tldCBiZWdpbj0i77u/IiBpZD0iVzVNME1wQ2VoaUh6cmVTek5UY3prYzlkIj8+IDx4OnhtcG1ldGEgeG1sbnM6eD0iYWRvYmU6bnM6bWV0YS8iIHg6eG1wdGs9IkFkb2JlIFhNUCBDb3JlIDUuMy1jMDExIDY2LjE0NTY2MSwgMjAxMi8wMi8wNi0xNDo1NjoyNyAgICAgICAgIj4gPHJkZjpSREYgeG1sbnM6cmRmPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5LzAyLzIyLXJkZi1zeW50YXgtbnMjIj4gPHJkZjpEZXNjcmlwdGlvbiByZGY6YWJvdXQ9IiIgeG1sbnM6eG1wTU09Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9tbS8iIHhtbG5zOnN0UmVmPSJodHRwOi8vbnMuYWRvYmUuY29tL3hhcC8xLjAvc1R5cGUvUmVzb3VyY2VSZWYjIiB4bWxuczp4bXA9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC8iIHhtcE1NOk9yaWdpbmFsRG9jdW1lbnRJRD0ieG1wLmRpZDoxNTg5QTM3RjNCMjA2ODExODIyQUVEOUNBRDIxQzhDMyIgeG1wTU06RG9jdW1lbnRJRD0ieG1wLmRpZDo4RTdBNDY4ODFBQUQxMUU0ODc3NTg3NjMyNDFCNzExQSIgeG1wTU06SW5zdGFuY2VJRD0ieG1wLmlpZDo4RTdBNDY4NzFBQUQxMUU0ODc3NTg3NjMyNDFCNzExQSIgeG1w! OkNyZWF0b3JUb29sPSJBZG9iZSBQaG90b3Nob3AgQ1M2IChNYWNpbnRvc2gpIj4gPHhtcE1NOkRlcml2ZWRGcm9tIHN0UmVmOmluc3RhbmNlSUQ9InhtcC5paWQ6OTE3MzgzQ0I2QjIwNjgxMTgyMkFFRDlDQUQyMUM4QzMiIHN0UmVmOmRvY3VtZW50SUQ9InhtcC5kaWQ6MTU4OUEzN0YzQjIwNjgxMTgyMkFFRDlDQUQyMUM4QzMiLz4gPC9yZGY6RGVzY3JpcHRpb24+IDwvcmRmOlJERj4gPC94OnhtcG1ldGE+IDw/eHBhY2tldCBlbmQ9InIiPz7NVVBAAAAO30lEQVR42uxdCXRU1Rn+3nszk5nJhmEJAYKyJJJAWFyqUqwWwaJi0aKA9bh0USwunEo9UGmrHG0Vj3LUUoEqFQGXciqgiFCoVtsKeBAJS9JWtrAmIUxmkpnJJDNv6X/fu5O8mUwmkwkoPef9Od/cN/ct9593v/vf//73vhdB0zRY0nU5dktxuzxBMG3zD6GD84XYHYMI1xMuJZQQ2MWzCS6+P0TwE74i/Juwi7CFcCR6gY6qUeMf5t2JjhUsInxjRBhJyUOEewn2NNWIEFYQFlM17rWI8P9FhJsILxGGdHDpOsJ+wmlCA8/LJfQhjCD07uC8Q4TZhI3pEMFmVenXJqMJ7xIGx+UfJawivEf4IsVrXUaYQriLcCHPY8T6gHCYMJVQ3hXlLIvw9ViE1wg/iTt8JeFpuvsHYs4BehLKCAWEHnyXj1BN2EfwmGuMzimi5FeEu+Ouv5zwU6trOD+IUEif/zS1WiZvEWZSzQT4gQ5WYbwVj0+x+I+5dXmNrhPm18miz6WEO+OszdV0zHGLCN8cEZj53mnaXUO4ke72blYTArRS+r6QMLnVFggmu5C6sO5gLl23kp/NuqBNhL6mYy7XTN1OoioXrSo9JzKJ7vVOjTtrhLWEAoMEag5UZaMmyxVq! JDKZAFUmKDJBpd0EqinTuZ1hMqGCV34ObZfzstaajmGEnGT5CF+vRbg0zul7kr! CAN8Ufa6K0vLnkCmSXXQ5nuBmavx6qtw4t+3dC9p6GIJH/LkkQRMm4oNBlC8F8kT/x7Sd4+WYnc5c1ajj3UhBHgofppi/mdbmGmHA75DDC9afh63cxSr4zMeZk+Uw1Au+/jsCGN6C2NEGw2clmk9EWumS4l/PWP43KXkBle2j793wf060fdzwti3CuLAIfy0eHhwtMrZE5jONAZl+lSrUvXI/+w0qTXF1D/Su/QeP65RDsDrISkkGGrlmHf+mOYptVeoJvH04Uw7CIkKYcjSMCVdESSh7gX1lM4JYYEuj1qyKU1w/eUdcC3jPQMnNh65UP9+Dh6FFUin79+8e4ioG/vYszCx80uguyDkLUOqROCDMZ1vPYA5OlVOs/s4hw9onAmncF32YRwXy+/TZhRsy4TVWoD4gAkTA0RYHjuh/Adc0tyBhcAme/iyDGVXLk5GE0bfsr/NRlsK7DIITUFTK8Q7iDb9fCiFAyGQ4+0rCIcPaIUMHJwORb0ISddGfv4kGj2AE8jQ4QaUFkwh3o9/OFcNtSd9M8L8+D/8PVeneBrpHhbtJpFelkHtJWcjJYw8duiSZEMYFQyrfX8BudQ9srTceQJaBclYgQURCc/hiGPPZCl0jApOcjzyJz3GRodA39WubrJ8dKXSfmLDIdjbxSrrt+jGUR0pSqKRdHN9msXxnfvgBGOHiDESgyE4eYIMvwFw5D8bJNyOiOozrjEiiNXmNUkbpVYIGnm2GErb08j4WsR1oWoftSbCLBW5wERe1IYOoW5HseT4sEClmAWk8zzgQ19H7kd5RBfoaqInYWIalM5rr5uK7guhdbROhOz6DpmMVThqd5usiUZ4AqUVNUBHsVIm9oiX5+U4uCpavLsWTVbmz6+FCn5R2vDuhRR7+vCdLYSbAVFpHfqeiGpl15HSOq21OmPP03WF1DmnLk+3rXECS4eYCGBWokFhdKxBqBRgqnR30Xg+e/jF7ZWXjng68wdk! wBBvbPTqt8/+a3UbdoLgQHdxxTF+aYkJOBk1xn9huyLIuQvhRyEjB5jaf3dRQgYmi5oC8k0bjl024qSpsETLIn3UHugabPS6BrjTmq43KeZjJCWERIt2sAbjBN6mzSjDn/25JNEKk2B+RIxBiumZw8D5n7lKJDX1bhqjtfwUtvbde/u0aPNSapgK7gNq7rJlPe9RYR0mfCVaa7u53nXZesBgRNQSgUirnM4y9uxogpi/DE4q3kN0SSFrlszQ4cPeXFF/tOwNcCOMuuNBxGVTOxLQFi9biO67rdlHe5RYT0ZQRP63jap+NDBR32gA/+QDBmz5sby2G3iThe68O2L48mLXDGDaPhsElgk9Q9aOiRMbi0HQk0VSDHlCBzqEIbGdqkd5zupRYR0u8ahvH7X8HTkUlNMnUFTs8peLz1Mde5+doShGVVb+VXjipMWuZN1wxD1dZ5WP3MNCPDmWUYBBZfokpXIoJelnt0ED1vrUfeFC/cw5uIK0K8PqN4up+nxdY0dPqSxdNTPO2X3CAQEWqP4nhDY8yuxfOnYM49V2NA3x66ZehSbMHfAi0iwd5XRmZJE1zDQ3BfHIJg582fzU/ZNNQsy0dwj8u8+KmApyd5mmsRoRtxBC7RJec5yboGtjjNUX8aQpMfTeEI3I62RxkGDchLrVD5DJl9sihyNYRwBSTtVQx64RRsubrJIZ2MmmZdgyBqeur7KAeBclfb4IVXPE+jrMy0iNB9CfO0k4dUBDZU0K2C1+uDO793aldXybSfmgOt/nWqyBazywFHL2Mlk6aIrfmMAEqTiMbPcuH9KBtqQNIjB2yoaRJ7nO7WCqWzID2jMZ7OeMC6B3dtFbw+H/qnQAQtuA3q4QlEhpCxUkm00SWiC12FVnLprZ9FKytdaNyejWC522j9ktE1RIljjkfF6R62iJC+syjzhtQjzgPvmAmCCFcNWYQGX+cFRKqhHvi2UYGiHYIkEh9ERBpt1BUokH! IUqC0iQv/JgH93JoJ73VACkk4K3TcQDAJoieekorpGdQ9YREifCWzJF5uwGcZzKjpjDqsZZ! 3UVTsQ5jAkPD+3h/DGWqWmyiCO/LtTNfusSRr2la8Z3xjNJayssebAxqmsJT49Yw8f0ZR9Ph/L0YHKDYKxIdjTUQQg2ItjSkvzw7Al6VwBB1U9Vmw2LIHBz3wqJE4JVvMIcRUKExxJYDCExIQ7G6V5pESH9rqHcNC4fzPMqk4aY2ehBZN1Dle4wJmeCDeKgNYaJFxXYesgYMKcGrqJmvuJN0GMHKlU6iBDOoc3oMaERBffXYcjCEyhaUgV7fjiRHpVc18GmvL1W15A+EzbT51P8G5t3+AOMBaKlnfkKTt1PaMCAvvmdWIVbUbtxKpwFW5B9WRiZpSEdbFpb9lHVUYsX3Sokl9o6nNV9SOoiGj/LRrjWET9aYLKe59xgyttqESF9i2B+fmE6DCK8Sni8U4eRRg6eem9K5QT/G0T9h70hrpaQNaoZWWVNcBc3w5EvG6Fj3qoZAeSAiACNGLyf5KD5uIMZlUTyqknnqOyxiNA9YUvS2PIvtmScRW2qYDzdXJRsCOk8dRgn/P6UChAzaMRgU/WxIKtk/263bgmkbBkZ/WXYsmSoYQGR03a0kAWIOo+6/9B+2HiA6+hC2zL3DXo5Vl12S5aYtmdz8zw3uUUQYPd7IQYa4G8KdVqAY8CFdJaqDwtZ5Yp2Sh0qOY8SQgdp6FhOQ8dKN8Ieux5a1vdLbSOJOJnLdZwd/xssIqTbNRjrQdg6hObo8i+ev45woqPlYvoEkMAdRl/n8QTn0BFQ2VI30ySj4QtorYCoz3HraHUA25fNdFrHdYwuVWvmv8EiwlmQ+Txl3eyjWvv+N8EwUtS7B6+vodOLZ44Za0wv8poz6p1aPpFD4hBTW6A0nR/2KNoiyvNbuyCrHtN2FqNYxKKMfPsF3v9uo+1VyaakXdWH4fF27jA6i8tgc+eyZcwspABBocqn0o4OdOKP9w/A+1P6UL4Wr1M82Kt5tjHdmI48T+a668dYRDg7Yl6ruJbPArJX2! RxP5CYYRKhCYyDQmv3+oZX44ear8NwXj2JX7T9iTuk5/lbYI0QAIoFiF7B2al+svKc/avpm4MBQt24dhI7XLTId7uY6re1AZ2vSKX2TEOOJreAmlz0nwB5Jn0k3fhkdMYa2T7CGHTt0oBbY1AS7tw4NgSbkZrnpcmTiaWSw37ML+zw70dPZB9cXTseO2h04ekkl1CuK4WzW4AxrCGRJsMlGxbNtmU1IaUg0sdBMGKMZpc6k/ZNMUdEVMaMTq0bPWlcx0WSK2buMLtOMF1+VEVpiuwaCaMw71PPuQSC/QRSogkU7HGIGGsM+vLhjCU4E9xA9FDhY2MAmoMkt6pbBsAKGjxhyiom6gxZetofrstS0b2K7YapVhWdN2JPGU03f2TOQF9FdP6inxhNGsYEl8hPq+cjBJbn5HoEIQZVNpBA0I5XYs4m84hPNHdjldpm+uLLN73KaynW1iHAOZS3d/CdNzZLNUJZR911D23mEv7eNAUVknGwbOWTY3K0ntf7RiSp7uQb/kwUFClt4IpF1IIuish5BbGcKWBl5epmsq9JwyLTvyTg/wSLCOZQFdM+Xta5gNx6SncKH8+MJP6IGrqj6GsZjCAQNh7GXKx+qpkIhyKqMiBpGVoYbh2tCOF4XQq1Xw3TvtXjouUMY94kXeZ4wIuQ4OshnsBPoeop+baMMjZe5l0cZWMYyRN/llEAsZzFNUZOP3R/g5jkaZVzPI3iz6LQVZOhXkFPwjBCJzHOcqYbPH0J+1kDI9McmlAbmFGFG8QMY1etK1ARrdZ8hz2WsITn05gaM++g0vkNk8OfY0ewSmWV4lnb9UmsLJrJ5j1kmfdhr/OZFX76JBD2M9exjmlLxvWGpOJCzeKVExasHmzRsNcKMMjzjb19aMO2+mcVFQ7Du2EqUXDAGw7LLOrxmw5b1OPbb2RBtjs8FUWTkekN/a6Mxr8CcwD/DeDw/Kg/Srlc609UiwrklAvtgD8J8SjAvV! d5LRHiE8Gn0NTqZKz692aGq853ZOSMycnIzJWcGbHx5e0RWEGluQaTB63H7z7ztfe/Nh71b! 1vE3ruk24BrCy+DvOuBSr+cL2J/KGxQsIpx7IkTlecKc2AO0esJiqMrrUJQq5hgyS2HUidY+EiUK+pPPomRjaxgH0cjjXhiv+o9fD88inL9oHaBYRDiviMA22aNMiwi3xRGCgU0oUJehB3vY01M0xNP4ZITAnkPIp8Y/nLZHkhWYqAce2stfWGBLMEc0LSKcl0SISj5vsewVd5ndVCXIHdHno/EBIc6QWEQ4f4nQaghIriDcCOMfelyaYvHsX/mwf9DxIeHz+NcopUOE/wkwAAeR3z4C+zelAAAAAElFTkSuQmCC -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ Modified: trunk/www/linux-firefox/Makefile ============================================================================== --- trunk/www/linux-firefox/Makefile Wed Nov 19 01:27:24 2014 (r1763) +++ trunk/www/linux-firefox/Makefile Wed Nov 19 03:04:24 2014 (r1764) @@ -2,10 +2,10 @@ # $FreeBSD: head/www/linux-firefox/Makefile 370932 2014-10-15 15:48:16Z beat $ PORTNAME= firefox -DISTVERSION= 34.0b7 +DISTVERSION= 34.0b10 PORTEPOCH= 1 CATEGORIES= www ipv6 -MASTER_SITES= MOZILLA/${PORTNAME}/candidates/${DISTVERSION}-candidates/build1/linux-i686/en-US +MASTER_SITES= MOZILLA/${PORTNAME}/releases/${DISTVERSION}/linux-i686/en-US MAINTAINER= gecko@FreeBSD.org COMMENT= Web browser based on the browser portion of Mozilla Modified: trunk/www/linux-firefox/distinfo ============================================================================== --- trunk/www/linux-firefox/distinfo Wed Nov 19 01:27:24 2014 (r1763) +++ trunk/www/linux-firefox/distinfo Wed Nov 19 03:04:24 2014 (r1764) @@ -1,5 +1,5 @@ -SHA256 (firefox-34.0b7.tar.bz2) = 046d09c4afebc27d14f633634521a89b2bdffac13d771a3b6aacdaa9eff03a80 -SIZE (firefox-34.0b7.tar.bz2) = 46523066 +SHA256 (firefox-34.0b10.tar.bz2) = 87cbe7fc668e8db9b3e33a57e780814c53a8cdd471a56c9b06b9ec1ef6bab37a +SIZE (firefox-34.0b10.tar.bz2) = 46574277 SHA256 (glib2-2.22.2-2.fc12.i686.rpm) = e3b459c245ec14e7248e9de4b506963a4773407f3e58835db5070d0ed02ecc99 SIZE (glib2-2.22.2-2.fc12.i686.rpm) = 1162908 SHA256 (gtk2-2.18.3-19.fc12.i686.rpm) = aea9cf7ffe9c8dae0faa2bf3d2aa1b2117c55dce03da72dcce8c268279ec0a4b Modified: trunk/www/linux-pepperflash/Makefile ============================================================================== --- trunk/www/linux-pepperflash/Makefile Wed Nov 19 01:27:24 2014 (r1763) +++ trunk/www/linux-pepperflash/Makefile Wed Nov 19 03:04:24 2014 (r1764) @@ -1,7 +1,7 @@ # $FreeBSD$ PORTNAME= pepperflash -PORTVERSION= 38.0.2125.111 +PORTVERSION= 39.0.2171.65 CATEGORIES= www multimedia linux MASTER_SITES= http://dl.google.com/linux/chrome/rpm/stable/${LINUX_RPM_ARCH}/ PKGNAMEPREFIX= linux- Modified: trunk/www/linux-pepperflash/distinfo.i386 ============================================================================== --- trunk/www/linux-pepperflash/distinfo.i386 Wed Nov 19 01:27:24 2014 (r1763) +++ trunk/www/linux-pepperflash/distinfo.i386 Wed Nov 19 03:04:24 2014 (r1764) @@ -1,2 +1,2 @@ -SHA256 (rpm/i386/centos/6.5/google-chrome-stable-38.0.2125.111-1.i386.rpm) = 16ded5334f450d29c2050232564af4afc2301fb1463b2ec719d6c27d3503a15d -SIZE (rpm/i386/centos/6.5/google-chrome-stable-38.0.2125.111-1.i386.rpm) = 59002162 +SHA256 (rpm/i386/centos/6.6/google-chrome-stable-39.0.2171.65-1.i386.rpm) = 2fba30a41326f6152cdb79939883842ac741f7cc25da0a57aaf9757acdd055ee +SIZE (rpm/i386/centos/6.6/google-chrome-stable-39.0.2171.65-1.i386.rpm) = 59390698 Modified: trunk/www/linux-tor-browser/Makefile ============================================================================== --- trunk/www/linux-tor-browser/Makefile Wed Nov 19 01:27:24 2014 (r1763) +++ trunk/www/linux-tor-browser/Makefile Wed Nov 19 03:04:24 2014 (r1764) @@ -2,7 +2,7 @@ PORTNAME= tor-browser DISTVERSIONPREFIX=linux32- -DISTVERSION= 4.0.1 +DISTVERSION= 4.5-alpha-1 DISTVERSIONSUFFIX=_${LOCALE} CATEGORIES= www security linux MASTER_SITES= https://people.torproject.org/~mikeperry/builds/${DISTVERSION}/ \ Modified: trunk/www/linux-tor-browser/distinfo ============================================================================== --- trunk/www/linux-tor-browser/distinfo Wed Nov 19 01:27:24 2014 (r1763) +++ trunk/www/linux-tor-browser/distinfo Wed Nov 19 03:04:24 2014 (r1764) @@ -1,30 +1,30 @@ -SHA256 (tor-browser-linux32-4.0.1_ar.tar.xz) = 0be69bd27fd94e88efb376357bfe50c96361c3d97643b3fe99820fce6ade21d7 -SIZE (tor-browser-linux32-4.0.1_ar.tar.xz) = 43253668 -SHA256 (tor-browser-linux32-4.0.1_de.tar.xz) = 01e1dd2b39307058ee3a008162975ca65c59bc53303e2aae6a0b3c7dc4d83020 -SIZE (tor-browser-linux32-4.0.1_de.tar.xz) = 43190600 -SHA256 (tor-browser-linux32-4.0.1_en-US.tar.xz) = 83a2de8e638f5e4dcda84ce7b664f46394669ee45157f85127ed4f9d4050be8c -SIZE (tor-browser-linux32-4.0.1_en-US.tar.xz) = 42847152 -SHA256 (tor-browser-linux32-4.0.1_es-ES.tar.xz) = f6eb7f6dcfcd0a451220473dec498ed05b24e3c9e9a538121e72c6b813a8a534 -SIZE (tor-browser-linux32-4.0.1_es-ES.tar.xz) = 43120264 -SHA256 (tor-browser-linux32-4.0.1_fa.tar.xz) = f5846b3a960eaa22fe50050934e3022d51b927e7f477cfb1dcce0ceb0d4825a4 -SIZE (tor-browser-linux32-4.0.1_fa.tar.xz) = 43253772 -SHA256 (tor-browser-linux32-4.0.1_fr.tar.xz) = b97df9547fc6e97ec15dea43611850578ebb0915daa291a334fe77d3b9964864 -SIZE (tor-browser-linux32-4.0.1_fr.tar.xz) = 43206848 -SHA256 (tor-browser-linux32-4.0.1_it.tar.xz) = c6f0fc6c50d133c4de22591aba696eb752e184b1f8bb7dac0f31fdd15baa4065 -SIZE (tor-browser-linux32-4.0.1_it.tar.xz) = 43119504 -SHA256 (tor-browser-linux32-4.0.1_ko.tar.xz) = aa833640d9d6cf62026b9a0bcc156dc94e0f656a56b364b10a0c2ea1b7f1ba7d -SIZE (tor-browser-linux32-4.0.1_ko.tar.xz) = 43186996 -SHA256 (tor-browser-linux32-4.0.1_nl.tar.xz) = 7cb9655b9405884e1a11bb0b51dc294c1c81272c4e2f2f81ca542bf0966d92f1 -SIZE (tor-browser-linux32-4.0.1_nl.tar.xz) = 43174540 -SHA256 (tor-browser-linux32-4.0.1_pl.tar.xz) = 1ea321c73f10d6e09cb432bfa20a87ef468aac905a3a3fde8dfc9fe187557284 -SIZE (tor-browser-linux32-4.0.1_pl.tar.xz) = 43164228 -SHA256 (tor-browser-linux32-4.0.1_pt-PT.tar.xz) = 38351d64bc227a629994466a349aa1cf74a16088a47ec9307368b43c4c9dba77 -SIZE (tor-browser-linux32-4.0.1_pt-PT.tar.xz) = 43173948 -SHA256 (tor-browser-linux32-4.0.1_ru.tar.xz) = eb7a5341cb314b0ad97c10759c9ac7a12927bea6b8c58d754fbc173e8893aaf3 -SIZE (tor-browser-linux32-4.0.1_ru.tar.xz) = 43158404 -SHA256 (tor-browser-linux32-4.0.1_tr.tar.xz) = 96d3e349908578ecf3150e2985e5dd39071ad6f33a2850f0cf892534f3cca896 -SIZE (tor-browser-linux32-4.0.1_tr.tar.xz) = 43202784 -SHA256 (tor-browser-linux32-4.0.1_vi.tar.xz) = 416372cad884228668b8df57c775f5b4939391d198f530ee5a670e1b3d33fbc5 -SIZE (tor-browser-linux32-4.0.1_vi.tar.xz) = 43198840 -SHA256 (tor-browser-linux32-4.0.1_zh-CN.tar.xz) = 11da516b6ba9a6b8e8df879cf4011baa379ea2f9977d76fc1730ca4924add3e5 -SIZE (tor-browser-linux32-4.0.1_zh-CN.tar.xz) = 43207420 +SHA256 (tor-browser-linux32-4.5-alpha-1_ar.tar.xz) = 68a9a7039dff369150a07e28ae9c12899e51a71b8e32891ba8989720ff57be7f +SIZE (tor-browser-linux32-4.5-alpha-1_ar.tar.xz) = 44258600 +SHA256 (tor-browser-linux32-4.5-alpha-1_de.tar.xz) = 562e86313b35a2df74f13b211b894cfc0298e8ebb25d2ba4209c883bcdc15066 +SIZE (tor-browser-linux32-4.5-alpha-1_de.tar.xz) = 44192404 +SHA256 (tor-browser-linux32-4.5-alpha-1_en-US.tar.xz) = b4c2550d08833b03360566785d82f0ae309a77a788eef09f3b509e5cc9509483 +SIZE (tor-browser-linux32-4.5-alpha-1_en-US.tar.xz) = 43858076 +SHA256 (tor-browser-linux32-4.5-alpha-1_es-ES.tar.xz) = 262e5bcf1f226457128b0c3a8d2fe44cd7e854438cad1b424e429d601256314c +SIZE (tor-browser-linux32-4.5-alpha-1_es-ES.tar.xz) = 44145840 +SHA256 (tor-browser-linux32-4.5-alpha-1_fa.tar.xz) = 4baaadffd8de5174118c35cdcbb8c9fb57686f6a094ce441f7cb9cd57ed393f2 +SIZE (tor-browser-linux32-4.5-alpha-1_fa.tar.xz) = 44261432 +SHA256 (tor-browser-linux32-4.5-alpha-1_fr.tar.xz) = 32099a83b1caa8861b5da26ad8a92e47932db1e08baa5d28e660e4eda68805a0 +SIZE (tor-browser-linux32-4.5-alpha-1_fr.tar.xz) = 44211676 +SHA256 (tor-browser-linux32-4.5-alpha-1_it.tar.xz) = d9a25cb6420eee03d4aed71ef9969ace7700b2b9991eb043f7160e3a853bfaa4 +SIZE (tor-browser-linux32-4.5-alpha-1_it.tar.xz) = 44131236 +SHA256 (tor-browser-linux32-4.5-alpha-1_ko.tar.xz) = d517ec29452ff1bf563c0d09a81f451f16fae39a897e3ff301d70d37048be6c3 +SIZE (tor-browser-linux32-4.5-alpha-1_ko.tar.xz) = 44207176 +SHA256 (tor-browser-linux32-4.5-alpha-1_nl.tar.xz) = ecf6bbd04656cf2553a1109dc25436a8f4309e479b9b36f90b4ffdc2f00c7c20 +SIZE (tor-browser-linux32-4.5-alpha-1_nl.tar.xz) = 44196120 +SHA256 (tor-browser-linux32-4.5-alpha-1_pl.tar.xz) = 533bff670c5a3fc86b1e79375b3cfaf0ee7ba896ea15f39224a53f0c315f982d +SIZE (tor-browser-linux32-4.5-alpha-1_pl.tar.xz) = 44171264 +SHA256 (tor-browser-linux32-4.5-alpha-1_pt-PT.tar.xz) = 524ebbb4455a0447f1fe76a114069849f4905fe9054e8164cee4e813e1643d09 +SIZE (tor-browser-linux32-4.5-alpha-1_pt-PT.tar.xz) = 44183836 +SHA256 (tor-browser-linux32-4.5-alpha-1_ru.tar.xz) = 8f486fdb654e400dc493eca147458c01df20e293d571f5aa06b4da33adcdc029 +SIZE (tor-browser-linux32-4.5-alpha-1_ru.tar.xz) = 44169100 +SHA256 (tor-browser-linux32-4.5-alpha-1_tr.tar.xz) = e5ef5bbac98b81aee9d31181cf445abd3c90e20a01580c5dbe3d801ddd869345 +SIZE (tor-browser-linux32-4.5-alpha-1_tr.tar.xz) = 44226380 +SHA256 (tor-browser-linux32-4.5-alpha-1_vi.tar.xz) = 2641eda1d5eed0c887b7767cbcd441eb266a60686b283183e47bc593f1b7dc4b +SIZE (tor-browser-linux32-4.5-alpha-1_vi.tar.xz) = 44216324 +SHA256 (tor-browser-linux32-4.5-alpha-1_zh-CN.tar.xz) = 59014dd1845668d0d4bc6480ae8385c9404b004775bb192fd8d67161e9127e3a +SIZE (tor-browser-linux32-4.5-alpha-1_zh-CN.tar.xz) = 44214116 Modified: trunk/www/linux-tor-browser/files/pkg-message.in ============================================================================== --- trunk/www/linux-tor-browser/files/pkg-message.in Wed Nov 19 01:27:24 2014 (r1763) +++ trunk/www/linux-tor-browser/files/pkg-message.in Wed Nov 19 03:04:24 2014 (r1764) @@ -1,3 +1,3 @@ Unlike vendor-provided TorBrowserBundle, the port stores temporary -data under %%USERDATADIR%%. If you wish to start from a clean profile -either remove the directory or reinstall the package. +user data under %%USERDATADIR%%. If you wish to start from a clean +profile either remove the directory or reinstall the package. From owner-freebsd-gecko@FreeBSD.ORG Wed Nov 19 04:02:23 2014 Return-Path: Delivered-To: freebsd-gecko@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 90032708 for ; Wed, 19 Nov 2014 04:02:23 +0000 (UTC) Received: from trillian.chruetertee.ch (trillian.chruetertee.ch [217.150.244.247]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 0AF83302 for ; Wed, 19 Nov 2014 04:02:22 +0000 (UTC) Received: from trillian.chruetertee.ch (trillian [217.150.244.247]) by trillian.chruetertee.ch (8.14.4/8.14.3) with ESMTP id sAJ42KJq039189 for ; Wed, 19 Nov 2014 04:02:20 GMT (envelope-from svn-freebsd-gecko@chruetertee.ch) Received: (from www@localhost) by trillian.chruetertee.ch (8.14.4/8.14.3/Submit) id sAJ42Fv9038577 for freebsd-gecko@freebsd.org; Wed, 19 Nov 2014 04:02:15 GMT (envelope-from svn-freebsd-gecko@chruetertee.ch) Date: Wed, 19 Nov 2014 04:02:15 GMT Message-Id: <201411190402.sAJ42Fv9038577@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 Subject: [SVN-Commit] r1765 - trunk/www/linux-pepperflash MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Reply-To: freebsd-gecko@freebsd.org X-BeenThere: freebsd-gecko@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: Gecko Rendering Engine issues List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 19 Nov 2014 04:02:23 -0000 Author: jbeich Date: Wed Nov 19 04:02:13 2014 New Revision: 1765 Log: - move distfile outside of centos subdirectory - use WRKSRC for path to the useful content - don't extract the whole Chrome Modified: trunk/www/linux-pepperflash/Makefile trunk/www/linux-pepperflash/distinfo.i386 Modified: trunk/www/linux-pepperflash/Makefile ============================================================================== --- trunk/www/linux-pepperflash/Makefile Wed Nov 19 03:04:24 2014 (r1764) +++ trunk/www/linux-pepperflash/Makefile Wed Nov 19 04:02:13 2014 (r1765) @@ -6,6 +6,7 @@ MASTER_SITES= http://dl.google.com/linux/chrome/rpm/stable/${LINUX_RPM_ARCH}/ PKGNAMEPREFIX= linux- DISTNAME= google-chrome-stable-${DISTVERSION} +DIST_SUBDIR= rpm/${LINUX_RPM_ARCH} MAINTAINER= gecko@FreeBSD.org COMMENT= Pepper Flash from Google Chrome @@ -19,13 +20,15 @@ RPMVERSION= 1 LINUX_RPM_ARCH= i386 ONLY_FOR_ARCHS= amd64 i386 +EXTRACT_AFTER_ARGS=--include ${WRKSRC_SUBDIR} +WRKSRC_SUBDIR= opt/google/chrome/PepperFlash PREFIX?= ${LOCALBASE} # ignore USE_LINUX_PREFIX DATADIR= ${PREFIX}/lib/PepperFlash PORTDATA= libpepflashplayer.so manifest.json do-install: @${MKDIR} ${STAGEDIR}${DATADIR} - ${TAR} cf - -C${WRKSRC}/opt/google/chrome PepperFlash \ + ${TAR} cf - -C${WRKSRC:H} ${WRKSRC:T} \ | ${TAR} xof - -C${STAGEDIR}${DATADIR:H} .include Modified: trunk/www/linux-pepperflash/distinfo.i386 ============================================================================== --- trunk/www/linux-pepperflash/distinfo.i386 Wed Nov 19 03:04:24 2014 (r1764) +++ trunk/www/linux-pepperflash/distinfo.i386 Wed Nov 19 04:02:13 2014 (r1765) @@ -1,2 +1,2 @@ -SHA256 (rpm/i386/centos/6.6/google-chrome-stable-39.0.2171.65-1.i386.rpm) = 2fba30a41326f6152cdb79939883842ac741f7cc25da0a57aaf9757acdd055ee -SIZE (rpm/i386/centos/6.6/google-chrome-stable-39.0.2171.65-1.i386.rpm) = 59390698 +SHA256 (rpm/i386/google-chrome-stable-39.0.2171.65-1.i386.rpm) = 2fba30a41326f6152cdb79939883842ac741f7cc25da0a57aaf9757acdd055ee +SIZE (rpm/i386/google-chrome-stable-39.0.2171.65-1.i386.rpm) = 59390698 From owner-freebsd-gecko@FreeBSD.ORG Wed Nov 19 00:31:22 2014 Return-Path: Delivered-To: gecko@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 67D5C9E2 for ; Wed, 19 Nov 2014 00:31:22 +0000 (UTC) Received: from nm7-vm0.bullet.mail.ne1.yahoo.com (nm7-vm0.bullet.mail.ne1.yahoo.com [98.138.91.66]) (using TLSv1 with cipher ECDHE-RSA-RC4-SHA (128/128 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 26F28BEA for ; Wed, 19 Nov 2014 00:31:21 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=yahoo.com; s=s2048; t=1416356950; bh=ZxrZmFCUoVeyuge2av7u+pCreELzDjweJQfS1cJHF84=; h=Date:Subject:From:To:Cc:From:Subject; b=XihnEsLQhqKjuU70sXAfcHRR1zLhrC7P8lqowvcDCJC2N+BYm5bTGDKkB/HE+V2LEqxxOZRZvvv+KvG6A4gnWzeMg3pA97Y+hek17s9oRwPuHzrWm4XeYIe6exFvg2loZYT2v3IusN/xZ4LTBpbGLZZFQr9u+urIdXb1ST73YGQNIzUmSznw5EyES42d0iuF7QPucJ9KuBKaSL7GBF6jZIT3WcuPqyuPKRJZdECNTQa1qlEG4BKVOEaSrI2PjWXL/rqr9szQn0co4gtpdsZVEbjlw8fGd2Q63zx8OIMsFM7l0R9xjKUEKHnz2rE9tpKJzpGFY/mqT0riWJ96qolHNA== DomainKey-Signature: a=rsa-sha1; q=dns; c=nofws; s=s2048; d=yahoo.com; b=fBa5h3b4/Qahq6fzcbhpKaS0LXJpi4JjF7bxn6LS5SoJ1xB+YXMdxSUiVs+P9Z9v7I41JMOmpFy1Z2cFFeE2qIKL85ulrQ2CB9IL6Qd6/96f5DNHvQ5udmPPqevguiNl+kupqYljCasiA01Ae2FB+rT07Nx5frRzACypFIQFVKV4SxuD2DItr4IQ9pzbGuA2Oa4N99eBHLKmyVed2wT6Y5iclapWcbrJQ9fI48e98/zWooLKFXBok8dqEblh++aGFOi3LlCsA6WM0o7LjC3051va/m37HfKQeCD7cV/w4l/vm4RlK9CVkANdU8MIX3ryttqvDFFVdeI9Cz309E30Lw==; Received: from [98.138.100.115] by nm7.bullet.mail.ne1.yahoo.com with NNFMP; 19 Nov 2014 00:29:10 -0000 Received: from [98.138.226.126] by tm106.bullet.mail.ne1.yahoo.com with NNFMP; 19 Nov 2014 00:29:10 -0000 Received: from [127.0.0.1] by smtp205.mail.ne1.yahoo.com with NNFMP; 19 Nov 2014 00:29:10 -0000 X-Yahoo-Newman-Id: 564872.30412.bm@smtp205.mail.ne1.yahoo.com X-Yahoo-Newman-Property: ymail-3 X-YMail-OSG: FLrNOV8VM1nSA1QM9hlWMBSDcjLDtR2332Whmc58dmoiL3K S1wpZA_6FXEBe7bGvXtuyYNtaYT3hOKLI_JD4zyjTg4hDMlsAlZ_L6HBL0gv Ui6VExtGfQtf4lIi2L4k2Y1.MKtgec48f_AVTuI6PdfVxyhe7kp2K.95Qt8T tKlfcJztYoBdi9xCD15jMTQhvKQQ8fOCvFI3nvXua87FOfR_m_ZJzCNVwX4K zOI8xUj8siWhGx0hAu.YFZbeiWompZwX49p0W695hHResCAc4kSp9q2BKE84 ro2OYdGm3.YUWzwxEY7kmF_25XtFl84LFOAUuL1_DNK1XYnHzAZBggHGKoKw n8FxcxRSfRXnsSrb_uuqnrDOVL_9Ujhu6Lq0_y4MSBYTDu9IEMZExwuFNHuQ ieGvwvs3Ii2ymKSJBenG5_Xe7yfRar_bsDR1VuaophdY2BZVxrlcv5978s36 1uTelQjBbE2J4SnpGta5JQbuRjRWlMOtlbInuBZ4Htqd2xnlfhkUxU6_3WQ- - X-Yahoo-SMTP: wXzXVjyswBDaYVnAlG7oRCZIzo8- Date: Wed, 19 Nov 2014 00:56:12 +0800 Subject: feedback Message-ID: From: =?UTF-8?B?6ZKf5bCP546y?= To: "gecko@freebsd.org" MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: base64 X-Mailman-Approved-At: Wed, 19 Nov 2014 04:25:30 +0000 Cc: "zxl1985@swu.edu.cn" X-BeenThere: freebsd-gecko@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: Gecko Rendering Engine issues List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 19 Nov 2014 00:31:22 -0000 SGVsbG8sIFNpci9NYWRhbSEKCsKgCgpJIGFtIHZlcnkgaW50ZXJlc3RlZCB3aXRoIFBDQlNELsKg IFVwIHRvIGRhdGUsIEkgZXhwZXJpZW5jZWQgaXQgc2V2ZXJhbCB0aW1lcyB3aXRoIGRpZmZlcmVu dCBlZGl0aW9uLgoKwqAKCiBub3csIHRoZSBQQyBCU0Qgc3lzdGVtIGlzIG5vdCBzdGlsbCBzdXBw b3J0ZWQgd2VsbCB3aXRoIEFUSSBncmFwaGljIGNhcmQgZm9yIHRoZSBkcml2ZXJzLgoKwqAKCkkg YW0gbm90IHN1cmUgd2hldGhlciBpdCdzIG9rIGZvciBVU0IgMy4wIGRpc2sgaXMgT0sgb24gdGhl IFBDIEJTRCBPUyBhbmQgc29saWQgc3RhdGUgZGlzay4gSWYgaSBjaGFuZ2UgZnJvbSB3aW5kb3dz IG9zIHRvIFBDIEJTRCBPUywgbXkgYW5kcm9pZCBwaG9uZSBhbmQgb3RoZXIgZGV2aWNlcyBjb3Vs ZCBiZSBjaGFyZ2VkIGFuZCB0aGUgQXBwIGNvdWxkIGJlIG1hbmFnZWQgdGhyb3VnaCBQQ0JTRCBw bGF0Zm9ybSBhcyB0aGUgc2FtZSBhcyB3aW5kb3dzIG9zPwoKd2hlbiB3ZSBpbnN0YWxsIHdpbmRv d3Mgb3MsIHRoZSBkaXNrIGNvdWxkIGJlIHJlZm9ybWF0ZWQgdG8gbnRmcyBubyBtYXR0ZXIgd2hh dCBmb3JtYXRlcyB0aGUgZGlza3MgYXJlLiBTbywgcGNic2Qgb3MgY291bGQgZG8gdGhlIHNhbWUg dGhpbmc/IHdoZW4gcGNic2Qgb3MgaXMgaW5zdGFsbGVkLCBudGZzLWZvcm1hdCBkaXNrIHNob3Vs ZCBiZSBjb252ZXJ0ZWQgdG8gemZzIGF0IGZpcnN0LCBzbyBob3cgY291bGQgd2UgcmVhY2ggdGhl IGdvYWwgZWFzaWx5PwrCoAoKWW91cnMKClNpbmNlcmVseSEKCkFuZGlvIFpIT05HCgo= From owner-freebsd-gecko@FreeBSD.ORG Wed Nov 19 11:08:30 2014 Return-Path: Delivered-To: gecko@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id BC6748D7 for ; Wed, 19 Nov 2014 11:08:30 +0000 (UTC) Received: from eyou.net (gw1.swu.edu.cn [202.202.96.135]) by mx1.freebsd.org (Postfix) with SMTP id EBEF964A for ; Wed, 19 Nov 2014 11:08:28 +0000 (UTC) X-EYOU-SPAMVALUE: 0 X-EMDG-ORIGINAL-FROM: X-EMDG-ORIGINAL-TO: X-EMDG-ORIGINAL-IP: 172.17.146.213 X-EMDG-VER: 4.0.2 Received: (eyou anti_spam gateway 4.0.2); Wed, 19 Nov 2014 19:08:22 +0800 Message-ID: <616395302.15567@eyou.net> X-EMDG-SMTPAUTH: zxl1985@swu.edu.cn Received: from 172.17.146.213 by 202.202.96.132 with SMTP; Wed, 19 Nov 2014 19:08:22 +0800 From: "Andio ZHONG \(ZHONG Xiaoling\)" To: Subject: Feedback Date: Wed, 19 Nov 2014 19:07:48 +0800 Message-ID: <000601d003e9$0df13800$29d3a800$@swu.edu.cn> MIME-Version: 1.0 X-Mailer: Microsoft Outlook 15.0 Thread-Index: AdAD30nE1Bwre+F4Qu6eBsQ5/6KG8w== Content-Language: zh-cn X-Mailman-Approved-At: Wed, 19 Nov 2014 12:24:06 +0000 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit X-Content-Filtered-By: Mailman/MimeDel 2.1.18-1 Cc: zxl1985@yahoo.com X-BeenThere: freebsd-gecko@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: Gecko Rendering Engine issues List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 19 Nov 2014 11:08:30 -0000 Could you give me some help? After finishing PCBSD OS installed, some software isn't include in the package. so the appcafe is needed while the download speed still low in Chongqing, China. When I install texmaker(about 3.3 GB) and Ipe(about 1 GB), the installation of the two softwares have faild several times. Yours Sincerely! Andio ZHONG Ph.D Candidate @ Institution For Clean Energy & Advanced Materials, Southwest University, Beibei District, Chongqing, People's Republic of China Post Code: 400715 From owner-freebsd-gecko@FreeBSD.ORG Wed Nov 19 14:29:18 2014 Return-Path: Delivered-To: gecko@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id E2D899E8 for ; Wed, 19 Nov 2014 14:29:18 +0000 (UTC) Received: from eyou.net (gw1.swu.edu.cn [202.202.96.135]) by mx1.freebsd.org (Postfix) with SMTP id B50C4E15 for ; Wed, 19 Nov 2014 14:29:03 +0000 (UTC) X-EYOU-SPAMVALUE: 0 X-EMDG-ORIGINAL-FROM: X-EMDG-ORIGINAL-TO: X-EMDG-ORIGINAL-IP: 172.17.146.213 X-EMDG-VER: 4.0.2 Received: (eyou anti_spam gateway 4.0.2); Wed, 19 Nov 2014 22:28:56 +0800 Message-ID: <616407336.23149@eyou.net> X-EMDG-SMTPAUTH: zxl1985@swu.edu.cn Received: from 172.17.146.213 by 202.202.96.132 with SMTP; Wed, 19 Nov 2014 22:28:56 +0800 From: "Andio ZHONG \(ZHONG Xiaoling\)" To: Subject: Feedback Date: Wed, 19 Nov 2014 22:28:24 +0800 Message-ID: <000001d00405$13d9e8e0$3b8dbaa0$@swu.edu.cn> MIME-Version: 1.0 X-Mailer: Microsoft Outlook 15.0 Thread-Index: AdAEBDwFLDYwsy8JR7G1/g2xZteXGA== Content-Language: zh-cn X-Mailman-Approved-At: Wed, 19 Nov 2014 15:15:12 +0000 Content-Type: text/plain; charset="gb2312" Content-Transfer-Encoding: quoted-printable X-Content-Filtered-By: Mailman/MimeDel 2.1.18-1 Cc: zxl1985@yahoo.com X-BeenThere: freebsd-gecko@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: Gecko Rendering Engine issues List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 19 Nov 2014 14:29:19 -0000 PCBSD 10.1 release is running on a Vmware virtual machine. Chinese words couldn=A1=AFt type out although Pinyin was chosen. Another thing is that = the thinkingrock couldn=A1=AFt running on the platform. It was stack as well = as pictures showing below (also pictures was attached) =20 Yours Sincerely! Andio ZHONG =20 Ph.D Candidate @ Institution For Clean Energy & Advanced Materials, Southwest University, Beibei District, Chongqing, People=A1=AFs Republic of China Post Code: 400715 =20 From owner-freebsd-gecko@FreeBSD.ORG Wed Nov 19 19:19:23 2014 Return-Path: Delivered-To: gecko@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id B35CCDC4 for ; Wed, 19 Nov 2014 19:19:23 +0000 (UTC) Received: from kenobi.freebsd.org (kenobi.freebsd.org [IPv6:2001:1900:2254:206a::16:76]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id A083F684 for ; Wed, 19 Nov 2014 19:19:23 +0000 (UTC) Received: from bugs.freebsd.org ([127.0.1.118]) by kenobi.freebsd.org (8.14.9/8.14.9) with ESMTP id sAJJJNf6060214 for ; Wed, 19 Nov 2014 19:19:23 GMT (envelope-from bugzilla-noreply@freebsd.org) From: bugzilla-noreply@freebsd.org To: gecko@FreeBSD.org Subject: maintainer-feedback requested: [Bug 195176] mail/thunderbird OPTIONS broken Date: Wed, 19 Nov 2014 19:19:23 +0000 X-Bugzilla-Type: request Message-ID: In-Reply-To: References: X-Bugzilla-URL: https://bugs.freebsd.org/bugzilla/ Auto-Submitted: auto-generated MIME-Version: 1.0 Content-Type: text/plain; charset="UTF-8" X-BeenThere: freebsd-gecko@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: Gecko Rendering Engine issues List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 19 Nov 2014 19:19:23 -0000 Nikolai Lifanov has asked gecko@FreeBSD.org for maintainer-feedback: Bug 195176: mail/thunderbird OPTIONS broken https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=195176 --- Description --- After the latest package update from pkg.freebsd.org, Thunderbird lost lightning and enigmail. Somehow DEFAULT_OPTIONS are not applied or overridden: $ svnversion 372802 $ sudo make rmconfig ===> No user-specified options configured for thunderbird-31.2.0 $ sudo make showconfig ===> The following configuration options are available for thunderbird-31.2.0: DBUS=on: D-Bus IPC system support DEBUG=off: Build with debugging support DTRACE=off: Build with DTrace probes ENIGMAIL=off: Enigmail extension GCONF=off: GConf configuration backend support GIO=on: GIO for file I/O GNOMEUI=off: libgnomeui support module GNOMEVFS2=off: GnomeVFS2 (virtual file system) support GSTREAMER=off: Multimedia support via GStreamer LIBPROXY=off: Proxy support via libproxy LIGHTNING=off: Calendar extension LOGGING=on: Additional log messages OPTIMIZED_CFLAGS=on: Use extra compiler optimizations PGO=off: Use Profile-Guided Optimization PROFILE=off: Build with profiling support TEST=off: Build and/or run tests ====> Options available for the multi AUDIO: you have to choose at least one of them ALSA=on: ALSA audio architecture support PULSEAUDIO=off: PulseAudio sound server support ===> Use 'make config' to modify these settings Expected: ENIGMAIL and LIGHTNING should be on. --- Comment #1 from Bugzilla Automation --- Auto-assigned to maintainer gecko@FreeBSD.org From owner-freebsd-gecko@FreeBSD.ORG Wed Nov 19 19:19:24 2014 Return-Path: Delivered-To: gecko@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 7E693DC7 for ; Wed, 19 Nov 2014 19:19:24 +0000 (UTC) Received: from kenobi.freebsd.org (kenobi.freebsd.org [IPv6:2001:1900:2254:206a::16:76]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 4CC12687 for ; Wed, 19 Nov 2014 19:19:24 +0000 (UTC) Received: from bugs.freebsd.org ([127.0.1.118]) by kenobi.freebsd.org (8.14.9/8.14.9) with ESMTP id sAJJJOqW060225 for ; Wed, 19 Nov 2014 19:19:24 GMT (envelope-from bugzilla-noreply@freebsd.org) From: bugzilla-noreply@freebsd.org To: gecko@FreeBSD.org Subject: [Bug 195176] New: mail/thunderbird OPTIONS broken Date: Wed, 19 Nov 2014 19:19:23 +0000 X-Bugzilla-Reason: AssignedTo X-Bugzilla-Type: new X-Bugzilla-Watch-Reason: None X-Bugzilla-Product: Ports Tree X-Bugzilla-Component: Individual Port(s) X-Bugzilla-Version: Latest X-Bugzilla-Keywords: X-Bugzilla-Severity: Affects Many People X-Bugzilla-Who: lifanov@mail.lifanov.com X-Bugzilla-Status: Needs Triage X-Bugzilla-Priority: --- X-Bugzilla-Assigned-To: gecko@FreeBSD.org X-Bugzilla-Target-Milestone: --- X-Bugzilla-Flags: maintainer-feedback? X-Bugzilla-Changed-Fields: bug_id short_desc product version rep_platform op_sys bug_status bug_severity priority component assigned_to reporter flagtypes.name Message-ID: Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: 7bit X-Bugzilla-URL: https://bugs.freebsd.org/bugzilla/ Auto-Submitted: auto-generated MIME-Version: 1.0 X-BeenThere: freebsd-gecko@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: Gecko Rendering Engine issues List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 19 Nov 2014 19:19:24 -0000 https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=195176 Bug ID: 195176 Summary: mail/thunderbird OPTIONS broken Product: Ports Tree Version: Latest Hardware: Any OS: Any Status: Needs Triage Severity: Affects Many People Priority: --- Component: Individual Port(s) Assignee: gecko@FreeBSD.org Reporter: lifanov@mail.lifanov.com Assignee: gecko@FreeBSD.org Flags: maintainer-feedback?(gecko@FreeBSD.org) After the latest package update from pkg.freebsd.org, Thunderbird lost lightning and enigmail. Somehow DEFAULT_OPTIONS are not applied or overridden: $ svnversion 372802 $ sudo make rmconfig ===> No user-specified options configured for thunderbird-31.2.0 $ sudo make showconfig ===> The following configuration options are available for thunderbird-31.2.0: DBUS=on: D-Bus IPC system support DEBUG=off: Build with debugging support DTRACE=off: Build with DTrace probes ENIGMAIL=off: Enigmail extension GCONF=off: GConf configuration backend support GIO=on: GIO for file I/O GNOMEUI=off: libgnomeui support module GNOMEVFS2=off: GnomeVFS2 (virtual file system) support GSTREAMER=off: Multimedia support via GStreamer LIBPROXY=off: Proxy support via libproxy LIGHTNING=off: Calendar extension LOGGING=on: Additional log messages OPTIMIZED_CFLAGS=on: Use extra compiler optimizations PGO=off: Use Profile-Guided Optimization PROFILE=off: Build with profiling support TEST=off: Build and/or run tests ====> Options available for the multi AUDIO: you have to choose at least one of them ALSA=on: ALSA audio architecture support PULSEAUDIO=off: PulseAudio sound server support ===> Use 'make config' to modify these settings Expected: ENIGMAIL and LIGHTNING should be on. --- Comment #1 from Bugzilla Automation --- Auto-assigned to maintainer gecko@FreeBSD.org -- You are receiving this mail because: You are the assignee for the bug. From owner-freebsd-gecko@FreeBSD.ORG Thu Nov 20 02:35:21 2014 Return-Path: Delivered-To: gecko@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 6DE843B7 for ; Thu, 20 Nov 2014 02:35:21 +0000 (UTC) Received: from kenobi.freebsd.org (kenobi.freebsd.org [IPv6:2001:1900:2254:206a::16:76]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 55B1DBE5 for ; Thu, 20 Nov 2014 02:35:21 +0000 (UTC) Received: from bugs.freebsd.org ([127.0.1.118]) by kenobi.freebsd.org (8.14.9/8.14.9) with ESMTP id sAK2ZLVD077481 for ; Thu, 20 Nov 2014 02:35:21 GMT (envelope-from bugzilla-noreply@freebsd.org) From: bugzilla-noreply@freebsd.org To: gecko@FreeBSD.org Subject: [Bug 195176] mail/thunderbird OPTIONS broken Date: Thu, 20 Nov 2014 02:35:21 +0000 X-Bugzilla-Reason: AssignedTo X-Bugzilla-Type: changed X-Bugzilla-Watch-Reason: None X-Bugzilla-Product: Ports Tree X-Bugzilla-Component: Individual Port(s) X-Bugzilla-Version: Latest X-Bugzilla-Keywords: X-Bugzilla-Severity: Affects Many People X-Bugzilla-Who: jbeich@vfemail.net X-Bugzilla-Status: In Discussion X-Bugzilla-Priority: --- X-Bugzilla-Assigned-To: gecko@FreeBSD.org X-Bugzilla-Target-Milestone: --- X-Bugzilla-Flags: maintainer-feedback? X-Bugzilla-Changed-Fields: bug_status cc Message-ID: In-Reply-To: References: Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: 7bit X-Bugzilla-URL: https://bugs.freebsd.org/bugzilla/ Auto-Submitted: auto-generated MIME-Version: 1.0 X-BeenThere: freebsd-gecko@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: Gecko Rendering Engine issues List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 20 Nov 2014 02:35:21 -0000 https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=195176 Jan Beich changed: What |Removed |Added ---------------------------------------------------------------------------- Status|Needs Triage |In Discussion CC| |bapt@FreeBSD.org --- Comment #2 from Jan Beich --- Regressed since ports r372672 as bapt@ changed += to =. -- You are receiving this mail because: You are the assignee for the bug. From owner-freebsd-gecko@FreeBSD.ORG Thu Nov 20 02:37:53 2014 Return-Path: Delivered-To: gecko@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id D87A0476 for ; Thu, 20 Nov 2014 02:37:53 +0000 (UTC) Received: from kenobi.freebsd.org (kenobi.freebsd.org [IPv6:2001:1900:2254:206a::16:76]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id C0D0BBF8 for ; Thu, 20 Nov 2014 02:37:53 +0000 (UTC) Received: from bugs.freebsd.org ([127.0.1.118]) by kenobi.freebsd.org (8.14.9/8.14.9) with ESMTP id sAK2brWt078478 for ; Thu, 20 Nov 2014 02:37:53 GMT (envelope-from bugzilla-noreply@freebsd.org) From: bugzilla-noreply@freebsd.org To: gecko@FreeBSD.org Subject: [Bug 195176] mail/thunderbird OPTIONS broken Date: Thu, 20 Nov 2014 02:37:53 +0000 X-Bugzilla-Reason: AssignedTo X-Bugzilla-Type: changed X-Bugzilla-Watch-Reason: None X-Bugzilla-Product: Ports Tree X-Bugzilla-Component: Individual Port(s) X-Bugzilla-Version: Latest X-Bugzilla-Keywords: X-Bugzilla-Severity: Affects Many People X-Bugzilla-Who: jbeich@vfemail.net X-Bugzilla-Status: In Discussion X-Bugzilla-Priority: --- X-Bugzilla-Assigned-To: gecko@FreeBSD.org X-Bugzilla-Target-Milestone: --- X-Bugzilla-Flags: maintainer-feedback? X-Bugzilla-Changed-Fields: attachments.created Message-ID: In-Reply-To: References: Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: 7bit X-Bugzilla-URL: https://bugs.freebsd.org/bugzilla/ Auto-Submitted: auto-generated MIME-Version: 1.0 X-BeenThere: freebsd-gecko@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: Gecko Rendering Engine issues List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 20 Nov 2014 02:37:53 -0000 https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=195176 --- Comment #3 from Jan Beich --- Created attachment 149626 --> https://bugs.freebsd.org/bugzilla/attachment.cgi?id=149626&action=edit fix Temporary fix until bug 194863 lands. -- You are receiving this mail because: You are the assignee for the bug. From owner-freebsd-gecko@FreeBSD.ORG Thu Nov 20 02:38:33 2014 Return-Path: Delivered-To: gecko@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 090F848C for ; Thu, 20 Nov 2014 02:38:33 +0000 (UTC) Received: from kenobi.freebsd.org (kenobi.freebsd.org [IPv6:2001:1900:2254:206a::16:76]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id E5517C00 for ; Thu, 20 Nov 2014 02:38:32 +0000 (UTC) Received: from bugs.freebsd.org ([127.0.1.118]) by kenobi.freebsd.org (8.14.9/8.14.9) with ESMTP id sAK2cWSk078807 for ; Thu, 20 Nov 2014 02:38:32 GMT (envelope-from bugzilla-noreply@freebsd.org) From: bugzilla-noreply@freebsd.org To: gecko@FreeBSD.org Subject: [Bug 195176] mail/thunderbird OPTIONS broken Date: Thu, 20 Nov 2014 02:38:32 +0000 X-Bugzilla-Reason: AssignedTo X-Bugzilla-Type: changed X-Bugzilla-Watch-Reason: None X-Bugzilla-Product: Ports Tree X-Bugzilla-Component: Individual Port(s) X-Bugzilla-Version: Latest X-Bugzilla-Keywords: X-Bugzilla-Severity: Affects Many People X-Bugzilla-Who: jbeich@vfemail.net X-Bugzilla-Status: In Discussion X-Bugzilla-Priority: --- X-Bugzilla-Assigned-To: gecko@FreeBSD.org X-Bugzilla-Target-Milestone: --- X-Bugzilla-Flags: maintainer-feedback+ X-Bugzilla-Changed-Fields: flagtypes.name Message-ID: In-Reply-To: References: Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: 7bit X-Bugzilla-URL: https://bugs.freebsd.org/bugzilla/ Auto-Submitted: auto-generated MIME-Version: 1.0 X-BeenThere: freebsd-gecko@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: Gecko Rendering Engine issues List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 20 Nov 2014 02:38:33 -0000 https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=195176 Jan Beich changed: What |Removed |Added ---------------------------------------------------------------------------- Flags|maintainer-feedback?(gecko@ |maintainer-feedback+ |FreeBSD.org) | -- You are receiving this mail because: You are the assignee for the bug. From owner-freebsd-gecko@FreeBSD.ORG Thu Nov 20 05:57:57 2014 Return-Path: Delivered-To: freebsd-gecko@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id E99B8847 for ; Thu, 20 Nov 2014 05:57:57 +0000 (UTC) Received: from trillian.chruetertee.ch (trillian.chruetertee.ch [217.150.244.247]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 64DF7A6 for ; Thu, 20 Nov 2014 05:57:56 +0000 (UTC) Received: from trillian.chruetertee.ch (trillian [217.150.244.247]) by trillian.chruetertee.ch (8.14.4/8.14.3) with ESMTP id sAK5vlpg071613 for ; Thu, 20 Nov 2014 05:57:47 GMT (envelope-from svn-freebsd-gecko@chruetertee.ch) Received: (from www@localhost) by trillian.chruetertee.ch (8.14.4/8.14.3/Submit) id sAK5vgWl071075 for freebsd-gecko@freebsd.org; Thu, 20 Nov 2014 05:57:42 GMT (envelope-from svn-freebsd-gecko@chruetertee.ch) Date: Thu, 20 Nov 2014 05:57:42 GMT Message-Id: <201411200557.sAK5vgWl071075@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 Subject: [SVN-Commit] r1766 - in trunk: . www/firefox www/firefox-nightly MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Reply-To: freebsd-gecko@freebsd.org X-BeenThere: freebsd-gecko@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: Gecko Rendering Engine issues List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 20 Nov 2014 05:57:58 -0000 Author: jbeich Date: Thu Nov 20 05:57:42 2014 New Revision: 1766 Log: after ports@372768 expose GTK3 for www/firefox and default for -nightly Modified: trunk/Gecko_ChangeLog trunk/www/firefox-nightly/Makefile trunk/www/firefox/Makefile Modified: trunk/Gecko_ChangeLog ============================================================================== --- trunk/Gecko_ChangeLog Wed Nov 19 04:02:13 2014 (r1765) +++ trunk/Gecko_ChangeLog Thu Nov 20 05:57:42 2014 (r1766) @@ -4,3 +4,7 @@ - drop lang/python2 dependency, only lang/python27 is required to build - use DuckDuckGo searchplugin from upstream (has suggestions and purposes) - backport a few about:memory fixes +- add GTK3 option for www/firefox[1] + +[1] Adwaita is a bit broken since Gtk 3.14, see + https://bugzilla.mozilla.org/show_bug.cgi?id=1073117 Modified: trunk/www/firefox-nightly/Makefile ============================================================================== --- trunk/www/firefox-nightly/Makefile Wed Nov 19 04:02:13 2014 (r1765) +++ trunk/www/firefox-nightly/Makefile Thu Nov 20 05:57:42 2014 (r1766) @@ -58,7 +58,7 @@ --enable-application=browser OPTIONS_DEFINE= MACH -OPTIONS_DEFAULT= GTK2 +OPTIONS_DEFAULT= GTK3 OPTIONS_SINGLE+= TOOLKIT OPTIONS_SINGLE_TOOLKIT= GTK2 GTK3 @@ -78,6 +78,10 @@ RUN_DEPENDS+= gstreamer1-libav>=1.2.4_1:${PORTSDIR}/multimedia/gstreamer1-libav .endif +.if ${PORT_OPTIONS:MGTK3} +BUILD_DEPENDS+= gtk3>=3.14.3:${PORTSDIR}/x11-toolkits/gtk30 +.endif + .if ${PORT_OPTIONS:MMACH} && ${PORT_OPTIONS:MPGO} IGNORE= MACH currently does not support PGO build .endif Modified: trunk/www/firefox/Makefile ============================================================================== --- trunk/www/firefox/Makefile Wed Nov 19 04:02:13 2014 (r1765) +++ trunk/www/firefox/Makefile Thu Nov 20 05:57:42 2014 (r1766) @@ -49,6 +49,11 @@ --enable-application=browser \ --enable-official-branding +OPTIONS_DEFAULT= GTK2 + +OPTIONS_SINGLE+= TOOLKIT +OPTIONS_SINGLE_TOOLKIT= GTK2 GTK3 + .include "${.CURDIR}/../../www/firefox/Makefile.options" .include @@ -62,6 +67,10 @@ RUN_DEPENDS+= gstreamer1-libav>=1.2.4_1:${PORTSDIR}/multimedia/gstreamer1-libav .endif +.if ${PORT_OPTIONS:MGTK3} +BUILD_DEPENDS+= gtk3>=3.14.3:${PORTSDIR}/x11-toolkits/gtk30 +.endif + post-extract: @${SED} -e 's|@FIREFOX_ICON@|${FIREFOX_ICON}|' -e 's|@MOZILLA@|${MOZILLA}|' \ -e 's|@MOZILLA_NAME@|${MOZILLA_NAME}|' \ From owner-freebsd-gecko@FreeBSD.ORG Thu Nov 20 07:12:48 2014 Return-Path: Delivered-To: gecko@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id CD2C137E for ; Thu, 20 Nov 2014 07:12:48 +0000 (UTC) Received: from kenobi.freebsd.org (kenobi.freebsd.org [IPv6:2001:1900:2254:206a::16:76]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id B5548A08 for ; Thu, 20 Nov 2014 07:12:48 +0000 (UTC) Received: from bugs.freebsd.org ([127.0.1.118]) by kenobi.freebsd.org (8.14.9/8.14.9) with ESMTP id sAK7Cm1j063769 for ; Thu, 20 Nov 2014 07:12:48 GMT (envelope-from bugzilla-noreply@freebsd.org) From: bugzilla-noreply@freebsd.org To: gecko@FreeBSD.org Subject: [Bug 195176] mail/thunderbird OPTIONS broken Date: Thu, 20 Nov 2014 07:12:48 +0000 X-Bugzilla-Reason: AssignedTo X-Bugzilla-Type: changed X-Bugzilla-Watch-Reason: None X-Bugzilla-Product: Ports Tree X-Bugzilla-Component: Individual Port(s) X-Bugzilla-Version: Latest X-Bugzilla-Keywords: X-Bugzilla-Severity: Affects Many People X-Bugzilla-Who: commit-hook@freebsd.org X-Bugzilla-Status: In Discussion X-Bugzilla-Priority: --- X-Bugzilla-Assigned-To: gecko@FreeBSD.org X-Bugzilla-Target-Milestone: --- X-Bugzilla-Flags: maintainer-feedback+ X-Bugzilla-Changed-Fields: Message-ID: In-Reply-To: References: Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: 7bit X-Bugzilla-URL: https://bugs.freebsd.org/bugzilla/ Auto-Submitted: auto-generated MIME-Version: 1.0 X-BeenThere: freebsd-gecko@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: Gecko Rendering Engine issues List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 20 Nov 2014 07:12:48 -0000 https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=195176 --- Comment #4 from commit-hook@freebsd.org --- A commit references this bug: Author: bapt Date: Thu Nov 20 07:12:15 UTC 2014 New revision: 372853 URL: https://svnweb.freebsd.org/changeset/ports/372853 Log: Fix thunderbird options PR: 195176 Submitted by: Nikolai Lifanov Pointyhat: bapt Changes: head/www/firefox/Makefile.options -- You are receiving this mail because: You are the assignee for the bug. From owner-freebsd-gecko@FreeBSD.ORG Thu Nov 20 07:16:09 2014 Return-Path: Delivered-To: gecko@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 6BEE34CA for ; Thu, 20 Nov 2014 07:16:09 +0000 (UTC) Received: from kenobi.freebsd.org (kenobi.freebsd.org [IPv6:2001:1900:2254:206a::16:76]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 53F42A43 for ; Thu, 20 Nov 2014 07:16:09 +0000 (UTC) Received: from bugs.freebsd.org ([127.0.1.118]) by kenobi.freebsd.org (8.14.9/8.14.9) with ESMTP id sAK7G9KW074314 for ; Thu, 20 Nov 2014 07:16:09 GMT (envelope-from bugzilla-noreply@freebsd.org) From: bugzilla-noreply@freebsd.org To: gecko@FreeBSD.org Subject: [Bug 195176] mail/thunderbird OPTIONS broken Date: Thu, 20 Nov 2014 07:16:09 +0000 X-Bugzilla-Reason: AssignedTo X-Bugzilla-Type: changed X-Bugzilla-Watch-Reason: None X-Bugzilla-Product: Ports Tree X-Bugzilla-Component: Individual Port(s) X-Bugzilla-Version: Latest X-Bugzilla-Keywords: X-Bugzilla-Severity: Affects Many People X-Bugzilla-Who: bapt@FreeBSD.org X-Bugzilla-Status: Issue Resolved X-Bugzilla-Priority: --- X-Bugzilla-Assigned-To: gecko@FreeBSD.org X-Bugzilla-Target-Milestone: --- X-Bugzilla-Flags: maintainer-feedback+ X-Bugzilla-Changed-Fields: bug_status resolution Message-ID: In-Reply-To: References: Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: 7bit X-Bugzilla-URL: https://bugs.freebsd.org/bugzilla/ Auto-Submitted: auto-generated MIME-Version: 1.0 X-BeenThere: freebsd-gecko@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: Gecko Rendering Engine issues List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 20 Nov 2014 07:16:09 -0000 https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=195176 Baptiste Daroussin changed: What |Removed |Added ---------------------------------------------------------------------------- Status|In Discussion |Issue Resolved Resolution|--- |FIXED -- You are receiving this mail because: You are the assignee for the bug. From owner-freebsd-gecko@FreeBSD.ORG Thu Nov 20 10:29:18 2014 Return-Path: Delivered-To: gecko@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id C5188928 for ; Thu, 20 Nov 2014 10:29:18 +0000 (UTC) Received: from mail-wg0-f50.google.com (mail-wg0-f50.google.com [74.125.82.50]) (using TLSv1 with cipher ECDHE-RSA-RC4-SHA (128/128 bits)) (Client CN "smtp.gmail.com", Issuer "Google Internet Authority G2" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 5A0C4228 for ; Thu, 20 Nov 2014 10:29:17 +0000 (UTC) Received: by mail-wg0-f50.google.com with SMTP id k14so3287113wgh.9 for ; Thu, 20 Nov 2014 02:29:10 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:message-id:date:from:user-agent:mime-version:to :subject:content-type; bh=JkaB5zn+5rLRdV+SdnSYvxBI771oNc5I3ZQKWOIB82g=; b=YRPUvSm2jGAjU2dW9XSyf4U7fOUEUPoLTHzWB/om+Wp6dQtUrVXoFtLKec/Q93Xsjy aTlWeh5fIXITzrieoUFm6OBFVwEnB3NHnQ3UOhJH5PFv6a4bO5qUYTvpL3t5Lw2eK2Hn 2kVryzC10reM9AQ+Oj8n7BSA3g4ZFTcjjuAoEw7ruYLwXxWrnnzpPIkQgNHGrA+w6sC4 MO9zQQjgl1bsGpeVkSaDnSXPPGU6ecNHsygJY/5IHZmYlZchBnBbI1OxXqVozcQeDFMA qXEUVqtcxxMkks7WI8yWCRej/G9Od741UYBUvPpm8hvTj1uIiPmKaO9kMqm0a3fFL79e bKUQ== X-Gm-Message-State: ALoCoQmQ0v1Bq7L/m8D24D4augt515iBFtN4tIgqh/QtKLfhzzaBQrga6LLUi4cDNgl6OdPKluwk X-Received: by 10.180.81.134 with SMTP id a6mr13783877wiy.11.1416479350067; Thu, 20 Nov 2014 02:29:10 -0800 (PST) Received: from [144.32.136.27] (aew6pc07.ohm.york.ac.uk. [144.32.136.27]) by mx.google.com with ESMTPSA id dx8sm3467265wib.2.2014.11.20.02.29.08 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 20 Nov 2014 02:29:09 -0800 (PST) Message-ID: <546DC26A.6020805@york.ac.uk> Date: Thu, 20 Nov 2014 10:28:58 +0000 From: Dan Turner User-Agent: Mozilla/5.0 (X11; FreeBSD amd64; rv:31.0) Gecko/20100101 Thunderbird/31.2.0 MIME-Version: 1.0 To: gecko@FreeBSD.org Subject: FireFox persistent seg. faults Content-Type: multipart/signed; micalg=pgp-sha1; protocol="application/pgp-signature"; boundary="dApb9kqrs7086MAVG0Bgq8PVEm2eBunuS" X-BeenThere: freebsd-gecko@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: Gecko Rendering Engine issues List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 20 Nov 2014 10:29:18 -0000 This is an OpenPGP/MIME signed message (RFC 4880 and 3156) --dApb9kqrs7086MAVG0Bgq8PVEm2eBunuS Content-Type: multipart/mixed; boundary="------------020101060001070708010404" This is a multi-part message in MIME format. --------------020101060001070708010404 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable Hi, I'm trying to get to the bottom of a problem I'm having. I am running Firefox 33.0,1 on my FreeBSD 10.0-RELEASE-p9 box. Unfortunately, my FireFox process will quit (seemingly) at random every few hours. Running it from a terminal shows a seg. fault. I attempted to attach gdb to the process to acquire a stack trace, but gdb unexpectedly fell over as soon as I attempted the attach. I'm not sure how to go about retrieving more details for you, so if you could point me in the right direction (there's no man page for console arguments or anything, so I don't know if I could turn up logging, for example?) that would be helpful. This is the browser that I use daily, so I end up with lots of credentials going into it, so I would expect a core dump to contain sensitive information, unless I'm mistaken. The attachment is the console output of my gdb session when it got its pants in a twist. Regards, Dan Turner --=20 Dan Turner The Skills Forge Project Department of Electronics The University of York Heslington, York YO10 4DD Times Higher Education University of the Year 2010 EMAIL DISCLAIMER http://www.york.ac.uk/docs/disclaimer/email.htm --------------020101060001070708010404 Content-Type: text/plain; charset=UTF-8; name="fx-gdb-session.txt" Content-Transfer-Encoding: base64 Content-Disposition: attachment; filename="fx-gdb-session.txt" W1RodSAxNC8xMS8yMCAxMDowNyBHTVRdW3B0cy8zXVthbWQ2NC9mcmVlYnNkMTAuMC8xMC4w LVJFTEVBU0UtcDldWzUuMC43XQo8ZHN0NTAyQGFldzZwYzA3On4+CnpzaC8zIDEwNDQgJSBz dWRvIGdkYgpvdHAtbWQ1IDQ5NiBhZTgwNDMgZXh0ClBhc3N3b3JkOiAKR05VIGdkYiA2LjEu MSBbRnJlZUJTRF0KQ29weXJpZ2h0IDIwMDQgRnJlZSBTb2Z0d2FyZSBGb3VuZGF0aW9uLCBJ bmMuCkdEQiBpcyBmcmVlIHNvZnR3YXJlLCBjb3ZlcmVkIGJ5IHRoZSBHTlUgR2VuZXJhbCBQ dWJsaWMgTGljZW5zZSwgYW5kIHlvdSBhcmUKd2VsY29tZSB0byBjaGFuZ2UgaXQgYW5kL29y IGRpc3RyaWJ1dGUgY29waWVzIG9mIGl0IHVuZGVyIGNlcnRhaW4gY29uZGl0aW9ucy4KVHlw ZSAic2hvdyBjb3B5aW5nIiB0byBzZWUgdGhlIGNvbmRpdGlvbnMuClRoZXJlIGlzIGFic29s dXRlbHkgbm8gd2FycmFudHkgZm9yIEdEQi4gIFR5cGUgInNob3cgd2FycmFudHkiIGZvciBk ZXRhaWxzLgpUaGlzIEdEQiB3YXMgY29uZmlndXJlZCBhcyAiYW1kNjQtbWFyY2VsLWZyZWVi c2QiLgooZ2RiKSBhdHRhY2ggOTgxNzcKQXR0YWNoaW5nIHRvIHByb2Nlc3MgOTgxNzcKL3Vz ci9zcmMvZ251L3Vzci5iaW4vZ2RiL2xpYmdkYi8uLi8uLi8uLi8uLi9jb250cmliL2dkYi9n ZGIvc29saWItc3ZyNC5jOjE0NDQ6IGludGVybmFsLWVycm9yOiBsZWdhY3lfZmV0Y2hfbGlu a19tYXBfb2Zmc2V0cyBjYWxsZWQgd2l0aG91dCBsZWdhY3kgbGlua19tYXAgc3VwCnBvcnQg ZW5hYmxlZC4KQSBwcm9ibGVtIGludGVybmFsIHRvIEdEQiBoYXMgYmVlbiBkZXRlY3RlZCwK ZnVydGhlciBkZWJ1Z2dpbmcgbWF5IHByb3ZlIHVucmVsaWFibGUuClF1aXQgdGhpcyBkZWJ1 Z2dpbmcgc2Vzc2lvbj8gKHkgb3IgbikgeQoKL3Vzci9zcmMvZ251L3Vzci5iaW4vZ2RiL2xp YmdkYi8uLi8uLi8uLi8uLi9jb250cmliL2dkYi9nZGIvc29saWItc3ZyNC5jOjE0NDQ6IGlu dGVybmFsLWVycm9yOiBsZWdhY3lfZmV0Y2hfbGlua19tYXBfb2Zmc2V0cyBjYWxsZWQgd2l0 aG91dCBsZWdhY3kgbGlua19tYXAgc3VwCnBvcnQgZW5hYmxlZC4KQSBwcm9ibGVtIGludGVy bmFsIHRvIEdEQiBoYXMgYmVlbiBkZXRlY3RlZCwKZnVydGhlciBkZWJ1Z2dpbmcgbWF5IHBy b3ZlIHVucmVsaWFibGUuCkNyZWF0ZSBhIGNvcmUgZmlsZSBvZiBHREI/ICh5IG9yIG4pIHkK Cg== --------------020101060001070708010404-- --dApb9kqrs7086MAVG0Bgq8PVEm2eBunuS Content-Type: application/pgp-signature; name="signature.asc" Content-Description: OpenPGP digital signature Content-Disposition: attachment; filename="signature.asc" -----BEGIN PGP SIGNATURE----- Version: GnuPG v2 iQEcBAEBAgAGBQJUbcJzAAoJENMvYM2MQadPOMgIAIGn6KG+W4XfIJoBhGZ/0luL pvugkoIwK7Vt14pCOGco/UtJy035KlpR//c0jCOav0TkTGO0zCzzlzdF+8h7PUIW 1Q2pYHUIWz3qEUHBFzHrQ+TdKGq1tZgZNBOgpelyeEc97YtgJv4QqU1M4LIrCXuo PBRnypW82bzA2B0A/T3wKPVCyCKTr4TLbpotHOeKlctlrByXSdxE+81WlZsjyMgf 01RGo5pdFTGwPHB0jd3+semw2AvCgiXPgw3xt+1H4aWpOLE2+Y8rcuYqHJzrWHHc rxWeFm3BqsIJAK/FLrVjJIw1FrCsp/BCl6EOfz+od1Ps5RjW6vBfYIkWe1iNbV0= =pcFp -----END PGP SIGNATURE----- --dApb9kqrs7086MAVG0Bgq8PVEm2eBunuS-- From owner-freebsd-gecko@FreeBSD.ORG Thu Nov 20 10:35:15 2014 Return-Path: Delivered-To: gecko@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id D9CAA9EC for ; Thu, 20 Nov 2014 10:35:15 +0000 (UTC) Received: from mail.modirum.com (mail.modirum.com [31.185.27.10]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 99E17315 for ; Thu, 20 Nov 2014 10:35:14 +0000 (UTC) Received: from [134.90.150.194] (helo=[192.168.3.161]) by mail.modirum.com with esmtpsa (TLSv1:DHE-RSA-AES256-SHA:256) (Exim 4.80.1 (FreeBSD)) (envelope-from ) id 1XrOkE-000FnK-TD; Thu, 20 Nov 2014 10:13:46 +0000 From: =?utf-8?Q?Eirik_=C3=98verby?= Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable Subject: FreeBSD Port: security/ca_root_nss Date: Thu, 20 Nov 2014 11:13:46 +0100 Message-Id: To: gecko@FreeBSD.org Mime-Version: 1.0 (Mac OS X Mail 8.0 \(1990.1\)) X-Mailer: Apple Mail (2.1990.1) X-SA-Authenticated: Yes X-SA-Exim-Connect-IP: 134.90.150.194 X-SA-Exim-Mail-From: eirik.overby@modirum.com X-SA-Exim-Scanned: No (on mail.modirum.com); SAEximRunCond expanded to false Cc: Espen Tagestad X-BeenThere: freebsd-gecko@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: Gecko Rendering Engine issues List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 20 Nov 2014 10:35:15 -0000 Hi, we just had our package distribution severely broken by the recent = change in ca_root_nss that installs a cert.pem symlink in = /usr/local/etc/ssl by default, with no option to disable during build = time. Since system fetch (and other tools) defaults to reading the file = from /usr/local/etc/ssl before /etc/ssl, this effectively got all our = systems stranded, unable to install/update packages. I see this was discussed on the freebsd-security list, but unfortunately = I did not have time to follow the full discussion (trusting the = conclusion would be, like before, to allow the sysadmin to decide whom = to trust), and therefore did not realise this would be the outcome. I'm sure I'm bikeshedding now, but to me this seems like something that = _should_ have been a build-time option, that _should_ have defaulted to = disabled, and that _really_should_ have been mentioned in UPDATING as it = breaks all kinds of stuff - either by things suddenly not working, or by = introducing security problems (I really REALLY do not want to trust any = 3rd party when it comes to where I fetch my built packages from, for = instance). Apologies if this email seems a bit edgy - it would be because I've just = spent quite a few hours trying to figure out what on earth just = happened... ;-) Wbr Eirik =C3=98verby= From owner-freebsd-gecko@FreeBSD.ORG Sat Nov 22 09:13:47 2014 Return-Path: Delivered-To: freebsd-gecko@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 6C813754 for ; Sat, 22 Nov 2014 09:13:47 +0000 (UTC) Received: from trillian.chruetertee.ch (trillian.chruetertee.ch [217.150.244.247]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 01B0E8A3 for ; Sat, 22 Nov 2014 09:13:46 +0000 (UTC) Received: from trillian.chruetertee.ch (trillian [217.150.244.247]) by trillian.chruetertee.ch (8.14.4/8.14.3) with ESMTP id sAM9DbcZ076047 for ; Sat, 22 Nov 2014 09:13:37 GMT (envelope-from svn-freebsd-gecko@chruetertee.ch) Received: (from www@localhost) by trillian.chruetertee.ch (8.14.4/8.14.3/Submit) id sAM9DWix075626 for freebsd-gecko@freebsd.org; Sat, 22 Nov 2014 09:13:32 GMT (envelope-from svn-freebsd-gecko@chruetertee.ch) Date: Sat, 22 Nov 2014 09:13:32 GMT Message-Id: <201411220913.sAM9DWix075626@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 Subject: [SVN-Commit] r1767 - trunk/www/firefox-nightly MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Reply-To: freebsd-gecko@freebsd.org X-BeenThere: freebsd-gecko@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: Gecko Rendering Engine issues List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 22 Nov 2014 09:13:47 -0000 Author: jbeich Date: Sat Nov 22 09:13:32 2014 New Revision: 1767 Log: replace build status with meeting notes link The notes are mostly about major changes happening in Gecko engine like Electrolysis being recently enabled by default and causing breakage in extensions and elsewhere. Maybe easier to comprehend than trying to read ~1500 commit logs each week. Modified: trunk/www/firefox-nightly/pkg-descr Modified: trunk/www/firefox-nightly/pkg-descr ============================================================================== --- trunk/www/firefox-nightly/pkg-descr Thu Nov 20 05:57:42 2014 (r1766) +++ trunk/www/firefox-nightly/pkg-descr Sat Nov 22 09:13:32 2014 (r1767) @@ -13,4 +13,4 @@ patches, etc. WWW: https://nightly.mozilla.org/ -WWW: https://treeherder.mozilla.org/ui/#/jobs?repo=mozilla-inbound +WWW: https://wiki.mozilla.org/Platform/ From owner-freebsd-gecko@FreeBSD.ORG Sat Nov 22 10:43:17 2014 Return-Path: Delivered-To: freebsd-gecko@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 28C26DA6 for ; Sat, 22 Nov 2014 10:43:17 +0000 (UTC) Received: from trillian.chruetertee.ch (trillian.chruetertee.ch [217.150.244.247]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 25EF71000 for ; Sat, 22 Nov 2014 10:43:15 +0000 (UTC) Received: from trillian.chruetertee.ch (trillian [217.150.244.247]) by trillian.chruetertee.ch (8.14.4/8.14.3) with ESMTP id sAMAhCqn084406 for ; Sat, 22 Nov 2014 10:43: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 sAMAh76V083395 for freebsd-gecko@freebsd.org; Sat, 22 Nov 2014 10:43:07 GMT (envelope-from svn-freebsd-gecko@chruetertee.ch) Date: Sat, 22 Nov 2014 10:43:07 GMT Message-Id: <201411221043.sAMAh76V083395@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 Subject: [SVN-Commit] r1768 - in trunk: . mail/thunderbird/files www/firefox-esr/files www/firefox/files www/libxul/files www/seamonkey/files MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Reply-To: freebsd-gecko@freebsd.org X-BeenThere: freebsd-gecko@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: Gecko Rendering Engine issues List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 22 Nov 2014 10:43:17 -0000 Author: jbeich Date: Sat Nov 22 10:43:07 2014 New Revision: 1768 Log: improve web notifications Added: trunk/mail/thunderbird/files/patch-bug858919 trunk/www/firefox-esr/files/patch-bug858919 trunk/www/firefox/files/patch-bug858919 trunk/www/libxul/files/patch-bug858919 trunk/www/seamonkey/files/patch-bug858919 Modified: trunk/Gecko_ChangeLog Modified: trunk/Gecko_ChangeLog ============================================================================== --- trunk/Gecko_ChangeLog Sat Nov 22 09:13:32 2014 (r1767) +++ trunk/Gecko_ChangeLog Sat Nov 22 10:43:07 2014 (r1768) @@ -4,6 +4,7 @@ - drop lang/python2 dependency, only lang/python27 is required to build - use DuckDuckGo searchplugin from upstream (has suggestions and purposes) - backport a few about:memory fixes +- backport Web Notifications libnotify integration - add GTK3 option for www/firefox[1] [1] Adwaita is a bit broken since Gtk 3.14, see Added: trunk/mail/thunderbird/files/patch-bug858919 ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ trunk/mail/thunderbird/files/patch-bug858919 Sat Nov 22 10:43:07 2014 (r1768) @@ -0,0 +1,392 @@ +commit a33d4f7 +Author: Martin Stransky +Date: Fri Nov 14 04:04:00 2014 +0100 + + Bug 858919 - Add support for libnotify calls which was removed for new notification API. r=karlt +--- + toolkit/components/alerts/nsAlertsService.cpp | 10 +-- + toolkit/system/gnome/moz.build | 2 + + toolkit/system/gnome/nsAlertsIconListener.cpp | 64 ++++++++++++------ + toolkit/system/gnome/nsAlertsIconListener.h | 89 ++++++++++++++++++++++++++ + toolkit/system/gnome/nsGnomeModule.cpp | 5 ++ + toolkit/system/gnome/nsSystemAlertsService.cpp | 54 ++++++++++++++++ + toolkit/system/gnome/nsSystemAlertsService.h | 27 ++++++++ + 7 files changed, 226 insertions(+), 25 deletions(-) + +diff --git toolkit/components/alerts/nsAlertsService.cpp toolkit/components/alerts/nsAlertsService.cpp +index 93f4536..f8b5e07 100644 +--- mozilla/toolkit/components/alerts/nsAlertsService.cpp ++++ mozilla/toolkit/components/alerts/nsAlertsService.cpp +@@ -100,9 +100,11 @@ NS_IMETHODIMP nsAlertsService::ShowAlertNotification(const nsAString & aImageUrl + nsCOMPtr sysAlerts(do_GetService(NS_SYSTEMALERTSERVICE_CONTRACTID)); + nsresult rv; + if (sysAlerts) { +- return sysAlerts->ShowAlertNotification(aImageUrl, aAlertTitle, aAlertText, aAlertTextClickable, +- aAlertCookie, aAlertListener, aAlertName, +- aBidi, aLang, IPC::Principal(aPrincipal)); ++ rv = sysAlerts->ShowAlertNotification(aImageUrl, aAlertTitle, aAlertText, aAlertTextClickable, ++ aAlertCookie, aAlertListener, aAlertName, ++ aBidi, aLang, IPC::Principal(aPrincipal)); ++ if (NS_SUCCEEDED(rv)) ++ return NS_OK; + } + + if (!ShouldShowAlert()) { +diff --git toolkit/system/gnome/moz.build toolkit/system/gnome/moz.build +index c033f8b..9242209 100644 +--- mozilla/toolkit/system/gnome/moz.build ++++ mozilla/toolkit/system/gnome/moz.build +@@ -5,7 +5,9 @@ + # file, You can obtain one at http://mozilla.org/MPL/2.0/. + + SOURCES += [ ++ 'nsAlertsIconListener.cpp', + 'nsGnomeModule.cpp', ++ 'nsSystemAlertsService.cpp', + ] + + if CONFIG['MOZ_ENABLE_GCONF']: +diff --git toolkit/system/gnome/nsAlertsIconListener.cpp toolkit/system/gnome/nsAlertsIconListener.cpp +index f39335e..55f4356 100644 +--- mozilla/toolkit/system/gnome/nsAlertsIconListener.cpp ++++ mozilla/toolkit/system/gnome/nsAlertsIconListener.cpp +@@ -51,6 +51,21 @@ static void notify_closed_marshal(GClosure* closure, + NS_RELEASE(alert); + } + ++static GdkPixbuf* ++GetPixbufFromImgRequest(imgIRequest* aRequest) ++{ ++ nsCOMPtr image; ++ nsresult rv = aRequest->GetImage(getter_AddRefs(image)); ++ if (NS_FAILED(rv)) { ++ return nullptr; ++ } ++ ++ nsCOMPtr imgToPixbuf = ++ do_GetService("@mozilla.org/widget/image-to-gdk-pixbuf;1"); ++ ++ return imgToPixbuf->ConvertImageToPixbuf(image); ++} ++ + NS_IMPL_ISUPPORTS(nsAlertsIconListener, imgINotificationObserver, + nsIObserver, nsISupportsWeakReference) + +@@ -106,47 +121,45 @@ nsAlertsIconListener::Notify(imgIRequest *aRequest, int32_t aType, const nsIntRe + nsresult + nsAlertsIconListener::OnStopRequest(imgIRequest* aRequest) + { ++ NS_ASSERTION(mIconRequest == aRequest, "aRequest does not match!"); ++ + uint32_t imgStatus = imgIRequest::STATUS_ERROR; + nsresult rv = aRequest->GetImageStatus(&imgStatus); + NS_ENSURE_SUCCESS(rv, rv); + if (imgStatus == imgIRequest::STATUS_ERROR && !mLoadedFrame) { + // We have an error getting the image. Display the notification with no icon. + ShowAlert(nullptr); +- } + +- if (mIconRequest) { ++ // Cancel any pending request + mIconRequest->Cancel(NS_BINDING_ABORTED); + mIconRequest = nullptr; + } ++ + return NS_OK; + } + + nsresult + nsAlertsIconListener::OnStopFrame(imgIRequest* aRequest) + { +- if (aRequest != mIconRequest) +- return NS_ERROR_FAILURE; ++ NS_ASSERTION(mIconRequest == aRequest, "aRequest does not match!"); + + if (mLoadedFrame) + return NS_OK; // only use one frame + +- nsCOMPtr image; +- nsresult rv = aRequest->GetImage(getter_AddRefs(image)); +- if (NS_FAILED(rv)) +- return rv; +- +- nsCOMPtr imgToPixbuf = +- do_GetService("@mozilla.org/widget/image-to-gdk-pixbuf;1"); +- +- GdkPixbuf* imagePixbuf = imgToPixbuf->ConvertImageToPixbuf(image); +- if (!imagePixbuf) +- return NS_ERROR_FAILURE; ++ GdkPixbuf* imagePixbuf = GetPixbufFromImgRequest(aRequest); ++ if (!imagePixbuf) { ++ ShowAlert(nullptr); ++ } else { ++ ShowAlert(imagePixbuf); ++ g_object_unref(imagePixbuf); ++ } + +- ShowAlert(imagePixbuf); ++ mLoadedFrame = true; + +- g_object_unref(imagePixbuf); ++ // Cancel any pending request (multipart image loading/decoding for instance) ++ mIconRequest->Cancel(NS_BINDING_ABORTED); ++ mIconRequest = nullptr; + +- mLoadedFrame = true; + return NS_OK; + } + +@@ -180,6 +193,9 @@ nsAlertsIconListener::ShowAlert(GdkPixbuf* aPixbuf) + mClosureHandler = g_signal_connect_closure(mNotification, "closed", closure, FALSE); + gboolean result = notify_notification_show(mNotification, nullptr); + ++ if (result && mAlertListener) ++ mAlertListener->Observe(nullptr, "alertshow", mAlertCookie.get()); ++ + return result ? NS_OK : NS_ERROR_FAILURE; + } + +@@ -201,9 +217,15 @@ nsAlertsIconListener::StartRequest(const nsAString & aImageUrl) + if (!il) + return ShowAlert(nullptr); + +- return il->LoadImageXPCOM(imageUri, nullptr, nullptr, nullptr, nullptr, +- this, nullptr, nsIRequest::LOAD_NORMAL, nullptr, +- nullptr, getter_AddRefs(mIconRequest)); ++ nsresult rv = il->LoadImageXPCOM(imageUri, nullptr, nullptr, nullptr, nullptr, ++ this, nullptr, nsIRequest::LOAD_NORMAL, nullptr, ++ 0 /* use default */, getter_AddRefs(mIconRequest)); ++ if (NS_FAILED(rv)) ++ return rv; ++ ++ mIconRequest->StartDecoding(); ++ ++ return NS_OK; + } + + void +diff --git toolkit/system/gnome/nsAlertsIconListener.h toolkit/system/gnome/nsAlertsIconListener.h +new file mode 100644 +index 0000000..ac96db9 +--- /dev/null ++++ mozilla/toolkit/system/gnome/nsAlertsIconListener.h +@@ -0,0 +1,89 @@ ++/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */ ++/* This Source Code Form is subject to the terms of the Mozilla Public ++ * License, v. 2.0. If a copy of the MPL was not distributed with this ++ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ ++ ++#ifndef nsAlertsIconListener_h__ ++#define nsAlertsIconListener_h__ ++ ++#include "nsCOMPtr.h" ++#include "imgINotificationObserver.h" ++#include "nsStringAPI.h" ++#include "nsIObserver.h" ++#include "nsWeakReference.h" ++ ++#include ++ ++class imgIRequest; ++ ++struct NotifyNotification; ++ ++class nsAlertsIconListener : public imgINotificationObserver, ++ public nsIObserver, ++ public nsSupportsWeakReference ++{ ++public: ++ NS_DECL_ISUPPORTS ++ NS_DECL_IMGINOTIFICATIONOBSERVER ++ NS_DECL_NSIOBSERVER ++ ++ nsAlertsIconListener(); ++ ++ nsresult InitAlertAsync(const nsAString & aImageUrl, ++ const nsAString & aAlertTitle, ++ const nsAString & aAlertText, ++ bool aAlertTextClickable, ++ const nsAString & aAlertCookie, ++ nsIObserver * aAlertListener); ++ ++ void SendCallback(); ++ void SendClosed(); ++ ++protected: ++ virtual ~nsAlertsIconListener(); ++ ++ nsresult OnStopRequest(imgIRequest* aRequest); ++ nsresult OnStopFrame(imgIRequest* aRequest); ++ ++ /** ++ * The only difference between libnotify.so.4 and libnotify.so.1 for these symbols ++ * is that notify_notification_new takes three arguments in libnotify.so.4 and ++ * four in libnotify.so.1. ++ * Passing the fourth argument as NULL is binary compatible. ++ */ ++ typedef void (*NotifyActionCallback)(NotifyNotification*, char*, gpointer); ++ typedef bool (*notify_is_initted_t)(void); ++ typedef bool (*notify_init_t)(const char*); ++ typedef GList* (*notify_get_server_caps_t)(void); ++ typedef NotifyNotification* (*notify_notification_new_t)(const char*, const char*, const char*, const char*); ++ typedef bool (*notify_notification_show_t)(void*, char*); ++ typedef void (*notify_notification_set_icon_from_pixbuf_t)(void*, GdkPixbuf*); ++ typedef void (*notify_notification_add_action_t)(void*, const char*, const char*, NotifyActionCallback, gpointer, GFreeFunc); ++ ++ nsCOMPtr mIconRequest; ++ nsCString mAlertTitle; ++ nsCString mAlertText; ++ ++ nsCOMPtr mAlertListener; ++ nsString mAlertCookie; ++ ++ bool mLoadedFrame; ++ bool mAlertHasAction; ++ ++ static void* libNotifyHandle; ++ static bool libNotifyNotAvail; ++ static notify_is_initted_t notify_is_initted; ++ static notify_init_t notify_init; ++ static notify_get_server_caps_t notify_get_server_caps; ++ static notify_notification_new_t notify_notification_new; ++ static notify_notification_show_t notify_notification_show; ++ static notify_notification_set_icon_from_pixbuf_t notify_notification_set_icon_from_pixbuf; ++ static notify_notification_add_action_t notify_notification_add_action; ++ NotifyNotification* mNotification; ++ gulong mClosureHandler; ++ ++ nsresult StartRequest(const nsAString & aImageUrl); ++ nsresult ShowAlert(GdkPixbuf* aPixbuf); ++}; ++ ++#endif +diff --git toolkit/system/gnome/nsGnomeModule.cpp toolkit/system/gnome/nsGnomeModule.cpp +index 5ccc8e5..f893893 100644 +--- mozilla/toolkit/system/gnome/nsGnomeModule.cpp ++++ mozilla/toolkit/system/gnome/nsGnomeModule.cpp +@@ -22,6 +22,8 @@ NS_GENERIC_FACTORY_CONSTRUCTOR_INIT(nsGnomeVFSService, Init) + NS_GENERIC_FACTORY_CONSTRUCTOR(nsGIOService) + NS_GENERIC_FACTORY_CONSTRUCTOR_INIT(nsGSettingsService, Init) + #endif ++#include "nsSystemAlertsService.h" ++NS_GENERIC_FACTORY_CONSTRUCTOR_INIT(nsSystemAlertsService, Init) + + #ifdef MOZ_ENABLE_GCONF + NS_DEFINE_NAMED_CID(NS_GCONFSERVICE_CID); +@@ -33,6 +35,7 @@ NS_DEFINE_NAMED_CID(NS_GNOMEVFSSERVICE_CID); + NS_DEFINE_NAMED_CID(NS_GIOSERVICE_CID); + NS_DEFINE_NAMED_CID(NS_GSETTINGSSERVICE_CID); + #endif ++NS_DEFINE_NAMED_CID(NS_SYSTEMALERTSSERVICE_CID); + + static const mozilla::Module::CIDEntry kGnomeCIDs[] = { + #ifdef MOZ_ENABLE_GCONF +@@ -45,6 +48,7 @@ static const mozilla::Module::CIDEntry kGnomeCIDs[] = { + { &kNS_GIOSERVICE_CID, false, nullptr, nsGIOServiceConstructor }, + { &kNS_GSETTINGSSERVICE_CID, false, nullptr, nsGSettingsServiceConstructor }, + #endif ++ { &kNS_SYSTEMALERTSSERVICE_CID, false, nullptr, nsSystemAlertsServiceConstructor }, + { nullptr } + }; + +@@ -59,6 +63,7 @@ static const mozilla::Module::ContractIDEntry kGnomeContracts[] = { + { NS_GIOSERVICE_CONTRACTID, &kNS_GIOSERVICE_CID }, + { NS_GSETTINGSSERVICE_CONTRACTID, &kNS_GSETTINGSSERVICE_CID }, + #endif ++ { NS_SYSTEMALERTSERVICE_CONTRACTID, &kNS_SYSTEMALERTSSERVICE_CID }, + { nullptr } + }; + +diff --git toolkit/system/gnome/nsSystemAlertsService.cpp toolkit/system/gnome/nsSystemAlertsService.cpp +new file mode 100644 +index 0000000..b91b402 +--- /dev/null ++++ mozilla/toolkit/system/gnome/nsSystemAlertsService.cpp +@@ -0,0 +1,54 @@ ++/* -*- Mode: C++; tab-width: 2; indent-tabs-mode:nil; c-basic-offset: 2 -*- */ ++/* This Source Code Form is subject to the terms of the Mozilla Public ++ * License, v. 2.0. If a copy of the MPL was not distributed with this ++ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ ++ ++#include "nsXULAppAPI.h" ++#include "nsSystemAlertsService.h" ++#include "nsAlertsIconListener.h" ++#include "nsAutoPtr.h" ++ ++NS_IMPL_ADDREF(nsSystemAlertsService) ++NS_IMPL_RELEASE(nsSystemAlertsService) ++ ++NS_INTERFACE_MAP_BEGIN(nsSystemAlertsService) ++ NS_INTERFACE_MAP_ENTRY_AMBIGUOUS(nsISupports, nsIAlertsService) ++ NS_INTERFACE_MAP_ENTRY(nsIAlertsService) ++NS_INTERFACE_MAP_END_THREADSAFE ++ ++nsSystemAlertsService::nsSystemAlertsService() ++{ ++} ++ ++nsSystemAlertsService::~nsSystemAlertsService() ++{} ++ ++nsresult ++nsSystemAlertsService::Init() ++{ ++ return NS_OK; ++} ++ ++NS_IMETHODIMP nsSystemAlertsService::ShowAlertNotification(const nsAString & aImageUrl, const nsAString & aAlertTitle, ++ const nsAString & aAlertText, bool aAlertTextClickable, ++ const nsAString & aAlertCookie, ++ nsIObserver * aAlertListener, ++ const nsAString & aAlertName, ++ const nsAString & aBidi, ++ const nsAString & aLang, ++ const nsAString & aData, ++ nsIPrincipal * aPrincipal) ++{ ++ nsRefPtr alertListener = new nsAlertsIconListener(); ++ if (!alertListener) ++ return NS_ERROR_OUT_OF_MEMORY; ++ ++ return alertListener->InitAlertAsync(aImageUrl, aAlertTitle, aAlertText, aAlertTextClickable, ++ aAlertCookie, aAlertListener); ++} ++ ++NS_IMETHODIMP nsSystemAlertsService::CloseAlert(const nsAString& aAlertName, ++ nsIPrincipal* aPrincipal) ++{ ++ return NS_ERROR_NOT_IMPLEMENTED; ++} +diff --git toolkit/system/gnome/nsSystemAlertsService.h toolkit/system/gnome/nsSystemAlertsService.h +new file mode 100644 +index 0000000..b0bd625 +--- /dev/null ++++ mozilla/toolkit/system/gnome/nsSystemAlertsService.h +@@ -0,0 +1,27 @@ ++/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */ ++/* This Source Code Form is subject to the terms of the Mozilla Public ++ * License, v. 2.0. If a copy of the MPL was not distributed with this ++ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ ++ ++#ifndef nsSystemAlertsService_h__ ++#define nsSystemAlertsService_h__ ++ ++#include "nsIAlertsService.h" ++#include "nsCOMPtr.h" ++ ++class nsSystemAlertsService : public nsIAlertsService ++{ ++public: ++ NS_DECL_NSIALERTSSERVICE ++ NS_DECL_ISUPPORTS ++ ++ nsSystemAlertsService(); ++ ++ nsresult Init(); ++ ++protected: ++ virtual ~nsSystemAlertsService(); ++ ++}; ++ ++#endif /* nsSystemAlertsService_h__ */ Added: trunk/www/firefox-esr/files/patch-bug858919 ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ trunk/www/firefox-esr/files/patch-bug858919 Sat Nov 22 10:43:07 2014 (r1768) @@ -0,0 +1,392 @@ +commit a33d4f7 +Author: Martin Stransky +Date: Fri Nov 14 04:04:00 2014 +0100 + + Bug 858919 - Add support for libnotify calls which was removed for new notification API. r=karlt +--- + toolkit/components/alerts/nsAlertsService.cpp | 10 +-- + toolkit/system/gnome/moz.build | 2 + + toolkit/system/gnome/nsAlertsIconListener.cpp | 64 ++++++++++++------ + toolkit/system/gnome/nsAlertsIconListener.h | 89 ++++++++++++++++++++++++++ + toolkit/system/gnome/nsGnomeModule.cpp | 5 ++ + toolkit/system/gnome/nsSystemAlertsService.cpp | 54 ++++++++++++++++ + toolkit/system/gnome/nsSystemAlertsService.h | 27 ++++++++ + 7 files changed, 226 insertions(+), 25 deletions(-) + +diff --git toolkit/components/alerts/nsAlertsService.cpp toolkit/components/alerts/nsAlertsService.cpp +index 93f4536..f8b5e07 100644 +--- toolkit/components/alerts/nsAlertsService.cpp ++++ toolkit/components/alerts/nsAlertsService.cpp +@@ -100,9 +100,11 @@ NS_IMETHODIMP nsAlertsService::ShowAlertNotification(const nsAString & aImageUrl + nsCOMPtr sysAlerts(do_GetService(NS_SYSTEMALERTSERVICE_CONTRACTID)); + nsresult rv; + if (sysAlerts) { +- return sysAlerts->ShowAlertNotification(aImageUrl, aAlertTitle, aAlertText, aAlertTextClickable, +- aAlertCookie, aAlertListener, aAlertName, +- aBidi, aLang, IPC::Principal(aPrincipal)); ++ rv = sysAlerts->ShowAlertNotification(aImageUrl, aAlertTitle, aAlertText, aAlertTextClickable, ++ aAlertCookie, aAlertListener, aAlertName, ++ aBidi, aLang, IPC::Principal(aPrincipal)); ++ if (NS_SUCCEEDED(rv)) ++ return NS_OK; + } + + if (!ShouldShowAlert()) { +diff --git toolkit/system/gnome/moz.build toolkit/system/gnome/moz.build +index c033f8b..9242209 100644 +--- toolkit/system/gnome/moz.build ++++ toolkit/system/gnome/moz.build +@@ -5,7 +5,9 @@ + # file, You can obtain one at http://mozilla.org/MPL/2.0/. + + SOURCES += [ ++ 'nsAlertsIconListener.cpp', + 'nsGnomeModule.cpp', ++ 'nsSystemAlertsService.cpp', + ] + + if CONFIG['MOZ_ENABLE_GCONF']: +diff --git toolkit/system/gnome/nsAlertsIconListener.cpp toolkit/system/gnome/nsAlertsIconListener.cpp +index f39335e..55f4356 100644 +--- toolkit/system/gnome/nsAlertsIconListener.cpp ++++ toolkit/system/gnome/nsAlertsIconListener.cpp +@@ -51,6 +51,21 @@ static void notify_closed_marshal(GClosure* closure, + NS_RELEASE(alert); + } + ++static GdkPixbuf* ++GetPixbufFromImgRequest(imgIRequest* aRequest) ++{ ++ nsCOMPtr image; ++ nsresult rv = aRequest->GetImage(getter_AddRefs(image)); ++ if (NS_FAILED(rv)) { ++ return nullptr; ++ } ++ ++ nsCOMPtr imgToPixbuf = ++ do_GetService("@mozilla.org/widget/image-to-gdk-pixbuf;1"); ++ ++ return imgToPixbuf->ConvertImageToPixbuf(image); ++} ++ + NS_IMPL_ISUPPORTS(nsAlertsIconListener, imgINotificationObserver, + nsIObserver, nsISupportsWeakReference) + +@@ -106,47 +121,45 @@ nsAlertsIconListener::Notify(imgIRequest *aRequest, int32_t aType, const nsIntRe + nsresult + nsAlertsIconListener::OnStopRequest(imgIRequest* aRequest) + { ++ NS_ASSERTION(mIconRequest == aRequest, "aRequest does not match!"); ++ + uint32_t imgStatus = imgIRequest::STATUS_ERROR; + nsresult rv = aRequest->GetImageStatus(&imgStatus); + NS_ENSURE_SUCCESS(rv, rv); + if (imgStatus == imgIRequest::STATUS_ERROR && !mLoadedFrame) { + // We have an error getting the image. Display the notification with no icon. + ShowAlert(nullptr); +- } + +- if (mIconRequest) { ++ // Cancel any pending request + mIconRequest->Cancel(NS_BINDING_ABORTED); + mIconRequest = nullptr; + } ++ + return NS_OK; + } + + nsresult + nsAlertsIconListener::OnStopFrame(imgIRequest* aRequest) + { +- if (aRequest != mIconRequest) +- return NS_ERROR_FAILURE; ++ NS_ASSERTION(mIconRequest == aRequest, "aRequest does not match!"); + + if (mLoadedFrame) + return NS_OK; // only use one frame + +- nsCOMPtr image; +- nsresult rv = aRequest->GetImage(getter_AddRefs(image)); +- if (NS_FAILED(rv)) +- return rv; +- +- nsCOMPtr imgToPixbuf = +- do_GetService("@mozilla.org/widget/image-to-gdk-pixbuf;1"); +- +- GdkPixbuf* imagePixbuf = imgToPixbuf->ConvertImageToPixbuf(image); +- if (!imagePixbuf) +- return NS_ERROR_FAILURE; ++ GdkPixbuf* imagePixbuf = GetPixbufFromImgRequest(aRequest); ++ if (!imagePixbuf) { ++ ShowAlert(nullptr); ++ } else { ++ ShowAlert(imagePixbuf); ++ g_object_unref(imagePixbuf); ++ } + +- ShowAlert(imagePixbuf); ++ mLoadedFrame = true; + +- g_object_unref(imagePixbuf); ++ // Cancel any pending request (multipart image loading/decoding for instance) ++ mIconRequest->Cancel(NS_BINDING_ABORTED); ++ mIconRequest = nullptr; + +- mLoadedFrame = true; + return NS_OK; + } + +@@ -180,6 +193,9 @@ nsAlertsIconListener::ShowAlert(GdkPixbuf* aPixbuf) + mClosureHandler = g_signal_connect_closure(mNotification, "closed", closure, FALSE); + gboolean result = notify_notification_show(mNotification, nullptr); + ++ if (result && mAlertListener) ++ mAlertListener->Observe(nullptr, "alertshow", mAlertCookie.get()); ++ + return result ? NS_OK : NS_ERROR_FAILURE; + } + +@@ -201,9 +217,15 @@ nsAlertsIconListener::StartRequest(const nsAString & aImageUrl) + if (!il) + return ShowAlert(nullptr); + +- return il->LoadImageXPCOM(imageUri, nullptr, nullptr, nullptr, nullptr, +- this, nullptr, nsIRequest::LOAD_NORMAL, nullptr, +- nullptr, getter_AddRefs(mIconRequest)); ++ nsresult rv = il->LoadImageXPCOM(imageUri, nullptr, nullptr, nullptr, nullptr, ++ this, nullptr, nsIRequest::LOAD_NORMAL, nullptr, ++ 0 /* use default */, getter_AddRefs(mIconRequest)); ++ if (NS_FAILED(rv)) ++ return rv; ++ ++ mIconRequest->StartDecoding(); ++ ++ return NS_OK; + } + + void +diff --git toolkit/system/gnome/nsAlertsIconListener.h toolkit/system/gnome/nsAlertsIconListener.h +new file mode 100644 +index 0000000..ac96db9 +--- /dev/null ++++ toolkit/system/gnome/nsAlertsIconListener.h +@@ -0,0 +1,89 @@ ++/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */ ++/* This Source Code Form is subject to the terms of the Mozilla Public ++ * License, v. 2.0. If a copy of the MPL was not distributed with this ++ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ ++ ++#ifndef nsAlertsIconListener_h__ ++#define nsAlertsIconListener_h__ ++ ++#include "nsCOMPtr.h" ++#include "imgINotificationObserver.h" ++#include "nsStringAPI.h" ++#include "nsIObserver.h" ++#include "nsWeakReference.h" ++ ++#include ++ ++class imgIRequest; ++ ++struct NotifyNotification; ++ ++class nsAlertsIconListener : public imgINotificationObserver, ++ public nsIObserver, ++ public nsSupportsWeakReference ++{ ++public: ++ NS_DECL_ISUPPORTS ++ NS_DECL_IMGINOTIFICATIONOBSERVER ++ NS_DECL_NSIOBSERVER ++ ++ nsAlertsIconListener(); ++ ++ nsresult InitAlertAsync(const nsAString & aImageUrl, ++ const nsAString & aAlertTitle, ++ const nsAString & aAlertText, ++ bool aAlertTextClickable, ++ const nsAString & aAlertCookie, ++ nsIObserver * aAlertListener); ++ ++ void SendCallback(); ++ void SendClosed(); ++ ++protected: ++ virtual ~nsAlertsIconListener(); ++ ++ nsresult OnStopRequest(imgIRequest* aRequest); ++ nsresult OnStopFrame(imgIRequest* aRequest); ++ ++ /** ++ * The only difference between libnotify.so.4 and libnotify.so.1 for these symbols ++ * is that notify_notification_new takes three arguments in libnotify.so.4 and ++ * four in libnotify.so.1. ++ * Passing the fourth argument as NULL is binary compatible. ++ */ ++ typedef void (*NotifyActionCallback)(NotifyNotification*, char*, gpointer); ++ typedef bool (*notify_is_initted_t)(void); ++ typedef bool (*notify_init_t)(const char*); ++ typedef GList* (*notify_get_server_caps_t)(void); ++ typedef NotifyNotification* (*notify_notification_new_t)(const char*, const char*, const char*, const char*); ++ typedef bool (*notify_notification_show_t)(void*, char*); ++ typedef void (*notify_notification_set_icon_from_pixbuf_t)(void*, GdkPixbuf*); ++ typedef void (*notify_notification_add_action_t)(void*, const char*, const char*, NotifyActionCallback, gpointer, GFreeFunc); ++ ++ nsCOMPtr mIconRequest; ++ nsCString mAlertTitle; ++ nsCString mAlertText; ++ ++ nsCOMPtr mAlertListener; ++ nsString mAlertCookie; ++ ++ bool mLoadedFrame; ++ bool mAlertHasAction; ++ ++ static void* libNotifyHandle; ++ static bool libNotifyNotAvail; ++ static notify_is_initted_t notify_is_initted; ++ static notify_init_t notify_init; ++ static notify_get_server_caps_t notify_get_server_caps; ++ static notify_notification_new_t notify_notification_new; ++ static notify_notification_show_t notify_notification_show; ++ static notify_notification_set_icon_from_pixbuf_t notify_notification_set_icon_from_pixbuf; ++ static notify_notification_add_action_t notify_notification_add_action; ++ NotifyNotification* mNotification; ++ gulong mClosureHandler; ++ ++ nsresult StartRequest(const nsAString & aImageUrl); ++ nsresult ShowAlert(GdkPixbuf* aPixbuf); ++}; ++ ++#endif +diff --git toolkit/system/gnome/nsGnomeModule.cpp toolkit/system/gnome/nsGnomeModule.cpp +index 5ccc8e5..f893893 100644 +--- toolkit/system/gnome/nsGnomeModule.cpp ++++ toolkit/system/gnome/nsGnomeModule.cpp +@@ -22,6 +22,8 @@ NS_GENERIC_FACTORY_CONSTRUCTOR_INIT(nsGnomeVFSService, Init) + NS_GENERIC_FACTORY_CONSTRUCTOR(nsGIOService) + NS_GENERIC_FACTORY_CONSTRUCTOR_INIT(nsGSettingsService, Init) + #endif ++#include "nsSystemAlertsService.h" ++NS_GENERIC_FACTORY_CONSTRUCTOR_INIT(nsSystemAlertsService, Init) + + #ifdef MOZ_ENABLE_GCONF + NS_DEFINE_NAMED_CID(NS_GCONFSERVICE_CID); +@@ -33,6 +35,7 @@ NS_DEFINE_NAMED_CID(NS_GNOMEVFSSERVICE_CID); + NS_DEFINE_NAMED_CID(NS_GIOSERVICE_CID); + NS_DEFINE_NAMED_CID(NS_GSETTINGSSERVICE_CID); + #endif ++NS_DEFINE_NAMED_CID(NS_SYSTEMALERTSSERVICE_CID); + + static const mozilla::Module::CIDEntry kGnomeCIDs[] = { + #ifdef MOZ_ENABLE_GCONF +@@ -45,6 +48,7 @@ static const mozilla::Module::CIDEntry kGnomeCIDs[] = { + { &kNS_GIOSERVICE_CID, false, nullptr, nsGIOServiceConstructor }, + { &kNS_GSETTINGSSERVICE_CID, false, nullptr, nsGSettingsServiceConstructor }, + #endif ++ { &kNS_SYSTEMALERTSSERVICE_CID, false, nullptr, nsSystemAlertsServiceConstructor }, + { nullptr } + }; + +@@ -59,6 +63,7 @@ static const mozilla::Module::ContractIDEntry kGnomeContracts[] = { + { NS_GIOSERVICE_CONTRACTID, &kNS_GIOSERVICE_CID }, + { NS_GSETTINGSSERVICE_CONTRACTID, &kNS_GSETTINGSSERVICE_CID }, + #endif ++ { NS_SYSTEMALERTSERVICE_CONTRACTID, &kNS_SYSTEMALERTSSERVICE_CID }, + { nullptr } + }; + +diff --git toolkit/system/gnome/nsSystemAlertsService.cpp toolkit/system/gnome/nsSystemAlertsService.cpp +new file mode 100644 +index 0000000..b91b402 +--- /dev/null ++++ toolkit/system/gnome/nsSystemAlertsService.cpp +@@ -0,0 +1,54 @@ ++/* -*- Mode: C++; tab-width: 2; indent-tabs-mode:nil; c-basic-offset: 2 -*- */ ++/* This Source Code Form is subject to the terms of the Mozilla Public ++ * License, v. 2.0. If a copy of the MPL was not distributed with this ++ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ ++ ++#include "nsXULAppAPI.h" ++#include "nsSystemAlertsService.h" ++#include "nsAlertsIconListener.h" ++#include "nsAutoPtr.h" ++ ++NS_IMPL_ADDREF(nsSystemAlertsService) ++NS_IMPL_RELEASE(nsSystemAlertsService) ++ ++NS_INTERFACE_MAP_BEGIN(nsSystemAlertsService) ++ NS_INTERFACE_MAP_ENTRY_AMBIGUOUS(nsISupports, nsIAlertsService) ++ NS_INTERFACE_MAP_ENTRY(nsIAlertsService) ++NS_INTERFACE_MAP_END_THREADSAFE ++ ++nsSystemAlertsService::nsSystemAlertsService() ++{ ++} ++ ++nsSystemAlertsService::~nsSystemAlertsService() ++{} ++ ++nsresult ++nsSystemAlertsService::Init() ++{ ++ return NS_OK; ++} ++ ++NS_IMETHODIMP nsSystemAlertsService::ShowAlertNotification(const nsAString & aImageUrl, const nsAString & aAlertTitle, ++ const nsAString & aAlertText, bool aAlertTextClickable, ++ const nsAString & aAlertCookie, ++ nsIObserver * aAlertListener, ++ const nsAString & aAlertName, ++ const nsAString & aBidi, ++ const nsAString & aLang, ++ const nsAString & aData, ++ nsIPrincipal * aPrincipal) ++{ ++ nsRefPtr alertListener = new nsAlertsIconListener(); ++ if (!alertListener) ++ return NS_ERROR_OUT_OF_MEMORY; ++ ++ return alertListener->InitAlertAsync(aImageUrl, aAlertTitle, aAlertText, aAlertTextClickable, ++ aAlertCookie, aAlertListener); ++} ++ ++NS_IMETHODIMP nsSystemAlertsService::CloseAlert(const nsAString& aAlertName, ++ nsIPrincipal* aPrincipal) ++{ ++ return NS_ERROR_NOT_IMPLEMENTED; ++} +diff --git toolkit/system/gnome/nsSystemAlertsService.h toolkit/system/gnome/nsSystemAlertsService.h +new file mode 100644 +index 0000000..b0bd625 +--- /dev/null ++++ toolkit/system/gnome/nsSystemAlertsService.h +@@ -0,0 +1,27 @@ ++/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */ ++/* This Source Code Form is subject to the terms of the Mozilla Public ++ * License, v. 2.0. If a copy of the MPL was not distributed with this ++ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ ++ ++#ifndef nsSystemAlertsService_h__ ++#define nsSystemAlertsService_h__ ++ ++#include "nsIAlertsService.h" ++#include "nsCOMPtr.h" ++ ++class nsSystemAlertsService : public nsIAlertsService ++{ ++public: ++ NS_DECL_NSIALERTSSERVICE ++ NS_DECL_ISUPPORTS ++ ++ nsSystemAlertsService(); ++ ++ nsresult Init(); ++ ++protected: ++ virtual ~nsSystemAlertsService(); ++ ++}; ++ ++#endif /* nsSystemAlertsService_h__ */ Added: trunk/www/firefox/files/patch-bug858919 ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ trunk/www/firefox/files/patch-bug858919 Sat Nov 22 10:43:07 2014 (r1768) @@ -0,0 +1,394 @@ +commit a33d4f7 +Author: Martin Stransky +Date: Fri Nov 14 04:04:00 2014 +0100 + + Bug 858919 - Add support for libnotify calls which was removed for new notification API. r=karlt +--- + toolkit/components/alerts/nsAlertsService.cpp | 10 +-- + toolkit/system/gnome/moz.build | 2 + + toolkit/system/gnome/nsAlertsIconListener.cpp | 64 ++++++++++++------ + toolkit/system/gnome/nsAlertsIconListener.h | 89 ++++++++++++++++++++++++++ + toolkit/system/gnome/nsGnomeModule.cpp | 5 ++ + toolkit/system/gnome/nsSystemAlertsService.cpp | 54 ++++++++++++++++ + toolkit/system/gnome/nsSystemAlertsService.h | 27 ++++++++ + 7 files changed, 226 insertions(+), 25 deletions(-) + +diff --git toolkit/components/alerts/nsAlertsService.cpp toolkit/components/alerts/nsAlertsService.cpp +index 93f4536..f8b5e07 100644 +--- toolkit/components/alerts/nsAlertsService.cpp ++++ toolkit/components/alerts/nsAlertsService.cpp +@@ -100,10 +100,12 @@ NS_IMETHODIMP nsAlertsService::ShowAlertNotification(const nsAString & aImageUrl + nsCOMPtr sysAlerts(do_GetService(NS_SYSTEMALERTSERVICE_CONTRACTID)); + nsresult rv; + if (sysAlerts) { +- return sysAlerts->ShowAlertNotification(aImageUrl, aAlertTitle, aAlertText, aAlertTextClickable, +- aAlertCookie, aAlertListener, aAlertName, +- aBidi, aLang, aData, +- IPC::Principal(aPrincipal)); ++ rv = sysAlerts->ShowAlertNotification(aImageUrl, aAlertTitle, aAlertText, aAlertTextClickable, ++ aAlertCookie, aAlertListener, aAlertName, ++ aBidi, aLang, aData, ++ IPC::Principal(aPrincipal)); ++ if (NS_SUCCEEDED(rv)) ++ return NS_OK; + } + + if (!ShouldShowAlert()) { +diff --git toolkit/system/gnome/moz.build toolkit/system/gnome/moz.build +index c033f8b..9242209 100644 +--- toolkit/system/gnome/moz.build ++++ toolkit/system/gnome/moz.build +@@ -5,7 +5,9 @@ + # file, You can obtain one at http://mozilla.org/MPL/2.0/. + + SOURCES += [ ++ 'nsAlertsIconListener.cpp', + 'nsGnomeModule.cpp', ++ 'nsSystemAlertsService.cpp', + ] + + if CONFIG['MOZ_ENABLE_GCONF']: +diff --git toolkit/system/gnome/nsAlertsIconListener.cpp toolkit/system/gnome/nsAlertsIconListener.cpp +index f39335e..55f4356 100644 +--- toolkit/system/gnome/nsAlertsIconListener.cpp ++++ toolkit/system/gnome/nsAlertsIconListener.cpp +@@ -51,6 +51,21 @@ static void notify_closed_marshal(GClosure* closure, + NS_RELEASE(alert); + } + ++static GdkPixbuf* ++GetPixbufFromImgRequest(imgIRequest* aRequest) ++{ ++ nsCOMPtr image; ++ nsresult rv = aRequest->GetImage(getter_AddRefs(image)); ++ if (NS_FAILED(rv)) { ++ return nullptr; ++ } ++ ++ nsCOMPtr imgToPixbuf = ++ do_GetService("@mozilla.org/widget/image-to-gdk-pixbuf;1"); ++ ++ return imgToPixbuf->ConvertImageToPixbuf(image); ++} ++ + NS_IMPL_ISUPPORTS(nsAlertsIconListener, imgINotificationObserver, + nsIObserver, nsISupportsWeakReference) + +@@ -106,47 +121,45 @@ nsAlertsIconListener::Notify(imgIRequest *aRequest, int32_t aType, const nsIntRe + nsresult + nsAlertsIconListener::OnStopRequest(imgIRequest* aRequest) + { ++ NS_ASSERTION(mIconRequest == aRequest, "aRequest does not match!"); ++ + uint32_t imgStatus = imgIRequest::STATUS_ERROR; + nsresult rv = aRequest->GetImageStatus(&imgStatus); + NS_ENSURE_SUCCESS(rv, rv); + if (imgStatus == imgIRequest::STATUS_ERROR && !mLoadedFrame) { + // We have an error getting the image. Display the notification with no icon. + ShowAlert(nullptr); +- } + +- if (mIconRequest) { ++ // Cancel any pending request + mIconRequest->Cancel(NS_BINDING_ABORTED); + mIconRequest = nullptr; + } ++ + return NS_OK; + } + + nsresult + nsAlertsIconListener::OnStopFrame(imgIRequest* aRequest) + { +- if (aRequest != mIconRequest) +- return NS_ERROR_FAILURE; ++ NS_ASSERTION(mIconRequest == aRequest, "aRequest does not match!"); + + if (mLoadedFrame) + return NS_OK; // only use one frame + +- nsCOMPtr image; +- nsresult rv = aRequest->GetImage(getter_AddRefs(image)); +- if (NS_FAILED(rv)) +- return rv; +- +- nsCOMPtr imgToPixbuf = +- do_GetService("@mozilla.org/widget/image-to-gdk-pixbuf;1"); +- +- GdkPixbuf* imagePixbuf = imgToPixbuf->ConvertImageToPixbuf(image); +- if (!imagePixbuf) +- return NS_ERROR_FAILURE; ++ GdkPixbuf* imagePixbuf = GetPixbufFromImgRequest(aRequest); ++ if (!imagePixbuf) { ++ ShowAlert(nullptr); ++ } else { ++ ShowAlert(imagePixbuf); ++ g_object_unref(imagePixbuf); ++ } + +- ShowAlert(imagePixbuf); ++ mLoadedFrame = true; + +- g_object_unref(imagePixbuf); ++ // Cancel any pending request (multipart image loading/decoding for instance) ++ mIconRequest->Cancel(NS_BINDING_ABORTED); ++ mIconRequest = nullptr; + +- mLoadedFrame = true; + return NS_OK; + } + +@@ -180,6 +193,9 @@ nsAlertsIconListener::ShowAlert(GdkPixbuf* aPixbuf) + mClosureHandler = g_signal_connect_closure(mNotification, "closed", closure, FALSE); + gboolean result = notify_notification_show(mNotification, nullptr); + ++ if (result && mAlertListener) ++ mAlertListener->Observe(nullptr, "alertshow", mAlertCookie.get()); ++ + return result ? NS_OK : NS_ERROR_FAILURE; + } + +@@ -201,9 +217,15 @@ nsAlertsIconListener::StartRequest(const nsAString & aImageUrl) + if (!il) + return ShowAlert(nullptr); + +- return il->LoadImageXPCOM(imageUri, nullptr, nullptr, nullptr, nullptr, +- this, nullptr, nsIRequest::LOAD_NORMAL, nullptr, +- nullptr, getter_AddRefs(mIconRequest)); ++ nsresult rv = il->LoadImageXPCOM(imageUri, nullptr, nullptr, nullptr, nullptr, ++ this, nullptr, nsIRequest::LOAD_NORMAL, nullptr, ++ 0 /* use default */, getter_AddRefs(mIconRequest)); ++ if (NS_FAILED(rv)) ++ return rv; ++ ++ mIconRequest->StartDecoding(); ++ ++ return NS_OK; + } + + void +diff --git toolkit/system/gnome/nsAlertsIconListener.h toolkit/system/gnome/nsAlertsIconListener.h +new file mode 100644 +index 0000000..ac96db9 +--- /dev/null ++++ toolkit/system/gnome/nsAlertsIconListener.h +@@ -0,0 +1,89 @@ ++/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */ ++/* This Source Code Form is subject to the terms of the Mozilla Public ++ * License, v. 2.0. If a copy of the MPL was not distributed with this ++ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ ++ ++#ifndef nsAlertsIconListener_h__ ++#define nsAlertsIconListener_h__ ++ ++#include "nsCOMPtr.h" ++#include "imgINotificationObserver.h" ++#include "nsStringAPI.h" ++#include "nsIObserver.h" ++#include "nsWeakReference.h" ++ ++#include ++ ++class imgIRequest; ++ ++struct NotifyNotification; ++ ++class nsAlertsIconListener : public imgINotificationObserver, ++ public nsIObserver, ++ public nsSupportsWeakReference ++{ ++public: ++ NS_DECL_ISUPPORTS ++ NS_DECL_IMGINOTIFICATIONOBSERVER ++ NS_DECL_NSIOBSERVER ++ ++ nsAlertsIconListener(); ++ ++ nsresult InitAlertAsync(const nsAString & aImageUrl, ++ const nsAString & aAlertTitle, ++ const nsAString & aAlertText, ++ bool aAlertTextClickable, ++ const nsAString & aAlertCookie, ++ nsIObserver * aAlertListener); ++ ++ void SendCallback(); ++ void SendClosed(); ++ ++protected: ++ virtual ~nsAlertsIconListener(); ++ ++ nsresult OnStopRequest(imgIRequest* aRequest); ++ nsresult OnStopFrame(imgIRequest* aRequest); ++ ++ /** ++ * The only difference between libnotify.so.4 and libnotify.so.1 for these symbols ++ * is that notify_notification_new takes three arguments in libnotify.so.4 and ++ * four in libnotify.so.1. ++ * Passing the fourth argument as NULL is binary compatible. ++ */ ++ typedef void (*NotifyActionCallback)(NotifyNotification*, char*, gpointer); ++ typedef bool (*notify_is_initted_t)(void); ++ typedef bool (*notify_init_t)(const char*); ++ typedef GList* (*notify_get_server_caps_t)(void); ++ typedef NotifyNotification* (*notify_notification_new_t)(const char*, const char*, const char*, const char*); ++ typedef bool (*notify_notification_show_t)(void*, char*); ++ typedef void (*notify_notification_set_icon_from_pixbuf_t)(void*, GdkPixbuf*); ++ typedef void (*notify_notification_add_action_t)(void*, const char*, const char*, NotifyActionCallback, gpointer, GFreeFunc); ++ ++ nsCOMPtr mIconRequest; ++ nsCString mAlertTitle; ++ nsCString mAlertText; ++ ++ nsCOMPtr mAlertListener; ++ nsString mAlertCookie; ++ ++ bool mLoadedFrame; ++ bool mAlertHasAction; ++ ++ static void* libNotifyHandle; ++ static bool libNotifyNotAvail; ++ static notify_is_initted_t notify_is_initted; ++ static notify_init_t notify_init; ++ static notify_get_server_caps_t notify_get_server_caps; ++ static notify_notification_new_t notify_notification_new; ++ static notify_notification_show_t notify_notification_show; ++ static notify_notification_set_icon_from_pixbuf_t notify_notification_set_icon_from_pixbuf; ++ static notify_notification_add_action_t notify_notification_add_action; ++ NotifyNotification* mNotification; ++ gulong mClosureHandler; ++ ++ nsresult StartRequest(const nsAString & aImageUrl); ++ nsresult ShowAlert(GdkPixbuf* aPixbuf); ++}; ++ ++#endif +diff --git toolkit/system/gnome/nsGnomeModule.cpp toolkit/system/gnome/nsGnomeModule.cpp +index 5ccc8e5..f893893 100644 +--- toolkit/system/gnome/nsGnomeModule.cpp ++++ toolkit/system/gnome/nsGnomeModule.cpp +@@ -22,6 +22,8 @@ NS_GENERIC_FACTORY_CONSTRUCTOR_INIT(nsGnomeVFSService, Init) + NS_GENERIC_FACTORY_CONSTRUCTOR(nsGIOService) + NS_GENERIC_FACTORY_CONSTRUCTOR_INIT(nsGSettingsService, Init) + #endif ++#include "nsSystemAlertsService.h" ++NS_GENERIC_FACTORY_CONSTRUCTOR_INIT(nsSystemAlertsService, Init) + + #ifdef MOZ_ENABLE_GCONF + NS_DEFINE_NAMED_CID(NS_GCONFSERVICE_CID); +@@ -33,6 +35,7 @@ NS_DEFINE_NAMED_CID(NS_GNOMEVFSSERVICE_CID); + NS_DEFINE_NAMED_CID(NS_GIOSERVICE_CID); + NS_DEFINE_NAMED_CID(NS_GSETTINGSSERVICE_CID); + #endif ++NS_DEFINE_NAMED_CID(NS_SYSTEMALERTSSERVICE_CID); + + static const mozilla::Module::CIDEntry kGnomeCIDs[] = { + #ifdef MOZ_ENABLE_GCONF +@@ -45,6 +48,7 @@ static const mozilla::Module::CIDEntry kGnomeCIDs[] = { + { &kNS_GIOSERVICE_CID, false, nullptr, nsGIOServiceConstructor }, + { &kNS_GSETTINGSSERVICE_CID, false, nullptr, nsGSettingsServiceConstructor }, + #endif ++ { &kNS_SYSTEMALERTSSERVICE_CID, false, nullptr, nsSystemAlertsServiceConstructor }, + { nullptr } + }; + +@@ -59,6 +63,7 @@ static const mozilla::Module::ContractIDEntry kGnomeContracts[] = { + { NS_GIOSERVICE_CONTRACTID, &kNS_GIOSERVICE_CID }, + { NS_GSETTINGSSERVICE_CONTRACTID, &kNS_GSETTINGSSERVICE_CID }, + #endif ++ { NS_SYSTEMALERTSERVICE_CONTRACTID, &kNS_SYSTEMALERTSSERVICE_CID }, + { nullptr } + }; + +diff --git toolkit/system/gnome/nsSystemAlertsService.cpp toolkit/system/gnome/nsSystemAlertsService.cpp +new file mode 100644 +index 0000000..b91b402 +--- /dev/null ++++ toolkit/system/gnome/nsSystemAlertsService.cpp +@@ -0,0 +1,54 @@ ++/* -*- Mode: C++; tab-width: 2; indent-tabs-mode:nil; c-basic-offset: 2 -*- */ ++/* This Source Code Form is subject to the terms of the Mozilla Public ++ * License, v. 2.0. If a copy of the MPL was not distributed with this ++ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ ++ ++#include "nsXULAppAPI.h" ++#include "nsSystemAlertsService.h" ++#include "nsAlertsIconListener.h" ++#include "nsAutoPtr.h" ++ ++NS_IMPL_ADDREF(nsSystemAlertsService) ++NS_IMPL_RELEASE(nsSystemAlertsService) ++ ++NS_INTERFACE_MAP_BEGIN(nsSystemAlertsService) ++ NS_INTERFACE_MAP_ENTRY_AMBIGUOUS(nsISupports, nsIAlertsService) ++ NS_INTERFACE_MAP_ENTRY(nsIAlertsService) ++NS_INTERFACE_MAP_END_THREADSAFE ++ ++nsSystemAlertsService::nsSystemAlertsService() ++{ ++} ++ ++nsSystemAlertsService::~nsSystemAlertsService() ++{} ++ ++nsresult ++nsSystemAlertsService::Init() ++{ ++ return NS_OK; ++} ++ ++NS_IMETHODIMP nsSystemAlertsService::ShowAlertNotification(const nsAString & aImageUrl, const nsAString & aAlertTitle, ++ const nsAString & aAlertText, bool aAlertTextClickable, ++ const nsAString & aAlertCookie, ++ nsIObserver * aAlertListener, ++ const nsAString & aAlertName, ++ const nsAString & aBidi, ++ const nsAString & aLang, ++ const nsAString & aData, ++ nsIPrincipal * aPrincipal) ++{ ++ nsRefPtr alertListener = new nsAlertsIconListener(); ++ if (!alertListener) ++ return NS_ERROR_OUT_OF_MEMORY; ++ ++ return alertListener->InitAlertAsync(aImageUrl, aAlertTitle, aAlertText, aAlertTextClickable, ++ aAlertCookie, aAlertListener); ++} ++ ++NS_IMETHODIMP nsSystemAlertsService::CloseAlert(const nsAString& aAlertName, ++ nsIPrincipal* aPrincipal) ++{ ++ return NS_ERROR_NOT_IMPLEMENTED; ++} +diff --git toolkit/system/gnome/nsSystemAlertsService.h toolkit/system/gnome/nsSystemAlertsService.h +new file mode 100644 +index 0000000..b0bd625 +--- /dev/null ++++ toolkit/system/gnome/nsSystemAlertsService.h +@@ -0,0 +1,27 @@ ++/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */ ++/* This Source Code Form is subject to the terms of the Mozilla Public ++ * License, v. 2.0. If a copy of the MPL was not distributed with this ++ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ ++ ++#ifndef nsSystemAlertsService_h__ ++#define nsSystemAlertsService_h__ ++ ++#include "nsIAlertsService.h" ++#include "nsCOMPtr.h" ++ ++class nsSystemAlertsService : public nsIAlertsService ++{ ++public: ++ NS_DECL_NSIALERTSSERVICE ++ NS_DECL_ISUPPORTS ++ ++ nsSystemAlertsService(); ++ ++ nsresult Init(); ++ ++protected: ++ virtual ~nsSystemAlertsService(); ++ ++}; ++ ++#endif /* nsSystemAlertsService_h__ */ Added: trunk/www/libxul/files/patch-bug858919 ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ trunk/www/libxul/files/patch-bug858919 Sat Nov 22 10:43:07 2014 (r1768) @@ -0,0 +1,392 @@ +commit a33d4f7 +Author: Martin Stransky +Date: Fri Nov 14 04:04:00 2014 +0100 + + Bug 858919 - Add support for libnotify calls which was removed for new notification API. r=karlt +--- + toolkit/components/alerts/nsAlertsService.cpp | 10 +-- + toolkit/system/gnome/moz.build | 2 + + toolkit/system/gnome/nsAlertsIconListener.cpp | 64 ++++++++++++------ + toolkit/system/gnome/nsAlertsIconListener.h | 89 ++++++++++++++++++++++++++ + toolkit/system/gnome/nsGnomeModule.cpp | 5 ++ + toolkit/system/gnome/nsSystemAlertsService.cpp | 54 ++++++++++++++++ + toolkit/system/gnome/nsSystemAlertsService.h | 27 ++++++++ + 7 files changed, 226 insertions(+), 25 deletions(-) + +diff --git toolkit/components/alerts/nsAlertsService.cpp toolkit/components/alerts/nsAlertsService.cpp +index 93f4536..f8b5e07 100644 +--- toolkit/components/alerts/nsAlertsService.cpp ++++ toolkit/components/alerts/nsAlertsService.cpp +@@ -100,9 +100,11 @@ NS_IMETHODIMP nsAlertsService::ShowAlertNotification(const nsAString & aImageUrl + nsCOMPtr sysAlerts(do_GetService(NS_SYSTEMALERTSERVICE_CONTRACTID)); + nsresult rv; + if (sysAlerts) { +- return sysAlerts->ShowAlertNotification(aImageUrl, aAlertTitle, aAlertText, aAlertTextClickable, +- aAlertCookie, aAlertListener, aAlertName, +- aBidi, aLang, IPC::Principal(aPrincipal)); ++ rv = sysAlerts->ShowAlertNotification(aImageUrl, aAlertTitle, aAlertText, aAlertTextClickable, ++ aAlertCookie, aAlertListener, aAlertName, ++ aBidi, aLang, IPC::Principal(aPrincipal)); ++ if (NS_SUCCEEDED(rv)) ++ return NS_OK; + } + + if (!ShouldShowAlert()) { +diff --git toolkit/system/gnome/moz.build toolkit/system/gnome/moz.build +index c033f8b..9242209 100644 +--- toolkit/system/gnome/moz.build ++++ toolkit/system/gnome/moz.build +@@ -5,7 +5,9 @@ + # file, You can obtain one at http://mozilla.org/MPL/2.0/. + + SOURCES += [ ++ 'nsAlertsIconListener.cpp', + 'nsGnomeModule.cpp', ++ 'nsSystemAlertsService.cpp', + ] + + if CONFIG['MOZ_ENABLE_GCONF']: +diff --git toolkit/system/gnome/nsAlertsIconListener.cpp toolkit/system/gnome/nsAlertsIconListener.cpp +index f39335e..55f4356 100644 +--- toolkit/system/gnome/nsAlertsIconListener.cpp ++++ toolkit/system/gnome/nsAlertsIconListener.cpp +@@ -51,6 +51,21 @@ static void notify_closed_marshal(GClosure* closure, + NS_RELEASE(alert); + } + ++static GdkPixbuf* ++GetPixbufFromImgRequest(imgIRequest* aRequest) ++{ ++ nsCOMPtr image; ++ nsresult rv = aRequest->GetImage(getter_AddRefs(image)); ++ if (NS_FAILED(rv)) { ++ return nullptr; ++ } ++ ++ nsCOMPtr imgToPixbuf = ++ do_GetService("@mozilla.org/widget/image-to-gdk-pixbuf;1"); ++ ++ return imgToPixbuf->ConvertImageToPixbuf(image); ++} ++ + NS_IMPL_ISUPPORTS(nsAlertsIconListener, imgINotificationObserver, + nsIObserver, nsISupportsWeakReference) + +@@ -106,47 +121,45 @@ nsAlertsIconListener::Notify(imgIRequest *aRequest, int32_t aType, const nsIntRe + nsresult + nsAlertsIconListener::OnStopRequest(imgIRequest* aRequest) + { ++ NS_ASSERTION(mIconRequest == aRequest, "aRequest does not match!"); ++ + uint32_t imgStatus = imgIRequest::STATUS_ERROR; + nsresult rv = aRequest->GetImageStatus(&imgStatus); + NS_ENSURE_SUCCESS(rv, rv); + if (imgStatus == imgIRequest::STATUS_ERROR && !mLoadedFrame) { + // We have an error getting the image. Display the notification with no icon. + ShowAlert(nullptr); +- } + +- if (mIconRequest) { ++ // Cancel any pending request + mIconRequest->Cancel(NS_BINDING_ABORTED); + mIconRequest = nullptr; + } ++ + return NS_OK; + } + + nsresult + nsAlertsIconListener::OnStopFrame(imgIRequest* aRequest) + { +- if (aRequest != mIconRequest) +- return NS_ERROR_FAILURE; ++ NS_ASSERTION(mIconRequest == aRequest, "aRequest does not match!"); + + if (mLoadedFrame) + return NS_OK; // only use one frame + +- nsCOMPtr image; +- nsresult rv = aRequest->GetImage(getter_AddRefs(image)); +- if (NS_FAILED(rv)) +- return rv; +- +- nsCOMPtr imgToPixbuf = +- do_GetService("@mozilla.org/widget/image-to-gdk-pixbuf;1"); +- +- GdkPixbuf* imagePixbuf = imgToPixbuf->ConvertImageToPixbuf(image); +- if (!imagePixbuf) +- return NS_ERROR_FAILURE; ++ GdkPixbuf* imagePixbuf = GetPixbufFromImgRequest(aRequest); ++ if (!imagePixbuf) { ++ ShowAlert(nullptr); ++ } else { ++ ShowAlert(imagePixbuf); ++ g_object_unref(imagePixbuf); ++ } + +- ShowAlert(imagePixbuf); ++ mLoadedFrame = true; + +- g_object_unref(imagePixbuf); ++ // Cancel any pending request (multipart image loading/decoding for instance) ++ mIconRequest->Cancel(NS_BINDING_ABORTED); ++ mIconRequest = nullptr; + +- mLoadedFrame = true; + return NS_OK; + } + +@@ -180,6 +193,9 @@ nsAlertsIconListener::ShowAlert(GdkPixbuf* aPixbuf) + mClosureHandler = g_signal_connect_closure(mNotification, "closed", closure, FALSE); + gboolean result = notify_notification_show(mNotification, nullptr); + ++ if (result && mAlertListener) ++ mAlertListener->Observe(nullptr, "alertshow", mAlertCookie.get()); ++ + return result ? NS_OK : NS_ERROR_FAILURE; + } + +@@ -201,9 +217,15 @@ nsAlertsIconListener::StartRequest(const nsAString & aImageUrl) + if (!il) + return ShowAlert(nullptr); + +- return il->LoadImageXPCOM(imageUri, nullptr, nullptr, nullptr, nullptr, +- this, nullptr, nsIRequest::LOAD_NORMAL, nullptr, +- nullptr, getter_AddRefs(mIconRequest)); ++ nsresult rv = il->LoadImageXPCOM(imageUri, nullptr, nullptr, nullptr, nullptr, ++ this, nullptr, nsIRequest::LOAD_NORMAL, nullptr, ++ 0 /* use default */, getter_AddRefs(mIconRequest)); ++ if (NS_FAILED(rv)) ++ return rv; ++ ++ mIconRequest->StartDecoding(); ++ ++ return NS_OK; + } + + void +diff --git toolkit/system/gnome/nsAlertsIconListener.h toolkit/system/gnome/nsAlertsIconListener.h +new file mode 100644 +index 0000000..ac96db9 +--- /dev/null ++++ toolkit/system/gnome/nsAlertsIconListener.h +@@ -0,0 +1,89 @@ ++/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */ ++/* This Source Code Form is subject to the terms of the Mozilla Public ++ * License, v. 2.0. If a copy of the MPL was not distributed with this ++ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ ++ ++#ifndef nsAlertsIconListener_h__ ++#define nsAlertsIconListener_h__ ++ ++#include "nsCOMPtr.h" ++#include "imgINotificationObserver.h" ++#include "nsStringAPI.h" ++#include "nsIObserver.h" ++#include "nsWeakReference.h" ++ ++#include ++ ++class imgIRequest; ++ ++struct NotifyNotification; ++ ++class nsAlertsIconListener : public imgINotificationObserver, ++ public nsIObserver, ++ public nsSupportsWeakReference ++{ ++public: ++ NS_DECL_ISUPPORTS ++ NS_DECL_IMGINOTIFICATIONOBSERVER ++ NS_DECL_NSIOBSERVER ++ ++ nsAlertsIconListener(); ++ ++ nsresult InitAlertAsync(const nsAString & aImageUrl, ++ const nsAString & aAlertTitle, ++ const nsAString & aAlertText, ++ bool aAlertTextClickable, ++ const nsAString & aAlertCookie, ++ nsIObserver * aAlertListener); ++ ++ void SendCallback(); ++ void SendClosed(); ++ ++protected: ++ virtual ~nsAlertsIconListener(); ++ ++ nsresult OnStopRequest(imgIRequest* aRequest); ++ nsresult OnStopFrame(imgIRequest* aRequest); ++ ++ /** ++ * The only difference between libnotify.so.4 and libnotify.so.1 for these symbols ++ * is that notify_notification_new takes three arguments in libnotify.so.4 and ++ * four in libnotify.so.1. ++ * Passing the fourth argument as NULL is binary compatible. ++ */ ++ typedef void (*NotifyActionCallback)(NotifyNotification*, char*, gpointer); ++ typedef bool (*notify_is_initted_t)(void); ++ typedef bool (*notify_init_t)(const char*); ++ typedef GList* (*notify_get_server_caps_t)(void); ++ typedef NotifyNotification* (*notify_notification_new_t)(const char*, const char*, const char*, const char*); ++ typedef bool (*notify_notification_show_t)(void*, char*); ++ typedef void (*notify_notification_set_icon_from_pixbuf_t)(void*, GdkPixbuf*); ++ typedef void (*notify_notification_add_action_t)(void*, const char*, const char*, NotifyActionCallback, gpointer, GFreeFunc); ++ ++ nsCOMPtr mIconRequest; ++ nsCString mAlertTitle; ++ nsCString mAlertText; ++ ++ nsCOMPtr mAlertListener; ++ nsString mAlertCookie; ++ ++ bool mLoadedFrame; ++ bool mAlertHasAction; ++ ++ static void* libNotifyHandle; ++ static bool libNotifyNotAvail; ++ static notify_is_initted_t notify_is_initted; ++ static notify_init_t notify_init; ++ static notify_get_server_caps_t notify_get_server_caps; ++ static notify_notification_new_t notify_notification_new; ++ static notify_notification_show_t notify_notification_show; ++ static notify_notification_set_icon_from_pixbuf_t notify_notification_set_icon_from_pixbuf; ++ static notify_notification_add_action_t notify_notification_add_action; ++ NotifyNotification* mNotification; ++ gulong mClosureHandler; ++ ++ nsresult StartRequest(const nsAString & aImageUrl); ++ nsresult ShowAlert(GdkPixbuf* aPixbuf); ++}; ++ ++#endif +diff --git toolkit/system/gnome/nsGnomeModule.cpp toolkit/system/gnome/nsGnomeModule.cpp +index 5ccc8e5..f893893 100644 +--- toolkit/system/gnome/nsGnomeModule.cpp ++++ toolkit/system/gnome/nsGnomeModule.cpp +@@ -22,6 +22,8 @@ NS_GENERIC_FACTORY_CONSTRUCTOR_INIT(nsGnomeVFSService, Init) + NS_GENERIC_FACTORY_CONSTRUCTOR(nsGIOService) + NS_GENERIC_FACTORY_CONSTRUCTOR_INIT(nsGSettingsService, Init) + #endif ++#include "nsSystemAlertsService.h" ++NS_GENERIC_FACTORY_CONSTRUCTOR_INIT(nsSystemAlertsService, Init) + + #ifdef MOZ_ENABLE_GCONF + NS_DEFINE_NAMED_CID(NS_GCONFSERVICE_CID); +@@ -33,6 +35,7 @@ NS_DEFINE_NAMED_CID(NS_GNOMEVFSSERVICE_CID); + NS_DEFINE_NAMED_CID(NS_GIOSERVICE_CID); + NS_DEFINE_NAMED_CID(NS_GSETTINGSSERVICE_CID); + #endif ++NS_DEFINE_NAMED_CID(NS_SYSTEMALERTSSERVICE_CID); + + static const mozilla::Module::CIDEntry kGnomeCIDs[] = { + #ifdef MOZ_ENABLE_GCONF +@@ -45,6 +48,7 @@ static const mozilla::Module::CIDEntry kGnomeCIDs[] = { + { &kNS_GIOSERVICE_CID, false, nullptr, nsGIOServiceConstructor }, + { &kNS_GSETTINGSSERVICE_CID, false, nullptr, nsGSettingsServiceConstructor }, + #endif ++ { &kNS_SYSTEMALERTSSERVICE_CID, false, nullptr, nsSystemAlertsServiceConstructor }, + { nullptr } + }; + +@@ -59,6 +63,7 @@ static const mozilla::Module::ContractIDEntry kGnomeContracts[] = { + { NS_GIOSERVICE_CONTRACTID, &kNS_GIOSERVICE_CID }, + { NS_GSETTINGSSERVICE_CONTRACTID, &kNS_GSETTINGSSERVICE_CID }, + #endif ++ { NS_SYSTEMALERTSERVICE_CONTRACTID, &kNS_SYSTEMALERTSSERVICE_CID }, + { nullptr } + }; + +diff --git toolkit/system/gnome/nsSystemAlertsService.cpp toolkit/system/gnome/nsSystemAlertsService.cpp +new file mode 100644 +index 0000000..b91b402 +--- /dev/null ++++ toolkit/system/gnome/nsSystemAlertsService.cpp +@@ -0,0 +1,54 @@ ++/* -*- Mode: C++; tab-width: 2; indent-tabs-mode:nil; c-basic-offset: 2 -*- */ ++/* This Source Code Form is subject to the terms of the Mozilla Public ++ * License, v. 2.0. If a copy of the MPL was not distributed with this ++ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ ++ ++#include "nsXULAppAPI.h" ++#include "nsSystemAlertsService.h" ++#include "nsAlertsIconListener.h" ++#include "nsAutoPtr.h" ++ ++NS_IMPL_ADDREF(nsSystemAlertsService) ++NS_IMPL_RELEASE(nsSystemAlertsService) ++ ++NS_INTERFACE_MAP_BEGIN(nsSystemAlertsService) ++ NS_INTERFACE_MAP_ENTRY_AMBIGUOUS(nsISupports, nsIAlertsService) ++ NS_INTERFACE_MAP_ENTRY(nsIAlertsService) ++NS_INTERFACE_MAP_END_THREADSAFE ++ ++nsSystemAlertsService::nsSystemAlertsService() ++{ ++} ++ ++nsSystemAlertsService::~nsSystemAlertsService() ++{} ++ ++nsresult ++nsSystemAlertsService::Init() ++{ ++ return NS_OK; ++} ++ ++NS_IMETHODIMP nsSystemAlertsService::ShowAlertNotification(const nsAString & aImageUrl, const nsAString & aAlertTitle, ++ const nsAString & aAlertText, bool aAlertTextClickable, ++ const nsAString & aAlertCookie, ++ nsIObserver * aAlertListener, ++ const nsAString & aAlertName, ++ const nsAString & aBidi, ++ const nsAString & aLang, ++ const nsAString & aData, ++ nsIPrincipal * aPrincipal) ++{ ++ nsRefPtr alertListener = new nsAlertsIconListener(); ++ if (!alertListener) ++ return NS_ERROR_OUT_OF_MEMORY; ++ ++ return alertListener->InitAlertAsync(aImageUrl, aAlertTitle, aAlertText, aAlertTextClickable, ++ aAlertCookie, aAlertListener); ++} ++ ++NS_IMETHODIMP nsSystemAlertsService::CloseAlert(const nsAString& aAlertName, ++ nsIPrincipal* aPrincipal) ++{ ++ return NS_ERROR_NOT_IMPLEMENTED; ++} +diff --git toolkit/system/gnome/nsSystemAlertsService.h toolkit/system/gnome/nsSystemAlertsService.h +new file mode 100644 +index 0000000..b0bd625 +--- /dev/null ++++ toolkit/system/gnome/nsSystemAlertsService.h +@@ -0,0 +1,27 @@ ++/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */ ++/* This Source Code Form is subject to the terms of the Mozilla Public ++ * License, v. 2.0. If a copy of the MPL was not distributed with this ++ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ ++ ++#ifndef nsSystemAlertsService_h__ ++#define nsSystemAlertsService_h__ ++ ++#include "nsIAlertsService.h" ++#include "nsCOMPtr.h" ++ ++class nsSystemAlertsService : public nsIAlertsService ++{ ++public: ++ NS_DECL_NSIALERTSSERVICE ++ NS_DECL_ISUPPORTS ++ ++ nsSystemAlertsService(); ++ ++ nsresult Init(); ++ ++protected: ++ virtual ~nsSystemAlertsService(); ++ ++}; ++ ++#endif /* nsSystemAlertsService_h__ */ Added: trunk/www/seamonkey/files/patch-bug858919 ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ trunk/www/seamonkey/files/patch-bug858919 Sat Nov 22 10:43:07 2014 (r1768) @@ -0,0 +1,394 @@ +commit a33d4f7 +Author: Martin Stransky +Date: Fri Nov 14 04:04:00 2014 +0100 + + Bug 858919 - Add support for libnotify calls which was removed for new notification API. r=karlt +--- + toolkit/components/alerts/nsAlertsService.cpp | 10 +-- + toolkit/system/gnome/moz.build | 2 + + toolkit/system/gnome/nsAlertsIconListener.cpp | 64 ++++++++++++------ + toolkit/system/gnome/nsAlertsIconListener.h | 89 ++++++++++++++++++++++++++ + toolkit/system/gnome/nsGnomeModule.cpp | 5 ++ + toolkit/system/gnome/nsSystemAlertsService.cpp | 54 ++++++++++++++++ + toolkit/system/gnome/nsSystemAlertsService.h | 27 ++++++++ + 7 files changed, 226 insertions(+), 25 deletions(-) + +diff --git toolkit/components/alerts/nsAlertsService.cpp toolkit/components/alerts/nsAlertsService.cpp +index 93f4536..f8b5e07 100644 +--- mozilla/toolkit/components/alerts/nsAlertsService.cpp ++++ mozilla/toolkit/components/alerts/nsAlertsService.cpp +@@ -100,10 +100,12 @@ NS_IMETHODIMP nsAlertsService::ShowAlertNotification(const nsAString & aImageUrl + nsCOMPtr sysAlerts(do_GetService(NS_SYSTEMALERTSERVICE_CONTRACTID)); + nsresult rv; + if (sysAlerts) { +- return sysAlerts->ShowAlertNotification(aImageUrl, aAlertTitle, aAlertText, aAlertTextClickable, +- aAlertCookie, aAlertListener, aAlertName, +- aBidi, aLang, aData, +- IPC::Principal(aPrincipal)); ++ rv = sysAlerts->ShowAlertNotification(aImageUrl, aAlertTitle, aAlertText, aAlertTextClickable, ++ aAlertCookie, aAlertListener, aAlertName, ++ aBidi, aLang, aData, ++ IPC::Principal(aPrincipal)); ++ if (NS_SUCCEEDED(rv)) ++ return NS_OK; + } + + if (!ShouldShowAlert()) { +diff --git toolkit/system/gnome/moz.build toolkit/system/gnome/moz.build +index c033f8b..9242209 100644 +--- mozilla/toolkit/system/gnome/moz.build ++++ mozilla/toolkit/system/gnome/moz.build +@@ -5,7 +5,9 @@ + # file, You can obtain one at http://mozilla.org/MPL/2.0/. + + SOURCES += [ ++ 'nsAlertsIconListener.cpp', + 'nsGnomeModule.cpp', ++ 'nsSystemAlertsService.cpp', + ] + + if CONFIG['MOZ_ENABLE_GCONF']: +diff --git toolkit/system/gnome/nsAlertsIconListener.cpp toolkit/system/gnome/nsAlertsIconListener.cpp +index f39335e..55f4356 100644 +--- mozilla/toolkit/system/gnome/nsAlertsIconListener.cpp ++++ mozilla/toolkit/system/gnome/nsAlertsIconListener.cpp +@@ -51,6 +51,21 @@ static void notify_closed_marshal(GClosure* closure, + NS_RELEASE(alert); + } + ++static GdkPixbuf* ++GetPixbufFromImgRequest(imgIRequest* aRequest) ++{ ++ nsCOMPtr image; ++ nsresult rv = aRequest->GetImage(getter_AddRefs(image)); ++ if (NS_FAILED(rv)) { ++ return nullptr; ++ } ++ ++ nsCOMPtr imgToPixbuf = ++ do_GetService("@mozilla.org/widget/image-to-gdk-pixbuf;1"); ++ ++ return imgToPixbuf->ConvertImageToPixbuf(image); ++} ++ + NS_IMPL_ISUPPORTS(nsAlertsIconListener, imgINotificationObserver, + nsIObserver, nsISupportsWeakReference) + +@@ -106,47 +121,45 @@ nsAlertsIconListener::Notify(imgIRequest *aRequest, int32_t aType, const nsIntRe + nsresult + nsAlertsIconListener::OnStopRequest(imgIRequest* aRequest) + { ++ NS_ASSERTION(mIconRequest == aRequest, "aRequest does not match!"); ++ + uint32_t imgStatus = imgIRequest::STATUS_ERROR; + nsresult rv = aRequest->GetImageStatus(&imgStatus); + NS_ENSURE_SUCCESS(rv, rv); + if (imgStatus == imgIRequest::STATUS_ERROR && !mLoadedFrame) { + // We have an error getting the image. Display the notification with no icon. + ShowAlert(nullptr); +- } + +- if (mIconRequest) { ++ // Cancel any pending request + mIconRequest->Cancel(NS_BINDING_ABORTED); + mIconRequest = nullptr; + } ++ + return NS_OK; + } + + nsresult + nsAlertsIconListener::OnStopFrame(imgIRequest* aRequest) + { +- if (aRequest != mIconRequest) +- return NS_ERROR_FAILURE; ++ NS_ASSERTION(mIconRequest == aRequest, "aRequest does not match!"); + + if (mLoadedFrame) + return NS_OK; // only use one frame + +- nsCOMPtr image; +- nsresult rv = aRequest->GetImage(getter_AddRefs(image)); +- if (NS_FAILED(rv)) +- return rv; +- +- nsCOMPtr imgToPixbuf = +- do_GetService("@mozilla.org/widget/image-to-gdk-pixbuf;1"); +- +- GdkPixbuf* imagePixbuf = imgToPixbuf->ConvertImageToPixbuf(image); +- if (!imagePixbuf) +- return NS_ERROR_FAILURE; ++ GdkPixbuf* imagePixbuf = GetPixbufFromImgRequest(aRequest); ++ if (!imagePixbuf) { ++ ShowAlert(nullptr); ++ } else { ++ ShowAlert(imagePixbuf); ++ g_object_unref(imagePixbuf); ++ } + +- ShowAlert(imagePixbuf); ++ mLoadedFrame = true; + +- g_object_unref(imagePixbuf); ++ // Cancel any pending request (multipart image loading/decoding for instance) ++ mIconRequest->Cancel(NS_BINDING_ABORTED); ++ mIconRequest = nullptr; + +- mLoadedFrame = true; + return NS_OK; + } + +@@ -180,6 +193,9 @@ nsAlertsIconListener::ShowAlert(GdkPixbuf* aPixbuf) + mClosureHandler = g_signal_connect_closure(mNotification, "closed", closure, FALSE); + gboolean result = notify_notification_show(mNotification, nullptr); + ++ if (result && mAlertListener) ++ mAlertListener->Observe(nullptr, "alertshow", mAlertCookie.get()); ++ + return result ? NS_OK : NS_ERROR_FAILURE; + } + +@@ -201,9 +217,15 @@ nsAlertsIconListener::StartRequest(const nsAString & aImageUrl) + if (!il) + return ShowAlert(nullptr); + +- return il->LoadImageXPCOM(imageUri, nullptr, nullptr, nullptr, nullptr, +- this, nullptr, nsIRequest::LOAD_NORMAL, nullptr, +- nullptr, getter_AddRefs(mIconRequest)); ++ nsresult rv = il->LoadImageXPCOM(imageUri, nullptr, nullptr, nullptr, nullptr, ++ this, nullptr, nsIRequest::LOAD_NORMAL, nullptr, ++ 0 /* use default */, getter_AddRefs(mIconRequest)); ++ if (NS_FAILED(rv)) ++ return rv; ++ ++ mIconRequest->StartDecoding(); ++ ++ return NS_OK; + } + + void +diff --git toolkit/system/gnome/nsAlertsIconListener.h toolkit/system/gnome/nsAlertsIconListener.h +new file mode 100644 +index 0000000..ac96db9 +--- /dev/null ++++ mozilla/toolkit/system/gnome/nsAlertsIconListener.h +@@ -0,0 +1,89 @@ ++/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */ ++/* This Source Code Form is subject to the terms of the Mozilla Public ++ * License, v. 2.0. If a copy of the MPL was not distributed with this ++ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ ++ ++#ifndef nsAlertsIconListener_h__ ++#define nsAlertsIconListener_h__ ++ ++#include "nsCOMPtr.h" ++#include "imgINotificationObserver.h" ++#include "nsStringAPI.h" ++#include "nsIObserver.h" ++#include "nsWeakReference.h" ++ ++#include ++ ++class imgIRequest; ++ ++struct NotifyNotification; ++ ++class nsAlertsIconListener : public imgINotificationObserver, ++ public nsIObserver, ++ public nsSupportsWeakReference ++{ ++public: ++ NS_DECL_ISUPPORTS ++ NS_DECL_IMGINOTIFICATIONOBSERVER ++ NS_DECL_NSIOBSERVER ++ ++ nsAlertsIconListener(); ++ ++ nsresult InitAlertAsync(const nsAString & aImageUrl, ++ const nsAString & aAlertTitle, ++ const nsAString & aAlertText, ++ bool aAlertTextClickable, ++ const nsAString & aAlertCookie, ++ nsIObserver * aAlertListener); ++ ++ void SendCallback(); ++ void SendClosed(); ++ ++protected: ++ virtual ~nsAlertsIconListener(); ++ ++ nsresult OnStopRequest(imgIRequest* aRequest); ++ nsresult OnStopFrame(imgIRequest* aRequest); ++ ++ /** ++ * The only difference between libnotify.so.4 and libnotify.so.1 for these symbols ++ * is that notify_notification_new takes three arguments in libnotify.so.4 and ++ * four in libnotify.so.1. ++ * Passing the fourth argument as NULL is binary compatible. ++ */ ++ typedef void (*NotifyActionCallback)(NotifyNotification*, char*, gpointer); ++ typedef bool (*notify_is_initted_t)(void); ++ typedef bool (*notify_init_t)(const char*); ++ typedef GList* (*notify_get_server_caps_t)(void); ++ typedef NotifyNotification* (*notify_notification_new_t)(const char*, const char*, const char*, const char*); ++ typedef bool (*notify_notification_show_t)(void*, char*); ++ typedef void (*notify_notification_set_icon_from_pixbuf_t)(void*, GdkPixbuf*); ++ typedef void (*notify_notification_add_action_t)(void*, const char*, const char*, NotifyActionCallback, gpointer, GFreeFunc); ++ ++ nsCOMPtr mIconRequest; ++ nsCString mAlertTitle; ++ nsCString mAlertText; ++ ++ nsCOMPtr mAlertListener; ++ nsString mAlertCookie; ++ ++ bool mLoadedFrame; ++ bool mAlertHasAction; ++ ++ static void* libNotifyHandle; ++ static bool libNotifyNotAvail; ++ static notify_is_initted_t notify_is_initted; ++ static notify_init_t notify_init; ++ static notify_get_server_caps_t notify_get_server_caps; ++ static notify_notification_new_t notify_notification_new; ++ static notify_notification_show_t notify_notification_show; ++ static notify_notification_set_icon_from_pixbuf_t notify_notification_set_icon_from_pixbuf; ++ static notify_notification_add_action_t notify_notification_add_action; ++ NotifyNotification* mNotification; ++ gulong mClosureHandler; ++ ++ nsresult StartRequest(const nsAString & aImageUrl); ++ nsresult ShowAlert(GdkPixbuf* aPixbuf); ++}; ++ ++#endif +diff --git toolkit/system/gnome/nsGnomeModule.cpp toolkit/system/gnome/nsGnomeModule.cpp +index 5ccc8e5..f893893 100644 +--- mozilla/toolkit/system/gnome/nsGnomeModule.cpp ++++ mozilla/toolkit/system/gnome/nsGnomeModule.cpp +@@ -22,6 +22,8 @@ NS_GENERIC_FACTORY_CONSTRUCTOR_INIT(nsGnomeVFSService, Init) + NS_GENERIC_FACTORY_CONSTRUCTOR(nsGIOService) + NS_GENERIC_FACTORY_CONSTRUCTOR_INIT(nsGSettingsService, Init) + #endif ++#include "nsSystemAlertsService.h" ++NS_GENERIC_FACTORY_CONSTRUCTOR_INIT(nsSystemAlertsService, Init) + + #ifdef MOZ_ENABLE_GCONF + NS_DEFINE_NAMED_CID(NS_GCONFSERVICE_CID); +@@ -33,6 +35,7 @@ NS_DEFINE_NAMED_CID(NS_GNOMEVFSSERVICE_CID); + NS_DEFINE_NAMED_CID(NS_GIOSERVICE_CID); + NS_DEFINE_NAMED_CID(NS_GSETTINGSSERVICE_CID); + #endif ++NS_DEFINE_NAMED_CID(NS_SYSTEMALERTSSERVICE_CID); + + static const mozilla::Module::CIDEntry kGnomeCIDs[] = { + #ifdef MOZ_ENABLE_GCONF +@@ -45,6 +48,7 @@ static const mozilla::Module::CIDEntry kGnomeCIDs[] = { + { &kNS_GIOSERVICE_CID, false, nullptr, nsGIOServiceConstructor }, + { &kNS_GSETTINGSSERVICE_CID, false, nullptr, nsGSettingsServiceConstructor }, + #endif ++ { &kNS_SYSTEMALERTSSERVICE_CID, false, nullptr, nsSystemAlertsServiceConstructor }, + { nullptr } + }; + +@@ -59,6 +63,7 @@ static const mozilla::Module::ContractIDEntry kGnomeContracts[] = { + { NS_GIOSERVICE_CONTRACTID, &kNS_GIOSERVICE_CID }, + { NS_GSETTINGSSERVICE_CONTRACTID, &kNS_GSETTINGSSERVICE_CID }, + #endif ++ { NS_SYSTEMALERTSERVICE_CONTRACTID, &kNS_SYSTEMALERTSSERVICE_CID }, + { nullptr } + }; + +diff --git toolkit/system/gnome/nsSystemAlertsService.cpp toolkit/system/gnome/nsSystemAlertsService.cpp +new file mode 100644 +index 0000000..b91b402 +--- /dev/null ++++ mozilla/toolkit/system/gnome/nsSystemAlertsService.cpp +@@ -0,0 +1,54 @@ ++/* -*- Mode: C++; tab-width: 2; indent-tabs-mode:nil; c-basic-offset: 2 -*- */ ++/* This Source Code Form is subject to the terms of the Mozilla Public ++ * License, v. 2.0. If a copy of the MPL was not distributed with this ++ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ ++ ++#include "nsXULAppAPI.h" ++#include "nsSystemAlertsService.h" ++#include "nsAlertsIconListener.h" ++#include "nsAutoPtr.h" ++ ++NS_IMPL_ADDREF(nsSystemAlertsService) ++NS_IMPL_RELEASE(nsSystemAlertsService) ++ ++NS_INTERFACE_MAP_BEGIN(nsSystemAlertsService) ++ NS_INTERFACE_MAP_ENTRY_AMBIGUOUS(nsISupports, nsIAlertsService) ++ NS_INTERFACE_MAP_ENTRY(nsIAlertsService) ++NS_INTERFACE_MAP_END_THREADSAFE ++ ++nsSystemAlertsService::nsSystemAlertsService() ++{ ++} ++ ++nsSystemAlertsService::~nsSystemAlertsService() ++{} ++ ++nsresult ++nsSystemAlertsService::Init() ++{ ++ return NS_OK; ++} ++ ++NS_IMETHODIMP nsSystemAlertsService::ShowAlertNotification(const nsAString & aImageUrl, const nsAString & aAlertTitle, ++ const nsAString & aAlertText, bool aAlertTextClickable, ++ const nsAString & aAlertCookie, ++ nsIObserver * aAlertListener, ++ const nsAString & aAlertName, ++ const nsAString & aBidi, ++ const nsAString & aLang, ++ const nsAString & aData, ++ nsIPrincipal * aPrincipal) ++{ ++ nsRefPtr alertListener = new nsAlertsIconListener(); ++ if (!alertListener) ++ return NS_ERROR_OUT_OF_MEMORY; ++ ++ return alertListener->InitAlertAsync(aImageUrl, aAlertTitle, aAlertText, aAlertTextClickable, ++ aAlertCookie, aAlertListener); ++} ++ ++NS_IMETHODIMP nsSystemAlertsService::CloseAlert(const nsAString& aAlertName, ++ nsIPrincipal* aPrincipal) ++{ ++ return NS_ERROR_NOT_IMPLEMENTED; ++} +diff --git toolkit/system/gnome/nsSystemAlertsService.h toolkit/system/gnome/nsSystemAlertsService.h +new file mode 100644 +index 0000000..b0bd625 +--- /dev/null ++++ mozilla/toolkit/system/gnome/nsSystemAlertsService.h +@@ -0,0 +1,27 @@ ++/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */ ++/* This Source Code Form is subject to the terms of the Mozilla Public ++ * License, v. 2.0. If a copy of the MPL was not distributed with this ++ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ ++ ++#ifndef nsSystemAlertsService_h__ ++#define nsSystemAlertsService_h__ ++ ++#include "nsIAlertsService.h" ++#include "nsCOMPtr.h" ++ ++class nsSystemAlertsService : public nsIAlertsService ++{ ++public: ++ NS_DECL_NSIALERTSSERVICE ++ NS_DECL_ISUPPORTS ++ ++ nsSystemAlertsService(); ++ ++ nsresult Init(); ++ ++protected: ++ virtual ~nsSystemAlertsService(); ++ ++}; ++ ++#endif /* nsSystemAlertsService_h__ */ From owner-freebsd-gecko@FreeBSD.ORG Sat Nov 22 10:43:23 2014 Return-Path: Delivered-To: freebsd-gecko@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 88BE2DB1 for ; Sat, 22 Nov 2014 10:43:23 +0000 (UTC) Received: from trillian.chruetertee.ch (trillian.chruetertee.ch [217.150.244.247]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 02F318 for ; Sat, 22 Nov 2014 10:43:22 +0000 (UTC) Received: from trillian.chruetertee.ch (trillian [217.150.244.247]) by trillian.chruetertee.ch (8.14.4/8.14.3) with ESMTP id sAMAhLmC085650 for ; Sat, 22 Nov 2014 10:43:21 GMT (envelope-from svn-freebsd-gecko@chruetertee.ch) Received: (from www@localhost) by trillian.chruetertee.ch (8.14.4/8.14.3/Submit) id sAMAhGPI085334 for freebsd-gecko@freebsd.org; Sat, 22 Nov 2014 10:43:16 GMT (envelope-from svn-freebsd-gecko@chruetertee.ch) Date: Sat, 22 Nov 2014 10:43:16 GMT Message-Id: <201411221043.sAMAhGPI085334@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 Subject: [SVN-Commit] r1769 - trunk/www/firefox/files MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Reply-To: freebsd-gecko@freebsd.org X-BeenThere: freebsd-gecko@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: Gecko Rendering Engine issues List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 22 Nov 2014 10:43:23 -0000 Author: jbeich Date: Sat Nov 22 10:43:16 2014 New Revision: 1769 Log: backport a few gtk3 fixes Added: trunk/www/firefox/files/patch-bug1097592 trunk/www/firefox/files/patch-bug877605 Added: trunk/www/firefox/files/patch-bug1097592 ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ trunk/www/firefox/files/patch-bug1097592 Sat Nov 22 10:43:16 2014 (r1769) @@ -0,0 +1,41 @@ +commit a822f9a +Author: Martin Stransky +Date: Fri Nov 14 06:32:00 2014 +0100 + + Bug 1097592 - Don't use PR_FindFunctionSymbolAndLibrary to avoid app freeze, r=karlt +--- + widget/gtk/mozgtk/mozgtk.c | 1 + + widget/gtk/nsWindow.cpp | 8 +------- + 2 files changed, 2 insertions(+), 7 deletions(-) + +diff --git widget/gtk/mozgtk/mozgtk.c widget/gtk/mozgtk/mozgtk.c +index 11829d7..3b46759 100644 +--- widget/gtk/mozgtk/mozgtk.c ++++ widget/gtk/mozgtk/mozgtk.c +@@ -121,6 +121,7 @@ STUB(gdk_x11_lookup_xdisplay) + STUB(gdk_x11_screen_get_xscreen) + STUB(gdk_x11_visual_get_xvisual) + STUB(gdk_x11_window_lookup_for_display) ++STUB(gdk_x11_window_set_user_time) + STUB(gdk_x11_xatom_to_atom) + STUB(gtk_accel_label_new) + STUB(gtk_alignment_get_type) +diff --git widget/gtk/nsWindow.cpp widget/gtk/nsWindow.cpp +index 26c333b..d462f13 100644 +--- widget/gtk/nsWindow.cpp ++++ widget/gtk/nsWindow.cpp +@@ -1295,13 +1295,7 @@ SetUserTimeAndStartupIDForActivatedWindow(GtkWidget* aWindow) + } + + if (sn_launchee_context_get_id_has_timestamp(ctx)) { +- PRLibrary* gtkLibrary; +- SetUserTimeFunc setUserTimeFunc = (SetUserTimeFunc) +- PR_FindFunctionSymbolAndLibrary("gdk_x11_window_set_user_time", >kLibrary); +- if (setUserTimeFunc) { +- setUserTimeFunc(gdkWindow, sn_launchee_context_get_timestamp(ctx)); +- PR_UnloadLibrary(gtkLibrary); +- } ++ gdk_x11_window_set_user_time(gdkWindow, sn_launchee_context_get_timestamp(ctx)); + } + + sn_launchee_context_setup_window(ctx, gdk_x11_window_get_xid(gdkWindow)); Added: trunk/www/firefox/files/patch-bug877605 ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ trunk/www/firefox/files/patch-bug877605 Sat Nov 22 10:43:16 2014 (r1769) @@ -0,0 +1,305 @@ +commit d7cc508 +Author: Martin Stransky +Date: Thu Sep 4 05:17:00 2014 +0200 + + Bug 877605 - GTK3 - fixed tab widget rendering. r=karlt +--- + widget/gtk/gtk2drawing.c | 18 ++++++ + widget/gtk/gtk3drawing.c | 121 ++++++++++++++++++++++++++++++---------- + widget/gtk/gtkdrawing.h | 13 +++++ + widget/gtk/nsNativeThemeGTK.cpp | 20 ++++--- + 4 files changed, 136 insertions(+), 36 deletions(-) + +diff --git widget/gtk/gtk2drawing.c widget/gtk/gtk2drawing.c +index 71e1929..290a17a 100644 +--- widget/gtk/gtk2drawing.c ++++ widget/gtk/gtk2drawing.c +@@ -3013,6 +3013,24 @@ moz_gtk_get_widget_border(GtkThemeWidgetType widget, gint* left, gint* top, + } + + gint ++moz_gtk_get_tab_border(gint* left, gint* top, gint* right, gint* bottom, ++ GtkTextDirection direction, GtkTabFlags flags) ++{ ++ moz_gtk_get_widget_border(MOZ_GTK_TAB, left, top, ++ right, bottom, direction, ++ FALSE); ++ ++ // Top tabs have no bottom border, bottom tabs have no top border ++ if (flags & MOZ_GTK_TAB_BOTTOM) { ++ *top = 0; ++ } else { ++ *bottom = 0; ++ } ++ ++ return MOZ_GTK_SUCCESS; ++} ++ ++gint + moz_gtk_get_combo_box_entry_button_size(gint* width, gint* height) + { + /* +diff --git widget/gtk/gtk3drawing.c widget/gtk/gtk3drawing.c +index 684650d..e9e21b1 100644 +--- widget/gtk/gtk3drawing.c ++++ widget/gtk/gtk3drawing.c +@@ -2105,6 +2105,21 @@ moz_gtk_get_tab_thickness(void) + return border.top; + } + ++static void ++moz_gtk_tab_prepare_style_context(GtkStyleContext *style, ++ GtkTabFlags flags) ++{ ++ gtk_style_context_set_state(style, ((flags & MOZ_GTK_TAB_SELECTED) == 0) ? ++ GTK_STATE_FLAG_NORMAL : ++ GTK_STATE_FLAG_ACTIVE); ++ gtk_style_context_add_region(style, GTK_STYLE_REGION_TAB, ++ (flags & MOZ_GTK_TAB_FIRST) ? ++ GTK_REGION_FIRST : 0); ++ gtk_style_context_add_class(style, (flags & MOZ_GTK_TAB_BOTTOM) ? ++ GTK_STYLE_CLASS_BOTTOM : ++ GTK_STYLE_CLASS_TOP); ++} ++ + /* actual small tabs */ + static gint + moz_gtk_tab_paint(cairo_t *cr, GdkRectangle* rect, +@@ -2117,22 +2132,35 @@ moz_gtk_tab_paint(cairo_t *cr, GdkRectangle* rect, + * tab appear physically attached to the tabpanel; see details below. */ + + GtkStyleContext* style; ++ GdkRectangle tabRect; + GdkRectangle focusRect; + GdkRectangle backRect; ++ int initial_gap = 0; + + ensure_tab_widget(); + gtk_widget_set_direction(gTabWidget, direction); + + style = gtk_widget_get_style_context(gTabWidget); +- backRect = focusRect = *rect; +- + gtk_style_context_save(style); ++ moz_gtk_tab_prepare_style_context(style, flags); ++ ++ tabRect = *rect; ++ ++ if (flags & MOZ_GTK_TAB_FIRST) { ++ gtk_widget_style_get (gTabWidget, "initial-gap", &initial_gap, NULL); ++ tabRect.width -= initial_gap; ++ ++ if (direction != GTK_TEXT_DIR_RTL) { ++ tabRect.x += initial_gap; ++ } ++ } ++ ++ focusRect = backRect = tabRect; + + if ((flags & MOZ_GTK_TAB_SELECTED) == 0) { + /* Only draw the tab */ +- gtk_style_context_set_state(style, GTK_STATE_FLAG_NORMAL); + gtk_render_extension(style, cr, +- rect->x, rect->y, rect->width, rect->height, ++ tabRect.x, tabRect.y, tabRect.width, tabRect.height, + (flags & MOZ_GTK_TAB_BOTTOM) ? + GTK_POS_TOP : GTK_POS_BOTTOM ); + } else { +@@ -2186,24 +2214,19 @@ moz_gtk_tab_paint(cairo_t *cr, GdkRectangle* rect, + gap_loffset = gap_roffset = 20; /* should be enough */ + if (flags & MOZ_GTK_TAB_FIRST) { + if (direction == GTK_TEXT_DIR_RTL) +- gap_roffset = 0; ++ gap_roffset = initial_gap; + else +- gap_loffset = 0; ++ gap_loffset = initial_gap; + } + +- gtk_style_context_set_state(style, GTK_STATE_FLAG_ACTIVE); +- +- /* Adwaita theme engine crashes without it (rhbz#713764) */ +- gtk_style_context_add_region(style, GTK_STYLE_REGION_TAB, 0); +- + if (flags & MOZ_GTK_TAB_BOTTOM) { + /* Draw the tab on bottom */ + focusRect.y += gap_voffset; + focusRect.height -= gap_voffset; + + gtk_render_extension(style, cr, +- rect->x, rect->y + gap_voffset, rect->width, +- rect->height - gap_voffset, GTK_POS_TOP); ++ tabRect.x, tabRect.y + gap_voffset, tabRect.width, ++ tabRect.height - gap_voffset, GTK_POS_TOP); + + gtk_style_context_remove_region(style, GTK_STYLE_REGION_TAB); + +@@ -2219,38 +2242,39 @@ moz_gtk_tab_paint(cairo_t *cr, GdkRectangle* rect, + cairo_clip(cr); + + gtk_render_frame_gap(style, cr, +- rect->x - gap_loffset, +- rect->y + gap_voffset - 3 * gap_height, +- rect->width + gap_loffset + gap_roffset, ++ tabRect.x - gap_loffset, ++ tabRect.y + gap_voffset - 3 * gap_height, ++ tabRect.width + gap_loffset + gap_roffset, + 3 * gap_height, GTK_POS_BOTTOM, +- gap_loffset, gap_loffset + rect->width); ++ gap_loffset, gap_loffset + tabRect.width); + cairo_restore(cr); + } else { + /* Draw the tab on top */ + focusRect.height -= gap_voffset; + gtk_render_extension(style, cr, +- rect->x, rect->y, rect->width, +- rect->height - gap_voffset, GTK_POS_BOTTOM); ++ tabRect.x, tabRect.y, tabRect.width, ++ tabRect.height - gap_voffset, GTK_POS_BOTTOM); + + gtk_style_context_remove_region(style, GTK_STYLE_REGION_TAB); + +- backRect.y += (rect->height - gap_voffset); ++ backRect.y += (tabRect.height - gap_voffset); + backRect.height = gap_height; + + /* Draw the gap; erase with background color before painting in + * case theme does not */ + gtk_render_background(style, cr, backRect.x, backRect.y, + backRect.width, backRect.height); ++ + cairo_save(cr); + cairo_rectangle(cr, backRect.x, backRect.y, backRect.width, backRect.height); + cairo_clip(cr); + + gtk_render_frame_gap(style, cr, +- rect->x - gap_loffset, +- rect->y + rect->height - gap_voffset, +- rect->width + gap_loffset + gap_roffset, ++ tabRect.x - gap_loffset, ++ tabRect.y + tabRect.height - gap_voffset, ++ tabRect.width + gap_loffset + gap_roffset, + 3 * gap_height, GTK_POS_TOP, +- gap_loffset, gap_loffset + rect->width); ++ gap_loffset, gap_loffset + tabRect.width); + cairo_restore(cr); + } + } +@@ -2885,10 +2909,6 @@ moz_gtk_get_widget_border(GtkThemeWidgetType widget, gint* left, gint* top, + left, top, right, bottom); + return MOZ_GTK_SUCCESS; + } +- case MOZ_GTK_TAB: +- ensure_tab_widget(); +- w = gTabWidget; +- break; + /* These widgets have no borders, since they are not containers. */ + case MOZ_GTK_SPLITTER_HORIZONTAL: + case MOZ_GTK_SPLITTER_VERTICAL: +@@ -2932,6 +2952,51 @@ moz_gtk_get_widget_border(GtkThemeWidgetType widget, gint* left, gint* top, + } + + gint ++moz_gtk_get_tab_border(gint* left, gint* top, gint* right, gint* bottom, ++ GtkTextDirection direction, GtkTabFlags flags) ++{ ++ GtkStyleContext* style; ++ int tab_curvature; ++ ++ ensure_tab_widget(); ++ ++ style = gtk_widget_get_style_context(gTabWidget); ++ gtk_style_context_save(style); ++ moz_gtk_tab_prepare_style_context(style, flags); ++ ++ // TODO add_style_border() should be replaced ++ // with focus-line-width and focus-padding ++ // see Bug 877605 ++ *left = *top = *right = *bottom = 0; ++ moz_gtk_add_style_border(style, left, top, right, bottom); ++ moz_gtk_add_style_padding(style, left, top, right, bottom); ++ ++ gtk_widget_style_get (gTabWidget, "tab-curvature", &tab_curvature, NULL); ++ *left += tab_curvature; ++ *right += tab_curvature; ++ ++ if (flags & MOZ_GTK_TAB_FIRST) { ++ int initial_gap; ++ gtk_widget_style_get (gTabWidget, "initial-gap", &initial_gap, NULL); ++ if (direction == GTK_TEXT_DIR_RTL) ++ *right += initial_gap; ++ else ++ *left += initial_gap; ++ } ++ ++ // Top tabs have no bottom border, bottom tabs have no top border ++ if (flags & MOZ_GTK_TAB_BOTTOM) { ++ *top = 0; ++ } else { ++ *bottom = 0; ++ } ++ ++ gtk_style_context_restore(style); ++ ++ return MOZ_GTK_SUCCESS; ++} ++ ++gint + moz_gtk_get_combo_box_entry_button_size(gint* width, gint* height) + { + /* +diff --git widget/gtk/gtkdrawing.h widget/gtk/gtkdrawing.h +index fb11105..1938e8f 100644 +--- widget/gtk/gtkdrawing.h ++++ widget/gtk/gtkdrawing.h +@@ -259,6 +259,19 @@ gint moz_gtk_get_widget_border(GtkThemeWidgetType widget, gint* left, gint* top, + gboolean inhtml); + + /** ++ * Get the border size of a notebook tab ++ * left/right: [OUT] the tab's left/right border ++ * top/bottom: [OUT] the tab's top/bottom border ++ * direction: the text direction for the widget ++ * flags: tab-dependant flags; see the GtkTabFlags definition. ++ * ++ * returns: MOZ_GTK_SUCCESS if there was no error, an error code otherwise ++ */ ++gint ++moz_gtk_get_tab_border(gint* left, gint* top, gint* right, gint* bottom, ++ GtkTextDirection direction, GtkTabFlags flags); ++ ++/** + * Get the desired size of a GtkCheckButton + * indicator_size: [OUT] the indicator size + * indicator_spacing: [OUT] the spacing between the indicator and its +diff --git widget/gtk/nsNativeThemeGTK.cpp widget/gtk/nsNativeThemeGTK.cpp +index 969fb0a..62018e5 100644 +--- widget/gtk/nsNativeThemeGTK.cpp ++++ widget/gtk/nsNativeThemeGTK.cpp +@@ -940,14 +940,18 @@ nsNativeThemeGTK::GetWidgetBorder(nsDeviceContext* aContext, nsIFrame* aFrame, + // but don't reserve any space for it. + break; + case NS_THEME_TAB: +- // Top tabs have no bottom border, bottom tabs have no top border +- moz_gtk_get_widget_border(MOZ_GTK_TAB, &aResult->left, &aResult->top, +- &aResult->right, &aResult->bottom, direction, +- FALSE); +- if (IsBottomTab(aFrame)) +- aResult->top = 0; +- else +- aResult->bottom = 0; ++ { ++ GtkThemeWidgetType gtkWidgetType; ++ gint flags; ++ ++ if (!GetGtkWidgetAndState(aWidgetType, aFrame, gtkWidgetType, nullptr, ++ &flags)) ++ return NS_OK; ++ ++ moz_gtk_get_tab_border(&aResult->left, &aResult->top, ++ &aResult->right, &aResult->bottom, direction, ++ (GtkTabFlags)flags); ++ } + break; + case NS_THEME_MENUITEM: + case NS_THEME_CHECKMENUITEM: From owner-freebsd-gecko@FreeBSD.ORG Sat Nov 22 11:30:00 2014 Return-Path: Delivered-To: freebsd-gecko@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id B9BAB296 for ; Sat, 22 Nov 2014 11:30:00 +0000 (UTC) Received: from trillian.chruetertee.ch (trillian.chruetertee.ch [217.150.244.247]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 4EFE05DF for ; Sat, 22 Nov 2014 11:29:59 +0000 (UTC) Received: from trillian.chruetertee.ch (trillian [217.150.244.247]) by trillian.chruetertee.ch (8.14.4/8.14.3) with ESMTP id sAMBTvfh041761 for ; Sat, 22 Nov 2014 11:29: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 sAMBTqPI041468 for freebsd-gecko@freebsd.org; Sat, 22 Nov 2014 11:29:52 GMT (envelope-from svn-freebsd-gecko@chruetertee.ch) Date: Sat, 22 Nov 2014 11:29:52 GMT Message-Id: <201411221129.sAMBTqPI041468@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 Subject: [SVN-Commit] r1770 - in trunk/www: firefox firefox-nightly MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Reply-To: freebsd-gecko@freebsd.org X-BeenThere: freebsd-gecko@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: Gecko Rendering Engine issues List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 22 Nov 2014 11:30:00 -0000 Author: jbeich Date: Sat Nov 22 11:29:52 2014 New Revision: 1770 Log: Adwaita (default gtk3) theme doesn't come with any icons Raleigh used to come with fallback icons but Adwaita doesn't. Firefox uses theme icons for new tab '+', file dialogs and download manager. Any other icon theme would work, too. Modified: trunk/www/firefox-nightly/Makefile trunk/www/firefox/Makefile Modified: trunk/www/firefox-nightly/Makefile ============================================================================== --- trunk/www/firefox-nightly/Makefile Sat Nov 22 10:43:16 2014 (r1769) +++ trunk/www/firefox-nightly/Makefile Sat Nov 22 11:29:52 2014 (r1770) @@ -80,6 +80,7 @@ .if ${PORT_OPTIONS:MGTK3} BUILD_DEPENDS+= gtk3>=3.14.3:${PORTSDIR}/x11-toolkits/gtk30 +RUN_DEPENDS+= adwaita-icon-theme>=3.14:${PORTSDIR}/x11-themes/adwaita-icon-theme .endif .if ${PORT_OPTIONS:MMACH} && ${PORT_OPTIONS:MPGO} Modified: trunk/www/firefox/Makefile ============================================================================== --- trunk/www/firefox/Makefile Sat Nov 22 10:43:16 2014 (r1769) +++ trunk/www/firefox/Makefile Sat Nov 22 11:29:52 2014 (r1770) @@ -69,6 +69,7 @@ .if ${PORT_OPTIONS:MGTK3} BUILD_DEPENDS+= gtk3>=3.14.3:${PORTSDIR}/x11-toolkits/gtk30 +RUN_DEPENDS+= adwaita-icon-theme>=3.14:${PORTSDIR}/x11-themes/adwaita-icon-theme .endif post-extract: From owner-freebsd-gecko@FreeBSD.ORG Sat Nov 22 11:36:23 2014 Return-Path: Delivered-To: freebsd-gecko@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id C3F8C3F9 for ; Sat, 22 Nov 2014 11:36:23 +0000 (UTC) Received: from trillian.chruetertee.ch (trillian.chruetertee.ch [217.150.244.247]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 4E86A694 for ; Sat, 22 Nov 2014 11:36:22 +0000 (UTC) Received: from trillian.chruetertee.ch (trillian [217.150.244.247]) by trillian.chruetertee.ch (8.14.4/8.14.3) with ESMTP id sAMBaKIh073521 for ; Sat, 22 Nov 2014 11:36:20 GMT (envelope-from svn-freebsd-gecko@chruetertee.ch) Received: (from www@localhost) by trillian.chruetertee.ch (8.14.4/8.14.3/Submit) id sAMBaFrF072965 for freebsd-gecko@freebsd.org; Sat, 22 Nov 2014 11:36:15 GMT (envelope-from svn-freebsd-gecko@chruetertee.ch) Date: Sat, 22 Nov 2014 11:36:15 GMT Message-Id: <201411221136.sAMBaFrF072965@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 Subject: [SVN-Commit] r1771 - in trunk/www/firefox-nightly: . files MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Reply-To: freebsd-gecko@freebsd.org X-BeenThere: freebsd-gecko@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: Gecko Rendering Engine issues List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 22 Nov 2014 11:36:24 -0000 Author: jbeich Date: Sat Nov 22 11:36:15 2014 New Revision: 1771 Log: update just Nightly to pick up bug 1097592 Deleted: trunk/www/firefox-nightly/files/patch-bug1063726 Modified: trunk/www/firefox-nightly/Makefile.hgrev trunk/www/firefox-nightly/distinfo Modified: trunk/www/firefox-nightly/Makefile.hgrev ============================================================================== --- trunk/www/firefox-nightly/Makefile.hgrev Sat Nov 22 11:29:52 2014 (r1770) +++ trunk/www/firefox-nightly/Makefile.hgrev Sat Nov 22 11:36:15 2014 (r1771) @@ -1 +1 @@ -HGREV= 216336:20065dfb6476 +HGREV= 216988:ac55dd11daec Modified: trunk/www/firefox-nightly/distinfo ============================================================================== --- trunk/www/firefox-nightly/distinfo Sat Nov 22 11:29:52 2014 (r1770) +++ trunk/www/firefox-nightly/distinfo Sat Nov 22 11:36:15 2014 (r1771) @@ -1,2 +1,2 @@ -SHA256 (firefox-nightly/20065dfb6476.tar.bz2) = 1ba878b151604490970897b1b387a937702fe596f424317f42d1f0a1488ce648 -SIZE (firefox-nightly/20065dfb6476.tar.bz2) = 174587296 +SHA256 (firefox-nightly/ac55dd11daec.tar.bz2) = e44f77973bece68be7cb2b8720369ef81124a235bd1817374957dffd220810f4 +SIZE (firefox-nightly/ac55dd11daec.tar.bz2) = 175046048 Deleted: trunk/www/firefox-nightly/files/patch-bug1063726 ============================================================================== --- trunk/www/firefox-nightly/files/patch-bug1063726 Sat Nov 22 11:36:15 2014 (r1770) +++ /dev/null 00:00:00 1970 (deleted) @@ -1,41 +0,0 @@ -diff --git js/src/configure.in js/src/configure.in -index 75177dd..1051ba2 100644 ---- js/src/configure.in -+++ js/src/configure.in -@@ -3913,7 +3913,17 @@ dnl ======================================================== - dnl JavaScript shell - dnl ======================================================== - --AC_CHECK_HEADERS(malloc.h malloc/malloc.h) -+MALLOC_HEADERS="malloc.h malloc_np.h malloc/malloc.h sys/malloc.h" -+MALLOC_H= -+ -+for file in $MALLOC_HEADERS; do -+ MOZ_CHECK_HEADER($file, [MALLOC_H=$file]) -+ if test "$MALLOC_H" != ""; then -+ AC_DEFINE_UNQUOTED(MALLOC_H, <$MALLOC_H>) -+ break -+ fi -+done -+ - AC_CHECK_FUNCS(setlocale localeconv malloc_size malloc_usable_size) - - AC_SUBST(MOZILLA_VERSION) -diff --git js/src/shell/js.cpp js/src/shell/js.cpp -index 866522a..b0b475f 100644 ---- js/src/shell/js.cpp -+++ js/src/shell/js.cpp -@@ -22,11 +22,8 @@ - # include /* for isatty() */ - #endif - #include --#ifdef HAVE_MALLOC_H /* for malloc_usable_size on Linux, _msize on Windows */ --#include --#endif --#ifdef HAVE_MALLOC_MALLOC_H --#include /* for malloc_size on OSX */ -+#if defined(MALLOC_H) -+#include MALLOC_H /* for malloc_usable_size, malloc_size, _msize */ - #endif - #include - #include