summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--graphite/graphite-2.3.1_debug.patch13
-rw-r--r--graphite/makefile.mk10
-rwxr-xr-xicu/icuversion.mk6
-rw-r--r--moz/prj/d.lst19
-rw-r--r--neon/neon.patch57
-rw-r--r--python/prj/d.lst6
6 files changed, 78 insertions, 33 deletions
diff --git a/graphite/graphite-2.3.1_debug.patch b/graphite/graphite-2.3.1_debug.patch
new file mode 100644
index 000000000000..583fac711e2b
--- /dev/null
+++ b/graphite/graphite-2.3.1_debug.patch
@@ -0,0 +1,13 @@
+--- misc/silgraphite-2.3.1/engine/src/segment/SegmentAux.cpp 2008-08-21 16:24:32.000000000 +0200
++++ misc/build/silgraphite-2.3.1/engine/src/segment/SegmentAux.cpp 2011-02-21 13:22:23.159834368 +0100
+@@ -247,7 +247,9 @@
+ GlyphSetIterator::reference GlyphSetIterator::operator*() const
+ {
+ assert(m_pseg != 0);
+- assert(m_vit != std::vector<int>::const_iterator());
++ // #i116227# the check below is well meant but breaks itself when using stlport with debug facilities
++ // a valid iterator cannot be compared to an empty one in that case
++ // assert(m_vit != std::vector<int>::const_iterator());
+ // in the case of a non-contiguous list
+ return m_pseg->m_prgginf[(*m_vit) - m_pseg->m_isloutGinf0];
+ }
diff --git a/graphite/makefile.mk b/graphite/makefile.mk
index b9ecb7aea396..77cd1df94a4e 100644
--- a/graphite/makefile.mk
+++ b/graphite/makefile.mk
@@ -47,7 +47,7 @@ all:
.IF "$(ENABLE_GRAPHITE)"=="TRUE"
TARFILE_NAME=silgraphite-2.3.1
TARFILE_MD5=d35724900f6a4105550293686688bbb3
-PATCH_FILES=graphite-2.3.1.patch
+PATCH_FILES=graphite-2.3.1.patch graphite-2.3.1_debug.patch
# convert line-endings to avoid problems when patching
CONVERTFILES=\
@@ -71,7 +71,7 @@ VCNUM=8
# make use of stlport headerfiles
EXT_USE_STLPORT=TRUE
BUILD_ACTION=nmake VERBOSE=1
-.IF "$(debug)"=="true"
+.IF "x$(debug)"!="x"
BUILD_FLAGS= "CFG=DEBUG"
CFLAGSWITHPATH= $(CFLAGS:s!-Fd.!-Fd../../../../../!)
.ELSE
@@ -90,7 +90,7 @@ BUILD_FLAGS+= "CFLAGS4MSC=$(CFLAGS4MSC)" /F makefile.vc$(VCNUM) lib_dll
.IF "$(COM)"=="GCC"
# Does linux want --disable-shared?
-.IF "$(debug)"=="true"
+.IF "x$(debug)"!="x"
GR_CONFIGURE_FLAGS= --enable-debug=yes --disable-final --enable-static --disable-shared
.ELSE
GR_CONFIGURE_FLAGS= --enable-final=yes --enable-static --disable-shared
@@ -123,7 +123,7 @@ BUILD_DIR=$(CONFIGURE_DIR)
.IF "$(OS)"=="WNT" && "$(COM)"!="GCC"
#OUT2LIB=win32$/bin.msvc$/*.lib
-.IF "$(debug)"=="true"
+.IF "x$(debug)"!="x"
OUT2LIB=engine$/debug$/*.lib
.ELSE
OUT2LIB=engine$/release$/*.lib
@@ -141,7 +141,7 @@ OUT2LIB+=src$/.libs$/libgraphite.*.dylib
.ELSE
.IF "$(OS)"=="WNT" && "$(COM)"!="GCC"
#OUT2LIB+=engine$/src$/.libs$/libgraphite*.dll
-.IF "$(debug)"=="true"
+.IF "x$(debug)"!="x"
OUT2BIN= \
# engine$/debug$/*.dll \
engine$/debug$/*.pdb
diff --git a/icu/icuversion.mk b/icu/icuversion.mk
index eedf6276e598..a170642b276c 100755
--- a/icu/icuversion.mk
+++ b/icu/icuversion.mk
@@ -25,9 +25,9 @@
#
#*************************************************************************
# major
-ICU_MAJOR=4
+ICU_MAJOR*=4
# minor
-ICU_MINOR=0
+ICU_MINOR*=0
# micro
-ICU_MICRO=1
+ICU_MICRO*=1
diff --git a/moz/prj/d.lst b/moz/prj/d.lst
index dda8503f5f9d..67bd28bb164b 100644
--- a/moz/prj/d.lst
+++ b/moz/prj/d.lst
@@ -236,5 +236,22 @@ mkdir: %_DEST%\inc%_EXT%\mozilla\xpcom_obsolete
..\%__SRC%\inc\xpnet\* %_DEST%\inc%_EXT%\mozilla\xpnet
..\%__SRC%\inc\zlib\* %_DEST%\inc%_EXT%\mozilla\zlib
..\%__SRC%\inc\xpcom_obsolete\* %_DEST%\inc%_EXT%\mozilla\xpcom_obsolete
-..\%__SRC%\lib\* %_DEST%\lib%_EXT%
+
+..\%__SRC%\lib\libldap50.* %_DEST%\lib%_EXT%
+..\%__SRC%\lib\libmozjs.* %_DEST%\lib%_EXT%
+..\%__SRC%\lib\libmozz.* %_DEST%\lib%_EXT%
+..\%__SRC%\lib\libmsgbaseutil.* %_DEST%\lib%_EXT%
+..\%__SRC%\lib\libnssckbi.* %_DEST%\lib%_EXT%
+..\%__SRC%\lib\libnssdbm3.* %_DEST%\lib%_EXT%
+..\%__SRC%\lib\libnssutil3.* %_DEST%\lib%_EXT%
+..\%__SRC%\lib\libprldap50.* %_DEST%\lib%_EXT%
+..\%__SRC%\lib\libxpcom.* %_DEST%\lib%_EXT%
+..\%__SRC%\lib\libxpcom_compat.* %_DEST%\lib%_EXT%
+..\%__SRC%\lib\libxpcom_core.* %_DEST%\lib%_EXT%
+..\%__SRC%\lib\*.a %_DEST%\lib%_EXT%
+..\%__SRC%\lib\*.lib %_DEST%\lib%_EXT%
+
+mkdir: %_DEST%\lib%_EXT%\sqlite
+..\%__SRC%\lib\libsqlite3.* %_DEST%\lib%_EXT%\sqlite
+
..\%__SRC%\bin\*.zip %_DEST%\bin%_EXT%
diff --git a/neon/neon.patch b/neon/neon.patch
index 51ec3a8d6d0b..473b88695ccc 100644
--- a/neon/neon.patch
+++ b/neon/neon.patch
@@ -1,5 +1,5 @@
---- misc/neon-0.29.5/src/config.h 2010-12-07 15:53:32.000000000 +0100
-+++ misc/build/neon-0.29.5/src/config.h 2010-12-07 13:44:29.000000000 +0100
+--- misc/neon-0.29.5/src/config.h 2011-02-03 10:32:38.000000000 +0100
++++ misc/build/neon-0.29.5/src/config.h 2011-02-03 10:26:19.000000000 +0100
@@ -1 +1,488 @@
-dummy
+
@@ -490,8 +490,8 @@
+#else
+#define HAVE_NTLM 1
+#endif
---- misc/neon-0.29.5/src/makefile.mk 2010-12-07 15:53:32.000000000 +0100
-+++ misc/build/neon-0.29.5/src/makefile.mk 2010-12-07 13:44:29.000000000 +0100
+--- misc/neon-0.29.5/src/makefile.mk 2011-02-03 10:32:38.000000000 +0100
++++ misc/build/neon-0.29.5/src/makefile.mk 2011-02-03 10:26:19.000000000 +0100
@@ -1 +1,102 @@
-dummy
+PRJ=..$/..$/..$/..$/..
@@ -597,7 +597,7 @@
+DEF1NAME=$(SHL1TARGET)
+.INCLUDE : target.mk
--- misc/neon-0.29.5/src/ne_auth.c 2010-10-14 17:00:53.000000000 +0200
-+++ misc/build/neon-0.29.5/src/ne_auth.c 2010-12-07 15:39:56.000000000 +0100
++++ misc/build/neon-0.29.5/src/ne_auth.c 2011-02-03 10:31:22.000000000 +0100
@@ -367,7 +367,7 @@
static int get_credentials(auth_session *sess, ne_buffer **errmsg, int attempt,
struct auth_challenge *chall, char *pwbuf)
@@ -607,7 +607,28 @@
chall->handler->attempt++, sess->username, pwbuf) == 0) {
return 0;
} else {
-@@ -610,10 +610,12 @@
+@@ -385,15 +385,19 @@
+ {
+ char *tmp, password[NE_ABUFSIZ];
+
++#if 0 /* Workaround - IIS sends challenge without realm. */
++
+ /* Verify challenge... must have a realm */
+ if (parms->realm == NULL) {
+ challenge_error(errmsg, _("missing realm in Basic challenge"));
+ return -1;
+ }
++#endif
+
+ clean_session(sess);
+
+- sess->realm = ne_strdup(parms->realm);
++ if (parms->realm != NULL)
++ sess->realm = ne_strdup(parms->realm);
+
+ if (get_credentials(sess, errmsg, attempt, parms, password)) {
+ /* Failed to get credentials */
+@@ -610,10 +614,12 @@
return NULL;
}
@@ -621,7 +642,7 @@
NE_DEBUG(NE_DBG_HTTPAUTH, "auth: SSPI challenge.\n");
-@@ -630,8 +632,17 @@
+@@ -630,8 +636,17 @@
return status;
}
}
@@ -641,7 +662,7 @@
if (status) {
return status;
}
-@@ -651,7 +662,7 @@
+@@ -651,7 +666,7 @@
{
int ntlm = ne_strcasecmp(parms->protocol->name, "NTLM") == 0;
@@ -650,7 +671,7 @@
}
static int verify_sspi(struct auth_request *req, auth_session *sess,
-@@ -674,7 +685,7 @@
+@@ -674,7 +689,7 @@
return NE_OK;
}
@@ -660,7 +681,7 @@
#endif
--- misc/neon-0.29.5/src/ne_auth.h 2009-09-01 22:13:12.000000000 +0200
-+++ misc/build/neon-0.29.5/src/ne_auth.h 2010-12-07 13:44:30.000000000 +0100
++++ misc/build/neon-0.29.5/src/ne_auth.h 2011-02-03 10:26:20.000000000 +0100
@@ -47,8 +47,8 @@
* Hint: if you just wish to attempt authentication just once (even if
* the user gets the username/password wrong), have the callback
@@ -673,7 +694,7 @@
/* Set callbacks to provide credentials for server and proxy
* authentication, using the default set of authentication protocols.
--- misc/neon-0.29.5/src/ne_defs.h 2010-01-11 23:57:34.000000000 +0100
-+++ misc/build/neon-0.29.5/src/ne_defs.h 2010-12-07 13:44:30.000000000 +0100
++++ misc/build/neon-0.29.5/src/ne_defs.h 2011-02-03 10:26:20.000000000 +0100
@@ -41,7 +41,7 @@
#endif
@@ -684,7 +705,7 @@
#endif
--- misc/neon-0.29.5/src/ne_locks.c 2007-02-05 11:09:27.000000000 +0100
-+++ misc/build/neon-0.29.5/src/ne_locks.c 2010-12-07 13:44:30.000000000 +0100
++++ misc/build/neon-0.29.5/src/ne_locks.c 2011-02-03 10:26:21.000000000 +0100
@@ -579,6 +579,23 @@
const char *token = ne_get_response_header(ctx->req, "Lock-Token");
/* at the root element; retrieve the Lock-Token header,
@@ -752,7 +773,7 @@
}
}
--- misc/neon-0.29.5/src/ne_locks.h 2006-01-02 12:43:19.000000000 +0100
-+++ misc/build/neon-0.29.5/src/ne_locks.h 2010-12-07 13:44:30.000000000 +0100
++++ misc/build/neon-0.29.5/src/ne_locks.h 2011-02-03 10:26:21.000000000 +0100
@@ -22,6 +22,10 @@
#ifndef NE_LOCKS_H
#define NE_LOCKS_H
@@ -765,7 +786,7 @@
#include "ne_uri.h" /* for ne_uri */
--- misc/neon-0.29.5/src/ne_sspi.c 2007-08-10 17:26:08.000000000 +0200
-+++ misc/build/neon-0.29.5/src/ne_sspi.c 2010-12-07 13:44:31.000000000 +0100
++++ misc/build/neon-0.29.5/src/ne_sspi.c 2011-02-03 10:26:21.000000000 +0100
@@ -206,6 +206,45 @@
}
@@ -852,7 +873,7 @@
securityStatus =
initializeSecurityContext(&sspiContext->credentials, NULL,
--- misc/neon-0.29.5/src/ne_sspi.h 2006-02-12 13:05:14.000000000 +0100
-+++ misc/build/neon-0.29.5/src/ne_sspi.h 2010-12-07 13:44:31.000000000 +0100
++++ misc/build/neon-0.29.5/src/ne_sspi.h 2011-02-03 10:26:21.000000000 +0100
@@ -41,7 +41,7 @@
int ne_sspi_clear_context(void *context);
@@ -863,7 +884,7 @@
#endif /* HAVE_SSPI */
--- misc/neon-0.29.5/src/ne_uri.c 2007-12-05 12:04:47.000000000 +0100
-+++ misc/build/neon-0.29.5/src/ne_uri.c 2010-12-07 13:44:31.000000000 +0100
++++ misc/build/neon-0.29.5/src/ne_uri.c 2011-02-03 10:26:21.000000000 +0100
@@ -42,7 +42,7 @@
#include "ne_alloc.h"
#include "ne_uri.h"
@@ -910,7 +931,7 @@
/* 4x */ AT, AL, AL, AL, AL, AL, AL, AL, AL, AL, AL, AL, AL, AL, AL, AL,
/* 5x */ AL, AL, AL, AL, AL, AL, AL, AL, AL, AL, AL, GD, OT, GD, OT, US,
--- misc/neon-0.29.5/src/ne_utils.c 2006-03-07 10:36:43.000000000 +0100
-+++ misc/build/neon-0.29.5/src/ne_utils.c 2010-12-07 13:44:31.000000000 +0100
++++ misc/build/neon-0.29.5/src/ne_utils.c 2011-02-03 10:26:21.000000000 +0100
@@ -118,6 +118,9 @@
#ifdef HAVE_GNUTLS
", GNU TLS " LIBGNUTLS_VERSION
@@ -941,7 +962,7 @@
#endif /* NE_HAVE_* */
default:
--- misc/neon-0.29.5/src/ne_utils.h 2007-07-16 08:54:57.000000000 +0200
-+++ misc/build/neon-0.29.5/src/ne_utils.h 2010-12-07 13:44:31.000000000 +0100
++++ misc/build/neon-0.29.5/src/ne_utils.h 2011-02-03 10:26:21.000000000 +0100
@@ -54,6 +54,7 @@
#define NE_FEATURE_SOCKS (5) /* SOCKSv5 support */
#define NE_FEATURE_TS_SSL (6) /* Thread-safe SSL/TLS support */
diff --git a/python/prj/d.lst b/python/prj/d.lst
index def1bb84a414..e5c4d5bcb273 100644
--- a/python/prj/d.lst
+++ b/python/prj/d.lst
@@ -3,9 +3,6 @@ mkdir: %_DEST%\lib%_EXT%\python\lib-old
mkdir: %_DEST%\lib%_EXT%\python\lib-tk
mkdir: %_DEST%\lib%_EXT%\python\site-packages
mkdir: %_DEST%\lib%_EXT%\python\encodings
-mkdir: %_DEST%\lib%_EXT%\python\test
-mkdir: %_DEST%\lib%_EXT%\python\test\output
-mkdir: %_DEST%\lib%_EXT%\python\test\data
mkdir: %_DEST%\lib%_EXT%\python\email
mkdir: %_DEST%\lib%_EXT%\python\email\mime
mkdir: %_DEST%\lib%_EXT%\python\compiler
@@ -38,9 +35,6 @@ mkdir: %_DEST%\lib%_EXT%\python\ctypes\macholib
..\%__SRC%\misc\build\Python-2.6.1\Lib\lib-old\* %_DEST%\lib%_EXT%\python\lib-old\*
..\%__SRC%\misc\build\Python-2.6.1\Lib\lib-tk\* %_DEST%\lib%_EXT%\python\lib-tk\*
..\%__SRC%\misc\build\Python-2.6.1\Lib\site-packages\* %_DEST%\lib%_EXT%\python\site-packages\*
-..\%__SRC%\misc\build\Python-2.6.1\Lib\test\* %_DEST%\lib%_EXT%\python\test\*
-..\%__SRC%\misc\build\Python-2.6.1\Lib\test\output\* %_DEST%\lib%_EXT%\python\test\output\*
-..\%__SRC%\misc\build\Python-2.6.1\Lib\test\data\* %_DEST%\lib%_EXT%\python\test\data\*
..\%__SRC%\misc\build\Python-2.6.1\Lib\encodings\* %_DEST%\lib%_EXT%\python\encodings\*
..\%__SRC%\misc\build\Python-2.6.1\Lib\email\* %_DEST%\lib%_EXT%\python\email\*
..\%__SRC%\misc\build\Python-2.6.1\Lib\email\mime\* %_DEST%\lib%_EXT%\python\email\mime\*
generated by cgit v1.2.3 (git 2.39.1) at 2024-04-26 15:22:52 +0000