Fix trailing CRs cause patch to fail with latest patch (2.5.9).

3 files changed, 77 insertions, 74 deletions

diff --git a/net-www/mozilla/ChangeLog b/net-www/mozilla/ChangeLog
index a58fa07c7858..6bce7f6998c2 100644
--- a/net-www/mozilla/ChangeLog
+++ b/net-www/mozilla/ChangeLog
@@ -1,7 +1,10 @@
 # ChangeLog for net-www/mozilla
 # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-www/mozilla/ChangeLog,v 1.107 2003/07/12 22:52:21 brad Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-www/mozilla/ChangeLog,v 1.108 2003/07/13 17:03:15 azarah Exp $
 
+  13 Jul 2003; Martin Schlemmer <azarah@gentoo.org> files/1.2/mozilla-1.2-image-reload-memleak.patch :
+  Fix trailing CRs cause patch to fail with latest patch (2.5.9).
+  
   12 Jul 2003; foser <foser@gentoo.org> mozilla-1.4.ebuild :
   Make orbit dep gtk1 only (#18153)
 
diff --git a/net-www/mozilla/Manifest b/net-www/mozilla/Manifest
index ac75ec1d801f..5469cc1ab270 100644
--- a/net-www/mozilla/Manifest
+++ b/net-www/mozilla/Manifest
@@ -1,43 +1,43 @@
-MD5 f9f43dd3dc176189f1a5da3eb5698767 mozilla-1.3-r1.ebuild 16657
+MD5 ee57cb7cd172adba78bc6fd029fafedb ChangeLog 19179
 MD5 97c3777f17c2b6c320c2fa9fba74041f mozilla-1.0.1-r3.ebuild 15212
-MD5 564c916ec5f35871b461da553d748c3b mozilla-1.4.ebuild 16614
 MD5 4855edccbe0b8fcb1ee7dfb4cc3fb71a mozilla-1.1-r1.ebuild 14822
-MD5 5244675fb2e956e4a020f7389dd74709 mozilla-1.3-r2.ebuild 16662
-MD5 59b4ae689e84fd891836adfa59f17d33 ChangeLog 18926
 MD5 de55659daa79b5c545b604ab3def7963 mozilla-1.2.1-r5.ebuild 20931
-MD5 e239c459343aa377a9c1a6fd0239e4c9 files/mozilla-1.0-asmfixes.patch 9089
-MD5 d0e52abf109fe61c4195f0cbf002ae18 files/google.src 706
-MD5 766df4cd7332bf4127847985f98e46ec files/gtk2mozilla_head_patch2 27148
-MD5 4749f0978ad569b9bcf028c75b5de9cc files/mozilla-1.0-abi-xpcom-ppc.patch 12433
-MD5 937ecdca5b59d442c2b0b5027ead762d files/mozilla-1.0-abi-compat-wrappers.patch 1799
+MD5 5244675fb2e956e4a020f7389dd74709 mozilla-1.3-r2.ebuild 16662
+MD5 f9f43dd3dc176189f1a5da3eb5698767 mozilla-1.3-r1.ebuild 16657
+MD5 e9287a617cb41a85616f9c3a75cbf0c1 mozilla-1.4.ebuild 16417
+MD5 2245cc4f37902e2c6dd188f72874fbb3 files/10mozilla 60
+MD5 7d244b888dbd302c14414cbfc1f62501 files/xft.js 135
+MD5 cf872ecce56e05c488ae7f41b50dec31 files/digest-mozilla-1.0.1-r3 281
 MD5 eccaf421f7e91faad5f835cadca4263e files/digest-mozilla-1.1-r1 202
-MD5 3cbe151665ba43403e657607949244e8 files/digest-mozilla-1.3-r1 201
 MD5 3cbe151665ba43403e657607949244e8 files/digest-mozilla-1.3-r2 201
+MD5 614b93ca61ff42ba48eb6a5e617f0953 files/digest-mozilla-1.4 201
+MD5 766df4cd7332bf4127847985f98e46ec files/gtk2mozilla_head_patch2 27148
 MD5 fec6b616b0fec2ee53d64edc2dbfa03c files/mozilla 134
-MD5 23d6b685fd5e49a07cc4a1786871bf47 files/mozilla-alpha-xpcom-subs-fix.patch 4953
-MD5 2245cc4f37902e2c6dd188f72874fbb3 files/10mozilla 60
+MD5 937ecdca5b59d442c2b0b5027ead762d files/mozilla-1.0-abi-compat-wrappers.patch 1799
+MD5 4749f0978ad569b9bcf028c75b5de9cc files/mozilla-1.0-abi-xpcom-ppc.patch 12433
+MD5 e239c459343aa377a9c1a6fd0239e4c9 files/mozilla-1.0-asmfixes.patch 9089
+MD5 2428c0ad22b38f773fb9c174722909de files/mozilla-1.0.1-platform.patch 3543
 MD5 1c48ae2eab3e01fae125748d40917e79 files/mozilla-1.0.1-sparc-xpcom.patch 4267
-MD5 5b01d0425f9ef7bbe0765985e6041c6b files/mozilla.sh 6684
-MD5 7d244b888dbd302c14414cbfc1f62501 files/xft.js 135
+MD5 23d6b685fd5e49a07cc4a1786871bf47 files/mozilla-alpha-xpcom-subs-fix.patch 4953
 MD5 df4a4bc60d8f5d28c801ccedfea84d70 files/mozilla-ft-bytecode.patch 629
-MD5 cf872ecce56e05c488ae7f41b50dec31 files/digest-mozilla-1.0.1-r3 281
+MD5 296fe1fa9c5b387bcd909f0a128c7a16 files/mozilla-new-freetype2.patch 720
+MD5 d2a2c551fe8991a27d4abe4e3bbedbe3 files/mozilla-xft-unix-prefs.patch 1320
+MD5 5b01d0425f9ef7bbe0765985e6041c6b files/mozilla.sh 6684
+MD5 3cbe151665ba43403e657607949244e8 files/digest-mozilla-1.3-r1 201
 MD5 e30291e992d71bccac5937cca9696da0 files/enigmail-0.76.1-Makefile 1560
+MD5 d0e52abf109fe61c4195f0cbf002ae18 files/google.src 706
 MD5 08ca97500d420d77f99f60d5eeb54c1f files/digest-mozilla-1.2.1-r5 268
-MD5 2428c0ad22b38f773fb9c174722909de files/mozilla-1.0.1-platform.patch 3543
-MD5 614b93ca61ff42ba48eb6a5e617f0953 files/digest-mozilla-1.4 201
-MD5 d2a2c551fe8991a27d4abe4e3bbedbe3 files/mozilla-xft-unix-prefs.patch 1320
-MD5 296fe1fa9c5b387bcd909f0a128c7a16 files/mozilla-new-freetype2.patch 720
-MD5 9bb311174360a35555ae82617d33bc3f files/1.2/mozilla-1.2b-over-the-spot.patch.bz2 320
-MD5 025a72a791c12f7c3f50e59fc63db451 files/1.2/mozilla-1.2b-freetype.patch.bz2 854
+MD5 8803e1d528f2f49a3f3fa98ba14d9ff0 files/1.2/mozilla-1.2-branch-update.patch.bz2 8240
 MD5 83da5242120c74b0ca6cceae9d6cf237 files/1.2/mozilla-1.2-cutnpaste-limit-fix.patch.bz2 2838
-MD5 b94275225c24a9776a85f33734c8a7eb files/1.2/mozilla-1.2b-wallet.patch.bz2 396
-MD5 d63b3ff6f56728d85392ac75a9745a15 files/1.2/mozilla-1.2.1-Xrender-includes.patch.bz2 605
-MD5 fd94ea7ab54ecfd812c46fa5ce53cd0e files/1.2/mozilla-1.2b-default-plugin-less-annoying.patch.bz2 1030
 MD5 9ec98639ee6359407ab5150486c3d0d1 files/1.2/mozilla-1.2b-Xft-includes.patch.bz2 387
-MD5 8803e1d528f2f49a3f3fa98ba14d9ff0 files/1.2/mozilla-1.2-branch-update.patch.bz2 8240
-MD5 f103c0c7a936a1dd20ecce0d29ebba54 files/1.2/mozilla-1.2-image-reload-memleak.patch 1534
+MD5 fd94ea7ab54ecfd812c46fa5ce53cd0e files/1.2/mozilla-1.2b-default-plugin-less-annoying.patch.bz2 1030
+MD5 025a72a791c12f7c3f50e59fc63db451 files/1.2/mozilla-1.2b-freetype.patch.bz2 854
 MD5 696d4810f2ccb8f2bcb0275fa13c67b9 files/1.2/mozilla-1.2b-gtk2.patch.bz2 6091
+MD5 9bb311174360a35555ae82617d33bc3f files/1.2/mozilla-1.2b-over-the-spot.patch.bz2 320
+MD5 b94275225c24a9776a85f33734c8a7eb files/1.2/mozilla-1.2b-wallet.patch.bz2 396
+MD5 d63b3ff6f56728d85392ac75a9745a15 files/1.2/mozilla-1.2.1-Xrender-includes.patch.bz2 605
+MD5 4877db25d49b916e55a5d11238c63d8c files/1.2/mozilla-1.2-image-reload-memleak.patch 1489
+MD5 491741624c0aee888ea4a6824b979c3c files/1.3/mozilla-1.3-gtk2.patch 17387
+MD5 82ebd0eb0bf87f9ddb11e686904d2633 files/1.3/mozilla-1.3-provider-shutdown.patch 4754
 MD5 068edb8c46e34027f9c3febc19656c70 files/1.3/mozilla-1.3-fix-RAW-target.patch 328
 MD5 1655fea18e9fc538b41d88561d6080c7 files/1.3/mozilla-1.3-fix-gtkim.patch 921
-MD5 82ebd0eb0bf87f9ddb11e686904d2633 files/1.3/mozilla-1.3-provider-shutdown.patch 4754
-MD5 491741624c0aee888ea4a6824b979c3c files/1.3/mozilla-1.3-gtk2.patch 17387
diff --git a/net-www/mozilla/files/1.2/mozilla-1.2-image-reload-memleak.patch b/net-www/mozilla/files/1.2/mozilla-1.2-image-reload-memleak.patch
index 51e6c37ef826..209de2bb0464 100644
--- a/net-www/mozilla/files/1.2/mozilla-1.2-image-reload-memleak.patch
+++ b/net-www/mozilla/files/1.2/mozilla-1.2-image-reload-memleak.patch
@@ -1,45 +1,45 @@
-? hpradhan@hedwig

-Index: nsImageDocument.cpp

-===================================================================

-RCS file: /cvsroot/mozilla/content/html/document/src/nsImageDocument.cpp,v

-retrieving revision 1.87

-diff -u -u -r1.87 nsImageDocument.cpp

---- content/html/document/src/nsImageDocument.cpp	28 Sep 2002 10:50:50 -0000	1.87

-+++ content/html/document/src/nsImageDocument.cpp	11 Dec 2002 11:52:11 -0000

-@@ -97,6 +97,8 @@

-                                PRBool aReset = PR_TRUE,

-                                nsIContentSink* aSink = nsnull);

