Current-Users archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
Re: KDE4 on NetBSD 5.99.2
M.Drochner%fz-juelich.de@localhost said:
> the appended patch
------------------------------------------------------------------------------------------------
------------------------------------------------------------------------------------------------
Forschungszentrum Juelich GmbH
52425 Juelich
Sitz der Gesellschaft: Juelich
Eingetragen im Handelsregister des Amtsgerichts Dueren Nr. HR B 3498
Vorsitzende des Aufsichtsrats: MinDir'in Baerbel Brumme-Bothe
Geschaeftsfuehrung: Prof. Dr. Achim Bachem (Vorsitzender),
Dr. Ulrich Krafft (stellv. Vorsitzender), Prof. Dr.-Ing. Harald Bolt,
Prof. Dr. Sebastian M. Schmidt
------------------------------------------------------------------------------------------------
------------------------------------------------------------------------------------------------
Index: Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/x11/qt4-libs/Makefile,v
retrieving revision 1.36
diff -u -r1.36 Makefile
--- Makefile 13 Oct 2009 15:59:02 -0000 1.36
+++ Makefile 5 Jan 2010 10:28:00 -0000
@@ -5,7 +5,7 @@
.include "../../x11/qt4-libs/Makefile.common"
PKGNAME= qt4-libs-${QTVERSION}
-PKGREVISION= 1
+PKGREVISION= 2
COMMENT= C++ X GUI toolkit
BUILD_TARGET= sub-src
Index: distinfo
===================================================================
RCS file: /cvsroot/pkgsrc/x11/qt4-libs/distinfo,v
retrieving revision 1.35
diff -u -r1.35 distinfo
--- distinfo 11 Oct 2009 09:14:52 -0000 1.35
+++ distinfo 5 Jan 2010 10:28:00 -0000
@@ -25,3 +25,5 @@
SHA1 (patch-at) = f9b090ead20dd1b664484237ac5777fdd03ea1ed
SHA1 (patch-av) = f716b571ef0f8b5c7684378a0e3772c1680c6dcf
SHA1 (patch-ax) = 2c895f23a49be32d4605557a74ce5af34cdfc061
+SHA1 (patch-ca) = ae3098989a57fef9874dfc024a4821d274ebda48
+SHA1 (patch-cb) = d520bc2a828dabada78af5a2aa110f98dc67ba73
Index: patches/patch-ca
===================================================================
RCS file: patches/patch-ca
diff -N patches/patch-ca
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-ca 5 Jan 2010 10:28:00 -0000
@@ -0,0 +1,273 @@
+$NetBSD$
+
+--- src/3rdparty/webkit/WebCore/loader/FTPDirectoryParser.cpp.orig
2009-09-29 11:01:36.000000000 +0000
++++ src/3rdparty/webkit/WebCore/loader/FTPDirectoryParser.cpp
+@@ -53,6 +53,13 @@ static struct tm *gmtimeQt(const time_t
+ #define gmtime_r(x, y) gmtime_s((y), (x))
+ #endif
+
++static inline FTPEntryType ParsingFailed(ListState& state)
++{
++ if (state.parsedOne || state.listStyle) /* junk if we fail to parse */
++ return FTPJunkEntry; /* this time but had previously parsed
sucessfully */
++ return FTPMiscEntry; /* its part of a comment or error message */
++}
++
+ FTPEntryType parseOneFTPLine(const char* line, ListState& state, ListResult&
result)
+ {
+ result.clear();
+@@ -121,6 +128,9 @@ FTPEntryType parseOneFTPLine(const char*
+ }
+ }
+ }
++
++ if (!numtoks)
++ return ParsingFailed(state);
+
+ linelen_sans_wsp = &(tokens[numtoks-1][toklen[numtoks-1]]) - tokens[0];
+ if (numtoks == (sizeof(tokens)/sizeof(tokens[0])) )
+@@ -352,11 +362,16 @@ FTPEntryType parseOneFTPLine(const char*
+ pos++;
+ p++;
+ }
+- if (lstyle && pos < (toklen[0]-1) && *p == ']')
+- {
++ if (lstyle && pos < (toklen[0]-1))
++ {
++ /* ']' was found and there is at least one character after it */
++ ASSERT(*p == ']');
+ pos++;
+ p++;
+ tokmarker = pos; /* length of leading "[DIR1.DIR2.etc]" */
++ } else {
++ /* not a CMU style listing */
++ lstyle = 0;
+ }
+ }
+ while (lstyle && pos < toklen[0] && *p != ';')
+@@ -383,7 +398,7 @@ FTPEntryType parseOneFTPLine(const char*
+ pos -= tokmarker; /* => fnlength sans "[DIR1.DIR2.etc]" */
+ p = &(tokens[0][tokmarker]); /* offset of basename */
+
+- if (!lstyle || pos > 80) /* VMS filenames can't be longer than that
*/
++ if (!lstyle || pos == 0 || pos > 80) /* VMS filenames can't be
longer than that */
+ {
+ lstyle = 0;
+ }
+@@ -776,7 +791,7 @@ FTPEntryType parseOneFTPLine(const char*
+ state.parsedOne = true;
+ state.listStyle = lstyle;
+
+- p = &(line[linelen_sans_wsp]); /* line end sans wsp */
++ p = &(line[linelen]); /* line end */
+ result.caseSensitive = true;
+ result.filename = tokens[3];
+ result.filenameLength = p - tokens[3];
+@@ -784,29 +799,46 @@ FTPEntryType parseOneFTPLine(const char*
+
+ if (*tokens[2] != '<') /* not <DIR> or <JUNCTION> */
+ {
++ // try to handle correctly spaces at the beginning of the filename
++ // filesize (token[2]) must end at offset 38
++ if (tokens[2] + toklen[2] - line == 38) {
++ result.filename = &(line[39]);
++ result.filenameLength = p - result.filename;
++ }
+ result.type = FTPFileEntry;
+ pos = toklen[2];
+ result.fileSize = String(tokens[2], pos);
+ }
+- else if ((tokens[2][1]) != 'D') /* not <DIR> */
+- {
+- result.type = FTPJunkEntry; /* unknown until junc for sure */
+- if (result.filenameLength > 4)
+- {
+- p = result.filename;
+- for (pos = result.filenameLength - 4; pos > 0; pos--)
+- {
+- if (p[0] == ' ' && p[3] == ' ' && p[2] == '>' &&
+- (p[1] == '=' || p[1] == '-'))
++ else {
++ // try to handle correctly spaces at the beginning of the filename
++ // token[2] must begin at offset 24, the length is 5 or 10
++ // token[3] must begin at offset 39 or higher
++ if (tokens[2] - line == 24 && (toklen[2] == 5 || toklen[2] == 10) &&
++ tokens[3] - line >= 39) {
++ result.filename = &(line[39]);
++ result.filenameLength = p - result.filename;
++ }
++
++ if ((tokens[2][1]) != 'D') /* not <DIR> */
++ {
++ result.type = FTPJunkEntry; /* unknown until junc for sure */
++ if (result.filenameLength > 4)
++ {
++ p = result.filename;
++ for (pos = result.filenameLength - 4; pos > 0; pos--)
+ {
+- result.type = FTPLinkEntry;
+- result.filenameLength = p - result.filename;
+- result.linkname = p + 4;
+- result.linknameLength = &(line[linelen_sans_wsp])
+- - result.linkname;
+- break;
++ if (p[0] == ' ' && p[3] == ' ' && p[2] == '>' &&
++ (p[1] == '=' || p[1] == '-'))
++ {
++ result.type = FTPLinkEntry;
++ result.filenameLength = p - result.filename;
++ result.linkname = p + 4;
++ result.linknameLength = &(line[linelen])
++ - result.linkname;
++ break;
++ }
++ p++;
+ }
+- p++;
+ }
+ }
+ }
+@@ -817,8 +849,13 @@ FTPEntryType parseOneFTPLine(const char*
+ result.modifiedTime.tm_mon--;
+ result.modifiedTime.tm_mday = atoi(tokens[0]+3);
+ result.modifiedTime.tm_year = atoi(tokens[0]+6);
++ /* if year has only two digits then assume that
++ 00-79 is 2000-2079
++ 80-99 is 1980-1999 */
+ if (result.modifiedTime.tm_year < 80)
+- result.modifiedTime.tm_year += 100;
++ result.modifiedTime.tm_year += 2000;
++ else if (result.modifiedTime.tm_year < 100)
++ result.modifiedTime.tm_year += 1900;
+ }
+
+ result.modifiedTime.tm_hour = atoi(tokens[1]+0);
+@@ -970,6 +1007,8 @@ FTPEntryType parseOneFTPLine(const char*
+ * "drwxr-xr-x 2 0 0 512 May 28 22:17 etc"
+ */
+
++ bool isOldHellsoft = false;
++
+ if (numtoks >= 6)
+ {
+ /* there are two perm formats (Hellsoft/NetWare and *IX strmode(3)).
+@@ -995,6 +1034,8 @@ FTPEntryType parseOneFTPLine(const char*
+ {
+ /* rest is FMA[S] or AFM[S] */
+ lstyle = 'U'; /* very likely one of the NetWare servers */
++ if (toklen[0] == 10)
++ isOldHellsoft = true;
+ }
+ }
+ }
+@@ -1059,7 +1100,7 @@ FTPEntryType parseOneFTPLine(const char*
+
+ /* check that size is numeric */
+ p = tokens[tokmarker];
+- for (pos = 0; lstyle && pos < toklen[tokmarker]; pos++)
++ for (unsigned int i = 0; lstyle && i < toklen[tokmarker]; ++i)
+ {
+ if (!isASCIIDigit(*p++))
+ lstyle = 0;
+@@ -1068,11 +1109,11 @@ FTPEntryType parseOneFTPLine(const char*
+ {
+ month_num = 0;
+ p = tokens[tokmarker+1];
+- for (pos = 0;pos < (12*3); pos+=3)
++ for (unsigned int i = 0; i < (12*3); i+=3)
+ {
+- if (p[0] == month_names[pos+0] &&
+- p[1] == month_names[pos+1] &&
+- p[2] == month_names[pos+2])
++ if (p[0] == month_names[i+0] &&
++ p[1] == month_names[i+1] &&
++ p[2] == month_names[i+2])
+ break;
+ month_num++;
+ }
+@@ -1080,8 +1121,8 @@ FTPEntryType parseOneFTPLine(const char*
+ lstyle = 0;
+ }
+ } /* relative position test */
+- } /* while (pos+5) < numtoks */
+- } /* if (numtoks >= 4) */
++ } /* for (pos = (numtoks-5); !lstyle && pos > 1; pos--) */
++ } /* if (lstyle == 'U') */
+
+ if (lstyle == 'U')
+ {
+@@ -1140,24 +1181,49 @@ FTPEntryType parseOneFTPLine(const char*
+
+ } /* time/year */
+
+- result.filename = tokens[tokmarker+4];
+- result.filenameLength = (&(line[linelen_sans_wsp]))
++ // there is exacly 1 space between filename and previous token in all
++ // outputs except old Hellsoft
++ if (!isOldHellsoft)
++ result.filename = tokens[tokmarker+3] + toklen[tokmarker+3] + 1;
++ else
++ result.filename = tokens[tokmarker+4];
++
++ result.filenameLength = (&(line[linelen]))
+ - (result.filename);
+
+ if (result.type == FTPLinkEntry && result.filenameLength > 4)
+ {
+- p = result.filename + 1;
+- for (pos = 1; pos < (result.filenameLength - 4); pos++)
+- {
+- if (*p == ' ' && p[1] == '-' && p[2] == '>' && p[3] == ' ')
+- {
+- result.linkname = p + 4;
+- result.linknameLength = (&(line[linelen_sans_wsp]))
+- - (result.linkname);
+- result.filenameLength = pos;
+- break;
+- }
+- p++;
++ /* First try to use result.fe_size to find " -> " sequence.
++ This can give proper result for cases like "aaa -> bbb -> ccc".
*/
++ unsigned int fileSize = result.fileSize.toUInt();
++
++ if (result.filenameLength > (fileSize + 4) &&
++ strncmp(result.filename + result.filenameLength - fileSize - 4,
" -> ", 4) == 0)
++ {
++ result.linkname = result.filename + (result.filenameLength -
fileSize);
++ result.linknameLength = (&(line[linelen])) - (result.linkname);
++ result.filenameLength -= fileSize + 4;
++ }
++ else
++ {
++ /* Search for sequence " -> " from the end for case when there are
++ more occurrences. F.e. if ftpd returns "a -> b -> c" assume
++ "a -> b" as a name. Powerusers can remove unnecessary parts
++ manually but there is no way to follow the link when some
++ essential part is missing. */
++ p = result.filename + (result.filenameLength - 5);
++ for (pos = (result.filenameLength - 5); pos > 0; pos--)
++ {
++ if (strncmp(p, " -> ", 4) == 0)
++ {
++ result.linkname = p + 4;
++ result.linknameLength = (&(line[linelen]))
++ - (result.linkname);
++ result.filenameLength = pos;
++ break;
++ }
++ p--;
++ }
+ }
+ }
+
+@@ -1614,9 +1680,7 @@ FTPEntryType parseOneFTPLine(const char*
+
+ } /* if (linelen > 0) */
+
+- if (state.parsedOne || state.listStyle) /* junk if we fail to parse */
+- return FTPJunkEntry; /* this time but had previously parsed
sucessfully */
+- return FTPMiscEntry; /* its part of a comment or error message */
++ return ParsingFailed(state);
+ }
+
+ } // namespace WebCore
Index: patches/patch-cb
===================================================================
RCS file: patches/patch-cb
diff -N patches/patch-cb
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-cb 5 Jan 2010 10:28:01 -0000
@@ -0,0 +1,12 @@
+$NetBSD$
+
+--- src/3rdparty/webkit/WebCore/xml/XMLHttpRequest.cpp.orig 2009-09-29
11:01:37.000000000 +0000
++++ src/3rdparty/webkit/WebCore/xml/XMLHttpRequest.cpp
+@@ -735,7 +735,6 @@ void XMLHttpRequest::makeCrossSiteAccess
+ }
+
+
preflightRequest.setHTTPHeaderField("Access-Control-Request-Headers",
String::adopt(headerBuffer));
+- preflightRequest.addHTTPHeaderFields(m_requestHeaders);
+ }
+
+ if (m_async) {
Home |
Main Index |
Thread Index |
Old Index