From f96441b9faf769c9ecdd4d338b605ea3d0cc4010 Mon Sep 17 00:00:00 2001
From: Chris Larson <clarson@kergoth.com>
Date: Tue, 9 Nov 2004 00:36:47 +0000
Subject: Disable bk EOLN_NATIVE conversions on all files in packages
 FILESPATHs, to prevent it screwing up patches.

BKrev: 4190111fA4MuVozAqwE7xOSL9fr-TA
---
 mozilla/files/mozilla-thunderbird.desktop | 11 +++++++++++
 mozilla/files/no-xmb.patch                | 18 ++++++++++++++++++
 mozilla/files/xptcstubs.patch             | 19 +++++++++++++++++++
 3 files changed, 48 insertions(+)

(limited to 'mozilla/files')

diff --git a/mozilla/files/mozilla-thunderbird.desktop b/mozilla/files/mozilla-thunderbird.desktop
index e69de29bb2..61615d94c2 100644
--- a/mozilla/files/mozilla-thunderbird.desktop
+++ b/mozilla/files/mozilla-thunderbird.desktop
@@ -0,0 +1,11 @@
+[Desktop Entry]
+Name=Thunderbird Email Client
+Comment=Thunderbird Email Client
+Exec=thunderbird
+Terminal=false
+MultipleArgs=false
+Type=Application
+Icon=mozilla-thunderbird.png
+Categories=Application;Internet;
+SingleInstance=true
+
diff --git a/mozilla/files/no-xmb.patch b/mozilla/files/no-xmb.patch
index e69de29bb2..1b909a677c 100644
--- a/mozilla/files/no-xmb.patch
+++ b/mozilla/files/no-xmb.patch
@@ -0,0 +1,18 @@
+--- mozilla/gfx/src/gtk/nsGdkUtils.cpp.old	2004-07-02 09:33:33.000000000 +0100
++++ mozilla/gfx/src/gtk/nsGdkUtils.cpp	2004-07-02 09:33:34.000000000 +0100
+@@ -115,6 +115,7 @@
+ #endif /* MOZ_WIDGET_GTK2 */
+     }
+   }
++#if 0
+   else if (font->type == GDK_FONT_FONTSET)
+   {
+ #ifdef MOZ_WIDGET_GTK
+@@ -128,6 +129,7 @@
+                    fontset, GDK_GC_XGC(gc), x, y, text, text_length);
+ #endif /* MOZ_WIDGET_GTK2 */
+   }
++#endif
+   else
+     g_error("undefined font type\n");
+ }
diff --git a/mozilla/files/xptcstubs.patch b/mozilla/files/xptcstubs.patch
index e69de29bb2..7517acef27 100644
--- a/mozilla/files/xptcstubs.patch
+++ b/mozilla/files/xptcstubs.patch
@@ -0,0 +1,19 @@
+Index: xptcstubs_arm.cpp
+===================================================================
+RCS file: /cvsroot/mozilla/xpcom/reflect/xptcall/src/md/unix/xptcstubs_arm.cpp,v
+retrieving revision 1.7
+diff -u -r1.7 xptcstubs_arm.cpp
+--- mozilla/xpcom/reflect/xptcall/src/md/unix/xptcstubs_arm.cpp	18 Apr 2004 14:18:18 -0000	1.7
++++ mozilla/xpcom/reflect/xptcall/src/md/unix/xptcstubs_arm.cpp	4 May 2004 18:36:44 -0000
+@@ -45,9 +45,9 @@
+ #endif
+ 
+ /* Specify explicitly a symbol for this function, don't try to guess the c++ mangled symbol.  */
+-static nsresult PrepareAndDispatch(nsXPTCStubBase* self, uint32 methodIndex, PRUint32* args) asm("_PrepareAndDispatch");
++nsresult PrepareAndDispatch(nsXPTCStubBase* self, uint32 methodIndex, PRUint32* args) asm("_PrepareAndDispatch");
+ 
+-static nsresult
++nsresult
+ PrepareAndDispatch(nsXPTCStubBase* self, uint32 methodIndex, PRUint32* args)
+ {
+ #define PARAM_BUFFER_COUNT     16
-- 
cgit v1.2.3