- 

-+  NS_IMETHOD SetScriptGlobalObject(nsIScriptGlobalObject* aScriptGlobalObject);

-+

-   nsresult CreateSyntheticDocument();

- 

-   nsresult EndLayout(nsISupports *ctxt, 

-@@ -144,8 +146,6 @@

- NS_IMETHODIMP

- ImageListener::OnStartRequest(nsIRequest* request, nsISupports *ctxt)

- {

--  nsresult rv;

--

-   nsCOMPtr<nsIChannel> channel = do_QueryInterface(request);

-   if (!channel) return NS_ERROR_NULL_POINTER;

- 

-@@ -276,6 +276,18 @@

-   return NS_OK;

- }

- 

-+NS_IMETHODIMP

-+nsImageDocument::SetScriptGlobalObject(nsIScriptGlobalObject* aScriptGlobalObject)

-+{

-+  if (!aScriptGlobalObject) {

-+    // If the global object is being set to null, then it means we are

-+    // going away soon. Drop our ref to imgRequest so that we dont end

-+    // up leaking due to cycles through imgLib

-+    mImageRequest = nsnull;

-+  }

-+

-+  return nsHTMLDocument::SetScriptGlobalObject(aScriptGlobalObject);

-+}

- 

- nsresult

- nsImageDocument::CreateSyntheticDocument()

+? hpradhan@hedwig
+Index: nsImageDocument.cpp
+===================================================================
+RCS file: /cvsroot/mozilla/content/html/document/src/nsImageDocument.cpp,v
+retrieving revision 1.87
+diff -u -u -r1.87 nsImageDocument.cpp
+--- content/html/document/src/nsImageDocument.cpp	28 Sep 2002 10:50:50 -0000	1.87
++++ content/html/document/src/nsImageDocument.cpp	11 Dec 2002 11:52:11 -0000
+@@ -97,6 +97,8 @@
+                                PRBool aReset = PR_TRUE,
+                                nsIContentSink* aSink = nsnull);
+ 
++  NS_IMETHOD SetScriptGlobalObject(nsIScriptGlobalObject* aScriptGlobalObject);
++
+   nsresult CreateSyntheticDocument();
+ 
+   nsresult EndLayout(nsISupports *ctxt, 
+@@ -144,8 +146,6 @@
+ NS_IMETHODIMP
+ ImageListener::OnStartRequest(nsIRequest* request, nsISupports *ctxt)
+ {
+-  nsresult rv;
+-
+   nsCOMPtr<nsIChannel> channel = do_QueryInterface(request);
+   if (!channel) return NS_ERROR_NULL_POINTER;
+ 
+@@ -276,6 +276,18 @@
+   return NS_OK;
+ }
+ 
++NS_IMETHODIMP
++nsImageDocument::SetScriptGlobalObject(nsIScriptGlobalObject* aScriptGlobalObject)
++{
++  if (!aScriptGlobalObject) {
++    // If the global object is being set to null, then it means we are
++    // going away soon. Drop our ref to imgRequest so that we dont end
++    // up leaking due to cycles through imgLib
++    mImageRequest = nsnull;
++  }
++
++  return nsHTMLDocument::SetScriptGlobalObject(aScriptGlobalObject);
++}
+ 
+ nsresult
+ nsImageDocument::CreateSyntheticDocument()