mirror of
https://git.FreeBSD.org/ports.git
synced 2025-01-21 08:42:23 +00:00
Remove patches with absurdly long filenames (>100 characters), after a
repo copy to files with shorter names.
This commit is contained in:
Kris Kennaway
parent
0fdf2ebc7e
commit
b04150bf09
Notes:
svn2git
2021-03-31 03:12:20 +00:00
svn path=/head/; revision=61026
@ -1,71 +0,0 @@
|
||||
--- ../connectivity/source/drivers/mozab/mozillasrc/MDatabaseMetaDataHelper.cxx.orig Sat May 18 01:46:08 2002
|
||||
+++ ../connectivity/source/drivers/mozab/mozillasrc/MDatabaseMetaDataHelper.cxx Sat May 18 01:56:23 2002
|
||||
@@ -2,9 +2,9 @@
|
||||
*
|
||||
* $RCSfile: MDatabaseMetaDataHelper.cxx,v $
|
||||
*
|
||||
- * $Revision: 1.5 $
|
||||
+ * $Revision: 1.6 $
|
||||
*
|
||||
- * last change: $Author: dkenny $ $Date: 2001/12/13 09:34:19 $
|
||||
+ * last change: $Author: fs $ $Date: 2002/05/17 12:08:41 $
|
||||
*
|
||||
* The Contents of this file are made available subject to the terms of
|
||||
* either of the following licenses
|
||||
@@ -213,11 +213,15 @@
|
||||
|
||||
retCode = dirFactoryService->GetDirFactory(aFactory.getStr(), getter_AddRefs(dirFactory)) ;
|
||||
NS_ENSURE_SUCCESS (retCode, retCode) ;
|
||||
- OUString value = OStringToOUString(aFactory, RTL_TEXTENCODING_ASCII_US) ;
|
||||
- const PRUnichar *valueChars = value.getStr() ;
|
||||
- nsCOMPtr<nsISimpleEnumerator> subDirs ;
|
||||
+ nsCOMPtr <nsIAbDirectoryProperties> properties;
|
||||
+ properties = do_CreateInstance(NS_ABDIRECTORYPROPERTIES_CONTRACTID, &retCode);
|
||||
+ NS_ENSURE_SUCCESS(retCode, retCode) ;
|
||||
|
||||
- retCode = dirFactory->CreateDirectory(1, &kPropertyName, &valueChars, getter_AddRefs(subDirs)) ;
|
||||
+ retCode = properties->SetURI(aFactory.getStr());
|
||||
+ NS_ENSURE_SUCCESS(retCode,retCode);
|
||||
+
|
||||
+ nsCOMPtr<nsISimpleEnumerator> subDirs ;
|
||||
+ retCode = dirFactory->CreateDirectory(properties, getter_AddRefs(subDirs));
|
||||
NS_ENSURE_SUCCESS(retCode, retCode) ;
|
||||
PRBool hasMore = PR_TRUE ;
|
||||
nsCOMPtr<nsISupportsArray> array ;
|
||||
@@ -635,12 +639,12 @@
|
||||
if ( NS_FAILED(rv) )
|
||||
return sal_False;
|
||||
|
||||
- rv = url->SetSpec( sAbURI.getStr() );
|
||||
+ rv = url->SetSpec( nsDependentCString(sAbURI.getStr()) );
|
||||
if ( NS_FAILED(rv) )
|
||||
return sal_False;
|
||||
|
||||
- nsXPIDLCString host;
|
||||
- rv = url->GetHost(getter_Copies (host));
|
||||
+ nsCAutoString host;
|
||||
+ rv = url->GetAsciiHost(host);
|
||||
if ( NS_FAILED(rv) )
|
||||
return sal_False;
|
||||
|
||||
@@ -654,6 +658,11 @@
|
||||
if ( NS_FAILED(rv) )
|
||||
return sal_False;
|
||||
|
||||
+ PRUint32 options;
|
||||
+ rv = url->GetOptions(&options);
|
||||
+ if ( NS_FAILED(rv) )
|
||||
+ return sal_False;
|
||||
+
|
||||
// Get the ldap connection
|
||||
nsCOMPtr<nsILDAPConnection> ldapConnection;
|
||||
ldapConnection = do_CreateInstance(NS_LDAPCONNECTION_CONTRACTID, &rv);
|
||||
@@ -671,7 +680,7 @@
|
||||
|
||||
// Now lets initialize the LDAP connection properly. We'll kick
|
||||
// off the bind operation in the callback function, |OnLDAPInit()|.
|
||||
- rv = ldapConnection->Init(host, port, NS_ConvertASCIItoUCS2(dn).get(),
|
||||
+ rv = ldapConnection->Init(host.get(), port, options, nsnull,
|
||||
messageListener);
|
||||
if ( NS_FAILED(rv) )
|
||||
return sal_False;
|
||||
@ -1,22 +0,0 @@
|
||||
--- ../connectivity/source/drivers/mozab/mozillasrc/MNSInclude.hxx.orig Sat May 18 01:58:35 2002
|
||||
+++ ../connectivity/source/drivers/mozab/mozillasrc/MNSInclude.hxx Sat May 18 02:00:42 2002
|
||||
@@ -2,9 +2,9 @@
|
||||
*
|
||||
* $RCSfile: MNSInclude.hxx,v $
|
||||
*
|
||||
- * $Revision: 1.3 $
|
||||
+ * $Revision: 1.4 $
|
||||
*
|
||||
- * last change: $Author: oj $ $Date: 2001/11/26 13:52:26 $
|
||||
+ * last change: $Author: fs $ $Date: 2002/05/17 12:08:41 $
|
||||
*
|
||||
* The Contents of this file are made available subject to the terms of
|
||||
* either of the following licenses
|
||||
@@ -83,7 +83,6 @@
|
||||
# define _DEBUG MOZ_TMP_UDEBUG
|
||||
#endif
|
||||
|
||||
-#include <xp_core.h>
|
||||
#include <nsCOMPtr.h>
|
||||
#include <nsISupportsArray.h>
|
||||
#include <nsStr.h>
|
||||
@ -1,26 +0,0 @@
|
||||
--- ../connectivity/source/drivers/mozab/mozillasrc/MTypeConverter.cxx.orig Mon Nov 26 14:52:26 2001
|
||||
+++ ../connectivity/source/drivers/mozab/mozillasrc/MTypeConverter.cxx Sat May 18 14:02:06 2002
|
||||
@@ -2,9 +2,9 @@
|
||||
*
|
||||
* $RCSfile: MTypeConverter.cxx,v $
|
||||
*
|
||||
- * $Revision: 1.3 $
|
||||
+ * $Revision: 1.4 $
|
||||
*
|
||||
- * last change: $Author: oj $ $Date: 2001/11/26 13:52:26 $
|
||||
+ * last change: $Author: fs $ $Date: 2002/05/17 12:08:41 $
|
||||
*
|
||||
* The Contents of this file are made available subject to the terms of
|
||||
* either of the following licenses
|
||||
@@ -136,9 +136,11 @@
|
||||
::rtl::OString os(ous,ous.getLength(),RTL_TEXTENCODING_ASCII_US);
|
||||
return( ::std::string(os.getStr()));
|
||||
}
|
||||
+#if 0
|
||||
// -------------------------------------------------------------------------
|
||||
::std::string MTypeConverter::nsStringToStlString(nsString const &nss)
|
||||
{
|
||||
return( ::std::string(nss.GetBuffer()));
|
||||
}
|
||||
+#endif
|
||||
// -------------------------------------------------------------------------
|
||||
@ -1,11 +0,0 @@
|
||||
--- ../sysui/unix/office/gnome/gnome-vfs-filetype-registration.cxx.orig Wed Apr 10 21:54:49 2002
|
||||
+++ ../sysui/unix/office/gnome/gnome-vfs-filetype-registration.cxx Wed May 1 22:40:02 2002
|
||||
@@ -62,7 +62,7 @@
|
||||
#include <stdlib.h>
|
||||
#include <stdio.h>
|
||||
#include <dlfcn.h>
|
||||
-#if !defined(NETBSD)
|
||||
+#if !(defined NETBSD || defined FREEBSD)
|
||||
#include <alloca.h>
|
||||
#endif
|
||||
#include <string.h>
|
||||
@ -1,71 +0,0 @@
|
||||
--- ../connectivity/source/drivers/mozab/mozillasrc/MDatabaseMetaDataHelper.cxx.orig Sat May 18 01:46:08 2002
|
||||
+++ ../connectivity/source/drivers/mozab/mozillasrc/MDatabaseMetaDataHelper.cxx Sat May 18 01:56:23 2002
|
||||
@@ -2,9 +2,9 @@
|
||||
*
|
||||
* $RCSfile: MDatabaseMetaDataHelper.cxx,v $
|
||||
*
|
||||
- * $Revision: 1.5 $
|
||||
+ * $Revision: 1.6 $
|
||||
*
|
||||
- * last change: $Author: dkenny $ $Date: 2001/12/13 09:34:19 $
|
||||
+ * last change: $Author: fs $ $Date: 2002/05/17 12:08:41 $
|
||||
*
|
||||
* The Contents of this file are made available subject to the terms of
|
||||
* either of the following licenses
|
||||
@@ -213,11 +213,15 @@
|
||||
|
||||
retCode = dirFactoryService->GetDirFactory(aFactory.getStr(), getter_AddRefs(dirFactory)) ;
|
||||
NS_ENSURE_SUCCESS (retCode, retCode) ;
|
||||
- OUString value = OStringToOUString(aFactory, RTL_TEXTENCODING_ASCII_US) ;
|
||||
- const PRUnichar *valueChars = value.getStr() ;
|
||||
- nsCOMPtr<nsISimpleEnumerator> subDirs ;
|
||||
+ nsCOMPtr <nsIAbDirectoryProperties> properties;
|
||||
+ properties = do_CreateInstance(NS_ABDIRECTORYPROPERTIES_CONTRACTID, &retCode);
|
||||
+ NS_ENSURE_SUCCESS(retCode, retCode) ;
|
||||
|
||||
- retCode = dirFactory->CreateDirectory(1, &kPropertyName, &valueChars, getter_AddRefs(subDirs)) ;
|
||||
+ retCode = properties->SetURI(aFactory.getStr());
|
||||
+ NS_ENSURE_SUCCESS(retCode,retCode);
|
||||
+
|
||||
+ nsCOMPtr<nsISimpleEnumerator> subDirs ;
|
||||
+ retCode = dirFactory->CreateDirectory(properties, getter_AddRefs(subDirs));
|
||||
NS_ENSURE_SUCCESS(retCode, retCode) ;
|
||||
PRBool hasMore = PR_TRUE ;
|
||||
nsCOMPtr<nsISupportsArray> array ;
|
||||
@@ -635,12 +639,12 @@
|
||||
if ( NS_FAILED(rv) )
|
||||
return sal_False;
|
||||
|
||||
- rv = url->SetSpec( sAbURI.getStr() );
|
||||
+ rv = url->SetSpec( nsDependentCString(sAbURI.getStr()) );
|
||||
if ( NS_FAILED(rv) )
|
||||
return sal_False;
|
||||
|
||||
- nsXPIDLCString host;
|
||||
- rv = url->GetHost(getter_Copies (host));
|
||||
+ nsCAutoString host;
|
||||
+ rv = url->GetAsciiHost(host);
|
||||
if ( NS_FAILED(rv) )
|
||||
return sal_False;
|
||||
|
||||
@@ -654,6 +658,11 @@
|
||||
if ( NS_FAILED(rv) )
|
||||
return sal_False;
|
||||
|
||||
+ PRUint32 options;
|
||||
+ rv = url->GetOptions(&options);
|
||||
+ if ( NS_FAILED(rv) )
|
||||
+ return sal_False;
|
||||
+
|
||||
// Get the ldap connection
|
||||
nsCOMPtr<nsILDAPConnection> ldapConnection;
|
||||
ldapConnection = do_CreateInstance(NS_LDAPCONNECTION_CONTRACTID, &rv);
|
||||
@@ -671,7 +680,7 @@
|
||||
|
||||
// Now lets initialize the LDAP connection properly. We'll kick
|
||||
// off the bind operation in the callback function, |OnLDAPInit()|.
|
||||
- rv = ldapConnection->Init(host, port, NS_ConvertASCIItoUCS2(dn).get(),
|
||||
+ rv = ldapConnection->Init(host.get(), port, options, nsnull,
|
||||
messageListener);
|
||||
if ( NS_FAILED(rv) )
|
||||
return sal_False;
|
||||
@ -1,22 +0,0 @@
|
||||
--- ../connectivity/source/drivers/mozab/mozillasrc/MNSInclude.hxx.orig Sat May 18 01:58:35 2002
|
||||
+++ ../connectivity/source/drivers/mozab/mozillasrc/MNSInclude.hxx Sat May 18 02:00:42 2002
|
||||
@@ -2,9 +2,9 @@
|
||||
*
|
||||
* $RCSfile: MNSInclude.hxx,v $
|
||||
*
|
||||
- * $Revision: 1.3 $
|
||||
+ * $Revision: 1.4 $
|
||||
*
|
||||
- * last change: $Author: oj $ $Date: 2001/11/26 13:52:26 $
|
||||
+ * last change: $Author: fs $ $Date: 2002/05/17 12:08:41 $
|
||||
*
|
||||
* The Contents of this file are made available subject to the terms of
|
||||
* either of the following licenses
|
||||
@@ -83,7 +83,6 @@
|
||||
# define _DEBUG MOZ_TMP_UDEBUG
|
||||
#endif
|
||||
|
||||
-#include <xp_core.h>
|
||||
#include <nsCOMPtr.h>
|
||||
#include <nsISupportsArray.h>
|
||||
#include <nsStr.h>
|
||||
@ -1,26 +0,0 @@
|
||||
--- ../connectivity/source/drivers/mozab/mozillasrc/MTypeConverter.cxx.orig Mon Nov 26 14:52:26 2001
|
||||
+++ ../connectivity/source/drivers/mozab/mozillasrc/MTypeConverter.cxx Sat May 18 14:02:06 2002
|
||||
@@ -2,9 +2,9 @@
|
||||
*
|
||||
* $RCSfile: MTypeConverter.cxx,v $
|
||||
*
|
||||
- * $Revision: 1.3 $
|
||||
+ * $Revision: 1.4 $
|
||||
*
|
||||
- * last change: $Author: oj $ $Date: 2001/11/26 13:52:26 $
|
||||
+ * last change: $Author: fs $ $Date: 2002/05/17 12:08:41 $
|
||||
*
|
||||
* The Contents of this file are made available subject to the terms of
|
||||
* either of the following licenses
|
||||
@@ -136,9 +136,11 @@
|
||||
::rtl::OString os(ous,ous.getLength(),RTL_TEXTENCODING_ASCII_US);
|
||||
return( ::std::string(os.getStr()));
|
||||
}
|
||||
+#if 0
|
||||
// -------------------------------------------------------------------------
|
||||
::std::string MTypeConverter::nsStringToStlString(nsString const &nss)
|
||||
{
|
||||
return( ::std::string(nss.GetBuffer()));
|
||||
}
|
||||
+#endif
|
||||
// -------------------------------------------------------------------------
|
||||
@ -1,11 +0,0 @@
|
||||
--- ../sysui/unix/office/gnome/gnome-vfs-filetype-registration.cxx.orig Wed Apr 10 21:54:49 2002
|
||||
+++ ../sysui/unix/office/gnome/gnome-vfs-filetype-registration.cxx Wed May 1 22:40:02 2002
|
||||
@@ -62,7 +62,7 @@
|
||||
#include <stdlib.h>
|
||||
#include <stdio.h>
|
||||
#include <dlfcn.h>
|
||||
-#if !defined(NETBSD)
|
||||
+#if !(defined NETBSD || defined FREEBSD)
|
||||
#include <alloca.h>
|
||||
#endif
|
||||
#include <string.h>
|
||||
@ -1,71 +0,0 @@
|
||||
--- ../connectivity/source/drivers/mozab/mozillasrc/MDatabaseMetaDataHelper.cxx.orig Sat May 18 01:46:08 2002
|
||||
+++ ../connectivity/source/drivers/mozab/mozillasrc/MDatabaseMetaDataHelper.cxx Sat May 18 01:56:23 2002
|
||||
@@ -2,9 +2,9 @@
|
||||
*
|
||||
* $RCSfile: MDatabaseMetaDataHelper.cxx,v $
|
||||
*
|
||||
- * $Revision: 1.5 $
|
||||
+ * $Revision: 1.6 $
|
||||
*
|
||||
- * last change: $Author: dkenny $ $Date: 2001/12/13 09:34:19 $
|
||||
+ * last change: $Author: fs $ $Date: 2002/05/17 12:08:41 $
|
||||
*
|
||||
* The Contents of this file are made available subject to the terms of
|
||||
* either of the following licenses
|
||||
@@ -213,11 +213,15 @@
|
||||
|
||||
retCode = dirFactoryService->GetDirFactory(aFactory.getStr(), getter_AddRefs(dirFactory)) ;
|
||||
NS_ENSURE_SUCCESS (retCode, retCode) ;
|
||||
- OUString value = OStringToOUString(aFactory, RTL_TEXTENCODING_ASCII_US) ;
|
||||
- const PRUnichar *valueChars = value.getStr() ;
|
||||
- nsCOMPtr<nsISimpleEnumerator> subDirs ;
|
||||
+ nsCOMPtr <nsIAbDirectoryProperties> properties;
|
||||
+ properties = do_CreateInstance(NS_ABDIRECTORYPROPERTIES_CONTRACTID, &retCode);
|
||||
+ NS_ENSURE_SUCCESS(retCode, retCode) ;
|
||||
|
||||
- retCode = dirFactory->CreateDirectory(1, &kPropertyName, &valueChars, getter_AddRefs(subDirs)) ;
|
||||
+ retCode = properties->SetURI(aFactory.getStr());
|
||||
+ NS_ENSURE_SUCCESS(retCode,retCode);
|
||||
+
|
||||
+ nsCOMPtr<nsISimpleEnumerator> subDirs ;
|
||||
+ retCode = dirFactory->CreateDirectory(properties, getter_AddRefs(subDirs));
|
||||
NS_ENSURE_SUCCESS(retCode, retCode) ;
|
||||
PRBool hasMore = PR_TRUE ;
|
||||
nsCOMPtr<nsISupportsArray> array ;
|
||||
@@ -635,12 +639,12 @@
|
||||
if ( NS_FAILED(rv) )
|
||||
return sal_False;
|
||||
|
||||
- rv = url->SetSpec( sAbURI.getStr() );
|
||||
+ rv = url->SetSpec( nsDependentCString(sAbURI.getStr()) );
|
||||
if ( NS_FAILED(rv) )
|
||||
return sal_False;
|
||||
|
||||
- nsXPIDLCString host;
|
||||
- rv = url->GetHost(getter_Copies (host));
|
||||
+ nsCAutoString host;
|
||||
+ rv = url->GetAsciiHost(host);
|
||||
if ( NS_FAILED(rv) )
|
||||
return sal_False;
|
||||
|
||||
@@ -654,6 +658,11 @@
|
||||
if ( NS_FAILED(rv) )
|
||||
return sal_False;
|
||||
|
||||
+ PRUint32 options;
|
||||
+ rv = url->GetOptions(&options);
|
||||
+ if ( NS_FAILED(rv) )
|
||||
+ return sal_False;
|
||||
+
|
||||
// Get the ldap connection
|
||||
nsCOMPtr<nsILDAPConnection> ldapConnection;
|
||||
ldapConnection = do_CreateInstance(NS_LDAPCONNECTION_CONTRACTID, &rv);
|
||||
@@ -671,7 +680,7 @@
|
||||
|
||||
// Now lets initialize the LDAP connection properly. We'll kick
|
||||
// off the bind operation in the callback function, |OnLDAPInit()|.
|
||||
- rv = ldapConnection->Init(host, port, NS_ConvertASCIItoUCS2(dn).get(),
|
||||
+ rv = ldapConnection->Init(host.get(), port, options, nsnull,
|
||||
messageListener);
|
||||
if ( NS_FAILED(rv) )
|
||||
return sal_False;
|
||||
@ -1,22 +0,0 @@
|
||||
--- ../connectivity/source/drivers/mozab/mozillasrc/MNSInclude.hxx.orig Sat May 18 01:58:35 2002
|
||||
+++ ../connectivity/source/drivers/mozab/mozillasrc/MNSInclude.hxx Sat May 18 02:00:42 2002
|
||||
@@ -2,9 +2,9 @@
|
||||
*
|
||||
* $RCSfile: MNSInclude.hxx,v $
|
||||
*
|
||||
- * $Revision: 1.3 $
|
||||
+ * $Revision: 1.4 $
|
||||
*
|
||||
- * last change: $Author: oj $ $Date: 2001/11/26 13:52:26 $
|
||||
+ * last change: $Author: fs $ $Date: 2002/05/17 12:08:41 $
|
||||
*
|
||||
* The Contents of this file are made available subject to the terms of
|
||||
* either of the following licenses
|
||||
@@ -83,7 +83,6 @@
|
||||
# define _DEBUG MOZ_TMP_UDEBUG
|
||||
#endif
|
||||
|
||||
-#include <xp_core.h>
|
||||
#include <nsCOMPtr.h>
|
||||
#include <nsISupportsArray.h>
|
||||
#include <nsStr.h>
|
||||
@ -1,26 +0,0 @@
|
||||
--- ../connectivity/source/drivers/mozab/mozillasrc/MTypeConverter.cxx.orig Mon Nov 26 14:52:26 2001
|
||||
+++ ../connectivity/source/drivers/mozab/mozillasrc/MTypeConverter.cxx Sat May 18 14:02:06 2002
|
||||
@@ -2,9 +2,9 @@
|
||||
*
|
||||
* $RCSfile: MTypeConverter.cxx,v $
|
||||
*
|
||||
- * $Revision: 1.3 $
|
||||
+ * $Revision: 1.4 $
|
||||
*
|
||||
- * last change: $Author: oj $ $Date: 2001/11/26 13:52:26 $
|
||||
+ * last change: $Author: fs $ $Date: 2002/05/17 12:08:41 $
|
||||
*
|
||||
* The Contents of this file are made available subject to the terms of
|
||||
* either of the following licenses
|
||||
@@ -136,9 +136,11 @@
|
||||
::rtl::OString os(ous,ous.getLength(),RTL_TEXTENCODING_ASCII_US);
|
||||
return( ::std::string(os.getStr()));
|
||||
}
|
||||
+#if 0
|
||||
// -------------------------------------------------------------------------
|
||||
::std::string MTypeConverter::nsStringToStlString(nsString const &nss)
|
||||
{
|
||||
return( ::std::string(nss.GetBuffer()));
|
||||
}
|
||||
+#endif
|
||||
// -------------------------------------------------------------------------
|
||||
@ -1,11 +0,0 @@
|
||||
--- ../sysui/unix/office/gnome/gnome-vfs-filetype-registration.cxx.orig Wed Apr 10 21:54:49 2002
|
||||
+++ ../sysui/unix/office/gnome/gnome-vfs-filetype-registration.cxx Wed May 1 22:40:02 2002
|
||||
@@ -62,7 +62,7 @@
|
||||
#include <stdlib.h>
|
||||
#include <stdio.h>
|
||||
#include <dlfcn.h>
|
||||
-#if !defined(NETBSD)
|
||||
+#if !(defined NETBSD || defined FREEBSD)
|
||||
#include <alloca.h>
|
||||
#endif
|
||||
#include <string.h>
|
||||
Loading…
Reference in New Issue
Block a user