- fixes building with mozilla 1.0 family (bad relation is used to compare

  mozilla version)

Changed files:
    galeon-mozilla_ver.patch -> 1.1

diff --git a/galeon-mozilla_ver.patch b/galeon-mozilla_ver.patch
new file mode 100644 (file)
index 0000000..b8a4cc6
--- /dev/null
+++ b/galeon-mozilla_ver.patch
@@ -0,0 +1,219 @@
+diff -Nur galeon-1.2.2.orig/src/mozilla/ContentHandler.cpp galeon-1.2.2/src/mozilla/ContentHandler.cpp
+--- galeon-1.2.2.orig/src/mozilla/ContentHandler.cpp   Thu May  9 00:49:51 2002
++++ galeon-1.2.2/src/mozilla/ContentHandler.cpp        Fri May 24 11:29:40 2002
+@@ -361,7 +361,7 @@
+       }
+ 
+       saveDir = do_CreateInstance (NS_LOCAL_FILE_CONTRACTID);
+-#if MOZILLA_VERSION > VERSION3(1,0,0)
++#if MOZILLA_VERSION >= VERSION3(1,0,0)
+       saveDir->InitWithNativePath (nsDependentCString(expanded_directory));
+ #else
+       saveDir->InitWithPath (expanded_directory);
+@@ -392,7 +392,7 @@
+       }
+       else
+       {
+-#if MOZILLA_VERSION > VERSION3(1,0,0)
++#if MOZILLA_VERSION >= VERSION3(1,0,0)
+               nsCString cDirName;
+               saveDir->GetNativePath (cDirName);
+               char *cDefaultFile = mozilla_unicode_to_locale (aDefaultFile);
+@@ -423,7 +423,7 @@
+               rv = aFile->GetParent (getter_AddRefs(aDirectory));
+               if(NS_SUCCEEDED(rv) && aDirectory)
+               {
+-#if MOZILLA_VERSION > VERSION3(1,0,0)
++#if MOZILLA_VERSION >= VERSION3(1,0,0)
+                       nsCString cDirectoryName;
+                       rv = aDirectory->GetNativePath(cDirectoryName);
+ #else
+@@ -496,7 +496,7 @@
+                       appLauncher->DeleteTemporaryFileOnExit(mTempFile);
+               }
+ 
+-#if MOZILLA_VERSION > VERSION3(1,0,0)
++#if MOZILLA_VERSION >= VERSION3(1,0,0)
+               nsCString aFileName;
+               mTempFile->GetNativePath(aFileName);
+ #else
+diff -Nur galeon-1.2.2.orig/src/mozilla/FilePicker.cpp galeon-1.2.2/src/mozilla/FilePicker.cpp
+--- galeon-1.2.2.orig/src/mozilla/FilePicker.cpp       Thu May  9 00:49:52 2002
++++ galeon-1.2.2/src/mozilla/FilePicker.cpp    Fri May 24 11:30:38 2002
+@@ -147,7 +147,7 @@
+       mFileFormats = fileFormats;
+       mFile = do_CreateInstance (NS_LOCAL_FILE_CONTRACTID);
+       mDisplayDirectory = do_CreateInstance (NS_LOCAL_FILE_CONTRACTID);
+-#if MOZILLA_VERSION > VERSION3(1,0,0)
++#if MOZILLA_VERSION >= VERSION3(1,0,0)
+       mDisplayDirectory->InitWithNativePath(nsDependentCString(g_get_home_dir()));
+ #else
+       mDisplayDirectory->InitWithPath(g_get_home_dir());
+@@ -282,7 +282,7 @@
+               cFileName = mozilla_unicode_to_locale (mDefaultString.get());
+       }
+ 
+-#if MOZILLA_VERSION > VERSION3(1,0,0)
++#if MOZILLA_VERSION >= VERSION3(1,0,0)
+       nsCAutoString cDirName;
+       mDisplayDirectory->GetNativePath (cDirName);
+ 
+@@ -560,7 +560,7 @@
+               }
+       }
+ 
+-#if MOZILLA_VERSION > VERSION3(1,0,0)
++#if MOZILLA_VERSION >= VERSION3(1,0,0)
+       aFilePicker->mFile->InitWithNativePath (nsDependentCString(aFileName));
+ 
+       if (aFilePicker->mMode == nsIFilePicker::modeGetFolder)
+@@ -706,7 +706,7 @@
+ 
+       nsCOMPtr<nsILocalFile> aDir = 
+                               do_CreateInstance (NS_LOCAL_FILE_CONTRACTID);
+-#if MOZILLA_VERSION > VERSION3(1,0,0)
++#if MOZILLA_VERSION >= VERSION3(1,0,0)
+       aDir->InitWithNativePath (nsDependentCString(expanded_directory));
+ #else
+       aDir->InitWithPath (expanded_directory);
+@@ -743,7 +743,7 @@
+                       g_free (*ret_fullpath);
+               nsCOMPtr<nsILocalFile> aFile;
+               aFilePicker->GetFile (getter_AddRefs(aFile));
+-#if MOZILLA_VERSION > VERSION3(1,0,0)
++#if MOZILLA_VERSION >= VERSION3(1,0,0)
+               nsCString tempFullPathStr;
+               aFile->GetNativePath (tempFullPathStr);
+               *ret_fullpath = g_strdup (tempFullPathStr.get());
+diff -Nur galeon-1.2.2.orig/src/mozilla/GaleonWrapper.cpp galeon-1.2.2/src/mozilla/GaleonWrapper.cpp
+--- galeon-1.2.2.orig/src/mozilla/GaleonWrapper.cpp    Sat May 18 01:03:19 2002
++++ galeon-1.2.2/src/mozilla/GaleonWrapper.cpp Fri May 24 11:31:40 2002
+@@ -435,7 +435,7 @@
+       if (NS_FAILED(rv) || !persist) return NS_ERROR_FAILURE;
+ 
+       nsCOMPtr<nsILocalFile> file;
+-#if MOZILLA_VERSION > VERSION3(1,0,0)
++#if MOZILLA_VERSION >= VERSION3(1,0,0)
+       NS_NewNativeLocalFile(nsDependentCString(filename),
+                             PR_TRUE, getter_AddRefs(file)); 
+ #else
+@@ -492,7 +492,7 @@
+       if (NS_FAILED(rv) || !persist) return NS_ERROR_FAILURE;
+ 
+       nsCOMPtr<nsILocalFile> file;
+-#if MOZILLA_VERSION > VERSION3(1,0,0)
++#if MOZILLA_VERSION >= VERSION3(1,0,0)
+       NS_NewNativeLocalFile(nsDependentCString(filename),
+                             PR_TRUE, getter_AddRefs(file)); 
+ #else
+@@ -502,7 +502,7 @@
+ 
+       nsCOMPtr<nsILocalFile> path;
+       if (datapath)
+-#if MOZILLA_VERSION > VERSION3(1,0,0)
++#if MOZILLA_VERSION >= VERSION3(1,0,0)
+               NS_NewNativeLocalFile(nsDependentCString(datapath),
+                                     PR_TRUE, getter_AddRefs(path));
+ #else
+diff -Nur galeon-1.2.2.orig/src/mozilla/MozRegisterComponents.cpp galeon-1.2.2/src/mozilla/MozRegisterComponents.cpp
+--- galeon-1.2.2.orig/src/mozilla/MozRegisterComponents.cpp    Sun Apr 28 22:19:21 2002
++++ galeon-1.2.2/src/mozilla/MozRegisterComponents.cpp Fri May 24 11:32:14 2002
+@@ -193,7 +193,7 @@
+       nsresult rv = NS_OK;
+ 
+       nsCOMPtr<nsILocalFile> dllFile;
+-#if MOZILLA_VERSION > VERSION3(1,0,0)
++#if MOZILLA_VERSION >= VERSION3(1,0,0)
+       rv = NS_NewNativeLocalFile (nsDependentCString(aDLLPath),
+                                   PR_TRUE, getter_AddRefs (dllFile));
+ #else
+diff -Nur galeon-1.2.2.orig/src/mozilla/PrintProgressListener.cpp galeon-1.2.2/src/mozilla/PrintProgressListener.cpp
+--- galeon-1.2.2.orig/src/mozilla/PrintProgressListener.cpp    Sat May 18 01:03:19 2002
++++ galeon-1.2.2/src/mozilla/PrintProgressListener.cpp Fri May 24 11:33:11 2002
+@@ -54,7 +54,7 @@
+ /* void onStateChange (in nsIWebProgress aWebProgress, in nsIRequest aRequest, in long aStateFlags, in unsigned long aStatus); */
+ NS_IMETHODIMP GPrintListener::OnStateChange(nsIWebProgress *aWebProgress,
+                                           nsIRequest *aRequest,
+-#if MOZILLA_VERSION > VERSION3(1,0,0)
++#if MOZILLA_VERSION >= VERSION3(1,0,0)
+                                           PRUint32 aStateFlags,
+ #else
+                                           PRInt32 aStateFlags,
+@@ -118,7 +118,7 @@
+ /* void onSecurityChange (in nsIWebProgress aWebProgress, in nsIRequest aRequest, in long state); */
+ NS_IMETHODIMP GPrintListener::OnSecurityChange(nsIWebProgress *aWebProgress,
+                                              nsIRequest *aRequest,
+-#if MOZILLA_VERSION > VERSION3(1,0,0)
++#if MOZILLA_VERSION >= VERSION3(1,0,0)
+                                              PRUint32 state)
+ #else
+                                              PRInt32 state)
+diff -Nur galeon-1.2.2.orig/src/mozilla/ProgressListener2.cpp galeon-1.2.2/src/mozilla/ProgressListener2.cpp
+--- galeon-1.2.2.orig/src/mozilla/ProgressListener2.cpp        Sat May 18 17:02:59 2002
++++ galeon-1.2.2/src/mozilla/ProgressListener2.cpp     Fri May 24 11:33:52 2002
+@@ -279,7 +279,7 @@
+               }
+ 
+               /* setup filename */
+-#if MOZILLA_VERSION > VERSION3(1,0,0)
++#if MOZILLA_VERSION >= VERSION3(1,0,0)
+               nsCString leafName;
+               rv = mFile->GetNativeLeafName (leafName);
+               text[COL_FILENAME] = nsCRT::strdup (leafName.get());
+@@ -458,7 +458,7 @@
+  */
+ NS_IMETHODIMP GProgressListener2::OnStateChange (nsIWebProgress *aWebProgress,
+                                                nsIRequest *aRequest,
+-#if MOZILLA_VERSION > VERSION3(1,0,0)
++#if MOZILLA_VERSION >= VERSION3(1,0,0)
+                                                PRUint32 aStateFlags,
+ #else
+                                                PRInt32 aStateFlags,
+@@ -469,7 +469,7 @@
+ 
+       if (aStateFlags & nsIWebProgressListener::STATE_STOP)
+       {
+-#if MOZILLA_VERSION > VERSION3(1,0,0)
++#if MOZILLA_VERSION >= VERSION3(1,0,0)
+               nsCString filename;
+               mFile->GetNativePath (filename);
+ #else
+@@ -537,7 +537,7 @@
+                                       (SetPixmapInfo *) mCallbackInfo;
+ 
+                               gchar *fn;
+-#if MOZILLA_VERSION > VERSION3(1,0,0)
++#if MOZILLA_VERSION >= VERSION3(1,0,0)
+                               nsCString cfn;
+                               mFile->GetNativePath(cfn);
+                               fn = nsCRT::strdup(cfn.get());
+@@ -833,7 +833,7 @@
+ NS_IMETHODIMP GProgressListener2::
+                       OnSecurityChange(nsIWebProgress *aWebProgress,
+                                        nsIRequest *aRequest,
+-#if MOZILLA_VERSION > VERSION3(1,0,0)
++#if MOZILLA_VERSION >= VERSION3(1,0,0)
+                                        PRUint32 state)
+ #else
+                                        PRInt32 state)
+diff -Nur galeon-1.2.2.orig/src/mozilla/mozilla.cpp galeon-1.2.2/src/mozilla/mozilla.cpp
+--- galeon-1.2.2.orig/src/mozilla/mozilla.cpp  Fri May 17 09:45:40 2002
++++ galeon-1.2.2/src/mozilla/mozilla.cpp       Fri May 24 11:28:52 2002
+@@ -367,7 +367,7 @@
+               if (NS_FAILED(rv) || !persist) return NS_ERROR_FAILURE;
+ 
+               nsCOMPtr<nsILocalFile> file;
+-#if MOZILLA_VERSION > VERSION3(1,0,0)
++#if MOZILLA_VERSION >= VERSION3(1,0,0)
+               NS_NewNativeLocalFile(nsDependentCString(filename), PR_TRUE, getter_AddRefs(file)); 
+ #else
+               NS_NewLocalFile(filename, PR_TRUE, getter_AddRefs(file)); 
+@@ -1841,7 +1841,7 @@
+ {
+       nsresult rv;
+       nsCOMPtr<nsILocalFile> localFile;
+-#if MOZILLA_VERSION > VERSION3(1,0,0)
++#if MOZILLA_VERSION >= VERSION3(1,0,0)
+       rv = NS_NewNativeLocalFile(nsDependentCString(filename), PR_TRUE, getter_AddRefs(localFile)); 
+ #else
+       rv = NS_NewLocalFile(filename, PR_TRUE, getter_AddRefs(localFile));