From: "Jory Pratt" <anarchy@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] proj/mozilla:master commit in: mail-client/thunderbird/files/
Date: Mon, 4 Apr 2011 02:25:23 +0000 (UTC) [thread overview]
Message-ID: <cea3c994cea324fac35ba56aad6942d3542f5586.anarchy@gentoo> (raw)
commit: cea3c994cea324fac35ba56aad6942d3542f5586
Author: Jory A. Pratt <anarchy <AT> gentoo <DOT> org>
AuthorDate: Mon Apr 4 02:25:43 2011 +0000
Commit: Jory Pratt <anarchy <AT> gentoo <DOT> org>
CommitDate: Mon Apr 4 02:25:43 2011 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/mozilla.git;a=commit;h=cea3c994
remove dead files
---
mail-client/thunderbird/files/bug-606109.patch | 48 ------------------
mail-client/thunderbird/files/libnotify-0.7.patch | 56 ---------------------
2 files changed, 0 insertions(+), 104 deletions(-)
diff --git a/mail-client/thunderbird/files/bug-606109.patch b/mail-client/thunderbird/files/bug-606109.patch
deleted file mode 100644
index 57d9cd9..0000000
--- a/mail-client/thunderbird/files/bug-606109.patch
+++ /dev/null
@@ -1,48 +0,0 @@
-# HG changeset patch
-# User Jory A. Pratt <anarchy@gentoo.org>
-# Parent 74e4421e0a30c6e21b594675e32a8d9d663c309c
-Add missing ifde MOZ_MEDIA
-
-diff --git a/content/base/src/nsContentSink.cpp b/content/base/src/nsContentSink.cpp
---- a/mozilla/content/base/src/nsContentSink.cpp
-+++ b/mozilla/content/base/src/nsContentSink.cpp
-@@ -1860,17 +1860,19 @@ nsIAtom** const kDefaultAllowedTags [] =
- &nsGkAtoms::nobr,
- &nsGkAtoms::noscript,
- &nsGkAtoms::ol,
- &nsGkAtoms::optgroup,
- &nsGkAtoms::option,
- &nsGkAtoms::output,
- &nsGkAtoms::p,
- &nsGkAtoms::pre,
-+#ifdef MOZ_MEDIA
- &nsGkAtoms::progress,
-+#endif
- &nsGkAtoms::q,
- &nsGkAtoms::rp,
- &nsGkAtoms::rt,
- &nsGkAtoms::ruby,
- &nsGkAtoms::s,
- &nsGkAtoms::samp,
- &nsGkAtoms::section,
- &nsGkAtoms::select,
-@@ -1952,17 +1954,19 @@ nsIAtom** const kDefaultAllowedAttribute
- &nsGkAtoms::itemref,
- &nsGkAtoms::itemscope,
- &nsGkAtoms::itemtype,
- &nsGkAtoms::kind,
- &nsGkAtoms::label,
- &nsGkAtoms::lang,
- &nsGkAtoms::list,
- &nsGkAtoms::longdesc,
-+#ifdef MOZ_MEDIA
- &nsGkAtoms::loop,
-+#endif
- &nsGkAtoms::low,
- &nsGkAtoms::max,
- &nsGkAtoms::maxlength,
- &nsGkAtoms::media,
- &nsGkAtoms::min,
- &nsGkAtoms::mozdonotsend,
- &nsGkAtoms::method,
- &nsGkAtoms::multiple,
diff --git a/mail-client/thunderbird/files/libnotify-0.7.patch b/mail-client/thunderbird/files/libnotify-0.7.patch
deleted file mode 100644
index ab363a2..0000000
--- a/mail-client/thunderbird/files/libnotify-0.7.patch
+++ /dev/null
@@ -1,56 +0,0 @@
-# HG changeset patch
-# User Priit Laes <plaes@plaes.org>
-# Parent 194dd9a57615185c998a87148fac65df51600758
-Bug 628222 - Add support for libnotify-0.7+. r=karlt
-
-diff --git a/mozilla/toolkit/system/gnome/nsAlertsIconListener.cpp b/mozilla/toolkit/system/gnome/nsAlertsIconListener.cpp
---- a/mozilla/toolkit/system/gnome/nsAlertsIconListener.cpp
-+++ b/mozilla/toolkit/system/gnome/nsAlertsIconListener.cpp
-@@ -42,16 +42,21 @@
- #include "nsNetUtil.h"
- #include "nsIImageToPixbuf.h"
- #include "nsIStringBundle.h"
-
- #include <gdk-pixbuf/gdk-pixbuf.h>
- #include <libnotify/notify.h>
- #include <gdk/gdk.h>
-
-+// Compatibility macro for <libnotify-0.7
-+#ifndef NOTIFY_CHECK_VERSION
-+#define NOTIFY_CHECK_VERSION(x,y,z) 0
-+#endif
-+
- static PRBool gHasActions = PR_FALSE;
-
- static void notify_action_cb(NotifyNotification *notification,
- gchar *action, gpointer user_data)
- {
- nsAlertsIconListener* alert = static_cast<nsAlertsIconListener*> (user_data);
- alert->SendCallback();
- }
-@@ -199,17 +204,23 @@ nsAlertsIconListener::OnStopFrame(imgIRe
- return NS_OK;
- }
-
- nsresult
- nsAlertsIconListener::ShowAlert(GdkPixbuf* aPixbuf)
- {
- NotifyNotification* notify = notify_notification_new(mAlertTitle.get(),
- mAlertText.get(),
-- NULL, NULL);
-+ NULL
-+// >=libnotify-0.7.0 has no support for attaching to widgets
-+#if !NOTIFY_CHECK_VERSION(0,7,0)
-+ , NULL
-+#endif
-+ );
-+
- if (!notify)
- return NS_ERROR_OUT_OF_MEMORY;
-
- if (aPixbuf)
- notify_notification_set_icon_from_pixbuf(notify, aPixbuf);
-
- NS_ADDREF(this);
- if (mAlertHasAction) {
-
reply other threads:[~2011-04-04 2:25 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=cea3c994cea324fac35ba56aad6942d3542f5586.anarchy@gentoo \
--to=anarchy@gentoo.org \
--cc=gentoo-commits@lists.gentoo.org \
--cc=gentoo-dev@lists.gentoo.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox