[SVN-Commit] r1068 - in trunk: Mk mail/thunderbird-esr/files mail/thunderbird/files www/firefox-esr/files www/firefox-nightly/files www/firefox/files www/libxul/files www/seamonkey/files

[svn-freebsd-gecko at chruetertee.ch]

Author: jbeich
Date: Wed Oct 10 04:21:28 2012
New Revision: 1068

Log:
backout r1066 and always --disable-gio with QT4

Deleted:
   trunk/mail/thunderbird-esr/files/patch-bug799766
   trunk/mail/thunderbird/files/patch-bug799766
   trunk/www/firefox-esr/files/patch-bug799766
   trunk/www/firefox-nightly/files/patch-bug799766
   trunk/www/firefox/files/patch-bug799766
   trunk/www/libxul/files/patch-bug799766
   trunk/www/seamonkey/files/patch-bug799766
Modified:
   trunk/Mk/bsd.gecko.mk

Modified: trunk/Mk/bsd.gecko.mk
==============================================================================
--- trunk/Mk/bsd.gecko.mk	Wed Oct 10 00:27:10 2012	(r1067)
+++ trunk/Mk/bsd.gecko.mk	Wed Oct 10 04:21:28 2012	(r1068)
@@ -704,7 +704,7 @@
 MOZ_OPTIONS+=	--disable-gconf
 .endif
 
-.if ${PORT_OPTIONS:MGIO}
+.if ${PORT_OPTIONS:MGIO} && ! ${PORT_OPTIONS:MQT4}
 MOZ_OPTIONS+=	--enable-gio
 .else
 MOZ_OPTIONS+=	--disable-gio

Deleted: trunk/mail/thunderbird-esr/files/patch-bug799766
==============================================================================
--- trunk/mail/thunderbird-esr/files/patch-bug799766	Wed Oct 10 04:21:28 2012	(r1067)
+++ /dev/null	00:00:00 1970	(deleted)
@@ -1,10 +0,0 @@
---- mozilla/toolkit/system/gnome/nsGIOService.cpp~
-+++ mozilla/toolkit/system/gnome/nsGIOService.cpp
-@@ -12,7 +12,6 @@
- #include <dlfcn.h>
- 
- #include <gio/gio.h>
--#include <gtk/gtk.h>
- 
- 
- typedef const char* (*get_commandline_t)(GAppInfo*);

Deleted: trunk/mail/thunderbird/files/patch-bug799766
==============================================================================
--- trunk/mail/thunderbird/files/patch-bug799766	Wed Oct 10 04:21:28 2012	(r1067)
+++ /dev/null	00:00:00 1970	(deleted)
@@ -1,10 +0,0 @@
---- mozilla/toolkit/system/gnome/nsGIOService.cpp~
-+++ mozilla/toolkit/system/gnome/nsGIOService.cpp
-@@ -12,7 +12,6 @@
- #include <dlfcn.h>
- 
- #include <gio/gio.h>
--#include <gtk/gtk.h>
- 
- 
- typedef const char* (*get_commandline_t)(GAppInfo*);

Deleted: trunk/www/firefox-esr/files/patch-bug799766
==============================================================================
--- trunk/www/firefox-esr/files/patch-bug799766	Wed Oct 10 04:21:28 2012	(r1067)
+++ /dev/null	00:00:00 1970	(deleted)
@@ -1,10 +0,0 @@
---- toolkit/system/gnome/nsGIOService.cpp~
-+++ toolkit/system/gnome/nsGIOService.cpp
-@@ -12,7 +12,6 @@
- #include <dlfcn.h>
- 
- #include <gio/gio.h>
--#include <gtk/gtk.h>
- 
- 
- typedef const char* (*get_commandline_t)(GAppInfo*);

Deleted: trunk/www/firefox-nightly/files/patch-bug799766
==============================================================================
--- trunk/www/firefox-nightly/files/patch-bug799766	Wed Oct 10 04:21:28 2012	(r1067)
+++ /dev/null	00:00:00 1970	(deleted)
@@ -1,10 +0,0 @@
---- toolkit/system/gnome/nsGIOService.cpp~
-+++ toolkit/system/gnome/nsGIOService.cpp
-@@ -12,7 +12,6 @@
- #include <dlfcn.h>
- 
- #include <gio/gio.h>
--#include <gtk/gtk.h>
- 
- 
- typedef const char* (*get_commandline_t)(GAppInfo*);

Deleted: trunk/www/firefox/files/patch-bug799766
==============================================================================
--- trunk/www/firefox/files/patch-bug799766	Wed Oct 10 04:21:28 2012	(r1067)
+++ /dev/null	00:00:00 1970	(deleted)
@@ -1,10 +0,0 @@
---- toolkit/system/gnome/nsGIOService.cpp~
-+++ toolkit/system/gnome/nsGIOService.cpp
-@@ -12,7 +12,6 @@
- #include <dlfcn.h>
- 
- #include <gio/gio.h>
--#include <gtk/gtk.h>
- 
- 
- typedef const char* (*get_commandline_t)(GAppInfo*);

Deleted: trunk/www/libxul/files/patch-bug799766
==============================================================================
--- trunk/www/libxul/files/patch-bug799766	Wed Oct 10 04:21:28 2012	(r1067)
+++ /dev/null	00:00:00 1970	(deleted)
@@ -1,10 +0,0 @@
---- toolkit/system/gnome/nsGIOService.cpp~
-+++ toolkit/system/gnome/nsGIOService.cpp
-@@ -12,7 +12,6 @@
- #include <dlfcn.h>
- 
- #include <gio/gio.h>
--#include <gtk/gtk.h>
- 
- 
- typedef const char* (*get_commandline_t)(GAppInfo*);

Deleted: trunk/www/seamonkey/files/patch-bug799766
==============================================================================
--- trunk/www/seamonkey/files/patch-bug799766	Wed Oct 10 04:21:28 2012	(r1067)
+++ /dev/null	00:00:00 1970	(deleted)
@@ -1,10 +0,0 @@
---- mozilla/toolkit/system/gnome/nsGIOService.cpp~
-+++ mozilla/toolkit/system/gnome/nsGIOService.cpp
-@@ -12,7 +12,6 @@
- #include <dlfcn.h>
- 
- #include <gio/gio.h>
--#include <gtk/gtk.h>
- 
- 
- typedef const char* (*get_commandline_t)(GAppInfo*);