Skip to content

C
core
Kaydet (Commit) 89ef48f5 authored tarafından Jens-Heiner Rechtien's avatar Jens-Heiner Rechtien
Dosyalara gözat
Seçenekler

DEV300: merge masterfix ea9085d6db4c@DEV300

üst 27a76954 c326b2f1
Show whitespace changes
Inline Side-by-side
Showing with 100 additions and 726 deletions
berkeleydb/db-4.7.25.patch
Dosyayı görüntüle @ 89ef48f5
......@@ -646,7 +646,7 @@
+
--- misc/db-4.7.25.NC/makefile.mk 2009-07-21 11:42:40.000000000 +0200
+++ misc/build/db-4.7.25.NC/makefile.mk 2009-07-21 11:39:26.000000000 +0200
@@ -1 +1,81 @@
@@ -1 +1,76 @@
-dummy
+PRJ=..$/..$/..$/..
+PRJNAME=libdb47
......@@ -658,11 +658,6 @@
+CFLAGS+=-GS -EHsc -Gy
+
+#LINKFLAGS!:=$(LINKFLAGS:s/NODEFAULTLIB/NOLOGO/)
+.IF "$(USE_SHELL)"!="4nt"
+BUILD_ACTION_SEP=;
+.ELSE # "$(USE_SHELL)"!="4nt"
+BUILD_ACTION_SEP=^
+.ENDIF # "$(USE_SHELL)"!="4nt"
+
+CHILDREN= \
+ btree clib common cxx \
......@@ -720,7 +715,7 @@
+ALLTAR : $(CHILDREN)
+
+$(CHILDREN) .PHONY :
+ cd $@ $(BUILD_ACTION_SEP) $(MAKECMD) subdmake=true $(MFLAGS) $(CALLMACROS)
+ cd $@ ; $(MAKECMD) subdmake=true $(MFLAGS) $(CALLMACROS)
+
+.INCLUDE : target.mk
+
......
berkeleydb/makefile.mk
Dosyayı görüntüle @ 89ef48f5
......@@ -43,6 +43,7 @@ all:
# --- Files --------------------------------------------------------
TARFILE_NAME=db-4.7.25.NC-custom
TARFILE_MD5=d70951c80dabecc2892c919ff5d07172
TARFILE_ROOTDIR=db-4.7.25.NC
ADDITIONAL_FILES= \
......@@ -160,11 +161,6 @@ OUT2INC= \
# make use of stlport headerfiles
EXT_USE_STLPORT=TRUE
.IF "$(USE_SHELL)"!="4nt"
BUILD_ACTION_SEP=;
.ELSE # "$(USE_SHELL)"!="4nt"
BUILD_ACTION_SEP=^
.ENDIF # "$(USE_SHELL)"!="4nt"
BUILD_DIR=
BUILD_ACTION=dmake
......
bitstream_vera_fonts/fonts/ttf_dejavu/makefile.mk
Dosyayı görüntüle @ 89ef48f5
......@@ -37,6 +37,7 @@ TARGET=ttf_dejavu
# --- Files --------------------------------------------------------
TARFILE_NAME=dejavu-fonts-ttf-2.30
TARFILE_MD5=fe5b3e2b7c4577f30dc001054365653e
TARFILE_ROOTDIR=dejavu-fonts-ttf-2.30
PATCH_FILES=
......
bitstream_vera_fonts/fonts/ttf_gentium/makefile.mk
Dosyayı görüntüle @ 89ef48f5
......@@ -37,6 +37,7 @@ TARGET=ttf_gentium
# --- Files --------------------------------------------------------
TARFILE_NAME=gentiumbasic-fonts-1.10
TARFILE_MD5=35efabc239af896dfb79be7ebdd6e6b9
TARFILE_ROOTDIR=gentiumbasic-fonts-1.10
PATCH_FILES=
......
bitstream_vera_fonts/fonts/ttf_liberation/makefile.mk
Dosyayı görüntüle @ 89ef48f5
......@@ -37,6 +37,7 @@ TARGET=ttf_liberation
# --- Files --------------------------------------------------------
TARFILE_NAME=liberation-fonts-1.05
TARFILE_MD5=30102daecfb3a6aa022d2691dc075180
TARFILE_ROOTDIR=liberation-fonts-1.05
PATCH_FILES=
......
boost/makefile.mk
Dosyayı görüntüle @ 89ef48f5
......@@ -49,6 +49,7 @@ all:
# --- Files --------------------------------------------------------
TARFILE_NAME=boost_1_39_0
TARFILE_MD5=fcc6df1160753d0b8c835d17fdeeb0a7
PATCH_FILES=$(TARFILE_NAME).patch
CONFIGURE_DIR=
......
cairo/cairo/makefile.mk
Dosyayı görüntüle @ 89ef48f5
......@@ -50,6 +50,8 @@ all:
CAIROVERSION=1.8.0
TARFILE_NAME=$(PRJNAME)-$(CAIROVERSION)
TARFILE_MD5=4ea70ea87b47e92d318d4e7f5b940f47
PATCH_FILES=..$/$(TARFILE_NAME).patch
cairo_CFLAGS=$(SOLARINC)
......
cairo/pixman/makefile.mk
Dosyayı görüntüle @ 89ef48f5
......@@ -50,7 +50,9 @@ all:
PIXMANVERSION=0.12.0
TARFILE_NAME=pixman-$(PIXMANVERSION)
PATCH_FILE_NAME=..$/$(TARFILE_NAME).patch
TARFILE_MD5=09357cc74975b01714e00c5899ea1881
PATCH_FILES=..$/$(TARFILE_NAME).patch
# Note: we are building static pixman library to avoid linking problems.
# However, for Unix dynamic library must be used (especially due to 64bit issues)
......
curl/makefile.mk
Dosyayı görüntüle @ 89ef48f5
......@@ -42,6 +42,7 @@ all:
# --- Files --------------------------------------------------------
TARFILE_NAME=curl-7.19.7
TARFILE_MD5=ecb2e37e45c9933e2a963cabe03670ab
PATCH_FILES=curl-7.19.7.patch
.IF "$(GUI)"=="WNT"
......
expat/makefile.mk
Dosyayı görüntüle @ 89ef48f5
......@@ -43,6 +43,7 @@ all:
# --- Files --------------------------------------------------------
TARFILE_NAME=expat-2.0.1
TARFILE_MD5=ee8b492592568805593f81f8cdf2a04c
ADDITIONAL_FILES=lib$/makefile.mk
PATCH_FILES=expat-2.0.1.patch \
expat-winapi.patch
......
graphite/makefile.mk
Dosyayı görüntüle @ 89ef48f5
......@@ -46,6 +46,7 @@ all:
# --- Files --------------------------------------------------------
.IF "$(ENABLE_GRAPHITE)"=="TRUE"
TARFILE_NAME=silgraphite-2.3.1
TARFILE_MD5=d35724900f6a4105550293686688bbb3
PATCH_FILES=graphite-2.3.1.patch
# convert line-endings to avoid problems when patching
......
hunspell/hunspell-1.2.8.patch deleted 100644 → 0
Dosyayı görüntüle @ 27a76954
--- misc/hunspell-1.2.8/intl/localename.c 2007-04-06 10:05:34.000000000 +0200
+++ misc/build/hunspell-1.2.8/intl/localename.c 2008-11-01 16:30:49.000000000 +0100
@@ -140,6 +140,9 @@
# ifndef LANG_SINDHI
# define LANG_SINDHI 0x59
# endif
+# ifndef LANG_SORBIAN
+# define LANG_SORBIAN 0x2e
+# endif
# ifndef LANG_SLOVAK
# define LANG_SLOVAK 0x1b
# endif
--- misc/hunspell-1.2.8/src/hunspell/affixmgr.cxx 2008-11-01 08:00:41.000000000 +0100
+++ misc/build/hunspell-1.2.8/src/hunspell/affixmgr.cxx 2008-11-01 16:30:49.000000000 +0100
@@ -25,6 +25,10 @@
#endif
#endif
+#ifdef OS2
+#undef DEBUG
+#endif
+
AffixMgr::AffixMgr(const char * affpath, HashMgr** ptr, int * md, const char * key)
{
// register hash manager and load affix data from aff file
@@ -2133,7 +2137,7 @@
while ((rv) && ((needaffix && TESTAFF(rv->astr, needaffix, rv->alen)) ||
!((compoundflag && !words && TESTAFF(rv->astr, compoundflag, rv->alen)) ||
(compoundend && !words && TESTAFF(rv->astr, compoundend, rv->alen)) ||
- (numdefcpd && defcpd_check(&words, wnum + 1, rv, NULL,1))))) {
+ (numdefcpd && words && defcpd_check(&words, wnum + 1, rv, NULL,1))))) {
rv = rv->next_homonym;
}
--- misc/hunspell-1.2.8/src/hunspell/affixmgr.hxx 2008-10-30 21:28:59.000000000 +0100
+++ misc/build/hunspell-1.2.8/src/hunspell/affixmgr.hxx 2008-11-01 16:30:49.000000000 +0100
@@ -2,9 +2,6 @@
#define _AFFIXMGR_HXX_
#ifdef MOZILLA_CLIENT
-#ifdef __SUNPRO_CC // for SunONE Studio compiler
-using namespace std;
-#endif
#include <stdio.h>
#else
#include <cstdio>
--- misc/hunspell-1.2.8/src/hunspell/atypes.hxx 2008-10-29 15:30:51.000000000 +0100
+++ misc/build/hunspell-1.2.8/src/hunspell/atypes.hxx 2008-11-01 16:30:49.000000000 +0100
@@ -1,6 +1,8 @@
#ifndef _ATYPES_HXX_
#define _ATYPES_HXX_
+#include <stdio.h>
+
#ifndef HUNSPELL_WARNING
#ifdef HUNSPELL_WARNING_ON
#define HUNSPELL_WARNING fprintf
--- misc/hunspell-1.2.8/src/hunspell/csutil.cxx Wed Oct 22 12:15:28 2008
+++ misc/build/hunspell-1.2.8/src/hunspell/csutil.cxx Thu Feb 19 18:13:34 2009
@@ -18,13 +18,13 @@
#include "langnum.hxx"
#ifdef OPENOFFICEORG
-# include <unicode/uchar.h>
+#include <unicode/uchar.h>
#else
-# ifndef MOZILLA_CLIENT
-# include "utf_info.cxx"
-# define UTF_LST_LEN (sizeof(utf_lst) / (sizeof(unicode_info)))
-# endif
+#ifndef MOZILLA_CLIENT
+#include "utf_info.cxx"
+#define UTF_LST_LEN (sizeof(utf_lst) / (sizeof(unicode_info)))
#endif
+#endif
#ifdef MOZILLA_CLIENT
#include "nsCOMPtr.h"
--- misc/hunspell-1.2.8/src/hunspell/filemgr.cxx Sat Nov 1 15:09:41 2008
+++ misc/build/hunspell-1.2.8/src/hunspell/filemgr.cxx Thu Feb 19 17:28:35 2009
@@ -11,6 +11,7 @@
#include <stdio.h>
#endif
+using namespace std;
#include "filemgr.hxx"
int FileMgr::fail(const char * err, const char * par) {
--- misc/hunspell-1.2.8/src/hunspell/filemgr.hxx Mon Aug 11 11:32:02 2008
+++ misc/build/hunspell-1.2.8/src/hunspell/filemgr.hxx Thu Feb 19 13:58:01 2009
@@ -6,7 +6,7 @@
class FileMgr
{
protected:
- FILE * fin;
+ std::FILE * fin;
Hunzip * hin;
char in[BUFSIZE + 50]; // input buffer
int fail(const char * err, const char * par);
--- misc/hunspell-1.2.8/src/hunspell/hashmgr.cxx Thu Aug 14 16:49:33 2008
+++ misc/build/hunspell-1.2.8/src/hunspell/hashmgr.cxx Thu Feb 19 17:25:33 2009
@@ -6,6 +6,9 @@
#include <cstring>
#include <cstdio>
#include <cctype>
+//#ifdef __SUNPRO_CC // for SunONE Studio compiler
+//using namespace std;
+//#endif
#else
#include <stdlib.h>
#include <string.h>
@@ -13,10 +16,6 @@
#include <ctype.h>
#endif
-#include "hashmgr.hxx"
-#include "csutil.hxx"
-#include "atypes.hxx"
-
#ifdef MOZILLA_CLIENT
#ifdef __SUNPRO_CC // for SunONE Studio compiler
using namespace std;
@@ -27,6 +26,10 @@
#endif
#endif
+#include "hashmgr.hxx"
+#include "csutil.hxx"
+#include "atypes.hxx"
+
// build a hash table from a munched word list
HashMgr::HashMgr(const char * tpath, const char * apath, const char * key)
@@ -459,6 +462,10 @@
}
} else {
al = decode_flags(&flags, ap + 1, dict);
+ if (al == -1) {
+ HUNSPELL_WARNING(stderr, "Can't allocate memory.\n");
+ return 6;
+ }
flag_qsort(flags, 0, al);
}
} else {
@@ -499,6 +506,11 @@
int HashMgr::decode_flags(unsigned short ** result, char * flags, FileMgr * af) {
int len;
+ if (*flags == '\0') {
+ HUNSPELL_WARNING(stderr, "error: line %d: bad flagvector\n", af->getlinenum());
+ *result = NULL;
+ return 0;
+ }
switch (flag_mode) {
case FLAG_LONG: { // two-character flags (1x2yZz -> 1x 2y Zz)
len = strlen(flags);
--- misc/hunspell-1.2.8/src/hunspell/hashmgr.hxx 2008-08-12 12:22:54.000000000 +0200
+++ misc/build/hunspell-1.2.8/src/hunspell/hashmgr.hxx 2009-02-19 12:57:11.780108100 +0100
@@ -3,6 +3,7 @@
#ifndef MOZILLA_CLIENT
#include <cstdio>
+/* using namespace std; */
#else
#include <stdio.h>
#endif
--- misc/hunspell-1.2.8/src/hunspell/hunspell.cxx Thu Oct 30 20:15:53 2008
+++ misc/build/hunspell-1.2.8/src/hunspell/hunspell.cxx Thu Feb 19 18:13:35 2009
@@ -1,3 +1,7 @@
+#ifdef _MSC_VER
+#pragma setlocale("C")
+#endif
+
#include "license.hunspell"
#include "license.myspell"
@@ -11,11 +15,6 @@
#include <stdio.h>
#endif
-#include "hunspell.hxx"
-#include "hunspell.h"
-#include "config.h"
-#include "csutil.hxx"
-
#ifndef MOZILLA_CLIENT
#ifndef WIN32
using namespace std;
@@ -22,6 +21,9 @@
#endif
#endif
+#include "hunspell.hxx"
+#include "csutil.hxx"
+
Hunspell::Hunspell(const char * affpath, const char * dpath, const char * key)
{
encoding = NULL;
@@ -338,7 +340,11 @@
char wspace[MAXWORDUTF8LEN];
w_char unicw[MAXWORDLEN];
// Hunspell supports XML input of the simplified API (see manual)
- if (strcmp(word, SPELL_XML) == 0) return 1;
+ if (strncmp(word, SPELL_XML, sizeof(SPELL_XML) - 3) == 0) {
+ if (strcmp(word, SPELL_XML) == 0) return 1; // query XML interface support
+ return 0;
+ }
+
int nc = strlen(word);
int wl2 = 0;
if (utf8) {
@@ -1854,89 +1860,3 @@
}
#endif // END OF HUNSPELL_EXPERIMENTAL CODE
-
-Hunhandle *Hunspell_create(const char * affpath, const char * dpath)
-{
- return (Hunhandle*)(new Hunspell(affpath, dpath));
-}
-
-Hunhandle *Hunspell_create_key(const char * affpath, const char * dpath,
- const char * key)
-{
- return (Hunhandle*)(new Hunspell(affpath, dpath, key));
-}
-
-void Hunspell_destroy(Hunhandle *pHunspell)
-{
- delete (Hunspell*)(pHunspell);
-}
-
-int Hunspell_spell(Hunhandle *pHunspell, const char *word)
-{
- return ((Hunspell*)pHunspell)->spell(word);
-}
-
-char *Hunspell_get_dic_encoding(Hunhandle *pHunspell)
-{
- return ((Hunspell*)pHunspell)->get_dic_encoding();
-}
-
-int Hunspell_suggest(Hunhandle *pHunspell, char*** slst, const char * word)
-{
- return ((Hunspell*)pHunspell)->suggest(slst, word);
-}
-
-int Hunspell_analyze(Hunhandle *pHunspell, char*** slst, const char * word)
-{
- return ((Hunspell*)pHunspell)->analyze(slst, word);
-}
-
-int Hunspell_stem(Hunhandle *pHunspell, char*** slst, const char * word)
-{
- return ((Hunspell*)pHunspell)->stem(slst, word);
-}
-
-int Hunspell_stem(Hunhandle *pHunspell, char*** slst, char** desc, int n)
-{
- return ((Hunspell*)pHunspell)->stem(slst, desc, n);
-}
-
-int Hunspell_generate(Hunhandle *pHunspell, char*** slst, const char * word,
- const char * word2)
-{
- return ((Hunspell*)pHunspell)->generate(slst, word, word2);
-}
-
-int Hunspell_generate(Hunhandle *pHunspell, char*** slst, const char * word,
- char** desc, int n)
-{
- return ((Hunspell*)pHunspell)->generate(slst, word, desc, n);
-}
-
- /* functions for run-time modification of the dictionary */
-
- /* add word to the run-time dictionary */
-
-int Hunspell_add(Hunhandle *pHunspell, const char * word) {
- return ((Hunspell*)pHunspell)->add(word);
-}
-
- /* add word to the run-time dictionary with affix flags of
- * the example (a dictionary word): Hunspell will recognize
- * affixed forms of the new word, too.
- */
-
-int Hunspell_add_with_affix(Hunhandle *pHunspell, const char * word,
- const char * example) {
- return ((Hunspell*)pHunspell)->add_with_affix(word, example);
-}
-
- /* remove word from the run-time dictionary */
-
-int Hunspell_remove(Hunhandle *pHunspell, const char * word) {
- return ((Hunspell*)pHunspell)->remove(word);
-}
-
-void Hunspell_free_list(Hunhandle *pHunspell, char *** slst, int n) {
- freelist(slst, n);
-}
--- misc/hunspell-1.2.8/src/hunspell/hunspell.hxx 2008-07-09 16:14:39.000000000 +0200
+++ misc/build/hunspell-1.2.8/src/hunspell/hunspell.hxx 2008-11-26 18:32:58.765625000 +0100
@@ -28,11 +28,7 @@
#endif
#endif
-#ifdef WIN32
-class DLLEXPORT Hunspell
-#else
class Hunspell
-#endif
{
AffixMgr* pAMgr;
HashMgr* pHMgr[MAXDIC];
--- misc/hunspell-1.2.8/src/hunspell/hunzip.cxx Tue Jun 17 10:57:55 2008
+++ misc/build/hunspell-1.2.8/src/hunspell/hunzip.cxx Thu Feb 19 17:29:19 2009
@@ -8,6 +8,7 @@
#include <stdio.h>
#endif
+using namespace std;
#include "hunzip.hxx"
#define CODELEN 65536
--- misc/hunspell-1.2.8/src/hunspell/hunzip.hxx Thu Feb 19 15:59:42 2009
+++ misc/build/hunspell-1.2.8/src/hunspell/hunzip.hxx Thu Feb 19 18:13:35 2009
@@ -18,6 +18,8 @@
#define MSG_MEMORY "error: %s: missing memory\n"
#define MSG_KEY "error: %s: missing or bad password\n"
+#include <stdlib.h>
+
struct bit {
unsigned char c[2];
int v[2];
--- misc/hunspell-1.2.8/src/hunspell/license.hunspell 2008-06-17 10:57:55.000000000 +0200
+++ misc/build/hunspell-1.2.8/src/hunspell/license.hunspell 2008-11-01 16:30:49.000000000 +0100
@@ -56,4 +56,3 @@
*
* ***** END LICENSE BLOCK ***** */
-#include "config.h"
--- misc/hunspell-1.2.8/src/hunspell/makefile.mk Tue Jun 17 10:57:55 2008
+++ misc/build/hunspell-1.2.8/src/hunspell/makefile.mk Thu Feb 19 18:13:52 2009
@@ -60,11 +60,13 @@
#
#*************************************************************************
-PRJ = ..
+PRJ = ../../../../../..
PRJNAME = hunspell
TARGET = hunspell
-LIBTARGET=NO
+LIBTARGET=YES
+EXTERNAL_WARNINGS_NOT_ERRORS := TRUE
+UWINAPILIB=
#----- Settings ---------------------------------------------------------
@@ -73,7 +74,7 @@
# --- Files --------------------------------------------------------
# all_target: ALLTAR DICTIONARY
-all_target: ALLTAR
+#all_target: ALLTAR
##CXXFLAGS += -I..$/..$/lingutil
##CFLAGSCXX += -I..$/..$/lingutil
@@ -89,6 +90,10 @@
$(SLO)$/utf_info.obj \
$(SLO)$/hashmgr.obj \
$(SLO)$/suggestmgr.obj \
+ $(SLO)$/phonet.obj \
+ $(SLO)$/hunzip.obj \
+ $(SLO)$/filemgr.obj \
+ $(SLO)$/replist.obj \
$(SLO)$/hunspell.obj
LIB1TARGET= $(SLB)$/lib$(TARGET).lib
--- misc/hunspell-1.2.8/src/hunspell/phonet.cxx 2008-08-13 15:29:08.000000000 +0200
+++ misc/build/hunspell-1.2.8/src/hunspell/phonet.cxx 2008-11-01 16:30:49.000000000 +0100
@@ -32,6 +32,7 @@
#include <cstring>
#include <cstdio>
#include <cctype>
+using namespace std;
#else
#include <stdlib.h>
#include <string.h>
--- misc/hunspell-1.2.8/src/hunspell/replist.cxx Sat Nov 1 15:09:51 2008
+++ misc/build/hunspell-1.2.8/src/hunspell/replist.cxx Thu Feb 19 14:02:51 2009
@@ -13,6 +13,7 @@
#include "replist.hxx"
#include "csutil.hxx"
+using namespace std;
RepList::RepList(int n) {
dat = (replentry **) malloc(sizeof(replentry *) * n);
--- misc/hunspell-1.2.8/src/tools/analyze.cxx Tue Jun 17 13:44:50 2008
+++ misc/build/hunspell-1.2.8/src/tools/analyze.cxx Thu Feb 19 18:13:35 2009
@@ -3,13 +3,13 @@
#include <cstdlib>
#include <cstdio>
-#include "hunspell.hxx"
-
#ifndef WIN32
using namespace std;
#endif
+#include "hunspell.hxx"
+
int main(int argc, char **argv)
{
--- misc/hunspell-1.2.8/src/tools/chmorph.cxx Tue Jun 17 12:15:34 2008
+++ misc/build/hunspell-1.2.8/src/tools/chmorph.cxx Thu Feb 19 17:36:46 2009
@@ -2,13 +2,13 @@
#include <cstdlib>
#include <cstdio>
-#include "hunspell.hxx"
-#include "textparser.hxx"
-
#ifndef W32
using namespace std;
#endif
+#include "hunspell.hxx"
+#include "textparser.hxx"
+
int
main(int argc, char** argv)
{
--- misc/hunspell-1.2.8/src/tools/example.cxx Tue Jun 17 13:07:24 2008
+++ misc/build/hunspell-1.2.8/src/tools/example.cxx Thu Feb 19 17:38:12 2009
@@ -2,12 +2,12 @@
#include <cstdlib>
#include <cstdio>
+using namespace std;
+
#include "hunspell.hxx"
extern char * mystrdup(const char * s);
-using namespace std;
-
int
main(int argc, char** argv)
{
--- misc/hunspell-1.2.8/src/tools/hunspell.cxx 2008-09-04 15:44:19.000000000 +0200
+++ misc/build/hunspell-1.2.8/src/tools/hunspell.cxx 2008-11-01 16:31:24.000000000 +0100
@@ -7,10 +7,20 @@
#include <cstdlib>
#include <cstdio>
+
+#ifdef __SUNPRO_CC
+using namespace std;
+#include <string.h>
+#include <malloc.h>
+#endif
+
#include "config.h"
#include "hunspell.hxx"
#include "csutil.hxx"
+// switch off iconv support for tests (fixing Solaris problems)
+#undef HAVE_ICONV
+
#ifndef HUNSPELL_EXTRA
#define suggest_auto suggest
#endif
@@ -28,7 +38,9 @@
#ifdef WIN32
+#ifndef __MINGW32__
#define gettext
+#endif
#define LIBDIR "C:\\Hunspell\\"
#define USEROOODIR "Application Data\\OpenOffice.org 2\\user\\wordbook"
#define OOODIR \
@@ -98,8 +110,10 @@
#if ENABLE_NLS
#ifdef HAVE_LOCALE_H
#include <locale.h>
+#ifdef HAVE_LANGINFO_CODESET
#include <langinfo.h>
#endif
+#endif
#ifdef HAVE_LIBINTL_H
#include <libintl.h>
@@ -1385,9 +1399,11 @@
#ifdef HAVE_LOCALE_H
ui_lang = setlocale(LC_ALL, "");
textdomain("hunspell");
+#ifdef HAVE_LANGINFO_CODESET
ui_enc = nl_langinfo(CODESET);
#endif
#endif
+#endif
#ifdef HAVE_READLINE
rl_set_key("", rl_escape, rl_get_keymap());
--- misc/hunspell-1.2.8/src/tools/hunzip.cxx Tue Jan 15 11:10:04 2008
+++ misc/build/hunspell-1.2.8/src/tools/hunzip.cxx Thu Feb 19 17:38:12 2009
@@ -2,6 +2,8 @@
#include <stdlib.h>
#include <string.h>
+using namespace std;
+
#include "hunzip.hxx"
#define DESC "hunzip - decompress a hzip file to the standard output\n" \
--- misc/hunspell-1.2.8/src/tools/hzip.c Fri Apr 4 15:20:10 2008
+++ misc/build/hunspell-1.2.8/src/tools/hzip.c Thu Feb 19 18:13:35 2009
@@ -44,7 +44,7 @@
if (tree->type != code_NODE) {
int i = tree->word;
code[deep] = '\0';
- if (tree->type == code_TERM) i = CODELEN; // terminal code
+ if (tree->type == code_TERM) i = CODELEN;
table[i] = malloc((deep + 1) * sizeof(char));
strcpy(table[i], code);
}
@@ -63,7 +63,7 @@
return ni;
}
-// return length of the freq array
+
int get_freqdata(struct item *** dest, FILE * f, unsigned short * termword) {
int freq[CODELEN];
int i, j, k, n;
@@ -88,7 +88,7 @@
(*dest)[n]->word = i;
n++;
}
- // terminal sequence (also contains the last odd byte of the file)
+
(*dest)[n] = newitem(1, NULL, NULL, code_TERM);
*termword = *((unsigned short *) c);
return n + 1;
@@ -134,20 +134,20 @@
char c[2];
char * enc = key;
- // header and codes
- fprintf(f2, "%s", (key ? MAGIC_ENCRYPTED : MAGIC)); // 3-byte HEADER
+
+ fprintf(f2, "%s", (key ? MAGIC_ENCRYPTED : MAGIC));
cl = (unsigned char) (n & 0x00ff);
ch = (unsigned char) (n >> 8);
if (key) {
unsigned char cs;
for (cs = 0; *enc; enc++) cs ^= *enc;
- fprintf(f2, "%c", cs); // 1-byte check sum
+ fprintf(f2, "%c", cs);
enc = key;
ch ^= *enc;
if ((*(++enc)) == '\0') enc = key;
cl ^= *enc;
}
- fprintf(f2, "%c%c", ch, cl); // upper and lower byte of record count
+ fprintf(f2, "%c%c", ch, cl);
for (i = 0; i < BUFSIZE; i++) bitbuf[i] = '\0';
for (i = 0; i < CODELEN + 1; i++) if (table[i]) {
unsigned short * d = (unsigned short *) &c;
@@ -159,7 +159,7 @@
if (*(++enc) == '\0') enc = key;
c[1] ^= *enc;
}
- fprintf(f2, "%c%c", c[0], c[1]); // 2-character code id
+ fprintf(f2, "%c%c", c[0], c[1]);
bits = 0;
write_bits(f2, bitbuf, &bits, table[i]);
if (key) {
@@ -169,11 +169,11 @@
if (*(++enc) == '\0') enc = key;
bitbuf[cl] ^= *enc;
}
- } else fprintf(f2, "%c", (unsigned char) bits); // 1-byte code length
- fwrite(bitbuf, sizeof(char), bits/8 + 1, f2); // x-byte code
+ } else fprintf(f2, "%c", (unsigned char) bits);
+ fwrite(bitbuf, sizeof(char), bits/8 + 1, f2);
}
- // file encoding
+
bits = 0;
while((cx[0] = getc(f)) != -1 && (cx[1] = getc(f)) != -1) {
c[0] = cx[0];
@@ -180,7 +180,7 @@
c[1] = cx[1];
write_bits(f2, bitbuf, &bits, table[*((unsigned short *) c)]);
}
- // terminal suffixes
+
write_bits(f2, bitbuf, &bits, table[CODELEN]);
if (bits > 0) fwrite(bitbuf, sizeof(char), bits/8 + 1, f2);
}
@@ -201,11 +201,11 @@
} else pfx = 0;
}
if (i > 0 && buf[i - 1] == '\n') {
- if (j == i) j--; // line duplicate
+ if (j == i) j--;
if (j > 29) j = 29;
c = j;
if (c == '\t') c = 30;
- // common suffix
+
for (; buf[i - m - 2] == prev[prevlen - m - 2] &&
m < i - j - 1 && m < 15; m++);
if (m == 1) m = 0;
@@ -221,7 +221,7 @@
*p = buf[k];
}
if (m > 0) {
- *p = m + 31; // 33-46
+ *p = m + 31;
p++;
}
if (i > 0 && buf[i - 1] == '\n') {
hunspell/hunspell-consts-1.2.8.patch deleted 100644 → 0
Dosyayı görüntüle @ 27a76954
--- misc/hunspell-1.2.8/src/hunspell/affixmgr.cxx 2009-05-16 14:33:27.000000000 +0100
+++ misc/build/hunspell-1.2.8/src/hunspell/affixmgr.cxx 2009-05-16 14:35:52.000000000 +0100
@@ -3238,7 +3238,7 @@
}
// return the value of suffix
-const int AffixMgr::have_contclass()
+int AffixMgr::have_contclass() const
{
return havecontclass;
}
--- misc/hunspell-1.2.8.orig/src/hunspell/affixmgr.hxx 2009-05-16 14:33:27.000000000 +0100
+++ misc/build/hunspell-1.2.8/src/hunspell/affixmgr.hxx 2009-05-16 14:35:38.000000000 +0100
@@ -189,7 +189,7 @@
const char * get_suffix();
const char * get_derived();
const char * get_version();
- const int have_contclass();
+ int have_contclass() const;
int get_utf8();
int get_complexprefixes();
char * get_suffixed(char );
hunspell/hunspell-solaris.patch 0 → 100644
Dosyayı görüntüle @ 89ef48f5
--- misc/hunspell-1.2.9.orig/src/tools/hunspell.cxx 2010-02-27 23:42:05.000000000 +0000
+++ misc/build/hunspell-1.2.9/src/tools/hunspell.cxx 2010-02-27 23:43:02.000000000 +0000
@@ -10,6 +10,9 @@
#include "hunspell.hxx"
#include "csutil.hxx"
+// switch off iconv support for tests (fixing Solaris problems)
+#undef HAVE_ICONV
+
#ifndef HUNSPELL_EXTRA
#define suggest_auto suggest
#endif
hunspell/hunspell-stacksmash.patch 0 → 100644
Dosyayı görüntüle @ 89ef48f5
--- misc/hunspell-1.2.9/src/hunspell/hunspell.cxx 2010-03-04 10:25:06.000000000 +0000
+++ misc/build/hunspell-1.2.9/src/hunspell/hunspell.cxx 2010-03-04 10:25:38.000000000 +0000
@@ -1665,7 +1665,7 @@
if (!q2) return 0; // bad XML input
if (check_xml_par(q, "type=", "analyze")) {
int n = 0, s = 0;
- if (get_xml_par(cw, strchr(q2, '>'), MAXWORDUTF8LEN)) n = analyze(slst, cw);
+ if (get_xml_par(cw, strchr(q2, '>'), MAXWORDUTF8LEN - 1)) n = analyze(slst, cw);
if (n == 0) return 0;
// convert the result to <code><a>ana1</a><a>ana2</a></code> format
for (int i = 0; i < n; i++) s+= strlen((*slst)[i]);
@@ -1686,13 +1686,13 @@
(*slst)[0] = r;
return 1;
} else if (check_xml_par(q, "type=", "stem")) {
- if (get_xml_par(cw, strchr(q2, '>'), MAXWORDUTF8LEN)) return stem(slst, cw);
+ if (get_xml_par(cw, strchr(q2, '>'), MAXWORDUTF8LEN - 1)) return stem(slst, cw);
} else if (check_xml_par(q, "type=", "generate")) {
- int n = get_xml_par(cw, strchr(q2, '>'), MAXWORDUTF8LEN);
+ int n = get_xml_par(cw, strchr(q2, '>'), MAXWORDUTF8LEN - 1);
if (n == 0) return 0;
char * q3 = strstr(q2 + 1, "<word");
if (q3) {
- if (get_xml_par(cw2, strchr(q3, '>'), MAXWORDUTF8LEN)) {
+ if (get_xml_par(cw2, strchr(q3, '>'), MAXWORDUTF8LEN - 1)) {
return generate(slst, cw, cw2);
}
} else {
hunspell/hunspell-wntconfig.patch 0 → 100644
Dosyayı görüntüle @ 89ef48f5
--- misc/hunspell-1.2.9/config.h 2010-02-25 14:38:38.000000000 +0000
+++ misc/build/hunspell-1.2.9/config.h 2010-02-25 14:38:42.000000000 +0000
@@ -1 +0,0 @@
-dummy
hunspell/makefile.mk
Dosyayı görüntüle @ 89ef48f5
......@@ -36,17 +36,16 @@ TARGET=hunspell
# --- Files --------------------------------------------------------
TARFILE_NAME=hunspell-1.2.8
TARFILE_ROOTDIR=hunspell-1.2.8
#ADDITIONAL_FILES += src/hunspell/makefile.mk
TARFILE_NAME=hunspell-1.2.9
TARFILE_MD5=68dd2e8253d9a7930e9fd50e2d7220d0
ADDITIONAL_FILES+=config.h
PATCH_FILES=\
hunspell-1.2.8.patch \
hunspell-consts-1.2.8.patch # hunspell#2064983
hunspell-wntconfig.patch \
hunspell-solaris.patch \
hunspell-stacksmash.patch
.IF "$(GUI)"=="UNX"
#CONFIGURE_DIR=$(BUILD_DIR)
#relative to CONFIGURE_DIR
CONFIGURE_ACTION=$(AUGMENT_LIBRARY_PATH) configure
......
icu/createmak.cfg
Dosyayı görüntüle @ 89ef48f5
......@@ -2,10 +2,7 @@
SOURCE=<HEADER>
InputPath=<INPUTPATH>
"<TARGET>" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
<<tempfile.bat
@echo off
<TARGETPATH>
<<
[Deps]
SOURCE=.\<SOURCEFILE>.<EXT>
......
icu/makefile.mk
Dosyayı görüntüle @ 89ef48f5
......@@ -39,8 +39,10 @@ TARGET=so_icu
.IF "$(ICU_MICRO)"!="0"
TARFILE_NAME=icu4c-$(ICU_MAJOR)_$(ICU_MINOR)_$(ICU_MICRO)-src
TARFILE_MD5=2f6ecca935948f7db92d925d88d0d078
.ELSE
TARFILE_NAME=icu4c-$(ICU_MAJOR)_$(ICU_MINOR)-src
TARFILE_MD5=
.ENDIF
TARFILE_ROOTDIR=icu
......@@ -85,9 +87,8 @@ icu_CFLAGS+=-O $(ARCH_FLAGS) $(EXTRA_CDEFS)
icu_LDFLAGS+=$(EXTRA_LINKFLAGS)
icu_CXXFLAGS+=-O $(ARCH_FLAGS) $(EXTRA_CDEFS)
BUILD_ACTION_SEP=;
# remove conversion and transliteration data to reduce binary size.
CONFIGURE_ACTION=rm data/mappings/ucm*.mk data/translit/trn*.mk $(BUILD_ACTION_SEP)
CONFIGURE_ACTION=rm data/mappings/ucm*.mk data/translit/trn*.mk ;
# until someone introduces SOLARIS 64-bit builds
.IF "$(OS)"=="SOLARIS"
......@@ -184,11 +185,6 @@ OUT2BIN= \
$(BUILD_DIR)$/bin$/gencmn.exe
.ELSE
.IF "$(USE_SHELL)"=="4nt"
BUILD_ACTION_SEP=^
.ELSE
BUILD_ACTION_SEP=;
.ENDIF # "$(USE_SHELL)"=="4nt"
BUILD_DIR=source
.IF "full_debug" == ""
......@@ -254,7 +250,7 @@ OUT2BIN= \
.IF "$(BINARY_PATCH_FILES)"!=""
$(PACKAGE_DIR)$/so_add_binary : $(PACKAGE_DIR)$/$(ADD_FILES_FLAG_FILE)
cd $(PACKAGE_DIR) && gunzip -c $(BACK_PATH)$(BINARY_PATCH_FILES) | tar $(TAR_EXCLUDE_SWITCH) -xvf -
cd $(PACKAGE_DIR) && gunzip -c $(BACK_PATH)$(BINARY_PATCH_FILES) | tar -xvf -
$(TOUCH) $(PACKAGE_DIR)$/so_add_binary
$(PACKAGE_DIR)$/$(CONFIGURE_FLAG_FILE) : $(PACKAGE_DIR)$/so_add_binary
......
jpeg/makefile.mk
Dosyayı görüntüle @ 89ef48f5
......@@ -43,6 +43,7 @@ all:
# --- Files --------------------------------------------------------
TARFILE_NAME=jpeg-6b
TARFILE_MD5=dbd5f3b47ed13132f04c685d608a7547
PATCH_FILES=jpeg-6b.patch
ADDITIONAL_FILES=makefile.mk \
......
libxml2/makefile.mk
Dosyayı görüntüle @ 89ef48f5
......@@ -45,6 +45,7 @@ all:
LIBXML2VERSION=2.6.31
TARFILE_NAME=$(PRJNAME)-$(LIBXML2VERSION)
TARFILE_MD5=71ef7bcd3493a94395abccecbcf62dd7
#.IF "$(OS)$(COM)"=="WNTGCC"
#PATCH_FILES=$(TARFILE_NAME)-mingw.patch
#.ELSE
......
libxslt/makefile.mk
Dosyayı görüntüle @ 89ef48f5
......@@ -49,6 +49,7 @@ all:
LIBXSLTVERSION=$(LIBXSLT_MAJOR).$(LIBXSLT_MINOR).$(LIBXSLT_MICRO)
TARFILE_NAME=$(PRJNAME)-$(LIBXSLTVERSION)
TARFILE_MD5=e83ec5d27fc4c10c6f612879bea9a153
PATCH_FILES=$(TARFILE_NAME).patch $(TARFILE_NAME)_win_manifest.patch
# This is only for UNX environment now
......
moz/extractfiles.mk
Dosyayı görüntüle @ 89ef48f5
......@@ -386,10 +386,6 @@ $(INCCOM)$/nsBuildID.h: $(PACKAGE_DIR)$/$(PREDELIVER_FLAG_FILE)
$(MISC)$/build$/so_moz_include_files: $(INCCOM)$/nsBuildID.h
.IF "$(USE_SHELL)"=="4nt"
$(COPY) /QSZ $(INCLUDE_PATH)* $(INCLUDE_DIR)
$(COPY) /QSZ $(PUBLIC_PATH)* $(INCLUDE_DIR)
.ELSE
.IF "$(OS)"!="SOLARIS"
$(GNUCOPY) -pRL $(INCLUDE_PATH)* $(INCLUDE_DIR)
$(GNUCOPY) -pRL $(PUBLIC_PATH)* $(INCLUDE_DIR)
......@@ -397,7 +393,6 @@ $(MISC)$/build$/so_moz_include_files: $(INCCOM)$/nsBuildID.h
$(COPY) -pr $(INCLUDE_PATH)* $(INCLUDE_DIR)
$(COPY) -pr $(PUBLIC_PATH)* $(INCLUDE_DIR)
.ENDIF # "$(OS)"!="SOLARIS"
.ENDIF
.IF "$(GUI)"=="UNX"
chmod -R 775 $(INCCOM)
......
moz/makefile.mk
Dosyayı görüntüle @ 89ef48f5
......@@ -78,6 +78,7 @@ XLDOPTS:= -B$(SYSBASE)/usr/lib -B$(SYSBASE)/usr/lib/system -lmathCommon
MOZILLA_VERSION=1.1.14
TARFILE_NAME=seamonkey-$(MOZILLA_VERSION).source
TARFILE_MD5=a169ab152209200a7bad29a275cb0333
TARFILE_ROOTDIR=mozilla
PATCH_FILES = \
......@@ -168,13 +169,7 @@ MOZ_CROSSCOMPILE=CROSS_COMPILE=1 CC="$(CC) -arch $(MOZ_ARCH)" CXX="$(CXX) -arch
CONFIGURE_ACTION=$(null,$(MOZ_ARCH) $(NULL) $(MOZ_CROSSCOMPILE)) ../configure $(MOZILLA_CONFIGURE_FLAGS)
.IF "$(USE_SHELL)"!="4nt"
BUILD_ACTION:=$(GNUMAKE) -j$(EXTMAXPROCESS)
.ELSE
# This construct is needed because unitools.mk defines GNUMAKE using $ENV_TOOLS.
# $ENV_TOOLS doesn't exist for OOo builds and the cygwin make is needed.
BUILD_ACTION:=make
.ENDIF
.IF "$(GUI)"=="UNX"
.IF "$(COMNAME)"=="sunpro5"
......@@ -244,7 +239,6 @@ MOZTOOLSINST:=$(MISC)$/build$/moztoolsinst
.ELSE
MOZTOOLS_EXTRACT:=$(MISC)$/build$/moztools
.ENDIF
.IF "$(USE_SHELL)"!="4nt"
.IF "$(COM)"=="GCC"
MOZ_TOOLS_DOS:=$(shell @cygpath -ad "$(MISC)")\build\moztoolsinst
PATH!:=$(PATH):$(shell @cygpath $(MOZ_TOOLS_DOS))/bin:$(shell @cygpath $(MOZ_TOOLS_DOS))/vc71/bin
......@@ -253,11 +247,6 @@ SET_MOZ_TOOLS_INSTALL_BAT:=export "MOZ_TOOLS=$(MOZ_TOOLS_DOS)"
MOZ_TOOLS_DOS:=$(shell @cygpath -ad "$(MISC)")\build\moztools\vc8-moztools
PATH!:=$(shell @cygpath $(MOZ_TOOLS_DOS))/bin:$(PATH)
.ENDIF
.ELSE # "$(USE_SHELL)"!="4nt"
# MOZ_TOOLS must contain an absolute path
MOZ_TOOLS_DOS:=$(shell @echo %@SFN[$(MISC)])\build\moztools\vc8-moztools
PATH!:=$(MOZ_TOOLS_DOS)\bin;$(PATH)
.ENDIF # "$(USE_SHELL)"!="4nt"
MOZ_TOOLS:=$(subst,\,/ $(MOZ_TOOLS_DOS))
.IF "$(COM)"=="GCC"
......
neon/makefile.mk
Dosyayı görüntüle @ 89ef48f5
......@@ -49,6 +49,7 @@ TARGET=so_neon
NEON_NAME=neon-0.29.3
TARFILE_NAME=$(NEON_NAME)
TARFILE_MD5=ba1015b59c112d44d7797b62fe7bee51
PATCH_FILES=neon.patch
.IF "$(GUI)"=="WNT"
......
neon/neon.patch
Dosyayı görüntüle @ 89ef48f5
--- misc/neon-0.29.3/src/config.h 2010-01-27 12:46:23.000000000 +0100
+++ misc/build/neon-0.29.3/src/config.h 2010-01-27 12:44:10.000000000 +0100
--- misc/neon-0.29.3/src/config.h 2010-03-23 14:47:43.000000000 +0100
+++ misc/build/neon-0.29.3/src/config.h 2010-03-23 12:19:50.000000000 +0100
@@ -1 +1,488 @@
-dummy
+
......@@ -490,9 +490,9 @@
+#else
+#define HAVE_NTLM 1
+#endif
--- misc/neon-0.29.3/src/makefile.mk 2010-01-27 12:46:23.000000000 +0100
+++ misc/build/neon-0.29.3/src/makefile.mk 2010-01-27 12:44:10.000000000 +0100
@@ -1 +1,101 @@
--- misc/neon-0.29.3/src/makefile.mk 2010-03-23 14:47:43.000000000 +0100
+++ misc/build/neon-0.29.3/src/makefile.mk 2010-03-23 14:45:21.000000000 +0100
@@ -1 +1,102 @@
-dummy
+PRJ=..$/..$/..$/..$/..
+
......@@ -500,6 +500,7 @@
+TARGET=neon
+LIBTARGET=NO
+USE_DEFFILE=TRUE
+NO_DEFAULT_STL=TRUE
+EXTERNAL_WARNINGS_NOT_ERRORS := TRUE
+UWINAPILIB=
+
......@@ -596,7 +597,7 @@
+DEF1NAME=$(SHL1TARGET)
+.INCLUDE : target.mk
--- misc/neon-0.29.3/src/ne_auth.c 2009-12-30 22:29:30.000000000 +0100
+++ misc/build/neon-0.29.3/src/ne_auth.c 2010-01-27 12:45:34.000000000 +0100
+++ misc/build/neon-0.29.3/src/ne_auth.c 2010-03-23 12:19:50.000000000 +0100
@@ -367,7 +367,7 @@
static int get_credentials(auth_session *sess, ne_buffer **errmsg, int attempt,
struct auth_challenge *chall, char *pwbuf)
......@@ -634,7 +635,7 @@
return status;
}
--- misc/neon-0.29.3/src/ne_auth.h 2009-09-01 22:13:12.000000000 +0200
+++ misc/build/neon-0.29.3/src/ne_auth.h 2010-01-27 12:44:10.000000000 +0100
+++ misc/build/neon-0.29.3/src/ne_auth.h 2010-03-23 12:19:50.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
......@@ -647,7 +648,7 @@
/* Set callbacks to provide credentials for server and proxy
* authentication, using the default set of authentication protocols.
--- misc/neon-0.29.3/src/ne_defs.h 2009-09-02 16:04:43.000000000 +0200
+++ misc/build/neon-0.29.3/src/ne_defs.h 2010-01-27 12:44:10.000000000 +0100
+++ misc/build/neon-0.29.3/src/ne_defs.h 2010-03-23 12:19:50.000000000 +0100
@@ -41,7 +41,7 @@
#endif
......@@ -658,7 +659,7 @@
#endif
--- misc/neon-0.29.3/src/ne_locks.c 2007-02-05 11:09:27.000000000 +0100
+++ misc/build/neon-0.29.3/src/ne_locks.c 2010-01-27 12:44:10.000000000 +0100
+++ misc/build/neon-0.29.3/src/ne_locks.c 2010-03-23 12:19:50.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,
......@@ -726,7 +727,7 @@
}
}
--- misc/neon-0.29.3/src/ne_locks.h 2006-01-02 12:43:19.000000000 +0100
+++ misc/build/neon-0.29.3/src/ne_locks.h 2010-01-27 12:44:10.000000000 +0100
+++ misc/build/neon-0.29.3/src/ne_locks.h 2010-03-23 12:19:50.000000000 +0100
@@ -22,6 +22,10 @@
#ifndef NE_LOCKS_H
#define NE_LOCKS_H
......@@ -739,7 +740,7 @@
#include "ne_uri.h" /* for ne_uri */
--- misc/neon-0.29.3/src/ne_sspi.c 2007-08-10 17:26:08.000000000 +0200
+++ misc/build/neon-0.29.3/src/ne_sspi.c 2010-01-27 12:44:10.000000000 +0100
+++ misc/build/neon-0.29.3/src/ne_sspi.c 2010-03-23 12:19:50.000000000 +0100
@@ -206,6 +206,45 @@
}
......@@ -826,7 +827,7 @@
securityStatus =
initializeSecurityContext(&sspiContext->credentials, NULL,
--- misc/neon-0.29.3/src/ne_sspi.h 2006-02-12 13:05:14.000000000 +0100
+++ misc/build/neon-0.29.3/src/ne_sspi.h 2010-01-27 12:44:10.000000000 +0100
+++ misc/build/neon-0.29.3/src/ne_sspi.h 2010-03-23 12:19:50.000000000 +0100
@@ -41,7 +41,7 @@
int ne_sspi_clear_context(void *context);
......@@ -837,7 +838,7 @@
#endif /* HAVE_SSPI */
--- misc/neon-0.29.3/src/ne_uri.c 2007-12-05 12:04:47.000000000 +0100
+++ misc/build/neon-0.29.3/src/ne_uri.c 2010-01-27 12:44:10.000000000 +0100
+++ misc/build/neon-0.29.3/src/ne_uri.c 2010-03-23 12:19:50.000000000 +0100
@@ -42,7 +42,7 @@
#include "ne_alloc.h"
#include "ne_uri.h"
......@@ -884,7 +885,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.3/src/ne_utils.c 2006-03-07 10:36:43.000000000 +0100
+++ misc/build/neon-0.29.3/src/ne_utils.c 2010-01-27 12:44:10.000000000 +0100
+++ misc/build/neon-0.29.3/src/ne_utils.c 2010-03-23 12:19:50.000000000 +0100
@@ -118,6 +118,9 @@
#ifdef HAVE_GNUTLS
", GNU TLS " LIBGNUTLS_VERSION
......@@ -915,7 +916,7 @@
#endif /* NE_HAVE_* */
default:
--- misc/neon-0.29.3/src/ne_utils.h 2007-07-16 08:54:57.000000000 +0200
+++ misc/build/neon-0.29.3/src/ne_utils.h 2010-01-27 12:44:10.000000000 +0100
+++ misc/build/neon-0.29.3/src/ne_utils.h 2010-03-23 12:19:50.000000000 +0100
@@ -54,6 +54,7 @@
#define NE_FEATURE_SOCKS (5) /* SOCKSv5 support */
#define NE_FEATURE_TS_SSL (6) /* Thread-safe SSL/TLS support */
......
neon/neon_exports_unix.patch
Dosyayı görüntüle @ 89ef48f5
--- misc/neon-0.29.3/src/exports.map 2009-09-29 10:28:13.531250000 +0200
+++ misc/build/neon-0.29.3/src/exports.map 2009-09-21 12:16:53.453125000 +0200
@@ -0,0 +1,288 @@
+NEON_0_29_3 {
+UDK_3_0_0 {
+ global:
+ ne__negotiate_ssl;
+ ne__ssl_exit;
......
neon/neon_exports_win.patch
Dosyayı görüntüle @ 89ef48f5
--- misc/neon-0.29.3/src/exports.map 2009-09-29 10:28:13.531250000 +0200
+++ misc/build/neon-0.29.3/src/exports.map 2009-09-21 12:16:53.453125000 +0200
@@ -0,0 +1,294 @@
+NEON_0_29_3 {
+UDK_3_0_0 {
+ global:
+ ne_sspi_authenticate;
+ ne_sspi_clear_context;
......
neon/prj/build.lst
Dosyayı görüntüle @ 89ef48f5
xh neon : OPENSSL:openssl soltools external EXPAT:expat LIBXML2:libxml2 NULL
xh neon : OPENSSL:openssl ZLIB:zlib stlport soltools external EXPAT:expat LIBXML2:libxml2 NULL
xh neon usr1 - all xh_mkout NULL
xh neon nmake - all xh_neon NULL
nss/makefile.mk
Dosyayı görüntüle @ 89ef48f5
......@@ -42,6 +42,7 @@ all:
.ENDIF
TARFILE_NAME=nss_3_12_5
TARFILE_MD5=6244eb0b6e2647ee50470951fa6efb47
TARFILE_ROOTDIR=mozilla
PATCH_FILES=nss.patch
......@@ -134,12 +135,8 @@ OUT2LIB= \
.ELSE # "$(COM)"=="GCC"
MOZ_MSVCVERSION= 9
.EXPORT : MOZ_MSVCVERSION
.IF "$(USE_SHELL)"=="4nt"
PATH!:=$(MOZILLABUILD)/msys/bin;$(MOZILLABUILD)/moztools/bin;$(PATH)
.ELSE # $(USE_SHELL)"=="4nt"
moz_build:=$(shell cygpath -p $(MOZILLABUILD))
PATH!:=$(moz_build)/msys/bin:$(moz_build)/moztools/bin:$(PATH)
.ENDIF # $(USE_SHELL)"=="4nt"
.EXPORT : PATH
#Using WINNT will cause at least that nspr4.dll, plc4.dll, plds4.dll
......
python/makefile.mk
Dosyayı görüntüle @ 89ef48f5
......@@ -46,6 +46,7 @@ all:
TARFILE_NAME=Python-$(PYVERSION)
TARFILE_MD5=e81c2f0953aa60f8062c05a4673f2be0
PATCH_FILES=\
Python-$(PYVERSION).patch \
Python-ssl.patch
......@@ -78,7 +79,7 @@ CONFIGURE_ACTION=$(AUGMENT_LIBRARY_PATH) ./configure --prefix=$(MYCWD)/python-in
.IF "$(OS)$(CPU)" == "SOLARISI"
CONFIGURE_ACTION += --disable-ipv6
.ENDIF
BUILD_ACTION=$(ENV_BUILD) $(GNUMAKE) -j$(EXTMAXPROCESS) ; $(GNUMAKE) install ; chmod -R ug+w $(MYCWD)/python-inst
BUILD_ACTION=$(ENV_BUILD) $(GNUMAKE) -j$(EXTMAXPROCESS) && $(GNUMAKE) install && chmod -R ug+w $(MYCWD)/python-inst && chmod g+w Include
.ELSE
# ----------------------------------
# WINDOWS
......@@ -93,7 +94,7 @@ python_LDFLAGS=-mno-cygwin -mthreads
python_LDFLAGS+=-shared-libgcc
.ENDIF
CONFIGURE_ACTION=./configure --prefix=$(MYCWD)/python-inst --enable-shared CC="$(CC:s/guw.exe //)" CXX="$(CXX:s/guw.exe //)" MACHDEP=MINGW32 LN="cp -p" CFLAGS="$(python_CFLAGS)" LDFLAGS="$(python_LDFLAGS)"
BUILD_ACTION=$(ENV_BUILD) make ; make install
BUILD_ACTION=$(ENV_BUILD) make && make install
.ELSE
#PYTHONPATH:=..$/Lib
#.EXPORT : PYTHONPATH
......
saxon/makefile.mk
Dosyayı görüntüle @ 89ef48f5
......@@ -45,6 +45,7 @@ all:
# --- Files --------------------------------------------------------
TARFILE_NAME=source-9.0.0.7-bj
TARFILE_MD5=ada24d37d8d638b3d8a9985e80bc2978
ADDITIONAL_FILES=build.xml
TARFILE_ROOTDIR=src
......
stax/makefile.mk
Dosyayı görüntüle @ 89ef48f5
......@@ -49,6 +49,7 @@ all:
# --- Files --------------------------------------------------------
TARFILE_NAME=stax-api-1.0-2-sources
TARFILE_MD5=8294d6c42e3553229af9934c5c0ed997
TARFILE_ROOTDIR=src
BUILD_ACTION=$(JAVAC) javax$/xml$/stream$/*.java && jar -cf jsr173_1.0_api.jar javax$/xml$/stream$/*.class javax$/xml$/stream$/events$/*.class javax$/xml$/stream$/util$/*.class
......
zlib/makefile.mk
Dosyayı görüntüle @ 89ef48f5
......@@ -45,6 +45,7 @@ all:
# --- Files --------------------------------------------------------
TARFILE_NAME=zlib-1.1.4
TARFILE_MD5=abc405d0bdd3ee22782d7aa20e440f08
PATCH_FILES=zlib-1.1.4.patch
ADDITIONAL_FILES=makefile.mk
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment