From owner-freebsd-gecko@FreeBSD.ORG Tue Nov 25 18:44:50 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 5549CEA for ; Tue, 25 Nov 2014 18:44:50 +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 EE4CE5EE for ; Tue, 25 Nov 2014 18:44:49 +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 sAPIifVh023960 for ; Tue, 25 Nov 2014 18:44:41 GMT (envelope-from svn-freebsd-gecko@chruetertee.ch) Received: (from www@localhost) by trillian.chruetertee.ch (8.14.4/8.14.3/Submit) id sAPIiarg022929 for freebsd-gecko@freebsd.org; Tue, 25 Nov 2014 18:44:36 GMT (envelope-from svn-freebsd-gecko@chruetertee.ch) Date: Tue, 25 Nov 2014 18:44:36 GMT Message-Id: <201411251844.sAPIiarg022929@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] r1775 - in trunk: mail/thunderbird/files www/firefox-esr/files www/libxul/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: Tue, 25 Nov 2014 18:44:50 -0000 Author: jbeich Date: Tue Nov 25 18:44:35 2014 New Revision: 1775 Log: fix the following error in -esr31 ports after r1768 toolkit/system/gnome/nsSystemAlertsService.cpp:32:38: error: out-of-line definition of 'ShowAlertNotification' does not match any declaration in 'nsSystemAlertsService' NS_IMETHODIMP nsSystemAlertsService::ShowAlertNotification(const nsAString & aImageUrl, const nsAS... ^~~~~~~~~~~~~~~~~~~~~ 1 error generated. Modified: trunk/mail/thunderbird/files/patch-bug858919 trunk/www/firefox-esr/files/patch-bug858919 trunk/www/libxul/files/patch-bug858919 Modified: trunk/mail/thunderbird/files/patch-bug858919 ============================================================================== --- trunk/mail/thunderbird/files/patch-bug858919 Mon Nov 24 08:13:13 2014 (r1774) +++ trunk/mail/thunderbird/files/patch-bug858919 Tue Nov 25 18:44:35 2014 (r1775) @@ -302,7 +302,7 @@ index 0000000..b91b402 --- /dev/null +++ mozilla/toolkit/system/gnome/nsSystemAlertsService.cpp -@@ -0,0 +1,54 @@ +@@ -0,0 +1,53 @@ +/* -*- 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 @@ -341,7 +341,6 @@ + const nsAString & aAlertName, + const nsAString & aBidi, + const nsAString & aLang, -+ const nsAString & aData, + nsIPrincipal * aPrincipal) +{ + nsRefPtr alertListener = new nsAlertsIconListener(); Modified: trunk/www/firefox-esr/files/patch-bug858919 ============================================================================== --- trunk/www/firefox-esr/files/patch-bug858919 Mon Nov 24 08:13:13 2014 (r1774) +++ trunk/www/firefox-esr/files/patch-bug858919 Tue Nov 25 18:44:35 2014 (r1775) @@ -302,7 +302,7 @@ index 0000000..b91b402 --- /dev/null +++ toolkit/system/gnome/nsSystemAlertsService.cpp -@@ -0,0 +1,54 @@ +@@ -0,0 +1,53 @@ +/* -*- 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 @@ -341,7 +341,6 @@ + const nsAString & aAlertName, + const nsAString & aBidi, + const nsAString & aLang, -+ const nsAString & aData, + nsIPrincipal * aPrincipal) +{ + nsRefPtr alertListener = new nsAlertsIconListener(); Modified: trunk/www/libxul/files/patch-bug858919 ============================================================================== --- trunk/www/libxul/files/patch-bug858919 Mon Nov 24 08:13:13 2014 (r1774) +++ trunk/www/libxul/files/patch-bug858919 Tue Nov 25 18:44:35 2014 (r1775) @@ -302,7 +302,7 @@ index 0000000..b91b402 --- /dev/null +++ toolkit/system/gnome/nsSystemAlertsService.cpp -@@ -0,0 +1,54 @@ +@@ -0,0 +1,53 @@ +/* -*- 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 @@ -341,7 +341,6 @@ + const nsAString & aAlertName, + const nsAString & aBidi, + const nsAString & aLang, -+ const nsAString & aData, + nsIPrincipal * aPrincipal) +{ + nsRefPtr alertListener = new nsAlertsIconListener();