Author: jbeich
Date: Mon Jul 9 22:54:59 2012
New Revision: 867
Log:
unbreak qt with libc++
Added:
branches/experimental/mail/thunderbird-esr/patch-mozilla-widget-src-qt-nsSound.cpp
branches/experimental/mail/thunderbird-esr/patch-mozilla-widget-src-qt-nsWindow.cpp
branches/experimental/mail/thunderbird/files/patch-mozilla-widget-qt-nsSound.cpp
branches/experimental/mail/thunderbird/files/patch-mozilla-widget-qt-nsWindow.cpp
branches/experimental/www/firefox-esr/files/patch-widget-src-qt-nsSound.cpp
branches/experimental/www/firefox-esr/files/patch-widget-src-qt-nsWindow.cpp
branches/experimental/www/firefox-nightly/files/patch-widget-qt-nsSound.cpp
branches/experimental/www/firefox-nightly/files/patch-widget-qt-nsWindow.cpp
branches/experimental/www/firefox/files/patch-widget-qt-nsSound.cpp
branches/experimental/www/firefox/files/patch-widget-qt-nsWindow.cpp
branches/experimental/www/libxul/files/patch-widget-src-qt-nsSound.cpp
branches/experimental/www/libxul/files/patch-widget-src-qt-nsWindow.cpp
branches/experimental/www/seamonkey/files/patch-mozilla-widget-qt-nsSound.cpp
branches/experimental/www/seamonkey/files/patch-mozilla-widget-qt-nsWindow.cpp
Modified:
branches/experimental/www/firefox-nightly/files/patch-bug753046
Added:
branches/experimental/mail/thunderbird-esr/patch-mozilla-widget-src-qt-nsSound.cpp
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++
branches/experimental/mail/thunderbird-esr/patch-mozilla-widget-src-qt-nsSound.cpp
Mon Jul 9 22:54:59 2012 (r867)
@@ -0,0 +1,10 @@
+--- mozilla/widget/src/qt/nsSound.cpp~
++++ mozilla/widget/src/qt/nsSound.cpp
+@@ -40,6 +40,7 @@
+ #include <QSound>
+
+ #include <string.h>
++#include <unistd.h>
+
+ #include "nscore.h"
+ #include "plstr.h"
Added:
branches/experimental/mail/thunderbird-esr/patch-mozilla-widget-src-qt-nsWindow.cpp
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++
branches/experimental/mail/thunderbird-esr/patch-mozilla-widget-src-qt-nsWindow.cpp
Mon Jul 9 22:54:59 2012 (r867)
@@ -0,0 +1,10 @@
+--- mozilla/widget/src/qt/nsWindow.cpp~
++++ mozilla/widget/src/qt/nsWindow.cpp
+@@ -43,6 +43,7 @@ using namespace QtMobility;
+
+ #ifdef MOZ_X11
+ #include <X11/Xlib.h>
++#include "mozilla/X11Util.h"
+ #endif //MOZ_X11
+
+ #include "nsXULAppAPI.h"
Added:
branches/experimental/mail/thunderbird/files/patch-mozilla-widget-qt-nsSound.cpp
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++
branches/experimental/mail/thunderbird/files/patch-mozilla-widget-qt-nsSound.cpp
Mon Jul 9 22:54:59 2012 (r867)
@@ -0,0 +1,10 @@
+--- mozilla/widget/qt/nsSound.cpp~
++++ mozilla/widget/qt/nsSound.cpp
+@@ -40,6 +40,7 @@
+ #include <QSound>
+
+ #include <string.h>
++#include <unistd.h>
+
+ #include "nscore.h"
+ #include "plstr.h"
Added:
branches/experimental/mail/thunderbird/files/patch-mozilla-widget-qt-nsWindow.cpp
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++
branches/experimental/mail/thunderbird/files/patch-mozilla-widget-qt-nsWindow.cpp
Mon Jul 9 22:54:59 2012 (r867)
@@ -0,0 +1,10 @@
+--- mozilla/widget/qt/nsWindow.cpp~
++++ mozilla/widget/qt/nsWindow.cpp
+@@ -43,6 +43,7 @@ using namespace QtMobility;
+
+ #ifdef MOZ_X11
+ #include <X11/Xlib.h>
++#include "mozilla/X11Util.h"
+ #endif //MOZ_X11
+
+ #include "nsXULAppAPI.h"
Added:
branches/experimental/www/firefox-esr/files/patch-widget-src-qt-nsSound.cpp
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ branches/experimental/www/firefox-esr/files/patch-widget-src-qt-nsSound.cpp
Mon Jul 9 22:54:59 2012 (r867)
@@ -0,0 +1,10 @@
+--- widget/src/qt/nsSound.cpp~
++++ widget/src/qt/nsSound.cpp
+@@ -40,6 +40,7 @@
+ #include <QSound>
+
+ #include <string.h>
++#include <unistd.h>
+
+ #include "nscore.h"
+ #include "plstr.h"
Added:
branches/experimental/www/firefox-esr/files/patch-widget-src-qt-nsWindow.cpp
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++
branches/experimental/www/firefox-esr/files/patch-widget-src-qt-nsWindow.cpp
Mon Jul 9 22:54:59 2012 (r867)
@@ -0,0 +1,10 @@
+--- widget/src/qt/nsWindow.cpp~
++++ widget/src/qt/nsWindow.cpp
+@@ -43,6 +43,7 @@ using namespace QtMobility;
+
+ #ifdef MOZ_X11
+ #include <X11/Xlib.h>
++#include "mozilla/X11Util.h"
+ #endif //MOZ_X11
+
+ #include "nsXULAppAPI.h"
Modified: branches/experimental/www/firefox-nightly/files/patch-bug753046
==============================================================================
--- branches/experimental/www/firefox-nightly/files/patch-bug753046 Mon Jul
9 18:14:40 2012 (r866)
+++ branches/experimental/www/firefox-nightly/files/patch-bug753046 Mon Jul
9 22:54:59 2012 (r867)
@@ -4,6 +4,15 @@
--- dom/plugins/ipc/PluginModuleChild.cpp.orig 2011-12-20 23:28:14.000000000
+0000
+++ dom/plugins/ipc/PluginModuleChild.cpp
+@@ -33,6 +33,8 @@
+ #include "nsPluginsDir.h"
+ #include "nsXULAppAPI.h"
+
++#include <unistd.h>
++
+ #ifdef MOZ_X11
+ # include "mozilla/X11Util.h"
+ #endif
@@ -228,7 +228,7 @@ PluginModuleChild::Init(const std::strin
// TODO: use PluginPRLibrary here
Added:
branches/experimental/www/firefox-nightly/files/patch-widget-qt-nsSound.cpp
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ branches/experimental/www/firefox-nightly/files/patch-widget-qt-nsSound.cpp
Mon Jul 9 22:54:59 2012 (r867)
@@ -0,0 +1,10 @@
+--- widget/qt/nsSound.cpp~
++++ widget/qt/nsSound.cpp
+@@ -40,6 +40,7 @@
+ #include <QSound>
+
+ #include <string.h>
++#include <unistd.h>
+
+ #include "nscore.h"
+ #include "plstr.h"
Added:
branches/experimental/www/firefox-nightly/files/patch-widget-qt-nsWindow.cpp
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++
branches/experimental/www/firefox-nightly/files/patch-widget-qt-nsWindow.cpp
Mon Jul 9 22:54:59 2012 (r867)
@@ -0,0 +1,10 @@
+--- widget/qt/nsWindow.cpp~
++++ widget/qt/nsWindow.cpp
+@@ -43,6 +43,7 @@ using namespace QtMobility;
+
+ #ifdef MOZ_X11
+ #include <X11/Xlib.h>
++#include "mozilla/X11Util.h"
+ #endif //MOZ_X11
+
+ #include "nsXULAppAPI.h"
Added: branches/experimental/www/firefox/files/patch-widget-qt-nsSound.cpp
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ branches/experimental/www/firefox/files/patch-widget-qt-nsSound.cpp Mon Jul
9 22:54:59 2012 (r867)
@@ -0,0 +1,10 @@
+--- widget/qt/nsSound.cpp~
++++ widget/qt/nsSound.cpp
+@@ -40,6 +40,7 @@
+ #include <QSound>
+
+ #include <string.h>
++#include <unistd.h>
+
+ #include "nscore.h"
+ #include "plstr.h"
Added: branches/experimental/www/firefox/files/patch-widget-qt-nsWindow.cpp
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ branches/experimental/www/firefox/files/patch-widget-qt-nsWindow.cpp
Mon Jul 9 22:54:59 2012 (r867)
@@ -0,0 +1,10 @@
+--- widget/qt/nsWindow.cpp~
++++ widget/qt/nsWindow.cpp
+@@ -43,6 +43,7 @@ using namespace QtMobility;
+
+ #ifdef MOZ_X11
+ #include <X11/Xlib.h>
++#include "mozilla/X11Util.h"
+ #endif //MOZ_X11
+
+ #include "nsXULAppAPI.h"
Added: branches/experimental/www/libxul/files/patch-widget-src-qt-nsSound.cpp
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ branches/experimental/www/libxul/files/patch-widget-src-qt-nsSound.cpp
Mon Jul 9 22:54:59 2012 (r867)
@@ -0,0 +1,10 @@
+--- widget/src/qt/nsSound.cpp~
++++ widget/src/qt/nsSound.cpp
+@@ -40,6 +40,7 @@
+ #include <QSound>
+
+ #include <string.h>
++#include <unistd.h>
+
+ #include "nscore.h"
+ #include "plstr.h"
Added: branches/experimental/www/libxul/files/patch-widget-src-qt-nsWindow.cpp
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ branches/experimental/www/libxul/files/patch-widget-src-qt-nsWindow.cpp
Mon Jul 9 22:54:59 2012 (r867)
@@ -0,0 +1,10 @@
+--- widget/src/qt/nsWindow.cpp~
++++ widget/src/qt/nsWindow.cpp
+@@ -43,6 +43,7 @@ using namespace QtMobility;
+
+ #ifdef MOZ_X11
+ #include <X11/Xlib.h>
++#include "mozilla/X11Util.h"
+ #endif //MOZ_X11
+
+ #include "nsXULAppAPI.h"
Added:
branches/experimental/www/seamonkey/files/patch-mozilla-widget-qt-nsSound.cpp
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++
branches/experimental/www/seamonkey/files/patch-mozilla-widget-qt-nsSound.cpp
Mon Jul 9 22:54:59 2012 (r867)
@@ -0,0 +1,10 @@
+--- mozilla/widget/qt/nsSound.cpp~
++++ mozilla/widget/qt/nsSound.cpp
+@@ -40,6 +40,7 @@
+ #include <QSound>
+
+ #include <string.h>
++#include <unistd.h>
+
+ #include "nscore.h"
+ #include "plstr.h"
Added:
branches/experimental/www/seamonkey/files/patch-mozilla-widget-qt-nsWindow.cpp
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++
branches/experimental/www/seamonkey/files/patch-mozilla-widget-qt-nsWindow.cpp
Mon Jul 9 22:54:59 2012 (r867)
@@ -0,0 +1,10 @@
+--- mozilla/widget/qt/nsWindow.cpp~
++++ mozilla/widget/qt/nsWindow.cpp
+@@ -43,6 +43,7 @@ using namespace QtMobility;
+
+ #ifdef MOZ_X11
+ #include <X11/Xlib.h>
++#include "mozilla/X11Util.h"
+ #endif //MOZ_X11
+
+ #include "nsXULAppAPI.h"
_______________________________________________
freebsd-gecko@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/freebsd-gecko
To unsubscribe, send any mail to "freebsd-gecko-unsubscr...@freebsd.org"
