Date: Tue, 25 Nov 2014 18:44:36 GMT 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 Message-ID: <201411251844.sAPIiarg022929@trillian.chruetertee.ch>
next in thread | raw e-mail | index | archive | help
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<nsAlertsIconListener> 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<nsAlertsIconListener> 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<nsAlertsIconListener> alertListener = new nsAlertsIconListener();
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201411251844.sAPIiarg022929>